Commits January 2007

commits@lists.geany.org

3 participants
87 discussions

SF.net SVN: geany: [1218] trunk
by eht16＠users.sourceforge.net 21 Jan '07

21 Jan '07

Revision: 1218 http://svn.sourceforge.net/geany/?rev=1218&view=rev Author: eht16 Date: 2007-01-21 11:10:40 -0800 (Sun, 21 Jan 2007) Log Message: ----------- Replaced the New button by a Create button. Modified Paths: -------------- trunk/ChangeLog trunk/src/project.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-01-21 18:22:14 UTC (rev 1217) +++ trunk/ChangeLog 2007-01-21 19:10:40 UTC (rev 1218) @@ -5,6 +5,7 @@ * src/build.c, src/msgwindow.c, src/msgwindow.h: Applied patch from Jeff Pohlmeyer to avoid parsing of compiler errors by the va_list system. + * src/project.c: Replaced the New button by a Create button. 2007-01-20 Enrico Tröger <enrico.troeger(a)uvena.de> Modified: trunk/src/project.c =================================================================== --- trunk/src/project.c 2007-01-21 18:22:14 UTC (rev 1217) +++ trunk/src/project.c 2007-01-21 19:10:40 UTC (rev 1218) @@ -148,7 +148,6 @@ void project_properties() { - gchar *ok_button; GtkWidget *vbox; GtkWidget *table; GtkWidget *image; @@ -158,15 +157,26 @@ GtkWidget *swin; PropertyDialogElements *e = g_new(PropertyDialogElements, 1); + e->dialog = gtk_dialog_new_with_buttons(_("Project properties"), GTK_WINDOW(app->window), + GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, NULL); + if (app->project == NULL) - ok_button = GTK_STOCK_NEW; + { + bbox = gtk_hbox_new(FALSE, 0); + button = gtk_button_new(); + image = gtk_image_new_from_stock("gtk-new", GTK_ICON_SIZE_BUTTON); + label = gtk_label_new_with_mnemonic(_("C_reate")); + gtk_box_pack_start(GTK_BOX(bbox), image, FALSE, FALSE, 3); + gtk_box_pack_start(GTK_BOX(bbox), label, FALSE, FALSE, 3); + gtk_container_add(GTK_CONTAINER(button), bbox); + gtk_dialog_add_action_widget(GTK_DIALOG(e->dialog), button, GTK_RESPONSE_OK); + } else - ok_button = GTK_STOCK_OK; + { + gtk_dialog_add_buttons(GTK_DIALOG(e->dialog), GTK_STOCK_OK, GTK_RESPONSE_OK, NULL); + } - e->dialog = gtk_dialog_new_with_buttons(_("Project properties"), GTK_WINDOW(app->window), - GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - ok_button, GTK_RESPONSE_OK, NULL); vbox = ui_dialog_vbox_new(GTK_DIALOG(e->dialog)); entries_modified = FALSE; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1217] trunk
by eht16＠users.sourceforge.net 21 Jan '07

21 Jan '07

Revision: 1217 http://svn.sourceforge.net/geany/?rev=1217&view=rev Author: eht16 Date: 2007-01-21 10:22:14 -0800 (Sun, 21 Jan 2007) Log Message: ----------- Applied patch from Jeff Pohlmeyer to avoid parsing of compiler errors by the va_list system. Modified Paths: -------------- trunk/ChangeLog trunk/src/build.c trunk/src/msgwindow.c trunk/src/msgwindow.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-01-21 17:43:52 UTC (rev 1216) +++ trunk/ChangeLog 2007-01-21 18:22:14 UTC (rev 1217) @@ -1,3 +1,12 @@ +2007-01-21 Enrico Tröger <enrico.troeger(a)uvena.de> + + * src/project.c: Implemented loading and saving of the project file + and minor improvements. + * src/build.c, src/msgwindow.c, src/msgwindow.h: + Applied patch from Jeff Pohlmeyer to avoid parsing of compiler errors + by the va_list system. + + 2007-01-20 Enrico Tröger <enrico.troeger(a)uvena.de> * scintilla/makefile.win32: Fixed typo. @@ -4,8 +13,6 @@ * scintilla/*, src/sci_cb.c: Updated Scintilla to version 1.72. * doc/geany.docbook: Added a notice of changed DnD behaviour in Scintilla 1.72. - * src/project.c: Implemented loading and saving of the project file - and minor improvements. 2007-01-19 Enrico Tröger <enrico.troeger(a)uvena.de> Modified: trunk/src/build.c =================================================================== --- trunk/src/build.c 2007-01-21 17:43:52 UTC (rev 1216) +++ trunk/src/build.c 2007-01-21 18:22:14 UTC (rev 1217) @@ -431,7 +431,7 @@ working_dir = g_path_get_dirname(locale_filename); utf8_working_dir = g_path_get_dirname(doc_list[idx].file_name); gtk_list_store_clear(msgwindow.store_compiler); - msgwin_compiler_add(COLOR_BLUE, _("%s (in directory: %s)"), utf8_cmd_string, utf8_working_dir); + msgwin_compiler_add_fmt(COLOR_BLUE, _("%s (in directory: %s)"), utf8_cmd_string, utf8_working_dir); gtk_notebook_set_current_page(GTK_NOTEBOOK(msgwindow.notebook), MSG_COMPILER); // set the build info for the message window @@ -774,7 +774,7 @@ if (failure) { msg = _("Compilation failed."); - msgwin_compiler_add(COLOR_DARK_RED, "%s", msg); + msgwin_compiler_add(COLOR_DARK_RED, msg); // If msgwindow is hidden, user will want to display it to see the error if (! app->msgwindow_visible) { @@ -788,7 +788,7 @@ else { msg = _("Compilation finished successfully."); - msgwin_compiler_add(COLOR_BLUE, "%s", msg); + msgwin_compiler_add(COLOR_BLUE, msg); if (! app->msgwindow_visible || gtk_notebook_get_current_page(GTK_NOTEBOOK(msgwindow.notebook)) != MSG_COMPILER) ui_set_statusbar("%s", msg); Modified: trunk/src/msgwindow.c =================================================================== --- trunk/src/msgwindow.c 2007-01-21 17:43:52 UTC (rev 1216) +++ trunk/src/msgwindow.c 2007-01-21 18:22:14 UTC (rev 1217) @@ -186,8 +186,20 @@ static const GdkColor color_error = {0, 65535, 0, 0}; +void msgwin_compiler_add_fmt(gint msg_color, const gchar *format, ...) +{ + gchar string[512]; + va_list args; + + va_start(args, format); + g_vsnprintf(string, 512, format, args); + va_end(args); + msgwin_compiler_add(msg_color, string); +} + + // adds string to the compiler textview -void msgwin_compiler_add(gint msg_color, const gchar *format, ...) +void msgwin_compiler_add(gint msg_color, const gchar *msg) { GtkTreeIter iter; GtkTreePath *path; @@ -195,13 +207,7 @@ const GdkColor dark_red = {0, 65535 / 2, 0, 0}; const GdkColor blue = {0, 0, 0, 0xD000}; // not too bright ;-) const GdkColor black = {0, 0, 0, 0}; - gchar string[512]; - va_list args; - va_start(args, format); - g_vsnprintf(string, 512, format, args); - va_end(args); - switch (msg_color) { case COLOR_RED: color = &color_error; break; @@ -211,7 +217,7 @@ } gtk_list_store_append(msgwindow.store_compiler, &iter); - gtk_list_store_set(msgwindow.store_compiler, &iter, 0, color, 1, string, -1); + gtk_list_store_set(msgwindow.store_compiler, &iter, 0, color, 1, msg, -1); if (app->msgwindow_visible) { Modified: trunk/src/msgwindow.h =================================================================== --- trunk/src/msgwindow.h 2007-01-21 17:43:52 UTC (rev 1216) +++ trunk/src/msgwindow.h 2007-01-21 18:22:14 UTC (rev 1217) @@ -71,16 +71,18 @@ void msgwin_msg_add(gint line, gint idx, const gchar *string); -void msgwin_compiler_add(gint msg_color, const gchar *format, ...) - G_GNUC_PRINTF (2, 3); +void msgwin_compiler_add_fmt(gint msg_color, const gchar *format, ...) G_GNUC_PRINTF (2, 3); +void msgwin_compiler_add(gint msg_color, const gchar *msg); + void msgwin_status_add(const gchar *format, ...) G_GNUC_PRINTF (1, 2); void msgwin_menu_add_common_items(GtkMenu *menu); gboolean msgwin_goto_compiler_file_line(); -void msgwin_parse_compiler_error_line(const gchar *string, const gchar *dir, gchar **filename, gint *line); +void msgwin_parse_compiler_error_line(const gchar *string, const gchar *dir, + gchar **filename, gint *line); gboolean msgwin_goto_messages_file_line(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1216] trunk
by eht16＠users.sourceforge.net 21 Jan '07

21 Jan '07

Revision: 1216 http://svn.sourceforge.net/geany/?rev=1216&view=rev Author: eht16 Date: 2007-01-21 09:43:52 -0800 (Sun, 21 Jan 2007) Log Message: ----------- Implemented loading and saving of the project file and minor improvements. Modified Paths: -------------- trunk/ChangeLog trunk/src/project.c trunk/src/project.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-01-21 00:24:01 UTC (rev 1215) +++ trunk/ChangeLog 2007-01-21 17:43:52 UTC (rev 1216) @@ -4,6 +4,8 @@ * scintilla/*, src/sci_cb.c: Updated Scintilla to version 1.72. * doc/geany.docbook: Added a notice of changed DnD behaviour in Scintilla 1.72. + * src/project.c: Implemented loading and saving of the project file + and minor improvements. 2007-01-19 Enrico Tröger <enrico.troeger(a)uvena.de> Modified: trunk/src/project.c =================================================================== --- trunk/src/project.c 2007-01-21 00:24:01 UTC (rev 1215) +++ trunk/src/project.c 2007-01-21 17:43:52 UTC (rev 1216) @@ -30,6 +30,7 @@ #include "support.h" #include "utils.h" #include "ui_utils.h" +#include "msgwindow.h" #ifdef G_OS_WIN32 # include "win32.h" #endif @@ -38,7 +39,7 @@ static gboolean entries_modified; // simple struct to keep references to the elements of the properties dialog -typedef struct +typedef struct _PropertyDialogElements { GtkWidget *dialog; GtkWidget *name; @@ -57,12 +58,16 @@ static void on_open_dialog_response(GtkDialog *dialog, gint response, gpointer user_data); static gboolean close_open_project(); static gboolean load_config(const gchar *filename); +static gboolean write_config(); static void on_name_entry_changed(GtkEditable *editable, PropertyDialogElements *e); static void on_entries_changed(GtkEditable *editable, PropertyDialogElements *e); #define SHOW_ERR(...) dialogs_show_msgbox(GTK_MESSAGE_ERROR, __VA_ARGS__) #define MAX_NAME_LEN 50 +// "projects" is part of the default project base path so be carefully when translating +// please avoid special characters and spaces, look at the source for details or ask Frank +#define PROJECT_DIR _("projects") void project_new() @@ -78,6 +83,7 @@ #ifndef G_OS_WIN32 GtkWidget *dialog; GtkFileFilter *filter; + gchar *dir; #endif if (! close_open_project()) return; @@ -109,6 +115,10 @@ gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dialog), filter); gtk_file_chooser_set_filter(GTK_FILE_CHOOSER(dialog), filter); + dir = g_strconcat(GEANY_HOME_DIR, G_DIR_SEPARATOR_S, PROJECT_DIR, NULL); + gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialog), dir); + g_free(dir); + g_signal_connect ((gpointer) dialog, "response", G_CALLBACK(on_open_dialog_response), NULL); gtk_widget_show_all(dialog); @@ -118,10 +128,13 @@ void project_close() { - /// TODO should we handle open files in any way here? - g_return_if_fail(app->project != NULL); + /// TODO handle open project files + + write_config(); + msgwin_status_add(_("Project \"%s\" closed."), app->project->name); + g_free(app->project->name); g_free(app->project->description); g_free(app->project->file_name); @@ -169,6 +182,7 @@ gtk_misc_set_alignment(GTK_MISC(label), 1, 0); e->name = gtk_entry_new(); + gtk_entry_set_max_length(GTK_ENTRY(e->name), MAX_NAME_LEN); gtk_table_attach(GTK_TABLE(table), e->name, 1, 2, 0, 1, (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), (GtkAttachOptions) (0), 0, 0); @@ -180,7 +194,9 @@ gtk_misc_set_alignment(GTK_MISC(label), 1, 0); e->description = gtk_text_view_new(); + gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(e->description), GTK_WRAP_WORD); swin = gtk_scrolled_window_new(NULL, NULL); + gtk_widget_set_size_request(swin, 250, 80); gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(swin), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(swin), GTK_WIDGET(e->description)); @@ -188,7 +204,7 @@ (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), (GtkAttachOptions) (0), 0, 0); - label = gtk_label_new(_("File location:")); + label = gtk_label_new(_("Filename:")); gtk_table_attach(GTK_TABLE(table), label, 0, 1, 2, 3, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); @@ -235,6 +251,7 @@ e->patterns = gtk_text_view_new(); swin = gtk_scrolled_window_new(NULL, NULL); + gtk_widget_set_size_request(swin, -1, 80); gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(swin), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(swin), GTK_WIDGET(e->patterns)); @@ -288,7 +305,7 @@ } } gtk_text_buffer_set_text(buffer, str->str, -1); - g_string_free(str, FALSE); // can this leak? + g_string_free(str, TRUE); } gtk_entry_set_text(GTK_ENTRY(e->file_name), p->file_name); @@ -329,6 +346,7 @@ { const gchar *name, *file_name, *base_path; gint name_len; + gboolean new_project = FALSE; GeanyProject *p; name = gtk_entry_get_text(GTK_ENTRY(e->name)); @@ -349,7 +367,7 @@ file_name = gtk_entry_get_text(GTK_ENTRY(e->file_name)); if (strlen(file_name) == 0) { - SHOW_ERR(_("You have specified an invalid project file location.")); + SHOW_ERR(_("You have specified an invalid project filename.")); gtk_widget_grab_focus(e->file_name); return; } @@ -389,9 +407,14 @@ return; } - app->project = g_new0(GeanyProject, 1); + if (app->project == NULL) + { + app->project = g_new0(GeanyProject, 1); + new_project = TRUE; + } p = app->project; + if (p->name != NULL) g_free(p->name); p->name = g_strdup(name); { // get and set the project description GtkTextBuffer *buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(e->description)); @@ -400,7 +423,10 @@ gtk_text_buffer_get_end_iter(buffer, &end); p->description = gtk_text_buffer_get_text(buffer, &start, &end, FALSE); } + if (p->file_name != NULL) g_free(p->file_name); p->file_name = g_strdup(file_name); + + if (p->base_path != NULL) g_free(p->base_path); p->base_path = g_strdup(base_path); { // get and set the project file patterns @@ -414,6 +440,11 @@ p->file_patterns = g_strsplit(tmp, "\n", -1); g_free(tmp); } + write_config(); + if (new_project) + msgwin_status_add(_("Project \"%s\" created."), p->name); + else + msgwin_status_add(_("Project \"%s\" saved."), p->name); } gtk_widget_destroy(GTK_WIDGET(dialog)); @@ -493,10 +524,6 @@ } -// "projects" is part of the default project base path so be carefully when translating -// please avoid special characters and spaces, look at the source for details or ask Frank -#define PROJECT_DIR _("projects") - /* sets the project base path and the project file name according to the project name */ static void on_name_entry_changed(GtkEditable *editable, PropertyDialogElements *e) { @@ -550,7 +577,10 @@ // try to load the config if (load_config(filename)) + { gtk_widget_destroy(GTK_WIDGET(dialog)); + msgwin_status_add(_("Project \"%s\" opened."), app->project->name); + } else { SHOW_ERR(_("Project file could not be loaded.")); @@ -563,8 +593,74 @@ } +/* Reads the given filename and creates a new project with the data found in the file. + * At this point there should not be an already opened project in Geany otherwise it will just + * return. + * The filename is expected in the locale encoding. */ static gboolean load_config(const gchar *filename) { - /// TODO write me + GKeyFile *config; + GeanyProject *p; + + // there should not be an open project + g_return_val_if_fail(app->project == NULL && filename != NULL, FALSE); + + p = app->project = g_new0(GeanyProject, 1); + + config = g_key_file_new(); + if (! g_key_file_load_from_file(config, filename, G_KEY_FILE_KEEP_COMMENTS, NULL)) + { + g_key_file_free(config); + return FALSE; + } + + p->name = utils_get_setting_string(config, "project", "name", GEANY_STRING_UNTITLED); + p->description = utils_get_setting_string(config, "project", "description", ""); + p->file_name = utils_get_utf8_from_locale(filename); + p->base_path = utils_get_setting_string(config, "project", "base_path", ""); + p->file_patterns = g_key_file_get_string_list(config, "project", "file_patterns", NULL, NULL); + + g_key_file_free(config); + return TRUE; } + + +static gboolean write_config() +{ + GeanyProject *p; + GKeyFile *config; + gchar *filename; + gchar *data; + + g_return_val_if_fail(app->project != NULL, FALSE); + + p = app->project; + + config = g_key_file_new(); + // try to load an existing config to keep manually added comments + filename = utils_get_locale_from_utf8(p->file_name); + g_key_file_load_from_file(config, filename, G_KEY_FILE_KEEP_COMMENTS, NULL); + + g_key_file_set_string(config, "project", "name", p->name); + g_key_file_set_string(config, "project", "description", p->description); + g_key_file_set_string(config, "project", "base_path", p->base_path); + g_key_file_set_string_list(config, "project", "file_patterns", + (const gchar**) p->file_patterns, g_strv_length(p->file_patterns)); + + // write the file + data = g_key_file_to_data(config, NULL, NULL); + if (utils_write_file(filename, data) != 0) + { + g_free(data); + g_free(filename); + g_key_file_free(config); + return FALSE; + } + + g_free(data); + g_free(filename); + g_key_file_free(config); + + return TRUE; +} Modified: trunk/src/project.h =================================================================== --- trunk/src/project.h 2007-01-21 00:24:01 UTC (rev 1215) +++ trunk/src/project.h 2007-01-21 17:43:52 UTC (rev 1216) @@ -32,7 +32,7 @@ gchar *name; // the name of the project gchar *description; // short description of the project - gchar *file_name; // where the project file is stored + gchar *file_name; // where the project file is stored (in UTF-8) gchar *base_path; // base path of the project directory gchar *executable; // name of the project executable This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1215] trunk
by eht16＠users.sourceforge.net 21 Jan '07

21 Jan '07

Revision: 1215 http://svn.sourceforge.net/geany/?rev=1215&view=rev Author: eht16 Date: 2007-01-20 16:24:01 -0800 (Sat, 20 Jan 2007) Log Message: ----------- Added a notice of changed DnD behaviour in Scintilla 1.72. Modified Paths: -------------- trunk/ChangeLog trunk/doc/geany.docbook Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-01-21 00:18:33 UTC (rev 1214) +++ trunk/ChangeLog 2007-01-21 00:24:01 UTC (rev 1215) @@ -2,6 +2,8 @@ * scintilla/makefile.win32: Fixed typo. * scintilla/*, src/sci_cb.c: Updated Scintilla to version 1.72. + * doc/geany.docbook: + Added a notice of changed DnD behaviour in Scintilla 1.72. 2007-01-19 Enrico Tröger <enrico.troeger(a)uvena.de> Modified: trunk/doc/geany.docbook =================================================================== --- trunk/doc/geany.docbook 2007-01-21 00:18:33 UTC (rev 1214) +++ trunk/doc/geany.docbook 2007-01-21 00:24:01 UTC (rev 1215) @@ -363,6 +363,16 @@ appropriate command line option - see <xref linkend="clo"/>. </para> </section> + <section id="general_dnd"> + <title>Drag and drop of text</title> + <para> + If you drag selected text in the editor widget of + <application>Geany</application> the text is moved to the position where the + mouse pointer is when releasing the mouse button. This behaviour has been + changed in <application>Geany</application> 0.12. Before the selected text + was copied to the new position. + </para> + </section> <section id="general_vte"> <title>Virtual terminal emulator widget (VTE)</title> <para> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1214] trunk/po
by eht16＠users.sourceforge.net 21 Jan '07

21 Jan '07

Revision: 1214 http://svn.sourceforge.net/geany/?rev=1214&view=rev Author: eht16 Date: 2007-01-20 16:18:33 -0800 (Sat, 20 Jan 2007) Log Message: ----------- Update of German translation Modified Paths: -------------- trunk/po/ChangeLog trunk/po/de.po Modified: trunk/po/ChangeLog =================================================================== --- trunk/po/ChangeLog 2007-01-20 23:54:28 UTC (rev 1213) +++ trunk/po/ChangeLog 2007-01-21 00:18:33 UTC (rev 1214) @@ -1,3 +1,8 @@ +2007-01-21 Enrico Tröger <enrico.troeger(a)uvena.de> + + * de.po: Update of German translation + + 2007-01-20 Frank Lanitz <frank(a)frank.uvena.de> * de.po: Update of German translation @@ -6,7 +11,7 @@ 2007-01-06 Frank Lanitz <frank(a)frank.uvena.de> * de.po: Update of German translation - * fr.po: Update of French translation (Thnaks to Jean-Philippe Moal) + * fr.po: Update of French translation (Thanks to Jean-Philippe Moal) 2007-01-05 Enrico Tröger <enrico.troeger(a)uvena.de> @@ -16,7 +21,7 @@ 2007-01-03 Frank Lanitz <frank(a)frank.uvena.de> - * it.po: Update of Italian translation (thanks to M. Baldinelli) + * it.po: Update of Italian translation (Thanks to M. Baldinelli) 2006-12-21 Enrico Tröger <enrico.troeger(a)uvena.de> Modified: trunk/po/de.po =================================================================== --- trunk/po/de.po 2007-01-20 23:54:28 UTC (rev 1213) +++ trunk/po/de.po 2007-01-21 00:18:33 UTC (rev 1214) @@ -8,9 +8,9 @@ msgstr "" "Project-Id-Version: geany 0.10svn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-01-20 01:04+0100\n" -"PO-Revision-Date: 2007-01-20 16:06+0100\n" -"Last-Translator: Frank Lanitz <frank(a)frank.uvena.de>\n" +"POT-Creation-Date: 2007-01-21 01:12+0100\n" +"PO-Revision-Date: 2007-01-21 01:13+0100\n" +"Last-Translator: Enrico Tröger <enrico.troeger(a)uvena.de>\n" "Language-Team: German <frank(a)frank.uvena.de>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" @@ -74,22 +74,21 @@ 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:188 -#: src/build.c:566 +#: src/build.c:188 src/build.c:566 #, 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:202 -#: src/build.c:603 +#: src/build.c:202 src/build.c:603 #, 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:230 -#: src/build.c:446 -#: src/build.c:648 -#: src/search.c:1069 +#: src/build.c:230 src/build.c:446 src/build.c:648 src/search.c:1069 #, c-format msgid "Process failed (%s)" msgstr "Prozess fehlgeschlagen (%s)" @@ -132,8 +131,7 @@ msgstr "Kompiliert die aktuelle Datei" #. build the code -#: src/build.c:907 -#: src/interface.c:858 +#: src/build.c:907 src/interface.c:858 msgid "_Build" msgstr "_Erstellen" @@ -142,24 +140,20 @@ msgstr "Erstellt die aktuelle Datei (erzeugt eine ausführbare Datei)" #. build the code with make all -#: src/build.c:921 -#: src/build.c:1043 +#: src/build.c:921 src/build.c:1043 msgid "_Make All" msgstr "_Make all" -#: src/build.c:924 -#: src/build.c:1046 +#: src/build.c:924 src/build.c:1046 msgid "Builds the current file with the make tool and the default target" msgstr "Erstellt die aktuelle Datei mit \"make\" und dem Default-Target" #. build the code with make custom -#: src/build.c:932 -#: src/build.c:1054 +#: src/build.c:932 src/build.c:1054 msgid "Make Custom _Target" msgstr "Make (eigenes _Target)" -#: src/build.c:936 -#: src/build.c:1058 +#: src/build.c:936 src/build.c:1058 msgid "Builds the current file with the make tool and the specified target" msgstr "Erstellt die aktuelle Datei mit \"make\" und dem angegebenem Target" @@ -173,13 +167,11 @@ msgstr "Kompiliert die aktuelle Datei mittels make " #. next error -#: src/build.c:959 -#: src/build.c:1070 +#: src/build.c:959 src/build.c:1070 msgid "_Next Error" msgstr "Nächster _Fehler" -#: src/build.c:974 -#: src/interface.c:986 +#: src/build.c:974 src/interface.c:986 msgid "Run or view the current file" msgstr "Aktuelle Datei anzeigen oder ausführen" @@ -189,8 +181,11 @@ msgstr "_Programm-Parameter angeben" #: src/build.c:990 -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" +msgid "" +"Sets the includes and library paths for the compiler and the program " +"arguments for execution" +msgstr "" +"Include-Dateien und Bibliotheken-Pfade sowie Programmparameter festlegen" #. DVI #: src/build.c:1013 @@ -215,8 +210,7 @@ msgid "View DVI File" msgstr "DVI-Datei anzeigen" -#: src/build.c:1087 -#: src/build.c:1100 +#: src/build.c:1087 src/build.c:1100 msgid "Compiles and view the current file" msgstr "Kompiliert und zeigt die aktuelle Datei an." @@ -226,8 +220,7 @@ msgstr "PDF-Datei anzeigen" #. arguments -#: src/build.c:1115 -#: src/dialogs.c:642 +#: src/build.c:1115 src/dialogs.c:642 msgid "Set Arguments" msgstr "Programm-Parameter angeben" @@ -240,7 +233,8 @@ msgstr "Make (eigenes Target)" #: src/build.c:1388 -msgid "Enter custom options here, all entered text is passed to the make command." +msgid "" +"Enter custom options here, all entered text is passed to the make command." msgstr "Alles was Sie hier angeben, wird direkt an \"make\" übergeben." #: src/build.c:1427 @@ -264,9 +258,7 @@ msgid "Do you really want to quit?" msgstr "Möchten Sie wirklich beenden?" -#: src/callbacks.c:491 -#: src/interface.c:326 -#: src/utils.c:347 +#: src/callbacks.c:491 src/interface.c:326 src/utils.c:347 msgid "_Reload" msgstr "_Neu laden" @@ -287,50 +279,43 @@ #: src/callbacks.c:1251 #, c-format msgid "Forward declaration \"%s\" not found." -msgstr "" +msgstr "(Vorwärts-)Deklaration von \"%s\" nicht gefunden." #: src/callbacks.c:1253 #, c-format msgid "Definition of \"%s\" not found." msgstr "Definition von \"%s\" nicht gefunden." -#: src/callbacks.c:1458 -#: src/callbacks.c:1482 -msgid "Please set the filetype for the current file before using this function." +#: src/callbacks.c:1458 src/callbacks.c:1482 +msgid "" +"Please set the filetype for the current file before using this function." msgstr "Bitte legen Sie den Dateityp fest, bevor Sie diese Funktion benutzen." -#: src/callbacks.c:1593 -#: src/ui_utils.c:457 +#: src/callbacks.c:1593 src/ui_utils.c:457 msgid "dd.mm.yyyy" msgstr "TT.MM.JJ" -#: src/callbacks.c:1595 -#: src/ui_utils.c:458 +#: src/callbacks.c:1595 src/ui_utils.c:458 msgid "mm.dd.yyyy" msgstr "MM.TT.JJ" -#: src/callbacks.c:1597 -#: src/ui_utils.c:459 +#: src/callbacks.c:1597 src/ui_utils.c:459 msgid "yyyy/mm/dd" msgstr "JJJJ/MM/TT" -#: src/callbacks.c:1599 -#: src/ui_utils.c:468 +#: src/callbacks.c:1599 src/ui_utils.c:468 msgid "dd.mm.yyyy hh:mm:ss" msgstr "TT.MM.JJJJ Stunden:Minuten:Sekunden" -#: src/callbacks.c:1601 -#: src/ui_utils.c:469 +#: src/callbacks.c:1601 src/ui_utils.c:469 msgid "mm.dd.yyyy hh:mm:ss" msgstr "MM.TT.JJJJ Stunden:Minuten:Sekunden" -#: src/callbacks.c:1603 -#: src/ui_utils.c:470 +#: src/callbacks.c:1603 src/ui_utils.c:470 msgid "yyyy/mm/dd hh:mm:ss" msgstr "JJJJ/MM/TT Stunden:Minuten:Sekunden" -#: src/callbacks.c:1605 -#: src/ui_utils.c:479 +#: src/callbacks.c:1605 src/ui_utils.c:479 msgid "Use Custom Date Format" msgstr "Benutze selbst erstelltes Zeitformat" @@ -339,31 +324,40 @@ msgstr "Benutzerdefiniertes Datumsformat" #: src/callbacks.c:1617 -msgid "Enter here a custom date and time format. You can use any conversion specifiers which can be used with the ANSI C strftime function. See \"man strftime\" for more information." -msgstr "Hier kann ein benutzerdefiniertes Datumsformat eingegeben werden. Dabei können alle Platzhalter verwendet werden, die auch in ANSI C strftime zum Einsatz kommen." +msgid "" +"Enter here a custom date and time format. You can use any conversion " +"specifiers which can be used with the ANSI C strftime function. See \"man " +"strftime\" for more information." +msgstr "" +"Hier kann ein benutzerdefiniertes Datumsformat eingegeben werden. Dabei " +"können alle Platzhalter verwendet werden, die auch in ANSI C strftime zum " +"Einsatz kommen." #: src/callbacks.c:1637 msgid "Date format string could not be converted (possibly too long)." -msgstr "Das Datenformat konnte nicht umgewandelt werden. Eventuell ist es zu lang." +msgstr "" +"Das Datenformat konnte nicht umgewandelt werden. Eventuell ist es zu lang." #: src/callbacks.c:2025 msgid "No more message items." msgstr "Keine weiteren Nachrichten. " #. initialize the dialog -#: src/dialogs.c:75 -#: src/prefs.c:1030 +#: src/dialogs.c:75 src/prefs.c:1030 msgid "Open File" msgstr "Datei öffnen" -#: src/dialogs.c:78 -#: src/interface.c:635 +#: src/dialogs.c:78 src/interface.c:635 msgid "_View" msgstr "_Ansicht" #: src/dialogs.c:80 -msgid "Opens the file in read-only mode. If you choose more than one file to open, all files will be opened read-only." -msgstr "Öffnet die Datei schreibgeschützt. Wenn Sie mehrere Dateien wählen, werden alle schreibgeschützt geöffnet." +msgid "" +"Opens the file in read-only mode. If you choose more than one file to open, " +"all files will be opened read-only." +msgstr "" +"Öffnet die Datei schreibgeschützt. Wenn Sie mehrere Dateien wählen, werden " +"alle schreibgeschützt geöffnet." #: src/dialogs.c:113 msgid "Detect by file extension" @@ -384,11 +378,16 @@ #: src/dialogs.c:192 msgid "" -"Explicitly defines an encoding for the file, if it would not be detected. This is useful when you know that the encoding of a file cannot be detected correctly by Geany.\n" -"Note if you choose multiple files, they will all be opened with the chosen encoding." +"Explicitly defines an encoding for the file, if it would not be detected. " +"This is useful when you know that the encoding of a file cannot be detected " +"correctly by Geany.\n" +"Note if you choose multiple files, they will all be opened with the chosen " +"encoding." msgstr "" -"Definiert explizit eine bestimmte Zeichenkodierung, wenn sie nicht automatisch erkannt werden kann.\n" -"Beachten Sie, wenn Sie mehrere Dateien auswählen, werden alle mit der gewählten Zeichenkodierung geöffnet." +"Definiert explizit eine bestimmte Zeichenkodierung, wenn sie nicht " +"automatisch erkannt werden kann.\n" +"Beachten Sie, wenn Sie mehrere Dateien auswählen, werden alle mit der " +"gewählten Zeichenkodierung geöffnet." #: src/dialogs.c:212 msgid "Set filetype:" @@ -396,11 +395,15 @@ #: src/dialogs.c:222 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:261 msgid "Save File" @@ -451,15 +454,11 @@ msgid "Characters:" msgstr "Buchstaben:" -#: src/dialogs.c:544 -#: src/interface.c:3190 -#: src/vte.c:549 -#: src/vte.c:556 +#: src/dialogs.c:544 src/interface.c:3190 src/vte.c:549 src/vte.c:556 msgid "Color Chooser" msgstr "Farbwähler" -#: src/dialogs.c:611 -#: src/keybindings.c:148 +#: src/dialogs.c:611 src/keybindings.c:148 msgid "Go to line" msgstr "Gehe zu Zeile" @@ -470,8 +469,10 @@ #: src/dialogs.c:648 msgid "Set programs and options for compiling and viewing (La)TeX files." msgstr "" -"Setzt Programme und deren Optionen zum Kompilieren bzw. Betrachten von (La)TeX-Dateien.\n" -"Der jeweilige Dateiname wird bei einem Aufruf automatisch an das Ende angefügt." +"Setzt Programme und deren Optionen zum Kompilieren bzw. Betrachten von (La)" +"TeX-Dateien.\n" +"Der jeweilige Dateiname wird bei einem Aufruf automatisch an das Ende " +"angefügt." #: src/dialogs.c:659 msgid "DVI creation:" @@ -489,15 +490,16 @@ msgid "PDF preview:" msgstr "PDF-Vorschau:" -#: src/dialogs.c:732 -#: src/dialogs.c:847 +#: src/dialogs.c:732 src/dialogs.c:847 #, c-format msgid "" "%f will be replaced by the current filename, e.g. test_file.c\n" "%e will be replaced by the filename without extension, e.g. test_file" msgstr "" -"%f wird durch den aktuellen Dateinamen ersetzt. Zum Beispiel: meine_Datei.c \n" -"%e wird durch den Dateinamen ohne Dateiendung ersetzt. Zum Beispiel meine_Datei " +"%f wird durch den aktuellen Dateinamen ersetzt. Zum Beispiel: meine_Datei." +"c \n" +"%e wird durch den Dateinamen ohne Dateiendung ersetzt. Zum Beispiel " +"meine_Datei " #: src/dialogs.c:759 msgid "Set Includes and Arguments" @@ -519,25 +521,21 @@ msgid "Build:" msgstr "Erstellen:" -#: src/dialogs.c:829 -#: src/dialogs.c:1101 +#: src/dialogs.c:829 src/dialogs.c:1101 msgid "Execute:" msgstr "Ausführen:" #: src/dialogs.c:894 -msgid "An error occurred or file information could not be retrieved (e.g. from a new file)." -msgstr "Es ist ein Fehler aufgetreten oder Datei-Informationen konnten nicht gelesen werden(z.B. bei einer neuen, ungespeicherten Datei)." +msgid "" +"An error occurred or file information could not be retrieved (e.g. from a " +"new file)." +msgstr "" +"Es ist ein Fehler aufgetreten oder Datei-Informationen konnten nicht gelesen " +"werden(z.B. bei einer neuen, ungespeicherten Datei)." -#: src/dialogs.c:913 -#: src/dialogs.c:914 -#: src/dialogs.c:915 -#: src/dialogs.c:921 -#: src/dialogs.c:922 -#: src/dialogs.c:923 -#: src/ui_utils.c:122 -#: src/ui_utils.c:125 -#: src/utils.c:515 -#: src/utils.c:567 +#: src/dialogs.c:913 src/dialogs.c:914 src/dialogs.c:915 src/dialogs.c:921 +#: src/dialogs.c:922 src/dialogs.c:923 src/ui_utils.c:122 src/ui_utils.c:125 +#: src/utils.c:515 src/utils.c:567 msgid "unknown" msgstr "unbekannt" @@ -569,13 +567,11 @@ msgid "Encoding:" msgstr "Kodierung:" -#: src/dialogs.c:1022 -#: src/ui_utils.c:124 +#: src/dialogs.c:1022 src/ui_utils.c:124 msgid "(with BOM)" msgstr "(mit BOM)" -#: src/dialogs.c:1022 -#: src/ui_utils.c:124 +#: src/dialogs.c:1022 src/ui_utils.c:124 msgid "(without BOM)" msgstr "(ohne BOM)" @@ -636,8 +632,7 @@ msgid "New file opened." msgstr "Neue Datei geöffnet." -#: src/document.c:584 -#: src/document.c:851 +#: src/document.c:584 src/document.c:851 #, c-format msgid "Could not open file %s (%s)" msgstr "Konnte Datei '%s' nicht öffnen(%s)." @@ -645,10 +640,13 @@ #: src/document.c:607 #, c-format msgid "" -"The file \"%s\" could not be opened properly and has been truncated. This can occur if the file contains a NULL byte. Be aware that saving it can cause data loss.\n" +"The file \"%s\" could not be opened properly and has been truncated. This " +"can occur if the file contains a NULL byte. Be aware that saving it can " +"cause data loss.\n" "The file was set to read-only." msgstr "" -"Die Datei »%s« konnte nicht ordnungsgemäß geladen werden und wurde evtl. abgeschnitten. Die kann zu Datenverlust beim Speichern führen!\n" +"Die Datei »%s« konnte nicht ordnungsgemäß geladen werden und wurde evtl. " +"abgeschnitten. Die kann zu Datenverlust beim Speichern führen!\n" "Die Datei wird schreibgeschützt geöffnet." #: src/document.c:631 @@ -658,8 +656,12 @@ #: src/document.c:640 #, c-format -msgid "The file \"%s\" does not look like a text file or the file encoding is not supported." -msgstr "Die Datei \"%s\" scheint keine Textdatei zu sein, oder das Format wird nicht unterstützt." +msgid "" +"The file \"%s\" does not look like a text file or the file encoding is not " +"supported." +msgstr "" +"Die Datei \"%s\" scheint keine Textdatei zu sein, oder das Format wird nicht " +"unterstützt." #: src/document.c:681 msgid "Invalid filename" @@ -679,18 +681,19 @@ msgid ", read-only" msgstr ", schreibgeschützt" -#: src/document.c:879 -#: src/document.c:962 +#: src/document.c:879 src/document.c:962 msgid "Error saving file." msgstr "Fehler beim Speichern der Datei." #: src/document.c:926 #, c-format msgid "" -"An error occurred while converting the file from UTF-8 in \"%s\". The file remains unsaved.\n" +"An error occurred while converting the file from UTF-8 in \"%s\". The file " +"remains unsaved.\n" "Error message: %s\n" msgstr "" -"Beim Konvertieren der Datei von UTF-8 in \"%s\" ist ein Fehler aufgetreten. Die Datei bleibt ungespeichert.\n" +"Beim Konvertieren der Datei von UTF-8 in \"%s\" ist ein Fehler aufgetreten. " +"Die Datei bleibt ungespeichert.\n" "Fehlermeldung: %s\n" #: src/document.c:950 @@ -703,9 +706,7 @@ msgid "File %s saved." msgstr "Datei %s wurde gespeichert." -#: src/document.c:1041 -#: src/document.c:1093 -#: src/document.c:1101 +#: src/document.c:1041 src/document.c:1093 src/document.c:1101 #, c-format msgid "\"%s\" was not found." msgstr "\"%s\" wurde nicht gefunden." @@ -714,13 +715,11 @@ msgid "Wrap search and find again?" msgstr "Suche vom Dokumentanfang bzw. -ende neu beginnen?" -#: src/document.c:1180 -#: src/search.c:1188 +#: src/document.c:1180 src/search.c:1188 msgid "No matches found." msgstr "Keine Treffer gefunden." -#: src/document.c:1190 -#: src/document.c:1197 +#: src/document.c:1190 src/document.c:1197 #, c-format msgid "%s: replaced %d occurrences of \"%s\" with \"%s\"." msgstr "%s: Es wurde %d Mal \"%s\" gegen \"%s\" ersetzt." @@ -762,8 +761,7 @@ msgid "Celtic" msgstr "Keltisch" -#: src/encodings.c:53 -#: src/encodings.c:54 +#: src/encodings.c:53 src/encodings.c:54 msgid "Greek" msgstr "Griechisch" @@ -775,29 +773,19 @@ msgid "South European" msgstr "Südeuropäisch" -#: src/encodings.c:57 -#: src/encodings.c:58 -#: src/encodings.c:59 -#: src/encodings.c:60 +#: src/encodings.c:57 src/encodings.c:58 src/encodings.c:59 src/encodings.c:60 msgid "Western" msgstr "Westlich" -#: src/encodings.c:62 -#: src/encodings.c:63 -#: src/encodings.c:64 +#: src/encodings.c:62 src/encodings.c:63 src/encodings.c:64 msgid "Baltic" msgstr "Baltisch" -#: src/encodings.c:65 -#: src/encodings.c:66 -#: src/encodings.c:67 +#: src/encodings.c:65 src/encodings.c:66 src/encodings.c:67 msgid "Central European" msgstr "Mitteleuropäisch" -#: src/encodings.c:68 -#: src/encodings.c:69 -#: src/encodings.c:70 -#: src/encodings.c:71 +#: src/encodings.c:68 src/encodings.c:69 src/encodings.c:70 src/encodings.c:71 #: src/encodings.c:72 msgid "Cyrillic" msgstr "Kyrillisch" @@ -814,15 +802,11 @@ msgid "Romanian" msgstr "Rumänisch" -#: src/encodings.c:77 -#: src/encodings.c:78 -#: src/encodings.c:79 +#: src/encodings.c:77 src/encodings.c:78 src/encodings.c:79 msgid "Arabic" msgstr "Arabisch" -#: src/encodings.c:80 -#: src/encodings.c:81 -#: src/encodings.c:82 +#: src/encodings.c:80 src/encodings.c:81 src/encodings.c:82 msgid "Hebrew" msgstr "Hebräisch" @@ -842,51 +826,34 @@ msgid "Thai" msgstr "Thai" -#: src/encodings.c:88 -#: src/encodings.c:89 -#: src/encodings.c:90 +#: src/encodings.c:88 src/encodings.c:89 src/encodings.c:90 msgid "Turkish" msgstr "Türkisch" -#: src/encodings.c:91 -#: src/encodings.c:92 -#: src/encodings.c:93 +#: src/encodings.c:91 src/encodings.c:92 src/encodings.c:93 msgid "Vietnamese" msgstr "Vietnamesisch" -#: src/encodings.c:95 -#: src/encodings.c:96 -#: src/encodings.c:97 -#: src/encodings.c:98 -#: src/encodings.c:99 -#: src/encodings.c:100 -#: src/encodings.c:101 +#: src/encodings.c:95 src/encodings.c:96 src/encodings.c:97 src/encodings.c:98 +#: src/encodings.c:99 src/encodings.c:100 src/encodings.c:101 #: src/encodings.c:102 msgid "Unicode" msgstr "Unicode" -#: src/encodings.c:104 -#: src/encodings.c:105 -#: src/encodings.c:106 +#: src/encodings.c:104 src/encodings.c:105 src/encodings.c:106 #: src/encodings.c:107 msgid "Chinese Simplified" msgstr "Chinesisch vereinfacht" -#: src/encodings.c:108 -#: src/encodings.c:109 -#: src/encodings.c:110 +#: src/encodings.c:108 src/encodings.c:109 src/encodings.c:110 msgid "Chinese Traditional" msgstr "Chinesisch traditionell" -#: src/encodings.c:111 -#: src/encodings.c:112 -#: src/encodings.c:113 +#: src/encodings.c:111 src/encodings.c:112 src/encodings.c:113 msgid "Japanese" msgstr "Japanisch" -#: src/encodings.c:114 -#: src/encodings.c:115 -#: src/encodings.c:116 +#: src/encodings.c:114 src/encodings.c:115 src/encodings.c:116 #: src/encodings.c:117 msgid "Korean" msgstr "Koreanisch" @@ -1031,8 +998,7 @@ msgid "Config file" msgstr "Konfigurationsdatei" -#: src/filetypes.c:720 -#: src/project.c:103 +#: src/filetypes.c:720 src/project.c:104 msgid "All files" msgstr "Alle Dateien" @@ -1044,8 +1010,7 @@ msgid "untitled" msgstr "unbenannt" -#: src/interface.c:256 -#: src/interface.c:1478 +#: src/interface.c:256 src/interface.c:1478 msgid "Geany" msgstr "Geany" @@ -1057,14 +1022,9 @@ msgid "New (with _Template)" msgstr "Neu (aus _Vorlage)" -#: src/interface.c:288 -#: src/interface.c:345 -#: src/interface.c:519 -#: src/interface.c:570 -#: src/interface.c:745 -#: src/interface.c:755 -#: src/interface.c:1998 -#: src/interface.c:2049 +#: src/interface.c:288 src/interface.c:345 src/interface.c:519 +#: src/interface.c:570 src/interface.c:745 src/interface.c:755 +#: src/interface.c:1998 src/interface.c:2049 msgid "invisible" msgstr "unsichtbar" @@ -1096,8 +1056,7 @@ msgid "Closes all open files" msgstr "Schließt alle offenen Dateien" -#: src/interface.c:393 -#: src/interface.c:1059 +#: src/interface.c:393 src/interface.c:1059 msgid "Quit Geany" msgstr "Geany beenden" @@ -1105,13 +1064,11 @@ msgid "_Edit" msgstr "_Bearbeiten" -#: src/interface.c:436 -#: src/interface.c:1899 +#: src/interface.c:436 src/interface.c:1899 msgid "Select _All" msgstr "A_lles auswählen" -#: src/interface.c:445 -#: src/interface.c:1925 +#: src/interface.c:445 src/interface.c:1925 msgid "_Format" msgstr "_Format" @@ -1119,43 +1076,35 @@ msgid "Convert the case of the current selection" msgstr "Ändert die Großschreibung der aktuellen Auswahl" -#: src/interface.c:453 -#: src/interface.c:1932 +#: src/interface.c:453 src/interface.c:1932 msgid "Convert Selection to _Lower-case" msgstr "Auswahl in _Kleinbuchstaben umwandeln" -#: src/interface.c:457 -#: src/interface.c:1936 +#: src/interface.c:457 src/interface.c:1936 msgid "Convert Selection to _Upper-case" msgstr "Auswahl in _Großbuchstaben umwandeln" -#: src/interface.c:466 -#: src/interface.c:1945 +#: src/interface.c:466 src/interface.c:1945 msgid "_Comment Line(s)" msgstr "Zeile(n) _auskommentieren" -#: src/interface.c:470 -#: src/interface.c:1949 +#: src/interface.c:470 src/interface.c:1949 msgid "U_ncomment Line(s)" msgstr "Zeile(n) _einkommentieren" -#: src/interface.c:474 -#: src/interface.c:1953 +#: src/interface.c:474 src/interface.c:1953 msgid "_Toggle Line Commentation" msgstr "Kommentierung _umschalten" -#: src/interface.c:478 -#: src/interface.c:1957 +#: src/interface.c:478 src/interface.c:1957 msgid "Du_plicate Line or Selection" msgstr "Zeile oder Auswahl kopieren" -#: src/interface.c:487 -#: src/interface.c:1966 +#: src/interface.c:487 src/interface.c:1966 msgid "_Increase Indent" msgstr "Einzug _erhöhen" -#: src/interface.c:495 -#: src/interface.c:1974 +#: src/interface.c:495 src/interface.c:1974 msgid "_Decrease Indent" msgstr "Einzug _verringern" @@ -1167,68 +1116,60 @@ msgid "I_nsert Comments" msgstr "K_ommentare einfügen" -#: src/interface.c:533 -#: src/interface.c:2012 +#: src/interface.c:533 src/interface.c:2012 msgid "Insert ChangeLog Entry" msgstr "ChangeLog-Eintrag hinzufügen" -#: src/interface.c:536 -#: src/interface.c:2015 +#: src/interface.c:536 src/interface.c:2015 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:538 -#: src/interface.c:2017 +#: src/interface.c:538 src/interface.c:2017 msgid "Insert File Header" msgstr "Dateikopf einfügen" -#: src/interface.c:541 -#: src/interface.c:2020 +#: src/interface.c:541 src/interface.c:2020 msgid "Inserts a file header at the beginning of the file" msgstr "Fügt einen Dateikopf am Anfang einer neu erzeugten Datei ein." -#: src/interface.c:543 -#: src/interface.c:2022 +#: src/interface.c:543 src/interface.c:2022 msgid "Insert Function Description" msgstr "Funktionsbeschreibung einfügen" -#: src/interface.c:546 -#: src/interface.c:2025 +#: src/interface.c:546 src/interface.c:2025 msgid "Inserts a description before the current function" msgstr "Fügt eine Funktionsbeschreibung vor der Funktion ein." -#: src/interface.c:548 -#: src/interface.c:2027 +#: src/interface.c:548 src/interface.c:2027 msgid "Insert Multiline Comment" msgstr "Mehrzeiligen Kommentar einfügen" -#: src/interface.c:551 -#: src/interface.c:2030 +#: src/interface.c:551 src/interface.c:2030 msgid "Inserts a multiline comment" msgstr "Fügt einen mehrzeiligen Kommentar ein." -#: src/interface.c:553 -#: src/interface.c:2032 +#: src/interface.c:553 src/interface.c:2032 msgid "Insert GPL Notice" msgstr "GPL-Hinweis einfügen" -#: src/interface.c:556 -#: src/interface.c:2035 +#: src/interface.c:556 src/interface.c:2035 msgid "Inserts a GPL notice (should be done at the beginning of the file)" -msgstr "Fügt einen kurzen Lizenz-Hinweis auf die GPL ein (sollte am Anfang einer Datei sein)." +msgstr "" +"Fügt einen kurzen Lizenz-Hinweis auf die GPL ein (sollte am Anfang einer " +"Datei sein)." -#: src/interface.c:558 -#: src/interface.c:2037 +#: src/interface.c:558 src/interface.c:2037 msgid "Insert BSD license Notice" msgstr "BSD-Lizenz-Hinweis einfügen" -#: src/interface.c:561 -#: src/interface.c:2040 -msgid "Inserts a BSD licence notice (should be done at the beginning of the file)" -msgstr "Fügt einen kurzen Lizenz-Hinweis auf die BSD-Lizenz ein (sollte am Anfang einer Datei sein)." +#: src/interface.c:561 src/interface.c:2040 +msgid "" +"Inserts a BSD licence notice (should be done at the beginning of the file)" +msgstr "" +"Fügt einen kurzen Lizenz-Hinweis auf die BSD-Lizenz ein (sollte am Anfang " +"einer Datei sein)." -#: src/interface.c:563 -#: src/interface.c:2042 +#: src/interface.c:563 src/interface.c:2042 msgid "Insert Dat_e" msgstr "_Datum einfügen" @@ -1248,8 +1189,7 @@ msgid "Find in F_iles" msgstr "In _Dateien suchen" -#: src/interface.c:605 -#: src/search.c:385 +#: src/interface.c:605 src/search.c:385 msgid "_Replace" msgstr "_Ersetzen" @@ -1279,7 +1219,8 @@ #: src/interface.c:663 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:666 msgid "Show _Toolbar" @@ -1298,8 +1239,12 @@ msgstr "M_arkierungsrand anzeigen" #: src/interface.c:680 -msgid "Shows or hides the small margin right of the line numbers, which is used to mark lines." -msgstr "Zeigt oder versteckt den kleinen Rand rechts von den Zeilennummern, der zum Anzeigen von Markierungen genutzt wird." +msgid "" +"Shows or hides the small margin right of the line numbers, which is used to " +"mark lines." +msgstr "" +"Zeigt oder versteckt den kleinen Rand rechts von den Zeilennummern, der zum " +"Anzeigen von Markierungen genutzt wird." #: src/interface.c:683 msgid "Show _Line Numbers" @@ -1317,10 +1262,15 @@ msgid "_Line Wrapping" msgstr "_Zeilenumbruch" -#: src/interface.c:716 -#: src/interface.c:3255 -msgid "Wrap the line at the window border and continue it on the next line. Note: line wrapping has a high performance cost for large documents so should be disabled on slow machines." -msgstr "Bricht lange Zeilen am Fensterrand um und setzt sie auf der nächsten Zeile fort. Achtung: Bei großen Dokumenten erfordert der Zeilenumbruch viel Rechenleistung und sollte daher auf langsameren Rechnern deaktiviert werden." +#: src/interface.c:716 src/interface.c:3255 +msgid "" +"Wrap the line at the window border and continue it on the next line. Note: " +"line wrapping has a high performance cost for large documents so should be " +"disabled on slow machines." +msgstr "" +"Bricht lange Zeilen am Fensterrand um und setzt sie auf der nächsten Zeile " +"fort. Achtung: Bei großen Dokumenten erfordert der Zeilenumbruch viel " +"Rechenleistung und sollte daher auf langsameren Rechnern deaktiviert werden." #: src/interface.c:719 msgid "_Use Auto-indentation" @@ -1366,8 +1316,7 @@ msgid "_Replace Tabs by Spaces" msgstr "_Tabulatoren durch Leerzeichen ersetzen" -#: src/interface.c:791 -#: src/interface.c:3023 +#: src/interface.c:791 src/interface.c:3023 msgid "Replaces all tabs in document by spaces." msgstr "Ersetzt alle Tabulatoren im Dokument durch Leerzeichen" @@ -1393,7 +1342,8 @@ #: src/interface.c:816 msgid "Removes all error indicators in the current document." -msgstr "Entfernt alle gesetzten (Fehler)-Markierungen innerhalb des Dokumentes." +msgstr "" +"Entfernt alle gesetzten (Fehler)-Markierungen innerhalb des Dokumentes." #: src/interface.c:818 msgid "_Project" @@ -1419,18 +1369,23 @@ msgid "_Colour Chooser" msgstr "_Farbwähler" -#: src/interface.c:872 -#: src/interface.c:997 -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:872 src/interface.c:997 +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:878 msgid "_Word Count" msgstr "_Wörter zählen" #: src/interface.c:881 -msgid "Counts the words and characters in the current selection or the whole document" -msgstr "Zählt die Wörter und Zeichen in der aktuellen Auswahl bzw. dem aktuellen Dokument." +msgid "" +"Counts the words and characters in the current selection or the whole " +"document" +msgstr "" +"Zählt die Wörter und Zeichen in der aktuellen Auswahl bzw. dem aktuellen " +"Dokument." #: src/interface.c:883 msgid "_Insert Special HTML Characters" @@ -1464,8 +1419,7 @@ msgid "Save the current file" msgstr "Speichert die aktuelle Datei" -#: src/interface.c:939 -#: src/keybindings.c:118 +#: src/interface.c:939 src/keybindings.c:118 msgid "Save all" msgstr "Alle speichern" @@ -1489,8 +1443,7 @@ msgid "Redo the last modification" msgstr "Wiederholt die letzte Änderung." -#: src/interface.c:978 -#: src/keybindings.c:170 +#: src/interface.c:978 src/keybindings.c:170 msgid "Compile" msgstr "Kompilieren" @@ -1510,8 +1463,7 @@ msgid "Zoom out the text" msgstr "Text verkleinern" -#: src/interface.c:1024 -#: src/interface.c:1029 +#: src/interface.c:1024 src/interface.c:1029 msgid "Find the entered text in the current file" msgstr "Findet den eingegebenen Text im aktuellen Dokument" @@ -1523,13 +1475,11 @@ msgid "Jump to the entered line number." msgstr "Springe zu angegebener Zeile" -#: src/interface.c:1087 -#: src/treeviews.c:72 +#: src/interface.c:1087 src/treeviews.c:72 msgid "Symbols" msgstr "Symbole" -#: src/interface.c:1100 -#: src/treeviews.c:115 +#: src/interface.c:1100 src/treeviews.c:115 msgid "Open files" msgstr "Geöffnete Dateien" @@ -1549,28 +1499,23 @@ msgid "Scribble" msgstr "Notizen" -#: src/interface.c:1719 -#: src/interface.c:2878 +#: src/interface.c:1719 src/interface.c:2878 msgid "Images and text" msgstr "Icons und Text" -#: src/interface.c:1725 -#: src/interface.c:2910 +#: src/interface.c:1725 src/interface.c:2910 msgid "Images only" msgstr "Nur Icons" -#: src/interface.c:1731 -#: src/interface.c:2902 +#: src/interface.c:1731 src/interface.c:2902 msgid "Text only" msgstr "Nur Text" -#: src/interface.c:1742 -#: src/interface.c:2894 +#: src/interface.c:1742 src/interface.c:2894 msgid "Large icons" msgstr "Große Symbole" -#: src/interface.c:1747 -#: src/interface.c:2886 +#: src/interface.c:1747 src/interface.c:2886 msgid "Small icons" msgstr "Kleine Symbole" @@ -1586,8 +1531,7 @@ msgid "Insert Comments" msgstr "Kommentare einfügen" -#: src/interface.c:2057 -#: src/keybindings.c:236 +#: src/interface.c:2057 src/keybindings.c:236 msgid "Find Usage" msgstr "Auftreten finden" @@ -1607,8 +1551,7 @@ msgid "Goto to the entered line" msgstr "Springe zu angegebener Zeile" -#: src/interface.c:2459 -#: src/keybindings.c:136 +#: src/interface.c:2459 src/keybindings.c:136 msgid "Preferences" msgstr "Einstellungen" @@ -1633,8 +1576,13 @@ msgstr "Starte die Virtual Terminal Emulation beim Starten" #: src/interface.c:2508 -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" +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:2511 msgid "Confirm exit" @@ -1653,24 +1601,36 @@ msgstr "Bei Fehlern oder beendeter Kompilierung Piepton ausgeben" #: src/interface.c:2540 -msgid "Whether to beep if an error occured or when the compilation process has finished." -msgstr "Legt fest, ob bei einem Fehler oder bei beendeter Kompilierung ein Piepton ausgegeben werden soll." +msgid "" +"Whether to beep if an error occured or when the compilation process has " +"finished." +msgstr "" +"Legt fest, ob bei einem Fehler oder bei beendeter Kompilierung ein Piepton " +"ausgegeben werden soll." #: src/interface.c:2543 msgid "Switch to status message list at new message" msgstr "Wechsele zum Statusmeldungsfenster bei neuer Meldung" #: src/interface.c:2546 -msgid "Switch to the status message tab (in the notebook window at the bottom) if a new status message arrives." -msgstr "Automatisch zu dem Statusmeldungs-Reiter im unteren Fenster wechseln, wenn eine neue Statusmeldung vorliegt." +msgid "" +"Switch to the status message tab (in the notebook window at the bottom) if a " +"new status message arrives." +msgstr "" +"Automatisch zu dem Statusmeldungs-Reiter im unteren Fenster wechseln, wenn " +"eine neue Statusmeldung vorliegt." #: src/interface.c:2549 msgid "Always wrap search and hide the Find dialog" msgstr "Das vollständige Dokument durchsuchen und den Suchen-Dialog schließen" #: src/interface.c:2553 -msgid "Always wrap search around the document and hide the Find dialog after clicking Find Next/Previous" -msgstr "Immer das vollständige Dokument durchsuchen und den Suchen-Dialog nach Klicken auf Nächstes/Vorheriges schließen." +msgid "" +"Always wrap search around the document and hide the Find dialog after " +"clicking Find Next/Previous" +msgstr "" +"Immer das vollständige Dokument durchsuchen und den Suchen-Dialog nach " +"Klicken auf Nächstes/Vorheriges schließen." # Denke trifft es besser als »Eigenschaften« #: src/interface.c:2556 @@ -1685,8 +1645,7 @@ msgid "Show symbol list" msgstr "Symbol-Ansicht anzeigen" -#: src/interface.c:2586 -#: src/interface.c:2592 +#: src/interface.c:2586 src/interface.c:2592 msgid "Toggle the symbol list on and off" msgstr "Schaltet die Symbol-Ansicht ein und aus." @@ -1702,13 +1661,11 @@ msgid "Symbol list:" msgstr "Symbol-Liste:" -#: src/interface.c:2623 -#: src/interface.c:2688 +#: src/interface.c:2623 src/interface.c:2688 msgid "Message window:" msgstr "Meldungsfenster:" -#: src/interface.c:2630 -#: src/interface.c:2695 +#: src/interface.c:2630 src/interface.c:2695 msgid "Editor:" msgstr "Editor:" @@ -1736,29 +1693,21 @@ msgid "Show editor tabs" msgstr "Zeige Liste mit geöffneten Dateien" -#: src/interface.c:2713 -#: src/interface.c:2723 -#: src/interface.c:2733 +#: src/interface.c:2713 src/interface.c:2723 src/interface.c:2733 #: src/interface.c:3070 msgid "Left" msgstr "Links" -#: src/interface.c:2714 -#: src/interface.c:2724 -#: src/interface.c:2734 +#: src/interface.c:2714 src/interface.c:2724 src/interface.c:2734 #: src/interface.c:3078 msgid "Right" msgstr "Rechts" -#: src/interface.c:2715 -#: src/interface.c:2725 -#: src/interface.c:2735 +#: src/interface.c:2715 src/interface.c:2725 src/interface.c:2735 msgid "Top" msgstr "Oben" -#: src/interface.c:2716 -#: src/interface.c:2726 -#: src/interface.c:2736 +#: src/interface.c:2716 src/interface.c:2726 src/interface.c:2736 msgid "Bottom" msgstr "Unten" @@ -1780,7 +1729,8 @@ #: src/interface.c:2791 msgid "Display the New, Open, Close, Save and Reload buttons in the toolbar" -msgstr "Zeigt Symbole für Neu, Öffnen, Schließen und Neuladen in der Werkzeugleiste." +msgstr "" +"Zeigt Symbole für Neu, Öffnen, Schließen und Neuladen in der Werkzeugleiste." #: src/interface.c:2794 msgid "Show Compile and Run" @@ -1812,7 +1762,8 @@ #: src/interface.c:2819 msgid "Display the Redo and Undo buttons in the toolbar" -msgstr "Zeigt die Symbole zum Rückgängigmachen und Wiederholen in der Werkzeugleiste." +msgstr "" +"Zeigt die Symbole zum Rückgängigmachen und Wiederholen in der Werkzeugleiste." #: src/interface.c:2822 msgid "Show Search field" @@ -1894,8 +1845,7 @@ 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:3019 -#: src/keybindings.c:162 +#: src/interface.c:3019 src/keybindings.c:162 msgid "Replace tabs by space" msgstr "Tabulatoren durch Leerzeichen ersetzen" @@ -1908,7 +1858,8 @@ msgstr "Platzierung neuer Dateien:" #: src/interface.c:3060 -msgid "Specifies the number of files which are stored in the Recent files list." +msgid "" +"Specifies the number of files which are stored in the Recent files list." msgstr "Gibt die Länge der Liste von Dateien an, die zuletzt geöffnet wurden." #: src/interface.c:3073 @@ -1927,8 +1878,7 @@ msgid "Misc." msgstr "Sonstiges" -#: src/interface.c:3098 -#: src/symbols.c:395 +#: src/interface.c:3098 src/symbols.c:395 msgid "Files" msgstr "Dateien" @@ -1985,24 +1935,41 @@ msgstr "Stellt die Farbe des \"long line markers\" ein." #: src/interface.c:3198 -msgid "The long line marker is a thin vertical line in the editor. It helps to mark long lines, or as a hint to break the line. Set this value to a value greater than 0 to specify the column where it should appear." -msgstr "Die Markierung für statischen Zeilenumbruch ist eine dünne Linie im Editorfenster. Sie hilft dabei, lange Zeilen zu markieren und dabei auf einen eventuell notwendigen Zeilenumbruch hinzuweisen. Werte größer als 0 geben die Spalte an, in der die Linie angezeigt werden soll." +msgid "" +"The long line marker is a thin vertical line in the editor. It helps to mark " +"long lines, or as a hint to break the line. Set this value to a value " +"greater than 0 to specify the column where it should appear." +msgstr "" +"Die Markierung für statischen Zeilenumbruch ist eine dünne Linie im " +"Editorfenster. Sie hilft dabei, lange Zeilen zu markieren und dabei auf " +"einen eventuell notwendigen Zeilenumbruch hinzuweisen. Werte größer als 0 " +"geben die Spalte an, in der die Linie angezeigt werden soll." #: src/interface.c:3208 msgid "Line" msgstr "Linie" #: src/interface.c:3211 -msgid "Prints a vertical line in the editor window at the given cursor position (see below)." -msgstr "Zeichnet eine vertikale Linie im Editorfenster an der angegebenen Cursor-Position (nur sinnvoll mit Festbreitenschriften)." +msgid "" +"Prints a vertical line in the editor window at the given cursor position " +"(see below)." +msgstr "" +"Zeichnet eine vertikale Linie im Editorfenster an der angegebenen Cursor-" +"Position (nur sinnvoll mit Festbreitenschriften)." #: src/interface.c:3215 msgid "Background" msgstr "Hintergrund" #: src/interface.c:3218 -msgid "The background colour of characters after the given cursor position (see below) changed to the colour set below. (This is recommended if you use proportional fonts)" -msgstr "Die Hintergrundfarbe der Zeichen, die hinter der angegebenen Cursor-Position(siehe unten) stehen, wird auf die unten angegebene Farbe geändert (das ist nützlich für proportionale Schriftarten)." +msgid "" +"The background colour of characters after the given cursor position (see " +"below) changed to the colour set below. (This is recommended if you use " +"proportional fonts)" +msgstr "" +"Die Hintergrundfarbe der Zeichen, die hinter der angegebenen Cursor-Position" +"(siehe unten) stehen, wird auf die unten angegebene Farbe geändert (das ist " +"nützlich für proportionale Schriftarten)." #: src/interface.c:3222 msgid "Disabled" @@ -2018,7 +1985,8 @@ #: src/interface.c:3250 msgid "Add the same indentation as the previous line after pressing enter" -msgstr "Fügt denselben Einzug wie in der vorherigen Zeile nach Drücken von Enter ein." +msgstr "" +"Fügt denselben Einzug wie in der vorherigen Zeile nach Drücken von Enter ein." #: src/interface.c:3252 msgid "Line wrapping" @@ -2038,22 +2006,29 @@ #: src/interface.c:3266 msgid "Unfold all children of a fold point when unfolding it." -msgstr "Klappt alle ausgeblendeten Codeblöcke einer Stelle im Quellcode mit aus. " +msgstr "" +"Klappt alle ausgeblendeten Codeblöcke einer Stelle im Quellcode mit aus. " #: src/interface.c:3269 msgid "Use indicators to show compile errors" msgstr "Benutzt Markierungen, um Probleme beim Kompilieren anzuzeigen." #: src/interface.c:3272 -msgid "Whether to use indicators (a squiggly underline) to highlight the lines where the compiler found a warning or an error." -msgstr "Legt fest, ob Markierungen (wellige Unterstreichungen) benutzt werden sollen, um Zeilen mit Fehlern beim Kompiliervorgang zu markieren" +msgid "" +"Whether to use indicators (a squiggly underline) to highlight the lines " +"where the compiler found a warning or an error." +msgstr "" +"Legt fest, ob Markierungen (wellige Unterstreichungen) benutzt werden " +"sollen, um Zeilen mit Fehlern beim Kompiliervorgang zu markieren" #: src/interface.c:3275 msgid "Disable Drag and Drop" msgstr "Drag and Drop deaktivieren" #: src/interface.c:3278 -msgid "Disable drag and drop completely in the editor window so you can't drag and drop any selections within or outside of the editor window." +msgid "" +"Disable drag and drop completely in the editor window so you can't drag and " +"drop any selections within or outside of the editor window." msgstr "Deaktiviert Drag and Drop für das komplette Editorfenster. " #: src/interface.c:3281 @@ -2061,8 +2036,12 @@ msgstr "Benutze Tabulatoren, um Leerzeichen einzufügen." #: src/interface.c:3284 -msgid "Whenever some whitespace is inserted by Geany it will use tabluators when enabled otherwise Geany will use just spaces." -msgstr "Wenn diese Option aktiviert ist, werden Immer, wenn Leerzeichen in Geany eingefügt werden, Tabulatoren benutzt. " +msgid "" +"Whenever some whitespace is inserted by Geany it will use tabluators when " +"enabled otherwise Geany will use just spaces." +msgstr "" +"Wenn diese Option aktiviert ist, werden Immer, wenn Leerzeichen in Geany " +"eingefügt werden, Tabulatoren benutzt. " #: src/interface.c:3287 msgid "Features" @@ -2074,7 +2053,9 @@ #: src/interface.c:3309 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:3312 msgid "XML tag autocompletion" @@ -2090,7 +2071,9 @@ #: src/interface.c:3331 msgid "Number of rows to display in the autocompletion list." -msgstr "Anzahl der Zeilen, die maximal angezeigt werden sollen, wenn die Autovervollständigungsliste angezeigt wird." +msgstr "" +"Anzahl der Zeilen, die maximal angezeigt werden sollen, wenn die " +"Autovervollständigungsliste angezeigt wird." #: src/interface.c:3334 msgid "Autocompletion" @@ -2102,7 +2085,9 @@ #: src/interface.c:3357 msgid "Enter tool paths below. Tools you do not need can be left blank." -msgstr "Geben Sie hier die Pfade zu den einzelnen Werkzeugen an (Programme, die nicht benötigt werden, können freigelassen werden)" +msgstr "" +"Geben Sie hier die Pfade zu den einzelnen Werkzeugen an (Programme, die " +"nicht benötigt werden, können freigelassen werden)" #: src/interface.c:3369 msgid "Make:" @@ -2121,8 +2106,12 @@ msgstr "Pfad und spezielle Optionen und / oder Targets für \"make\" angeben." #: src/interface.c:3402 -msgid "A terminal emulator like xterm, gnome-terminal or konsole (should accept the -e argument)" -msgstr "Eine Terminal-Emulation wie z.B. xterm, gnome-terminal oder konsole (sie sollte die Option -e akzeptieren)" +msgid "" +"A terminal emulator like xterm, gnome-terminal or konsole (should accept the " +"-e argument)" +msgstr "" +"Eine Terminal-Emulation wie z.B. xterm, gnome-terminal oder konsole (sie " +"sollte die Option -e akzeptieren)" #: src/interface.c:3409 msgid "Path (and possibly additional arguments) to your favorite browser" @@ -2150,10 +2139,14 @@ msgstr "Werkzeuge" #: src/interface.c:3511 -msgid "Set the information to be used in templates. See the documentation for details." +msgid "" +"Set the information to be used in templates. See the documentation for " +"details." msgstr "" -"Geben Sie hier die Informationen an, die in den Vorlagen benutzt werden sollen.\n" -"Konsultieren Sie die Dokumentation, um mehr über die Arbeitsweise der Vorlagen zu erfahren." +"Geben Sie hier die Informationen an, die in den Vorlagen benutzt werden " +"sollen.\n" +"Konsultieren Sie die Dokumentation, um mehr über die Arbeitsweise der " +"Vorlagen zu erfahren." #: src/interface.c:3529 msgid "email address of the developer" @@ -2196,8 +2189,12 @@ msgstr "Der Name des Entwicklers" #: src/interface.c:3594 -msgid "Notice: For all changes you make here to take effect, you need to restart Geany." -msgstr "Damit hier gemachte Eigenschaftsänderungen wirksam werden, muss Geany neu gestartet werden" +msgid "" +"Notice: For all changes you make here to take effect, you need to restart " +"Geany." +msgstr "" +"Damit hier gemachte Eigenschaftsänderungen wirksam werden, muss Geany neu " +"gestartet werden" #: src/interface.c:3601 msgid "Template data" @@ -2208,8 +2205,15 @@ msgstr "Vorlagen" #: src/interface.c:3624 -msgid "Here you can change keyboard shortcuts for various actions. Select one and press the Change button to enter a new shortcut, or double click on an action to edit the string representation of the shortcut directly." -msgstr "Hier können die Tastenkominationen für verschiedene Aktionen innerhalb von Geany festgelegt bzw. verändert werden. Um eine Tastenkombination zu ändern, einfach Doppelklicken oder markieren und auf Ändern klicken. Zudem können die Tastenkombinationen auch direkt eingegeben werden." +msgid "" +"Here you can change keyboard shortcuts for various actions. Select one and " +"press the Change button to enter a new shortcut, or double click on an " +"action to edit the string representation of the shortcut directly." +msgstr "" +"Hier können die Tastenkominationen für verschiedene Aktionen innerhalb von " +"Geany festgelegt bzw. verändert werden. Um eine Tastenkombination zu ändern, " +"einfach Doppelklicken oder markieren und auf Ändern klicken. Zudem können " +"die Tastenkombinationen auch direkt eingegeben werden." #: src/interface.c:3647 msgid "Change" @@ -2279,13 +2283,11 @@ msgid "Find Previous" msgstr "Vorheriges" -#: src/keybindings.c:142 -#: src/search.c:376 +#: src/keybindings.c:142 src/search.c:376 msgid "Replace" msgstr "Ersetzen" -#: src/keybindings.c:144 -#: src/search.c:514 +#: src/keybindings.c:144 src/search.c:514 msgid "Find in files" msgstr "In Dateien suchen" @@ -2425,8 +2427,7 @@ msgid "Complete word" msgstr "Vervollständige Wort" -#: src/keybindings.c:225 -#: src/keybindings.c:228 +#: src/keybindings.c:225 src/keybindings.c:228 msgid "Show calltip" msgstr "Calltip anzeigen" @@ -2453,11 +2454,14 @@ #: src/keyfile.c:336 msgid "Type here what you want, use it as a notice/scratch board" -msgstr "Schreiben Sie hier rein, was sie möchten. Sie können es als Notizbuch nutzen." +msgstr "" +"Schreiben Sie hier rein, was sie möchten. Sie können es als Notizbuch nutzen." #: src/keyfile.c:565 msgid "Failed to load one or more session files." -msgstr "Eine oder mehre Datei(en) aus der letzten Sitzung konnte(n) nicht geladen werden." +msgstr "" +"Eine oder mehre Datei(en) aus der letzten Sitzung konnte(n) nicht geladen " +"werden." #: src/main.c:89 msgid "use an alternate configuration directory" @@ -2469,7 +2473,9 @@ #: src/main.c:93 msgid "don't open files in a running instance, force opening a new instance" -msgstr "Dateien nicht in einer bereits laufenden Instanz, sondern in einer neuen Instanz öffnen." +msgstr "" +"Dateien nicht in einer bereits laufenden Instanz, sondern in einer neuen " +"Instanz öffnen." #: src/main.c:95 msgid "set initial line number for the first opened file" @@ -2519,8 +2525,7 @@ "Es könnte zu Problemen bei der Verwendung von Geany kommen.\n" "Geany trotzdem starten?" -#: src/main.c:496 -#: src/socket.c:102 +#: src/main.c:496 src/socket.c:102 #, c-format msgid "Could not find file '%s'." msgstr "Konnte die Datei %s nicht finden." @@ -2562,88 +2567,96 @@ #: src/prefs.c:922 #, 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/project.c:88 +#: src/project.c:89 msgid "Open project" msgstr "Projekt öffnen" -#: src/project.c:107 +#: src/project.c:108 msgid "Project files" msgstr "Projektdateien" -#: src/project.c:153 +#: src/project.c:156 msgid "Project properties" msgstr "Projekteigenschaften" -#: src/project.c:165 +#: src/project.c:168 msgid "Name:" msgstr "Name:" -#: src/project.c:176 +#: src/project.c:179 msgid "Description:" msgstr "Beschreibung:" -#: src/project.c:191 -msgid "File location:" -msgstr "Dateilage: " +#: src/project.c:194 +msgid "Filename:" +msgstr "Dateiname:" -#: src/project.c:210 +#: src/project.c:213 msgid "Base path:" -msgstr "Basispfad: " +msgstr "Basispfad:" -#: src/project.c:229 +#: src/project.c:232 msgid "File patterns:" -msgstr "Dateiattribute: " +msgstr "Dateinamenmuster:" -#: src/project.c:310 +#: src/project.c:313 #, c-format -msgid "There is already an open project \"%s\". Do you want to close it before proceed?" -msgstr "Es ist schon ein Projekt \"%s\" geöffnet. Soll es vor dem weiterarbeiten geschlossen werden? " +msgid "" +"There is already an open project \"%s\". Do you want to close it before " +"proceed?" +msgstr "" +"Es ist schon ein Projekt \"%s\" geöffnet. Soll es vor dem Weiterarbeiten " +"geschlossen werden? " -#: src/project.c:338 +#: src/project.c:341 msgid "The specified project name is too short." msgstr "Der eingegebene Projektname ist zu kurz. " -#: src/project.c:344 +#: src/project.c:347 #, c-format msgid "The specified project name is too long (max. %d characters)." msgstr "Der eingegebene Projektname ist zu lang (max %d Zeichen)." -#: src/project.c:352 -msgid "You have specified an invalid project file location." -msgstr "Sie haben einen ungültigen Dateipfad angegeben. " +#: src/project.c:355 +msgid "You have specified an invalid project filename." +msgstr "Sie haben einen ungültigen Dateinamen angegeben. " -#: src/project.c:360 +#: src/project.c:363 msgid "You have specified an invalid project base path." msgstr "Sie haben einen ungültigen Projektbasispfad angegeben. " -#: src/project.c:370 +#: src/project.c:373 msgid "The specified project base path does not exist. Should it be created?" -msgstr "Der Projektbasispfad existiert nicht. Soll er durch Geany angelegt werden? " +msgstr "" +"Der Projektbasispfad existiert nicht. Soll er durch Geany angelegt werden? " -#: src/project.c:387 +#: src/project.c:390 msgid "Project file could not be written." msgstr "Projektdatei konnte nicht geschrieben werden. " #. initialise the dialog -#: src/project.c:459 +#: src/project.c:462 msgid "Choose project filename" msgstr "Wählen Sie den Dateinamen für die Projektdatei" #. initialise the dialog -#: src/project.c:482 +#: src/project.c:485 msgid "Choose project base path" msgstr "Wählen Sie den Projektbasispfad" #. "projects" is part of the default project base path so be carefully when translating #. please avoid special characters and spaces, look at the source for details or ask Frank -#: src/project.c:498 +#: src/project.c:501 msgid "projects" msgstr "projekte" -#: src/project.c:556 +#: src/project.c:559 msgid "Project file could not be loaded." msgstr "Die Projektdatei konnte nicht geladen werden. " @@ -2652,8 +2665,12 @@ msgstr "Reguläre Ausdrücke _benutzen" #: src/search.c:154 -msgid "Use POSIX-like regular expressions. For detailed information about using regular expressions, please read the documentation." -msgstr "Benutze POSIX-ähnliche reguläre Ausdrücke. Für weitere Informationen über reguläre Ausdrücke lesen Sie bitte die Dokumentation." +msgid "" +"Use POSIX-like regular expressions. For detailed information about using " +"regular expressions, please read the documentation." +msgstr "" +"Benutze POSIX-ähnliche reguläre Ausdrücke. Für weitere Informationen über " +"reguläre Ausdrücke lesen Sie bitte die Dokumentation." #: src/search.c:161 msgid "_Search backwards" @@ -2665,19 +2682,17 @@ #: src/search.c:180 msgid "" -"Replace \\\\, \\t, \\n" -", \\r and \\uXXXX (Unicode chararacters) with the corresponding control characters." +"Replace \\\\, \\t, \\n, \\r and \\uXXXX (Unicode chararacters) with the " +"corresponding control characters." msgstr "" -"Ersetzt \\\\, \\t, \\n" -", \\r und \\uXXXX (Unicode-Zeichen) mit den entsprechenden Sonderzeichen." +"Ersetzt \\\\, \\t, \\n, \\r und \\uXXXX (Unicode-Zeichen) mit den " +"entsprechenden Sonderzeichen." -#: src/search.c:189 -#: src/search.c:587 +#: src/search.c:189 src/search.c:587 msgid "_Case sensitive" msgstr "_Groß- / Kleinschreibung beachten" -#: src/search.c:194 -#: src/search.c:593 +#: src/search.c:194 src/search.c:593 msgid "Match only a _whole word" msgstr "Nur _ganze Wörter finden" @@ -2697,9 +2712,7 @@ msgid "_Next" msgstr "_Nächstes" -#: src/search.c:274 -#: src/search.c:392 -#: src/search.c:544 +#: src/search.c:274 src/search.c:392 src/search.c:544 msgid "Search for:" msgstr "Suchen nach:" @@ -2712,24 +2725,20 @@ msgid "_Mark" msgstr "_Markieren" -#: src/search.c:310 -#: src/search.c:450 +#: src/search.c:310 src/search.c:450 msgid "In Sessi_on" msgstr "In Sessi_on finden" -#: src/search.c:315 -#: src/search.c:455 +#: src/search.c:315 src/search.c:455 msgid "_In Document" msgstr "_Im Dokument" #. close window checkbox -#: src/search.c:321 -#: src/search.c:461 +#: src/search.c:321 src/search.c:461 msgid "Close _dialog" msgstr "Diesen Dialog _schließen." -#: src/search.c:326 -#: src/search.c:466 +#: src/search.c:326 src/search.c:466 msgid "Disable this option to keep the dialog open." msgstr "Diese Option deaktivieren, um den Dialog nicht zu schließen." @@ -2766,10 +2775,10 @@ msgid "_Grep regular expressions" msgstr "Reguläre Ausdrücke _benutzen (grep)" -#: src/search.c:576 -#: src/search.c:583 +#: src/search.c:576 src/search.c:583 msgid "See grep's manual page for more information." -msgstr "Schlagen Sie in der Dokumentation zu »grep« für mehr Informationen nach." +msgstr "" +"Schlagen Sie in der Dokumentation zu »grep« für mehr Informationen nach." #: src/search.c:581 msgid "_Extended regular expressions" @@ -2803,7 +2812,9 @@ #: src/search.c:1021 #, c-format msgid "Cannot execute grep tool '%s'; check the path setting in Preferences." -msgstr "Konnte das grep Kommando '%s' nicht finden (Pfad zum Grep Kommando in den Einstellungen überprüfen)." +msgstr "" +"Konnte das grep Kommando '%s' nicht finden (Pfad zum Grep Kommando in den " +"Einstellungen überprüfen)." #: src/search.c:1136 #, c-format @@ -2823,19 +2834,16 @@ msgid "No matches found for '%s'." msgstr "Keine Treffer für '%s' gefunden." -#: 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/symbols.c:401 -#: src/symbols.c:433 +#: src/symbols.c:401 src/symbols.c:433 msgid "Chapter" msgstr "Kapitel" -#: src/symbols.c:403 -#: src/symbols.c:425 +#: src/symbols.c:403 src/symbols.c:425 msgid "Section" msgstr "Section" @@ -2855,10 +2863,7 @@ msgid "Appendix" msgstr "Anhang" -#: src/symbols.c:413 -#: src/symbols.c:435 -#: src/symbols.c:539 -#: src/symbols.c:575 +#: src/symbols.c:413 src/symbols.c:435 src/symbols.c:539 src/symbols.c:575 msgid "Other" msgstr "Sonstiges" @@ -2882,8 +2887,7 @@ msgid "Label" msgstr "Label" -#: src/symbols.c:441 -#: src/symbols.c:525 +#: src/symbols.c:441 src/symbols.c:525 msgid "Package" msgstr "Package" @@ -2903,10 +2907,7 @@ msgid "Our" msgstr "Our" -#: src/symbols.c:462 -#: src/symbols.c:483 -#: src/symbols.c:529 -#: src/symbols.c:559 +#: src/symbols.c:462 src/symbols.c:483 src/symbols.c:529 src/symbols.c:559 msgid "Classes" msgstr "Klassen" @@ -2918,15 +2919,11 @@ msgid "Mixins" msgstr "Mixins" -#: src/symbols.c:468 -#: src/symbols.c:485 -#: src/symbols.c:531 +#: src/symbols.c:468 src/symbols.c:485 src/symbols.c:531 msgid "Methods" msgstr "Methoden" -#: src/symbols.c:470 -#: src/symbols.c:533 -#: src/symbols.c:563 +#: src/symbols.c:470 src/symbols.c:533 src/symbols.c:563 msgid "Members" msgstr "Instanzvariablen" @@ -2937,15 +2934,11 @@ #. gtk_tree_store_append(doc_list[idx].tag_store, &(tv_iters.tag_macro), NULL); #. gtk_tree_store_set(doc_list[idx].tag_store, &(tv_iters.tag_macro), 0, _("Macros"), -1); #. -#: src/symbols.c:472 -#: src/symbols.c:512 -#: src/symbols.c:573 +#: src/symbols.c:472 src/symbols.c:512 src/symbols.c:573 msgid "Variables" msgstr "Variablen" -#: src/symbols.c:487 -#: src/symbols.c:504 -#: src/symbols.c:561 +#: src/symbols.c:487 src/symbols.c:504 src/symbols.c:561 msgid "Functions" msgstr "Funktionen" @@ -2978,8 +2971,13 @@ msgstr "_Einfügen" #: src/tools.c:72 -msgid "Choose a special character from the list below and double click on it or use the button to insert it at the current cursor position." -msgstr "Wählen Sie das gesuchte Sonderzeichen aus der Liste aus und fügen Sie es mit einem Doppelklick oder über die Button »Einfügen« in Ihre aktuelles Dokument ein. " +msgid "" +"Choose a special character from the list below and double click on it or use " +"the button to insert it at the current cursor position." +msgstr "" +"Wählen Sie das gesuchte Sonderzeichen aus der Liste aus und fügen Sie es mit " +"einem Doppelklick oder über die Button »Einfügen« in Ihre aktuelles Dokument " +"ein. " #: src/tools.c:85 msgid "Character" @@ -3021,13 +3019,11 @@ msgid "Miscellaneous characters" msgstr "Sonstige Zeichen" -#: src/treeviews.c:200 -#: src/treeviews.c:252 +#: src/treeviews.c:200 src/treeviews.c:252 msgid "Hide" msgstr "Verbergen" -#: src/treeviews.c:208 -#: src/treeviews.c:260 +#: src/treeviews.c:208 src/treeviews.c:260 msgid "Hide sidebar" msgstr "Seitenleiste verbergen" @@ -3037,8 +3033,12 @@ #: src/ui_utils.c:114 #, c-format -msgid "%c line: % 4d column: % 3d selection: % 4d %s mode: %s%s cur. function: %s encoding: %s %s filetype: %s" -msgstr "%c Zeile: % 4d Spalte: % 3d Auswahl: % 4d %s Modus: %s%s akt. Funktion: %s Kodierung: %s %s Dateityp: %s" +msgid "" +"%c line: % 4d column: % 3d selection: % 4d %s mode: %s%s cur. " +"function: %s encoding: %s %s filetype: %s" +msgstr "" +"%c Zeile: % 4d Spalte: % 3d Auswahl: % 4d %s Modus: %s%s akt. " +"Funktion: %s Kodierung: %s %s Dateityp: %s" #: src/ui_utils.c:118 msgid "OVR" @@ -3094,10 +3094,11 @@ msgid "" "The file '%s' on the disk is more recent than\n" "the current buffer." -msgstr "Die Datei '%s' auf dem Datenträger ist aktueller als die momentan geöffnete Version." +msgstr "" +"Die Datei '%s' auf dem Datenträger ist aktueller als die momentan geöffnete " +"Version." -#: src/vte.c:187 -#: src/vte.c:506 +#: src/vte.c:187 src/vte.c:506 msgid "Terminal" msgstr "Terminal" @@ -3110,8 +3111,12 @@ msgstr "Terminalplugin" #: src/vte.c:509 -msgid "These settings for the virtual terminal emulator widget (VTE) only apply if the VTE library could be loaded." -msgstr "Die Einstellungen für VTE werden nur wirksam, wenn die VTE-Bibliothek erfolgreich geladen werden konnte." +msgid "" +"These settings for the virtual terminal emulator widget (VTE) only apply if " +"the VTE library could be loaded." +msgstr "" +"Die Einstellungen für VTE werden nur wirksam, wenn die VTE-Bibliothek " +"erfolgreich geladen werden konnte." #: src/vte.c:520 msgid "Terminal font:" @@ -3142,7 +3147,9 @@ msgstr "Zeilen zum Zurückrollen:" #: src/vte.c:569 -msgid "Specifies the history in lines, which you can scroll back in the terminal widget." +msgid "" +"Specifies the history in lines, which you can scroll back in the terminal " +"widget." msgstr "Gibt die Zeilen an, die man im Terminal zurückrollen kann." #: src/vte.c:573 @@ -3150,15 +3157,21 @@ msgstr "Terminalemulation:" #: src/vte.c:583 -msgid "Controls how the terminal emulator should behave. Do not change this value unless you know exactly what you are doing." -msgstr "Steuert, wie sich die Terminal Emulation verhalten soll . Ändern Sie diese Werte nur, wenn sie wissen, was Sie tun. " +msgid "" +"Controls how the terminal emulator should behave. Do not change this value " +"unless you know exactly what you are doing." +msgstr "" +"Steuert, wie sich die Terminal Emulation verhalten soll . Ändern Sie diese " +"Werte nur, wenn sie wissen, was Sie tun. " #: src/vte.c:585 msgid "Shell:" msgstr "Shell:" #: src/vte.c:592 -msgid "Sets the path to the shell which should be started inside the terminal emulation." +msgid "" +"Sets the path to the shell which should be started inside the terminal " +"emulation." msgstr "Setzt den Pfad zu der Shell, die in der VTE benutzt werden soll." #: src/vte.c:609 @@ -3167,7 +3180,9 @@ #: src/vte.c:610 msgid "Whether to scroll to the bottom if a key was pressed." -msgstr "Legt fest, ob das Fenster bei einem Tastendruck bis zum Ende gescrollt werden soll." +msgstr "" +"Legt fest, ob das Fenster bei einem Tastendruck bis zum Ende gescrollt " +"werden soll." #: src/vte.c:614 msgid "Scroll on output" @@ -3182,8 +3197,14 @@ msgstr "Me_nütastenkombination deaktivieren (Vorgabe ist F10)" #: src/vte.c:620 -msgid "This option disables the keybinding to popup the menu bar (default is F10). Disabling it can be useful if you use, for example, Midnight Commander within the VTE." -msgstr "Diese Option deaktiviert bestimmte Tastenkombinationen des Menüs. Eine Deaktivierung kann sinnvoll sein, wenn Sie zum Beispiel den Midnight Commander in der VTE benutzen möchten." +msgid "" +"This option disables the keybinding to popup the menu bar (default is F10). " +"Disabling it can be useful if you use, for example, Midnight Commander " +"within the VTE." +msgstr "" +"Diese Option deaktiviert bestimmte Tastenkombinationen des Menüs. Eine " +"Deaktivierung kann sinnvoll sein, wenn Sie zum Beispiel den Midnight " +"Commander in der VTE benutzen möchten." #: src/vte.c:624 msgid "Follow the path of the current file" @@ -3191,15 +3212,22 @@ #: src/vte.c:625 msgid "Whether to execute \"cd $path\" when you switch between opened files." -msgstr "Legt fest, ob \"cd $path\" in der VTE ausgeführt werden soll, wenn Sie zwischen geöffneten Dateien wechseln." +msgstr "" +"Legt fest, ob \"cd $path\" in der VTE ausgeführt werden soll, wenn Sie " +"zwischen geöffneten Dateien wechseln." #: src/vte.c:629 msgid "Execute programs in VTE" msgstr "Führe Programme in der VTE aus" #: src/vte.c:630 -msgid "Run programs in VTE instead of opening a terminal emulation window. Please note, programs executed in VTE cannot be stopped." -msgstr "Führt Programme in der VTE aus, anstatt ein neues Terminalfenster zu öffnen. Achtung: Programme die in der VTE ausgeführt werden, können nicht gestoppt werden. " +msgid "" +"Run programs in VTE instead of opening a terminal emulation window. Please " +"note, programs executed in VTE cannot be stopped." +msgstr "" +"Führt Programme in der VTE aus, anstatt ein neues Terminalfenster zu öffnen. " +"Achtung: Programme die in der VTE ausgeführt werden, können nicht gestoppt " +"werden. " #: src/win32.c:61 msgid "Executables" @@ -3209,8 +3237,7 @@ msgid "Error" msgstr "Fehler" -#: src/win32.c:340 -#: src/win32.c:381 +#: src/win32.c:340 src/win32.c:381 msgid "Question" msgstr "Frage" @@ -3222,3 +3249,5 @@ msgid "Information" msgstr "Information" +#~ msgid "File location:" +#~ msgstr "Dateiname: " This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1213] trunk
by eht16＠users.sourceforge.net 21 Jan '07

21 Jan '07

Revision: 1213 http://svn.sourceforge.net/geany/?rev=1213&view=rev Author: eht16 Date: 2007-01-20 15:54:28 -0800 (Sat, 20 Jan 2007) Log Message: ----------- Updated Scintilla to version 1.72. Modified Paths: -------------- trunk/ChangeLog trunk/scintilla/CellBuffer.cxx trunk/scintilla/CellBuffer.h trunk/scintilla/ContractionState.cxx trunk/scintilla/Document.cxx trunk/scintilla/Document.h trunk/scintilla/DocumentAccessor.cxx trunk/scintilla/Editor.cxx trunk/scintilla/Editor.h trunk/scintilla/LexCPP.cxx trunk/scintilla/LexD.cxx trunk/scintilla/LexHTML.cxx trunk/scintilla/LexOthers.cxx trunk/scintilla/LexRuby.cxx trunk/scintilla/PlatGTK.cxx trunk/scintilla/ScintillaBase.cxx trunk/scintilla/ScintillaGTK.cxx trunk/scintilla/ViewStyle.cxx trunk/scintilla/ViewStyle.h trunk/scintilla/include/Scintilla.h trunk/scintilla/include/Scintilla.iface trunk/src/sci_cb.c Added Paths: ----------- trunk/scintilla/Partitioning.h trunk/scintilla/SplitVector.h Removed Paths: ------------- trunk/scintilla/LexGen.py Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-01-20 15:16:26 UTC (rev 1212) +++ trunk/ChangeLog 2007-01-20 23:54:28 UTC (rev 1213) @@ -1,6 +1,7 @@ 2007-01-20 Enrico Tröger <enrico.troeger(a)uvena.de> * scintilla/makefile.win32: Fixed typo. + * scintilla/*, src/sci_cb.c: Updated Scintilla to version 1.72. 2007-01-19 Enrico Tröger <enrico.troeger(a)uvena.de> Modified: trunk/scintilla/CellBuffer.cxx =================================================================== --- trunk/scintilla/CellBuffer.cxx 2007-01-20 15:16:26 UTC (rev 1212) +++ trunk/scintilla/CellBuffer.cxx 2007-01-20 23:54:28 UTC (rev 1213) @@ -14,6 +14,8 @@ #include "Scintilla.h" #include "SVector.h" +#include "SplitVector.h" +#include "Partitioning.h" #include "CellBuffer.h" MarkerHandleSet::MarkerHandleSet() { @@ -30,7 +32,7 @@ root = 0; } -int MarkerHandleSet::Length() { +int MarkerHandleSet::Length() const { int c = 0; MarkerHandleNumber *mhn = root; while (mhn) { @@ -40,7 +42,7 @@ return c; } -int MarkerHandleSet::NumberFromHandle(int handle) { +int MarkerHandleSet::NumberFromHandle(int handle) const { MarkerHandleNumber *mhn = root; while (mhn) { if (mhn->handle == handle) { @@ -51,7 +53,7 @@ return - 1; } -int MarkerHandleSet::MarkValue() { +int MarkerHandleSet::MarkValue() const { unsigned int m = 0; MarkerHandleNumber *mhn = root; while (mhn) { @@ -61,7 +63,7 @@ return m; } -bool MarkerHandleSet::Contains(int handle) { +bool MarkerHandleSet::Contains(int handle) const { MarkerHandleNumber *mhn = root; while (mhn) { if (mhn->handle == handle) { @@ -90,7 +92,7 @@ if (mhn->handle == handle) { *pmhn = mhn->next; delete mhn; - return ; + return; } pmhn = &((*pmhn)->next); } @@ -121,210 +123,154 @@ other->root = 0; } -LineVector::LineVector() { - linesData = 0; - lines = 0; - size = 0; - levels = 0; - sizeLevels = 0; +LineVector::LineVector() : starts(256) { handleCurrent = 1; - growSize = 1000; Init(); } LineVector::~LineVector() { - for (int line = 0; line < lines; line++) { - delete linesData[line].handleSet; - linesData[line].handleSet = 0; + starts.DeleteAll(); + for (int line = 0; line < markers.Length(); line++) { + delete markers[line]; + markers[line] = 0; } - delete []linesData; - linesData = 0; - delete []levels; - levels = 0; + markers.DeleteAll(); + levels.DeleteAll(); } void LineVector::Init() { - for (int line = 0; line < lines; line++) { - delete linesData[line].handleSet; - linesData[line].handleSet = 0; + starts.DeleteAll(); + for (int line = 0; line < markers.Length(); line++) { + delete markers[line]; + markers[line] = 0; } - delete []linesData; - linesData = new LineData[static_cast<int>(growSize)]; - size = growSize; - lines = 1; - delete []levels; - levels = 0; - sizeLevels = 0; + markers.DeleteAll(); + levels.DeleteAll(); } -void LineVector::Expand(int sizeNew) { - LineData *linesDataNew = new LineData[sizeNew]; - if (linesDataNew) { - for (int i = 0; i < size; i++) - linesDataNew[i] = linesData[i]; - // Do not delete handleSets here as they are transferred to new linesData - delete []linesData; - linesData = linesDataNew; - size = sizeNew; - } else { - Platform::DebugPrintf("No memory available\n"); - // TODO: Blow up - } +void LineVector::ExpandLevels(int sizeNew) { + levels.InsertValue(levels.Length(), sizeNew - levels.Length(), SC_FOLDLEVELBASE); +} +void LineVector::ClearLevels() { + levels.DeleteAll(); } -void LineVector::ExpandLevels(int sizeNew) { - if (sizeNew == -1) - sizeNew = size; - int *levelsNew = new int[sizeNew]; - if (levelsNew) { - int i = 0; - for (; i < sizeLevels; i++) - levelsNew[i] = levels[i]; - for (; i < sizeNew; i++) - levelsNew[i] = SC_FOLDLEVELBASE; - delete []levels; - levels = levelsNew; - sizeLevels = sizeNew; - } else { - Platform::DebugPrintf("No memory available\n"); - // TODO: Blow up +int LineVector::SetLevel(int line, int level) { + int prev = 0; + if ((line >= 0) && (line < Lines())) { + if (!levels.Length()) { + ExpandLevels(Lines() + 1); + } + prev = levels[line]; + if (prev != level) { + levels[line] = level; + } } + return prev; +} +int LineVector::GetLevel(int line) { + if (levels.Length() && (line >= 0) && (line < Lines())) { + return levels[line]; + } else { + return SC_FOLDLEVELBASE; + } } -void LineVector::ClearLevels() { - delete []levels; - levels = 0; - sizeLevels = 0; +void LineVector::InsertText(int line, int delta) { + starts.InsertText(line, delta); } -void LineVector::InsertValue(int pos, int value) { - //Platform::DebugPrintf("InsertValue[%d] = %d\n", pos, value); - if ((lines + 2) >= size) { - if (growSize * 6 < size) - growSize *= 2; - Expand(size + growSize); - if (levels) { - ExpandLevels(size + growSize); - } +void LineVector::InsertLine(int line, int position) { + starts.InsertPartition(line, position); + if (markers.Length()) { + markers.Insert(line, 0); } - lines++; - for (int i = lines; i > pos; i--) { - linesData[i] = linesData[i - 1]; - } - linesData[pos].startPosition = value; - linesData[pos].handleSet = 0; - if (levels) { - for (int j = lines; j > pos; j--) { - levels[j] = levels[j - 1]; + if (levels.Length()) { + int level = SC_FOLDLEVELBASE; + if ((line > 0) && (line < Lines())) { + level = levels[line-1] & ~SC_FOLDLEVELWHITEFLAG; } - if (pos == 0) { - levels[pos] = SC_FOLDLEVELBASE; - } else if (pos == (lines - 1)) { // Last line will not be a folder - levels[pos] = SC_FOLDLEVELBASE; - } else { - levels[pos] = levels[pos - 1]; - } + levels.InsertValue(line, 1, level); } } -void LineVector::SetValue(int pos, int value) { - //Platform::DebugPrintf("SetValue[%d] = %d\n", pos, value); - if ((pos + 2) >= size) { - //Platform::DebugPrintf("Resize %d %d\n", size,pos); - Expand(pos + growSize); - //Platform::DebugPrintf("end Resize %d %d\n", size,pos); - lines = pos; - if (levels) { - ExpandLevels(pos + growSize); - } - } - linesData[pos].startPosition = value; +void LineVector::SetLineStart(int line, int position) { + starts.SetPartitionStartPosition(line, position); } -void LineVector::Remove(int pos) { - //Platform::DebugPrintf("Remove %d\n", pos); +void LineVector::RemoveLine(int line) { + starts.RemovePartition(line); // Retain the markers from the deleted line by oring them into the previous line - if (pos > 0) { - MergeMarkers(pos - 1); + if (markers.Length()) { + if (line > 0) { + MergeMarkers(line - 1); + } + markers.Delete(line); } - for (int i = pos; i < lines; i++) { - linesData[i] = linesData[i + 1]; - } - if (levels) { + if (levels.Length()) { // Move up following lines but merge header flag from this line // to line before to avoid a temporary disappearence causing expansion. - int firstHeader = levels[pos] & SC_FOLDLEVELHEADERFLAG; - for (int j = pos; j < lines; j++) { - levels[j] = levels[j + 1]; - } - if (pos > 0) - levels[pos-1] |= firstHeader; + int firstHeader = levels[line] & SC_FOLDLEVELHEADERFLAG; + levels.Delete(line); + if (line > 0) + levels[line-1] |= firstHeader; } - lines--; } int LineVector::LineFromPosition(int pos) { - //Platform::DebugPrintf("LineFromPostion %d lines=%d end = %d\n", pos, lines, linesData[lines].startPosition); - if (lines == 0) + return starts.PartitionFromPosition(pos); +} + +int LineVector::MarkValue(int line) { + if (markers.Length() && markers[line]) + return markers[line]->MarkValue(); + else return 0; - //Platform::DebugPrintf("LineFromPosition %d\n", pos); - if (pos >= linesData[lines].startPosition) - return lines - 1; - int lower = 0; - int upper = lines; - do { - int middle = (upper + lower + 1) / 2; // Round high - if (pos < linesData[middle].startPosition) { - upper = middle - 1; - } else { - lower = middle; - } - } while (lower < upper); - //Platform::DebugPrintf("LineFromPostion %d %d %d\n", pos, lower, linesData[lower].startPosition, linesData[lower > 1 ? lower - 1 : 0].startPosition); - return lower; } int LineVector::AddMark(int line, int markerNum) { handleCurrent++; - if (!linesData[line].handleSet) { + if (!markers.Length()) { + // No existing markers so allocate one element per line + markers.InsertValue(0, Lines(), 0); + } + if (!markers[line]) { // Need new structure to hold marker handle - linesData[line].handleSet = new MarkerHandleSet; - if (!linesData[line].handleSet) + markers[line] = new MarkerHandleSet(); + if (!markers[line]) return - 1; } - linesData[line].handleSet->InsertHandle(handleCurrent, markerNum); + markers[line]->InsertHandle(handleCurrent, markerNum); return handleCurrent; } void LineVector::MergeMarkers(int pos) { - if (linesData[pos + 1].handleSet != NULL) { - if (linesData[pos].handleSet == NULL ) - linesData[pos].handleSet = new MarkerHandleSet; - linesData[pos].handleSet->CombineWith(linesData[pos + 1].handleSet); - delete linesData[pos + 1].handleSet; - linesData[pos + 1].handleSet = NULL; + if (markers[pos + 1] != NULL) { + if (markers[pos] == NULL) + markers[pos] = new MarkerHandleSet; + markers[pos]->CombineWith(markers[pos + 1]); + delete markers[pos + 1]; + markers[pos + 1] = NULL; } } void LineVector::DeleteMark(int line, int markerNum, bool all) { - if (linesData[line].handleSet) { + if (markers.Length() && markers[line]) { if (markerNum == -1) { - delete linesData[line].handleSet; - linesData[line].handleSet = 0; + delete markers[line]; + markers[line] = NULL; } else { - bool performedDeletion = - linesData[line].handleSet->RemoveNumber(markerNum); + bool performedDeletion = markers[line]->RemoveNumber(markerNum); while (all && performedDeletion) { - performedDeletion = - linesData[line].handleSet->RemoveNumber(markerNum); + performedDeletion = markers[line]->RemoveNumber(markerNum); } - if (linesData[line].handleSet->Length() == 0) { - delete linesData[line].handleSet; - linesData[line].handleSet = 0; + if (markers[line]->Length() == 0) { + delete markers[line]; + markers[line] = NULL; } } } @@ -333,23 +279,25 @@ void LineVector::DeleteMarkFromHandle(int markerHandle) { int line = LineFromHandle(markerHandle); if (line >= 0) { - linesData[line].handleSet->RemoveHandle(markerHandle); - if (linesData[line].handleSet->Length() == 0) { - delete linesData[line].handleSet; - linesData[line].handleSet = 0; + markers[line]->RemoveHandle(markerHandle); + if (markers[line]->Length() == 0) { + delete markers[line]; + markers[line] = NULL; } } } int LineVector::LineFromHandle(int markerHandle) { - for (int line = 0; line < lines; line++) { - if (linesData[line].handleSet) { - if (linesData[line].handleSet->Contains(markerHandle)) { - return line; + if (markers.Length()) { + for (int line = 0; line < Lines(); line++) { + if (markers[line]) { + if (markers[line]->Contains(markerHandle)) { + return line; + } } } } - return - 1; + return -1; } Action::Action() { @@ -437,7 +385,7 @@ int lenActionsNew = lenActions * 2; Action *actionsNew = new Action[lenActionsNew]; if (!actionsNew) - return ; + return; for (int act = 0; act <= currentAction; act++) actionsNew[act].Grab(&actions[act]); delete []actions; @@ -446,7 +394,8 @@ } } -void UndoHistory::AppendAction(actionType at, int position, char *data, int lengthData, bool &startSequence) { +void UndoHistory::AppendAction(actionType at, int position, char *data, int lengthData, + bool &startSequence) { EnsureUndoRoom(); //Platform::DebugPrintf("%% %d action %d %d %d\n", at, position, lengthData, currentAction); //Platform::DebugPrintf("^ %d action %d %d\n", actions[currentAction - 1].at, @@ -454,7 +403,6 @@ if (currentAction < savePoint) { savePoint = -1; } - int oldCurrentAction = currentAction; if (currentAction >= 1) { if (0 == undoSequenceDepth) { @@ -488,7 +436,7 @@ currentAction++; } } else { - //Platform::DebugPrintf("action coalesced\n"); + // Action coalesced. } } else { @@ -499,7 +447,7 @@ } else { currentAction++; } - startSequence = oldCurrentAction!=currentAction; + startSequence = oldCurrentAction != currentAction; actions[currentAction].Create(at, position, data, lengthData); currentAction++; actions[currentAction].Create(startAction); @@ -603,132 +551,51 @@ currentAction++; } -CellBuffer::CellBuffer(int initialLength) { - body = new char[initialLength]; - size = initialLength; - length = 0; - part1len = 0; - gaplen = initialLength; - part2body = body + gaplen; +CellBuffer::CellBuffer() { readOnly = false; collectingUndo = true; - growSize = 4000; } CellBuffer::~CellBuffer() { - delete []body; - body = 0; } -void CellBuffer::GapTo(int position) { - if (position == part1len) - return ; - if (position < part1len) { - int diff = part1len - position; - //Platform::DebugPrintf("Move gap backwards to %d diff = %d part1len=%d length=%d \n", position,diff, part1len, length); - for (int i = 0; i < diff; i++) - body[part1len + gaplen - i - 1] = body[part1len - i - 1]; - } else { // position > part1len - int diff = position - part1len; - //Platform::DebugPrintf("Move gap forwards to %d diff =%d\n", position,diff); - for (int i = 0; i < diff; i++) - body[part1len + i] = body[part1len + gaplen + i]; - } - part1len = position; - part2body = body + gaplen; -} - -void CellBuffer::RoomFor(int insertionLength) { - //Platform::DebugPrintf("need room %d %d\n", gaplen, insertionLength); - if (gaplen <= insertionLength) { - //Platform::DebugPrintf("need room %d %d\n", gaplen, insertionLength); - if (growSize * 6 < size) - growSize *= 2; - int newSize = size + insertionLength + growSize; - Allocate(newSize); - } -} - -// To make it easier to write code that uses ByteAt, a position outside the range of the buffer -// can be retrieved. All characters outside the range have the value '\0'. -char CellBuffer::ByteAt(int position) { - if (position < part1len) { - if (position < 0) { - return '\0'; - } else { - return body[position]; - } - } else { - if (position >= length) { - return '\0'; - } else { - return part2body[position]; - } - } -} - -void CellBuffer::SetByteAt(int position, char ch) { - - if (position < 0) { - //Platform::DebugPrintf("Bad position %d\n",position); - return ; - } - if (position >= length + 11) { - Platform::DebugPrintf("Very Bad position %d of %d\n", position, length); - //exit(2); - return ; - } - if (position >= length) { - //Platform::DebugPrintf("Bad position %d of %d\n",position,length); - return ; - } - - if (position < part1len) { - body[position] = ch; - } else { - part2body[position] = ch; - } -} - char CellBuffer::CharAt(int position) { - return ByteAt(position*2); + return substance.ValueAt(position); } void CellBuffer::GetCharRange(char *buffer, int position, int lengthRetrieve) { if (lengthRetrieve < 0) - return ; + return; if (position < 0) - return ; - int bytePos = position * 2; - if ((bytePos + lengthRetrieve * 2) > length) { - Platform::DebugPrintf("Bad GetCharRange %d for %d of %d\n", bytePos, - lengthRetrieve, length); - return ; + return; + if ((position + lengthRetrieve) > substance.Length()) { + Platform::DebugPrintf("Bad GetCharRange %d for %d of %d\n", position, + lengthRetrieve, substance.Length()); + return; } - GapTo(0); // Move the buffer so its easy to subscript into it - char *pb = part2body + bytePos; - while (lengthRetrieve--) { - *buffer++ = *pb; - pb += 2; + + for (int i=0; i<lengthRetrieve; i++) { + *buffer++ = substance.ValueAt(position + i); } } char CellBuffer::StyleAt(int position) { - return ByteAt(position*2 + 1); + return style.ValueAt(position); } -const char *CellBuffer::InsertString(int position, char *s, int insertLength, bool &startSequence) { +// The char* returned is to an allocation owned by the undo history +const char *CellBuffer::InsertString(int position, const char *s, int insertLength, bool &startSequence) { char *data = 0; // InsertString and DeleteChars are the bottleneck though which all changes occur if (!readOnly) { if (collectingUndo) { // Save into the undo/redo stack, but only the characters - not the formatting // This takes up about half load time - data = new char[insertLength / 2]; - for (int i = 0; i < insertLength / 2; i++) { - data[i] = s[i * 2]; + data = new char[insertLength]; + for (int i = 0; i < insertLength; i++) { + data[i] = s[i]; } - uh.AppendAction(insertAction, position / 2, data, insertLength / 2, startSequence); + uh.AppendAction(insertAction, position, data, insertLength, startSequence); } BasicInsertString(position, s, insertLength); @@ -736,33 +603,33 @@ return data; } -bool CellBuffer::SetStyleAt(int position, char style, char mask) { - style &= mask; - char curVal = ByteAt(position * 2 + 1); - if ((curVal & mask) != style) { - SetByteAt(position*2 + 1, static_cast<char>((curVal & ~mask) | style)); +bool CellBuffer::SetStyleAt(int position, char styleValue, char mask) { + styleValue &= mask; + char curVal = style.ValueAt(position); + if ((curVal & mask) != styleValue) { + style.SetValueAt(position, static_cast<char>((curVal & ~mask) | styleValue)); return true; } else { return false; } } -bool CellBuffer::SetStyleFor(int position, int lengthStyle, char style, char mask) { - int bytePos = position * 2 + 1; +bool CellBuffer::SetStyleFor(int position, int lengthStyle, char styleValue, char mask) { bool changed = false; PLATFORM_ASSERT(lengthStyle == 0 || - (lengthStyle > 0 && lengthStyle + position < length)); + (lengthStyle > 0 && lengthStyle + position <= style.Length())); while (lengthStyle--) { - char curVal = ByteAt(bytePos); - if ((curVal & mask) != style) { - SetByteAt(bytePos, static_cast<char>((curVal & ~mask) | style)); + char curVal = style.ValueAt(position); + if ((curVal & mask) != styleValue) { + style.SetValueAt(position, static_cast<char>((curVal & ~mask) | styleValue)); changed = true; } - bytePos += 2; + position++; } return changed; } +// The char* returned is to an allocation owned by the undo history const char *CellBuffer::DeleteChars(int position, int deleteLength, bool &startSequence) { // InsertString and DeleteChars are the bottleneck though which all changes occur PLATFORM_ASSERT(deleteLength > 0); @@ -770,11 +637,11 @@ if (!readOnly) { if (collectingUndo) { // Save into the undo/redo stack, but only the characters - not the formatting - data = new char[deleteLength / 2]; - for (int i = 0; i < deleteLength / 2; i++) { - data[i] = ByteAt(position + i * 2); + data = new char[deleteLength]; + for (int i = 0; i < deleteLength; i++) { + data[i] = substance.ValueAt(position + i); } - uh.AppendAction(removeAction, position / 2, data, deleteLength / 2, startSequence); + uh.AppendAction(removeAction, position, data, deleteLength, startSequence); } BasicDeleteChars(position, deleteLength); @@ -782,39 +649,26 @@ return data; } -int CellBuffer::ByteLength() { - return length; -} - int CellBuffer::Length() { - return ByteLength() / 2; + return substance.Length(); } void CellBuffer::Allocate(int newSize) { - if (newSize > length) { - GapTo(length); - char *newBody = new char[newSize]; - memcpy(newBody, body, length); - delete []body; - body = newBody; - gaplen += newSize - size; - part2body = body + gaplen; - size = newSize; - } + substance.ReAllocate(newSize); + style.ReAllocate(newSize); } int CellBuffer::Lines() { - //Platform::DebugPrintf("Lines = %d\n", lv.lines); - return lv.lines; + return lv.Lines(); } int CellBuffer::LineStart(int line) { if (line < 0) return 0; - else if (line > lv.lines) + else if (line >= Lines()) return Length(); else - return lv.linesData[line].startPosition; + return lv.LineStart(line); } bool CellBuffer::IsReadOnly() { @@ -834,14 +688,14 @@ } int CellBuffer::AddMark(int line, int markerNum) { - if ((line >= 0) && (line < lv.lines)) { + if ((line >= 0) && (line < Lines())) { return lv.AddMark(line, markerNum); } return - 1; } void CellBuffer::DeleteMark(int line, int markerNum) { - if ((line >= 0) && (line < lv.lines)) { + if ((line >= 0) && (line < Lines())) { lv.DeleteMark(line, markerNum, false); } } @@ -851,13 +705,13 @@ } int CellBuffer::GetMark(int line) { - if ((line >= 0) && (line < lv.lines) && (lv.linesData[line].handleSet)) - return lv.linesData[line].handleSet->MarkValue(); + if ((line >= 0) && (line < Lines())) + return lv.MarkValue(line); return 0; } void CellBuffer::DeleteAllMarks(int markerNum) { - for (int line = 0; line < lv.lines; line++) { + for (int line = 0; line < Lines(); line++) { lv.DeleteMark(line, markerNum, true); } } @@ -868,119 +722,87 @@ // Without undo -void CellBuffer::BasicInsertString(int position, char *s, int insertLength) { - //Platform::DebugPrintf("Inserting at %d for %d\n", position, insertLength); +void CellBuffer::BasicInsertString(int position, const char *s, int insertLength) { if (insertLength == 0) - return ; + return; PLATFORM_ASSERT(insertLength > 0); - RoomFor(insertLength); - GapTo(position); - memcpy(body + part1len, s, insertLength); - length += insertLength; - part1len += insertLength; - gaplen -= insertLength; - part2body = body + gaplen; + substance.InsertFromArray(position, s, 0, insertLength); + style.InsertValue(position, insertLength, 0); - int lineInsert = lv.LineFromPosition(position / 2) + 1; + int lineInsert = lv.LineFromPosition(position) + 1; // Point all the lines after the insertion point further along in the buffer - for (int lineAfter = lineInsert; lineAfter <= lv.lines; lineAfter++) { - lv.linesData[lineAfter].startPosition += insertLength / 2; - } - char chPrev = ' '; - if ((position - 2) >= 0) - chPrev = ByteAt(position - 2); - char chAfter = ' '; - if ((position + insertLength) < length) - chAfter = ByteAt(position + insertLength); + lv.InsertText(lineInsert-1, insertLength); + char chPrev = substance.ValueAt(position - 1); + char chAfter = substance.ValueAt(position + insertLength); if (chPrev == '\r' && chAfter == '\n') { - //Platform::DebugPrintf("Splitting a crlf pair at %d\n", lineInsert); // Splitting up a crlf pair at position - lv.InsertValue(lineInsert, position / 2); + lv.InsertLine(lineInsert, position); lineInsert++; } char ch = ' '; - for (int i = 0; i < insertLength; i += 2) { + for (int i = 0; i < insertLength; i++) { ch = s[i]; if (ch == '\r') { - //Platform::DebugPrintf("Inserting cr at %d\n", lineInsert); - lv.InsertValue(lineInsert, (position + i) / 2 + 1); + lv.InsertLine(lineInsert, (position + i) + 1); lineInsert++; } else if (ch == '\n') { if (chPrev == '\r') { - //Platform::DebugPrintf("Patching cr before lf at %d\n", lineInsert-1); // Patch up what was end of line - lv.SetValue(lineInsert - 1, (position + i) / 2 + 1); + lv.SetLineStart(lineInsert - 1, (position + i) + 1); } else { - //Platform::DebugPrintf("Inserting lf at %d\n", lineInsert); - lv.InsertValue(lineInsert, (position + i) / 2 + 1); + lv.InsertLine(lineInsert, (position + i) + 1); lineInsert++; } } chPrev = ch; } - // Joining two lines where last insertion is cr and following text starts with lf + // Joining two lines where last insertion is cr and following substance starts with lf if (chAfter == '\n') { if (ch == '\r') { - //Platform::DebugPrintf("Joining cr before lf at %d\n", lineInsert-1); // End of line already in buffer so drop the newly created one - lv.Remove(lineInsert - 1); + lv.RemoveLine(lineInsert - 1); } } } void CellBuffer::BasicDeleteChars(int position, int deleteLength) { - //Platform::DebugPrintf("Deleting at %d for %d\n", position, deleteLength); if (deleteLength == 0) - return ; + return; - if ((position == 0) && (deleteLength == length)) { + if ((position == 0) && (deleteLength == substance.Length())) { // If whole buffer is being deleted, faster to reinitialise lines data // than to delete each line. - //printf("Whole buffer being deleted\n"); lv.Init(); } else { // Have to fix up line positions before doing deletion as looking at text in buffer // to work out which lines have been removed - int lineRemove = lv.LineFromPosition(position / 2) + 1; - // Point all the lines after the insertion point further along in the buffer - for (int lineAfter = lineRemove; lineAfter <= lv.lines; lineAfter++) { - lv.linesData[lineAfter].startPosition -= deleteLength / 2; - } - char chPrev = ' '; - if (position >= 2) - chPrev = ByteAt(position - 2); + int lineRemove = lv.LineFromPosition(position) + 1; + lv.InsertText(lineRemove-1, - (deleteLength)); + char chPrev = substance.ValueAt(position - 1); char chBefore = chPrev; - char chNext = ' '; - if (position < length) - chNext = ByteAt(position); + char chNext = substance.ValueAt(position); bool ignoreNL = false; if (chPrev == '\r' && chNext == '\n') { - //Platform::DebugPrintf("Deleting lf after cr, move line end to cr at %d\n", lineRemove); // Move back one - lv.SetValue(lineRemove, position / 2); + lv.SetLineStart(lineRemove, position); lineRemove++; ignoreNL = true; // First \n is not real deletion } char ch = chNext; - for (int i = 0; i < deleteLength; i += 2) { - chNext = ' '; - if ((position + i + 2) < length) - chNext = ByteAt(position + i + 2); - //Platform::DebugPrintf("Deleting %d %x\n", i, ch); + for (int i = 0; i < deleteLength; i++) { + chNext = substance.ValueAt(position + i + 1); if (ch == '\r') { if (chNext != '\n') { - //Platform::DebugPrintf("Removing cr end of line\n"); - lv.Remove(lineRemove); + lv.RemoveLine(lineRemove); } } else if (ch == '\n') { if (ignoreNL) { ignoreNL = false; // Further \n are real deletions } else { - //Platform::DebugPrintf("Removing lf end of line\n"); - lv.Remove(lineRemove); + lv.RemoveLine(lineRemove); } } @@ -988,20 +810,15 @@ } // May have to fix up end if last deletion causes cr to be next to lf // or removes one of a crlf pair - char chAfter = ' '; - if ((position + deleteLength) < length) - chAfter = ByteAt(position + deleteLength); + char chAfter = substance.ValueAt(position + deleteLength); if (chBefore == '\r' && chAfter == '\n') { - //d.printf("Joining cr before lf at %d\n", lineRemove); // Using lineRemove-1 as cr ended line before start of deletion - lv.Remove(lineRemove - 1); - lv.SetValue(lineRemove - 1, position / 2 + 1); + lv.RemoveLine(lineRemove - 1); + lv.SetLineStart(lineRemove - 1, position + 1); } } - GapTo(position); - length -= deleteLength; - gaplen += deleteLength; - part2body = body + gaplen; + substance.DeleteRange(position, deleteLength); + style.DeleteRange(position, deleteLength); } bool CellBuffer::SetUndoCollection(bool collectUndo) { @@ -1041,15 +858,9 @@ void CellBuffer::PerformUndoStep() { const Action &actionStep = uh.GetUndoStep(); if (actionStep.at == insertAction) { - BasicDeleteChars(actionStep.position*2, actionStep.lenData*2); + BasicDeleteChars(actionStep.position, actionStep.lenData); } else if (actionStep.at == removeAction) { - char *styledData = new char[actionStep.lenData * 2]; - for (int i = 0; i < actionStep.lenData; i++) { - styledData[i*2] = actionStep.data[i]; - styledData[i*2 + 1] = 0; - } - BasicInsertString(actionStep.position*2, styledData, actionStep.lenData*2); - delete []styledData; + BasicInsertString(actionStep.position, actionStep.data, actionStep.lenData); } uh.CompletedUndoStep(); } @@ -1069,15 +880,9 @@ void CellBuffer::PerformRedoStep() { const Action &actionStep = uh.GetRedoStep(); if (actionStep.at == insertAction) { - char *styledData = new char[actionStep.lenData * 2]; - for (int i = 0; i < actionStep.lenData; i++) { - styledData[i*2] = actionStep.data[i]; - styledData[i*2 + 1] = 0; - } - BasicInsertString(actionStep.position*2, styledData, actionStep.lenData*2); - delete []styledData; + BasicInsertString(actionStep.position, actionStep.data, actionStep.lenData); } else if (actionStep.at == removeAction) { - BasicDeleteChars(actionStep.position*2, actionStep.lenData*2); + BasicDeleteChars(actionStep.position, actionStep.lenData); } uh.CompletedRedoStep(); } @@ -1097,25 +902,11 @@ } int CellBuffer::SetLevel(int line, int level) { - int prev = 0; - if ((line >= 0) && (line < lv.lines)) { - if (!lv.levels) { - lv.ExpandLevels(); - } - prev = lv.levels[line]; - if (lv.levels[line] != level) { - lv.levels[line] = level; - } - } - return prev; + return lv.SetLevel(line, level); } int CellBuffer::GetLevel(int line) { - if (lv.levels && (line >= 0) && (line < lv.lines)) { - return lv.levels[line]; - } else { - return SC_FOLDLEVELBASE; - } + return lv.GetLevel(line); } void CellBuffer::ClearLevels() { Modified: trunk/scintilla/CellBuffer.h =================================================================== --- trunk/scintilla/CellBuffer.h 2007-01-20 15:16:26 UTC (rev 1212) +++ trunk/scintilla/CellBuffer.h 2007-01-20 23:54:28 UTC (rev 1213) @@ -27,10 +27,10 @@ public: MarkerHandleSet(); ~MarkerHandleSet(); - int Length(); - int NumberFromHandle(int handle); - int MarkValue(); ///< Bit set of marker numbers. - bool Contains(int handle); + int Length() const; + int NumberFromHandle(int handle) const; + int MarkValue() const; ///< Bit set of marker numbers. + bool Contains(int handle) const; bool InsertHandle(int handle, int markerNum); void RemoveHandle(int handle); bool RemoveNumber(int markerNum); @@ -38,43 +38,40 @@ }; /** - * Each line stores the starting position of the first character of the line in the cell buffer - * and potentially a marker handle set. Often a line will not have any attached markers. - */ -struct LineData { - int startPosition; - MarkerHandleSet *handleSet; - LineData() : startPosition(0), handleSet(0) { - } -}; - -/** * The line vector contains information about each of the lines in a cell buffer. */ class LineVector { -public: - int growSize; - int lines; - LineData *linesData; - int size; - int *levels; - int sizeLevels; + Partitioning starts; + SplitVector<MarkerHandleSet *> markers; + SplitVector<int> levels; /// Handles are allocated sequentially and should never have to be reused as 32 bit ints are very big. int handleCurrent; +public: + LineVector(); ~LineVector(); void Init(); - void Expand(int sizeNew); void ExpandLevels(int sizeNew=-1); void ClearLevels(); - void InsertValue(int pos, int value); - void SetValue(int pos, int value); - void Remove(int pos); + int SetLevel(int line, int level); + int GetLevel(int line); + + void InsertText(int line, int delta); + void InsertLine(int line, int position); + void SetLineStart(int line, int position); + void RemoveLine(int line); + int Lines() { + return starts.Partitions(); + } int LineFromPosition(int pos); + int LineStart(int line) { + return starts.PositionFromPartition(line); + } + int MarkValue(int line); int AddMark(int line, int marker); void MergeMarkers(int pos); void DeleteMark(int line, int markerNum, bool all); @@ -150,16 +147,9 @@ */ class CellBuffer { private: - char *body; ///< The cell buffer itself. - int size; ///< Allocated size of the buffer. - int length; ///< Total length of the data. - int part1len; ///< Length of the first part. - int gaplen; ///< Length of the gap between the two parts. - char *part2body; ///< The second part of the cell buffer. - ///< Doesn't point after the gap but set so that - ///< part2body[position] is consistent with body[position]. + SplitVector<char> substance; + SplitVector<char> style; bool readOnly; - int growSize; bool collectingUndo; UndoHistory uh; @@ -168,15 +158,9 @@ SVector lineStates; - void GapTo(int position); - void RoomFor(int insertionLength); - - inline char ByteAt(int position); - void SetByteAt(int position, char ch); - public: - CellBuffer(int initialLength = 4000); + CellBuffer(); ~CellBuffer(); /// Retrieving positions outside the range of the buffer works and returns 0 @@ -184,18 +168,17 @@ void GetCharRange(char *buffer, int position, int lengthRetrieve); char StyleAt(int position); - int ByteLength(); int Length(); void Allocate(int newSize); int Lines(); int LineStart(int line); int LineFromPosition(int pos) { return lv.LineFromPosition(pos); } - const char *InsertString(int position, char *s, int insertLength, bool &startSequence); + const char *InsertString(int position, const char *s, int insertLength, bool &startSequence); /// Setting styles for positions outside the range of the buffer is safe and has no effect. /// @return true if the style of a character is changed. - bool SetStyleAt(int position, char style, char mask='\377'); - bool SetStyleFor(int position, int length, char style, char mask); + bool SetStyleAt(int position, char styleValue, char mask='\377'); + bool SetStyleFor(int position, int length, char styleValue, char mask); const char *DeleteChars(int position, int deleteLength, bool &startSequence); @@ -216,7 +199,7 @@ int LineFromHandle(int markerHandle); /// Actions without undo - void BasicInsertString(int position, char *s, int insertLength); + void BasicInsertString(int position, const char *s, int insertLength); void BasicDeleteChars(int position, int deleteLength); bool SetUndoCollection(bool collectUndo); @@ -245,6 +228,4 @@ void ClearLevels(); }; -#define CELL_SIZE 2 - #endif Modified: trunk/scintilla/ContractionState.cxx =================================================================== --- trunk/scintilla/ContractionState.cxx 2007-01-20 15:16:26 UTC (rev 1212) +++ trunk/scintilla/ContractionState.cxx 2007-01-20 23:54:28 UTC (rev 1213) @@ -208,11 +208,11 @@ if (lines[line].visible != visible) { delta += visible ? lines[line].height : -lines[line].height; lines[line].visible = visible; + valid = false; } } } linesInDisplay += delta; - valid = false; return delta != 0; } Modified: trunk/scintilla/Document.cxx =================================================================== --- trunk/scintilla/Document.cxx 2007-01-20 15:16:26 UTC (rev 1212) +++ trunk/scintilla/Document.cxx 2007-01-20 23:54:28 UTC (rev 1213) @@ -14,6 +14,8 @@ #include "Scintilla.h" #include "SVector.h" +#include "SplitVector.h" +#include "Partitioning.h" #include "CellBuffer.h" #include "CharClassify.h" #include "Document.h" @@ -358,10 +360,9 @@ } } -// Document only modified by gateways DeleteChars, InsertStyledString, Undo, Redo, and SetStyleAt. +// Document only modified by gateways DeleteChars, InsertString, Undo, Redo, and SetStyleAt. // SetStyleAt does not change the persistent state of a document -// Unlike Undo, Redo, and InsertStyledString, the pos argument is a cell number not a char number bool Document::DeleteChars(int pos, int len) { if (len == 0) return false; @@ -380,8 +381,8 @@ 0, 0)); int prevLinesTotal = LinesTotal(); bool startSavePoint = cb.IsSavePoint(); - bool startSequence=false; - const char *text = cb.DeleteChars(pos * 2, len * 2, startSequence); + bool startSequence = false; + const char *text = cb.DeleteChars(pos, len, startSequence); if (startSavePoint && cb.IsCollectingUndo()) NotifySavePoint(!startSavePoint); if ((pos < Length()) || (pos == 0)) @@ -390,7 +391,7 @@ ModifiedAt(pos-1); NotifyModified( DocModification( - SC_MOD_DELETETEXT | SC_PERFORMED_USER | (startSequence?SC_START_ACTION:0), + SC_MOD_DELETETEXT | SC_PERFORMED_USER | (startSequence?SC_STARTACTION:0), pos, len, LinesTotal() - prevLinesTotal, text)); } @@ -400,9 +401,12 @@ } /** - * Insert a styled string (char/style pairs) with a length. + * Insert a string with a length. */ -bool Document::InsertStyledString(int position, char *s, int insertLength) { +bool Document::InsertString(int position, const char *s, int insertLength) { + if (insertLength <= 0) { + return false; + } CheckReadOnly(); if (enteredCount != 0) { return false; @@ -412,19 +416,19 @@ NotifyModified( DocModification( SC_MOD_BEFOREINSERT | SC_PERFORMED_USER, - position / 2, insertLength / 2, + position, insertLength, 0, s)); int prevLinesTotal = LinesTotal(); bool startSavePoint = cb.IsSavePoint(); - bool startSequence=false; + bool startSequence = false; const char *text = cb.InsertString(position, s, insertLength, startSequence); if (startSavePoint && cb.IsCollectingUndo()) NotifySavePoint(!startSavePoint); - ModifiedAt(position / 2); + ModifiedAt(position); NotifyModified( DocModification( - SC_MOD_INSERTTEXT | SC_PERFORMED_USER | (startSequence?SC_START_ACTION:0), - position / 2, insertLength / 2, + SC_MOD_INSERTTEXT | SC_PERFORMED_USER | (startSequence?SC_STARTACTION:0), + position, insertLength, LinesTotal() - prevLinesTotal, text)); } enteredCount--; @@ -546,39 +550,18 @@ * Insert a single character. */ bool Document::InsertChar(int pos, char ch) { - char chs[2]; + char chs[1]; chs[0] = ch; - chs[1] = 0; - return InsertStyledString(pos*2, chs, 2); + return InsertString(pos, chs, 1); } /** * Insert a null terminated string. */ -bool Document::InsertString(int position, const char *s) { +bool Document::InsertCString(int position, const char *s) { return InsertString(position, s, strlen(s)); } -/** - * Insert a string with a length. - */ -bool Document::InsertString(int position, const char *s, size_t insertLength) { - bool changed = false; - if (insertLength > 0) { - char *sWithStyle = new char[insertLength * 2]; - if (sWithStyle) { - for (size_t i = 0; i < insertLength; i++) { - sWithStyle[i*2] = s[i]; - sWithStyle[i*2 + 1] = 0; - } - changed = InsertStyledString(position*2, sWithStyle, - static_cast<int>(insertLength*2)); - delete []sWithStyle; - } - } - return changed; -} - void Document::ChangeChar(int pos, char ch) { DeleteChars(pos, 1); InsertChar(pos, ch); @@ -655,7 +638,7 @@ int indentPos = GetLineIndentPosition(line); BeginUndoAction(); DeleteChars(thisLineStart, indentPos - thisLineStart); - InsertString(thisLineStart, linebuf); + InsertCString(thisLineStart, linebuf); EndUndoAction(); } } @@ -684,6 +667,8 @@ return column; } else if (ch == '\n') { return column; + } else if (i >= Length()) { + return column; } else { column++; i = MovePositionOutsideChar(i + 1, 1); @@ -856,7 +841,7 @@ while (pos > 0 && (WordCharClass(cb.CharAt(pos - 1)) == ccStart)) pos--; } else { - if (!onlyWordCharacters) + if (!onlyWordCharacters && pos < Length()) ccStart = WordCharClass(cb.CharAt(pos)); while (pos < (Length()) && (WordCharClass(cb.CharAt(pos)) == ccStart)) pos++; Modified: trunk/scintilla/Document.h =================================================================== --- trunk/scintilla/Document.h 2007-01-20 15:16:26 UTC (rev 1212) +++ trunk/scintilla/Document.h 2007-01-20 23:54:28 UTC (rev 1213) @@ -136,7 +136,7 @@ // Gateways to modifying document void ModifiedAt(int pos); bool DeleteChars(int pos, int len); - bool InsertStyledString(int position, char *s, int insertLength); + bool InsertString(int position, const char *s, int insertLength); int Undo(); int Redo(); bool CanUndo() { return cb.CanUndo(); } @@ -163,8 +163,7 @@ bool IsReadOnly() { return cb.IsReadOnly(); } bool InsertChar(int pos, char ch); - bool InsertString(int position, const char *s); - bool InsertString(int position, const char *s, size_t insertLength); + bool InsertCString(int position, const char *s); void ChangeChar(int pos, char ch); void DelChar(int pos); void DelCharBack(int pos); @@ -197,7 +196,7 @@ int NextWordStart(int pos, int delta); int NextWordEnd(int pos, int delta); int Length() { return cb.Length(); } - void Allocate(int newSize) { cb.Allocate(newSize*2); } + void Allocate(int newSize) { cb.Allocate(newSize); } long FindText(int minPos, int maxPos, const char *s, bool caseSensitive, bool word, bool wordStart, bool regExp, bool posix, int *length); long FindText(int iMessage, unsigned long wParam, long lParam); Modified: trunk/scintilla/DocumentAccessor.cxx =================================================================== --- trunk/scintilla/DocumentAccessor.cxx 2007-01-20 15:16:26 UTC (rev 1212) +++ trunk/scintilla/DocumentAccessor.cxx 2007-01-20 23:54:28 UTC (rev 1213) @@ -16,6 +16,8 @@ #include "SVector.h" #include "Accessor.h" #include "DocumentAccessor.h" +#include "SplitVector.h" +#include "Partitioning.h" #include "CellBuffer.h" #include "Scintilla.h" #include "CharClassify.h" Modified: trunk/scintilla/Editor.cxx =================================================================== --- trunk/scintilla/Editor.cxx 2007-01-20 15:16:26 UTC (rev 1212) +++ trunk/scintilla/Editor.cxx 2007-01-20 23:54:28 UTC (rev 1213) @@ -19,6 +19,8 @@ #include "ContractionState.h" #include "SVector.h" +#include "SplitVector.h" +#include "Partitioning.h" #include "CellBuffer.h" #include "KeyMap.h" #include "Indicator.h" @@ -1661,7 +1663,7 @@ unsigned int posLineStart = pdoc->LineStart(line); LayoutLine(line, surface, vs, ll, pixelWidth); for (int subLine = 1; subLine < ll->lines; subLine++) { - pdoc->InsertString(posLineStart + (subLine - 1) * strlen(eol) + + pdoc->InsertCString(posLineStart + (subLine - 1) * strlen(eol) + ll->LineStart(subLine), eol); targetEnd += static_cast<int>(strlen(eol)); } @@ -1915,6 +1917,7 @@ LineLayout *Editor::RetrieveLineLayout(int lineNumber) { int posLineStart = pdoc->LineStart(lineNumber); int posLineEnd = pdoc->LineStart(lineNumber + 1); + PLATFORM_ASSERT(posLineEnd >= posLineStart); int lineCaret = pdoc->LineFromPosition(currentPos); return llc.Retrieve(lineNumber, lineCaret, posLineEnd - posLineStart, pdoc->GetStyleClock(), @@ -1930,6 +1933,7 @@ if (!ll) return; PLATFORM_ASSERT(line < pdoc->LinesTotal()); + PLATFORM_ASSERT(ll->chars != NULL); int posLineStart = pdoc->LineStart(line); int posLineEnd = pdoc->LineStart(line + 1); // If the line is very long, limit the treatment to a length that should fit in the viewport @@ -2273,6 +2277,21 @@ surface->FillRectangle(rcSegment, vsDraw.styles[STYLE_DEFAULT].back.allocated); } + if (vsDraw.selEOLFilled && eolInSelection && vsDraw.selbackset && (line < pdoc->LinesTotal() - 1) && (vsDraw.selAlpha == SC_ALPHA_NOALPHA)) { + surface->FillRectangle(rcSegment, SelectionBackground(vsDraw)); + } else { + if (overrideBackground) { + surface->FillRectangle(rcSegment, background); + } else if (vsDraw.styles[ll->styles[ll->numCharsInLine] & styleMask].eolFilled) { + surface->FillRectangle(rcSegment, vsDraw.styles[ll->styles[ll->numCharsInLine] & styleMask].back.allocated); + } else { + surface->FillRectangle(rcSegment, vsDraw.styles[STYLE_DEFAULT].back.allocated); + } + if (vsDraw.selEOLFilled && eolInSelection && vsDraw.selbackset && (line < pdoc->LinesTotal() - 1) && (vsDraw.selAlpha != SC_ALPHA_NOALPHA)) { + SimpleAlphaRectangle(surface, rcSegment, SelectionBackground(vsDraw), vsDraw.selAlpha); + } + } + if (drawWrapMarkEnd) { PRectangle rcPlace = rcSegment; @@ -4096,7 +4115,7 @@ char *text = CopyRange(start, end); if (forLine) { const char *eol = StringFromEOLMode(pdoc->eolMode); - pdoc->InsertString(end, eol); + pdoc->InsertCString(end, eol); pdoc->InsertString(end + istrlen(eol), text, end - start); } else { pdoc->InsertString(end, text, end - start); @@ -4116,7 +4135,7 @@ } else if (pdoc->eolMode == SC_EOL_CR) { eol = "\r"; } // else SC_EOL_LF -> "\n" already set - if (pdoc->InsertString(currentPos, eol)) { + if (pdoc->InsertCString(currentPos, eol)) { SetEmptySelection(currentPos + istrlen(eol)); while (*eol) { NotifyChar(*eol); @@ -4975,7 +4994,7 @@ SetEmptySelection(position); } else { position = MovePositionOutsideChar(position, currentPos - position); - if (pdoc->InsertString(position, value)) { + if (pdoc->InsertCString(position, value)) { SetSelection(position + istrlen(value), position); } pdoc->EndUndoAction(); @@ -5681,6 +5700,26 @@ } } +void Editor::AddStyledText(char *buffer, int appendLength) { + // The buffer consists of alternating character bytes and style bytes + size_t textLength = appendLength / 2; + char *text = new char[textLength]; + if (text) { + size_t i; + for (i=0;i<textLength;i++) { + text[i] = buffer[i*2]; + } + pdoc->InsertString(CurrentPosition(), text, textLength); + for (i=0;i<textLength;i++) { + text[i] = buffer[i*2+1]; + } + pdoc->StartStyling(CurrentPosition(), static_cast<char>(0xff)); + pdoc->SetStyles(textLength, text); + delete []text; + } + SetEmptySelection(currentPos + textLength); +} + static bool ValidMargin(unsigned long wParam) { return wParam < ViewStyle::margins; } @@ -5717,7 +5756,7 @@ pdoc->BeginUndoAction(); pdoc->DeleteChars(0, pdoc->Length()); SetEmptySelection(0); - pdoc->InsertString(0, CharPtrFromSPtr(lParam)); + pdoc->InsertCString(0, CharPtrFromSPtr(lParam)); pdoc->EndUndoAction(); return 1; } @@ -5867,7 +5906,7 @@ pdoc->BeginUndoAction(); ClearSelection(); char *replacement = CharPtrFromSPtr(lParam); - pdoc->InsertString(currentPos, replacement); + pdoc->InsertCString(currentPos, replacement); pdoc->EndUndoAction(); SetEmptySelection(currentPos + istrlen(replacement)); EnsureCaretVisible(); @@ -6023,13 +6062,10 @@ return 0; } - case SCI_ADDSTYLEDTEXT: { - if (lParam == 0) - return 0; - pdoc->InsertStyledString(CurrentPosition() * 2, CharPtrFromSPtr(lParam), wParam); - SetEmptySelection(currentPos + wParam / 2); - return 0; - } + case SCI_ADDSTYLEDTEXT: + if (lParam) + AddStyledText(CharPtrFromSPtr(lParam), wParam); + return 0; case SCI_INSERTTEXT: { if (lParam == 0) @@ -6039,7 +6075,7 @@ insertPos = CurrentPosition(); int newCurrent = CurrentPosition(); char *sz = CharPtrFromSPtr(lParam); - pdoc->InsertString(insertPos, sz); + pdoc->InsertCString(insertPos, sz); if (newCurrent > insertPos) newCurrent += istrlen(sz); SetEmptySelection(newCurrent); @@ -6898,6 +6934,14 @@ case SCI_GETSELALPHA: return vs.selAlpha; + case SCI_GETSELEOLFILLED: + return vs.selEOLFilled; + + case SCI_SETSELEOLFILLED: + vs.selEOLFilled = wParam != 0; + InvalidateStyleRedraw(); + break; + case SCI_SETWHITESPACEFORE: vs.whitespaceForegroundSet = wParam != 0; vs.whitespaceForeground.desired = ColourDesired(lParam); Modified: trunk/scintilla/Editor.h =================================================================== --- trunk/scintilla/Editor.h 2007-01-20 15:16:26 UTC (rev 1212) +++ trunk/scintilla/Editor.h 2007-01-20 23:54:28 UTC (rev 1213) @@ -527,6 +527,7 @@ int CodePage() const; virtual bool ValidCodePage(int /* codePage */) const { return true; } int WrapCount(int line); + void AddStyledText(char *buffer, int appendLength); virtual sptr_t DefWndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) = 0; Modified: trunk/scintilla/LexCPP.cxx =================================================================== --- trunk/scintilla/LexCPP.cxx 2007-01-20 15:16:26 UTC (rev 1212) +++ trunk/scintilla/LexCPP.cxx 2007-01-20 23:54:28 UTC (rev 1213) @@ -371,8 +371,8 @@ // Store both the current line's fold level and the next lines in the // level store to make it easy to pick up with each increment // and to make it possible to fiddle the current level for "} else {". -static void FoldNoBoxCppDoc(unsigned int startPos, int length, int initStyle, - Accessor &styler) { +static void FoldCppDoc(unsigned int startPos, int length, int initStyle, + WordList *[], Accessor &styler) { bool foldComment = styler.GetPropertyInt("fold.comment") != 0; bool foldPreprocessor = styler.GetPropertyInt("fold.preprocessor") != 0; bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0; @@ -396,9 +396,9 @@ styleNext = styler.StyleAt(i + 1); bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n'); if (foldComment && IsStreamCommentStyle(style)) { - if (!IsStreamCommentStyle(stylePrev)) { + if (!IsStreamCommentStyle(stylePrev) && (stylePrev != SCE_C_COMMENTLINEDOC)) { levelNext++; - } else if (!IsStreamCommentStyle(styleNext) && !atEOL) { + } else if (!IsStreamCommentStyle(styleNext) && (styleNext != SCE_C_COMMENTLINEDOC) && !atEOL) { // Comments don't end at end of line and the next character may be unstyled. levelNext--; } @@ -461,11 +461,6 @@ } } -static void FoldCppDoc(unsigned int startPos, int length, int initStyle, WordList *[], - Accessor &styler) { - FoldNoBoxCppDoc(startPos, length, initStyle, styler); -} - static const char * const cppWordLists[] = { "Primary keywords and identifiers", "Secondary keywords and identifiers", Modified: trunk/scintilla/LexD.cxx =================================================================== --- trunk/scintilla/LexD.cxx 2007-01-20 15:16:26 UTC (rev 1212) +++ trunk/scintilla/LexD.cxx 2007-01-20 23:54:28 UTC (rev 1213) @@ -2,7 +2,6 @@ ** Lexer for D. ** ** Copyright (c) 2006 by Waldemar Augustyn <waldemar(a)wdmsys.com> - ** Licensed under the terms described in LicenseContributor.txt. **/ // Copyright 1998-2005 by Neil Hodgson <neilh(a)scintilla.org> // The License.txt file describes the conditions under which this software may be distributed. @@ -24,24 +23,24 @@ /*/ Nested comments require keeping the value of the nesting level for every position in the document. But since scintilla always styles line by line, - we only need to store that value per line. The non-negative number indicates + we only need to store one value per line. The non-negative number indicates nesting level at the end of the line. /*/ // We use custom qualifiers since it is not clear what D allows. -static bool IsWordStart(char ch) { +static bool IsWordStart(int ch) { return isascii(ch) && (isalpha(ch) || ch == '_'); } -static bool IsWord(char ch) { +static bool IsWord(int ch) { return isascii(ch) && (isalnum(ch) || ch == '_'); } -static bool IsDoxygen(char ch) { +static bool IsDoxygen(int ch) { if (isascii(ch) && islower(ch)) return true; - if (ch == '$' || ch == '@' || ch == '\\' || + if (ch == '$' || ch == '@' || ch == '\\' || ch == '&' || ch == '#' || ch == '<' || ch == '>' || ch == '{' || ch == '}' || ch == '[' || ch == ']') return true; @@ -49,7 +48,7 @@ } -static void ColouriseDDoc(unsigned int startPos, int length, int initStyle, +static void ColouriseDoc(unsigned int startPos, int length, int initStyle, WordList *keywordlists[], Accessor &styler, bool caseSensitive) { WordList &keywords = *keywordlists[0]; @@ -60,13 +59,10 @@ int styleBeforeDCKeyword = SCE_D_DEFAULT; StyleContext sc(startPos, length, initStyle, styler); - + int curLine = styler.GetLine(startPos); int curNcLevel = curLine > 0? styler.GetLineState(curLine-1): 0; - //~ printf("WA LexD::Colorize start(%d) end(%d) initStyle(%d) curLine(%d) begNcLevel(%d)\n", - //~ startPos, startPos+length, initStyle, curLine+1, curNcLevel); - for (; sc.More(); sc.Forward()) { if (sc.atLineStart) { @@ -77,10 +73,8 @@ } curLine = styler.GetLine(sc.currentPos); styler.SetLineState(curLine, curNcLevel); - //~ printf(" WA LexD::Colorize set line(%d) to curNcLevel(%d) BOL\n", - //~ curLine+1, curNcLevel); } - + // Handle line continuation generically. if (sc.ch == '\\') { if (sc.chNext == '\n' || sc.chNext == '\r') { @@ -179,8 +173,6 @@ curNcLevel -= 1; curLine = styler.GetLine(sc.currentPos); styler.SetLineState(curLine, curNcLevel); - //~ printf(" WA LexD::Colorize set line(%d) to curNcLevel(%d) NEST DOWN\n", - //~ curLine+1, curNcLevel); sc.Forward(); if (curNcLevel == 0) { sc.ForwardSetState(SCE_D_DEFAULT); @@ -190,8 +182,6 @@ curNcLevel += 1; curLine = styler.GetLine(sc.currentPos); styler.SetLineState(curLine, curNcLevel); - //~ printf(" WA LexD::Colorize set line(%d) to curNcLevel(%d) NEST UP\n", - //~ curLine+1, curNcLevel); sc.Forward(); } break; @@ -234,8 +224,6 @@ curNcLevel += 1; curLine = styler.GetLine(sc.currentPos); styler.SetLineState(curLine, curNcLevel); - //~ printf(" WA LexD::Colorize set line(%d) to curNcLevel(%d) NEST NEW\n", - //~ curLine+1, curNcLevel); sc.SetState(SCE_D_COMMENTNESTED); sc.Forward(); } else if (sc.Match('/', '*')) { @@ -261,8 +249,6 @@ } } sc.Complete(); - //~ styler.Flush(); // Make sure nested comments are properly accounted for - //~ styler.ClearNestedCommentChange(); } static bool IsStreamCommentStyle(int style) { @@ -275,11 +261,11 @@ // Store both the current line's fold level and the next lines in the // level store to make it easy to pick up with each increment // and to make it possible to fiddle the current level for "} else {". -static void FoldNoBoxDDoc(unsigned int startPos, int length, int initStyle, - Accessor &styler) { +static void FoldDoc(unsigned int startPos, int length, int initStyle, Accessor &styler) { bool foldComment = styler.GetPropertyInt("fold.comment") != 0; bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0; - bool foldAtElse = styler.GetPropertyInt("fold.at.else", 0) != 0; + bool foldAtElse = styler.GetPropertyInt("lexer.d.fold.at.else", + styler.GetPropertyInt("fold.at.else", 0)) != 0; unsigned int endPos = startPos + length; int visibleChars = 0; int lineCurrent = styler.GetLine(startPos); @@ -347,9 +333,9 @@ } } -static void FoldDDoc(unsigned int startPos, int length, int initStyle, +static void FoldDDoc(unsigned int startPos, int length, int initStyle, WordList *[], Accessor &styler) { - FoldNoBoxDDoc(startPos, length, initStyle, styler); + FoldDoc(startPos, length, initStyle, styler); } static const char * const dWordLists[] = { @@ -360,10 +346,9 @@ 0, }; -static void ColouriseDDocSensitive(unsigned int startPos, int length, +static void ColouriseDDoc(unsigned int startPos, int length, int initStyle, WordList *keywordlists[], Accessor &styler) { - ColouriseDDoc(startPos, length, initStyle, keywordlists, styler, true); + ColouriseDoc(startPos, length, initStyle, keywordlists, styler, true); } -LexerModule lmD(SCLEX_D, ColouriseDDocSensitive, "d", FoldDDoc, dWordLists); - +LexerModule lmD(SCLEX_D, ColouriseDDoc, "d", FoldDDoc, dWordLists); Deleted: trunk/scintilla/LexGen.py =================================================================== --- trunk/scintilla/LexGen.py 2007-01-20 15:16:26 UTC (rev 1212) +++ trunk/scintilla/LexGen.py 2007-01-20 23:54:28 UTC (rev 1213) @@ -1,180 +0,0 @@ -# LexGen.py - implemented 2002 by Neil Hodgson neilh(a)scintilla.org -# Released to the public domain. - -# Regenerate the Scintilla and SciTE source files that list -# all the lexers and all the properties files. -# Should be run whenever a new lexer is added or removed. -# Requires Python 2.1 or later -# Most files are regenerated in place with templates stored in comments. -# The VS .NET project file is generated into a different file as the -# VS .NET environment will not retain comments when modifying the file. -# The files are copied to a string apart from sections between a -# ++Autogenerated comment and a --Autogenerated comment which is -# generated by the CopyWithInsertion function. After the whole -# string is instantiated, it is compared with the target file and -# if different the file is rewritten. -# Does not regenerate the Visual C++ 6 project files but does the VS .NET -# project file. - -import string -import sys -import os -import glob - -# EOL constants -CR = "\r" -LF = "\n" -CRLF = "\r\n" -if sys.platform == "win32": - NATIVE = CRLF -else: - # Yes, LF is the native EOL even on Mac OS X. CR is just for - # Mac OS <=9 (a.k.a. "Mac Classic") - NATIVE = LF - -# Automatically generated sections contain start and end comments, -# a definition line and the results. -# The results are replaced by regenerating based on the definition line. -# The definition line is a comment prefix followed by "**". -# If there is a digit after the ** then this indicates which list to use -# and the digit and next character are not part of the definition -# Backslash is used as an escape within the definition line. -# The part between $ and $ is repeated for each item in the list. -# \* is replaced by each list item. \t, and \n are tab and newline. -def CopyWithInsertion(input, commentPrefix, retainDefs, eolType, *lists): - copying = 1 - listid = 0 - output = [] - for line in input.splitlines(0): - isStartGenerated = line.startswith(commentPrefix + "++Autogenerated") - if copying and not isStartGenerated: - output.append(line) - if isStartGenerated: - if retainDefs: - output.append(line) - copying = 0 - definition = "" - elif not copying and line.startswith(commentPrefix + "**"): - if retainDefs: - output.append(line) - definition = line[len(commentPrefix + "**"):] - listid = 0 - if definition[0] in string.digits: - listid = int(definition[:1]) - definition = definition[2:] - # Hide double slashes as a control character - definition = definition.replace("\\\\", "\001") - # Do some normal C style transforms - definition = definition.replace("\\n", "\n") - definition = definition.replace("\\t", "\t") - # Get the doubled backslashes back as single backslashes - definition = definition.replace("\001", "\\") - startRepeat = definition.find("\$") - endRepeat = definition.find("\$") - intro = definition[:startRepeat] - out = "" - if intro.endswith("\n"): - pos = 0 - else: - pos = len(intro) - out += intro - middle = definition[startRepeat+2:endRepeat] - for i in lists[listid]: - item = middle.replace("\\*", i) - if pos and (pos + len(item) >= 80): - out += "\\\n" - pos = 0 - out += item - pos += len(item) - if item.endswith("\n"): - pos = 0 - outro = definition[endRepeat+2:] - out += outro - out = out.replace("\n", eolType) # correct EOLs in generated content - output.append(out) - elif line.startswith(commentPrefix + "--Autogenerated"): - copying = 1 - if retainDefs: - output.append(line) - output = [line.rstrip(" \t") for line in output] # trim trailing whitespace - return eolType.join(output) + eolType - -def UpdateFile(filename, updated): - """ If the file is different to updated then copy updated - into the file else leave alone so CVS and make don't treat - it as modified. """ - try: - infile = open(filename, "rb") - except IOError: # File is not there yet - out = open(filename, "wb") - out.write(updated) - out.close() - print "New", filename - return - original = infile.read() - infile.close() - if updated != original: - os.unlink(filename) - out = open(filename, "wb") - out.write(updated) - out.close() - print "Changed", filename - #~ else: - #~ print "Unchanged", filename - -def Generate(inpath, outpath, commentPrefix, eolType, *lists): - """Generate 'outpath' from 'inpath'. - - "eolType" indicates the type of EOLs to use in the generated - file. It should be one of following constants: LF, CRLF, - CR, or NATIVE. - """ - #print "generate '%s' -> '%s' (comment prefix: %r, eols: %r)"\ - # % (inpath, outpath, commentPrefix, eolType) - try: - infile = open(inpath, "r") - except IOError: - print "Can not open", inpath - return - original = infile.read() - infile.close() - updated = CopyWithInsertion(original, commentPrefix, - inpath == outpath, eolType, *lists) - UpdateFile(outpath, updated) - -def Regenerate(filename, commentPrefix, eolType, *lists): - """Regenerate the given file. - - "eolType" indicates the type of EOLs to use in the generated - file. It should be one of following constants: LF, CRLF, - CR, or NATIVE. - """ - Generate(filename, filename, commentPrefix, eolType, *lists) - -def FindModules(lexFile): - modules = [] - f = open(lexFile) - for l in f.readlines(): - if l.startswith("LexerModule"): - l = l.replace("(", " ") - modules.append(l.split()[1]) - return modules - -def ciCompare(a,b): - return a.lower() < b.lower() - -def RegenerateAll(): - root="./" - - # Find all the lexer source code files - lexFilePaths = glob.glob(root + "Lex*.cxx") - lexFiles = [os.path.basename(f)[:-4] for f in lexFilePaths] - print lexFiles - lexerModules = [] - for lexFile in lexFilePaths: - lexerModules.extend(FindModules(lexFile)) - lexerModules.sort(ciCompare) - - Regenerate(root + "KeyWords.cxx", "//", NATIVE, lexerModules) - -RegenerateAll() Modified: trunk/scintilla/LexHTML.cxx =================================================================== --- trunk/scintilla/LexHTML.cxx 2007-01-20 15:16:26 UTC (rev 1212) +++ trunk/scintilla/LexHTML.cxx 2007-01-20 23:54:28 UTC (rev 1213) @@ -173,6 +173,7 @@ bool allowTermination = !isStringState(state); if (allowTermination) { switch (state) { + case SCE_HB_COMMENTLINE: case SCE_HPHP_COMMENT: case SCE_HP_COMMENTLINE: case SCE_HPA_COMMENTLINE: Modified: trunk/scintilla/LexOthers.cxx =================================================================== --- trunk/scintilla/LexOthers.cxx 2007-01-20 15:16:26 UTC (rev 1212) +++ trunk/scintilla/LexOthers.cxx 2007-01-20 23:54:28 UTC (rev 1213) @@ -125,7 +125,7 @@ styler.ColourTo(startLine + offset + 1, SCE_BAT_IDENTIFIER); offset += 2; // Check for External Command / Program - if (!isspacechar(lineBuffer[offset])) { + if (offset < lengthLine && !isspacechar(lineBuffer[offset])) { cmdLoc = offset; } // Check for Environment Variable (%x...%) @@ -136,7 +136,7 @@ styler.ColourTo(startLine + offset, SCE_BAT_IDENTIFIER); offset++; // Check for External Command / Program - if (!isspacechar(lineBuffer[offset])) { + if (offset < lengthLine && !isspacechar(lineBuffer[offset])) { cmdLoc = offset; } } @@ -371,6 +371,7 @@ offset -= (wbl - wbo); // Check for Local Variable (%%a) } else if ( + (wbl > 2) && (wordBuffer[1] == '%') && (wordBuffer[2] != '%') && (!IsBOperator(wordBuffer[2])) && @@ -473,6 +474,7 @@ } } if (linePos > 0) { // Last line does not have ending characters + lineBuffer[linePos] = '\0'; ColouriseBatchLine(lineBuffer, linePos, startLine, startPos + length - 1, keywordlists, styler); } Modified: trunk/scintilla/LexRuby.cxx =================================================================== --- trunk/scintilla/LexRuby.cxx 2007-01-20 15:16:26 UTC (rev 1212) +++ trunk/scintilla/LexRuby.cxx 2007-01-20 23:54:28 UTC (rev 1213) @@ -49,7 +49,10 @@ } static inline bool isSafeWordcharOrHigh(char ch) { - return isHighBitChar(ch) || iswordchar(ch); + // Error: scintilla's KeyWords.h includes '.' as a word-char + // we want to separate things that can take methods from the + // methods. + return isHighBitChar(ch) || isalnum(ch) || ch == '_'; } static bool inline iswhitespace(char ch) { @@ -238,7 +241,75 @@ return true; } +// This class is used by the enter and exit methods, so it needs +// to be hoisted out of the function. +class QuoteCls { + public: + int Count; + char Up; + char Down; + QuoteCls() { + this->New(); + } + void New() { + Count = 0; + Up = '\0'; + Down = '\0'; + } + void Open(char u) { + Count++; + Up = u; + Down = opposite(Up); + } + QuoteCls(const QuoteCls& q) { + // copy constructor -- use this for copying in + Count = q.Count; + Up = q.Up; + Down = q.Down; + } + QuoteCls& operator=(const QuoteCls& q) { // assignment constructor + if (this != &q) { + Count = q.Count; + Up = q.Up; + Down = q.Down; + } + return *this; + } + +}; + + +static void enterInnerExpression(int *p_inner_string_types, + int *p_inner_expn_brace_counts, + QuoteCls *p_inner_quotes, + int& inner_string_count, + int& state, + int& brace_counts, + QuoteCls curr_quote + ) { + p_inner_string_types[inner_string_count] = state; + state = SCE_RB_DEFAULT; + p_inner_expn_brace_counts[inner_string_count] = brace_counts; + brace_counts = 0; + p_inner_quotes[inner_string_count] = curr_quote; + ++inner_string_count; +} + +static void exitInnerExpression(int *p_inner_string_types, + int *p_inner_expn_brace_counts, + QuoteCls *p_inner_quotes, + int& inner_string_count, + int& state, + int& brace_counts, + QuoteCls& curr_quote + ) { + --inner_string_count; + state = p_inner_string_types[inner_string_count]; + brace_counts = p_inner_expn_brace_counts[inner_string_count]; + curr_quote = p_inner_quotes[inner_string_count]; +} + static bool isEmptyLine(int pos, Accessor &styler) { int spaceFlags = 0; @@ -288,7 +359,7 @@ // // iPrev points to the start of << -static bool sureThisIsHeredoc(int iPrev, +static bool sureThisIsHeredoc(int iPrev, Accessor &styler, char *prevWord) { @@ -605,25 +676,6 @@ }; HereDocCls HereDoc; - class QuoteCls { - public: - int Count; - char Up; - char Down; - QuoteCls() { - this->New(); - } - void New() { - Count = 0; - Up = '\0'; - Down = '\0'; - } - void Open(char u) { - Count++; - Up = u; - Down = opposite(Up); - } - }; QuoteCls Quote; int numDots = 0; // For numbers -- @@ -643,6 +695,7 @@ char chPrev = styler.SafeGetCharAt(startPos - 1); char chNext = styler.SafeGetCharAt(startPos); + bool is_real_number = true; // Differentiate between constants and ?-sequences. // Ruby uses a different mask because bad indentation is marked by oring with 32 styler.StartAt(startPos, 127); styler.StartSegment(startPos); @@ -654,8 +707,39 @@ SCE_RB_STRING_QW, SCE_RB_STRING_QX}; static const char* q_chars = "qQrwWx"; - - for (int i = startPos; i < lengthDoc; i++) { + + // In most cases a value of 2 should be ample for the code in the + // Ruby library, and the code the user is likely to enter. + // For example, + // fu_output_message "mkdir #{options[:mode] ? ('-m %03o ' % options[:mode]) : ''}#{list.join ' '}" + // if options[:verbose] + // from fileutils.rb nests to a level of 2 + // If the user actually hits a 6th occurrence of '#{' in a double-quoted + // string (including regex'es, %Q, %<sym>, %w, and other strings + // that interpolate), it will stay as a string. The problem with this + // is that quotes might flip, a 7th '#{' will look like a comment, + // and code-folding might be wrong. + + // If anyone runs into this problem, I recommend raising this + // value slightly higher to replacing the fixed array with a linked + // list. Keep in mind this code will be called everytime the lexer + // is invoked. + +#define INNER_STRINGS_MAX_COUNT 5 + // These vars track our instances of "...#{,,,%Q<..#{,,,}...>,,,}..." + int inner_string_types[INNER_STRINGS_MAX_COUNT]; + // Track # braces when we push a new #{ thing + int inner_expn_brace_counts[INNER_STRINGS_MAX_COUNT]; + QuoteCls inner_quotes[INNER_STRINGS_MAX_COUNT]; + int inner_string_count = 0; + int brace_counts = 0; // Number of #{ ... } things within an expression + + int i; + for (i = 0; i < INNER_STRINGS_MAX_COUNT; i++) { + inner_string_types[i] = 0; + inner_expn_brace_counts[i] = 0; + } + for (i = startPos; i < lengthDoc; i++) { char ch = chNext; chNext = styler.SafeGetCharAt(i + 1); char chNext2 = styler.SafeGetCharAt(i + 2); @@ -690,6 +774,7 @@ if (isSafeDigit(ch)) { styler.ColourTo(i - 1, state); state = SCE_RB_NUMBER; + is_real_number = true; numDots = 0; } else if (isHighBitChar(ch) || iswordstart(ch)) { styler.ColourTo(i - 1, state); @@ -885,7 +970,7 @@ chNext = styler.SafeGetCharAt(i + 1); have_string = true; } - } else if (!isSafeWordcharOrHigh(chNext)) { + } else if (preferRE && !isSafeWordcharOrHigh(chNext)) { // Ruby doesn't allow high bit chars here, // but the editor host might state = SCE_RB_STRING_QQ; @@ -898,6 +983,16 @@ // stay in default preferRE = true; } + } else if (ch == '?') { + styler.ColourTo(i - 1, state); + if (iswhitespace(chNext) || chNext == '\n' || chNext == '\r') { + styler.ColourTo(i, SCE_RB_OPERATOR); + } else { + // It's the start of a character code escape sequence + // Color it as a number. + state = SCE_RB_NUMBER; + is_real_number = false; + } } else if (isoperator(ch) || ch == '.') { styler.ColourTo(i - 1, state); styler.ColourTo(i, SCE_RB_OPERATOR); @@ -909,7 +1004,20 @@ // we aren't ending an object exp'n, and ops // like : << / are unary operators. - preferRE = (strchr(")}].", ch) == NULL); + if (ch == '{') { + ++brace_counts; + preferRE = true; + } else if (ch == '}' && --brace_counts < 0 + && inner_string_count > 0) { + styler.ColourTo(i, SCE_RB_OPERATOR); + exitInnerExpression(inner_string_types, + inner_expn_brace_counts, + inner_quotes, + inner_string_count, + state, brace_counts, Quote); + } else { + preferRE = (strchr(")}].", ch) == NULL); + } // Stay in default state } else if (isEOLChar(ch)) { // Make sure it's a true line-end, with no backslash @@ -984,7 +1092,37 @@ } } } else if (state == SCE_RB_NUMBER) { - if (isSafeAlnumOrHigh(ch) || ch == '_') { + if (!is_real_number) { + if (ch != '\\') { + styler.ColourTo(i, state); + state = SCE_RB_DEFAULT; + preferRE = false; + } else if (strchr("\\ntrfvaebs", chNext)) { + // Terminal escape sequence -- handle it next time + // Nothing more to do this time through the loop + } else if (chNext == 'C' || chNext == 'M') { + if (chNext2 != '-') { + // \C or \M ends the sequence -- handle it next time + } else { + // Move from abc?\C-x + // ^ + // to + // ^ + i += 2; + ch = chNext2; + chNext = styler.SafeGetCharAt(i + 1); + } + } else if (chNext == 'c') { + // Stay here, \c is a combining sequence + advance_char(i, ch, chNext, chNext2); // pass by ref + } else { + // ?\x, including ?\\ is final. + styler.ColourTo(i + 1, state); + state = SCE_RB_DEFAULT; + preferRE = false; + advance_char(i, ch, chNext, chNext2); + } + } else if (isSafeAlnumOrHigh(ch) || ch == '_') { // Keep going } else if (ch == '.' && ++numDots == 1) { // Keep going @@ -1155,30 +1293,47 @@ Quote.Count++; } else if (ch == '#' ) { - //todo: distinguish comments from pound chars - // for now, handle as comment - styler.ColourTo(i - 1, state); - bool inEscape = false; - while (++i < lengthDoc) { - ch = styler.SafeGetCharAt(i); - if (ch == '\\') { - inEscape = true; - } else if (isEOLChar(ch)) { - // Comment inside a regex - styler.ColourTo(i - 1, SCE_RB_COMMENTLINE); - break; - } else if (inEscape) { - inEscape = false; // don't look at char - } else if (ch == Quote.Down) { - // Have the regular handler deal with this - // to get trailing modifiers. - i--; - ch = styler[i]; - break; + if (chNext == '{' + && inner_string_count < INNER_STRINGS_MAX_COUNT) { + // process #{ ... } + styler.ColourTo(i - 1, state); + styler.ColourTo(i + 1, SCE_RB_OPERATOR); + enterInnerExpression(inner_string_types, + inner_expn_brace_counts, + inner_quotes, + inner_string_count, + state, + brace_counts, + Quote); + preferRE = true; + // Skip one + advance_char(i, ch, chNext, chNext2); + } else { + //todo: distinguish comments from pound chars + // for now, handle as comment + styler.ColourTo(i - 1, state); + bool inEscape = false; + while (++i < lengthDoc) { + ch = styler.SafeGetCharAt(i); + if (ch == '\\') { + inEscape = true; + } else if (isEOLChar(ch)) { + // Comment inside a regex + styler.ColourTo(i - 1, SCE_RB_COMMENTLINE); + break; + } else if (inEscape) { + inEscape = false; // don't look at char + } else if (ch == Quote.Down) { + // Have the regular handler deal with this + // to get trailing modifiers. + i--; + ch = styler[i]; + break; + } } + chNext = styler.SafeGetCharAt(i + 1); + chNext2 = styler.SafeGetCharAt(i + 2); } - chNext = styler.SafeGetCharAt(i + 1); - chNext2 = styler.SafeGetCharAt(i + 2); } // Quotes of all kinds... } else if (state == SCE_RB_STRING_Q || state == SCE_RB_STRING_QQ || @@ -1199,6 +1354,23 @@ } } else if (ch == Quote.Up) { Quote.Count++; + } else if (ch == '#' && chNext == '{' + && inner_string_count < INNER_STRINGS_MAX_COUNT + && state != SCE_RB_CHARACTER + && state != SCE_RB_STRING_Q) { + // process #{ ... } + styler.ColourTo(i - 1, state); + styler.ColourTo(i + 1, SCE_RB_OPERATOR); + enterInnerExpression(inner_string_types, + inner_expn_brace_counts, + inner_quotes, + inner_string_count, + state, + brace_counts, + Quote); + preferRE = true; + // Skip one + advance_char(i, ch, chNext, chNext2); } } Added: trunk/scintilla/Partitioning.h =================================================================== --- trunk/scintilla/Partitioning.h (rev 0) +++ trunk/scintilla/Partitioning.h 2007-01-20 23:54:28 UTC (rev 1213) @@ -0,0 +1,184 @@ +// Scintilla source code edit control +/** @file Partitioning.h + ** Data structure used to partition an interval. Used for holding line start/end positions. + **/ +// Copyright 1998-2007 by Neil Hodgson <neilh(a)scintilla.org> +// The License.txt file describes the conditions under which this software may be distributed. + +#ifndef PARTITIONING_H +#define PARTITIONING_H + +/// A split vector of integers with a method for adding a value to all elements +/// in a range. +/// Used by the Partitioning class. + +class SplitVectorWithRangeAdd : public SplitVector<int> { +public: + SplitVectorWithRangeAdd(int growSize_) { + SetGrowSize(growSize_); + ReAllocate(growSize_); + } + ~SplitVectorWithRangeAdd() { + } + void RangeAddDelta(int start, int end, int delta) { + // end is 1 past end, so end-start is number of elements to change + int i = 0; + int rangeLength = end - start; + int range1Length = rangeLength; + int part1Left = part1Length - start; + if (range1Length > part1Left) + range1Length = part1Left; + while (i < range1Length) { + body[start++] += delta; + i++; + } + start += gapLength; + while (i < rangeLength) { + body[start++] += delta; + i++; + } + } +}; + +/// Divide an interval into multiple partitions. +/// Useful for breaking a document down into sections such as lines. + +class Partitioning { +private: + // To avoid calculating all the partition positions whenever any text is inserted + // there may be a step somewhere in the list. + int stepPartition; + int stepLength; + SplitVectorWithRangeAdd *body; + + // Move step forward + void ApplyStep(int partitionUpTo) { + if (stepLength != 0) { + body->RangeAddDelta(stepPartition+1, partitionUpTo + 1, stepLength); + } + stepPartition = partitionUpTo; + if (stepPartition >= body->Length()-1) { + stepPartition = body->Length()-1; + stepLength = 0; + } + } + + // Move step backward + void BackStep(int partitionDownTo) { + if (stepLength != 0) { + body->RangeAddDelta(partitionDownTo+1, stepPartition+1, -stepLength); + } + stepPartition = partitionDownTo; + } + + void Allocate(int growSize) { + body = new SplitVectorWithRangeAdd(growSize); + stepPartition = 0; + stepLength = 0; + body->Insert(0, 0); // This value stays 0 for ever + body->Insert(1, 0); // This is the end of the first partition and will be the start of the second + } + +public: + Partitioning(int growSize) { + Allocate(growSize); + } + + ~Partitioning() { + delete body; + body = NULL; + } + + int Partitions() { + return body->Length()-1; + } + + void InsertPartition(int partition, int pos) { + if (stepPartition < partition) { + ApplyStep(partition); + } + body->Insert(partition, pos); + stepPartition++; + } + + void SetPartitionStartPosition(int partition, int pos) { + ApplyStep(partition+1); + if ((partition < 0) || (partition > body->Length())) { + return; + } + body->SetValueAt(partition, pos); + } + + void InsertText(int partitionInsert, int delta) { + // Point all the partitions after the insertion point further along in the buffer + if (stepLength != 0) { + if (partitionInsert >= stepPartition) { + // Fill in up to the new insertion point + ApplyStep(partitionInsert); + stepLength += delta; + } else if (partitionInsert >= (stepPartition - body->Length() / 10)) { + // Close to step but before so move step back + BackStep(partitionInsert); + stepLength += delta; + } else { + ApplyStep(body->Length()-1); + stepPartition = partitionInsert; + stepLength = delta; + } + } else { + stepPartition = partitionInsert; + stepLength = delta; + } + } + + void RemovePartition(int partition) { + if (partition > stepPartition) { + ApplyStep(partition); + stepPartition--; + } else { + stepPartition--; + } + body->Delete(partition); + } + + int PositionFromPartition(int partition) { + PLATFORM_ASSERT(partition >= 0); + PLATFORM_ASSERT(partition < body->Length()); + if ((partition < 0) || (partition >= body->Length())) { + return 0; + } + int pos = body->ValueAt(partition); + if (partition > stepPartition) + pos += stepLength; + return pos; + } + + int PartitionFromPosition(int pos) { + if (body->Length() <= 1) + return 0; + if (pos >= (PositionFromPartition(body->Length()-1))) + return body->Length() - 1 - 1; + int lower = 0; + int upper = body->Length()-1; + do { + int middle = (upper + lower + 1) / 2; // Round high + int posMiddle = body->ValueAt(middle); + if (middle > stepPartition) + posMiddle += stepLength; + if (pos < posMiddle) { + upper = middle - 1; + } else { + lower = middle; + } + } while (lower < upper); + return lower; + } + + void DeleteAll() { + int growSize = body->GetGrowSize(); + delete body; + Allocate(growSize); + } +}; + +#endif Modified: trunk/scintilla/PlatGTK.cxx =================================================================== --- trunk/scintilla/PlatGTK.cxx 2007-01-20 15:16:26 UTC (rev 1212) +++ trunk/scintilla/PlatGTK.cxx 2007-01-20 23:54:28 UTC (rev 1213) @@ -745,7 +745,7 @@ case SC_CHARSET_ANSI: return ""; case SC_CHARSET_DEFAULT: - return "LATIN1"; + return "ISO-8859-1"; case SC_CHARSET_BALTIC: return "ISO-8859-13"; case SC_CHARSET_CHINESEBIG5: @@ -2283,7 +2283,7 @@ return; } - bool valid = gtk_tree_model_iter_nth_child(model, &iter, NULL, n); + bool valid = gtk_tree_model_iter_nth_child(model, &iter, NULL, n) != FALSE; if (valid) { gtk_tree_selection_select_iter(selection, &iter); @@ -2356,7 +2356,7 @@ GtkTreeIter iter; GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(list)); - bool valid = gtk_tree_model_get_iter_first(model, &iter); + bool valid = gtk_tree_model_get_iter_first(model, &iter) != FALSE; int i = 0; while(valid) { gchar *s; @@ -2364,7 +2364,7 @@ if (s && (0 == strncmp(prefix, s, strlen(prefix)))) { return i; } - valid = gtk_tree_model_iter_next(model, &iter); + valid = gtk_tree_model_iter_next(model, &iter) != FALSE; i++; } #endif @@ -2388,7 +2388,7 @@ #else GtkTreeIter iter; GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(list)); - bool valid = gtk_tree_model_iter_nth_child(model, &iter, NULL, n); + bool valid = gtk_tree_model_iter_nth_child(model, &iter, NULL, n) != FALSE; if (valid) { gtk_tree_model_get(model, &iter, TEXT_COLUMN, &text, -1); } Modified: trunk/scintilla/ScintillaBase.cxx =================================================================== --- trunk/scintilla/ScintillaBase.cxx 2007-01-20 15:16:26 UTC (rev 1212) +++ trunk/scintilla/ScintillaBase.cxx 2007-01-20 23:54:28 UTC (rev 1213) @@ -22,6 +22,8 @@ #endif #include "ContractionState.h" #include "SVector.h" +#include "SplitVector.h" +#include "Partitioning.h" #include "CellBuffer.h" #include "CallTip.h" #include "KeyMap.h" @@ -356,7 +358,7 @@ SetEmptySelection(ac.posStart); if (item != -1) { SString piece = selected; - pdoc->InsertString(firstPos, piece.c_str()); + pdoc->InsertCString(firstPos, piece.c_str()); SetEmptySelection(firstPos + static_cast<int>(piece.length())); } pdoc->EndUndoAction(); Modified: trunk/scintilla/ScintillaGTK.cxx =================================================================== --- trunk/scintilla/ScintillaGTK.cxx 2007-01-20 15:16:26 UTC (rev 1212) +++ trunk/scintilla/ScintillaGTK.cxx 2007-01-20 23:54:28 UTC (rev 1213) @@ -28,6 +28,8 @@ #endif #include "ContractionState.h" #include "SVector.h" +#include "SplitVector.h" +#include "Partitioning.h" #include "CellBuffer.h" #include "CallTip.h" #include "KeyMap.h" @@ -1807,7 +1809,15 @@ // Compute amount and direction to scroll (even tho on win32 there is // intensity of scrolling info in the native message, gtk doesn't // support this so we simulate similarly adaptive scrolling) + // Note that this is disabled on OS X (Darwin) where the X11 server already has + // and adaptive scrolling algorithm that fights with this one int cLineScroll; +#if defined(__MWERKS__) || defined(__APPLE_CPP__) || defined(__APPLE_CC__) + cLineScroll = sciThis->linesPerScroll; + if (cLineScroll == 0) + cLineScroll = 4; + sciThis->wheelMouseIntensity = cLineScroll; +#else int timeDelta = 1000000; GTimeVal curTime; g_get_current_time(&curTime); @@ -1825,6 +1835,7 @@ cLineScroll = 4; sciThis->wheelMouseIntensity = cLineScroll; } +#endif if (event->direction == GDK_SCROLL_UP || event->direction == GDK_SCROLL_LEFT) { cLineScroll *= -1; } @@ -1841,7 +1852,7 @@ return FALSE; } - // Horizontal scrolling + // Horizontal scrolling if (event->direction == GDK_SCROLL_LEFT || event->direction == GDK_SCROLL_RIGHT) { sciThis->HorizontalScrollTo(sciThis->xOffset + cLineScroll); @@ -1945,6 +1956,12 @@ return SCK_SUBTRACT; case GDK_KP_Divide: return SCK_DIVIDE; + case GDK_Super_L: + return SCK_WIN; + case GDK_Super_R: + return SCK_RWIN; + case GDK_Menu: + return SCK_MENU; default: return keyIn; } @@ -1974,10 +1991,8 @@ // This will have to change for Unicode else if (key >= 0xFE00) key = KeyTranslate(key); - else if (IsUnicodeMode()) - ; // No operation #if GTK_MAJOR_VERSION < 2 - else if ((key >= 0x100) && (key < 0x1000)) + else if (!IsUnicodeMode() && (key >= 0x100) && (key < 0x1000)) key &= 0xff; #endif @@ -1988,7 +2003,7 @@ //fprintf(stderr, "SK-key: %d %x %x\n",event->keyval, event->state, consumed); if (event->keyval == 0xffffff && event->length > 0) { ClearSelection(); - if (pdoc->InsertString(CurrentPosition(), event->string)) { + if (pdoc->InsertCString(CurrentPosition(), event->string)) { MovePositionTo(CurrentPosition() + event->length); } } @@ -2325,14 +2340,17 @@ } gboolean ScintillaGTK::DragMotion(GtkWidget *widget, GdkDragContext *context, - gint x, gint y, guint dragtime) { + gint x, gint y, guint dragtime) { ScintillaGTK *sciThis = ScintillaFromWidget(widget); - //Platform::DebugPrintf("DragMotion %d %d %x %x %x\n", x, y, - // context->actions, context->suggested_action, sciThis); Point npt(x, y); sciThis->inDragDrop = true; sciThis->SetDragPosition(sciThis->PositionFromLocation(npt)); - gdk_drag_status(context, context->suggested_action, dragtime); + GdkDragAction preferredAction = context->suggested_action; + if (context->actions == static_cast<GdkDragAction> + (GDK_ACTION_COPY | GDK_ACTION_MOVE)) { + preferredAction = GDK_ACTION_MOVE; + } + gdk_drag_status(context, preferredAction, dragtime); return FALSE; } Added: trunk/scintilla/SplitVector.h =================================================================== --- trunk/scintilla/SplitVector.h (rev 0) +++ trunk/scintilla/SplitVector.h 2007-01-20 23:54:28 UTC (rev 1213) @@ -0,0 +1,229 @@ +// Scintilla source code edit control +/** @file SplitVector.h + ** Main data structure for holding arrays that handle insertions + ** and deletions efficiently. + **/ +// Copyright 1998-2007 by Neil Hodgson <neilh(a)scintilla.org> +// The License.txt file describes the conditions under which this software may be distributed. + +#ifndef SPLITVECTOR_H +#define SPLITVECTOR_H + +template <typename T> +class SplitVector { +protected: + T *body; + int size; + int lengthBody; + int part1Length; + int gapLength; /// invariant: gapLength == size - lengthBody + int growSize; + + /// Move the gap to a particular position so that insertion and + /// deletion at that point will not require much copying and + /// hence be fast. + void GapTo(int position) { + if (position != part1Length) { + if (position < part1Length) { + memmove( + body + position + gapLength, + body + position, + sizeof(T) * (part1Length - position)); + } else { // position > part1Length + memmove( + body + part1Length, + body + part1Length + gapLength, + sizeof(T) * (position - part1Length)); + } + part1Length = position; + } + } + + /// Check that there is room in the buffer for an insertion, + /// reallocating if more space needed. + void RoomFor(int insertionLength) { + if (gapLength <= insertionLength) { + if (growSize * 6 < size) + growSize *= 2; + ReAllocate(size + insertionLength + growSize); + } + } + +public: + /// Construct a split buffer. + SplitVector() { + body = NULL; + growSize = 8; + size = 0; + lengthBody = 0; + part1Length = 0; + gapLength = 0; + } + + ~SplitVector() { + delete []body; + body = NULL; + } + + void Create(int initialLength_, int growSize_); + + int GetGrowSize() const { + return growSize; + } + + void SetGrowSize(int growSize_) { + growSize = growSize_; + } + + /// Reallocate the storage for the buffer to be newSize and + /// copy exisiting contents to the new buffer. + /// Must not be used to decrease the size of the buffer. + void ReAllocate(int newSize) { + if (newSize > size) { + // Move the gap to the end + GapTo(lengthBody); + T *newBody = new T[newSize]; + if ((size != 0) && (body != NULL)) { + memmove(newBody, body, sizeof(T) * lengthBody); + delete []body; + } + body = newBody; + gapLength += newSize - size; + size = newSize; + } + } + + /// Retrieve the character at a particular position. + /// Retrieving positions outside the range of the buffer returns 0. + /// The assertions here are disabled since calling code can be + /// simpler if out of range access works and returns 0. + T ValueAt(int position) const { + if (position < part1Length) { + //PLATFORM_ASSERT(position >= 0); + if (position < 0) { + return 0; + } else { + return body[position]; + } + } else { + //PLATFORM_ASSERT(position < lengthBody); + if (position >= lengthBody) { + return 0; + } else { + return body[gapLength + position]; + } + } + } + + void SetValueAt(int position, T v) { + if (position < part1Length) { + PLATFORM_ASSERT(position >= 0); + if (position < 0) { + ; + } else { + body[position] = v; + } + } else { + PLATFORM_ASSERT(position < lengthBody); + if (position >= lengthBody) { + ; + } else { + body[gapLength + position] = v; + } + } + } + + T& operator[](int position) const { + PLATFORM_ASSERT(position >= 0 && position < lengthBody); + if (position < part1Length) { + return body[position]; + } else { + return body[gapLength + position]; + } + } + + /// Retrieve the length of the buffer. + int Length() const { + return lengthBody; + } + + /// Insert a single value into the buffer. + /// Inserting at positions outside the current range fails. + void Insert(int position, T v) { + PLATFORM_ASSERT((position >= 0) && (position <= lengthBody)); + if ((position < 0) || (position > lengthBody)) { + return; + } + RoomFor(1); + GapTo(position); + body[part1Length] = v; + lengthBody++; + part1Length++; + gapLength--; + } + + /// Insert a number of elements into the buffer setting their value. + /// Inserting at positions outside the current range fails. + void InsertValue(int position, int insertLength, T v) { + PLATFORM_ASSERT((position >= 0) && (position <= lengthBody)); + if (insertLength > 0) { + if ((position < 0) || (position > lengthBody)) { + return; + } + RoomFor(insertLength); + GapTo(position); + for (int i = 0; i < insertLength; i++) + body[part1Length + i] = v; + lengthBody += insertLength; + part1Length += insertLength; + gapLength -= insertLength; + } + } + + /// Insert text into the buffer from an array. + void InsertFromArray(int positionToInsert, const T s[], int positionFrom, int insertLength) { + PLATFORM_ASSERT((positionToInsert >= 0) && (positionToInsert <= lengthBody)); + if (insertLength > 0) { + if ((positionToInsert < 0) || (positionToInsert > lengthBody)) { + return; + } + RoomFor(insertLength); + GapTo(positionToInsert); + memmove(body + part1Length, s + positionFrom, sizeof(T) * insertLength); + lengthBody += insertLength; + part1Length += insertLength; + gapLength -= insertLength; + } + } + + /// Delete one element from the buffer. + void Delete(int position) { + PLATFORM_ASSERT((position >= 0) && (position < lengthBody)); + if ((position < 0) || (position >= lengthBody)) { + return; + } + DeleteRange(position, 1); + } + + /// Delete a range from the buffer. + /// Deleting positions outside the current range fails. + void DeleteRange(int position, int deleteLength) { + PLATFORM_ASSERT((position >= 0) && (position + deleteLength <= lengthBody)); + if ((position < 0) || ((position + deleteLength) > lengthBody)) { + return; + } + if (deleteLength > 0) { + GapTo(position); + lengthBody -= deleteLength; + gapLength += deleteLength; + } + } + + /// Delete all the buffer contents. + void DeleteAll() { + DeleteRange(0, lengthBody); + } + +}; + +#endif Modified: trunk/scintilla/ViewStyle.cxx =================================================================== --- trunk/scintilla/ViewStyle.cxx 2007-01-20 15:16:26 UTC (rev 1212) +++ trunk/scintilla/ViewStyle.cxx 2007-01-20 23:54:28 UTC (rev 1213) @@ -74,6 +74,7 @@ selbackground.desired = source.selbackground.desired; selbackground2.desired = source.selbackground2.desired; selAlpha = source.selAlpha; + selEOLFilled = source.selEOLFilled; foldmarginColourSet = source.foldmarginColourSet; foldmarginColour.desired = source.foldmarginColour.desired; @@ -143,6 +144,7 @@ selbackground.desired = ColourDesired(0xc0, 0xc0, 0xc0); selbackground2.desired = ColourDesired(0xb0, 0xb0, 0xb0); selAlpha = SC_ALPHA_NOALPHA; + selEOLFilled = false; foldmarginColourSet = false; foldmarginColour.desired = ColourDesired(0xff, 0, 0); Modified: trunk/scintilla/ViewStyle.h =================================================================== --- trunk/scintilla/ViewStyle.h 2007-01-20 15:16:26 UTC (rev 1212) +++ trunk/scintilla/ViewStyle.h 2007-01-20 23:54:28 UTC (rev 1213) @@ -54,6 +54,7 @@ ColourPair selbackground; ColourPair selbackground2; int selAlpha; + bool selEOLFilled; bool whitespaceForegroundSet; ColourPair whitespaceForeground; bool whitespaceBackgroundSet; Modified: trunk/scintilla/include/Scintilla.h =================================================================== --- trunk/scintilla/include/Scintilla.h 2007-01-20 15:16:26 UTC (rev 1212) +++ trunk/scintilla/include/Scintilla.h 2007-01-20 23:54:28 UTC (rev 1213) @@ -201,6 +201,8 @@ #define SCI_SETSELBACK 2068 #define SCI_GETSELALPHA 2477 #define SCI_SETSELALPHA 2478 +#define SCI_GETSELEOLFILLED 2479 +#define SCI_SETSELEOLFILLED 2480 #define SCI_SETCARETFORE 2069 #define SCI_ASSIGNCMDKEY 2070 #define SCI_CLEARCMDKEY 2071 @@ -647,7 +649,7 @@ #define SC_MOD_BEFOREINSERT 0x400 #define SC_MOD_BEFOREDELETE 0x800 #define SC_MULTILINEUNDOREDO 0x1000 -#define SC_START_ACTION 0x2000 +#define SC_STARTACTION 0x2000 #define SC_MODEVENTMASKALL 0x2FFF #define SCEN_CHANGE 768 #define SCEN_SETFOCUS 512 @@ -669,6 +671,9 @@ #define SCK_ADD 310 #define SCK_SUBTRACT 311 #define SCK_DIVIDE 312 +#define SCK_WIN 313 +#define SCK_RWIN 314 +#define SCK_MENU 315 #define SCMOD_NORM 0 #define SCMOD_SHIFT 1 #define SCMOD_CTRL 2 Modified: trunk/scintilla/include/Scintilla.iface =================================================================== --- trunk/scintilla/include/Scintilla.iface 2007-01-20 15:16:26 UTC (rev 1212) +++ trunk/scintilla/include/Scintilla.iface 2007-01-20 23:54:28 UTC (rev 1213) @@ -316,9 +316,14 @@ # Add a set of markers to a line. fun void MarkerAddSet=2466(int line, int set) +# Set the alpha used for a marker that is drawn in the text area, not the margin. +fun void MarkerSetAlpha=2476(int markerNumber, int alpha) + enu MarginType=SC_MARGIN_ val SC_MARGIN_SYMBOL=0 val SC_MARGIN_NUMBER=1 +val SC_MARGIN_BACK=2 +val SC_MARGIN_FORE=3 # Set a margin to be either numeric or symbolic. set void SetMarginTypeN=2240(int margin, int marginType) @@ -431,6 +436,18 @@ # Set the background colour of the selection and whether to use this setting. fun void SetSelBack=2068(bool useSetting, colour back) +# Get the alpha of the selection. +get int GetSelAlpha=2477(,) + +# Set the alpha of the selection. +set void SetSelAlpha=2478(int alpha,) + +# Is the selection end of line filled? +get bool GetSelEOLFilled=2479(,) + +# Set the selection to have its end of line filled or not. +set void SetSelEOLFilled=2480(bool filled,) + # Set the foreground colour of the caret. set void SetCaretFore=2069(colour fore,) @@ -1300,7 +1317,7 @@ # Move the caret inside current view if it's not there already. fun void MoveCaretInsideView=2401(,) -# How many characters are on a line, not including end of line characters? +# How many characters are on a line, including end of line characters? fun int LineLength=2350(int line,) # Highlight the characters at two positions. @@ -1717,7 +1734,8 @@ val SC_MOD_BEFOREINSERT=0x400 val SC_MOD_BEFOREDELETE=0x800 val SC_MULTILINEUNDOREDO=0x1000 -val SC_MODEVENTMASKALL=0x1FFF +val SC_STARTACTION=0x2000 +val SC_MODEVENTMASKALL=0x2FFF # For compatibility, these go through the COMMAND notification rather than NOTIFY # and should have had exactly the same values as the EN_* constants. @@ -1749,6 +1767,9 @@ val SCK_ADD=310 val SCK_SUBTRACT=311 val SCK_DIVIDE=312 +val SCK_WIN=313 +val SCK_RWIN=314 +val SCK_MENU=315 enu KeyMod=SCMOD_ val SCMOD_NORM=0 @@ -1835,6 +1856,8 @@ val SCLEX_FREEBASIC=75 val SCLEX_INNOSETUP=76 val SCLEX_OPAL=77 +val SCLEX_SPICE=78 +val SCLEX_D=79 # When a lexer specifies its language as SCLEX_AUTOMATIC it receives a # value assigned in sequence from SCLEX_AUTOMATIC+1. @@ -1881,6 +1904,26 @@ val SCE_C_COMMENTDOCKEYWORD=17 val SCE_C_COMMENTDOCKEYWORDERROR=18 val SCE_C_GLOBALCLASS=19 +# Lexical states for SCLEX_D +lex D=SCLEX_D SCE_D_ +val SCE_D_DEFAULT=0 +val SCE_D_COMMENT=1 +val SCE_D_COMMENTLINE=2 +val SCE_D_COMMENTDOC=3 +val SCE_D_COMMENTNESTED=4 +val SCE_D_NUMBER=5 +val SCE_D_WORD=6 +val SCE_D_WORD2=7 +val SCE_D_WORD3=8 +val SCE_D_TYPEDEF=9 +val SCE_D_STRING=10 +val SCE_D_STRINGEOL=11 +val SCE_D_CHARACTER=12 +val SCE_D_OPERATOR=13 +val SCE_D_IDENTIFIER=14 +val SCE_D_COMMENTLINEDOC=15 +val SCE_D_COMMENTDOCKEYWORD=16 +val SCE_D_COMMENTDOCKEYWORDERROR=17 # Lexical states for SCLEX_TCL lex TCL=SCLEX_TCL SCE_TCL_ val SCE_TCL_DEFAULT=0 @@ -1903,6 +1946,8 @@ val SCE_TCL_WORD6=17 val SCE_TCL_WORD7=18 val SCE_TCL_WORD8=19 +val SCE_TCL_COMMENT_BOX=20 +val SCE_TCL_BLOCK_COMMENT=21 # Lexical states for SCLEX_HTML, SCLEX_XML lex HTML=SCLEX_HTML SCE_H lex XML=SCLEX_XML SCE_H @@ -2678,6 +2723,7 @@ val SCE_AU3_SPECIAL=12 val SCE_AU3_EXPAND=13 val SCE_AU3_COMOBJ=14 +val SCE_AU3_UDF=15 # Lexical states for SCLEX_APDL lex APDL=SCLEX_APDL SCE_APDL_ val SCE_APDL_DEFAULT=0 @@ -2942,6 +2988,17 @@ val SCE_OPAL_PAR=7 val SCE_OPAL_BOOL_CONST=8 val SCE_OPAL_DEFAULT=32 +# Lexical states for SCLEX_SPICE +lex Spice=SCLEX_SPICE SCE_SPICE_ +val SCE_SPICE_DEFAULT=0 +val SCE_SPICE_IDENTIFIER=1 +val SCE_SPICE_KEYWORD=2 +val SCE_SPICE_KEYWORD2=3 +val SCE_SPICE_KEYWORD3=4 +val SCE_SPICE_NUMBER=5 +val SCE_SPICE_DELIMITER=6 +val SCE_SPICE_VALUE=7 +val SCE_SPICE_COMMENTLINE=8 # Events Modified: trunk/src/sci_cb.c =================================================================== --- trunk/src/sci_cb.c 2007-01-20 15:16:26 UTC (rev 1212) +++ trunk/src/sci_cb.c 2007-01-20 23:54:28 UTC (rev 1213) @@ -183,7 +183,7 @@ } case SCN_MODIFIED: { - if (nt->modificationType & SC_START_ACTION && ! app->ignore_callback) + if (nt->modificationType & SC_STARTACTION && ! app->ignore_callback) { // get notified about undo changes document_undo_add(idx, UNDO_SCINTILLA, NULL); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1212] trunk/tagmanager/python.c
by eht16＠users.sourceforge.net 20 Jan '07

20 Jan '07

Revision: 1212 http://svn.sourceforge.net/geany/?rev=1212&view=rev Author: eht16 Date: 2007-01-20 07:16:26 -0800 (Sat, 20 Jan 2007) Log Message: ----------- Just changed a comment. Modified Paths: -------------- trunk/tagmanager/python.c Modified: trunk/tagmanager/python.c =================================================================== --- trunk/tagmanager/python.c 2007-01-20 15:07:46 UTC (rev 1211) +++ trunk/tagmanager/python.c 2007-01-20 15:16:26 UTC (rev 1212) @@ -103,9 +103,9 @@ { cp++; // count indentation amount of current line + // the indentation has to be made with tabs only _or_ spaces only, if they are mixed + // the code below gets confused indent++; - /// TODO should be improved by separating between tabs and spaces but to do this we - /// have to know the tabulator width which is set in geany and not available here } else if (*cp == '#') 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: [1211] trunk/po
by kretek＠users.sourceforge.net 20 Jan '07

20 Jan '07

Revision: 1211 http://svn.sourceforge.net/geany/?rev=1211&view=rev Author: kretek Date: 2007-01-20 07:07:46 -0800 (Sat, 20 Jan 2007) Log Message: ----------- Update of German translation - RFC Modified Paths: -------------- trunk/po/ChangeLog trunk/po/de.po Modified: trunk/po/ChangeLog =================================================================== --- trunk/po/ChangeLog 2007-01-20 14:46:04 UTC (rev 1210) +++ trunk/po/ChangeLog 2007-01-20 15:07:46 UTC (rev 1211) @@ -1,3 +1,8 @@ +2007-01-20 Frank Lanitz <frank(a)frank.uvena.de> + + * de.po: Update of German translation + + 2007-01-06 Frank Lanitz <frank(a)frank.uvena.de> * de.po: Update of German translation Modified: trunk/po/de.po =================================================================== --- trunk/po/de.po 2007-01-20 14:46:04 UTC (rev 1210) +++ trunk/po/de.po 2007-01-20 15:07:46 UTC (rev 1211) @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: geany 0.10svn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-01-06 22:37+0100\n" -"PO-Revision-Date: 2007-01-06 22:43+0100\n" +"POT-Creation-Date: 2007-01-20 01:04+0100\n" +"PO-Revision-Date: 2007-01-20 16:06+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" @@ -19,2875 +19,2641 @@ "X-Poedit-Country: GERMANY\n" "X-Poedit-SourceCharset: utf-8\n" -#: src/main.c:87 -msgid "use an alternate configuration directory" -msgstr "Benutzt ein anderes Verzeichnis für die Konfigurationsdateien" +#: src/about.c:120 +msgid "About Geany" +msgstr "Über Geany" -#: src/main.c:88 -msgid "runs in debug mode (means being verbose)" -msgstr "Geany im Debug-Modus ausführen (Gesprächig!)" +#: src/about.c:169 +msgid "A fast and lightweight IDE" +msgstr "Eine kleine und schnelle Entwicklungsumgebung" -#: src/main.c:91 -msgid "don't open files in a running instance, force opening a new instance" +#: src/about.c:190 +#, c-format +msgid "(built on %s)" +msgstr "(kompiliert am %s)" + +#. gtk_container_add(GTK_CONTAINER(info_box), cop_label); +#: src/about.c:221 +msgid "Info" +msgstr "Info" + +#: src/about.c:233 +msgid "Developers" +msgstr "Entwickler" + +#: src/about.c:233 +msgid "Maintainer" +msgstr "Hauptentwickler" + +#: src/about.c:233 +msgid "developer" +msgstr "Entwickler" + +#: src/about.c:234 +msgid "translation maintainer" +msgstr "Übersetzungskoordinator" + +#: src/about.c:234 +msgid "Translators" +msgstr "Übersetzer" + +#: src/about.c:235 +msgid "language" +msgstr "Sprache" + +#: src/about.c:241 +msgid "Credits" +msgstr "Credits" + +#: src/about.c:254 +msgid "License" +msgstr "Lizenz" + +#: src/build.c:155 +#, 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:188 +#: src/build.c:566 +#, 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:202 +#: src/build.c:603 +#, 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:230 +#: src/build.c:446 +#: src/build.c:648 +#: src/search.c:1069 +#, c-format +msgid "Process failed (%s)" +msgstr "Prozess fehlgeschlagen (%s)" + +#: src/build.c:355 +#, c-format +msgid "Something very strange is occurred, could not stat %s (%s)." +msgstr "Ein Fehler ist aufgetreten, konnte Datei %s nicht prüfen (%s)." + +#: src/build.c:434 +#, c-format +msgid "%s (in directory: %s)" +msgstr "%s (im Verzeichnis: %s)" + +#: src/build.c:542 +#, 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:580 +#, c-format +msgid "Failed to change the working directory to %s" +msgstr "Konnte nicht in Arbeitsverzeichnis %s wechseln" + +#: src/build.c:776 +msgid "Compilation failed." +msgstr "Kompilierung fehlgeschlagen." + +#: src/build.c:790 +msgid "Compilation finished successfully." +msgstr "Kompilierung beendet - erfolgreich." + +#. compile the code +#: src/build.c:895 +msgid "_Compile" +msgstr "_Kompilieren" + +#: src/build.c:898 +msgid "Compiles the current file" +msgstr "Kompiliert die aktuelle Datei" + +#. build the code +#: src/build.c:907 +#: src/interface.c:858 +msgid "_Build" +msgstr "_Erstellen" + +#: src/build.c:911 +msgid "Builds the current file (generate an executable file)" +msgstr "Erstellt die aktuelle Datei (erzeugt eine ausführbare Datei)" + +#. build the code with make all +#: src/build.c:921 +#: src/build.c:1043 +msgid "_Make All" +msgstr "_Make all" + +#: src/build.c:924 +#: src/build.c:1046 +msgid "Builds the current file with the make tool and the default target" +msgstr "Erstellt die aktuelle Datei mit \"make\" und dem Default-Target" + +#. build the code with make custom +#: src/build.c:932 +#: src/build.c:1054 +msgid "Make Custom _Target" +msgstr "Make (eigenes _Target)" + +#: src/build.c:936 +#: src/build.c:1058 +msgid "Builds the current file with the make tool and the specified target" +msgstr "Erstellt die aktuelle Datei mit \"make\" und dem angegebenem Target" + +#. build the code with make object +#: src/build.c:943 +msgid "Make _Object" +msgstr "Make _Objekt-Datei" + +#: src/build.c:947 +msgid "Compiles the current file using the make tool" +msgstr "Kompiliert die aktuelle Datei mittels make " + +#. next error +#: src/build.c:959 +#: src/build.c:1070 +msgid "_Next Error" +msgstr "Nächster _Fehler" + +#: src/build.c:974 +#: src/interface.c:986 +msgid "Run or view the current file" +msgstr "Aktuelle Datei anzeigen oder ausführen" + +#. arguments +#: src/build.c:985 +msgid "_Set Includes and Arguments" +msgstr "_Programm-Parameter angeben" + +#: src/build.c:990 +msgid "Sets the includes and library paths for the compiler and the program arguments for execution" +msgstr "Include-Dateien und Bibliotheken-Pfade sowie Programmparameter festlegen" + +#. DVI +#: src/build.c:1013 +msgid "LaTeX -> DVI" +msgstr "LaTeX -> DVI" + +#: src/build.c:1016 +msgid "Compiles the current file into a DVI file" +msgstr "Kompiliert die aktuelle Datei als DVI-Datei." + +#. PDF +#: src/build.c:1026 +msgid "LaTeX -> PDF" +msgstr "LaTeX -> PDF" + +#: src/build.c:1029 +msgid "Compiles the current file into a PDF file" +msgstr "Kompiliert die aktuelle Datei als PDF-Datei." + +#. DVI view +#: src/build.c:1082 +msgid "View DVI File" +msgstr "DVI-Datei anzeigen" + +#: src/build.c:1087 +#: src/build.c:1100 +msgid "Compiles and view the current file" +msgstr "Kompiliert und zeigt die aktuelle Datei an." + +#. PDF view +#: src/build.c:1096 +msgid "View PDF File" +msgstr "PDF-Datei anzeigen" + +#. arguments +#: src/build.c:1115 +#: src/dialogs.c:642 +msgid "Set Arguments" +msgstr "Programm-Parameter angeben" + +#: src/build.c:1120 +msgid "Sets the program paths and arguments" +msgstr "Programm-Parameter angeben" + +#: src/build.c:1387 +msgid "Make Custom Target" +msgstr "Make (eigenes Target)" + +#: src/build.c:1388 +msgid "Enter custom options here, all entered text is passed to the make command." +msgstr "Alles was Sie hier angeben, wird direkt an \"make\" übergeben." + +#: src/build.c:1427 +msgid "Failed to execute the view program" +msgstr "Konnte das Anzeigeprogramm nicht ausführen." + +#: src/build.c:1446 +msgid "Failed to execute the terminal program" +msgstr "Konnte das Terminal-Programm nicht ausführen." + +#: src/build.c:1505 +#, c-format +msgid "Process could not be stopped (%s)." +msgstr "Der Prozess konnte nicht angehalten werden (%s)." + +#: src/build.c:1521 +msgid "No more build errors." +msgstr "Keine weiteren Fehlermeldungen." + +#: src/callbacks.c:175 +msgid "Do you really want to quit?" +msgstr "Möchten Sie wirklich beenden?" + +#: src/callbacks.c:491 +#: src/interface.c:326 +#: src/utils.c:347 +msgid "_Reload" +msgstr "_Neu laden" + +#: src/callbacks.c:492 +msgid "Any unsaved changes will be lost." +msgstr "Alle ungesicherten Änderungen gehen verloren." + +#: src/callbacks.c:493 +#, c-format +msgid "Are you sure you want to reload '%s'?" +msgstr "Wollen Sie %s wirklich neu laden?" + +#: src/callbacks.c:878 +#, 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:1251 +#, c-format +msgid "Forward declaration \"%s\" not found." msgstr "" -"Dateien nicht in einer bereits laufenden Instanz, sondern in einer neuen " -"Instanz öffnen." -#: src/main.c:93 -msgid "set initial line number for the first opened file" -msgstr "Setzt die Zeilennummer in der zuerst geöffneten Datei" +#: src/callbacks.c:1253 +#, c-format +msgid "Definition of \"%s\" not found." +msgstr "Definition von \"%s\" nicht gefunden." -#: src/main.c:94 -msgid "don't show message window at startup" -msgstr "Kein Meldungsfenster beim Starten anzeigen" +#: src/callbacks.c:1458 +#: src/callbacks.c:1482 +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/main.c:95 -msgid "don't load auto completion data (see documentation)" -msgstr "Autovervollständigungsdaten nicht laden" +#: src/callbacks.c:1593 +#: src/ui_utils.c:457 +msgid "dd.mm.yyyy" +msgstr "TT.MM.JJ" -#: src/main.c:96 -msgid "don't load the previous session's files" -msgstr "Dateien aus der letzten Sitzung nicht laden" +#: src/callbacks.c:1595 +#: src/ui_utils.c:458 +msgid "mm.dd.yyyy" +msgstr "MM.TT.JJ" -#: src/main.c:98 -msgid "don't load terminal support" -msgstr "Die virtual terminal emulation (VTE) nicht starten" +#: src/callbacks.c:1597 +#: src/ui_utils.c:459 +msgid "yyyy/mm/dd" +msgstr "JJJJ/MM/TT" -#: src/main.c:99 -msgid "filename of libvte.so" -msgstr "Name der libvte.so" +#: src/callbacks.c:1599 +#: src/ui_utils.c:468 +msgid "dd.mm.yyyy hh:mm:ss" +msgstr "TT.MM.JJJJ Stunden:Minuten:Sekunden" -#: src/main.c:101 -msgid "show version and exit" -msgstr "Versionsinformation anzeigen und Programm beenden" +#: src/callbacks.c:1601 +#: src/ui_utils.c:469 +msgid "mm.dd.yyyy hh:mm:ss" +msgstr "MM.TT.JJJJ Stunden:Minuten:Sekunden" -#: src/main.c:399 -msgid " - A fast and lightweight IDE" -msgstr " - Eine kleine und schnelle Entwicklungsumgebung" +#: src/callbacks.c:1603 +#: src/ui_utils.c:470 +msgid "yyyy/mm/dd hh:mm:ss" +msgstr "JJJJ/MM/TT Stunden:Minuten:Sekunden" -#: src/main.c:409 +#: src/callbacks.c:1605 +#: src/ui_utils.c:479 +msgid "Use Custom Date Format" +msgstr "Benutze selbst erstelltes Zeitformat" + +#: src/callbacks.c:1616 +msgid "Custom Date Format" +msgstr "Benutzerdefiniertes Datumsformat" + +#: src/callbacks.c:1617 +msgid "Enter here a custom date and time format. You can use any conversion specifiers which can be used with the ANSI C strftime function. See \"man strftime\" for more information." +msgstr "Hier kann ein benutzerdefiniertes Datumsformat eingegeben werden. Dabei können alle Platzhalter verwendet werden, die auch in ANSI C strftime zum Einsatz kommen." + +#: src/callbacks.c:1637 +msgid "Date format string could not be converted (possibly too long)." +msgstr "Das Datenformat konnte nicht umgewandelt werden. Eventuell ist es zu lang." + +#: src/callbacks.c:2025 +msgid "No more message items." +msgstr "Keine weiteren Nachrichten. " + +#. initialize the dialog +#: src/dialogs.c:75 +#: src/prefs.c:1030 +msgid "Open File" +msgstr "Datei öffnen" + +#: src/dialogs.c:78 +#: src/interface.c:635 +msgid "_View" +msgstr "_Ansicht" + +#: src/dialogs.c:80 +msgid "Opens the file in read-only mode. If you choose more than one file to open, all files will be opened read-only." +msgstr "Öffnet die Datei schreibgeschützt. Wenn Sie mehrere Dateien wählen, werden alle schreibgeschützt geöffnet." + +#: src/dialogs.c:113 +msgid "Detect by file extension" +msgstr "Durch Dateiendung erkennen" + +#: src/dialogs.c:124 +msgid "Detect from file" +msgstr "Aus Datei lesen" + +#. line 1 with checkbox and encoding combo +#: src/dialogs.c:170 +msgid "Show _hidden files" +msgstr "_Versteckte Dateien anzeigen" + +#: src/dialogs.c:182 +msgid "Set encoding:" +msgstr "Zeichenkodierung festlegen:" + +#: src/dialogs.c:192 +msgid "" +"Explicitly defines an encoding for the file, if it would not be detected. This is useful when you know that the encoding of a file cannot be detected correctly by Geany.\n" +"Note if you choose multiple files, they will all be opened with the chosen encoding." +msgstr "" +"Definiert explizit eine bestimmte Zeichenkodierung, wenn sie nicht automatisch erkannt werden kann.\n" +"Beachten Sie, wenn Sie mehrere Dateien auswählen, werden alle mit der gewählten Zeichenkodierung geöffnet." + +#: src/dialogs.c:212 +msgid "Set filetype:" +msgstr "Dateityp festlegen:" + +#: src/dialogs.c:222 +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." +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." + +#: src/dialogs.c:261 +msgid "Save File" +msgstr "Datei speichern" + +#: src/dialogs.c:353 #, 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)" +msgid "The file '%s' is not saved." +msgstr "'%s' wurde nicht gespeichert." -#: src/main.c:449 +#: src/dialogs.c:363 +msgid "Do you want to save it before closing?" +msgstr "Möchten Sie vor dem Schließen speichern?" + +#: src/dialogs.c:366 +msgid "_Don't save" +msgstr "_Nicht speichern" + +#: src/dialogs.c:410 +msgid "Choose font" +msgstr "Schriftart auswählen" + +#: src/dialogs.c:448 +msgid "Word Count" +msgstr "Wörter zählen" + +#: src/dialogs.c:457 +msgid "selection" +msgstr "Auswahl" + +#: src/dialogs.c:463 +msgid "whole document" +msgstr "Vollständiges Dokument" + +#: src/dialogs.c:472 +msgid "Range:" +msgstr "Bereich:" + +#: src/dialogs.c:484 +msgid "Lines:" +msgstr "Zeilen:" + +#: src/dialogs.c:498 +msgid "Words:" +msgstr "Wörter: " + +#: src/dialogs.c:512 +msgid "Characters:" +msgstr "Buchstaben:" + +#: src/dialogs.c:544 +#: src/interface.c:3190 +#: src/vte.c:549 +#: src/vte.c:556 +msgid "Color Chooser" +msgstr "Farbwähler" + +#: src/dialogs.c:611 +#: src/keybindings.c:148 +msgid "Go to line" +msgstr "Gehe zu Zeile" + +#: src/dialogs.c:617 +msgid "Enter the line you want to go to:" +msgstr "Geben Sie die Zeile an, zu der Sie springen möchten:" + +#: src/dialogs.c:648 +msgid "Set programs and options for compiling and viewing (La)TeX files." +msgstr "" +"Setzt Programme und deren Optionen zum Kompilieren bzw. Betrachten von (La)TeX-Dateien.\n" +"Der jeweilige Dateiname wird bei einem Aufruf automatisch an das Ende angefügt." + +#: src/dialogs.c:659 +msgid "DVI creation:" +msgstr "DVI-Erstellung:" + +#: src/dialogs.c:678 +msgid "PDF creation:" +msgstr "PDF-Erstellung:" + +#: src/dialogs.c:697 +msgid "DVI preview:" +msgstr "DVI-Vorschau:" + +#: src/dialogs.c:716 +msgid "PDF preview:" +msgstr "PDF-Vorschau:" + +#: src/dialogs.c:732 +#: src/dialogs.c:847 #, c-format msgid "" -"Configuration directory could not be created (%s).\n" -"There could be some problems using Geany without a configuration directory.\n" -"Start Geany anyway?" +"%f will be replaced by the current filename, e.g. test_file.c\n" +"%e will be replaced by the filename without extension, e.g. test_file" msgstr "" -"Konfigurationsverzeichnis konnte nicht erstellt werden (%s).\n" -"Es könnte zu Problemen bei der Verwendung von Geany kommen.\n" -"Geany trotzdem starten?" +"%f wird durch den aktuellen Dateinamen ersetzt. Zum Beispiel: meine_Datei.c \n" +"%e wird durch den Dateinamen ohne Dateiendung ersetzt. Zum Beispiel meine_Datei " -#: src/main.c:575 +#: src/dialogs.c:759 +msgid "Set Includes and Arguments" +msgstr "Programm-Parameter angeben" + +#: src/dialogs.c:765 +msgid "Set the commands for building and running programs." +msgstr "Legt die Kommandos zum Erstellen und Ausführen von Programmen fest." + +#: src/dialogs.c:772 +msgid " commands" +msgstr "Kommandos" + +#: src/dialogs.c:787 +msgid "Compile:" +msgstr "Kompilieren:" + +#: src/dialogs.c:808 +msgid "Build:" +msgstr "Erstellen:" + +#: src/dialogs.c:829 +#: src/dialogs.c:1101 +msgid "Execute:" +msgstr "Ausführen:" + +#: src/dialogs.c:894 +msgid "An error occurred or file information could not be retrieved (e.g. from a new file)." +msgstr "Es ist ein Fehler aufgetreten oder Datei-Informationen konnten nicht gelesen werden(z.B. bei einer neuen, ungespeicherten Datei)." + +#: src/dialogs.c:913 +#: src/dialogs.c:914 +#: src/dialogs.c:915 +#: src/dialogs.c:921 +#: src/dialogs.c:922 +#: src/dialogs.c:923 +#: src/ui_utils.c:122 +#: src/ui_utils.c:125 +#: src/utils.c:515 +#: src/utils.c:567 +msgid "unknown" +msgstr "unbekannt" + +#: src/dialogs.c:927 +msgid "Properties" +msgstr "Eigenschaften" + +#: src/dialogs.c:955 +msgid "Type:" +msgstr "Dateityp:" + +#: src/dialogs.c:968 +msgid "Size:" +msgstr "Größe:" + +#: src/dialogs.c:983 +msgid "Location:" +msgstr "Ort:" + +#: src/dialogs.c:996 +msgid "Read-only:" +msgstr "Schreibgeschützt:" + +#: src/dialogs.c:1003 +msgid "(only inside Geany)" +msgstr "(nur innerhalb von Geany)" + +#: src/dialogs.c:1012 +msgid "Encoding:" +msgstr "Kodierung:" + +#: src/dialogs.c:1022 +#: src/ui_utils.c:124 +msgid "(with BOM)" +msgstr "(mit BOM)" + +#: src/dialogs.c:1022 +#: src/ui_utils.c:124 +msgid "(without BOM)" +msgstr "(ohne BOM)" + +#: src/dialogs.c:1032 +msgid "Modified:" +msgstr "Modifiziert:" + +#: src/dialogs.c:1045 +msgid "Changed:" +msgstr "Geändert:" + +#: src/dialogs.c:1058 +msgid "Accessed:" +msgstr "Zugriff:" + +#: src/dialogs.c:1079 +msgid "Permissions:" +msgstr "Berechtigungen:" + +#. Header +#: src/dialogs.c:1087 +msgid "Read:" +msgstr "Lesen:" + +#: src/dialogs.c:1094 +msgid "Write:" +msgstr "Schreiben:" + +#. Owner +#: src/dialogs.c:1109 +msgid "Owner:" +msgstr "Eigentümer:" + +#. Group +#: src/dialogs.c:1145 +msgid "Group:" +msgstr "Gruppe:" + +#. Other +#: src/dialogs.c:1181 +msgid "Other:" +msgstr "Andere:" + +#: src/dialogs.c:1302 +msgid "Keyboard shortcuts" +msgstr "Tastaturkürzel" + +#: src/dialogs.c:1311 +msgid "The following keyboard shortcuts are defined:" +msgstr "Folgende Tastenkürzel sind definiert: " + +#: src/document.c:350 #, c-format -msgid "This is Geany %s." -msgstr "Willkommen zu Geany %s." +msgid "File %s closed." +msgstr "Datei %s wurde geschlossen." -#: src/main.c:577 +#: src/document.c:434 +msgid "New file opened." +msgstr "Neue Datei geöffnet." + +#: src/document.c:584 +#: src/document.c:851 #, c-format -msgid "Configuration directory could not be created (%s)." -msgstr "Konfigurationsverzeichnis konnte nicht erstellt werden (%s)." +msgid "Could not open file %s (%s)" +msgstr "Konnte Datei '%s' nicht öffnen(%s)." -#: src/interface.c:246 src/interface.c:1413 +#: src/document.c:607 +#, c-format +msgid "" +"The file \"%s\" could not be opened properly and has been truncated. This can occur if the file contains a NULL byte. Be aware that saving it can cause data loss.\n" +"The file was set to read-only." +msgstr "" +"Die Datei »%s« konnte nicht ordnungsgemäß geladen werden und wurde evtl. abgeschnitten. Die kann zu Datenverlust beim Speichern führen!\n" +"Die Datei wird schreibgeschützt geöffnet." + +#: src/document.c:631 +#, c-format +msgid "The file \"%s\" is not valid %s." +msgstr "Die Datei \"%s\" ist kein gültiges %s." + +#: src/document.c:640 +#, c-format +msgid "The file \"%s\" does not look like a text file or the file encoding is not supported." +msgstr "Die Datei \"%s\" scheint keine Textdatei zu sein, oder das Format wird nicht unterstützt." + +#: src/document.c:681 +msgid "Invalid filename" +msgstr "Ungültiger Dateiname" + +#: src/document.c:777 +#, c-format +msgid "File %s reloaded." +msgstr "Datei %s neu geladen." + +#: src/document.c:779 +#, c-format +msgid "File %s opened(%d%s)." +msgstr "Datei %s geöffnet(%d%s)." + +#: src/document.c:781 +msgid ", read-only" +msgstr ", schreibgeschützt" + +#: src/document.c:879 +#: src/document.c:962 +msgid "Error saving file." +msgstr "Fehler beim Speichern der Datei." + +#: src/document.c:926 +#, c-format +msgid "" +"An error occurred while converting the file from UTF-8 in \"%s\". The file remains unsaved.\n" +"Error message: %s\n" +msgstr "" +"Beim Konvertieren der Datei von UTF-8 in \"%s\" ist ein Fehler aufgetreten. Die Datei bleibt ungespeichert.\n" +"Fehlermeldung: %s\n" + +#: src/document.c:950 +#, c-format +msgid "Error saving file (%s)." +msgstr "Fehler beim Speichern der Datei (%s)." + +#: src/document.c:993 +#, c-format +msgid "File %s saved." +msgstr "Datei %s wurde gespeichert." + +#: src/document.c:1041 +#: src/document.c:1093 +#: src/document.c:1101 +#, c-format +msgid "\"%s\" was not found." +msgstr "\"%s\" wurde nicht gefunden." + +#: src/document.c:1101 +msgid "Wrap search and find again?" +msgstr "Suche vom Dokumentanfang bzw. -ende neu beginnen?" + +#: src/document.c:1180 +#: src/search.c:1188 +msgid "No matches found." +msgstr "Keine Treffer gefunden." + +#: src/document.c:1190 +#: src/document.c:1197 +#, c-format +msgid "%s: replaced %d occurrences of \"%s\" with \"%s\"." +msgstr "%s: Es wurde %d Mal \"%s\" gegen \"%s\" ersetzt." + +#: src/document.c:1451 +msgid "Win (CRLF)" +msgstr "Win (CRLF)" + +#: src/document.c:1452 +msgid "Mac (CR)" +msgstr "Mac (CR)" + +#: src/document.c:1454 +msgid "Unix (LF)" +msgstr "Unix (LF)" + +#: src/document.c:1550 +#, c-format +msgid "" +"The file \"%s\" will be printed with the following command:\n" +"\n" +"%s" +msgstr "" +"Die Datei \"%s\" wird mit folgendem Befehl gedruckt:\n" +"\n" +"%s" + +#: src/document.c:1559 +#, c-format +msgid "Printing of \"%s\" failed (return code: %d)." +msgstr "Drucken der Datei \"%s\" ist fehlgeschlagen (Rückgabewert: %d)." + +#: src/document.c:1564 +#, c-format +msgid "File %s printed." +msgstr "Datei %s wurde gedruckt." + +#: src/encodings.c:52 +msgid "Celtic" +msgstr "Keltisch" + +#: src/encodings.c:53 +#: src/encodings.c:54 +msgid "Greek" +msgstr "Griechisch" + +#: src/encodings.c:55 +msgid "Nordic" +msgstr "Nordisch" + +#: src/encodings.c:56 +msgid "South European" +msgstr "Südeuropäisch" + +#: src/encodings.c:57 +#: src/encodings.c:58 +#: src/encodings.c:59 +#: src/encodings.c:60 +msgid "Western" +msgstr "Westlich" + +#: src/encodings.c:62 +#: src/encodings.c:63 +#: src/encodings.c:64 +msgid "Baltic" +msgstr "Baltisch" + +#: src/encodings.c:65 +#: src/encodings.c:66 +#: src/encodings.c:67 +msgid "Central European" +msgstr "Mitteleuropäisch" + +#: src/encodings.c:68 +#: src/encodings.c:69 +#: src/encodings.c:70 +#: src/encodings.c:71 +#: src/encodings.c:72 +msgid "Cyrillic" +msgstr "Kyrillisch" + +#: src/encodings.c:73 +msgid "Cyrillic/Russian" +msgstr "Kyrillisch/Russisch" + +#: src/encodings.c:74 +msgid "Cyrillic/Ukrainian" +msgstr "Kyrillisch/Ukrainisch" + +#: src/encodings.c:75 +msgid "Romanian" +msgstr "Rumänisch" + +#: src/encodings.c:77 +#: src/encodings.c:78 +#: src/encodings.c:79 +msgid "Arabic" +msgstr "Arabisch" + +#: src/encodings.c:80 +#: src/encodings.c:81 +#: src/encodings.c:82 +msgid "Hebrew" +msgstr "Hebräisch" + +#: src/encodings.c:83 +msgid "Hebrew Visual" +msgstr "Hebräisch visuell" + +#: src/encodings.c:85 +msgid "Armenian" +msgstr "Armenisch" + +#: src/encodings.c:86 +msgid "Georgian" +msgstr "Georgian" + +#: src/encodings.c:87 +msgid "Thai" +msgstr "Thai" + +#: src/encodings.c:88 +#: src/encodings.c:89 +#: src/encodings.c:90 +msgid "Turkish" +msgstr "Türkisch" + +#: src/encodings.c:91 +#: src/encodings.c:92 +#: src/encodings.c:93 +msgid "Vietnamese" +msgstr "Vietnamesisch" + +#: src/encodings.c:95 +#: src/encodings.c:96 +#: src/encodings.c:97 +#: src/encodings.c:98 +#: src/encodings.c:99 +#: src/encodings.c:100 +#: src/encodings.c:101 +#: src/encodings.c:102 +msgid "Unicode" +msgstr "Unicode" + +#: src/encodings.c:104 +#: src/encodings.c:105 +#: src/encodings.c:106 +#: src/encodings.c:107 +msgid "Chinese Simplified" +msgstr "Chinesisch vereinfacht" + +#: src/encodings.c:108 +#: src/encodings.c:109 +#: src/encodings.c:110 +msgid "Chinese Traditional" +msgstr "Chinesisch traditionell" + +#: src/encodings.c:111 +#: src/encodings.c:112 +#: src/encodings.c:113 +msgid "Japanese" +msgstr "Japanisch" + +#: src/encodings.c:114 +#: src/encodings.c:115 +#: src/encodings.c:116 +#: src/encodings.c:117 +msgid "Korean" +msgstr "Koreanisch" + +#: src/encodings.c:119 +msgid "Without encoding" +msgstr "Ohne Zeichenkodierung" + +#: src/encodings.c:212 +msgid "_West European" +msgstr "_Westeuropäisch" + +#: src/encodings.c:218 +msgid "_East European" +msgstr "_Osteuropäisch" + +#: src/encodings.c:224 +msgid "East _Asian" +msgstr "Ost_asiatisch" + +#: src/encodings.c:230 +msgid "_SE & SW Asian" +msgstr "_SO- & SW-Asiatisch" + +#: src/encodings.c:236 +msgid "_Middle Eastern" +msgstr "_Nahöstlich" + +#: src/encodings.c:242 +msgid "_Unicode" +msgstr "_Unicode" + +#: src/filetypes.c:136 +msgid "C source file" +msgstr "C Quelldatei" + +#: src/filetypes.c:156 +msgid "C++ source file" +msgstr "C++ Quelldatei" + +#: src/filetypes.c:184 +msgid "D source file" +msgstr "D Quelldatei" + +#: src/filetypes.c:204 +msgid "Java source file" +msgstr "Java Quelldatei" + +#: src/filetypes.c:224 +msgid "Pascal source file" +msgstr "Pascal Quelldatei" + +#: src/filetypes.c:247 +msgid "Assembler source file" +msgstr "Assembler Quelldatei" + +#: src/filetypes.c:266 +msgid "Fortran source file (F77)" +msgstr "Fortran (F77) Quelldatei" + +#: src/filetypes.c:290 +msgid "(O)Caml source file" +msgstr "(O)Caml Quelldatei" + +#: src/filetypes.c:310 +msgid "Perl source file" +msgstr "Perl Quelldatei" + +#: src/filetypes.c:332 +msgid "PHP source file" +msgstr "PHP Quelldatei" + +#: src/filetypes.c:355 +msgid "Javascript source file" +msgstr "Javascript Quelldatei" + +#: src/filetypes.c:374 +msgid "Python source file" +msgstr "Python Quelldatei" + +#: src/filetypes.c:394 +msgid "Ruby source file" +msgstr "Ruby Quelldatei" + +#: src/filetypes.c:414 +msgid "Tcl source file" +msgstr "Tcl Quelldatei" + +#: src/filetypes.c:435 +msgid "Lua source file" +msgstr "Lua Quelldatei" + +#: src/filetypes.c:454 +msgid "Ferite source file" +msgstr "Ferite Qulldatei" + +#: src/filetypes.c:473 +msgid "Shell script file" +msgstr "Shellskript Datei" + +#: src/filetypes.c:498 +msgid "Makefile" +msgstr "Makefile" + +#: src/filetypes.c:519 +msgid "XML source file" +msgstr "XML Quelldatei" + +#: src/filetypes.c:539 +msgid "Docbook source file" +msgstr "Docbook Quelldatei" + +#: src/filetypes.c:558 +msgid "HTML source file" +msgstr "HTML Quelldatei" + +#: src/filetypes.c:579 +msgid "Cascading StyleSheet" +msgstr "Cascading StyleSheet" + +#: src/filetypes.c:598 +msgid "SQL Dump file" +msgstr "SQL-Dump Datei" + +#: src/filetypes.c:617 +msgid "LaTeX source file" +msgstr "LaTeX Quelldatei" + +#: src/filetypes.c:638 +msgid "O-Matrix source file" +msgstr "O-Matrix Quelldatei" + +#: src/filetypes.c:657 +msgid "VHDL source file" +msgstr "VHDL Quelldatei" + +#: src/filetypes.c:677 +msgid "Diff file" +msgstr "Diff Daten" + +#: src/filetypes.c:697 +msgid "Config file" +msgstr "Konfigurationsdatei" + +#: src/filetypes.c:720 +#: src/project.c:103 +msgid "All files" +msgstr "Alle Dateien" + +#: src/filetypes.c:729 +msgid "None" +msgstr "Keiner" + +#: src/geany.h:50 +msgid "untitled" +msgstr "unbenannt" + +#: src/interface.c:256 +#: src/interface.c:1478 msgid "Geany" msgstr "Geany" -#: src/interface.c:256 +#: src/interface.c:266 msgid "_File" msgstr "_Datei" -#: src/interface.c:267 +#: src/interface.c:277 msgid "New (with _Template)" msgstr "Neu (aus _Vorlage)" -#: src/interface.c:278 src/interface.c:335 src/interface.c:509 -#: src/interface.c:560 src/interface.c:735 src/interface.c:745 -#: src/interface.c:1923 src/interface.c:1974 +#: src/interface.c:288 +#: src/interface.c:345 +#: src/interface.c:519 +#: src/interface.c:570 +#: src/interface.c:745 +#: src/interface.c:755 +#: src/interface.c:1998 +#: src/interface.c:2049 msgid "invisible" msgstr "unsichtbar" -#: src/interface.c:290 +#: src/interface.c:300 msgid "Recent _Files" msgstr "Z_uletzt geöffnet" -#: src/interface.c:307 +#: src/interface.c:317 msgid "Save A_ll" msgstr "A_lle speichern" -#: src/interface.c:310 +#: src/interface.c:320 msgid "Saves all open files" msgstr "Speichert alle offenen Dateien" -#: src/interface.c:316 src/callbacks.c:491 src/utils.c:346 -msgid "_Reload" -msgstr "_Neu laden" - -#: src/interface.c:324 +#: src/interface.c:334 msgid "R_eload As" msgstr "N_eu laden als" -#: src/interface.c:355 +#: src/interface.c:365 msgid "Prints the current file" msgstr "Druckt die aktuelle Datei" -#: src/interface.c:366 +#: src/interface.c:376 msgid "C_lose All" msgstr "_Alle schließen" -#: src/interface.c:369 +#: src/interface.c:379 msgid "Closes all open files" msgstr "Schließt alle offenen Dateien" -#: src/interface.c:383 src/interface.c:1009 +#: src/interface.c:393 +#: src/interface.c:1059 msgid "Quit Geany" msgstr "Geany beenden" -#: src/interface.c:385 +#: src/interface.c:395 msgid "_Edit" msgstr "_Bearbeiten" -#: src/interface.c:426 src/interface.c:1824 +#: src/interface.c:436 +#: src/interface.c:1899 msgid "Select _All" msgstr "A_lles auswählen" -#: src/interface.c:435 src/interface.c:1850 +#: src/interface.c:445 +#: src/interface.c:1925 msgid "_Format" msgstr "_Format" -#: src/interface.c:438 +#: src/interface.c:448 msgid "Convert the case of the current selection" msgstr "Ändert die Großschreibung der aktuellen Auswahl" -#: src/interface.c:443 src/interface.c:1857 +#: src/interface.c:453 +#: src/interface.c:1932 msgid "Convert Selection to _Lower-case" msgstr "Auswahl in _Kleinbuchstaben umwandeln" -#: src/interface.c:447 src/interface.c:1861 +#: src/interface.c:457 +#: src/interface.c:1936 msgid "Convert Selection to _Upper-case" msgstr "Auswahl in _Großbuchstaben umwandeln" -#: src/interface.c:456 src/interface.c:1870 +#: src/interface.c:466 +#: src/interface.c:1945 msgid "_Comment Line(s)" msgstr "Zeile(n) _auskommentieren" -#: src/interface.c:460 src/interface.c:1874 +#: src/interface.c:470 +#: src/interface.c:1949 msgid "U_ncomment Line(s)" msgstr "Zeile(n) _einkommentieren" -#: src/interface.c:464 src/interface.c:1878 +#: src/interface.c:474 +#: src/interface.c:1953 msgid "_Toggle Line Commentation" msgstr "Kommentierung _umschalten" -#: src/interface.c:468 src/interface.c:1882 +#: src/interface.c:478 +#: src/interface.c:1957 msgid "Du_plicate Line or Selection" msgstr "Zeile oder Auswahl kopieren" -#: src/interface.c:477 src/interface.c:1891 +#: src/interface.c:487 +#: src/interface.c:1966 msgid "_Increase Indent" msgstr "Einzug _erhöhen" -#: src/interface.c:485 src/interface.c:1899 +#: src/interface.c:495 +#: src/interface.c:1974 msgid "_Decrease Indent" msgstr "Einzug _verringern" -#: src/interface.c:498 +#: src/interface.c:508 msgid "_Insert \"include <...>\"" msgstr "\"include <...>\" ei_nfügen" -#: src/interface.c:512 +#: src/interface.c:522 msgid "I_nsert Comments" msgstr "K_ommentare einfügen" -#: src/interface.c:523 src/interface.c:1937 +#: src/interface.c:533 +#: src/interface.c:2012 msgid "Insert ChangeLog Entry" msgstr "ChangeLog-Eintrag hinzufügen" -#: src/interface.c:526 src/interface.c:1940 +#: src/interface.c:536 +#: src/interface.c:2015 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:528 src/interface.c:1942 +#: src/interface.c:538 +#: src/interface.c:2017 msgid "Insert File Header" msgstr "Dateikopf einfügen" -#: src/interface.c:531 src/interface.c:1945 +#: src/interface.c:541 +#: src/interface.c:2020 msgid "Inserts a file header at the beginning of the file" msgstr "Fügt einen Dateikopf am Anfang einer neu erzeugten Datei ein." -#: src/interface.c:533 src/interface.c:1947 +#: src/interface.c:543 +#: src/interface.c:2022 msgid "Insert Function Description" msgstr "Funktionsbeschreibung einfügen" -#: src/interface.c:536 src/interface.c:1950 +#: src/interface.c:546 +#: src/interface.c:2025 msgid "Inserts a description before the current function" msgstr "Fügt eine Funktionsbeschreibung vor der Funktion ein." -#: src/interface.c:538 src/interface.c:1952 +#: src/interface.c:548 +#: src/interface.c:2027 msgid "Insert Multiline Comment" msgstr "Mehrzeiligen Kommentar einfügen" -#: src/interface.c:541 src/interface.c:1955 +#: src/interface.c:551 +#: src/interface.c:2030 msgid "Inserts a multiline comment" msgstr "Fügt einen mehrzeiligen Kommentar ein." -#: src/interface.c:543 src/interface.c:1957 +#: src/interface.c:553 +#: src/interface.c:2032 msgid "Insert GPL Notice" msgstr "GPL-Hinweis einfügen" -#: src/interface.c:546 src/interface.c:1960 +#: src/interface.c:556 +#: src/interface.c:2035 msgid "Inserts a GPL notice (should be done at the beginning of the file)" -msgstr "" -"Fügt einen kurzen Lizenz-Hinweis auf die GPL ein (sollte am Anfang einer " -"Datei sein)." +msgstr "Fügt einen kurzen Lizenz-Hinweis auf die GPL ein (sollte am Anfang einer Datei sein)." -#: src/interface.c:548 src/interface.c:1962 +#: src/interface.c:558 +#: src/interface.c:2037 msgid "Insert BSD license Notice" msgstr "BSD-Lizenz-Hinweis einfügen" -#: src/interface.c:551 src/interface.c:1965 -msgid "" -"Inserts a BSD llicence notice (should be done at the beginning of the file)" -msgstr "" -"Fügt einen kurzen Lizenz-Hinweis auf die Bsd-Lizenz ein (sollte am Anfang " -"einer Datei sein)." +#: src/interface.c:561 +#: src/interface.c:2040 +msgid "Inserts a BSD licence notice (should be done at the beginning of the file)" +msgstr "Fügt einen kurzen Lizenz-Hinweis auf die BSD-Lizenz ein (sollte am Anfang einer Datei sein)." -#: src/interface.c:553 src/interface.c:1967 +#: src/interface.c:563 +#: src/interface.c:2042 msgid "Insert Dat_e" msgstr "_Datum einfügen" -#: src/interface.c:572 +#: src/interface.c:582 msgid "_Search" msgstr "_Suchen" -#: src/interface.c:583 +#: src/interface.c:593 msgid "Find _Next" msgstr "_Nächstes" -#: src/interface.c:587 +#: src/interface.c:597 msgid "Find _Previous" msgstr "_Vorheriges" -#: src/interface.c:591 +#: src/interface.c:601 msgid "Find in F_iles" msgstr "In _Dateien suchen" -#: src/interface.c:595 src/search.c:385 +#: src/interface.c:605 +#: src/search.c:385 msgid "_Replace" msgstr "_Ersetzen" -#: src/interface.c:608 +#: src/interface.c:618 msgid "Next _Message" msgstr "_Nächste Nachricht" -#: src/interface.c:617 +#: src/interface.c:627 msgid "_Go to Line" msgstr "_Gehe zu Zeile" -#: src/interface.c:625 src/dialogs.c:77 -msgid "_View" -msgstr "_Ansicht" - -#: src/interface.c:632 +#: src/interface.c:642 msgid "Change _Font" msgstr "_Schriftart ändern" -#: src/interface.c:635 +#: src/interface.c:645 msgid "Change the default font" msgstr "Ändert die Standardschriftart für das Editor-Fenster" -#: src/interface.c:646 +#: src/interface.c:656 msgid "Full_screen" msgstr "_Vollbild" -#: src/interface.c:650 +#: src/interface.c:660 msgid "Show Message _Window" -msgstr "Schriftart des Meldungsfenster" +msgstr "_Schriftart des Meldungsfenster" -#: src/interface.c:653 +#: src/interface.c:663 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:656 +#: src/interface.c:666 msgid "Show _Toolbar" msgstr "_Werkzeugleiste anzeigen" -#: src/interface.c:659 +#: src/interface.c:669 msgid "Toggle the toolbar on and off" msgstr "Schaltet die Anzeige der Werkzeugleiste an und aus." -#: src/interface.c:662 +#: src/interface.c:672 msgid "Show Side_bar" msgstr "Seiten_leiste anzeigen" -#: src/interface.c:667 +#: src/interface.c:677 msgid "Show _Markers Margin" msgstr "M_arkierungsrand anzeigen" -#: src/interface.c:670 -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:680 +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:673 +#: src/interface.c:683 msgid "Show _Line Numbers" msgstr "_Zeilennummern anzeigen" -#: src/interface.c:676 +#: src/interface.c:686 msgid "Shows or hides the Line Number margin." msgstr "Zeigt oder versteckt den Zeilennummernrand." -#: src/interface.c:696 +#: src/interface.c:706 msgid "_Document" msgstr "D_okument" -#: src/interface.c:703 +#: src/interface.c:713 msgid "_Line Wrapping" msgstr "_Zeilenumbruch" -#: src/interface.c:706 src/interface.c:3178 -msgid "" -"Wrap the line at the window border and continue it on the next line. Note: " -"line wrapping has a high performance cost for large documents so should be " -"disabled on slow machines." -msgstr "" -"Bricht lange Zeilen am Fensterrand um und setzt sie auf der nächsten Zeile " -"fort. Achtung: Bei großen Dokumenten erfordert der Zeilenumbruch viel " -"Rechenleistung und sollte daher auf langsameren Rechnern deaktiviert werden." +#: src/interface.c:716 +#: src/interface.c:3255 +msgid "Wrap the line at the window border and continue it on the next line. Note: line wrapping has a high performance cost for large documents so should be disabled on slow machines." +msgstr "Bricht lange Zeilen am Fensterrand um und setzt sie auf der nächsten Zeile fort. Achtung: Bei großen Dokumenten erfordert der Zeilenumbruch viel Rechenleistung und sollte daher auf langsameren Rechnern deaktiviert werden." -#: src/interface.c:709 +#: src/interface.c:719 msgid "_Use Auto-indentation" msgstr "Automatische _Einrückung benutzen" -#: src/interface.c:714 +#: src/interface.c:724 msgid "Read _Only" msgstr "_Nur Lesen" -#: src/interface.c:717 +#: src/interface.c:727 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:719 +#: src/interface.c:729 msgid "_Write Unicode BOM" msgstr "_Unicode BOM schreiben" -#: src/interface.c:728 +#: src/interface.c:738 msgid "Set File_type" msgstr "Datei_typ festlegen" -#: src/interface.c:738 +#: src/interface.c:748 msgid "Set _Encoding" msgstr "Zeichen_kodierung festlegen" -#: src/interface.c:748 +#: src/interface.c:758 msgid "Set Line E_ndings" msgstr "_Zeilenenden anzeigen" -#: src/interface.c:755 +#: src/interface.c:765 msgid "Convert and Set to _CR/LF (Win)" msgstr "Auf _CR/LF setzen und umwandeln (Win)" -#: src/interface.c:761 +#: src/interface.c:771 msgid "Convert and Set to _LF (Unix)" msgstr "Auf _LF setzen und umwandeln (Unix)" -#: src/interface.c:767 +#: src/interface.c:777 msgid "Convert and Set to CR (_Mac)" msgstr "Auf CR setzen und umwandeln (_Mac)" -#: src/interface.c:778 +#: src/interface.c:788 msgid "_Replace Tabs by Spaces" msgstr "_Tabulatoren durch Leerzeichen ersetzen" -#: src/interface.c:781 src/interface.c:2946 +#: src/interface.c:791 +#: src/interface.c:3023 msgid "Replaces all tabs in document by spaces." msgstr "Ersetzt alle Tabulatoren im Dokument durch Leerzeichen" -#: src/interface.c:788 +#: src/interface.c:798 msgid "_Fold All" msgstr "Alle _einklappen" -#: src/interface.c:791 +#: src/interface.c:801 msgid "Folds all contractible code blocks" msgstr "Klappt alle ausblendbaren Codeblöcke ein" -#: src/interface.c:793 +#: src/interface.c:803 msgid "_Unfold All" msgstr "_Alle ausklappen" -#: src/interface.c:796 +#: src/interface.c:806 msgid "Unfolds all contracted code blocks" msgstr "Klappt alle ausgeblendeten Codeblöcke wieder ausklappen" -#: src/interface.c:803 +#: src/interface.c:813 msgid "Remove Error _Indicators" msgstr "Alle _Markierungen löschen" -#: src/interface.c:806 +#: src/interface.c:816 msgid "Removes all error indicators in the current document." -msgstr "" -"Entfernt alle gesetzten (Fehler)-Markierungen innerhalb des Dokumentes." +msgstr "Entfernt alle gesetzten (Fehler)-Markierungen innerhalb des Dokumentes." -#. build the code -#: src/interface.c:808 src/build.c:908 -msgid "_Build" -msgstr "_Erstellen" +#: src/interface.c:818 +msgid "_Project" +msgstr "_Projekt" -#: src/interface.c:812 +#: src/interface.c:825 +msgid "_New" +msgstr "_Neu" + +#: src/interface.c:833 +msgid "_Open" +msgstr "Ö_ffnen" + +#: src/interface.c:841 +msgid "_Close" +msgstr "S_chließen" + +#: src/interface.c:862 msgid "_Tools" msgstr "_Werkzeuge" -#: src/interface.c:819 +#: src/interface.c:869 msgid "_Colour Chooser" msgstr "_Farbwähler" -#: src/interface.c:822 src/interface.c:947 -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:872 +#: src/interface.c:997 +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:828 +#: src/interface.c:878 msgid "_Word Count" msgstr "_Wörter zählen" -#: src/interface.c:831 -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:881 +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:833 +#: src/interface.c:883 msgid "_Insert Special HTML Characters" msgstr "_HTML-Sonderzeichen einfügen" -#: src/interface.c:837 +#: src/interface.c:887 msgid "_Help" msgstr "_Hilfe" -#: src/interface.c:848 +#: src/interface.c:898 msgid "_Keyboard Shortcuts" msgstr "_Tastenkürzel" -#: src/interface.c:851 +#: src/interface.c:901 msgid "Shows a list of all keyboard shortcuts for Geany." msgstr "Zeige eine Übersicht mit allen Tastenkürzeln für Geany." -#: src/interface.c:853 +#: src/interface.c:903 msgid "_Website" msgstr "_Webseite" -#: src/interface.c:876 +#: src/interface.c:926 msgid "Create a new file" msgstr "Neue Datei anlegen" -#: src/interface.c:882 +#: src/interface.c:932 msgid "Open an existing file" msgstr "Öffnet eine existierende Datei" -#: src/interface.c:887 +#: src/interface.c:937 msgid "Save the current file" msgstr "Speichert die aktuelle Datei" -#: src/interface.c:889 src/keybindings.c:114 +#: src/interface.c:939 +#: src/keybindings.c:118 msgid "Save all" msgstr "Alle speichern" -#: src/interface.c:892 +#: src/interface.c:942 msgid "Save all open files" msgstr "Speichere alle offenen Dateien" -#: src/interface.c:901 +#: src/interface.c:951 msgid "Reload the current file from disk" msgstr "Liest die aktuelle Datei neu ein." -#: src/interface.c:906 +#: src/interface.c:956 msgid "Close the current file" msgstr "Schließt die aktuelle Datei" -#: src/interface.c:915 +#: src/interface.c:965 msgid "Undo the last modification" msgstr "Macht die letzte Änderung rückgängig." -#: src/interface.c:920 +#: src/interface.c:970 msgid "Redo the last modification" msgstr "Wiederholt die letzte Änderung." -#: src/interface.c:928 src/keybindings.c:166 +#: src/interface.c:978 +#: src/keybindings.c:170 msgid "Compile" msgstr "Kompilieren" -#: src/interface.c:931 +#: src/interface.c:981 msgid "Compile the current file" msgstr "Kompiliert die aktuelle Datei" -#: src/interface.c:936 src/build.c:975 -msgid "Run or view the current file" -msgstr "Aktuelle Datei anzeigen oder ausführen" - -#: src/interface.c:944 +#: src/interface.c:994 msgid "Color" msgstr "Farbwähler" -#: src/interface.c:956 +#: src/interface.c:1006 msgid "Zoom in the text" msgstr "Text vergrößern" -#: src/interface.c:961 +#: src/interface.c:1011 msgid "Zoom out the text" msgstr "Text verkleinern" -#: src/interface.c:974 src/interface.c:979 +#: src/interface.c:1024 +#: src/interface.c:1029 msgid "Find the entered text in the current file" msgstr "Findet den eingegebenen Text im aktuellen Dokument" -#: src/interface.c:992 +#: src/interface.c:1042 msgid "Enter a line number and jump to it." msgstr "Geben Sie die Zeile an, zu der Sie springen möchten." -#: src/interface.c:999 +#: src/interface.c:1049 msgid "Jump to the entered line number." msgstr "Springe zu angegebener Zeile" -#: src/interface.c:1037 src/treeviews.c:71 +#: src/interface.c:1087 +#: src/treeviews.c:72 msgid "Symbols" msgstr "Symbole" -#: src/interface.c:1050 src/treeviews.c:307 +#: src/interface.c:1100 +#: src/treeviews.c:115 msgid "Open files" msgstr "Geöffnete Dateien" -#: src/interface.c:1085 +#: src/interface.c:1135 msgid "Status" msgstr "Status" -#: src/interface.c:1099 +#: src/interface.c:1149 msgid "Compiler" msgstr "Compiler" -#: src/interface.c:1113 +#: src/interface.c:1163 msgid "Messages" msgstr "Meldungen" -#: src/interface.c:1126 +#: src/interface.c:1176 msgid "Scribble" msgstr "Notizen" -#: src/interface.c:1644 src/interface.c:2801 +#: src/interface.c:1719 +#: src/interface.c:2878 msgid "Images and text" msgstr "Icons und Text" -#: src/interface.c:1650 src/interface.c:2833 +#: src/interface.c:1725 +#: src/interface.c:2910 msgid "Images only" msgstr "Nur Icons" -#: src/interface.c:1656 src/interface.c:2825 +#: src/interface.c:1731 +#: src/interface.c:2902 msgid "Text only" msgstr "Nur Text" -#: src/interface.c:1667 src/interface.c:2817 +#: src/interface.c:1742 +#: src/interface.c:2894 msgid "Large icons" msgstr "Große Symbole" -#: src/interface.c:1672 src/interface.c:2809 +#: src/interface.c:1747 +#: src/interface.c:2886 msgid "Small icons" msgstr "Kleine Symbole" -#: src/interface.c:1682 +#: src/interface.c:1757 msgid "Hide toolbar" msgstr "Toolbar verbergen" -#: src/interface.c:1912 +#: src/interface.c:1987 msgid "Insert \"include <...>\"" msgstr "\"include <...>\" einfügen" -#: src/interface.c:1926 +#: src/interface.c:2001 msgid "Insert Comments" msgstr "Kommentare einfügen" -#: src/interface.c:1982 src/keybindings.c:232 +#: src/interface.c:2057 +#: src/keybindings.c:236 msgid "Find Usage" msgstr "Auftreten finden" -#: src/interface.c:1990 +#: src/interface.c:2065 msgid "Go to Tag Definition" msgstr "Gehe zu Tag Definition" -#: src/interface.c:1994 +#: src/interface.c:2069 msgid "Go to Tag Declaration" msgstr "Gehe zu Tag Deklaration" -#: src/interface.c:2003 +#: src/interface.c:2078 msgid "Go to Line" msgstr "Gehe zu Zeile" -#: src/interface.c:2006 +#: src/interface.c:2081 msgid "Goto to the entered line" msgstr "Springe zu angegebener Zeile" -#: src/interface.c:2382 src/keybindings.c:132 +#: src/interface.c:2459 +#: src/keybindings.c:136 msgid "Preferences" msgstr "Einstellungen" -#: src/interface.c:2415 +#: src/interface.c:2492 msgid "Load files from the last session" msgstr "Dateien aus der letzten Sitzung laden" -#: src/interface.c:2419 +#: src/interface.c:2496 msgid "Opens at startup the files from the last session" msgstr "Lädt die geöffneten Dateien aus der letzten Sitzung" -#: src/interface.c:2422 +#: src/interface.c:2499 msgid "Save window position and geometry" msgstr "Fensterposition und -größe speichern" -#: src/interface.c:2426 +#: src/interface.c:2503 msgid "Saves the window position and geometry and restores it at the start" msgstr "Speichert die Fensterposition und -größe" -#: src/interface.c:2429 +#: src/interface.c:2506 msgid "Load virtual terminal emulation at startup" msgstr "Starte die Virtual Terminal Emulation beim Starten" -#: src/interface.c:2431 -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:2508 +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:2434 +#: src/interface.c:2511 msgid "Confirm exit" msgstr "Beenden bestätigen" -#: src/interface.c:2438 +#: src/interface.c:2515 msgid "Shows a confirmation dialog on exit." msgstr "Zeigt einen Bestätigungsdialog vor dem Beenden." -#: src/interface.c:2441 +#: src/interface.c:2518 msgid "Startup and shutdown" msgstr "Start und Beenden " -#: src/interface.c:2460 +#: src/interface.c:2537 msgid "Beep on errors or when compilation has finished" msgstr "Bei Fehlern oder beendeter Kompilierung Piepton ausgeben" -#: src/interface.c:2463 -msgid "" -"Whether to beep if an error occured or when the compilation process has " -"finished." -msgstr "" -"Legt fest, ob bei einem Fehler oder bei beendeter Kompilierung ein Piepton " -"ausgegeben werden soll." +#: src/interface.c:2540 +msgid "Whether to beep if an error occured or when the compilation process has finished." +msgstr "Legt fest, ob bei einem Fehler oder bei beendeter Kompilierung ein Piepton ausgegeben werden soll." -#: src/interface.c:2466 +#: src/interface.c:2543 msgid "Switch to status message list at new message" msgstr "Wechsele zum Statusmeldungsfenster bei neuer Meldung" -#: src/interface.c:2469 -msgid "" -"Switch to the status message tab (in the notebook window at the bottom) if a " -"new status message arrives." -msgstr "" -"Automatisch zu dem Statusmeldungs-Reiter im unteren Fenster wechseln, wenn " -"eine neue Statusmeldung vorliegt." +#: src/interface.c:2546 +msgid "Switch to the status message tab (in the notebook window at the bottom) if a new status message arrives." +msgstr "Automatisch zu dem Statusmeldungs-Reiter im unteren Fenster wechseln, wenn eine neue Statusmeldung vorliegt." -#: src/interface.c:2472 +#: src/interface.c:2549 msgid "Always wrap search and hide the Find dialog" msgstr "Das vollständige Dokument durchsuchen und den Suchen-Dialog schließen" -#: src/interface.c:2476 -msgid "" -"Always wrap search around the document and hide the Find dialog after " -"clicking Find Next/Previous" -msgstr "" -"Immer das vollständige Dokument durchsuchen und den Suchen-Dialog nach " -"Klicken auf Nächstes/Vorheriges schließen." +#: src/interface.c:2553 +msgid "Always wrap search around the document and hide the Find dialog after clicking Find Next/Previous" +msgstr "Immer das vollständige Dokument durchsuchen und den Suchen-Dialog nach Klicken auf Nächstes/Vorheriges schließen." # Denke trifft es besser als »Eigenschaften« -#: src/interface.c:2479 +#: src/interface.c:2556 msgid "Behaviour" msgstr "Funktionen" -#: src/interface.c:2484 +#: src/interface.c:2561 msgid "General" msgstr "Allgemein" -#: src/interface.c:2506 +#: src/interface.c:2583 msgid "Show symbol list" msgstr "Symbol-Ansicht anzeigen" -#: src/interface.c:2509 src/interface.c:2515 +#: src/interface.c:2586 +#: src/interface.c:2592 msgid "Toggle the symbol list on and off" msgstr "Schaltet die Symbol-Ansicht ein und aus." -#: src/interface.c:2512 +#: src/interface.c:2589 msgid "Show open files list" msgstr "Zeige Liste mit geöffneten Dateien" -#: src/interface.c:2518 +#: src/interface.c:2595 msgid "Sidebar" msgstr "Seitenleiste" -#: src/interface.c:2539 +#: src/interface.c:2616 msgid "Symbol list:" msgstr "Symbol-Liste:" -#: src/interface.c:2546 src/interface.c:2611 +#: src/interface.c:2623 +#: src/interface.c:2688 msgid "Message window:" msgstr "Meldungsfenster:" -#: src/interface.c:2553 src/interface.c:2618 +#: src/interface.c:2630 +#: src/interface.c:2695 msgid "Editor:" msgstr "Editor:" -#: src/interface.c:2565 +#: src/interface.c:2642 msgid "Sets the font for the message window" msgstr "Ändert die Schriftart für das Meldungsfenster" -#: src/interface.c:2573 +#: src/interface.c:2650 msgid "Sets the font for the symbol list" msgstr "Legt die Schriftart für die Symbol-Ansicht fest. " -#: src/interface.c:2581 +#: src/interface.c:2658 msgid "Sets the editor font" msgstr "Legt die Schriftart des Editorfensters fest. " -#: src/interface.c:2583 +#: src/interface.c:2660 msgid "Fonts" msgstr "Schriftarten" -#: src/interface.c:2604 +#: src/interface.c:2681 msgid "Sidebar:" msgstr "Seitenleiste:" -#: src/interface.c:2625 +#: src/interface.c:2702 msgid "Show editor tabs" msgstr "Zeige Liste mit geöffneten Dateien" -#: src/interface.c:2636 src/interface.c:2646 src/interface.c:2656 -#: src/interface.c:2993 +#: src/interface.c:2713 +#: src/interface.c:2723 +#: src/interface.c:2733 +#: src/interface.c:3070 msgid "Left" msgstr "Links" -#: src/interface.c:2637 src/interface.c:2647 src/interface.c:2657 -#: src/interface.c:3001 +#: src/interface.c:2714 +#: src/interface.c:2724 +#: src/interface.c:2734 +#: src/interface.c:3078 msgid "Right" msgstr "Rechts" -#: src/interface.c:2638 src/interface.c:2648 src/interface.c:2658 +#: src/interface.c:2715 +#: src/interface.c:2725 +#: src/interface.c:2735 msgid "Top" msgstr "Oben" -#: src/interface.c:2639 src/interface.c:2649 src/interface.c:2659 +#: src/interface.c:2716 +#: src/interface.c:2726 +#: src/interface.c:2736 msgid "Bottom" msgstr "Unten" -#: src/interface.c:2661 +#: src/interface.c:2738 msgid "Tab placement" msgstr "Tab-Platzierung:" -#: src/interface.c:2666 +#: src/interface.c:2743 msgid "Interface" msgstr "Schnittstelle" -#: src/interface.c:2685 +#: src/interface.c:2762 msgid "Show Toolbar" msgstr "Werkzeugleiste anzeigen" -#: src/interface.c:2710 +#: src/interface.c:2787 msgid "Show file operation buttons" msgstr "Dateioperationssymbole anzeigen" -#: src/interface.c:2714 +#: src/interface.c:2791 msgid "Display the New, Open, Close, Save and Reload buttons in the toolbar" -msgstr "" -"Zeigt Symbole für Neu, Öffnen, Schließen und Neuladen in der Werkzeugleiste." +msgstr "Zeigt Symbole für Neu, Öffnen, Schließen und Neuladen in der Werkzeugleiste." -#: src/interface.c:2717 +#: src/interface.c:2794 msgid "Show Compile and Run" msgstr "Kompileren und Ausführen anzeigen" -#: src/interface.c:2721 +#: src/interface.c:2798 msgid "Display the Compile and Run buttons in the toolbar" msgstr "Zeigt die Symbole zum Kompilieren und Ausführen in der Werkzeugleiste." -#: src/interface.c:2724 +#: src/interface.c:2801 msgid "Show Colour Chooser button" msgstr "Farbwähler anzeigen" -#: src/interface.c:2728 +#: src/interface.c:2805 msgid "Display the Colour Chooser button in the toolbar" msgstr "Zeigt das Farbwählersymbol in der Werkzeugleiste." -#: src/interface.c:2731 +#: src/interface.c:2808 msgid "Show Zoom In and Zoom Out" msgstr "Heran- und Wegzoomen anzeigen" -#: src/interface.c:2735 +#: src/interface.c:2812 msgid "Display the Zoom In and Zoom Out buttons in the toolbar" msgstr "Zeigt die Symbole zum Heran- und Herauszoomen in der Werkzeugleiste." -#: src/interface.c:2738 +#: src/interface.c:2815 msgid "Show Redo and Undo buttons" msgstr "Rückgängig und Wiederholen anzeigen" -#: src/interface.c:2742 +#: src/interface.c:2819 msgid "Display the Redo and Undo buttons in the toolbar" -msgstr "" -"Zeigt die Symbole zum Rückgängigmachen und Wiederholen in der Werkzeugleiste." +msgstr "Zeigt die Symbole zum Rückgängigmachen und Wiederholen in der Werkzeugleiste." -#: src/interface.c:2745 +#: src/interface.c:2822 msgid "Show Search field" msgstr "Suchfeld anzeigen" -#: src/interface.c:2749 +#: src/interface.c:2826 msgid "Display the search field and button in the toolbar" msgstr "Zeige das Suchfeld in der Werkzeugleiste" -#: src/interface.c:2752 +#: src/interface.c:2829 msgid "Show Goto line field" msgstr "Zeilennummereingabefeld anzeigen" -#: src/interface.c:2756 +#: src/interface.c:2833 msgid "Display the line number field and button in the toolbar" msgstr "Zeige das Zeilennummereingabefeld in der Werkzeugleiste" -#: src/interface.c:2759 +#: src/interface.c:2836 msgid "Show Quit button" msgstr "Icon zum Beenden anzeigen" -#: src/interface.c:2763 +#: src/interface.c:2840 msgid "Display the quit button in the toolbar" msgstr "Zeigt das Icon zum Beenden von Geany in der Werkzeugleiste an." -#: src/interface.c:2766 +#: src/interface.c:2843 msgid "Items" msgstr "Symbole" -#: src/interface.c:2787 +#: src/interface.c:2864 msgid "Icon style:" msgstr "Symbolstil:" -#: src/interface.c:2794 +#: src/interface.c:2871 msgid "Icon size:" msgstr "Symbolgröße:" -#: src/interface.c:2841 +#: src/interface.c:2918 msgid "Appearance" msgstr "Aussehen" -#: src/interface.c:2846 +#: src/interface.c:2923 msgid "Toolbar" msgstr "Werkzeugleiste" -#: src/interface.c:2874 +#: src/interface.c:2951 msgid "Tab Width:" msgstr "Tabulatorbreite" -#: src/interface.c:2886 +#: src/interface.c:2963 msgid "Sets the default encoding for newly created files." msgstr "Setzt die Zeichenkodierung für neu erstellte Dateien" -#: src/interface.c:2898 +#: src/interface.c:2975 msgid "The width in chars, which one tab character will take" msgstr "Die Breite in Zeichen, die ein Tabalutar-Zeichen einnimmt" -#: src/interface.c:2903 +#: src/interface.c:2980 msgid "Default encoding:" msgstr "Standardkodierung:" -#: src/interface.c:2909 +#: src/interface.c:2986 msgid "New files" msgstr "Neue Dateien" -#: src/interface.c:2928 +#: src/interface.c:3005 msgid "Strip trailing spaces" msgstr "Leerzeichen am Zeilenende entfernen" -#: src/interface.c:2932 +#: src/interface.c:3009 msgid "Removes trailing spaces and tabs and the end of lines" msgstr "Entfernt Leerzeichen an Zeilenenden" -#: src/interface.c:2935 +#: src/interface.c:3012 msgid "Ensure new line at file end" msgstr "Neue Zeile am Dateiende" -#: src/interface.c:2939 +#: src/interface.c:3016 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:2942 src/keybindings.c:158 +#: src/interface.c:3019 +#: src/keybindings.c:162 msgid "Replace tabs by space" msgstr "Tabulatoren durch Leerzeichen ersetzen" -#: src/interface.c:2949 +#: src/interface.c:3026 msgid "Saving files" msgstr "Speichern" -#: src/interface.c:2970 +#: src/interface.c:3047 msgid "Placement of new file tabs:" msgstr "Platzierung neuer Dateien:" -#: src/interface.c:2983 -msgid "" -"Specifies the number of files which are stored in the Recent files list." +#: src/interface.c:3060 +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:2996 +#: src/interface.c:3073 msgid "File tabs will be placed on the left of the notebook" msgstr "Neue Dateien werden links von der Datei-Liste platziert." -#: src/interface.c:3004 +#: src/interface.c:3081 msgid "File tabs will be placed on the right of the notebook" msgstr "Neue Dateien werden rechts von der Datei-Liste platziert." -#: src/interface.c:3008 +#: src/interface.c:3085 msgid "Recent files list length:" msgstr "Anzahl der \"Zuletzt geöffneten\" Dateien" -#: src/interface.c:3016 +#: src/interface.c:3093 msgid "Misc." msgstr "Sonstiges" -#: src/interface.c:3021 src/treeviews.c:111 +#: src/interface.c:3098 +#: src/symbols.c:395 msgid "Files" msgstr "Dateien" -#: src/interface.c:3043 +#: src/interface.c:3120 msgid "Invert syntax highlighting colours" msgstr "Invertiere Syntax-Hervorhebungen " -#: src/interface.c:3045 +#: src/interface.c:3122 msgid "Use white text on a black background." msgstr "Benutze weiße Schrift auf einem schwarzem Hintergrund" -#: src/interface.c:3047 +#: src/interface.c:3124 msgid "Show indentation guides" msgstr "Zeige Einrückungshinweise" -#: src/interface.c:3050 +#: src/interface.c:3127 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:3053 +#: src/interface.c:3130 msgid "Show white space" msgstr "Zeige Leerzeichen" -#: src/interface.c:3056 +#: src/interface.c:3133 msgid "Marks spaces with dots and tabs with arrows." msgstr "Markiert Leerzeichen mit Punkten und Tabulatoren mit kleinen Pfeilen." -#: src/interface.c:3059 +#: src/interface.c:3136 msgid "Show line endings" msgstr "Zeilenenden anzeigen" -#: src/interface.c:3062 +#: src/interface.c:3139 msgid "Show the line ending character" msgstr "Zeilenende-Zeichen anzeigen" -#: src/interface.c:3065 +#: src/interface.c:3142 msgid "Display" msgstr "Anzeige" -#: src/interface.c:3086 +#: src/interface.c:3163 msgid "Long line marker:" msgstr "Markierung für statischen Zeilenumbruch:" -#: src/interface.c:3093 +#: src/interface.c:3170 msgid "Long line marker color:" msgstr "Farbe der Markierung für statischen Zeilenumbruch:" -#: src/interface.c:3100 +#: src/interface.c:3177 msgid "Type:" msgstr "Typ:" -#: src/interface.c:3112 +#: src/interface.c:3189 msgid "Sets the color of the long line marker" msgstr "Stellt die Farbe des \"long line markers\" ein." -#: src/interface.c:3113 src/dialogs.c:540 src/vte.c:546 src/vte.c:553 -msgid "Color Chooser" -msgstr "Farbwähler" +#: src/interface.c:3198 +msgid "The long line marker is a thin vertical line in the editor. It helps to mark long lines, or as a hint to break the line. Set this value to a value greater than 0 to specify the column where it should appear." +msgstr "Die Markierung für statischen Zeilenumbruch ist eine dünne Linie im Editorfenster. Sie hilft dabei, lange Zeilen zu markieren und dabei auf einen eventuell notwendigen Zeilenumbruch hinzuweisen. Werte größer als 0 geben die Spalte an, in der die Linie angezeigt werden soll." -#: src/interface.c:3121 -msgid "" -"The long line marker is a thin vertical line in the editor. It helps to mark " -"long lines, or as a hint to break the line. Set this value to a value " -"greater than 0 to specify the column where it should appear." -msgstr "" -"Die Markierung für statischen Zeilenumbruch ist eine dünne Linie im " -"Editorfenster. Sie hilft dabei, lange Zeilen zu markieren und dabei auf " -"einen eventuell notwendigen Zeilenumbruch hinzuweisen. Werte größer als 0 " -"geben die Spalte an, in der die Linie angezeigt werden soll." - -#: src/interface.c:3131 +#: src/interface.c:3208 msgid "Line" msgstr "Linie" -#: src/interface.c:3134 -msgid "" -"Prints a vertical line in the editor window at the given cursor position " -"(see below)." -msgstr "" -"Zeichnet eine vertikale Linie im Editorfenster an der angegebenen Cursor-" -"Position (nur sinnvoll mit Festbreitenschriften)." +#: src/interface.c:3211 +msgid "Prints a vertical line in the editor window at the given cursor position (see below)." +msgstr "Zeichnet eine vertikale Linie im Editorfenster an der angegebenen Cursor-Position (nur sinnvoll mit Festbreitenschriften)." -#: src/interface.c:3138 +#: src/interface.c:3215 msgid "Background" msgstr "Hintergrund" -#: src/interface.c:3141 -msgid "" -"The background colour of characters after the given cursor position (see " -"below) changed to the colour set below. (This is recommended if you use " -"proportional fonts)" -msgstr "" -"Die Hintergrundfarbe der Zeichen, die hinter der angegebenen Cursor-Position" -"(siehe unten) stehen, wird auf die unten angegebene Farbe geändert (das ist " -"nützlich für proportionale Schriftarten)." +#: src/interface.c:3218 +msgid "The background colour of characters after the given cursor position (see below) changed to the colour set below. (This is recommended if you use proportional fonts)" +msgstr "Die Hintergrundfarbe der Zeichen, die hinter der angegebenen Cursor-Position(siehe unten) stehen, wird auf die unten angegebene Farbe geändert (das ist nützlich für proportionale Schriftarten)." -#: src/interface.c:3145 +#: src/interface.c:3222 msgid "Disabled" msgstr "Deaktiviert" -#: src/interface.c:3151 +#: src/interface.c:3228 msgid "Long line marker" msgstr "Markierung für statischen Zeilenumbruch" -#: src/interface.c:3170 +#: src/interface.c:3247 msgid "Auto indentation" msgstr "Automatische Einrückung benutzen" -#: src/interface.c:3173 +#: src/interface.c:3250 msgid "Add the same indentation as the previous line after pressing enter" -msgstr "" -"Fügt denselben Einzug wie in der vorherigen Zeile nach Drücken von Enter ein." +msgstr "Fügt denselben Einzug wie in der vorherigen Zeile nach Drücken von Enter ein." -#: src/interface.c:3175 +#: src/interface.c:3252 msgid "Line wrapping" msgstr "Zeilenumbruch" -#: src/interface.c:3180 +#: src/interface.c:3257 msgid "Enable folding" msgstr "Quellcode-Ausblendung aktivieren" -#: src/interface.c:3183 +#: src/interface.c:3260 msgid "Whether to enable folding the code" msgstr "Legt fest, ob es möglich sein soll, Teile des Quellcodes auszublenden." -#: src/interface.c:3186 +#: src/interface.c:3263 msgid "Unfold all children of a fold point" msgstr "Alle untergeordneten Codeblöcke ebenfalls ausklappen" -#: src/interface.c:3189 +#: src/interface.c:3266 msgid "Unfold all children of a fold point when unfolding it." -msgstr "" -"Klappt alle ausgeblendeten Codeblöcke einer Stelle im Quellcode mit aus. " +msgstr "Klappt alle ausgeblendeten Codeblöcke einer Stelle im Quellcode mit aus. " -#: src/interface.c:3192 +#: src/interface.c:3269 msgid "Use indicators to show compile errors" msgstr "Benutzt Markierungen, um Probleme beim Kompilieren anzuzeigen." -#: src/interface.c:3195 -msgid "" -"Whether to use indicators (a squiggly underline) to highlight the lines " -"where the compiler found a warning or an error." -msgstr "" -"Legt fest, ob Markierungen (wellige Unterstreichungen) benutzt werden " -"sollen, um Zeilen mit Fehlern beim Kompiliervorgang zu markieren" +#: src/interface.c:3272 +msgid "Whether to use indicators (a squiggly underline) to highlight the lines where the compiler found a warning or an error." +msgstr "Legt fest, ob Markierungen (wellige Unterstreichungen) benutzt werden sollen, um Zeilen mit Fehlern beim Kompiliervorgang zu markieren" -#: src/interface.c:3198 +#: src/interface.c:3275 +msgid "Disable Drag and Drop" +msgstr "Drag and Drop deaktivieren" + +#: src/interface.c:3278 +msgid "Disable drag and drop completely in the editor window so you can't drag and drop any selections within or outside of the editor window." +msgstr "Deaktiviert Drag and Drop für das komplette Editorfenster. " + +#: src/interface.c:3281 +msgid "Use tabulators when inserting whitespace" +msgstr "Benutze Tabulatoren, um Leerzeichen einzufügen." + +#: src/interface.c:3284 +msgid "Whenever some whitespace is inserted by Geany it will use tabluators when enabled otherwise Geany will use just spaces." +msgstr "Wenn diese Option aktiviert ist, werden Immer, wenn Leerzeichen in Geany eingefügt werden, Tabulatoren benutzt. " + +#: src/interface.c:3287 msgid "Features" msgstr "Funktionen" -#: src/interface.c:3217 +#: src/interface.c:3306 msgid "Construct autocompletion" msgstr "Autovervollständigung von Konstrukten" -#: src/interface.c:3220 +#: src/interface.c:3309 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:3223 +#: src/interface.c:3312 msgid "XML tag autocompletion" msgstr "XML-Tag Autovervollständigung" -#: src/interface.c:3226 +#: src/interface.c:3315 msgid "Automatic completion of open XML tags (includes HTML tags)" msgstr "Autovervollständigung von offenen XML-Tags, einschließlich HTML-Tags" -#: src/interface.c:3233 +#: src/interface.c:3322 msgid "Rows of autocompletion list:" msgstr "Anzahl der Zeilen der Autovervollständigungsliste: " -#: src/interface.c:3242 +#: src/interface.c:3331 msgid "Number of rows to display in the autocompletion list." -msgstr "" -"Anzahl der Zeilen, die maximal angezeigt werden sollen, wenn die " -"Autovervollständigungsliste angezeigt wird." +msgstr "Anzahl der Zeilen, die maximal angezeigt werden sollen, wenn die Autovervollständigungsliste angezeigt wird." -#: src/interface.c:3245 +#: src/interface.c:3334 msgid "Autocompletion" msgstr "Autovervollständigung" -#: src/interface.c:3250 +#: src/interface.c:3339 msgid "Editor" msgstr "Editor" -#: src/interface.c:3268 +#: src/interface.c:3357 msgid "Enter tool paths below. Tools you do not need can be left blank." -msgstr "" -"Geben Sie hier die Pfade zu den einzelnen Werkzeugen an (Programme, die " -"nicht benötigt werden, können freigelassen werden)" +msgstr "Geben Sie hier die Pfade zu den einzelnen Werkzeugen an (Programme, die nicht benötigt werden, können freigelassen werden)" -#: src/interface.c:3280 +#: src/interface.c:3369 msgid "Make:" msgstr "Make:" -#: src/interface.c:3287 +#: src/interface.c:3376 msgid "Terminal:" msgstr "Terminal:" -#: src/interface.c:3294 +#: src/interface.c:3383 msgid "Browser:" msgstr "Browser:" -#: src/interface.c:3306 +#: src/interface.c:3395 msgid "Path and options for the make tool" msgstr "Pfad und spezielle Optionen und / oder Targets für \"make\" angeben." -#: src/interface.c:3313 -msgid "" -"A terminal emulator like xterm, gnome-terminal or konsole (should accept the " -"-e argument)" -msgstr "" -"Eine Terminal-Emulation wie z.B. xterm, gnome-terminal oder konsole (sie " -"sollte die Option -e akzeptieren)" +#: src/interface.c:3402 +msgid "A terminal emulator like xterm, gnome-terminal or konsole (should accept the -e argument)" +msgstr "Eine Terminal-Emulation wie z.B. xterm, gnome-terminal oder konsole (sie sollte die Option -e akzeptieren)" -#: src/interface.c:3320 +#: src/interface.c:3409 msgid "Path (and possibly additional arguments) to your favorite browser" msgstr "Pfad und evtl. Argumente zu Ihrem Lieblingsbrowser" -#: src/interface.c:3352 +#: src/interface.c:3441 msgid "Print command:" msgstr "Druckbefehl:" -#: src/interface.c:3364 +#: src/interface.c:3453 #, c-format msgid "Path to the command for printing files (use %f for the filename)." msgstr "Pfad zum Druckbefehl (benutzen Sie %f für den Dateinamen)." -#: src/interface.c:3376 +#: src/interface.c:3465 msgid "Grep:" msgstr "Grep:" -#: src/interface.c:3399 +#: src/interface.c:3488 msgid "Tool paths" msgstr "Pfade zu den Werkzeugen" -#: src/interface.c:3404 +#: src/interface.c:3493 msgid "Tools" msgstr "Werkzeuge" -#: src/interface.c:3422 -msgid "" -"Set the information to be used in templates. See the documentation for " -"details." +#: src/interface.c:3511 +msgid "Set the information to be used in templates. See the documentation for details." msgstr "" -"Geben Sie hier die Informationen an, die in den Vorlagen benutzt werden " -"sollen.\n" -"Konsultieren Sie die Dokumentation, um mehr über die Arbeitsweise der " -"Vorlagen zu erfahren." +"Geben Sie hier die Informationen an, die in den Vorlagen benutzt werden sollen.\n" +"Konsultieren Sie die Dokumentation, um mehr über die Arbeitsweise der Vorlagen zu erfahren." -#: src/interface.c:3440 +#: src/interface.c:3529 msgid "email address of the developer" msgstr "eMail-Adresse des Entwicklers" -#: src/interface.c:3447 +#: src/interface.c:3536 msgid "Initials of the developer name" msgstr "Initialen des Entwicklernames" -#: src/interface.c:3449 +#: src/interface.c:3538 msgid "Initial Version:" msgstr "Anfangsversion:" -#: src/interface.c:3461 +#: src/interface.c:3550 msgid "Version number, which a new file initially has" msgstr "Versionsnummer, die eine neue Datei zu Beginn hat" -#: src/interface.c:3468 +#: src/interface.c:3557 msgid "Company name" msgstr "Firmenname" -#: src/interface.c:3470 +#: src/interface.c:3559 msgid "Developer:" msgstr "Entwickler:" -#: src/interface.c:3477 +#: src/interface.c:3566 msgid "Company:" msgstr "Firma:" -#: src/interface.c:3484 +#: src/interface.c:3573 msgid "Mail address:" msgstr "Mail-Adresse:" -#: src/interface.c:3491 +#: src/interface.c:3580 msgid "Initials:" msgstr "Initialen:" -#: src/interface.c:3503 +#: src/interface.c:3592 msgid "The name of the developer" msgstr "Der Name des Entwicklers" -#: src/interface.c:3505 -msgid "" -"Notice: For all changes you make here to take effect, you need to restart " -"Geany." -msgstr "" -"Damit hier gemachte Eigenschaftsänderungen wirksam werden, muss Geany neu " -"gestartet werden" +#: src/interface.c:3594 +msgid "Notice: For all changes you make here to take effect, you need to restart Geany." +msgstr "Damit hier gemachte Eigenschaftsänderungen wirksam werden, muss Geany neu gestartet werden" -#: src/interface.c:3512 +#: src/interface.c:3601 msgid "Template data" msgstr "Daten für Vorlagen:" -#: src/interface.c:3517 +#: src/interface.c:3606 msgid "Templates" msgstr "Vorlagen" -#: src/interface.c:3535 -msgid "" -"Here you can change keyboard shortcuts for various actions. Select one and " -"press the Change button to enter a new shortcut, or double click on an " -"action to edit the string representation of the shortcut directly." -msgstr "" -"Hier können die Tastenkominationen für verschiedene Aktionen innerhalb von " -"Geany festgelegt bzw. verändert werden. Um eine Tastenkombination zu ändern, " -"einfach Doppelklicken oder markieren und auf Ändern klicken. Zudem können " -"die Tastenkombinationen auch direkt eingegeben werden." +#: src/interface.c:3624 +msgid "Here you can change keyboard shortcuts for various actions. Select one and press the Change button to enter a new shortcut, or double click on an action to edit the string representation of the shortcut directly." +msgstr "Hier können die Tastenkominationen für verschiedene Aktionen innerhalb von Geany festgelegt bzw. verändert werden. Um eine Tastenkombination zu ändern, einfach Doppelklicken oder markieren und auf Ändern klicken. Zudem können die Tastenkombinationen auch direkt eingegeben werden." -#: src/interface.c:3558 +#: src/interface.c:3647 msgid "Change" msgstr "Ändern" -#: src/interface.c:3562 +#: src/interface.c:3651 msgid "Keyboard shortcuts" msgstr "Tastaturkürzel" -#: src/interface.c:3567 +#: src/interface.c:3656 msgid "Keybindings" msgstr "Tastenkürzel" -#: src/callbacks.c:174 -msgid "Do you really want to quit?" -msgstr "Möchten Sie wirklich beenden?" - -#: src/callbacks.c:492 -msgid "Any unsaved changes will be lost." -msgstr "Alle ungesicherten Änderungen gehen verloren." - -#: src/callbacks.c:493 -#, c-format -msgid "Are you sure you want to reload '%s'?" -msgstr "Wollen Sie %s wirklich neu laden?" - -#: src/callbacks.c:878 -#, 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:1248 -#, c-format -msgid "Declaration of \"%s()\" not found" -msgstr "Deklaration von \"%s()\" nicht gefunden." - -#: src/callbacks.c:1250 -#, c-format -msgid "Definition of \"%s()\" not found" -msgstr "Definition von \"%s()\" nicht gefunden." - -#: src/callbacks.c:1455 src/callbacks.c:1479 -msgid "" -"Please set the filetype for the current file before using this function." -msgstr "Bitte legen Sie den Dateityp fest, bevor Sie diese Funktion benutzen." - -#: src/callbacks.c:1590 src/ui_utils.c:561 -msgid "dd.mm.yyyy" -msgstr "TT.MM.JJ" - -#: src/callbacks.c:1592 src/ui_utils.c:562 -msgid "mm.dd.yyyy" -msgstr "MM.TT.JJ" - -#: src/callbacks.c:1594 src/ui_utils.c:563 -msgid "yyyy/mm/dd" -msgstr "JJJJ/MM/TT" - -#: src/callbacks.c:1596 src/ui_utils.c:572 -msgid "dd.mm.yyyy hh:mm:ss" -msgstr "TT.MM.JJJJ Stunden:Minuten:Sekunden" - -#: src/callbacks.c:1598 src/ui_utils.c:573 -msgid "mm.dd.yyyy hh:mm:ss" -msgstr "MM.TT.JJJJ Stunden:Minuten:Sekunden" - -#: src/callbacks.c:1600 src/ui_utils.c:574 -msgid "yyyy/mm/dd hh:mm:ss" -msgstr "JJJJ/MM/TT Stunden:Minuten:Sekunden" - -#: src/callbacks.c:1602 src/ui_utils.c:583 -msgid "Use Custom Date Format" -msgstr "Benutze selbst erstelltes Zeitformat" - -#: src/callbacks.c:1613 -msgid "Custom Date Format" -msgstr "Benutzerdefiniertes Datumsformat" - -#: src/callbacks.c:1614 -msgid "" -"Enter here a custom date and time format. You can use any conversion " -"specifiers which can be used with the ANSI C strftime function. See \"man " -"strftime\" for more information." -msgstr "" -"Hier kann ein benutzerdefiniertes Datumsformat eingegeben werden. Dabei " -"können alle Platzhalter verwendet werden, die auch in ANSI C strftime zum " -"Einsatz kommen." - -#: src/callbacks.c:1634 -msgid "Date format string could not be converted (possibly too long)." -msgstr "" -"Das Datenformat konnte nicht umgewandelt werden. Eventuell ist es zu lang." - -#: src/callbacks.c:2022 -msgid "No more message items." -msgstr "Keine weiteren Nachrichten. " - -#: src/support.c:90 src/support.c:114 -#, c-format -msgid "Couldn't find pixmap file: %s" -msgstr "Konnte PixMap %s nicht finden." - -#. initialize the dialog -#: src/dialogs.c:74 src/prefs.c:1023 -msgid "Open File" -msgstr "Datei öffnen" - -#: src/dialogs.c:79 -msgid "" -"Opens the file in read-only mode. If you choose more than one file to open, " -"all files will be opened read-only." -msgstr "" -"Öffnet die Datei schreibgeschützt. Wenn Sie mehrere Dateien wählen, werden " -"alle schreibgeschützt geöffnet." - -#: src/dialogs.c:112 -msgid "Detect by file extension" -msgstr "Durch Dateiendung erkennen" - -#: src/dialogs.c:123 -msgid "Detect from file" -msgstr "Aus Datei lesen" - -#. line 1 with checkbox and encoding combo -#: src/dialogs.c:169 -msgid "Show _hidden files" -msgstr "_Versteckte Dateien anzeigen" - -#: src/dialogs.c:181 -msgid "Set encoding:" -msgstr "Zeichenkodierung festlegen:" - -#: src/dialogs.c:191 -msgid "" -"Explicitly defines an encoding for the file, if it would not be detected. " -"This is useful when you know that the encoding of a file cannot be detected " -"correctly by Geany.\n" -"Note if you choose multiple files, they will all be opened with the chosen " -"encoding." -msgstr "" -"Definiert explizit eine bestimmte Zeichenkodierung, wenn sie nicht " -"automatisch erkannt werden kann.\n" -"Beachten Sie, wenn Sie mehrere Dateien auswählen, werden alle mit der " -"gewählten Zeichenkodierung geöffnet." - -#: src/dialogs.c:211 -msgid "Set filetype:" -msgstr "Dateityp festlegen:" - -#: src/dialogs.c:221 -msgid "" -"Explicitly defines a filetype for the file, if it would not be detected by " -"filename extension.\n" -"Note if you choose multiple files, they will all be opened with the chosen " -"filetype." -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." - -#: src/dialogs.c:260 -msgid "Save File" -msgstr "Datei speichern" - -#: src/dialogs.c:350 -#, c-format -msgid "The file '%s' is not saved." -msgstr "'%s' wurde nicht gespeichert." - -#: src/dialogs.c:360 -msgid "Do you want to save it before closing?" -msgstr "Möchten Sie vor dem Schließen speichern?" - -#: src/dialogs.c:363 -msgid "_Don't save" -msgstr "_Nicht speichern" - -#: src/dialogs.c:407 -msgid "Choose font" -msgstr "Schriftart auswählen" - -#: src/dialogs.c:444 -msgid "Word Count" -msgstr "Wörter zählen" - -#: src/dialogs.c:453 -msgid "selection" -msgstr "Auswahl" - -#: src/dialogs.c:459 -msgid "whole document" -msgstr "Vollständiges Dokument" - -#: src/dialogs.c:468 -msgid "Range:" -msgstr "Bereich:" - -#: src/dialogs.c:480 -msgid "Lines:" -msgstr "Zeilen:" - -#: src/dialogs.c:494 -msgid "Words:" -msgstr "Wörter: " - -#: src/dialogs.c:508 -msgid "Characters:" -msgstr "Buchstaben:" - -#: src/dialogs.c:607 src/keybindings.c:144 -msgid "Go to line" -msgstr "Gehe zu Zeile" - -#: src/dialogs.c:613 -msgid "Enter the line you want to go to:" -msgstr "Geben Sie die Zeile an, zu der Sie springen möchten:" - -#. arguments -#: src/dialogs.c:638 src/build.c:1116 -msgid "Set Arguments" -msgstr "Programm-Parameter angeben" - -#: src/dialogs.c:644 -msgid "Set programs and options for compiling and viewing (La)TeX files." -msgstr "" -"Setzt Programme und deren Optionen zum Kompilieren bzw. Betrachten von (La)" -"TeX-Dateien.\n" -"Der jeweilige Dateiname wird bei einem Aufruf automatisch an das Ende " -"angefügt." - -#: src/dialogs.c:655 -msgid "DVI creation:" -msgstr "DVI-Erstellung:" - -#: src/dialogs.c:674 -msgid "PDF creation:" -msgstr "PDF-Erstellung:" - -#: src/dialogs.c:693 -msgid "DVI preview:" -msgstr "DVI-Vorschau:" - -#: src/dialogs.c:712 -msgid "PDF preview:" -msgstr "PDF-Vorschau:" - -#: src/dialogs.c:728 src/dialogs.c:843 -#, c-format -msgid "" -"%f will be replaced by the current filename, e.g. test_file.c\n" -"%e will be replaced by the filename without extension, e.g. test_file" -msgstr "" -"%f wird durch den aktuellen Dateinamen ersetzt. Zum Beispiel: meine_Datei." -"c \n" -"%e wird durch den Dateinamen ohne Dateiendung ersetzt. Zum Beispiel " -"meine_Datei " - -#: src/dialogs.c:755 -msgid "Set Includes and Arguments" -msgstr "Programm-Parameter angeben" - -#: src/dialogs.c:761 -msgid "Set the commands for building and running programs." -msgstr "Legt die Kommandos zum Erstellen und Ausführen von Programmen fest." - -#: src/dialogs.c:768 -msgid " commands" -msgstr "Kommandos" - -#: src/dialogs.c:783 -msgid "Compile:" -msgstr "Kompilieren:" - -#: src/dialogs.c:804 -msgid "Build:" -msgstr "Erstellen:" - -#: src/dialogs.c:825 src/dialogs.c:1096 -msgid "Execute:" -msgstr "Ausführen:" - -#: src/dialogs.c:890 -msgid "" -"An error occurred or file information could not be retrieved (e.g. from a " -"new file)." -msgstr "" -"Es ist ein Fehler aufgetreten oder Datei-Informationen konnten nicht gelesen " -"werden(z.B. bei einer neuen, ungespeicherten Datei)." - -#: src/dialogs.c:909 src/dialogs.c:910 src/dialogs.c:911 src/dialogs.c:917 -#: src/dialogs.c:918 src/dialogs.c:919 src/utils.c:514 src/utils.c:566 -#: src/ui_utils.c:122 src/ui_utils.c:124 -msgid "unknown" -msgstr "unbekannt" - -#: src/dialogs.c:923 -msgid "Properties" -msgstr "Eigenschaften" - -#: src/dialogs.c:951 -msgid "Type:" -msgstr "Dateityp:" - -#: src/dialogs.c:964 -msgid "Size:" -msgstr "Größe:" - -#: src/dialogs.c:979 -msgid "Location:" -msgstr "Ort:" - -#: src/dialogs.c:992 -msgid "Read-only:" -msgstr "Schreibgeschützt:" - -#: src/dialogs.c:999 -msgid "(only inside Geany)" -msgstr "(nur innerhalb von Geany)" - -#: src/dialogs.c:1008 -msgid "Encoding:" -msgstr "Kodierung:" - -#: src/dialogs.c:1017 src/ui_utils.c:123 -msgid "(with BOM)" -msgstr "(mit BOM)" - -#: src/dialogs.c:1017 src/ui_utils.c:123 -msgid "(without BOM)" -msgstr "(ohne BOM)" - -#: src/dialogs.c:1027 -msgid "Modified:" -msgstr "Modifiziert:" - -#: src/dialogs.c:1040 -msgid "Changed:" -msgstr "Geändert:" - -#: src/dialogs.c:1053 -msgid "Accessed:" -msgstr "Zugriff:" - -#: src/dialogs.c:1074 -msgid "Permissions:" -msgstr "Berechtigungen:" - -#. Header -#: src/dialogs.c:1082 -msgid "Read:" -msgstr "Lesen:" - -#: src/dialogs.c:1089 -msgid "Write:" -msgstr "Schreiben:" - -#. Owner -#: src/dialogs.c:1104 -msgid "Owner:" -msgstr "Eigentümer:" - -#. Group -#: src/dialogs.c:1140 -msgid "Group:" -msgstr "Gruppe:" - -#. Other -#: src/dialogs.c:1176 -msgid "Other:" -msgstr "Andere:" - -#: src/dialogs.c:1297 -msgid "Keyboard shortcuts" -msgstr "Tastaturkürzel" - -#: src/dialogs.c:1306 -msgid "The following keyboard shortcuts are defined:" -msgstr "Folgende Tastenkürzel sind definiert: " - -#: src/document.c:339 -#, c-format -msgid "File %s closed." -msgstr "Datei %s wurde geschlossen." - -#: src/document.c:420 -msgid "New file opened." -msgstr "Neue Datei geöffnet." - -#: src/document.c:564 src/document.c:831 -#, c-format -msgid "Could not open file %s (%s)" -msgstr "Konnte Datei '%s' nicht öffnen(%s)." - -#: src/document.c:587 -#, c-format -msgid "" -"The file \"%s\" could not be opened properly and has been truncated. This " -"can occur if the file contains a NULL byte. Be aware that saving it can " -"cause data loss.\n" -"The file was set to read-only." -msgstr "" -"Die Datei »%s« konnte nicht ordnungsgemäß geladen werden und wurde evtl. " -"abgeschnitten. Die kann zu Datenverlust beim Speichern führen!\n" -"Die Datei wird schreibgeschützt geöffnet." - -#: src/document.c:611 -#, c-format -msgid "The file \"%s\" is not valid %s." -msgstr "Die Datei \"%s\" ist kein gültiges %s." - -#: src/document.c:620 -#, c-format -msgid "" -"The file \"%s\" does not look like a text file or the file encoding is not " -"supported." -msgstr "" -"Die Datei \"%s\" scheint keine Textdatei zu sein, oder das Format wird nicht " -"unterstützt." - -#: src/document.c:661 -msgid "Invalid filename" -msgstr "Ungültiger Dateiname" - -#: src/document.c:757 -#, c-format -msgid "File %s reloaded." -msgstr "Datei %s neu geladen." - -#: src/document.c:759 -#, c-format -msgid "File %s opened(%d%s)." -msgstr "Datei %s geöffnet(%d%s)." - -#: src/document.c:761 -msgid ", read-only" -msgstr ", schreibgeschützt" - -#: src/document.c:859 src/document.c:940 -msgid "Error saving file." -msgstr "Fehler beim Speichern der Datei." - -#: src/document.c:904 -#, c-format -msgid "" -"An error occurred while converting the file from UTF-8 in \"%s\". The file " -"remains unsaved.\n" -"Error message: %s\n" -msgstr "" -"Beim Konvertieren der Datei von UTF-8 in \"%s\" ist ein Fehler aufgetreten. " -"Die Datei bleibt ungespeichert.\n" -"Fehlermeldung: %s\n" - -#: src/document.c:928 -#, c-format -msgid "Error saving file (%s)." -msgstr "Fehler beim Speichern der Datei (%s)." - -#: src/document.c:971 -#, c-format -msgid "File %s saved." -msgstr "Datei %s wurde gespeichert." - -#: src/document.c:1019 src/document.c:1071 src/document.c:1079 -#, c-format -msgid "\"%s\" was not found." -msgstr "\"%s\" wurde nicht gefunden." - -#: src/document.c:1079 -msgid "Wrap search and find again?" -msgstr "Suche vom Dokumentanfang bzw. -ende neu beginnen?" - -#: src/document.c:1158 src/search.c:1188 -msgid "No matches found." -msgstr "Keine Treffer gefunden." - -#: src/document.c:1168 src/document.c:1175 -#, c-format -msgid "%s: replaced %d occurrences of \"%s\" with \"%s\"." -msgstr "%s: Es wurde %d Mal \"%s\" gegen \"%s\" ersetzt." - -#: src/document.c:1429 -msgid "Win (CRLF)" -msgstr "Win (CRLF)" - -#: src/document.c:1430 -msgid "Mac (CR)" -msgstr "Mac (CR)" - -#: src/document.c:1432 -msgid "Unix (LF)" -msgstr "Unix (LF)" - -#: src/document.c:1528 -#, c-format -msgid "" -"The file \"%s\" will be printed with the following command:\n" -"\n" -"%s" -msgstr "" -"Die Datei \"%s\" wird mit folgendem Befehl gedruckt:\n" -"\n" -"%s" - -#: src/document.c:1537 -#, c-format -msgid "Printing of \"%s\" failed (return code: %d)." -msgstr "Drucken der Datei \"%s\" ist fehlgeschlagen (Rückgabewert: %d)." - -#: src/document.c:1542 -#, c-format -msgid "File %s printed." -msgstr "Datei %s wurde gedruckt." - -#: src/utils.c:347 -msgid "Do you want to reload it?" -msgstr "Möchten Sie die Datei neu laden?" - -#: src/utils.c:348 -#, c-format -msgid "" -"The file '%s' on the disk is more recent than\n" -"the current buffer." -msgstr "" -"Die Datei '%s' auf dem Datenträger ist aktueller als die momentan geöffnete " -"Version." - -#: src/ui_utils.c:114 -#, c-format -msgid "" -"%c line: % 4d column: % 3d selection: % 4d %s mode: %s%s cur. " -"function: %s encoding: %s %s filetype: %s" -msgstr "" -"%c Zeile: % 4d Spalte: % 3d Auswahl: % 4d %s Modus: %s%s akt. " -"Funktion: %s Kodierung: %s %s Dateityp: %s" - -#: src/ui_utils.c:118 -msgid "OVR" -msgstr "ÜBER" - -#: src/ui_utils.c:118 -msgid "INS" -msgstr "EINF" - -#: src/ui_utils.c:144 -msgid "(Unsaved)" -msgstr "(Ungespeichert)" - -#: src/ui_utils.c:183 -#, c-format -msgid "Font updated (%s)." -msgstr "Schriftart gewechselt (%s)." - -#: src/ui_utils.c:309 -msgid "No tags found" -msgstr "Keine Symbole gefunden." - -#: src/ui_utils.c:530 -msgid "C Standard Library" -msgstr "C Standard Bibliothek" - -#: src/ui_utils.c:531 -msgid "ISO C99" -msgstr "ISO C99" - -#: src/ui_utils.c:532 -msgid "C++ (C Standard Library)" -msgstr "C++ (C Standard Bibliothek)" - -#: src/ui_utils.c:533 -msgid "C++ Standard Library" -msgstr "C++ Standard Bibliothek" - -#: src/ui_utils.c:534 -msgid "C++ STL" -msgstr "C++ STL" - -#: src/ui_utils.c:600 -msgid "Set Custom Date Format" -msgstr "Benutzerdefiniertes Datumsformat einstellen " - -#: src/filetypes.c:131 -msgid "C source file" -msgstr "C Quelldatei" - -#: src/filetypes.c:151 -msgid "C++ source file" -msgstr "C++ Quelldatei" - -#: src/filetypes.c:179 -msgid "D source file" -msgstr "D Quelldatei" - -#: src/filetypes.c:199 -msgid "Java source file" -msgstr "Java Quelldatei" - -#: src/filetypes.c:218 -msgid "Pascal source file" -msgstr "Pascal Quelldatei" - -#: src/filetypes.c:241 -msgid "Assembler source file" -msgstr "Assembler Quelldatei" - -#: src/filetypes.c:260 -msgid "Fortran source file (F77)" -msgstr "Fortran (F77) Quelldatei" - -#: src/filetypes.c:284 -msgid "(O)Caml source file" -msgstr "(O)Caml Quelldatei" - -#: src/filetypes.c:304 -msgid "Perl source file" -msgstr "Perl Quelldatei" - -#: src/filetypes.c:326 -msgid "PHP source file" -msgstr "PHP Quelldatei" - -#: src/filetypes.c:349 -msgid "Python source file" -msgstr "Python Quelldatei" - -#: src/filetypes.c:369 -msgid "Ruby source file" -msgstr "Ruby Quelldatei" - -#: src/filetypes.c:389 -msgid "Tcl source file" -msgstr "Tcl Quelldatei" - -#: src/filetypes.c:410 -msgid "Ferite source file" -msgstr "Ferite Qulldatei" - -#: src/filetypes.c:429 -msgid "Shell script file" -msgstr "Shellskript Datei" - -#: src/filetypes.c:454 -msgid "Makefile" -msgstr "Makefile" - -#: src/filetypes.c:475 -msgid "XML source file" -msgstr "XML Quelldatei" - -#: src/filetypes.c:495 -msgid "Docbook source file" -msgstr "Docbook Quelldatei" - -#: src/filetypes.c:514 -msgid "HTML source file" -msgstr "HTML Quelldatei" - -#: src/filetypes.c:535 -msgid "Cascading StyleSheet" -msgstr "Cascading StyleSheet" - -#: src/filetypes.c:554 -msgid "SQL Dump file" -msgstr "SQL-Dump Datei" - -#: src/filetypes.c:573 -msgid "LaTeX source file" -msgstr "LaTeX Quelldatei" - -#: src/filetypes.c:594 -msgid "O-Matrix source file" -msgstr "O-Matrix Quelldatei" - -#: src/filetypes.c:613 -msgid "VHDL source file" -msgstr "VHDL Quelldatei" - -#: src/filetypes.c:633 -msgid "Diff file" -msgstr "Diff Daten" - -#: src/filetypes.c:653 -msgid "Config file" -msgstr "Konfigurationsdatei" - -#: src/filetypes.c:676 -msgid "All files" -msgstr "Alle Dateien" - -#: src/filetypes.c:685 -msgid "None" -msgstr "Keiner" - -#: src/win32.c:60 -msgid "Executables" -msgstr "Executables" - -#: src/win32.c:333 -msgid "Error" -msgstr "Fehler" - -#: src/win32.c:339 src/win32.c:380 -msgid "Question" -msgstr "Frage" - -#: src/win32.c:345 -msgid "Warning" -msgstr "Warnung" - -#: src/win32.c:351 -msgid "Information" -msgstr "Information" - -#: src/keyfile.c:70 -#, c-format -msgid "%s configuration file, edit as you need" -msgstr "%s Konfigurationsdatei. Bei Bedarf anpassen." - -#: src/keyfile.c:333 -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." - -#: src/keyfile.c:560 -msgid "Failed to load one or more session files." -msgstr "" -"Eine oder mehre Datei(en) aus der letzten Sitzung konnte(n) nicht geladen " -"werden." - -#: src/msgwindow.c:107 -msgid "Status messages" -msgstr "Meldungen" - -#: src/msgwindow.c:411 -msgid "_Hide Message Window" -msgstr "Meldungsfenster ausblenden" - -#: src/build.c:156 -#, 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:189 src/build.c:567 -#, 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:203 src/build.c:604 -#, 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:231 src/build.c:447 src/build.c:649 src/search.c:1069 -#, c-format -msgid "Process failed (%s)" -msgstr "Prozess fehlgeschlagen (%s)" - -#: src/build.c:356 -#, c-format -msgid "Something very strange is occurred, could not stat %s (%s)." -msgstr "Ein Fehler ist aufgetreten, konnte Datei %s nicht prüfen (%s)." - -#: src/build.c:435 -#, c-format -msgid "%s (in directory: %s)" -msgstr "%s (im Verzeichnis: %s)" - -#: src/build.c:543 -#, 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:581 -#, c-format -msgid "Failed to change the working directory to %s" -msgstr "Konnte nicht in Arbeitsverzeichnis %s wechseln" - -#: src/build.c:777 -msgid "Compilation failed." -msgstr "Kompilierung fehlgeschlagen." - -#: src/build.c:791 -msgid "Compilation finished successfully." -msgstr "Kompilierung beendet - erfolgreich." - -#. compile the code -#: src/build.c:896 -msgid "_Compile" -msgstr "_Kompilieren" - -#: src/build.c:899 -msgid "Compiles the current file" -msgstr "Kompiliert die aktuelle Datei" - -#: src/build.c:912 -msgid "Builds the current file (generate an executable file)" -msgstr "Erstellt die aktuelle Datei (erzeugt eine ausführbare Datei)" - -#. build the code with make all -#: src/build.c:922 src/build.c:1044 -msgid "_Make All" -msgstr "_Make all" - -#: src/build.c:925 src/build.c:1047 -msgid "Builds the current file with the make tool and the default target" -msgstr "Erstellt die aktuelle Datei mit \"make\" und dem Default-Target" - -#. build the code with make custom -#: src/build.c:933 src/build.c:1055 -msgid "Make Custom _Target" -msgstr "Make (eigenes _Target)" - -#: src/build.c:937 src/build.c:1059 -msgid "Builds the current file with the make tool and the specified target" -msgstr "Erstellt die aktuelle Datei mit \"make\" und dem angegebenem Target" - -#. build the code with make object -#: src/build.c:944 -msgid "Make _Object" -msgstr "Make _Objekt-Datei" - -#: src/build.c:948 -msgid "Compiles the current file using the make tool" -msgstr "Kompiliert die aktuelle Datei mittels make " - -#. next error -#: src/build.c:960 src/build.c:1071 -msgid "_Next Error" -msgstr "Nächster _Fehler" - -#. arguments -#: src/build.c:986 -msgid "_Set Includes and Arguments" -msgstr "_Programm-Parameter angeben" - -#: src/build.c:991 -msgid "" -"Sets the includes and library paths for the compiler and the program " -"arguments for execution" -msgstr "" -"Include-Dateien und Bibliotheken-Pfade sowie Programmparameter festlegen" - -#. DVI -#: src/build.c:1014 -msgid "LaTeX -> DVI" -msgstr "LaTeX -> DVI" - -#: src/build.c:1017 -msgid "Compiles the current file into a DVI file" -msgstr "Kompiliert die aktuelle Datei als DVI-Datei." - -#. PDF -#: src/build.c:1027 -msgid "LaTeX -> PDF" -msgstr "LaTeX -> PDF" - -#: src/build.c:1030 -msgid "Compiles the current file into a PDF file" -msgstr "Kompiliert die aktuelle Datei als PDF-Datei." - -#. DVI view -#: src/build.c:1083 -msgid "View DVI File" -msgstr "DVI-Datei anzeigen" - -#: src/build.c:1088 src/build.c:1101 -msgid "Compiles and view the current file" -msgstr "Kompiliert und zeigt die aktuelle Datei an." - -#. PDF view -#: src/build.c:1097 -msgid "View PDF File" -msgstr "PDF-Datei anzeigen" - -#: src/build.c:1121 -msgid "Sets the program paths and arguments" -msgstr "Programm-Parameter angeben" - -#: src/build.c:1388 -msgid "Make Custom Target" -msgstr "Make (eigenes Target)" - -#: src/build.c:1389 -msgid "" -"Enter custom options here, all entered text is passed to the make command." -msgstr "Alles was Sie hier angeben, wird direkt an \"make\" übergeben." - -#: src/build.c:1428 -msgid "Failed to execute the view program" -msgstr "Konnte das Anzeigeprogramm nicht ausführen." - -#: src/build.c:1447 -msgid "Failed to execute the terminal program" -msgstr "Konnte das Terminal-Programm nicht ausführen." - -#: src/build.c:1506 -#, c-format -msgid "Process could not be stopped (%s)." -msgstr "Der Prozess konnte nicht angehalten werden (%s)." - -#: src/build.c:1541 -msgid "No more build errors." -msgstr "Keine weiteren Fehlermeldungen." - -#: src/prefs.c:310 -msgid "Action" -msgstr "Aktion" - -#: src/prefs.c:315 -msgid "Shortcut" -msgstr "Tastenkürzel" - -#: src/prefs.c:789 -msgid "Grab key" -msgstr "Tasten festlegen" - -#: src/prefs.c:793 -#, 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:917 -#, 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:119 -msgid "About Geany" -msgstr "Über Geany" - -#: src/about.c:168 -msgid "A fast and lightweight IDE" -msgstr "Eine kleine und schnelle Entwicklungsumgebung" - -#: src/about.c:189 -#, c-format -msgid "(built on %s)" -msgstr "(kompiliert am %s)" - -#. gtk_container_add(GTK_CONTAINER(info_box), cop_label); -#: src/about.c:220 -msgid "Info" -msgstr "Info" - -#: src/about.c:232 -msgid "Developers" -msgstr "Entwickler" - -#: src/about.c:232 -msgid "Maintainer" -msgstr "Hauptentwickler" - -#: src/about.c:232 -msgid "developer" -msgstr "Entwickler" - -#: src/about.c:233 -msgid "translation maintainer" -msgstr "Übersetzungskoordinator" - -#: src/about.c:233 -msgid "Translators" -msgstr "Übersetzer" - -#: src/about.c:234 -msgid "language" -msgstr "Sprache" - -#: src/about.c:240 -msgid "Credits" -msgstr "Credits" - -#: src/about.c:253 -msgid "License" -msgstr "Lizenz" - -#: src/geany.h:49 -msgid "untitled" -msgstr "unbenannt" - -#: src/encodings.c:51 -msgid "Celtic" -msgstr "Keltisch" - -#: src/encodings.c:52 src/encodings.c:53 -msgid "Greek" -msgstr "Griechisch" - -#: src/encodings.c:54 -msgid "Nordic" -msgstr "Nordisch" - -#: src/encodings.c:55 -msgid "South European" -msgstr "Südeuropäisch" - -#: src/encodings.c:56 src/encodings.c:57 src/encodings.c:58 src/encodings.c:59 -msgid "Western" -msgstr "Westlich" - -#: src/encodings.c:61 src/encodings.c:62 src/encodings.c:63 -msgid "Baltic" -msgstr "Baltisch" - -#: src/encodings.c:64 src/encodings.c:65 src/encodings.c:66 -msgid "Central European" -msgstr "Mitteleuropäisch" - -#: src/encodings.c:67 src/encodings.c:68 src/encodings.c:69 src/encodings.c:70 -#: src/encodings.c:71 -msgid "Cyrillic" -msgstr "Kyrillisch" - -#: src/encodings.c:72 -msgid "Cyrillic/Russian" -msgstr "Kyrillisch/Russisch" - -#: src/encodings.c:73 -msgid "Cyrillic/Ukrainian" -msgstr "Kyrillisch/Ukrainisch" - -#: src/encodings.c:74 -msgid "Romanian" -msgstr "Rumänisch" - -#: src/encodings.c:76 src/encodings.c:77 src/encodings.c:78 -msgid "Arabic" -msgstr "Arabisch" - -#: src/encodings.c:79 src/encodings.c:80 src/encodings.c:81 -msgid "Hebrew" -msgstr "Hebräisch" - -#: src/encodings.c:82 -msgid "Hebrew Visual" -msgstr "Hebräisch visuell" - -#: src/encodings.c:84 -msgid "Armenian" -msgstr "Armenisch" - -#: src/encodings.c:85 -msgid "Georgian" -msgstr "Georgian" - -#: src/encodings.c:86 -msgid "Thai" -msgstr "Thai" - -#: src/encodings.c:87 src/encodings.c:88 src/encodings.c:89 -msgid "Turkish" -msgstr "Türkisch" - -#: src/encodings.c:90 src/encodings.c:91 src/encodings.c:92 -msgid "Vietnamese" -msgstr "Vietnamesisch" - -#: src/encodings.c:94 src/encodings.c:95 src/encodings.c:96 src/encodings.c:97 -#: src/encodings.c:98 src/encodings.c:99 src/encodings.c:100 -#: src/encodings.c:101 -msgid "Unicode" -msgstr "Unicode" - -#: src/encodings.c:103 src/encodings.c:104 src/encodings.c:105 -#: src/encodings.c:106 -msgid "Chinese Simplified" -msgstr "Chinesisch vereinfacht" - -#: src/encodings.c:107 src/encodings.c:108 src/encodings.c:109 -msgid "Chinese Traditional" -msgstr "Chinesisch traditionell" - -#: src/encodings.c:110 src/encodings.c:111 src/encodings.c:112 -msgid "Japanese" -msgstr "Japanisch" - -#: src/encodings.c:113 src/encodings.c:114 src/encodings.c:115 -#: src/encodings.c:116 -msgid "Korean" -msgstr "Koreanisch" - -#: src/encodings.c:118 -msgid "Without encoding" -msgstr "Ohne Zeichenkodierung" - -#: src/encodings.c:211 -msgid "_West European" -msgstr "_Westeuropäisch" - -#: src/encodings.c:217 -msgid "_East European" -msgstr "_Osteuropäisch" - -#: src/encodings.c:223 -msgid "East _Asian" -msgstr "Ost_asiatisch" - -#: src/encodings.c:229 -msgid "_SE & SW Asian" -msgstr "_SO- & SW-Asiatisch" - -#: src/encodings.c:235 -msgid "_Middle Eastern" -msgstr "_Nahöstlich" - -#: src/encodings.c:241 -msgid "_Unicode" -msgstr "_Unicode" - -#: src/treeviews.c:117 src/treeviews.c:149 -msgid "Chapter" -msgstr "Kapitel" - -#: src/treeviews.c:119 src/treeviews.c:141 -msgid "Section" -msgstr "Section" - -#: src/treeviews.c:121 -msgid "Sect1" -msgstr "Sect1" - -#: src/treeviews.c:123 -msgid "Sect2" -msgstr "Sect2" - -#: src/treeviews.c:125 -msgid "Sect3" -msgstr "Sect3" - -#: src/treeviews.c:127 -msgid "Appendix" -msgstr "Anhang" - -#: src/treeviews.c:129 src/treeviews.c:151 src/treeviews.c:239 -#: src/treeviews.c:280 -msgid "Other" -msgstr "Sonstiges" - -#: src/treeviews.c:137 -msgid "Command" -msgstr "Command" - -#: src/treeviews.c:139 -msgid "Environment" -msgstr "Umgebung" - -#: src/treeviews.c:143 -msgid "Subsection" -msgstr "Subsection" - -#: src/treeviews.c:145 -msgid "Subsubsection" -msgstr "Subsubsection" - -#: src/treeviews.c:147 -msgid "Label" -msgstr "Label" - -#: src/treeviews.c:157 -msgid "Function" -msgstr "Funktion" - -#: src/treeviews.c:159 src/treeviews.c:222 -msgid "Package" -msgstr "Package" - -#: src/treeviews.c:161 -msgid "My" -msgstr "My" - -#: src/treeviews.c:163 -msgid "Local" -msgstr "Lokal" - -#: src/treeviews.c:165 -msgid "Our" -msgstr "Our" - -#: src/treeviews.c:178 src/treeviews.c:203 src/treeviews.c:225 -msgid "Methods" -msgstr "Methoden" - -#: src/treeviews.c:180 src/treeviews.c:201 src/treeviews.c:227 -#: src/treeviews.c:268 -msgid "Classes" -msgstr "Klassen" - -#: src/treeviews.c:182 -msgid "Singletons" -msgstr "Singletons" - -#: src/treeviews.c:184 -msgid "Mixins" -msgstr "Mixins" - -#. gtk_tree_store_append(doc_list[idx].tag_store, &(tv.tag_class), NULL); -#. gtk_tree_store_set(doc_list[idx].tag_store, &(tv.tag_class), 0, _("Constants"), -1); -#. gtk_tree_store_append(doc_list[idx].tag_store, &(tv.tag_member), NULL); -#. gtk_tree_store_set(doc_list[idx].tag_store, &(tv.tag_member), 0, _("Members"), -1); -#. gtk_tree_store_append(doc_list[idx].tag_store, &(tv.tag_macro), NULL); @@ Diff output truncated at 100000 characters. @@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1210] trunk
by eht16＠users.sourceforge.net 20 Jan '07

20 Jan '07

Revision: 1210 http://svn.sourceforge.net/geany/?rev=1210&view=rev Author: eht16 Date: 2007-01-20 06:46:04 -0800 (Sat, 20 Jan 2007) Log Message: ----------- Fixed typo. Modified Paths: -------------- trunk/ChangeLog trunk/scintilla/makefile.win32 Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-01-19 23:17:40 UTC (rev 1209) +++ trunk/ChangeLog 2007-01-20 14:46:04 UTC (rev 1210) @@ -1,3 +1,8 @@ +2007-01-20 Enrico Tröger <enrico.troeger(a)uvena.de> + + * scintilla/makefile.win32: Fixed typo. + + 2007-01-19 Enrico Tröger <enrico.troeger(a)uvena.de> * src/build.c: Use "rm" to delete the run script because unlink is not Modified: trunk/scintilla/makefile.win32 =================================================================== --- trunk/scintilla/makefile.win32 2007-01-19 23:17:40 UTC (rev 1209) +++ trunk/scintilla/makefile.win32 2007-01-20 14:46:04 UTC (rev 1210) @@ -62,7 +62,7 @@ LEXOBJS=\ LexBash.o LexAsm.o LexCSS.o LexConf.o LexCPP.o LexCrontab.o LexHTML.o LexOthers.o LexPascal.o \ LexPerl.o LexPython.o LexSQL.o LexCaml.o LexOMS.o LexTCL.o LexRuby.o LexFortran.o LexVHDL.o \ -LexD.o LeyLua.o +LexD.o LexLua.o #--Autogenerated -- end of automatically generated section all: $(COMPLIB) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1209] trunk
by eht16＠users.sourceforge.net 20 Jan '07

20 Jan '07

Revision: 1209 http://svn.sourceforge.net/geany/?rev=1209&view=rev Author: eht16 Date: 2007-01-19 15:17:40 -0800 (Fri, 19 Jan 2007) Log Message: ----------- Fixed crashes when using some dialogs after they were closed before. Modified Paths: -------------- trunk/ChangeLog trunk/src/dialogs.c trunk/src/prefs.c trunk/src/prefs.h trunk/src/search.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-01-19 18:19:58 UTC (rev 1208) +++ trunk/ChangeLog 2007-01-19 23:17:40 UTC (rev 1209) @@ -4,6 +4,8 @@ available on all systems. * geany.desktop.in: Added more mimetypes supplied by Nick Schermer. * doc/geany.docbook: Documented GEANY_PROJECT_EXT. + * src/dialogs.c, src/prefs.c, src/prefs.h, src/search.c: + Fixed crashes when using some dialogs after they were closed before. 2007-01-18 Enrico Tröger <enrico.troeger(a)uvena.de> Modified: trunk/src/dialogs.c =================================================================== --- trunk/src/dialogs.c 2007-01-19 18:19:58 UTC (rev 1208) +++ trunk/src/dialogs.c 2007-01-19 23:17:40 UTC (rev 1209) @@ -127,7 +127,7 @@ g_signal_connect((gpointer) app->open_filesel, "selection-changed", G_CALLBACK(on_file_open_selection_changed), NULL); g_signal_connect ((gpointer) app->open_filesel, "delete_event", - G_CALLBACK(gtk_widget_hide), NULL); + G_CALLBACK(gtk_widget_hide_on_delete), NULL); g_signal_connect((gpointer) app->open_filesel, "response", G_CALLBACK(on_file_open_dialog_response), NULL); } @@ -267,8 +267,10 @@ gtk_window_set_type_hint(GTK_WINDOW(app->save_filesel), GDK_WINDOW_TYPE_HINT_DIALOG); gtk_dialog_set_default_response(GTK_DIALOG(app->save_filesel), GTK_RESPONSE_ACCEPT); - g_signal_connect((gpointer) app->save_filesel, "delete_event", G_CALLBACK(gtk_widget_hide), NULL); - g_signal_connect((gpointer) app->save_filesel, "response", G_CALLBACK(on_file_save_dialog_response), NULL); + g_signal_connect((gpointer) app->save_filesel, "delete_event", + G_CALLBACK(gtk_widget_hide_on_delete), NULL); + g_signal_connect((gpointer) app->save_filesel, "response", + G_CALLBACK(on_file_save_dialog_response), NULL); gtk_window_set_transient_for(GTK_WINDOW(app->save_filesel), GTK_WINDOW(app->window)); } @@ -415,7 +417,7 @@ gtk_widget_show(GTK_FONT_SELECTION_DIALOG(app->open_fontsel)->apply_button); g_signal_connect((gpointer) app->open_fontsel, - "delete_event", G_CALLBACK(gtk_widget_hide), NULL); + "delete_event", G_CALLBACK(gtk_widget_hide_on_delete), NULL); g_signal_connect((gpointer) GTK_FONT_SELECTION_DIALOG(app->open_fontsel)->ok_button, "clicked", G_CALLBACK(on_font_ok_button_clicked), NULL); g_signal_connect((gpointer) GTK_FONT_SELECTION_DIALOG(app->open_fontsel)->cancel_button, @@ -423,7 +425,8 @@ g_signal_connect((gpointer) GTK_FONT_SELECTION_DIALOG(app->open_fontsel)->apply_button, "clicked", G_CALLBACK(on_font_apply_button_clicked), NULL); - gtk_font_selection_dialog_set_font_name(GTK_FONT_SELECTION_DIALOG(app->open_fontsel), app->editor_font); + gtk_font_selection_dialog_set_font_name( + GTK_FONT_SELECTION_DIALOG(app->open_fontsel), app->editor_font); gtk_window_set_transient_for(GTK_WINDOW(app->open_fontsel), GTK_WINDOW(app->window)); } /* We make sure the dialog is visible. */ @@ -546,7 +549,7 @@ g_signal_connect(GTK_COLOR_SELECTION_DIALOG(app->open_colorsel)->ok_button, "clicked", G_CALLBACK(on_color_ok_button_clicked), NULL); g_signal_connect(app->open_colorsel, "delete_event", - G_CALLBACK(gtk_widget_hide), NULL); + G_CALLBACK(gtk_widget_hide_on_delete), NULL); } // if colour is non-NULL set it in the dialog as preselected colour if (colour != NULL && (colour[0] == '0' || colour[0] == '#')) Modified: trunk/src/prefs.c =================================================================== --- trunk/src/prefs.c 2007-01-19 18:19:58 UTC (rev 1208) +++ trunk/src/prefs.c 2007-01-19 23:17:40 UTC (rev 1209) @@ -684,14 +684,6 @@ } -gboolean on_prefs_delete_event(GtkWidget *widget, GdkEvent *event, gpointer user_data) -{ - gtk_widget_hide(widget); - - return TRUE; -} - - void on_prefs_color_choosed(GtkColorButton *widget, gpointer user_data) { GdkColor color; @@ -987,8 +979,10 @@ vte_append_preferences_tab(); #endif - g_signal_connect((gpointer) app->prefs_dialog, "response", G_CALLBACK(on_prefs_button_clicked), NULL); - g_signal_connect((gpointer) app->prefs_dialog, "delete_event", G_CALLBACK(on_prefs_delete_event), NULL); + g_signal_connect((gpointer) app->prefs_dialog, "response", + G_CALLBACK(on_prefs_button_clicked), NULL); + g_signal_connect((gpointer) app->prefs_dialog, "delete_event", + G_CALLBACK(gtk_widget_hide_on_delete), NULL); g_signal_connect((gpointer) lookup_widget(app->prefs_dialog, "tagbar_font"), "font-set", G_CALLBACK(on_prefs_font_choosed), GINT_TO_POINTER(1)); g_signal_connect((gpointer) lookup_widget(app->prefs_dialog, "msgwin_font"), Modified: trunk/src/prefs.h =================================================================== --- trunk/src/prefs.h 2007-01-19 18:19:58 UTC (rev 1208) +++ trunk/src/prefs.h 2007-01-19 23:17:40 UTC (rev 1209) @@ -28,8 +28,6 @@ void on_prefs_button_clicked(GtkDialog *dialog, gint response, gpointer user_data); -gboolean on_prefs_delete_event(GtkWidget *widget, GdkEvent *event, gpointer user_data); - void on_prefs_font_choosed(GtkFontButton *widget, gpointer user_data); void on_prefs_color_choosed(GtkColorButton *widget, gpointer user_data); Modified: trunk/src/search.c =================================================================== --- trunk/src/search.c 2007-01-19 18:19:58 UTC (rev 1208) +++ trunk/src/search.c 2007-01-19 23:17:40 UTC (rev 1209) @@ -286,7 +286,7 @@ g_signal_connect((gpointer) widgets.find_dialog, "response", G_CALLBACK(on_find_dialog_response), entry); g_signal_connect((gpointer) widgets.find_dialog, "delete_event", - G_CALLBACK(gtk_widget_hide), NULL); + G_CALLBACK(gtk_widget_hide_on_delete), NULL); sbox = gtk_hbox_new(FALSE, 6); gtk_box_pack_start(GTK_BOX(sbox), label, FALSE, FALSE, 0); @@ -416,7 +416,7 @@ g_signal_connect((gpointer) widgets.replace_dialog, "response", G_CALLBACK(on_replace_dialog_response), entry_replace); g_signal_connect((gpointer) widgets.replace_dialog, "delete_event", - G_CALLBACK(gtk_widget_hide), NULL); + G_CALLBACK(gtk_widget_hide_on_delete), NULL); fbox = gtk_hbox_new(FALSE, 6); gtk_box_pack_start(GTK_BOX(fbox), label_find, FALSE, FALSE, 0); @@ -620,7 +620,7 @@ g_signal_connect((gpointer) widgets.find_in_files_dialog, "response", G_CALLBACK(on_find_in_files_dialog_response), combo); g_signal_connect((gpointer) widgets.find_in_files_dialog, "delete_event", - G_CALLBACK(gtk_widget_hide), NULL); + G_CALLBACK(gtk_widget_hide_on_delete), NULL); gtk_widget_show_all(widgets.find_in_files_dialog); sel = get_default_text(idx); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

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

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits January 2007