Commits January 2008

commits@lists.geany.org

4 participants
60 discussions

SF.net SVN: geany: [2199] trunk
by ntrel＠users.sourceforge.net 29 Jan '08

29 Jan '08

Revision: 2199 http://geany.svn.sourceforge.net/geany/?rev=2199&view=rev Author: ntrel Date: 2008-01-29 08:34:16 -0800 (Tue, 29 Jan 2008) Log Message: ----------- Factor out get_search_flags() from Find, Replace dialog response code. Modified Paths: -------------- trunk/ChangeLog trunk/src/search.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-01-29 16:11:18 UTC (rev 2198) +++ trunk/ChangeLog 2008-01-29 16:34:16 UTC (rev 2199) @@ -5,6 +5,9 @@ in case. * src/keybindings.c, src/keybindings.h: Rename binding type KeyBinding. + * src/search.c: + Factor out get_search_flags() from Find, Replace dialog response + code. 2008-01-28 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: trunk/src/search.c =================================================================== --- trunk/src/search.c 2008-01-29 16:11:18 UTC (rev 2198) +++ trunk/src/search.c 2008-01-29 16:34:16 UTC (rev 2199) @@ -788,6 +788,26 @@ } +static gint get_search_flags(GtkWidget *dialog) +{ + gboolean fl1, fl2, fl3, fl4; + + fl1 = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON( + lookup_widget(dialog, "check_case"))); + fl2 = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON( + lookup_widget(dialog, "check_word"))); + fl3 = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON( + lookup_widget(dialog, "check_regexp"))); + fl4 = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON( + lookup_widget(dialog, "check_wordstart"))); + + return (fl1 ? SCFIND_MATCHCASE : 0) | + (fl2 ? SCFIND_WHOLEWORD : 0) | + (fl3 ? SCFIND_REGEXP | SCFIND_POSIX : 0) | + (fl4 ? SCFIND_WORDSTART : 0); +} + + static void on_find_dialog_response(GtkDialog *dialog, gint response, gpointer user_data) { @@ -797,17 +817,9 @@ { gint idx = document_get_cur_idx(); gboolean search_replace_escape; - gboolean - fl1 = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON( - lookup_widget(GTK_WIDGET(widgets.find_dialog), "check_case"))), - fl2 = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON( - lookup_widget(GTK_WIDGET(widgets.find_dialog), "check_word"))), - fl3 = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON( - lookup_widget(GTK_WIDGET(widgets.find_dialog), "check_regexp"))), - fl4 = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON( - lookup_widget(GTK_WIDGET(widgets.find_dialog), "check_wordstart"))), - check_close = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON( + gboolean check_close = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON( lookup_widget(GTK_WIDGET(widgets.find_dialog), "check_close"))); + search_replace_escape = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON( lookup_widget(GTK_WIDGET(widgets.find_dialog), "check_escape"))); search_data.backwards = FALSE; @@ -826,11 +838,9 @@ } ui_combo_box_add_to_history(GTK_COMBO_BOX(user_data), search_data.text); - search_data.flags = (fl1 ? SCFIND_MATCHCASE : 0) | - (fl2 ? SCFIND_WHOLEWORD : 0) | - (fl3 ? SCFIND_REGEXP | SCFIND_POSIX: 0) | - (fl4 ? SCFIND_WORDSTART : 0); + search_data.flags = get_search_flags(widgets.find_dialog); + switch (response) { case GEANY_RESPONSE_FIND: @@ -884,7 +894,6 @@ GtkWidget *entry_replace = lookup_widget(GTK_WIDGET(widgets.replace_dialog), "entry_replace"); gint search_flags_re; gboolean search_backwards_re, search_replace_escape_re; - gboolean fl1, fl2, fl3, fl4; gboolean close_window; gchar *find, *replace; @@ -894,14 +903,6 @@ return; } - fl1 = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON( - lookup_widget(GTK_WIDGET(widgets.replace_dialog), "check_case"))); - fl2 = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON( - lookup_widget(GTK_WIDGET(widgets.replace_dialog), "check_word"))); - fl3 = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON( - lookup_widget(GTK_WIDGET(widgets.replace_dialog), "check_regexp"))); - fl4 = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON( - lookup_widget(GTK_WIDGET(widgets.replace_dialog), "check_wordstart"))); close_window = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON( lookup_widget(GTK_WIDGET(widgets.replace_dialog), "check_close"))); search_backwards_re = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON( @@ -911,7 +912,10 @@ 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))))); - if ((response != GEANY_RESPONSE_FIND) && fl1 && (strcmp(find, replace) == 0)) + search_flags_re = get_search_flags(widgets.replace_dialog); + + if ((response != GEANY_RESPONSE_FIND) && (search_flags_re & SCFIND_MATCHCASE) + && (strcmp(find, replace) == 0)) { utils_beep(); gtk_widget_grab_focus(GTK_WIDGET(GTK_BIN(lookup_widget(widgets.replace_dialog, "entry_find"))->child)); @@ -929,11 +933,6 @@ return; } - search_flags_re = (fl1 ? SCFIND_MATCHCASE : 0) | - (fl2 ? SCFIND_WHOLEWORD : 0) | - (fl3 ? SCFIND_REGEXP | SCFIND_POSIX : 0) | - (fl4 ? SCFIND_WORDSTART : 0); - switch (response) { case GEANY_RESPONSE_REPLACE_AND_FIND: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [2198] trunk
by ntrel＠users.sourceforge.net 29 Jan '08

29 Jan '08

Revision: 2198 http://geany.svn.sourceforge.net/geany/?rev=2198&view=rev Author: ntrel Date: 2008-01-29 08:11:18 -0800 (Tue, 29 Jan 2008) Log Message: ----------- Rename binding type KeyBinding. Modified Paths: -------------- trunk/ChangeLog trunk/src/keybindings.c trunk/src/keybindings.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-01-29 13:17:01 UTC (rev 2197) +++ trunk/ChangeLog 2008-01-29 16:11:18 UTC (rev 2198) @@ -3,6 +3,8 @@ * src/search.c: Allow case sensitive replace when the replace string varies only in case. + * src/keybindings.c, src/keybindings.h: + Rename binding type KeyBinding. 2008-01-28 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: trunk/src/keybindings.c =================================================================== --- trunk/src/keybindings.c 2008-01-29 13:17:01 UTC (rev 2197) +++ trunk/src/keybindings.c 2008-01-29 16:11:18 UTC (rev 2198) @@ -50,7 +50,7 @@ /* simple convenience function to allocate and fill the struct */ -static binding *fill(KBCallback func, guint key, GdkModifierType mod, const gchar *name, +static KeyBinding *fill(KBCallback func, guint key, GdkModifierType mod, const gchar *name, const gchar *label); static void cb_func_file_action(guint key_id); @@ -775,12 +775,12 @@ /* simple convenience function to allocate and fill the struct */ -static binding *fill(KBCallback func, guint key, GdkModifierType mod, const gchar *name, +static KeyBinding *fill(KBCallback func, guint key, GdkModifierType mod, const gchar *name, const gchar *label) { - binding *result; + KeyBinding *result; - result = g_new0(binding, 1); + result = g_new0(KeyBinding, 1); result->name = name; result->label = label; result->key = key; Modified: trunk/src/keybindings.h =================================================================== --- trunk/src/keybindings.h 2008-01-29 13:17:01 UTC (rev 2197) +++ trunk/src/keybindings.h 2008-01-29 16:11:18 UTC (rev 2198) @@ -28,7 +28,7 @@ typedef void (*KBCallback) (guint key_id); // holds all user-definable key bindings -typedef struct binding +typedef struct KeyBinding { guint key; GdkModifierType mods; @@ -42,7 +42,7 @@ // string to use as a section name in the preferences dialog in keybinding treeview as well as // in the keybinding help dialog, set only for the first binding in the section gchar *section; -} binding; +} KeyBinding; // Plugin API @@ -177,7 +177,7 @@ } GeanyKeyCommand; -binding *keys[GEANY_MAX_KEYS]; +KeyBinding *keys[GEANY_MAX_KEYS]; void keybindings_init(void); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [2197] trunk/NEWS
by ntrel＠users.sourceforge.net 29 Jan '08

29 Jan '08

Revision: 2197 http://geany.svn.sourceforge.net/geany/?rev=2197&view=rev Author: ntrel Date: 2008-01-29 05:17:01 -0800 (Tue, 29 Jan 2008) Log Message: ----------- Update ntrel's changes for 0.13 release. Modified Paths: -------------- trunk/NEWS Modified: trunk/NEWS =================================================================== --- trunk/NEWS 2008-01-29 12:21:02 UTC (rev 2196) +++ trunk/NEWS 2008-01-29 13:17:01 UTC (rev 2197) @@ -1,3 +1,65 @@ +Geany 0.13 (TBA) + + Filetypes: + * Add configurable default file extension setting for filetype + definition files. + * Fix reST autocompletion. + + Tags: + * Show arrays and modifiers like const in calltip return types for + C-like files. + * Fix parsing the correct D class name when inheriting. + * Fix parsing D constructor tags. + * Ignore D import statements. + + Interface: + * Add 'Indent Type' option in the Document menu. + * Add 'Detect from file' Editor indentation pref. + * Show TAB or SP for current document's indent type. + * Add a 'Newline strips trailing spaces' pref (thanks to Catalin + Marinas). + * Add 'Strip Trailing Spaces' document menu item. + * Add combo box input history for 'Make Custom Target' dialog. + * Make Open, Save As dialogs start in project base path (or default + path pref) when the current file has no filename. + * Add 'Make in base path' project file preference. + * Make 'Open Selected File' first try the current file's directory, + falling back to the project base path if no file was found. + + Editor: + * Fix hidden lines after deleting a line that is a collapsed fold + point. + * Make Fold All/Unfold All attempt to scroll the current line in view. + * Show line wrap symbol at start of line for wrapped lines. + * Allow scrolling past end of document, so the user can append text + with the last lines drawn at the top of the view. + + Keybindings: + * Add configurable keybindings for Cut, Copy and Paste. + * Ask the user whether to override an existing keybinding when setting + a combination that is already in use. + * Add 'Override Geany keybindings' VTE prefs dialog option (replaces + hidden pref), which makes the VTE interpret all keyboard shortcuts + except focus group keybindings. + + Plugins: + * Add File Browser sidebar plugin. + * Add Version Control Diff plugin (VC Diff), which supports SVN, CVS and + GIT (thanks to Yura Siamashka). + + Plugin API: + * Add keybindings->send_command(). + * Add pluginmacros.h to define common macros for app, p_utils, etc. + * Add more documentation/comments to demoplugin.c. + + Windows: + * Enable build support. + * Prevent prefs dialog being hidden after using the prefs file dialog. + + Documentation: + * HACKING: Update 'Adding a filetype' section. + + Geany 0.12 (October 10, 2007) Bugs fixed: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [2196] trunk
by ntrel＠users.sourceforge.net 29 Jan '08

29 Jan '08

Revision: 2196 http://geany.svn.sourceforge.net/geany/?rev=2196&view=rev Author: ntrel Date: 2008-01-29 04:21:02 -0800 (Tue, 29 Jan 2008) Log Message: ----------- Allow case sensitive replace when the replace string varies only in case. Modified Paths: -------------- trunk/ChangeLog trunk/src/search.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-01-28 17:27:39 UTC (rev 2195) +++ trunk/ChangeLog 2008-01-29 12:21:02 UTC (rev 2196) @@ -1,3 +1,10 @@ +2008-01-29 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/search.c: + Allow case sensitive replace when the replace string varies only + in case. + + 2008-01-28 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * plugins/pluginmacros.h, src/plugindata.h, plugins/*.c: Modified: trunk/src/search.c =================================================================== --- trunk/src/search.c 2008-01-28 17:27:39 UTC (rev 2195) +++ trunk/src/search.c 2008-01-29 12:21:02 UTC (rev 2196) @@ -911,7 +911,7 @@ 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))))); - if ((response != GEANY_RESPONSE_FIND) && fl1 && (strcasecmp(find, replace) == 0)) + if ((response != GEANY_RESPONSE_FIND) && fl1 && (strcmp(find, replace) == 0)) { utils_beep(); gtk_widget_grab_focus(GTK_WIDGET(GTK_BIN(lookup_widget(widgets.replace_dialog, "entry_find"))->child)); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [2195] trunk
by ntrel＠users.sourceforge.net 28 Jan '08

28 Jan '08

Revision: 2195 http://geany.svn.sourceforge.net/geany/?rev=2195&view=rev Author: ntrel Date: 2008-01-28 09:27:39 -0800 (Mon, 28 Jan 2008) Log Message: ----------- Add new macros for plugin API functions that use a 'p_' prefix to prevent conflicts with other tags whilst keeping the same first word as core function names, and update plugins to use them. The old plugin macros are still available, but will be removed after the next release. Compiling with -DGEANY_DISABLE_DEPRECATED in CFLAGS will disable the old macros. Modified Paths: -------------- trunk/ChangeLog trunk/plugins/autosave.c trunk/plugins/classbuilder.c trunk/plugins/demoplugin.c trunk/plugins/export.c trunk/plugins/filebrowser.c trunk/plugins/htmlchars.c trunk/plugins/pluginmacros.h trunk/plugins/vcdiff.c trunk/src/plugindata.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-01-27 18:27:33 UTC (rev 2194) +++ trunk/ChangeLog 2008-01-28 17:27:39 UTC (rev 2195) @@ -1,3 +1,15 @@ +2008-01-28 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * plugins/pluginmacros.h, src/plugindata.h, plugins/*.c: + Add new macros for plugin API functions that use a 'p_' prefix to + prevent conflicts with other tags whilst keeping the same first word + as core function names, and update plugins to use them. + The old plugin macros are still available, but will be removed + after the next release. + Compiling with -DGEANY_DISABLE_DEPRECATED in CFLAGS will disable + the old macros. + + 2008-01-27 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * src/printing.c: Modified: trunk/plugins/autosave.c =================================================================== --- trunk/plugins/autosave.c 2008-01-27 18:27:33 UTC (rev 2194) +++ trunk/plugins/autosave.c 2008-01-28 17:27:39 UTC (rev 2195) @@ -50,7 +50,7 @@ gboolean auto_save(gpointer data) { - gint cur_idx = documents->get_cur_idx(); + gint cur_idx = p_document->get_cur_idx(); gint i, idx, max = gtk_notebook_get_n_pages(GTK_NOTEBOOK(app->notebook)); gint saved_files = 0; @@ -58,22 +58,22 @@ { for (i = 0; i < max; i++) { - idx = documents->get_n_idx(i); + idx = p_document->get_n_idx(i); // skip current file to save it lastly, skip files without name if (idx != cur_idx && doc_list[idx].file_name != NULL) - if (documents->save_file(idx, FALSE)) + if (p_document->save_file(idx, FALSE)) saved_files++; } } // finally save current file, do it after all other files to get correct window title and // symbol list if (doc_list[cur_idx].file_name != NULL) - if (documents->save_file(cur_idx, FALSE)) + if (p_document->save_file(cur_idx, FALSE)) saved_files++; if (saved_files > 0 && print_msg) - ui->set_statusbar(FALSE, _("Autosave: Saved %d files automatically."), saved_files); + p_ui->set_statusbar(FALSE, _("Autosave: Saved %d files automatically."), saved_files); return TRUE; } @@ -118,7 +118,7 @@ dialog = gtk_dialog_new_with_buttons(_("Auto Save"), GTK_WINDOW(parent), GTK_DIALOG_DESTROY_WITH_PARENT, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, NULL); - vbox = ui->dialog_vbox_new(GTK_DIALOG(dialog)); + vbox = p_ui->dialog_vbox_new(GTK_DIALOG(dialog)); gtk_widget_set_name(dialog, "GeanyDialog"); gtk_box_set_spacing(GTK_BOX(vbox), 6); @@ -173,16 +173,16 @@ g_key_file_set_boolean(config, "autosave", "print_messages", print_msg); g_key_file_set_boolean(config, "autosave", "save_all", save_all); - if (! g_file_test(config_dir, G_FILE_TEST_IS_DIR) && utils->mkdir(config_dir, TRUE) != 0) + if (! g_file_test(config_dir, G_FILE_TEST_IS_DIR) && p_utils->mkdir(config_dir, TRUE) != 0) { - dialogs->show_msgbox(GTK_MESSAGE_ERROR, + p_dialogs->show_msgbox(GTK_MESSAGE_ERROR, _("Plugin configuration directory could not be created.")); } else { // write config to file data = g_key_file_to_data(config, NULL, NULL); - utils->write_file(config_file, data); + p_utils->write_file(config_file, data); g_free(data); } Modified: trunk/plugins/classbuilder.c =================================================================== --- trunk/plugins/classbuilder.c 2008-01-27 18:27:33 UTC (rev 2194) +++ trunk/plugins/classbuilder.c 2008-01-28 17:27:39 UTC (rev 2195) @@ -251,30 +251,30 @@ switch (class_info->type) { case GEANY_CLASS_TYPE_CPP: - fileheader = templates->get_template_fileheader(GEANY_FILETYPES_CPP, class_info->header); + fileheader = p_templates->get_template_fileheader(GEANY_FILETYPES_CPP, class_info->header); template = g_string_new(templates_cpp_class_header); - utils->string_replace_all(template, "{fileheader}", fileheader); - utils->string_replace_all(template, "{header_guard}", class_info->header_guard); - utils->string_replace_all(template, "{base_include}", class_info->base_include); - utils->string_replace_all(template, "{class_name}", class_info->class_name); - utils->string_replace_all(template, "{base_decl}", class_info->base_decl); - utils->string_replace_all(template, "{constructor_decl}", + p_utils->string_replace_all(template, "{fileheader}", fileheader); + p_utils->string_replace_all(template, "{header_guard}", class_info->header_guard); + p_utils->string_replace_all(template, "{base_include}", class_info->base_include); + p_utils->string_replace_all(template, "{class_name}", class_info->class_name); + p_utils->string_replace_all(template, "{base_decl}", class_info->base_decl); + p_utils->string_replace_all(template, "{constructor_decl}", class_info->constructor_decl); - utils->string_replace_all(template, "{destructor_decl}", + p_utils->string_replace_all(template, "{destructor_decl}", class_info->destructor_decl); break; case GEANY_CLASS_TYPE_GTK: - fileheader = templates->get_template_fileheader(GEANY_FILETYPES_C, class_info->header); + fileheader = p_templates->get_template_fileheader(GEANY_FILETYPES_C, class_info->header); template = g_string_new(templates_gtk_class_header); - utils->string_replace_all(template, "{fileheader}", fileheader); - utils->string_replace_all(template, "{header_guard}", class_info->header_guard); - utils->string_replace_all(template, "{base_include}", class_info->base_include); - utils->string_replace_all(template, "{class_name}", class_info->class_name); - utils->string_replace_all(template, "{class_name_up}", class_info->class_name_up); - utils->string_replace_all(template, "{class_name_low}", class_info->class_name_low); - utils->string_replace_all(template, "{base_name}", class_info->base_name); - utils->string_replace_all(template, "{constructor_decl}", + p_utils->string_replace_all(template, "{fileheader}", fileheader); + p_utils->string_replace_all(template, "{header_guard}", class_info->header_guard); + p_utils->string_replace_all(template, "{base_include}", class_info->base_include); + p_utils->string_replace_all(template, "{class_name}", class_info->class_name); + p_utils->string_replace_all(template, "{class_name_up}", class_info->class_name_up); + p_utils->string_replace_all(template, "{class_name_low}", class_info->class_name_low); + p_utils->string_replace_all(template, "{base_name}", class_info->base_name); + p_utils->string_replace_all(template, "{constructor_decl}", class_info->constructor_decl); break; } @@ -297,35 +297,35 @@ switch (class_info->type) { case GEANY_CLASS_TYPE_CPP: - fileheader = templates->get_template_fileheader(GEANY_FILETYPES_CPP, class_info->source); + fileheader = p_templates->get_template_fileheader(GEANY_FILETYPES_CPP, class_info->source); template = g_string_new(templates_cpp_class_source); - utils->string_replace_all(template, "{fileheader}", fileheader); - utils->string_replace_all(template, "{header}", class_info->header); - utils->string_replace_all(template, "{class_name}", class_info->class_name); - utils->string_replace_all(template, "{base_include}", class_info->base_include); - utils->string_replace_all(template, "{base_name}", class_info->base_name); - utils->string_replace_all(template, "{constructor_impl}", + p_utils->string_replace_all(template, "{fileheader}", fileheader); + p_utils->string_replace_all(template, "{header}", class_info->header); + p_utils->string_replace_all(template, "{class_name}", class_info->class_name); + p_utils->string_replace_all(template, "{base_include}", class_info->base_include); + p_utils->string_replace_all(template, "{base_name}", class_info->base_name); + p_utils->string_replace_all(template, "{constructor_impl}", class_info->constructor_impl); - utils->string_replace_all(template, "{destructor_impl}", + p_utils->string_replace_all(template, "{destructor_impl}", class_info->destructor_impl); break; case GEANY_CLASS_TYPE_GTK: - fileheader = templates->get_template_fileheader(GEANY_FILETYPES_C, class_info->source); + fileheader = p_templates->get_template_fileheader(GEANY_FILETYPES_C, class_info->source); template = g_string_new(templates_gtk_class_source); - utils->string_replace_all(template, "{fileheader}", fileheader); - utils->string_replace_all(template, "{header}", class_info->header); - utils->string_replace_all(template, "{class_name}", class_info->class_name); - utils->string_replace_all(template, "{class_name_up}", class_info->class_name_up); - utils->string_replace_all(template, "{class_name_low}", class_info->class_name_low); - utils->string_replace_all(template, "{base_name}", class_info->base_name); - utils->string_replace_all(template, "{base_gtype}", class_info->base_gtype); - utils->string_replace_all(template, "{destructor_decl}", class_info->destructor_decl); - utils->string_replace_all(template, "{constructor_impl}", + p_utils->string_replace_all(template, "{fileheader}", fileheader); + p_utils->string_replace_all(template, "{header}", class_info->header); + p_utils->string_replace_all(template, "{class_name}", class_info->class_name); + p_utils->string_replace_all(template, "{class_name_up}", class_info->class_name_up); + p_utils->string_replace_all(template, "{class_name_low}", class_info->class_name_low); + p_utils->string_replace_all(template, "{base_name}", class_info->base_name); + p_utils->string_replace_all(template, "{base_gtype}", class_info->base_gtype); + p_utils->string_replace_all(template, "{destructor_decl}", class_info->destructor_decl); + p_utils->string_replace_all(template, "{constructor_impl}", class_info->constructor_impl); - utils->string_replace_all(template, "{destructor_impl}", + p_utils->string_replace_all(template, "{destructor_impl}", class_info->destructor_impl); - utils->string_replace_all(template, "{gtk_destructor_registration}", + p_utils->string_replace_all(template, "{gtk_destructor_registration}", class_info->gtk_destructor_registration); break; } @@ -361,9 +361,9 @@ g_signal_connect_swapped(G_OBJECT(cc_dlg->dialog), "destroy", G_CALLBACK(g_free), (gpointer)cc_dlg); - main_box = ui->dialog_vbox_new(GTK_DIALOG(cc_dlg->dialog)); + main_box = p_ui->dialog_vbox_new(GTK_DIALOG(cc_dlg->dialog)); - frame = ui->frame_new_with_alignment(_("Class"), &align); + frame = p_ui->frame_new_with_alignment(_("Class"), &align); gtk_container_add(GTK_CONTAINER(main_box), frame); vbox = gtk_vbox_new(FALSE, 10); @@ -398,7 +398,7 @@ cc_dlg->source_entry = gtk_entry_new(); gtk_container_add(GTK_CONTAINER(hbox), cc_dlg->source_entry); - frame = ui->frame_new_with_alignment(_("Inheritance"), &align); + frame = p_ui->frame_new_with_alignment(_("Inheritance"), &align); gtk_container_add(GTK_CONTAINER(main_box), frame); vbox = gtk_vbox_new(FALSE, 10); @@ -445,7 +445,7 @@ gtk_container_add(GTK_CONTAINER(hbox), cc_dlg->base_gtype_entry); } - frame = ui->frame_new_with_alignment(_("Options"), &align); + frame = p_ui->frame_new_with_alignment(_("Options"), &align); gtk_container_add(GTK_CONTAINER(main_box), frame); vbox = gtk_vbox_new(FALSE, 10); @@ -556,7 +556,7 @@ base_name_splitted = str_case_split(gtk_entry_get_text(GTK_ENTRY(entry)), '_'); if (! g_ascii_strncasecmp(gtk_entry_get_text(GTK_ENTRY(entry)), "gtk", 3)) tmp = g_strconcat("gtk/", gtk_entry_get_text(GTK_ENTRY(entry)), ".h", NULL); - else if (utils->str_equal(gtk_entry_get_text(GTK_ENTRY(entry)), "GObject")) + else if (p_utils->str_equal(gtk_entry_get_text(GTK_ENTRY(entry)), "GObject")) tmp = g_strdup("glib-object.h"); else tmp = g_strconcat(gtk_entry_get_text(GTK_ENTRY(entry)), ".h", NULL); @@ -572,7 +572,7 @@ tmp = g_strdup_printf("%.3s_TYPE%s", base_name_splitted, base_name_splitted + 3); - else if (utils->str_equal(gtk_entry_get_text(GTK_ENTRY(entry)), "GObject")) + else if (p_utils->str_equal(gtk_entry_get_text(GTK_ENTRY(entry)), "GObject")) tmp = g_strdup("G_TYPE_OBJECT"); else tmp = g_strconcat(base_name_splitted, "_TYPE", NULL); @@ -597,7 +597,7 @@ g_return_if_fail(cc_dlg != NULL); - if (utils->str_equal(gtk_entry_get_text(GTK_ENTRY(cc_dlg->class_name_entry)), "")) + if (p_utils->str_equal(gtk_entry_get_text(GTK_ENTRY(cc_dlg->class_name_entry)), "")) return; class_info = g_new0(ClassInfo, 1); @@ -606,7 +606,7 @@ tmp = str_case_split(class_info->class_name, '_'); class_info->class_name_up = g_ascii_strup(tmp, -1); class_info->class_name_low = g_ascii_strdown(class_info->class_name_up, -1); - if (! utils->str_equal(gtk_entry_get_text(GTK_ENTRY(cc_dlg->base_name_entry)), "")) + if (! p_utils->str_equal(gtk_entry_get_text(GTK_ENTRY(cc_dlg->base_name_entry)), "")) { class_info->base_name = g_strdup(gtk_entry_get_text(GTK_ENTRY(cc_dlg->base_name_entry))); class_info->base_include = g_strdup_printf("\n#include %c%s%c\n", @@ -629,7 +629,7 @@ case GEANY_CLASS_TYPE_CPP: { class_info->source = g_strdup(gtk_entry_get_text(GTK_ENTRY(cc_dlg->source_entry))); - if (! utils->str_equal(class_info->base_name, "")) + if (! p_utils->str_equal(class_info->base_name, "")) class_info->base_decl = g_strdup_printf(": public %s", class_info->base_name); else class_info->base_decl = g_strdup(""); @@ -637,7 +637,7 @@ { gchar *base_constructor; - if (utils->str_equal(class_info->base_name, "")) + if (p_utils->str_equal(class_info->base_name, "")) base_constructor = g_strdup(""); else base_constructor = g_strdup_printf("\t: %s()\n", class_info->base_name); @@ -726,19 +726,19 @@ } // only create the files if the filename is not empty - if (! utils->str_equal(class_info->source, "")) + if (! p_utils->str_equal(class_info->source, "")) { text = get_template_class_source(class_info); - idx = documents->new_file(class_info->source, NULL, NULL); - scintilla->set_text(doc_list[idx].sci, text); + idx = p_document->new_file(class_info->source, NULL, NULL); + p_sci->set_text(doc_list[idx].sci, text); g_free(text); } - if (! utils->str_equal(class_info->header, "")) + if (! p_utils->str_equal(class_info->header, "")) { text = get_template_class_header(class_info); - idx = documents->new_file(class_info->header, NULL, NULL); - scintilla->set_text(doc_list[idx].sci, text); + idx = p_document->new_file(class_info->header, NULL, NULL); + p_sci->set_text(doc_list[idx].sci, text); g_free(text); } Modified: trunk/plugins/demoplugin.c =================================================================== --- trunk/plugins/demoplugin.c 2008-01-27 18:27:33 UTC (rev 2194) +++ trunk/plugins/demoplugin.c 2008-01-28 17:27:39 UTC (rev 2195) @@ -111,7 +111,7 @@ dialog = gtk_dialog_new_with_buttons(_("Demo"), GTK_WINDOW(parent), GTK_DIALOG_DESTROY_WITH_PARENT, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, NULL); - vbox = ui->dialog_vbox_new(GTK_DIALOG(dialog)); + vbox = p_ui->dialog_vbox_new(GTK_DIALOG(dialog)); gtk_widget_set_name(dialog, "GeanyDialog"); gtk_box_set_spacing(GTK_BOX(vbox), 6); Modified: trunk/plugins/export.c =================================================================== --- trunk/plugins/export.c 2008-01-27 18:27:33 UTC (rev 2194) +++ trunk/plugins/export.c 2008-01-28 17:27:39 UTC (rev 2195) @@ -160,8 +160,8 @@ if (extension == NULL) return; - idx = documents->get_cur_idx(); - tooltips = GTK_TOOLTIPS(support->lookup_widget(app->window, "tooltips")); + idx = p_document->get_cur_idx(); + tooltips = GTK_TOOLTIPS(p_support->lookup_widget(app->window, "tooltips")); exi = g_new(ExportInfo, 1); exi->idx = idx; @@ -210,7 +210,7 @@ if (doc_list[idx].file_name != NULL) { gchar *base_name = g_path_get_basename(doc_list[idx].file_name); - gchar *short_name = utils->remove_ext_from_filename(base_name); + gchar *short_name = p_utils->remove_ext_from_filename(base_name); gchar *file_name; gchar *locale_filename; gchar *locale_dirname; @@ -220,7 +220,7 @@ suffix = "_export"; file_name = g_strconcat(short_name, suffix, extension, NULL); - locale_filename = utils->get_locale_from_utf8(doc_list[idx].file_name); + locale_filename = p_utils->get_locale_from_utf8(doc_list[idx].file_name); locale_dirname = g_path_get_dirname(locale_filename); // set the current name to base_name.html which probably doesn't exist yet so // gtk_file_chooser_set_filename() can't be used and we need @@ -243,7 +243,7 @@ // use default startup directory(if set) if no files are open if (NZV(default_open_path) && g_path_is_absolute(default_open_path)) { - gchar *locale_path = utils->get_locale_from_utf8(default_open_path); + gchar *locale_path = p_utils->get_locale_from_utf8(default_open_path); gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialog), locale_path); g_free(locale_path); } @@ -267,13 +267,13 @@ static void write_data(const gchar *filename, const gchar *data) { - gint error_nr = utils->write_file(filename, data); - gchar *utf8_filename = utils->get_utf8_from_locale(filename); + gint error_nr = p_utils->write_file(filename, data); + gchar *utf8_filename = p_utils->get_utf8_from_locale(filename); if (error_nr == 0) - ui->set_statusbar(TRUE, _("Document successfully exported as '%s'."), utf8_filename); + p_ui->set_statusbar(TRUE, _("Document successfully exported as '%s'."), utf8_filename); else - ui->set_statusbar(TRUE, _("File '%s' could not be written (%s)."), + p_ui->set_statusbar(TRUE, _("File '%s' could not be written (%s)."), utf8_filename, g_strerror(error_nr)); g_free(utf8_filename); @@ -321,15 +321,15 @@ if (exi->have_zoom_level_checkbox) { use_zoom_level = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON( - support->lookup_widget(GTK_WIDGET(dialog), "check_zoom_level"))); + p_support->lookup_widget(GTK_WIDGET(dialog), "check_zoom_level"))); } - utf8_filename = utils->get_utf8_from_locale(new_filename); + utf8_filename = p_utils->get_utf8_from_locale(new_filename); // check if file exists and ask whether to overwrite or not if (g_file_test(new_filename, G_FILE_TEST_EXISTS)) { - if (dialogs->show_question( + if (p_dialogs->show_question( _("The file '%s' already exists. Do you want to overwrite it?"), utf8_filename) == FALSE) return; @@ -355,25 +355,25 @@ GString *body; GString *cmds; GString *latex; - gint style_max = pow(2, scintilla->send_message(doc_list[idx].sci, SCI_GETSTYLEBITS, 0, 0)); + gint style_max = pow(2, p_sci->send_message(doc_list[idx].sci, SCI_GETSTYLEBITS, 0, 0)); // first read all styles from Scintilla for (i = 0; i < style_max; i++) { - styles[i][FORE] = scintilla->send_message(doc_list[idx].sci, SCI_STYLEGETFORE, i, 0); - styles[i][BACK] = scintilla->send_message(doc_list[idx].sci, SCI_STYLEGETBACK, i, 0); - styles[i][BOLD] = scintilla->send_message(doc_list[idx].sci, SCI_STYLEGETBOLD, i, 0); - styles[i][ITALIC] = scintilla->send_message(doc_list[idx].sci, SCI_STYLEGETITALIC, i, 0); + styles[i][FORE] = p_sci->send_message(doc_list[idx].sci, SCI_STYLEGETFORE, i, 0); + styles[i][BACK] = p_sci->send_message(doc_list[idx].sci, SCI_STYLEGETBACK, i, 0); + styles[i][BOLD] = p_sci->send_message(doc_list[idx].sci, SCI_STYLEGETBOLD, i, 0); + styles[i][ITALIC] = p_sci->send_message(doc_list[idx].sci, SCI_STYLEGETITALIC, i, 0); styles[i][USED] = 0; } // read the document and write the LaTeX code body = g_string_new(""); - for (i = 0; i < scintilla->get_length(doc_list[idx].sci); i++) + for (i = 0; i < p_sci->get_length(doc_list[idx].sci); i++) { - style = scintilla->get_style_at(doc_list[idx].sci, i); - c = scintilla->get_char_at(doc_list[idx].sci, i); - c_next = scintilla->get_char_at(doc_list[idx].sci, i + 1); + style = p_sci->get_style_at(doc_list[idx].sci, i); + c = p_sci->get_char_at(doc_list[idx].sci, i); + c_next = p_sci->get_char_at(doc_list[idx].sci, i + 1); if (style != old_style || ! block_open) { @@ -533,13 +533,13 @@ // write all latex = g_string_new(TEMPLATE_LATEX); - utils->string_replace_all(latex, "{export_content}", body->str); - utils->string_replace_all(latex, "{export_styles}", cmds->str); - utils->string_replace_all(latex, "{export_date}", get_date(DATE_TYPE_DEFAULT)); + p_utils->string_replace_all(latex, "{export_content}", body->str); + p_utils->string_replace_all(latex, "{export_styles}", cmds->str); + p_utils->string_replace_all(latex, "{export_date}", get_date(DATE_TYPE_DEFAULT)); if (doc_list[idx].file_name == NULL) - utils->string_replace_all(latex, "{export_filename}", GEANY_STRING_UNTITLED); + p_utils->string_replace_all(latex, "{export_filename}", GEANY_STRING_UNTITLED); else - utils->string_replace_all(latex, "{export_filename}", doc_list[idx].file_name); + p_utils->string_replace_all(latex, "{export_filename}", doc_list[idx].file_name); write_data(filename, latex->str); @@ -562,15 +562,15 @@ GString *body; GString *css; GString *html; - gint style_max = pow(2, scintilla->send_message(doc_list[idx].sci, SCI_GETSTYLEBITS, 0, 0)); + gint style_max = pow(2, p_sci->send_message(doc_list[idx].sci, SCI_GETSTYLEBITS, 0, 0)); // first read all styles from Scintilla for (i = 0; i < style_max; i++) { - styles[i][FORE] = ROTATE_RGB(scintilla->send_message(doc_list[idx].sci, SCI_STYLEGETFORE, i, 0)); - styles[i][BACK] = ROTATE_RGB(scintilla->send_message(doc_list[idx].sci, SCI_STYLEGETBACK, i, 0)); - styles[i][BOLD] = scintilla->send_message(doc_list[idx].sci, SCI_STYLEGETBOLD, i, 0); - styles[i][ITALIC] = scintilla->send_message(doc_list[idx].sci, SCI_STYLEGETITALIC, i, 0); + styles[i][FORE] = ROTATE_RGB(p_sci->send_message(doc_list[idx].sci, SCI_STYLEGETFORE, i, 0)); + styles[i][BACK] = ROTATE_RGB(p_sci->send_message(doc_list[idx].sci, SCI_STYLEGETBACK, i, 0)); + styles[i][BOLD] = p_sci->send_message(doc_list[idx].sci, SCI_STYLEGETBOLD, i, 0); + styles[i][ITALIC] = p_sci->send_message(doc_list[idx].sci, SCI_STYLEGETITALIC, i, 0); styles[i][USED] = 0; } @@ -579,18 +579,18 @@ font_name = pango_font_description_get_family(font_desc); //font_size = pango_font_description_get_size(font_desc) / PANGO_SCALE; // take the zoom level also into account - font_size = scintilla->send_message(doc_list[idx].sci, SCI_STYLEGETSIZE, 0, 0); + font_size = p_sci->send_message(doc_list[idx].sci, SCI_STYLEGETSIZE, 0, 0); if (use_zoom) - font_size += scintilla->send_message(doc_list[idx].sci, SCI_GETZOOM, 0, 0); + font_size += p_sci->send_message(doc_list[idx].sci, SCI_GETZOOM, 0, 0); // read the document and write the HTML body body = g_string_new(""); - for (i = 0; i < scintilla->get_length(doc_list[idx].sci); i++) + for (i = 0; i < p_sci->get_length(doc_list[idx].sci); i++) { - style = scintilla->get_style_at(doc_list[idx].sci, i); - c = scintilla->get_char_at(doc_list[idx].sci, i); - // scintilla->get_char_at() takes care of index boundaries and return 0 if i is too high - c_next = scintilla->get_char_at(doc_list[idx].sci, i + 1); + style = p_sci->get_style_at(doc_list[idx].sci, i); + c = p_sci->get_char_at(doc_list[idx].sci, i); + // p_sci->get_char_at() takes care of index boundaries and return 0 if i is too high + c_next = p_sci->get_char_at(doc_list[idx].sci, i + 1); if ((style != old_style || ! span_open) && ! isspace(c)) { @@ -685,13 +685,13 @@ // write all html = g_string_new(TEMPLATE_HTML); - utils->string_replace_all(html, "{export_date}", get_date(DATE_TYPE_HTML)); - utils->string_replace_all(html, "{export_content}", body->str); - utils->string_replace_all(html, "{export_styles}", css->str); + p_utils->string_replace_all(html, "{export_date}", get_date(DATE_TYPE_HTML)); + p_utils->string_replace_all(html, "{export_content}", body->str); + p_utils->string_replace_all(html, "{export_styles}", css->str); if (doc_list[idx].file_name == NULL) - utils->string_replace_all(html, "{export_filename}", GEANY_STRING_UNTITLED); + p_utils->string_replace_all(html, "{export_filename}", GEANY_STRING_UNTITLED); else - utils->string_replace_all(html, "{export_filename}", doc_list[idx].file_name); + p_utils->string_replace_all(html, "{export_filename}", doc_list[idx].file_name); write_data(filename, html->str); Modified: trunk/plugins/filebrowser.c =================================================================== --- trunk/plugins/filebrowser.c 2008-01-27 18:27:33 UTC (rev 2194) +++ trunk/plugins/filebrowser.c 2008-01-28 17:27:39 UTC (rev 2195) @@ -109,7 +109,7 @@ { const gchar *ext = exts[i]; - if (utils->str_equal(&base_name[len - strlen(ext)], ext)) + if (p_utils->str_equal(&base_name[len - strlen(ext)], ext)) return TRUE; } } @@ -145,7 +145,7 @@ else gtk_list_store_append(file_store, &iter); - utf8_name = utils->get_utf8_from_locale(name); + utf8_name = p_utils->get_utf8_from_locale(name); gtk_list_store_set(file_store, &iter, FILEVIEW_COLUMN_ICON, (dir) ? GTK_STOCK_DIRECTORY : GTK_STOCK_FILE, @@ -158,7 +158,7 @@ { g_return_val_if_fail(dir && strlen(dir) > ROOT_OFFSET, FALSE); - return (utils->str_equal(dir + ROOT_OFFSET, G_DIR_SEPARATOR_S)); + return (p_utils->str_equal(dir + ROOT_OFFSET, G_DIR_SEPARATOR_S)); } @@ -201,11 +201,11 @@ clear(); - utf8_dir = utils->get_utf8_from_locale(current_dir); + utf8_dir = p_utils->get_utf8_from_locale(current_dir); gtk_entry_set_text(GTK_ENTRY(path_entry), utf8_dir); g_free(utf8_dir); - list = utils->get_file_list(current_dir, NULL, NULL); + list = p_utils->get_file_list(current_dir, NULL, NULL); if (list != NULL) { add_top_level_entry(); @@ -231,7 +231,7 @@ if (project) dir = project->base_path; if (NZV(dir)) - return utils->get_locale_from_utf8(dir); + return p_utils->get_locale_from_utf8(dir); return g_get_current_dir(); } @@ -241,7 +241,7 @@ { gchar *fname; gchar *dir; - gint idx = documents->get_cur_idx(); + gint idx = p_document->get_cur_idx(); if (! DOC_IDX_VALID(idx) || doc_list[idx].file_name == NULL || ! g_path_is_absolute(doc_list[idx].file_name)) @@ -251,7 +251,7 @@ return; } fname = doc_list[idx].file_name; - fname = utils->get_locale_from_utf8(fname); + fname = p_utils->get_locale_from_utf8(fname); dir = g_path_get_dirname(fname); g_free(fname); @@ -273,7 +273,7 @@ if (gtk_tree_selection_count_selected_rows(treesel) == 1) return TRUE; - ui->set_statusbar(FALSE, _("Too many items selected!")); + p_ui->set_statusbar(FALSE, _("Too many items selected!")); return FALSE; } @@ -295,7 +295,7 @@ gtk_tree_model_get_iter(model, &iter, treepath); gtk_tree_model_get(model, &iter, FILEVIEW_COLUMN_ICON, &icon, -1); - if (utils->str_equal(icon, GTK_STOCK_DIRECTORY)) + if (p_utils->str_equal(icon, GTK_STOCK_DIRECTORY)) { dir_found = TRUE; g_free(icon); @@ -317,13 +317,13 @@ gtk_tree_model_get_iter(model, &iter, treepath); gtk_tree_model_get(model, &iter, FILEVIEW_COLUMN_NAME, &name, -1); - if (utils->str_equal(name, "..")) + if (p_utils->str_equal(name, "..")) { fname = g_path_get_dirname(current_dir); } else { - setptr(name, utils->get_locale_from_utf8(name)); + setptr(name, p_utils->get_locale_from_utf8(name)); fname = g_build_filename(current_dir, name, NULL); } g_free(name); @@ -345,18 +345,18 @@ else dir = g_strdup(fname); - utils->string_replace_all(cmd_str, "%f", fname); - utils->string_replace_all(cmd_str, "%d", dir); + p_utils->string_replace_all(cmd_str, "%f", fname); + p_utils->string_replace_all(cmd_str, "%d", dir); cmd = g_string_free(cmd_str, FALSE); - locale_cmd = utils->get_locale_from_utf8(cmd); + locale_cmd = p_utils->get_locale_from_utf8(cmd); if (! g_spawn_command_line_async(locale_cmd, &error)) { gchar *c = strchr(cmd, ' '); if (c != NULL) *c = '\0'; - ui->set_statusbar(TRUE, + p_ui->set_statusbar(TRUE, _("Could not execute configured external command '%s' (%s)."), cmd, error->message); g_error_free(error); @@ -398,7 +398,7 @@ } -/* We use documents->open_files() as it's more efficient. */ +/* We use p_document->open_files() as it's more efficient. */ static void open_selected_files(GList *list) { GSList *files = NULL; @@ -411,7 +411,7 @@ files = g_slist_append(files, fname); } - documents->open_files(files, FALSE, NULL, NULL); + p_document->open_files(files, FALSE, NULL, NULL); g_slist_foreach(files, (GFunc) g_free, NULL); // free filenames g_slist_free(files); } @@ -482,8 +482,8 @@ g_list_foreach(list, (GFunc) gtk_tree_path_free, NULL); g_list_free(list); - setptr(dir, utils->get_utf8_from_locale(dir)); - search->show_find_in_files_dialog(dir); + setptr(dir, p_utils->get_utf8_from_locale(dir)); + p_search->show_find_in_files_dialog(dir); g_free(dir); } @@ -546,7 +546,7 @@ gtk_widget_show(item); gtk_container_add(GTK_CONTAINER(menu), item); g_signal_connect_swapped((gpointer) item, "activate", - G_CALLBACK(keybindings->send_command), + G_CALLBACK(p_keybindings->send_command), GINT_TO_POINTER(GEANY_KEYS_MENU_SIDEBAR)); return menu; @@ -619,7 +619,7 @@ on_go_up(); return; } - new_dir = utils->get_locale_from_utf8(new_dir); + new_dir = p_utils->get_locale_from_utf8(new_dir); } else new_dir = g_strdup(g_get_home_dir()); @@ -674,7 +674,7 @@ static GtkWidget *make_toolbar() { GtkWidget *wid, *toolbar; - GtkTooltips *tooltips = GTK_TOOLTIPS(support->lookup_widget( + GtkTooltips *tooltips = GTK_TOOLTIPS(p_support->lookup_widget( app->window, "tooltips")); toolbar = gtk_toolbar_new(); @@ -718,7 +718,7 @@ gtk_tree_model_get(GTK_TREE_MODEL(file_store), iter, FILEVIEW_COLUMN_ICON, &icon, FILEVIEW_COLUMN_NAME, &str, -1); - if (str != NULL && icon != NULL && utils->str_equal(icon, GTK_STOCK_DIRECTORY) && + if (str != NULL && icon != NULL && p_utils->str_equal(icon, GTK_STOCK_DIRECTORY) && ! g_str_has_suffix(key, G_DIR_SEPARATOR_S)) { // key is something like "/tmp/te" and str is a filename like "test", @@ -838,7 +838,7 @@ dialog = gtk_dialog_new_with_buttons(_("File Browser"), GTK_WINDOW(parent), GTK_DIALOG_DESTROY_WITH_PARENT, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, NULL); - vbox = ui->dialog_vbox_new(GTK_DIALOG(dialog)); + vbox = p_ui->dialog_vbox_new(GTK_DIALOG(dialog)); gtk_widget_set_name(dialog, "GeanyDialog"); gtk_box_set_spacing(GTK_BOX(vbox), 6); @@ -892,16 +892,16 @@ g_key_file_set_boolean(config, "filebrowser", "show_hidden_files", show_hidden_files); g_key_file_set_boolean(config, "filebrowser", "hide_object_files", hide_object_files); - if (! g_file_test(config_dir, G_FILE_TEST_IS_DIR) && utils->mkdir(config_dir, TRUE) != 0) + if (! g_file_test(config_dir, G_FILE_TEST_IS_DIR) && p_utils->mkdir(config_dir, TRUE) != 0) { - dialogs->show_msgbox(GTK_MESSAGE_ERROR, + p_dialogs->show_msgbox(GTK_MESSAGE_ERROR, _("Plugin configuration directory could not be created.")); } else { // write config to file data = g_key_file_to_data(config, NULL, NULL); - utils->write_file(config_file, data); + p_utils->write_file(config_file, data); g_free(data); } Modified: trunk/plugins/htmlchars.c =================================================================== --- trunk/plugins/htmlchars.c 2008-01-27 18:27:33 UTC (rev 2194) +++ trunk/plugins/htmlchars.c 2008-01-28 17:27:39 UTC (rev 2195) @@ -74,7 +74,7 @@ _("Special Characters"), GTK_WINDOW(app->window), GTK_DIALOG_DESTROY_WITH_PARENT, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, _("_Insert"), GTK_RESPONSE_OK, NULL); - vbox = ui->dialog_vbox_new(GTK_DIALOG(sc_dialog)); + vbox = p_ui->dialog_vbox_new(GTK_DIALOG(sc_dialog)); gtk_box_set_spacing(GTK_BOX(vbox), 6); gtk_widget_set_name(sc_dialog, "GeanyDialog"); @@ -425,18 +425,18 @@ * returns only TRUE if a valid selection(i.e. no category) could be found */ static gboolean sc_insert(GtkTreeModel *model, GtkTreeIter *iter) { - gint idx = documents->get_cur_idx(); + gint idx = p_document->get_cur_idx(); gboolean result = FALSE; if (DOC_IDX_VALID(idx)) { gchar *str; - gint pos = scintilla->get_current_position(doc_list[idx].sci); + gint pos = p_sci->get_current_position(doc_list[idx].sci); gtk_tree_model_get(model, iter, COLUMN_HTML_NAME, &str, -1); if (str && *str) { - scintilla->insert_text(doc_list[idx].sci, pos, str); + p_sci->insert_text(doc_list[idx].sci, pos, str); g_free(str); result = TRUE; } @@ -495,7 +495,7 @@ item_activate(GtkMenuItem *menuitem, gpointer gdata) { // refuse opening the dialog if we don't have an active tab - gint idx = documents->get_cur_idx(); + gint idx = p_document->get_cur_idx(); if (idx == -1 || ! doc_list[idx].is_valid) return; Modified: trunk/plugins/pluginmacros.h =================================================================== --- trunk/plugins/pluginmacros.h 2008-01-27 18:27:33 UTC (rev 2194) +++ trunk/plugins/pluginmacros.h 2008-01-28 17:27:39 UTC (rev 2195) @@ -32,6 +32,42 @@ #define prefs geany_data->prefs #define project app->project +#ifdef GEANY_DISABLE_DEPRECATED + +/* These macros are named the same as the first word in the core function name, + * but with a 'p_' prefix to prevent conflicts with other tag names. + * Example: document_open_file() -> p_document->open_file() */ +#define p_dialogs geany_data->dialogs +#define p_document geany_data->documents +#define p_encoding geany_data->encoding +#define p_highlighting geany_data->highlighting +#define p_keybindings geany_data->keybindings +#define p_msgwindow geany_data->msgwindow +#define p_sci geany_data->sci +#define p_search geany_data->search +#define p_support geany_data->support +#define p_templates geany_data->templates +#define p_tm geany_data->tm +#define p_ui geany_data->ui +#define p_utils geany_data->utils + +#else + +#define p_dialogs dialogs +#define p_document documents +#define p_encoding encodings +#define p_highlighting highlighting +#define p_keybindings keybindings +#define p_msgwindow msgwindow +#define p_sci scintilla +#define p_search search +#define p_support support +#define p_templates templates +#define p_tm tagmanager +#define p_ui ui +#define p_utils utils + +/* Temporary source compatibility macros - do not use these in new code. */ #define dialogs geany_data->dialogs #define documents geany_data->documents // avoids conflict with document typedef #define encodings geany_data->encoding // avoids conflict with document::encoding @@ -47,3 +83,5 @@ #define utils geany_data->utils #endif + +#endif Modified: trunk/plugins/vcdiff.c =================================================================== --- trunk/plugins/vcdiff.c 2008-01-27 18:27:33 UTC (rev 2194) +++ trunk/plugins/vcdiff.c 2008-01-28 17:27:39 UTC (rev 2195) @@ -270,37 +270,37 @@ // UTF-8 because internally Geany always needs UTF-8 if (force_encoding) { - text = encodings->convert_to_utf8_from_charset( + text = p_encoding->convert_to_utf8_from_charset( std_output, -1, force_encoding, TRUE); } else { - text = encodings->convert_to_utf8(std_output, -1, &detect_enc); + text = p_encoding->convert_to_utf8(std_output, -1, &detect_enc); } if (text) { idx = find_by_filename(filename); if ( idx == -1) { - idx = documents->new_file(filename, + idx = p_document->new_file(filename, geany_data->filetypes[GEANY_FILETYPES_DIFF], text); } else { - scintilla->set_text(doc_list[idx].sci, text); + p_sci->set_text(doc_list[idx].sci, text); book = GTK_NOTEBOOK(app->notebook); page = gtk_notebook_page_num(book, GTK_WIDGET(doc_list[idx].sci)); gtk_notebook_set_current_page(book, page); doc_list[idx].changed = FALSE; - documents->set_text_changed(idx); + p_document->set_text_changed(idx); } - documents->set_encoding(idx, + p_document->set_encoding(idx, force_encoding ? force_encoding : detect_enc); } else { - ui->set_statusbar(FALSE, _("Could not parse the output of the diff")); + p_ui->set_statusbar(FALSE, _("Could not parse the output of the diff")); } g_free(text); g_free(detect_enc); @@ -339,7 +339,7 @@ // CVS dump stuff to stderr when diff nested dirs if (strcmp(argv[0], "cvs") != 0 && NZV(std_error)) { - dialogs->show_msgbox(1, + p_dialogs->show_msgbox(1, _("%s exited with an error: \n%s."), argv[0], g_strstrip(std_error)); } else if (NZV(std_output)) @@ -348,12 +348,12 @@ } else { - ui->set_statusbar(FALSE, _("No changes were made.")); + p_ui->set_statusbar(FALSE, _("No changes were made.")); } } else { - ui->set_statusbar(FALSE, + p_ui->set_statusbar(FALSE, _("Something went really wrong.")); } g_free(dir); @@ -372,16 +372,16 @@ gchar *locale_filename = NULL; gchar *text; - idx = documents->get_cur_idx(); + idx = p_document->get_cur_idx(); g_return_if_fail(DOC_IDX_VALID(idx) && doc_list[idx].file_name != NULL); if (doc_list[idx].changed) { - documents->save_file(idx, FALSE); + p_document->save_file(idx, FALSE); } - locale_filename = utils->get_locale_from_utf8(doc_list[idx].file_name); + locale_filename = p_utils->get_locale_from_utf8(doc_list[idx].file_name); base_name = g_path_get_dirname(locale_filename); text = make_diff(base_name, VC_COMMAND_DIFF_DIR); @@ -403,16 +403,16 @@ gchar *locale_filename = NULL; gchar *text; - idx = documents->get_cur_idx(); + idx = p_document->get_cur_idx(); g_return_if_fail(project != NULL && NZV(project->base_path)); if (DOC_IDX_VALID(idx) && doc_list[idx].changed && doc_list[idx].file_name != NULL) { - documents->save_file(idx, FALSE); + p_document->save_file(idx, FALSE); } - locale_filename = utils->get_locale_from_utf8(project->base_path); + locale_filename = p_utils->get_locale_from_utf8(project->base_path); text = make_diff(locale_filename, VC_COMMAND_DIFF_PROJECT); if (text) { @@ -429,16 +429,16 @@ gint idx; gchar *locale_filename, *text; - idx = documents->get_cur_idx(); + idx = p_document->get_cur_idx(); g_return_if_fail(DOC_IDX_VALID(idx) && doc_list[idx].file_name != NULL); if (doc_list[idx].changed) { - documents->save_file(idx, FALSE); + p_document->save_file(idx, FALSE); } - locale_filename = utils->get_locale_from_utf8(doc_list[idx].file_name); + locale_filename = p_utils->get_locale_from_utf8(doc_list[idx].file_name); text = make_diff(locale_filename, VC_COMMAND_DIFF_FILE); if (text) @@ -460,7 +460,7 @@ gboolean have_file; gboolean have_vc = FALSE; - doc = documents->get_current(); + doc = p_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; Modified: trunk/src/plugindata.h =================================================================== --- trunk/src/plugindata.h 2008-01-27 18:27:33 UTC (rev 2194) +++ trunk/src/plugindata.h 2008-01-28 17:27:39 UTC (rev 2195) @@ -93,7 +93,7 @@ /* The API version should be incremented whenever any plugin data types below are * modified or appended to. */ -static const gint api_version = 39; +static const gint api_version = 40; /* The ABI version should be incremented whenever existing fields in the plugin * data types below have to be changed or reordered. It should stay the same if fields This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [2194] trunk
by eht16＠users.sourceforge.net 27 Jan '08

27 Jan '08

Revision: 2194 http://geany.svn.sourceforge.net/geany/?rev=2194&view=rev Author: eht16 Date: 2008-01-27 10:27:33 -0800 (Sun, 27 Jan 2008) Log Message: ----------- Fix crash on Windows when printing an untitled file. Fix black line number margin when printing by using also pre-defined styles. Modified Paths: -------------- trunk/ChangeLog trunk/src/printing.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-01-27 17:44:18 UTC (rev 2193) +++ trunk/ChangeLog 2008-01-27 18:27:33 UTC (rev 2194) @@ -1,3 +1,11 @@ +2008-01-27 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * src/printing.c: + Fix crash on Windows when printing an untitled file. + Fix black line number margin when printing by using also pre-defined + styles. + + 2008-01-25 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * src/project.c: Modified: trunk/src/printing.c =================================================================== --- trunk/src/printing.c 2008-01-27 17:44:18 UTC (rev 2193) +++ trunk/src/printing.c 2008-01-27 18:27:33 UTC (rev 2194) @@ -434,6 +434,8 @@ // read all styles from Scintilla style_max = pow(2, scintilla_send_message(doc_list[dinfo->idx].sci, SCI_GETSTYLEBITS, 0, 0)); + if (style_max == 32) // if the lexer uses only the first 32 styles(style bits = 5), we need + style_max = STYLE_LASTPREDEFINED; // to add the pre-defined styles for (i = 0; i < style_max; i++) { dinfo->styles[i][FORE] = ROTATE_RGB(scintilla_send_message( This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [2193] trunk/src/printing.c
by eht16＠users.sourceforge.net 27 Jan '08

27 Jan '08

Revision: 2193 http://geany.svn.sourceforge.net/geany/?rev=2193&view=rev Author: eht16 Date: 2008-01-27 09:44:18 -0800 (Sun, 27 Jan 2008) Log Message: ----------- Fix crash on Windows when printing an untitled file. Modified Paths: -------------- trunk/src/printing.c Modified: trunk/src/printing.c =================================================================== --- trunk/src/printing.c 2008-01-27 14:54:00 UTC (rev 2192) +++ trunk/src/printing.c 2008-01-27 17:44:18 UTC (rev 2193) @@ -711,10 +711,11 @@ static void status_changed(GtkPrintOperation *op, gpointer data) { + gchar *filename = (data != NULL) ? data : GEANY_STRING_UNTITLED; if (gtk_print_operation_get_status(op) == GTK_PRINT_STATUS_FINISHED_ABORTED) - msgwin_status_add(_("Printing of file %s was cancelled."), (gchar *) data); + msgwin_status_add(_("Printing of file %s was cancelled."), filename); else if (gtk_print_operation_get_status(op) == GTK_PRINT_STATUS_FINISHED) - msgwin_status_add(_("File %s printed."), (gchar *) data); + msgwin_status_add(_("File %s printed."), filename); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [2192] trunk/po
by frlan＠users.sourceforge.net 27 Jan '08

27 Jan '08

Revision: 2192 http://geany.svn.sourceforge.net/geany/?rev=2192&view=rev Author: frlan Date: 2008-01-27 06:54:00 -0800 (Sun, 27 Jan 2008) Log Message: ----------- Update of British English translation Modified Paths: -------------- trunk/po/ChangeLog trunk/po/en_GB.po Modified: trunk/po/ChangeLog =================================================================== --- trunk/po/ChangeLog 2008-01-26 17:46:55 UTC (rev 2191) +++ trunk/po/ChangeLog 2008-01-27 14:54:00 UTC (rev 2192) @@ -1,3 +1,8 @@ +2008-01-27 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> + + * en_GB.po: Update British English translation (Thanks to Jeff Bailes) + + 2008-01-26 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> * hu.po: Update of Hungarian translation (Thanks to Gabor Kmetyko) Modified: trunk/po/en_GB.po =================================================================== --- trunk/po/en_GB.po 2008-01-26 17:46:55 UTC (rev 2191) +++ trunk/po/en_GB.po 2008-01-27 14:54:00 UTC (rev 2192) @@ -1,7 +1,7 @@ # British English translation of geany. # Copyright (C) 2007 THE geany'S COPYRIGHT HOLDER # This file is distributed under the same license as the geany package. -# Jeff Bailes <thepizzaking(a)gmail.com>, 2007. +# Jeff Bailes <thepizzaking(a)gmail.com>, 2007, 2008. # # msgid "" @@ -9,25 +9,26 @@ "Project-Id-Version: geany 0.13\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-01-19 16:55+0100\n" -"PO-Revision-Date: 2007-07-16 18:48+1000\n" +"PO-Revision-Date: 2008-01-27 21:08+1000\n" "Last-Translator: Jeff Bailes <thepizzaking(a)gmail.com>\n" -"Language-Team: British English\n" +"Language-Team: British English <geany-i18n(a)uvena.de>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" #: ../geany.desktop.in.h:1 -#, fuzzy msgid "A fast and lightweight IDE using GTK2" -msgstr "A fast and lightweight IDE" +msgstr "A fast and lightweight IDE using GTK2" -#: ../geany.desktop.in.h:2 ../src/interface.c:283 ../src/interface.c:1676 +#: ../geany.desktop.in.h:2 +#: ../src/interface.c:283 +#: ../src/interface.c:1676 msgid "Geany" msgstr "Geany" #: ../geany.desktop.in.h:3 msgid "Integrated Development Environment" -msgstr "" +msgstr "Integrated Development Environment" #: ../src/about.c:120 msgid "About Geany" @@ -52,9 +53,8 @@ msgstr "Developers" #: ../src/about.c:248 -#, fuzzy msgid "maintainer" -msgstr "Maintainer" +msgstr "maintainer" #: ../src/about.c:256 msgid "developer" @@ -69,9 +69,8 @@ msgstr "Translators" #: ../src/about.c:293 -#, fuzzy msgid "Previous Translators" -msgstr "Translators" +msgstr "Previous Translators" #: ../src/about.c:312 msgid "Credits" @@ -82,37 +81,36 @@ msgstr "Licence" #: ../src/about.c:335 -msgid "" -"License text could not be found, please visit http://www.gnu.org/licenses/" -"gpl-2.0.txt to view it online." -msgstr "" +msgid "License text could not be found, please visit http://www.gnu.org/licenses/gpl-2.0.txt to view it online." +msgstr "Licence text could not be found, please visit http://www.gnu.org/licenses/gpl-2.0.txt to view it online." #: ../src/build.c:177 #, c-format msgid "Failed to view %s (make sure it is already compiled)" msgstr "Failed to view %s (make sure it is already compiled)" -#: ../src/build.c:210 ../src/build.c:838 -#, fuzzy, c-format -msgid "" -"Could not find terminal \"%s\" (check path for Terminal tool setting in " -"Preferences)" -msgstr "" -"Could not find terminal '%s' (check path for Terminal tool setting in " -"Preferences)" +#: ../src/build.c:210 +#: ../src/build.c:838 +#, c-format +msgid "Could not find terminal \"%s\" (check path for Terminal tool setting in Preferences)" +msgstr "Could not find terminal \"%s\" (check path for Terminal tool setting in Preferences)" -#: ../src/build.c:224 ../src/build.c:744 +#: ../src/build.c:224 +#: ../src/build.c:744 #, c-format msgid "Failed to execute \"%s\" (start-script could not be created)" msgstr "Failed to execute \"%s\" (start-script could not be created)" -#: ../src/build.c:261 ../src/build.c:562 ../src/build.c:871 +#: ../src/build.c:261 +#: ../src/build.c:562 +#: ../src/build.c:871 #: ../src/search.c:1171 #, c-format msgid "Process failed (%s)" msgstr "Process failed (%s)" -#: ../src/build.c:379 ../src/build.c:629 +#: ../src/build.c:379 +#: ../src/build.c:629 msgid "Command stopped because the current file has no extension." msgstr "Command stopped because the current file has no extension." @@ -127,19 +125,18 @@ msgstr "%s (in directory: %s)" #: ../src/build.c:640 -#, fuzzy, c-format +#, c-format msgid "Failed to execute \"%s\" (make sure it is already built)" -msgstr "Failed to execute %s (make sure it is already built)" +msgstr "Failed to execute \"%s\" (make sure it is already built)" #: ../src/build.c:708 -#, fuzzy, c-format +#, c-format msgid "Failed to change the working directory to \"%s\"" -msgstr "Failed to change the working directory to %s" +msgstr "Failed to change the working directory to \"%s\"" #: ../src/build.c:802 -msgid "" -"Could not execute the file in the VTE because it probably contains a command." -msgstr "" +msgid "Could not execute the file in the VTE because it probably contains a command." +msgstr "Could not execute the file in the VTE because it probably contains a command." #: ../src/build.c:984 msgid "Compilation failed." @@ -159,7 +156,8 @@ msgstr "Compiles the current file" #. build the code -#: ../src/build.c:1113 ../src/interface.c:967 +#: ../src/build.c:1113 +#: ../src/interface.c:967 msgid "_Build" msgstr "_Build" @@ -168,20 +166,24 @@ msgstr "Builds the current file (generate an executable file)" #. build the code with make all -#: ../src/build.c:1127 ../src/build.c:1247 +#: ../src/build.c:1127 +#: ../src/build.c:1247 msgid "_Make All" msgstr "_Make All" -#: ../src/build.c:1130 ../src/build.c:1250 +#: ../src/build.c:1130 +#: ../src/build.c:1250 msgid "Builds the current file with the make tool and the default target" msgstr "Builds the current file with the make tool and the default target" #. build the code with make custom -#: ../src/build.c:1138 ../src/build.c:1258 +#: ../src/build.c:1138 +#: ../src/build.c:1258 msgid "Make Custom _Target" msgstr "Make Custom _Target" -#: ../src/build.c:1142 ../src/build.c:1262 +#: ../src/build.c:1142 +#: ../src/build.c:1262 msgid "Builds the current file with the make tool and the specified target" msgstr "Builds the current file with the make tool and the specified target" @@ -195,11 +197,13 @@ msgstr "Compiles the current file using the make tool" #. next error -#: ../src/build.c:1164 ../src/build.c:1273 +#: ../src/build.c:1164 +#: ../src/build.c:1273 msgid "_Next Error" msgstr "_Next Error" -#: ../src/build.c:1179 ../src/interface.c:1111 +#: ../src/build.c:1179 +#: ../src/interface.c:1111 msgid "Run or view the current file" msgstr "Run or view the current file" @@ -209,12 +213,8 @@ msgstr "_Set Includes and Arguments" #: ../src/build.c:1195 -msgid "" -"Sets the includes and library paths for the compiler and the program " -"arguments for execution" -msgstr "" -"Sets the includes and library paths for the compiler and the program " -"arguments for execution" +msgid "Sets the includes and library paths for the compiler and the program arguments for execution" +msgstr "Sets the includes and library paths for the compiler and the program arguments for execution" #. DVI #: ../src/build.c:1217 @@ -239,7 +239,8 @@ msgid "View DVI File" msgstr "View DVI File" -#: ../src/build.c:1290 ../src/build.c:1303 +#: ../src/build.c:1290 +#: ../src/build.c:1303 msgid "Compile and view the current file" msgstr "Compile and view the current file" @@ -249,7 +250,8 @@ msgstr "View PDF File" #. arguments -#: ../src/build.c:1318 ../src/build.c:1397 +#: ../src/build.c:1318 +#: ../src/build.c:1397 msgid "Set Arguments" msgstr "Set Arguments" @@ -277,7 +279,8 @@ msgid "PDF preview:" msgstr "PDF preview:" -#: ../src/build.c:1488 ../src/build.c:1660 +#: ../src/build.c:1488 +#: ../src/build.c:1660 #, c-format msgid "" "%f will be replaced by the current filename, e.g. test_file.c\n" @@ -296,9 +299,9 @@ #. in-dialog heading for the "Set Includes and Arguments" dialog #: ../src/build.c:1581 -#, fuzzy, c-format +#, c-format msgid "%s commands" -msgstr " commands" +msgstr "%s commands" #: ../src/build.c:1596 msgid "Compile:" @@ -308,7 +311,8 @@ msgid "Build:" msgstr "Build:" -#: ../src/build.c:1638 ../src/dialogs.c:1164 +#: ../src/build.c:1638 +#: ../src/dialogs.c:1164 msgid "Execute:" msgstr "Execute:" @@ -317,10 +321,8 @@ msgstr "Make Custom Target" #: ../src/build.c:1952 -msgid "" -"Enter custom options here, all entered text is passed to the make command." -msgstr "" -"Enter custom options here, all entered text is passed to the make command." +msgid "Enter custom options here, all entered text is passed to the make command." +msgstr "Enter custom options here, all entered text is passed to the make command." #: ../src/build.c:2042 msgid "Failed to execute the view program" @@ -343,7 +345,9 @@ msgid "Do you really want to quit?" msgstr "Do you really want to quit?" -#: ../src/callbacks.c:510 ../src/interface.c:357 ../src/treeviews.c:448 +#: ../src/callbacks.c:510 +#: ../src/interface.c:357 +#: ../src/treeviews.c:448 #: ../src/utils.c:336 msgid "_Reload" msgstr "_Reload" @@ -357,54 +361,53 @@ msgid "Are you sure you want to reload '%s'?" msgstr "Are you sure you want to reload '%s'?" -#: ../src/callbacks.c:1321 ../src/callbacks.c:1345 -msgid "" -"Please set the filetype for the current file before using this function." -msgstr "" -"Please set the filetype for the current file before using this function." +#: ../src/callbacks.c:1321 +#: ../src/callbacks.c:1345 +msgid "Please set the filetype for the current file before using this function." +msgstr "Please set the filetype for the current file before using this function." -#: ../src/callbacks.c:1447 ../src/ui_utils.c:480 +#: ../src/callbacks.c:1447 +#: ../src/ui_utils.c:480 msgid "dd.mm.yyyy" msgstr "dd.mm.yyyy" -#: ../src/callbacks.c:1449 ../src/ui_utils.c:481 +#: ../src/callbacks.c:1449 +#: ../src/ui_utils.c:481 msgid "mm.dd.yyyy" msgstr "mm.dd.yyyy" -#: ../src/callbacks.c:1451 ../src/ui_utils.c:482 +#: ../src/callbacks.c:1451 +#: ../src/ui_utils.c:482 msgid "yyyy/mm/dd" msgstr "yyyy/mm/dd" -#: ../src/callbacks.c:1453 ../src/ui_utils.c:491 +#: ../src/callbacks.c:1453 +#: ../src/ui_utils.c:491 msgid "dd.mm.yyyy hh:mm:ss" msgstr "dd.mm.yyyy hh:mm:ss" -#: ../src/callbacks.c:1455 ../src/ui_utils.c:492 +#: ../src/callbacks.c:1455 +#: ../src/ui_utils.c:492 msgid "mm.dd.yyyy hh:mm:ss" msgstr "mm.dd.yyyy hh:mm:ss" -#: ../src/callbacks.c:1457 ../src/ui_utils.c:493 +#: ../src/callbacks.c:1457 +#: ../src/ui_utils.c:493 msgid "yyyy/mm/dd hh:mm:ss" msgstr "yyyy/mm/dd hh:mm:ss" -#: ../src/callbacks.c:1459 ../src/ui_utils.c:502 -#, fuzzy +#: ../src/callbacks.c:1459 +#: ../src/ui_utils.c:502 msgid "_Use Custom Date Format" -msgstr "Use Custom Date Format" +msgstr "_Use Custom Date Format" #: ../src/callbacks.c:1470 msgid "Custom Date Format" msgstr "Custom Date Format" #: ../src/callbacks.c:1471 -#, fuzzy -msgid "" -"Enter here a custom date and time format. You can use any conversion " -"specifiers which can be used with the ANSI C strftime function." -msgstr "" -"Enter here a custom date and time format. You can use any conversion " -"specifiers which can be used with the ANSI C strftime function. See \"man " -"strftime\" for more information." +msgid "Enter here a custom date and time format. You can use any conversion specifiers which can be used with the ANSI C strftime function." +msgstr "Enter here a custom date and time format. You can use any conversion specifiers which can be used with the ANSI C strftime function." #: ../src/callbacks.c:1490 msgid "Date format string could not be converted (possibly too long)." @@ -415,27 +418,26 @@ msgstr "No more message items." #. initialize the dialog -#: ../src/dialogs.c:174 ../src/prefs.c:1442 +#: ../src/dialogs.c:174 +#: ../src/prefs.c:1442 msgid "Open File" msgstr "Open File" -#: ../src/dialogs.c:178 ../src/interface.c:708 +#: ../src/dialogs.c:178 +#: ../src/interface.c:708 msgid "_View" msgstr "_View" #: ../src/dialogs.c:180 -msgid "" -"Opens the file in read-only mode. If you choose more than one file to open, " -"all files will be opened read-only." -msgstr "" -"Opens the file in read-only mode. If you choose more than one file to open, " -"all files will be opened read-only." +msgid "Opens the file in read-only mode. If you choose more than one file to open, all files will be opened read-only." +msgstr "Opens the file in read-only mode. If you choose more than one file to open, all files will be opened read-only." #: ../src/dialogs.c:216 msgid "Detect by file extension" msgstr "Detect by file extension" -#: ../src/dialogs.c:227 ../src/interface.c:3693 +#: ../src/dialogs.c:227 +#: ../src/interface.c:3693 msgid "Detect from file" msgstr "Detect from file" @@ -450,17 +452,11 @@ #: ../src/dialogs.c:313 msgid "" -"Explicitly defines an encoding for the file, if it would not be detected. " -"This is useful when you know that the encoding of a file cannot be detected " -"correctly by Geany.\n" -"Note if you choose multiple files, they will all be opened with the chosen " -"encoding." +"Explicitly defines an encoding for the file, if it would not be detected. This is useful when you know that the encoding of a file cannot be detected correctly by Geany.\n" +"Note if you choose multiple files, they will all be opened with the chosen encoding." msgstr "" -"Explicitly defines an encoding for the file, if it would not be detected. " -"This is useful when you know that the encoding of a file cannot be detected " -"correctly by Geany.\n" -"Note if you choose multiple files, they will all be opened with the chosen " -"encoding." +"Explicitly defines an encoding for the file, if it would not be detected. This is useful when you know that the encoding of a file cannot be detected correctly by Geany.\n" +"Note if you choose multiple files, they will all be opened with the chosen encoding." #: ../src/dialogs.c:333 msgid "Set filetype:" @@ -468,17 +464,14 @@ #: ../src/dialogs.c:343 msgid "" -"Explicitly defines a filetype for the file, if it would not be detected by " -"filename extension.\n" -"Note if you choose multiple files, they will all be opened with the chosen " -"filetype." +"Explicitly defines a filetype for the file, if it would not be detected by filename extension.\n" +"Note if you choose multiple files, they will all be opened with the chosen filetype." msgstr "" -"Explicitly defines a filetype for the file, if it would not be detected by " -"filename extension.\n" -"Note if you choose multiple files, they will all be opened with the chosen " -"filetype." +"Explicitly defines a filetype for the file, if it would not be detected by filename extension.\n" +"Note if you choose multiple files, they will all be opened with the chosen filetype." -#: ../src/dialogs.c:454 ../plugins/export.c:333 +#: ../src/dialogs.c:454 +#: ../plugins/export.c:333 #, c-format msgid "The file '%s' already exists. Do you want to overwrite it?" msgstr "The file '%s' already exists. Do you want to overwrite it?" @@ -488,23 +481,20 @@ msgstr "Save File" #: ../src/dialogs.c:487 -#, fuzzy msgid "R_ename" -msgstr "Filename:" +msgstr "R_ename" #: ../src/dialogs.c:489 msgid "Save the file and rename it." -msgstr "" +msgstr "Save the file and rename it." #: ../src/dialogs.c:500 msgid "_Open file in a new tab" -msgstr "" +msgstr "_Open file in a new tab" #: ../src/dialogs.c:502 -msgid "" -"Keep the current unsaved document open and open the newly saved file in a " -"new tab." -msgstr "" +msgid "Keep the current unsaved document open and open the newly saved file in a new tab." +msgstr "Keep the current unsaved document open and open the newly saved file in a new tab." #: ../src/dialogs.c:661 #, c-format @@ -523,7 +513,9 @@ msgid "Choose font" msgstr "Choose font" -#: ../src/dialogs.c:902 ../src/interface.c:2316 ../src/keybindings.c:170 +#: ../src/dialogs.c:902 +#: ../src/interface.c:2316 +#: ../src/keybindings.c:170 msgid "Go to Line" msgstr "Go to Line" @@ -532,16 +524,18 @@ msgstr "Enter the line you want to go to:" #: ../src/dialogs.c:956 -msgid "" -"An error occurred or file information could not be retrieved (e.g. from a " -"new file)." -msgstr "" -"An error occurred or file information could not be retrieved (e.g. from a " -"new file)." +msgid "An error occurred or file information could not be retrieved (e.g. from a new file)." +msgstr "An error occurred or file information could not be retrieved (e.g. from a new file)." -#: ../src/dialogs.c:975 ../src/dialogs.c:976 ../src/dialogs.c:977 -#: ../src/dialogs.c:983 ../src/dialogs.c:984 ../src/dialogs.c:985 -#: ../src/ui_utils.c:161 ../src/utils.c:498 ../src/utils.c:519 +#: ../src/dialogs.c:975 +#: ../src/dialogs.c:976 +#: ../src/dialogs.c:977 +#: ../src/dialogs.c:983 +#: ../src/dialogs.c:984 +#: ../src/dialogs.c:985 +#: ../src/ui_utils.c:161 +#: ../src/utils.c:498 +#: ../src/utils.c:519 #: ../src/utils.c:572 msgid "unknown" msgstr "unknown" @@ -574,7 +568,8 @@ msgid "Encoding:" msgstr "Encoding:" -#: ../src/dialogs.c:1085 ../src/ui_utils.c:163 +#: ../src/dialogs.c:1085 +#: ../src/ui_utils.c:163 msgid "(with BOM)" msgstr "(with BOM)" @@ -632,7 +627,8 @@ msgid "New file \"%s\" opened." msgstr "New file \"%s\" opened." -#: ../src/document.c:758 ../src/document.c:1134 +#: ../src/document.c:758 +#: ../src/document.c:1134 #, c-format msgid "Could not open file %s (%s)" msgstr "Could not open file %s (%s)" @@ -640,14 +636,10 @@ #: ../src/document.c:785 #, c-format msgid "" -"The file \"%s\" could not be opened properly and has been truncated. This " -"can occur if the file contains a NULL byte. Be aware that saving it can " -"cause data loss.\n" +"The file \"%s\" could not be opened properly and has been truncated. This can occur if the file contains a NULL byte. Be aware that saving it can cause data loss.\n" "The file was set to read-only." msgstr "" -"The file \"%s\" could not be opened properly and has been truncated. This " -"can occur if the file contains a NULL byte. Be aware that saving it can " -"cause data loss.\n" +"The file \"%s\" could not be opened properly and has been truncated. This can occur if the file contains a NULL byte. Be aware that saving it can cause data loss.\n" "The file was set to read-only." #: ../src/document.c:809 @@ -657,30 +649,29 @@ #: ../src/document.c:818 #, c-format -msgid "" -"The file \"%s\" does not look like a text file or the file encoding is not " -"supported." -msgstr "" -"The file \"%s\" does not look like a text file or the file encoding is not " -"supported." +msgid "The file \"%s\" does not look like a text file or the file encoding is not supported." +msgstr "The file \"%s\" does not look like a text file or the file encoding is not supported." #: ../src/document.c:927 msgid "Invalid filename" msgstr "Invalid filename" #: ../src/document.c:987 -#, fuzzy, c-format +#, c-format msgid "Setting %s indentation mode." -msgstr "Auto indentation mode:" +msgstr "Setting %s indentation mode." -#: ../src/document.c:988 ../src/interface.c:808 ../src/interface.c:3672 +#: ../src/document.c:988 +#: ../src/interface.c:808 +#: ../src/interface.c:3672 msgid "Tabs" -msgstr "" +msgstr "Tabs" -#: ../src/document.c:988 ../src/interface.c:814 ../src/interface.c:3679 -#, fuzzy +#: ../src/document.c:988 +#: ../src/interface.c:814 +#: ../src/interface.c:3679 msgid "Spaces" -msgstr "Namespaces" +msgstr "Spaces" #: ../src/document.c:1037 #, c-format @@ -696,19 +687,15 @@ msgid ", read-only" msgstr ", read-only" -#: ../src/document.c:1188 ../src/document.c:1302 +#: ../src/document.c:1188 +#: ../src/document.c:1302 msgid "Error saving file." msgstr "Error saving file." #: ../src/document.c:1236 -#, fuzzy, c-format -msgid "" -"An error occurred while converting the file from UTF-8 in \"%s\". The file " -"remains unsaved." -msgstr "" -"An error occurred while converting the file from UTF-8 in \"%s\". The file " -"remains unsaved.\n" -"Error message: %s\n" +#, c-format +msgid "An error occurred while converting the file from UTF-8 in \"%s\". The file remains unsaved." +msgstr "An error occurred while converting the file from UTF-8 in \"%s\". The file remains unsaved." #: ../src/document.c:1257 #, c-format @@ -716,11 +703,13 @@ "Error message: %s\n" "The error occurred at \"%s\" (line: %d, column: %d)." msgstr "" +"Error message: %s\n" +"The error occurred at \"%s\" (line: %d, column: %d)." #: ../src/document.c:1262 -#, fuzzy, c-format +#, c-format msgid "Error message: %s." -msgstr "Error saving file (%s)." +msgstr "Error message: %s." #: ../src/document.c:1290 #, c-format @@ -732,7 +721,9 @@ msgid "File %s saved." msgstr "File %s saved." -#: ../src/document.c:1405 ../src/document.c:1459 ../src/document.c:1467 +#: ../src/document.c:1405 +#: ../src/document.c:1459 +#: ../src/document.c:1467 #, c-format msgid "\"%s\" was not found." msgstr "\"%s\" was not found." @@ -741,13 +732,16 @@ msgid "Wrap search and find again?" msgstr "Wrap search and find again?" -#: ../src/document.c:1542 ../src/search.c:859 ../src/search.c:1360 +#: ../src/document.c:1542 +#: ../src/search.c:859 +#: ../src/search.c:1360 #: ../src/search.c:1361 -#, fuzzy, c-format +#, c-format msgid "No matches found for \"%s\"." -msgstr "No matches found for '%s'." +msgstr "No matches found for \"%s\"." -#: ../src/document.c:1552 ../src/document.c:1559 +#: ../src/document.c:1552 +#: ../src/document.c:1559 #, c-format msgid "%s: replaced %d occurrence(s) of \"%s\" with \"%s\"." msgstr "%s: replaced %d occurrence(s) of \"%s\" with \"%s\"." @@ -768,7 +762,8 @@ msgid "Celtic" msgstr "Celtic" -#: ../src/encodings.c:66 ../src/encodings.c:67 +#: ../src/encodings.c:66 +#: ../src/encodings.c:67 msgid "Greek" msgstr "Greek" @@ -780,21 +775,30 @@ msgid "South European" msgstr "South European" -#: ../src/encodings.c:70 ../src/encodings.c:71 ../src/encodings.c:72 +#: ../src/encodings.c:70 +#: ../src/encodings.c:71 +#: ../src/encodings.c:72 #: ../src/encodings.c:73 msgid "Western" msgstr "Western" -#: ../src/encodings.c:75 ../src/encodings.c:76 ../src/encodings.c:77 +#: ../src/encodings.c:75 +#: ../src/encodings.c:76 +#: ../src/encodings.c:77 msgid "Baltic" msgstr "Baltic" -#: ../src/encodings.c:78 ../src/encodings.c:79 ../src/encodings.c:80 +#: ../src/encodings.c:78 +#: ../src/encodings.c:79 +#: ../src/encodings.c:80 msgid "Central European" msgstr "Central European" -#: ../src/encodings.c:81 ../src/encodings.c:82 ../src/encodings.c:83 -#: ../src/encodings.c:84 ../src/encodings.c:85 +#: ../src/encodings.c:81 +#: ../src/encodings.c:82 +#: ../src/encodings.c:83 +#: ../src/encodings.c:84 +#: ../src/encodings.c:85 msgid "Cyrillic" msgstr "Cyrillic" @@ -810,11 +814,15 @@ msgid "Romanian" msgstr "Romanian" -#: ../src/encodings.c:90 ../src/encodings.c:91 ../src/encodings.c:92 +#: ../src/encodings.c:90 +#: ../src/encodings.c:91 +#: ../src/encodings.c:92 msgid "Arabic" msgstr "Arabic" -#: ../src/encodings.c:93 ../src/encodings.c:94 ../src/encodings.c:95 +#: ../src/encodings.c:93 +#: ../src/encodings.c:94 +#: ../src/encodings.c:95 msgid "Hebrew" msgstr "Hebrew" @@ -834,34 +842,51 @@ msgid "Thai" msgstr "Thai" -#: ../src/encodings.c:101 ../src/encodings.c:102 ../src/encodings.c:103 +#: ../src/encodings.c:101 +#: ../src/encodings.c:102 +#: ../src/encodings.c:103 msgid "Turkish" msgstr "Turkish" -#: ../src/encodings.c:104 ../src/encodings.c:105 ../src/encodings.c:106 +#: ../src/encodings.c:104 +#: ../src/encodings.c:105 +#: ../src/encodings.c:106 msgid "Vietnamese" msgstr "Vietnamese" -#: ../src/encodings.c:108 ../src/encodings.c:109 ../src/encodings.c:110 -#: ../src/encodings.c:111 ../src/encodings.c:112 ../src/encodings.c:113 -#: ../src/encodings.c:114 ../src/encodings.c:115 +#: ../src/encodings.c:108 +#: ../src/encodings.c:109 +#: ../src/encodings.c:110 +#: ../src/encodings.c:111 +#: ../src/encodings.c:112 +#: ../src/encodings.c:113 +#: ../src/encodings.c:114 +#: ../src/encodings.c:115 msgid "Unicode" msgstr "Unicode" -#: ../src/encodings.c:117 ../src/encodings.c:118 ../src/encodings.c:119 +#: ../src/encodings.c:117 +#: ../src/encodings.c:118 +#: ../src/encodings.c:119 #: ../src/encodings.c:120 msgid "Chinese Simplified" msgstr "Chinese Simplified" -#: ../src/encodings.c:121 ../src/encodings.c:122 ../src/encodings.c:123 +#: ../src/encodings.c:121 +#: ../src/encodings.c:122 +#: ../src/encodings.c:123 msgid "Chinese Traditional" msgstr "Chinese Traditional" -#: ../src/encodings.c:124 ../src/encodings.c:125 ../src/encodings.c:126 +#: ../src/encodings.c:124 +#: ../src/encodings.c:125 +#: ../src/encodings.c:126 msgid "Japanese" msgstr "Japanese" -#: ../src/encodings.c:127 ../src/encodings.c:128 ../src/encodings.c:129 +#: ../src/encodings.c:127 +#: ../src/encodings.c:128 +#: ../src/encodings.c:129 #: ../src/encodings.c:130 msgid "Korean" msgstr "Korean" @@ -894,18 +919,34 @@ msgid "_Unicode" msgstr "_Unicode" -#: ../src/filetypes.c:107 ../src/filetypes.c:118 ../src/filetypes.c:130 -#: ../src/filetypes.c:141 ../src/filetypes.c:152 ../src/filetypes.c:163 -#: ../src/filetypes.c:175 ../src/filetypes.c:186 ../src/filetypes.c:197 -#: ../src/filetypes.c:209 ../src/filetypes.c:220 ../src/filetypes.c:232 -#: ../src/filetypes.c:244 ../src/filetypes.c:255 ../src/filetypes.c:266 -#: ../src/filetypes.c:277 ../src/filetypes.c:288 ../src/filetypes.c:299 -#: ../src/filetypes.c:310 ../src/filetypes.c:357 ../src/filetypes.c:368 -#: ../src/filetypes.c:402 ../src/filetypes.c:413 ../src/filetypes.c:424 +#: ../src/filetypes.c:107 +#: ../src/filetypes.c:118 +#: ../src/filetypes.c:130 +#: ../src/filetypes.c:141 +#: ../src/filetypes.c:152 +#: ../src/filetypes.c:163 +#: ../src/filetypes.c:175 +#: ../src/filetypes.c:186 +#: ../src/filetypes.c:197 +#: ../src/filetypes.c:209 +#: ../src/filetypes.c:220 +#: ../src/filetypes.c:232 +#: ../src/filetypes.c:244 +#: ../src/filetypes.c:255 +#: ../src/filetypes.c:266 +#: ../src/filetypes.c:277 +#: ../src/filetypes.c:288 +#: ../src/filetypes.c:299 +#: ../src/filetypes.c:310 +#: ../src/filetypes.c:357 +#: ../src/filetypes.c:368 +#: ../src/filetypes.c:402 +#: ../src/filetypes.c:413 +#: ../src/filetypes.c:424 #: ../src/filetypes.c:458 -#, fuzzy, c-format +#, c-format msgid "%s source file" -msgstr "C source file" +msgstr "%s source file" #: ../src/filetypes.c:321 msgid "Shell script file" @@ -916,12 +957,10 @@ msgstr "Makefile" #: ../src/filetypes.c:345 -#, fuzzy msgid "XML document" -msgstr "whole document" +msgstr "XML document" #: ../src/filetypes.c:380 -#, fuzzy msgid "Cascading StyleSheet" msgstr "Cascading StyleSheet" @@ -939,34 +978,37 @@ #: ../src/filetypes.c:469 msgid "reStructuredText file" -msgstr "" +msgstr "reStructuredText file" -#: ../src/filetypes.c:481 ../src/project.c:265 +#: ../src/filetypes.c:481 +#: ../src/project.c:265 msgid "All files" msgstr "All files" #: ../src/filetypes.c:508 msgid "_Programming Languages" -msgstr "" +msgstr "_Programming Languages" #: ../src/filetypes.c:509 msgid "_Scripting Languages" -msgstr "" +msgstr "_Scripting Languages" #: ../src/filetypes.c:510 msgid "_Markup Languages" -msgstr "" +msgstr "_Markup Languages" #: ../src/filetypes.c:511 -#, fuzzy msgid "M_iscellaneous Languages" -msgstr "Miscellaneous characters" +msgstr "M_iscellaneous Languages" -#: ../src/filetypes.c:545 ../src/interface.c:3643 ../src/templates.c:350 +#: ../src/filetypes.c:545 +#: ../src/interface.c:3643 +#: ../src/templates.c:350 msgid "None" msgstr "None" -#: ../src/filetypes.c:964 ../src/win32.c:83 +#: ../src/filetypes.c:964 +#: ../src/win32.c:83 msgid "All Source" msgstr "All Source" @@ -982,14 +1024,21 @@ msgid "New (with _Template)" msgstr "New (with _Template)" -#: ../src/interface.c:315 ../src/interface.c:376 ../src/interface.c:556 -#: ../src/interface.c:616 ../src/interface.c:630 ../src/interface.c:846 -#: ../src/interface.c:856 ../src/interface.c:2209 ../src/interface.c:2269 +#: ../src/interface.c:315 +#: ../src/interface.c:376 +#: ../src/interface.c:556 +#: ../src/interface.c:616 +#: ../src/interface.c:630 +#: ../src/interface.c:846 +#: ../src/interface.c:856 +#: ../src/interface.c:2209 +#: ../src/interface.c:2269 #: ../src/interface.c:2283 msgid "invisible" msgstr "invisible" -#: ../src/interface.c:327 ../src/interface.c:2135 +#: ../src/interface.c:327 +#: ../src/interface.c:2135 msgid "Open Selected F_ile" msgstr "Open Selected F_ile" @@ -1019,7 +1068,7 @@ #: ../src/interface.c:403 msgid "Page set_up" -msgstr "" +msgstr "Page set_up" #: ../src/interface.c:410 msgid "Prints the current file" @@ -1033,7 +1082,8 @@ msgid "Closes all open files" msgstr "Closes all open files" -#: ../src/interface.c:438 ../src/interface.c:1203 +#: ../src/interface.c:438 +#: ../src/interface.c:1203 msgid "Quit Geany" msgstr "Quit Geany" @@ -1041,11 +1091,13 @@ msgid "_Edit" msgstr "_Edit" -#: ../src/interface.c:481 ../src/interface.c:2126 +#: ../src/interface.c:481 +#: ../src/interface.c:2126 msgid "Select _All" msgstr "Select _All" -#: ../src/interface.c:490 ../src/interface.c:2144 +#: ../src/interface.c:490 +#: ../src/interface.c:2144 msgid "_Format" msgstr "_Format" @@ -1053,36 +1105,43 @@ msgid "Convert the case of the current selection" msgstr "Convert the case of the current selection" -#: ../src/interface.c:498 ../src/interface.c:2151 -#, fuzzy +#: ../src/interface.c:498 +#: ../src/interface.c:2151 msgid "T_oggle Case of Selection" -msgstr "Du_plicate Line or Selection" +msgstr "T_oggle Case of Selection" -#: ../src/interface.c:507 ../src/interface.c:2160 +#: ../src/interface.c:507 +#: ../src/interface.c:2160 msgid "_Comment Line(s)" msgstr "_Comment Line(s)" -#: ../src/interface.c:511 ../src/interface.c:2164 +#: ../src/interface.c:511 +#: ../src/interface.c:2164 msgid "U_ncomment Line(s)" msgstr "U_ncomment Line(s)" -#: ../src/interface.c:515 ../src/interface.c:2168 +#: ../src/interface.c:515 +#: ../src/interface.c:2168 msgid "_Toggle Line Commentation" msgstr "_Toggle Line Commentation" -#: ../src/interface.c:519 ../src/interface.c:2172 +#: ../src/interface.c:519 +#: ../src/interface.c:2172 msgid "Du_plicate Line or Selection" msgstr "Du_plicate Line or Selection" -#: ../src/interface.c:528 ../src/interface.c:2181 +#: ../src/interface.c:528 +#: ../src/interface.c:2181 msgid "_Increase Indent" msgstr "_Increase Indent" -#: ../src/interface.c:536 ../src/interface.c:2189 +#: ../src/interface.c:536 +#: ../src/interface.c:2189 msgid "_Decrease Indent" msgstr "_Decrease Indent" -#: ../src/interface.c:549 ../src/interface.c:2202 +#: ../src/interface.c:549 +#: ../src/interface.c:2202 msgid "_Send Selection to" msgstr "_Send Selection to" @@ -1090,57 +1149,68 @@ msgid "I_nsert Comments" msgstr "I_nsert Comments" -#: ../src/interface.c:575 ../src/interface.c:2228 +#: ../src/interface.c:575 +#: ../src/interface.c:2228 msgid "Insert ChangeLog Entry" msgstr "Insert ChangeLog Entry" -#: ../src/interface.c:578 ../src/interface.c:2231 +#: ../src/interface.c:578 +#: ../src/interface.c:2231 msgid "Inserts a typical ChangeLog entry in the current file" msgstr "Inserts a typical ChangeLog entry in the current file" -#: ../src/interface.c:580 ../src/interface.c:2233 +#: ../src/interface.c:580 +#: ../src/interface.c:2233 msgid "Insert File Header" msgstr "Insert File Header" -#: ../src/interface.c:583 ../src/interface.c:2236 +#: ../src/interface.c:583 +#: ../src/interface.c:2236 msgid "Inserts a file header at the beginning of the file" msgstr "Inserts a file header at the beginning of the file" -#: ../src/interface.c:585 ../src/interface.c:2238 +#: ../src/interface.c:585 +#: ../src/interface.c:2238 msgid "Insert Function Description" msgstr "Insert Function Description" -#: ../src/interface.c:588 ../src/interface.c:2241 +#: ../src/interface.c:588 +#: ../src/interface.c:2241 msgid "Inserts a description before the current function" msgstr "Inserts a description before the current function" -#: ../src/interface.c:590 ../src/interface.c:2243 +#: ../src/interface.c:590 +#: ../src/interface.c:2243 msgid "Insert Multiline Comment" msgstr "Insert Multiline Comment" -#: ../src/interface.c:593 ../src/interface.c:2246 +#: ../src/interface.c:593 +#: ../src/interface.c:2246 msgid "Inserts a multiline comment" msgstr "Inserts a multiline comment" -#: ../src/interface.c:595 ../src/interface.c:2248 +#: ../src/interface.c:595 +#: ../src/interface.c:2248 msgid "Insert GPL Notice" msgstr "Insert GPL Notice" -#: ../src/interface.c:598 ../src/interface.c:2251 +#: ../src/interface.c:598 +#: ../src/interface.c:2251 msgid "Inserts a GPL notice (should be done at the beginning of the file)" msgstr "Inserts a GPL notice (should be done at the beginning of the file)" -#: ../src/interface.c:600 ../src/interface.c:2253 +#: ../src/interface.c:600 +#: ../src/interface.c:2253 msgid "Insert BSD License Notice" msgstr "Insert BSD Licence Notice" -#: ../src/interface.c:603 ../src/interface.c:2256 -msgid "" -"Inserts a BSD licence notice (should be done at the beginning of the file)" -msgstr "" -"Inserts a BSD licence notice (should be done at the beginning of the file)" +#: ../src/interface.c:603 +#: ../src/interface.c:2256 +msgid "Inserts a BSD licence notice (should be done at the beginning of the file)" +msgstr "Inserts a BSD licence notice (should be done at the beginning of the file)" -#: ../src/interface.c:605 ../src/interface.c:2258 +#: ../src/interface.c:605 +#: ../src/interface.c:2258 msgid "Insert Dat_e" msgstr "Insert Dat_e" @@ -1164,7 +1234,8 @@ msgid "Find in F_iles" msgstr "Find in F_iles" -#: ../src/interface.c:665 ../src/search.c:405 +#: ../src/interface.c:665 +#: ../src/search.c:405 msgid "_Replace" msgstr "_Replace" @@ -1192,10 +1263,10 @@ msgid "Change the default font" msgstr "Change the default font" -#: ../src/interface.c:729 ../src/keybindings.c:173 -#, fuzzy +#: ../src/interface.c:729 +#: ../src/keybindings.c:173 msgid "Toggle All Additional Widgets" -msgstr "Toggle all additional widgets" +msgstr "Toggle All Additional Widgets" #: ../src/interface.c:733 msgid "Full_screen" @@ -1226,12 +1297,8 @@ msgstr "Show _Markers Margin" #: ../src/interface.c:757 -msgid "" -"Shows or hides the small margin right of the line numbers, which is used to " -"mark lines." -msgstr "" -"Shows or hides the small margin right of the line numbers, which is used to " -"mark lines." +msgid "Shows or hides the small margin right of the line numbers, which is used to mark lines." +msgstr "Shows or hides the small margin right of the line numbers, which is used to mark lines." #: ../src/interface.c:760 msgid "Show _Line Numbers" @@ -1249,24 +1316,18 @@ msgid "_Line Wrapping" msgstr "_Line Wrapping" -#: ../src/interface.c:793 ../src/interface.c:3722 -msgid "" -"Wrap the line at the window border and continue it on the next line. Note: " -"line wrapping has a high performance cost for large documents so should be " -"disabled on slow machines." -msgstr "" -"Wrap the line at the window border and continue it on the next line. Note: " -"line wrapping has a high performance cost for large documents so should be " -"disabled on slow machines." +#: ../src/interface.c:793 +#: ../src/interface.c:3722 +msgid "Wrap the line at the window border and continue it on the next line. Note: line wrapping has a high performance cost for large documents so should be disabled on slow machines." +msgstr "Wrap the line at the window border and continue it on the next line. Note: line wrapping has a high performance cost for large documents so should be disabled on slow machines." #: ../src/interface.c:796 -#, fuzzy msgid "_Auto-indentation" -msgstr "_Use Auto-indentation" +msgstr "_Auto-indentation" #: ../src/interface.c:801 msgid "In_dent Type" -msgstr "" +msgstr "In_dent Type" #: ../src/interface.c:825 msgid "Read _Only" @@ -1305,15 +1366,15 @@ msgstr "Convert and Set to CR (_Mac)" #: ../src/interface.c:889 -#, fuzzy msgid "_Strip Trailing Spaces" -msgstr "Strip trailing spaces" +msgstr "_Strip Trailing Spaces" #: ../src/interface.c:893 msgid "_Replace Tabs by Spaces" msgstr "_Replace Tabs by Spaces" -#: ../src/interface.c:896 ../src/interface.c:3948 +#: ../src/interface.c:896 +#: ../src/interface.c:3948 msgid "Replaces all tabs in document by spaces." msgstr "Replaces all tabs in document by spaces." @@ -1366,29 +1427,24 @@ msgstr "_Tools" #: ../src/interface.c:978 -#, fuzzy msgid "_Color Chooser" msgstr "_Colour Chooser" -#: ../src/interface.c:981 ../src/interface.c:1122 -msgid "" -"Open a color chooser dialog, to interactively pick colors from a palette." -msgstr "" -"Open a colour chooser dialogue, to interactively pick colours from a palette." +#: ../src/interface.c:981 +#: ../src/interface.c:1122 +msgid "Open a color chooser dialog, to interactively pick colors from a palette." +msgstr "Open a colour chooser dialogue, to interactively pick colours from a palette." #: ../src/interface.c:987 msgid "_Word Count" msgstr "_Word Count" #: ../src/interface.c:990 -msgid "" -"Counts the words and characters in the current selection or the whole " -"document" -msgstr "" -"Counts the words and characters in the current selection or the whole " -"document" +msgid "Counts the words and characters in the current selection or the whole document" +msgstr "Counts the words and characters in the current selection or the whole document" -#: ../src/interface.c:992 ../src/interface.c:999 +#: ../src/interface.c:992 +#: ../src/interface.c:999 msgid "_Help" msgstr "_Help" @@ -1416,11 +1472,13 @@ msgid "Save the current file" msgstr "Save the current file" -#: ../src/interface.c:1048 ../src/keybindings.c:123 +#: ../src/interface.c:1048 +#: ../src/keybindings.c:123 msgid "Save all" msgstr "Save all" -#: ../src/interface.c:1051 ../plugins/autosave.c:152 +#: ../src/interface.c:1051 +#: ../plugins/autosave.c:152 msgid "Save all open files" msgstr "Save all open files" @@ -1440,15 +1498,18 @@ msgid "Redo the last modification" msgstr "Redo the last modification" -#: ../src/interface.c:1089 ../src/keybindings.c:245 +#: ../src/interface.c:1089 +#: ../src/keybindings.c:245 msgid "Navigate back a location" msgstr "Navigate back a location" -#: ../src/interface.c:1095 ../src/keybindings.c:247 +#: ../src/interface.c:1095 +#: ../src/keybindings.c:247 msgid "Navigate forward a location" msgstr "Navigate forwards a location" -#: ../src/interface.c:1103 ../src/keybindings.c:200 +#: ../src/interface.c:1103 +#: ../src/keybindings.c:200 msgid "Compile" msgstr "Compile" @@ -1469,16 +1530,15 @@ msgstr "Zoom out the text" #: ../src/interface.c:1145 -#, fuzzy msgid "Decrease indentation" -msgstr "Decrease indent" +msgstr "Decrease indentation" #: ../src/interface.c:1150 -#, fuzzy msgid "Increase indentation" -msgstr "Increase indent" +msgstr "Increase indentation" -#: ../src/interface.c:1163 ../src/interface.c:1168 +#: ../src/interface.c:1163 +#: ../src/interface.c:1168 msgid "Find the entered text in the current file" msgstr "Find the entered text in the current file" @@ -1490,14 +1550,15 @@ msgid "Jump to the entered line number." msgstr "Jump to the entered line number." -#: ../src/interface.c:1231 ../src/treeviews.c:108 +#: ../src/interface.c:1231 +#: ../src/treeviews.c:108 msgid "Symbols" msgstr "Symbols" -#: ../src/interface.c:1245 ../src/treeviews.c:261 -#, fuzzy +#: ../src/interface.c:1245 +#: ../src/treeviews.c:261 msgid "Documents" -msgstr "_Document" +msgstr "Documents" #: ../src/interface.c:1281 msgid "Status" @@ -1515,23 +1576,28 @@ msgid "Scribble" msgstr "Scribble" -#: ../src/interface.c:1943 ../src/interface.c:3424 +#: ../src/interface.c:1943 +#: ../src/interface.c:3424 msgid "Images and text" msgstr "Images and text" -#: ../src/interface.c:1949 ../src/interface.c:3456 +#: ../src/interface.c:1949 +#: ../src/interface.c:3456 msgid "Images only" msgstr "Images only" -#: ../src/interface.c:1955 ../src/interface.c:3448 +#: ../src/interface.c:1955 +#: ../src/interface.c:3448 msgid "Text only" msgstr "Text only" -#: ../src/interface.c:1966 ../src/interface.c:3440 +#: ../src/interface.c:1966 +#: ../src/interface.c:3440 msgid "Large icons" msgstr "Large icons" -#: ../src/interface.c:1971 ../src/interface.c:3432 +#: ../src/interface.c:1971 +#: ../src/interface.c:3432 msgid "Small icons" msgstr "Small icons" @@ -1547,28 +1613,32 @@ msgid "Insert \"include <...>\"" msgstr "Insert \"include <...>\"" -#: ../src/interface.c:2291 ../src/keybindings.c:324 +#: ../src/interface.c:2291 +#: ../src/keybindings.c:324 msgid "Find Usage" msgstr "Find Usage" -#: ../src/interface.c:2299 ../src/keybindings.c:326 +#: ../src/interface.c:2299 +#: ../src/keybindings.c:326 msgid "Go to Tag Definition" msgstr "Go to Tag Definition" -#: ../src/interface.c:2303 ../src/keybindings.c:328 +#: ../src/interface.c:2303 +#: ../src/keybindings.c:328 msgid "Go to Tag Declaration" msgstr "Go to Tag Declaration" -#: ../src/interface.c:2307 ../src/keybindings.c:330 +#: ../src/interface.c:2307 +#: ../src/keybindings.c:330 msgid "Context Action" msgstr "Context Action" #: ../src/interface.c:2319 -#, fuzzy msgid "Go to the entered line" -msgstr "Goto to the entered line" +msgstr "Go to the entered line" -#: ../src/interface.c:2783 ../src/keybindings.c:150 +#: ../src/interface.c:2783 +#: ../src/keybindings.c:150 msgid "Preferences" msgstr "Preferences" @@ -1581,27 +1651,20 @@ msgstr "Opens at startup the files from the last session" #: ../src/interface.c:2823 -#, fuzzy msgid "Load virtual terminal support" -msgstr "Load virtual terminal emulation at startup" +msgstr "Load virtual terminal support" #: ../src/interface.c:2825 -#, fuzzy -msgid "" -"Whether the virtual terminal emulation (VTE) should be loaded at startup. " -"Disable it if you do not need it." -msgstr "" -"Whether the virtual terminal emulation(VTE) should be loaded at startup. " -"Disable it if you do not need it." +msgid "Whether the virtual terminal emulation (VTE) should be loaded at startup. Disable it if you do not need it." +msgstr "Whether the virtual terminal emulation (VTE) should be loaded at startup. Disable it if you do not need it." #: ../src/interface.c:2828 msgid "Enable plugin support" -msgstr "" +msgstr "Enable plugin support" #: ../src/interface.c:2832 -#, fuzzy msgid "Startup" -msgstr "Sidebar" +msgstr "Startup" #: ../src/interface.c:2851 msgid "Save window position and geometry" @@ -1620,85 +1683,64 @@ msgstr "Shows a confirmation dialogue on exit." #: ../src/interface.c:2865 -#, fuzzy msgid "Shutdown" -msgstr "Startup and shutdown" +msgstr "Shutdown" #: ../src/interface.c:2884 -#, fuzzy msgid "Use project-based session files" -msgstr "Geany project files" +msgstr "Use project-based session files" #: ../src/interface.c:2888 -msgid "" -"Whether to store a project's session files and open them when re-opening the " -"project." -msgstr "" +msgid "Whether to store a project's session files and open them when re-opening the project." +msgstr "Whether to store a project's session files and open them when re-opening the project." #: ../src/interface.c:2891 -#, fuzzy msgid "Projects" -msgstr "Paths" +msgstr "Projects" #: ../src/interface.c:2910 msgid "Beep on errors or when compilation has finished" msgstr "Beep on errors or when compilation has finished" #: ../src/interface.c:2913 -#, fuzzy -msgid "" -"Whether to beep if an error occurred or when the compilation process has " -"finished." -msgstr "" -"Whether to beep if an error occurred or when the compilation process has " -"finished." +msgid "Whether to beep if an error occurred or when the compilation process has finished." +msgstr "Whether to beep if an error occurred or when the compilation process has finished." #: ../src/interface.c:2916 msgid "Switch to status message list at new message" msgstr "Switch to status message list at new message" #: ../src/interface.c:2919 -msgid "" -"Switch to the status message tab (in the notebook window at the bottom) if a " -"new status message arrives." -msgstr "" -"Switch to the status message tab (in the notebook window at the bottom) if a " -"new status message arrives." +msgid "Switch to the status message tab (in the notebook window at the bottom) if a new status message arrives." +msgstr "Switch to the status message tab (in the notebook window at the bottom) if a new status message arrives." #: ../src/interface.c:2922 msgid "Suppress status messages in the status bar" -msgstr "" +msgstr "Suppress status messages in the status bar" #: ../src/interface.c:2925 -msgid "" -"Removes all messages from the status bar. The messages are still displayed " -"in the status messages window." -msgstr "" +msgid "Removes all messages from the status bar. The messages are still displayed in the status messages window." +msgstr "Removes all messages from the status bar. The messages are still displayed in the status messages window." #: ../src/interface.c:2928 msgid "Auto focus widgets (focus follows mouse)" -msgstr "" +msgstr "Auto focus widgets (focus follows mouse)" #: ../src/interface.c:2931 -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 " -"fields and the VTE." -msgstr "" +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 fields and the VTE." +msgstr "Gives the focus automatically to widgets below the mouse cursor. Works for the main editor widget, the scribble, the toolbar search and goto line fields and the VTE." #: ../src/interface.c:2934 msgid "Always wrap search and hide the Find dialog" msgstr "Always wrap search and hide the Find dialogue" #: ../src/interface.c:2938 -msgid "" -"Always wrap search around the document and hide the Find dialog after " -"clicking Find Next/Previous" -msgstr "" -"Always wrap search around the document and hide the Find dialogue after " -"clicking Find Next/Previous" +msgid "Always wrap search around the document and hide the Find dialog after clicking Find Next/Previous" +msgstr "Always wrap search around the document and hide the Find dialogue after clicking Find Next/Previous" -#: ../src/interface.c:2941 ../src/interface.c:3271 ../src/interface.c:3990 +#: ../src/interface.c:2941 +#: ../src/interface.c:3271 +#: ../src/interface.c:3990 msgid "Miscellaneous" msgstr "Miscellaneous" @@ -1707,13 +1749,8 @@ msgstr "Startup path:" #: ../src/interface.c:2974 -#, fuzzy -msgid "" -"Path to start in when opening or saving files. Must be an absolute path. " -"Leave blank to use the current working directory." -msgstr "" -"Path to start when opening or saving files. Must be an absolute path. Leave " -"blank to use the current working directory." +msgid "Path to start in when opening or saving files. Must be an absolute path. Leave blank to use the current working directory." +msgstr "Path to start in when opening or saving files. Must be an absolute path. Leave blank to use the current working directory." #: ../src/interface.c:2987 msgid "Project files:" @@ -1740,19 +1777,16 @@ msgstr "Toggle the symbol list on and off" #: ../src/interface.c:3045 -#, fuzzy msgid "Show documents list" -msgstr "Show open files list" +msgstr "Show documents list" #: ../src/interface.c:3048 -#, fuzzy msgid "Toggle the documents list on and off" -msgstr "Toggle the open files list on and off" +msgstr "Toggle the documents list on and off" #: ../src/interface.c:3051 -#, fuzzy msgid "Show full path name in documents list" -msgstr "Show open files list" +msgstr "Show full path name in documents list" #: ../src/interface.c:3056 msgid "Sidebar" @@ -1762,11 +1796,13 @@ msgid "Symbol list:" msgstr "Symbol list:" -#: ../src/interface.c:3084 ../src/interface.c:3196 +#: ../src/interface.c:3084 +#: ../src/interface.c:3196 msgid "Message window:" msgstr "Message window:" -#: ../src/interface.c:3091 ../src/interface.c:3230 +#: ../src/interface.c:3091 +#: ../src/interface.c:3230 msgid "Editor:" msgstr "Editor:" @@ -1791,21 +1827,20 @@ msgstr "Show editor tabs" #: ../src/interface.c:3144 -#, fuzzy msgid "Show close buttons" -msgstr "Show Colour Chooser button" +msgstr "Show close buttons" #: ../src/interface.c:3148 -msgid "" -"Shows a small cross button in the file tabs to easily close files when " -"clicking on it (requires restart of Geany)." -msgstr "" +msgid "Shows a small cross button in the file tabs to easily close files when clicking on it (requires restart of Geany)." +msgstr "Shows a small cross button in the file tabs to easily close files when clicking on it (requires restart of Geany)." #: ../src/interface.c:3155 msgid "Placement of new file tabs:" msgstr "Placement of new file tabs:" -#: ../src/interface.c:3160 ../src/interface.c:3208 ../src/interface.c:3225 +#: ../src/interface.c:3160 +#: ../src/interface.c:3208 +#: ../src/interface.c:3225 #: ../src/interface.c:3242 msgid "Left" msgstr "Left" @@ -1814,7 +1849,9 @@ msgid "File tabs will be placed on the left of the notebook" msgstr "File tabs will be placed on the left of the notebook" -#: ../src/interface.c:3168 ../src/interface.c:3209 ../src/interface.c:3226 +#: ../src/interface.c:3168 +#: ../src/interface.c:3209 +#: ../src/interface.c:3226 #: ../src/interface.c:3243 msgid "Right" msgstr "Right" @@ -1824,15 +1861,18 @@ msgstr "File tabs will be placed on the right of the notebook" #: ../src/interface.c:3175 -#, fuzzy msgid "Editor tabs" -msgstr "Fonts" +msgstr "Editor tabs" -#: ../src/interface.c:3210 ../src/interface.c:3227 ../src/interface.c:3244 +#: ../src/interface.c:3210 +#: ../src/interface.c:3227 +#: ../src/interface.c:3244 msgid "Top" msgstr "Top" -#: ../src/interface.c:3211 ../src/interface.c:3228 ../src/interface.c:3245 +#: ../src/interface.c:3211 +#: ../src/interface.c:3228 +#: ../src/interface.c:3245 msgid "Bottom" msgstr "Bottom" @@ -1841,14 +1881,12 @@ msgstr "Sidebar:" #: ../src/interface.c:3247 -#, fuzzy msgid "Tab positions" -msgstr "Location:" +msgstr "Tab positions" #: ../src/interface.c:3266 -#, fuzzy msgid "Show status bar" -msgstr "Show statusbar" +msgstr "Show status bar" #: ../src/interface.c:3269 msgid "Whether to show the status bar at the bottom of the main window." @@ -1863,9 +1901,8 @@ msgstr "Show Toolbar" #: ../src/interface.c:3300 -#, fuzzy msgid "Toolbar" -msgstr "Tool paths" +msgstr "Toolbar" #: ../src/interface.c:3319 msgid "Show file operation buttons" @@ -1888,10 +1925,8 @@ msgstr "Show Back and Forwards buttons" #: ../src/interface.c:3337 -msgid "" -"Display the Back and Forward buttons in the toolbar used for code navigation" -msgstr "" -"Display the Back and Forwards buttons in the toolbar used for code navigation" +msgid "Display the Back and Forward buttons in the toolbar used for code navigation" +msgstr "Display the Back and Forwards buttons in the toolbar used for code navigation" #: ../src/interface.c:3340 msgid "Show Compile and Run buttons" @@ -1902,12 +1937,10 @@ msgstr "Display the Compile and Run buttons in the toolbar" #: ../src/interface.c:3347 -#, fuzzy msgid "Show Color Chooser button" msgstr "Show Colour Chooser button" #: ../src/interface.c:3351 -#, fuzzy msgid "Display the Color Chooser button in the toolbar" msgstr "Display the Colour Chooser button in the toolbar" @@ -1915,14 +1948,14 @@ msgid "Show Zoom In and Zoom Out buttons" msgstr "Show Zoom In and Zoom Out buttons" -#: ../src/interface.c:3358 ../src/interface.c:3365 +#: ../src/interface.c:3358 +#: ../src/interface.c:3365 msgid "Display the Zoom In and Zoom Out buttons in the toolbar" msgstr "Display the Zoom In and Zoom Out buttons in the toolbar" #: ../src/interface.c:3361 -#, fuzzy msgid "Show Increase and Decrease Indentation buttons" -msgstr "Show Redo and Undo buttons" +msgstr "Show Increase and Decrease Indentation buttons" #: ../src/interface.c:3368 msgid "Show Search field" @@ -1933,9 +1966,8 @@ msgstr "Display the search field and button in the toolbar" #: ../src/interface.c:3375 -#, fuzzy msgid "Show Go to Line field" -msgstr "Show Goto line field" +msgstr "Show Go to Line field" #: ../src/interface.c:3379 msgid "Display the line number field and button in the toolbar" @@ -1970,7 +2002,6 @@ msgstr "Toolbar" #: ../src/interface.c:3491 -#, fuzzy msgid "Invert syntax highlighting colors" msgstr "Invert syntax highlighting colours" @@ -2014,7 +2045,8 @@ msgid "Long line marker color:" msgstr "Long line marker colour:" -#: ../src/interface.c:3548 ../src/interface.c:3686 +#: ../src/interface.c:3548 +#: ../src/interface.c:3686 msgid "Type:" msgstr "Type:" @@ -2022,47 +2054,32 @@ msgid "Sets the color of the long line marker" msgstr "Sets the colour of the long line marker" -#: ../src/interface.c:3561 ../src/tools.c:652 ../src/vte.c:693 +#: ../src/interface.c:3561 +#: ../src/tools.c:652 +#: ../src/vte.c:693 #: ../src/vte.c:700 msgid "Color Chooser" msgstr "Colour Chooser" #: ../src/interface.c:3569 -msgid "" -"The long line marker is a thin vertical line in the editor. It helps to mark " -"long lines, or as a hint to break the line. Set this value to a value " -"greater than 0 to specify the column where it should appear." -msgstr "" -"The long line marker is a thin vertical line in the editor. It helps to mark " -"long lines, or as a hint to break the line. Set this value to a value " -"greater than 0 to specify the column where it should appear." +msgid "The long line marker is a thin vertical line in the editor. It helps to mark long lines, or as a hint to break the line. Set this value to a value greater than 0 to specify the column where it should appear." +msgstr "The long line marker is a thin vertical line in the editor. It helps to mark long lines, or as a hint to break the line. Set this value to a value greater than 0 to specify the column where it should appear." #: ../src/interface.c:3579 msgid "Line" msgstr "Line" #: ../src/interface.c:3582 -msgid "" -"Prints a vertical line in the editor window at the given cursor position " -"(see below)." -msgstr "" -"Prints a vertical line in the editor window at the given cursor position " -"(see below)." +msgid "Prints a vertical line in the editor window at the given cursor position (see below)." +msgstr "Prints a vertical line in the editor window at the given cursor position (see below)." #: ../src/interface.c:3586 msgid "Background" msgstr "Background" #: ../src/interface.c:3589 -#, fuzzy -msgid "" -"The background color of characters after the given cursor position (see " -"below) changed to the color set below. (This is recommended if you use " -"proportional fonts)" -msgstr "" -"The background colour of characters after the given cursor position (see " -"below) changed to the colour set below. (This is recommended if you use " -"proportional fonts)" +msgid "The background color of characters after the given cursor position (see below) changed to the color set below. (This is recommended if you use proportional fonts)" +msgstr "The background colour of characters after the given cursor position (see below) changed to the colour set below. (This is recommended if you use proportional fonts)" #: ../src/interface.c:3593 msgid "Disabled" @@ -2073,14 +2090,12 @@ msgstr "Long line marker" #: ../src/interface.c:3604 -#, fuzzy msgid "Display" -msgstr "Display" +msgstr "Display" #: ../src/interface.c:3632 -#, fuzzy msgid "Auto-indent mode:" -msgstr "Auto indentation mode:" +msgstr "Auto-indent mode:" #: ../src/interface.c:3644 msgid "Basic" @@ -2088,37 +2103,32 @@ #: ../src/interface.c:3645 msgid "Current chars" -msgstr "" +msgstr "Current chars" #: ../src/interface.c:3646 -#, fuzzy msgid "Match braces" -msgstr "Goto matching brace" +msgstr "Match braces" #: ../src/interface.c:3654 msgid "The width in chars, which one tab character will take" msgstr "The width in chars, which one tab character will take" #: ../src/interface.c:3659 -#, fuzzy msgid "Tab width:" -msgstr "Tab Width:" +msgstr "Tab width:" -#: ../src/interface.c:3675 ../src/interface.c:3682 -#, fuzzy +#: ../src/interface.c:3675 +#: ../src/interface.c:3682 msgid "Whether to use tabs or spaces when indentation is inserted." -msgstr "Whether to scroll to the bottom when output is generated." +msgstr "Whether to use tabs or spaces when indentation is inserted." #: ../src/interface.c:3698 -msgid "" -"Whether to detect the indentation type from file contents when a file is " -"opened." -msgstr "" +msgid "Whether to detect the indentation type from file contents when a file is opened." +msgstr "Whether to detect the indentation type from file contents when a file is opened." #: ../src/interface.c:3700 -#, fuzzy msgid "Indentation" -msgstr "Context Action" +msgstr "Indentation" #: ../src/interface.c:3719 msgid "Line wrapping" @@ -2126,28 +2136,19 @@ #: ../src/interface.c:3724 msgid "Enable \"smart\" home key" -msgstr "" +msgstr "Enable \"smart\" home key" #: ../src/interface.c:3727 -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 " -"to the very beginning of the line. When this feature is disabled, the HOME " -"key always moves the caret to the start of the current line, regardless of " -"its current position." -msgstr "" +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 to the very beginning of the line. When this feature is disabled, the HOME key always moves the caret to the start of the current line, regardless of its current position." +msgstr "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 to the very beginning of the line. When this feature is disabled, the HOME key always moves the caret to the start of the current line, regardless of its current position." #: ../src/interface.c:3730 msgid "Disable Drag and Drop" msgstr "Disable Drag and Drop" #: ../src/interface.c:3733 -msgid "" -"Disable drag and drop completely in the editor window so you can't drag and " -"drop any selections within or outside of the editor window." -msgstr "" -"Disable drag and drop completely in the editor window so you can't drag and " -"drop any selections within or outside of the editor window." +msgid "Disable drag and drop completely in the editor window so you can't drag and drop any selections within or outside of the editor window." +msgstr "Disable drag and drop completely in the editor window so you can't drag and drop any selections within or outside of the editor window." #: ../src/interface.c:3736 msgid "Enable folding" @@ -2158,73 +2159,56 @@ msgstr "Whether to enable folding the code" #: ../src/interface.c:3742 -#, fuzzy msgid "Fold/Unfold all children of a fold point" -msgstr "Unfold all children of a fold point" +msgstr "Fold/Unfold all children of a fold point" #: ../src/interface.c:3745 -msgid "" -"Fold or unfold all children of a fold point. By pressing the Shift key while " -"clicking on a fold symbol the contrary behaviour is used." -msgstr "" +msgid "Fold or unfold all children of a fold point. By pressing the Shift key while clicking on a fold symbol the contrary behaviour is used." +msgstr "Fold or unfold all children of a fold point. By pressing the Shift key while clicking on a fold symbol the contrary behaviour is used." #: ../src/interface.c:3748 msgid "Use indicators to show compile errors" msgstr "Use indicators to show compile errors" #: ../src/interface.c:3751 -msgid "" -"Whether to use indicators (a squiggly underline) to highlight the lines " -"where the compiler found a warning or an error." -msgstr "" -"Whether to use indicators (a squiggly underline) to highlight the lines " -"where the compiler found a warning or an error." +msgid "Whether to use indicators (a squiggly underline) to highlight the lines where the compiler found a warning or an error." +msgstr "Whether to use indicators (a squiggly underline) to highlight the lines where the compiler found a warning or an error." #: ../src/interface.c:3754 -#, fuzzy msgid "Newline strips trailing spaces" -msgstr "Strip trailing spaces" +msgstr "Newline strips trailing spaces" #: ../src/interface.c:3757 msgid "Enable newline to strip the trailing spaces on the previous line." -msgstr "" +msgstr "Enable newline to strip the trailing spaces on the previous line." #: ../src/interface.c:3760 msgid "Features" msgstr "Features" #: ../src/interface.c:3779 -#, fuzzy msgid "Snippet completion" -msgstr "Suppress construct completion" +msgstr "Snippet completion" #: ../src/interface.c:3782 -msgid "" -"Type a defined short character sequence and complete it to a more complex " -"string using a single keypress." -msgstr "" +msgid "Type a defined short character sequence and complete it to a more complex string using a single keypress." +msgstr "Type a defined short character sequence and complete it to a more complex string using a single keypress." #: ../src/interface.c:3785 msgid "XML tag autocompletion" msgstr "XML tag autocompletion" #: ../src/interface.c:3788 -#, fuzzy msgid "Automatic completion and closing of XML tags (includes HTML tags)" -msgstr "Automatic completion of open XML tags (includes HTML tags)" +msgstr "Automatic completion and closing of XML tags (includes HTML tags)" #: ../src/interface.c:3791 -#, fuzzy msgid "Automatic symbol completion" -msgstr "Symbol autocompletion" +msgstr "Automatic symbol completion" #: ../src/interface.c:3794 -msgid "" -"Automatic completion of known symbols in open files (function names, global " -"variables, ...)" -msgstr "" -"Automatic completion of known symbols in open files (function names, global " -"variables, ...)" +msgid "Automatic completion of known symbols in open files (function names, global variables, ...)" +msgstr "Automatic completion of known symbols in open files (function names, global variables, ...)" #: ../src/interface.c:3809 msgid "Number of rows to display in the autocompletion list." @@ -2232,23 +2216,19 @@ #: ../src/interface.c:3812 msgid "Characters to type for completion:" -msgstr "" +msgstr "Characters to type for completion:" #: ../src/interface.c:3819 -#, fuzzy msgid "Rows of symbol completion list:" -msgstr "Rows of autocompletion list:" +msgstr "Rows of symbol completion list:" #: ../src/interface.c:3832 -msgid "" -"The amount of characters which are necessary to show the symbol auto " -"completion list." -msgstr "" +msgid "The amount of characters which are necessary to show the symbol auto completion list." +msgstr "The amount of characters which are necessary to show the symbol auto completion list." #: ../src/interface.c:3835 -#, fuzzy msgid "Completions" -msgstr "Autocompletion" +msgstr "Completions" #: ../src/interface.c:3840 msgid "Editor" @@ -2259,30 +2239,24 @@ msgstr "Sets the default encoding for newly created files." #: ../src/interface.c:3878 -#, fuzzy msgid "Default encoding (new files):" -msgstr "Default encoding:" +msgstr "Default encoding (new files):" #: ../src/interface.c:3885 -#, fuzzy msgid "Default encoding (existing files):" -msgstr "Default encoding:" +msgstr "Default encoding (existing files):" #: ../src/interface.c:3897 -#, fuzzy msgid "Sets the default encoding for opening existing files." -msgstr "Sets the default encoding for newly created files." +msgstr "Sets the default encoding for opening existing files." #: ../src/interface.c:3903 msgid "Use fixed encoding when opening files" -msgstr "" +msgstr "Use fixed encoding when opening files" #: ../src/interface.c:3908 -msgid "" -"This option disables the automatic detection of the file encoding when " -"opening files and opens the file with the specified encoding (usually not " -"needed)." -msgstr "" +msgid "This option disables the automatic detection of the file encoding when opening files and opens the file with the specified encoding (usually not needed)." +msgstr "This option disables the automatic detection of the file encoding when opening files and opens the file with the specified encoding (usually not needed)." #: ../src/interface.c:3911 msgid "New files" @@ -2304,7 +2278,8 @@ msgid "Removes trailing spaces and tabs and the end of lines" msgstr "Removes trailing spaces and tabs and the end of lines" -#: ../src/interface.c:3944 ../src/keybindings.c:191 +#: ../src/interface.c:3944 +#: ../src/keybindings.c:191 msgid "Replace tabs by space" msgstr "Replace tabs by space" @@ -2317,12 +2292,12 @@ msgstr "Recent files list length:" #: ../src/interface.c:3986 -msgid "" -"Specifies the number of files which are stored in the Recent files list." -msgstr "" -"Specifies the number of files which are stored in the Recent files list." +msgid "Specifies the number of files which are stored in the Recent files list." +msgstr "Specifies the number of files which are stored in the Recent files list." -#: ../src/interface.c:3995 ../src/symbols.c:520 ../plugins/filebrowser.c:812 +#: ../src/interface.c:3995 +#: ../src/symbols.c:520 +#: ../plugins/filebrowser.c:812 msgid "Files" msgstr "Files" @@ -2343,12 +2318,8 @@ msgstr "Path and options for the make tool" #: ../src/interface.c:4060 -msgid "" -"A terminal emulator like xterm, gnome-terminal or konsole (should accept the " -"-e argument)" -msgstr "" -"A terminal emulator like xterm, gnome-terminal or konsole (should accept the " -"-e argument)" +msgid "A terminal emulator like xterm, gnome-terminal or konsole (should accept the -e argument)" +msgstr "A terminal emulator like xterm, gnome-terminal or konsole (should accept the -e argument)" #: ../src/interface.c:4067 msgid "Path (and possibly additional arguments) to your favorite browser" @@ -2363,26 +2334,17 @@ msgstr "Tool paths" #: ../src/interface.c:4143 -#, fuzzy msgid "Context action:" -msgstr "Context Action" +msgstr "Context action:" #: ../src/interface.c:4154 -#, fuzzy, c-format -msgid "" -"Context action command. The currently selected word can be used with %s. It " -"can appear anywhere in the given command and will be replaced before " -"execution." -msgstr "" -"Context action command. The current selected word can be used with %s. It " -"can be everywhere in the given command and will be replaced before execution." +#, c-format +msgid "Context action command. The currently selected word can be used with %s. It can appear anywhere in the given command and will be replaced before execution." +msgstr "Context action command. The currently selected word can be used with %s. It can appear anywhere in the given command and will be replaced before execution." #: ../src/interface.c:4167 -#, fuzzy msgid "Commands" -msgstr "" -"\n" -"Tag commands\n" +msgstr "Commands" #: ../src/interface.c:4172 msgid "Tools" @@ -2397,9 +2359,8 @@ msgstr "Initials of the developer name" #: ../src/interface.c:4214 -#, fuzzy msgid "Initial version:" -msgstr "Initial Version:" +msgstr "Initial version:" #: ../src/interface.c:4226 msgid "Version number, which a new file initially has" @@ -2438,9 +2399,8 @@ msgstr "Templates" #: ../src/interface.c:4313 -#, fuzzy msgid "C_hange" -msgstr "Change" +msgstr "C_hange" #: ../src/interface.c:4317 msgid "Keyboard shortcuts" @@ -2451,9 +2411,8 @@ msgstr "Keybindings" #: ../src/interface.c:4344 -#, fuzzy msgid "Command:" -msgstr "Command" +msgstr "Command:" #: ../src/interface.c:4351 #, c-format @@ -2462,73 +2421,65 @@ #: ../src/interface.c:4361 msgid "Use an external command for printing" -msgstr "" +msgstr "Use an external command for printing" -#: ../src/interface.c:4382 ../src/printing.c:342 -#, fuzzy +#: ../src/interface.c:4382 +#: ../src/printing.c:342 msgid "Print line numbers" -msgstr "Show _Line Numbers" +msgstr "Print line numbers" -#: ../src/interface.c:4385 ../src/printing.c:344 -#, fuzzy +#: ../src/interface.c:4385 +#: ../src/printing.c:344 msgid "Add line numbers to the printed page." -msgstr "Follow the path of the current file" +msgstr "Add line numbers to the printed page." -#: ../src/interface.c:4388 ../src/printing.c:348 -#, fuzzy +#: ../src/interface.c:4388 +#: ../src/printing.c:348 msgid "Print page numbers" -msgstr "Show _Line Numbers" +msgstr "Print page numbers" -#: ../src/interface.c:4391 ../src/printing.c:350 -msgid "" -"Add page numbers at the bottom of each page. It takes 2 lines of the page." -msgstr "" +#: ../src/interface.c:4391 +#: ../src/printing.c:350 +msgid "Add page numbers at the bottom of each page. It takes 2 lines of the page." +msgstr "Add page numbers at the bottom of each page. It takes 2 lines of the page." -#: ../src/interface.c:4394 ../src/printing.c:354 -#, fuzzy +#: ../src/interface.c:4394 +#: ../src/printing.c:354 msgid "Print page header" -msgstr "Base path:" +msgstr "Print page header" -#: ../src/interface.c:4397 ../src/printing.c:356 -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." -msgstr "" +#: ../src/interface.c:4397 +#: ../src/printing.c:356 +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." +msgstr "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." -#: ../src/interface.c:4415 ../src/printing.c:373 -#, fuzzy +#: ../src/interface.c:4415 +#: ../src/printing.c:373 msgid "Use the basename of the printed file" -msgstr "Follow the path of the current file" +msgstr "Use the basename of the printed file" -#: ../src/interface.c:4418 ../src/printing.c:375 -#, fuzzy +#: ../src/interface.c:4418 +#: ../src/printing.c:375 msgid "Print only the basename(without the path) of the printed file." -msgstr "Follow the path of the current file" +msgstr "Print only the basename(without the path) of the printed file." -#: ../src/interface.c:4425 ../src/printing.c:382 -#, fuzzy +#: ../src/interface.c:4425 +#: ../src/printing.c:382 msgid "Date format:" -msgstr "Custom Date Format" +msgstr "Date format:" -#: ../src/interface.c:4432 ../src/printing.c:387 -#, fuzzy -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 " -"with the ANSI C strftime function." -msgstr "" -"Enter here a custom date and time format. You can use any conversion " -"specifiers which can be used with the ANSI C strftime function. See \"man " -"strftime\" for more information." +#: ../src/interface.c:4432 +#: ../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 with the ANSI C strftime function." +msgstr "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 with the ANSI C strftime function." #: ../src/interface.c:4435 msgid "Use native GTK printing" -msgstr "" +msgstr "Use native GTK printing" #: ../src/interface.c:4442 -#, fuzzy msgid "Printing" -msgstr "Print" +msgstr "Printing" #: ../src/keybindings.c:113 msgid "New" @@ -2580,16 +2531,15 @@ #: ../src/keybindings.c:140 msgid "Cut" -msgstr "" +msgstr "Cut" #: ../src/keybindings.c:142 -#, fuzzy msgid "Copy" -msgstr "Company:" +msgstr "Copy" #: ../src/keybindings.c:144 msgid "Paste" -msgstr "" +msgstr "Paste" #: ../src/keybindings.c:146 msgid "Select All" @@ -2599,7 +2549,8 @@ msgid "Insert date" msgstr "Insert date" -#: ../src/keybindings.c:154 ../src/search.c:275 +#: ../src/keybindings.c:154 +#: ../src/search.c:275 msgid "Find" msgstr "Find" @@ -2619,14 +2570,15 @@ msgid "Find Previous Selection" msgstr "Find Previous Selection" -#: ../src/keybindings.c:164 ../src/search.c:395 +#: ../src/keybindings.c:164 +#: ../src/search.c:395 msgid "Replace" msgstr "Replace" -#: ../src/keybindings.c:166 ../src/search.c:546 -#, fuzzy +#: ../src/keybindings.c:166 +#: ../src/search.c:546 msgid "Find in Files" -msgstr "Find in F_iles" +msgstr "Find in Files" #: ../src/keybindings.c:168 msgid "Next Message" @@ -2653,7 +2605,6 @@ msgstr "Zoom Out" #: ../src/keybindings.c:186 -#, fuzzy msgid "Show Color Chooser" msgstr "Show Colour Chooser" @@ -2706,9 +2657,8 @@ msgstr "Build options" #: ../src/keybindings.c:220 -#, fuzzy msgid "Help" -msgstr "_Help" +msgstr "Help" #: ../src/keybindings.c:223 msgid "Switch to Editor" @@ -2739,53 +2689,44 @@ msgstr "Switch to last used document" #: ../src/keybindings.c:237 -#, fuzzy msgid "Move document left" -msgstr "whole document" +msgstr "Move document left" #: ../src/keybindings.c:239 -#, fuzzy msgid "Move document right" -msgstr "whole document" +msgstr "Move document right" #: ../src/keybindings.c:241 -#, fuzzy msgid "Move document first" -msgstr "whole document" +msgstr "Move document first" #: ../src/keybindings.c:243 -#, fuzzy msgid "Move document last" -msgstr "whole document" +msgstr "Move document last" #: ../src/keybindings.c:250 msgid "Duplicate line or selection" msgstr "Duplicate line or selection" #: ../src/keybindings.c:252 -#, fuzzy msgid "Delete current line(s)" -msgstr "Close the current file" +msgstr "Delete current line(s)" #: ../src/keybindings.c:254 -#, fuzzy msgid "Copy current line(s)" -msgstr "Compile the current file" +msgstr "Copy current line(s)" #: ../src/keybindings.c:256 -#, fuzzy msgid "Cut current line(s)" -msgstr "Close the current file" +msgstr "Cut current line(s)" #: ../src/keybindings.c:258 -#, fuzzy msgid "Transpose current line" -msgstr "Prints the current file" +msgstr "Transpose current line" #: ../src/keybindings.c:260 -#, fuzzy msgid "Toggle Case of Selection" -msgstr "Toggle line commentation" +msgstr "Toggle Case of Selection" #: ../src/keybindings.c:262 msgid "Toggle line commentation" @@ -2808,18 +2749,16 @@ msgstr "Decrease indent" #: ../src/keybindings.c:272 -#, fuzzy msgid "Increase indent by one space" -msgstr "Increase indent" +msgstr "Increase indent by one space" #: ../src/keybindings.c:274 -#, fuzzy msgid "Decrease indent by one space" -msgstr "Decrease indent" +msgstr "Decrease indent by one space" #: ../src/keybindings.c:276 msgid "Smart line indent" -msgstr "" +msgstr "Smart line indent" #: ../src/keybindings.c:278 msgid "Send to Custom Command 1" @@ -2834,23 +2773,20 @@ msgstr "Send to Custom Command 3" #: ../src/keybindings.c:285 -#, fuzzy msgid "Go to matching brace" -msgstr "Goto matching brace" +msgstr "Go to matching brace" #: ../src/keybindings.c:288 msgid "Toggle marker" msgstr "Toggle marker" #: ../src/keybindings.c:291 -#, fuzzy msgid "Go to next marker" -msgstr "Goto next marker" +msgstr "Go to next marker" #: ../src/keybindings.c:294 -#, fuzzy msgid "Go to previous marker" -msgstr "Goto previous marker" +msgstr "Go to previous marker" #: ../src/keybindings.c:297 msgid "Complete word" @@ -2866,42 +2802,36 @@ #. has special callback #: ../src/keybindings.c:303 -#, fuzzy msgid "Complete snippet" -msgstr "Complete construct" +msgstr "Complete snippet" #: ../src/keybindings.c:305 -#, fuzzy msgid "Suppress snippet completion" -msgstr "Suppress construct completion" +msgstr "Suppress snippet completion" #: ../src/keybindings.c:308 msgid "Select current word" msgstr "Select current word" #: ../src/keybindings.c:310 -#, fuzzy msgid "Select current line(s)" -msgstr "Select current word" +msgstr "Select current line(s)" #: ../src/keybindings.c:312 -#, fuzzy msgid "Select current paragraph" -msgstr "Select current word" +msgstr "Select current paragraph" #: ../src/keybindings.c:314 -#, fuzzy msgid "Scroll to current line" -msgstr "Compile the current file" +msgstr "Scroll to current line" #: ../src/keybindings.c:316 -#, fuzzy msgid "Scroll up the view by one line" -msgstr "Compile the current file" +msgstr "Scroll up the view by one line" #: ../src/keybindings.c:318 msgid "Scroll down the view by one line" -msgstr "" +msgstr "Scroll down the view by one line" #: ../src/keybindings.c:321 msgid "Insert alternative whitespace" @@ -2909,92 +2839,64 @@ #. set section name #: ../src/keybindings.c:369 -#, fuzzy msgid "File menu" -msgstr "File menu\n" +msgstr "File menu" #: ../src/keybindings.c:370 -#, fuzzy msgid "Edit menu" -msgstr "" -"\n" -"Edit menu\n" +msgstr "Edit menu" #: ../src/keybindings.c:371 -#, fuzzy msgid "Search menu" -msgstr "" -"\n" -"Search menu\n" +msgstr "Search menu" #: ../src/keybindings.c:372 -#, fuzzy msgid "View menu" -msgstr "" -"\n" -"View menu\n" +msgstr "View menu" #: ../src/keybindings.c:373 -#, fuzzy msgid "Document menu" -msgstr "" -"\n" -"Document menu\n" +msgstr "Document menu" #: ../src/keybindings.c:374 -#, fuzzy msgid "Build menu" -msgstr "" -"\n" -"Build menu\n" +msgstr "Build menu" #: ../src/keybindings.c:375 -#, fuzzy msgid "Tools menu" -msgstr "" -"\n" -"Tools menu\n" +msgstr "Tools menu" #: ../src/keybindings.c:376 msgid "Help menu" -msgstr "" +msgstr "Help menu" #: ../src/keybindings.c:377 -#, fuzzy msgid "Focus commands" -msgstr " commands" +msgstr "Focus commands" #: ../src/keybindings.c:378 -#, fuzzy msgid "Notebook tab commands" -msgstr " commands" +msgstr "Notebook tab commands" #: ../src/keybindings.c:379 -#, fuzzy msgid "Editing commands" -msgstr "" -"\n" -"Editing commands\n" +msgstr "Editing commands" #: ../src/keybindings.c:380 -#, fuzzy msgid "Tag commands" -msgstr " commands" +msgstr "Tag commands" #: ../src/keybindings.c:381 -#, fuzzy msgid "Other commands" -msgstr " commands" +msgstr "Other commands" #: ../src/keybindings.c:564 -#, fuzzy msgid "Keyboard Shortcuts" -msgstr "_Keyboard Shortcuts" +msgstr "Keyboard Shortcuts" #: ../src/keybindings.c:576 -#, fuzzy msgid "The following keyboard shortcuts are configurable:" -msgstr "The following keyboard shortcuts are defined:" +msgstr "The following keyboard shortcuts are configurable:" #: ../src/keyfile.c:702 msgid "Type here what you want, use it as a notice/scratch board" @@ -3005,83 +2907,68 @@ msgstr "Failed to load one or more session files." #: ../src/main.c:119 -#, fuzzy -msgid "" -"Set initial column number for the first opened file (useful in conjunction " -"with --line)" -msgstr "" -"set initial column number for the first opened file (useful in conjunction " -"with --line)" +msgid "Set initial column number for the first opened file (useful in conjunction with --line)" +msgstr "Set initial column number for the first opened file (useful in conjunction with --line)" #: ../src/main.c:120 -#, fuzzy msgid "Use an alternate configuration directory" -msgstr "use an alternate configuration directory" +msgstr "Use an alternate configuration directory" #: ../src/main.c:121 -#, fuzzy msgid "Runs in debug mode (means being verbose)" -msgstr "runs in debug mode (means being verbose)" +msgstr "Runs in debug mode (means being verbose)" #: ../src/main.c:122 msgid "Print internal filetype names" -msgstr "" +msgstr "Print internal filetype names" #: ../src/main.c:123 -#, fuzzy msgid "Generate global tags file (see documentation)" -msgstr "generate global tags file (see documentation)" +msgstr "Generate global tags file (see documentation)" #: ../src/main.c:127 -#, fuzzy msgid "Don't open files in a running instance, force opening a new instance" -msgstr "don't open files in a running instance, force opening a new instance" +msgstr "Don't open files in a running instance, force opening a new instance" #: ../src/main.c:129 -#, fuzzy msgid "Set initial line number for the first opened file" -msgstr "set initial line number for the first opened file" +msgstr "Set initial line number for the first opened file" #: ../src/main.c:130 -#, fuzzy msgid "Don't show message window at startup" -msgstr "don't show message window at startup" +msgstr "Don't show message window at startup" #: ../src/main.c:131 -#, fuzzy msgid "Don't load auto completion data (see documentation)" -msgstr "don't load auto completion data (see documentation)" +msgstr "Don't load auto completion data (see documentation)" #: ../src/main.c:133 msgid "Don't load plugins" -msgstr "" +msgstr "Don't load plugins" #: ../src/main.c:135 msgid "Print Geany's installation prefix" -msgstr "" +msgstr "Print Geany's installation prefix" #: ../src/main.c:136 msgid "don't load the previous session's files" msgstr "don't load the previous session's files" #: ../src/main.c:138 -#, fuzzy msgid "Don't load terminal support" -msgstr "don't load terminal support" +msgstr "Don't load terminal support" #: ../src/main.c:139 -#, fuzzy msgid "Filename of libvte.so" -msgstr "filename of libvte.so" +msgstr "Filename of libvte.so" #: ../src/main.c:141 -#, fuzzy msgid "Show version and exit" -msgstr "show version and exit" +msgstr "Show version and exit" #: ../src/main.c:428 msgid "[FILES...]" -msgstr "" +msgstr "[FILES...]" #: ../src/main.c:450 #, c-format @@ -3099,7 +2986,8 @@ "There could be some problems using Geany without a configuration directory.\n" "Start Geany anyway?" -#: ../src/main.c:620 ../src/socket.c:143 +#: ../src/main.c:620 +#: ../src/socket.c:143 #, c-format msgid "Could not find file '%s'." msgstr "Could not find file '%s'." @@ -3124,7 +3012,7 @@ #: ../src/plugins.c:579 msgid "Plugin Manager" -msgstr "" +msgstr "Plugin Manager" #: ../src/plugins.c:707 #, c-format @@ -3133,39 +3021,37 @@ "Description: %s\n" "Author(s): %s" msgstr "" +"Plugin: %s %s\n" +"Description: %s\n" +"Author(s): %s" #: ../src/plugins.c:768 -#, fuzzy msgid "Active" -msgstr "Action" +msgstr "Active" #: ../src/plugins.c:774 msgid "Plugin" -msgstr "" +msgstr "Plugin" #: ../src/plugins.c:780 -#, fuzzy msgid "File" -msgstr "_File" +msgstr "File" #: ../src/plugins.c:798 msgid "No plugins available." -msgstr "" +msgstr "No plugins available." #: ../src/plugins.c:843 msgid "Plugins" -msgstr "" +msgstr "Plugins" #: ../src/plugins.c:864 -msgid "" -"Below is a list of available plugins. Select the plugins which should be " -"loaded when Geany is started." -msgstr "" +msgid "Below is a list of available plugins. Select the plugins which should be loaded when Geany is started." +msgstr "Below is a list of available plugins. Select the plugins which should be loaded when Geany is started." #: ../src/plugins.c:872 -#, fuzzy msgid "Plugin details:" -msgstr "Context Action" +msgstr "Plugin details:" #: ../src/prefs.c:105 msgid "Action" @@ -3176,9 +3062,8 @@ msgstr "Shortcut" #: ../src/prefs.c:1075 -#, fuzzy msgid "Grab Key" -msgstr "Grab key" +msgstr "Grab Key" #: ../src/prefs.c:1081 #, c-format @@ -3187,17 +3072,16 @@ #: ../src/prefs.c:1233 msgid "_Override" -msgstr "" +msgstr "_Override" #: ../src/prefs.c:1234 msgid "Override that keybinding?" -msgstr "" +msgstr "Override that keybinding?" #: ../src/prefs.c:1235 -#, fuzzy, c-format +#, c-format msgid "The combination '%s' is already used for \"%s\"." -msgstr "" -"The combination '%s' is already used for \"%s\". Please choose another one." +msgstr "The combination '%s' is already used for \"%s\"." #. add manually GeanyWrapLabels because it can't be added with Glade #. page Tools @@ -3207,69 +3091,51 @@ #. page Templates #: ../src/prefs.c:1348 -msgid "" -"Set the information to be used in templates. See the documentation for " -"details." -msgstr "" -"Set the information to be used in templates. See the documentation for " -"details." +msgid "Set the information to be used in templates. See the documentation for details." +msgstr "Set the information to be used in templates. See the documentation for details." #: ../src/prefs.c:1352 -msgid "" -"Notice: For all changes you make here to take effect, you need to restart " -"Geany." -msgstr "" -"Notice: For all changes you make here to take effect, you need to restart " -"Geany." +msgid "Notice: For all changes you make here to take effect, you need to restart Geany." +msgstr "Notice: For all changes you make here to take effect, you need to restart Geany." #. page Keybindings #: ../src/prefs.c:1358 -msgid "" -"Here you can change keyboard shortcuts for various actions. Select one and " -"press the Change button to enter a new shortcut, or double click on an " -"action to edit the string representation of the shortcut directly." -msgstr "" -"Here you can change keyboard shortcuts for various actions. Select one and " -"press the Change button to enter a new shortcut, or double click on an " -"action to edit the string representation of the shortcut directly." +msgid "Here you can change keyboard shortcuts for various actions. Select one and press the Change button to enter a new shortcut, or double click on an action to edit the string representation of the shortcut directly." +msgstr "Here you can change keyboard shortcuts for various actions. Select one and press the Change button to enter a new shortcut, or double click on an action to edit the string representation of the shortcut directly." #. page Printing #: ../src/prefs.c:1363 -msgid "" -"Notice: Native GTK printing is only available if Geany was built against " -"GTK 2.10 (or above) and Geany is running with GTK 2.10 (or above)." -msgstr "" +msgid "Notice: Native GTK printing is only available if Geany was built against GTK 2.10 (or above) and Geany is running with GTK 2.10 (or above)." +msgstr "Notice: Native GTK printing is only available if Geany was built against GTK 2.10 (or above) and Geany is running with GTK 2.10 (or above)." #: ../src/printing.c:269 -#, fuzzy, c-format +#, c-format msgid "Page %d of %d" -msgstr "Changed:" +msgstr "Page %d of %d" #: ../src/printing.c:337 -#, fuzzy msgid "Document Setup" -msgstr "" -"\n" -"Document menu\n" +msgstr "Document Setup" #: ../src/printing.c:715 -#, fuzzy, c-format +#, c-format msgid "Printing of file %s was cancelled." -msgstr "Printing of \"%s\" failed (return code: %s)." +msgstr "Printing of file %s was cancelled." -#: ../src/printing.c:717 ../src/printing.c:834 +#: ../src/printing.c:717 +#: ../src/printing.c:834 #, c-format msgid "File %s printed." msgstr "File %s printed." #: ../src/printing.c:765 -#, fuzzy, c-format +#, c-format msgid "Printing of %s failed (%s)." -msgstr "Printing of \"%s\" failed (return code: %s)." +msgstr "Printing of %s failed (%s)." #: ../src/printing.c:805 msgid "Please set a print command in the preferences dialog first" -msgstr "" +msgstr "Please set a print command in the preferences dialogue first" #: ../src/printing.c:813 #, c-format @@ -3301,38 +3167,40 @@ msgid "C_reate" msgstr "C_reate" -#: ../src/project.c:131 ../src/project.c:367 +#: ../src/project.c:131 +#: ../src/project.c:367 msgid "Name:" msgstr "Name:" -#: ../src/project.c:139 ../src/project.c:379 +#: ../src/project.c:139 +#: ../src/project.c:379 msgid "Filename:" msgstr "Filename:" -#: ../src/project.c:155 ../src/project.c:408 +#: ../src/project.c:155 +#: ../src/project.c:408 msgid "Base path:" msgstr "Base path:" -#: ../src/project.c:160 ../src/project.c:416 -#, fuzzy -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 " -"project filename." -msgstr "" -"Base directory of all files that make up the project. This can be a new " -"path, or an existing directory tree." +#: ../src/project.c:160 +#: ../src/project.c:416 +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 project filename." +msgstr "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 project filename." -#: ../src/project.c:163 ../src/project.c:419 +#: ../src/project.c:163 +#: ../src/project.c:419 msgid "Choose Project Base Path" msgstr "Choose Project Base Path" -#: ../src/project.c:208 ../src/project.c:241 ../src/project.c:856 +#: ../src/project.c:208 +#: ../src/project.c:241 +#: ../src/project.c:856 #, c-format msgid "Project file \"%s\" could not be loaded." msgstr "Project file \"%s\" could not be loaded." -#: ../src/project.c:235 ../src/project.c:249 +#: ../src/project.c:235 +#: ../src/project.c:249 msgid "Open Project" msgstr "Open Project" @@ -3355,19 +3223,15 @@ #: ../src/project.c:425 msgid "Make in base path" -msgstr "" +msgstr "Make in base path" #: ../src/project.c:430 msgid "Run command:" msgstr "Run command:" #: ../src/project.c:438 -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." -msgstr "" -"Command-line to run in the project base directory. Options can be appended " -"to the command. Leave blank to use the default run command." +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." +msgstr "Command-line to run in the project base directory. Options can be appended to the command. Leave blank to use the default run command." #: ../src/project.c:454 msgid "File patterns:" @@ -3378,9 +3242,9 @@ msgstr "Do you want to close it before proceeding?" #: ../src/project.c:551 -#, fuzzy, c-format +#, c-format msgid "The '%s' project is already open." -msgstr "The '%s' project is already open. " +msgstr "The '%s' project is already open." #: ../src/project.c:581 msgid "The specified project name is too short." @@ -3396,9 +3260,9 @@ msgstr "You have specified an invalid project filename." #: ../src/project.c:604 -#, fuzzy, c-format +#, c-format msgid "Project file could not be written (%s)." -msgstr "Project file could not be written." +msgstr "Project file could not be written (%s)." #: ../src/project.c:624 msgid "Create the project's base path directory?" @@ -3420,12 +3284,14 @@ msgstr "Project \"%s\" saved." #. initialise the dialog -#: ../src/project.c:746 ../src/project.c:757 +#: ../src/project.c:746 +#: ../src/project.c:757 msgid "Choose Project Filename" msgstr "Choose Project Filename" #. initialise the dialog -#: ../src/project.c:775 ../src/project.c:786 +#: ../src/project.c:775 +#: ../src/project.c:786 msgid "Choose Project Run Command" msgstr "Choose Project Run Command" @@ -3439,17 +3305,12 @@ msgstr "_Use regular expressions" #: ../src/search.c:142 -msgid "" -"Use POSIX-like regular expressions. For detailed information about using " -"regular expressions, please read the documentation." -msgstr "" -"Use POSIX-like regular expressions. For detailed information about using " -"regular expressions, please read the documentation." +msgid "Use POSIX-like regular expressions. For detailed information about using regular expressions, please read the documentation." +msgstr "Use POSIX-like regular expressions. For detailed information about using regular expressions, please read the documentation." #: ../src/search.c:149 -#, fuzzy msgid "Search _backwards" -msgstr "_Search backwards" +msgstr "Search _backwards" #: ../src/search.c:163 msgid "Use _escape sequences" @@ -3457,18 +3318,19 @@ #: ../src/search.c:168 msgid "" -"Replace \\\\, \\t, \\n, \\r and \\uXXXX (Unicode chararacters) with the " -"corresponding control characters." +"Replace \\\\, \\t, \\n" +", \\r and \\uXXXX (Unicode chararacters) with the corresponding control characters." msgstr "" -"Replace \\\\, \\t, \\n, \\r and \\uXXXX (Unicode chararacters) with the " -"corresponding control characters." +"Replace \\\\, \\t, \\n" +", \\r and \\uXXXX (Unicode chararacters) with the corresponding control characters." -#: ../src/search.c:177 ../src/search.c:620 -#, fuzzy +#: ../src/search.c:177 +#: ../src/search.c:620 msgid "C_ase sensitive" -msgstr "_Case sensitive" +msgstr "C_ase sensitive" -#: ../src/search.c:182 ../src/search.c:626 +#: ../src/search.c:182 +#: ../src/search.c:626 msgid "Match only a _whole word" msgstr "Match only a _whole word" @@ -3484,16 +3346,16 @@ msgid "_Next" msgstr "_Next" -#: ../src/search.c:292 ../src/search.c:412 ../src/search.c:571 -#, fuzzy +#: ../src/search.c:292 +#: ../src/search.c:412 +#: ../src/search.c:571 msgid "_Search for:" -msgstr "Search for:" +msgstr "_Search for:" #. Now add the multiple match options #: ../src/search.c:319 -#, fuzzy msgid "_Find All" -msgstr "Find All" +msgstr "_Find All" #: ../src/search.c:322 msgid "_Mark" @@ -3503,38 +3365,39 @@ msgid "Mark all matches in the current document." msgstr "Mark all matches in the current document." -#: ../src/search.c:329 ../src/search.c:472 +#: ../src/search.c:329 +#: ../src/search.c:472 msgid "In Sessi_on" msgstr "In Sessi_on" -#: ../src/search.c:334 ../src/search.c:477 +#: ../src/search.c:334 +#: ../src/search.c:477 msgid "_In Document" msgstr "_In Document" #. close window checkbox -#: ../src/search.c:340 ../src/search.c:483 +#: ../src/search.c:340 +#: ../src/search.c:483 msgid "Close _dialog" msgstr "Close _dialogue" -#: ../src/search.c:345 ../src/search.c:488 +#: ../src/search.c:345 +#: ../src/search.c:488 msgid "Disable this option to keep the dialog open." msgstr "Disable this option to keep the dialogue open." #: ../src/search.c:408 -#, fuzzy msgid "Replace & Fi_nd" -msgstr "Re_place & Find" +msgstr "Replace & Fi_nd" #: ../src/search.c:415 -#, fuzzy msgid "Replace wit_h:" -msgstr "Replace with:" +msgstr "Replace wit_h:" #. Now add the multiple replace options #: ../src/search.c:462 -#, fuzzy msgid "Re_place All" -msgstr "Replace All" +msgstr "Re_place All" #: ../src/search.c:465 msgid "In Se_lection" @@ -3545,20 +3408,19 @@ msgstr "Replace all matches found in the currently selected text" #: ../src/search.c:556 -#, fuzzy msgid "_Directory:" -msgstr "Directory:" +msgstr "_Directory:" #: ../src/search.c:591 -#, fuzzy msgid "Fixed s_trings" -msgstr "_Fixed strings" +msgstr "Fixed s_trings" #: ../src/search.c:600 msgid "_Grep regular expressions" msgstr "_Grep regular expressions" -#: ../src/search.c:604 ../src/search.c:611 +#: ../src/search.c:604 +#: ../src/search.c:611 msgid "See grep's manual page for more information." msgstr "See grep's manual page for more information." @@ -3586,10 +3448,12 @@ msgid "Other options to pass to Grep" msgstr "Other options to pass to Grep" -#: ../src/search.c:861 ../src/search.c:1367 ../src/search.c:1368 -#, fuzzy, c-format +#: ../src/search.c:861 +#: ../src/search.c:1367 +#: ../src/search.c:1368 +#, c-format msgid "Found %d matches for \"%s\"." -msgstr "Found %d matches for '%s'." +msgstr "Found %d matches for \"%s\"." #: ../src/search.c:980 #, c-format @@ -3623,7 +3487,8 @@ msgid "Search failed." msgstr "Search failed." -#: ../src/search.c:1274 ../src/search.c:1275 +#: ../src/search.c:1274 +#: ../src/search.c:1275 #, c-format msgid "Search completed with %d matches." msgstr "Search completed with %d matches." @@ -3632,16 +3497,21 @@ msgid "No matches found." msgstr "No matches found." -#: ../src/support.c:90 ../src/support.c:114 +#: ../src/support.c:90 +#: ../src/support.c:114 #, c-format msgid "Couldn't find pixmap file: %s" msgstr "Couldn't find pixmap file: %s" -#: ../src/symbols.c:526 ../src/symbols.c:560 ../src/symbols.c:596 +#: ../src/symbols.c:526 +#: ../src/symbols.c:560 +#: ../src/symbols.c:596 msgid "Chapter" msgstr "Chapter" -#: ../src/symbols.c:527 ../src/symbols.c:556 ../src/symbols.c:597 +#: ../src/symbols.c:527 +#: ../src/symbols.c:556 +#: ../src/symbols.c:597 msgid "Section" msgstr "Section" @@ -3663,16 +3533,23 @@ #. &(tv_iters.tag_macro), _("Macros"), #. &(tv_iters.tag_variable), _("Variables"), -#: ../src/symbols.c:532 ../src/symbols.c:561 ../src/symbols.c:654 -#: ../src/symbols.c:666 ../src/symbols.c:678 ../src/symbols.c:706 +#: ../src/symbols.c:532 +#: ../src/symbols.c:561 +#: ../src/symbols.c:654 +#: ../src/symbols.c:666 +#: ../src/symbols.c:678 +#: ../src/symbols.c:706 msgid "Other" msgstr "Other" -#: ../src/symbols.c:539 ../src/symbols.c:687 +#: ../src/symbols.c:539 +#: ../src/symbols.c:687 msgid "Module" msgstr "Module" -#: ../src/symbols.c:540 ../src/symbols.c:664 ../src/symbols.c:676 +#: ../src/symbols.c:540 +#: ../src/symbols.c:664 +#: ../src/symbols.c:676 msgid "Types" msgstr "Types" @@ -3680,20 +3557,23 @@ msgid "Type constructors" msgstr "Type constructors" -#: ../src/symbols.c:542 ../src/symbols.c:569 ../src/symbols.c:584 -#: ../src/symbols.c:620 ../src/symbols.c:633 ../src/symbols.c:673 +#: ../src/symbols.c:542 +#: ../src/symbols.c:569 +#: ../src/symbols.c:584 +#: ../src/symbols.c:620 +#: ../src/symbols.c:633 +#: ../src/symbols.c:673 #: ../src/symbols.c:694 msgid "Functions" msgstr "Functions" #: ../src/symbols.c:547 -#, fuzzy msgid "Sections" -msgstr "Section" +msgstr "Sections" #: ../src/symbols.c:548 msgid "Keys" -msgstr "" +msgstr "Keys" #: ../src/symbols.c:554 msgid "Command" @@ -3703,11 +3583,13 @@ msgid "Environment" msgstr "Environment" -#: ../src/symbols.c:557 ../src/symbols.c:598 +#: ../src/symbols.c:557 +#: ../src/symbols.c:598 msgid "Subsection" msgstr "Subsection" -#: ../src/symbols.c:558 ../src/symbols.c:599 +#: ../src/symbols.c:558 +#: ../src/symbols.c:599 msgid "Subsubsection" msgstr "Subsubsection" @@ -3715,7 +3597,8 @@ msgid "Label" msgstr "Label" -#: ../src/symbols.c:568 ../src/symbols.c:647 +#: ../src/symbols.c:568 +#: ../src/symbols.c:647 msgid "Package" msgstr "Package" @@ -3731,49 +3614,61 @@ msgid "Our" msgstr "Our" -#: ../src/symbols.c:582 ../src/symbols.c:648 ../src/symbols.c:661 +#: ../src/symbols.c:582 +#: ../src/symbols.c:648 +#: ../src/symbols.c:661 msgid "Interfaces" msgstr "Interfaces" -#: ../src/symbols.c:583 ../src/symbols.c:607 ../src/symbols.c:618 -#: ../src/symbols.c:649 ../src/symbols.c:662 ../src/symbols.c:693 +#: ../src/symbols.c:583 +#: ../src/symbols.c:607 +#: ../src/symbols.c:618 +#: ../src/symbols.c:649 +#: ../src/symbols.c:662 +#: ../src/symbols.c:693 msgid "Classes" msgstr "Classes" -#: ../src/symbols.c:585 ../src/symbols.c:675 +#: ../src/symbols.c:585 +#: ../src/symbols.c:675 msgid "Constants" -msgstr "" +msgstr "Constants" #. &(tv_iters.tag_class), _("Constants"), #. &(tv_iters.tag_member), _("Members"), #. &(tv_iters.tag_macro), _("Macros"), -#: ../src/symbols.c:586 ../src/symbols.c:621 ../src/symbols.c:637 -#: ../src/symbols.c:665 ../src/symbols.c:674 ../src/symbols.c:705 +#: ../src/symbols.c:586 +#: ../src/symbols.c:621 +#: ../src/symbols.c:637 +#: ../src/symbols.c:665 +#: ../src/symbols.c:674 +#: ../src/symbols.c:705 msgid "Variables" msgstr "Variables" #: ../src/symbols.c:606 -#, fuzzy msgid "Modules" -msgstr "Module" +msgstr "Modules" #: ../src/symbols.c:608 msgid "Singletons" msgstr "Singletons" -#: ../src/symbols.c:609 ../src/symbols.c:619 ../src/symbols.c:650 +#: ../src/symbols.c:609 +#: ../src/symbols.c:619 +#: ../src/symbols.c:650 #: ../src/symbols.c:663 msgid "Methods" msgstr "Methods" -#: ../src/symbols.c:651 ../src/symbols.c:695 +#: ../src/symbols.c:651 +#: ../src/symbols.c:695 msgid "Members" msgstr "Members" #: ../src/symbols.c:677 -#, fuzzy msgid "Labels" -msgstr "Label" +msgstr "Labels" #: ../src/symbols.c:690 msgid "Namespaces" @@ -3793,9 +3688,9 @@ msgstr "Unknown filetype extension for \"%s\".\n" #: ../src/symbols.c:925 -#, fuzzy, c-format +#, c-format msgid "Failed to create tags file, perhaps because no tags were found.\n" -msgstr "Failed to create tags file.\n" +msgstr "Failed to create tags file, perhaps because no tags were found.\n" #: ../src/symbols.c:932 #, c-format @@ -3810,12 +3705,10 @@ #, c-format msgid "" "Example:\n" -"CFLAGS=`pkg-config gtk+-2.0 --cflags` %s -g gtk2.c.tags /usr/include/gtk-2.0/" -"gtk/gtk.h\n" +"CFLAGS=`pkg-config gtk+-2.0 --cflags` %s -g gtk2.c.tags /usr/include/gtk-2.0/gtk/gtk.h\n" msgstr "" "Example:\n" -"CFLAGS=`pkg-config gtk+-2.0 --cflags` %s -g gtk2.c.tags /usr/include/gtk-2.0/" -"gtk/gtk.h\n" +"CFLAGS=`pkg-config gtk+-2.0 --cflags` %s -g gtk2.c.tags /usr/include/gtk-2.0/gtk/gtk.h\n" #: ../src/symbols.c:947 msgid "Load Tags" @@ -3850,19 +3743,17 @@ msgid "Passing data and executing custom command: %s" msgstr "Passing data and executing custom command: %s" -#: ../src/tools.c:218 ../src/tools.c:447 +#: ../src/tools.c:218 +#: ../src/tools.c:447 msgid "Set Custom Commands" msgstr "Set Custom Commands" #: ../src/tools.c:225 -msgid "" -"You can send the current selection to any of these commands and the output " -"of the command replaces the current selection." -msgstr "" -"You can send the current selection to any of these commands and the output " -"of the command replaces the current selection." +msgid "You can send the current selection to any of these commands and the output of the command replaces the current selection." +msgstr "You can send the current selection to any of these commands and the output of the command replaces the current selection." -#: ../src/tools.c:416 ../src/tools.c:420 +#: ../src/tools.c:416 +#: ../src/tools.c:420 msgid "No custom commands defined." msgstr "No custom commands defined." @@ -3899,39 +3790,38 @@ msgstr "No tags found" #: ../src/treeviews.c:365 -#, fuzzy msgid "Sort by _Name" -msgstr "Appearance" +msgstr "Sort by _Name" #: ../src/treeviews.c:372 -#, fuzzy msgid "Sort by _Appearance" -msgstr "Appearance" +msgstr "Sort by _Appearance" -#: ../src/treeviews.c:383 ../src/treeviews.c:470 -#, fuzzy +#: ../src/treeviews.c:383 +#: ../src/treeviews.c:470 msgid "Show S_ymbol List" -msgstr "Show symbol list" +msgstr "Show S_ymbol List" -#: ../src/treeviews.c:389 ../src/treeviews.c:476 -#, fuzzy +#: ../src/treeviews.c:389 +#: ../src/treeviews.c:476 msgid "Show _Document List" -msgstr "Show open files list" +msgstr "Show _Document List" -#: ../src/treeviews.c:395 ../src/treeviews.c:482 ../plugins/filebrowser.c:543 -#, fuzzy +#: ../src/treeviews.c:395 +#: ../src/treeviews.c:482 +#: ../plugins/filebrowser.c:543 @@ 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: [2191] trunk/po
by frlan＠users.sourceforge.net 26 Jan '08

26 Jan '08

Revision: 2191 http://geany.svn.sourceforge.net/geany/?rev=2191&view=rev Author: frlan Date: 2008-01-26 09:46:55 -0800 (Sat, 26 Jan 2008) Log Message: ----------- Update of Hungarian translation Modified Paths: -------------- trunk/po/ChangeLog trunk/po/hu.po Modified: trunk/po/ChangeLog =================================================================== --- trunk/po/ChangeLog 2008-01-25 13:14:38 UTC (rev 2190) +++ trunk/po/ChangeLog 2008-01-26 17:46:55 UTC (rev 2191) @@ -1,3 +1,8 @@ +2008-01-26 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> + + * hu.po: Update of Hungarian translation (Thanks to Gabor Kmetyko) + + 2008-01-22 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * el.po, LINGUAS: Modified: trunk/po/hu.po =================================================================== --- trunk/po/hu.po 2008-01-25 13:14:38 UTC (rev 2190) +++ trunk/po/hu.po 2008-01-26 17:46:55 UTC (rev 2191) @@ -1,16 +1,16 @@ -# Translation of Geany v0.12 to Hungarian -# Copyright © 2007 Free Software Foundation, Inc. -# This file is distributed under the same license as the Roundup package. +# Translation of Geany v0.13 to Hungarian +# Copyright © 2007, 2008 Free Software Foundation, Inc. +# This file is distributed under the same license as the Geany package. # -# kilo aka Gabor Kmetyko <kg_kilo(a)freemail.hu>, 2007. +# kilo aka Gabor Kmetyko <kg_kilo(a)freemail.hu>, 2007, 2008. msgid "" msgstr "" "Project-Id-Version: Geany 0.13\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-01-19 16:55+0100\n" -"PO-Revision-Date: 2007-09-20 14:19+0200\n" +"PO-Revision-Date: 2008-01-21 14:25+0100\n" "Last-Translator: kilo aka Gabor Kmetyko <kg_kilo(a)freemail.hu>\n" -"Language-Team: Hungarian\n" +"Language-Team: Hungarian <geany-i18n(a)uvena.de>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -118,8 +118,7 @@ #: ../src/build.c:379 ../src/build.c:629 msgid "Command stopped because the current file has no extension." -msgstr "" -"Parancs végrehajtása megállt, mert a jelenlegi fájlnak nincs kiterjesztése." +msgstr "Parancs végrehajtása megállt, mert a jelenlegi fájlnak nincs kiterjesztése." #: ../src/build.c:403 #, c-format @@ -144,9 +143,8 @@ msgstr "Nem sikerült a munkakönyvtárat átállítani erre: \"%s\"" #: ../src/build.c:802 -msgid "" -"Could not execute the file in the VTE because it probably contains a command." -msgstr "" +msgid "Could not execute the file in the VTE because it probably contains a command." +msgstr "Nem sikerült a fájlt végrehajtani a VTE-n belül, mert feltehetően egy parancsot tartalmaz." #: ../src/build.c:984 msgid "Compilation failed." @@ -192,8 +190,7 @@ #: ../src/build.c:1142 ../src/build.c:1262 msgid "Builds the current file with the make tool and the specified target" -msgstr "" -"Build-eli a jelenlegi fájlt a make eszközzel és a megadott célállománnyal" +msgstr "Build-eli a jelenlegi fájlt a make eszközzel és a megadott célállománnyal" #. build the code with make object #: ../src/build.c:1149 @@ -329,8 +326,7 @@ msgstr "Egyedi cél készítése" #: ../src/build.c:1952 -msgid "" -"Enter custom options here, all entered text is passed to the make command." +msgid "Enter custom options here, all entered text is passed to the make command." msgstr "" "Adja meg itt az egyedi opciókat, minden bevitt szöveg átadásra kerül a make " "parancs számára." @@ -371,8 +367,7 @@ msgstr "Biztosan újra akarja olvasni '%s'-t?" #: ../src/callbacks.c:1321 ../src/callbacks.c:1345 -msgid "" -"Please set the filetype for the current file before using this function." +msgid "Please set the filetype for the current file before using this function." msgstr "Mielőtt ezt a funkciót használná, adja meg a jelenlegi fájl típusát." #: ../src/callbacks.c:1447 ../src/ui_utils.c:480 @@ -400,13 +395,12 @@ msgstr "éééé/hh/nn óó:pp:mm" #: ../src/callbacks.c:1459 ../src/ui_utils.c:502 -#, fuzzy msgid "_Use Custom Date Format" -msgstr "Egyedi dátum formátum használata" +msgstr "Egyedi dát_umformátum használata" #: ../src/callbacks.c:1470 msgid "Custom Date Format" -msgstr "Egyedi dátum formátum" +msgstr "Egyedi dátumformátum" #: ../src/callbacks.c:1471 msgid "" @@ -418,8 +412,7 @@ #: ../src/callbacks.c:1490 msgid "Date format string could not be converted (possibly too long)." -msgstr "" -"A dátum formátum stringet nem lehetett átalakítani (feltehetően túl hosszú)." +msgstr "A dátumformátum stringet nem lehetett átalakítani (feltehetően túl hosszú)." #: ../src/callbacks.c:1788 msgid "No more message items." @@ -681,9 +674,9 @@ msgstr "Érvénytelen fájlnév" #: ../src/document.c:987 -#, fuzzy, c-format +#, c-format msgid "Setting %s indentation mode." -msgstr "Automatikus behúzás üzemmód:" +msgstr "%s behúzás üzemmód beállítása." #: ../src/document.c:988 ../src/interface.c:808 ../src/interface.c:3672 msgid "Tabs" @@ -712,14 +705,13 @@ msgstr "Hiba a fájl mentésekor." #: ../src/document.c:1236 -#, fuzzy, c-format +#, c-format msgid "" "An error occurred while converting the file from UTF-8 in \"%s\". The file " "remains unsaved." msgstr "" "Hiba történt a fájl UTF-8-ból konvertálásakor itt: \"%s\". A fájl nem került " -"mentésre.\n" -"Hibaüzenet: %s\n" +"mentésre." #: ../src/document.c:1257 #, c-format @@ -727,11 +719,13 @@ "Error message: %s\n" "The error occurred at \"%s\" (line: %d, column: %d)." msgstr "" +"Hibaüzenet: %s\n" +"A hiba itt történt: \"%s\" (sor: %d, oszlop: %d)." #: ../src/document.c:1262 -#, fuzzy, c-format +#, c-format msgid "Error message: %s." -msgstr "Hiba a fájl mentésekor (%s)." +msgstr "Hibaüzenet: %s." #: ../src/document.c:1290 #, c-format @@ -914,9 +908,9 @@ #: ../src/filetypes.c:310 ../src/filetypes.c:357 ../src/filetypes.c:368 #: ../src/filetypes.c:402 ../src/filetypes.c:413 ../src/filetypes.c:424 #: ../src/filetypes.c:458 -#, fuzzy, c-format +#, c-format msgid "%s source file" -msgstr "C forráskód fájl" +msgstr "%s forráskód fájl" #: ../src/filetypes.c:321 msgid "Shell script file" @@ -931,7 +925,6 @@ msgstr "XML dokumentum" #: ../src/filetypes.c:380 -#, fuzzy msgid "Cascading StyleSheet" msgstr "Cascading StyleSheet" @@ -1028,7 +1021,7 @@ #: ../src/interface.c:403 msgid "Page set_up" -msgstr "" +msgstr "Oldal b_eállítása" #: ../src/interface.c:410 msgid "Prints the current file" @@ -1143,8 +1136,7 @@ msgstr "BSD licensz megjegyzés beszúrása" #: ../src/interface.c:603 ../src/interface.c:2256 -msgid "" -"Inserts a BSD licence notice (should be done at the beginning of the file)" +msgid "Inserts a BSD licence notice (should be done at the beginning of the file)" msgstr "BSD licensz megjegyzést illeszt be (a fájl elejére kell kerüljön)" #: ../src/interface.c:605 ../src/interface.c:2258 @@ -1213,8 +1205,7 @@ #: ../src/interface.c:740 msgid "Toggle the window with status and compiler messages on and off" -msgstr "" -"Ki/bekapcsolja az állapotokat és fordítóüzeneteket megjelenítő ablakot " +msgstr "Ki/bekapcsolja az állapotokat és fordítóüzeneteket megjelenítő ablakot " #: ../src/interface.c:743 msgid "Show _Toolbar" @@ -1267,13 +1258,12 @@ "ki kellene kapcsolni." #: ../src/interface.c:796 -#, fuzzy msgid "_Auto-indentation" msgstr "A_utomatikus behúzás" #: ../src/interface.c:801 msgid "In_dent Type" -msgstr "" +msgstr "Be_húzás típusa" #: ../src/interface.c:825 msgid "Read _Only" @@ -1281,8 +1271,7 @@ #: ../src/interface.c:828 msgid "Treat this file as read-only. No changes can be made." -msgstr "" -"A fájlt csak olvashatóként kezeli. Nem lehet benne változtatásokat tenni." +msgstr "A fájlt csak olvashatóként kezeli. Nem lehet benne változtatásokat tenni." #: ../src/interface.c:830 msgid "_Write Unicode BOM" @@ -1313,9 +1302,8 @@ msgstr "Beállítás és átalakítás _CR-re (Mac)" #: ../src/interface.c:889 -#, fuzzy msgid "_Strip Trailing Spaces" -msgstr "Sorvégi szóközök levágása" +msgstr "_Sorvégi szóközök levágása" #: ../src/interface.c:893 msgid "_Replace Tabs by Spaces" @@ -1378,10 +1366,9 @@ msgstr "_Színválasztó" #: ../src/interface.c:981 ../src/interface.c:1122 -msgid "" -"Open a color chooser dialog, to interactively pick colors from a palette." +msgid "Open a color chooser dialog, to interactively pick colors from a palette." msgstr "" -"Megnyit egy színválasztó dialógus ablakot, hogy interaktív módon lehessek " +"Megnyit egy színválasztó dialógus ablakot, hogy interaktív módon lehessen " "egy palettáról színt választani." #: ../src/interface.c:987 @@ -1477,12 +1464,10 @@ msgstr "Szöveg kicsinyítése" #: ../src/interface.c:1145 -#, fuzzy msgid "Decrease indentation" msgstr "Behúzás csökkentése" #: ../src/interface.c:1150 -#, fuzzy msgid "Increase indentation" msgstr "Behúzás növelése" @@ -1503,9 +1488,8 @@ msgstr "Szimbólumok" #: ../src/interface.c:1245 ../src/treeviews.c:261 -#, fuzzy msgid "Documents" -msgstr "_Dokumentum" +msgstr "Dokumentumok" #: ../src/interface.c:1281 msgid "Status" @@ -1604,9 +1588,8 @@ msgstr "Engedélyezi bővítőmodulok támogatását" #: ../src/interface.c:2832 -#, fuzzy msgid "Startup" -msgstr "Oldalsáv" +msgstr "Indulás" #: ../src/interface.c:2851 msgid "Save window position and geometry" @@ -1625,25 +1608,22 @@ msgstr "Kilépéskor megerősítő ablakot jelenít meg." #: ../src/interface.c:2865 -#, fuzzy msgid "Shutdown" -msgstr "Indulás és leállás" +msgstr "Leállás" #: ../src/interface.c:2884 -#, fuzzy msgid "Use project-based session files" -msgstr "Geany projekt fájlok" +msgstr "Projekt-alapú munkamenet fájlok használata" #: ../src/interface.c:2888 msgid "" "Whether to store a project's session files and open them when re-opening the " "project." -msgstr "" +msgstr "Eltárolja-e a projekt munkamenet fájljait és megnyissa-e őket a projekt újbóli megnyitásakor?" #: ../src/interface.c:2891 -#, fuzzy msgid "Projects" -msgstr "Elérési utak" +msgstr "Projektek" #: ../src/interface.c:2910 msgid "Beep on errors or when compilation has finished" @@ -1747,19 +1727,16 @@ msgstr "Ki/bekapcsolja a szimbólumok listáját" #: ../src/interface.c:3045 -#, fuzzy msgid "Show documents list" msgstr "Megnyitott fájlok listájának megjelenítése" #: ../src/interface.c:3048 -#, fuzzy msgid "Toggle the documents list on and off" msgstr "Ki/bekapcsolja a megnyitott fájlok listáját" #: ../src/interface.c:3051 -#, fuzzy msgid "Show full path name in documents list" -msgstr "Megnyitott fájlok listájának megjelenítése" +msgstr "Teljes elérési út megjelenítése a megnyitott fájlok listáján" #: ../src/interface.c:3056 msgid "Sidebar" @@ -1894,8 +1871,7 @@ msgstr "Vissza és Előre gombok megjelenítése" #: ../src/interface.c:3337 -msgid "" -"Display the Back and Forward buttons in the toolbar used for code navigation" +msgid "Display the Back and Forward buttons in the toolbar used for code navigation" msgstr "" "Megjeleníti a Vissza és az Előre gombokat az eszköztáron a kódon belül " "történő mozgáshoz" @@ -1925,9 +1901,8 @@ msgstr "Megjeleníti a Nagyítás és a Kicsinyítés gombokat az eszköztáron" #: ../src/interface.c:3361 -#, fuzzy msgid "Show Increase and Decrease Indentation buttons" -msgstr "Újra és Visszavonás gombok megjelenítése" +msgstr "Behúzás növelése / csökkentése gombok megjelenítése" #: ../src/interface.c:3368 msgid "Show Search field" @@ -2080,7 +2055,6 @@ msgstr "Megjelenítés" #: ../src/interface.c:3632 -#, fuzzy msgid "Auto-indent mode:" msgstr "Automatikus behúzás üzemmód:" @@ -2101,20 +2075,18 @@ msgstr "A tabulátor mérete karakterekben" #: ../src/interface.c:3659 -#, fuzzy msgid "Tab width:" msgstr "Tabulátor szélessége:" #: ../src/interface.c:3675 ../src/interface.c:3682 -#, fuzzy msgid "Whether to use tabs or spaces when indentation is inserted." -msgstr "Az aljára ugorjon-e, ha kimenetre írás történt." +msgstr "Tabulátort vagy szóközt használjon, ha behúzás történik?" #: ../src/interface.c:3698 msgid "" "Whether to detect the indentation type from file contents when a file is " "opened." -msgstr "" +msgstr "Fájl megnyitásakor megállapítsa-e a fájltartalom alapján a behúzások típusát?" #: ../src/interface.c:3700 msgid "Indentation" @@ -2163,15 +2135,14 @@ msgstr "Engedélyezi-e a kód blokkokra osztását" #: ../src/interface.c:3742 -#, fuzzy msgid "Fold/Unfold all children of a fold point" -msgstr "Kinyitja egy blokk összes gyermekét" +msgstr "Kinyitja/bezárja egy blokk összes gyermekét" #: ../src/interface.c:3745 msgid "" "Fold or unfold all children of a fold point. By pressing the Shift key while " "clicking on a fold symbol the contrary behaviour is used." -msgstr "" +msgstr "Kinyitja/bezárja egy blokk összes gyermekét. A Shift billentyűt használva kattintás közben az ellentétes viselkedés történik." #: ../src/interface.c:3748 msgid "Use indicators to show compile errors" @@ -2186,42 +2157,38 @@ "a fordító figyelmeztetést vagy hibát talált." #: ../src/interface.c:3754 -#, fuzzy msgid "Newline strips trailing spaces" -msgstr "Sorvégi szóközök levágása" +msgstr "Soremelés levágja a sorvégi szóközöket" #: ../src/interface.c:3757 msgid "Enable newline to strip the trailing spaces on the previous line." -msgstr "" +msgstr "Engedélyezi, hogy soremeléskor az előző sor végéről levágja a szóközöket." #: ../src/interface.c:3760 msgid "Features" msgstr "Sajátságok" #: ../src/interface.c:3779 -#, fuzzy msgid "Snippet completion" -msgstr "Szerkezet kiegészítés felfüggesztése" +msgstr "Részlet kiegészítése" #: ../src/interface.c:3782 msgid "" "Type a defined short character sequence and complete it to a more complex " "string using a single keypress." -msgstr "" +msgstr "Gépeljen be egy meghatározott karaktersort és egészíttesse ki egy bonyolultabb szövegre egy gombnyomással." #: ../src/interface.c:3785 msgid "XML tag autocompletion" msgstr "XML címke automatikus kiegészítése" #: ../src/interface.c:3788 -#, fuzzy msgid "Automatic completion and closing of XML tags (includes HTML tags)" msgstr "" -"A megnyitott XML címkék (beleértve a HTML címkéket is) automatikus " +"Az XML címkék (beleértve a HTML címkéket is) automatikus " "kiegészítése" #: ../src/interface.c:3791 -#, fuzzy msgid "Automatic symbol completion" msgstr "Szimbólumok automatikus kiegészítése" @@ -2239,23 +2206,21 @@ #: ../src/interface.c:3812 msgid "Characters to type for completion:" -msgstr "" +msgstr "Kiegészítéshez használt karakterek:" #: ../src/interface.c:3819 -#, fuzzy msgid "Rows of symbol completion list:" -msgstr "Automatikus kiegészítés sorainak száma:" +msgstr "Szimbólum-kiegészítés sorai:" #: ../src/interface.c:3832 msgid "" "The amount of characters which are necessary to show the symbol auto " "completion list." -msgstr "" +msgstr "A szimbólumok automatikus kiegészítése listájának megjelenítéséhez szükséges karakterek száma." #: ../src/interface.c:3835 -#, fuzzy msgid "Completions" -msgstr "Automatikus kiegészítés" +msgstr "Kiegészítések" #: ../src/interface.c:3840 msgid "Editor" @@ -2263,8 +2228,7 @@ #: ../src/interface.c:3872 msgid "Sets the default encoding for newly created files." -msgstr "" -"Beállítja az alapértelmezett kódolást újonnan létrehozott fájlok esetén." +msgstr "Beállítja az alapértelmezett kódolást újonnan létrehozott fájlok esetén." #: ../src/interface.c:3878 msgid "Default encoding (new files):" @@ -2324,8 +2288,7 @@ msgstr "Legutóbbi fájlok listájának hossza:" #: ../src/interface.c:3986 -msgid "" -"Specifies the number of files which are stored in the Recent files list." +msgid "Specifies the number of files which are stored in the Recent files list." msgstr "Megadja, hogy hány fájl jelenjen meg a Legutóbbi fájlok listáján." #: ../src/interface.c:3995 ../src/symbols.c:520 ../plugins/filebrowser.c:812 @@ -2452,84 +2415,70 @@ msgstr "Billentyű hozzárendelések" #: ../src/interface.c:4344 -#, fuzzy msgid "Command:" -msgstr "Parancs" +msgstr "Parancs:" #: ../src/interface.c:4351 #, c-format msgid "Path to the command for printing files (use %f for the filename)." -msgstr "" -"Elérési út a fájl nyomtatási parancshoz (használjon %f-et a fájlnév helyén)." +msgstr "Elérési út a fájl nyomtatási parancshoz (használjon %f-et a fájlnév helyén)." #: ../src/interface.c:4361 msgid "Use an external command for printing" -msgstr "" +msgstr "Külső parancs használata nyomtatáshoz" #: ../src/interface.c:4382 ../src/printing.c:342 -#, fuzzy msgid "Print line numbers" -msgstr "S_orszámok megjelenítése" +msgstr "Sorszámok nyomtatása" #: ../src/interface.c:4385 ../src/printing.c:344 -#, fuzzy msgid "Add line numbers to the printed page." -msgstr "Az aktuális fájl elérési útjának követése" +msgstr "Sorszámozás hozzáadása a nyomtatott oldalon." #: ../src/interface.c:4388 ../src/printing.c:348 -#, fuzzy msgid "Print page numbers" -msgstr "S_orszámok megjelenítése" +msgstr "Oldalszámozás nyomtatása" #: ../src/interface.c:4391 ../src/printing.c:350 -msgid "" -"Add page numbers at the bottom of each page. It takes 2 lines of the page." -msgstr "" +msgid "Add page numbers at the bottom of each page. It takes 2 lines of the page." +msgstr "Oldalszám elhelyezése minden oldal alján. Ez 2 sort foglal el az oldalon." #: ../src/interface.c:4394 ../src/printing.c:354 -#, fuzzy msgid "Print page header" -msgstr "Szülő fejléc:" +msgstr "Oldal fejléc nyomtatása" #: ../src/interface.c:4397 ../src/printing.c:356 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." -msgstr "" +msgstr "Fejlécet helyez minden oldalra az oldalszámmal, fájlnévvel és az aktuális dátummal (ld. lejjebb). Ez 3 sort foglal el az oldalon." #: ../src/interface.c:4415 ../src/printing.c:373 -#, fuzzy msgid "Use the basename of the printed file" -msgstr "Az aktuális fájl elérési útjának követése" +msgstr "A nyomtatott fájlt alap nevének használata" #: ../src/interface.c:4418 ../src/printing.c:375 -#, fuzzy msgid "Print only the basename(without the path) of the printed file." -msgstr "Az aktuális fájl elérési útjának követése" +msgstr "A nyomtatott fájl alap nevét (elérési út nélkül) írja ki." #: ../src/interface.c:4425 ../src/printing.c:382 -#, fuzzy msgid "Date format:" -msgstr "Egyedi dátum formátum" +msgstr "Dátumformátum:" #: ../src/interface.c:4432 ../src/printing.c:387 -#, fuzzy 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 " "with the ANSI C strftime function." -msgstr "" -"Adja meg itt az egyedi dátum és idő formátumot. Minden olyan konverziós " -"jelölés használható, amit az ANSI C strftime függvénnyel használni lehet." +msgstr "Adja meg itt az egyedi dátum- és időformátumot az oldalak fejlécébe kerülő időponthoz. Minden olyan konverziós jelölés használható, amit az ANSI C strftime függvénnyel használni lehet." #: ../src/interface.c:4435 msgid "Use native GTK printing" -msgstr "" +msgstr "Natív GTK nyomtatás használata" #: ../src/interface.c:4442 -#, fuzzy msgid "Printing" -msgstr "Nyomtat" +msgstr "Nyomtatás" #: ../src/keybindings.c:113 msgid "New" @@ -2581,16 +2530,15 @@ #: ../src/keybindings.c:140 msgid "Cut" -msgstr "" +msgstr "Kivágás" #: ../src/keybindings.c:142 -#, fuzzy msgid "Copy" -msgstr "Cég:" +msgstr "Másolás" #: ../src/keybindings.c:144 msgid "Paste" -msgstr "" +msgstr "Beillesztés" #: ../src/keybindings.c:146 msgid "Select All" @@ -2745,14 +2693,12 @@ msgstr "Dokumentum mozgatása jobbra" #: ../src/keybindings.c:241 -#, fuzzy msgid "Move document first" -msgstr "Dokumentum mozgatása balra" +msgstr "Dokumentum mozgatása első helyre" #: ../src/keybindings.c:243 -#, fuzzy msgid "Move document last" -msgstr "Dokumentum mozgatása balra" +msgstr "Dokumentum mozgatása utolsó helyre" #: ../src/keybindings.c:250 msgid "Duplicate line or selection" @@ -2852,14 +2798,12 @@ #. has special callback #: ../src/keybindings.c:303 -#, fuzzy msgid "Complete snippet" -msgstr "Szerkezet kiegészítése" +msgstr "Részlet kiegészítése" #: ../src/keybindings.c:305 -#, fuzzy msgid "Suppress snippet completion" -msgstr "Szerkezet kiegészítés felfüggesztése" +msgstr "Részlet kiegészítés felfüggesztése" #: ../src/keybindings.c:308 msgid "Select current word" @@ -2927,7 +2871,6 @@ msgstr "Fókusz parancsok" #: ../src/keybindings.c:378 -#, fuzzy msgid "Notebook tab commands" msgstr "Címke parancsok" @@ -2940,9 +2883,8 @@ msgstr "Címke parancsok" #: ../src/keybindings.c:381 -#, fuzzy msgid "Other commands" -msgstr "%s parancsok" +msgstr "Egyéb parancsok" #: ../src/keybindings.c:564 msgid "Keyboard Shortcuts" @@ -3008,7 +2950,7 @@ #: ../src/main.c:135 msgid "Print Geany's installation prefix" -msgstr "" +msgstr "A Geany telepítés prefix nyomtatása" #: ../src/main.c:136 msgid "don't load the previous session's files" @@ -3072,7 +3014,7 @@ #: ../src/plugins.c:579 msgid "Plugin Manager" -msgstr "" +msgstr "Bővítménykezelő" #: ../src/plugins.c:707 #, c-format @@ -3081,39 +3023,39 @@ "Description: %s\n" "Author(s): %s" msgstr "" +"Bővítmény: %s %s\n" +"Leírás: %s\n" +"Szerző(k): %s" #: ../src/plugins.c:768 -#, fuzzy msgid "Active" -msgstr "Parancs" +msgstr "Aktív" #: ../src/plugins.c:774 msgid "Plugin" -msgstr "" +msgstr "Bővítmény" #: ../src/plugins.c:780 -#, fuzzy msgid "File" -msgstr "_Fájl" +msgstr "Fájl" #: ../src/plugins.c:798 msgid "No plugins available." -msgstr "" +msgstr "Nincs elérhető bővítmény." #: ../src/plugins.c:843 msgid "Plugins" -msgstr "" +msgstr "Bővítmények" #: ../src/plugins.c:864 msgid "" "Below is a list of available plugins. Select the plugins which should be " "loaded when Geany is started." -msgstr "" +msgstr "Lejjebb látható az elérhető bővítmények listája. Válassza ki azokat, amelyeket a Geany indulásakor be kell tölteni." #: ../src/plugins.c:872 -#, fuzzy msgid "Plugin details:" -msgstr "Behúzás" +msgstr "Bővítmény részletei:" #: ../src/prefs.c:105 msgid "Action" @@ -3136,18 +3078,16 @@ #: ../src/prefs.c:1233 msgid "_Override" -msgstr "" +msgstr "_Felülbírálás" #: ../src/prefs.c:1234 msgid "Override that keybinding?" -msgstr "" +msgstr "Felülbírálja ezt a billentyű-hozzárendelést?" #: ../src/prefs.c:1235 -#, fuzzy, c-format +#, c-format msgid "The combination '%s' is already used for \"%s\"." -msgstr "" -"A '%s' kombináció már használatban van a(z) \"%s\" parancsnál. Válasszon " -"másikat!" +msgstr "A(z) '%s' kombináció már használatban van a(z) \"%s\" parancsnál." #. add manually GeanyWrapLabels because it can't be added with Glade #. page Tools @@ -3171,7 +3111,7 @@ "Notice: For all changes you make here to take effect, you need to restart " "Geany." msgstr "" -"Figyelem: minden itt végzett változtatáséletbe lépéséhez újra kell " +"Figyelem: minden itt végzett változtatás életbe lépéséhez újra kell " "indítani a Geany-t." #. page Keybindings @@ -3192,21 +3132,23 @@ "Notice: Native GTK printing is only available if Geany was built against " "GTK 2.10 (or above) and Geany is running with GTK 2.10 (or above)." msgstr "" +"Figyelem: A natív GTK nyomtatás csak akkor elérhető, ha a Geany " +"GTK 2.10-re (vagy későbbire) lett fordítva és a Geany GTK 2.10 " +"(vagy későbbi) verzión fut." #: ../src/printing.c:269 -#, fuzzy, c-format +#, c-format msgid "Page %d of %d" -msgstr "Változott:" +msgstr "%d. oldal (összesen: %d)" #: ../src/printing.c:337 -#, fuzzy msgid "Document Setup" -msgstr "Dokumentum menü" +msgstr "Dokumentum beállítások" #: ../src/printing.c:715 -#, fuzzy, c-format +#, c-format msgid "Printing of file %s was cancelled." -msgstr "\"%s\" nyomtatása sikertelen (visszatérési érték: %s)." +msgstr "%s fájl nyomtatása megszakítva." #: ../src/printing.c:717 ../src/printing.c:834 #, c-format @@ -3214,13 +3156,13 @@ msgstr "%s fájl kinyomtatva." #: ../src/printing.c:765 -#, fuzzy, c-format +#, c-format msgid "Printing of %s failed (%s)." -msgstr "\"%s\" nyomtatása sikertelen (visszatérési érték: %s)." +msgstr "%s nyomtatása sikertelen (%s)." #: ../src/printing.c:805 msgid "Please set a print command in the preferences dialog first" -msgstr "" +msgstr "Először állítson be egy nyomtatási parancsot a tulajdonságok párbeszédablakban!" #: ../src/printing.c:813 #, c-format @@ -3265,14 +3207,13 @@ msgstr "Alapkönyvtár:" #: ../src/project.c:160 ../src/project.c:416 -#, fuzzy 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 " "project filename." msgstr "" "A projektet alkotó fájlok alapkönyvtára. Lehet új könyvtár, vagy egy már " -"létező elérési út is." +"létező elérési út is. Lehet használni a projekt fájlnevéhez képest relatív elérési utakat is." #: ../src/project.c:163 ../src/project.c:419 msgid "Choose Project Base Path" @@ -3306,7 +3247,7 @@ #: ../src/project.c:425 msgid "Make in base path" -msgstr "" +msgstr "Make parancs az alapkönyvtárban" #: ../src/project.c:430 msgid "Run command:" @@ -3329,9 +3270,9 @@ msgstr "Szeretné bezárni, mielőtt folytatja?" #: ../src/project.c:551 -#, fuzzy, c-format +#, c-format msgid "The '%s' project is already open." -msgstr "A(z) '%s' projekt már nyitva van. " +msgstr "A(z) '%s' projekt már nyitva van." #: ../src/project.c:581 msgid "The specified project name is too short." @@ -3347,9 +3288,9 @@ msgstr "Érvénytelen projekt fájlnevet adott meg." #: ../src/project.c:604 -#, fuzzy, c-format +#, c-format msgid "Project file could not be written (%s)." -msgstr "A projekt fájl nem írható." +msgstr "A projekt fájl nem írható (%s)." #: ../src/project.c:624 msgid "Create the project's base path directory?" @@ -3439,9 +3380,8 @@ #. Now add the multiple match options #: ../src/search.c:319 -#, fuzzy msgid "_Find All" -msgstr "Minde keresi" +msgstr "_Mindet keresi" #: ../src/search.c:322 msgid "_Mark" @@ -3473,15 +3413,13 @@ msgstr "Cse_re & Keresés" #: ../src/search.c:415 -#, fuzzy msgid "Replace wit_h:" msgstr "C_sere erre:" #. Now add the multiple replace options #: ../src/search.c:462 -#, fuzzy msgid "Re_place All" -msgstr "Mindet cseréli" +msgstr "Min_det cseréli" #: ../src/search.c:465 msgid "In Se_lection" @@ -3496,7 +3434,6 @@ msgstr "_Könyvtár:" #: ../src/search.c:591 -#, fuzzy msgid "Fixed s_trings" msgstr "_Fix stringek" @@ -3702,9 +3639,8 @@ msgstr "Változók" #: ../src/symbols.c:606 -#, fuzzy msgid "Modules" -msgstr "Modul" +msgstr "Modulok" #: ../src/symbols.c:608 msgid "Singletons" @@ -3720,9 +3656,8 @@ msgstr "Tagok" #: ../src/symbols.c:677 -#, fuzzy msgid "Labels" -msgstr "Címke" +msgstr "Címkék" #: ../src/symbols.c:690 msgid "Namespaces" @@ -3742,9 +3677,9 @@ msgstr "Ismeretlen fájlkiterjesztés: \"%s\".\n" #: ../src/symbols.c:925 -#, fuzzy, c-format +#, c-format msgid "Failed to create tags file, perhaps because no tags were found.\n" -msgstr "Nem sikerült létrehozni a címkefájlt.\n" +msgstr "Nem sikerült létrehozni a címkefájlt, feltehetően azért, mert nem sikerült címékéket találni.\n" #: ../src/symbols.c:932 #, c-format @@ -3848,39 +3783,34 @@ msgstr "Nem található címke" #: ../src/treeviews.c:365 -#, fuzzy msgid "Sort by _Name" -msgstr "Rendezés névre" +msgstr "Rendezés _név alapján" #: ../src/treeviews.c:372 -#, fuzzy msgid "Sort by _Appearance" -msgstr "Rendezés megjelenésre" +msgstr "Rendezés megjelenés _alapján" #: ../src/treeviews.c:383 ../src/treeviews.c:470 -#, fuzzy msgid "Show S_ymbol List" -msgstr "Szimbólum lista megjelenítése" +msgstr "S_zimbólum lista megjelenítése" #: ../src/treeviews.c:389 ../src/treeviews.c:476 -#, fuzzy msgid "Show _Document List" -msgstr "Megnyitott fájlok listájának megjelenítése" +msgstr "Megnyitott fájlok listájának me_gjelenítése" #: ../src/treeviews.c:395 ../src/treeviews.c:482 ../plugins/filebrowser.c:543 -#, fuzzy msgid "H_ide Sidebar" -msgstr "Oldalsáv elrejtése" +msgstr "Oldalsáv e_lrejtése" #: ../src/treeviews.c:460 msgid "Show _Full Path Name" -msgstr "" +msgstr "Teljes _elérési út megjelenítése" #. Status bar statistics: col = column, sel = selection. #: ../src/ui_utils.c:146 #, c-format msgid "line: %d\t col: %d\t sel: %d\t " -msgstr "" +msgstr "sor: %d\t osz.: %d\t kij.: %d\t " #: ../src/ui_utils.c:151 msgid "RO " @@ -3897,11 +3827,11 @@ #: ../src/ui_utils.c:155 msgid "TAB" -msgstr "" +msgstr "TAB" #: ../src/ui_utils.c:155 msgid "SP " -msgstr "" +msgstr "SP " #: ../src/ui_utils.c:171 msgid "MOD" @@ -3933,9 +3863,8 @@ msgstr "C++ STL" #: ../src/ui_utils.c:519 -#, fuzzy msgid "_Set Custom Date Format" -msgstr "Egyedi dátum formátum megadása" +msgstr "Egyedi dátumformátum megadása" #: ../src/ui_utils.c:1344 msgid "Select Folder" @@ -3963,14 +3892,12 @@ msgstr "Terminál" #: ../src/vte.c:479 -#, fuzzy msgid "Set Path From Document" -msgstr "Baloldali dokumentumra kapcsol" +msgstr "Könyvtárváltás dokumentum alapján" #: ../src/vte.c:484 -#, fuzzy msgid "Restart Terminal" -msgstr "Terminál" +msgstr "Terminál újraindítása" #: ../src/vte.c:495 msgid "_Input Methods" @@ -3980,7 +3907,7 @@ msgid "" "Could not change the directory in the VTE because it probably contains a " "command." -msgstr "" +msgstr "Nem sikerült könyvtárat váltani a VTE-n belül, mert az feltehetően egy parancsot tartalmaz." #: ../src/vte.c:646 msgid "Terminal plugin" @@ -4072,12 +3999,11 @@ #: ../src/vte.c:763 msgid "Override Geany keybindings" -msgstr "" +msgstr "Geany billentyű-hozzárendelések felülbírálata" #: ../src/vte.c:765 -msgid "" -"Allows the VTE to receive keyboard shortcuts (apart from focus commands)." -msgstr "" +msgid "Allows the VTE to receive keyboard shortcuts (apart from focus commands)." +msgstr "Engedélyezi, hogy a VTE billentyűparancsokat fogadjon (a fókusz parancsokon kívül)." #: ../src/vte.c:769 msgid "Disable menu shortcut key (F10 by default)" @@ -4107,13 +4033,13 @@ #. use the object for the toggled handler of check_skip_script checkbox #: ../src/vte.c:781 msgid "Don't use run script" -msgstr "" +msgstr "Ne használjon futtató parancsfájlt" #: ../src/vte.c:782 msgid "" "Don't use the simple run script which is usually used to display the exit " "status of the executed program." -msgstr "" +msgstr "Ne használa az egyszerű futtató parancsfájlt, amit általában használunk a végrehajtott program kilépési állapotának megjelenítésére." #: ../src/vte.c:786 msgid "Execute programs in VTE" @@ -4162,9 +4088,8 @@ #: ../plugins/classbuilder.c:43 ../plugins/htmlchars.c:41 #: ../plugins/export.c:45 ../plugins/vcdiff.c:46 ../plugins/filebrowser.c:49 #: ../plugins/autosave.c:41 -#, fuzzy msgid "The Geany developer team" -msgstr "A fejlesztő neve" +msgstr "A Geany fejlesztői csapat" #: ../plugins/classbuilder.c:355 msgid "Create Class" @@ -4227,12 +4152,10 @@ msgstr "O_stály létrehozása" #: ../plugins/classbuilder.c:787 -#, fuzzy msgid "C++ Class" msgstr "C++ osztály" #: ../plugins/classbuilder.c:790 -#, fuzzy msgid "GTK+ Class" msgstr "GTK+ osztály" @@ -4323,8 +4246,7 @@ msgstr "Jelenlegi _nagyítás használata" #: ../plugins/export.c:190 -msgid "" -"Renders the font size of the document together with the current zoom level." +msgid "Renders the font size of the document together with the current zoom level." msgstr "" "A dokumentum fontméretét a jelenlegi nagyítás mértékének megfelelően " "jeleníti meg." @@ -4355,15 +4277,15 @@ #: ../plugins/vcdiff.c:45 msgid "VC Diff" -msgstr "" +msgstr "VC Diff" #: ../plugins/vcdiff.c:45 msgid "Creates a patch of a file against version control." -msgstr "" +msgstr "Folt létrehozása a fájlból a verziókövető rendszer alapján." #: ../plugins/vcdiff.c:303 msgid "Could not parse the output of the diff" -msgstr "" +msgstr "Nem sikerült a diff parancs kimenetét feldolgozni" #: ../plugins/vcdiff.c:343 #, c-format @@ -4371,100 +4293,92 @@ "%s exited with an error: \n" "%s." msgstr "" +"%s kilépett hibával: \n" +"%s." #: ../plugins/vcdiff.c:351 msgid "No changes were made." -msgstr "" +msgstr "Nem történt változtatás." #: ../plugins/vcdiff.c:357 msgid "Something went really wrong." -msgstr "" +msgstr "Valami komolyan elromlott." #: ../plugins/vcdiff.c:484 msgid "_VCdiff" -msgstr "" +msgstr "_VCdiff" #. Single file #: ../plugins/vcdiff.c:494 -#, fuzzy msgid "From Current _File" -msgstr "Hiba a fájl mentésekor." +msgstr "Jelenlegi _fájl alapján" #: ../plugins/vcdiff.c:497 -#, fuzzy msgid "Make a diff from the current active file" -msgstr "A jelenlegi fájl mentése" +msgstr "Diff létrehozása a jelenlegi aktív fájlból" #. Directory #: ../plugins/vcdiff.c:503 -#, fuzzy msgid "From Current _Directory" -msgstr "Projekt megnyitása" +msgstr "Jelenlegi _könyvtár alapján" #: ../plugins/vcdiff.c:506 -#, fuzzy msgid "Make a diff from the directory of the current active file" -msgstr "A jelenlegi fájl mentése" +msgstr "Diff létrehozása a jelenlegi aktív fájl könyvtára alapján" #. Project #: ../plugins/vcdiff.c:512 -#, fuzzy msgid "From Current _Project" -msgstr "Projekt megnyitása" +msgstr "Jelenlegi _projekt alapján" #: ../plugins/vcdiff.c:515 -#, fuzzy msgid "Make a diff from the current project's base path" -msgstr "A jelenlegi fájl mentése" +msgstr "Diff létrehozása a jelenlegi projekt alapkönyvtára alapján" #: ../plugins/filebrowser.c:48 ../plugins/filebrowser.c:838 -#, fuzzy msgid "File Browser" -msgstr "Böngésző:" +msgstr "Fájlböngésző" #: ../plugins/filebrowser.c:48 msgid "Adds a file browser tab to the sidebar." -msgstr "" +msgstr "Az oldalsávon megjelenít egy fájlböngészőt." #: ../plugins/filebrowser.c:276 msgid "Too many items selected!" -msgstr "" +msgstr "Túl sok elem került kiválasztásra!" #: ../plugins/filebrowser.c:360 #, c-format msgid "Could not execute configured external command '%s' (%s)." -msgstr "" +msgstr "Nem sikerült végrehajtani a beállított '%s' külső parancsot (%s)." #: ../plugins/filebrowser.c:513 msgid "Open _externally" -msgstr "" +msgstr "Külső m_egnyitás" #: ../plugins/filebrowser.c:523 -#, fuzzy msgid "_Find in Files" -msgstr "Keresés fájlokban" +msgstr "Keresés _fájlokban" #: ../plugins/filebrowser.c:534 -#, fuzzy msgid "Show _Hidden Files" -msgstr "_Rejtett fájlokat is megjeleníti" +msgstr "_Rejtett fájlok megjelenítése" #: ../plugins/filebrowser.c:686 msgid "Up" -msgstr "" +msgstr "Fel" #: ../plugins/filebrowser.c:692 msgid "Refresh" -msgstr "" +msgstr "Frissítés" #: ../plugins/filebrowser.c:698 msgid "Home" -msgstr "" +msgstr "Saját könyvtár" #: ../plugins/filebrowser.c:704 -#, fuzzy msgid "Set path from document" -msgstr "Baloldali dokumentumra kapcsol" +msgstr "Könyvtárváltás a dokumentum alapján" #: ../plugins/filebrowser.c:854 #, c-format @@ -4475,50 +4389,48 @@ "%d will be replaced with the path name of the selected file without the " "filename" msgstr "" +"A parancs, amit a \"Megnyitás mint\" használ. Megadásakor a %f és %d helyettesítők is használhatók.\n" +"A %f helyére a fájlnév kerül, teljes elérési úttal.\n" +"A %d helyére a kiválasztott fájl elérési útja kerül, a fájlnév nélkül." #: ../plugins/filebrowser.c:860 -#, fuzzy msgid "Show hidden files" -msgstr "_Rejtett fájlokat is megjeleníti" +msgstr "Rejtett fájlokat is megjeleníti" #: ../plugins/filebrowser.c:865 -#, fuzzy msgid "Hide object files" -msgstr "Projekt fájlok" +msgstr "Objektum fájlok elrejtése" #: ../plugins/filebrowser.c:869 msgid "" "Don't show generated object files in the file browser, this includes *.o, *." "obj. *.so, *.dll, *.a, *.lib" -msgstr "" +msgstr "Ne mutassa a fájl kiválasztó panelen a generált objektum fájlokat (*.o, *.obj, *.so, *.dll, *.a, *.lib)" #: ../plugins/filebrowser.c:898 ../plugins/autosave.c:179 -#, fuzzy msgid "Plugin configuration directory could not be created." -msgstr "A konfigurációs könyvtárat nem lehetett létrehozni (%s)." +msgstr "A bővítmény konfigurációs könyvtárat nem lehetett létrehozni." #: ../plugins/autosave.c:40 ../plugins/autosave.c:118 -#, fuzzy msgid "Auto Save" -msgstr "Ment" +msgstr "Automatikus mentés" #: ../plugins/autosave.c:40 msgid "Save automatically all open files in a given time interval." -msgstr "" +msgstr "Automatikusan elment minden megnyitott fájlt megadott időszakonként." #: ../plugins/autosave.c:76 #, c-format msgid "Autosave: Saved %d files automatically." -msgstr "" +msgstr "Automatikus mentés: %d fájl automatikusan mentve." #: ../plugins/autosave.c:141 msgid "Print status message if files have been automatcally saved" -msgstr "" +msgstr "Írjon ki állapot üzenetet, ha automatikusan mentett fájlokat." #: ../plugins/autosave.c:147 -#, fuzzy msgid "Save only current open file" -msgstr "A jelenlegi fájl mentése" +msgstr "Csak az aktuális megnyitott fájlt mentse" #~ msgid "Mixins" #~ msgstr "Kevert" @@ -4685,3 +4597,4 @@ #, fuzzy #~ msgid "From _directory" #~ msgstr "_Könyvtár:" + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [2190] trunk
by ntrel＠users.sourceforge.net 25 Jan '08

25 Jan '08

Revision: 2190 http://geany.svn.sourceforge.net/geany/?rev=2190&view=rev Author: ntrel Date: 2008-01-25 05:14:38 -0800 (Fri, 25 Jan 2008) Log Message: ----------- Close any project before closing all documents so the project session files are saved. Modified Paths: -------------- trunk/ChangeLog trunk/src/callbacks.c trunk/src/main.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-01-25 13:09:14 UTC (rev 2189) +++ trunk/ChangeLog 2008-01-25 13:14:38 UTC (rev 2190) @@ -2,6 +2,9 @@ * src/project.c: Remove unnecessary save of project keyfile. + * src/callbacks.c, src/main.c: + Close any project before closing all documents so the project + session files are saved. 2008-01-23 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2008-01-25 13:09:14 UTC (rev 2189) +++ trunk/src/callbacks.c 2008-01-25 13:14:38 UTC (rev 2190) @@ -145,14 +145,17 @@ configuration_save(); - // force close all tabs + // ignore changes for all tabs (already asked user in on_exit_clicked) for (i = 0; i < doc_array->len; i++) { if (doc_list[i].is_valid && doc_list[i].changed) { - doc_list[i].changed = FALSE; // ignore changes (already asked user in on_exit_clicked) + doc_list[i].changed = FALSE; } } + if (app->project != NULL) + project_close(FALSE); // save project session files + on_close_all1_activate(NULL, NULL); main_quit(); Modified: trunk/src/main.c =================================================================== --- trunk/src/main.c 2008-01-25 13:09:14 UTC (rev 2189) +++ trunk/src/main.c 2008-01-25 13:14:38 UTC (rev 2190) @@ -839,9 +839,6 @@ socket_finalize(); #endif - if (app->project != NULL) - project_close(FALSE); - #ifdef HAVE_PLUGINS if (want_plugins) plugins_free(); 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 January 2008