Commits October 2008

commits@lists.geany.org

3 participants
118 discussions

SF.net SVN: geany:[3164] trunk/po
by frlan＠users.sourceforge.net 31 Oct '08

31 Oct '08

Revision: 3164 http://geany.svn.sourceforge.net/geany/?rev=3164&view=rev Author: frlan Date: 2008-10-31 12:29:34 +0000 (Fri, 31 Oct 2008) Log Message: ----------- Little update of French translation. Closes #2210060. Modified Paths: -------------- trunk/po/ChangeLog trunk/po/fr.po Modified: trunk/po/ChangeLog =================================================================== --- trunk/po/ChangeLog 2008-10-30 15:23:27 UTC (rev 3163) +++ trunk/po/ChangeLog 2008-10-31 12:29:34 UTC (rev 3164) @@ -1,3 +1,9 @@ +2008-10-31 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> + + * fr.po: Little update of French translation. Closes #2210060. + Thanks to Colomban Wendling for reporting. + + 2008-10-29 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> * de.po: Little update of German translation Modified: trunk/po/fr.po =================================================================== --- trunk/po/fr.po 2008-10-30 15:23:27 UTC (rev 3163) +++ trunk/po/fr.po 2008-10-31 12:29:34 UTC (rev 3164) @@ -2848,7 +2848,7 @@ #: ../src/interface.c:4781 ../src/printing.c:348 msgid "Print page numbers" -msgstr "Afficher les numéros de ligne" +msgstr "Afficher les numéros de page" #: ../src/interface.c:4784 ../src/printing.c:350 msgid "" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3163] trunk
by eht16＠users.sourceforge.net 30 Oct '08

30 Oct '08

Revision: 3163 http://geany.svn.sourceforge.net/geany/?rev=3163&view=rev Author: eht16 Date: 2008-10-30 15:23:27 +0000 (Thu, 30 Oct 2008) Log Message: ----------- Revert last change as it breaks (again) the primary X selection as well as the mouse cursor on the scrollbar. Modified Paths: -------------- trunk/ChangeLog trunk/plugins/splitwindow.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-10-29 21:27:14 UTC (rev 3162) +++ trunk/ChangeLog 2008-10-30 15:23:27 UTC (rev 3163) @@ -1,3 +1,10 @@ +2008-10-30 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * plugins/splitwindow.c: + Revert last change as it breaks (again) the primary X selection as + well as the mouse cursor on the scrollbar. + + 2008-10-29 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * plugins/splitwindow.c: Modified: trunk/plugins/splitwindow.c =================================================================== --- trunk/plugins/splitwindow.c 2008-10-29 21:27:14 UTC (rev 3162) +++ trunk/plugins/splitwindow.c 2008-10-30 15:23:27 UTC (rev 3163) @@ -295,8 +295,8 @@ p_support->lookup_widget(geany->main_widgets->window, "vbox1")); pane = gtk_hpaned_new(); + gtk_container_add(GTK_CONTAINER(parent), pane); gtk_widget_reparent(notebook, pane); - gtk_container_add(GTK_CONTAINER(parent), pane); box = gtk_vbox_new(FALSE, 0); toolbar = create_toolbar(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3162] trunk/po
by frlan＠users.sourceforge.net 30 Oct '08

30 Oct '08

Revision: 3162 http://geany.svn.sourceforge.net/geany/?rev=3162&view=rev Author: frlan Date: 2008-10-29 21:27:14 +0000 (Wed, 29 Oct 2008) Log Message: ----------- Little update of German translation Modified Paths: -------------- trunk/po/ChangeLog trunk/po/de.po Modified: trunk/po/ChangeLog =================================================================== --- trunk/po/ChangeLog 2008-10-29 20:52:22 UTC (rev 3161) +++ trunk/po/ChangeLog 2008-10-29 21:27:14 UTC (rev 3162) @@ -1,3 +1,8 @@ +2008-10-29 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> + + * de.po: Little update of German translation + + 2008-10-24 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> * fr.po: Update of French translation. Thanks to Roland Baudin. Modified: trunk/po/de.po =================================================================== --- trunk/po/de.po 2008-10-29 20:52:22 UTC (rev 3161) +++ trunk/po/de.po 2008-10-29 21:27:14 UTC (rev 3162) @@ -9,9 +9,9 @@ msgstr "" "Project-Id-Version: geany 0.15\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-10-18 17:18+0200\n" -"PO-Revision-Date: 2008-10-17 17:35+0100\n" -"Last-Translator: Dominic Hopf <dh(a)dmaphy.de>\n" +"POT-Creation-Date: 2008-10-29 22:22+0100\n" +"PO-Revision-Date: 2008-10-29 22:26+0100\n" +"Last-Translator: Frank Lanitz <frank(a)frank.uvena.de>\n" "Language-Team: German <geany-i18n(a)uvena.de>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" @@ -25,7 +25,7 @@ msgid "A fast and lightweight IDE using GTK2" msgstr "Eine kleine und schnelle Entwicklungsumgebung für GTK2" -#: ../geany.desktop.in.h:2 ../src/interface.c:291 ../src/interface.c:1741 +#: ../geany.desktop.in.h:2 ../src/interface.c:297 ../src/interface.c:1785 msgid "Geany" msgstr "Geany" @@ -175,7 +175,7 @@ msgstr "Kompiliert die aktuelle Datei" #. build the code -#: ../src/build.c:1051 ../src/interface.c:992 +#: ../src/build.c:1051 ../src/interface.c:998 msgid "_Build" msgstr "_Erstellen" @@ -219,7 +219,7 @@ msgid "_Previous Error" msgstr "_Vorheriger Fehler" -#: ../src/build.c:1124 ../src/interface.c:1154 +#: ../src/build.c:1124 ../src/interface.c:1184 msgid "Run or view the current file" msgstr "Aktuelle Datei anzeigen oder ausführen" @@ -335,7 +335,7 @@ msgid "Build:" msgstr "Erstellen:" -#: ../src/build.c:1593 ../src/dialogs.c:1242 +#: ../src/build.c:1593 ../src/dialogs.c:1216 msgid "Execute:" msgstr "Ausführen:" @@ -365,7 +365,7 @@ msgid "Do you really want to quit?" msgstr "Soll Geany wirklich beendet werden?" -#: ../src/callbacks.c:460 ../src/document.c:2537 ../src/interface.c:365 +#: ../src/callbacks.c:460 ../src/document.c:2535 ../src/interface.c:371 #: ../src/treeviews.c:454 msgid "_Reload" msgstr "_Neu laden" @@ -379,44 +379,52 @@ msgid "Are you sure you want to reload '%s'?" msgstr "Möchten Sie %s wirklich neu laden?" -#: ../src/callbacks.c:1287 ../src/callbacks.c:1312 +#: ../src/callbacks.c:1177 ../src/keybindings.c:348 +msgid "Go to Line" +msgstr "Gehe zu Zeile" + +#: ../src/callbacks.c:1177 +msgid "Enter the line you want to go to:" +msgstr "Geben Sie die Zeile an, zu der Sie springen möchten:" + +#: ../src/callbacks.c:1294 ../src/callbacks.c:1319 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:1423 ../src/ui_utils.c:516 +#: ../src/callbacks.c:1430 ../src/ui_utils.c:516 msgid "dd.mm.yyyy" msgstr "TT.MM.JJJJ" -#: ../src/callbacks.c:1425 ../src/ui_utils.c:517 +#: ../src/callbacks.c:1432 ../src/ui_utils.c:517 msgid "mm.dd.yyyy" msgstr "MM.TT.JJJJ" -#: ../src/callbacks.c:1427 ../src/ui_utils.c:518 +#: ../src/callbacks.c:1434 ../src/ui_utils.c:518 msgid "yyyy/mm/dd" msgstr "JJJJ/MM/TT" -#: ../src/callbacks.c:1429 ../src/ui_utils.c:527 +#: ../src/callbacks.c:1436 ../src/ui_utils.c:527 msgid "dd.mm.yyyy hh:mm:ss" msgstr "TT.MM.JJJJ Stunden:Minuten:Sekunden" -#: ../src/callbacks.c:1431 ../src/ui_utils.c:528 +#: ../src/callbacks.c:1438 ../src/ui_utils.c:528 msgid "mm.dd.yyyy hh:mm:ss" msgstr "MM.TT.JJJJ Stunden:Minuten:Sekunden" -#: ../src/callbacks.c:1433 ../src/ui_utils.c:529 +#: ../src/callbacks.c:1440 ../src/ui_utils.c:529 msgid "yyyy/mm/dd hh:mm:ss" msgstr "JJJJ/MM/TT Stunden:Minuten:Sekunden" -#: ../src/callbacks.c:1435 ../src/ui_utils.c:538 +#: ../src/callbacks.c:1442 ../src/ui_utils.c:538 msgid "_Use Custom Date Format" msgstr "Benutze selbst erstelltes _Datumsformat" -#: ../src/callbacks.c:1446 +#: ../src/callbacks.c:1453 msgid "Custom Date Format" msgstr "Benutzerdefiniertes Datumsformat" -#: ../src/callbacks.c:1447 +#: ../src/callbacks.c:1454 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." @@ -425,21 +433,21 @@ "können alle Platzhalter verwendet werden, die auch in der ANSI C Funktion " "»strftime« zum Einsatz kommen." -#: ../src/callbacks.c:1466 +#: ../src/callbacks.c:1473 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:1748 ../src/callbacks.c:1758 +#: ../src/callbacks.c:1755 ../src/callbacks.c:1765 msgid "No more message items." msgstr "Keine weiteren Nachrichten." #. initialize the dialog -#: ../src/dialogs.c:178 ../src/prefs.c:1689 +#: ../src/dialogs.c:178 ../src/prefs.c:1701 msgid "Open File" msgstr "Datei öffnen" -#: ../src/dialogs.c:182 ../src/interface.c:718 +#: ../src/dialogs.c:182 ../src/interface.c:724 msgid "_View" msgstr "_Ansicht" @@ -455,7 +463,7 @@ msgid "Detect by file extension" msgstr "Durch Dateiendung erkennen" -#: ../src/dialogs.c:231 ../src/interface.c:3694 +#: ../src/dialogs.c:231 ../src/interface.c:3755 msgid "Detect from file" msgstr "Aus Datei lesen" @@ -543,15 +551,7 @@ msgid "Choose font" msgstr "Schriftart auswählen" -#: ../src/dialogs.c:972 ../src/keybindings.c:348 -msgid "Go to Line" -msgstr "Gehe zu Zeile" - -#: ../src/dialogs.c:979 -msgid "Enter the line you want to go to:" -msgstr "Geben Sie die Zeile an, zu der Sie springen möchten:" - -#: ../src/dialogs.c:1026 +#: ../src/dialogs.c:1000 msgid "" "An error occurred or file information could not be retrieved (e.g. from a " "new file)." @@ -559,87 +559,87 @@ "Es ist ein Fehler aufgetreten oder Datei-Informationen konnten nicht gelesen " "werden (z.B. bei einer neuen, noch nicht gespeicherten Datei)." -#: ../src/dialogs.c:1045 ../src/dialogs.c:1046 ../src/dialogs.c:1047 -#: ../src/dialogs.c:1053 ../src/dialogs.c:1054 ../src/dialogs.c:1055 -#: ../src/symbols.c:1388 ../src/symbols.c:1409 ../src/symbols.c:1461 +#: ../src/dialogs.c:1019 ../src/dialogs.c:1020 ../src/dialogs.c:1021 +#: ../src/dialogs.c:1027 ../src/dialogs.c:1028 ../src/dialogs.c:1029 +#: ../src/symbols.c:1386 ../src/symbols.c:1407 ../src/symbols.c:1459 #: ../src/ui_utils.c:195 msgid "unknown" msgstr "unbekannt" -#: ../src/dialogs.c:1059 +#: ../src/dialogs.c:1033 msgid "Properties" msgstr "Eigenschaften" -#: ../src/dialogs.c:1089 +#: ../src/dialogs.c:1063 msgid "Type:" msgstr "Dateityp:" -#: ../src/dialogs.c:1103 +#: ../src/dialogs.c:1077 msgid "Size:" msgstr "Größe:" -#: ../src/dialogs.c:1119 +#: ../src/dialogs.c:1093 msgid "Location:" msgstr "Ort:" -#: ../src/dialogs.c:1133 +#: ../src/dialogs.c:1107 msgid "Read-only:" msgstr "Schreibgeschützt:" -#: ../src/dialogs.c:1140 +#: ../src/dialogs.c:1114 msgid "(only inside Geany)" msgstr "(nur innerhalb von Geany)" -#: ../src/dialogs.c:1149 +#: ../src/dialogs.c:1123 msgid "Encoding:" msgstr "Kodierung:" #. BOM = byte order mark -#: ../src/dialogs.c:1159 ../src/ui_utils.c:198 +#: ../src/dialogs.c:1133 ../src/ui_utils.c:198 msgid "(with BOM)" msgstr "(mit BOM)" -#: ../src/dialogs.c:1159 +#: ../src/dialogs.c:1133 msgid "(without BOM)" msgstr "(ohne BOM)" -#: ../src/dialogs.c:1170 +#: ../src/dialogs.c:1144 msgid "Modified:" msgstr "Modifiziert:" -#: ../src/dialogs.c:1184 +#: ../src/dialogs.c:1158 msgid "Changed:" msgstr "Geändert:" -#: ../src/dialogs.c:1198 +#: ../src/dialogs.c:1172 msgid "Accessed:" msgstr "Zugriff:" -#: ../src/dialogs.c:1220 +#: ../src/dialogs.c:1194 msgid "Permissions:" msgstr "Berechtigungen:" #. Header -#: ../src/dialogs.c:1228 +#: ../src/dialogs.c:1202 msgid "Read:" msgstr "Lesen:" -#: ../src/dialogs.c:1235 +#: ../src/dialogs.c:1209 msgid "Write:" msgstr "Schreiben:" #. Owner -#: ../src/dialogs.c:1250 +#: ../src/dialogs.c:1224 msgid "Owner:" msgstr "Eigentümer:" #. Group -#: ../src/dialogs.c:1286 +#: ../src/dialogs.c:1260 msgid "Group:" msgstr "Gruppe:" #. Other -#: ../src/dialogs.c:1322 +#: ../src/dialogs.c:1296 msgid "Other:" msgstr "Andere:" @@ -653,12 +653,12 @@ msgid "New file \"%s\" opened." msgstr "Neue Datei \"%s\" geöffnet." -#: ../src/document.c:761 ../src/document.c:1225 +#: ../src/document.c:759 ../src/document.c:1223 #, c-format msgid "Could not open file %s (%s)" msgstr "Konnte Datei '%s' nicht öffnen (%s)." -#: ../src/document.c:791 +#: ../src/document.c:788 #, c-format msgid "" "The file \"%s\" could not be opened properly and has been truncated. This " @@ -671,12 +671,12 @@ "enthält und kann zu Datenverlust beim Speichern führen!\n" "Die Datei wird schreibgeschützt geöffnet." -#: ../src/document.c:815 +#: ../src/document.c:812 #, c-format msgid "The file \"%s\" is not valid %s." msgstr "Die Datei \"%s\" ist kein gültiges %s." -#: ../src/document.c:824 +#: ../src/document.c:822 #, c-format msgid "" "The file \"%s\" does not look like a text file or the file encoding is not " @@ -685,44 +685,44 @@ "Die Datei \"%s\" scheint keine Textdatei zu sein, oder die Zeichenkodierung " "wird nicht unterstützt." -#: ../src/document.c:961 +#: ../src/document.c:959 msgid "Spaces" msgstr "Leerzeichen" -#: ../src/document.c:964 +#: ../src/document.c:962 msgid "Tabs" msgstr "Tabulatoren" -#: ../src/document.c:967 +#: ../src/document.c:965 msgid "Tabs and Spaces" msgstr "Tabulatoren und Leerzeichen" #. For translators: first wildcard is the indentation mode (Spaces, Tabs, Tabs #. * and Spaces), the second one is the filename -#: ../src/document.c:972 +#: ../src/document.c:970 #, c-format msgid "Setting %s indentation mode for %s." msgstr "Setze Einrückungsmodus %s für %s." -#: ../src/document.c:1009 +#: ../src/document.c:1007 msgid "Invalid filename" msgstr "Ungültiger Dateiname" -#: ../src/document.c:1120 +#: ../src/document.c:1118 #, c-format msgid "File %s reloaded." msgstr "Datei %s neu geladen." -#: ../src/document.c:1122 +#: ../src/document.c:1120 #, c-format msgid "File %s opened(%d%s)." msgstr "Datei %s geöffnet (%d%s)." -#: ../src/document.c:1124 +#: ../src/document.c:1122 msgid ", read-only" msgstr ", schreibgeschützt" -#: ../src/document.c:1351 +#: ../src/document.c:1349 #, c-format msgid "" "An error occurred while converting the file from UTF-8 in \"%s\". The file " @@ -731,7 +731,7 @@ "Beim Konvertieren der Datei von UTF-8 nach \"%s\" ist ein Fehler " "aufgetreten. Die Datei bleibt ungespeichert." -#: ../src/document.c:1373 +#: ../src/document.c:1371 #, c-format msgid "" "Error message: %s\n" @@ -740,52 +740,52 @@ "Fehlermeldung: %s\n" "Der Fehler trat bei \"%s\" (Zeile: %d, Spalte: %d) auf." -#: ../src/document.c:1378 +#: ../src/document.c:1376 #, c-format msgid "Error message: %s." msgstr "Fehlermeldung: %s." -#: ../src/document.c:1454 ../src/document.c:1510 +#: ../src/document.c:1452 ../src/document.c:1508 msgid "Error saving file." msgstr "Fehler beim Speichern der Datei." -#: ../src/document.c:1508 +#: ../src/document.c:1506 #, c-format msgid "Error saving file (%s)." msgstr "Fehler beim Speichern der Datei (%s)." -#: ../src/document.c:1541 +#: ../src/document.c:1539 #, c-format msgid "File %s saved." msgstr "Datei %s wurde gespeichert." -#: ../src/document.c:1609 ../src/document.c:1664 ../src/document.c:1672 +#: ../src/document.c:1607 ../src/document.c:1662 ../src/document.c:1670 #, c-format msgid "\"%s\" was not found." msgstr "\"%s\" wurde nicht gefunden." -#: ../src/document.c:1672 +#: ../src/document.c:1670 msgid "Wrap search and find again?" msgstr "Suche vom Dokumentanfang bzw. -ende neu beginnen?" -#: ../src/document.c:1749 ../src/search.c:913 ../src/search.c:1426 +#: ../src/document.c:1747 ../src/search.c:913 ../src/search.c:1426 #: ../src/search.c:1427 #, c-format msgid "No matches found for \"%s\"." msgstr "Keine Treffer für \"%s\" gefunden." -#: ../src/document.c:1760 ../src/document.c:1769 +#: ../src/document.c:1758 ../src/document.c:1767 #, c-format msgid "%s: replaced %d occurrence of \"%s\" with \"%s\"." msgid_plural "%s: replaced %d occurrences of \"%s\" with \"%s\"." msgstr[0] "%s: %d mal wurde \"%s\" mit \"%s\" ersetzt." msgstr[1] "%s: %d mal wurde \"%s\" mit \"%s\" ersetzt." -#: ../src/document.c:2538 +#: ../src/document.c:2536 msgid "Do you want to reload it?" msgstr "Möchten Sie die Datei neu laden?" -#: ../src/document.c:2539 +#: ../src/document.c:2537 #, c-format msgid "" "The file '%s' on the disk is more recent than\n" @@ -794,32 +794,32 @@ "Die Datei '%s' auf dem Datenträger ist aktueller als die momentan geöffnete " "Version." -#: ../src/document.c:2583 +#: ../src/document.c:2581 msgid "Try to resave the file?" msgstr "Versuchen die Datei erneut zu speichern?" -#: ../src/document.c:2584 +#: ../src/document.c:2582 #, c-format msgid "File \"%s\" was not found on disk!" msgstr "\"%s\" wurde nicht auf dem Datenträger gefunden." -#: ../src/editor.c:3504 ../src/utils.c:291 +#: ../src/editor.c:3550 ../src/utils.c:291 msgid "Win (CRLF)" msgstr "Win (CRLF)" -#: ../src/editor.c:3505 ../src/utils.c:292 +#: ../src/editor.c:3551 ../src/utils.c:292 msgid "Mac (CR)" msgstr "Mac (CR)" -#: ../src/editor.c:3506 ../src/utils.c:293 +#: ../src/editor.c:3552 ../src/utils.c:293 msgid "Unix (LF)" msgstr "Unix (LF)" -#: ../src/editor.c:3632 +#: ../src/editor.c:3678 msgid "Enter Tab Width" msgstr "Tabulatorbreite:" -#: ../src/editor.c:3633 +#: ../src/editor.c:3679 msgid "Enter the amount of spaces which should be replaced by a tab character." msgstr "" "Geben Sie die Anzahl der Leerzeichen an, welche durch den Tabulator ersetzt " @@ -1032,16 +1032,16 @@ msgid "M_iscellaneous Languages" msgstr "_Sonstige Sprachen" -#: ../src/filetypes.c:612 ../src/interface.c:3613 ../src/templates.c:347 +#: ../src/filetypes.c:612 ../src/interface.c:3674 ../src/templates.c:347 #: ../src/ui_utils.c:148 msgid "None" msgstr "Keiner" -#: ../src/filetypes.c:1149 ../src/win32.c:107 +#: ../src/filetypes.c:1161 ../src/win32.c:107 msgid "All Source" msgstr "Alle Quellen" -#: ../src/filetypes.c:1227 +#: ../src/filetypes.c:1239 #, c-format msgid "Bad regex for filetype %s: %s" msgstr "Schlechte RegEx für Dateityp %s: %s" @@ -1050,261 +1050,261 @@ msgid "untitled" msgstr "unbenannt" -#: ../src/interface.c:301 +#: ../src/interface.c:307 msgid "_File" msgstr "_Datei" -#: ../src/interface.c:312 +#: ../src/interface.c:318 msgid "New (with _Template)" msgstr "Neu (aus _Vorlage)" -#: ../src/interface.c:323 ../src/interface.c:384 ../src/interface.c:562 -#: ../src/interface.c:622 ../src/interface.c:636 ../src/interface.c:866 -#: ../src/interface.c:876 ../src/interface.c:2284 ../src/interface.c:2344 -#: ../src/interface.c:2358 +#: ../src/interface.c:329 ../src/interface.c:390 ../src/interface.c:568 +#: ../src/interface.c:628 ../src/interface.c:642 ../src/interface.c:872 +#: ../src/interface.c:882 ../src/interface.c:2333 ../src/interface.c:2393 +#: ../src/interface.c:2407 msgid "invisible" msgstr "unsichtbar" -#: ../src/interface.c:335 ../src/interface.c:2210 +#: ../src/interface.c:341 ../src/interface.c:2259 msgid "Open Selected F_ile" msgstr "_Markierte Datei öffnen" -#: ../src/interface.c:339 +#: ../src/interface.c:345 msgid "Recent _Files" msgstr "_Zuletzt geöffnet" -#: ../src/interface.c:356 +#: ../src/interface.c:362 msgid "Save A_ll" msgstr "A_lle speichern" -#: ../src/interface.c:359 +#: ../src/interface.c:365 msgid "Saves all open files" msgstr "Speichert alle offenen Dateien" -#: ../src/interface.c:373 +#: ../src/interface.c:379 msgid "R_eload As" msgstr "N_eu laden als" -#: ../src/interface.c:401 +#: ../src/interface.c:407 msgid "Page Set_up" msgstr "Seiteneigensc_haften" -#: ../src/interface.c:408 +#: ../src/interface.c:414 msgid "Prints the current file" msgstr "Druckt die aktuelle Datei" -#: ../src/interface.c:419 +#: ../src/interface.c:425 msgid "Close Ot_her Documents" msgstr "_Inaktive Dateien schließen" -#: ../src/interface.c:427 +#: ../src/interface.c:433 msgid "C_lose All" msgstr "_Alle schließen" -#: ../src/interface.c:430 +#: ../src/interface.c:436 msgid "Closes all open files" msgstr "Schließt alle geöffneten Dateien" -#: ../src/interface.c:444 ../src/interface.c:1246 +#: ../src/interface.c:450 ../src/interface.c:1278 msgid "Quit Geany" msgstr "Geany beenden" -#: ../src/interface.c:446 +#: ../src/interface.c:452 msgid "_Edit" msgstr "_Bearbeiten" -#: ../src/interface.c:487 ../src/interface.c:2201 +#: ../src/interface.c:493 ../src/interface.c:2250 msgid "Select _All" msgstr "A_lles auswählen" -#: ../src/interface.c:496 ../src/interface.c:2219 +#: ../src/interface.c:502 ../src/interface.c:2268 msgid "_Format" msgstr "_Format" -#: ../src/interface.c:499 +#: ../src/interface.c:505 msgid "Convert the case of the current selection" msgstr "Ändert die Großschreibung der aktuellen Auswahl" -#: ../src/interface.c:504 ../src/interface.c:2226 +#: ../src/interface.c:510 ../src/interface.c:2275 msgid "T_oggle Case of Selection" msgstr "_Groß- und Kleinschreibung bei Auswahl vertauschen" -#: ../src/interface.c:513 ../src/interface.c:2235 +#: ../src/interface.c:519 ../src/interface.c:2284 msgid "_Comment Line(s)" msgstr "Zeile(n) _auskommentieren" -#: ../src/interface.c:517 ../src/interface.c:2239 +#: ../src/interface.c:523 ../src/interface.c:2288 msgid "U_ncomment Line(s)" msgstr "Zeile(n) _einkommentieren" -#: ../src/interface.c:521 ../src/interface.c:2243 +#: ../src/interface.c:527 ../src/interface.c:2292 msgid "_Toggle Line Commentation" msgstr "Kommentierung _umschalten" -#: ../src/interface.c:525 ../src/interface.c:2247 +#: ../src/interface.c:531 ../src/interface.c:2296 msgid "Du_plicate Line or Selection" msgstr "_Zeile oder Auswahl kopieren" -#: ../src/interface.c:534 ../src/interface.c:2256 +#: ../src/interface.c:540 ../src/interface.c:2305 msgid "_Increase Indent" msgstr "Einzug _erhöhen" -#: ../src/interface.c:542 ../src/interface.c:2264 +#: ../src/interface.c:548 ../src/interface.c:2313 msgid "_Decrease Indent" msgstr "Einzug _verringern" -#: ../src/interface.c:555 ../src/interface.c:2277 +#: ../src/interface.c:561 ../src/interface.c:2326 msgid "_Send Selection to" msgstr "_Auswahl senden an" -#: ../src/interface.c:570 ../src/interface.c:2292 +#: ../src/interface.c:576 ../src/interface.c:2341 msgid "I_nsert Comments" msgstr "K_ommentare einfügen" -#: ../src/interface.c:581 ../src/interface.c:2303 +#: ../src/interface.c:587 ../src/interface.c:2352 msgid "Insert _ChangeLog Entry" msgstr "_ChangeLog-Eintrag hinzufügen" -#: ../src/interface.c:584 ../src/interface.c:2306 +#: ../src/interface.c:590 ../src/interface.c:2355 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:586 ../src/interface.c:2308 +#: ../src/interface.c:592 ../src/interface.c:2357 msgid "Insert File _Header" msgstr "_Dateikopf einfügen" -#: ../src/interface.c:589 ../src/interface.c:2311 +#: ../src/interface.c:595 ../src/interface.c:2360 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:591 ../src/interface.c:2313 +#: ../src/interface.c:597 ../src/interface.c:2362 msgid "Insert _Function Description" msgstr "_Funktionsbeschreibung einfügen" -#: ../src/interface.c:594 ../src/interface.c:2316 +#: ../src/interface.c:600 ../src/interface.c:2365 msgid "Inserts a description before the current function" msgstr "Fügt eine Funktionsbeschreibung vor der Funktion ein." -#: ../src/interface.c:596 ../src/interface.c:2318 +#: ../src/interface.c:602 ../src/interface.c:2367 msgid "Insert _Multiline Comment" msgstr "_Mehrzeiligen Kommentar einfügen" -#: ../src/interface.c:599 ../src/interface.c:2321 +#: ../src/interface.c:605 ../src/interface.c:2370 msgid "Inserts a multiline comment" msgstr "Fügt einen mehrzeiligen Kommentar ein." -#: ../src/interface.c:601 ../src/interface.c:2323 +#: ../src/interface.c:607 ../src/interface.c:2372 msgid "Insert _GPL Notice" msgstr "_GPL-Hinweis einfügen" -#: ../src/interface.c:604 ../src/interface.c:2326 +#: ../src/interface.c:610 ../src/interface.c:2375 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)." -#: ../src/interface.c:606 ../src/interface.c:2328 +#: ../src/interface.c:612 ../src/interface.c:2377 msgid "Insert _BSD License Notice" msgstr "_BSD-Lizenz-Hinweis einfügen" -#: ../src/interface.c:609 ../src/interface.c:2331 +#: ../src/interface.c:615 ../src/interface.c:2380 msgid "" "Inserts a BSD license 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:611 ../src/interface.c:2333 +#: ../src/interface.c:617 ../src/interface.c:2382 msgid "Insert Dat_e" msgstr "_Datum einfügen" -#: ../src/interface.c:625 ../src/interface.c:2347 +#: ../src/interface.c:631 ../src/interface.c:2396 msgid "_Insert \"include <...>\"" msgstr "\"include <...>\" ei_nfügen" -#: ../src/interface.c:648 +#: ../src/interface.c:654 msgid "_Search" msgstr "_Suchen" -#: ../src/interface.c:659 +#: ../src/interface.c:665 msgid "Find _Next" msgstr "_Nächstes" -#: ../src/interface.c:663 +#: ../src/interface.c:669 msgid "Find _Previous" msgstr "_Vorheriges" -#: ../src/interface.c:667 +#: ../src/interface.c:673 msgid "Find in F_iles" msgstr "In _Dateien suchen" -#: ../src/interface.c:671 ../src/search.c:437 +#: ../src/interface.c:677 ../src/search.c:437 msgid "_Replace" msgstr "_Ersetzen" -#: ../src/interface.c:684 +#: ../src/interface.c:690 msgid "Find _Selected" msgstr "Auswahl _finden" -#: ../src/interface.c:688 +#: ../src/interface.c:694 msgid "Find Pre_vious Selected" msgstr "Auswahl finden (_rückwärts)" -#: ../src/interface.c:697 +#: ../src/interface.c:703 msgid "Next _Message" msgstr "Nä_chste Nachricht" -#: ../src/interface.c:701 +#: ../src/interface.c:707 msgid "Pr_evious Message" msgstr "V_orherige Nachricht" -#: ../src/interface.c:710 ../src/interface.c:2399 +#: ../src/interface.c:716 ../src/interface.c:2448 msgid "_Go to Line" msgstr "_Gehe zu Zeile" -#: ../src/interface.c:725 +#: ../src/interface.c:731 msgid "Change _Font" msgstr "_Schriftart ändern" -#: ../src/interface.c:728 +#: ../src/interface.c:734 msgid "Change the default font" msgstr "Ändert die Standardschriftart für das Editor-Fenster" -#: ../src/interface.c:739 +#: ../src/interface.c:745 msgid "To_ggle All Additional Widgets" msgstr "Zusätzliche _Infofenster ein-/ausblenden" -#: ../src/interface.c:743 +#: ../src/interface.c:749 msgid "Full_screen" msgstr "_Vollbild" -#: ../src/interface.c:747 +#: ../src/interface.c:753 msgid "Show Message _Window" msgstr "_Meldungsfenster anzeigen" -#: ../src/interface.c:750 +#: ../src/interface.c:756 msgid "Toggle the window with status and compiler messages on and off" msgstr "" "Schaltet den Infobereich mit Meldungen, Compiler-Ausgaben, Notizen etc. ein " "oder aus." -#: ../src/interface.c:753 +#: ../src/interface.c:759 msgid "Show _Toolbar" msgstr "W_erkzeugleiste anzeigen" -#: ../src/interface.c:756 +#: ../src/interface.c:762 msgid "Toggle the toolbar on and off" msgstr "Schaltet die Anzeige der Werkzeugleiste an und aus." -#: ../src/interface.c:759 +#: ../src/interface.c:765 msgid "Show Side_bar" msgstr "Seiten_leiste anzeigen" -#: ../src/interface.c:764 +#: ../src/interface.c:770 msgid "Show _Markers Margin" msgstr "M_arkierungsrand anzeigen" -#: ../src/interface.c:767 +#: ../src/interface.c:773 msgid "" "Shows or hides the small margin right of the line numbers, which is used to " "mark lines." @@ -1312,23 +1312,23 @@ "Zeigt oder versteckt den kleinen Rand rechts von den Zeilennummern, welcher " "zum Anzeigen von Markierungen genutzt wird." -#: ../src/interface.c:770 +#: ../src/interface.c:776 msgid "Show _Line Numbers" msgstr "_Zeilennummern anzeigen" -#: ../src/interface.c:773 +#: ../src/interface.c:779 msgid "Shows or hides the Line Number margin." msgstr "Zeigt oder versteckt den Zeilennummernrand." -#: ../src/interface.c:793 +#: ../src/interface.c:799 msgid "_Document" msgstr "D_okument" -#: ../src/interface.c:800 +#: ../src/interface.c:806 msgid "_Line Wrapping" msgstr "_Visueller Zeilenumbruch" -#: ../src/interface.c:803 ../src/interface.c:3728 +#: ../src/interface.c:809 ../src/interface.c:3789 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 " @@ -1338,150 +1338,150 @@ "fort. Achtung: Bei großen Dokumenten erfordert der Zeilenumbruch viel " "Rechenleistung und sollte daher auf langsameren Rechnern deaktiviert werden." -#: ../src/interface.c:806 +#: ../src/interface.c:812 msgid "Line _Breaking" msgstr "Automatischer Zeilen_umbruch" -#: ../src/interface.c:810 +#: ../src/interface.c:816 msgid "_Auto-indentation" msgstr "_Automatische Einrückung benutzen" -#: ../src/interface.c:815 +#: ../src/interface.c:821 msgid "In_dent Type" msgstr "Art der _Einrückung" -#: ../src/interface.c:822 ../src/interface.c:3652 +#: ../src/interface.c:828 ../src/interface.c:3713 msgid "_Tabs" msgstr "_Tabulatoren" -#: ../src/interface.c:828 ../src/interface.c:3643 +#: ../src/interface.c:834 ../src/interface.c:3704 msgid "_Spaces" msgstr "_Leerzeichen" -#: ../src/interface.c:834 ../src/interface.c:3661 +#: ../src/interface.c:840 ../src/interface.c:3722 msgid "T_abs and Spaces" msgstr "Tabulatoren _und Leerzeichen" -#: ../src/interface.c:845 +#: ../src/interface.c:851 msgid "Read _Only" msgstr "_Nur Lesen" -#: ../src/interface.c:848 +#: ../src/interface.c:854 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:850 +#: ../src/interface.c:856 msgid "_Write Unicode BOM" msgstr "_Unicode BOM schreiben" -#: ../src/interface.c:859 +#: ../src/interface.c:865 msgid "Set File_type" msgstr "Datei_typ festlegen" -#: ../src/interface.c:869 +#: ../src/interface.c:875 msgid "Set _Encoding" msgstr "Ze_ichenkodierung festlegen" -#: ../src/interface.c:879 +#: ../src/interface.c:885 msgid "Set Line E_ndings" msgstr "Zeilenen_den festlegen" -#: ../src/interface.c:886 +#: ../src/interface.c:892 msgid "Convert and Set to _CR/LF (Win)" msgstr "Auf _CR/LF setzen und umwandeln (Win)" -#: ../src/interface.c:892 +#: ../src/interface.c:898 msgid "Convert and Set to _LF (Unix)" msgstr "Auf _LF setzen und umwandeln (Unix)" -#: ../src/interface.c:898 +#: ../src/interface.c:904 msgid "Convert and Set to CR (_Mac)" msgstr "Auf CR setzen und umwandeln (_Mac)" -#: ../src/interface.c:909 +#: ../src/interface.c:915 msgid "_Strip Trailing Spaces" msgstr "Lee_rzeichen am Zeilenende entfernen" -#: ../src/interface.c:913 +#: ../src/interface.c:919 msgid "_Replace Tabs by Spaces" msgstr "Tabulat_oren durch Leerzeichen ersetzen" -#: ../src/interface.c:916 ../src/interface.c:4179 +#: ../src/interface.c:922 ../src/interface.c:4240 msgid "Replaces all tabs in document by spaces." msgstr "Ersetzt alle Tabulatoren im Dokument durch Leerzeichen." -#: ../src/interface.c:918 +#: ../src/interface.c:924 msgid "Replace Spaces b_y Tabs" msgstr "_Leerzeichen durch Tabulatoren ersetzen" -#: ../src/interface.c:921 +#: ../src/interface.c:927 msgid "Replaces all spaces in the document by tab characters." msgstr "Ersetzt alle Leerzeichen im Dokument durch Tabulatoren." -#: ../src/interface.c:928 +#: ../src/interface.c:934 msgid "_Fold All" msgstr "A_lle einklappen" -#: ../src/interface.c:931 +#: ../src/interface.c:937 msgid "Folds all contractible code blocks" msgstr "Klappt alle ausblendbaren Quelltext-Blöcke ein." -#: ../src/interface.c:933 +#: ../src/interface.c:939 msgid "_Unfold All" msgstr "_Alle ausklappen" -#: ../src/interface.c:936 +#: ../src/interface.c:942 msgid "Unfolds all contracted code blocks" msgstr "Blendet alle ausgeblendeten Quelltext-Blöcke wieder ein." -#: ../src/interface.c:943 +#: ../src/interface.c:949 msgid "Remove _Markers" msgstr "Alle _Markierungen entfernen" -#: ../src/interface.c:947 +#: ../src/interface.c:953 msgid "Remove Error _Indicators" msgstr "Alle _Fehlermarkierungen entfernen" -#: ../src/interface.c:950 +#: ../src/interface.c:956 msgid "Removes all error indicators in the current document." msgstr "" "Entfernt alle gesetzten (Fehler)-Markierungen innerhalb des Dokumentes." -#: ../src/interface.c:952 +#: ../src/interface.c:958 msgid "_Project" msgstr "_Projekt" -#: ../src/interface.c:959 +#: ../src/interface.c:965 msgid "_New" msgstr "_Neu" -#: ../src/interface.c:967 +#: ../src/interface.c:973 msgid "_Open" msgstr "Ö_ffnen" -#: ../src/interface.c:975 +#: ../src/interface.c:981 msgid "_Close" msgstr "S_chließen" -#: ../src/interface.c:996 +#: ../src/interface.c:1002 msgid "_Tools" msgstr "_Werkzeuge" -#: ../src/interface.c:1003 +#: ../src/interface.c:1009 msgid "_Color Chooser" msgstr "_Farb-Wähler" -#: ../src/interface.c:1006 ../src/interface.c:1165 +#: ../src/interface.c:1012 ../src/interface.c:1195 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:1012 +#: ../src/interface.c:1018 msgid "_Word Count" msgstr "_Wörter zählen" -#: ../src/interface.c:1015 +#: ../src/interface.c:1021 msgid "" "Counts the words and characters in the current selection or the whole " "document" @@ -1489,218 +1489,234 @@ "Zählt die Wörter und Zeichen in der aktuellen Auswahl bzw. dem aktuellen " "Dokument." -#: ../src/interface.c:1017 +#: ../src/interface.c:1023 msgid "Load Ta_gs" msgstr "_Tags laden" -#: ../src/interface.c:1020 +#: ../src/interface.c:1026 msgid "Load global tags file" msgstr "Globale Tags-Datei laden" -#: ../src/interface.c:1022 +#: ../src/interface.c:1028 msgid "_Reload Configuration" msgstr "Einstellungen _erneut laden" -#: ../src/interface.c:1025 +#: ../src/interface.c:1031 msgid "" "Reload configuration data like snippets, templates and filetype extensions." msgstr "" "Lädt die Einstellungen der (Code-)Schnipsel, Vorlagen und Dateierweiterungen " "erneut." -#: ../src/interface.c:1031 ../src/interface.c:1038 +#: ../src/interface.c:1037 ../src/interface.c:1044 msgid "_Help" msgstr "_Hilfe" -#: ../src/interface.c:1046 +#: ../src/interface.c:1052 msgid "_Website" msgstr "_Webseite" -#: ../src/interface.c:1050 +#: ../src/interface.c:1056 msgid "_Keyboard Shortcuts" msgstr "_Tastenkürzel" -#: ../src/interface.c:1053 +#: ../src/interface.c:1059 msgid "Shows a list of all keyboard shortcuts for Geany." msgstr "Zeige eine Übersicht mit allen Tastenkürzeln für Geany." -#: ../src/interface.c:1055 +#: ../src/interface.c:1061 msgid "_Debug Messages" msgstr "_Debug-Meldungen" -#: ../src/interface.c:1078 +#: ../src/interface.c:1084 msgid "Create a new file" msgstr "Legt eine neue Datei an." -#: ../src/interface.c:1084 +#: ../src/interface.c:1090 msgid "Open an existing file" msgstr "Öffnet eine existierende Datei." -#: ../src/interface.c:1089 +#: ../src/interface.c:1095 msgid "Save the current file" msgstr "Speichert die aktuelle Datei." -#: ../src/interface.c:1091 ../src/keybindings.c:196 +#: ../src/interface.c:1097 ../src/keybindings.c:196 msgid "Save all" msgstr "Alle speichern" -#: ../src/interface.c:1094 +#: ../src/interface.c:1100 msgid "Save all open files" msgstr "Speichert alle geöffnete Dateien." -#: ../src/interface.c:1103 +#: ../src/interface.c:1109 msgid "Reload the current file from disk" msgstr "Liest die aktuelle Datei neu ein." -#: ../src/interface.c:1108 +#: ../src/interface.c:1114 msgid "Close the current file" msgstr "Schließt die aktuelle Datei." -#: ../src/interface.c:1117 +#: ../src/interface.c:1123 +msgid "Cut the current selection" +msgstr "Aktuelle Auswahl ausschneiden" + +#: ../src/interface.c:1128 +msgid "Copy the current selection" +msgstr "Aktuelle Auswahl kopieren" + +#: ../src/interface.c:1133 +msgid "Paste the contents of the clipboard" +msgstr "" + +#: ../src/interface.c:1138 +msgid "Delete the current selection" +msgstr "Aktuelle Auswahl löschen" + +#: ../src/interface.c:1147 msgid "Undo the last modification" msgstr "Macht die letzte Änderung rückgängig." -#: ../src/interface.c:1122 +#: ../src/interface.c:1152 msgid "Redo the last modification" msgstr "Wiederholt die letzte Änderung." -#: ../src/interface.c:1132 ../src/keybindings.c:344 +#: ../src/interface.c:1162 ../src/keybindings.c:344 msgid "Navigate back a location" msgstr "Navigiert eine Position nach hinten." -#: ../src/interface.c:1138 ../src/keybindings.c:346 +#: ../src/interface.c:1168 ../src/keybindings.c:346 msgid "Navigate forward a location" msgstr "Navigiert eine Position nach vorne." -#: ../src/interface.c:1146 ../src/keybindings.c:445 +#: ../src/interface.c:1176 ../src/keybindings.c:445 msgid "Compile" msgstr "Kompilieren" -#: ../src/interface.c:1149 +#: ../src/interface.c:1179 msgid "Compile the current file" msgstr "Kompiliert die aktuelle Datei." -#: ../src/interface.c:1162 +#: ../src/interface.c:1192 msgid "Color" msgstr "Farbwähler" -#: ../src/interface.c:1174 +#: ../src/interface.c:1204 msgid "Zoom in the text" msgstr "Text vergrößern" -#: ../src/interface.c:1179 +#: ../src/interface.c:1209 msgid "Zoom out the text" msgstr "Text verkleinern" -#: ../src/interface.c:1188 +#: ../src/interface.c:1218 msgid "Decrease indentation" msgstr "Einzug verringern" -#: ../src/interface.c:1193 +#: ../src/interface.c:1223 msgid "Increase indentation" msgstr "Einzug erhöhen" -#: ../src/interface.c:1206 ../src/interface.c:1211 +#: ../src/interface.c:1236 ../src/interface.c:1241 msgid "Find the entered text in the current file" msgstr "Findet den eingegebenen Text im aktuellen Dokument." -#: ../src/interface.c:1224 +#: ../src/interface.c:1255 msgid "Enter a line number and jump to it." msgstr "Geben Sie die Zeilennummer ein, zu der Sie springen möchten." -#: ../src/interface.c:1231 +#: ../src/interface.c:1263 msgid "Jump to the entered line number." msgstr "Springt zur angegebenen Zeile." -#: ../src/interface.c:1274 ../src/treeviews.c:112 +#: ../src/interface.c:1306 ../src/treeviews.c:112 msgid "Symbols" msgstr "Symbole" -#: ../src/interface.c:1288 ../src/treeviews.c:268 +#: ../src/interface.c:1320 ../src/treeviews.c:268 msgid "Documents" msgstr "Dokumente" -#: ../src/interface.c:1325 +#: ../src/interface.c:1357 msgid "Status" msgstr "Status" -#: ../src/interface.c:1339 +#: ../src/interface.c:1371 msgid "Compiler" msgstr "Compiler" -#: ../src/interface.c:1354 +#: ../src/interface.c:1386 msgid "Messages" msgstr "Meldungen" -#: ../src/interface.c:1367 +#: ../src/interface.c:1399 msgid "Scribble" msgstr "Notizen" -#: ../src/interface.c:2016 ../src/interface.c:3522 +#: ../src/interface.c:2065 ../src/interface.c:3583 msgid "Images _and Text" msgstr "Symbole _und Text" -#: ../src/interface.c:2022 ../src/interface.c:3554 +#: ../src/interface.c:2071 ../src/interface.c:3615 msgid "_Images Only" msgstr "Nur _Symbole" -#: ../src/interface.c:2028 ../src/interface.c:3546 +#: ../src/interface.c:2077 ../src/interface.c:3607 msgid "_Text Only" msgstr "Nur _Text" -#: ../src/interface.c:2039 ../src/interface.c:3538 +#: ../src/interface.c:2088 ../src/interface.c:3599 msgid "_Large Icons" msgstr "_Große Symbole" -#: ../src/interface.c:2044 ../src/interface.c:3530 +#: ../src/interface.c:2093 ../src/interface.c:3591 msgid "_Small Icons" msgstr "_Kleine Symbole" -#: ../src/interface.c:2054 +#: ../src/interface.c:2103 msgid "_Hide toolbar" msgstr "Werkzeugliste _verbergen" -#: ../src/interface.c:2366 +#: ../src/interface.c:2415 msgid "Find _Usage" msgstr "_Auftreten finden" -#: ../src/interface.c:2374 +#: ../src/interface.c:2423 msgid "Find _Document Usage" msgstr "_Auftreten im Dokument finden" -#: ../src/interface.c:2382 +#: ../src/interface.c:2431 msgid "Go to _Tag Definition" msgstr "Gehe zu _Tag Definition" -#: ../src/interface.c:2386 +#: ../src/interface.c:2435 msgid "Go to T_ag Declaration" msgstr "Gehe zu T_ag Deklaration" -#: ../src/interface.c:2390 +#: ../src/interface.c:2439 msgid "Conte_xt Action" msgstr "_Kontextaktion" -#: ../src/interface.c:2402 +#: ../src/interface.c:2451 msgid "Go to the entered line" msgstr "Springe zu angegebener Zeile" -#: ../src/interface.c:2918 ../src/keybindings.c:311 +#: ../src/interface.c:2969 ../src/keybindings.c:311 msgid "Preferences" msgstr "Einstellungen" -#: ../src/interface.c:2951 +#: ../src/interface.c:3002 msgid "Load files from the last session" msgstr "Dateien aus der letzten Sitzung laden" -#: ../src/interface.c:2954 +#: ../src/interface.c:3005 msgid "Opens at startup the files from the last session" msgstr "Lädt die geöffneten Dateien aus der letzten Sitzung." -#: ../src/interface.c:2956 +#: ../src/interface.c:3007 msgid "Load virtual terminal support" msgstr "Die Virtual Terminal Emulation (VTE) laden" -#: ../src/interface.c:2958 +#: ../src/interface.c:3009 msgid "" "Whether the virtual terminal emulation (VTE) should be loaded at startup. " "Disable it if you do not need it." @@ -1709,39 +1725,39 @@ "soll oder nicht. Wenn sie nicht benötigt wird, sollte dieser Punkt " "deaktiviert werden." -#: ../src/interface.c:2960 +#: ../src/interface.c:3011 msgid "Enable plugin support" msgstr "Plugins aktivieren" -#: ../src/interface.c:2964 +#: ../src/interface.c:3015 msgid "Startup" msgstr "Starten" -#: ../src/interface.c:2983 +#: ../src/interface.c:3034 msgid "Save window position and geometry" msgstr "Fensterposition und -größe speichern" -#: ../src/interface.c:2986 +#: ../src/interface.c:3037 msgid "Saves the window position and geometry and restores it at the start" msgstr "Speichert die Fensterposition und die Fenstergröße." -#: ../src/interface.c:2988 +#: ../src/interface.c:3039 msgid "Confirm exit" msgstr "Beenden bestätigen" -#: ../src/interface.c:2991 +#: ../src/interface.c:3042 msgid "Shows a confirmation dialog on exit." msgstr "Zeigt einen Bestätigungsdialog vor dem Beenden." -#: ../src/interface.c:2993 +#: ../src/interface.c:3044 msgid "Shutdown" msgstr "Beenden " -#: ../src/interface.c:3012 +#: ../src/interface.c:3063 msgid "Use project-based session files" msgstr "Sitzung im Projekt speichern und wieder öffnen" -#: ../src/interface.c:3015 +#: ../src/interface.c:3066 msgid "" "Whether to store a project's session files and open them when re-opening the " "project." @@ -1749,12 +1765,12 @@ "Speichert die geöffneten Dateien (aktuelle Sitzung) zusammen mit dem Projekt " "und öffnet diese Dateien wieder wenn das Projekt geöffnet wird." -#: ../src/interface.c:3017 +#: ../src/interface.c:3068 msgid "Store project file inside the project base directory" msgstr "" "Soll die Projektdatei innerhalb des Projektbasisverzeichnis erstellt werden?" -#: ../src/interface.c:3020 +#: ../src/interface.c:3071 msgid "" "When enabled, a project file is stored by default inside the project base " "directory when creating new projects instead of one directory above the base " @@ -1766,15 +1782,15 @@ "angelegt. Ansonsten wird die Datei ein Verzeichnis über dem Basisverzeichnis " "angelegt. Der Pfad kann im »Neues Projekt«-Dialog geändert werden." -#: ../src/interface.c:3022 +#: ../src/interface.c:3073 msgid "Projects" msgstr "Projekte" -#: ../src/interface.c:3041 +#: ../src/interface.c:3092 msgid "Beep on errors or when compilation has finished" msgstr "Bei Fehlern oder beendeter Kompilierung Piepton ausgeben" -#: ../src/interface.c:3044 +#: ../src/interface.c:3095 msgid "" "Whether to beep if an error occurred or when the compilation process has " "finished." @@ -1782,11 +1798,11 @@ "Legt fest, ob bei einem Fehler oder bei beendeter Kompilierung ein »Beep« " "ausgegeben werden soll." -#: ../src/interface.c:3046 +#: ../src/interface.c:3097 msgid "Switch to status message list at new message" msgstr "Bei neuen Meldungen zum Statusmeldungsfenster wechseln" -#: ../src/interface.c:3049 +#: ../src/interface.c:3100 msgid "" "Switch to the status message tab (in the notebook window at the bottom) if a " "new status message arrives." @@ -1794,11 +1810,11 @@ "Wechselt automatisch zu dem Dateireiter mit den Statusmeldungen im " "Infobereich, wenn eine neue Statusmeldung vorliegt." -#: ../src/interface.c:3051 +#: ../src/interface.c:3102 msgid "Suppress status messages in the status bar" msgstr "Statusmeldungen in der Statuszeile unterdrücken" -#: ../src/interface.c:3054 +#: ../src/interface.c:3105 msgid "" "Removes all messages from the status bar. The messages are still displayed " "in the status messages window." @@ -1806,11 +1822,11 @@ "Entfernt alle Nachrichten aus der Statuszeile. Die Nachrichten sind " "weiterhin über den »Status«-Reiter im Infobereich abrufbar." -#: ../src/interface.c:3056 +#: ../src/interface.c:3107 msgid "Auto focus widgets (focus follows mouse)" msgstr "Autofokus (Der Fokus folgt der Maus)" -#: ../src/interface.c:3059 +#: ../src/interface.c:3110 msgid "" "Gives the focus automatically to widgets below the mouse cursor. Works for " "the main editor widget, the scribble, the toolbar search and goto line " @@ -1821,15 +1837,15 @@ "das Hauptfenster, das Notizbuch, den Such- und Springe-zu-Feldern in der " "Werkzeugliste sowie für das Terminal." -#: ../src/interface.c:3061 ../src/interface.c:3390 ../src/interface.c:4241 +#: ../src/interface.c:3112 ../src/interface.c:3441 ../src/interface.c:4302 msgid "Miscellaneous" msgstr "Sonstiges" -#: ../src/interface.c:3082 +#: ../src/interface.c:3133 msgid "Startup path:" msgstr "Startpfad:" -#: ../src/interface.c:3094 +#: ../src/interface.c:3145 msgid "" "Path to start in when opening or saving files. Must be an absolute path. " "Leave blank to use the current working directory." @@ -1838,83 +1854,83 @@ "muss ein absolut sein. Um das aktuelle Arbeitsverzeichnis zu benutzen, " "keinen Pfad eintragen." -#: ../src/interface.c:3107 +#: ../src/interface.c:3158 msgid "Project files:" msgstr "Projektdateien:" -#: ../src/interface.c:3119 +#: ../src/interface.c:3170 msgid "Path to start in when opening project files" msgstr "Pfad zum Öffnen von Projektdateien." -#: ../src/interface.c:3132 +#: ../src/interface.c:3183 msgid "Paths" msgstr "Pfade" -#: ../src/interface.c:3137 +#: ../src/interface.c:3188 msgid "General" msgstr "Allgemein" -#: ../src/interface.c:3160 +#: ../src/interface.c:3211 msgid "Show symbol list" msgstr "Symbol-Ansicht anzeigen" -#: ../src/interface.c:3163 +#: ../src/interface.c:3214 msgid "Toggle the symbol list on and off" msgstr "Schaltet die Symbol-Ansicht ein und aus." -#: ../src/interface.c:3165 +#: ../src/interface.c:3216 msgid "Show documents list" msgstr "Dokumentenliste anzeigen" -#: ../src/interface.c:3168 +#: ../src/interface.c:3219 msgid "Toggle the documents list on and off" msgstr "Schaltet die Dokumentenliste ein und aus." -#: ../src/interface.c:3170 +#: ../src/interface.c:3221 msgid "Show full path name in documents list" msgstr "Zeige den vollständigen Pfad in der Dokumentenliste an" -#: ../src/interface.c:3174 +#: ../src/interface.c:3225 msgid "Sidebar" msgstr "Seitenleiste" -#: ../src/interface.c:3195 +#: ../src/interface.c:3246 msgid "Symbol list:" msgstr "Symbol-Liste:" -#: ../src/interface.c:3202 ../src/interface.c:3312 +#: ../src/interface.c:3253 ../src/interface.c:3363 msgid "Message window:" msgstr "Meldungsfenster:" -#: ../src/interface.c:3209 ../src/interface.c:3348 +#: ../src/interface.c:3260 ../src/interface.c:3399 msgid "Editor:" msgstr "Editor:" -#: ../src/interface.c:3221 +#: ../src/interface.c:3272 msgid "Sets the font for the message window" msgstr "Ändert die Schriftart für das Meldungsfenster im Infobereich." -#: ../src/interface.c:3229 +#: ../src/interface.c:3280 msgid "Sets the font for the symbol list" msgstr "Legt die Schriftart für die Symbol-Ansicht fest." -#: ../src/interface.c:3237 +#: ../src/interface.c:3288 msgid "Sets the editor font" msgstr "Legt die Schriftart für das Editorfenster fest." -#: ../src/interface.c:3239 +#: ../src/interface.c:3290 msgid "Fonts" msgstr "Schriftarten" -#: ../src/interface.c:3258 +#: ../src/interface.c:3309 msgid "Show editor tabs" msgstr "Zeige Karteireiter für geöffnete Dateien" -#: ../src/interface.c:3262 +#: ../src/interface.c:3313 msgid "Show close buttons" msgstr "»Schließen«-Knöpfe anzeigen" -#: ../src/interface.c:3265 +#: ../src/interface.c:3316 msgid "" "Shows a small cross button in the file tabs to easily close files when " "clicking on it (requires restart of Geany)." @@ -1922,234 +1938,250 @@ "Zeigt ein kleines Kreuz auf den Dateireitern zum einfachen schließen einer " "Datei an. (Option benötigt einen Neustart von Geany zum Aktivieren.)" -#: ../src/interface.c:3271 +#: ../src/interface.c:3322 msgid "Placement of new file tabs:" msgstr "Platzierung neuer Dateien:" -#: ../src/interface.c:3276 ../src/interface.c:3325 ../src/interface.c:3343 -#: ../src/interface.c:3361 +#: ../src/interface.c:3327 ../src/interface.c:3376 ../src/interface.c:3394 +#: ../src/interface.c:3412 msgid "Left" msgstr "Links" -#: ../src/interface.c:3279 +#: ../src/interface.c:3330 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:3284 ../src/interface.c:3326 ../src/interface.c:3344 -#: ../src/interface.c:3362 +#: ../src/interface.c:3335 ../src/interface.c:3377 ../src/interface.c:3395 +#: ../src/interface.c:3413 msgid "Right" msgstr "Rechts" -#: ../src/interface.c:3287 +#: ../src/interface.c:3338 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:3291 +#: ../src/interface.c:3342 msgid "Editor tabs" msgstr "Dateireiter" -#: ../src/interface.c:3327 ../src/interface.c:3345 ../src/interface.c:3363 +#: ../src/interface.c:3378 ../src/interface.c:3396 ../src/interface.c:3414 msgid "Top" msgstr "Oben" -#: ../src/interface.c:3328 ../src/interface.c:3346 ../src/interface.c:3364 +#: ../src/interface.c:3379 ../src/interface.c:3397 ../src/interface.c:3415 msgid "Bottom" msgstr "Unten" -#: ../src/interface.c:3330 +#: ../src/interface.c:3381 msgid "Sidebar:" msgstr "Seitenleiste:" -#: ../src/interface.c:3366 +#: ../src/interface.c:3417 msgid "Tab positions" msgstr "Reiterposition" -#: ../src/interface.c:3385 +#: ../src/interface.c:3436 msgid "Show status bar" msgstr "Statusleiste anzeigen" -#: ../src/interface.c:3388 +#: ../src/interface.c:3439 msgid "Whether to show the status bar at the bottom of the main window." msgstr "" "Legt fest, ob die Statuszeile an der unteren Seite des Fensters angezeigt " "werden soll oder nicht." -#: ../src/interface.c:3395 +#: ../src/interface.c:3446 msgid "Interface" msgstr "Schnittstelle" -#: ../src/interface.c:3414 +#: ../src/interface.c:3465 msgid "Show Toolbar" msgstr "Werkzeugleiste anzeigen" -#: ../src/interface.c:3418 +#: ../src/interface.c:3469 msgid "Toolbar" msgstr "Werkzeugleiste" -#: ../src/interface.c:3437 -msgid "Show file operation buttons" +#: ../src/interface.c:3488 +msgid "Show File Operation buttons" msgstr "Dateioperationssymbole anzeigen" -#: ../src/interface.c:3440 +#: ../src/interface.c:3491 msgid "Display the New, Open, Close, Save and Reload buttons in the toolbar" msgstr "" "Zeigt die Symbole für Neu, Öffnen, Schließen und Neuladen in der " "Werkzeugleiste." -#: ../src/interface.c:3442 +#: ../src/interface.c:3493 +msgid "Show Cut and Delete buttons" +msgstr "Schaltflächen zum Ausschneiden und Löschen anzeigen" + +#: ../src/interface.c:3496 +msgid "Display the Cut and Delete buttons in the toolbar" +msgstr "Zeigt die Symbole zum Ausschneiden und Löschen in der Werkzeugleiste." + +#: ../src/interface.c:3498 +msgid "Show Copy and Paste buttons" +msgstr "Schaltflächen zum Kopieren und Einfügen anzeigen" + +#: ../src/interface.c:3501 +msgid "Display the Copy and Paste buttons in the toolbar" +msgstr "Zeigt die Symbole zum Kopieren und Einfügen in der Werkzeugleiste." + +#: ../src/interface.c:3503 msgid "Show Redo and Undo buttons" msgstr "Rückgängig und Wiederholen anzeigen" -#: ../src/interface.c:3445 +#: ../src/interface.c:3506 msgid "Display the Redo and Undo buttons in the toolbar" msgstr "" "Zeigt die Symbole zum Rückgängigmachen und Wiederholen in der Werkzeugleiste." -#: ../src/interface.c:3447 +#: ../src/interface.c:3508 msgid "Show Back and Forward buttons" msgstr "Schaltflächen zur Vorwärts- und Rückwärtsnavigation anzeigen" -#: ../src/interface.c:3450 +#: ../src/interface.c:3511 msgid "" "Display the Back and Forward buttons in the toolbar used for code navigation" msgstr "" "Zeigt die Schaltflächen zur Vorwärts- und Rückwärtsnavigation innerhalb der " "Quelltexte in der Werkzeugliste an." -#: ../src/interface.c:3452 +#: ../src/interface.c:3513 msgid "Show Compile and Run buttons" msgstr "Schaltflächen zum Kompilieren und Ausführen anzeigen" -#: ../src/interface.c:3455 +#: ../src/interface.c:3516 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:3457 +#: ../src/interface.c:3518 msgid "Show Color Chooser button" msgstr "Farbwähler anzeigen" -#: ../src/interface.c:3460 +#: ../src/interface.c:3521 msgid "Display the Color Chooser button in the toolbar" msgstr "Zeigt das Farbwählersymbol in der Werkzeugleiste." -#: ../src/interface.c:3462 +#: ../src/interface.c:3523 msgid "Show Zoom In and Zoom Out buttons" msgstr "Schaltflächen zum Heran- und Wegzoomen anzeigen" -#: ../src/interface.c:3465 +#: ../src/interface.c:3526 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:3467 +#: ../src/interface.c:3528 msgid "Show Increase and Decrease Indentation buttons" msgstr "Schaltflächen zum Verringern/Erhöhen des Einzugs anzeigen" -#: ../src/interface.c:3470 +#: ../src/interface.c:3531 msgid "Display the Increase and Decrease Indentation buttons in the toolbar" msgstr "" "Zeigt die Symbole zum Ein- und Ausrücken von Quelltext in der Werkzeugleiste " "an." -#: ../src/interface.c:3472 +#: ../src/interface.c:3533 msgid "Show Search field" msgstr "Suchfeld anzeigen" -#: ../src/interface.c:3475 +#: ../src/interface.c:3536 msgid "Display the search field and button in the toolbar" msgstr "Zeigt das Suchfeld in der Werkzeugleiste an." -#: ../src/interface.c:3477 +#: ../src/interface.c:3538 msgid "Show Go to Line field" msgstr "Springe zu Zeile-Eingabefeld anzeigen" -#: ../src/interface.c:3480 +#: ../src/interface.c:3541 msgid "Display the line number field and button in the toolbar" msgstr "" "Zeigt das Eingabefeld um in eine bestimmte Zeile zu springen in der " "Werkzeugleiste an." -#: ../src/interface.c:3482 +#: ../src/interface.c:3543 msgid "Show Quit button" msgstr "Schaltfläche Beenden anzeigen" -#: ../src/interface.c:3485 +#: ../src/interface.c:3546 msgid "Display the quit button in the toolbar" msgstr "Zeigt die Schaltfläche zum Beenden von Geany in der Werkzeugleiste an." -#: ../src/interface.c:3487 +#: ../src/interface.c:3548 msgid "Items" msgstr "Symbole" -#: ../src/interface.c:3508 +#: ../src/interface.c:3569 msgid "Icon style:" msgstr "Symbolstil:" -#: ../src/interface.c:3515 +#: ../src/interface.c:3576 msgid "Icon size:" msgstr "Symbolgröße:" -#: ../src/interface.c:3562 +#: ../src/interface.c:3623 msgid "Appearance" msgstr "Aussehen" -#: ../src/interface.c:3567 +#: ../src/interface.c:3628 msgid "Toolbar" msgstr "Werkzeugleiste" -#: ../src/interface.c:3601 +#: ../src/interface.c:3662 msgid "Auto-indent mode:" msgstr "Modus für automatische Einrückung:" -#: ../src/interface.c:3614 +#: ../src/interface.c:3675 msgid "Basic" msgstr "Einfach" -#: ../src/interface.c:3615 +#: ../src/interface.c:3676 msgid "Current chars" msgstr "Aktuelle Zeichenkette" -#: ../src/interface.c:3616 +#: ../src/interface.c:3677 msgid "Match braces" msgstr "Übereinstimmende Klammerung" -#: ../src/interface.c:3618 ../src/interface.c:3972 +#: ../src/interface.c:3679 ../src/interface.c:4033 msgid "Type:" msgstr "Typ:" -#: ../src/interface.c:3625 +#: ../src/interface.c:3686 msgid "Width:" msgstr "Breite:" -#: ../src/interface.c:3638 +#: ../src/interface.c:3699 msgid "The width in chars of a single indent" msgstr "Die Breite einer Einrückung in Zeichen." -#: ../src/interface.c:3648 +#: ../src/interface.c:3709 msgid "Use spaces when inserting indentation" msgstr "Benutze Leerzeichen zum Einrücken" -#: ../src/interface.c:3657 +#: ../src/interface.c:3718 msgid "Use one tab per indent" msgstr "Ein Tabulator pro Einzug" -#: ../src/interface.c:3666 +#: ../src/interface.c:3727 msgid "" "Use spaces if the total indent is less than the tab width, otherwise use both" msgstr "" "Benutzt Leerzeichen, falls die Einrückung kleiner ist als die " "Tabulatorenbreite, anderenfalls beides, Leerzeichen und Tabulatoren." -#: ../src/interface.c:3681 +#: ../src/interface.c:3742 msgid "Hard tab width:" msgstr "Tabulatorenbreite:" -#: ../src/interface.c:3689 +#: ../src/interface.c:3750 msgid "The width of a tab when Tabs & Spaces is set for a document" msgstr "" "Die Breite eines Tabulators, wenn »Tabulatoren & Leerzeichen« für das " "Dokument ausgewählt ist." -#: ../src/interface.c:3699 +#: ../src/interface.c:3760 msgid "" "Whether to detect the indentation type from file contents when a file is " "opened." @@ -2158,11 +2190,11 @@ "(Tabulatoren oder Leerzeichen) automatisch aus der geöffneten Datei zu " "bestimmen." -#: ../src/interface.c:3701 +#: ../src/interface.c:3762 msgid "Tab key indents" msgstr "Einrücken mit der Tabulatortaste" -#: ../src/interface.c:3704 +#: ../src/interface.c:3765 msgid "" "Pressing tab/shift-tab indents/unindents instead of inserting a tab " "character." @@ -2170,19 +2202,19 @@ "Tabulator und Shift+Tabulator rückt einen Quelltext ein oder aus anstatt ein " "Tabulatorzeichen einzufügen." -#: ../src/interface.c:3706 +#: ../src/interface.c:3767 msgid "Indentation" msgstr "Einrückung" -#: ../src/interface.c:3725 +#: ../src/interface.c:3786 msgid "Line wrapping" msgstr "Visueller Zeilenumbruch" -#: ../src/interface.c:3730 +#: ../src/interface.c:3791 msgid "Enable \"smart\" home key" msgstr "»Intelligente« Pos1-Taste (Home) aktivieren" -#: ../src/interface.c:3733 +#: ../src/interface.c:3794 msgid "" "When \"smart\" home is enabled, the HOME key will move the caret to the " "first non-blank character of the line, unless it is already there, it moves " @@ -2196,30 +2228,30 @@ "nicht aktiviert ist, springt der Cursor immer zum Beginn der Zeile ohne auf " "die aktuelle Position Rücksicht zu nehmen." -#: ../src/interface.c:3735 +#: ../src/interface.c:3796 msgid "Disable Drag and Drop" msgstr "Drag and Drop deaktivieren" -#: ../src/interface.c:3738 +#: ../src/interface.c:3799 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:3740 +#: ../src/interface.c:3801 msgid "Enable folding" msgstr "Quelltext-Ausblendung aktivieren" -#: ../src/interface.c:3743 +#: ../src/interface.c:3804 msgid "Whether to enable folding the code" msgstr "" "Legt fest, ob es möglich sein soll, Teile des Quelltextes auszublenden." -#: ../src/interface.c:3745 +#: ../src/interface.c:3806 msgid "Fold/unfold all children of a fold point" msgstr "Alle untergeordneten Quelltextblöcke ein/ausklappen" -#: ../src/interface.c:3748 +#: ../src/interface.c:3809 msgid "" "Fold or unfold all children of a fold point. By pressing the Shift key while " "clicking on a fold symbol the contrary behavior is used." @@ -2228,11 +2260,11 @@ "gedrückt halten von »Shift« wird das Gegenteil gemacht, wenn auf das Symbol " "geklickt wird." -#: ../src/interface.c:3750 +#: ../src/interface.c:3811 msgid "Use indicators to show compile errors" msgstr "Benutzt Markierungen, um Probleme beim Kompilieren anzuzeigen." -#: ../src/interface.c:3753 +#: ../src/interface.c:3814 msgid "" "Whether to use indicators (a squiggly underline) to highlight the lines " "where the compiler found a warning or an error." @@ -2240,25 +2272,25 @@ "Legt fest, ob Markierungen (gewellte Unterstreichungen) benutzt werden " "sollen, um Zeilen mit Fehlern beim Kompiliervorgang zu markieren." -#: ../src/interface.c:3755 +#: ../src/interface.c:3816 msgid "Newline strips trailing spaces" msgstr "Neue Zeile entfernt Leerzeichen am Zeilenende" -#: ../src/interface.c:3758 +#: ../src/interface.c:3819 msgid "Enable newline to strip the trailing spaces on the previous line." msgstr "" "Legt fest, ob unnötige Leerzeichen am Ende einer Zeile automatisch beim " "Wechseln in eine neue Zeile entfernt werden sollen." -#: ../src/interface.c:3764 +#: ../src/interface.c:3825 msgid "Line breaking column:" msgstr "Spalte für automatischen Zeilenumbruch:" -#: ../src/interface.c:3778 +#: ../src/interface.c:3839 msgid "Comment toggle marker:" msgstr "Kommentarumschaltzeichen:" -#: ../src/interface.c:3785 +#: ../src/interface.c:3846 msgid "" "A string which is added when toggling a line comment in a source file. It is " "used to mark the comment as toggled." @@ -2267,19 +2299,19 @@ "Kommentar zu markieren, der per Tastenkombination ein- oder ausgeschaltet " "werden kann." -#: ../src/interface.c:3787 +#: ../src/interface.c:3848 msgid "Features" msgstr "Funktionen" -#: ../src/interface.c:3792 +#: ../src/interface.c:3853 msgid "Features" msgstr "Funktionen" -#: ../src/interface.c:3811 +#: ../src/interface.c:3872 msgid "Snippet completion" msgstr "Vervollständigung von (Code-)Schnipseln" -#: ../src/interface.c:3814 +#: ../src/interface.c:3875 msgid "" "Type a defined short character sequence and complete it to a more complex " "string using a single keypress." @@ -2287,19 +2319,19 @@ "Mittels eines Tastenkürzels kann ein kurzer (Code-)Schnipsel zu einem " "komplexeren Text erweitert werden." -#: ../src/interface.c:3816 +#: ../src/interface.c:3877 msgid "XML tag auto completion" msgstr "XML-Tag Autovervollständigung" -#: ../src/interface.c:3819 +#: ../src/interface.c:3880 msgid "Automatic completion and closing of XML tags (includes HTML tags)" msgstr "Autovervollständigung von offenen XML-Tags, einschließlich HTML-Tags" -#: ../src/interface.c:3821 +#: ../src/interface.c:3882 msgid "Automatic continuation of multi-line comments" msgstr "Automatisches Weiterführen von mehrzeiligen Kommentaren" -#: ../src/interface.c:3824 +#: ../src/interface.c:3885 msgid "" "Continue automatically multi-line comments in languages like C, C++ and Java " "when a new line is entered inside such a comment." @@ -2307,11 +2339,11 @@ "Verlängert den Kommentarbereich in den Sprachen C, C++ und Java, wenn eine " "neue Zeile innerhalb eines Kommentares hinzu gefügt wird." -#: ../src/interface.c:3826 +#: ../src/interface.c:3887 msgid "Automatic symbol completion" msgstr "Automatische Vervollständigung von Symbolen" -#: ../src/interface.c:3829 +#: ../src/interface.c:3890 msgid "" "Automatic completion of known symbols in open files (function names, global " "variables, ...)" @@ -2319,19 +2351,19 @@ "Automatische Vervollständigung von bekannten Variablen und Funktionsnamen " "geöffneter Dateien." -#: ../src/interface.c:3837 +#: ../src/interface.c:3898 msgid "Max. symbol name suggestions:" msgstr "Max. Vorschläge der Symbolvervollständigung:" -#: ../src/interface.c:3844 +#: ../src/interface.c:3905 msgid "Completion list height:" msgstr "Höhe der Vervollständigungsliste:" -#: ../src/interface.c:3851 +#: ../src/interface.c:3912 msgid "Characters to type for completion:" msgstr "Zu tippende Zeichen für die Vervollständigung:" -#: ../src/interface.c:3864 +#: ../src/interface.c:3925 msgid "" "The amount of characters which are necessary to show the symbol auto " "completion list." @@ -2339,91 +2371,91 @@ "Die Anzahl der Zeichen, die nötig sind um die Symbol-Vervollständigungsliste " "anzuzeigen." -#: ../src/interface.c:3873 +#: ../src/interface.c:3934 msgid "Display height in rows for the auto completion list." msgstr "" "Anzahl der Zeilen, die maximal angezeigt werden sollen, wenn die " "Vervollständigungsliste angezeigt wird." -#: ../src/interface.c:3882 +#: ../src/interface.c:3943 msgid "Maximum number of entries to display in the auto completion list." msgstr "" "Anzahl der Elemente, die maximal angezeigt werden sollen, wenn die " "Vervollständigungsliste angezeigt wird." -#: ../src/interface.c:3885 +#: ../src/interface.c:3946 msgid "Completions" msgstr "Vervollständigungen" -#: ../src/interface.c:3890 +#: ../src/interface.c:3951 msgid "Completions" msgstr "Vervollständigungen" -#: ../src/interface.c:3913 +#: ../src/interface.c:3974 msgid "Invert syntax highlighting colors" msgstr "Invertiere Syntax-Hervorhebungen" -#: ../src/interface.c:3915 +#: ../src/interface.c:3976 msgid "Use white text on a black background." msgstr "Benutze weiße Schrift auf einem schwarzem Hintergrund" -#: ../src/interface.c:3917 +#: ../src/interface.c:3978 msgid "Show indentation guides" msgstr "Zeige Einrückungshinweise" -#: ../src/interface.c:3920 +#: ../src/interface.c:3981 msgid "Shows small dotted lines to help you to use the right indentation." msgstr "" "Blendet punktierte Linien ein, um die richtige Einrückung zu erleichtern." -#: ../src/interface.c:3922 +#: ../src/interface.c:3983 msgid "Show white space" msgstr "Zeige Leerzeichen" -#: ../src/interface.c:3925 +#: ../src/interface.c:3986 msgid "Marks spaces with dots and tabs with arrows." msgstr "Markiert Leerzeichen mit Punkten und Tabulatoren mit kleinen Pfeilen." -#: ../src/interface.c:3927 +#: ../src/interface.c:3988 msgid "Show line endings" msgstr "Zeige Zeilenenden" -#: ../src/interface.c:3930 +#: ../src/interface.c:3991 msgid "Show the line ending character." msgstr "Zeilenende-Zeichen anzeigen" -#: ../src/interface.c:3932 +#: ../src/interface.c:3993 msgid "Stop scrolling at last line" msgstr "Am Ende des Dokuments nicht mehr weiter scrollen." -#: ../src/interface.c:3935 +#: ../src/interface.c:3996 msgid "Whether to stop scrolling one page past the last line of a document." msgstr "" "Legt fest, ob am Ende des Dokuments noch eine Seite weiter nach unten " "gescrollt werden kann oder nicht." -#: ../src/interface.c:3937 +#: ../src/interface.c:3998 msgid "Display" msgstr "Anzeige" -#: ../src/interface.c:3958 +#: ../src/interface.c:4019 msgid "Long line marker:" msgstr "Zeilenlänge markieren bei:" -#: ../src/interface.c:3965 +#: ../src/interface.c:4026 msgid "Long line marker color:" msgstr "Farbe der Markierung:" -#: ../src/interface.c:3984 +#: ../src/interface.c:4045 msgid "Sets the color of the long line marker" msgstr "Stellt die Farbe der \"Umbruchhilfe für lange Zeilen\" ein." -#: ../src/interface.c:3985 ../src/tools.c:743 ../src/vte.c:737 +#: ../src/interface.c:4046 ../src/tools.c:743 ../src/vte.c:737 #: ../src/vte.c:744 msgid "Color Chooser" msgstr "Farbwähler" -#: ../src/interface.c:3993 +#: ../src/interface.c:4054 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 " @@ -2434,11 +2466,11 @@ "einen eventuell notwendigen Zeilenumbruch hinzuweisen. Werte größer als 0 " "geben die Spalte an, in der die Linie angezeigt werden soll." -#: ../src/interface.c:4003 +#: ../src/interface.c:4064 msgid "Line" msgstr "Linie" -#: ../src/interface.c:4006 +#: ../src/interface.c:4067 msgid "" "Prints a vertical line in the editor window at the given cursor position " "(see below)." @@ -2446,11 +2478,11 @@ "Zeichnet eine vertikale Linie im Editorfenster an der angegebenen Cursor-" "Position (nur sinnvoll mit Festbreitenschriften)." -#: ../src/interface.c:4010 +#: ../src/interface.c:4071 msgid "Background" msgstr "Hintergrund" -#: ../src/interface.c:4013 +#: ../src/interface.c:4074 msgid "" "The background color of characters after the given cursor position (see " "below) changed to the color set below. (This is recommended if you use " @@ -2460,61 +2492,61 @@ "(siehe unten) stehen, wird auf die unten angegebene Farbe geändert (nützlich " "für proportionale Schriftarten)." -#: ../src/interface.c:4017 +#: ../src/interface.c:4078 msgid "Disabled" msgstr "Deaktiviert" -#: ../src/interface.c:4023 +#: ../src/interface.c:4084 msgid "Long line marker" msgstr "Umbruchhilfe für lange Zeilen" -#: ../src/interface.c:4028 +#: ../src/interface.c:4089 msgid "Display" msgstr "Ansicht" -#: ../src/interface.c:4032 ../src/keybindings.c:213 +#: ../src/interface.c:4093 ../src/keybindings.c:213 msgid "Editor" msgstr "Editor" -#: ../src/interface.c:4059 +#: ../src/interface.c:4120 msgid "Open new documents from the command-line" msgstr "Öffne neue Dokumente von der Kommandozeile" -#: ../src/interface.c:4062 +#: ../src/interface.c:4123 msgid "Start a new file for each command-line filename that doesn't exist." msgstr "" "Öffnet eine neue Datei für jeden Dateinamen, der auf der Kommandozeile " "angegeben wurde und noch nicht existiert." -#: ../src/interface.c:4076 +#: ../src/interface.c:4137 msgid "Default end of line characters:" msgstr "Zeichen für das Standardzeilenende:" -#: ../src/interface.c:4083 +#: ../src/interface.c:4144 msgid "New files" msgstr "Neue Dateien" -#: ../src/interface.c:4109 +#: ../src/interface.c:4170 msgid "Sets the default encoding for newly created files." msgstr "Setzt die Zeichenkodierung für neu erstellte Dateien." -#: ../src/interface.c:4115 +#: ../src/interface.c:4176 msgid "Default encoding (new files):" msgstr "Standardzeichenkodierung (neue Dateien):" -#: ../src/interface.c:4122 +#: ../src/interface.c:4183 msgid "Default encoding (existing files):" msgstr "Standardzeichenkodierung (existierende Dateien):" -#: ../src/interface.c:4134 +#: ../src/interface.c:4195 msgid "Sets the default encoding for opening existing files." msgstr "Setzt die Standard-Zeichenkodierung für zu öffnende Dateien." -#: ../src/interface.c:4140 +#: ../src/interface.c:4201 msgid "Use fixed encoding when opening files" msgstr "Benutze feststehende Zeichenkodierung beim Öffnen neuer Dateien" -#: ../src/interface.c:4145 +#: ../src/interface.c:4206 msgid "" "This option disables the automatic detection of the file encoding when " "opening files and opens the file with the specified encoding (usually not " @@ -2523,48 +2555,48 @@ "Diese Option deaktiviert die automatische Erkennung der Zeichenkodierung und " "öffnet die ausgewählten Dateien mit der angegebenen Kodierung." -#: ../src/interface.c:4147 +#: ../src/interface.c:4208 msgid "Encodings" msgstr "Zeichenkodierungen:" -#: ../src/interface.c:4166 +#: ../src/interface.c:4227 msgid "Ensure new line at file end" msgstr "Neue Zeile am Dateiende" -#: ../src/interface.c:4169 +#: ../src/interface.c:4230 msgid "Ensures that at the end of the file is a new line" msgstr "Fügt am Dateiende eine neue Zeile an, falls keine vorhanden ist." -#: ../src/interface.c:4171 +#: ../src/interface.c:4232 msgid "Strip trailing spaces and tabs" msgstr "Leerzeichen und Tabulatoren am Zeilenende entfernen" -#: ../src/interface.c:4174 +#: ../src/interface.c:4235 msgid "Removes trailing spaces and tabs and the end of lines" msgstr "Entfernt Leerzeichen und Tabulatoren am Ende einer Zeile." -#: ../src/interface.c:4176 ../src/keybindings.c:430 +#: ../src/interface.c:4237 ../src/keybindings.c:430 msgid "Replace tabs by space" msgstr "Tabulatoren durch Leerzeichen ersetzen" -#: ../src/interface.c:4181 +#: ../src/interface.c:4242 msgid "Saving files" msgstr "Speichern" -#: ../src/interface.c:4206 +#: ../src/interface.c:4267 msgid "Recent files list length:" msgstr "Anzahl der \"Zuletzt geöffneten\" Dateien" -#: ../src/interface.c:4220 +#: ../src/interface.c:4281 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:4224 +#: ../src/interface.c:4285 msgid "Disk check timeout:" msgstr "Zeitinterval zum Prüfen auf Dateiänderungen:" -#: ../src/interface.c:4237 +#: ../src/interface.c:4298 msgid "" "How often to check for changes to document files on disk, in seconds. Zero " "disables checking." @@ -2572,15 +2604,15 @@ "Wie oft soll auf Veränderungen geprüft werden? Angabe in Sekunden. 0 " "deaktiviert die Funktion." -#: ../src/interface.c:4246 ../src/symbols.c:581 ../plugins/filebrowser.c:924 +#: ../src/interface.c:4307 ../src/symbols.c:581 ../plugins/filebrowser.c:924 msgid "Files" msgstr "Dateien" -#: ../src/interface.c:4265 +#: ../src/interface.c:4326 msgid "Always wrap search and hide the Find dialog" msgstr "Das vollständige Dokument durchsuchen und den Suchen-Dialog schließen" -#: ../src/interface.c:4268 +#: ../src/interface.c:4329 msgid "" "Always wrap search around the document and hide the Find dialog after " "clicking Find Next/Previous." @@ -2588,46 +2620,46 @@ "Immer das vollständige Dokument durchsuchen und den Suchen-Dialog nach " "Klicken auf Nächstes/Vorheriges schließen." -#: ../src/interface.c:4270 +#: ../src/interface.c:4331 msgid "Use the current word under the cursor for Find dialogs" msgstr "Aktuelle Cursorposition zur Suche heranziehen." -#: ../src/interface.c:4273 +#: ../src/interface.c:4334 msgid "" "Use current word under the cursor when opening the Find, Find in Files or " "Replace dialog and there is no selection." msgstr "" "Bestimmt das aktuelle Wort zum Suchen & Ersetzen anhand der Cursor-Position." -#: ../src/interface.c:4275 +#: ../src/interface.c:4336 msgid "Use the current file's directory for Find in Files" msgstr "Aktuelles Verzeichnis zur Suche heranziehen." -#: ../src/interface.c:4279 +#: ../src/interface.c:4340 msgid "Search" msgstr "Suche" -#: ../src/interface.c:4284 ../src/keybindings.c:314 +#: ../src/interface.c:4345 ../src/keybindings.c:314 msgid "Search" msgstr "Suchen" -#: ../src/interface.c:4317 +#: ../src/interface.c:4378 msgid "Make:" msgstr "Make:" -#: ../src/interface.c:4324 +#: ../src/interface.c:4385 msgid "Terminal:" msgstr "Terminal:" -#: ../src/interface.c:4331 +#: ../src/interface.c:4392 msgid "Browser:" msgstr "Browser:" -#: ../src/interface.c:4343 +#: ../src/interface.c:4404 msgid "Path and options for the make tool" msgstr "Pfad und spezielle Optionen und / oder Targets für \"make\" angeben." -#: ../src/interface.c:4350 +#: ../src/interface.c:4411 msgid "" "A terminal emulator like xterm, gnome-terminal or konsole (should accept the " "-e argument)" @@ -2635,23 +2667,23 @@ "Eine Terminal-Emulation wie z.B. xterm, gnome-terminal oder konsole (sie " "sollte die Option -e akzeptieren)." -#: ../src/interface.c:4357 +#: ../src/interface.c:4418 msgid "Path (and possibly additional arguments) to your favorite browser" msgstr "Pfad und evtl. Argumente zum Starten eines Browsers" -#: ../src/interface.c:4389 +#: ../src/interface.c:4450 msgid "Grep:" msgstr "Grep:" -#: ../src/interface.c:4412 +#: ../src/interface.c:4473 msgid "Tool paths" msgstr "Pfade zu den Werkzeugen" -#: ../src/interface.c:4433 +#: ../src/interface.c:4494 msgid "Context action:" msgstr "Kontextaktion:" -#: ../src/interface.c:4444 +#: ../src/interface.c:4505 #, c-format msgid "" "Context action command. The currently selected word can be used with %s. It " @@ -2661,67 +2693,67 @@ "Der aktuell markierte Text kann mit %s angegeben werden. Es darf überall in " "der Kommandozeile vorkommen und wird vor dem Ausführen ersetzt." -#: ../src/interface.c:4457 +#: ../src/interface.c:4518 msgid "Commands" msgstr "Befehle" -#: ../src/interface.c:4462 ../src/keybindings.c:466 +#: ../src/interface.c:4523 ../src/keybindings.c:466 msgid "Tools" msgstr "Werkzeuge" -#: ../src/interface.c:4496 +#: ../src/interface.c:4557 msgid "email address of the developer" msgstr "E-Mail-Adresse des Entwicklers" -#: ../src/interface.c:4503 +#: ../src/interface.c:4564 msgid "Initials of the developer name" msgstr "Initialen des Entwicklernamens" -#: ../src/interface.c:4505 +#: ../src/interface.c:4566 msgid "Initial version:" msgstr "Anfangsversion:" -#: ../src/interface.c:4517 +#: ../src/interface.c:4578 msgid "Version number, which a new file initially has" msgstr "Versionsnummer, welche eine neue Datei zu Beginn hat" -#: ../src/interface.c:4524 +#: ../src/interface.c:4585 msgid "Company name" msgstr "Firmenname" -#: ../src/interface.c:4526 +#: ../src/interface.c:4587 msgid "Developer:" msgstr "Entwickler:" -#: ../src/interface.c:4533 +#: ../src/interface.c:4594 msgid "Company:" msgstr "Firma:" -#: ../src/interface.c:4540 +#: ../src/interface.c:4601 msgid "Mail address:" msgstr "Mail-Adresse:" -#: ../src/interface.c:4547 +#: ../src/interface.c:4608 msgid "Initials:" msgstr "Initialen:" -#: ../src/interface.c:4559 +#: ../src/interface.c:4620 msgid "The name of the developer" msgstr "Der Name des Entwicklers" -#: ../src/interface.c:4561 +#: ../src/interface.c:4622 msgid "Year:" msgstr "Jahr:" -#: ../src/interface.c:4568 +#: ../src/interface.c:4629 msgid "Date:" msgstr "Datum:" -#: ../src/interface.c:4575 +#: ../src/interface.c:4636 msgid "Date & Time:" msgstr "Datum / Zeit:" -#: ../src/interface.c:4587 +#: ../src/interface.c:4648 msgid "" "Specify a format for the the {datetime} wildcard. You can use any conversion " "specifiers which can be used with the ANSI C strftime function." @@ -2730,7 +2762,7 @@ "alle Platzhalter verwendet werden, die auch in der ANSI C Funktion »strftime« " "zum Einsatz kommen." -#: ../src/interface.c:4594 +#: ../src/interface.c:4655 msgid "" "Specify a format for the the {year} wildcard. You can use any conversion " "specifiers which can be used with the ANSI C strftime function." @@ -2739,7 +2771,7 @@ "Platzhalter verwendet werden, die auch in der ANSI C Funktion »strftime« zum " "Einsatz kommen." -#: ../src/interface.c:4601 +#: ../src/interface.c:4662 msgid "" "Specify a format for the the {date} wildcard. You can use any conversion " "specifiers which can be used with the ANSI C strftime function." @@ -2748,61 +2780,61 @@ "Platzhalter verwendet werden, die auch in der ANSI C Funktion »strftime« zum " "Einsatz kommen." -#: ../src/interface.c:4603 +#: ../src/interface.c:4664 msgid "Template data" msgstr "Daten für Vorlagen:" -#: ../src/interface.c:4608 +#: ../src/interface.c:4669 msgid "Templates" msgstr "Vorlagen" -#: ../src/interface.c:4646 +#: ../src/interface.c:4707 msgid "C_hange" msgstr "Ä_ndern" -#: ../src/interface.c:4650 +#: ../src/interface.c:4711 msgid "Keyboard shortcuts" msgstr "Tastaturkürzel" -#: ../src/interface.c:4655 +#: ../src/interface.c:4716 msgid "Keybindings" msgstr "Tastenkürzel" -#: ../src/interface.c:4678 +#: ../src/interface.c:4739 msgid "Command:" msgstr "Befehl:" -#: ../src/interface.c:4685 +#: ../src/interface.c:4746 #, 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:4695 +#: ../src/interface.c:4756 msgid "Use an external command for printing" msgstr "Ein externes Programm zum Drucken benutzen" -#: ../src/interface.c:4715 ../src/printing.c:343 +#: ../src/interface.c:4776 ../src/printing.c:343 msgid "Print line numbers" msgstr "Drucke Zeilennummern" -#: ../src/interface.c:4718 ../src/printing.c:345 +#: ../src/interface.c:4779 ../src/printing.c:345 msgid "Add line numbers to the printed page." msgstr "Zeige Zeilennummern auf der gedruckten Seite" -#: ../src/interface.c:4720 ../src/printing.c:348 +#: ../src/interface.c:4781 ../src/printing.c:348 msgid "Print page numbers" msgstr "Drucke Seitenzahlen" -#: ../src/interface.c:4723 ../src/printing.c:350 +#: ../src/interface.c:4784 ../src/printing.c:350 msgid "" "Add page numbers at the bottom of each page. It takes 2 lines of the page." msgstr "Füge jeder Seite die Seitenzahlen hinzu. Es werden 2 Zeilen benutzt." -#: ../src/interface.c:4725 ../src/printing.c:353 +#: ../src/interface.c:4786 ../src/printing.c:353 msgid "Print page header" msgstr "Drucke Seitenkopf" -#: ../src/interface.c:4728 ../src/printing.c:355 +#: ../src/interface.c:4789 ../src/printing.c:355 msgid "" "Adds a little header to every page containing the page number, the filename " "and the current date(see below). It takes 3 lines of the page." @@ -2810,21 +2842,21 @@ "Fügt 3 Kopfzeilen am Anfang jeder Seite ein (beinhaltet die Seitenzahl, den " "Dateinamen sowie das Datum). Es werden 3 Zeilen benutzt." -#: ../src/interface.c:4745 ../src/printing.c:371 +#: ../src/interface.c:4806 ../src/printing.c:371 msgid "Use the basename of the printed file" msgstr "Basisnamen der aktuellen Datei benutzen" -#: ../src/interface.c:4748 ../src/printing.c:373 +#: ../src/interface.c:4809 ../src/printing.c:373 msgid "Print only the basename(without the path) of the printed file." msgstr "" "Nur den Basisdateinamen (ohne die Pfadangabe) der zu druckenden Datei " "verwenden." -#: ../src/interface.c:4754 ../src/printing.c:379 +#: ../src/interface.c:4815 ../src/printing.c:379 msgid "Date format:" msgstr "Datumsformat:" -#: ../src/interface.c:4761 ../src/printing.c:384 +#: ../src/interface.c:4822 ../src/printing.c:384 msgid "" "Specify a format for the date and time stamp which is added to the page " "header on each page. You can use any conversion specifiers which can be used " @@ -2834,15 +2866,15 @@ "können alle Platzhalter verwendet werden, die auch in der ANSI C Funktion " "»strftime« zum Einsatz kommen." -#: ../src/interface.c:4764 +#: ../src/interface.c:4825 msgid "Use native GTK printing" msgstr "GTK-Druckunterstützung benutzen" -#: ../src/interface.c:4770 +#: ../src/interface.c:4831 msgid "Printing" msgstr "Drucken" -#: ../src/keybindings.c:182 ../src/plugins.c:1032 +#: ../src/keybindings.c:182 ../src/plugins.c:1037 msgid "File" msgstr "Datei" @@ -3319,12 +3351,12 @@ msgid "The following keyboard shortcuts are configurable:" msgstr "Die folgende Tastenkürzel sind frei definierbar:" -#: ../src/keyfile.c:817 +#: ../src/keyfile.c:821 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:1012 +#: ../src/keyfile.c:1016 msgid "Failed to load one or more session files." msgstr "" "Eine oder mehre Datei(en) aus der letzten Sitzung konnte(n) nicht geladen " @@ -3334,7 +3366,7 @@ msgid "Debug Messages" msgstr "Debug-Meldungen" -#: ../src/main.c:123 +#: ../src/main.c:120 msgid "" "Set initial column number for the first opened file (useful in conjunction " "with --line)" @@ -3342,74 +3374,78 @@ "Setzt die Spaltennummer in der zuerst geöffneten Datei. Sinnvoll nur in " "Kombination mit der Option -l oder --line." -#: ../src/main.c:124 +#: ../src/main.c:121 msgid "Use an alternate configuration directory" msgstr "Benutzt ein anderes Verzeichnis für die Konfigurationsdateien" -#: ../src/main.c:125 +#: ../src/main.c:122 msgid "Runs in debug mode (means being verbose)" msgstr "Geany im Debug-Modus ausführen (Gesprächig!)" -#: ../src/main.c:126 +#: ../src/main.c:123 msgid "Print internal filetype names" msgstr "Listet die unterstützen Dateitypen auf." -#: ../src/main.c:127 +#: ../src/main.c:124 msgid "Generate global tags file (see documentation)" msgstr "Erstelle globale Tag-Datei (Dokumentation beachten!)" -#: ../src/main.c:131 +#: ../src/main.c:125 +msgid "Don't preprocess C/C++ files when generating tags" +msgstr "" + +#: ../src/main.c:128 msgid "Don't open files in a running instance, force opening a new instance" msgstr "" "Dateien nicht in einer bereits laufenden Instanz, sondern in einer neuen " "Instanz öffnen." -#: ../src/main.c:133 +#: ../src/main.c:130 msgid "Set initial line number for the first opened file" msgstr "Setzt die Zeilennummer in der zuerst geöffneten Datei." -#: ../src/main.c:134 +#: ../src/main.c:131 msgid "Don't show message window at startup" msgstr "Kein Meldungsfenster beim Starten anzeigen" -#: ../src/main.c:135 +#: ../src/main.c:132 msgid "Don't load auto completion data (see documentation)" msgstr "Autovervollständigungsdaten nicht laden (Dokumentation beachten)" -#: ../src/main.c:137 +#: ../src/main.c:134 msgid "Don't load plugins" msgstr "Plugins nicht laden" -#: ../src/main.c:139 +#: ../src/main.c:136 msgid "Print Geany's installation prefix" msgstr "Geany's Installationsverzeichnis ausgeben" -#: ../src/main.c:140 +#: ../src/main.c:137 msgid "don't load the previous session's files" msgstr "Dateien aus der letzten Sitzung nicht laden" -#: ../src/main.c:142 +#: ../src/main.c:139 msgid "Don't load terminal support" msgstr "Die virtual terminal emulation (VTE) nicht starten" -#: ../src/main.c:143 +#: ../src/main.c:140 msgid "Filename of libvte.so" msgstr "Name der libvte.so" -#: ../src/main.c:145 +#: ../src/main.c:142 msgid "Show version and exit" msgstr "Versionsinformation anzeigen und Programm beenden" -#: ../src/main.c:481 +#: ../src/main.c:496 msgid "[FILES...]" msgstr "[Dateien...]" -#: ../src/main.c:498 +#: ../src/main.c:513 #, c-format msgid "(built on %s with GTK %d.%d.%d, GLib %d.%d.%d)" msgstr "(kompiliert am %s mit GTK %d.%d.%d, GLib %d.%d.%d)" -#: ../src/main.c:602 +#: ../src/main.c:615 #, c-format msgid "" "Configuration directory could not be created (%s).\n" @@ -3420,22 +3456,27 @@ "Es könnte zu Problemen bei der Verwendung von Geany kommen.\n" "Geany trotzdem starten?" -#: ../src/main.c:672 ../src/socket.c:157 +#: ../src/main.c:685 ../src/socket.c:157 #, c-format msgid "Could not find file '%s'." msgstr "Konnte die Datei %s nicht finden." -#: ../src/main.c:829 +#: ../src/main.c:735 #, c-format +msgid "Ignoring extra filenames after %s" +msgstr "" + +#: ../src/main.c:880 +#, c-format msgid "This is Geany %s." msgstr "Willkommen zu Geany %s." -#: ../src/main.c:831 +#: ../src/main.c:882 #, c-format msgid "Configuration directory could not be created (%s)." msgstr "Konfigurationsverzeichnis konnte nicht erstellt werden (%s)." -#: ../src/main.c:1051 +#: ../src/main.c:1083 msgid "Configuration files reloaded." msgstr "Einstellungen erneut geladen." @@ -3451,7 +3492,7 @@ msgid "_Hide Message Window" msgstr "Meldungs_fenster ausblenden" -#: ../src/plugins.c:394 +#: ../src/plugins.c:399 #, c-format msgid "" "The plugin \"%s\" is not binary compatible with this release of Geany - " @@ -3460,11 +3501,11 @@ "Das Plugin »%s« ist nicht kompatibel mit dieser Version von Geany. Bitte neu " "kompilieren." -#: ../src/plugins.c:823 +#: ../src/plugins.c:828 msgid "_Plugin Manager" msgstr "_Plugin Manager" -#: ../src/plugins.c:954 +#: ../src/plugins.c:959 #, c-format msgid "" "Plugin: %s %s\n" @@ -3475,23 +3516,23 @@ "Beschreibung: %s\n" "Autor(en): %s" -#: ../src/plugins.c:1020 +#: ../src/plugins.c:1025 msgid "Active" msgstr "Aktiv" -#: ../src/plugins.c:1026 +#: ../src/plugins.c:1031 msgid "Plugin" msgstr "Plugin" -#: ../src/plugins.c:1050 +#: ../src/plugins.c:1055 msgid "No plugins available." msgstr "Keine Plugins vorhanden." -#: ../src/plugins.c:1159 +#: ../src/plugins.c:1164 msgid "Plugins" msgstr "Plugins" -#: ../src/plugins.c:1179 +#: ../src/plugins.c:1184 msgid "" "Below is a list of available plugins. Select the plugins which should be " "loaded when Geany is started." @@ -3499,7 +3540,7 @@ "Unten ist eine Liste mit verfügbaren Plugins. Wählen Sie die Plugins aus, " "die beim Starten Geany geladen werden sollen." -#: ../src/plugins.c:1187 +#: ../src/plugins.c:1192 msgid "Plugin details:" msgstr "Plugin-Details" @@ -3511,38 +3552,38 @@ msgid "Shortcut" msgstr "Tastenkürzel" -#: ../src/prefs.c:1283 +#: ../src/prefs.c:1295 msgid "Grab Key" msgstr "Tasten festlegen" -#: ../src/prefs.c:1289 +#: ../src/prefs.c:1301 #, c-format msgid "Press the combination of the keys you want to use for \"%s\"." msgstr "Welche Tastenkombination soll für \"%s\" genutzt werden?" -#: ../src/prefs.c:1476 +#: ../src/prefs.c:1488 msgid "_Override" msgstr "_Ersetzen" -#: ../src/prefs.c:1477 +#: ../src/prefs.c:1489 msgid "Override that keybinding?" msgstr "Diese Tastenkombination ersetzen?" -#: ../src/prefs.c:1478 +#: ../src/prefs.c:1490 #, c-format msgid "The combination '%s' is already used for \"%s\"." msgstr "Die Tastenkombination '%s' wird bereits für \"%s\" verwendet." #. add manually GeanyWrapLabels because it can't be added with Glade #. * page Tools -#: ../src/prefs.c:1590 +#: ../src/prefs.c:1602 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." #. page Templates -#: ../src/prefs.c:1595 +#: ../src/prefs.c:1607 msgid "" "Set the information to be used in templates. See the documentation for " "details." @@ -3552,7 +3593,7 @@ "Konsultieren Sie die Dokumentation, um mehr über die Arbeitsweise der " "Vorlagen zu erfahren." -#: ../src/prefs.c:1599 +#: ../src/prefs.c:1611 msgid "" "Notice: For all changes you make here to take effect, you need to restart " "Geany or force the reload of the settings using Tools->Reload Configuration." @@ -3563,7 +3604,7 @@ "erneut laden\" auf." #. page Keybindings -#: ../src/prefs.c:1605 +#: ../src/prefs.c:1617 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 " @@ -3575,7 +3616,7 @@ "die Tastenkombinationen auch direkt eingegeben werden." #. page Printing -#: ../src/prefs.c:1610 +#: ../src/prefs.c:1622 msgid "" "Notice: Native GTK printing is only available if Geany was built against " "GTK 2.10 (or above) and Geany is running with GTK 2.10 (or above)." @@ -3986,13 +4027,13 @@ msgid "Couldn't find pixmap file: %s" msgstr "Konnte PixMap %s nicht finden." -#: ../src/symbols.c:587 ../src/symbols.c:621 ../src/symbols.c:678 +#: ../src/symbols.c:587 ../src/symbols.c:621 ../src/symbols.c:676 msgid "Chapter" msgstr "Kapitel" -#: ../src/symbols.c:588 ../src/symbols.c:617 ../src/symbols.c:679 +#: ../src/symbols.c:588 ../src/symbols.c:617 ../src/symbols.c:677 msgid "Section" -msgstr "Absatz" +msgstr "Abschnitt" #: ../src/symbols.c:589 msgid "Sect1" @@ -4012,18 +4053,18 @@ #. &(tv_iters.tag_macro), _("Macros"), #. &(tv_iters.tag_variable), _("Variables"), -#: ../src/symbols.c:593 ../src/symbols.c:622 ../src/symbols.c:737 -#: ../src/symbols.c:749 ../src/symbols.c:761 ../src/symbols.c:776 -#: ../src/symbols.c:820 +#: ../src/symbols.c:593 ../src/symbols.c:622 ../src/symbols.c:735 +#: ../src/symbols.c:747 ../src/symbols.c:759 ../src/symbols.c:774 +#: ../src/symbols.c:818 msgid "Other" msgstr "Sonstiges" -#: ../src/symbols.c:600 ../src/symbols.c:769 ../src/symbols.c:801 +#: ../src/symbols.c:600 ../src/symbols.c:767 ../src/symbols.c:799 msgid "Module" msgstr "Modul" -#: ../src/symbols.c:601 ../src/symbols.c:747 ../src/symbols.c:759 -#: ../src/symbols.c:774 ../src/symbols.c:786 +#: ../src/symbols.c:601 ../src/symbols.c:745 ../src/symbols.c:757 +#: ../src/symbols.c:772 ../src/symbols.c:784 msgid "Types" msgstr "Typen" @@ -4032,8 +4073,8 @@ msgstr "Typkonstruktoren" #: ../src/symbols.c:603 ../src/symbols.c:630 ../src/symbols.c:645 -#: ../src/symbols.c:703 ../src/symbols.c:716 ../src/symbols.c:756 -#: ../src/symbols.c:771 ../src/symbols.c:808 +#: ../src/symbols.c:701 ../src/symbols.c:714 ../src/symbols.c:754 +#: ../src/symbols.c:769 ../src/symbols.c:806 msgid "Functions" msgstr "Funktionen" @@ -4053,19 +4094,19 @@ msgid "Environment" msgstr "Umgebung" -#: ../src/symbols.c:618 ../src/symbols.c:680 +#: ../src/symbols.c:618 ../src/symbols.c:678 msgid "Subsection" -msgstr "Subsection" +msgstr "Unterabschnitt" -#: ../src/symbols.c:619 ../src/symbols.c:681 +#: ../src/symbols.c:619 ../src/symbols.c:679 msgid "Subsubsection" -msgstr "Subsubsection" +msgstr "Unterunterabschnitt" #: ../src/symbols.c:620 msgid "Label" msgstr "Label" -#: ../src/symbols.c:629 ../src/symbols.c:730 +#: ../src/symbols.c:629 ../src/symbols.c:728 msgid "Package" msgstr "Package" @@ -4081,26 +4122,27 @@ msgid "Our" msgstr "Our" -#: ../src/symbols.c:643 ../src/symbols.c:731 ../src/symbols.c:744 -#: ../src/symbols.c:770 +#: ../src/symbols.c:643 ../src/symbols.c:729 ../src/symbols.c:742 +#: ../src/symbols.c:768 msgid "Interfaces" msgstr "Interfaces" -#: ../src/symbols.c:644 ../src/symbols.c:689 ../src/symbols.c:701 -#: ../src/symbols.c:732 ../src/symbols.c:745 ../src/symbols.c:807 +#: ../src/symbols.c:644 ../src/symbols.c:668 ../src/symbols.c:687 +#: ../src/symbols.c:699 ../src/symbols.c:730 ../src/symbols.c:743 +#: ../src/symbols.c:805 msgid "Classes" msgstr "Klassen" -#: ../src/symbols.c:646 ../src/symbols.c:758 +#: ../src/symbols.c:646 ../src/symbols.c:756 msgid "Constants" msgstr "Konstanten" #. &(tv_iters.tag_class), _("Constants"), #. &(tv_iters.tag_member), _("Members"), #. &(tv_iters.tag_macro), _("Macros"), -#: ../src/symbols.c:647 ../src/symbols.c:704 ../src/symbols.c:720 -#: ../src/symbols.c:748 ../src/symbols.c:757 ../src/symbols.c:773 -#: ../src/symbols.c:819 +#: ../src/symbols.c:647 ../src/symbols.c:702 ../src/symbols.c:718 +#: ../src/symbols.c:746 ../src/symbols.c:755 ../src/symbols.c:771 +#: ../src/symbols.c:817 msgid "Variables" msgstr "Variablen" @@ -4124,68 +4166,76 @@ msgid "Heading (H3)" msgstr "Überschrift (H3)" -#: ../src/symbols.c:688 +#: ../src/symbols.c:669 +msgid "ID Selectors" +msgstr "" + +#: ../src/symbols.c:670 +msgid "Type Selectors" +msgstr "" + +#: ../src/symbols.c:686 msgid "Modules" msgstr "Module" -#: ../src/symbols.c:690 +#: ../src/symbols.c:688 msgid "Singletons" msgstr "Singletons" -#: ../src/symbols.c:691 ../src/symbols.c:702 ../src/symbols.c:733 -#: ../src/symbols.c:746 +#: ../src/symbols.c:689 ../src/symbols.c:700 ../src/symbols.c:731 +#: ../src/symbols.c:744 msgid "Methods" msgstr "Methoden" -#: ../src/symbols.c:734 ../src/symbols.c:809 +#: ../src/symbols.c:732 ../src/symbols.c:807 msgid "Members" msgstr "Instanzvariablen" -#: ../src/symbols.c:760 ../src/symbols.c:783 +#: ../src/symbols.c:758 ../src/symbols.c:781 msgid "Labels" msgstr "Label" -#: ../src/symbols.c:772 +#: ../src/symbols.c:770 msgid "Subroutines" msgstr "Subroutinen" -#: ../src/symbols.c:775 +#: ../src/symbols.c:773 msgid "Blocks" msgstr "Blöcke" -#: ../src/symbols.c:784 ../src/symbols.c:793 ../src/symbols.c:816 +#: ../src/symbols.c:782 ../src/symbols.c:791 ../src/symbols.c:814 msgid "Macros" msgstr "Makros" -#: ../src/symbols.c:785 +#: ../src/symbols.c:783 msgid "Defines" msgstr "Definitionen" -#: ../src/symbols.c:792 +#: ../src/symbols.c:790 msgid "Targets" msgstr "Targets" -#: ../src/symbols.c:804 +#: ../src/symbols.c:802 msgid "Namespaces" msgstr "Namensräume" -#: ../src/symbols.c:810 +#: ../src/symbols.c:808 msgid "Structs / Typedefs" msgstr "Structs / Typedefs" -#: ../src/symbols.c:1034 +#: ../src/symbols.c:1032 #, c-format msgid "Unknown filetype extension for \"%s\".\n" msgstr "Unbekannte Dateityperweiterung für \"%s\".\n" -#: ../src/symbols.c:1055 +#: ../src/symbols.c:1053 #, c-format msgid "Failed to create tags file, perhaps because no tags were found.\n" msgstr "" "Die Tag-Datei konnte nicht erstellt werden, möglicherweise konnten keinen " "Tags gefunden werden.\n" -#: ../src/symbols.c:1062 +#: ../src/symbols.c:1060 #, c-format msgid "" "Usage: %s -g <Tag File> <File list>\n" @@ -4194,7 +4244,7 @@ "Verwendung: %s -g <Tag-Datei> <Datei-Liste>\n" "\n" -#: ../src/symbols.c:1063 +#: ../src/symbols.c:1061 #, c-format msgid "" "Example:\n" @@ -4205,30 +4255,30 @@ "CFLAGS=`pkg-config gtk+-2.0 --cflags` %s -g gtk2.c.tags /usr/include/gtk-2.0/" "gtk/gtk.h\n" -#: ../src/symbols.c:1077 +#: ../src/symbols.c:1075 msgid "Load Tags" msgstr "Tags laden" -#: ../src/symbols.c:1084 +#: ../src/symbols.c:1082 msgid "Geany tag files (*.tags)" msgstr "Geany Tag-Datei (*.tags)" -#: ../src/symbols.c:1103 +#: ../src/symbols.c:1101 #, c-format msgid "Loaded %s tags file '%s'." msgstr "%s Tag-Datei '%s' geladen." -#: ../src/symbols.c:1105 +#: ../src/symbols.c:1103 #, c-format msgid "Could not load tags file '%s'." msgstr "Konnte Tag-Datei '%s' nicht laden." -#: ../src/symbols.c:1238 +#: ../src/symbols.c:1236 #, c-format msgid "Forward declaration \"%s\" not found." msgstr "(Vorwärts-)Deklaration von \"%s\" nicht gefunden." -#: ../src/symbols.c:1240 +#: ../src/symbols.c:1238 #, c-format msgid "Definition of \"%s\" not found." msgstr "Definition von \"%s\" nicht gefunden." @@ -4413,11 +4463,11 @@ msgid "_Set Custom Date Format" msgstr "_Benutzerdefiniertes Datumsformat einstellen" -#: ../src/ui_utils.c:1466 +#: ../src/ui_utils.c:1470 msgid "Select Folder" msgstr "Ordner wählen" -#: ../src/ui_utils.c:1466 +#: ../src/ui_utils.c:1470 msgid "Select File" msgstr "Datei wählen" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3161] trunk
by eht16＠users.sourceforge.net 30 Oct '08

30 Oct '08

Revision: 3161 http://geany.svn.sourceforge.net/geany/?rev=3161&view=rev Author: eht16 Date: 2008-10-29 20:52:22 +0000 (Wed, 29 Oct 2008) Log Message: ----------- Try to fix a weird bug in reparenting the notebook widget when splitting on Windows. It still occurs on unsplitting. Modified Paths: -------------- trunk/ChangeLog trunk/plugins/splitwindow.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-10-27 19:17:28 UTC (rev 3160) +++ trunk/ChangeLog 2008-10-29 20:52:22 UTC (rev 3161) @@ -1,3 +1,11 @@ +2008-10-29 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * plugins/splitwindow.c: + Try to fix a weird bug in reparenting the notebook widget when + splitting on Windows. + It still occurs on unsplitting. + + 2008-10-27 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * doc/geany.txt, doc/geany.html: Modified: trunk/plugins/splitwindow.c =================================================================== --- trunk/plugins/splitwindow.c 2008-10-27 19:17:28 UTC (rev 3160) +++ trunk/plugins/splitwindow.c 2008-10-29 20:52:22 UTC (rev 3161) @@ -295,8 +295,8 @@ p_support->lookup_widget(geany->main_widgets->window, "vbox1")); pane = gtk_hpaned_new(); + gtk_widget_reparent(notebook, pane); gtk_container_add(GTK_CONTAINER(parent), pane); - gtk_widget_reparent(notebook, pane); box = gtk_vbox_new(FALSE, 0); toolbar = create_toolbar(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3160] trunk
by eht16＠users.sourceforge.net 28 Oct '08

28 Oct '08

Revision: 3160 http://geany.svn.sourceforge.net/geany/?rev=3160&view=rev Author: eht16 Date: 2008-10-27 19:17:28 +0000 (Mon, 27 Oct 2008) Log Message: ----------- Enable generation of API documentation of tagmanager functions which are exposed in the plugin API, hide all others from the API docs. Modified Paths: -------------- trunk/ChangeLog trunk/doc/Doxyfile.in trunk/tagmanager/include/tm_source_file.h trunk/tagmanager/include/tm_work_object.h trunk/tagmanager/include/tm_workspace.h trunk/tagmanager/tm_source_file.c trunk/tagmanager/tm_work_object.c trunk/tagmanager/tm_workspace.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-10-27 19:17:11 UTC (rev 3159) +++ trunk/ChangeLog 2008-10-27 19:17:28 UTC (rev 3160) @@ -6,6 +6,13 @@ Replace deprecated gtk_marshal_* functions with g_cclosure_marshal_* functions and add geany_cclosure_marshal_VOID__STRING_INT_POINTER. Fix a wrong marshal type (pointer != int). + * doc/Doxyfile.in, tagmanager/include/tm_source_file.h, + tagmanager/include/tm_work_object.h, + tagmanager/include/tm_workspace.h, tagmanager/tm_source_file.c, + tagmanager/tm_work_object.c, tagmanager/tm_workspace.c: + Enable generation of API documentation of tagmanager functions + which are exposed in the plugin API, hide all others from the + API docs. 2008-10-26 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> Modified: trunk/doc/Doxyfile.in =================================================================== --- trunk/doc/Doxyfile.in 2008-10-27 19:17:11 UTC (rev 3159) +++ trunk/doc/Doxyfile.in 2008-10-27 19:17:28 UTC (rev 3160) @@ -95,7 +95,10 @@ #--------------------------------------------------------------------------- # configuration options related to the input files #--------------------------------------------------------------------------- -INPUT = ../src/ ./ ../plugins/pluginmacros.h +INPUT = ../src/ ./ ../plugins/pluginmacros.h \ + ../tagmanager/tm_source_file.c ../tagmanager/include/tm_source_file.h \ + ../tagmanager/tm_work_object.c ../tagmanager/include/tm_work_object.h \ + ../tagmanager/tm_workspace.c ../tagmanager/include/tm_workspace.h INPUT_ENCODING = UTF-8 FILE_PATTERNS = *.c \ *.cc \ Modified: trunk/tagmanager/include/tm_source_file.h =================================================================== --- trunk/tagmanager/include/tm_source_file.h 2008-10-27 19:17:11 UTC (rev 3159) +++ trunk/tagmanager/include/tm_source_file.h 2008-10-27 19:17:28 UTC (rev 3160) @@ -12,15 +12,7 @@ #include "tm_work_object.h" -/*! \file - The TMSourceFile structure and associated functions are used to maintain - tags for individual files. See the test file tm_source_file_test.c included - below for an example of how to use this structure and the related functions. - \include tm_tag_print.c - -*/ - #ifndef LIBCTAGS_DEFINED typedef int langType; typedef void tagEntryInfo; @@ -34,21 +26,14 @@ { #endif -/*! Casts a pointer to a pointer to a TMSourceFile structure */ +/* Casts a pointer to a pointer to a TMSourceFile structure */ #define TM_SOURCE_FILE(work_object) ((TMSourceFile *) work_object) -/*! Checks whether the object is a TMSourceFile */ +/* Checks whether the object is a TMSourceFile */ #define IS_TM_SOURCE_FILE(source_file) (((TMWorkObject *) (source_file))->type \ == source_file_class_id) /*! - This example demonstrates the use of the TMSourceFile structure. When run, - it outputs the tags encountered in the source files specified in the command line. - - \example tm_tag_print.c -*/ - -/*! The TMSourceFile structure is derived from TMWorkObject and contains all it's attributes, plus an integer representing the language of the file. */ @@ -59,20 +44,21 @@ gboolean inactive; /*!< Whether this file should be scanned for tags */ } TMSourceFile; -/*! Initializes a TMSourceFile structure from a file name. */ + +/* Initializes a TMSourceFile structure from a file name. */ gboolean tm_source_file_init(TMSourceFile *source_file, const char *file_name, gboolean update, const char *name); -/*! Initializes a TMSourceFile structure and returns a pointer to it. */ +/* Initializes a TMSourceFile structure and returns a pointer to it. */ TMWorkObject *tm_source_file_new(const char *file_name, gboolean update, const char *name); -/*! Destroys the contents of the source file. Note that the tags are owned by the +/* Destroys the contents of the source file. Note that the tags are owned by the source file and are also destroyed when the source file is destroyed. If pointers to these tags are used elsewhere, then those tag arrays should be rebuilt. */ void tm_source_file_destroy(TMSourceFile *source_file); -/*! Frees a TMSourceFile structure, including all contents */ +/* Frees a TMSourceFile structure, including all contents */ void tm_source_file_free(gpointer source_file); /*! Updates the source file by reparsing if the modification time is greater @@ -92,14 +78,14 @@ gboolean tm_source_file_update(TMWorkObject *source_file, gboolean force , gboolean recurse, gboolean update_parent); -/*! Parses the source file and regenarates the tags. +/* Parses the source file and regenarates the tags. \param source_file The source file to parse \return TRUE on success, FALSE on failure \sa tm_source_file_update() */ gboolean tm_source_file_parse(TMSourceFile *source_file); -/*! +/* This function is registered into the ctags parser when a file is parsed for the first time. The function is then called by the ctags parser each time it finds a new tag. You should not have to use this function. @@ -107,23 +93,23 @@ */ int tm_source_file_tags(const tagEntryInfo *tag); -/*! +/* Writes all tags of a source file (including the file tag itself) to the passed file pointer. \param source_file The source file to write. \param fp The file pointer to write to. - \attrs The attributes to write. + \param attrs The attributes to write. \return TRUE on success, FALSE on failure. */ gboolean tm_source_file_write(TMWorkObject *source_file, FILE *fp, guint attrs); -/*! Contains the id obtained by registering the TMSourceFile class as a child of +/* Contains the id obtained by registering the TMSourceFile class as a child of TMWorkObject. \sa tm_work_object_register() */ extern guint source_file_class_id; -/*! Gets the name associated with the language index. +/* Gets the name associated with the language index. \param lang The language index. \return The language name, or NULL. */ Modified: trunk/tagmanager/include/tm_work_object.h =================================================================== --- trunk/tagmanager/include/tm_work_object.h 2008-10-27 19:17:11 UTC (rev 3159) +++ trunk/tagmanager/include/tm_work_object.h 2008-10-27 19:17:28 UTC (rev 3160) @@ -19,10 +19,10 @@ { #endif -/*! Evaluates to X is X is defined, else evaluates to Y */ +/* Evaluates to X is X is defined, else evaluates to Y */ #define NVL(X,Y) (X)?(X):(Y) -/*! Macro to cast a pointer to (TMWorkObject *) */ +/* Macro to cast a pointer to (TMWorkObject *) */ #define TM_WORK_OBJECT(work_object) ((TMWorkObject *) work_object) /*! @@ -41,7 +41,7 @@ GPtrArray *tags_array; /*!< Tags obtained by parsing the object */ } TMWorkObject; -/*! Prototype of the update function required to be written by all classes +/* Prototype of the update function required to be written by all classes derived from TMWorkObject. The function should take a pointer to the object and a flag indicating whether the cache should be ignored, and update the object's tag array accordingly. @@ -51,7 +51,7 @@ typedef gboolean (*TMUpdateFunc) (TMWorkObject *work_object, gboolean force , gboolean recurse, gboolean update_parent); -/*! Prototype of the find function required to be written by all classed +/* Prototype of the find function required to be written by all classed derived from TMWorkObject. The function should take a pointer to the work object and a file name and return a pointer to the work object corresponding to the file name if the file is part of the object, and NULL otherwise. @@ -60,7 +60,7 @@ typedef TMWorkObject *(*TMFindFunc) (TMWorkObject *work_object, const char *file_name , gboolean name_only); -/*! +/* Contains pointers to functions necessary to handle virtual function calls correctly. To create a new object derived from TMWorkObject, you need to write the three functions specified as the members of this class and @@ -73,9 +73,9 @@ TMFindFunc find_func; /*!< Function to locate contained work objects */ } TMWorkObjectClass; -#define TM_OBJECT_TYPE(work_object) ((TMWorkObject *) work_object)->type /*!< Type of the work object */ -#define TM_OBJECT_FILE(work_object) ((TMWorkObject *) work_object)->file_name /*!< File name of the work object */ -#define TM_OBJECT_TAGS(work_object) ((TMWorkObject *) work_object)->tags_array /*!< Tag array of the work object */ +#define TM_OBJECT_TYPE(work_object) ((TMWorkObject *) work_object)->type /*< Type of the work object */ +#define TM_OBJECT_FILE(work_object) ((TMWorkObject *) work_object)->file_name /*< File name of the work object */ +#define TM_OBJECT_TAGS(work_object) ((TMWorkObject *) work_object)->tags_array /*< Tag array of the work object */ /*! Given a file name, returns a newly allocated string containing the realpath() @@ -86,7 +86,7 @@ */ gchar *tm_get_real_path(const gchar *file_name); -/*! +/* Initializes the work object structure. This function should be called by the initialization routine of the derived classes to ensure that the base members are initialized properly. The library user should not have to call this under @@ -101,7 +101,7 @@ gboolean tm_work_object_init(TMWorkObject *work_object, guint type, const char *file_name , gboolean create); -/*! +/* Initializes a new TMWorkObject structure and returns a pointer to it. You shouldn't have to call this function. \return NULL on failure @@ -109,14 +109,14 @@ */ TMWorkObject *tm_work_object_new(guint type, const char *file_name, gboolean create); -/*! +/* Utility function - Given a file name, returns the timestamp of modification. \param file_name Full path to the file. \return Timestamp of the file's modification time. 0 on failure. */ time_t tm_get_file_timestamp(const char *file_name); -/*! +/* Checks if the work object has been modified since the last update by comparing the timestamp stored in the work object structure with the modification time of the physical file. @@ -125,7 +125,7 @@ */ gboolean tm_work_object_is_changed(TMWorkObject *work_object); -/*! +/* Destroys a work object's data without freeing the structure itself. It should be called by the deallocator function of classes derived from TMWorkObject. The user shouldn't have to call this function. @@ -140,7 +140,7 @@ */ void tm_work_object_free(gpointer work_object); -/*! +/* This function should be called exactly once by all classes derived from TMWorkObject, since it supplies a unique ID on each call and stores the functions to call for updation and deallocation of objects of the type allocated. The user should not @@ -153,7 +153,7 @@ */ guint tm_work_object_register(GFreeFunc free_func, TMUpdateFunc update_func, TMFindFunc find_func); -/*! +/* Writes the tags for the work object to the file specified. \param work_object The work object whose tags need to be written. \param file The file to which the tags are to be written. @@ -161,7 +161,7 @@ */ void tm_work_object_write_tags(TMWorkObject *work_object, FILE *file, guint attrs); -/*! +/* Updates the tags array if necessary. Automatically calls the update function of the type to which the object belongs. \param work_object Pointer to a work object or an object derived from it. @@ -175,7 +175,7 @@ gboolean tm_work_object_update(TMWorkObject *work_object, gboolean force , gboolean recurse, gboolean update_parent); -/*! +/* Finds the work object corresponding to the file name passed and returns a pointer to it. If not found, returns NULL. This is a virtual function which automatically calls the registered find function of teh derived object. @@ -184,7 +184,7 @@ TMWorkObject *tm_work_object_find(TMWorkObject *work_object, const char *file_name , gboolean name_only); -/*! Dumps the contents of a work object - useful for debugging */ +/* Dumps the contents of a work object - useful for debugging */ void tm_work_object_dump(const TMWorkObject *w); #ifdef __cplusplus Modified: trunk/tagmanager/include/tm_workspace.h =================================================================== --- trunk/tagmanager/include/tm_workspace.h 2008-10-27 19:17:11 UTC (rev 3159) +++ trunk/tagmanager/include/tm_workspace.h 2008-10-27 19:17:28 UTC (rev 3160) @@ -7,6 +7,7 @@ * */ + #ifndef TM_WORKSPACE_H #define TM_WORKSPACE_H @@ -14,28 +15,12 @@ #include "tm_work_object.h" -/*! \file - The TMWorkspace structure is meant to be used as a singleton to store application - wide tag information. The workspace is intended to contain a list of global tags - and a set of work objects (projects or individual files). You need not use the - workspace, though, to use tag manager, unless you need things like global tags - and a place to store all current open projects and individual files. TMWorkspace - is derived from TMWorkObject. - - The following example demonstrates the use of workspace functions to create global tags. - \include tm_global_tags.c -*/ - #ifdef __cplusplus extern "C" { #endif -/*! - This example demonstrates the use of the global tag generation function. - \example tm_global_tags.c -*/ /*! The Tag Manager Workspace. This is a singleton work object containing a list of work objects. These can be either individual files or project containing @@ -50,7 +35,7 @@ GPtrArray *work_objects; /*!< An array of TMWorkObject pointers */ } TMWorkspace; -/*! Since TMWorkspace is a singleton, you should not create multiple +/* Since TMWorkspace is a singleton, you should not create multiple workspaces, but get a pointer to the workspace whenever required. The first time a pointer is requested, or a work object is added to the workspace, a workspace is created. Subsequent calls to the function will return the @@ -64,7 +49,7 @@ */ gboolean tm_workspace_add_object(TMWorkObject *work_object); -/*! Given a file name, returns a pointer to the object if the object's file +/* Given a file name, returns a pointer to the object if the object's file name is same as the passed file name, otherwise retruns NULL. This is an overloaded version of tm_work_object_find(). \param work_object Pointer to the workspace. @@ -84,7 +69,7 @@ */ gboolean tm_workspace_remove_object(TMWorkObject *work_object, gboolean free, gboolean update); -/*! Loads the global tag list from the specified file. The global tag list should +/* Loads the global tag list from the specified file. The global tag list should have been first created using tm_workspace_create_global_tags(). \param tags_file The file containing global tags. \return TRUE on success, FALSE on failure. @@ -93,7 +78,7 @@ gboolean tm_workspace_load_global_tags(const char *tags_file, gint mode); /*gboolean tm_workspace_load_global_tags(const char *tags_file);*/ -/*! Creates a list of global tags. Ideally, this should be created once during +/* Creates a list of global tags. Ideally, this should be created once during installations so that all users can use the same file. Thsi is because a full scale global tag list can occupy several megabytes of disk space. \param pre_process The pre-processing command. This is executed via system(), @@ -107,13 +92,13 @@ gboolean tm_workspace_create_global_tags(const char *config_dir, const char *pre_process, const char **includes, int includes_count, const char *tags_file, int lang); -/*! Recreates the tag array of the workspace by collecting the tags of +/* Recreates the tag array of the workspace by collecting the tags of all member work objects. You shouldn't have to call this directly since this is called automatically by tm_workspace_update(). */ void tm_workspace_recreate_tags_array(void); -/*! Calls tm_work_object_update() for all workspace member work objects. +/* Calls tm_work_object_update() for all workspace member work objects. Use if you want to globally refresh the workspace. \param workspace Pointer to the workspace. \param force Whether the cache should be ignored. @@ -125,10 +110,10 @@ gboolean tm_workspace_update(TMWorkObject *workspace, gboolean force , gboolean recurse, gboolean update_parent); -/*! Dumps the workspace tree - useful for debugging */ +/* Dumps the workspace tree - useful for debugging */ void tm_workspace_dump(void); -/*! Returns all matching tags found in the workspace. +/* Returns all matching tags found in the workspace. \param name The name of the tag to find. \param type The tag types to return (TMTagType). Can be a bitmask. \param attrs The attributes to sort and dedup on (0 terminated integer array). @@ -140,7 +125,7 @@ const GPtrArray *tm_workspace_find(const char *name, int type, TMTagAttrType *attrs , gboolean partial, langType lang); -/*! Returns all matching tags found in the workspace. +/* Returns all matching tags found in the workspace. \param name The name of the tag to find. \param scope The scope name of the tag to find, or NULL. \param type The tag types to return (TMTagType). Can be a bitmask. @@ -154,23 +139,23 @@ tm_workspace_find_scoped (const char *name, const char *scope, gint type, TMTagAttrType *attrs, gboolean partial, langType lang, gboolean global_search); -/*! Returns TMTag to function which "own" given line +/* Returns TMTag to function which "own" given line \param line Current line in edited file. \param file_tags A GPtrArray of edited file TMTag pointers. \return TMTag pointers to owner function. */ const TMTag *tm_get_current_function(GPtrArray *file_tags, const gulong line); -/*! Returns a list of parent classes for the given class name +/* Returns a list of parent classes for the given class name \param name Name of the class \return A GPtrArray of TMTag pointers (includes the TMTag for the class) */ const GPtrArray *tm_workspace_get_parents(const gchar *name); -/*! Frees the workspace structure and all child work objects. Use only when +/* Frees the workspace structure and all child work objects. Use only when exiting from the main program. */ void tm_workspace_free(gpointer workspace); -/*! Contains the id obtained by registering the TMWorkspace class as a child of +/* Contains the id obtained by registering the TMWorkspace class as a child of TMWorkObject. \sa tm_work_object_register() */ Modified: trunk/tagmanager/tm_source_file.c =================================================================== --- trunk/tagmanager/tm_source_file.c 2008-10-27 19:17:11 UTC (rev 3159) +++ trunk/tagmanager/tm_source_file.c 2008-10-27 19:17:28 UTC (rev 3160) @@ -7,6 +7,13 @@ * */ +/** + * @file tm_source_file.h + The TMSourceFile structure and associated functions are used to maintain + tags for individual files. +*/ + + #include <stdio.h> #include <limits.h> #include <stdlib.h> Modified: trunk/tagmanager/tm_work_object.c =================================================================== --- trunk/tagmanager/tm_work_object.c 2008-10-27 19:17:11 UTC (rev 3159) +++ trunk/tagmanager/tm_work_object.c 2008-10-27 19:17:28 UTC (rev 3160) @@ -7,6 +7,11 @@ * */ +/** + * @file tm_work_object.h + * A TMWorkObject structure is the base class for TMSourceFile and TMProject. +*/ + #include "general.h" /* must always come first */ #include <stdio.h> Modified: trunk/tagmanager/tm_workspace.c =================================================================== --- trunk/tagmanager/tm_workspace.c 2008-10-27 19:17:11 UTC (rev 3159) +++ trunk/tagmanager/tm_workspace.c 2008-10-27 19:17:28 UTC (rev 3160) @@ -7,6 +7,18 @@ * */ +/*! + * @file tm_workspace.h + The TMWorkspace structure is meant to be used as a singleton to store application + wide tag information. + + The workspace is intended to contain a list of global tags + and a set of work objects (projects or individual files). You need not use the + workspace, though, to use tag manager, unless you need things like global tags + and a place to store all current open projects and individual files. TMWorkspace + is derived from TMWorkObject. +*/ + #include "general.h" #include <stdio.h> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3159] trunk
by eht16＠users.sourceforge.net 28 Oct '08

28 Oct '08

Revision: 3159 http://geany.svn.sourceforge.net/geany/?rev=3159&view=rev Author: eht16 Date: 2008-10-27 19:17:11 +0000 (Mon, 27 Oct 2008) Log Message: ----------- Replace deprecated gtk_marshal_* functions with g_cclosure_marshal_* functions and add geany_cclosure_marshal_VOID__STRING_INT_POINTER. Fix a wrong marshal type (pointer != int). Modified Paths: -------------- trunk/ChangeLog trunk/src/geanyobject.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-10-27 19:17:00 UTC (rev 3158) +++ trunk/ChangeLog 2008-10-27 19:17:11 UTC (rev 3159) @@ -2,6 +2,10 @@ * doc/geany.txt, doc/geany.html: Update docs for changed rectangular selection usage since Geany 0.15. + * src/geanyobject.c: + Replace deprecated gtk_marshal_* functions with g_cclosure_marshal_* + functions and add geany_cclosure_marshal_VOID__STRING_INT_POINTER. + Fix a wrong marshal type (pointer != int). 2008-10-26 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> Modified: trunk/src/geanyobject.c =================================================================== --- trunk/src/geanyobject.c 2008-10-27 19:17:00 UTC (rev 3158) +++ trunk/src/geanyobject.c 2008-10-27 19:17:11 UTC (rev 3159) @@ -78,6 +78,37 @@ } +static void geany_cclosure_marshal_VOID__STRING_INT_POINTER(GClosure *closure, GValue *ret_val, + guint n_param_vals, const GValue *param_values, gpointer hint, gpointer mdata) +{ + typedef gboolean (*GMarshalFunc_VOID__STRING_INT_POINTER) + (gpointer data1, gconstpointer arg_1, gint arg_2, gpointer arg_3, gpointer data2); + + register GMarshalFunc_VOID__STRING_INT_POINTER callback; + register GCClosure* cc = (GCClosure*) closure; + register gpointer data1, data2; + + g_return_if_fail(n_param_vals == 4); + + if (G_CCLOSURE_SWAP_DATA(closure)) + { + data1 = closure->data; + data2 = g_value_peek_pointer(param_values + 0); + } + else + { + data1 = g_value_peek_pointer(param_values + 0); + data2 = closure->data; + } + callback = (GMarshalFunc_VOID__STRING_INT_POINTER) (mdata ? mdata : cc->callback); + callback(data1, + g_value_get_string(param_values + 1), + g_value_get_int(param_values + 2), + g_value_get_pointer(param_values + 3), + data2); +} + + static void create_signals(GObjectClass *g_object_class) { geany_object_signals[GCB_DOCUMENT_NEW] = g_signal_new ( @@ -86,7 +117,7 @@ G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GeanyObjectClass, document_new), NULL, NULL, - gtk_marshal_NONE__POINTER, + g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER); geany_object_signals[GCB_DOCUMENT_OPEN] = g_signal_new ( @@ -95,7 +126,7 @@ G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GeanyObjectClass, document_open), NULL, NULL, - gtk_marshal_NONE__POINTER, + g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER); geany_object_signals[GCB_DOCUMENT_SAVE] = g_signal_new ( @@ -104,7 +135,7 @@ G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GeanyObjectClass, document_save), NULL, NULL, - gtk_marshal_NONE__POINTER, + g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER); geany_object_signals[GCB_DOCUMENT_ACTIVATE] = g_signal_new ( @@ -113,7 +144,7 @@ G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GeanyObjectClass, document_activate), NULL, NULL, - gtk_marshal_NONE__POINTER, + g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER); geany_object_signals[GCB_DOCUMENT_CLOSE] = g_signal_new ( @@ -122,7 +153,7 @@ G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GeanyObjectClass, document_close), NULL, NULL, - gtk_marshal_NONE__POINTER, + g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER); @@ -132,7 +163,7 @@ G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GeanyObjectClass, project_open), NULL, NULL, - gtk_marshal_NONE__POINTER, + g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER); geany_object_signals[GCB_PROJECT_SAVE] = g_signal_new ( @@ -141,7 +172,7 @@ G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GeanyObjectClass, project_save), NULL, NULL, - gtk_marshal_NONE__INT, + g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER); geany_object_signals[GCB_PROJECT_CLOSE] = g_signal_new ( @@ -150,7 +181,7 @@ G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GeanyObjectClass, project_close), NULL, NULL, - gtk_marshal_NONE__NONE, + g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); geany_object_signals[GCB_UPDATE_EDITOR_MENU] = g_signal_new ( @@ -159,7 +190,7 @@ G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GeanyObjectClass, update_editor_menu), NULL, NULL, - gtk_marshal_NONE__STRING_INT_POINTER, + geany_cclosure_marshal_VOID__STRING_INT_POINTER, G_TYPE_NONE, 3, G_TYPE_STRING, G_TYPE_INT, G_TYPE_POINTER); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3158] trunk
by eht16＠users.sourceforge.net 28 Oct '08

28 Oct '08

Revision: 3158 http://geany.svn.sourceforge.net/geany/?rev=3158&view=rev Author: eht16 Date: 2008-10-27 19:17:00 +0000 (Mon, 27 Oct 2008) Log Message: ----------- Update docs for changed rectangular selection usage since Geany 0.15. Modified Paths: -------------- trunk/ChangeLog trunk/doc/geany.html trunk/doc/geany.txt Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-10-27 02:33:10 UTC (rev 3157) +++ trunk/ChangeLog 2008-10-27 19:17:00 UTC (rev 3158) @@ -1,3 +1,9 @@ +2008-10-27 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * doc/geany.txt, doc/geany.html: + Update docs for changed rectangular selection usage since Geany 0.15. + + 2008-10-26 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * src/document.c: Modified: trunk/doc/geany.html =================================================================== --- trunk/doc/geany.html 2008-10-27 02:33:10 UTC (rev 3157) +++ trunk/doc/geany.html 2008-10-27 19:17:00 UTC (rev 3158) @@ -934,9 +934,9 @@ <div class="section" id="column-mode-editing"> <h3><a class="toc-backref" href="#id38">Column mode editing</a></h3> There is basic support for column mode editing. To use it, create a -rectangular selection by holding down the Control key while selecting -some text. It is also possible to create a zero-column selection but -be careful because there is no visual indication of this selection. +rectangular selection by holding down the Control and Shift key while +selecting some text. It is also possible to create a zero-column selection +but be careful because there is no visual indication of this selection. Once a rectangular selection exists you can start editing the text within this selection and the modifications will be done for every line in the selection. @@ -4402,7 +4402,7 @@ <div class="footer"> <hr class="footer" /> <a class="reference external" href="geany.txt">View document source</a>. -Generated on: 2008-10-25 18:46 UTC. +Generated on: 2008-10-27 17:07 UTC. Generated by <a class="reference external" href="http://docutils.sourceforge.net/">Docutils</a> from <a class="reference external" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> source. </div> Modified: trunk/doc/geany.txt =================================================================== --- trunk/doc/geany.txt 2008-10-27 02:33:10 UTC (rev 3157) +++ trunk/doc/geany.txt 2008-10-27 19:17:00 UTC (rev 3158) @@ -591,9 +591,9 @@ ^^^^^^^^^^^^^^^^^^^ There is basic support for column mode editing. To use it, create a -rectangular selection by holding down the Control key while selecting -some text. It is also possible to create a zero-column selection but -be careful because there is no visual indication of this selection. +rectangular selection by holding down the Control and Shift key while +selecting some text. It is also possible to create a zero-column selection +but be careful because there is no visual indication of this selection. Once a rectangular selection exists you can start editing the text within this selection and the modifications will be done for every line in the selection. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3156] trunk
by eht16＠users.sourceforge.net 26 Oct '08

26 Oct '08

Revision: 3156 http://geany.svn.sourceforge.net/geany/?rev=3156&view=rev Author: eht16 Date: 2008-10-26 14:16:09 +0000 (Sun, 26 Oct 2008) Log Message: ----------- Handle UTF16/32 encoded files without a BOM better and allow them to opened (#2155573, patch by Jason Oster, thanks). Modified Paths: -------------- trunk/ChangeLog trunk/TODO trunk/src/document.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-10-25 18:57:00 UTC (rev 3155) +++ trunk/ChangeLog 2008-10-26 14:16:09 UTC (rev 3156) @@ -1,3 +1,10 @@ +2008-10-26 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * src/document.c: + Handle UTF16/32 encoded files without a BOM better and allow + them to opened (#2155573, patch by Jason Oster, thanks). + + 2008-10-25 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * src/main.c, src/plugins.c: Modified: trunk/TODO =================================================================== --- trunk/TODO 2008-10-25 18:57:00 UTC (rev 3155) +++ trunk/TODO 2008-10-26 14:16:09 UTC (rev 3156) @@ -3,7 +3,6 @@ Note: features included in brackets have lower priority. Fix bugs: - o fix bug that prevents UTF-16, UTF-32 files from being loaded o tagmanager fails on UTF-16/32 Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2008-10-25 18:57:00 UTC (rev 3155) +++ trunk/src/document.c 2008-10-26 14:16:09 UTC (rev 3156) @@ -636,7 +636,7 @@ else { gchar *converted_text = encodings_convert_to_utf8_from_charset( - filedata->data, filedata->len, forced_enc, FALSE); + filedata->data, filedata->size, forced_enc, FALSE); if (converted_text == NULL) { return FALSE; @@ -657,7 +657,7 @@ /* detect encoding and convert to UTF-8 if necessary */ static gboolean -handle_encoding(FileData *filedata) +handle_encoding(FileData *filedata, GeanyEncodingIndex enc_idx) { g_return_val_if_fail(filedata->enc == NULL, FALSE); g_return_val_if_fail(filedata->bom == FALSE, FALSE); @@ -671,9 +671,6 @@ else { /* first check for a BOM */ - GeanyEncodingIndex enc_idx = - encodings_scan_unicode_bom(filedata->data, filedata->size, NULL); - if (enc_idx != GEANY_ENCODING_NONE) { filedata->enc = g_strdup(encodings[enc_idx].charset); @@ -702,7 +699,8 @@ if (filedata->enc == NULL) /* either there was no BOM or the BOM encoding failed */ { /* try UTF-8 first */ - if (g_utf8_validate(filedata->data, filedata->len, NULL)) + if ((filedata->size == filedata->len) && + g_utf8_validate(filedata->data, filedata->len, NULL)) { filedata->enc = g_strdup("UTF-8"); } @@ -779,13 +777,12 @@ * if we have a BOM */ tmp_enc_idx = encodings_scan_unicode_bom(filedata->data, filedata->size, NULL); - /* check whether the size of the loaded data is equal to the size of the file in the filesystem */ - /* file size may be 0 to allow opening files in /proc/ which have typically a file size - * of 0 bytes */ + /* check whether the size of the loaded data is equal to the size of the file in the + * filesystem file size may be 0 to allow opening files in /proc/ which have typically a + * file size of 0 bytes */ if (filedata->len != filedata->size && filedata->size != 0 && ( tmp_enc_idx == GEANY_ENCODING_UTF_8 || /* tmp_enc_idx can be UTF-7/8/16/32, UCS and None */ - tmp_enc_idx == GEANY_ENCODING_UTF_7 || /* filter out UTF-7/8 and None where no NULL bytes */ - tmp_enc_idx == GEANY_ENCODING_NONE)) /* are allowed */ + tmp_enc_idx == GEANY_ENCODING_UTF_7)) /* filter UTF-7/8 where no NULL bytes are allowed */ { const gchar *warn_msg = _( "The file \"%s\" could not be opened properly and has been truncated. " \ @@ -812,16 +809,17 @@ } else if (! handle_forced_encoding(filedata, forced_enc)) { - ui_set_statusbar(TRUE, _("The file \"%s\" is not valid %s."), utf8_filename, forced_enc); + ui_set_statusbar(TRUE, _("The file \"%s\" is not valid %s."), + utf8_filename, forced_enc); utils_beep(); g_free(filedata->data); return FALSE; } } - else if (! handle_encoding(filedata)) + else if (! handle_encoding(filedata, tmp_enc_idx)) { ui_set_statusbar(TRUE, - _("The file \"%s\" does not look like a text file or the file encoding is not supported."), + _("The file \"%s\" does not look like a text file or the file encoding is not supported."), utf8_filename); utils_beep(); g_free(filedata->data); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3155] trunk
by eht16＠users.sourceforge.net 26 Oct '08

26 Oct '08

Revision: 3155 http://geany.svn.sourceforge.net/geany/?rev=3155&view=rev Author: eht16 Date: 2008-10-25 18:57:00 +0000 (Sat, 25 Oct 2008) Log Message: ----------- Add *_full variants of editor indicator functions to the plugin API for more control over indicators. Add/Update some API docs. Make the 'Mark' button for Find highlight the results with rounded boxes instead of marking the whole line. Modified Paths: -------------- trunk/ChangeLog trunk/doc/geany.html trunk/doc/geany.txt trunk/src/callbacks.c trunk/src/editor.c trunk/src/editor.h trunk/src/highlighting.c trunk/src/plugindata.h trunk/src/plugins.c trunk/src/sciwrappers.c trunk/src/search.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-10-25 18:56:38 UTC (rev 3154) +++ trunk/ChangeLog 2008-10-25 18:57:00 UTC (rev 3155) @@ -7,6 +7,14 @@ Add main_locale_init() to the plugin API. * src/callbacks.c: Fix updating of the value of the toolbar Goto line spinbutton. + * doc/geany.html, doc/geany.txt, src/callbacks.c, src/editor.c, + src/editor.h, src/highlighting.c, src/plugindata.h, src/plugins.c, + src/sciwrappers.c, src/search.c: + Add *_full variants of editor indicator functions to the plugin API + for more control over indicators. + Add/Update some API docs. + Make the 'Mark' button for Find highlight the results with rounded + boxes instead of marking the whole line. 2008-10-24 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> Modified: trunk/doc/geany.html =================================================================== --- trunk/doc/geany.html 2008-10-25 18:56:38 UTC (rev 3154) +++ trunk/doc/geany.html 2008-10-25 18:57:00 UTC (rev 3155) @@ -1223,10 +1223,9 @@ Find All In Document will show a list of matching lines in the current document in the Messages tab of the Message Window. Find All In Session does the same for all open documents. -Mark will set markers for all matching lines in the current document, -if the Markers margin is visible. If not, the background colour of -matching lines will be highlighted. Markers and highlighting can be -removed by selecting the Remove Markers command from the Document menu. +Mark will highlight all matches in the current document with a +coloured box. These markers can be removed by selecting the +Remove Markers command from the Document menu. </div> <div class="section" id="change-font-in-search-dialog-text-fields"> <h4><a class="toc-backref" href="#id52">Change font in search dialog text fields</a></h4> @@ -4403,7 +4402,7 @@ <div class="footer"> <hr class="footer" /> <a class="reference external" href="geany.txt">View document source</a>. -Generated on: 2008-10-23 20:49 UTC. +Generated on: 2008-10-25 18:46 UTC. Generated by <a class="reference external" href="http://docutils.sourceforge.net/">Docutils</a> from <a class="reference external" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> source. </div> Modified: trunk/doc/geany.txt =================================================================== --- trunk/doc/geany.txt 2008-10-25 18:56:38 UTC (rev 3154) +++ trunk/doc/geany.txt 2008-10-25 18:57:00 UTC (rev 3155) @@ -917,10 +917,9 @@ current document in the Messages tab of the Message Window. *Find All In Session* does the same for all open documents. -Mark will set markers for all matching lines in the current document, -if the Markers margin is visible. If not, the background colour of -matching lines will be highlighted. Markers and highlighting can be -removed by selecting the Remove Markers command from the Document menu. +Mark will highlight all matches in the current document with a +coloured box. These markers can be removed by selecting the +Remove Markers command from the Document menu. Change font in search dialog text fields Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2008-10-25 18:56:38 UTC (rev 3154) +++ trunk/src/callbacks.c 2008-10-25 18:57:00 UTC (rev 3155) @@ -1557,7 +1557,7 @@ GeanyDocument *doc = document_get_current(); if (doc != NULL) - editor_clear_indicators(doc->editor); + editor_clear_indicators_full(doc->editor, GEANY_INDICATOR_ERROR); } @@ -1917,6 +1917,7 @@ sci_marker_delete_all(doc->editor->sci, 0); /* delete the yellow tag marker */ sci_marker_delete_all(doc->editor->sci, 1); /* delete user markers */ + editor_clear_indicators_full(doc->editor, GEANY_INDICATOR_SEARCH); } Modified: trunk/src/editor.c =================================================================== --- trunk/src/editor.c 2008-10-25 18:56:38 UTC (rev 3154) +++ trunk/src/editor.c 2008-10-25 18:57:00 UTC (rev 3155) @@ -3388,8 +3388,9 @@ * Error indicators (red squiggly underlines) and usual line markers are removed. * * @param editor The editor to operate on. + * @param indic The indicator number to clear, this is a value of @ref GeanyIndicator. **/ -void editor_clear_indicators(GeanyEditor *editor) +void editor_clear_indicators_full(GeanyEditor *editor, gint indic) { glong last_pos; @@ -3397,21 +3398,36 @@ last_pos = sci_get_length(editor->sci); if (last_pos > 0) + { + sci_set_indicator(editor->sci, indic); sci_indicator_clear(editor->sci, 0, last_pos); + } +} + +/** + * Deletes all currently set indicators in the @a editor window. + * Error indicators (red squiggly underlines) and usual line markers are removed. + * + * @param editor The editor to operate on. + **/ +void editor_clear_indicators(GeanyEditor *editor) +{ + editor_clear_indicators_full(editor, GEANY_INDICATOR_ERROR); sci_marker_delete_all(editor->sci, 0); /* remove the yellow error line marker */ } /** - * This is a convenience function for editor_set_indicator(). It sets an error indicator - * (red squiggly underline) on the whole given line. + * This is a convenience function for editor_set_indicator_full(). It sets an indicator + * on the whole given line. * Whitespace at the start and the end of the line is not marked. * * @param editor The editor to operate on. + * @param indic The indicator number to use, this is a value of @ref GeanyIndicator. * @param line The line number which should be marked. **/ -void editor_set_indicator_on_line(GeanyEditor *editor, gint line) +void editor_set_indicator_on_line_full(GeanyEditor *editor, gint indic, gint line) { gint start, end; guint i = 0, len; @@ -3440,11 +3456,25 @@ } g_free(linebuf); - editor_set_indicator(editor, start + i, end); + editor_set_indicator_full(editor, indic, start + i, end); } /** + * This is a convenience function for editor_set_indicator(). It sets an error indicator + * (red squiggly underline) on the whole given line. + * Whitespace at the start and the end of the line is not marked. + * + * @param editor The editor to operate on. + * @param line The line number which should be marked. + **/ +void editor_set_indicator_on_line(GeanyEditor *editor, gint line) +{ + editor_set_indicator_on_line_full(editor, GEANY_INDICATOR_ERROR, line); +} + + +/** * Sets an error indicator (red squiggly underline) on the range specified by @c start and @c end. * No error checking or whitespace removal is performed, this should be done by the calling * function if necessary. @@ -3455,10 +3485,26 @@ **/ void editor_set_indicator(GeanyEditor *editor, gint start, gint end) { + editor_set_indicator_full(editor, GEANY_INDICATOR_ERROR, start, end); +} + + +/** + * Sets an indicator on the range specified by @c start and @c end. + * No error checking or whitespace removal is performed, this should be done by the calling + * function if necessary. + * + * @param editor The editor to operate on. + * @param indic The indicator number to use, this is a value of @ref GeanyIndicator. + * @param start The starting position for the marker. + * @param end The ending position for the marker. + **/ +void editor_set_indicator_full(GeanyEditor *editor, gint indic, gint start, gint end) +{ if (editor == NULL || start >= end) return; - sci_set_indicator(editor->sci, 0); + sci_set_indicator(editor->sci, indic); sci_indicator_fill(editor->sci, start, end - start); } Modified: trunk/src/editor.h =================================================================== --- trunk/src/editor.h 2008-10-25 18:56:38 UTC (rev 3154) +++ trunk/src/editor.h 2008-10-25 18:57:00 UTC (rev 3155) @@ -50,6 +50,18 @@ } GeanyAutoIndent; +/** Geany indicator types, can be used with Editor indicator functions to highlight + * text in the document. */ +typedef enum +{ + /** Indicator to highlight errors in the document text. This is a red squiggly underline. */ + GEANY_INDICATOR_ERROR = 0, + /** Indicator used to highlight search results in the document. This is a + * rounded box around the text. */ + /* start container indicator outside of lexer indicators (0..7), see Scintilla docs */ + GEANY_INDICATOR_SEARCH = 8 +} +GeanyIndicator; /** Indentation prefs that might be different according to project or filetype. * Use @c editor_get_indent_prefs() to lookup the prefs for a particular document. */ @@ -206,6 +218,12 @@ void editor_set_font(GeanyEditor *editor, const gchar *font); +void editor_set_indicator_on_line_full(GeanyEditor *editor, gint indic, gint line); + +void editor_set_indicator_full(GeanyEditor *editor, gint indic, gint start, gint end); + +void editor_clear_indicators_full(GeanyEditor *editor, gint indic); + const gchar *editor_get_eol_char_name(GeanyEditor *editor); gint editor_get_eol_char_len(GeanyEditor *editor); Modified: trunk/src/highlighting.c =================================================================== --- trunk/src/highlighting.c 2008-10-25 18:56:38 UTC (rev 3154) +++ trunk/src/highlighting.c 2008-10-25 18:57:00 UTC (rev 3155) @@ -461,10 +461,17 @@ common_style_set.styling[GCS_LINE_WRAP_VISUALS].background, 0); SSM(sci, SCI_SETWRAPSTARTINDENT, common_style_set.styling[GCS_LINE_WRAP_INDENT].foreground, 0); - /* indicator settings */ - SSM(sci, SCI_INDICSETSTYLE, 0, INDIC_SQUIGGLE); - SSM(sci, SCI_INDICSETFORE, 0, invert(0x0000ff)); + /* Error indicator */ + SSM(sci, SCI_INDICSETSTYLE, GEANY_INDICATOR_ERROR, INDIC_SQUIGGLE); + SSM(sci, SCI_INDICSETFORE, GEANY_INDICATOR_ERROR, invert(rotate_rgb(0xff0000))); + /* Search indicator, used for 'Mark' matches */ + SSM(sci, SCI_INDICSETSTYLE, GEANY_INDICATOR_SEARCH, INDIC_ROUNDBOX); + /* TODO make this configurable, but we can't really use the foreground nor the background + * colours of GCS_MARKER_LINE since the drawn box is a little translucent and the default + * colours for GCS_MARKER_LINE are too bright. */ + SSM(sci, SCI_INDICSETFORE, GEANY_INDICATOR_SEARCH, invert(rotate_rgb(0x00ff00))); + /* define marker symbols * 0 -> line marker */ SSM(sci, SCI_MARKERDEFINE, 0, SC_MARK_SHORTARROW); Modified: trunk/src/plugindata.h =================================================================== --- trunk/src/plugindata.h 2008-10-25 18:56:38 UTC (rev 3154) +++ trunk/src/plugindata.h 2008-10-25 18:57:00 UTC (rev 3155) @@ -41,7 +41,7 @@ enum { /** The Application Programming Interface (API) version, incremented * whenever any plugin data types are modified or appended to. */ - GEANY_API_VERSION = 103, + GEANY_API_VERSION = 104, /** The Application Binary Interface (ABI) version, incremented whenever * existing fields in the plugin data types have to be changed or reordered. */ @@ -289,6 +289,7 @@ gboolean (*has_selection) (struct _ScintillaObject *sci); gint (*get_tab_width) (struct _ScintillaObject *sci); void (*indicator_clear) (struct _ScintillaObject *sci, gint start, gint end); + void (*set_indicator) (struct _ScintillaObject *sci, gint indic); } ScintillaFuncs; @@ -477,6 +478,10 @@ struct _ScintillaObject* (*create_widget)(struct GeanyEditor *editor); /* Remember to convert any GeanyDocument or ScintillaObject pointers in any * appended functions to GeanyEditor pointers. */ + + void (*set_indicator_full) (struct GeanyEditor *editor, gint indic, gint start, gint end); + void (*set_indicator_on_line_full) (struct GeanyEditor *editor, gint indic, gint line); + void (*clear_indicators_full) (struct GeanyEditor *editor, gint indic); } EditorFuncs; Modified: trunk/src/plugins.c =================================================================== --- trunk/src/plugins.c 2008-10-25 18:56:38 UTC (rev 3154) +++ trunk/src/plugins.c 2008-10-25 18:57:00 UTC (rev 3155) @@ -134,7 +134,10 @@ &editor_set_indicator_on_line, &editor_clear_indicators, &editor_get_indent_prefs, - &editor_create_widget + &editor_create_widget, + &editor_set_indicator_full, + &editor_set_indicator_on_line_full, + &editor_clear_indicators_full, }; static ScintillaFuncs sci_funcs = { @@ -173,7 +176,8 @@ &sci_get_current_line, &sci_has_selection, &sci_get_tab_width, - &sci_indicator_clear + &sci_indicator_clear, + &sci_set_indicator }; static TemplateFuncs template_funcs = { Modified: trunk/src/sciwrappers.c =================================================================== --- trunk/src/sciwrappers.c 2008-10-25 18:56:38 UTC (rev 3154) +++ trunk/src/sciwrappers.c 2008-10-25 18:57:00 UTC (rev 3155) @@ -972,6 +972,15 @@ return SSM(sci, SCI_GETINDICATORCURRENT, 0, 0); } +/** + * Set the current indicator. This is necessary to define an indicator for a range of text or + * clearing indicators for a range of text. + * + * @param sci Scintilla widget. + * @param indic The indicator number to set. + * + * @see sci_indicator_clear + **/ void sci_set_indicator(ScintillaObject *sci, gint indic) { SSM(sci, SCI_SETINDICATORCURRENT, indic, 0); @@ -982,10 +991,16 @@ SSM(sci, SCI_INDICATORFILLRANGE, pos, len); } -/** Clear a range of text from any set indicators. Starting at @a pos, @a len characters long. - * @param sci Scintilla widget. - * @param pos Starting position. - * @param len Length. */ +/** + * Clear a range of text from the currently set indicator. + * Starting at @a pos, @a len characters long. + * In order to make this function properly, you need to set the current indicator before with + * @ref sci_set_indicator(). + * + * @param sci Scintilla widget. + * @param pos Starting position. + * @param len Length. + **/ void sci_indicator_clear(ScintillaObject *sci, gint pos, gint len) { SSM(sci, SCI_INDICATORCLEARRANGE, pos, len); Modified: trunk/src/search.c =================================================================== --- trunk/src/search.c 2008-10-25 18:56:38 UTC (rev 3154) +++ trunk/src/search.c 2008-10-25 18:57:00 UTC (rev 3155) @@ -801,7 +801,7 @@ static gint search_mark(GeanyDocument *doc, const gchar *search_text, gint flags) { - gint pos, line, count = 0; + gint pos, end_pos, count = 0; struct TextToFind ttf; g_return_val_if_fail(doc != NULL, 0); @@ -809,13 +809,13 @@ ttf.chrg.cpMin = 0; ttf.chrg.cpMax = sci_get_length(doc->editor->sci); ttf.lpstrText = (gchar *)search_text; - while (1) + while (TRUE) { pos = sci_find_text(doc->editor->sci, flags, &ttf); if (pos == -1) break; - line = sci_get_line_from_position(doc->editor->sci, pos); - sci_set_marker_at_line(doc->editor->sci, line, TRUE, 1); + end_pos = scintilla_send_message(doc->editor->sci, SCI_WORDENDPOSITION, pos, TRUE); + editor_set_indicator_full(doc->editor, GEANY_INDICATOR_SEARCH, pos, end_pos); ttf.chrg.cpMin = ttf.chrgText.cpMax + 1; count++; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3154] trunk
by eht16＠users.sourceforge.net 26 Oct '08

26 Oct '08

Revision: 3154 http://geany.svn.sourceforge.net/geany/?rev=3154&view=rev Author: eht16 Date: 2008-10-25 18:56:38 +0000 (Sat, 25 Oct 2008) Log Message: ----------- Fix updating of the value of the toolbar Goto line spinbutton. Modified Paths: -------------- trunk/ChangeLog trunk/src/callbacks.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-10-25 18:56:27 UTC (rev 3153) +++ trunk/ChangeLog 2008-10-25 18:56:38 UTC (rev 3154) @@ -5,6 +5,8 @@ pass NULL as package name. * src/main.c, src/plugins.c, src/plugindata.h: Add main_locale_init() to the plugin API. + * src/callbacks.c: + Fix updating of the value of the toolbar Goto line spinbutton. 2008-10-24 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2008-10-25 18:56:27 UTC (rev 3153) +++ trunk/src/callbacks.c 2008-10-25 18:56:38 UTC (rev 3154) @@ -1213,6 +1213,7 @@ on_goto_line_entry_activate (GtkEntry *entry, gpointer user_data) { + gtk_spin_button_update(GTK_SPIN_BUTTON(entry)); on_goto_line_dialog_response(GTK_DIALOG(user_data), GTK_RESPONSE_ACCEPT, entry); } @@ -1221,6 +1222,7 @@ on_toolbutton_goto_entry_activate (GtkEntry *entry, gpointer user_data) { + gtk_spin_button_update(GTK_SPIN_BUTTON(entry)); on_goto_line_dialog_response(NULL, GTK_RESPONSE_ACCEPT, entry); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits October 2008