Commits

commits@lists.geany.org

1 participants
11750 discussions

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

29 Jun '06

Revision: 503 Author: ntrel Date: 2006-06-29 09:55:29 -0700 (Thu, 29 Jun 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=503&view=rev Log Message: ----------- Apply fonts in Preferences when they are set and only if they have changed. Rename utils_set_font to utils_set_editor_font. Remove an old comment in document_open_file. Modified Paths: -------------- trunk/ChangeLog trunk/src/callbacks.c trunk/src/document.c trunk/src/prefs.c trunk/src/utils.c trunk/src/utils.h trunk/src/win32.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-06-29 14:00:09 UTC (rev 502) +++ trunk/ChangeLog 2006-06-29 16:55:29 UTC (rev 503) @@ -1,3 +1,11 @@ +2006-06-29 Nick Treleaven <nick.treleaven(a)btinternet.com> + + * src/utils.c, src/utils.h, src/win32.c, src/callbacks.c, + src/document.c, src/prefs.c: + Apply fonts in Preferences when they are set and only if they have + changed. Rename utils_set_font to utils_set_editor_font. + + 2006-06-29 Enrico Tröger <enrico.troeger(a)uvena.de> * src/geany.h, src/build.c, src/callbacks.c, src/keyfile.c, Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2006-06-29 14:00:09 UTC (rev 502) +++ trunk/src/callbacks.c 2006-06-29 16:55:29 UTC (rev 503) @@ -932,11 +932,12 @@ on_font_apply_button_clicked (GtkButton *button, gpointer user_data) { - g_free(app->editor_font); - app->editor_font = g_strdup( - gtk_font_selection_dialog_get_font_name(GTK_FONT_SELECTION_DIALOG(app->open_fontsel))); + gchar *fontname; - utils_set_font(); + fontname = gtk_font_selection_dialog_get_font_name( + GTK_FONT_SELECTION_DIALOG(app->open_fontsel)); + utils_set_editor_font(fontname); + g_free(fontname); } Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2006-06-29 14:00:09 UTC (rev 502) +++ trunk/src/document.c 2006-06-29 16:55:29 UTC (rev 503) @@ -546,8 +546,6 @@ utils_update_recent_menu(); } - // currently status messages are overridden by update sci SCN_UPDATEUI message - // processing gtk messages first causes a segfault on closing & reloading utils.c if (reload) msgwin_status_add(_("File %s reloaded."), utf8_filename); else Modified: trunk/src/prefs.c =================================================================== --- trunk/src/prefs.c 2006-06-29 14:00:09 UTC (rev 502) +++ trunk/src/prefs.c 2006-06-29 16:55:29 UTC (rev 503) @@ -450,20 +450,7 @@ utils_widget_show_hide(lookup_widget(app->window, "toolbutton25"), app->pref_main_show_goto); utils_widget_show_hide(lookup_widget(app->window, "separatortoolitem5"), app->pref_main_show_goto); utils_treeviews_showhide(); - for (i = 0; i < GEANY_MAX_OPEN_FILES; i++) - { - if (doc_list[i].is_valid && GTK_IS_WIDGET(doc_list[i].tag_tree)) - gtk_widget_modify_font(doc_list[i].tag_tree, pango_font_description_from_string(app->tagbar_font)); - } - if (GTK_IS_WIDGET(app->default_tag_tree)) - gtk_widget_modify_font(app->default_tag_tree, pango_font_description_from_string(app->tagbar_font)); - gtk_widget_modify_font(lookup_widget(app->window, "entry1"), pango_font_description_from_string(app->tagbar_font)); - gtk_widget_modify_font(msgwindow.tree_compiler, pango_font_description_from_string(app->msgwin_font)); - gtk_widget_modify_font(msgwindow.tree_msg, pango_font_description_from_string(app->msgwin_font)); - gtk_widget_modify_font(msgwindow.tree_status, pango_font_description_from_string(app->msgwin_font)); - utils_set_font(); - // re-colorize all open documents, if tab width or long line settings have changed /* if ((app->pref_editor_tab_width != old_tab_width) || (! utils_strcmp(app->long_line_color, old_long_line_color)) || @@ -539,32 +526,55 @@ void on_prefs_font_choosed(GtkFontButton *widget, gpointer user_data) { + const gchar *fontbtn = gtk_font_button_get_font_name(widget); + gint i; + switch (GPOINTER_TO_INT(user_data)) { case 1: { + if (strcmp(fontbtn, app->tagbar_font) == 0) break; g_free(app->tagbar_font); - app->tagbar_font = g_strdup(gtk_font_button_get_font_name(widget)); + app->tagbar_font = g_strdup(fontbtn); + for (i = 0; i < GEANY_MAX_OPEN_FILES; i++) + { + if (doc_list[i].is_valid && GTK_IS_WIDGET(doc_list[i].tag_tree)) + gtk_widget_modify_font(doc_list[i].tag_tree, + pango_font_description_from_string(app->tagbar_font)); + } + if (GTK_IS_WIDGET(app->default_tag_tree)) + gtk_widget_modify_font(app->default_tag_tree, + pango_font_description_from_string(app->tagbar_font)); + gtk_widget_modify_font(lookup_widget(app->window, "entry1"), + pango_font_description_from_string(app->tagbar_font)); break; } case 2: { + if (strcmp(fontbtn, app->msgwin_font) == 0) break; g_free(app->msgwin_font); - app->msgwin_font = g_strdup(gtk_font_button_get_font_name(widget)); + app->msgwin_font = g_strdup(fontbtn); + gtk_widget_modify_font(msgwindow.tree_compiler, + pango_font_description_from_string(app->msgwin_font)); + gtk_widget_modify_font(msgwindow.tree_msg, + pango_font_description_from_string(app->msgwin_font)); + gtk_widget_modify_font(msgwindow.tree_status, + pango_font_description_from_string(app->msgwin_font)); break; } case 3: { - g_free(app->editor_font); - app->editor_font = g_strdup(gtk_font_button_get_font_name(widget)); + utils_set_editor_font(fontbtn); break; } #ifdef HAVE_VTE case 4: { // VTE settings + if (strcmp(fontbtn, vc->font) == 0) break; g_free(vc->font); vc->font = g_strdup(gtk_font_button_get_font_name(widget)); + vte_apply_user_settings(); break; } #endif Modified: trunk/src/utils.c =================================================================== --- trunk/src/utils.c 2006-06-29 14:00:09 UTC (rev 502) +++ trunk/src/utils.c 2006-06-29 16:55:29 UTC (rev 503) @@ -355,12 +355,20 @@ -void utils_set_font(void) +void utils_set_editor_font(const gchar *font_name) { gint i, size; gchar *fname; PangoFontDescription *font_desc; + g_return_if_fail(font_name != NULL); + // do nothing if font has not changed + if (app->editor_font != NULL) + if (strcmp(font_name, app->editor_font) == 0) return; + + g_free(app->editor_font); + app->editor_font = g_strdup(font_name); + font_desc = pango_font_description_from_string(app->editor_font); fname = g_strdup_printf("!%s", pango_font_description_get_family(font_desc)); Modified: trunk/src/utils.h =================================================================== --- trunk/src/utils.h 2006-06-29 14:00:09 UTC (rev 502) +++ trunk/src/utils.h 2006-06-29 16:55:29 UTC (rev 503) @@ -57,7 +57,7 @@ /* This sets the window title according to the current filename. */ void utils_set_window_title(gint index); -void utils_set_font(void); +void utils_set_editor_font(const gchar *font_name); const GList *utils_get_tag_list(gint idx, guint tag_types); Modified: trunk/src/win32.c =================================================================== --- trunk/src/win32.c 2006-06-29 14:00:09 UTC (rev 502) +++ trunk/src/win32.c 2006-06-29 16:55:29 UTC (rev 503) @@ -290,9 +290,10 @@ } else { - g_free(app->editor_font); - app->editor_font = g_strdup_printf("%s %d", lf.lfFaceName, (cf.iPointSize / 10)); - utils_set_font(); + gchar *editorfont = g_strdup_printf("%s %d", lf.lfFaceName, + (cf.iPointSize / 10)); + utils_set_editor_font(editorfont); + g_free(editorfont); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

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

29 Jun '06

Revision: 502 Author: eht16 Date: 2006-06-29 07:00:09 -0700 (Thu, 29 Jun 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=502&view=rev Log Message: ----------- Renamed tools settings from build_* in tools_*. Modified Paths: -------------- trunk/ChangeLog trunk/src/build.c trunk/src/callbacks.c trunk/src/geany.h trunk/src/keyfile.c trunk/src/prefs.c trunk/src/utils.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-06-28 19:27:19 UTC (rev 501) +++ trunk/ChangeLog 2006-06-29 14:00:09 UTC (rev 502) @@ -1,3 +1,10 @@ +2006-06-29 Enrico Tröger <enrico.troeger(a)uvena.de> + + * src/geany.h, src/build.c, src/callbacks.c, src/keyfile.c, + src/utils.c, src/prefs.c: + Renamed tools settings from build_* in tools_*. + + 2006-06-28 Enrico Tröger <enrico.troeger(a)uvena.de> * src/utils.c, src/keyfile.c: Fixed weird behaviour of the recent Modified: trunk/src/build.c =================================================================== --- trunk/src/build.c 2006-06-28 19:27:19 UTC (rev 501) +++ trunk/src/build.c 2006-06-29 14:00:09 UTC (rev 502) @@ -53,9 +53,9 @@ gchar **argv; if (idx < 0 || doc_list[idx].file_name == NULL) return (GPid) 1; - + argv = g_new0(gchar*, 2); - argv[0] = (mode == 0) ? g_strdup(doc_list[idx].file_type->programs->compiler) : + argv[0] = (mode == 0) ? g_strdup(doc_list[idx].file_type->programs->compiler) : g_strdup(doc_list[idx].file_type->programs->linker); argv[1] = NULL; @@ -95,11 +95,11 @@ } // replace %f and %e in the run_cmd string - cmd_string = g_strdup((mode == 0) ? g_strdup(doc_list[idx].file_type->programs->run_cmd) : + cmd_string = g_strdup((mode == 0) ? g_strdup(doc_list[idx].file_type->programs->run_cmd) : g_strdup(doc_list[idx].file_type->programs->run_cmd2)); cmd_string = utils_str_replace(cmd_string, "%f", view_file); cmd_string = utils_str_replace(cmd_string, "%e", executable); - + // try convert in locale locale_cmd_string = g_locale_from_utf8(cmd_string, -1, NULL, NULL, NULL); if (locale_cmd_string == NULL) locale_cmd_string = g_strdup(view_file); @@ -141,17 +141,17 @@ gchar **argv; if (idx < 0 || doc_list[idx].file_name == NULL) return (GPid) 1; - + argv = g_new0(gchar*, 3); if (cust_target && app->build_make_custopt) { //cust-target - argv[0] = g_strdup(app->build_make_cmd); + argv[0] = g_strdup(app->tools_make_cmd); argv[1] = g_strdup(app->build_make_custopt); argv[2] = NULL; } else { - argv[0] = g_strdup(app->build_make_cmd); + argv[0] = g_strdup(app->tools_make_cmd); argv[1] = g_strdup("all"); argv[2] = NULL; } @@ -240,7 +240,7 @@ app->cur_idx = idx; document_clear_indicators(idx); - + cmd_string = g_strjoinv(" ", cmd); g_strfreev(cmd); @@ -248,7 +248,7 @@ if (locale_filename == NULL) locale_filename = g_strdup(doc_list[idx].file_name); executable = utils_remove_ext_from_filename(locale_filename); - + // replace %f and %e in the command string tmp = g_path_get_basename(locale_filename); cmd_string = utils_str_replace(cmd_string, "%f", tmp); @@ -257,7 +257,7 @@ cmd_string = utils_str_replace(cmd_string, "%e", tmp); g_free(tmp); g_free(executable); - + utf8_cmd_string = g_locale_to_utf8(cmd_string, -1, NULL, NULL, NULL); if (utf8_cmd_string == NULL) utf8_cmd_string = g_strdup(cmd_string); @@ -323,18 +323,18 @@ struct stat st; if (idx < 0 || doc_list[idx].file_name == NULL) return (GPid) 1; - + script_name = g_strdup("./geany_run_script.sh"); locale_filename = g_locale_from_utf8(doc_list[idx].file_name, -1, NULL, NULL, NULL); if (locale_filename == NULL) locale_filename = g_strdup(doc_list[idx].file_name); - locale_term_cmd = g_locale_from_utf8(app->build_term_cmd, -1, NULL, NULL, NULL); - if (locale_term_cmd == NULL) locale_term_cmd = g_strdup(app->build_term_cmd); + locale_term_cmd = g_locale_from_utf8(app->tools_term_cmd, -1, NULL, NULL, NULL); + if (locale_term_cmd == NULL) locale_term_cmd = g_strdup(app->tools_term_cmd); // split the term_cmd, so arguments will work too term_argv = g_strsplit(locale_term_cmd, " ", -1); term_argv_len = g_strv_length(term_argv); - + long_executable = utils_remove_ext_from_filename(locale_filename); // only check for existing executable, if executable is required by %e @@ -345,7 +345,7 @@ check_executable = g_strconcat(long_executable, ".class", NULL); else check_executable = g_strdup(long_executable); - + // check whether executable exists if (stat(check_executable, &st) != 0) { @@ -356,14 +356,14 @@ goto free_strings; } } - + // check if terminal path is set (to prevent misleading error messages) if (stat(term_argv[0], &st) != 0) { msgwin_status_add( _("Could not find terminal '%s' " - "(check path for Terminal tool setting in Preferences)"), app->build_term_cmd); + "(check path for Terminal tool setting in Preferences)"), app->tools_term_cmd); result_id = (GPid) 1; goto free_strings; } @@ -376,13 +376,13 @@ gchar *utf8_working_dir = NULL; utf8_working_dir = g_locale_to_utf8(working_dir, -1, NULL, NULL, NULL); if (utf8_working_dir == NULL) utf8_working_dir = g_strdup(working_dir); - + msgwin_status_add(_("Failed to change the working directory to %s"), working_dir); result_id = (GPid) 1; // return 1, to prevent error handling of the caller g_free(utf8_working_dir); goto free_strings; } - + // replace %f and %e in the run_cmd string cmd = g_strdup(doc_list[idx].file_type->programs->run_cmd); tmp = g_path_get_basename(locale_filename); Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2006-06-28 19:27:19 UTC (rev 501) +++ trunk/src/callbacks.c 2006-06-29 14:00:09 UTC (rev 502) @@ -128,9 +128,9 @@ g_free(app->pref_template_mail); g_free(app->pref_template_initial); g_free(app->pref_template_version); - g_free(app->build_make_cmd); - g_free(app->build_term_cmd); - g_free(app->build_browser_cmd); + g_free(app->tools_make_cmd); + g_free(app->tools_term_cmd); + g_free(app->tools_browser_cmd); while (! g_queue_is_empty(app->recent_queue)) { g_free(g_queue_pop_tail(app->recent_queue)); @@ -504,7 +504,7 @@ gchar *basename; if (idx == -1 || ! doc_list[idx].is_valid || doc_list[idx].file_name == NULL) return; - + basename = g_path_get_basename(doc_list[idx].file_name); if (dialogs_show_question(_ ("Are you sure you want to reload '%s'?\nAny unsaved changes will be lost."), @@ -2409,7 +2409,7 @@ { gint idx = document_get_cur_idx(); guint i = GPOINTER_TO_INT(user_data); - + if (idx < 0 || encodings[i].charset == NULL) return; g_free(doc_list[idx].encoding); Modified: trunk/src/geany.h =================================================================== --- trunk/src/geany.h 2006-06-28 19:27:19 UTC (rev 501) +++ trunk/src/geany.h 2006-06-29 14:00:09 UTC (rev 502) @@ -181,9 +181,10 @@ gchar *search_text; gchar *terminal_settings; gchar build_make_custopt[256]; - gchar *build_browser_cmd; - gchar *build_make_cmd; - gchar *build_term_cmd; + gchar *tools_browser_cmd; + gchar *tools_make_cmd; + gchar *tools_term_cmd; + gchar *tools_print_cmd; GtkIconSize toolbar_icon_size; GtkWidget *toolbar; GtkWidget *run_button; Modified: trunk/src/keyfile.c =================================================================== --- trunk/src/keyfile.c 2006-06-28 19:27:19 UTC (rev 501) +++ trunk/src/keyfile.c 2006-06-29 14:00:09 UTC (rev 502) @@ -130,10 +130,10 @@ g_key_file_set_string(config, PACKAGE, "pref_template_initial", app->pref_template_initial); g_key_file_set_string(config, PACKAGE, "pref_template_version", app->pref_template_version); - // store build settings - g_key_file_set_string(config, "build", "build_make_cmd", app->build_make_cmd ? app->build_make_cmd : ""); - g_key_file_set_string(config, "build", "build_term_cmd", app->build_term_cmd ? app->build_term_cmd : ""); - g_key_file_set_string(config, "build", "build_browser_cmd", app->build_browser_cmd ? app->build_browser_cmd : ""); + // store tools settings + g_key_file_set_string(config, "tools", "make_cmd", app->tools_make_cmd ? app->tools_make_cmd : ""); + g_key_file_set_string(config, "tools", "terminal_cmd", app->tools_term_cmd ? app->tools_term_cmd : ""); + g_key_file_set_string(config, "tools", "browser_cmd", app->tools_browser_cmd ? app->tools_browser_cmd : ""); for (i = 0; i < app->mru_length; i++) { @@ -285,15 +285,15 @@ app->pref_editor_trail_space = utils_get_setting_boolean(config, PACKAGE, "pref_editor_trail_space", TRUE); tmp_string = g_find_program_in_path("make"); - app->build_make_cmd = utils_get_setting_string(config, "build", "build_make_cmd", tmp_string); + app->tools_make_cmd = utils_get_setting_string(config, "tools", "tools_make_cmd", tmp_string); g_free(tmp_string); tmp_string = g_find_program_in_path("xterm"); - app->build_term_cmd = utils_get_setting_string(config, "build", "build_term_cmd", tmp_string); + app->tools_term_cmd = utils_get_setting_string(config, "tools", "tools_term_cmd", tmp_string); g_free(tmp_string); tmp_string = g_find_program_in_path("mozilla"); - app->build_browser_cmd = utils_get_setting_string(config, "build", "build_browser_cmd", tmp_string); + app->tools_browser_cmd = utils_get_setting_string(config, "tools", "tools_browser_cmd", tmp_string); g_free(tmp_string); recent_files = g_key_file_get_string_list(config, "files", "recent_files", &len, NULL); Modified: trunk/src/prefs.c =================================================================== --- trunk/src/prefs.c 2006-06-28 19:27:19 UTC (rev 501) +++ trunk/src/prefs.c 2006-06-29 14:00:09 UTC (rev 502) @@ -176,14 +176,14 @@ gtk_widget_set_sensitive(lookup_widget(app->prefs_dialog, "entry_com_term"), FALSE); gtk_widget_set_sensitive(lookup_widget(app->prefs_dialog, "button_term"), FALSE); #else - if (app->build_make_cmd) - gtk_entry_set_text(GTK_ENTRY(lookup_widget(app->prefs_dialog, "entry_com_make")), app->build_make_cmd); + if (app->tools_make_cmd) + gtk_entry_set_text(GTK_ENTRY(lookup_widget(app->prefs_dialog, "entry_com_make")), app->tools_make_cmd); - if (app->build_term_cmd) - gtk_entry_set_text(GTK_ENTRY(lookup_widget(app->prefs_dialog, "entry_com_term")), app->build_term_cmd); + if (app->tools_term_cmd) + gtk_entry_set_text(GTK_ENTRY(lookup_widget(app->prefs_dialog, "entry_com_term")), app->tools_term_cmd); #endif - if (app->build_browser_cmd) - gtk_entry_set_text(GTK_ENTRY(lookup_widget(app->prefs_dialog, "entry_browser")), app->build_browser_cmd); + if (app->tools_browser_cmd) + gtk_entry_set_text(GTK_ENTRY(lookup_widget(app->prefs_dialog, "entry_browser")), app->tools_browser_cmd); // Template settings @@ -370,16 +370,16 @@ // Tools Settings widget = lookup_widget(app->prefs_dialog, "entry_com_make"); - g_free(app->build_make_cmd); - app->build_make_cmd = g_strdup(gtk_entry_get_text(GTK_ENTRY(widget))); + g_free(app->tools_make_cmd); + app->tools_make_cmd = g_strdup(gtk_entry_get_text(GTK_ENTRY(widget))); widget = lookup_widget(app->prefs_dialog, "entry_com_term"); - g_free(app->build_term_cmd); - app->build_term_cmd = g_strdup(gtk_entry_get_text(GTK_ENTRY(widget))); + g_free(app->tools_term_cmd); + app->tools_term_cmd = g_strdup(gtk_entry_get_text(GTK_ENTRY(widget))); widget = lookup_widget(app->prefs_dialog, "entry_browser"); - g_free(app->build_browser_cmd); - app->build_browser_cmd = g_strdup(gtk_entry_get_text(GTK_ENTRY(widget))); + g_free(app->tools_browser_cmd); + app->tools_browser_cmd = g_strdup(gtk_entry_get_text(GTK_ENTRY(widget))); // Template settings widget = lookup_widget(app->prefs_dialog, "entry_template_developer"); Modified: trunk/src/utils.c =================================================================== --- trunk/src/utils.c 2006-06-28 19:27:19 UTC (rev 501) +++ trunk/src/utils.c 2006-06-29 14:00:09 UTC (rev 502) @@ -60,7 +60,7 @@ #else const gchar *argv[3]; - argv[0] = app->build_browser_cmd; + argv[0] = app->tools_browser_cmd; argv[1] = uri; argv[2] = NULL; @@ -841,7 +841,7 @@ encoding_strings = utils_glist_from_string("UTF-8"); encodings = encodings_get_encodings(encoding_strings); utils_glist_strings_free(encoding_strings); - + if (g_get_charset((const gchar**)&locale_charset) == FALSE) { const GeanyEncoding *locale_encoding; @@ -1854,7 +1854,7 @@ "bitset", "dequev", "list", "map", "set", "queue", "stack", "vector", "algorithm", "iterator", "functional", "string", "complex", "valarray", NULL }; - + blank = gtk_menu_item_new_with_label("#include \"...\""); gtk_container_add(GTK_CONTAINER(menu_edit), blank); gtk_widget_show(blank); @@ -2340,7 +2340,7 @@ guint field_idx_line; // idx of the field where the line is guint field_idx_file; // idx of the field where the filename is guint skip_dot_slash = 0; // number of characters to skip at the beginning of the filename - + *filename = NULL; *line = -1; @@ -2394,7 +2394,7 @@ // the error output of python and tcl equals case GEANY_FILETYPES_TCL: case GEANY_FILETYPES_PYTHON: - { + { // File "HyperArch.py", line 37, in ? // (file "clrdial.tcl" line 12) pattern = " \""; @@ -2404,7 +2404,7 @@ break; } case GEANY_FILETYPES_PASCAL: - { + { // bandit.pas(149,3) Fatal: Syntax error, ";" expected but "ELSE" found // still untested with other files than the opened pattern = "("; @@ -2417,7 +2417,7 @@ } fields = g_strsplit_set(string, pattern, field_min_len); - + // parse the line if (g_strv_length(fields) < field_min_len) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

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

28 Jun '06

Revision: 501 Author: eht16 Date: 2006-06-28 12:27:19 -0700 (Wed, 28 Jun 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=501&view=rev Log Message: ----------- Fixed a small typo. Skip converting from UTF-8 in UTF-8 when saving. Show an error messages dialog if the conversion into an encoding failed. Modified Paths: -------------- trunk/ChangeLog trunk/src/document.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-06-28 15:18:23 UTC (rev 500) +++ trunk/ChangeLog 2006-06-28 19:27:19 UTC (rev 501) @@ -2,6 +2,11 @@ * src/utils.c, src/keyfile.c: Fixed weird behaviour of the recent files list. + * src/document.c: + Fixed a small typo. + Skip converting from UTF-8 in UTF-8 when saving. + Show an error messages dialog if the conversion into an encoding + failed. 2006-06-27 Enrico Troeger <enrico.troeger(a)uvena.de> Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2006-06-28 15:18:23 UTC (rev 500) +++ trunk/src/document.c 2006-06-28 19:27:19 UTC (rev 501) @@ -607,25 +607,26 @@ data = (gchar*) g_malloc(len); sci_get_text(doc_list[idx].sci, len, data); - // save in original encoding - if (doc_list[idx].encoding != NULL) + // save in original encoding , skip when it is already UTF-8) + if (doc_list[idx].encoding != NULL && ! utils_strcmp(doc_list[idx].encoding, "UTF-8")) { GError *conv_error = NULL; gchar* conv_file_contents = NULL; - + // try to convert it from UTF-8 to original encoding conv_file_contents = g_convert(data, -1, doc_list[idx].encoding, "UTF-8", NULL, NULL, &conv_error); if (conv_error != NULL) { - geany_debug("error while converting the file to its orinial encoding"); - geany_debug("encoding: %s error message: %s)", - doc_list[idx].encoding, conv_error->message); - g_free(doc_list[idx].encoding); - doc_list[idx].encoding = g_strdup("UTF-8"); - msgwin_status_add(_("Error while converting file (%s)."), conv_error->message); + dialogs_show_error( + _("An error occurred while converting the file from UTF-8 in \"%s\". The file remains unsaved." + "\nError message: %s\n"), + doc_list[idx].encoding, conv_error->message); + geany_debug("encoding error: %s)", conv_error->message); g_error_free(conv_error); + g_free(data); + return; } else { @@ -988,7 +989,7 @@ switch (sci_get_eol_mode(doc_list[idx].sci)) { case SC_EOL_CRLF: return _("Win (CRLF)"); break; - case SC_EOL_CR: return _("Max (CR)"); break; + case SC_EOL_CR: return _("Mac (CR)"); break; case SC_EOL_LF: default: return _("Unix (LF)"); break; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

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

28 Jun '06

Revision: 500 Author: eht16 Date: 2006-06-28 08:18:23 -0700 (Wed, 28 Jun 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=500&view=rev Log Message: ----------- Fixed weird behaviour of the recent files list. Modified Paths: -------------- trunk/ChangeLog trunk/src/keyfile.c trunk/src/utils.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-06-27 22:15:12 UTC (rev 499) +++ trunk/ChangeLog 2006-06-28 15:18:23 UTC (rev 500) @@ -1,3 +1,9 @@ +2006-06-28 Enrico Tröger <enrico.troeger(a)uvena.de> + + * src/utils.c, src/keyfile.c: Fixed weird behaviour of the recent + files list. + + 2006-06-27 Enrico Troeger <enrico.troeger(a)uvena.de> * data/filetypes.php, data/filetypes.pascal, src/callbacks.c, Modified: trunk/src/keyfile.c =================================================================== --- trunk/src/keyfile.c 2006-06-27 22:15:12 UTC (rev 499) +++ trunk/src/keyfile.c 2006-06-28 15:18:23 UTC (rev 500) @@ -55,8 +55,7 @@ if (!config_exists) { - gchar *start_comm = g_malloc(100); - g_snprintf(start_comm, 100, _("%s configuration file, edit as you need"), PACKAGE); + gchar *start_comm = g_strdup_printf(_("%s configuration file, edit as you need"), PACKAGE); g_key_file_set_comment(config, NULL, NULL, start_comm, NULL); g_free(start_comm); } @@ -140,11 +139,14 @@ { if (! g_queue_is_empty(app->recent_queue)) { - recent_files[i] = g_queue_pop_head(app->recent_queue); + // copy the values, this is necessary when this function is called from the + // preferences dialog or when quitting is canceled to keep the queue intact + recent_files[i] = g_strdup(g_queue_peek_nth(app->recent_queue, i)); } else { recent_files[i] = NULL; + break; } } // There is a bug in GTK2.6 g_key_file_set_string_list, we must NULL terminate. Modified: trunk/src/utils.c =================================================================== --- trunk/src/utils.c 2006-06-27 22:15:12 UTC (rev 499) +++ trunk/src/utils.c 2006-06-28 15:18:23 UTC (rev 500) @@ -131,7 +131,6 @@ line = sci_get_line_from_position(doc_list[idx].sci, pos); col = sci_get_col_from_position(doc_list[idx].sci, pos); - // currently text need in German and C locale about 150 chars text = g_strdup_printf(_("%c line: % 4d column: % 3d selection: % 4d %s mode: %s%s cur. function: %s encoding: %s filetype: %s"), (doc_list[idx].changed) ? 42 : 32, (line + 1), (col + 1), @@ -1929,7 +1928,7 @@ if (g_list_length(children) > app->mru_length) { children = g_list_nth(children, app->mru_length - 1); - while (children) + while (children != NULL) { if (GTK_IS_WIDGET(children->data)) gtk_widget_destroy(GTK_WIDGET(children->data)); children = g_list_next(children); @@ -1939,7 +1938,8 @@ filename = g_queue_peek_head(app->recent_queue); tmp = gtk_menu_item_new_with_label(filename); gtk_widget_show(tmp); - gtk_menu_shell_insert(GTK_MENU_SHELL(recent_menu), tmp, 0); + //gtk_menu_shell_insert(GTK_MENU_SHELL(recent_menu), tmp, 0); + gtk_container_add(GTK_CONTAINER(recent_menu), tmp); g_signal_connect((gpointer) tmp, "activate", G_CALLBACK(on_recent_file_activate), (gpointer) 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: [499] trunk/po/de.po
by kretek＠users.sourceforge.net 28 Jun '06

28 Jun '06

Revision: 499 Author: kretek Date: 2006-06-27 15:15:12 -0700 (Tue, 27 Jun 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=499&view=rev Log Message: ----------- Update because of some trouble with make update-po Modified Paths: -------------- trunk/po/de.po Modified: trunk/po/de.po =================================================================== --- trunk/po/de.po 2006-06-27 22:01:08 UTC (rev 498) +++ trunk/po/de.po 2006-06-27 22:15:12 UTC (rev 499) @@ -8,7 +8,7 @@ "Project-Id-Version: geany 0.7\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2006-06-27 23:28+0200\n" -"PO-Revision-Date: 2006-06-27 23:52+0100\n" +"PO-Revision-Date: 2006-06-28 00:12+0100\n" "Last-Translator: Frank Lanitz <frank(a)frank.uvena.de>\n" "Language-Team: German <frank(a)frank.uvena.de>\n" "MIME-Version: 1.0\n" @@ -20,728 +20,816 @@ "X-Poedit-SourceCharset: utf-8\n" "X-Poedit-Basepath: /home/frank/svn/geany/\n" -#: src/main.c:389 +#: src/main.c:73 +msgid "runs in debug mode (means being verbose)" +msgstr "Geany im Debug-Modus ausführen (Gesprächig!)" + +#: src/main.c:74 +msgid "don't load auto completion data (see documentation)" +msgstr "Autovervollständigungsdaten nicht laden " + +#: src/main.c:76 +msgid "don't open files in a running instance, force opening a new instance" +msgstr "" +"Dateien nicht in einer bereits laufenden Instanz, sondern in einer neuen " +"Instanz öffnen." + +#: src/main.c:78 +msgid "use an alternate configuration directory" +msgstr "Benutzt ein anderes Verzeichnis für die Konfigurationsdateien" + +#: src/main.c:79 +msgid "don't show message window at startup" +msgstr "Kein Meldungsfenster beim Starten anzeigen" + +#: src/main.c:81 +msgid "don't load terminal support" +msgstr "Die virtual terminal emulation (VTE) nicht starten" + +#: src/main.c:82 +msgid "filename of libvte.so" +msgstr "Name der libvte.so" + +#: src/main.c:84 +msgid "show version and exit" +msgstr "Versionsinformation anzeigen und Programm beenden" + +#: src/main.c:398 msgid "" -"Geany is exiting because a named pipe was found. Mostly this means, Geany is already running. If you know Geany is not running, you can delete the file and start Geany anyway.\n" +"Geany is exiting because a named pipe was found. Mostly this means, Geany is " +"already running. If you know Geany is not running, you can delete the file " +"and start Geany anyway.\n" "Delete the named pipe and start Geany?" msgstr "" -"Geany wird beendet, da ein FIFO (named pipe) gefunden wurde. Das bedeutet meistens, dass Geany bereits läuft. Wenn Sie genau wissen, dass Geany nicht läuft, können Sie die Datei löschen und Geany trotzdem starten.\n" +"Geany wird beendet, da ein FIFO (named pipe) gefunden wurde. Das bedeutet " +"meistens, dass Geany bereits läuft. Wenn Sie genau wissen, dass Geany nicht " +"läuft, können Sie die Datei löschen und Geany trotzdem starten.\n" "Die Datei löschen und Geany starten?" -#: src/main.c:429 +#: src/main.c:440 +msgid " - A fast and lightweight IDE" +msgstr " - Eine kleine und schnelle Entwicklungsumgebung" + +#: src/main.c:450 #, c-format msgid "(built on %s with GTK %d.%d.%d, GLib %d.%d.%d)" msgstr "(kompiliert am %s mit GTK %d.%d.%d, GLib %d.%d.%d)" -#: src/main.c:504 +#: src/main.c:523 #, c-format msgid "This is Geany %s." msgstr "Willkommen zu Geany %s." -#: src/main.c:506 +#: src/main.c:525 #, c-format msgid "Configuration directory could not be created (%s)." msgstr "Konfigurationsverzeichnis konnte nicht erstellt werden (%s)." -#: src/interface.c:210 -#: src/interface.c:1171 +#: src/interface.c:213 src/interface.c:1189 msgid "Geany" msgstr "Geany" -#: src/interface.c:220 +#: src/interface.c:223 msgid "_File" msgstr "_Datei" -#: src/interface.c:231 +#: src/interface.c:234 msgid "New (with _template)" msgstr "Neu (aus _Vorlage)" -#: src/interface.c:242 -#: src/interface.c:319 -#: src/interface.c:384 -#: src/interface.c:607 -#: src/interface.c:1556 +#: src/interface.c:245 src/interface.c:264 src/interface.c:382 +#: src/interface.c:605 src/interface.c:615 src/interface.c:1577 msgid "invisible" msgstr "invisible" -#: src/interface.c:267 -#: src/interface.c:709 +#: src/interface.c:257 +msgid "Recent _files" +msgstr "Zuletzt geöffnet" + +#: src/interface.c:280 src/interface.c:727 src/keybindings.c:113 msgid "Save all" msgstr "Alle speichern" -#: src/interface.c:270 +#: src/interface.c:283 msgid "Saves all open files" msgstr "Speichert alle offenen Dateien" -#: src/interface.c:298 +#: src/interface.c:311 msgid "C_lose all" msgstr "_Alle schließen" -#: src/interface.c:301 +#: src/interface.c:314 msgid "Closes all open files" msgstr "Schließt alle offenen Dateien" -#: src/interface.c:312 -msgid "Recent _files" -msgstr "Zuletzt geöffnet" - -#: src/interface.c:330 -#: src/interface.c:819 +#: src/interface.c:328 src/interface.c:834 msgid "Quit Geany" msgstr "Geany beenden" -#: src/interface.c:332 +#: src/interface.c:330 msgid "_Edit" msgstr "_Bearbeiten" -#: src/interface.c:373 -#: src/interface.c:1545 +#: src/interface.c:371 src/interface.c:1566 msgid "Insert \"include <...>\"" msgstr "\"include <...>\" einfügen" -#: src/interface.c:387 -#: src/interface.c:1559 +#: src/interface.c:385 src/interface.c:1580 msgid "Insert Comments" msgstr "Kommentare einfügen" -#: src/interface.c:398 -#: src/interface.c:1570 +#: src/interface.c:396 src/interface.c:1591 msgid "Insert ChangeLog entry" msgstr "ChangeLog-Eintrag hinzufügen" -#: src/interface.c:401 +#: src/interface.c:399 msgid "Inserts a typical ChangeLog entry in the current file" msgstr "Fügt einen typischen ChangeLog-Eintrag an den Anfang der Datei ein" -#: src/interface.c:403 -#: src/interface.c:1575 +#: src/interface.c:401 src/interface.c:1596 msgid "Insert file header" msgstr "Dateikopf einfügen" -#: src/interface.c:406 -#: src/interface.c:1578 +#: src/interface.c:404 src/interface.c:1599 msgid "Inserts a few information at the beginning of the file" msgstr "Fügt einen Dateiopf am Anfang einer neu erzeugten Datei ein" -#: src/interface.c:408 -#: src/interface.c:1580 +#: src/interface.c:406 src/interface.c:1601 msgid "Insert function description" msgstr "Funktionsbeschreibung einfügen" -#: src/interface.c:411 -#: src/interface.c:1583 +#: src/interface.c:409 src/interface.c:1604 msgid "Inserts a description before the current function" msgstr "Fügt eine Funktionsbeschreibung vor der Funktion ein." -#: src/interface.c:413 -#: src/interface.c:1585 +#: src/interface.c:411 src/interface.c:1606 msgid "Insert multiline comment" msgstr "Mehrzeiligen Kommentar einfügen" -#: src/interface.c:416 -#: src/interface.c:1588 +#: src/interface.c:414 src/interface.c:1609 msgid "Inserts a multiline comment" msgstr "Fügt einen mehrzeiligen Kommentar ein." -#: src/interface.c:418 -#: src/interface.c:1590 +#: src/interface.c:416 src/interface.c:1611 msgid "Insert GPL notice" msgstr "GPL-Hinweis am Dateianfang einfügen" -#: src/interface.c:421 -#: src/interface.c:1593 +#: src/interface.c:419 src/interface.c:1614 msgid "Inserts a GPL notice (should be done at the beginning of the file)" -msgstr "Fügt einen kurzen Lizenz-Hinweis auf die GPL am Anfang einer neu erzeugten Datei ein" +msgstr "" +"Fügt einen kurzen Lizenz-Hinweis auf die GPL am Anfang einer neu erzeugten " +"Datei ein" -#: src/interface.c:428 -#: src/interface.c:1600 +#: src/interface.c:426 src/interface.c:1621 msgid "Change Selection" msgstr "Auswahl verändern" -#: src/interface.c:435 -#: src/interface.c:1607 +#: src/interface.c:433 src/interface.c:1628 msgid "To lower-case" msgstr "In Kleinbuchstaben" -#: src/interface.c:439 -#: src/interface.c:1611 +#: src/interface.c:437 src/interface.c:1632 msgid "To upper-case" msgstr "In Großbuchstaben" -#: src/interface.c:443 +#: src/interface.c:441 msgid "_Count words" msgstr "Wörter _zählen" -#: src/interface.c:446 -msgid "Counts the words and characters in the current selection or the whole document" -msgstr "Zählt die Wörter und Zeichen in der aktuellen Auswahl bzw. dem aktuellen Dokument." +#: src/interface.c:444 +msgid "" +"Counts the words and characters in the current selection or the whole " +"document" +msgstr "" +"Zählt die Wörter und Zeichen in der aktuellen Auswahl bzw. dem aktuellen " +"Dokument." -#: src/interface.c:457 +#: src/interface.c:455 msgid "_Search" msgstr "_Suchen" -#: src/interface.c:468 +#: src/interface.c:466 msgid "Find _Next" msgstr "_Nächstes" -#: src/interface.c:472 +#: src/interface.c:470 msgid "Find _Previous" msgstr "_Vorheriges" -#: src/interface.c:476 -#: src/dialogs.c:908 +#: src/interface.c:474 src/dialogs.c:910 msgid "_Replace" msgstr "_Ersetzen" -#: src/interface.c:489 +#: src/interface.c:487 msgid "_Go to line" msgstr "Gehe zu _Zeile" -#: src/interface.c:497 -#: src/dialogs.c:72 +#: src/interface.c:495 src/dialogs.c:74 msgid "_View" msgstr "_Ansicht" -#: src/interface.c:504 +#: src/interface.c:502 msgid "Change _Font" msgstr "Schriftart _ändern" -#: src/interface.c:507 +#: src/interface.c:505 msgid "Change the default font" msgstr "Ändert die Standardschriftart für das Editor-Fenster" -#: src/interface.c:513 +#: src/interface.c:511 msgid "Show _Colour Chooser" msgstr "_Farbwähler öffnen" -#: src/interface.c:516 -#: src/interface.c:749 -msgid "Open a color chooser dialog, to interactively pick colors from a palette." -msgstr "Öffnet einen Farbauswahl-Dialog zum Auswählen einer Farbe von einer Palette." +#: src/interface.c:514 src/interface.c:773 +msgid "" +"Open a color chooser dialog, to interactively pick colors from a palette." +msgstr "" +"Öffnet einen Farbauswahl-Dialog zum Auswählen einer Farbe von einer Palette." -#: src/interface.c:527 +#: src/interface.c:525 msgid "Full_screen" msgstr "_Vollbild" -#: src/interface.c:531 +#: src/interface.c:529 msgid "Show Messages _Window" msgstr "_Meldungsfenster anzeigen" -#: src/interface.c:534 +#: src/interface.c:532 msgid "Toggle the window with status and compiler messages on and off" -msgstr "Schaltet das Meldungsfenster(beinhaltet auch Compiler-Ausgaben) ein und aus." +msgstr "" +"Schaltet das Meldungsfenster(beinhaltet auch Compiler-Ausgaben) ein und aus." -#: src/interface.c:537 +#: src/interface.c:535 msgid "Show _Toolbar" msgstr "_Werkzeugleiste anzeigen" -#: src/interface.c:540 +#: src/interface.c:538 msgid "Toggle the toolbar on and off" msgstr "Schaltet die Anzeige der Werkzeugleiste an und aus." -#: src/interface.c:543 +#: src/interface.c:541 msgid "Show _Markers Margin" msgstr "Markierungsrand anzeigen" -#: src/interface.c:546 -msgid "Shows or hides the small margin right of the line numbers, which is used to mark lines." -msgstr "Zeigt oder versteckt den kleinen Rand rechts von den Zeilennummern, der zum Anzeigen von Markierungen genutzt wird." +#: src/interface.c:544 +msgid "" +"Shows or hides the small margin right of the line numbers, which is used to " +"mark lines." +msgstr "" +"Zeigt oder versteckt den kleinen Rand rechts von den Zeilennummern, der zum " +"Anzeigen von Markierungen genutzt wird." -#: src/interface.c:549 +#: src/interface.c:547 msgid "Show _Line Numbers" msgstr "_Zeilennummern anzeigen" -#: src/interface.c:552 +#: src/interface.c:550 msgid "Shows or hides the Line Number margin." msgstr "Zeigt oder versteckt den Zeilennummernrand." -#: src/interface.c:572 +#: src/interface.c:570 msgid "_Document" msgstr "D_okument" -#: src/interface.c:579 +#: src/interface.c:577 msgid "_Line breaking" msgstr "Zeilen_umbruch" -#: src/interface.c:582 +#: src/interface.c:580 msgid "Break the line at the window border and continue it on the next line" msgstr "Zeilen am Fensterrand umbrechen und auf der nächsten Zeile fortsetzen." -#: src/interface.c:585 -msgid "Use auto indentation" -msgstr "Auto-Einrückung benutzen" +#: src/interface.c:583 +msgid "_Use auto indentation" +msgstr "_Auto-Einrückung benutzen" -#: src/interface.c:590 +#: src/interface.c:588 msgid "Read _only" msgstr "Schreibgeschützt" -#: src/interface.c:593 +#: src/interface.c:591 msgid "Treat this file as read-only. No changes can be made." msgstr "Datei als schreibgeschützt behandeln. Keine Änderungen möglich." -#: src/interface.c:600 +#: src/interface.c:598 msgid "Set filetype" msgstr "Dateityp festlegen" -#: src/interface.c:610 +#: src/interface.c:608 +msgid "Set encoding" +msgstr "Zeichenkodierung festlegen" + +#: src/interface.c:618 msgid "Line endings" msgstr "Zeilenenden" -#: src/interface.c:617 +#: src/interface.c:625 msgid "Convert and set to CR/LF (Win)" msgstr "Auf CR/LF setzen umwandeln (Win)" -#: src/interface.c:621 +#: src/interface.c:629 msgid "Convert and set to LF (Unix)" msgstr "Auf LF setzen und umwandeln (Unix)" -#: src/interface.c:625 +#: src/interface.c:633 msgid "Convert and set to CR (Mac)" msgstr "Auf CR setzen umwandeln (Mac)" -#: src/interface.c:634 +#: src/interface.c:642 msgid "_Replace tabs by space" msgstr "_Tabulatoren durch Leerzeichen ersetzen" -#: src/interface.c:637 +#: src/interface.c:645 src/interface.c:2264 msgid "Replaces all tabs in document by spaces." msgstr "Ersetzt alle Tabulatoren im Dokument durch Leerzeichen" -#: src/interface.c:644 +#: src/interface.c:652 msgid "_Fold all" msgstr "Alle _einklappen" -#: src/interface.c:647 +#: src/interface.c:655 msgid "Folds all contractible code blocks" msgstr "Klappt alle ausblendbaren Codeblöcke ein" -#: src/interface.c:649 +#: src/interface.c:657 msgid "_Unfold all" msgstr "Alle _ausklappen" -#: src/interface.c:652 +#: src/interface.c:660 msgid "Unfolds all contracted code blocks" msgstr "Klappt alle ausgeblendeten Codeblöcke wieder aus" -#: src/interface.c:654 +#: src/interface.c:667 +msgid "Remove all _indicators" +msgstr "Alle Markierungen löschen" + +#: src/interface.c:670 +msgid "Removes all set indicators in the current document." +msgstr "Entfernt alle gesetzten Markierungen innerhalb des Dokumentes." + +#. build the code +#: src/interface.c:672 src/dialogs.c:523 msgid "_Build" msgstr "_Erstellen" -#: src/interface.c:658 +#: src/interface.c:676 msgid "_Help" msgstr "_Hilfe" -#: src/interface.c:669 +#: src/interface.c:687 msgid "_Keyboard shortcuts" msgstr "_Tastenkürzel" -#: src/interface.c:672 +#: src/interface.c:690 msgid "Shows a list of all keyboard shortcuts for Geany." msgstr "Zeige eine Übersicht mit allen Tastenkürzeln für Geany." -#: src/interface.c:674 +#: src/interface.c:692 msgid "_Website" msgstr "_Webseite" -#: src/interface.c:697 +#: src/interface.c:715 msgid "Create a new file" msgstr "Neue Datei anlegen" -#: src/interface.c:702 +#: src/interface.c:720 msgid "Open an existing file" msgstr "Öffnet eine existierende Datei" -#: src/interface.c:707 +#: src/interface.c:725 msgid "Save the current file" msgstr "Speichert die aktuelle Datei" -#: src/interface.c:712 +#: src/interface.c:730 msgid "Save all open files" msgstr "Speichere alle offenen Dateien" -#: src/interface.c:717 +#: src/interface.c:739 msgid "Reload the current file from disk" msgstr "Liest die aktuelle Datei neu ein." -#: src/interface.c:722 +#: src/interface.c:744 msgid "Close the current file" msgstr "Schließt die aktuelle Datei" -#: src/interface.c:731 +#: src/interface.c:752 src/keybindings.c:153 +msgid "Compile" +msgstr "Kompilieren" + +#: src/interface.c:755 msgid "Compile the current file" msgstr "Kompiliert die aktuelle Datei" -#: src/interface.c:735 +#: src/interface.c:759 src/keybindings.c:161 msgid "Run" msgstr "Ausführen" -#: src/interface.c:738 -#: src/dialogs.c:560 +#: src/interface.c:762 src/dialogs.c:562 msgid "Run or view the current file" msgstr "Aktuelle Datei anzeigen oder ausführen" -#: src/interface.c:746 +#: src/interface.c:770 msgid "Color" msgstr "Farbwähler" -#: src/interface.c:758 +#: src/interface.c:782 msgid "Zoom in the text" msgstr "Text vergrößern" -#: src/interface.c:763 +#: src/interface.c:787 msgid "Zoom out the text" msgstr "Text verkleinern" -#: src/interface.c:776 -#: src/interface.c:781 +#: src/interface.c:800 src/interface.c:805 msgid "Find the entered text in the current file" msgstr "Findet den eingegebenen Text im aktuellen Dokument" -#: src/interface.c:794 +#: src/interface.c:818 msgid "Enter a line number and jump to it." msgstr "Geben Sie die Zeile an, zu der Sie springen möchten." -#: src/interface.c:801 +#: src/interface.c:825 msgid "Jump to the entered line number." msgstr "Springe zu angegebener Zeile" -#: src/interface.c:846 -#: src/treeviews.c:40 +#: src/interface.c:861 src/treeviews.c:40 msgid "Symbols" msgstr "Symbole" -#: src/interface.c:859 -#: src/treeviews.c:180 +#: src/interface.c:874 src/treeviews.c:207 msgid "Open files" msgstr "Geöffnete Dateien" -#: src/interface.c:894 +#: src/interface.c:909 msgid "Status" msgstr "Status" -#: src/interface.c:908 +#: src/interface.c:923 msgid "Compiler" msgstr "Compiler" -#: src/interface.c:922 +#: src/interface.c:937 msgid "Messages" msgstr "Meldungen" -#: src/interface.c:935 +#: src/interface.c:950 msgid "Scribble" msgstr "Notizen" -#: src/interface.c:1366 +#: src/interface.c:1387 msgid "Images and text" msgstr "Icons und Text" -#: src/interface.c:1372 +#: src/interface.c:1393 msgid "Images only" msgstr "Nur Icons" -#: src/interface.c:1378 +#: src/interface.c:1399 msgid "Text only" msgstr "Nur Text" -#: src/interface.c:1389 +#: src/interface.c:1410 msgid "Large icons" msgstr "Große Symbole" -#: src/interface.c:1393 +#: src/interface.c:1414 msgid "Small icons" msgstr "Kleine Symbole" -#: src/interface.c:1402 +#: src/interface.c:1423 msgid "Hide toolbar" msgstr "Toolbar verbergen" -#: src/interface.c:1573 +#: src/interface.c:1594 msgid "Inserts a typical ChangeLog entry in the current " msgstr "ChangeLog-Eintrag hinzufügen" -#: src/interface.c:1620 +#: src/interface.c:1641 msgid "Find usage" msgstr "Auftreten finden" -#: src/interface.c:1628 +#: src/interface.c:1649 src/keybindings.c:193 +msgid "Go to tag definition" +msgstr "Gehe zu Tag Definition" + +#: src/interface.c:1653 src/keybindings.c:195 msgid "Go to tag declaration" msgstr "Gehe zu Tag Deklaration" -#: src/interface.c:1632 -msgid "Go to tag definition" -msgstr "Gehe zu Tag Definition" - -#: src/interface.c:1641 -#: src/dialogs.c:763 +#: src/interface.c:1662 src/dialogs.c:765 src/keybindings.c:133 msgid "Go to line" msgstr "Gehe zu Zeile" -#: src/interface.c:1644 +#: src/interface.c:1665 msgid "Goto to the entered line" msgstr "Springe zu angegebener Zeile" -#: src/interface.c:1889 +#: src/interface.c:1916 src/keybindings.c:125 msgid "Preferences" msgstr "Einstellungen" -#: src/interface.c:1925 +#: src/interface.c:1952 msgid "Recent files list length:" msgstr "Anzahl der \"Zuletzt geöffneten\" Dateien" -#: src/interface.c:1933 -msgid "Specifies the number of files which are stored in the Recent files list." +#: src/interface.c:1960 +msgid "" +"Specifies the number of files which are stored in the Recent files list." msgstr "Gibt die Länge der Liste von Dateien an, die zuletzt geöffnet wurden." -#: src/interface.c:1937 +#: src/interface.c:1964 msgid "Load files from the last session" msgstr "Dateien aus der letzten Sitzung laden" -#: src/interface.c:1941 +#: src/interface.c:1968 msgid "Opens at startup the files from the last session" msgstr "Lädt die geöffneten Dateien aus der letzten Sitzung" -#: src/interface.c:1944 +#: src/interface.c:1971 msgid "Save window position and geometry" msgstr "Fensterposition und -größe speichern" -#: src/interface.c:1948 +#: src/interface.c:1975 msgid "Saves the window position and geometry and restores it at the start" msgstr "Speichert die Fensterposition und -größe" -#: src/interface.c:1951 +#: src/interface.c:1978 msgid "Beep on errors or when compilation has finished" msgstr "Bei Fehlern oder beendeter Kompilierung Piepton ausgeben" -#: src/interface.c:1954 -msgid "Whether to beep if an error occured or when the compilation process has finished." -msgstr "Soll bei Fehlern oder beendeter Kompilierung ein Piepton ausgegeben werden?" +#: src/interface.c:1981 +msgid "" +"Whether to beep if an error occured or when the compilation process has " +"finished." +msgstr "" +"Soll bei Fehlern oder beendeter Kompilierung ein Piepton ausgegeben werden?" -#: src/interface.c:1957 +#: src/interface.c:1984 msgid "Switch to status message list at new message" msgstr "Wechsele zum Statusmeldungsfenster bei neuer Meldung" -#: src/interface.c:1960 -msgid "Switch to the status message tab(in the notebook window at the bottom) if a new status message arrive." -msgstr "Automatisch zu dem Statusmeldungs-Reiter im unteren Fenster wechseln, wenn eine neue Statusmeldung vorliegt." +#: src/interface.c:1987 +msgid "" +"Switch to the status message tab(in the notebook window at the bottom) if a " +"new status message arrive." +msgstr "" +"Automatisch zu dem Statusmeldungs-Reiter im unteren Fenster wechseln, wenn " +"eine neue Statusmeldung vorliegt." -#: src/interface.c:1963 +#: src/interface.c:1990 msgid "Load virtual terminal emulation at startup" msgstr "Starte die Virtual Terminal Emulation beim Starten" -#: src/interface.c:1965 -msgid "Whether the virtual terminal emulation(VTE) should be loaded at startup. Disable it if you do not need it." -msgstr "Stellt ein, ob die Virtual Terminal Emulation beim Starten geladen werden soll oder nicht. Wenn sie nicht benötigt wird, sollte dieser Punkt deaktiviert werden" +#: src/interface.c:1992 +msgid "" +"Whether the virtual terminal emulation(VTE) should be loaded at startup. " +"Disable it if you do not need it." +msgstr "" +"Stellt ein, ob die Virtual Terminal Emulation beim Starten geladen werden " +"soll oder nicht. Wenn sie nicht benötigt wird, sollte dieser Punkt " +"deaktiviert werden" -#: src/interface.c:1968 +#: src/interface.c:1995 msgid "Confirm exit" msgstr "Beenden bestätigen" -#: src/interface.c:1972 +#: src/interface.c:1999 msgid "Shows a confirmation dialog on exit." msgstr "Zeigt einen Bestätigungsdialog vor dem Beenden." -#: src/interface.c:1979 +#: src/interface.c:2006 msgid "Placement of new file tabs: " msgstr "Platzierung neuer Dateien:" -#: src/interface.c:1983 +#: src/interface.c:2010 msgid "Left" msgstr "Links" -#: src/interface.c:1986 +#: src/interface.c:2013 msgid "New file tabs will be placed to the left of the tab list" msgstr "Neue Dateien werden links von der Datei-Liste platziert." -#: src/interface.c:1995 +#: src/interface.c:2022 msgid "Right" msgstr "Rechts" -#: src/interface.c:1998 +#: src/interface.c:2025 msgid "New file tabs will be placed to the right of the tab list" msgstr "Neue Dateien werden rechts von der Datei-Liste platziert." -#: src/interface.c:2002 -#: src/interface.c:2327 +#: src/interface.c:2029 src/interface.c:2384 msgid "Miscellaneous" msgstr "Verschiedenes" -#: src/interface.c:2026 +#: src/interface.c:2053 msgid "Show search field" msgstr "Zeige Such-Feld" -#: src/interface.c:2030 +#: src/interface.c:2057 msgid "Display the search field and button in the toolbar" msgstr "Zeige das Suchfeld in der Werkzeugleiste" -#: src/interface.c:2033 +#: src/interface.c:2060 msgid "Show goto line field" msgstr "Zeilennummereingabefeld anzeigen" -#: src/interface.c:2037 +#: src/interface.c:2064 msgid "Display the line number field and button in the toolbar" msgstr "Zeige das Zeilennummereingabefeld in der Werkzeugleiste" -#: src/interface.c:2040 +#: src/interface.c:2067 msgid "Toolbar" msgstr "Werkzeugleiste" -#: src/interface.c:2064 +#: src/interface.c:2091 msgid "Show symbol list" msgstr "Symbol-Ansicht anzeigen" -#: src/interface.c:2067 -#: src/interface.c:2073 +#: src/interface.c:2094 src/interface.c:2100 msgid "Toggle the symbol list on and off" msgstr "Schaltet die Symbol-Ansicht ein und aus." -#: src/interface.c:2070 +#: src/interface.c:2097 msgid "Show open files list" msgstr "Zeige Liste mit geöffneten Dateien" -#: src/interface.c:2076 +#: src/interface.c:2103 msgid "Sidebar" msgstr "Seitenleiste" -#: src/interface.c:2102 +#: src/interface.c:2129 msgid "Symbol list font" msgstr "Schriftart der Symbol-Liste" -#: src/interface.c:2109 +#: src/interface.c:2136 msgid "Message window font" msgstr "Schriftart des Meldungsfenster" -#: src/interface.c:2121 +#: src/interface.c:2148 msgid "Sets the font for the message window" msgstr "Ändert die Schriftart für das Meldungsfenster" -#: src/interface.c:2129 +#: src/interface.c:2156 msgid "Sets the font for symbol list window" msgstr "Ändert die Schriftart für die Symbol-Ansicht" -#: src/interface.c:2132 +#: src/interface.c:2159 msgid "Fonts" msgstr "Schriftarten" -#: src/interface.c:2137 +#: src/interface.c:2164 msgid "General" msgstr "Allgemein" -#: src/interface.c:2165 +#: src/interface.c:2190 +msgid "Default encoding:" +msgstr "Standardkodierung:" + +#: src/interface.c:2197 +msgid "Sets the default encoding for newly created files." +msgstr "Setzt die Zeichenkodierung für neu erstellte Dateien" + +#: src/interface.c:2209 msgid "Tab Width" msgstr "Tabulator-Breite" -#: src/interface.c:2178 +#: src/interface.c:2222 msgid "The width in chars, which one tab character will take" msgstr "Die Breite in Zeichen, die ein Tabalutar-Zeichen einnimmt" -#: src/interface.c:2183 +#: src/interface.c:2227 msgid "New files" msgstr "Neue Dateien" -#: src/interface.c:2202 +#: src/interface.c:2246 msgid "Strip trailing spaces" msgstr "Leerzeichen am Zeilenende entfernen" -#: src/interface.c:2206 +#: src/interface.c:2250 msgid "Removes trailing spaces and tabs and the end of lines" msgstr "Entfernt Leerzeichen an Zeilenenden" -#: src/interface.c:2209 +#: src/interface.c:2253 msgid "Ensure new line at file end" msgstr "Neue Zeile am Dateiende" -#: src/interface.c:2213 +#: src/interface.c:2257 msgid "Ensures that at the end of the file is a new line" msgstr "Fügt am Dateiende eine neue Zeile an (wenn keine vorhanden ist)" -#: src/interface.c:2216 +#: src/interface.c:2260 src/keybindings.c:147 +msgid "Replace tabs by space" +msgstr "Tabulatoren durch Leerzeichen ersetzen" + +#: src/interface.c:2267 msgid "Saving files" msgstr "Speichern" -#: src/interface.c:2235 +#: src/interface.c:2286 msgid "Show indentation guides" msgstr "Zeige Einrückungshinweise" -#: src/interface.c:2238 +#: src/interface.c:2289 msgid "Shows small dotted lines to help you to use the right indentation." msgstr "Blendet punktierte Linien ein, um die Einrückung zu erleichtern." -#: src/interface.c:2241 +#: src/interface.c:2292 msgid "Show white space" msgstr "Zeige Leerzeichen" -#: src/interface.c:2244 +#: src/interface.c:2295 msgid "Marks spaces with dots and tabs with arrows." msgstr "Markiert Leerzeichen mit Punkten und Tabulatoren mit kleinen Pfeilen." -#: src/interface.c:2247 +#: src/interface.c:2298 msgid "Show line endings" msgstr "Zeilenenden anzeigen" -#: src/interface.c:2250 +#: src/interface.c:2301 msgid "Show the line ending character" msgstr "Zeilenende-Zeichen anzeigen" -#: src/interface.c:2253 +#: src/interface.c:2304 msgid "XML tag auto completion" msgstr "XML-Tag Autovervollständigung" -#: src/interface.c:2256 +#: src/interface.c:2307 msgid "Automatic completion of open XML tags(includes HTML tags)" -msgstr "Autovervollständigung von offenen XML-Tags, das schließt auch HTML-Tags ein." +msgstr "" +"Autovervollständigung von offenen XML-Tags, das schließt auch HTML-Tags ein." -#: src/interface.c:2259 +#: src/interface.c:2310 msgid "Construct auto completion" msgstr "Autovervollständigung von Konstrukten" -#: src/interface.c:2262 +#: src/interface.c:2313 msgid "Automatic completion of often used constructs like if and for" -msgstr "Autovervollständigung von häufig benutzten Konstrukten wie if, for und switch." +msgstr "" +"Autovervollständigung von häufig benutzten Konstrukten wie if, for und " +"switch." -#: src/interface.c:2265 +#: src/interface.c:2316 msgid "Enable folding" msgstr "Code-Ausblendung aktivieren" -#: src/interface.c:2268 +#: src/interface.c:2319 msgid "Whether to enable folding the code" msgstr "Soll Code-Ausblendung aktiviert werden?" -#: src/interface.c:2281 +#: src/interface.c:2322 +msgid "Use indicators to show compile errors" +msgstr "Benutzt Markierungen, um Probleme beim Kompilieren anzuzeigen. " + +#: src/interface.c:2325 +msgid "" +"Whether to use indicators(a squiggly underline) to highlight the lines, " +"where the compiler found a warning or an error." +msgstr "" +"Benutzt Markierungen (wellige Unterstreichungen) um die Zeilen zu markieren, " +"in denen Fehler beim Kompilieren aufgetreten sind. " + +#: src/interface.c:2338 msgid "Editor font" msgstr "Editor-Schriftart" -#: src/interface.c:2288 +#: src/interface.c:2345 msgid "Long line marker" msgstr "Long line marker" -#: src/interface.c:2295 +#: src/interface.c:2352 msgid "Long line marker color" msgstr "Long line marker color" -#: src/interface.c:2307 +#: src/interface.c:2364 msgid "Sets the font for the editors windows" msgstr "Ändert die Schriftart des Editors" -#: src/interface.c:2315 -msgid "The long line marker is a thin vertical line in the editor. It helps to mark long lines, or as a hint to break the line. To disable set the value to 0, or greater than 0 to specify the column where it should appear." -msgstr "Der \"long line marker\" ist eine dünne Linie im Editorfenster. Sie hilft dabei, lange Zeilen zu markieren und dabei auf einen eventuell notwendigen Zeilenumbruch hinzuweißen. Um sie zu deaktivieren, setzen Sie den Wert auf 0. Werte größer als 0 geben hingegen die Spalte an, in der die Linie angezeigt werden soll. " +#: src/interface.c:2372 +msgid "" +"The long line marker is a thin vertical line in the editor. It helps to mark " +"long lines, or as a hint to break the line. To disable set the value to 0, " +"or greater than 0 to specify the column where it should appear." +msgstr "" +"Der \"long line marker\" ist eine dünne Linie im Editorfenster. Sie hilft " +"dabei, lange Zeilen zu markieren und dabei auf einen eventuell notwendigen " +"Zeilenumbruch hinzuweißen. Um sie zu deaktivieren, setzen Sie den Wert auf " +"0. Werte größer als 0 geben hingegen die Spalte an, in der die Linie " +"angezeigt werden soll. " -#: src/interface.c:2324 +#: src/interface.c:2381 msgid "Sets the color of the long line marker" msgstr "Stellt die Farbe des \"long line markers\" ein." -#: src/interface.c:2325 -#: src/dialogs.c:477 -#: src/dialogs.c:1708 -#: src/dialogs.c:1715 +#: src/interface.c:2382 src/dialogs.c:479 src/dialogs.c:1723 +#: src/dialogs.c:1730 msgid "Color Chooser" msgstr "Farb-Wähler" -#: src/interface.c:2332 +#: src/interface.c:2389 msgid "Editor" msgstr "Editor" -#: src/interface.c:2340 +#: src/interface.c:2397 msgid "" "Enter here the paths to the make tool and the compiler\n" "(tools you do not need can be let blank)" @@ -749,37 +837,39 @@ "Geben Sie hier die Pfade für make und die Compiler an\n" "(Programme, die nicht benötigt werden, können Sie frei lassen)" -#: src/interface.c:2351 +#: src/interface.c:2408 msgid "Make" msgstr "Make" -#: src/interface.c:2358 -#: src/dialogs.c:1758 -#: src/vte.c:163 +#: src/interface.c:2415 src/dialogs.c:1773 src/vte.c:163 msgid "Terminal" msgstr "Terminal" -#: src/interface.c:2365 +#: src/interface.c:2422 msgid "Browser" msgstr "Browser" -#: src/interface.c:2377 +#: src/interface.c:2434 msgid "Path and options for the make tool" msgstr "Pfad und spezielle Optionen und / oder Targets für \"make\" angeben." -#: src/interface.c:2384 -msgid "A terminal emulator like xterm, gnome-terminal or konsole (should accept the -e argument)" -msgstr "Ein Terminal-Emulator wie z.B. xterm, gnome-terminal oder konsole (es sollte die Option -e akzeptieren)" +#: src/interface.c:2441 +msgid "" +"A terminal emulator like xterm, gnome-terminal or konsole (should accept the " +"-e argument)" +msgstr "" +"Ein Terminal-Emulator wie z.B. xterm, gnome-terminal oder konsole (es sollte " +"die Option -e akzeptieren)" -#: src/interface.c:2391 +#: src/interface.c:2448 msgid "Path (and possibly additional arguments) to your favorite browser" msgstr "Pfad und evtl. Argumente zu Ihrem Lieblingsbrowser" -#: src/interface.c:2423 +#: src/interface.c:2480 msgid "Tools" msgstr "Werkzeuge" -#: src/interface.c:2431 +#: src/interface.c:2488 msgid "" "Specify here information you want to use in templates.\n" "See documentation if you don't know, how templates work." @@ -787,47 +877,47 @@ "Geben Sie hier die Informationen an, die in Vorlagen benutzt werden sollen.\n" "Konsultieren Sie die Dokumentation, um mehr über Vorlagen zu erfahren." -#: src/interface.c:2447 +#: src/interface.c:2504 msgid "email address of the developer" msgstr "eMail-Adresse des Entwicklers" -#: src/interface.c:2454 +#: src/interface.c:2511 msgid "Initials of the developer name" msgstr "Initialen des Entwicklernames" -#: src/interface.c:2456 +#: src/interface.c:2513 msgid "Initial Version" msgstr "Anfangsversion" -#: src/interface.c:2468 +#: src/interface.c:2525 msgid "Version number, which a new file initially has" msgstr "Versionsnummer, die eine neue Datei zu Beginn hat" -#: src/interface.c:2475 +#: src/interface.c:2532 msgid "Company name" msgstr "Firmenname" -#: src/interface.c:2477 +#: src/interface.c:2534 msgid "Developer" msgstr "Entwickler" -#: src/interface.c:2484 +#: src/interface.c:2541 msgid "Company" msgstr "Firma" -#: src/interface.c:2491 +#: src/interface.c:2548 msgid "Mail address" msgstr "Mail-Adresse" -#: src/interface.c:2498 +#: src/interface.c:2555 msgid "Initials" msgstr "Initialen" -#: src/interface.c:2510 +#: src/interface.c:2567 msgid "The name of the developer" msgstr "Der Name des Entwicklers" -#: src/interface.c:2512 +#: src/interface.c:2569 msgid "" "Notice: For all changes you make here,\n" "you need to restart Geany to take effect." @@ -835,28 +925,35 @@ "Hinweis: Sie müssen Geany neustarten,\n" "wenn Sie hier Änderungen vornehmen." -#: src/interface.c:2516 +#: src/interface.c:2573 msgid "Templates" msgstr "Vorlagen" -#: src/interface.c:2524 -msgid "Here you can change keyboard shortcuts for various actions. Just double click on a action or select one and press the Change button to enter a new shortcut. You can also edit the string representation of the shortcut directly." -msgstr "Hier können die Tastenkominationen für verschiedene Aktionen innerhalb Geanys festgelegt bzw. verändert werden. Um die Tastenkombinationen zu ändern, einfach Doppelklicken oder markieren und auf Ändern klicken. Zudem können die Tastenkombinationen auch direkt eingegeben werden. " +#: src/interface.c:2581 +msgid "" +"Here you can change keyboard shortcuts for various actions. Just double " +"click on a action or select one and press the Change button to enter a new " +"shortcut. You can also edit the string representation of the shortcut " +"directly." +msgstr "" +"Hier können die Tastenkominationen für verschiedene Aktionen innerhalb " +"Geanys festgelegt bzw. verändert werden. Um die Tastenkombinationen zu " +"ändern, einfach Doppelklicken oder markieren und auf Ändern klicken. Zudem " +"können die Tastenkombinationen auch direkt eingegeben werden. " -#: src/interface.c:2547 +#: src/interface.c:2604 msgid "Change" msgstr "Ändern" -#: src/interface.c:2551 +#: src/interface.c:2608 msgid "Keybindings" msgstr "Tastenkürzel" -#: src/callbacks.c:204 -#: src/callbacks.c:219 +#: src/callbacks.c:210 src/callbacks.c:225 msgid "Do you really want to quit?" msgstr "Möchten Sie wirklich beenden?" -#: src/callbacks.c:459 +#: src/callbacks.c:510 #, c-format msgid "" "Are you sure you want to reload '%s'?\n" @@ -865,88 +962,84 @@ "Sind Sie sicher, dass Sie '%s' neuladen möchten?\n" "Alle ungespeicherten Änderungen gehen verloren." -#: src/callbacks.c:849 +#: src/callbacks.c:890 #, c-format msgid "The file '%s' already exists. Do you want to overwrite it?" msgstr "Die Datei '%s' existiert bereits. Möchten Sie sie überschreiben?" -#: src/callbacks.c:1315 -#: src/callbacks.c:1324 +#: src/callbacks.c:1344 src/callbacks.c:1353 #, c-format msgid "Declaration or definition of \"%s()\" not found" msgstr "Deklaration oder Definition von '%s' nicht gefunden." -#: src/callbacks.c:1633 +#: src/callbacks.c:1673 msgid "Failed to execute the view program" msgstr "Konnte das Anzeigeprogramm nicht ausführen" -#: src/callbacks.c:1641 +#: src/callbacks.c:1684 msgid "Failed to execute the terminal program" msgstr "Konnte das Terminal-Programm nicht ausführen" #. initialize the dialog -#: src/callbacks.c:1979 -#: src/dialogs.c:69 +#: src/callbacks.c:2007 src/dialogs.c:71 msgid "Open File" msgstr "Datei öffnen" -#: src/callbacks.c:2028 -#: src/callbacks.c:2078 -#: src/callbacks.c:2118 -#: src/callbacks.c:2178 -msgid "Please set the filetype for the current file before using this function." +#: src/callbacks.c:2056 src/callbacks.c:2101 src/callbacks.c:2141 +#: src/callbacks.c:2199 +msgid "" +"Please set the filetype for the current file before using this function." msgstr "Bitte legen Sie den Dateityp fest, bevor Sie diese Funktion benutzen. " -#: src/support.c:90 -#: src/support.c:114 +#: src/support.c:90 src/support.c:114 #, c-format msgid "Couldn't find pixmap file: %s" msgstr "Konnte PixMap %s nicht finden." -#: src/dialogs.c:74 -msgid "Opens the file in read-only mode. If you choose more than one file to open, all files will be opened read-only." -msgstr "Öffnet die Datei als schreibgeschützt. Wenn Sie mehrere Dateien wählen, werden alle schreibgeschützt geöffnet." +#: src/dialogs.c:76 +msgid "" +"Opens the file in read-only mode. If you choose more than one file to open, " +"all files will be opened read-only." +msgstr "" +"Öffnet die Datei als schreibgeschützt. Wenn Sie mehrere Dateien wählen, " +"werden alle schreibgeschützt geöffnet." -#: src/dialogs.c:110 +#: src/dialogs.c:112 msgid "Detect by file extension " msgstr "Durch Dateiendung erkennen" -#: src/dialogs.c:163 +#: src/dialogs.c:165 msgid "Save File" msgstr "Datei speichern" -#: src/dialogs.c:215 +#: src/dialogs.c:217 #, c-format msgid "There is a limit of %d concurrent open tabs." msgstr "Es dürfen maximal %d Datei gleichzeitg geöffnet sein." -#: src/dialogs.c:216 +#: src/dialogs.c:218 msgid "error: too many open files" msgstr "Fehler: zu viele offene Dateien" -#: src/dialogs.c:239 +#: src/dialogs.c:241 #, c-format msgid "The match \"%s\" was not found. Wrap search around the document?" msgstr "\"%s\" wurde nicht gefunden. Am Anfang des Dokumentes beginnen?" -#: src/dialogs.c:242 -#: src/dialogs.c:1826 +#: src/dialogs.c:244 src/dialogs.c:1841 msgid "Question" msgstr "Frage" -#: src/dialogs.c:271 +#: src/dialogs.c:273 msgid "Information" msgstr "Information" -#: src/dialogs.c:296 -#: src/dialogs.c:328 -#: src/dialogs.c:1269 -#: src/win32.c:217 +#: src/dialogs.c:298 src/dialogs.c:330 src/dialogs.c:1271 src/win32.c:217 #: src/win32.c:378 msgid "Error" msgstr "Fehler" -#: src/dialogs.c:320 +#: src/dialogs.c:322 #, c-format msgid "" "The file '%s' is not saved.\n" @@ -955,7 +1048,7 @@ "%s ist nicht gespeichert.\n" "Möchten Sie die Datei vor dem Beenden speichern?" -#: src/dialogs.c:325 +#: src/dialogs.c:327 msgid "" "The file is not saved.\n" "Do you want to save it before closing?" @@ -963,27 +1056,27 @@ "Die Datei ist nicht gespeichert.\n" "Möchten Sie die Datei vor dem Beenden speichern?" -#: src/dialogs.c:342 +#: src/dialogs.c:344 msgid "Don't save" msgstr "Nicht speichern" -#: src/dialogs.c:394 +#: src/dialogs.c:396 msgid "Choose font" msgstr "Schriftart auswählen" -#: src/dialogs.c:433 +#: src/dialogs.c:435 msgid "Word Count" msgstr "Wörter zählen" -#: src/dialogs.c:442 +#: src/dialogs.c:444 msgid "selection" msgstr "Auswahl" -#: src/dialogs.c:450 +#: src/dialogs.c:452 msgid "whole document" msgstr "Ganzes Dokument" -#: src/dialogs.c:452 +#: src/dialogs.c:454 #, c-format msgid "" "Range:\t\t%s\n" @@ -999,203 +1092,208 @@ "Zeichen:\t\t%d\n" #. compile the code -#: src/dialogs.c:505 -msgid "Compile" -msgstr "Kompilieren" +#: src/dialogs.c:507 +msgid "_Compile" +msgstr "_Kompilieren" -#: src/dialogs.c:508 +#: src/dialogs.c:510 msgid "Compiles the current file" msgstr "Kompiliert die aktuelle Datei" -#. build the code -#: src/dialogs.c:521 -msgid "Build" -msgstr "Erstellen" - -#: src/dialogs.c:525 +#: src/dialogs.c:527 msgid "Builds the current file (generate an executable file)" msgstr "Erstellt die aktuelle Datei(erzeugt eine ausführbare Datei)" #. build the code with make all -#: src/dialogs.c:534 -#: src/dialogs.c:631 +#: src/dialogs.c:536 src/dialogs.c:633 src/keybindings.c:157 msgid "Build with \"make\"" msgstr "Mit \"make\" erstellen" -#: src/dialogs.c:537 -#: src/dialogs.c:634 +#: src/dialogs.c:539 src/dialogs.c:636 msgid "Builds the current file with the make tool and the default target" msgstr "Erstellt die aktuelle Datei mit \"make\" und dem Default-Target" #. build the code with make -#: src/dialogs.c:545 -#: src/dialogs.c:642 -msgid "Build with make (custom target)" +#: src/dialogs.c:547 +msgid "Build with \"_make\" (custom _target)" msgstr "Mit \"make\" erstellen (eigenes Target angeben)" -#: src/dialogs.c:551 -#: src/dialogs.c:648 +#: src/dialogs.c:553 src/dialogs.c:650 msgid "Builds the current file with the make tool and the specified target" msgstr "Erstellt die aktuelle Datei mit \"make\" und dem angegebenem Target" -#: src/dialogs.c:577 -#: src/dialogs.c:1107 +#: src/dialogs.c:579 src/dialogs.c:1109 msgid "Set Includes and Arguments" msgstr "Programm-Parameter angeben" -#: src/dialogs.c:584 -msgid "Sets the includes and library paths for the compiler and the program arguments for execution" -msgstr "Include-Dateien und Bibliotheken-Pfade sowie Programmparameter festlegen" +#: src/dialogs.c:586 +msgid "" +"Sets the includes and library paths for the compiler and the program " +"arguments for execution" +msgstr "" +"Include-Dateien und Bibliotheken-Pfade sowie Programmparameter festlegen" #. DVI -#: src/dialogs.c:605 +#: src/dialogs.c:607 msgid "LaTeX -> DVI" msgstr "LaTeX -> DVI" -#: src/dialogs.c:608 +#: src/dialogs.c:610 msgid "Compiles the current file into a DVI file" msgstr "Kompiliert die aktuelle Datei als DVI-Datei" #. PDF -#: src/dialogs.c:618 +#: src/dialogs.c:620 msgid "LaTeX -> PDF" msgstr "LaTeX -> PDF" -#: src/dialogs.c:621 +#: src/dialogs.c:623 msgid "Compiles the current file into a PDF file" msgstr "Kompiliert die aktuelle Datei als PDF-Datei" +#. build the code with make +#: src/dialogs.c:644 +msgid "Build with make (custom target)" +msgstr "Mit \"make\" erstellen (eigenes Target angeben)" + #. DVI view -#: src/dialogs.c:653 +#: src/dialogs.c:655 msgid "View DVI file" msgstr "DVI-Datei anzeigen" -#: src/dialogs.c:659 -#: src/dialogs.c:672 +#: src/dialogs.c:661 src/dialogs.c:674 msgid "Compiles and view the current file" msgstr "Kompiliert und zeigt die aktuelle Datei an" #. PDF view -#: src/dialogs.c:666 +#: src/dialogs.c:668 msgid "View PDF file" msgstr "PDF-Datei anzeigen" #. arguments -#: src/dialogs.c:685 -#: src/dialogs.c:1000 +#: src/dialogs.c:687 src/dialogs.c:1002 msgid "Set Arguments" msgstr "Programm-Parameter angeben" -#: src/dialogs.c:692 +#: src/dialogs.c:694 msgid "Sets the program paths and arguments" msgstr "Programm-Parameter angeben" -#: src/dialogs.c:733 +#: src/dialogs.c:735 msgid "Enter custom options for the make tool" msgstr "Spezielle Optionen / Targets für \"make\" angeben." -#: src/dialogs.c:738 -msgid "Enter custom options here, all entered text is passed to the make command." +#: src/dialogs.c:740 +msgid "" +"Enter custom options here, all entered text is passed to the make command." msgstr "Alles was Sie hier angeben, wird direkt an \"make\" übergeben." -#: src/dialogs.c:768 +#: src/dialogs.c:770 msgid "Enter the line you want to go to" msgstr "Geben Sie die Zeile an, zu der Sie springen möchten" -#: src/dialogs.c:800 +#: src/dialogs.c:802 msgid "Find" msgstr "Suchen" -#: src/dialogs.c:805 -#: src/dialogs.c:913 +#: src/dialogs.c:807 src/dialogs.c:915 msgid "Enter the search text here" msgstr "Geben Sie hier den Suchbegriff ein" -#: src/dialogs.c:826 -#: src/dialogs.c:946 +#: src/dialogs.c:828 src/dialogs.c:948 msgid "_Case sensitive" msgstr "Groß- / Kleinschreibung beachten" -#: src/dialogs.c:831 -#: src/dialogs.c:951 +#: src/dialogs.c:833 src/dialogs.c:953 msgid "Match only a _whole word" msgstr "Nur ganze Wörter finden" -#: src/dialogs.c:836 -#: src/dialogs.c:956 +#: src/dialogs.c:838 src/dialogs.c:958 msgid "_Use regular expressions" msgstr "Reguläre Ausdrücke benutzen" -#: src/dialogs.c:841 -#: src/dialogs.c:961 -msgid "For detailed information about using regular expressions, please read the documentation." -msgstr "Für weitere Informationen über reguläre Ausdrücke lesen Sie bitte die Dokumentation." +#: src/dialogs.c:843 src/dialogs.c:963 +msgid "" +"For detailed information about using regular expressions, please read the " +"documentation." +msgstr "" +"Für weitere Informationen über reguläre Ausdrücke lesen Sie bitte die " +"Dokumentation." -#: src/dialogs.c:843 -#: src/dialogs.c:963 +#: src/dialogs.c:845 src/dialogs.c:965 msgid "_Search backwards" msgstr "Rückwärts suchen" -#: src/dialogs.c:848 -#: src/dialogs.c:968 +#: src/dialogs.c:850 src/dialogs.c:970 msgid "Match only word s_tart" msgstr "Nur Wort_anfänge finden" -#: src/dialogs.c:895 +#: src/dialogs.c:897 src/keybindings.c:131 msgid "Replace" msgstr "Ersetzen" -#: src/dialogs.c:898 +#: src/dialogs.c:900 msgid "_In Selection" msgstr "_Auswahl ersetzen" -#: src/dialogs.c:900 +#: src/dialogs.c:902 msgid "Replace all matches found in the currently selected text" msgstr "Ersetze alle Treffer im aktuell markierten Text" -#: src/dialogs.c:904 +#: src/dialogs.c:906 msgid "Replace _All" msgstr "_Alle ersetzen" -#: src/dialogs.c:917 +#: src/dialogs.c:919 msgid "Enter the replace text here" msgstr "Geben Sie hier den Ersetzungstext ein" -#: src/dialogs.c:1005 +#: src/dialogs.c:1007 msgid "" "Set programs and options for compilation and viewing (La)TeX files.\n" "The filename is appended automatically at the end.\n" msgstr "" -"Setzt Programme und deren Optionen zum Kompilieren bzw. Betrachten von (La)TeX-Dateien.\n" -"Der jeweilige Dateiname wird bei einem Aufruf automatisch an das Ende angefügt. \n" +"Setzt Programme und deren Optionen zum Kompilieren bzw. Betrachten von (La)" +"TeX-Dateien.\n" +"Der jeweilige Dateiname wird bei einem Aufruf automatisch an das Ende " +"angefügt. \n" -#: src/dialogs.c:1013 -msgid "Enter here the (La)TeX command (for DVI creation) and some useful options." -msgstr "Geben Sie hier den Befehl und dessen Optionen, für die DVI-Erzeugung, an." +#: src/dialogs.c:1015 +msgid "" +"Enter here the (La)TeX command (for DVI creation) and some useful options." +msgstr "" +"Geben Sie hier den Befehl und dessen Optionen, für die DVI-Erzeugung, an." -#: src/dialogs.c:1034 -msgid "Enter here the (La)TeX command (for PDF creation) and some useful options." -msgstr "Geben Sie hier den Befehl und dessen Optionen, für die PDF-Erzeugung, an." +#: src/dialogs.c:1036 +msgid "" +"Enter here the (La)TeX command (for PDF creation) and some useful options." +msgstr "" +"Geben Sie hier den Befehl und dessen Optionen, für die PDF-Erzeugung, an." -#: src/dialogs.c:1055 -msgid "Enter here the (La)TeX command (for DVI preview) and some useful options." -msgstr "Geben Sie hier den Befehl und dessen Optionen, für die DVI-Anzeige, an." +#: src/dialogs.c:1057 +msgid "" +"Enter here the (La)TeX command (for DVI preview) and some useful options." +msgstr "" +"Geben Sie hier den Befehl und dessen Optionen, für die DVI-Anzeige, an." -#: src/dialogs.c:1076 -msgid "Enter here the (La)TeX command (for PDF preview) and some useful options." -msgstr "Geben Sie hier den Befehl und dessen Optionen, für die PDF-Anzeige, an." +#: src/dialogs.c:1078 +msgid "" +"Enter here the (La)TeX command (for PDF preview) and some useful options." +msgstr "" +"Geben Sie hier den Befehl und dessen Optionen, für die PDF-Anzeige, an." -#: src/dialogs.c:1112 -msgid "Sets the includes and library paths for the compiler and the program arguments for execution\n" -msgstr "Include-Dateien und Bibliotheken-Pfade sowie Programmparameter festlegen.\n" +#: src/dialogs.c:1114 +msgid "" +"Sets the includes and library paths for the compiler and the program " +"arguments for execution\n" +msgstr "" +"Include-Dateien und Bibliotheken-Pfade sowie Programmparameter festlegen.\n" -#: src/dialogs.c:1121 +#: src/dialogs.c:1123 msgid "Enter here arguments to your compiler." msgstr "Geben Sie hier Paramter für den Compiler an." -#: src/dialogs.c:1127 -#: src/dialogs.c:1150 -#: src/dialogs.c:1174 +#: src/dialogs.c:1129 src/dialogs.c:1152 src/dialogs.c:1176 #, c-format msgid "" "%f will be replaced by the complete filename\n" @@ -1210,32 +1308,36 @@ "%f -> test_datei.c\n" "%e -> test_datei" -#: src/dialogs.c:1144 +#: src/dialogs.c:1146 msgid "Enter here arguments to your linker." msgstr "Geben Sie hier Parameter für den Linker an." #. program-args -#: src/dialogs.c:1168 +#: src/dialogs.c:1170 msgid "Enter here arguments to your program." msgstr "Geben Sie hier Parameter für Ihr Programm an." -#: src/dialogs.c:1213 +#: src/dialogs.c:1215 msgid "Show _hidden files" msgstr "_Versteckte Dateien anzeigen" -#: src/dialogs.c:1230 +#: src/dialogs.c:1232 msgid "Set filetype:" msgstr "Dateityp festlegen:" -#: src/dialogs.c:1233 +#: src/dialogs.c:1235 msgid "" -"Explicitly defines a filetype for the file, if it would not be detected by filename extension.\n" -"Note if you choose multiple files, they will all be opened with the chosen filetype." +"Explicitly defines a filetype for the file, if it would not be detected by " +"filename extension.\n" +"Note if you choose multiple files, they will all be opened with the chosen " +"filetype." msgstr "" -"Definiert explizit einen bestimmten Dateityp, wenn er nicht durch die Dateiendung erkannt wird.\n" -"Beachten Sie, wenn Sie mehrere Dateien auswählen, werden alle mit dem gewählten Dateityp geöffnet." +"Definiert explizit einen bestimmten Dateityp, wenn er nicht durch die " +"Dateiendung erkannt wird.\n" +"Beachten Sie, wenn Sie mehrere Dateien auswählen, werden alle mit dem " +"gewählten Dateityp geöffnet." -#: src/dialogs.c:1265 +#: src/dialogs.c:1267 #, c-format msgid "" "Configuration directory could not be created (%s).\n" @@ -1243,255 +1345,275 @@ "Start %s anyway?" msgstr "" "Konfigurationsverzeichnis konnte nicht erstellt werden (%s).\n" -"Es können einige Probleme in %s ohne ein Konfigurationsverzeichnis auftreten.\n" +"Es können einige Probleme in %s ohne ein Konfigurationsverzeichnis " +"auftreten.\n" "%s trotzdem starten?" -#: src/dialogs.c:1314 -msgid "An error occurred or file information could not be retrieved(e.g. from a new file)." -msgstr "Es ist ein Fehler aufgetreten oder Datei-Informationen konnten nicht gelesen werden(z.B. bei einer neuen Datei)." +#: src/dialogs.c:1316 +msgid "" +"An error occurred or file information could not be retrieved(e.g. from a new " +"file)." +msgstr "" +"Es ist ein Fehler aufgetreten oder Datei-Informationen konnten nicht gelesen " +"werden(z.B. bei einer neuen Datei)." -#: src/dialogs.c:1334 -#: src/dialogs.c:1335 -#: src/dialogs.c:1336 -#: src/dialogs.c:1342 -#: src/dialogs.c:1343 -#: src/dialogs.c:1344 -#: src/utils.c:108 -#: src/utils.c:128 -#: src/utils.c:129 -#: src/utils.c:1029 +#: src/dialogs.c:1336 src/dialogs.c:1337 src/dialogs.c:1338 src/dialogs.c:1344 +#: src/dialogs.c:1345 src/dialogs.c:1346 src/utils.c:143 src/utils.c:144 +#: src/utils.c:1069 msgid "unknown" msgstr "unbekannt" -#: src/dialogs.c:1348 +#: src/dialogs.c:1350 msgid "Properties" msgstr "Eigenschaften" -#: src/dialogs.c:1376 +#: src/dialogs.c:1378 msgid "Type:" msgstr "Dateityp:" -#: src/dialogs.c:1389 +#: src/dialogs.c:1391 msgid "Size:" msgstr "Größe:" -#: src/dialogs.c:1404 +#: src/dialogs.c:1406 msgid "Location:" msgstr "Ort:" -#: src/dialogs.c:1417 +#: src/dialogs.c:1419 msgid "Read-only:" msgstr "Schreibgeschützt:" -#: src/dialogs.c:1424 +#: src/dialogs.c:1426 msgid "(only inside Geany)" msgstr "(nur innerhalb von Geany)" -#: src/dialogs.c:1433 +#: src/dialogs.c:1435 msgid "Encoding:" msgstr "Kodierung:" -#: src/dialogs.c:1446 +#: src/dialogs.c:1448 msgid "Modified:" msgstr "Modifiziert:" -#: src/dialogs.c:1459 +#: src/dialogs.c:1461 msgid "Changed:" msgstr "Geändert:" -#: src/dialogs.c:1472 +#: src/dialogs.c:1474 msgid "Accessed:" msgstr "Zugriff:" #. Header -#: src/dialogs.c:1501 +#: src/dialogs.c:1503 msgid "Read:" msgstr "Lesen" -#: src/dialogs.c:1508 +#: src/dialogs.c:1510 msgid "Write:" msgstr "Schreiben:" -#: src/dialogs.c:1515 +#: src/dialogs.c:1517 msgid "Execute:" msgstr "Ausführen:" #. Owner -#: src/dialogs.c:1523 +#: src/dialogs.c:1525 msgid "Owner:" msgstr "Eigentümer:" #. Group -#: src/dialogs.c:1559 +#: src/dialogs.c:1561 msgid "Group:" msgstr "Gruppe:" #. Other -#: src/dialogs.c:1595 +#: src/dialogs.c:1597 msgid "Other:" msgstr "Andere:" -#: src/dialogs.c:1663 -msgid "These are settings for the virtual terminal emulator widget (VTE). They only apply, if the VTE library could be loaded." -msgstr "Hier sehen Sie Einstellungen für die Terminalemulation (VTE). Änderungen werden nur wirksam, wenn die VTE-Bibliothek geladen werden konnte." +#: src/dialogs.c:1678 +msgid "" +"These are settings for the virtual terminal emulator widget (VTE). They only " +"apply, if the VTE library could be loaded." +msgstr "" +"Hier sehen Sie Einstellungen für die Terminalemulation (VTE). Änderungen " +"werden nur wirksam, wenn die VTE-Bibliothek geladen werden konnte." -#: src/dialogs.c:1679 +#: src/dialogs.c:1694 msgid "Terminal font" msgstr "Terminal Schriftart" -#: src/dialogs.c:1689 +#: src/dialogs.c:1704 msgid "Sets the font for the terminal widget." msgstr "Ändert die Schriftart für das Terminal" -#: src/dialogs.c:1691 +#: src/dialogs.c:1706 msgid "Foreground color" msgstr "Vordergrundfarbe" -#: src/dialogs.c:1697 +#: src/dialogs.c:1712 msgid "Background color" msgstr "Hintergrundfarbe" -#: src/dialogs.c:1707 +#: src/dialogs.c:1722 msgid "Sets the foreground color of the text in the terminal widget." msgstr "Setzt die Vordergrundfarbe für Text im Terminal." -#: src/dialogs.c:1714 +#: src/dialogs.c:1729 msgid "Sets the background color of the text in the terminal widget." msgstr "Setzt die Hintergrundfarbe für Text im Terminal." -#: src/dialogs.c:1717 +#: src/dialogs.c:1732 msgid "Scrollback lines" msgstr "Zeilen zum Zurückrollen" -#: src/dialogs.c:1728 -msgid "Specifies the history in lines, which you can scroll back in the terminal widget." +#: src/dialogs.c:1743 +msgid "" +"Specifies the history in lines, which you can scroll back in the terminal " +"widget." msgstr "Gibt die Zeilen an, die man im Terminal zurückscrollen kann." -#: src/dialogs.c:1732 +#: src/dialogs.c:1747 msgid "Terminal emulation" msgstr "Terminalemulation" -#: src/dialogs.c:1742 -msgid "Controls how the terminal emulator should behave. xterm is a good start." -msgstr "Steuert wie sich das Terminal verhalten soll. xterm ist ein guter Startwert." +#: src/dialogs.c:1757 +msgid "" +"Controls how the terminal emulator should behave. xterm is a good start." +msgstr "" +"Steuert wie sich das Terminal verhalten soll. xterm ist ein guter Startwert." -#: src/dialogs.c:1744 +#: src/dialogs.c:1759 msgid "Scroll on keystroke" msgstr "Bei Tastendruck scrollen" -#: src/dialogs.c:1748 +#: src/dialogs.c:1763 msgid "Whether to scroll to the bottom if a key was pressed." msgstr "Ob das Fenster bei Tastendruck bis zum Ende gescrollt werden soll" -#: src/dialogs.c:1751 +#: src/dialogs.c:1766 msgid "Scroll on output" msgstr "Bei Ausgabe scrollen" -#: src/dialogs.c:1755 +#: src/dialogs.c:1770 msgid "Whether to scroll to the bottom if an output was generated." msgstr "Ob das Fenster bei Ausgabe bis zum Ende gescrollt werden soll" -#: src/document.c:325 +#: src/dialogs.c:1865 +msgid "Keyboard shortcuts" +msgstr "Tastaturkürzel" + +#: src/dialogs.c:1872 +msgid "The following keyboard shortcuts are defined:" +msgstr "Folgende Tastenkürzel sind definiert: " + +#: src/document.c:306 #, c-format msgid "File %s closed." msgstr "Datei %s wurde geschlossen." -#: src/document.c:378 +#: src/document.c:360 msgid "New file opened." msgstr "Neue Datei geöffnet." -#: src/document.c:418 -#: src/document.c:427 -#: src/document.c:428 +#: src/document.c:401 src/document.c:410 src/document.c:411 msgid "Invalid filename" msgstr "Ungültiger Dateiname" -#: src/document.c:449 +#: src/document.c:433 #, c-format msgid "Could not open file %s (%s)" msgstr "Konnte Datei '%s' nicht öffnen(%s)." -#: src/document.c:482 -msgid "The file does not look like a text file or the file encoding is not supported." -msgstr "Diese Datei scheint keine Textdatei zu sein, oder das Format wird nicht unterstützt." +#: src/document.c:466 +msgid "" +"The file does not look like a text file or the file encoding is not " +"supported." +msgstr "" +"Diese Datei scheint keine Textdatei zu sein, oder das Format wird nicht " +"unterstützt." -#: src/document.c:520 +#: src/document.c:552 #, c-format msgid "File %s reloaded." msgstr "Datei %s neu geladen." -#: src/document.c:546 +#: src/document.c:554 #, c-format msgid "File %s opened(%d%s)." msgstr "Datei %s geöffnet(%d%s)." -#: src/document.c:548 +#: src/document.c:556 msgid ", read-only" msgstr ", schreibgeschützt" -#: src/document.c:586 -#: src/document.c:625 +#: src/document.c:592 src/document.c:661 msgid "Error saving file." msgstr "Fehler beim Speichern der Datei." -#: src/document.c:606 +#: src/document.c:627 #, c-format +msgid "Error while converting file (%s)." +msgstr "Fehler bei der Umwandlung der Datei (%s)." + +#: src/document.c:642 +#, c-format msgid "Error saving file (%s)." msgstr "Fehler beim Speichern der Datei (%s)." -#: src/document.c:647 +#: src/document.c:683 #, c-format msgid "File %s saved." msgstr "Datei %s wurde gespeichert." -#: src/document.c:898 -msgid "tag list updating failed" -msgstr "Neuladen der Symbol-Liste ist fehlgeschlagen." - -#: src/document.c:965 +#: src/document.c:990 msgid "Win (CRLF)" msgstr "Win (CRLF)" -#: src/document.c:966 +#: src/document.c:991 msgid "Max (CR)" msgstr "Max (CR)" -#: src/document.c:968 +#: src/document.c:993 msgid "Unix (LF)" msgstr "Unix (LF)" -#: src/utils.c:120 +#. currently text need in German and C locale about 150 chars +#: src/utils.c:135 #, c-format -msgid "%c line: % 4d column: % 3d selection: % 4d %s mode: %s%s cur. function: %s encoding: %s filetype: %s" -msgstr "%c Zeile: % 4d Spalte: % 3d Auswahl: % 4d %s Modus: %s%s akt. Funktion: %s Kodierung: %s Dateityp: %s" +msgid "" +"%c line: % 4d column: % 3d selection: % 4d %s mode: %s%s cur. " +"function: %s encoding: %s filetype: %s" +msgstr "" +"%c Zeile: % 4d Spalte: % 3d Auswahl: % 4d %s Modus: %s%s akt. " +"Funktion: %s Kodierung: %s Dateityp: %s" -#: src/utils.c:124 +#: src/utils.c:139 msgid "OVR" msgstr "ÜBER" -#: src/utils.c:124 +#: src/utils.c:139 msgid "INS" msgstr "EINF" -#: src/utils.c:359 +#: src/utils.c:380 #, c-format msgid "Font updated (%s)." msgstr "Schriftart gewechselt (%s)." -#: src/utils.c:373 -#: src/geany.h:71 +#: src/utils.c:394 src/geany.h:71 msgid "untitled" msgstr "unbenannt" -#: src/utils.c:374 +#: src/utils.c:395 msgid "(Unsaved)" msgstr "(Ungespeichert)" -#: src/utils.c:648 +#: src/utils.c:670 msgid "No tags found" msgstr "Keine Symbole gefunden." -#: src/utils.c:951 +#: src/utils.c:970 #, c-format msgid "" "The file '%s' on the disk is more recent than\n" @@ -1501,91 +1623,111 @@ "Die Datei '%s' hat sich geändert.\n" "Möchten Sie sie neu laden?" -#: src/filetypes.c:53 +#: src/utils.c:1877 +msgid "C Standard Library" +msgstr "C Standard Bibliothek" + +#: src/utils.c:1878 +msgid "ISO C99" +msgstr "ISO C99" + +#: src/utils.c:1879 +msgid "C++ (C Standard Library)" +msgstr "C++ (C Standard Bibliothek)" + +#: src/utils.c:1880 +msgid "C++ Standard Library" +msgstr "C++ Standard Bibliothek" + +#: src/utils.c:1881 +msgid "C++ STL" +msgstr "C++ STL" + +#: src/filetypes.c:54 msgid "C source file" msgstr "C Quelldatei" -#: src/filetypes.c:71 +#: src/filetypes.c:74 msgid "C++ source file" msgstr "C++ Quelldatei" -#: src/filetypes.c:97 +#: src/filetypes.c:101 msgid "Java source file" msgstr "Java Quelldatei" -#: src/filetypes.c:114 +#: src/filetypes.c:119 msgid "Perl source file" msgstr "Perl Quelldatei" -#: src/filetypes.c:132 +#: src/filetypes.c:138 msgid "PHP / HTML source file" msgstr "PHP / HTML Quelldatei" -#: src/filetypes.c:154 +#: src/filetypes.c:161 msgid "XML source file" msgstr "XML Quelldatei" -#: src/filetypes.c:171 +#: src/filetypes.c:179 msgid "Docbook source file" msgstr "Docbook Quelldatei" -#: src/filetypes.c:187 +#: src/filetypes.c:196 msgid "Python source file" msgstr "Python Quelldatei" -#: src/filetypes.c:204 +#: src/filetypes.c:214 msgid "LaTeX source file" msgstr "LaTeX Quelldatei" -#: src/filetypes.c:222 +#: src/filetypes.c:233 msgid "Pascal source file" msgstr "Pascal Quelldatei" -#: src/filetypes.c:243 +#: src/filetypes.c:255 msgid "Shell script file" msgstr "Shellscript Datei" -#: src/filetypes.c:262 +#: src/filetypes.c:278 msgid "Makefile" msgstr "Makefile" -#: src/filetypes.c:279 +#: src/filetypes.c:297 msgid "Cascading StyleSheet" msgstr "Cascading StyleSheet" -#: src/filetypes.c:295 +#: src/filetypes.c:314 msgid "Config file" msgstr "Konfigurationsdatei" -#: src/filetypes.c:314 +#: src/filetypes.c:334 msgid "Assembler source file" msgstr "Assembler Quelldatei" -#: src/filetypes.c:330 +#: src/filetypes.c:351 msgid "SQL Dump file" msgstr "SQL-Dump Datei" -#: src/filetypes.c:346 +#: src/filetypes.c:368 msgid "(O)Caml source file" msgstr "(O)Caml Quelldatei" -#: src/filetypes.c:363 +#: src/filetypes.c:386 msgid "O-Matrix source file" msgstr "O-Matrix Quelldatei" -#: src/filetypes.c:379 +#: src/filetypes.c:403 msgid "Ruby source file" msgstr "Ruby Quelldatei" -#: src/filetypes.c:397 +#: src/filetypes.c:422 msgid "Tcl source file" msgstr "Tcl Quelldatei" -#: src/filetypes.c:415 +#: src/filetypes.c:441 msgid "All files" msgstr "Alle Dateien" -#: src/filetypes.c:424 +#: src/filetypes.c:450 msgid "None" msgstr "Keiner" @@ -1598,84 +1740,94 @@ msgid "%s configuration file, edit as you need" msgstr "%s Konfigurationsdatei. Bei Bedarf anpassen. " -#: src/keyfile.c:104 -msgid " VTE settings: FONT;FOREGROUND;BACKGROUND;scrollback;type;scroll on keystroke;scroll on output" -msgstr "VTE settings: FONT;FOREGROUND;BACKGROUND;scrollback;type;scroll on keystroke;scroll on output" +#: src/keyfile.c:105 +msgid "" +" VTE settings: FONT;FOREGROUND;BACKGROUND;scrollback;type;scroll on " +"keystroke;scroll on output" +msgstr "" +"VTE settings: FONT;FOREGROUND;BACKGROUND;scrollback;type;scroll on keystroke;" +"scroll on output" -#: src/keyfile.c:229 +#: src/keyfile.c:233 msgid "Type here what you want, use it as a notice/scratch board" -msgstr "Schreiben Sie hier rein, was sie möchten. Sie können es als Notizbuch nutzen." +msgstr "" +"Schreiben Sie hier rein, was sie möchten. Sie können es als Notizbuch nutzen." -#: src/msgwindow.c:44 +#: src/msgwindow.c:47 msgid "Status messages" msgstr "Meldungen" -#: src/build.c:89 +#: src/build.c:90 #, c-format msgid "Failed to view %s (make sure it is already compiled)" msgstr "Konnte %s nicht anzeigen (die Datei muss bereits erzeugt worden sein)" -#: src/build.c:116 -#: src/build.c:277 -#: src/build.c:414 +#: src/build.c:117 src/build.c:280 src/build.c:417 #, c-format msgid "Process failed (%s)" msgstr "Prozess fehlgeschlagen (%s)" -#: src/build.c:270 +#: src/build.c:273 #, c-format msgid "%s (in directory: %s)" msgstr "%s (im Verzeichnis: %s)" -#: src/build.c:350 +#: src/build.c:353 #, c-format msgid "Failed to execute %s (make sure it is already built)" msgstr "Konnte %s nicht ausführen (die Datei muss bereits erzeugt worden sein)" -#: src/build.c:362 +#: src/build.c:365 #, c-format -msgid "Could not find terminal '%s' (check path for Terminal tool setting in Preferences)" -msgstr "Konnte das Terminalprogramm '%s' nicht finden (Pfad zum Terminalprogramm in den Einstellungen überprüfen)" +msgid "" +"Could not find terminal '%s' (check path for Terminal tool setting in " +"Preferences)" +msgstr "" +"Konnte das Terminalprogramm '%s' nicht finden (Pfad zum Terminalprogramm in " +"den Einstellungen überprüfen)" -#: src/build.c:377 +#: src/build.c:380 #, c-format msgid "Failed to change the working directory to %s" msgstr "Konnte Arbeitsverzeichnis(%s) nicht wechseln" -#: src/build.c:395 +#: src/build.c:398 #, c-format msgid "Failed to execute %s (start-script could not be created)" msgstr "Konnte %s nicht ausführen (Start-Script konnte nicht erzeugt werden)" -#: src/build.c:521 +#: src/build.c:538 msgid "compilation finished unsuccessful" msgstr "Kompilierung beendet - nicht erfolgreich." -#: src/build.c:525 +#: src/build.c:542 msgid "compilation finished successful" msgstr "Kompilierung beendet - erfolgreich." -#: src/prefs.c:195 +#: src/prefs.c:219 msgid "Action" msgstr "Aktion" -#: src/prefs.c:200 +#: src/prefs.c:224 msgid "Shortcut" msgstr "Tastenkürzel" -#: src/prefs.c:564 +#: src/prefs.c:597 msgid "Grab key" msgstr "Tasten festlegen" -#: src/prefs.c:568 +#: src/prefs.c:601 #, c-format msgid "Type the combination of the keys you want to use for \"%s\"" msgstr "Welche Tastenkomination soll für \"%s\" benutzt werden? " -#: src/prefs.c:692 +#: src/prefs.c:725 #, c-format -msgid "The combination '%s' is already used for \"%s\". Please choose another one." -msgstr "Die Tastenkombination '%s' wird bereits für \"%s\" verwendet. Bitte wählen Sie eine andere Tastenkombination. " +msgid "" +"The combination '%s' is already used for \"%s\". Please choose another one." +msgstr "" +"Die Tastenkombination '%s' wird bereits für \"%s\" verwendet. Bitte wählen " +"Sie eine andere Tastenkombination. " #: src/about.c:98 msgid "About Geany" @@ -1726,8 +1878,7 @@ msgid "Chapter" msgstr "Kapitel" -#: src/treeviews.c:67 -#: src/treeviews.c:89 +#: src/treeviews.c:67 src/treeviews.c:89 msgid "Section" msgstr "Section" @@ -1747,9 +1898,7 @@ msgid "Appendix" msgstr "Anhang" -#: src/treeviews.c:77 -#: src/treeviews.c:99 -#: src/treeviews.c:161 +#: src/treeviews.c:77 src/treeviews.c:99 src/treeviews.c:182 msgid "Other" msgstr "Sonstiges" @@ -1778,7 +1927,6 @@ msgstr "Begin" #: src/treeviews.c:105 -#: src/treeviews.c:147 msgid "Function" msgstr "Funktion" @@ -1798,56 +1946,194 @@ msgid "Our" msgstr "Our" -#: src/treeviews.c:126 -#: src/treeviews.c:151 +#: src/treeviews.c:126 src/treeviews.c:151 msgid "Methods" msgstr "Methoden" -#: src/treeviews.c:128 -#: src/treeviews.c:149 -msgid "Class" +#: src/treeviews.c:128 src/treeviews.c:149 src/treeviews.c:170 +msgid "Classes" msgstr "Klassen" #: src/treeviews.c:130 -msgid "Singleton" -msgstr "Singleton" +msgid "Singletons" +msgstr "Singletons" #: src/treeviews.c:132 -msgid "Mixin" +msgid "Mixins" msgstr "Mixin" -#: src/treeviews.c:134 -#: src/treeviews.c:155 +#: src/treeviews.c:134 src/treeviews.c:176 msgid "Variables" msgstr "Variablen" -#: src/treeviews.c:136 +#: src/treeviews.c:136 src/treeviews.c:172 msgid "Members" msgstr "Instanzvariablen" -#: src/treeviews.c:153 -msgid "Macro" -msgstr "Makro" +#: src/treeviews.c:147 src/treeviews.c:168 +msgid "Functions" +msgstr "Funktionen" -#: src/treeviews.c:157 -msgid "Namespace" -msgstr "Namensraum" +#: src/treeviews.c:174 +msgid "Macros" +msgstr "Makros" -#: src/treeviews.c:159 -msgid "Struct / Typedef" -msgstr "Strukt / Typedef" +#: src/treeviews.c:178 +msgid "Namespaces" +msgstr "Namensräume" -#: src/treeviews.c:227 -#: src/treeviews.c:279 +#: src/treeviews.c:180 +msgid "Structs / Typedefs" +msgstr "Structs / Typedefs" + +#: src/treeviews.c:254 src/treeviews.c:306 msgid "Hide" msgstr "Verbergen" -#: src/treeviews.c:235 -#: src/treeviews.c:287 +#: src/treeviews.c:262 src/treeviews.c:314 msgid "Hide sidebar" msgstr "Sidebar verbergen" -#: src/treeviews.c:267 +#: src/treeviews.c:294 msgid "Reload" msgstr "Neu laden" +#: src/keybindings.c:107 +msgid "New" +msgstr "Neu" + +#: src/keybindings.c:109 +msgid "Open" +msgstr "Öffnen" + +#: src/keybindings.c:111 +msgid "Save" +msgstr "Speichern" + +#: src/keybindings.c:115 +msgid "Close" +msgstr "Schließen" + +#: src/keybindings.c:117 +msgid "Close all" +msgstr "Alle Schließen" + +#: src/keybindings.c:119 +msgid "Reload file" +msgstr "Neu laden" + +#: src/keybindings.c:121 +msgid "Undo" +msgstr "Zurück" + +#: src/keybindings.c:123 +msgid "Redo" +msgstr "Wiederholen" + +#: src/keybindings.c:127 +msgid "Find Next" +msgstr "Weitersuchen" + +#: src/keybindings.c:129 +msgid "Find Previous" +msgstr "Vorheriges" + +#: src/keybindings.c:135 +msgid "Show Colour Chooser" +msgstr "Farbwähler öffnen" + +#: src/keybindings.c:137 +msgid "Fullscreen" +msgstr "Vollbild" + +#: src/keybindings.c:139 +msgid "Toggle Messages Window" +msgstr "Meldungsfenster verstecken" + +#: src/keybindings.c:141 +msgid "Toggle Sidebar" +msgstr "Seitenleiste ausblenden" + +#: src/keybindings.c:143 +msgid "Zoom In" +msgstr "Hineinzoomen" + +#: src/keybindings.c:145 +msgid "Zoom Out" +msgstr "Herauszoomen" + +#: src/keybindings.c:149 +msgid "Fold all" +msgstr "Alle einklappen" + +#: src/keybindings.c:151 +msgid "Unfold all" +msgstr "Alle ausklappen" + +#: src/keybindings.c:155 +msgid "Build" +msgstr "Erstellen" + +#: src/keybindings.c:159 +msgid "Build with \"make\" (custom target)" +msgstr "Mit \"make\" erstellen (eigenes Target angeben)" + +#: src/keybindings.c:163 +msgid "Run (alternative command)" +msgstr "Ausführen (alternativer Befehl)" + +#: src/keybindings.c:165 +msgid "Build options" +msgstr "Optionen bei der Erzeugung" + +#: src/keybindings.c:167 +msgid "Reload symbol list" +msgstr "Symbol-Ansicht neuladen" + +#: src/keybindings.c:169 +msgid "Switch to Editor" +msgstr "Zum Editor wechseln" + +#: src/keybindings.c:171 +msgid "Switch to Scribble" +msgstr "Zu den Notizen wechseln " + +#: src/keybindings.c:173 +msgid "Switch to VTE" +msgstr "Wechsel zur VTE" + +#: src/keybindings.c:175 +msgid "Switch to left document" +msgstr "Zum linken Dokument wechseln" + +#: src/keybindings.c:177 +msgid "Switch to right document" +msgstr "Zum rechten Dokument wechseln" + +#: src/keybindings.c:179 +msgid "Duplicate line or selection" +msgstr "Zeile oder Auswahl kopieren" + +#: src/keybindings.c:181 +msgid "Comment line" +msgstr "Zeile auskommentieren" + +#: src/keybindings.c:183 +msgid "Complete word" +msgstr "Vervollständige Wort" + +#: src/keybindings.c:185 +msgid "Show calltip" +msgstr "Calltip anzeigen" + +#: src/keybindings.c:187 +msgid "Show macro list" +msgstr "Zeige Makroliste" + +#: src/keybindings.c:189 +msgid "Suppress auto completion" +msgstr "Autovervollständigung abstellen" + +#: src/keybindings.c:191 +msgid "Find Usage" +msgstr "Auftreten finden" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

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

28 Jun '06

Revision: 498 Author: kretek Date: 2006-06-27 15:01:08 -0700 (Tue, 27 Jun 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=498&view=rev Log Message: ----------- Minor updates and "bugfixes" Modified Paths: -------------- trunk/po/ChangeLog trunk/po/de.po trunk/po/geany.pot Modified: trunk/po/ChangeLog =================================================================== --- trunk/po/ChangeLog 2006-06-27 20:43:04 UTC (rev 497) +++ trunk/po/ChangeLog 2006-06-27 22:01:08 UTC (rev 498) @@ -1,3 +1,15 @@ +2006-06-27 Frank Lanitz <frank(a)frank.uvena.de> + + * ChangeLog: Correction of format + * de.po: Minor update and a few small corrections + * geany.pot: Update of catalog + + +2006-06-27 Frank Lanitz <frank(a)frank.uvena.de> + + * ru.po: Minor update, Thanks brahmann for it + + 2006-06-19 Frank Lanitz <frank(a)frank.uvena.de> * geany.pot: Update of catalog @@ -7,6 +19,7 @@ * ru.po: Update of Russian translation by brahmann <brahmann(a)lifelogs.org.ru> + 2006-06-13 Frank Lanitz <frank(a)frank.uvena.de> * be.po: Updated fuzzy entries, fixed a lot of errors, added @@ -15,6 +28,7 @@ * geany.pot: Update of catalog * ru.po: Minor update + 2006-06-12 Frank Lanitz <frank(a)frank.uvena.de> * be.po: Added Belarusian language support contributed by @@ -24,17 +38,20 @@ * de.po: Minor update of new strings * geany.pot: Update of catalog + 2006-06-06 Frank Lanitz <frank(a)frank.uvena.de> * de.po: Minor update * geany.pot: Minor update of strings + 2006-06-01 Frank Lanitz <frank(a)frank.uvena.de> * de.po: Update for final release of geany 0.7 * ca.po: Update for final release of geany 0.7 contributed by topi <topi(a)phreaker.net> + 2006-05-29 Frank Lanitz <frank(a)frank.uvena.de> * pl.po: Added Polish language support contributed by Modified: trunk/po/de.po =================================================================== --- trunk/po/de.po 2006-06-27 20:43:04 UTC (rev 497) +++ trunk/po/de.po 2006-06-27 22:01:08 UTC (rev 498) @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: geany 0.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-06-19 13:09+0200\n" -"PO-Revision-Date: 2006-06-19 15:09+0100\n" +"POT-Creation-Date: 2006-06-27 23:28+0200\n" +"PO-Revision-Date: 2006-06-27 23:52+0100\n" "Last-Translator: Frank Lanitz <frank(a)frank.uvena.de>\n" "Language-Team: German <frank(a)frank.uvena.de>\n" "MIME-Version: 1.0\n" @@ -20,39 +20,7 @@ "X-Poedit-SourceCharset: utf-8\n" "X-Poedit-Basepath: /home/frank/svn/geany/\n" -#: src/main.c:73 -msgid "runs in debug mode (means being verbose)" -msgstr "Im Debug-Modus ausführen (sehr gesprächig)" - -#: src/main.c:74 -msgid "don't load auto completion data (see documentation)" -msgstr "Daten für Autvervollständigung nicht laden (siehe Dokumentation)" - -#: src/main.c:76 -msgid "don't open files in a running instance, force opening a new instance" -msgstr "Dateien nicht in einer laufenden Instanz öffnen, sondern eine neue Instanz dafür starten" - -#: src/main.c:78 -msgid "use an alternate configuration directory" -msgstr "Ein alternatives Konfigurationsverzeichnis benutzen" - -#: src/main.c:79 -msgid "don't show message window at startup" -msgstr "Meldungsfenster beim Start nicht anzeigen" - -#: src/main.c:81 -msgid "don't load terminal support" -msgstr "Geany ohne Terminalsupport starten" - -#: src/main.c:82 -msgid "filename of libvte.so" -msgstr "Name der libvte.so" - -#: src/main.c:84 -msgid "show version and exit" -msgstr "Versionsinformation anzeigen und Programm beenden" - -#: src/main.c:397 +#: src/main.c:389 msgid "" "Geany is exiting because a named pipe was found. Mostly this means, Geany is already running. If you know Geany is not running, you can delete the file and start Geany anyway.\n" "Delete the named pipe and start Geany?" @@ -60,27 +28,23 @@ "Geany wird beendet, da ein FIFO (named pipe) gefunden wurde. Das bedeutet meistens, dass Geany bereits läuft. Wenn Sie genau wissen, dass Geany nicht läuft, können Sie die Datei löschen und Geany trotzdem starten.\n" "Die Datei löschen und Geany starten?" -#: src/main.c:439 -msgid " - A fast and lightweight IDE" -msgstr " - Eine kleine und schnelle Entwicklungsumgebung" - -#: src/main.c:449 +#: src/main.c:429 #, c-format msgid "(built on %s with GTK %d.%d.%d, GLib %d.%d.%d)" msgstr "(kompiliert am %s mit GTK %d.%d.%d, GLib %d.%d.%d)" -#: src/main.c:522 +#: src/main.c:504 #, c-format msgid "This is Geany %s." msgstr "Willkommen zu Geany %s." -#: src/main.c:524 +#: src/main.c:506 #, c-format msgid "Configuration directory could not be created (%s)." msgstr "Konfigurationsverzeichnis konnte nicht erstellt werden (%s)." #: src/interface.c:210 -#: src/interface.c:1176 +#: src/interface.c:1171 msgid "Geany" msgstr "Geany" @@ -93,720 +57,691 @@ msgstr "Neu (aus _Vorlage)" #: src/interface.c:242 -#: src/interface.c:261 -#: src/interface.c:379 -#: src/interface.c:602 -#: src/interface.c:1561 +#: src/interface.c:319 +#: src/interface.c:384 +#: src/interface.c:607 +#: src/interface.c:1556 msgid "invisible" msgstr "invisible" -#: src/interface.c:254 -msgid "Recent _files" -msgstr "Zuletzt geöffnet" - -#: src/interface.c:277 -#: src/interface.c:714 -#: src/keybindings.c:112 +#: src/interface.c:267 +#: src/interface.c:709 msgid "Save all" msgstr "Alle speichern" -#: src/interface.c:280 +#: src/interface.c:270 msgid "Saves all open files" msgstr "Speichert alle offenen Dateien" -#: src/interface.c:308 +#: src/interface.c:298 msgid "C_lose all" msgstr "_Alle schließen" -#: src/interface.c:311 +#: src/interface.c:301 msgid "Closes all open files" msgstr "Schließt alle offenen Dateien" -#: src/interface.c:325 -#: src/interface.c:821 +#: src/interface.c:312 +msgid "Recent _files" +msgstr "Zuletzt geöffnet" + +#: src/interface.c:330 +#: src/interface.c:819 msgid "Quit Geany" msgstr "Geany beenden" -#: src/interface.c:327 +#: src/interface.c:332 msgid "_Edit" msgstr "_Bearbeiten" -#: src/interface.c:368 -#: src/interface.c:1550 +#: src/interface.c:373 +#: src/interface.c:1545 msgid "Insert \"include <...>\"" msgstr "\"include <...>\" einfügen" -#: src/interface.c:382 -#: src/interface.c:1564 +#: src/interface.c:387 +#: src/interface.c:1559 msgid "Insert Comments" msgstr "Kommentare einfügen" -#: src/interface.c:393 -#: src/interface.c:1575 +#: src/interface.c:398 +#: src/interface.c:1570 msgid "Insert ChangeLog entry" msgstr "ChangeLog-Eintrag hinzufügen" -#: src/interface.c:396 +#: src/interface.c:401 msgid "Inserts a typical ChangeLog entry in the current file" msgstr "Fügt einen typischen ChangeLog-Eintrag an den Anfang der Datei ein" -#: src/interface.c:398 -#: src/interface.c:1580 +#: src/interface.c:403 +#: src/interface.c:1575 msgid "Insert file header" msgstr "Dateikopf einfügen" -#: src/interface.c:401 -#: src/interface.c:1583 +#: src/interface.c:406 +#: src/interface.c:1578 msgid "Inserts a few information at the beginning of the file" msgstr "Fügt einen Dateiopf am Anfang einer neu erzeugten Datei ein" -#: src/interface.c:403 -#: src/interface.c:1585 +#: src/interface.c:408 +#: src/interface.c:1580 msgid "Insert function description" msgstr "Funktionsbeschreibung einfügen" -#: src/interface.c:406 -#: src/interface.c:1588 +#: src/interface.c:411 +#: src/interface.c:1583 msgid "Inserts a description before the current function" msgstr "Fügt eine Funktionsbeschreibung vor der Funktion ein." -#: src/interface.c:408 -#: src/interface.c:1590 +#: src/interface.c:413 +#: src/interface.c:1585 msgid "Insert multiline comment" msgstr "Mehrzeiligen Kommentar einfügen" -#: src/interface.c:411 -#: src/interface.c:1593 +#: src/interface.c:416 +#: src/interface.c:1588 msgid "Inserts a multiline comment" msgstr "Fügt einen mehrzeiligen Kommentar ein." -#: src/interface.c:413 -#: src/interface.c:1595 +#: src/interface.c:418 +#: src/interface.c:1590 msgid "Insert GPL notice" msgstr "GPL-Hinweis am Dateianfang einfügen" -#: src/interface.c:416 -#: src/interface.c:1598 +#: src/interface.c:421 +#: src/interface.c:1593 msgid "Inserts a GPL notice (should be done at the beginning of the file)" msgstr "Fügt einen kurzen Lizenz-Hinweis auf die GPL am Anfang einer neu erzeugten Datei ein" -#: src/interface.c:423 -#: src/interface.c:1605 +#: src/interface.c:428 +#: src/interface.c:1600 msgid "Change Selection" msgstr "Auswahl verändern" -#: src/interface.c:430 -#: src/interface.c:1612 +#: src/interface.c:435 +#: src/interface.c:1607 msgid "To lower-case" msgstr "In Kleinbuchstaben" -#: src/interface.c:434 -#: src/interface.c:1616 +#: src/interface.c:439 +#: src/interface.c:1611 msgid "To upper-case" msgstr "In Großbuchstaben" -#: src/interface.c:438 +#: src/interface.c:443 msgid "_Count words" msgstr "Wörter _zählen" -#: src/interface.c:441 +#: src/interface.c:446 msgid "Counts the words and characters in the current selection or the whole document" msgstr "Zählt die Wörter und Zeichen in der aktuellen Auswahl bzw. dem aktuellen Dokument." -#: src/interface.c:452 +#: src/interface.c:457 msgid "_Search" msgstr "_Suchen" -#: src/interface.c:463 +#: src/interface.c:468 msgid "Find _Next" msgstr "_Nächstes" -#: src/interface.c:467 +#: src/interface.c:472 msgid "Find _Previous" msgstr "_Vorheriges" -#: src/interface.c:471 -#: src/dialogs.c:907 +#: src/interface.c:476 +#: src/dialogs.c:908 msgid "_Replace" msgstr "_Ersetzen" -#: src/interface.c:484 +#: src/interface.c:489 msgid "_Go to line" msgstr "Gehe zu _Zeile" -#: src/interface.c:492 -#: src/dialogs.c:73 +#: src/interface.c:497 +#: src/dialogs.c:72 msgid "_View" msgstr "_Ansicht" -#: src/interface.c:499 +#: src/interface.c:504 msgid "Change _Font" msgstr "Schriftart _ändern" -#: src/interface.c:502 +#: src/interface.c:507 msgid "Change the default font" msgstr "Ändert die Standardschriftart für das Editor-Fenster" -#: src/interface.c:508 +#: src/interface.c:513 msgid "Show _Colour Chooser" msgstr "_Farbwähler öffnen" -#: src/interface.c:511 -#: src/interface.c:760 +#: src/interface.c:516 +#: src/interface.c:749 msgid "Open a color chooser dialog, to interactively pick colors from a palette." msgstr "Öffnet einen Farbauswahl-Dialog zum Auswählen einer Farbe von einer Palette." -#: src/interface.c:522 +#: src/interface.c:527 msgid "Full_screen" msgstr "_Vollbild" -#: src/interface.c:526 +#: src/interface.c:531 msgid "Show Messages _Window" msgstr "_Meldungsfenster anzeigen" -#: src/interface.c:529 +#: src/interface.c:534 msgid "Toggle the window with status and compiler messages on and off" msgstr "Schaltet das Meldungsfenster(beinhaltet auch Compiler-Ausgaben) ein und aus." -#: src/interface.c:532 +#: src/interface.c:537 msgid "Show _Toolbar" msgstr "_Werkzeugleiste anzeigen" -#: src/interface.c:535 +#: src/interface.c:540 msgid "Toggle the toolbar on and off" msgstr "Schaltet die Anzeige der Werkzeugleiste an und aus." -#: src/interface.c:538 +#: src/interface.c:543 msgid "Show _Markers Margin" msgstr "Markierungsrand anzeigen" -#: src/interface.c:541 +#: src/interface.c:546 msgid "Shows or hides the small margin right of the line numbers, which is used to mark lines." msgstr "Zeigt oder versteckt den kleinen Rand rechts von den Zeilennummern, der zum Anzeigen von Markierungen genutzt wird." -#: src/interface.c:544 +#: src/interface.c:549 msgid "Show _Line Numbers" msgstr "_Zeilennummern anzeigen" -#: src/interface.c:547 +#: src/interface.c:552 msgid "Shows or hides the Line Number margin." msgstr "Zeigt oder versteckt den Zeilennummernrand." -#: src/interface.c:567 +#: src/interface.c:572 msgid "_Document" msgstr "D_okument" -#: src/interface.c:574 +#: src/interface.c:579 msgid "_Line breaking" msgstr "Zeilen_umbruch" -#: src/interface.c:577 +#: src/interface.c:582 msgid "Break the line at the window border and continue it on the next line" msgstr "Zeilen am Fensterrand umbrechen und auf der nächsten Zeile fortsetzen." -#: src/interface.c:580 -msgid "_Use auto indentation" -msgstr "_Auto-Einrückung benutzen" - #: src/interface.c:585 +msgid "Use auto indentation" +msgstr "Auto-Einrückung benutzen" + +#: src/interface.c:590 msgid "Read _only" msgstr "Schreibgeschützt" -#: src/interface.c:588 +#: src/interface.c:593 msgid "Treat this file as read-only. No changes can be made." msgstr "Datei als schreibgeschützt behandeln. Keine Änderungen möglich." -#: src/interface.c:595 +#: src/interface.c:600 msgid "Set filetype" msgstr "Dateityp festlegen" -#: src/interface.c:605 +#: src/interface.c:610 msgid "Line endings" msgstr "Zeilenenden" -#: src/interface.c:612 +#: src/interface.c:617 msgid "Convert and set to CR/LF (Win)" msgstr "Auf CR/LF setzen umwandeln (Win)" -#: src/interface.c:616 +#: src/interface.c:621 msgid "Convert and set to LF (Unix)" msgstr "Auf LF setzen und umwandeln (Unix)" -#: src/interface.c:620 +#: src/interface.c:625 msgid "Convert and set to CR (Mac)" msgstr "Auf CR setzen umwandeln (Mac)" -#: src/interface.c:629 +#: src/interface.c:634 msgid "_Replace tabs by space" msgstr "_Tabulatoren durch Leerzeichen ersetzen" -#: src/interface.c:632 +#: src/interface.c:637 msgid "Replaces all tabs in document by spaces." msgstr "Ersetzt alle Tabulatoren im Dokument durch Leerzeichen" -#: src/interface.c:639 +#: src/interface.c:644 msgid "_Fold all" msgstr "Alle _einklappen" -#: src/interface.c:642 +#: src/interface.c:647 msgid "Folds all contractible code blocks" msgstr "Klappt alle ausblendbaren Codeblöcke ein" -#: src/interface.c:644 +#: src/interface.c:649 msgid "_Unfold all" msgstr "Alle _ausklappen" -#: src/interface.c:647 +#: src/interface.c:652 msgid "Unfolds all contracted code blocks" msgstr "Klappt alle ausgeblendeten Codeblöcke wieder aus" #: src/interface.c:654 -msgid "Remove all _indicators" -msgstr "Alle Markierungen löschen" - -#: src/interface.c:657 -msgid "Removes all set indicators in the current document." -msgstr "Entfernt alle gesetzten Markierungen innerhalb des Dokumentes." - -#. build the code -#: src/interface.c:659 -#: src/dialogs.c:522 msgid "_Build" msgstr "_Erstellen" -#: src/interface.c:663 +#: src/interface.c:658 msgid "_Help" msgstr "_Hilfe" -#: src/interface.c:674 +#: src/interface.c:669 msgid "_Keyboard shortcuts" msgstr "_Tastenkürzel" -#: src/interface.c:677 +#: src/interface.c:672 msgid "Shows a list of all keyboard shortcuts for Geany." msgstr "Zeige eine Übersicht mit allen Tastenkürzeln für Geany." -#: src/interface.c:679 +#: src/interface.c:674 msgid "_Website" msgstr "_Webseite" -#: src/interface.c:702 +#: src/interface.c:697 msgid "Create a new file" msgstr "Neue Datei anlegen" -#: src/interface.c:707 +#: src/interface.c:702 msgid "Open an existing file" msgstr "Öffnet eine existierende Datei" -#: src/interface.c:712 +#: src/interface.c:707 msgid "Save the current file" msgstr "Speichert die aktuelle Datei" -#: src/interface.c:717 +#: src/interface.c:712 msgid "Save all open files" msgstr "Speichere alle offenen Dateien" -#: src/interface.c:726 +#: src/interface.c:717 msgid "Reload the current file from disk" msgstr "Liest die aktuelle Datei neu ein." -#: src/interface.c:731 +#: src/interface.c:722 msgid "Close the current file" msgstr "Schließt die aktuelle Datei" -#: src/interface.c:739 -#: src/keybindings.c:150 -msgid "Compile" -msgstr "Kompilieren" - -#: src/interface.c:742 +#: src/interface.c:731 msgid "Compile the current file" msgstr "Kompiliert die aktuelle Datei" -#: src/interface.c:746 -#: src/keybindings.c:158 +#: src/interface.c:735 msgid "Run" msgstr "Ausführen" -#: src/interface.c:749 -#: src/dialogs.c:561 +#: src/interface.c:738 +#: src/dialogs.c:560 msgid "Run or view the current file" msgstr "Aktuelle Datei anzeigen oder ausführen" -#: src/interface.c:757 +#: src/interface.c:746 msgid "Color" msgstr "Farbwähler" -#: src/interface.c:769 +#: src/interface.c:758 msgid "Zoom in the text" msgstr "Text vergrößern" -#: src/interface.c:774 +#: src/interface.c:763 msgid "Zoom out the text" msgstr "Text verkleinern" -#: src/interface.c:787 -#: src/interface.c:792 +#: src/interface.c:776 +#: src/interface.c:781 msgid "Find the entered text in the current file" msgstr "Findet den eingegebenen Text im aktuellen Dokument" -#: src/interface.c:805 +#: src/interface.c:794 msgid "Enter a line number and jump to it." msgstr "Geben Sie die Zeile an, zu der Sie springen möchten." -#: src/interface.c:812 +#: src/interface.c:801 msgid "Jump to the entered line number." msgstr "Springe zu angegebener Zeile" -#: src/interface.c:848 +#: src/interface.c:846 #: src/treeviews.c:40 msgid "Symbols" msgstr "Symbole" -#: src/interface.c:861 +#: src/interface.c:859 #: src/treeviews.c:180 msgid "Open files" msgstr "Geöffnete Dateien" -#: src/interface.c:896 +#: src/interface.c:894 msgid "Status" msgstr "Status" -#: src/interface.c:910 +#: src/interface.c:908 msgid "Compiler" msgstr "Compiler" -#: src/interface.c:924 +#: src/interface.c:922 msgid "Messages" msgstr "Meldungen" -#: src/interface.c:937 +#: src/interface.c:935 msgid "Scribble" msgstr "Notizen" -#: src/interface.c:1371 +#: src/interface.c:1366 msgid "Images and text" msgstr "Icons und Text" -#: src/interface.c:1377 +#: src/interface.c:1372 msgid "Images only" msgstr "Nur Icons" -#: src/interface.c:1383 +#: src/interface.c:1378 msgid "Text only" msgstr "Nur Text" -#: src/interface.c:1394 +#: src/interface.c:1389 msgid "Large icons" msgstr "Große Symbole" -#: src/interface.c:1398 +#: src/interface.c:1393 msgid "Small icons" msgstr "Kleine Symbole" -#: src/interface.c:1407 +#: src/interface.c:1402 msgid "Hide toolbar" msgstr "Toolbar verbergen" -#: src/interface.c:1578 +#: src/interface.c:1573 msgid "Inserts a typical ChangeLog entry in the current " msgstr "ChangeLog-Eintrag hinzufügen" -#: src/interface.c:1625 +#: src/interface.c:1620 msgid "Find usage" msgstr "Auftreten finden" -#: src/interface.c:1633 -#: src/keybindings.c:190 -msgid "Go to tag definition" -msgstr "Gehe zu Tag Definition" - -#: src/interface.c:1637 -#: src/keybindings.c:192 +#: src/interface.c:1628 msgid "Go to tag declaration" msgstr "Gehe zu Tag Deklaration" -#: src/interface.c:1646 -#: src/dialogs.c:764 -#: src/keybindings.c:130 +#: src/interface.c:1632 +msgid "Go to tag definition" +msgstr "Gehe zu Tag Definition" + +#: src/interface.c:1641 +#: src/dialogs.c:763 msgid "Go to line" msgstr "Gehe zu Zeile" -#: src/interface.c:1649 +#: src/interface.c:1644 msgid "Goto to the entered line" msgstr "Springe zu angegebener Zeile" -#: src/interface.c:1895 -#: src/keybindings.c:122 +#: src/interface.c:1889 msgid "Preferences" msgstr "Einstellungen" -#: src/interface.c:1931 +#: src/interface.c:1925 msgid "Recent files list length:" msgstr "Anzahl der \"Zuletzt geöffneten\" Dateien" -#: src/interface.c:1939 +#: src/interface.c:1933 msgid "Specifies the number of files which are stored in the Recent files list." msgstr "Gibt die Länge der Liste von Dateien an, die zuletzt geöffnet wurden." -#: src/interface.c:1943 +#: src/interface.c:1937 msgid "Load files from the last session" msgstr "Dateien aus der letzten Sitzung laden" -#: src/interface.c:1947 +#: src/interface.c:1941 msgid "Opens at startup the files from the last session" msgstr "Lädt die geöffneten Dateien aus der letzten Sitzung" -#: src/interface.c:1950 +#: src/interface.c:1944 msgid "Save window position and geometry" msgstr "Fensterposition und -größe speichern" -#: src/interface.c:1954 +#: src/interface.c:1948 msgid "Saves the window position and geometry and restores it at the start" msgstr "Speichert die Fensterposition und -größe" -#: src/interface.c:1957 +#: src/interface.c:1951 msgid "Beep on errors or when compilation has finished" msgstr "Bei Fehlern oder beendeter Kompilierung Piepton ausgeben" -#: src/interface.c:1960 +#: src/interface.c:1954 msgid "Whether to beep if an error occured or when the compilation process has finished." msgstr "Soll bei Fehlern oder beendeter Kompilierung ein Piepton ausgegeben werden?" -#: src/interface.c:1963 +#: src/interface.c:1957 msgid "Switch to status message list at new message" msgstr "Wechsele zum Statusmeldungsfenster bei neuer Meldung" -#: src/interface.c:1966 +#: src/interface.c:1960 msgid "Switch to the status message tab(in the notebook window at the bottom) if a new status message arrive." msgstr "Automatisch zu dem Statusmeldungs-Reiter im unteren Fenster wechseln, wenn eine neue Statusmeldung vorliegt." -#: src/interface.c:1969 +#: src/interface.c:1963 msgid "Load virtual terminal emulation at startup" msgstr "Starte die Virtual Terminal Emulation beim Starten" -#: src/interface.c:1971 +#: src/interface.c:1965 msgid "Whether the virtual terminal emulation(VTE) should be loaded at startup. Disable it if you do not need it." msgstr "Stellt ein, ob die Virtual Terminal Emulation beim Starten geladen werden soll oder nicht. Wenn sie nicht benötigt wird, sollte dieser Punkt deaktiviert werden" -#: src/interface.c:1974 +#: src/interface.c:1968 msgid "Confirm exit" msgstr "Beenden bestätigen" -#: src/interface.c:1978 +#: src/interface.c:1972 msgid "Shows a confirmation dialog on exit." msgstr "Zeigt einen Bestätigungsdialog vor dem Beenden." -#: src/interface.c:1985 +#: src/interface.c:1979 msgid "Placement of new file tabs: " msgstr "Platzierung neuer Dateien:" -#: src/interface.c:1989 +#: src/interface.c:1983 msgid "Left" msgstr "Links" -#: src/interface.c:1992 +#: src/interface.c:1986 msgid "New file tabs will be placed to the left of the tab list" msgstr "Neue Dateien werden links von der Datei-Liste platziert." -#: src/interface.c:2001 +#: src/interface.c:1995 msgid "Right" msgstr "Rechts" -#: src/interface.c:2004 +#: src/interface.c:1998 msgid "New file tabs will be placed to the right of the tab list" msgstr "Neue Dateien werden rechts von der Datei-Liste platziert." -#: src/interface.c:2008 -#: src/interface.c:2339 +#: src/interface.c:2002 +#: src/interface.c:2327 msgid "Miscellaneous" msgstr "Verschiedenes" -#: src/interface.c:2032 +#: src/interface.c:2026 msgid "Show search field" msgstr "Zeige Such-Feld" -#: src/interface.c:2036 +#: src/interface.c:2030 msgid "Display the search field and button in the toolbar" msgstr "Zeige das Suchfeld in der Werkzeugleiste" -#: src/interface.c:2039 +#: src/interface.c:2033 msgid "Show goto line field" msgstr "Zeilennummereingabefeld anzeigen" -#: src/interface.c:2043 +#: src/interface.c:2037 msgid "Display the line number field and button in the toolbar" msgstr "Zeige das Zeilennummereingabefeld in der Werkzeugleiste" -#: src/interface.c:2046 +#: src/interface.c:2040 msgid "Toolbar" msgstr "Werkzeugleiste" -#: src/interface.c:2070 +#: src/interface.c:2064 msgid "Show symbol list" msgstr "Symbol-Ansicht anzeigen" +#: src/interface.c:2067 #: src/interface.c:2073 -#: src/interface.c:2079 msgid "Toggle the symbol list on and off" msgstr "Schaltet die Symbol-Ansicht ein und aus." -#: src/interface.c:2076 +#: src/interface.c:2070 msgid "Show open files list" msgstr "Zeige Liste mit geöffneten Dateien" -#: src/interface.c:2082 +#: src/interface.c:2076 msgid "Sidebar" msgstr "Seitenleiste" -#: src/interface.c:2108 +#: src/interface.c:2102 msgid "Symbol list font" msgstr "Schriftart der Symbol-Liste" -#: src/interface.c:2115 +#: src/interface.c:2109 msgid "Message window font" msgstr "Schriftart des Meldungsfenster" -#: src/interface.c:2127 +#: src/interface.c:2121 msgid "Sets the font for the message window" msgstr "Ändert die Schriftart für das Meldungsfenster" -#: src/interface.c:2135 +#: src/interface.c:2129 msgid "Sets the font for symbol list window" msgstr "Ändert die Schriftart für die Symbol-Ansicht" -#: src/interface.c:2138 +#: src/interface.c:2132 msgid "Fonts" msgstr "Schriftarten" -#: src/interface.c:2143 +#: src/interface.c:2137 msgid "General" msgstr "Allgemein" -#: src/interface.c:2171 +#: src/interface.c:2165 msgid "Tab Width" msgstr "Tabulator-Breite" -#: src/interface.c:2184 +#: src/interface.c:2178 msgid "The width in chars, which one tab character will take" msgstr "Die Breite in Zeichen, die ein Tabalutar-Zeichen einnimmt" -#: src/interface.c:2189 +#: src/interface.c:2183 msgid "New files" msgstr "Neue Dateien" -#: src/interface.c:2208 +#: src/interface.c:2202 msgid "Strip trailing spaces" msgstr "Leerzeichen am Zeilenende entfernen" -#: src/interface.c:2212 +#: src/interface.c:2206 msgid "Removes trailing spaces and tabs and the end of lines" msgstr "Entfernt Leerzeichen an Zeilenenden" -#: src/interface.c:2215 +#: src/interface.c:2209 msgid "Ensure new line at file end" msgstr "Neue Zeile am Dateiende" -#: src/interface.c:2219 +#: src/interface.c:2213 msgid "Ensures that at the end of the file is a new line" msgstr "Fügt am Dateiende eine neue Zeile an (wenn keine vorhanden ist)" -#: src/interface.c:2222 +#: src/interface.c:2216 msgid "Saving files" msgstr "Speichern" -#: src/interface.c:2241 +#: src/interface.c:2235 msgid "Show indentation guides" msgstr "Zeige Einrückungshinweise" -#: src/interface.c:2244 +#: src/interface.c:2238 msgid "Shows small dotted lines to help you to use the right indentation." msgstr "Blendet punktierte Linien ein, um die Einrückung zu erleichtern." -#: src/interface.c:2247 +#: src/interface.c:2241 msgid "Show white space" msgstr "Zeige Leerzeichen" -#: src/interface.c:2250 +#: src/interface.c:2244 msgid "Marks spaces with dots and tabs with arrows." msgstr "Markiert Leerzeichen mit Punkten und Tabulatoren mit kleinen Pfeilen." -#: src/interface.c:2253 +#: src/interface.c:2247 msgid "Show line endings" msgstr "Zeilenenden anzeigen" -#: src/interface.c:2256 +#: src/interface.c:2250 msgid "Show the line ending character" msgstr "Zeilenende-Zeichen anzeigen" -#: src/interface.c:2259 +#: src/interface.c:2253 msgid "XML tag auto completion" msgstr "XML-Tag Autovervollständigung" -#: src/interface.c:2262 +#: src/interface.c:2256 msgid "Automatic completion of open XML tags(includes HTML tags)" msgstr "Autovervollständigung von offenen XML-Tags, das schließt auch HTML-Tags ein." -#: src/interface.c:2265 +#: src/interface.c:2259 msgid "Construct auto completion" msgstr "Autovervollständigung von Konstrukten" -#: src/interface.c:2268 +#: src/interface.c:2262 msgid "Automatic completion of often used constructs like if and for" msgstr "Autovervollständigung von häufig benutzten Konstrukten wie if, for und switch." -#: src/interface.c:2271 +#: src/interface.c:2265 msgid "Enable folding" msgstr "Code-Ausblendung aktivieren" -#: src/interface.c:2274 +#: src/interface.c:2268 msgid "Whether to enable folding the code" msgstr "Soll Code-Ausblendung aktiviert werden?" -#: src/interface.c:2277 -msgid "Use indicators to show compile errors" -msgstr "Benutzt Markierungen, um Probleme beim Kompilieren anzuzeigen. " - -#: src/interface.c:2280 -msgid "Whether to use indicators(a squiggly underline) to highlight the lines, where the compiler found a warning or an error." -msgstr "Benutzt Markierungen (wellige Unterstreichungen) um die Zeilen zu markieren, in denen Fehler beim Kompilieren aufgetreten sind. " - -#: src/interface.c:2293 +#: src/interface.c:2281 msgid "Editor font" msgstr "Editor-Schriftart" -#: src/interface.c:2300 +#: src/interface.c:2288 msgid "Long line marker" msgstr "Long line marker" -#: src/interface.c:2307 +#: src/interface.c:2295 msgid "Long line marker color" msgstr "Long line marker color" -#: src/interface.c:2319 +#: src/interface.c:2307 msgid "Sets the font for the editors windows" msgstr "Ändert die Schriftart des Editors" -#: src/interface.c:2327 +#: src/interface.c:2315 msgid "The long line marker is a thin vertical line in the editor. It helps to mark long lines, or as a hint to break the line. To disable set the value to 0, or greater than 0 to specify the column where it should appear." msgstr "Der \"long line marker\" ist eine dünne Linie im Editorfenster. Sie hilft dabei, lange Zeilen zu markieren und dabei auf einen eventuell notwendigen Zeilenumbruch hinzuweißen. Um sie zu deaktivieren, setzen Sie den Wert auf 0. Werte größer als 0 geben hingegen die Spalte an, in der die Linie angezeigt werden soll. " -#: src/interface.c:2336 +#: src/interface.c:2324 msgid "Sets the color of the long line marker" msgstr "Stellt die Farbe des \"long line markers\" ein." -#: src/interface.c:2337 -#: src/dialogs.c:478 -#: src/dialogs.c:1707 -#: src/dialogs.c:1714 +#: src/interface.c:2325 +#: src/dialogs.c:477 +#: src/dialogs.c:1708 +#: src/dialogs.c:1715 msgid "Color Chooser" msgstr "Farb-Wähler" -#: src/interface.c:2344 +#: src/interface.c:2332 msgid "Editor" msgstr "Editor" -#: src/interface.c:2352 +#: src/interface.c:2340 msgid "" "Enter here the paths to the make tool and the compiler\n" "(tools you do not need can be let blank)" @@ -814,37 +749,37 @@ "Geben Sie hier die Pfade für make und die Compiler an\n" "(Programme, die nicht benötigt werden, können Sie frei lassen)" -#: src/interface.c:2363 +#: src/interface.c:2351 msgid "Make" msgstr "Make" -#: src/interface.c:2370 -#: src/dialogs.c:1757 +#: src/interface.c:2358 +#: src/dialogs.c:1758 #: src/vte.c:163 msgid "Terminal" msgstr "Terminal" -#: src/interface.c:2377 +#: src/interface.c:2365 msgid "Browser" msgstr "Browser" -#: src/interface.c:2389 +#: src/interface.c:2377 msgid "Path and options for the make tool" msgstr "Pfad und spezielle Optionen und / oder Targets für \"make\" angeben." -#: src/interface.c:2396 +#: src/interface.c:2384 msgid "A terminal emulator like xterm, gnome-terminal or konsole (should accept the -e argument)" msgstr "Ein Terminal-Emulator wie z.B. xterm, gnome-terminal oder konsole (es sollte die Option -e akzeptieren)" -#: src/interface.c:2403 +#: src/interface.c:2391 msgid "Path (and possibly additional arguments) to your favorite browser" msgstr "Pfad und evtl. Argumente zu Ihrem Lieblingsbrowser" -#: src/interface.c:2435 +#: src/interface.c:2423 msgid "Tools" msgstr "Werkzeuge" -#: src/interface.c:2443 +#: src/interface.c:2431 msgid "" "Specify here information you want to use in templates.\n" "See documentation if you don't know, how templates work." @@ -852,47 +787,47 @@ "Geben Sie hier die Informationen an, die in Vorlagen benutzt werden sollen.\n" "Konsultieren Sie die Dokumentation, um mehr über Vorlagen zu erfahren." -#: src/interface.c:2459 +#: src/interface.c:2447 msgid "email address of the developer" msgstr "eMail-Adresse des Entwicklers" -#: src/interface.c:2466 +#: src/interface.c:2454 msgid "Initials of the developer name" msgstr "Initialen des Entwicklernames" -#: src/interface.c:2468 +#: src/interface.c:2456 msgid "Initial Version" msgstr "Anfangsversion" -#: src/interface.c:2480 +#: src/interface.c:2468 msgid "Version number, which a new file initially has" msgstr "Versionsnummer, die eine neue Datei zu Beginn hat" -#: src/interface.c:2487 +#: src/interface.c:2475 msgid "Company name" msgstr "Firmenname" -#: src/interface.c:2489 +#: src/interface.c:2477 msgid "Developer" msgstr "Entwickler" -#: src/interface.c:2496 +#: src/interface.c:2484 msgid "Company" msgstr "Firma" -#: src/interface.c:2503 +#: src/interface.c:2491 msgid "Mail address" msgstr "Mail-Adresse" -#: src/interface.c:2510 +#: src/interface.c:2498 msgid "Initials" msgstr "Initialen" -#: src/interface.c:2522 +#: src/interface.c:2510 msgid "The name of the developer" msgstr "Der Name des Entwicklers" -#: src/interface.c:2524 +#: src/interface.c:2512 msgid "" "Notice: For all changes you make here,\n" "you need to restart Geany to take effect." @@ -900,28 +835,28 @@ "Hinweis: Sie müssen Geany neustarten,\n" "wenn Sie hier Änderungen vornehmen." -#: src/interface.c:2528 +#: src/interface.c:2516 msgid "Templates" msgstr "Vorlagen" -#: src/interface.c:2536 +#: src/interface.c:2524 msgid "Here you can change keyboard shortcuts for various actions. Just double click on a action or select one and press the Change button to enter a new shortcut. You can also edit the string representation of the shortcut directly." msgstr "Hier können die Tastenkominationen für verschiedene Aktionen innerhalb Geanys festgelegt bzw. verändert werden. Um die Tastenkombinationen zu ändern, einfach Doppelklicken oder markieren und auf Ändern klicken. Zudem können die Tastenkombinationen auch direkt eingegeben werden. " -#: src/interface.c:2559 +#: src/interface.c:2547 msgid "Change" msgstr "Ändern" -#: src/interface.c:2563 +#: src/interface.c:2551 msgid "Keybindings" msgstr "Tastenkürzel" -#: src/callbacks.c:210 -#: src/callbacks.c:225 +#: src/callbacks.c:204 +#: src/callbacks.c:219 msgid "Do you really want to quit?" msgstr "Möchten Sie wirklich beenden?" -#: src/callbacks.c:460 +#: src/callbacks.c:459 #, c-format msgid "" "Are you sure you want to reload '%s'?\n" @@ -930,35 +865,35 @@ "Sind Sie sicher, dass Sie '%s' neuladen möchten?\n" "Alle ungespeicherten Änderungen gehen verloren." -#: src/callbacks.c:850 +#: src/callbacks.c:849 #, c-format msgid "The file '%s' already exists. Do you want to overwrite it?" msgstr "Die Datei '%s' existiert bereits. Möchten Sie sie überschreiben?" -#: src/callbacks.c:1313 -#: src/callbacks.c:1322 +#: src/callbacks.c:1315 +#: src/callbacks.c:1324 #, c-format msgid "Declaration or definition of \"%s()\" not found" msgstr "Deklaration oder Definition von '%s' nicht gefunden." -#: src/callbacks.c:1634 +#: src/callbacks.c:1633 msgid "Failed to execute the view program" msgstr "Konnte das Anzeigeprogramm nicht ausführen" -#: src/callbacks.c:1645 +#: src/callbacks.c:1641 msgid "Failed to execute the terminal program" msgstr "Konnte das Terminal-Programm nicht ausführen" #. initialize the dialog -#: src/callbacks.c:1968 -#: src/dialogs.c:70 +#: src/callbacks.c:1979 +#: src/dialogs.c:69 msgid "Open File" msgstr "Datei öffnen" -#: src/callbacks.c:2017 -#: src/callbacks.c:2062 -#: src/callbacks.c:2102 -#: src/callbacks.c:2162 +#: src/callbacks.c:2028 +#: src/callbacks.c:2078 +#: src/callbacks.c:2118 +#: src/callbacks.c:2178 msgid "Please set the filetype for the current file before using this function." msgstr "Bitte legen Sie den Dateityp fest, bevor Sie diese Funktion benutzen. " @@ -968,50 +903,50 @@ msgid "Couldn't find pixmap file: %s" msgstr "Konnte PixMap %s nicht finden." -#: src/dialogs.c:75 +#: src/dialogs.c:74 msgid "Opens the file in read-only mode. If you choose more than one file to open, all files will be opened read-only." msgstr "Öffnet die Datei als schreibgeschützt. Wenn Sie mehrere Dateien wählen, werden alle schreibgeschützt geöffnet." -#: src/dialogs.c:111 +#: src/dialogs.c:110 msgid "Detect by file extension " msgstr "Durch Dateiendung erkennen" -#: src/dialogs.c:164 +#: src/dialogs.c:163 msgid "Save File" msgstr "Datei speichern" -#: src/dialogs.c:216 +#: src/dialogs.c:215 #, c-format msgid "There is a limit of %d concurrent open tabs." msgstr "Es dürfen maximal %d Datei gleichzeitg geöffnet sein." -#: src/dialogs.c:217 +#: src/dialogs.c:216 msgid "error: too many open files" msgstr "Fehler: zu viele offene Dateien" -#: src/dialogs.c:240 +#: src/dialogs.c:239 #, c-format msgid "The match \"%s\" was not found. Wrap search around the document?" msgstr "\"%s\" wurde nicht gefunden. Am Anfang des Dokumentes beginnen?" -#: src/dialogs.c:243 -#: src/dialogs.c:1825 +#: src/dialogs.c:242 +#: src/dialogs.c:1826 msgid "Question" msgstr "Frage" -#: src/dialogs.c:272 +#: src/dialogs.c:271 msgid "Information" msgstr "Information" -#: src/dialogs.c:297 -#: src/dialogs.c:329 -#: src/dialogs.c:1268 +#: src/dialogs.c:296 +#: src/dialogs.c:328 +#: src/dialogs.c:1269 #: src/win32.c:217 #: src/win32.c:378 msgid "Error" msgstr "Fehler" -#: src/dialogs.c:321 +#: src/dialogs.c:320 #, c-format msgid "" "The file '%s' is not saved.\n" @@ -1020,7 +955,7 @@ "%s ist nicht gespeichert.\n" "Möchten Sie die Datei vor dem Beenden speichern?" -#: src/dialogs.c:326 +#: src/dialogs.c:325 msgid "" "The file is not saved.\n" "Do you want to save it before closing?" @@ -1028,27 +963,27 @@ "Die Datei ist nicht gespeichert.\n" "Möchten Sie die Datei vor dem Beenden speichern?" -#: src/dialogs.c:343 +#: src/dialogs.c:342 msgid "Don't save" msgstr "Nicht speichern" -#: src/dialogs.c:395 +#: src/dialogs.c:394 msgid "Choose font" msgstr "Schriftart auswählen" -#: src/dialogs.c:434 +#: src/dialogs.c:433 msgid "Word Count" msgstr "Wörter zählen" -#: src/dialogs.c:443 +#: src/dialogs.c:442 msgid "selection" msgstr "Auswahl" -#: src/dialogs.c:451 +#: src/dialogs.c:450 msgid "whole document" msgstr "Ganzes Dokument" -#: src/dialogs.c:453 +#: src/dialogs.c:452 #, c-format msgid "" "Range:\t\t%s\n" @@ -1064,204 +999,203 @@ "Zeichen:\t\t%d\n" #. compile the code -#: src/dialogs.c:506 -msgid "_Compile" -msgstr "_Kompilieren" +#: src/dialogs.c:505 +msgid "Compile" +msgstr "Kompilieren" -#: src/dialogs.c:509 +#: src/dialogs.c:508 msgid "Compiles the current file" msgstr "Kompiliert die aktuelle Datei" -#: src/dialogs.c:526 +#. build the code +#: src/dialogs.c:521 +msgid "Build" +msgstr "Erstellen" + +#: src/dialogs.c:525 msgid "Builds the current file (generate an executable file)" msgstr "Erstellt die aktuelle Datei(erzeugt eine ausführbare Datei)" #. build the code with make all -#: src/dialogs.c:535 -#: src/dialogs.c:632 -#: src/keybindings.c:154 +#: src/dialogs.c:534 +#: src/dialogs.c:631 msgid "Build with \"make\"" msgstr "Mit \"make\" erstellen" -#: src/dialogs.c:538 -#: src/dialogs.c:635 +#: src/dialogs.c:537 +#: src/dialogs.c:634 msgid "Builds the current file with the make tool and the default target" msgstr "Erstellt die aktuelle Datei mit \"make\" und dem Default-Target" #. build the code with make -#: src/dialogs.c:546 -msgid "Build with \"_make\" (custom _target)" +#: src/dialogs.c:545 +#: src/dialogs.c:642 +msgid "Build with make (custom target)" msgstr "Mit \"make\" erstellen (eigenes Target angeben)" -#: src/dialogs.c:552 -#: src/dialogs.c:649 +#: src/dialogs.c:551 +#: src/dialogs.c:648 msgid "Builds the current file with the make tool and the specified target" msgstr "Erstellt die aktuelle Datei mit \"make\" und dem angegebenem Target" -#: src/dialogs.c:578 -#: src/dialogs.c:1106 +#: src/dialogs.c:577 +#: src/dialogs.c:1107 msgid "Set Includes and Arguments" msgstr "Programm-Parameter angeben" -#: src/dialogs.c:585 +#: src/dialogs.c:584 msgid "Sets the includes and library paths for the compiler and the program arguments for execution" msgstr "Include-Dateien und Bibliotheken-Pfade sowie Programmparameter festlegen" #. DVI -#: src/dialogs.c:606 +#: src/dialogs.c:605 msgid "LaTeX -> DVI" msgstr "LaTeX -> DVI" -#: src/dialogs.c:609 +#: src/dialogs.c:608 msgid "Compiles the current file into a DVI file" msgstr "Kompiliert die aktuelle Datei als DVI-Datei" #. PDF -#: src/dialogs.c:619 +#: src/dialogs.c:618 msgid "LaTeX -> PDF" msgstr "LaTeX -> PDF" -#: src/dialogs.c:622 +#: src/dialogs.c:621 msgid "Compiles the current file into a PDF file" msgstr "Kompiliert die aktuelle Datei als PDF-Datei" -#. build the code with make -#: src/dialogs.c:643 -msgid "Build with make (custom target)" -msgstr "Mit \"make\" erstellen (eigenes Target angeben)" - #. DVI view -#: src/dialogs.c:654 +#: src/dialogs.c:653 msgid "View DVI file" msgstr "DVI-Datei anzeigen" -#: src/dialogs.c:660 -#: src/dialogs.c:673 +#: src/dialogs.c:659 +#: src/dialogs.c:672 msgid "Compiles and view the current file" msgstr "Kompiliert und zeigt die aktuelle Datei an" #. PDF view -#: src/dialogs.c:667 +#: src/dialogs.c:666 msgid "View PDF file" msgstr "PDF-Datei anzeigen" #. arguments -#: src/dialogs.c:686 -#: src/dialogs.c:999 +#: src/dialogs.c:685 +#: src/dialogs.c:1000 msgid "Set Arguments" msgstr "Programm-Parameter angeben" -#: src/dialogs.c:693 +#: src/dialogs.c:692 msgid "Sets the program paths and arguments" msgstr "Programm-Parameter angeben" -#: src/dialogs.c:734 +#: src/dialogs.c:733 msgid "Enter custom options for the make tool" msgstr "Spezielle Optionen / Targets für \"make\" angeben." -#: src/dialogs.c:739 +#: src/dialogs.c:738 msgid "Enter custom options here, all entered text is passed to the make command." msgstr "Alles was Sie hier angeben, wird direkt an \"make\" übergeben." -#: src/dialogs.c:769 +#: src/dialogs.c:768 msgid "Enter the line you want to go to" msgstr "Geben Sie die Zeile an, zu der Sie springen möchten" -#: src/dialogs.c:801 +#: src/dialogs.c:800 msgid "Find" msgstr "Suchen" -#: src/dialogs.c:806 -#: src/dialogs.c:912 +#: src/dialogs.c:805 +#: src/dialogs.c:913 msgid "Enter the search text here" msgstr "Geben Sie hier den Suchbegriff ein" -#: src/dialogs.c:827 -#: src/dialogs.c:945 +#: src/dialogs.c:826 +#: src/dialogs.c:946 msgid "_Case sensitive" msgstr "Groß- / Kleinschreibung beachten" -#: src/dialogs.c:832 -#: src/dialogs.c:950 +#: src/dialogs.c:831 +#: src/dialogs.c:951 msgid "Match only a _whole word" msgstr "Nur ganze Wörter finden" -#: src/dialogs.c:837 -#: src/dialogs.c:955 +#: src/dialogs.c:836 +#: src/dialogs.c:956 msgid "_Use regular expressions" msgstr "Reguläre Ausdrücke benutzen" -#: src/dialogs.c:842 -#: src/dialogs.c:960 +#: src/dialogs.c:841 +#: src/dialogs.c:961 msgid "For detailed information about using regular expressions, please read the documentation." msgstr "Für weitere Informationen über reguläre Ausdrücke lesen Sie bitte die Dokumentation." -#: src/dialogs.c:844 -#: src/dialogs.c:962 +#: src/dialogs.c:843 +#: src/dialogs.c:963 msgid "_Search backwards" msgstr "Rückwärts suchen" -#: src/dialogs.c:849 -#: src/dialogs.c:967 +#: src/dialogs.c:848 +#: src/dialogs.c:968 msgid "Match only word s_tart" msgstr "Nur Wort_anfänge finden" -#: src/dialogs.c:894 -#: src/keybindings.c:128 +#: src/dialogs.c:895 msgid "Replace" msgstr "Ersetzen" -#: src/dialogs.c:897 +#: src/dialogs.c:898 msgid "_In Selection" msgstr "_Auswahl ersetzen" -#: src/dialogs.c:899 +#: src/dialogs.c:900 msgid "Replace all matches found in the currently selected text" msgstr "Ersetze alle Treffer im aktuell markierten Text" -#: src/dialogs.c:903 +#: src/dialogs.c:904 msgid "Replace _All" msgstr "_Alle ersetzen" -#: src/dialogs.c:916 +#: src/dialogs.c:917 msgid "Enter the replace text here" msgstr "Geben Sie hier den Ersetzungstext ein" -#: src/dialogs.c:1004 +#: src/dialogs.c:1005 msgid "" "Set programs and options for compilation and viewing (La)TeX files.\n" "The filename is appended automatically at the end.\n" msgstr "" -"Set programs and options for compilation and viewing (La)TeX files.\n" -"The filename is appended automatically at the end.\n" +"Setzt Programme und deren Optionen zum Kompilieren bzw. Betrachten von (La)TeX-Dateien.\n" +"Der jeweilige Dateiname wird bei einem Aufruf automatisch an das Ende angefügt. \n" -#: src/dialogs.c:1012 +#: src/dialogs.c:1013 msgid "Enter here the (La)TeX command (for DVI creation) and some useful options." msgstr "Geben Sie hier den Befehl und dessen Optionen, für die DVI-Erzeugung, an." -#: src/dialogs.c:1033 +#: src/dialogs.c:1034 msgid "Enter here the (La)TeX command (for PDF creation) and some useful options." msgstr "Geben Sie hier den Befehl und dessen Optionen, für die PDF-Erzeugung, an." -#: src/dialogs.c:1054 +#: src/dialogs.c:1055 msgid "Enter here the (La)TeX command (for DVI preview) and some useful options." msgstr "Geben Sie hier den Befehl und dessen Optionen, für die DVI-Anzeige, an." -#: src/dialogs.c:1075 +#: src/dialogs.c:1076 msgid "Enter here the (La)TeX command (for PDF preview) and some useful options." msgstr "Geben Sie hier den Befehl und dessen Optionen, für die PDF-Anzeige, an." -#: src/dialogs.c:1111 +#: src/dialogs.c:1112 msgid "Sets the includes and library paths for the compiler and the program arguments for execution\n" msgstr "Include-Dateien und Bibliotheken-Pfade sowie Programmparameter festlegen.\n" -#: src/dialogs.c:1120 +#: src/dialogs.c:1121 msgid "Enter here arguments to your compiler." msgstr "Geben Sie hier Paramter für den Compiler an." -#: src/dialogs.c:1126 -#: src/dialogs.c:1149 -#: src/dialogs.c:1173 +#: src/dialogs.c:1127 +#: src/dialogs.c:1150 +#: src/dialogs.c:1174 #, c-format msgid "" "%f will be replaced by the complete filename\n" @@ -1276,24 +1210,24 @@ "%f -> test_datei.c\n" "%e -> test_datei" -#: src/dialogs.c:1143 +#: src/dialogs.c:1144 msgid "Enter here arguments to your linker." msgstr "Geben Sie hier Parameter für den Linker an." #. program-args -#: src/dialogs.c:1167 +#: src/dialogs.c:1168 msgid "Enter here arguments to your program." msgstr "Geben Sie hier Parameter für Ihr Programm an." -#: src/dialogs.c:1212 +#: src/dialogs.c:1213 msgid "Show _hidden files" msgstr "_Versteckte Dateien anzeigen" -#: src/dialogs.c:1229 +#: src/dialogs.c:1230 msgid "Set filetype:" msgstr "Dateityp festlegen:" -#: src/dialogs.c:1232 +#: src/dialogs.c:1233 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." @@ -1301,7 +1235,7 @@ "Definiert explizit einen bestimmten Dateityp, wenn er nicht durch die Dateiendung erkannt wird.\n" "Beachten Sie, wenn Sie mehrere Dateien auswählen, werden alle mit dem gewählten Dateityp geöffnet." -#: src/dialogs.c:1264 +#: src/dialogs.c:1265 #, c-format msgid "" "Configuration directory could not be created (%s).\n" @@ -1312,259 +1246,252 @@ "Es können einige Probleme in %s ohne ein Konfigurationsverzeichnis auftreten.\n" "%s trotzdem starten?" -#: src/dialogs.c:1313 +#: src/dialogs.c:1314 msgid "An error occurred or file information could not be retrieved(e.g. from a new file)." msgstr "Es ist ein Fehler aufgetreten oder Datei-Informationen konnten nicht gelesen werden(z.B. bei einer neuen Datei)." -#: src/dialogs.c:1333 #: src/dialogs.c:1334 #: src/dialogs.c:1335 -#: src/dialogs.c:1341 +#: src/dialogs.c:1336 #: src/dialogs.c:1342 #: src/dialogs.c:1343 -#: src/utils.c:119 -#: src/utils.c:120 -#: src/utils.c:1041 +#: src/dialogs.c:1344 +#: src/utils.c:108 +#: src/utils.c:128 +#: src/utils.c:129 +#: src/utils.c:1029 msgid "unknown" msgstr "unbekannt" -#: src/dialogs.c:1347 +#: src/dialogs.c:1348 msgid "Properties" msgstr "Eigenschaften" -#: src/dialogs.c:1375 +#: src/dialogs.c:1376 msgid "Type:" msgstr "Dateityp:" -#: src/dialogs.c:1388 +#: src/dialogs.c:1389 msgid "Size:" msgstr "Größe:" -#: src/dialogs.c:1403 +#: src/dialogs.c:1404 msgid "Location:" msgstr "Ort:" -#: src/dialogs.c:1416 +#: src/dialogs.c:1417 msgid "Read-only:" msgstr "Schreibgeschützt:" -#: src/dialogs.c:1423 +#: src/dialogs.c:1424 msgid "(only inside Geany)" msgstr "(nur innerhalb von Geany)" -#: src/dialogs.c:1432 +#: src/dialogs.c:1433 msgid "Encoding:" msgstr "Kodierung:" -#: src/dialogs.c:1445 +#: src/dialogs.c:1446 msgid "Modified:" msgstr "Modifiziert:" -#: src/dialogs.c:1458 +#: src/dialogs.c:1459 msgid "Changed:" msgstr "Geändert:" -#: src/dialogs.c:1471 +#: src/dialogs.c:1472 msgid "Accessed:" msgstr "Zugriff:" #. Header -#: src/dialogs.c:1500 +#: src/dialogs.c:1501 msgid "Read:" msgstr "Lesen" -#: src/dialogs.c:1507 +#: src/dialogs.c:1508 msgid "Write:" msgstr "Schreiben:" -#: src/dialogs.c:1514 +#: src/dialogs.c:1515 msgid "Execute:" msgstr "Ausführen:" #. Owner -#: src/dialogs.c:1522 +#: src/dialogs.c:1523 msgid "Owner:" msgstr "Eigentümer:" #. Group -#: src/dialogs.c:1558 +#: src/dialogs.c:1559 msgid "Group:" msgstr "Gruppe:" #. Other -#: src/dialogs.c:1594 +#: src/dialogs.c:1595 msgid "Other:" msgstr "Andere:" -#: src/dialogs.c:1662 +#: src/dialogs.c:1663 msgid "These are settings for the virtual terminal emulator widget (VTE). They only apply, if the VTE library could be loaded." msgstr "Hier sehen Sie Einstellungen für die Terminalemulation (VTE). Änderungen werden nur wirksam, wenn die VTE-Bibliothek geladen werden konnte." -#: src/dialogs.c:1678 +#: src/dialogs.c:1679 msgid "Terminal font" msgstr "Terminal Schriftart" -#: src/dialogs.c:1688 +#: src/dialogs.c:1689 msgid "Sets the font for the terminal widget." msgstr "Ändert die Schriftart für das Terminal" -#: src/dialogs.c:1690 +#: src/dialogs.c:1691 msgid "Foreground color" msgstr "Vordergrundfarbe" -#: src/dialogs.c:1696 +#: src/dialogs.c:1697 msgid "Background color" msgstr "Hintergrundfarbe" -#: src/dialogs.c:1706 +#: src/dialogs.c:1707 msgid "Sets the foreground color of the text in the terminal widget." msgstr "Setzt die Vordergrundfarbe für Text im Terminal." -#: src/dialogs.c:1713 +#: src/dialogs.c:1714 msgid "Sets the background color of the text in the terminal widget." msgstr "Setzt die Hintergrundfarbe für Text im Terminal." -#: src/dialogs.c:1716 +#: src/dialogs.c:1717 msgid "Scrollback lines" msgstr "Zeilen zum Zurückrollen" -#: src/dialogs.c:1727 +#: src/dialogs.c:1728 msgid "Specifies the history in lines, which you can scroll back in the terminal widget." msgstr "Gibt die Zeilen an, die man im Terminal zurückscrollen kann." -#: src/dialogs.c:1731 +#: src/dialogs.c:1732 msgid "Terminal emulation" msgstr "Terminalemulation" -#: src/dialogs.c:1741 +#: src/dialogs.c:1742 msgid "Controls how the terminal emulator should behave. xterm is a good start." msgstr "Steuert wie sich das Terminal verhalten soll. xterm ist ein guter Startwert." -#: src/dialogs.c:1743 +#: src/dialogs.c:1744 msgid "Scroll on keystroke" msgstr "Bei Tastendruck scrollen" -#: src/dialogs.c:1747 +#: src/dialogs.c:1748 msgid "Whether to scroll to the bottom if a key was pressed." msgstr "Ob das Fenster bei Tastendruck bis zum Ende gescrollt werden soll" -#: src/dialogs.c:1750 +#: src/dialogs.c:1751 msgid "Scroll on output" msgstr "Bei Ausgabe scrollen" -#: src/dialogs.c:1754 +#: src/dialogs.c:1755 msgid "Whether to scroll to the bottom if an output was generated." msgstr "Ob das Fenster bei Ausgabe bis zum Ende gescrollt werden soll" -#: src/dialogs.c:1849 -msgid "Keyboard shortcuts" -msgstr "Tastenkürzel" - -#: src/dialogs.c:1856 -msgid "The following keyboard shortcuts are defined:" -msgstr "Folgende Tastenkürzel sind definiert: " - -#: src/document.c:335 +#: src/document.c:325 #, c-format msgid "File %s closed." msgstr "Datei %s wurde geschlossen." -#: src/document.c:388 +#: src/document.c:378 msgid "New file opened." msgstr "Neue Datei geöffnet." -#: src/document.c:429 -#: src/document.c:438 -#: src/document.c:439 +#: src/document.c:418 +#: src/document.c:427 +#: src/document.c:428 msgid "Invalid filename" msgstr "Ungültiger Dateiname" -#: src/document.c:461 +#: src/document.c:449 #, c-format msgid "Could not open file %s (%s)" msgstr "Konnte Datei '%s' nicht öffnen(%s)." -#: src/document.c:494 +#: src/document.c:482 msgid "The file does not look like a text file or the file encoding is not supported." msgstr "Diese Datei scheint keine Textdatei zu sein, oder das Format wird nicht unterstützt." -#: src/document.c:532 +#: src/document.c:520 #, c-format msgid "File %s reloaded." msgstr "Datei %s neu geladen." -#: src/document.c:558 +#: src/document.c:546 #, c-format msgid "File %s opened(%d%s)." msgstr "Datei %s geöffnet(%d%s)." -#: src/document.c:560 +#: src/document.c:548 msgid ", read-only" msgstr ", schreibgeschützt" -#: src/document.c:600 -#: src/document.c:639 +#: src/document.c:586 +#: src/document.c:625 msgid "Error saving file." msgstr "Fehler beim Speichern der Datei." -#: src/document.c:620 +#: src/document.c:606 #, c-format msgid "Error saving file (%s)." msgstr "Fehler beim Speichern der Datei (%s)." -#: src/document.c:661 +#: src/document.c:647 #, c-format msgid "File %s saved." msgstr "Datei %s wurde gespeichert." -#: src/document.c:911 +#: src/document.c:898 msgid "tag list updating failed" msgstr "Neuladen der Symbol-Liste ist fehlgeschlagen." -#: src/document.c:978 +#: src/document.c:965 msgid "Win (CRLF)" msgstr "Win (CRLF)" -#: src/document.c:979 +#: src/document.c:966 msgid "Max (CR)" msgstr "Max (CR)" -#: src/document.c:981 +#: src/document.c:968 msgid "Unix (LF)" msgstr "Unix (LF)" -#: src/utils.c:111 +#: src/utils.c:120 #, c-format msgid "%c line: % 4d column: % 3d selection: % 4d %s mode: %s%s cur. function: %s encoding: %s filetype: %s" msgstr "%c Zeile: % 4d Spalte: % 3d Auswahl: % 4d %s Modus: %s%s akt. Funktion: %s Kodierung: %s Dateityp: %s" -#: src/utils.c:115 +#: src/utils.c:124 msgid "OVR" msgstr "ÜBER" -#: src/utils.c:115 +#: src/utils.c:124 msgid "INS" msgstr "EINF" -#: src/utils.c:350 +#: src/utils.c:359 #, c-format msgid "Font updated (%s)." msgstr "Schriftart gewechselt (%s)." -#: src/utils.c:364 +#: src/utils.c:373 #: src/geany.h:71 msgid "untitled" msgstr "unbenannt" -#: src/utils.c:365 +#: src/utils.c:374 msgid "(Unsaved)" msgstr "(Ungespeichert)" -#: src/utils.c:639 +#: src/utils.c:648 msgid "No tags found" msgstr "Keine Symbole gefunden." -#: src/utils.c:942 +#: src/utils.c:951 #, c-format msgid "" "The file '%s' on the disk is more recent than\n" @@ -1618,47 +1545,47 @@ msgid "Shell script file" msgstr "Shellscript Datei" -#: src/filetypes.c:265 +#: src/filetypes.c:262 msgid "Makefile" msgstr "Makefile" -#: src/filetypes.c:282 +#: src/filetypes.c:279 msgid "Cascading StyleSheet" msgstr "Cascading StyleSheet" -#: src/filetypes.c:298 +#: src/filetypes.c:295 msgid "Config file" msgstr "Konfigurationsdatei" -#: src/filetypes.c:317 +#: src/filetypes.c:314 msgid "Assembler source file" msgstr "Assembler Quelldatei" -#: src/filetypes.c:333 +#: src/filetypes.c:330 msgid "SQL Dump file" msgstr "SQL-Dump Datei" -#: src/filetypes.c:349 +#: src/filetypes.c:346 msgid "(O)Caml source file" msgstr "(O)Caml Quelldatei" -#: src/filetypes.c:366 +#: src/filetypes.c:363 msgid "O-Matrix source file" msgstr "O-Matrix Quelldatei" -#: src/filetypes.c:382 +#: src/filetypes.c:379 msgid "Ruby source file" msgstr "Ruby Quelldatei" -#: src/filetypes.c:400 +#: src/filetypes.c:397 msgid "Tcl source file" msgstr "Tcl Quelldatei" -#: src/filetypes.c:418 +#: src/filetypes.c:415 msgid "All files" msgstr "Alle Dateien" -#: src/filetypes.c:427 +#: src/filetypes.c:424 msgid "None" msgstr "Keiner" @@ -1669,13 +1596,13 @@ #: src/keyfile.c:59 #, c-format msgid "%s configuration file, edit as you need" -msgstr "%s configuration file, edit as you need" +msgstr "%s Konfigurationsdatei. Bei Bedarf anpassen. " -#: src/keyfile.c:105 +#: src/keyfile.c:104 msgid " VTE settings: FONT;FOREGROUND;BACKGROUND;scrollback;type;scroll on keystroke;scroll on output" msgstr "VTE settings: FONT;FOREGROUND;BACKGROUND;scrollback;type;scroll on keystroke;scroll on output" -#: src/keyfile.c:231 +#: src/keyfile.c:229 msgid "Type here what you want, use it as a notice/scratch board" msgstr "Schreiben Sie hier rein, was sie möchten. Sie können es als Notizbuch nutzen." @@ -1683,115 +1610,115 @@ msgid "Status messages" msgstr "Meldungen" -#: src/build.c:90 +#: src/build.c:89 #, c-format msgid "Failed to view %s (make sure it is already compiled)" msgstr "Konnte %s nicht anzeigen (die Datei muss bereits erzeugt worden sein)" -#: src/build.c:117 -#: src/build.c:280 -#: src/build.c:417 +#: src/build.c:116 +#: src/build.c:277 +#: src/build.c:414 #, c-format msgid "Process failed (%s)" msgstr "Prozess fehlgeschlagen (%s)" -#: src/build.c:273 +#: src/build.c:270 #, c-format msgid "%s (in directory: %s)" msgstr "%s (im Verzeichnis: %s)" -#: src/build.c:353 +#: src/build.c:350 #, c-format msgid "Failed to execute %s (make sure it is already built)" msgstr "Konnte %s nicht ausführen (die Datei muss bereits erzeugt worden sein)" -#: src/build.c:365 +#: src/build.c:362 #, c-format msgid "Could not find terminal '%s' (check path for Terminal tool setting in Preferences)" msgstr "Konnte das Terminalprogramm '%s' nicht finden (Pfad zum Terminalprogramm in den Einstellungen überprüfen)" -#: src/build.c:380 +#: src/build.c:377 #, c-format msgid "Failed to change the working directory to %s" msgstr "Konnte Arbeitsverzeichnis(%s) nicht wechseln" -#: src/build.c:398 +#: src/build.c:395 #, c-format msgid "Failed to execute %s (start-script could not be created)" msgstr "Konnte %s nicht ausführen (Start-Script konnte nicht erzeugt werden)" -#: src/build.c:532 +#: src/build.c:521 msgid "compilation finished unsuccessful" msgstr "Kompilierung beendet - nicht erfolgreich." -#: src/build.c:536 +#: src/build.c:525 msgid "compilation finished successful" msgstr "Kompilierung beendet - erfolgreich." -#: src/prefs.c:212 +#: src/prefs.c:195 msgid "Action" msgstr "Aktion" -#: src/prefs.c:217 +#: src/prefs.c:200 msgid "Shortcut" msgstr "Tastenkürzel" -#: src/prefs.c:584 +#: src/prefs.c:564 msgid "Grab key" msgstr "Tasten festlegen" -#: src/prefs.c:588 +#: src/prefs.c:568 #, c-format msgid "Type the combination of the keys you want to use for \"%s\"" msgstr "Welche Tastenkomination soll für \"%s\" benutzt werden? " -#: src/prefs.c:712 +#: src/prefs.c:692 #, c-format msgid "The combination '%s' is already used for \"%s\". Please choose another one." msgstr "Die Tastenkombination '%s' wird bereits für \"%s\" verwendet. Bitte wählen Sie eine andere Tastenkombination. " -#: src/about.c:96 +#: src/about.c:98 msgid "About Geany" msgstr "Über Geany" -#: src/about.c:143 +#: src/about.c:145 msgid "A fast and lightweight IDE" msgstr "Eine kleine und schnelle Entwicklungsumgebung" #. gtk_container_add(GTK_CONTAINER(info_box), cop_label); -#: src/about.c:193 +#: src/about.c:195 msgid "Info" msgstr "Info" -#: src/about.c:205 +#: src/about.c:207 msgid "Developers" msgstr "Entwickler" -#: src/about.c:205 +#: src/about.c:207 msgid "Maintainer" msgstr "Hauptentwickler" -#: src/about.c:205 +#: src/about.c:207 msgid "developer" msgstr "Entwickler" -#: src/about.c:206 +#: src/about.c:208 msgid "translation maintainer" msgstr "Übersetzungskoordinator" -#: src/about.c:206 +#: src/about.c:208 msgid "Translators" msgstr "Übersetzer" -#: src/about.c:207 +#: src/about.c:209 msgid "language" msgstr "Sprache" -#: src/about.c:213 +#: src/about.c:215 msgid "Credits" msgstr "Credits" -#: src/about.c:226 +#: src/about.c:228 msgid "License" msgstr "Lizenz" @@ -1924,143 +1851,3 @@ msgid "Reload" msgstr "Neu laden" -#: src/keybindings.c:106 -msgid "New" -msgstr "Neu" - -#: src/keybindings.c:108 -msgid "Open" -msgstr "Öffnen" - -#: src/keybindings.c:110 -msgid "Save" -msgstr "Speichern" - -#: src/keybindings.c:114 -msgid "Close all" -msgstr "Alle schließen" - -#: src/keybindings.c:116 -msgid "Reload file" -msgstr "Neu laden" - -#: src/keybindings.c:118 -msgid "Undo" -msgstr "Rückgängig" - -#: src/keybindings.c:120 -msgid "Redo" -msgstr "Wiederholen" - -#: src/keybindings.c:124 -msgid "Find Next" -msgstr "Weitersuchen" - -#: src/keybindings.c:126 -msgid "Find Previous" -msgstr "Vorheriges" - -#: src/keybindings.c:132 -msgid "Show Colour Chooser" -msgstr "Farbwähler öffnen" - -#: src/keybindings.c:134 -msgid "Fullscreen" -msgstr "Vollbild" - -#: src/keybindings.c:136 -msgid "Toggle Messages Window" -msgstr "Meldungsfenster verstecken" - -#: src/keybindings.c:138 -msgid "Toggle Sidebar" -msgstr "Seitenleiste ausblenden" - -#: src/keybindings.c:140 -msgid "Zoom In" -msgstr "Hineinzoomen" - -#: src/keybindings.c:142 -msgid "Zoom Out" -msgstr "Herauszoomen" - -#: src/keybindings.c:144 -msgid "Replace tabs by space" -msgstr "Tabulatoren durch Leerzeichen ersetzen" - -#: src/keybindings.c:146 -msgid "Fold all" -msgstr "Alle einklappen" - -#: src/keybindings.c:148 -msgid "Unfold all" -msgstr "Alle ausklappen" - -#: src/keybindings.c:152 -msgid "Build" -msgstr "Erstellen" - -#: src/keybindings.c:156 -msgid "Build with \"make\" (custom target)" -msgstr "Mit \"make\" erstellen (eigenes Target angeben)" - -#: src/keybindings.c:160 -msgid "Run (alternative command)" -msgstr "Ausführen (alternativer Befehl)" - -#: src/keybindings.c:162 -msgid "Build options" -msgstr "Optionen bei der Erzeugung" - -#: src/keybindings.c:164 -msgid "Reload symbol list" -msgstr "Symbol-Ansicht neuladen" - -#: src/keybindings.c:166 -msgid "Switch to Editor" -msgstr "Wechsle zum Editor" - -#: src/keybindings.c:168 -msgid "Switch to Scribble" -msgstr "Wechsle " - -#: src/keybindings.c:170 -msgid "Switch to VTE" -msgstr "Wechsel zur VTE" - -#: src/keybindings.c:172 -msgid "Switch to left document" -msgstr "Zum linken Dokument umschalten" - -#: src/keybindings.c:174 -msgid "Switch to right document" -msgstr "Zum rechten Dokument umschalten" - -#: src/keybindings.c:176 -msgid "Duplicate line or selection" -msgstr "Zeile oder Auswahl kopieren" - -#: src/keybindings.c:178 -msgid "Comment line" -msgstr "Zeile auskommentieren" - -#: src/keybindings.c:180 -msgid "Complete word" -msgstr "Vervollständige Wort" - -#: src/keybindings.c:182 -msgid "Show calltip" -msgstr "Calltip anzeigen" - -#: src/keybindings.c:184 -msgid "Show macro list" -msgstr "Zeige Makroliste" - -#: src/keybindings.c:186 -msgid "Suppress auto completion" -msgstr "Autovervollständigung abstellen" - -#: src/keybindings.c:188 -msgid "Find Usage" -msgstr "Auftreten finden" - Modified: trunk/po/geany.pot =================================================================== --- trunk/po/geany.pot 2006-06-27 20:43:04 UTC (rev 497) +++ trunk/po/geany.pot 2006-06-27 22:01:08 UTC (rev 498) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-06-25 22:28+0200\n" +"POT-Creation-Date: 2006-06-27 23:28+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" @@ -438,7 +438,7 @@ msgid "Symbols" msgstr "" -#: src/interface.c:874 src/treeviews.c:186 +#: src/interface.c:874 src/treeviews.c:207 msgid "Open files" msgstr "" @@ -919,26 +919,26 @@ msgid "The file '%s' already exists. Do you want to overwrite it?" msgstr "" -#: src/callbacks.c:1347 src/callbacks.c:1356 +#: src/callbacks.c:1344 src/callbacks.c:1353 #, c-format msgid "Declaration or definition of \"%s()\" not found" msgstr "" -#: src/callbacks.c:1678 +#: src/callbacks.c:1673 msgid "Failed to execute the view program" msgstr "" -#: src/callbacks.c:1689 +#: src/callbacks.c:1684 msgid "Failed to execute the terminal program" msgstr "" #. initialize the dialog -#: src/callbacks.c:2012 src/dialogs.c:71 +#: src/callbacks.c:2007 src/dialogs.c:71 msgid "Open File" msgstr "" -#: src/callbacks.c:2061 src/callbacks.c:2106 src/callbacks.c:2146 -#: src/callbacks.c:2204 +#: src/callbacks.c:2056 src/callbacks.c:2101 src/callbacks.c:2141 +#: src/callbacks.c:2199 msgid "" "Please set the filetype for the current file before using this function." msgstr "" @@ -1272,8 +1272,8 @@ msgstr "" #: src/dialogs.c:1336 src/dialogs.c:1337 src/dialogs.c:1338 src/dialogs.c:1344 -#: src/dialogs.c:1345 src/dialogs.c:1346 src/utils.c:119 src/utils.c:120 -#: src/utils.c:1050 +#: src/dialogs.c:1345 src/dialogs.c:1346 src/utils.c:143 src/utils.c:144 +#: src/utils.c:1069 msgid "unknown" msgstr "" @@ -1442,88 +1442,85 @@ "supported." msgstr "" -#: src/document.c:532 +#: src/document.c:552 #, c-format msgid "File %s reloaded." msgstr "" -#: src/document.c:534 +#: src/document.c:554 #, c-format msgid "File %s opened(%d%s)." msgstr "" -#: src/document.c:536 +#: src/document.c:556 msgid ", read-only" msgstr "" -#: src/document.c:589 src/document.c:658 +#: src/document.c:592 src/document.c:661 msgid "Error saving file." msgstr "" -#: src/document.c:624 +#: src/document.c:627 #, c-format msgid "Error while converting file (%s)." msgstr "" -#: src/document.c:639 +#: src/document.c:642 #, c-format msgid "Error saving file (%s)." msgstr "" -#: src/document.c:680 +#: src/document.c:683 #, c-format msgid "File %s saved." msgstr "" -#: src/document.c:926 -msgid "tag list updating failed" -msgstr "" - -#: src/document.c:993 +#: src/document.c:990 msgid "Win (CRLF)" msgstr "" -#: src/document.c:994 +#: src/document.c:991 msgid "Max (CR)" msgstr "" -#: src/document.c:996 +#: src/document.c:993 msgid "Unix (LF)" msgstr "" -#: src/utils.c:111 +#. currently text need in German and C locale about 150 chars +#: src/utils.c:135 #, c-format msgid "" "%c line: % 4d column: % 3d selection: % 4d %s mode: %s%s cur. " "function: %s encoding: %s filetype: %s" msgstr "" -#: src/utils.c:115 +#: src/utils.c:139 msgid "OVR" msgstr "" -#: src/utils.c:115 +#: src/utils.c:139 msgid "INS" msgstr "" -#: src/utils.c:360 +#: src/utils.c:380 #, c-format msgid "Font updated (%s)." msgstr "" -#: src/utils.c:374 src/geany.h:71 +#: src/utils.c:394 src/geany.h:71 msgid "untitled" msgstr "" -#: src/utils.c:375 +#: src/utils.c:395 msgid "(Unsaved)" msgstr "" -#: src/utils.c:649 +#: src/utils.c:670 msgid "No tags found" msgstr "" -#: src/utils.c:951 +#: src/utils.c:970 #, c-format msgid "" "The file '%s' on the disk is more recent than\n" @@ -1531,23 +1528,23 @@ "Do you want to reload it?" msgstr "" -#: src/utils.c:1858 +#: src/utils.c:1877 msgid "C Standard Library" msgstr "" -#: src/utils.c:1859 +#: src/utils.c:1878 msgid "ISO C99" msgstr "" -#: src/utils.c:1860 +#: src/utils.c:1879 msgid "C++ (C Standard Library)" msgstr "" -#: src/utils.c:1861 +#: src/utils.c:1880 msgid "C++ Standard Library" msgstr "" -#: src/utils.c:1862 +#: src/utils.c:1881 msgid "C++ STL" msgstr "" @@ -1599,43 +1596,43 @@ msgid "Makefile" msgstr "" -#: src/filetypes.c:296 +#: src/filetypes.c:297 msgid "Cascading StyleSheet" msgstr "" -#: src/filetypes.c:313 +#: src/filetypes.c:314 msgid "Config file" msgstr "" -#: src/filetypes.c:333 +#: src/filetypes.c:334 msgid "Assembler source file" msgstr "" -#: src/filetypes.c:350 +#: src/filetypes.c:351 msgid "SQL Dump file" msgstr "" -#: src/filetypes.c:367 +#: src/filetypes.c:368 msgid "(O)Caml source file" msgstr "" -#: src/filetypes.c:385 +#: src/filetypes.c:386 msgid "O-Matrix source file" msgstr "" -#: src/filetypes.c:402 +#: src/filetypes.c:403 msgid "Ruby source file" msgstr "" -#: src/filetypes.c:421 +#: src/filetypes.c:422 msgid "Tcl source file" msgstr "" -#: src/filetypes.c:440 +#: src/filetypes.c:441 msgid "All files" msgstr "" -#: src/filetypes.c:449 +#: src/filetypes.c:450 msgid "None" msgstr "" @@ -1658,7 +1655,7 @@ msgid "Type here what you want, use it as a notice/scratch board" msgstr "" -#: src/msgwindow.c:46 +#: src/msgwindow.c:47 msgid "Status messages" msgstr "" @@ -1699,11 +1696,11 @@ msgid "Failed to execute %s (start-script could not be created)" msgstr "" -#: src/build.c:539 +#: src/build.c:538 msgid "compilation finished unsuccessful" msgstr "" -#: src/build.c:543 +#: src/build.c:542 msgid "compilation finished successful" msgstr "" @@ -1799,7 +1796,7 @@ msgid "Appendix" msgstr "" -#: src/treeviews.c:77 src/treeviews.c:99 src/treeviews.c:161 +#: src/treeviews.c:77 src/treeviews.c:99 src/treeviews.c:182 msgid "Other" msgstr "" @@ -1827,7 +1824,7 @@ msgid "Begin" msgstr "" -#: src/treeviews.c:105 src/treeviews.c:147 +#: src/treeviews.c:105 msgid "Function" msgstr "" @@ -1851,47 +1848,51 @@ msgid "Methods" msgstr "" -#: src/treeviews.c:128 src/treeviews.c:149 -msgid "Class" +#: src/treeviews.c:128 src/treeviews.c:149 src/treeviews.c:170 +msgid "Classes" msgstr "" #: src/treeviews.c:130 -msgid "Singleton" +msgid "Singletons" msgstr "" #: src/treeviews.c:132 -msgid "Mixin" +msgid "Mixins" msgstr "" -#: src/treeviews.c:134 src/treeviews.c:155 +#: src/treeviews.c:134 src/treeviews.c:176 msgid "Variables" msgstr "" -#: src/treeviews.c:136 +#: src/treeviews.c:136 src/treeviews.c:172 msgid "Members" msgstr "" -#: src/treeviews.c:153 -msgid "Macro" +#: src/treeviews.c:147 src/treeviews.c:168 +msgid "Functions" msgstr "" -#: src/treeviews.c:157 -msgid "Namespace" +#: src/treeviews.c:174 +msgid "Macros" msgstr "" -#: src/treeviews.c:159 -msgid "Struct / Typedef" +#: src/treeviews.c:178 +msgid "Namespaces" msgstr "" -#: src/treeviews.c:233 src/treeviews.c:285 +#: src/treeviews.c:180 +msgid "Structs / Typedefs" +msgstr "" + +#: src/treeviews.c:254 src/treeviews.c:306 msgid "Hide" msgstr "" -#: src/treeviews.c:241 src/treeviews.c:293 +#: src/treeviews.c:262 src/treeviews.c:314 msgid "Hide sidebar" msgstr "" -#: src/treeviews.c:273 +#: src/treeviews.c:294 msgid "Reload" msgstr "" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

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

27 Jun '06

Revision: 497 Author: eht16 Date: 2006-06-27 13:43:04 -0700 (Tue, 27 Jun 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=497&view=rev Log Message: ----------- Fixed a crash when auto completion or call tips are used if no filetype was set. Added some sanity checks. Modified Paths: -------------- trunk/ChangeLog trunk/src/sci_cb.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-06-27 17:07:22 UTC (rev 496) +++ trunk/ChangeLog 2006-06-27 20:43:04 UTC (rev 497) @@ -6,6 +6,8 @@ Add support for parsing compiler output for LaTeX with latex's --file-line-error-style command line argument. Removed unneeded function utils_free_ptr_array(). + * src/sci_cb.c: Fixed a crash when auto completion or call tips are + used if no filetype was set. Added some sanity checks. 2006-06-27 Nick Treleaven <nick.treleaven(a)btinternet.com> Modified: trunk/src/sci_cb.c =================================================================== --- trunk/src/sci_cb.c 2006-06-27 17:07:22 UTC (rev 496) +++ trunk/src/sci_cb.c 2006-06-27 20:43:04 UTC (rev 497) @@ -359,7 +359,8 @@ lexer = SSM(sci, SCI_GETLEXER, 0, 0); idx = document_find_by_sci(sci); - + if (idx == -1 || ! doc_list[idx].is_valid || doc_list[idx].file_type == NULL) return FALSE; + word[0] = '\0'; if (pos == -1) { // position of '(' is unknown, so go backwards to find it @@ -388,16 +389,8 @@ gboolean sci_cb_start_auto_complete(ScintillaObject *sci, gint pos) { - gint line = sci_get_line_from_position(sci, pos); - gint line_start = sci_get_position_from_line(sci, line); - gint line_len = sci_get_line_length(sci, line); - gint line_pos = pos - line_start - 1; - gint current = pos - line_start; - gint rootlen; - gint startword = current, lexer = SSM(sci, SCI_GETLEXER, 0, 0); - gint style = SSM(sci, SCI_GETSTYLEAT, pos, 0); - gchar linebuf[line_len + 1]; - gchar *root; + gint line, line_start, line_len, line_pos, current, rootlen, startword, lexer, style; + gchar *linebuf, *root; const GPtrArray *tags; if (sci == NULL) return FALSE; @@ -407,7 +400,8 @@ line_len = sci_get_line_length(sci, line); line_pos = pos - line_start - 1; current = pos - line_start; - startword = current, lexer = SSM(sci, SCI_GETLEXER, 0, 0); + startword = current; + lexer = SSM(sci, SCI_GETLEXER, 0, 0); style = SSM(sci, SCI_GETSTYLEAT, pos, 0); //if (lexer != SCLEX_CPP && lexer != SCLEX_HTML && lexer != SCLEX_PASCAL) return FALSE; @@ -415,6 +409,7 @@ if (lexer == SCLEX_CPP && (style == SCE_C_COMMENT || style == SCE_C_COMMENTLINE || style == SCE_C_COMMENTDOC)) return FALSE; + linebuf = g_malloc(line_len + 1); sci_get_line(sci, line, linebuf); // find the start of the current word @@ -448,8 +443,18 @@ gint idx = document_find_by_sci(sci); TMTagAttrType attrs[] = { tm_tag_attr_name_t, 0 }; + if (idx == -1 || ! doc_list[idx].is_valid || doc_list[idx].file_type == NULL) + { // go home if typed less than 4 chars + g_free(linebuf); + return FALSE; + } + while ((line_pos - i >= 0) && ! g_ascii_isspace(linebuf[line_pos - i])) i++; - if (i < 4) return FALSE; // go home if typed less than 4 chars + if (i < 4) + { // go home if typed less than 4 chars + g_free(linebuf); + return FALSE; + } tags = tm_workspace_find(root, tm_tag_max_t, attrs, TRUE, doc_list[idx].file_type->lang); if (NULL != tags && tags->len > 0) @@ -467,6 +472,7 @@ g_string_free(words, TRUE); } } + g_free(linebuf); return TRUE; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

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

27 Jun '06

Revision: 496 Author: ntrel Date: 2006-06-27 10:07:22 -0700 (Tue, 27 Jun 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=496&view=rev Log Message: ----------- Make Status messages override the document statistics using utils_set_statusbar; don't use a fixed buffer for statistics Modified Paths: -------------- trunk/ChangeLog trunk/src/msgwindow.c trunk/src/utils.c trunk/src/utils.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-06-27 15:31:32 UTC (rev 495) +++ trunk/ChangeLog 2006-06-27 17:07:22 UTC (rev 496) @@ -13,6 +13,9 @@ * src/geany.h, src/keyfile.c: Add recent files items in the same order as they were saved. Remove app->recent_files and use g_strfreev in keyfile.c. + * src/utils.c, src/utils.h, src/msgwindow.c: + Make Status messages override the document statistics using + utils_set_statusbar; don't use a fixed buffer for statistics. 2006-06-26 Enrico Troeger <enrico.troeger(a)uvena.de> Modified: trunk/src/msgwindow.c =================================================================== --- trunk/src/msgwindow.c 2006-06-27 15:31:32 UTC (rev 495) +++ trunk/src/msgwindow.c 2006-06-27 17:07:22 UTC (rev 496) @@ -28,6 +28,7 @@ #include "support.h" #include "callbacks.h" #include "msgwindow.h" +#include "utils.h" static GdkColor dark = {0, 58832, 58832, 58832}; static GdkColor white = {0, 65535, 65535, 65535}; @@ -177,8 +178,7 @@ va_end(args); // display status message in status bar - gtk_statusbar_pop(GTK_STATUSBAR(app->statusbar), 1); - gtk_statusbar_push(GTK_STATUSBAR(app->statusbar), 1, string); + utils_set_statusbar(string, FALSE); gtk_list_store_append(msgwindow.store_status, &iter); //gtk_list_store_insert(msgwindow.store_status, &iter, 0); Modified: trunk/src/utils.c =================================================================== --- trunk/src/utils.c 2006-06-27 15:31:32 UTC (rev 495) +++ trunk/src/utils.c 2006-06-27 17:07:22 UTC (rev 496) @@ -89,11 +89,35 @@ } +/* allow_override is TRUE if text can be ignored when another message has been set + * that didn't use allow_override and has not timed out. */ +void utils_set_statusbar(const gchar *text, gboolean allow_override) +{ + static glong last_time = 0; + GTimeVal timeval; + const gint GEANY_STATUS_TIMEOUT = 1; + + g_get_current_time(&timeval); + + if (! allow_override) + { + gtk_statusbar_pop(GTK_STATUSBAR(app->statusbar), 1); + gtk_statusbar_push(GTK_STATUSBAR(app->statusbar), 1, text); + last_time = timeval.tv_sec; + } + else + if (timeval.tv_sec > last_time + GEANY_STATUS_TIMEOUT) + { + gtk_statusbar_pop(GTK_STATUSBAR(app->statusbar), 1); + gtk_statusbar_push(GTK_STATUSBAR(app->statusbar), 1, text); + } +} + + /* updates the status bar */ void utils_update_statusbar(gint idx, gint pos) { - // currently text need in German and C locale about 150 chars - gchar *text = (gchar*) g_malloc0(250); + gchar *text; const gchar *cur_tag; guint line, col; @@ -107,8 +131,8 @@ line = sci_get_line_from_position(doc_list[idx].sci, pos); col = sci_get_col_from_position(doc_list[idx].sci, pos); - g_snprintf(text, 250, -_("%c line: % 4d column: % 3d selection: % 4d %s mode: %s%s cur. function: %s encoding: %s filetype: %s"), + // currently text need in German and C locale about 150 chars + text = g_strdup_printf(_("%c line: % 4d column: % 3d selection: % 4d %s mode: %s%s cur. function: %s encoding: %s filetype: %s"), (doc_list[idx].changed) ? 42 : 32, (line + 1), (col + 1), sci_get_selected_text_length(doc_list[idx].sci) - 1, @@ -118,20 +142,16 @@ cur_tag, (doc_list[idx].encoding) ? doc_list[idx].encoding : _("unknown"), (doc_list[idx].file_type) ? doc_list[idx].file_type->title : _("unknown")); - gtk_statusbar_pop(GTK_STATUSBAR(app->statusbar), 1); - gtk_statusbar_push(GTK_STATUSBAR(app->statusbar), 1, text); + utils_set_statusbar(text, TRUE); //can be overridden by status messages + g_free(text); } else { - gtk_statusbar_pop(GTK_STATUSBAR(app->statusbar), 1); - gtk_statusbar_push(GTK_STATUSBAR(app->statusbar), 1, text); + utils_set_statusbar("", TRUE); //can be overridden by status messages } - - g_free(text); } - void utils_update_popup_reundo_items(gint index) { gboolean enable_undo; Modified: trunk/src/utils.h =================================================================== --- trunk/src/utils.h 2006-06-27 15:31:32 UTC (rev 495) +++ trunk/src/utils.h 2006-06-27 17:07:22 UTC (rev 496) @@ -27,6 +27,10 @@ void utils_start_browser(const gchar *uri); +/* allow_override is TRUE if text can be ignored when another message has been set + * that didn't use allow_override and has not timed out. */ +void utils_set_statusbar(const gchar *text, gboolean allow_override); + void utils_update_statusbar(gint idx, gint pos); void utils_set_buttons_state(gboolean enable); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

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

27 Jun '06

Revision: 495 Author: eht16 Date: 2006-06-27 08:31:32 -0700 (Tue, 27 Jun 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=495&view=rev Log Message: ----------- Add support for parsing compiler output for LaTeX with latex's --file-line-error-style command line argument. Removed unneeded function utils_free_ptr_array(). Modified Paths: -------------- trunk/ChangeLog trunk/data/filetypes.latex trunk/src/utils.c trunk/src/utils.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-06-27 15:29:33 UTC (rev 494) +++ trunk/ChangeLog 2006-06-27 15:31:32 UTC (rev 495) @@ -2,6 +2,10 @@ * data/filetypes.php, data/filetypes.pascal, src/callbacks.c, src/build.c: Parse stdout of compiler output too. + * src/utils.c, data/filetypes.latex: + Add support for parsing compiler output for LaTeX with latex's + --file-line-error-style command line argument. + Removed unneeded function utils_free_ptr_array(). 2006-06-27 Nick Treleaven <nick.treleaven(a)btinternet.com> Modified: trunk/data/filetypes.latex =================================================================== --- trunk/data/filetypes.latex 2006-06-27 15:29:33 UTC (rev 494) +++ trunk/data/filetypes.latex 2006-06-27 15:31:32 UTC (rev 495) @@ -32,8 +32,8 @@ # %f will be replaced by the complete filename # %e will be replaced by the filename without extension # (use only one of it at one time) -compiler=latex "%f" +compiler=latex --file-line-error-style "%f" # it is called linker, but here it is an alternative compiler command -linker=pdflatex "%f" +linker=pdflatex --file-line-error-style "%f" run_cmd=xdvi "%f" run_cmd2=xpdf "%f" Modified: trunk/src/utils.c =================================================================== --- trunk/src/utils.c 2006-06-27 15:29:33 UTC (rev 494) +++ trunk/src/utils.c 2006-06-27 15:31:32 UTC (rev 495) @@ -385,7 +385,8 @@ { static GList *tag_names = NULL; - if (doc_list[idx].is_valid && doc_list[idx].tm_file && doc_list[idx].tm_file->tags_array) + if (idx >= 0 && doc_list[idx].is_valid && doc_list[idx].tm_file && + doc_list[idx].tm_file->tags_array) { TMTag *tag; guint i; @@ -769,9 +770,7 @@ gtk_widget_set_sensitive(app->tagbar, FALSE); gtk_container_add(GTK_CONTAINER(app->tagbar), app->default_tag_tree); } - } - } @@ -1881,17 +1880,6 @@ } -void utils_free_ptr_array(gchar *array[], gint len) -{ - gint i; - - for (i = 0; i < len; i++) - { - g_free(array[i]); - } -} - - void utils_update_fold_items(void) { gtk_widget_set_sensitive(lookup_widget(app->window, "menu_fold_all1"), app->pref_editor_folding); @@ -2327,10 +2315,11 @@ gchar *end = NULL; gchar *path; gchar **fields; - gchar *pattern; // pattern to split the error message into some fields - guint field_min_len; // used to detect errors after parsing - guint field_idx_line; // idx of the field where the line is - guint field_idx_file; // idx of the field where the filename is + gchar *pattern; // pattern to split the error message into some fields + guint field_min_len; // used to detect errors after parsing + guint field_idx_line; // idx of the field where the line is + guint field_idx_file; // idx of the field where the filename is + guint skip_dot_slash = 0; // number of characters to skip at the beginning of the filename *filename = NULL; *line = -1; @@ -2355,6 +2344,15 @@ field_idx_file = 0; break; } + case GEANY_FILETYPES_LATEX: + { + // ./kommtechnik_2b.tex:18: Emergency stop. + pattern = ":"; + field_min_len = 3; + field_idx_line = 1; + field_idx_file = 0; + break; + } case GEANY_FILETYPES_PHP: { // Parse error: parse error, unexpected T_CASE in brace_bug.php on line 3 @@ -2416,9 +2414,13 @@ return; } + // skip some characters at the beginning of the filename, at the moment only "./" + // can be extended if other "trash" is known + if (strncmp(fields[field_idx_file], "./", 2) == 0) skip_dot_slash = 2; + // get the basename of the built file to get the path to look for other files path = g_path_get_dirname(doc_list[app->cur_idx].file_name); - *filename = g_strconcat(path, G_DIR_SEPARATOR_S, fields[field_idx_file], NULL); + *filename = g_strconcat(path, G_DIR_SEPARATOR_S, fields[field_idx_file] + skip_dot_slash, NULL); g_free(path); g_strfreev(fields); Modified: trunk/src/utils.h =================================================================== --- trunk/src/utils.h 2006-06-27 15:29:33 UTC (rev 494) +++ trunk/src/utils.h 2006-06-27 15:31:32 UTC (rev 495) @@ -171,8 +171,6 @@ void utils_update_toolbar_icons(GtkIconSize size); -void utils_free_ptr_array(gchar *array[], gint len); - void utils_update_recent_menu(void); gboolean utils_get_setting_boolean(GKeyFile *config, const gchar *section, const gchar *key, const gboolean default_value); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

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

27 Jun '06

Revision: 494 Author: eht16 Date: 2006-06-27 08:29:33 -0700 (Tue, 27 Jun 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=494&view=rev Log Message: ----------- Parse stdout of compiler output too. Modified Paths: -------------- trunk/ChangeLog trunk/data/filetypes.pascal trunk/data/filetypes.php trunk/src/build.c trunk/src/callbacks.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-06-27 15:24:39 UTC (rev 493) +++ trunk/ChangeLog 2006-06-27 15:29:33 UTC (rev 494) @@ -1,3 +1,9 @@ +2006-06-27 Enrico Troeger <enrico.troeger(a)uvena.de> + + * data/filetypes.php, data/filetypes.pascal, src/callbacks.c, + src/build.c: Parse stdout of compiler output too. + + 2006-06-27 Nick Treleaven <nick.treleaven(a)btinternet.com> * src/geany.h, src/keyfile.c: Modified: trunk/data/filetypes.pascal =================================================================== --- trunk/data/filetypes.pascal 2006-06-27 15:24:39 UTC (rev 493) +++ trunk/data/filetypes.pascal 2006-06-27 15:29:33 UTC (rev 494) @@ -38,5 +38,5 @@ # %f will be replaced by the complete filename # %e will be replaced by the filename without extension # (use only one of it at one time) -compiler=fpc "%f" 1>&2 +compiler=fpc "%f" run_cmd="./%e" Modified: trunk/data/filetypes.php =================================================================== --- trunk/data/filetypes.php 2006-06-27 15:24:39 UTC (rev 493) +++ trunk/data/filetypes.php 2006-06-27 15:29:33 UTC (rev 494) @@ -24,9 +24,7 @@ # %f will be replaced by the complete filename # %e will be replaced by the filename without extension # (use only one of it at one time) -# Geany expects that compilers put there error messages on stderr, php -l put the messages on stdout, -# so to get it working, we push them to stderr -compiler=php -l "%f" 1>&2 +compiler=php -l "%f" run_cmd=php "%f" # use can also use something like this, to view your PHP or HTML files through a browser and webserver Modified: trunk/src/build.c =================================================================== --- trunk/src/build.c 2006-06-27 15:24:39 UTC (rev 493) +++ trunk/src/build.c 2006-06-27 15:29:33 UTC (rev 494) @@ -454,24 +454,23 @@ { //if (s != G_IO_STATUS_NORMAL && s != G_IO_STATUS_EOF) break; if (GPOINTER_TO_INT(data)) - { msgwin_compiler_add(COLOR_RED, FALSE, g_strstrip(msg)); - if (app->pref_editor_use_indicators) + else + msgwin_compiler_add(COLOR_BLACK, FALSE, g_strstrip(msg)); + + if (app->pref_editor_use_indicators) + { + gchar *filename; + gint line; + utils_parse_compiler_error_line(g_strstrip(msg), &filename, &line); + if (line != -1) { - gchar *filename; - gint line; - utils_parse_compiler_error_line(g_strstrip(msg), &filename, &line); - if (line != -1) - { - gint idx = document_find_by_filename(filename, FALSE); - // document_set_indicator will check valid idx - document_set_indicator(idx, line - 1); - } - g_free(filename); + gint idx = document_find_by_filename(filename, FALSE); + // document_set_indicator will check valid idx + document_set_indicator(idx, line - 1); } + g_free(filename); } - else - msgwin_compiler_add(COLOR_BLACK, FALSE, g_strstrip(msg)); x++; g_free(msg); Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2006-06-27 15:24:39 UTC (rev 493) +++ trunk/src/callbacks.c 2006-06-27 15:29:33 UTC (rev 494) @@ -1403,14 +1403,12 @@ GtkTreeModel *model; GtkTreeSelection *selection; gchar *string; - static GdkColor red = {0, 65535, 0, 0}; - GdkColor *color; selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(msgwindow.tree_compiler)); if (gtk_tree_selection_get_selected(selection, &model, &iter)) { - gtk_tree_model_get(model, &iter, 0, &color, 1, &string, -1); - if (string && gdk_color_equal(&red, color)) + gtk_tree_model_get(model, &iter, 1, &string, -1); + if (string != NULL) { gint line; gint idx; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits