Commits February 2009

commits@lists.geany.org

3 participants
80 discussions

SF.net SVN: geany:[3611] trunk
by eht16＠users.sourceforge.net 27 Feb '09

27 Feb '09

Revision: 3611 http://geany.svn.sourceforge.net/geany/?rev=3611&view=rev Author: eht16 Date: 2009-02-27 14:07:20 +0000 (Fri, 27 Feb 2009) Log Message: ----------- Update the Packager tag due to Dominic's various contributions. Update description and feature list. Change Source tag to the gzip'ed tarball to be in sync with the Makefile target (thanks to Wolfgang Ocker for reporting). Modified Paths: -------------- trunk/ChangeLog trunk/geany.spec.in Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-02-27 14:07:06 UTC (rev 3610) +++ trunk/ChangeLog 2009-02-27 14:07:20 UTC (rev 3611) @@ -18,6 +18,11 @@ * plugins/splitwindow.c: Fix possible crash on non-32-bit systems (patch by Wolfgang Ocker, thanks). + * geany.spec.in: + Update the Packager tag due to Dominic's various contributions. + Update description and feature list. + Change Source tag to the gzip'ed tarball to be in sync with the + Makefile target (thanks to Wolfgang Ocker for reporting). 2009-02-26 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> Modified: trunk/geany.spec.in =================================================================== --- trunk/geany.spec.in 2009-02-27 14:07:06 UTC (rev 3610) +++ trunk/geany.spec.in 2009-02-27 14:07:20 UTC (rev 3611) @@ -4,26 +4,36 @@ Release: 1 License: GPL2 Group: Development/Tools -Vendor: Enrico Tröger <enrico.troeger(a)uvena.de> -Packager: Enrico Tröger <enrico.troeger(a)uvena.de> -Source: http://files.uvena.de/geany/%{name}-%{version}.tar.bz2 +Vendor: The Geany developer team <info(a)geany.org> +Packager: Dominic Hopf <dmaphy(a)gmail.com> +Source: http://download.geany.org/%{name}-%{version}.tar.gz URL: http://www.geany.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: glib2, gtk2, pango BuildRequires: glib2-devel, gtk2-devel, pango-devel %description -Geany is a small and fast editor with basic features of an integrated development environment. +Geany is a small and lightweight Integrated Development Environment. It +was developed to provide a small and fast IDE, which has only a few +dependencies from other packages. Another goal was to be as independent +as possible from a special Desktop Environment like KDE or GNOME - +Geany only requires the GTK2 runtime libraries. -Some features: -- syntax highlighting -- code completion -- code folding -- call tips -- folding -- many supported filetypes like C, Java, PHP, HTML, Python, Perl, Pascal -- symbol lists +Some basic features of Geany: +- Syntax highlighting +- Code folding +- Symbol name auto-completion +- Construct completion/snippets +- Auto-closing of XML and HTML tags +- Call tips +- Many supported filetypes including C, Java, PHP, HTML, Python, Perl, Pascal, and others +- Symbol lists +- Code navigation +- Build system to compile and execute your code +- Simple project management +- Plugin interface + %prep %setup -q This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3610] trunk
by eht16＠users.sourceforge.net 27 Feb '09

27 Feb '09

Revision: 3610 http://geany.svn.sourceforge.net/geany/?rev=3610&view=rev Author: eht16 Date: 2009-02-27 14:07:06 +0000 (Fri, 27 Feb 2009) Log Message: ----------- Fix possible crash on non-32-bit systems (patch by Wolfgang Ocker, thanks). Modified Paths: -------------- trunk/ChangeLog trunk/plugins/splitwindow.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-02-27 14:06:51 UTC (rev 3609) +++ trunk/ChangeLog 2009-02-27 14:07:06 UTC (rev 3610) @@ -15,6 +15,9 @@ * src/callbacks.c, src/toolbar.c: Fix broken non-incremental search with the toolbar search entry when pressing Enter (closes #2638180). + * plugins/splitwindow.c: + Fix possible crash on non-32-bit systems (patch by + Wolfgang Ocker, thanks). 2009-02-26 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> Modified: trunk/plugins/splitwindow.c =================================================================== --- trunk/plugins/splitwindow.c 2009-02-27 14:06:51 UTC (rev 3609) +++ trunk/plugins/splitwindow.c 2009-02-27 14:07:06 UTC (rev 3610) @@ -164,7 +164,7 @@ /* set the new sci widget to view the existing Scintilla document */ sdoc = (gpointer) scintilla_send_message(current, SCI_GETDOCPOINTER, 0, 0); - scintilla_send_message(sci, SCI_SETDOCPOINTER, 0, GPOINTER_TO_INT(sdoc)); + scintilla_send_message(sci, SCI_SETDOCPOINTER, 0, (sptr_t) sdoc); update_font(current, sci); lexer = scintilla_send_message(current, SCI_GETLEXER, 0, 0); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3609] trunk
by eht16＠users.sourceforge.net 27 Feb '09

27 Feb '09

Revision: 3609 http://geany.svn.sourceforge.net/geany/?rev=3609&view=rev Author: eht16 Date: 2009-02-27 14:06:51 +0000 (Fri, 27 Feb 2009) Log Message: ----------- Fix broken non-incremental search with the toolbar search entry when pressing Enter (closes #2638180). Modified Paths: -------------- trunk/ChangeLog trunk/src/callbacks.c trunk/src/toolbar.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-02-27 14:06:34 UTC (rev 3608) +++ trunk/ChangeLog 2009-02-27 14:06:51 UTC (rev 3609) @@ -12,6 +12,9 @@ Update source files upon creation. * data/c99.tags: Update C tags for glibc 2.9. + * src/callbacks.c, src/toolbar.c: + Fix broken non-incremental search with the toolbar search entry when + pressing Enter (closes #2638180). 2009-02-26 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2009-02-27 14:06:34 UTC (rev 3608) +++ trunk/src/callbacks.c 2009-02-27 14:06:51 UTC (rev 3609) @@ -553,7 +553,7 @@ gboolean result; setup_find_next(text); - result = document_search_bar_find(doc, search_data.text, 0, TRUE); + result = document_search_bar_find(doc, search_data.text, 0, GPOINTER_TO_INT(user_data)); if (search_data.search_bar) ui_set_search_entry_background(toolbar_get_widget_child_by_name("SearchEntry"), result); } Modified: trunk/src/toolbar.c =================================================================== --- trunk/src/toolbar.c 2009-02-27 14:06:34 UTC (rev 3608) +++ trunk/src/toolbar.c 2009-02-27 14:06:51 UTC (rev 3609) @@ -199,9 +199,9 @@ action_searchentry = geany_entry_action_new( "SearchEntry", _("Search"), _("Find the entered text in the current file"), FALSE); g_signal_connect(action_searchentry, "entry-activate", - G_CALLBACK(on_toolbar_search_entry_changed), NULL); + G_CALLBACK(on_toolbar_search_entry_changed), GINT_TO_POINTER(FALSE)); g_signal_connect(action_searchentry, "entry-changed", - G_CALLBACK(on_toolbar_search_entry_changed), NULL); + G_CALLBACK(on_toolbar_search_entry_changed), GINT_TO_POINTER(TRUE)); gtk_action_group_add_action(group, action_searchentry); action_gotoentry = geany_entry_action_new( This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3608] trunk/src/symbols.c
by eht16＠users.sourceforge.net 27 Feb '09

27 Feb '09

Revision: 3608 http://geany.svn.sourceforge.net/geany/?rev=3608&view=rev Author: eht16 Date: 2009-02-27 14:06:34 +0000 (Fri, 27 Feb 2009) Log Message: ----------- Fix missing brace in comment. Modified Paths: -------------- trunk/src/symbols.c Modified: trunk/src/symbols.c =================================================================== --- trunk/src/symbols.c 2009-02-27 14:06:21 UTC (rev 3607) +++ trunk/src/symbols.c 2009-02-27 14:06:34 UTC (rev 3608) @@ -1251,7 +1251,7 @@ int symbols_generate_global_tags(int argc, char **argv, gboolean want_preprocess) { /* -E pre-process, -dD output user macros, -p prof info (?), - * -undef remove builtin macros (seems to be needed with FC5 gcc 4.1.1 */ + * -undef remove builtin macros (seems to be needed with FC5 gcc 4.1.1) */ const char pre_process[] = "gcc -E -dD -p -undef"; if (argc > 2) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3607] trunk
by eht16＠users.sourceforge.net 27 Feb '09

27 Feb '09

Revision: 3607 http://geany.svn.sourceforge.net/geany/?rev=3607&view=rev Author: eht16 Date: 2009-02-27 14:06:21 +0000 (Fri, 27 Feb 2009) Log Message: ----------- Update C tags for glibc 2.9. Modified Paths: -------------- trunk/ChangeLog trunk/data/c99.tags Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-02-27 14:06:06 UTC (rev 3606) +++ trunk/ChangeLog 2009-02-27 14:06:21 UTC (rev 3607) @@ -10,6 +10,8 @@ Minor cleanups in search.c. * tagmanager/tm_source_file.c: Update source files upon creation. + * data/c99.tags: + Update C tags for glibc 2.9. 2009-02-26 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> Modified: trunk/data/c99.tags =================================================================== --- trunk/data/c99.tags 2009-02-27 14:06:06 UTC (rev 3606) +++ trunk/data/c99.tags 2009-02-27 14:06:21 UTC (rev 3607) @@ -638,6 +638,9 @@ basename\xCC1024\xCD(const char *__filename)\xD60\xCFchar * bcmp\xCC1024\xCD(const void *__s1, const void *__s2, size_t __n)\xD60\xCFint bcopy\xCC1024\xCD(const void *__src, void *__dest, size_t __n)\xD60\xCFvoid +be16toh\xCC131072\xCD(x)\xD60 +be32toh\xCC131072\xCD(x)\xD60 +be64toh\xCC131072\xCD(x)\xD60 blkcnt64_t\xCC4096\xD60\xCF__blkcnt64_t blkcnt_t\xCC4096\xD60\xCF__blkcnt_t blksize_t\xCC4096\xD60\xCF__blksize_t @@ -942,6 +945,12 @@ greg_t\xCC4096\xD60\xCFint gregset_t\xCC4096\xD60\xCFgreg_t gsignal\xCC1024\xCD(int __sig)\xD60\xCFint +htobe16\xCC131072\xCD(x)\xD60 +htobe32\xCC131072\xCD(x)\xD60 +htobe64\xCC131072\xCD(x)\xD60 +htole16\xCC131072\xCD(x)\xD60 +htole32\xCC131072\xCD(x)\xD60 +htole64\xCC131072\xCD(x)\xD60 hypot\xCC1024\xCD(double __x, double __y)\xD60\xCFdouble hypotf\xCC1024\xCD(float __x, float __y)\xD60\xCFfloat hypotl\xCC1024\xCD(long double __x, long double __y)\xD60\xCFlong double @@ -1063,6 +1072,9 @@ ldexpl\xCC1024\xCD(long double __x, int __exponent)\xD60\xCFlong double ldiv\xCC1024\xCD(long int __numer, long int __denom)\xD60\xCFldiv_t ldiv_t\xCC4096\xD60\xCFanon_struct_57 +le16toh\xCC131072\xCD(x)\xD60 +le32toh\xCC131072\xCD(x)\xD60 +le64toh\xCC131072\xCD(x)\xD60 lgamma\xCC1024\xCD(double)\xD60\xCFdouble lgamma_r\xCC1024\xCD(double, int *__signgamp)\xD60\xCFdouble lgammaf\xCC1024\xCD(float)\xD60\xCFfloat @@ -1219,6 +1231,7 @@ qfcvt_r\xCC1024\xCD(long double __value, int __ndigit, int * __decpt, int * __sign, char * __buf, size_t __len)\xD60\xCFint qgcvt\xCC1024\xCD(long double __value, int __ndigit, char *__buf)\xD60\xCFchar * qsort\xCC1024\xCD(void *__base, size_t __nmemb, size_t __size, __compar_fn_t __compar)\xD60\xCFvoid +qsort_r\xCC1024\xCD(void *__base, size_t __nmemb, size_t __size, __compar_d_fn_t __compar, void *__arg)\xD60\xCFvoid quad_t\xCC4096\xD60\xCF__quad_t raise\xCC1024\xCD(int __sig)\xD60\xCFint rand\xCC1024\xCD(void)\xD60\xCFint This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3606] trunk
by eht16＠users.sourceforge.net 27 Feb '09

27 Feb '09

Revision: 3606 http://geany.svn.sourceforge.net/geany/?rev=3606&view=rev Author: eht16 Date: 2009-02-27 14:06:06 +0000 (Fri, 27 Feb 2009) Log Message: ----------- Update source files upon creation. Modified Paths: -------------- trunk/ChangeLog trunk/tagmanager/tm_source_file.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-02-27 14:05:50 UTC (rev 3605) +++ trunk/ChangeLog 2009-02-27 14:06:06 UTC (rev 3606) @@ -8,6 +8,8 @@ Add images to the 'Replace' and 'Replace and Find' buttons in the Replace dialog. Minor cleanups in search.c. + * tagmanager/tm_source_file.c: + Update source files upon creation. 2009-02-26 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> Modified: trunk/tagmanager/tm_source_file.c =================================================================== --- trunk/tagmanager/tm_source_file.c 2009-02-27 14:05:50 UTC (rev 3605) +++ trunk/tagmanager/tm_source_file.c 2009-02-27 14:06:06 UTC (rev 3606) @@ -63,7 +63,7 @@ source_file->lang = getNamedLanguage(name); if (update) - tm_source_file_update(TM_WORK_OBJECT(source_file), FALSE, FALSE, FALSE); + tm_source_file_update(TM_WORK_OBJECT(source_file), TRUE, FALSE, FALSE); return TRUE; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3605] trunk
by eht16＠users.sourceforge.net 27 Feb '09

27 Feb '09

Revision: 3605 http://geany.svn.sourceforge.net/geany/?rev=3605&view=rev Author: eht16 Date: 2009-02-27 14:05:50 +0000 (Fri, 27 Feb 2009) Log Message: ----------- Move ui_set_search_entry_background() into ui_utils.c. Change the background colour of the search entries in the Find and Replace dialogs according to the search results like in the toolbar search field. Add images to the 'Replace' and 'Replace and Find' buttons in the Replace dialog. Minor cleanups in search.c. Modified Paths: -------------- trunk/ChangeLog trunk/src/callbacks.c trunk/src/search.c trunk/src/ui_utils.c trunk/src/ui_utils.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-02-26 23:11:06 UTC (rev 3604) +++ trunk/ChangeLog 2009-02-27 14:05:50 UTC (rev 3605) @@ -1,3 +1,15 @@ +2009-02-27 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * src/callbacks.c, src/search.c, src/ui_utils.c, src/ui_utils.c: + Move ui_set_search_entry_background() into ui_utils.c. + Change the background colour of the search entries in the Find + and Replace dialogs according to the search results like in the + toolbar search field. + Add images to the 'Replace' and 'Replace and Find' buttons in the + Replace dialog. + Minor cleanups in search.c. + + 2009-02-26 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> * plugins/vcdiff.c, plugins/Makefile.am, po/POTFILES.in: Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2009-02-26 23:11:06 UTC (rev 3604) +++ trunk/src/callbacks.c 2009-02-27 14:05:50 UTC (rev 3605) @@ -535,26 +535,6 @@ } -static void set_search_bar_background(GtkWidget *widget, gboolean success) -{ - const GdkColor red = {0, 0xffff, 0x6666, 0x6666}; - const GdkColor white = {0, 0xffff, 0xffff, 0xffff}; - static gboolean old_value = TRUE; - - if (widget == NULL) - widget = toolbar_get_widget_child_by_name("SearchEntry"); - - /* only update if really needed */ - if (search_data.search_bar && old_value != success) - { - gtk_widget_modify_base(widget, GTK_STATE_NORMAL, success ? NULL : &red); - gtk_widget_modify_text(widget, GTK_STATE_NORMAL, success ? NULL : &white); - - old_value = success; - } -} - - /* store text, clear search flags so we can use Search->Find Next/Previous */ static void setup_find_next(const gchar *text) { @@ -574,7 +554,8 @@ setup_find_next(text); result = document_search_bar_find(doc, search_data.text, 0, TRUE); - set_search_bar_background(NULL, result); + if (search_data.search_bar) + ui_set_search_entry_background(toolbar_get_widget_child_by_name("SearchEntry"), result); } @@ -593,7 +574,8 @@ setup_find_next(text); result = document_search_bar_find(doc, search_data.text, 0, FALSE); - set_search_bar_background(entry, result); + if (search_data.search_bar) + ui_set_search_entry_background(entry, result); } } @@ -1146,7 +1128,9 @@ if (result > -1) editor_display_current_line(doc->editor, 0.3F); - set_search_bar_background(NULL, (result > -1) ? TRUE : FALSE); + if (search_data.search_bar) + ui_set_search_entry_background( + toolbar_get_widget_child_by_name("SearchEntry"), (result > -1)); } } Modified: trunk/src/search.c =================================================================== --- trunk/src/search.c 2009-02-26 23:11:06 UTC (rev 3604) +++ trunk/src/search.c 2009-02-27 14:05:50 UTC (rev 3605) @@ -101,9 +101,10 @@ { GtkWidget *dialog; GtkWidget *find_entry; + GtkWidget *replace_entry; gboolean all_expanded; } -replace_dlg = {NULL, NULL, FALSE}; +replace_dlg = {NULL, NULL, NULL, FALSE}; static struct { @@ -469,10 +470,11 @@ { /* only set selection if the dialog is not already visible */ if (! GTK_WIDGET_VISIBLE(find_dlg.dialog) && sel) - gtk_entry_set_text(GTK_ENTRY(GTK_BIN( - ui_lookup_widget(find_dlg.dialog, "entry"))->child), sel); - gtk_widget_grab_focus(GTK_WIDGET(GTK_BIN(ui_lookup_widget(find_dlg.dialog, "entry"))->child)); + gtk_entry_set_text(GTK_ENTRY(find_dlg.entry), sel); + gtk_widget_grab_focus(find_dlg.entry); gtk_widget_show(find_dlg.dialog); + if (sel != NULL) /* when we have a selection, reset the entry widget's background colour */ + ui_set_search_entry_background(find_dlg.entry, TRUE); /* bring the dialog back in the foreground in case it is already open but the focus is away */ gtk_window_present(GTK_WINDOW(find_dlg.dialog)); } @@ -505,9 +507,13 @@ gtk_dialog_add_action_widget(GTK_DIALOG(replace_dlg.dialog), button, GEANY_RESPONSE_FIND); button = gtk_button_new_with_mnemonic(_("_Replace")); + gtk_button_set_image(GTK_BUTTON(button), + gtk_image_new_from_stock(GTK_STOCK_FIND_AND_REPLACE, GTK_ICON_SIZE_BUTTON)); gtk_dialog_add_action_widget(GTK_DIALOG(replace_dlg.dialog), button, GEANY_RESPONSE_REPLACE); button = gtk_button_new_with_mnemonic(_("Replace & Fi_nd")); + gtk_button_set_image(GTK_BUTTON(button), + gtk_image_new_from_stock(GTK_STOCK_FIND_AND_REPLACE, GTK_ICON_SIZE_BUTTON)); gtk_dialog_add_action_widget(GTK_DIALOG(replace_dlg.dialog), button, GEANY_RESPONSE_REPLACE_AND_FIND); @@ -533,6 +539,7 @@ gtk_entry_set_width_chars(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(entry_replace))), 50); g_object_set_data_full(G_OBJECT(replace_dlg.dialog), "entry_replace", g_object_ref(entry_replace), (GDestroyNotify)g_object_unref); + replace_dlg.replace_entry = GTK_BIN(entry_replace)->child; g_signal_connect(gtk_bin_get_child(GTK_BIN(entry_find)), "key-press-event", G_CALLBACK(on_widget_key_pressed_set_focus), @@ -629,6 +636,8 @@ /* only set selection if the dialog is not already visible */ if (! GTK_WIDGET_VISIBLE(replace_dlg.dialog) && sel) gtk_entry_set_text(GTK_ENTRY(replace_dlg.find_entry), sel); + if (sel != NULL) /* when we have a selection, reset the entry widget's background colour */ + ui_set_search_entry_background(replace_dlg.find_entry, TRUE); gtk_widget_grab_focus(replace_dlg.find_entry); gtk_widget_show(replace_dlg.dialog); /* bring the dialog back in the foreground in case it is already open but the focus is away */ @@ -1019,7 +1028,7 @@ (search_replace_escape && ! utils_str_replace_escape(search_data.text))) { utils_beep(); - gtk_widget_grab_focus(GTK_WIDGET(GTK_BIN(ui_lookup_widget(find_dlg.dialog, "entry"))->child)); + gtk_widget_grab_focus(find_dlg.entry); return; } @@ -1031,13 +1040,15 @@ { case GEANY_RESPONSE_FIND: case GEANY_RESPONSE_FIND_PREVIOUS: - document_find_text(doc, search_data.text, search_data.flags, + { + gint result = document_find_text(doc, search_data.text, search_data.flags, (response == GEANY_RESPONSE_FIND_PREVIOUS), TRUE, GTK_WIDGET(find_dlg.dialog)); + ui_set_search_entry_background(find_dlg.entry, (result > -1)); check_close = FALSE; if (search_prefs.suppress_dialogs) check_close = TRUE; break; - + } case GEANY_RESPONSE_FIND_IN_FILE: search_find_usage(search_data.text, search_data.flags, FALSE); break; @@ -1077,8 +1088,6 @@ on_replace_dialog_response(GtkDialog *dialog, gint response, gpointer user_data) { GeanyDocument *doc = document_get_current(); - GtkWidget *entry_find = ui_lookup_widget(GTK_WIDGET(replace_dlg.dialog), "entry_find"); - GtkWidget *entry_replace = ui_lookup_widget(GTK_WIDGET(replace_dlg.dialog), "entry_replace"); gint search_flags_re; gboolean search_backwards_re, search_replace_escape_re; gboolean close_window; @@ -1096,8 +1105,8 @@ ui_lookup_widget(GTK_WIDGET(replace_dlg.dialog), "check_back"))); search_replace_escape_re = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON( ui_lookup_widget(GTK_WIDGET(replace_dlg.dialog), "check_escape"))); - find = g_strdup(gtk_entry_get_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(entry_find))))); - replace = g_strdup(gtk_entry_get_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(entry_replace))))); + find = g_strdup(gtk_entry_get_text(GTK_ENTRY(replace_dlg.find_entry))); + replace = g_strdup(gtk_entry_get_text(GTK_ENTRY(replace_dlg.replace_entry))); search_flags_re = get_search_flags(replace_dlg.dialog); @@ -1105,18 +1114,20 @@ && (strcmp(find, replace) == 0)) { utils_beep(); - gtk_widget_grab_focus(GTK_WIDGET(GTK_BIN(ui_lookup_widget(replace_dlg.dialog, "entry_find"))->child)); + gtk_widget_grab_focus(replace_dlg.find_entry); return; } - ui_combo_box_add_to_history(GTK_COMBO_BOX(entry_find), find); - ui_combo_box_add_to_history(GTK_COMBO_BOX(entry_replace), replace); + ui_combo_box_add_to_history(GTK_COMBO_BOX( + gtk_widget_get_parent(replace_dlg.find_entry)), find); + ui_combo_box_add_to_history(GTK_COMBO_BOX( + gtk_widget_get_parent(replace_dlg.replace_entry)), replace); if (search_replace_escape_re && (! utils_str_replace_escape(find) || ! utils_str_replace_escape(replace))) { utils_beep(); - gtk_widget_grab_focus(GTK_WIDGET(GTK_BIN(ui_lookup_widget(replace_dlg.dialog, "entry_find"))->child)); + gtk_widget_grab_focus(replace_dlg.find_entry); return; } @@ -1139,8 +1150,9 @@ } case GEANY_RESPONSE_FIND: { - document_find_text(doc, find, search_flags_re, search_backwards_re, TRUE, - GTK_WIDGET(dialog)); + gint result = document_find_text(doc, find, search_flags_re, + search_backwards_re, TRUE, GTK_WIDGET(dialog)); + ui_set_search_entry_background(replace_dlg.find_entry, (result > -1)); break; } case GEANY_RESPONSE_REPLACE_IN_FILE: Modified: trunk/src/ui_utils.c =================================================================== --- trunk/src/ui_utils.c 2009-02-26 23:11:06 UTC (rev 3604) +++ trunk/src/ui_utils.c 2009-02-27 14:05:50 UTC (rev 3605) @@ -811,6 +811,25 @@ } +void ui_set_search_entry_background(GtkWidget *widget, gboolean success) +{ + static const GdkColor red = {0, 0xffff, 0x6666, 0x6666}; + static const GdkColor white = {0, 0xffff, 0xffff, 0xffff}; + static gboolean old_value = TRUE; + + g_return_if_fail(widget != NULL); + + /* update only if really needed */ + if (old_value != success) + { + gtk_widget_modify_base(widget, GTK_STATE_NORMAL, success ? NULL : &red); + gtk_widget_modify_text(widget, GTK_STATE_NORMAL, success ? NULL : &white); + + old_value = success; + } +} + + /* Note: remember to unref the pixbuf once an image or window has added a reference. */ GdkPixbuf *ui_new_pixbuf_from_inline(gint img) { Modified: trunk/src/ui_utils.h =================================================================== --- trunk/src/ui_utils.h 2009-02-26 23:11:06 UTC (rev 3604) +++ trunk/src/ui_utils.h 2009-02-27 14:05:50 UTC (rev 3605) @@ -244,6 +244,7 @@ void ui_document_show_hide(GeanyDocument *doc); +void ui_set_search_entry_background(GtkWidget *widget, gboolean success); GdkPixbuf *ui_new_pixbuf_from_inline(gint img); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3604] trunk
by frlan＠users.sourceforge.net 27 Feb '09

27 Feb '09

Revision: 3604 http://geany.svn.sourceforge.net/geany/?rev=3604&view=rev Author: frlan Date: 2009-02-26 23:11:06 +0000 (Thu, 26 Feb 2009) Log Message: ----------- Update of Spanish translation Modified Paths: -------------- trunk/THANKS trunk/po/ChangeLog trunk/po/es.po Modified: trunk/THANKS =================================================================== --- trunk/THANKS 2009-02-26 01:25:38 UTC (rev 3603) +++ trunk/THANKS 2009-02-26 23:11:06 UTC (rev 3604) @@ -76,6 +76,7 @@ Stavros Temertzidis <bullgr(at)gmail(dot)com> - el Jeff Bailes <thepizzaking(at)gmail(dot)com - en_GB Damián Viano <debian(at)damianv(dot)com(dot)ar> - es +Antonio Jiménez González <tonificante(at)hotmail(dot)com> - es Nacho Cabanes <ncabanes(at)gmail(dot)com> - es Harri Koskinen <harri(at)fastmonkey(dot)org> - fi_FI Jean-Philippe Moal <skateinmars(at)skateinmars(dot)net> - fr Modified: trunk/po/ChangeLog =================================================================== --- trunk/po/ChangeLog 2009-02-26 01:25:38 UTC (rev 3603) +++ trunk/po/ChangeLog 2009-02-26 23:11:06 UTC (rev 3604) @@ -1,3 +1,9 @@ +2009-02-27 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> + + * es.po: Update of Spanish translation. Thanks to Antonio Jiménez + González. + + 2009-02-13 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> * de.po: Revisit of German translation. Modified: trunk/po/es.po =================================================================== --- trunk/po/es.po 2009-02-26 01:25:38 UTC (rev 3603) +++ trunk/po/es.po 2009-02-26 23:11:06 UTC (rev 3604) @@ -2,14 +2,15 @@ # Copyright (C) 2006 Damián Viano <des(a)damianv.com.ar> # This file is distributed under the same license as the geany package. # Damián Viano <des(a)damianv.com.ar>, 2006, 2007. +# Antonio Jiménez González <tonificante(a)hotmail.com>, 2009 # msgid "" msgstr "" "Project-Id-Version: geany 0.16\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-02-03 18:10+0100\n" -"PO-Revision-Date: 2006-09-29 00:05+0100\n" -"Last-Translator: Damián Viano <des(a)damianv.com.ar>\n" +"POT-Creation-Date: 2009-02-27 00:10+0100\n" +"PO-Revision-Date: 2009-02-24 10:58+0100\n" +"Last-Translator: Antonio Jiménez González <tonificante(a)hotmail.com>\n" "Language-Team: Spanish <geany-i18n(a)uvena.de>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,7 +20,7 @@ msgid "A fast and lightweight IDE using GTK2" msgstr "Un IDE rápido y liviano basado en GTK2" -#: ../geany.desktop.in.h:2 ../src/interface.c:258 ../src/interface.c:1454 +#: ../geany.desktop.in.h:2 ../src/interface.c:260 ../src/interface.c:1467 msgid "Geany" msgstr "Geany" @@ -70,15 +71,16 @@ msgstr "Traductores Anteriores" #: ../src/about.c:329 -#, fuzzy msgid "Contributors" -msgstr "Constructores de tipos" +msgstr "Colaboradores" #: ../src/about.c:339 #, c-format msgid "" "Some of the many contributors (for a more detailed list, see the file %s):" msgstr "" +"Algunos de los muchos colaboradores (para una lista más detallada, véase el " +"archivo %s):" #: ../src/about.c:365 msgid "Credits" @@ -116,7 +118,7 @@ msgstr "Fallo al ejecutar \"%s\" (el guión de inicio no pudo ser creado)" #: ../src/build.c:276 ../src/build.c:508 ../src/build.c:752 -#: ../src/search.c:1373 +#: ../src/search.c:1380 #, c-format msgid "Process failed (%s)" msgstr "Falló el proceso (%s)" @@ -152,22 +154,22 @@ msgstr "_Compilar" #. build the code -#: ../src/build.c:994 ../src/build.c:2049 ../src/interface.c:956 +#: ../src/build.c:994 ../src/build.c:2056 ../src/interface.c:966 msgid "_Build" msgstr "_Construir" #. build the code with make all -#: ../src/build.c:1006 ../src/build.c:1112 ../src/build.c:2060 +#: ../src/build.c:1006 ../src/build.c:1112 ../src/build.c:2067 msgid "_Make All" msgstr "_Make All" #. build the code with make custom -#: ../src/build.c:1015 ../src/build.c:1121 ../src/build.c:2068 +#: ../src/build.c:1015 ../src/build.c:1121 ../src/build.c:2075 msgid "Make Custom _Target" msgstr "Make Obje_tivo Personalizado" #. build the code with make object -#: ../src/build.c:1024 ../src/build.c:2076 +#: ../src/build.c:1024 ../src/build.c:2083 msgid "Make _Object" msgstr "Make _Object" @@ -177,12 +179,11 @@ msgstr "Siguie_nte Error" #: ../src/build.c:1044 ../src/build.c:1141 -#, fuzzy msgid "_Previous Error" -msgstr "_Anterior" +msgstr "Error _anterior" #. arguments -#: ../src/build.c:1069 ../src/build.c:2088 +#: ../src/build.c:1069 ../src/build.c:2095 msgid "_Set Includes and Arguments" msgstr "_Selecciona Inclusiones y Argumentos" @@ -225,19 +226,19 @@ msgid "DVI creation:" msgstr "Creación de DVI:" -#: ../src/build.c:1290 +#: ../src/build.c:1291 msgid "PDF creation:" msgstr "Creación de PDF:" -#: ../src/build.c:1309 +#: ../src/build.c:1311 msgid "DVI preview:" msgstr "Previsualización de DVI" -#: ../src/build.c:1328 +#: ../src/build.c:1331 msgid "PDF preview:" msgstr "Previsualización de PDF" -#: ../src/build.c:1344 ../src/build.c:1517 +#: ../src/build.c:1348 ../src/build.c:1524 #, c-format msgid "" "%f will be replaced by the current filename, e.g. test_file.c\n" @@ -247,77 +248,73 @@ "%e será reemplazado por el nombre del archivo actual sin extencion, ej. " "prueba" -#: ../src/build.c:1423 +#: ../src/build.c:1427 msgid "Set Includes and Arguments" msgstr "Selecciona Inclusiones y Argumentos" -#: ../src/build.c:1430 +#: ../src/build.c:1434 msgid "Set the commands for building and running programs." msgstr "Configure los comandos para construir y ejecutar programas." #. in-dialog heading for the "Set Includes and Arguments" dialog -#: ../src/build.c:1438 +#: ../src/build.c:1442 #, c-format msgid "%s commands" msgstr "comandos de %s" -#: ../src/build.c:1453 +#: ../src/build.c:1457 msgid "Compile:" msgstr "Compilar:" -#: ../src/build.c:1474 +#: ../src/build.c:1479 msgid "Build:" msgstr "Construir:" -#: ../src/build.c:1495 ../src/dialogs.c:1222 +#: ../src/build.c:1501 ../src/dialogs.c:1224 msgid "Execute:" msgstr "Ejecución:" -#: ../src/build.c:1820 ../src/toolbar.c:194 -#, fuzzy +#: ../src/build.c:1827 ../src/toolbar.c:194 msgid "Build the current file" msgstr "Compilar el archivo actual" -#: ../src/build.c:1845 +#: ../src/build.c:1852 msgid "Make Custom Target" msgstr "Make Objetivo Personalizado" -#: ../src/build.c:1846 +#: ../src/build.c:1853 msgid "" "Enter custom options here, all entered text is passed to the make command." msgstr "" "Ingresar opciones personalizadas aquí, todo el texto ingresado es pasado a " "la herramienta make" -#: ../src/build.c:1895 -#, fuzzy +#: ../src/build.c:1902 msgid "Build the current file with Make and the default target" msgstr "" "Construye el archivo actual con la herramienta make y el objetivo " "predeterminado" -#: ../src/build.c:1898 -#, fuzzy +#: ../src/build.c:1905 msgid "Build the current file with Make and the specified target" msgstr "" "Construye el archivo actual con la herramienta make y el objetivo " "especificado" -#: ../src/build.c:1901 -#, fuzzy +#: ../src/build.c:1908 msgid "Compile the current file with Make" -msgstr "Compilar el archivo actual" +msgstr "Compilar el archivo actual con Make" -#: ../src/build.c:1963 +#: ../src/build.c:1970 msgid "Failed to execute the view program" msgstr "Fallo al ejecutar el programa visualizador" -#: ../src/build.c:2001 +#: ../src/build.c:2008 #, c-format msgid "Process could not be stopped (%s)." msgstr "El proceso no pudo ser detenido (%s)." -#: ../src/build.c:2020 ../src/build.c:2034 +#: ../src/build.c:2027 ../src/build.c:2041 msgid "No more build errors." msgstr "No hay más errores de construción." @@ -325,8 +322,8 @@ msgid "Do you really want to quit?" msgstr "¿Realmente desea salir?" -#: ../src/callbacks.c:459 ../src/document.c:2816 ../src/interface.c:332 -#: ../src/treeviews.c:516 +#: ../src/callbacks.c:459 ../src/document.c:2824 ../src/interface.c:334 +#: ../src/treeviews.c:517 msgid "_Reload" msgstr "_Recargar" @@ -339,7 +336,7 @@ msgid "Are you sure you want to reload '%s'?" msgstr "¿Está seguro que quiere recargar '%s'?" -#: ../src/callbacks.c:1212 ../src/keybindings.c:362 +#: ../src/callbacks.c:1212 ../src/keybindings.c:366 msgid "Go to Line" msgstr "Ir a la Línea" @@ -406,11 +403,11 @@ msgstr "No hay más items de mensajes." #. initialize the dialog -#: ../src/dialogs.c:177 ../src/prefs.c:1528 +#: ../src/dialogs.c:177 ../src/prefs.c:1547 msgid "Open File" msgstr "Abrir archivo" -#: ../src/dialogs.c:181 ../src/interface.c:675 +#: ../src/dialogs.c:181 ../src/interface.c:685 msgid "_View" msgstr "_Ver" @@ -422,24 +419,24 @@ "Abre el archivo en modo sólo lectura. Si elige más de un archivo todos serán " "abiertos como sólo lectura." -#: ../src/dialogs.c:222 +#: ../src/dialogs.c:221 msgid "Detect by file extension" msgstr "Detectar por extensión de archivo " -#: ../src/dialogs.c:233 ../src/interface.c:3442 ../src/interface.c:4983 +#: ../src/dialogs.c:232 ../src/interface.c:3466 ../src/interface.c:5007 msgid "Detect from file" msgstr "Detectar desde archivo" #. line 1 with checkbox and encoding combo -#: ../src/dialogs.c:296 +#: ../src/dialogs.c:295 msgid "Show _hidden files" msgstr "Mostrar archivos _ocultos" -#: ../src/dialogs.c:307 +#: ../src/dialogs.c:306 msgid "Set encoding:" msgstr "Elegir _codificación:" -#: ../src/dialogs.c:317 +#: ../src/dialogs.c:316 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 " @@ -478,41 +475,39 @@ msgstr "R_enombrar" #: ../src/dialogs.c:468 -#, fuzzy msgid "Save the file and rename it" -msgstr "Graba el archivo y lo renombra." +msgstr "Guardar el archivo y renombrarlo" #: ../src/dialogs.c:476 msgid "_Open file in a new tab" msgstr "_Abrir el archivo en una nueva pestaña" #: ../src/dialogs.c:478 -#, fuzzy msgid "" "Keep the current unsaved document open and open the newly saved file in a " "new tab" msgstr "" -"Mantener el documento actual (no grabado) abierto y abrir el archivo nuevo " -"grabado en una nueva pestaña." +"Mantener el documento actual (no guardado) abierto y abrir el archivo nuevo " +"guardado en una nueva pestaña." -#: ../src/dialogs.c:658 +#: ../src/dialogs.c:657 msgid "_Don't save" msgstr "_No grabar" -#: ../src/dialogs.c:692 +#: ../src/dialogs.c:691 #, c-format msgid "The file '%s' is not saved." msgstr "El archivo '%s' no fue guardado." -#: ../src/dialogs.c:694 +#: ../src/dialogs.c:693 msgid "Do you want to save it before closing?" msgstr "¿Quiere guardarlo antes de cerrar?" -#: ../src/dialogs.c:769 +#: ../src/dialogs.c:768 msgid "Choose font" msgstr "Elegir fuente" -#: ../src/dialogs.c:1006 +#: ../src/dialogs.c:1008 msgid "" "An error occurred or file information could not be retrieved (e.g. from a " "new file)." @@ -520,87 +515,87 @@ "Ocurrió un error o no se pudo obtener información de un archivo (ej. de un " "archivo nuevo)." -#: ../src/dialogs.c:1025 ../src/dialogs.c:1026 ../src/dialogs.c:1027 -#: ../src/dialogs.c:1033 ../src/dialogs.c:1034 ../src/dialogs.c:1035 -#: ../src/symbols.c:1618 ../src/symbols.c:1639 ../src/symbols.c:1691 +#: ../src/dialogs.c:1027 ../src/dialogs.c:1028 ../src/dialogs.c:1029 +#: ../src/dialogs.c:1035 ../src/dialogs.c:1036 ../src/dialogs.c:1037 +#: ../src/symbols.c:1627 ../src/symbols.c:1648 ../src/symbols.c:1700 #: ../src/ui_utils.c:203 msgid "unknown" msgstr "desconocido" -#: ../src/dialogs.c:1039 +#: ../src/dialogs.c:1041 msgid "Properties" msgstr "Propiedades" -#: ../src/dialogs.c:1069 +#: ../src/dialogs.c:1071 msgid "Type:" msgstr "Tipo:" -#: ../src/dialogs.c:1083 +#: ../src/dialogs.c:1085 msgid "Size:" msgstr "Tamaño:" -#: ../src/dialogs.c:1099 +#: ../src/dialogs.c:1101 msgid "Location:" msgstr "Ubicación:" -#: ../src/dialogs.c:1113 +#: ../src/dialogs.c:1115 msgid "Read-only:" msgstr "Sólo Lectura:" -#: ../src/dialogs.c:1120 +#: ../src/dialogs.c:1122 msgid "(only inside Geany)" msgstr "(sólo dentro de Geany)" -#: ../src/dialogs.c:1129 +#: ../src/dialogs.c:1131 msgid "Encoding:" msgstr "Codificación" #. BOM = byte order mark -#: ../src/dialogs.c:1139 ../src/ui_utils.c:206 +#: ../src/dialogs.c:1141 ../src/ui_utils.c:206 msgid "(with BOM)" msgstr "(con BOM)" -#: ../src/dialogs.c:1139 +#: ../src/dialogs.c:1141 msgid "(without BOM)" msgstr "(sin BOM)" -#: ../src/dialogs.c:1150 +#: ../src/dialogs.c:1152 msgid "Modified:" msgstr "Modificado:" -#: ../src/dialogs.c:1164 +#: ../src/dialogs.c:1166 msgid "Changed:" msgstr "Cambiado:" -#: ../src/dialogs.c:1178 +#: ../src/dialogs.c:1180 msgid "Accessed:" msgstr "Accedido:" -#: ../src/dialogs.c:1200 +#: ../src/dialogs.c:1202 msgid "Permissions:" msgstr "Permisos" #. Header -#: ../src/dialogs.c:1208 +#: ../src/dialogs.c:1210 msgid "Read:" msgstr "Lectura:" -#: ../src/dialogs.c:1215 +#: ../src/dialogs.c:1217 msgid "Write:" msgstr "Escritura:" #. Owner -#: ../src/dialogs.c:1230 +#: ../src/dialogs.c:1232 msgid "Owner:" msgstr "Dueño:" #. Group -#: ../src/dialogs.c:1266 +#: ../src/dialogs.c:1268 msgid "Group:" msgstr "Grupo:" #. Other -#: ../src/dialogs.c:1302 +#: ../src/dialogs.c:1304 msgid "Other:" msgstr "Otros:" @@ -614,7 +609,7 @@ msgid "New file \"%s\" opened." msgstr "Nuevo archivo \"%s\" abierto." -#: ../src/document.c:935 ../src/document.c:1435 +#: ../src/document.c:935 ../src/document.c:1436 #, c-format msgid "Could not open file %s (%s)" msgstr "No se pudo abrir el archivo %s (%s)" @@ -647,45 +642,44 @@ msgstr "" "El archivo \"%s\" no aparenta ser de texto o la codificación no es soportada" -#: ../src/document.c:1137 +#: ../src/document.c:1138 msgid "Spaces" msgstr "Espacios" -#: ../src/document.c:1140 +#: ../src/document.c:1141 msgid "Tabs" msgstr "Tabulaciones" -#: ../src/document.c:1143 -#, fuzzy +#: ../src/document.c:1144 msgid "Tabs and Spaces" -msgstr "_Reemplazar Tabulaciones por Espacios" +msgstr "Tabulados y Espacios" #. For translators: first wildcard is the indentation mode (Spaces, Tabs, Tabs #. * and Spaces), the second one is the filename -#: ../src/document.c:1148 -#, fuzzy, c-format +#: ../src/document.c:1149 +#, c-format msgid "Setting %s indentation mode for %s." -msgstr "Usando %s modo de formateo" +msgstr "Estableciendo modo de indentado %s para %s." -#: ../src/document.c:1200 +#: ../src/document.c:1201 msgid "Invalid filename" msgstr "Nombre de archivo invalido" -#: ../src/document.c:1319 +#: ../src/document.c:1320 #, c-format msgid "File %s reloaded." msgstr "Archivo %s recargado." -#: ../src/document.c:1321 +#: ../src/document.c:1322 #, c-format msgid "File %s opened(%d%s)." msgstr "Archivo %s abierto(%d%s)" -#: ../src/document.c:1323 +#: ../src/document.c:1324 msgid ", read-only" msgstr ", sólo lectura" -#: ../src/document.c:1597 +#: ../src/document.c:1598 #, c-format msgid "" "An error occurred while converting the file from UTF-8 in \"%s\". The file " @@ -694,7 +688,7 @@ "Ocurrió un error mientras se convertía el archivo desde UTF-8 en \"%s\". El " "archivo no fue guardado.n" -#: ../src/document.c:1619 +#: ../src/document.c:1620 #, c-format msgid "" "Error message: %s\n" @@ -703,52 +697,52 @@ "Mensaje de error: %s\n" "El error ocurrió en \"%s\" (linea: %d, columna: %d)." -#: ../src/document.c:1624 +#: ../src/document.c:1625 #, c-format msgid "Error message: %s." msgstr "Mensaje de error: %s." -#: ../src/document.c:1704 ../src/document.c:1765 +#: ../src/document.c:1705 ../src/document.c:1766 msgid "Error saving file." msgstr "Error guardando archivo." -#: ../src/document.c:1763 +#: ../src/document.c:1764 #, c-format msgid "Error saving file (%s)." msgstr "Error guardando archivo (%s)." -#: ../src/document.c:1790 +#: ../src/document.c:1789 #, c-format msgid "File %s saved." msgstr "Archivo %s guardado." -#: ../src/document.c:1857 ../src/document.c:1912 ../src/document.c:1920 +#: ../src/document.c:1856 ../src/document.c:1911 ../src/document.c:1919 #, c-format msgid "\"%s\" was not found." msgstr "no se encontró \"%s\"." -#: ../src/document.c:1920 +#: ../src/document.c:1919 msgid "Wrap search and find again?" msgstr "Volver al principio y buscar de nuevo?" -#: ../src/document.c:1997 ../src/search.c:1048 ../src/search.c:1644 -#: ../src/search.c:1645 +#: ../src/document.c:1996 ../src/search.c:1054 ../src/search.c:1651 +#: ../src/search.c:1652 #, c-format msgid "No matches found for \"%s\"." msgstr "No se encontraron coincidencias para \"%s\"." -#: ../src/document.c:2008 ../src/document.c:2017 +#: ../src/document.c:2007 ../src/document.c:2016 #, fuzzy, c-format msgid "%s: replaced %d occurrence of \"%s\" with \"%s\"." msgid_plural "%s: replaced %d occurrences of \"%s\" with \"%s\"." msgstr[0] "%s: se reemplazaron %d ocurrencia(s) de \"%s\" con \"%s\"." msgstr[1] "%s: se reemplazaron %d ocurrencia(s) de \"%s\" con \"%s\"." -#: ../src/document.c:2817 +#: ../src/document.c:2825 msgid "Do you want to reload it?" msgstr "¿Quiere recargarlo?" -#: ../src/document.c:2818 +#: ../src/document.c:2826 #, c-format msgid "" "The file '%s' on the disk is more recent than\n" @@ -757,35 +751,37 @@ "El archivo '%s' del disco es más reciente\n" "que la vista actual." -#: ../src/document.c:2839 +#: ../src/document.c:2847 msgid "Try to resave the file?" -msgstr "" +msgstr "¿Intentar volver a salvar el archivo?" -#: ../src/document.c:2840 -#, fuzzy, c-format +#: ../src/document.c:2848 +#, c-format msgid "File \"%s\" was not found on disk!" -msgstr "no se encontró \"%s\"." +msgstr "No se encontró el archivo \"%s\"!" -#: ../src/editor.c:3816 ../src/utils.c:295 +#: ../src/editor.c:3847 ../src/utils.c:295 msgid "Win (CRLF)" msgstr "Win (CRLF)" -#: ../src/editor.c:3817 ../src/utils.c:296 +#: ../src/editor.c:3848 ../src/utils.c:296 msgid "Mac (CR)" msgstr "Mac (CR)" -#: ../src/editor.c:3818 ../src/utils.c:297 +#: ../src/editor.c:3849 ../src/utils.c:297 msgid "Unix (LF)" msgstr "Unix (LF)" -#: ../src/editor.c:3944 +#: ../src/editor.c:3975 #, fuzzy msgid "Enter Tab Width" msgstr "Ancho de Tabulación:" -#: ../src/editor.c:3945 +#: ../src/editor.c:3976 msgid "Enter the amount of spaces which should be replaced by a tab character." msgstr "" +"Introduzca la cantidad de espacios que debería ser reemplazada por una " +"tabulación" #: ../src/encodings.c:75 msgid "Celtic" @@ -896,27 +892,27 @@ msgid "Without encoding" msgstr "Sin _codificación" -#: ../src/encodings.c:351 +#: ../src/encodings.c:348 msgid "_West European" msgstr "Europeo del _Oeste" -#: ../src/encodings.c:357 +#: ../src/encodings.c:354 msgid "_East European" msgstr "Europeo del _Este" -#: ../src/encodings.c:363 +#: ../src/encodings.c:360 msgid "East _Asian" msgstr "Este _Asiático" -#: ../src/encodings.c:369 +#: ../src/encodings.c:366 msgid "_SE & SW Asian" msgstr "_SE & SO Asiático" -#: ../src/encodings.c:375 +#: ../src/encodings.c:372 msgid "_Middle Eastern" msgstr "_Cercano Oriente" -#: ../src/encodings.c:381 +#: ../src/encodings.c:378 msgid "_Unicode" msgstr "_Unicode" @@ -977,7 +973,7 @@ msgid "reStructuredText file" msgstr "Archivo de reStructuredText" -#: ../src/filetypes.c:557 ../src/project.c:281 +#: ../src/filetypes.c:557 ../src/project.c:284 msgid "All files" msgstr "Todos los archivos" @@ -997,7 +993,7 @@ msgid "M_iscellaneous Languages" msgstr "Lenguajes M_isceláneos" -#: ../src/filetypes.c:686 ../src/interface.c:3361 ../src/interface.c:4902 +#: ../src/filetypes.c:686 ../src/interface.c:3385 ../src/interface.c:4926 #: ../src/templates.c:376 ../src/ui_utils.c:156 msgid "None" msgstr "Ninguno" @@ -1009,467 +1005,471 @@ #: ../src/filetypes.c:1354 #, c-format msgid "Bad regex for filetype %s: %s" -msgstr "" +msgstr "Expresión regular incorrecta para el tipo de archivo %s: %s" #: ../src/geany.h:50 msgid "untitled" msgstr "sin título" -#: ../src/interface.c:268 +#: ../src/interface.c:270 msgid "_File" msgstr "_Archivo" -#: ../src/interface.c:279 +#: ../src/interface.c:281 msgid "New (with _Template)" msgstr "Nuevo (desde _Plantilla)" -#: ../src/interface.c:290 ../src/interface.c:351 ../src/interface.c:525 -#: ../src/interface.c:579 ../src/interface.c:593 ../src/interface.c:835 -#: ../src/interface.c:845 ../src/interface.c:1963 ../src/interface.c:2017 -#: ../src/interface.c:2031 +#: ../src/interface.c:292 ../src/interface.c:353 ../src/interface.c:531 +#: ../src/interface.c:585 ../src/interface.c:599 ../src/interface.c:845 +#: ../src/interface.c:855 ../src/interface.c:1983 ../src/interface.c:2037 +#: ../src/interface.c:2051 msgid "invisible" msgstr "invisible" -#: ../src/interface.c:292 +#: ../src/interface.c:294 msgid "dummy tooltip, don't translate this." msgstr "" -#: ../src/interface.c:303 ../src/interface.c:1889 +#: ../src/interface.c:305 ../src/interface.c:1905 msgid "Open Selected F_ile" msgstr "Abrir Archivo Selecc_ionado" -#: ../src/interface.c:307 +#: ../src/interface.c:309 msgid "Recent _Files" msgstr "_Archivos Recientes" -#: ../src/interface.c:324 +#: ../src/interface.c:326 msgid "Save A_ll" msgstr "Guardar _Todo" -#: ../src/interface.c:340 +#: ../src/interface.c:342 msgid "R_eload As" msgstr "R_ecargar Como" -#: ../src/interface.c:368 +#: ../src/interface.c:370 msgid "Page Set_up" msgstr "_Configuración de Página" -#: ../src/interface.c:385 -#, fuzzy +#: ../src/interface.c:387 msgid "Close Ot_her Documents" -msgstr "Cerrar el archivo actual" +msgstr "Cerrar los o_tros documentos" -#: ../src/interface.c:393 +#: ../src/interface.c:395 msgid "C_lose All" msgstr "C_errar Todo" -#: ../src/interface.c:410 +#: ../src/interface.c:412 msgid "_Edit" msgstr "_Editar" -#: ../src/interface.c:451 ../src/interface.c:1880 +#: ../src/interface.c:453 ../src/interface.c:1896 msgid "Select _All" -msgstr "Seleccionar _todas" +msgstr "Seleccionar _todo" -#: ../src/interface.c:460 ../src/interface.c:1898 +#: ../src/interface.c:462 ../src/interface.c:1914 msgid "_Format" msgstr "_Formato" -#: ../src/interface.c:467 ../src/interface.c:1905 +#: ../src/interface.c:469 ../src/interface.c:1921 msgid "T_oggle Case of Selection" msgstr "C_onvertir mayúsculas/minúsculas de la Selección" -#: ../src/interface.c:476 ../src/interface.c:1914 +#: ../src/interface.c:478 ../src/interface.c:1930 msgid "_Comment Line(s)" msgstr "_Comentar Línea(s)" -#: ../src/interface.c:480 ../src/interface.c:1918 +#: ../src/interface.c:482 ../src/interface.c:1934 msgid "U_ncomment Line(s)" msgstr "_Descomentar Línea(s)" -#: ../src/interface.c:484 ../src/interface.c:1922 +#: ../src/interface.c:486 ../src/interface.c:1938 msgid "_Toggle Line Commentation" msgstr "Comen_tar/Descomentar" -#: ../src/interface.c:488 ../src/interface.c:1926 +#: ../src/interface.c:490 ../src/interface.c:1942 msgid "Du_plicate Line or Selection" msgstr "Du_plicar Línea o Selección" -#: ../src/interface.c:497 ../src/interface.c:1935 +#: ../src/interface.c:499 ../src/interface.c:1951 msgid "_Increase Indent" msgstr "_Incrementar sangría" -#: ../src/interface.c:505 ../src/interface.c:1943 +#: ../src/interface.c:507 ../src/interface.c:1959 msgid "_Decrease Indent" msgstr "_Decrementar sangría" -#: ../src/interface.c:518 ../src/interface.c:1956 +#: ../src/interface.c:520 ../src/interface.c:1972 +#, fuzzy +msgid "_Send Selection to Terminal" +msgstr "Mandar _Selección a" + +#: ../src/interface.c:524 ../src/interface.c:1976 msgid "_Send Selection to" msgstr "Mandar _Selección a" -#: ../src/interface.c:533 ../src/interface.c:1971 +#: ../src/interface.c:539 ../src/interface.c:1991 msgid "I_nsert Comments" msgstr "I_nsertar Comentarios" -#: ../src/interface.c:544 ../src/interface.c:1982 +#: ../src/interface.c:550 ../src/interface.c:2002 msgid "Insert _ChangeLog Entry" msgstr "Insertar Entrada de _ChangeLog" -#: ../src/interface.c:548 ../src/interface.c:1986 +#: ../src/interface.c:554 ../src/interface.c:2006 msgid "Insert File _Header" msgstr "Insertar _Encabezado de Archivo" -#: ../src/interface.c:552 ../src/interface.c:1990 +#: ../src/interface.c:558 ../src/interface.c:2010 msgid "Insert _Function Description" msgstr "Insertar Descripción de _Función" -#: ../src/interface.c:556 ../src/interface.c:1994 +#: ../src/interface.c:562 ../src/interface.c:2014 msgid "Insert _Multiline Comment" msgstr "Insertar Comentario _Multilínea" -#: ../src/interface.c:560 ../src/interface.c:1998 +#: ../src/interface.c:566 ../src/interface.c:2018 msgid "Insert _GPL Notice" msgstr "Insertar aviso de licencia _GPL" -#: ../src/interface.c:564 ../src/interface.c:2002 +#: ../src/interface.c:570 ../src/interface.c:2022 msgid "Insert _BSD License Notice" msgstr "Insertar aviso de licencia _BSD" -#: ../src/interface.c:568 ../src/interface.c:2006 +#: ../src/interface.c:574 ../src/interface.c:2026 msgid "Insert Dat_e" msgstr "Insertar F_echa" -#: ../src/interface.c:582 ../src/interface.c:2020 +#: ../src/interface.c:588 ../src/interface.c:2040 msgid "_Insert \"include <...>\"" msgstr "_Insertar \"include <...>\"" -#: ../src/interface.c:605 +#: ../src/interface.c:607 +#, fuzzy +msgid "Preference_s" +msgstr "Preferencias" + +#: ../src/interface.c:615 msgid "_Search" msgstr "_Buscar" -#: ../src/interface.c:616 +#: ../src/interface.c:626 msgid "Find _Next" -msgstr "Buscar _Sigiuente" +msgstr "Buscar _Siguiente" -#: ../src/interface.c:620 +#: ../src/interface.c:630 msgid "Find _Previous" msgstr "Buscar _Anterior" -#: ../src/interface.c:624 +#: ../src/interface.c:634 msgid "Find in F_iles" msgstr "Buscar en Arch_ivos" -#: ../src/interface.c:628 ../src/search.c:506 +#: ../src/interface.c:638 ../src/search.c:507 msgid "_Replace" msgstr "_Reemplazar" -#: ../src/interface.c:641 +#: ../src/interface.c:651 msgid "Find _Selected" msgstr "Buscar _Selección" -#: ../src/interface.c:645 +#: ../src/interface.c:655 #, fuzzy msgid "Find Pre_vious Selected" msgstr "Buscar Selección Pre_v" -#: ../src/interface.c:654 +#: ../src/interface.c:664 msgid "Next _Message" msgstr "Próximo _Mensaje" -#: ../src/interface.c:658 -#, fuzzy +#: ../src/interface.c:668 msgid "Pr_evious Message" -msgstr "Mensaje Siguiente" +msgstr "Mensaje Anterior" -#: ../src/interface.c:667 ../src/interface.c:2072 +#: ../src/interface.c:677 ../src/interface.c:2092 msgid "_Go to Line" msgstr "_Ir a la Línea" -#: ../src/interface.c:682 +#: ../src/interface.c:692 msgid "Change _Font" msgstr "Cambiar _Fuente" -#: ../src/interface.c:695 +#: ../src/interface.c:705 msgid "To_ggle All Additional Widgets" msgstr "M_ostrar/Esconder todos los paneles adicionales" -#: ../src/interface.c:699 +#: ../src/interface.c:709 msgid "Full_screen" msgstr "Pantalla _completa" -#: ../src/interface.c:703 +#: ../src/interface.c:713 msgid "Show Message _Window" msgstr "Mostrar _Ventana de Mensajes" -#: ../src/interface.c:708 +#: ../src/interface.c:718 msgid "Show _Toolbar" msgstr "Mostrar Barra de _Herramientas" -#: ../src/interface.c:713 +#: ../src/interface.c:723 msgid "Show Side_bar" msgstr "Mostrar _Barra lateral" -#: ../src/interface.c:718 ../src/interface.c:3769 ../src/keybindings.c:224 +#: ../src/interface.c:728 ../src/interface.c:3793 ../src/keybindings.c:226 msgid "Editor" msgstr "Editor" -#: ../src/interface.c:725 +#: ../src/interface.c:735 msgid "Show _Markers Margin" msgstr "Muestra las _Marcas de Margenes" -#: ../src/interface.c:730 +#: ../src/interface.c:740 msgid "Show _Line Numbers" msgstr "Mostrar Números de _Línea" -#: ../src/interface.c:735 -#, fuzzy +#: ../src/interface.c:745 msgid "Show _White Space" -msgstr "Mostrar espacios en blanco" +msgstr "Mostrar espacios en _blanco" -#: ../src/interface.c:739 -#, fuzzy +#: ../src/interface.c:749 msgid "Show Line _Endings" -msgstr "Mostrar terminaciones de línea" +msgstr "Mostrar _terminaciones de línea" -#: ../src/interface.c:743 +#: ../src/interface.c:753 #, fuzzy msgid "Show _Indentation Guides" msgstr "Mostrar guías de formateo automático de código" -#: ../src/interface.c:764 +#: ../src/interface.c:774 msgid "_Document" msgstr "_Documento" -#: ../src/interface.c:771 +#: ../src/interface.c:781 msgid "_Line Wrapping" msgstr "_Cortado de Líneas" -#: ../src/interface.c:776 -#, fuzzy +#: ../src/interface.c:786 msgid "Line _Breaking" -msgstr "Cortado de líneas" +msgstr "Salto de línea" -#: ../src/interface.c:780 +#: ../src/interface.c:790 msgid "_Auto-indentation" msgstr "Formateo de Código _Automático" -#: ../src/interface.c:785 +#: ../src/interface.c:795 msgid "In_dent Type" msgstr "Tipo _de formateo" -#: ../src/interface.c:792 ../src/interface.c:3400 ../src/interface.c:4941 +#: ../src/interface.c:802 ../src/interface.c:3424 ../src/interface.c:4965 msgid "_Tabs" msgstr "_Tabulaciones" -#: ../src/interface.c:798 ../src/interface.c:3391 ../src/interface.c:4932 +#: ../src/interface.c:808 ../src/interface.c:3415 ../src/interface.c:4956 msgid "_Spaces" msgstr "E_spacios" -#: ../src/interface.c:804 ../src/interface.c:3409 ../src/interface.c:4950 +#: ../src/interface.c:814 ../src/interface.c:3433 ../src/interface.c:4974 #, fuzzy msgid "T_abs and Spaces" msgstr "_Reemplazar Tabulaciones por Espacios" -#: ../src/interface.c:815 +#: ../src/interface.c:825 msgid "Read _Only" msgstr "S_olo Lectura" -#: ../src/interface.c:819 +#: ../src/interface.c:829 msgid "_Write Unicode BOM" msgstr "_Escribir el BOM Unicode" -#: ../src/interface.c:828 +#: ../src/interface.c:838 msgid "Set File_type" msgstr "Elegir _Tipo de Archivo" -#: ../src/interface.c:838 +#: ../src/interface.c:848 msgid "Set _Encoding" msgstr "Elegir _Codificación" -#: ../src/interface.c:848 +#: ../src/interface.c:858 msgid "Set Line E_ndings" msgstr "Elegir Termi_naciones de Línea" -#: ../src/interface.c:855 +#: ../src/interface.c:865 msgid "Convert and Set to _CR/LF (Win)" msgstr "Convertir a, y Elegir _CR/LF (Win)" -#: ../src/interface.c:861 +#: ../src/interface.c:871 msgid "Convert and Set to _LF (Unix)" msgstr "Convertir a, y Elegir _LF (Unix)" -#: ../src/interface.c:867 +#: ../src/interface.c:877 msgid "Convert and Set to CR (_Mac)" msgstr "Convertir a, y Elegir CR (_Mac)" -#: ../src/interface.c:878 +#: ../src/interface.c:888 msgid "_Strip Trailing Spaces" msgstr "_Borrar espacios al final" -#: ../src/interface.c:882 +#: ../src/interface.c:892 msgid "_Replace Tabs by Spaces" msgstr "_Reemplazar Tabulaciones por Espacios" -#: ../src/interface.c:886 +#: ../src/interface.c:896 #, fuzzy msgid "Replace Spaces b_y Tabs" msgstr "_Reemplazar Tabulaciones por Espacios" -#: ../src/interface.c:895 +#: ../src/interface.c:905 msgid "_Fold All" msgstr "_Plegar Todo" -#: ../src/interface.c:899 +#: ../src/interface.c:909 msgid "_Unfold All" msgstr "_Desplegar Todo" -#: ../src/interface.c:908 +#: ../src/interface.c:918 msgid "Remove _Markers" msgstr "Borrar _Marcas" -#: ../src/interface.c:912 +#: ../src/interface.c:922 msgid "Remove Error _Indicators" msgstr "Borrar los _Indicadores de Errores" -#: ../src/interface.c:916 +#: ../src/interface.c:926 msgid "_Project" msgstr "_Proyecto" -#: ../src/interface.c:923 +#: ../src/interface.c:933 msgid "_New" msgstr "_Nuevo" -#: ../src/interface.c:931 +#: ../src/interface.c:941 msgid "_Open" msgstr "_Abrir" -#: ../src/interface.c:939 +#: ../src/interface.c:949 msgid "_Close" msgstr "_Cerrar" -#: ../src/interface.c:960 +#: ../src/interface.c:970 msgid "_Tools" msgstr "_Herramientas" -#: ../src/interface.c:967 +#: ../src/interface.c:977 msgid "_Color Chooser" msgstr "Selector de _Color" -#: ../src/interface.c:975 +#: ../src/interface.c:985 msgid "_Word Count" msgstr "C_ontar Palabras" -#: ../src/interface.c:979 +#: ../src/interface.c:989 msgid "Load Ta_gs" msgstr "Cargar Ta_gs" -#: ../src/interface.c:983 +#: ../src/interface.c:993 msgid "_Reload Configuration" -msgstr "" +msgstr "_Recargar Configuración" -#: ../src/interface.c:991 ../src/interface.c:998 +#: ../src/interface.c:1001 ../src/interface.c:1008 msgid "_Help" msgstr "A_yuda" -#: ../src/interface.c:1006 +#: ../src/interface.c:1016 msgid "_Website" msgstr "Sitio _Web" -#: ../src/interface.c:1010 +#: ../src/interface.c:1020 msgid "_Keyboard Shortcuts" msgstr "_Atajos de Teclado" -#: ../src/interface.c:1014 -#, fuzzy +#: ../src/interface.c:1024 msgid "_Debug Messages" -msgstr "Mensajes" +msgstr "Mensajes de depuración" -#: ../src/interface.c:1053 ../src/treeviews.c:112 +#: ../src/interface.c:1063 ../src/treeviews.c:112 msgid "Symbols" msgstr "Símbolos" -#: ../src/interface.c:1067 ../src/treeviews.c:240 +#: ../src/interface.c:1077 ../src/treeviews.c:240 msgid "Documents" msgstr "Documentos" -#: ../src/interface.c:1104 +#: ../src/interface.c:1114 msgid "Status" msgstr "Estado" -#: ../src/interface.c:1118 +#: ../src/interface.c:1128 msgid "Compiler" msgstr "Compilador" -#: ../src/interface.c:1133 +#: ../src/interface.c:1143 msgid "Messages" msgstr "Mensajes" -#: ../src/interface.c:1146 +#: ../src/interface.c:1156 msgid "Scribble" msgstr "Borrador" -#: ../src/interface.c:1698 ../src/interface.c:3178 +#: ../src/interface.c:1713 ../src/interface.c:3202 msgid "Images _and Text" -msgstr "Imagenes _y texto" +msgstr "Imágenes _y texto" -#: ../src/interface.c:1704 ../src/interface.c:3210 +#: ../src/interface.c:1719 ../src/interface.c:3234 msgid "_Images Only" -msgstr "Sólo _imagenes" +msgstr "Sólo _imágenes" -#: ../src/interface.c:1710 ../src/interface.c:3202 +#: ../src/interface.c:1725 ../src/interface.c:3226 msgid "_Text Only" msgstr "Sólo _texto" -#: ../src/interface.c:1721 ../src/interface.c:3194 +#: ../src/interface.c:1736 ../src/interface.c:3218 msgid "_Large Icons" msgstr "Iconos _grandes" -#: ../src/interface.c:1726 ../src/interface.c:3186 +#: ../src/interface.c:1741 ../src/interface.c:3210 msgid "_Small Icons" msgstr "Iconos _pequeños" -#: ../src/interface.c:1736 +#: ../src/interface.c:1751 msgid "_Hide toolbar" msgstr "_Ocultar barra de herramientas" -#: ../src/interface.c:2039 +#: ../src/interface.c:2059 msgid "Find _Usage" msgstr "Encontrar _Uso" -#: ../src/interface.c:2047 +#: ../src/interface.c:2067 #, fuzzy msgid "Find _Document Usage" msgstr "Encontrar _Uso" -#: ../src/interface.c:2055 +#: ../src/interface.c:2075 msgid "Go to _Tag Definition" msgstr "Ir a la Definición del _Tag" -#: ../src/interface.c:2059 +#: ../src/interface.c:2079 msgid "Go to T_ag Declaration" msgstr "Ir a la Declaración del T_ag" -#: ../src/interface.c:2063 +#: ../src/interface.c:2083 msgid "Conte_xt Action" msgstr "Acción Conte_xtual" -#: ../src/interface.c:2593 ../src/keybindings.c:325 +#: ../src/interface.c:2617 ../src/keybindings.c:329 msgid "Preferences" msgstr "Preferencias" -#: ../src/interface.c:2629 +#: ../src/interface.c:2653 msgid "Load files from the last session" msgstr "Cargar archivos de la última sesión" -#: ../src/interface.c:2632 +#: ../src/interface.c:2656 msgid "Opens at startup the files from the last session" msgstr "Abre en el inicio los archivos de la última sesion" -#: ../src/interface.c:2634 +#: ../src/interface.c:2658 msgid "Load virtual terminal support" msgstr "Cargar emulación de terminal virtual" -#: ../src/interface.c:2636 +#: ../src/interface.c:2660 #, fuzzy msgid "" "Whether the virtual terminal emulation (VTE) should be loaded at startup, " @@ -1478,41 +1478,41 @@ "Si cargar o no al inicio la emulación de terminal virtual(VTE). Desactivar " "si no se necesita." -#: ../src/interface.c:2638 +#: ../src/interface.c:2662 msgid "Enable plugin support" msgstr "Activar soporte de complementos" -#: ../src/interface.c:2642 +#: ../src/interface.c:2666 msgid "Startup" msgstr "Inicio" -#: ../src/interface.c:2661 +#: ../src/interface.c:2685 msgid "Save window position and geometry" msgstr "Guardar la posición de la ventana y su geometría" -#: ../src/interface.c:2664 +#: ../src/interface.c:2688 msgid "Saves the window position and geometry and restores it at the start" msgstr "" "Guarda la posición de la ventana y su geometría y las restablece al inicio" -#: ../src/interface.c:2666 +#: ../src/interface.c:2690 msgid "Confirm exit" msgstr "Confirmar salida" -#: ../src/interface.c:2669 +#: ../src/interface.c:2693 #, fuzzy msgid "Shows a confirmation dialog on exit" msgstr "Muestra un dialogo de confirmación al momento de salir" -#: ../src/interface.c:2671 +#: ../src/interface.c:2695 msgid "Shutdown" msgstr "Cerrado" -#: ../src/interface.c:2692 +#: ../src/interface.c:2716 msgid "Startup path:" msgstr "Ruta de inicio:" -#: ../src/interface.c:2704 +#: ../src/interface.c:2728 msgid "" "Path to start in when opening or saving files. Must be an absolute path. " "Leave blank to use the current working directory." @@ -1520,28 +1520,27 @@ "Ruta a iniciar cuando se abren o guardan archivos. Debe ser una ruta " "absoluta. Dejar en blanco para usar el directorio de trabajo actual." -#: ../src/interface.c:2717 +#: ../src/interface.c:2741 msgid "Project files:" msgstr "Archivos del proyecto:" -#: ../src/interface.c:2729 +#: ../src/interface.c:2753 msgid "Path to start in when opening project files" msgstr "Ruta a iniciar cuando se abran archivos de proyectos" -#: ../src/interface.c:2742 +#: ../src/interface.c:2766 msgid "Paths" msgstr "Rutas" -#: ../src/interface.c:2747 -#, fuzzy +#: ../src/interface.c:2771 msgid "Startup" -msgstr "Estado" +msgstr "Inicio" -#: ../src/interface.c:2769 +#: ../src/interface.c:2793 msgid "Beep on errors or when compilation has finished" msgstr "Alerta sonora para errores o la finalización de la compilación" -#: ../src/interface.c:2772 +#: ../src/interface.c:2796 #, fuzzy msgid "" "Whether to beep if an error occurred or when the compilation process has " @@ -1550,11 +1549,11 @@ "Si dar una advertencia sonora de los errores o la finalización de la " "compilación." -#: ../src/interface.c:2774 +#: ../src/interface.c:2798 msgid "Switch to status message list at new message" msgstr "Cambiar a la lista de mensajes de estado cuando haya un nuevo mensaje" -#: ../src/interface.c:2777 +#: ../src/interface.c:2801 #, fuzzy msgid "" "Switch to the status message tab (in the notebook window at the bottom) if a " @@ -1563,11 +1562,11 @@ "Cambia a la pestaña de mensajes de estado (en la ventana de pestañas de " "abajo) cuando llega un nuevo mensaje." -#: ../src/interface.c:2779 +#: ../src/interface.c:2803 msgid "Suppress status messages in the status bar" msgstr "Suprimir mensajes de estado en la barra de estado" -#: ../src/interface.c:2782 +#: ../src/interface.c:2806 msgid "" "Removes all messages from the status bar. The messages are still displayed " "in the status messages window." @@ -1575,11 +1574,11 @@ "Remueve todos los mensajes de la barra de estado. Los mensajes son mostrados " "de todas formas en la ventana de mensajes de estado." -#: ../src/interface.c:2784 +#: ../src/interface.c:2808 msgid "Auto focus widgets (focus follows mouse)" msgstr "Enfocar automáticamente (el foco sigue al ratón)" -#: ../src/interface.c:2787 +#: ../src/interface.c:2811 msgid "" "Gives the focus automatically to widgets below the mouse cursor. Works for " "the main editor widget, the scribble, the toolbar search and goto line " @@ -1589,15 +1588,15 @@ "para el panel de edición principal, el borrador, la barra de búsquedas, el " "campo ir a y la VTE." -#: ../src/interface.c:2789 ../src/interface.c:3115 ../src/interface.c:3978 +#: ../src/interface.c:2813 ../src/interface.c:3139 ../src/interface.c:4002 msgid "Miscellaneous" -msgstr "Miscelaneos" +msgstr "Misceláneo" -#: ../src/interface.c:2809 +#: ../src/interface.c:2833 msgid "Always wrap search and hide the Find dialog" msgstr "Siempre dar la vuelta con la búsqueda y ocultar el dialogo de Buscar" -#: ../src/interface.c:2812 +#: ../src/interface.c:2836 #, fuzzy msgid "" "Always wrap search around the document and hide the Find dialog after " @@ -1606,11 +1605,11 @@ "Siempre dar la vuelta con la búsqueda y ocultar el dialogo de Buscar luego " "de hacer click en Buscar Siguiente/Anterior" -#: ../src/interface.c:2814 +#: ../src/interface.c:2838 msgid "Use the current word under the cursor for Find dialogs" msgstr "Usar la palabra actualmente bajo el cursor para los diálogos de Buscar" -#: ../src/interface.c:2817 +#: ../src/interface.c:2841 #, fuzzy msgid "" "Use current word under the cursor when opening the Find, Find in Files or " @@ -1619,21 +1618,20 @@ "Usar la palabra actualmente bajo el cursor, si no hay ningúna selección, al " "abrir el diálogo de Buscar, Buscar en Archivos o Reemplazar" -#: ../src/interface.c:2819 +#: ../src/interface.c:2843 #, fuzzy msgid "Use the current file's directory for Find in Files" msgstr "Usar la palabra actualmente bajo el cursor para los diálogos de Buscar" -#: ../src/interface.c:2823 -#, fuzzy +#: ../src/interface.c:2847 msgid "Search" -msgstr "Barra lateral" +msgstr "Buscar" -#: ../src/interface.c:2842 +#: ../src/interface.c:2866 msgid "Use project-based session files" msgstr "Usar archivos de sesión por proyectos" -#: ../src/interface.c:2845 +#: ../src/interface.c:2869 #, fuzzy msgid "" "Whether to store a project's session files and open them when re-opening the " @@ -1642,89 +1640,92 @@ "Si guardar un archivo de sesión por proyecto y abrirlo cuando se abra el " "proyecto." -#: ../src/interface.c:2847 +#: ../src/interface.c:2871 #, fuzzy msgid "Store project file inside the project base directory" msgstr "¿Crear el directorio de la ruta base del proyecto?" -#: ../src/interface.c:2850 +#: ../src/interface.c:2874 msgid "" "When enabled, a project file is stored by default inside the project base " "directory when creating new projects instead of one directory above the base " "directory. You can still change the path of the project file in the New " "Project dialog" msgstr "" +"Cuando está activado, el archivo de proyecto se almacena por defecto dentro " +"del directorio base del proyecto al crear nuevos proyectos, en lugar de " +"almacenarse en el directorio superior al directorio base. La ruta del " +"proyecto todavía se puede cambiar en el diálogo Nuevo Proyecto." -#: ../src/interface.c:2852 +#: ../src/interface.c:2876 msgid "Projects" msgstr "Proyectos" -#: ../src/interface.c:2857 -#, fuzzy +#: ../src/interface.c:2881 msgid "Miscellaneous" -msgstr "Miscelaneos" +msgstr "Misceláneo" -#: ../src/interface.c:2861 +#: ../src/interface.c:2885 msgid "General" msgstr "General" -#: ../src/interface.c:2884 +#: ../src/interface.c:2908 msgid "Show symbol list" msgstr "Mostrar la lista de símbolos" -#: ../src/interface.c:2887 +#: ../src/interface.c:2911 msgid "Toggle the symbol list on and off" msgstr "Mostrar/ocultar la lista de símbolos" -#: ../src/interface.c:2889 +#: ../src/interface.c:2913 msgid "Show documents list" msgstr "Mostrar la lista de documentos" -#: ../src/interface.c:2892 +#: ../src/interface.c:2916 msgid "Toggle the documents list on and off" msgstr "Mostrar/ocultar la lista de documentos" -#: ../src/interface.c:2894 +#: ../src/interface.c:2918 msgid "Sidebar" msgstr "Barra lateral" -#: ../src/interface.c:2915 +#: ../src/interface.c:2939 msgid "Symbol list:" msgstr "Lista de símbolos:" -#: ../src/interface.c:2922 ../src/interface.c:3037 +#: ../src/interface.c:2946 ../src/interface.c:3061 msgid "Message window:" msgstr "Ventana de mensajes:" -#: ../src/interface.c:2929 ../src/interface.c:3073 +#: ../src/interface.c:2953 ../src/interface.c:3097 msgid "Editor:" msgstr "Editor:" -#: ../src/interface.c:2941 +#: ../src/interface.c:2965 msgid "Sets the font for the message window" msgstr "Selecciona la fuente para la ventana de mensajes" -#: ../src/interface.c:2949 +#: ../src/interface.c:2973 msgid "Sets the font for the symbol list" msgstr "Selecciona la fuente para la lista de símbolos" -#: ../src/interface.c:2957 +#: ../src/interface.c:2981 msgid "Sets the editor font" msgstr "Selecciona la fuente del editor" -#: ../src/interface.c:2959 +#: ../src/interface.c:2983 msgid "Fonts" msgstr "Fuentes" -#: ../src/interface.c:2978 +#: ../src/interface.c:3002 msgid "Show editor tabs" msgstr "Mostrar pestañas del editor" -#: ../src/interface.c:2982 +#: ../src/interface.c:3006 msgid "Show close buttons" msgstr "Mostrar botónes para cerrar" -#: ../src/interface.c:2985 +#: ../src/interface.c:3009 #, fuzzy msgid "" "Shows a small cross button in the file tabs to easily close files when " @@ -1733,103 +1734,103 @@ "Muestra una pequeña cruz roja en las pestañas de archivos para cerrarlas " "fácilmente haciendo click en ella (requiere reiniciar Geany)." -#: ../src/interface.c:2991 +#: ../src/interface.c:3015 msgid "Placement of new file tabs:" msgstr "Ubicación de las pestañas de archivos nuevos:" -#: ../src/interface.c:2996 ../src/interface.c:3050 ../src/interface.c:3068 -#: ../src/interface.c:3086 +#: ../src/interface.c:3020 ../src/interface.c:3074 ../src/interface.c:3092 +#: ../src/interface.c:3110 msgid "Left" msgstr "Izquierda" -#: ../src/interface.c:2999 +#: ../src/interface.c:3023 msgid "File tabs will be placed on the left of the notebook" msgstr "" "Las pestañas de archivos serán ubicadas a la izquierda de la lista de " "pestañas" -#: ../src/interface.c:3004 ../src/interface.c:3051 ../src/interface.c:3069 -#: ../src/interface.c:3087 +#: ../src/interface.c:3028 ../src/interface.c:3075 ../src/interface.c:3093 +#: ../src/interface.c:3111 msgid "Right" msgstr "Derecha" -#: ../src/interface.c:3007 +#: ../src/interface.c:3031 msgid "File tabs will be placed on the right of the notebook" msgstr "" "Las pestañas de archivos serán ubicadas a la derecha de la lista de pestañas" -#: ../src/interface.c:3011 +#: ../src/interface.c:3035 #, fuzzy msgid "Double-clicking hides all additional widgets" msgstr "Mostrar/Esconder todos los paneles accesorios" -#: ../src/interface.c:3014 +#: ../src/interface.c:3038 #, fuzzy msgid "Calls the View->Toggle All Additional Widgets command" msgstr "Mostrar/Esconder todos los paneles adicionales" -#: ../src/interface.c:3016 +#: ../src/interface.c:3040 msgid "Editor tabs" msgstr "Pestañas de edición" -#: ../src/interface.c:3052 ../src/interface.c:3070 ../src/interface.c:3088 +#: ../src/interface.c:3076 ../src/interface.c:3094 ../src/interface.c:3112 msgid "Top" msgstr "Arriba" -#: ../src/interface.c:3053 ../src/interface.c:3071 ../src/interface.c:3089 +#: ../src/interface.c:3077 ../src/interface.c:3095 ../src/interface.c:3113 msgid "Bottom" msgstr "Abajo" -#: ../src/interface.c:3055 +#: ../src/interface.c:3079 msgid "Sidebar:" msgstr "Barra lateral:" -#: ../src/interface.c:3091 +#: ../src/interface.c:3115 msgid "Tab positions" msgstr "Posición de pestañas:" -#: ../src/interface.c:3110 +#: ../src/interface.c:3134 msgid "Show status bar" msgstr "Mostrar barra de estado" -#: ../src/interface.c:3113 +#: ../src/interface.c:3137 #, fuzzy msgid "Whether to show the status bar at the bottom of the main window" msgstr "Si mostrar la barra de estado debajo de la ventana principal." -#: ../src/interface.c:3120 +#: ../src/interface.c:3144 msgid "Interface" msgstr "Interfaz" -#: ../src/interface.c:3139 +#: ../src/interface.c:3163 msgid "Show Toolbar" msgstr "Mostrar Barra de Herramientas" -#: ../src/interface.c:3143 +#: ../src/interface.c:3167 msgid "Toolbar" msgstr "Barra de Herramientas" -#: ../src/interface.c:3164 +#: ../src/interface.c:3188 msgid "Icon style:" msgstr "Estilo de icono:" -#: ../src/interface.c:3171 +#: ../src/interface.c:3195 msgid "Icon size:" msgstr "Tamaño de icono:" -#: ../src/interface.c:3218 +#: ../src/interface.c:3242 msgid "Appearance" msgstr "Apariencia" -#: ../src/interface.c:3223 +#: ../src/interface.c:3247 msgid "Toolbar" msgstr "Barra de Herramientas" -#: ../src/interface.c:3250 +#: ../src/interface.c:3274 msgid "Line wrapping" msgstr "Cortado de líneas" -#: ../src/interface.c:3253 +#: ../src/interface.c:3277 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 " @@ -1839,11 +1840,11 @@ "siguiente. Nota: esta opción tiene un gran costo en velocidad para " "documentos grandes así que debería ser desactivada en maquinas lentas." -#: ../src/interface.c:3255 +#: ../src/interface.c:3279 msgid "Enable \"smart\" home key" msgstr "Activar la tecla inicio \"inteligente\"" -#: ../src/interface.c:3258 +#: ../src/interface.c:3282 msgid "" "When \"smart\" home is enabled, the HOME key will move the caret to the " "first non-blank character of the line, unless it is already there, it moves " @@ -1858,11 +1859,11 @@ "cursor al principio de la linea actual, independientemente de su posición " "actual." -#: ../src/interface.c:3260 +#: ../src/interface.c:3284 msgid "Disable Drag and Drop" msgstr "Desactivar Arrastrar y Soltar (Drag and Drop)" -#: ../src/interface.c:3263 +#: ../src/interface.c:3287 #, fuzzy msgid "" "Disable drag and drop completely in the editor window so you can't drag and " @@ -1872,20 +1873,20 @@ "podrá arrastrar o soltar ninguna selección dentro o hacia afuera de la " "ventana del editor." -#: ../src/interface.c:3265 +#: ../src/interface.c:3289 msgid "Enable folding" msgstr "Activar plegado" -#: ../src/interface.c:3268 +#: ../src/interface.c:3292 msgid "Whether to enable folding the code" -msgstr "Si activar el plegado de código" +msgstr "Define si se activa el plegado de código" -#: ../src/interface.c:3270 +#: ../src/interface.c:3294 #, fuzzy msgid "Fold/unfold all children of a fold point" msgstr "Plegar/Desplegar todos los hijos de un punto de plegado" -#: ../src/interface.c:3273 +#: ../src/interface.c:3297 #, fuzzy msgid "" "Fold or unfold all children of a fold point. By pressing the Shift key while " @@ -1895,11 +1896,11 @@ "comportamiento inverso apretando la tecla Shift mientras se hace click en un " "símbolo de plegado." -#: ../src/interface.c:3275 +#: ../src/interface.c:3299 msgid "Use indicators to show compile errors" msgstr "Usar indicadores para mostrar los errores de compilación" -#: ../src/interface.c:3278 +#: ../src/interface.c:3302 #, fuzzy msgid "" "Whether to use indicators (a squiggly underline) to highlight the lines " @@ -1908,95 +1909,101 @@ "Si usar indicadores (subrayado ondulado) para resaltar las líneas, donde el " "compilador encontró un error, o advertencia." -#: ../src/interface.c:3280 +#: ../src/interface.c:3304 msgid "Newline strips trailing spaces" msgstr "Una nueva linea borrar espacios extra al final" -#: ../src/interface.c:3283 +#: ../src/interface.c:3307 #, fuzzy msgid "Enable newline to strip the trailing spaces on the previous line" msgstr "" "Habilitar que las nuevas lineas borren los espacios extra al final de la " "linea anterior." -#: ../src/interface.c:3289 +#: ../src/interface.c:3313 msgid "Line breaking column:" -msgstr "" +msgstr "Columna de salto de línea:" -#: ../src/interface.c:3303 +#: ../src/interface.c:3327 #, fuzzy msgid "Comment toggle marker:" msgstr "Activar/Desactivar marca" -#: ../src/interface.c:3310 +#: ../src/interface.c:3334 msgid "" "A string which is added when toggling a line comment in a source file, it is " "used to mark the comment as toggled." msgstr "" +"Cadena que se añade al establecer una línea como comentario, en un archivo " +"de código fuente, y que se utiliza para marcar el comentario como " +"establecido." -#: ../src/interface.c:3312 +#: ../src/interface.c:3336 msgid "Features" msgstr "Características" -#: ../src/interface.c:3317 +#: ../src/interface.c:3341 #, fuzzy msgid "Features" msgstr "Características" -#: ../src/interface.c:3349 ../src/interface.c:4890 +#: ../src/interface.c:3373 ../src/interface.c:4914 msgid "Auto-indent mode:" msgstr "Modo de formateo de código:" -#: ../src/interface.c:3362 ../src/interface.c:4903 +#: ../src/interface.c:3386 ../src/interface.c:4927 msgid "Basic" msgstr "Básico" -#: ../src/interface.c:3363 ../src/interface.c:4904 +#: ../src/interface.c:3387 ../src/interface.c:4928 msgid "Current chars" msgstr "Carácter actual" -#: ../src/interface.c:3364 ../src/interface.c:4905 +#: ../src/interface.c:3388 ../src/interface.c:4929 msgid "Match braces" msgstr "Coincidiendo con las llaves correspondientes" -#: ../src/interface.c:3366 ../src/interface.c:3709 ../src/interface.c:4907 +#: ../src/interface.c:3390 ../src/interface.c:3733 ../src/interface.c:4931 msgid "Type:" msgstr "Tipo:" -#: ../src/interface.c:3373 ../src/interface.c:4914 -#, fuzzy +#: ../src/interface.c:3397 ../src/interface.c:4938 msgid "Width:" -msgstr "Escritura:" +msgstr "Ancho:" -#: ../src/interface.c:3386 ../src/interface.c:4927 +#: ../src/interface.c:3410 ../src/interface.c:4951 #, fuzzy msgid "The width in chars of a single indent" msgstr "El ancho, en carácteres, que ocupará una tabulación" -#: ../src/interface.c:3396 ../src/interface.c:4937 +#: ../src/interface.c:3420 ../src/interface.c:4961 #, fuzzy msgid "Use spaces when inserting indentation" msgstr "Usar tabulaciones cuando se inserten espacios en blanco" -#: ../src/interface.c:3405 ../src/interface.c:4946 +#: ../src/interface.c:3429 ../src/interface.c:4970 msgid "Use one tab per indent" -msgstr "" +msgstr "Utilizar un tabulado por indentación" -#: ../src/interface.c:3414 ../src/interface.c:4955 +#: ../src/interface.c:3438 ../src/interface.c:4979 msgid "" "Use spaces if the total indent is less than the tab width, otherwise use both" msgstr "" +"Usar espacios si el indentado total es menor que el ancho de tabulado, de lo " +"contrario usar ambos" -#: ../src/interface.c:3429 ../src/interface.c:4970 +#: ../src/interface.c:3453 ../src/interface.c:4994 #, fuzzy msgid "Hard tab width:" msgstr "Ancho de Tabulación:" -#: ../src/interface.c:3437 ../src/interface.c:4978 +#: ../src/interface.c:3461 ../src/interface.c:5002 msgid "The width of a tab when Tabs & Spaces is set for a document" msgstr "" +"El ancho de un tabulado cuando se ajusta Tabulados y Espacios para un " +"documento" -#: ../src/interface.c:3447 ../src/interface.c:4988 +#: ../src/interface.c:3471 ../src/interface.c:5012 #, fuzzy msgid "" "Whether to detect the indentation type from file contents when a file is " @@ -2005,30 +2012,32 @@ "Si detectar, cuando se abre un archivo, el tipo de sangría por el contenido " "del archivo." -#: ../src/interface.c:3449 +#: ../src/interface.c:3473 #, fuzzy msgid "Tab key indents" msgstr "Sangrado de linea inteligente" -#: ../src/interface.c:3452 +#: ../src/interface.c:3476 msgid "" "Pressing tab/shift-tab indents/unindents instead of inserting a tab character" msgstr "" +"Al pulsar tabulado/mayúsculas-tabulado se indenta/desindenta en lugar de " +"insertar un carácter de tabulado" -#: ../src/interface.c:3454 +#: ../src/interface.c:3478 msgid "Indentation" msgstr "Sangría" -#: ../src/interface.c:3459 ../src/interface.c:4990 +#: ../src/interface.c:3483 ../src/interface.c:5014 #, fuzzy msgid "Indentation" msgstr "Sangría" -#: ../src/interface.c:3482 +#: ../src/interface.c:3506 msgid "Snippet completion" -msgstr "Completado de contrucciones" +msgstr "Completado de construcciones" -#: ../src/interface.c:3485 +#: ../src/interface.c:3509 #, fuzzy msgid "" "Type a defined short character sequence and complete it to a more complex " @@ -2037,32 +2046,33 @@ "Ingresa una secuencia definida y corta de carácteres y complétala a una más " "compleja pulsando sólo una tecla." -#: ../src/interface.c:3487 -#, fuzzy +#: ../src/interface.c:3511 msgid "XML tag auto completion" -msgstr "Compleción automática de etiquetas XML" +msgstr "Completado automático de etiquetas XML" -#: ../src/interface.c:3490 +#: ../src/interface.c:3514 msgid "Automatic completion and closing of XML tags (includes HTML tags)" msgstr "" "Completado y cerrado automático de etiquetas XML abiertas (incluye etiquetas " "HTML)" -#: ../src/interface.c:3492 +#: ../src/interface.c:3516 msgid "Automatic continuation of multi-line comments" -msgstr "" +msgstr "Continuación automática de comentarios de varias líneas" -#: ../src/interface.c:3495 +#: ../src/interface.c:3519 msgid "" "Continue automatically multi-line comments in languages like C, C++ and Java " "when a new line is entered inside such a comment" msgstr "" +"Continuar automáticamente comentarios de varias líneas en lenguajes como C, C" +"++ y Java cuando se introduce una nueva linea dentro del comentario" -#: ../src/interface.c:3497 +#: ../src/interface.c:3521 msgid "Automatic symbol completion" msgstr "Completado automático de simbolos" -#: ../src/interface.c:3500 +#: ../src/interface.c:3524 msgid "" "Automatic completion of known symbols in open files (function names, global " "variables, ...)" @@ -2070,19 +2080,19 @@ "Completado automática de símbolos conocidos en archivos abiertos (nombres de " "funciones, variables globales, ...)" -#: ../src/interface.c:3508 +#: ../src/interface.c:3532 msgid "Max. symbol name suggestions:" -msgstr "" +msgstr "Número máximo de sugerencias para nombres de símbolos" -#: ../src/interface.c:3515 +#: ../src/interface.c:3539 msgid "Completion list height:" -msgstr "" +msgstr "Altura de la lista de completado:" -#: ../src/interface.c:3522 +#: ../src/interface.c:3546 msgid "Characters to type for completion:" msgstr "Carácteres a escribir para el completado:" -#: ../src/interface.c:3535 +#: ../src/interface.c:3559 #, fuzzy msgid "" "The amount of characters which are necessary to show the symbol auto " @@ -2091,124 +2101,128 @@ "La cantidad de carácteres que son necesarios para mostrar la lista de " "completado de símbolos." -#: ../src/interface.c:3544 -#, fuzzy +#: ../src/interface.c:3568 msgid "Display height in rows for the auto completion list" -msgstr "Número de líneas a mostrar en la lista de compleción automática." +msgstr "Número de líneas a mostrar en la lista de completado automático." -#: ../src/interface.c:3553 -#, fuzzy +#: ../src/interface.c:3577 msgid "Maximum number of entries to display in the auto completion list" -msgstr "Número de líneas a mostrar en la lista de compleción automática." +msgstr "Número de líneas a mostrar en la lista de completado automático" -#: ../src/interface.c:3556 +#: ../src/interface.c:3580 msgid "Completions" msgstr "Completados" -#: ../src/interface.c:3576 +#: ../src/interface.c:3600 msgid "Parenthesis ( )" -msgstr "" +msgstr "Paréntesis ( )" -#: ../src/interface.c:3581 +#: ../src/interface.c:3605 msgid "Auto-close parenthesis when typing an opening one" msgstr "" +"Cerrar automáticamente paréntesis al escribir un paréntesis de apertura" -#: ../src/interface.c:3583 +#: ../src/interface.c:3607 msgid "Single quotes ' '" -msgstr "" +msgstr "Comillas simples ' '" -#: ../src/interface.c:3588 +#: ../src/interface.c:3612 msgid "Auto-close simple quote when typing an opening one" msgstr "" +"Cerrar automáticamente comillas simples al escribir una comilla de apertura" -#: ../src/interface.c:3590 +#: ../src/interface.c:3614 msgid "Curly brackets { }" -msgstr "" +msgstr "Llaves { }" -#: ../src/interface.c:3595 +#: ../src/interface.c:3619 msgid "Auto-close curly bracket when typing an opening one" -msgstr "" +msgstr "Cerrar automáticamente llaves al escribir una llave de apertura" -#: ../src/interface.c:3597 +#: ../src/interface.c:3621 msgid "Square brackets [ ]" -msgstr "" +msgstr "Corchetes [ ]" -#: ../src/interface.c:3602 +#: ../src/interface.c:3626 msgid "Auto-close squre-bracket when typing an opening one" -msgstr "" +msgstr "Cerrar automáticamente corchetes al escribir un corchete de apertura" -#: ../src/interface.c:3604 +#: ../src/interface.c:3628 msgid "Double quotes \" \"" -msgstr "" +msgstr "Comillas dobles \" \"" -#: ../src/interface.c:3609 +#: ../src/interface.c:3633 msgid "Auto-close double quote when typing an opening one" msgstr "" +"Cerrar automáticamente comillas dobles al escribir una comilla doble de " +"apertura" -#: ../src/interface.c:3611 +#: ../src/interface.c:3635 msgid "Auto-close quotes and brackets" -msgstr "" +msgstr "Cerrar automáticamente comillas y corchetes" -#: ../src/interface.c:3616 +#: ../src/interface.c:3640 #, fuzzy msgid "Completions" msgstr "Completados" -#: ../src/interface.c:3639 +#: ../src/interface.c:3663 msgid "Invert syntax highlighting colors" msgstr "Invierte los colores de resaltado de sintaxis" -#: ../src/interface.c:3642 +#: ../src/interface.c:3666 msgid "" "Use white text on a black background and invert all colors, this option " "requires a restart of Geany" msgstr "" +"Usar texto blanco sobre fondo negro e invertir todos los colores, esta " +"opción necesita que se reinicie Geany" -#: ../src/interface.c:3644 +#: ../src/interface.c:3668 msgid "Show indentation guides" msgstr "Mostrar guías de formateo automático de código" -#: ../src/interface.c:3647 +#: ../src/interface.c:3671 #, fuzzy msgid "Shows small dotted lines to help you to use the right indentation" msgstr "" "Muestra pequeñas líneas punteadas para ayudar a usar el formato de código " "adecuado." -#: ../src/interface.c:3649 +#: ../src/interface.c:3673 msgid "Show white space" msgstr "Mostrar espacios en blanco" -#: ../src/interface.c:3652 +#: ../src/interface.c:3676 #, fuzzy msgid "Marks spaces with dots and tabs with arrows" msgstr "Marca los espacios con puntos y las tabulaciones con flechas" -#: ../src/interface.c:3654 +#: ../src/interface.c:3678 msgid "Show line endings" msgstr "Mostrar terminaciones de línea" -#: ../src/interface.c:3657 +#: ../src/interface.c:3681 #, fuzzy msgid "Show the line ending character" msgstr "Muestra los carácteres de terminación de línea" -#: ../src/interface.c:3659 +#: ../src/interface.c:3683 #, fuzzy msgid "Show line numbers" msgstr "Mostrar Números de _Línea" -#: ../src/interface.c:3662 +#: ../src/interface.c:3686 #, fuzzy msgid "Shows or hides the Line Number margin" msgstr "Muestra u oculta el margen con números de línea" -#: ../src/interface.c:3664 +#: ../src/interface.c:3688 #, fuzzy msgid "Show markers margin" msgstr "Muestra las _Marcas de Margenes" -#: ../src/interface.c:3667 +#: ../src/interface.c:3691 #, fuzzy msgid "" "Shows or hides the small margin right of the line numbers, which is used to " @@ -2217,37 +2231,39 @@ "Muestra u oculta el pequeño margen a la derecha de los números de líneas que " "se usa para marcar líneas" -#: ../src/interface.c:3669 +#: ../src/interface.c:3693 #, fuzzy msgid "Stop scrolling at last line" msgstr "Desplazar a la linea actual" -#: ../src/interface.c:3672 +#: ../src/interface.c:3696 msgid "Whether to stop scrolling one page past the last line of a document" msgstr "" +"Define si se detiene el scroll de página al sobrepasar la última línea del " +"documento" -#: ../src/interface.c:3674 +#: ../src/interface.c:3698 msgid "Display" msgstr "Mostrar" -#: ../src/interface.c:3695 +#: ../src/interface.c:3719 msgid "Long line marker:" msgstr "Marcador de líneas largas:" -#: ../src/interface.c:3702 +#: ../src/interface.c:3726 msgid "Long line marker color:" msgstr "Color del marcador de líneas largas:" -#: ../src/interface.c:3721 +#: ../src/interface.c:3745 msgid "Sets the color of the long line marker" msgstr "Selecciona el color del marcador de líneas largas" -#: ../src/interface.c:3722 ../src/toolbar.c:66 ../src/tools.c:743 -#: ../src/vte.c:757 ../src/vte.c:764 +#: ../src/interface.c:3746 ../src/toolbar.c:66 ../src/tools.c:746 +#: ../src/vte.c:769 ../src/vte.c:776 msgid "Color Chooser" msgstr "Selector de color" -#: ../src/interface.c:3730 +#: ../src/interface.c:3754 #, fuzzy msgid "" "The long line marker is a thin vertical line in the editor, it helps to mark " @@ -2258,11 +2274,11 @@ "a marcar las líneas largas, o como sugerencia para cortarlas. Poner un valor " "mayor a 0 para especificar la columna donde debe aparecer." -#: ../src/interface.c:3740 +#: ../src/interface.c:3764 msgid "Line" msgstr "Línea" -#: ../src/interface.c:3743 +#: ../src/interface.c:3767 #, fuzzy msgid "" "Prints a vertical line in the editor window at the given cursor position " @@ -2271,11 +2287,11 @@ "Imprime una línea vertical en la ventana de edición en la posición dada del " "cursor (ver debajo)." -#: ../src/interface.c:3747 +#: ../src/interface.c:3771 msgid "Background" msgstr "Fondo" -#: ../src/interface.c:3750 +#: ../src/interface.c:3774 #, fuzzy msgid "" "The background color of characters after the given cursor position (see " @@ -2286,58 +2302,60 @@ "abajo) al color seleccionado abajo. (Esto es recomendable si se usan fuentes " "proporcionales)" -#: ../src/interface.c:3754 +#: ../src/interface.c:3778 msgid "Disabled" msgstr "Deshabilitado" -#: ../src/interface.c:3760 +#: ../src/interface.c:3784 msgid "Long line marker" msgstr "Marcador de líneas largas" -#: ../src/interface.c:3765 +#: ../src/interface.c:3789 msgid "Display" msgstr "Mostrar" -#: ../src/interface.c:3796 +#: ../src/interface.c:3820 msgid "Open new documents from the command-line" -msgstr "" +msgstr "Abrir nuevos documentos desde la línea de comandos" -#: ../src/interface.c:3799 +#: ../src/interface.c:3823 msgid "Start a new file for each command-line filename that doesn't exist" msgstr "" +"Crear un archivo nuevo por cada archivo que no exista de los indicados por " +"línea de comandos" -#: ../src/interface.c:3813 +#: ../src/interface.c:3837 #, fuzzy msgid "Default end of line characters:" msgstr "Codificación por omisión (para archivos nuevos):" -#: ../src/interface.c:3820 +#: ../src/interface.c:3844 msgid "New files" msgstr "Archivos nuevos" -#: ../src/interface.c:3846 +#: ../src/interface.c:3870 #, fuzzy msgid "Sets the default encoding for newly created files" msgstr "Selecciona la codificación por omisión para nuevos archivos creados." -#: ../src/interface.c:3852 +#: ../src/interface.c:3876 msgid "Default encoding (new files):" msgstr "Codificación por omisión (para archivos nuevos):" -#: ../src/interface.c:3859 +#: ../src/interface.c:3883 msgid "Default encoding (existing files):" msgstr "Codificación por omisión (para archivos existentes):" -#: ../src/interface.c:3871 +#: ../src/interface.c:3895 #, fuzzy msgid "Sets the default encoding for opening existing files" msgstr "Selecciona la codificación por omisión para abrir archivos existentes." -#: ../src/interface.c:3877 +#: ../src/interface.c:3901 msgid "Use fixed encoding when opening files" msgstr "Usar una codificación fija al abrir archivos" -#: ../src/interface.c:3882 +#: ../src/interface.c:3906 #, fuzzy msgid "" "This option disables the automatic detection of the file encoding when " @@ -2348,83 +2366,85 @@ "archivos cuando se está abriendo un archivo y abre el archivo con la " "codificación especificada (esto normalmente no es necesario)." -#: ../src/interface.c:3884 +#: ../src/interface.c:3908 #, fuzzy msgid "Encodings" msgstr "Codificación" -#: ../src/interface.c:3903 +#: ../src/interface.c:3927 msgid "Ensure new line at file end" msgstr "Asegurar terminación de línea al final del archivo" -#: ../src/interface.c:3906 +#: ../src/interface.c:3930 msgid "Ensures that at the end of the file is a new line" msgstr "Asegura que haya una terminación de línea al final del archivo" -#: ../src/interface.c:3908 +#: ../src/interface.c:3932 #, fuzzy msgid "Strip trailing spaces and tabs" msgstr "Borrar espacios al final" -#: ../src/interface.c:3911 +#: ../src/interface.c:3935 msgid "Removes trailing spaces and tabs and the end of lines" msgstr "Borra los espacios y tabulaciones al final de las líneas" -#: ../src/interface.c:3913 ../src/keybindings.c:444 +#: ../src/interface.c:3937 ../src/keybindings.c:448 msgid "Replace tabs by space" msgstr "Reemplazar tabulaciones por espacios" -#: ../src/interface.c:3916 +#: ../src/interface.c:3940 #, fuzzy msgid "Replaces all tabs in document by spaces" msgstr "Reemplaza todas las tabulaciones en el documento por espacios" -#: ../src/interface.c:3918 +#: ../src/interface.c:3942 msgid "Saving files" msgstr "Grabando archivos" -#: ../src/interface.c:3943 +#: ../src/interface.c:3967 msgid "Recent files list length:" msgstr "Longitud de la lista de archivos recientes:" -#: ../src/interface.c:3957 +#: ../src/interface.c:3981 #, fuzzy msgid "Specifies the number of files which are stored in the Recent files list" msgstr "" "Especifica el número de archivos que se guardan en la lista Archivos " "recientes." -#: ../src/interface.c:3961 +#: ../src/interface.c:3985 msgid "Disk check timeout:" -msgstr "" +msgstr "Tiempo de espera para la comprobación en disco" -#: ../src/interface.c:3974 +#: ../src/interface.c:3998 msgid "" "How often to check for changes to document files on disk, in seconds. Zero " "disables checking." msgstr "" +"Frecuencia en segundos para comprobar en el disco los cambios de los " +"archivos abiertos. El valor 0 desactiva la comprobación." -#: ../src/interface.c:3983 ../src/symbols.c:554 ../plugins/filebrowser.c:994 +#: ../src/interface.c:4007 ../src/symbols.c:560 ../plugins/filebrowser.c:1016 msgid "Files" -msgstr "_Archivos" +msgstr "Archivos" -#: ../src/interface.c:4016 +#: ../src/interface.c:4040 msgid "Make:" msgstr "Make:" -#: ../src/interface.c:4023 +#: ../src/interface.c:4047 msgid "Terminal:" msgstr "Terminal:" -#: ../src/interface.c:4030 +#: ../src/interface.c:4054 msgid "Browser:" msgstr "Navegador:" -#: ../src/interface.c:4042 +#: ../src/interface.c:4066 msgid "Path and options for the make tool" msgstr "Ruta y opciones para la herramienta make" -#: ../src/interface.c:4049 +#: ../src/interface.c:4073 msgid "" "A terminal emulator like xterm, gnome-terminal or konsole (should accept the " "-e argument)" @@ -2432,23 +2452,23 @@ "Un emulador de terminal como xterm, gnome-terminal o konsole (debe aceptar " "el argumento -e)" -#: ../src/interface.c:4056 +#: ../src/interface.c:4080 msgid "Path (and possibly additional arguments) to your favorite browser" msgstr "Ruta (y posiblemente argumentos adicionales) a su navegador favorito" -#: ../src/interface.c:4088 +#: ../src/interface.c:4112 msgid "Grep:" msgstr "Grep:" -#: ../src/interface.c:4111 +#: ../src/interface.c:4135 msgid "Tool paths" msgstr "Rutas a las herramientas" -#: ../src/interface.c:4132 +#: ../src/interface.c:4156 msgid "Context action:" msgstr "Acción contextual:" -#: ../src/interface.c:4143 +#: ../src/interface.c:4167 #, c-format msgid "" "Context action command. The currently selected word can be used with %s. It " @@ -2459,69 +2479,67 @@ "usada con %s. Puede estar en cualquier lugar del comando dado y será " "remplazada antes de la ejecución." -#: ../src/interface.c:4156 +#: ../src/interface.c:4180 msgid "Commands" msgstr "Comandos" -#: ../src/interface.c:4161 ../src/keybindings.c:480 +#: ../src/interface.c:4185 ../src/keybindings.c:484 msgid "Tools" msgstr "Herramientas" -#: ../src/interface.c:4195 +#: ../src/interface.c:4219 msgid "email address of the developer" msgstr "dirección de correo electrónico del desarrollador" -#: ../src/interface.c:4202 +#: ../src/interface.c:4226 msgid "Initials of the developer name" msgstr "Iniciales del nombre del desarrollador" -#: ../src/interface.c:4204 +#: ../src/interface.c:4228 msgid "Initial version:" msgstr "Version inicial:" -#: ../src/interface.c:4216 +#: ../src/interface.c:4240 msgid "Version number, which a new file initially has" msgstr "Número de version que tiene un archivo nuevo" -#: ../src/interface.c:4223 +#: ../src/interface.c:4247 msgid "Company name" msgstr "Nombre de la compañia" -#: ../src/interface.c:4225 +#: ../src/interface.c:4249 msgid "Developer:" msgstr "Desarrollador:" -#: ../src/interface.c:4232 +#: ../src/interface.c:4256 msgid "Company:" msgstr "Compañia:" -#: ../src/interface.c:4239 +#: ../src/interface.c:4263 msgid "Mail address:" msgstr "Dirección de correo electrónico:" -#: ../src/interface.c:4246 +#: ../src/interface.c:4270 msgid "Initials:" msgstr "Iniciales:" -#: ../src/interface.c:4258 +#: ../src/interface.c:4282 msgid "The name of the developer" msgstr "El nombre del desarrollador" -#: ../src/interface.c:4260 -#, fuzzy +#: ../src/interface.c:4284 msgid "Year:" -msgstr "Barra lateral:" +msgstr "Año:" -#: ../src/interface.c:4267 -#, fuzzy +#: ../src/interface.c:4291 msgid "Date:" -msgstr "Make:" +msgstr "Fecha:" -#: ../src/interface.c:4274 +#: ../src/interface.c:4298 msgid "Date & Time:" -msgstr "" +msgstr "Fecha y hora:" -#: ../src/interface.c:4286 +#: ../src/interface.c:4310 #, fuzzy msgid "" "Specify a format for the the {datetime} wildcard. You can use any conversion " @@ -2531,7 +2549,7 @@ "cada página. Puede usar cualquier especificador de conversión que pueda ser " "usado con la función strftime de ANSI C." -#: ../src/interface.c:4293 +#: ../src/interface.c:4317 #, fuzzy msgid "" "Specify a format for the the {year} wildcard. You can use any conversion " @@ -2541,7 +2559,7 @@ "cada página. Puede usar cualquier especificador de conversión que pueda ser " "usado con la función strftime de ANSI C." -#: ../src/interface.c:4300 +#: ../src/interface.c:4324 #, fuzzy msgid "" "Specify a format for the the {date} wildcard. You can use any conversion " @@ -2551,54 +2569,54 @@ "cada página. Puede usar cualquier especificador de conversión que pueda ser " "usado con la función strftime de ANSI C." -#: ../src/interface.c:4302 +#: ../src/interface.c:4326 msgid "Template data" msgstr "Datos de plantillas" -#: ../src/interface.c:4307 +#: ../src/interface.c:4331 msgid "Templates" msgstr "Plantillas" -#: ../src/interface.c:4345 +#: ../src/interface.c:4369 msgid "C_hange" msgstr "_Cambiar" -#: ../src/interface.c:4349 +#: ../src/interface.c:4373 msgid "Keyboard shortcuts" msgstr "Atajos de teclado" -#: ../src/interface.c:4354 +#: ../src/interface.c:4378 msgid "Keybindings" msgstr "Atajos" -#: ../src/interface.c:4377 +#: ../src/interface.c:4401 msgid "Command:" msgstr "Comando:" -#: ../src/interface.c:4384 +#: ../src/interface.c:4408 #, fuzzy, c-format msgid "Path to the command for printing files (use %f for the filename)" msgstr "" "Ruta al comando para imprimir archivos (usar %f como nombre de archivo)." -#: ../src/interface.c:4394 +#: ../src/interface.c:4418 msgid "Use an external command for printing" msgstr "Usar un comando externo para la impresión" -#: ../src/interface.c:4414 ../src/printing.c:342 +#: ../src/interface.c:4438 ../src/printing.c:345 msgid "Print line numbers" msgstr "Imprimir números de línea" -#: ../src/interface.c:4417 ../src/printing.c:344 +#: ../src/interface.c:4441 ../src/printing.c:347 #, fuzzy msgid "Add line numbers to the printed page" msgstr "Agregar números de linea a la hoja impresa." -#: ../src/interface.c:4419 ../src/printing.c:347 +#: ../src/interface.c:4443 ../src/printing.c:350 msgid "Print page numbers" msgstr "Imprimir números de página" -#: ../src/interface.c:4422 +#: ../src/interface.c:4446 #, fuzzy msgid "" "Add page numbers at the bottom of each page, it takes 2 lines of the page" @@ -2606,11 +2624,11 @@ "Agregar números the página al final de cada página. Ocupa 2 lineas de la " "página." -#: ../src/interface.c:4424 ../src/printing.c:352 +#: ../src/interface.c:4448 ../src/printing.c:355 msgid "Print page header" msgstr "Imprimir encabezado de página" -#: ../src/interface.c:4427 ../src/printing.c:354 +#: ../src/interface.c:4451 ../src/printing.c:357 msgid "" "Adds a little header to every page containing the page number, the filename " "and the current date(see below). It takes 3 lines of the page." @@ -2619,20 +2637,20 @@ "el nombre del archivo y la fecha actual (ver abajo). Ocupa 3 lineas de la " "página." -#: ../src/interface.c:4444 ../src/printing.c:370 +#: ../src/interface.c:4468 ../src/printing.c:373 msgid "Use the basename of the printed file" msgstr "Usar el nombre del archivo impreso" -#: ../src/interface.c:4447 ../src/printing.c:372 +#: ../src/interface.c:4471 ../src/printing.c:375 #, fuzzy msgid "Print only the basename(without the path) of the printed file" msgstr "Imprimir sólo el nombre (sin la ruta) del archivo impreso." -#: ../src/interface.c:4453 ../src/printing.c:378 +#: ../src/interface.c:4477 ../src/printing.c:381 msgid "Date format:" msgstr "Formato de Fecha:" -#: ../src/interface.c:4460 ../src/printing.c:383 +#: ../src/interface.c:4484 ../src/printing.c:387 msgid "" "Specify a format for the date and time stamp which is added to the page " "header on each page. You can use any conversion specifiers which can be used " @@ -2642,532 +2660,537 @@ "cada página. Puede usar cualquier especificador de conversión que pueda ser " "usado con la función strftime de ANSI C." -#: ../src/interface.c:4463 +#: ../src/interface.c:4487 msgid "Use native GTK printing" msgstr "Usar la impresión nativa de GTK" -#: ../src/interface.c:4469 +#: ../src/interface.c:4493 msgid "Printing" msgstr "Imprimiendo" -#: ../src/interface.c:4873 +#: ../src/interface.c:4897 msgid "Project Properties" msgstr "Propiedades del Proyecto" -#: ../src/keybindings.c:193 ../src/plugins.c:1091 +#: ../src/keybindings.c:195 ../src/plugins.c:1099 msgid "File" msgstr "Archivo" -#: ../src/keybindings.c:196 +#: ../src/keybindings.c:198 msgid "New" msgstr "Nuevo" -#: ../src/keybindings.c:198 +#: ../src/keybindings.c:200 msgid "Open" msgstr "Abrir" -#: ../src/keybindings.c:201 +#: ../src/keybindings.c:203 msgid "Open selected file" msgstr "Abrir archivos seleccionados" -#: ../src/keybindings.c:203 +#: ../src/keybindings.c:205 msgid "Save" msgstr "Guardar" -#: ../src/keybindings.c:205 +#: ../src/keybindings.c:207 msgid "Save as" msgstr "Guardar como" -#: ../src/keybindings.c:207 +#: ../src/keybindings.c:209 msgid "Save all" msgstr "Guardar todo" -#: ../src/keybindings.c:210 +#: ../src/keybindings.c:212 msgid "Print" msgstr "Imprimir" -#: ../src/keybindings.c:212 +#: ../src/keybindings.c:214 msgid "Close" msgstr "Cerrar" -#: ../src/keybindings.c:214 +#: ../src/keybindings.c:216 msgid "Close all" msgstr "Cerrar todo" -#: ../src/keybindings.c:217 +#: ../src/keybindings.c:219 msgid "Reload file" msgstr "Recargar archivo" -#: ../src/keybindings.c:219 ../src/project.c:476 +#: ../src/keybindings.c:221 ../src/project.c:486 msgid "Project" msgstr "Proyecto" -#: ../src/keybindings.c:222 +#: ../src/keybindings.c:224 msgid "Project properties" msgstr "Propiedades del proyecto" -#: ../src/keybindings.c:227 +#: ../src/keybindings.c:229 msgid "Undo" msgstr "Deshacer" -#: ../src/keybindings.c:229 +#: ../src/keybindings.c:231 msgid "Redo" msgstr "Rehacer" -#: ../src/keybindings.c:231 +#: ../src/keybindings.c:233 msgid "Duplicate line or selection" msgstr "Duplicar línea o selección" -#: ../src/keybindings.c:234 +#: ../src/keybindings.c:236 msgid "Delete current line(s)" msgstr "Borrar la(s) linea(s) actual(es)" -#: ../src/keybindings.c:236 +#: ../src/keybindings.c:238 msgid "Transpose current line" msgstr "Transponer la linea actual" -#: ../src/keybindings.c:238 +#: ../src/keybindings.c:240 msgid "Scroll to current line" msgstr "Desplazar a la linea actual" -#: ../src/keybindings.c:240 +#: ../src/keybindings.c:242 msgid "Scroll up the view by one line" msgstr "Desplazar la vista hacia arriba una linea" -#: ../src/keybindings.c:242 +#: ../src/keybindings.c:244 msgid "Scroll down the view by one line" msgstr "Desplazar la vista hacia abajo una linea" -#: ../src/keybindings.c:245 +#: ../src/keybindings.c:247 msgid "Complete snippet" msgstr "Completar construcción" -#: ../src/keybindings.c:247 +#: ../src/keybindings.c:249 msgid "Move cursor in snippet" -msgstr "" +msgstr "Mover cursor dentro de un trozo de texto" -#: ../src/keybindings.c:249 +#: ../src/keybindings.c:251 msgid "Suppress snippet completion" msgstr "Evitar completado de contrucciones" -#: ../src/keybindings.c:251 +#: ../src/keybindings.c:253 msgid "Context Action" msgstr "Acción contextual" -#: ../src/keybindings.c:253 +#: ../src/keybindings.c:255 msgid "Complete word" msgstr "Completar palabra" -#: ../src/keybindings.c:255 +#: ../src/keybindings.c:257 msgid "Show calltip" msgstr "Mostrar pistas de prototipos" -#: ../src/keybindings.c:257 +#: ../src/keybindings.c:259 msgid "Show macro list" msgstr "Mostrar la lista de macros" -#: ../src/keybindings.c:259 +#: ../src/keybindings.c:261 msgid "Clipboard" -msgstr "Corta papeles" +msgstr "Portapapeles" -#: ../src/keybindings.c:262 +#: ../src/keybindings.c:264 msgid "Cut" msgstr "Cortar" -#: ../src/keybindings.c:264 +#: ../src/keybindings.c:266 msgid "Copy" msgstr "Copiar" -#: ../src/keybindings.c:266 +#: ../src/keybindings.c:268 msgid "Paste" msgstr "Pegar" -#: ../src/keybindings.c:268 +#: ../src/keybindings.c:270 msgid "Copy current line(s)" msgstr "Copiar la(s) linea(s) actual(es)" -#: ../src/keybindings.c:270 +#: ../src/keybindings.c:272 msgid "Cut current line(s)" msgstr "Cortar la(s) linea(s) actual(es)" -#: ../src/keybindings.c:272 +#: ../src/keybindings.c:274 msgid "Select" msgstr "Seleccionar" -#: ../src/keybindings.c:275 +#: ../src/keybindings.c:277 msgid "Select All" msgstr "Seleccionar Todo" -#: ../src/keybindings.c:277 +#: ../src/keybindings.c:279 msgid "Select current word" msgstr "Seleccionar palabra actual" -#: ../src/keybindings.c:279 +#: ../src/keybindings.c:281 msgid "Select current line(s)" msgstr "Seleccionar linea(s) actual(es)" -#: ../src/keybindings.c:281 +#: ../src/keybindings.c:283 msgid "Select current paragraph" msgstr "Seleccionar parrafo actual" -#: ../src/keybindings.c:283 +#: ../src/keybindings.c:285 msgid "Format" msgstr "Formato" -#: ../src/keybindings.c:287 +#: ../src/keybindings.c:289 msgid "Toggle Case of Selection" msgstr "Intercambiar entre Mayúsculas y minúsculas" -#: ../src/keybindings.c:289 +#: ../src/keybindings.c:291 msgid "Toggle line commentation" msgstr "Comentar/Descomentar" -#: ../src/keybindings.c:292 +#: ../src/keybindings.c:294 msgid "Comment line(s)" msgstr "Comentar línea(s)" -#: ../src/keybindings.c:294 +#: ../src/keybindings.c:296 msgid "Uncomment line(s)" msgstr "Descomentar línea(s)" -#: ../src/keybindings.c:296 +#: ../src/keybindings.c:298 msgid "Increase indent" msgstr "Incrementar sangría" -#: ../src/keybindings.c:299 +#: ../src/keybindings.c:301 msgid "Decrease indent" msgstr "Decrementar sangría" -#: ../src/keybindings.c:302 +#: ../src/keybindings.c:304 msgid "Increase indent by one space" msgstr "Incrementar sangría en un espacio" -#: ../src/keybindings.c:304 +#: ../src/keybindings.c:306 msgid "Decrease indent by one space" msgstr "Decrementar sangría en un espacio" -#: ../src/keybindings.c:306 +#: ../src/keybindings.c:308 msgid "Smart line indent" msgstr "Sangrado de linea inteligente" -#: ../src/keybindings.c:308 +#: ../src/keybindings.c:310 msgid "Send to Custom Command 1" msgstr "Enviar al Comando Personalizado 1" -#: ../src/keybindings.c:310 +#: ../src/keybindings.c:312 msgid "Send to Custom Command 2" msgstr "Enviar al Comando Personalizado 2" -#: ../src/keybindings.c:312 +#: ../src/keybindings.c:314 msgid "Send to Custom Command 3" msgstr "Enviar al Comando Personalizado 3" -#: ../src/keybindings.c:314 +#: ../src/keybindings.c:316 +#, fuzzy +msgid "Send Selection to Terminal" +msgstr "Mandar _Selección a" + +#: ../src/keybindings.c:318 msgid "Insert" msgstr "Insertar" -#: ../src/keybindings.c:317 +#: ../src/keybindings.c:321 msgid "Insert date" msgstr "Insertar fecha" -#: ../src/keybindings.c:320 +#: ../src/keybindings.c:324 #, fuzzy msgid "Insert alternative white space" msgstr "Insertar espacio en blanco alternativo" -#: ../src/keybindings.c:322 +#: ../src/keybindings.c:326 msgid "Settings" msgstr "Opciones" -#: ../src/keybindings.c:328 ../src/toolbar.c:200 +#: ../src/keybindings.c:332 ../src/toolbar.c:200 msgid "Search" msgstr "Buscar" -#: ../src/keybindings.c:331 ../src/search.c:363 +#: ../src/keybindings.c:335 ../src/search.c:363 msgid "Find" msgstr "Encontrar" -#: ../src/keybindings.c:333 +#: ../src/keybindings.c:337 msgid "Find Next" msgstr "Buscar Siguente" -#: ../src/keybindings.c:335 +#: ../src/keybindings.c:339 msgid "Find Previous" msgstr "Buscar Anterior" -#: ../src/keybindings.c:338 +#: ../src/keybindings.c:342 msgid "Find Next Selection" msgstr "Buscar Siguiente Selección" -#: ../src/keybindings.c:340 +#: ../src/keybindings.c:344 msgid "Find Previous Selection" msgstr "Buscar Anterior Selección" -#: ../src/keybindings.c:342 ../src/search.c:496 +#: ../src/keybindings.c:346 ../src/search.c:497 msgid "Replace" msgstr "Reemplazar" -#: ../src/keybindings.c:344 ../src/search.c:659 +#: ../src/keybindings.c:348 ../src/search.c:662 msgid "Find in Files" msgstr "Buscar en Archivos" -#: ../src/keybindings.c:347 +#: ../src/keybindings.c:351 msgid "Next Message" msgstr "Mensaje Siguiente" -#: ../src/keybindings.c:349 +#: ../src/keybindings.c:353 #, fuzzy msgid "Previous Message" msgstr "Mensaje Siguiente" -#: ../src/keybindings.c:351 +#: ../src/keybindings.c:355 msgid "Find Usage" msgstr "Encontrar uso" -#: ../src/keybindings.c:353 +#: ../src/keybindings.c:357 #, fuzzy msgid "Find Document Usage" msgstr "Encontrar uso" -#: ../src/keybindings.c:355 +#: ../src/keybindings.c:359 msgid "Go to" msgstr "Ir a" -#: ../src/keybindings.c:358 ../src/toolbar.c:62 +#: ../src/keybindings.c:362 ../src/toolbar.c:62 msgid "Navigate back a location" msgstr "Navegar una ubicación hacia atrás" -#: ../src/keybindings.c:360 ../src/toolbar.c:63 +#: ../src/keybindings.c:364 ../src/toolbar.c:63 msgid "Navigate forward a location" msgstr "Navegar una ubicación hacia adelante" -#: ../src/keybindings.c:365 +#: ../src/keybindings.c:369 msgid "Go to matching brace" msgstr "Ir a la llave correspondiente" -#: ../src/keybindings.c:368 +#: ../src/keybindings.c:372 msgid "Toggle marker" msgstr "Activar/Desactivar marca" -#: ../src/keybindings.c:371 +#: ../src/keybindings.c:375 msgid "Go to next marker" msgstr "Ir a la siguiente marca" -#: ../src/keybindings.c:374 +#: ../src/keybindings.c:378 msgid "Go to previous marker" msgstr "Ir a la marca anterior" -#: ../src/keybindings.c:376 +#: ../src/keybindings.c:380 msgid "Go to Tag Definition" msgstr "Ir a la Definición del Tag" -#: ../src/keybindings.c:378 +#: ../src/keybindings.c:382 msgid "Go to Tag Declaration" msgstr "Ir a la Declaración del Tag" -#: ../src/keybindings.c:380 +#: ../src/keybindings.c:384 #, fuzzy msgid "Go to Start of Line" msgstr "Ir a la Línea" -#: ../src/keybindings.c:382 +#: ../src/keybindings.c:386 #, fuzzy msgid "Go to End of Line" msgstr "Ir a la Línea" -#: ../src/keybindings.c:384 +#: ../src/keybindings.c:388 #, fuzzy msgid "Go to Previous Word Part" msgstr "Ir a la marca anterior" -#: ../src/keybindings.c:386 +#: ../src/keybindings.c:390 #, fuzzy msgid "Go to Next Word Part" msgstr "Ir a la siguiente marca" -#: ../src/keybindings.c:388 +#: ../src/keybindings.c:392 msgid "View" msgstr "Ver" -#: ../src/keybindings.c:391 +#: ../src/keybindings.c:395 msgid "Toggle All Additional Widgets" msgstr "Mostrar/Esconder todos los paneles adicionales" -#: ../src/keybindings.c:394 +#: ../src/keybindings.c:398 msgid "Fullscreen" msgstr "Pantalla completa" -#: ../src/keybindings.c:396 +#: ../src/keybindings.c:400 msgid "Toggle Messages Window" msgstr "Mostrar ventana de mensajes" -#: ../src/keybindings.c:399 +#: ../src/keybindings.c:403 msgid "Toggle Sidebar" msgstr "Mostrar/Ocultar barra lateral" -#: ../src/keybindings.c:401 +#: ../src/keybindings.c:405 msgid "Zoom In" msgstr "Acercar el texto" -#: ../src/keybindings.c:403 +#: ../src/keybindings.c:407 msgid "Zoom Out" msgstr "Alejar el texto" -#: ../src/keybindings.c:405 +#: ../src/keybindings.c:409 msgid "Focus" msgstr "Foco" -#: ../src/keybindings.c:408 +#: ../src/keybindings.c:412 msgid "Switch to Editor" msgstr "Ir al Editor" -#: ../src/keybindings.c:410 +#: ../src/keybindings.c:414 msgid "Switch to Scribble" msgstr "Ir al Borrador" -#: ../src/keybindings.c:412 +#: ../src/keybindings.c:416 msgid "Switch to VTE" msgstr "Ir a la VTE" -#: ../src/keybindings.c:414 +#: ../src/keybindings.c:418 msgid "Switch to Search Bar" msgstr "Ir a la Barra de Busqueda" -#: ../src/keybindings.c:416 +#: ../src/keybindings.c:420 msgid "Switch to Sidebar" msgstr "Ir a la Barra Lateral " -#: ../src/keybindings.c:418 +#: ../src/keybindings.c:422 #, fuzzy msgid "Switch to Compiler" msgstr "Ir a la Barra Lateral " -#: ../src/keybindings.c:420 +#: ../src/keybindings.c:424 msgid "Notebook tab" msgstr "Pestaña de anotador" -#: ../src/keybindings.c:423 +#: ../src/keybindings.c:427 msgid "Switch to left document" msgstr "Ir al documento de la izq." -#: ../src/keybindings.c:425 +#: ../src/keybindings.c:429 msgid "Switch to right document" msgstr "Ir al documento de la der." -#: ../src/keybindings.c:427 +#: ../src/keybindings.c:431 msgid "Switch to last used document" msgstr "Ir al último documento usado" -#: ../src/keybindings.c:429 +#: ../src/keybindings.c:433 msgid "Move document left" msgstr "Mover el documento a la izquierda" -#: ../src/keybindings.c:431 +#: ../src/keybindings.c:435 msgid "Move document right" msgstr "Mover el documento a la derecha" -#: ../src/keybindings.c:433 +#: ../src/keybindings.c:437 msgid "Move document first" msgstr "Mover el documento al principio" -#: ../src/keybindings.c:435 +#: ../src/keybindings.c:439 msgid "Move document last" msgstr "Mover el documento al final" -#: ../src/keybindings.c:437 +#: ../src/keybindings.c:441 msgid "Document" msgstr "Documento" -#: ../src/keybindings.c:440 +#: ../src/keybindings.c:444 #, fuzzy msgid "Toggle Line wrapping" msgstr "Cortado de líneas" -#: ../src/keybindings.c:442 +#: ../src/keybindings.c:446 #, fuzzy msgid "Toggle Line breaking" msgstr "Comen_tar/Descomentar" -#: ../src/keybindings.c:446 +#: ../src/keybindings.c:450 #, fuzzy msgid "Replace spaces by tabs" msgstr "_Reemplazar Tabulaciones por Espacios" -#: ../src/keybindings.c:448 +#: ../src/keybindings.c:452 #, fuzzy msgid "Toggle current fold" msgstr "Seleccionar palabra actual" -#: ../src/keybindings.c:450 +#: ../src/keybindings.c:454 msgid "Fold all" msgstr "Plegar todo" -#: ../src/keybindings.c:452 +#: ../src/keybindings.c:456 msgid "Unfold all" msgstr "Desplegar todo" -#: ../src/keybindings.c:454 +#: ../src/keybindings.c:458 msgid "Reload symbol list" msgstr "Recargar lista de símbolos" -#: ../src/keybindings.c:456 ../src/keybindings.c:461 ../src/ui_utils.c:1645 +#: ../src/keybindings.c:460 ../src/keybindings.c:465 ../src/ui_utils.c:1645 msgid "Build" msgstr "Construir" -#: ../src/keybindings.c:459 ../src/toolbar.c:64 +#: ../src/keybindings.c:463 ../src/toolbar.c:64 msgid "Compile" msgstr "Compilar" -#: ../src/keybindings.c:463 +#: ../src/keybindings.c:467 msgid "Make all" msgstr "Make all" -#: ../src/keybindings.c:466 +#: ../src/keybindings.c:470 msgid "Make custom target" msgstr "Construye con make (objetivo personalizado)" -#: ../src/keybindings.c:468 +#: ../src/keybindings.c:472 msgid "Make object" msgstr "Make object" -#: ../src/keybindings.c:470 +#: ../src/keybindings.c:474 msgid "Next error" msgstr "Siguiente error" -#: ../src/keybindings.c:472 +#: ../src/keybindings.c:476 #, fuzzy msgid "Previous error" msgstr "Traductores Anteriores" -#: ../src/keybindings.c:474 +#: ../src/keybindings.c:478 msgid "Run" msgstr "Ejecutar" -#: ../src/keybindings.c:476 +#: ../src/keybindings.c:480 msgid "Run (alternative command)" msgstr "Ejecutar (comando alternativo)" -#: ../src/keybindings.c:478 +#: ../src/keybindings.c:482 msgid "Build options" msgstr "Opciones de construcción" -#: ../src/keybindings.c:483 +#: ../src/keybindings.c:487 msgid "Show Color Chooser" msgstr "Mostrar Selector de Colores" -#: ../src/keybindings.c:485 ../src/keybindings.c:488 +#: ../src/keybindings.c:489 ../src/keybindings.c:492 msgid "Help" msgstr "Ayuda" -#: ../src/keybindings.c:777 +#: ../src/keybindings.c:782 msgid "Keyboard Shortcuts" msgstr "Atajos de Teclado" -#: ../src/keybindings.c:790 +#: ../src/keybindings.c:795 msgid "The following keyboard shortcuts are configurable:" msgstr "Los siguientes atajos de teclado son configurables:" -#: ../src/keybindings.c:1446 +#: ../src/keybindings.c:1530 #, fuzzy msgid "Switch to Document" msgstr "Ir al documento de la izq." @@ -3199,7 +3222,7 @@ #: ../src/main.c:126 ../src/main.c:146 msgid "Be verbose" -msgstr "" +msgstr "Modo Verbose (amplía la información mostrada)" #: ../src/main.c:127 msgid "Print internal filetype names" @@ -3229,7 +3252,7 @@ #: ../src/main.c:136 msgid "Don't load auto completion data (see documentation)" -msgstr "No cargar los datos de compleción automática (ver la documentación)" +msgstr "No cargar los datos de completado automático (ver la documentación)" #: ../src/main.c:138 msgid "Don't load plugins" @@ -3255,40 +3278,46 @@ msgid "Show version and exit" msgstr "Mostrar versión y salir" -#: ../src/main.c:483 +#: ../src/main.c:494 msgid "[FILES...]" msgstr "[ARCHIVOS...]" -#: ../src/main.c:500 +#: ../src/main.c:511 #, c-format msgid "(built on %s with GTK %d.%d.%d, GLib %d.%d.%d)" msgstr "(compilado en %s con GTK %d.%d.%d, GLib %d.%d.%d)" -#: ../src/main.c:604 +#: ../src/main.c:616 msgid "Move it now?" -msgstr "" +msgstr "¿Moverlo ahora?" -#: ../src/main.c:606 +#: ../src/main.c:618 msgid "Geany needs to move your old configuration directory before starting." msgstr "" +"Geany necesita mover su directorio de configuración antiguo antes de empezar." -#: ../src/main.c:612 +#: ../src/main.c:624 #, c-format msgid "" "Your configuration directory has been successfully moved from \"%s\" to \"%s" "\"." msgstr "" +"Su directorio de configuración se ha movido correctamente desde \"%s\" hacia " +"\"%s\"." #. for translators: the third %s in brackets is the error message which #. * describes why moving the dir didn't work -#: ../src/main.c:622 +#: ../src/main.c:634 #, c-format msgid "" "Your old configuration directory \"%s\" could not be moved to \"%s\" (%s). " "Please move manually the directory to the new location." msgstr "" +"Su directorio de configuración antiguo \"%s\" no se pudo mover hacia \"%s" +"\" (%s). Por favor, mueva manualmente su antiguo directorio al nuevo lugar " +"correspondiente." -#: ../src/main.c:702 +#: ../src/main.c:715 #, c-format msgid "" "Configuration directory could not be created (%s).\n" @@ -3299,40 +3328,40 @@ "Puede haber problemas usando Geany sin un directorio de configuración.\n" "¿Iniciar Geany de todas formas?" -#: ../src/main.c:788 ../src/socket.c:160 +#: ../src/main.c:801 ../src/socket.c:160 #, c-format msgid "Could not find file '%s'." msgstr "No se pudo encontrar el archivo '%s'." -#: ../src/main.c:1007 +#: ../src/main.c:1020 #, c-format msgid "This is Geany %s." msgstr "Este es Geany %s." -#: ../src/main.c:1009 +#: ../src/main.c:1022 #, c-format msgid "Configuration directory could not be created (%s)." msgstr "El directorio de configuración no pudo ser creada (%s)." -#: ../src/main.c:1219 +#: ../src/main.c:1238 #, fuzzy msgid "Configuration files reloaded." msgstr "archivo de configuración de %s, editarlo como lo necesite" -#: ../src/msgwindow.c:116 +#: ../src/msgwindow.c:134 msgid "Status messages" msgstr "Mensajes de estado" -#: ../src/msgwindow.c:491 +#: ../src/msgwindow.c:512 #, fuzzy msgid "Copy _All" msgstr "C_errar Todo" -#: ../src/msgwindow.c:521 +#: ../src/msgwindow.c:542 msgid "_Hide Message Window" msgstr "_Ocultar Ventana de Mensajes" -#: ../src/plugins.c:430 +#: ../src/plugins.c:435 #, c-format msgid "" "The plugin \"%s\" is not binary compatible with this release of Geany - " @@ -3341,11 +3370,11 @@ "El complemento \"%s\" no es compatible binariamente con esta distribución de " "Geany - por favor recompilarlo." -#: ../src/plugins.c:862 +#: ../src/plugins.c:870 msgid "_Plugin Manager" msgstr "_Administrador de Complementos" -#: ../src/plugins.c:1008 +#: ../src/plugins.c:1016 #, c-format msgid "" "Plugin: %s %s\n" @@ -3356,23 +3385,23 @@ "Descripción: %s\n" "Autor(es): %s" -#: ../src/plugins.c:1079 +#: ../src/plugins.c:1087 msgid "Active" msgstr "Activo" -#: ../src/plugins.c:1085 +#: ../src/plugins.c:1093 msgid "Plugin" msgstr "Complemento" -#: ../src/plugins.c:1109 +#: ../src/plugins.c:1117 msgid "No plugins available." msgstr "No hay complementos disponibles." -#: ../src/plugins.c:1221 +#: ../src/plugins.c:1229 msgid "Plugins" msgstr "Complementos" -#: ../src/plugins.c:1241 +#: ../src/plugins.c:1249 msgid "" "Below is a list of available plugins. Select the plugins which should be " "loaded when Geany is started." @@ -3380,7 +3409,7 @@ "Debajo se encuentra una lista de complementos disponibles. Seleccione los " "complementos que deben ser cargados cuando se inicia Geayn." -#: ../src/plugins.c:1254 +#: ../src/plugins.c:1262 msgid "Plugin details:" msgstr "Detalles del complemente:" @@ -3460,8 +3489,8 @@ "GTK 2.10 (or above) and Geany is running with GTK 2.10 (or above)." msgstr "" "Noticia: La impresión nativa de GTK sólo está disponible si Geany fue " -"compilado contra GTK 2.10 (o mayor) and Geany está corriendo con GTK " -"2.10 (o mayor)." +"compilado con GTK 2.10 (o superior) y Geany está corriendo con GTK " +"2.10 (o superior)." #. page Toolbar #: ../src/prefs.c:1446 @@ -3469,6 +3498,9 @@ "Notice: To customize the toolbar elements, edit the file 'ui_toolbar." "xml'. Please see the documentation for details." msgstr "" +"Información: Para personalizar los elementos de la barra de herramientas, " +"modifique el archivo 'ui_toolbar.xml'. Por favor consulte la documentación " +"para más detalles." #. page Editor->Indentation #: ../src/prefs.c:1452 @@ -3476,17 +3508,19 @@ "Warning: these settings are overridden by the current project. See " "Project->Properties." msgstr "" +"Advertencia: Estos ajustes son invalidados por el proyecto actual. " +"Consulte Proyecto->Propiedades." #: ../src/printing.c:270 #, c-format msgid "Page %d of %d" msgstr "Página %d de %d" -#: ../src/printing.c:337 +#: ../src/printing.c:340 msgid "Document Setup" msgstr "Configuración del Documento" -#: ../src/printing.c:349 +#: ../src/printing.c:352 #, fuzzy msgid "" "Add page numbers at the bottom of each page. It takes 2 lines of the page" @@ -3494,32 +3528,32 @@ "Agregar números the página al final de cada página. Ocupa 2 lineas de la " "página." -#: ../src/printing.c:487 +#: ../src/printing.c:491 #, fuzzy, c-format msgid "Page %d of %d" msgstr "Página %d de %d" -#: ../src/printing.c:737 +#: ../src/printing.c:741 #, c-format msgid "Printing of file %s was cancelled." msgstr "La impresión de %s fue cancelada." -#: ../src/printing.c:739 ../src/printing.c:858 +#: ../src/printing.c:743 ../src/printing.c:862 #, c-format msgid "File %s printed." msgstr "Archivo %s impreso." -#: ../src/printing.c:788 +#: ../src/printing.c:792 #, c-format msgid "Printing of %s failed (%s)." msgstr "La impresión de %s ha fallado (%s)." -#: ../src/printing.c:828 +#: ../src/printing.c:832 msgid "Please set a print command in the preferences dialog first" msgstr "" "Por favor primero configure un comando de impresión en el diálogo de opciones" -#: ../src/printing.c:836 +#: ../src/printing.c:840 #, c-format msgid "" "The file \"%s\" will be printed with the following command:\n" @@ -3530,7 +3564,7 @@ "\n" "%s" -#: ../src/printing.c:852 +#: ../src/printing.c:856 #, c-format msgid "Printing of \"%s\" failed (return code: %s)." msgstr "La impresión de \"%s\" ha fallado (código de retorno: %s)." @@ -3549,19 +3583,19 @@ msgid "C_reate" msgstr "C_rear" -#: ../src/project.c:140 ../src/project.c:371 +#: ../src/project.c:140 ../src/project.c:377 msgid "Name:" -msgstr "Nómbre:" +msgstr "Nombre:" -#: ../src/project.c:148 ../src/project.c:383 +#: ../src/project.c:149 ../src/project.c:390 msgid "Filename:" msgstr "Nombre de Archivo:" -#: ../src/project.c:163 ../src/project.c:412 +#: ../src/project.c:165 ../src/project.c:420 msgid "Base path:" msgstr "Ruta base:" -#: ../src/project.c:168 ../src/project.c:420 +#: ../src/project.c:171 ../src/project.c:429 msgid "" "Base directory of all files that make up the project. This can be a new " "path, or an existing directory tree. You can use paths relative to the " @@ -3571,41 +3605,41 @@ "ser una ruta nueva o un árbol de directorios ya existente. Pueden usarse " "rutas relativas al archivo de proyecto." -#: ../src/project.c:171 ../src/project.c:423 +#: ../src/project.c:174 ../src/project.c:432 msgid "Choose Project Base Path" msgstr "Elija la Ruta Base del Proyecto" -#: ../src/project.c:216 ../src/project.c:253 ../src/project.c:893 +#: ../src/project.c:219 ../src/project.c:256 ../src/project.c:903 #, c-format msgid "Project file \"%s\" could not be loaded." msgstr "El archivo de proyecto \"%s\" no pudo ser cargado." -#: ../src/project.c:247 ../src/project.c:265 +#: ../src/project.c:250 ../src/project.c:268 msgid "Open Project" msgstr "Abrir Proyecto" -#: ../src/project.c:285 +#: ../src/project.c:288 msgid "Project files" msgstr "Archivos del proyecto" -#: ../src/project.c:318 +#: ../src/project.c:321 #, c-format msgid "Project \"%s\" closed." msgstr "Proyecto \"%s\" cerrado." -#: ../src/project.c:395 +#: ../src/project.c:403 msgid "Description:" msgstr "Descripción:" -#: ../src/project.c:429 +#: ../src/project.c:438 msgid "Make in base path" msgstr "Make en el directorio base" -#: ../src/project.c:434 +#: ../src/project.c:443 msgid "Run command:" msgstr "Comando de ejecución:" -#: ../src/project.c:442 +#: ../src/project.c:452 msgid "" "Command-line to run in the project base directory. Options can be appended " "to the command. Leave blank to use the default run command." @@ -3613,72 +3647,72 @@ "Linea de comandos a correr en la ruta base del proyecto. Opciones pueden ser " "agregadas al comando. Dejar en blanco para usar el comando por defecto." -#: ../src/project.c:457 +#: ../src/project.c:467 msgid "File patterns:" msgstr "Patrones de archivos:" -#: ../src/project.c:559 +#: ../src/project.c:569 msgid "Do you want to close it before proceeding?" msgstr "¿Quiere cerrarlo antes de proceder?" -#: ../src/project.c:560 +#: ../src/project.c:570 #, c-format msgid "The '%s' project is already open." msgstr "El proyecto '%s' ya está abierto. " -#: ../src/project.c:604 @@ Diff output truncated at 100000 characters. @@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3603] trunk
by frlan＠users.sourceforge.net 26 Feb '09

26 Feb '09

Revision: 3603 http://geany.svn.sourceforge.net/geany/?rev=3603&view=rev Author: frlan Date: 2009-02-26 01:25:38 +0000 (Thu, 26 Feb 2009) Log Message: ----------- Removed deprecated plugin VC Diff. Please use geanyVC instead Modified Paths: -------------- trunk/ChangeLog trunk/plugins/Makefile.am trunk/po/POTFILES.in trunk/wscript Removed Paths: ------------- trunk/plugins/vcdiff.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-02-25 23:29:34 UTC (rev 3602) +++ trunk/ChangeLog 2009-02-26 01:25:38 UTC (rev 3603) @@ -1,3 +1,9 @@ +2009-02-26 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> + + * plugins/vcdiff.c, plugins/Makefile.am, po/POTFILES.in: + Removed deprecated plugin VC Diff + + 2009-02-25 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * src/templates.c: Modified: trunk/plugins/Makefile.am =================================================================== --- trunk/plugins/Makefile.am 2009-02-25 23:29:34 UTC (rev 3602) +++ trunk/plugins/Makefile.am 2009-02-26 01:25:38 UTC (rev 3603) @@ -24,7 +24,6 @@ classbuilder_la_LDFLAGS = -module -avoid-version htmlchars_la_LDFLAGS = -module -avoid-version export_la_LDFLAGS = -module -avoid-version -vcdiff_la_LDFLAGS = -module -avoid-version saveactions_la_LDFLAGS = -module -avoid-version filebrowser_la_LDFLAGS = -module -avoid-version splitwindow_la_LDFLAGS = -module -avoid-version @@ -51,7 +50,6 @@ classbuilder.dll \ htmlchars.dll \ export.dll \ - vcdiff.dll \ saveactions.dll \ filebrowser.dll # Split Window is broken on Windows @@ -71,7 +69,6 @@ classbuilder.la \ htmlchars.la \ export.la \ - vcdiff.la \ saveactions.la \ filebrowser.la \ splitwindow.la @@ -84,7 +81,6 @@ classbuilder_la_SOURCES = classbuilder.c htmlchars_la_SOURCES = htmlchars.c export_la_SOURCES = export.c -vcdiff_la_SOURCES = vcdiff.c saveactions_la_SOURCES = saveactions.c filebrowser_la_SOURCES = filebrowser.c splitwindow_la_SOURCES = splitwindow.c @@ -94,7 +90,6 @@ classbuilder_la_LIBADD = $(GTK_LIBS) htmlchars_la_LIBADD = $(GTK_LIBS) export_la_LIBADD = $(GTK_LIBS) -vcdiff_la_LIBADD = $(GTK_LIBS) saveactions_la_LIBADD = $(GTK_LIBS) filebrowser_la_LIBADD = $(GTK_LIBS) splitwindow_la_LIBADD = $(GTK_LIBS) Deleted: trunk/plugins/vcdiff.c =================================================================== --- trunk/plugins/vcdiff.c 2009-02-25 23:29:34 UTC (rev 3602) +++ trunk/plugins/vcdiff.c 2009-02-26 01:25:38 UTC (rev 3603) @@ -1,561 +0,0 @@ -/* - * vcdiff.c - this file is part of Geany, a fast and lightweight IDE - * - * Copyright 2007-2009 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> - * Copyright 2007-2009 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2007-2009 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> - * Copyright 2007-2008 Yura Siamashka <yurand2(at)gmail(dot)com> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -/* Version Diff plugin */ -/* This small plugin uses svn/git/etc. to generate a diff against the current - * version inside version control. - * Which VC program to use is detected by looking for a version control subdirectory, - * e.g. ".svn". */ - -#include "geany.h" -#include <string.h> - -#include "support.h" -#include "plugindata.h" -#include "document.h" -#include "editor.h" -#include "filetypes.h" -#include "utils.h" -#include "project.h" -#include "ui_utils.h" -#include "geanyfunctions.h" - -#define project geany->app->project - - -GeanyData *geany_data; -GeanyFunctions *geany_functions; - - -PLUGIN_VERSION_CHECK(GEANY_API_VERSION) - -PLUGIN_SET_INFO(_("Version Diff"), _("Creates a patch of a file against version control."), VERSION, - _("The Geany developer team")) - - -static GtkWidget *main_menu_item = NULL; - - -enum -{ - VC_COMMAND_DIFF_FILE, - VC_COMMAND_DIFF_DIR, - VC_COMMAND_DIFF_PROJECT -}; - -/* The addresses of these strings act as enums, their contents are not used. */ -static const gchar DIRNAME[] = "*DIRNAME*"; -static const gchar FILENAME[] = "*FILENAME*"; -static const gchar BASE_FILENAME[] = "*BASE_FILENAME*"; - - -static const gchar* SVN_CMD_DIFF_FILE[] = {"svn", "diff", "--non-interactive", FILENAME, NULL}; -static const gchar* SVN_CMD_DIFF_DIR[] = {"svn", "diff", "--non-interactive", DIRNAME, NULL}; -static const gchar* SVN_CMD_DIFF_PROJECT[] = {"svn", "diff", "--non-interactive", DIRNAME, NULL}; - -static void* SVN_COMMANDS[] = { SVN_CMD_DIFF_FILE, SVN_CMD_DIFF_DIR, SVN_CMD_DIFF_PROJECT }; - - -static const gchar* CVS_CMD_DIFF_FILE[] = {"cvs", "diff", "-u", BASE_FILENAME, NULL}; -static const gchar* CVS_CMD_DIFF_DIR[] = {"cvs", "diff", "-u",NULL}; -static const gchar* CVS_CMD_DIFF_PROJECT[] = {"cvs", "diff", "-u", NULL}; - -static void* CVS_COMMANDS[] = { CVS_CMD_DIFF_FILE, CVS_CMD_DIFF_DIR, CVS_CMD_DIFF_PROJECT }; - - -static const gchar* GIT_CMD_DIFF_FILE[] = {"git", "diff", "HEAD", "--", BASE_FILENAME, NULL}; -static const gchar* GIT_CMD_DIFF_DIR[] = {"git", "diff", "HEAD", NULL}; -static const gchar* GIT_CMD_DIFF_PROJECT[] = {"git", "diff", "HEAD", NULL}; - -static const gchar* GIT_ENV_DIFF_FILE[] = {"PAGER=cat", NULL}; -static const gchar* GIT_ENV_DIFF_DIR[] = {"PAGER=cat", NULL}; -static const gchar* GIT_ENV_DIFF_PROJECT[] = {"PAGER=cat", NULL}; - -static void* GIT_COMMANDS[] = { GIT_CMD_DIFF_FILE, GIT_CMD_DIFF_DIR, GIT_CMD_DIFF_PROJECT }; -static void* GIT_ENV[] = { GIT_ENV_DIFF_FILE, GIT_ENV_DIFF_DIR, GIT_ENV_DIFF_PROJECT }; - - -typedef struct VC_RECORD -{ - void** commands; - void** envs; - const gchar *program; - const gchar *subdir; /* version control subdirectory, e.g. ".svn" */ - gboolean check_parents; /* check parent dirs to find subdir */ -} VC_RECORD; - - -static void *NO_ENV[] = {NULL, NULL, NULL}; - -/* Adding another VC system should be as easy as adding another entry in this array. */ -static VC_RECORD VC[] = { - {SVN_COMMANDS, NO_ENV, "svn", ".svn", FALSE}, - {CVS_COMMANDS, NO_ENV, "cvs", "CVS", FALSE}, - {GIT_COMMANDS, GIT_ENV, "git", ".git", TRUE}, -}; - - -static gboolean find_subdir(const gchar* filename, const gchar *subdir) -{ - gboolean ret = FALSE; - gchar *base; - gchar *gitdir; - gchar *base_prev = g_strdup(":"); - - if (g_file_test(filename, G_FILE_TEST_IS_DIR)) - base = g_strdup(filename); - else - base = g_path_get_dirname(filename); - - while (strcmp(base, base_prev) != 0) - { - gitdir = g_build_path("/", base, subdir, NULL); - ret = g_file_test(gitdir, G_FILE_TEST_IS_DIR); - g_free(gitdir); - if (ret) - break; - g_free(base_prev); - base_prev = base; - base = g_path_get_dirname(base); - } - - g_free(base); - g_free(base_prev); - return ret; -} - - -static gboolean check_filename(const gchar* filename, VC_RECORD *vc) -{ - gboolean ret; - gchar *base; - gchar *dir; - gchar *path; - - if (! filename) - return FALSE; - - path = g_find_program_in_path(vc->program); - if (!path) - return FALSE; - g_free(path); - - if (vc->check_parents) - return find_subdir(filename, vc->subdir); - - if (g_file_test(filename, G_FILE_TEST_IS_DIR)) - base = g_strdup(filename); - else - base = g_path_get_dirname(filename); - dir = g_build_path("/", base, vc->subdir, NULL); - - ret = g_file_test(dir, G_FILE_TEST_IS_DIR); - - g_free(base); - g_free(dir); - - return ret; -} - - -static void* find_cmd_env(gint cmd_type, gboolean cmd, const gchar* filename) -{ - guint i, len; - - len = G_N_ELEMENTS(VC); - for (i = 0; i < len; i++) - { - if (check_filename(filename, &VC[i])) - { - if (cmd) - return VC[i].commands[cmd_type]; - else - return VC[i].envs[cmd_type]; - } - } - return NULL; -} - - -static gchar *quote_path(const gchar *path) -{ -#ifdef G_OS_WIN32 - /* On Windows we need to quote the path in order to handle spaces in paths correctly. */ - return g_strconcat("\"", path, "\"", NULL); -#else - return g_strdup(path); -#endif -} - - -static void* get_cmd_env(gint cmd_type, gboolean cmd, const gchar* filename, int *size) -{ - int i; - gint len = 0; - gchar** argv; - gchar** ret; - gchar* dir; - gchar* base_filename; - - argv = find_cmd_env(cmd_type, cmd, filename); - if (!argv) - return NULL; - - if (g_file_test(filename, G_FILE_TEST_IS_DIR)) - { - dir = g_strdup(filename); - } - else - { - dir = g_path_get_dirname(filename); - } - base_filename = g_path_get_basename(filename); - - while(1) - { - if (argv[len] == NULL) - break; - len++; - } - ret = g_malloc(sizeof(gchar*) * (len+1)); - memset(ret, 0, sizeof(gchar*) * (len+1)); - for (i = 0; i < len; i++) - { - if (argv[i] == DIRNAME) - { - ret[i] = quote_path(dir); - } - else if (argv[i] == FILENAME) - { - ret[i] = quote_path(filename); - } - else if (argv[i] == BASE_FILENAME) - { - ret[i] = quote_path(base_filename); - } - else - ret[i] = quote_path(argv[i]); - } - - *size = len; - - g_free(dir); - g_free(base_filename); - return ret; -} - - -/* utf8_name_prefix can have a path. */ -static void show_output(const gchar *std_output, const gchar *utf8_name_prefix, - const gchar *force_encoding) -{ - gchar *text, *detect_enc = NULL; - gint page; - GeanyDocument *doc; - GtkNotebook *book; - gchar *filename; - - filename = g_path_get_basename(utf8_name_prefix); - setptr(filename, g_strconcat(filename, ".vc.diff", NULL)); - - /* need to convert input text from the encoding of the original file into - * UTF-8 because internally Geany always needs UTF-8 */ - if (force_encoding) - { - text = encodings_convert_to_utf8_from_charset( - std_output, (gsize)-1, force_encoding, TRUE); - } - else - { - text = encodings_convert_to_utf8(std_output, (gsize)-1, &detect_enc); - } - if (text) - { - GeanyIndentType indent_type = - document_get_current()->editor->indent_type; - - doc = document_find_by_filename(filename); - if (doc == NULL) - { - GeanyFiletype *ft = filetypes_lookup_by_name("Diff"); - doc = document_new_file(filename, ft, text); - } - else - { - sci_set_text(doc->editor->sci, text); - book = GTK_NOTEBOOK(geany->main_widgets->notebook); - page = gtk_notebook_page_num(book, GTK_WIDGET(doc->editor->sci)); - gtk_notebook_set_current_page(book, page); - document_set_text_changed(doc, FALSE); - } - editor_set_indent_type(doc->editor, indent_type); - - document_set_encoding(doc, - force_encoding ? force_encoding : detect_enc); - } - else - { - ui_set_statusbar(FALSE, _("Input conversion of the diff output failed.")); - } - g_free(text); - g_free(detect_enc); - g_free(filename); -} - - -static gchar *make_diff(const gchar *filename, gint cmd) -{ - gchar *std_output = NULL; - gchar *std_error = NULL; - gchar *text = NULL; - gchar *dir; - gint argc = 0; - gchar **env = get_cmd_env(cmd, FALSE, filename, &argc); - gchar **argv = get_cmd_env(cmd, TRUE, filename, &argc); - gint exit_code = 0; - GError *error = NULL; - - if (! argv) - { - if (env) - g_strfreev(env); - return NULL; - } - - if (g_file_test(filename, G_FILE_TEST_IS_DIR)) - { - dir = g_strdup(filename); - } - else - { - dir = g_path_get_dirname(filename); - } - - if (utils_spawn_sync(dir, argv, env, G_SPAWN_SEARCH_PATH, NULL, NULL, - &std_output, &std_error, &exit_code, &error)) - { - /* CVS dump stuff to stderr when diff nested dirs */ - if (strcmp(argv[0], "cvs") != 0 && NZV(std_error)) - { - dialogs_show_msgbox(GTK_MESSAGE_WARNING, - _("%s exited with an error: \n%s."), argv[0], g_strstrip(std_error)); - } - else if (NZV(std_output)) - { - text = std_output; - } - else - { - ui_set_statusbar(FALSE, _("No changes were made.")); - } - /* win32_spawn() returns sometimes TRUE but error is set anyway, has to be fixed */ - if (error != NULL) - { - g_error_free(error); - } - } - else - { - gchar *msg; - - if (error != NULL) - { - msg = g_strdup(error->message); - g_error_free(error); - } - else - { /* if we don't have an exact error message, print at least the failing command */ - msg = g_strdup_printf(_("unknown error while trying to spawn a process for %s"), - argv[0]); - } - ui_set_statusbar(FALSE, _("An error occurred (%s)."), msg); - g_free(msg); - } - - g_free(dir); - g_free(std_error); - g_strfreev(env); - g_strfreev(argv); - return text; -} - - -/* Make a diff from the current directory */ -static void vcdirectory_activated(GtkMenuItem *menuitem, gpointer gdata) -{ - GeanyDocument *doc; - gchar *base_name = NULL; - gchar *locale_filename = NULL; - gchar *text; - - doc = document_get_current(); - - g_return_if_fail(doc != NULL && doc->file_name != NULL); - - if (doc->changed) - { - document_save_file(doc, FALSE); - } - - locale_filename = utils_get_locale_from_utf8(doc->file_name); - base_name = g_path_get_dirname(locale_filename); - - text = make_diff(base_name, VC_COMMAND_DIFF_DIR); - if (text) - { - setptr(base_name, utils_get_utf8_from_locale(base_name)); - show_output(text, base_name, NULL); - g_free(text); - } - - g_free(base_name); - g_free(locale_filename); -} - - -/* Callback if menu item for the current project was activated */ -static void vcproject_activated(GtkMenuItem *menuitem, gpointer gdata) -{ - GeanyDocument *doc; - gchar *locale_filename = NULL; - gchar *text; - - doc = document_get_current(); - - g_return_if_fail(project != NULL && NZV(project->base_path)); - - if (doc != NULL && doc->changed && doc->file_name != NULL) - { - document_save_file(doc, FALSE); - } - - locale_filename = utils_get_locale_from_utf8(project->base_path); - text = make_diff(locale_filename, VC_COMMAND_DIFF_PROJECT); - if (text) - { - show_output(text, project->name, NULL); - g_free(text); - } - g_free(locale_filename); -} - - -/* Callback if menu item for a single file was activated */ -static void vcfile_activated(GtkMenuItem *menuitem, gpointer gdata) -{ - GeanyDocument *doc; - gchar *locale_filename, *text; - - doc = document_get_current(); - - g_return_if_fail(doc != NULL && doc->file_name != NULL); - - if (doc->changed) - { - document_save_file(doc, FALSE); - } - - locale_filename = utils_get_locale_from_utf8(doc->file_name); - - text = make_diff(locale_filename, VC_COMMAND_DIFF_FILE); - if (text) - { - show_output(text, doc->file_name, doc->encoding); - g_free(text); - } - g_free(locale_filename); -} - - -static GtkWidget *menu_vcdiff_file = NULL; -static GtkWidget *menu_vcdiff_dir = NULL; -static GtkWidget *menu_vcdiff_project = NULL; - -static void update_menu_items(void) -{ - GeanyDocument *doc; - gboolean have_file; - gboolean have_vc = FALSE; - - doc = document_get_current(); - have_file = doc && doc->file_name && g_path_is_absolute(doc->file_name); - if (find_cmd_env(VC_COMMAND_DIFF_FILE, TRUE, doc->file_name)) - have_vc = TRUE; - - gtk_widget_set_sensitive(menu_vcdiff_file, have_vc && have_file); - gtk_widget_set_sensitive(menu_vcdiff_dir, have_vc && have_file); - gtk_widget_set_sensitive(menu_vcdiff_project, - project != NULL && NZV(project->base_path)); -} - - -/* Called by Geany to initialize the plugin */ -void plugin_init(GeanyData *data) -{ - GtkWidget *menu_vcdiff = NULL; - GtkWidget *menu_vcdiff_menu = NULL; - - menu_vcdiff = gtk_image_menu_item_new_with_mnemonic(_("_Version Diff")); - gtk_container_add(GTK_CONTAINER(geany->main_widgets->tools_menu), menu_vcdiff); - - g_signal_connect(menu_vcdiff, "activate", G_CALLBACK(update_menu_items), NULL); - - menu_vcdiff_menu = gtk_menu_new (); - gtk_menu_item_set_submenu(GTK_MENU_ITEM(menu_vcdiff), menu_vcdiff_menu); - - /* Single file */ - menu_vcdiff_file = gtk_menu_item_new_with_mnemonic(_("From Current _File")); - gtk_container_add(GTK_CONTAINER (menu_vcdiff_menu), menu_vcdiff_file); - ui_widget_set_tooltip_text(menu_vcdiff_file, _("Make a diff from the current active file")); - - g_signal_connect(menu_vcdiff_file, "activate", G_CALLBACK(vcfile_activated), NULL); - - /* Directory */ - menu_vcdiff_dir = gtk_menu_item_new_with_mnemonic(_("From Current _Directory")); - gtk_container_add(GTK_CONTAINER (menu_vcdiff_menu), menu_vcdiff_dir); - ui_widget_set_tooltip_text(menu_vcdiff_dir, - _("Make a diff from the directory of the current active file")); - - g_signal_connect(menu_vcdiff_dir, "activate", G_CALLBACK(vcdirectory_activated), NULL); - - /* Project */ - menu_vcdiff_project = gtk_menu_item_new_with_mnemonic(_("From Current _Project")); - gtk_container_add(GTK_CONTAINER (menu_vcdiff_menu), menu_vcdiff_project); - ui_widget_set_tooltip_text(menu_vcdiff_project, - _("Make a diff from the current project's base path")); - - g_signal_connect(menu_vcdiff_project, "activate", G_CALLBACK(vcproject_activated), NULL); - - gtk_widget_show_all(menu_vcdiff); - - ui_add_document_sensitive(menu_vcdiff); - main_menu_item = menu_vcdiff; -} - - -/* Called by Geany before unloading the plugin. */ -void plugin_cleanup(void) -{ - /* remove the menu item added in plugin_init() */ - gtk_widget_destroy(main_menu_item); -} Modified: trunk/po/POTFILES.in =================================================================== --- trunk/po/POTFILES.in 2009-02-25 23:29:34 UTC (rev 3602) +++ trunk/po/POTFILES.in 2009-02-26 01:25:38 UTC (rev 3603) @@ -42,7 +42,6 @@ plugins/classbuilder.c plugins/htmlchars.c plugins/export.c -plugins/vcdiff.c plugins/filebrowser.c plugins/saveactions.c plugins/splitwindow.c Modified: trunk/wscript =================================================================== --- trunk/wscript 2009-02-25 23:29:34 UTC (rev 3602) +++ trunk/wscript 2009-02-26 01:25:38 UTC (rev 3603) @@ -330,7 +330,6 @@ build_plugin('htmlchars') build_plugin('saveactions') build_plugin('splitwindow') - build_plugin('vcdiff') # Translations bld.new_task_gen( This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3602] trunk
by eht16＠users.sourceforge.net 26 Feb '09

26 Feb '09

Revision: 3602 http://geany.svn.sourceforge.net/geany/?rev=3602&view=rev Author: eht16 Date: 2009-02-25 23:29:34 +0000 (Wed, 25 Feb 2009) Log Message: ----------- Fix mnemonic for the Edit->Preferences menu item. Modified Paths: -------------- trunk/ChangeLog trunk/geany.glade trunk/src/interface.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-02-25 23:28:01 UTC (rev 3601) +++ trunk/ChangeLog 2009-02-25 23:29:34 UTC (rev 3602) @@ -8,6 +8,8 @@ src/vte.h, THANKS: Add 'Send Selection to Terminal' command to the Edit->Format menu (initial patch by David Gleich, thanks). + * geany.glade, src/interface.c: + Fix mnemonic for the Edit->Preferences menu item. 2009-02-24 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> Modified: trunk/geany.glade =================================================================== --- trunk/geany.glade 2009-02-25 23:28:01 UTC (rev 3601) +++ trunk/geany.glade 2009-02-25 23:29:34 UTC (rev 3602) @@ -61,7 +61,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image2803"> + <widget class="GtkImage" id="image2831"> <property name="visible">True</property> <property name="stock">gtk-new</property> <property name="icon_size">1</property> @@ -151,7 +151,7 @@ <signal name="activate" handler="on_save_all1_activate" last_modification_time="Thu, 02 Jun 2005 14:15:30 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image2804"> + <widget class="GtkImage" id="image2832"> <property name="visible">True</property> <property name="stock">gtk-save</property> <property name="icon_size">1</property> @@ -172,7 +172,7 @@ <signal name="activate" handler="on_toolbutton_reload_clicked" last_modification_time="Mon, 01 Sep 2008 16:57:06 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image2805"> + <widget class="GtkImage" id="image2833"> <property name="visible">True</property> <property name="stock">gtk-revert-to-saved</property> <property name="icon_size">1</property> @@ -192,7 +192,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image2806"> + <widget class="GtkImage" id="image2834"> <property name="visible">True</property> <property name="stock">gtk-revert-to-saved</property> <property name="icon_size">1</property> @@ -279,7 +279,7 @@ <signal name="activate" handler="on_close_other_documents1_activate" last_modification_time="Fri, 27 Jun 2008 15:19:28 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image2807"> + <widget class="GtkImage" id="image2835"> <property name="visible">True</property> <property name="stock">gtk-close</property> <property name="icon_size">1</property> @@ -300,7 +300,7 @@ <signal name="activate" handler="on_close_all1_activate" last_modification_time="Thu, 02 Jun 2005 14:15:30 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image2808"> + <widget class="GtkImage" id="image2836"> <property name="visible">True</property> <property name="stock">gtk-close</property> <property name="icon_size">1</property> @@ -497,7 +497,7 @@ <signal name="activate" handler="on_menu_increase_indent1_activate" last_modification_time="Tue, 01 Aug 2006 10:28:54 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image2809"> + <widget class="GtkImage" id="image2837"> <property name="visible">True</property> <property name="stock">gtk-indent</property> <property name="icon_size">1</property> @@ -518,7 +518,7 @@ <signal name="activate" handler="on_menu_decrease_indent1_activate" last_modification_time="Tue, 01 Aug 2006 10:28:54 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image2810"> + <widget class="GtkImage" id="image2838"> <property name="visible">True</property> <property name="stock">gtk-unindent</property> <property name="icon_size">1</property> @@ -583,7 +583,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image2811"> + <widget class="GtkImage" id="image2839"> <property name="visible">True</property> <property name="stock">gtk-add</property> <property name="icon_size">1</property> @@ -662,7 +662,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image2812"> + <widget class="GtkImage" id="image2840"> <property name="visible">True</property> <property name="stock">gtk-add</property> <property name="icon_size">1</property> @@ -694,7 +694,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image2813"> + <widget class="GtkImage" id="image2841"> <property name="visible">True</property> <property name="stock">gtk-add</property> <property name="icon_size">1</property> @@ -728,9 +728,21 @@ <child> <widget class="GtkImageMenuItem" id="preferences1"> <property name="visible">True</property> - <property name="label">gtk-preferences</property> - <property name="use_stock">True</property> + <property name="label" translatable="yes">Preference_s</property> + <property name="use_underline">True</property> <signal name="activate" handler="on_preferences1_activate" last_modification_time="Wed, 08 Jun 2005 11:35:19 GMT"/> + + <child internal-child="image"> + <widget class="GtkImage" id="image2842"> + <property name="visible">True</property> + <property name="stock">gtk-preferences</property> + <property name="icon_size">1</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + </widget> + </child> </widget> </child> </widget> @@ -792,7 +804,7 @@ <signal name="activate" handler="on_replace1_activate" last_modification_time="Sun, 23 Oct 2005 13:22:36 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image2814"> + <widget class="GtkImage" id="image2843"> <property name="visible">True</property> <property name="stock">gtk-find-and-replace</property> <property name="icon_size">1</property> @@ -867,7 +879,7 @@ <signal name="activate" handler="on_go_to_line_activate" last_modification_time="Sat, 06 Dec 2008 17:41:21 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image2815"> + <widget class="GtkImage" id="image2844"> <property name="visible">True</property> <property name="stock">gtk-jump-to</property> <property name="icon_size">1</property> @@ -901,7 +913,7 @@ <signal name="activate" handler="on_change_font1_activate" last_modification_time="Fri, 22 Apr 2005 18:58:45 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image2816"> + <widget class="GtkImage" id="image2845"> <property name="visible">True</property> <property name="stock">gtk-select-font</property> <property name="icon_size">1</property> @@ -1373,7 +1385,7 @@ <signal name="activate" handler="on_project_new1_activate" last_modification_time="Thu, 18 Jan 2007 22:16:24 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image2817"> + <widget class="GtkImage" id="image2846"> <property name="visible">True</property> <property name="stock">gtk-new</property> <property name="icon_size">1</property> @@ -1394,7 +1406,7 @@ <signal name="activate" handler="on_project_open1_activate" last_modification_time="Mon, 15 Jan 2007 17:34:17 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image2818"> + <widget class="GtkImage" id="image2847"> <property name="visible">True</property> <property name="stock">gtk-open</property> <property name="icon_size">1</property> @@ -1415,7 +1427,7 @@ <signal name="activate" handler="on_project_close1_activate" last_modification_time="Mon, 15 Jan 2007 17:34:17 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image2819"> + <widget class="GtkImage" id="image2848"> <property name="visible">True</property> <property name="stock">gtk-close</property> <property name="icon_size">1</property> @@ -1472,7 +1484,7 @@ <signal name="activate" handler="on_show_color_chooser1_activate" last_modification_time="Wed, 22 Jun 2005 18:10:21 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image2820"> + <widget class="GtkImage" id="image2849"> <property name="visible">True</property> <property name="stock">gtk-select-color</property> <property name="icon_size">1</property> @@ -1511,7 +1523,7 @@ <signal name="activate" handler="on_menu_reload_configuration1_activate" last_modification_time="Mon, 30 Jun 2008 16:19:40 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image2821"> + <widget class="GtkImage" id="image2850"> <property name="visible">True</property> <property name="stock">gtk-refresh</property> <property name="icon_size">1</property> @@ -1545,7 +1557,7 @@ <signal name="activate" handler="on_help1_activate" last_modification_time="Sun, 24 Jul 2005 15:23:11 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image2822"> + <widget class="GtkImage" id="image2851"> <property name="visible">True</property> <property name="stock">gtk-help</property> <property name="icon_size">1</property> Modified: trunk/src/interface.c =================================================================== --- trunk/src/interface.c 2009-02-25 23:28:01 UTC (rev 3601) +++ trunk/src/interface.c 2009-02-25 23:29:34 UTC (rev 3602) @@ -37,7 +37,7 @@ GtkWidget *file1_menu; GtkWidget *menu_new1; GtkWidget *menu_new_with_template1; - GtkWidget *image2803; + GtkWidget *image2831; GtkWidget *menu_new_with_template1_menu; GtkWidget *invisible2; GtkWidget *separator12; @@ -48,11 +48,11 @@ GtkWidget *menu_save1; GtkWidget *menu_save_as1; GtkWidget *menu_save_all1; - GtkWidget *image2804; + GtkWidget *image2832; GtkWidget *menu_reload1; - GtkWidget *image2805; + GtkWidget *image2833; GtkWidget *menu_reload_as1; - GtkWidget *image2806; + GtkWidget *image2834; GtkWidget *menu_reload_as1_menu; GtkWidget *invisible7; GtkWidget *separator21; @@ -63,9 +63,9 @@ GtkWidget *separator14; GtkWidget *menu_close1; GtkWidget *close_other_documents1; - GtkWidget *image2807; + GtkWidget *image2835; GtkWidget *menu_close_all1; - GtkWidget *image2808; + GtkWidget *image2836; GtkWidget *menu_separatormenuitem1; GtkWidget *menu_quit1; GtkWidget *edit1; @@ -90,9 +90,9 @@ GtkWidget *menu_duplicate_line1; GtkWidget *separator29; GtkWidget *menu_increase_indent1; - GtkWidget *image2809; + GtkWidget *image2837; GtkWidget *menu_decrease_indent1; - GtkWidget *image2810; + GtkWidget *image2838; GtkWidget *separator37; GtkWidget *send_selection_to_vte1; GtkWidget *send_selection_to2; @@ -100,7 +100,7 @@ GtkWidget *invisible13; GtkWidget *separator18; GtkWidget *add_comments1; - GtkWidget *image2811; + GtkWidget *image2839; GtkWidget *add_comments1_menu; GtkWidget *menu_add_changelog_entry1; GtkWidget *insert_file_header1; @@ -109,15 +109,16 @@ GtkWidget *insert_gpl_notice2; GtkWidget *insert_bsd_license_notice2; GtkWidget *insert_date1; - GtkWidget *image2812; + GtkWidget *image2840; GtkWidget *insert_date1_menu; GtkWidget *invisible8; GtkWidget *insert_include2; - GtkWidget *image2813; + GtkWidget *image2841; GtkWidget *insert_include2_menu; GtkWidget *invisible4; GtkWidget *separator9; GtkWidget *preferences1; + GtkWidget *image2842; GtkWidget *search1; GtkWidget *search1_menu; GtkWidget *find1; @@ -125,7 +126,7 @@ GtkWidget *find_previous1; GtkWidget *find_in_files1; GtkWidget *replace1; - GtkWidget *image2814; + GtkWidget *image2843; GtkWidget *separator33; GtkWidget *find_nextsel1; GtkWidget *find_prevsel1; @@ -134,11 +135,11 @@ GtkWidget *previous_message1; GtkWidget *separator32; GtkWidget *go_to_line1; - GtkWidget *image2815; + GtkWidget *image2844; GtkWidget *menu_view1; GtkWidget *menu_view1_menu; GtkWidget *menu_change_font1; - GtkWidget *image2816; + GtkWidget *image2845; GtkWidget *menu_separator4; GtkWidget *menu_toggle_all_additional_widgets1; GtkWidget *menu_fullscreen1; @@ -196,26 +197,26 @@ GtkWidget *menu_project1; GtkWidget *menu_project1_menu; GtkWidget *project_new1; - GtkWidget *image2817; + GtkWidget *image2846; GtkWidget *project_open1; - GtkWidget *image2818; + GtkWidget *image2847; GtkWidget *project_close1; - GtkWidget *image2819; + GtkWidget *image2848; GtkWidget *separator34; GtkWidget *project_properties1; GtkWidget *menu_build1; GtkWidget *tools1; GtkWidget *tools1_menu; GtkWidget *menu_choose_color1; - GtkWidget *image2820; + GtkWidget *image2849; GtkWidget *menu_count_words1; GtkWidget *load_tags1; GtkWidget *menu_reload_configuration1; - GtkWidget *image2821; + GtkWidget *image2850; GtkWidget *menu_help1; GtkWidget *menu_help1_menu; GtkWidget *help1; - GtkWidget *image2822; + GtkWidget *image2851; GtkWidget *website1; GtkWidget *keyboard_shortcuts1; GtkWidget *debug_messages1; @@ -281,9 +282,9 @@ gtk_widget_show (menu_new_with_template1); gtk_container_add (GTK_CONTAINER (file1_menu), menu_new_with_template1); - image2803 = gtk_image_new_from_stock ("gtk-new", GTK_ICON_SIZE_MENU); - gtk_widget_show (image2803); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_new_with_template1), image2803); + image2831 = gtk_image_new_from_stock ("gtk-new", GTK_ICON_SIZE_MENU); + gtk_widget_show (image2831); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_new_with_template1), image2831); menu_new_with_template1_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_new_with_template1), menu_new_with_template1_menu); @@ -326,25 +327,25 @@ gtk_widget_show (menu_save_all1); gtk_container_add (GTK_CONTAINER (file1_menu), menu_save_all1); - image2804 = gtk_image_new_from_stock ("gtk-save", GTK_ICON_SIZE_MENU); - gtk_widget_show (image2804); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_save_all1), image2804); + image2832 = gtk_image_new_from_stock ("gtk-save", GTK_ICON_SIZE_MENU); + gtk_widget_show (image2832); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_save_all1), image2832); menu_reload1 = gtk_image_menu_item_new_with_mnemonic (_("_Reload")); gtk_widget_show (menu_reload1); gtk_container_add (GTK_CONTAINER (file1_menu), menu_reload1); - image2805 = gtk_image_new_from_stock ("gtk-revert-to-saved", GTK_ICON_SIZE_MENU); - gtk_widget_show (image2805); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload1), image2805); + image2833 = gtk_image_new_from_stock ("gtk-revert-to-saved", GTK_ICON_SIZE_MENU); + gtk_widget_show (image2833); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload1), image2833); menu_reload_as1 = gtk_image_menu_item_new_with_mnemonic (_("R_eload As")); gtk_widget_show (menu_reload_as1); gtk_container_add (GTK_CONTAINER (file1_menu), menu_reload_as1); - image2806 = gtk_image_new_from_stock ("gtk-revert-to-saved", GTK_ICON_SIZE_MENU); - gtk_widget_show (image2806); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload_as1), image2806); + image2834 = gtk_image_new_from_stock ("gtk-revert-to-saved", GTK_ICON_SIZE_MENU); + gtk_widget_show (image2834); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload_as1), image2834); menu_reload_as1_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_reload_as1), menu_reload_as1_menu); @@ -387,17 +388,17 @@ gtk_widget_show (close_other_documents1); gtk_container_add (GTK_CONTAINER (file1_menu), close_other_documents1); - image2807 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU); - gtk_widget_show (image2807); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (close_other_documents1), image2807); + image2835 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU); + gtk_widget_show (image2835); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (close_other_documents1), image2835); menu_close_all1 = gtk_image_menu_item_new_with_mnemonic (_("C_lose All")); gtk_widget_show (menu_close_all1); gtk_container_add (GTK_CONTAINER (file1_menu), menu_close_all1); - image2808 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU); - gtk_widget_show (image2808); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_close_all1), image2808); + image2836 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU); + gtk_widget_show (image2836); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_close_all1), image2836); menu_separatormenuitem1 = gtk_separator_menu_item_new (); gtk_widget_show (menu_separatormenuitem1); @@ -499,17 +500,17 @@ gtk_widget_show (menu_increase_indent1); gtk_container_add (GTK_CONTAINER (menu_format1_menu), menu_increase_indent1); - image2809 = gtk_image_new_from_stock ("gtk-indent", GTK_ICON_SIZE_MENU); - gtk_widget_show (image2809); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_increase_indent1), image2809); + image2837 = gtk_image_new_from_stock ("gtk-indent", GTK_ICON_SIZE_MENU); + gtk_widget_show (image2837); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_increase_indent1), image2837); menu_decrease_indent1 = gtk_image_menu_item_new_with_mnemonic (_("_Decrease Indent")); gtk_widget_show (menu_decrease_indent1); gtk_container_add (GTK_CONTAINER (menu_format1_menu), menu_decrease_indent1); - image2810 = gtk_image_new_from_stock ("gtk-unindent", GTK_ICON_SIZE_MENU); - gtk_widget_show (image2810); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_decrease_indent1), image2810); + image2838 = gtk_image_new_from_stock ("gtk-unindent", GTK_ICON_SIZE_MENU); + gtk_widget_show (image2838); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_decrease_indent1), image2838); separator37 = gtk_separator_menu_item_new (); gtk_widget_show (separator37); @@ -539,9 +540,9 @@ gtk_widget_show (add_comments1); gtk_container_add (GTK_CONTAINER (edit1_menu), add_comments1); - image2811 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); - gtk_widget_show (image2811); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (add_comments1), image2811); + image2839 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); + gtk_widget_show (image2839); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (add_comments1), image2839); add_comments1_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (add_comments1), add_comments1_menu); @@ -574,9 +575,9 @@ gtk_widget_show (insert_date1); gtk_container_add (GTK_CONTAINER (edit1_menu), insert_date1); - image2812 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); - gtk_widget_show (image2812); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_date1), image2812); + image2840 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); + gtk_widget_show (image2840); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_date1), image2840); insert_date1_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (insert_date1), insert_date1_menu); @@ -588,9 +589,9 @@ gtk_widget_show (insert_include2); gtk_container_add (GTK_CONTAINER (edit1_menu), insert_include2); - image2813 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); - gtk_widget_show (image2813); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_include2), image2813); + image2841 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); + gtk_widget_show (image2841); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_include2), image2841); insert_include2_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (insert_include2), insert_include2_menu); @@ -603,10 +604,14 @@ gtk_container_add (GTK_CONTAINER (edit1_menu), separator9); gtk_widget_set_sensitive (separator9, FALSE); - preferences1 = gtk_image_menu_item_new_from_stock ("gtk-preferences", accel_group); + preferences1 = gtk_image_menu_item_new_with_mnemonic (_("Preference_s")); gtk_widget_show (preferences1); gtk_container_add (GTK_CONTAINER (edit1_menu), preferences1); + image2842 = gtk_image_new_from_stock ("gtk-preferences", GTK_ICON_SIZE_MENU); + gtk_widget_show (image2842); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (preferences1), image2842); + search1 = gtk_menu_item_new_with_mnemonic (_("_Search")); gtk_widget_show (search1); gtk_container_add (GTK_CONTAINER (menubar1), search1); @@ -634,9 +639,9 @@ gtk_widget_show (replace1); gtk_container_add (GTK_CONTAINER (search1_menu), replace1); - image2814 = gtk_image_new_from_stock ("gtk-find-and-replace", GTK_ICON_SIZE_MENU); - gtk_widget_show (image2814); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (replace1), image2814); + image2843 = gtk_image_new_from_stock ("gtk-find-and-replace", GTK_ICON_SIZE_MENU); + gtk_widget_show (image2843); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (replace1), image2843); separator33 = gtk_separator_menu_item_new (); gtk_widget_show (separator33); @@ -673,9 +678,9 @@ gtk_widget_show (go_to_line1); gtk_container_add (GTK_CONTAINER (search1_menu), go_to_line1); - image2815 = gtk_image_new_from_stock ("gtk-jump-to", GTK_ICON_SIZE_MENU); - gtk_widget_show (image2815); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (go_to_line1), image2815); + image2844 = gtk_image_new_from_stock ("gtk-jump-to", GTK_ICON_SIZE_MENU); + gtk_widget_show (image2844); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (go_to_line1), image2844); menu_view1 = gtk_menu_item_new_with_mnemonic (_("_View")); gtk_widget_show (menu_view1); @@ -688,9 +693,9 @@ gtk_widget_show (menu_change_font1); gtk_container_add (GTK_CONTAINER (menu_view1_menu), menu_change_font1); - image2816 = gtk_image_new_from_stock ("gtk-select-font", GTK_ICON_SIZE_MENU); - gtk_widget_show (image2816); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_change_font1), image2816); + image2845 = gtk_image_new_from_stock ("gtk-select-font", GTK_ICON_SIZE_MENU); + gtk_widget_show (image2845); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_change_font1), image2845); menu_separator4 = gtk_separator_menu_item_new (); gtk_widget_show (menu_separator4); @@ -929,25 +934,25 @@ gtk_widget_show (project_new1); gtk_container_add (GTK_CONTAINER (menu_project1_menu), project_new1); - image2817 = gtk_image_new_from_stock ("gtk-new", GTK_ICON_SIZE_MENU); - gtk_widget_show (image2817); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_new1), image2817); + image2846 = gtk_image_new_from_stock ("gtk-new", GTK_ICON_SIZE_MENU); + gtk_widget_show (image2846); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_new1), image2846); project_open1 = gtk_image_menu_item_new_with_mnemonic (_("_Open")); gtk_widget_show (project_open1); gtk_container_add (GTK_CONTAINER (menu_project1_menu), project_open1); - image2818 = gtk_image_new_from_stock ("gtk-open", GTK_ICON_SIZE_MENU); - gtk_widget_show (image2818); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_open1), image2818); + image2847 = gtk_image_new_from_stock ("gtk-open", GTK_ICON_SIZE_MENU); + gtk_widget_show (image2847); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_open1), image2847); project_close1 = gtk_image_menu_item_new_with_mnemonic (_("_Close")); gtk_widget_show (project_close1); gtk_container_add (GTK_CONTAINER (menu_project1_menu), project_close1); - image2819 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU); - gtk_widget_show (image2819); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_close1), image2819); + image2848 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU); + gtk_widget_show (image2848); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_close1), image2848); separator34 = gtk_separator_menu_item_new (); gtk_widget_show (separator34); @@ -973,9 +978,9 @@ gtk_widget_show (menu_choose_color1); gtk_container_add (GTK_CONTAINER (tools1_menu), menu_choose_color1); - image2820 = gtk_image_new_from_stock ("gtk-select-color", GTK_ICON_SIZE_MENU); - gtk_widget_show (image2820); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_choose_color1), image2820); + image2849 = gtk_image_new_from_stock ("gtk-select-color", GTK_ICON_SIZE_MENU); + gtk_widget_show (image2849); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_choose_color1), image2849); menu_count_words1 = gtk_menu_item_new_with_mnemonic (_("_Word Count")); gtk_widget_show (menu_count_words1); @@ -989,9 +994,9 @@ gtk_widget_show (menu_reload_configuration1); gtk_container_add (GTK_CONTAINER (tools1_menu), menu_reload_configuration1); - image2821 = gtk_image_new_from_stock ("gtk-refresh", GTK_ICON_SIZE_MENU); - gtk_widget_show (image2821); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload_configuration1), image2821); + image2850 = gtk_image_new_from_stock ("gtk-refresh", GTK_ICON_SIZE_MENU); + gtk_widget_show (image2850); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload_configuration1), image2850); menu_help1 = gtk_menu_item_new_with_mnemonic (_("_Help")); gtk_widget_show (menu_help1); @@ -1004,9 +1009,9 @@ gtk_widget_show (help1); gtk_container_add (GTK_CONTAINER (menu_help1_menu), help1); - image2822 = gtk_image_new_from_stock ("gtk-help", GTK_ICON_SIZE_MENU); - gtk_widget_show (image2822); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (help1), image2822); + image2851 = gtk_image_new_from_stock ("gtk-help", GTK_ICON_SIZE_MENU); + gtk_widget_show (image2851); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (help1), image2851); website1 = gtk_menu_item_new_with_mnemonic (_("_Website")); gtk_widget_show (website1); @@ -1470,7 +1475,7 @@ GLADE_HOOKUP_OBJECT (window1, file1_menu, "file1_menu"); GLADE_HOOKUP_OBJECT (window1, menu_new1, "menu_new1"); GLADE_HOOKUP_OBJECT (window1, menu_new_with_template1, "menu_new_with_template1"); - GLADE_HOOKUP_OBJECT (window1, image2803, "image2803"); + GLADE_HOOKUP_OBJECT (window1, image2831, "image2831"); GLADE_HOOKUP_OBJECT (window1, menu_new_with_template1_menu, "menu_new_with_template1_menu"); GLADE_HOOKUP_OBJECT (window1, invisible2, "invisible2"); GLADE_HOOKUP_OBJECT (window1, separator12, "separator12"); @@ -1481,11 +1486,11 @@ GLADE_HOOKUP_OBJECT (window1, menu_save1, "menu_save1"); GLADE_HOOKUP_OBJECT (window1, menu_save_as1, "menu_save_as1"); GLADE_HOOKUP_OBJECT (window1, menu_save_all1, "menu_save_all1"); - GLADE_HOOKUP_OBJECT (window1, image2804, "image2804"); + GLADE_HOOKUP_OBJECT (window1, image2832, "image2832"); GLADE_HOOKUP_OBJECT (window1, menu_reload1, "menu_reload1"); - GLADE_HOOKUP_OBJECT (window1, image2805, "image2805"); + GLADE_HOOKUP_OBJECT (window1, image2833, "image2833"); GLADE_HOOKUP_OBJECT (window1, menu_reload_as1, "menu_reload_as1"); - GLADE_HOOKUP_OBJECT (window1, image2806, "image2806"); + GLADE_HOOKUP_OBJECT (window1, image2834, "image2834"); GLADE_HOOKUP_OBJECT (window1, menu_reload_as1_menu, "menu_reload_as1_menu"); GLADE_HOOKUP_OBJECT (window1, invisible7, "invisible7"); GLADE_HOOKUP_OBJECT (window1, separator21, "separator21"); @@ -1496,9 +1501,9 @@ GLADE_HOOKUP_OBJECT (window1, separator14, "separator14"); GLADE_HOOKUP_OBJECT (window1, menu_close1, "menu_close1"); GLADE_HOOKUP_OBJECT (window1, close_other_documents1, "close_other_documents1"); - GLADE_HOOKUP_OBJECT (window1, image2807, "image2807"); + GLADE_HOOKUP_OBJECT (window1, image2835, "image2835"); GLADE_HOOKUP_OBJECT (window1, menu_close_all1, "menu_close_all1"); - GLADE_HOOKUP_OBJECT (window1, image2808, "image2808"); + GLADE_HOOKUP_OBJECT (window1, image2836, "image2836"); GLADE_HOOKUP_OBJECT (window1, menu_separatormenuitem1, "menu_separatormenuitem1"); GLADE_HOOKUP_OBJECT (window1, menu_quit1, "menu_quit1"); GLADE_HOOKUP_OBJECT (window1, edit1, "edit1"); @@ -1523,9 +1528,9 @@ GLADE_HOOKUP_OBJECT (window1, menu_duplicate_line1, "menu_duplicate_line1"); GLADE_HOOKUP_OBJECT (window1, separator29, "separator29"); GLADE_HOOKUP_OBJECT (window1, menu_increase_indent1, "menu_increase_indent1"); - GLADE_HOOKUP_OBJECT (window1, image2809, "image2809"); + GLADE_HOOKUP_OBJECT (window1, image2837, "image2837"); GLADE_HOOKUP_OBJECT (window1, menu_decrease_indent1, "menu_decrease_indent1"); - GLADE_HOOKUP_OBJECT (window1, image2810, "image2810"); + GLADE_HOOKUP_OBJECT (window1, image2838, "image2838"); GLADE_HOOKUP_OBJECT (window1, separator37, "separator37"); GLADE_HOOKUP_OBJECT (window1, send_selection_to_vte1, "send_selection_to_vte1"); GLADE_HOOKUP_OBJECT (window1, send_selection_to2, "send_selection_to2"); @@ -1533,7 +1538,7 @@ GLADE_HOOKUP_OBJECT (window1, invisible13, "invisible13"); GLADE_HOOKUP_OBJECT (window1, separator18, "separator18"); GLADE_HOOKUP_OBJECT (window1, add_comments1, "add_comments1"); - GLADE_HOOKUP_OBJECT (window1, image2811, "image2811"); + GLADE_HOOKUP_OBJECT (window1, image2839, "image2839"); GLADE_HOOKUP_OBJECT (window1, add_comments1_menu, "add_comments1_menu"); GLADE_HOOKUP_OBJECT (window1, menu_add_changelog_entry1, "menu_add_changelog_entry1"); GLADE_HOOKUP_OBJECT (window1, insert_file_header1, "insert_file_header1"); @@ -1542,15 +1547,16 @@ GLADE_HOOKUP_OBJECT (window1, insert_gpl_notice2, "insert_gpl_notice2"); GLADE_HOOKUP_OBJECT (window1, insert_bsd_license_notice2, "insert_bsd_license_notice2"); GLADE_HOOKUP_OBJECT (window1, insert_date1, "insert_date1"); - GLADE_HOOKUP_OBJECT (window1, image2812, "image2812"); + GLADE_HOOKUP_OBJECT (window1, image2840, "image2840"); GLADE_HOOKUP_OBJECT (window1, insert_date1_menu, "insert_date1_menu"); GLADE_HOOKUP_OBJECT (window1, invisible8, "invisible8"); GLADE_HOOKUP_OBJECT (window1, insert_include2, "insert_include2"); - GLADE_HOOKUP_OBJECT (window1, image2813, "image2813"); + GLADE_HOOKUP_OBJECT (window1, image2841, "image2841"); GLADE_HOOKUP_OBJECT (window1, insert_include2_menu, "insert_include2_menu"); GLADE_HOOKUP_OBJECT (window1, invisible4, "invisible4"); GLADE_HOOKUP_OBJECT (window1, separator9, "separator9"); GLADE_HOOKUP_OBJECT (window1, preferences1, "preferences1"); + GLADE_HOOKUP_OBJECT (window1, image2842, "image2842"); GLADE_HOOKUP_OBJECT (window1, search1, "search1"); GLADE_HOOKUP_OBJECT (window1, search1_menu, "search1_menu"); GLADE_HOOKUP_OBJECT (window1, find1, "find1"); @@ -1558,7 +1564,7 @@ GLADE_HOOKUP_OBJECT (window1, find_previous1, "find_previous1"); GLADE_HOOKUP_OBJECT (window1, find_in_files1, "find_in_files1"); GLADE_HOOKUP_OBJECT (window1, replace1, "replace1"); - GLADE_HOOKUP_OBJECT (window1, image2814, "image2814"); + GLADE_HOOKUP_OBJECT (window1, image2843, "image2843"); GLADE_HOOKUP_OBJECT (window1, separator33, "separator33"); GLADE_HOOKUP_OBJECT (window1, find_nextsel1, "find_nextsel1"); GLADE_HOOKUP_OBJECT (window1, find_prevsel1, "find_prevsel1"); @@ -1567,11 +1573,11 @@ GLADE_HOOKUP_OBJECT (window1, previous_message1, "previous_message1"); GLADE_HOOKUP_OBJECT (window1, separator32, "separator32"); GLADE_HOOKUP_OBJECT (window1, go_to_line1, "go_to_line1"); - GLADE_HOOKUP_OBJECT (window1, image2815, "image2815"); + GLADE_HOOKUP_OBJECT (window1, image2844, "image2844"); GLADE_HOOKUP_OBJECT (window1, menu_view1, "menu_view1"); GLADE_HOOKUP_OBJECT (window1, menu_view1_menu, "menu_view1_menu"); GLADE_HOOKUP_OBJECT (window1, menu_change_font1, "menu_change_font1"); - GLADE_HOOKUP_OBJECT (window1, image2816, "image2816"); + GLADE_HOOKUP_OBJECT (window1, image2845, "image2845"); GLADE_HOOKUP_OBJECT (window1, menu_separator4, "menu_separator4"); GLADE_HOOKUP_OBJECT (window1, menu_toggle_all_additional_widgets1, "menu_toggle_all_additional_widgets1"); GLADE_HOOKUP_OBJECT (window1, menu_fullscreen1, "menu_fullscreen1"); @@ -1627,26 +1633,26 @@ GLADE_HOOKUP_OBJECT (window1, menu_project1, "menu_project1"); GLADE_HOOKUP_OBJECT (window1, menu_project1_menu, "menu_project1_menu"); GLADE_HOOKUP_OBJECT (window1, project_new1, "project_new1"); - GLADE_HOOKUP_OBJECT (window1, image2817, "image2817"); + GLADE_HOOKUP_OBJECT (window1, image2846, "image2846"); GLADE_HOOKUP_OBJECT (window1, project_open1, "project_open1"); - GLADE_HOOKUP_OBJECT (window1, image2818, "image2818"); + GLADE_HOOKUP_OBJECT (window1, image2847, "image2847"); GLADE_HOOKUP_OBJECT (window1, project_close1, "project_close1"); - GLADE_HOOKUP_OBJECT (window1, image2819, "image2819"); + GLADE_HOOKUP_OBJECT (window1, image2848, "image2848"); GLADE_HOOKUP_OBJECT (window1, separator34, "separator34"); GLADE_HOOKUP_OBJECT (window1, project_properties1, "project_properties1"); GLADE_HOOKUP_OBJECT (window1, menu_build1, "menu_build1"); GLADE_HOOKUP_OBJECT (window1, tools1, "tools1"); GLADE_HOOKUP_OBJECT (window1, tools1_menu, "tools1_menu"); GLADE_HOOKUP_OBJECT (window1, menu_choose_color1, "menu_choose_color1"); - GLADE_HOOKUP_OBJECT (window1, image2820, "image2820"); + GLADE_HOOKUP_OBJECT (window1, image2849, "image2849"); GLADE_HOOKUP_OBJECT (window1, menu_count_words1, "menu_count_words1"); GLADE_HOOKUP_OBJECT (window1, load_tags1, "load_tags1"); GLADE_HOOKUP_OBJECT (window1, menu_reload_configuration1, "menu_reload_configuration1"); - GLADE_HOOKUP_OBJECT (window1, image2821, "image2821"); + GLADE_HOOKUP_OBJECT (window1, image2850, "image2850"); GLADE_HOOKUP_OBJECT (window1, menu_help1, "menu_help1"); GLADE_HOOKUP_OBJECT (window1, menu_help1_menu, "menu_help1_menu"); GLADE_HOOKUP_OBJECT (window1, help1, "help1"); - GLADE_HOOKUP_OBJECT (window1, image2822, "image2822"); + GLADE_HOOKUP_OBJECT (window1, image2851, "image2851"); GLADE_HOOKUP_OBJECT (window1, website1, "website1"); GLADE_HOOKUP_OBJECT (window1, keyboard_shortcuts1, "keyboard_shortcuts1"); GLADE_HOOKUP_OBJECT (window1, debug_messages1, "debug_messages1"); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits February 2009