Commits October 2009

commits@lists.geany.org

6 participants
121 discussions

SF.net SVN: geany:[4333] trunk
by frlan＠users.sourceforge.net 19 Oct '09

19 Oct '09

Revision: 4333 http://geany.svn.sourceforge.net/geany/?rev=4333&view=rev Author: frlan Date: 2009-10-19 07:12:08 +0000 (Mon, 19 Oct 2009) Log Message: ----------- Add Xhacker Liu to list of translators. Modified Paths: -------------- trunk/ChangeLog trunk/THANKS trunk/src/about.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-10-17 08:15:28 UTC (rev 4332) +++ trunk/ChangeLog 2009-10-19 07:12:08 UTC (rev 4333) @@ -1,3 +1,10 @@ +2009-10-19 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> + + * THANKS, src/about.c: + Add Xhacker Liu for his work at zh_CN translation to long list of + translators. + + 2009-10-16 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * src/sciwrappers.c: Modified: trunk/THANKS =================================================================== --- trunk/THANKS 2009-10-17 08:15:28 UTC (rev 4332) +++ trunk/THANKS 2009-10-19 07:12:08 UTC (rev 4333) @@ -120,6 +120,7 @@ Boris Dibrov <dibrov(dot)bor(at)gmail(dot)com> - uk Clytie Siddall <clytie(at)riverland(dot)net(dot)au> - vi_VN Dormouse Young <mouselinux(at)163(dot)com> - zh_CN +Xhacker Liu <liu.dongyuan(at)gmail(dot)com> - zh_CN KoViCH <kovich(dot)ian(at)gmail(dot)com> - zh_TW Projects: Modified: trunk/src/about.c =================================================================== --- trunk/src/about.c 2009-10-17 08:15:28 UTC (rev 4332) +++ trunk/src/about.c 2009-10-19 07:12:08 UTC (rev 4333) @@ -70,7 +70,7 @@ { "tr", "Gürkan Gür <seqizz(a)gmail.com>"}, { "uk", "Boris Dibrov <dibrov.bor(a)gmail.com>" }, { "vi_VN", "Clytie Siddall <clytie(a)riverland.net.au>" }, - { "zh_CN", "Dormouse Young <mouselinux(a)163.com>" }, + { "zh_CN", "Dormouse Young <mouselinux(a)163.com>,\nXhacker Liu <liu.dongyuan(a)gmail.com>" }, { "zh_TW", "KoViCH <kovich.ian(a)gmail.com>" } }; static const gint translators_len = G_N_ELEMENTS(translators); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[4332] trunk/po
by frlan＠users.sourceforge.net 17 Oct '09

17 Oct '09

Revision: 4332 http://geany.svn.sourceforge.net/geany/?rev=4332&view=rev Author: frlan Date: 2009-10-17 08:15:28 +0000 (Sat, 17 Oct 2009) Log Message: ----------- Minor update of German translation Modified Paths: -------------- trunk/po/ChangeLog trunk/po/de.po Modified: trunk/po/ChangeLog =================================================================== --- trunk/po/ChangeLog 2009-10-16 16:42:38 UTC (rev 4331) +++ trunk/po/ChangeLog 2009-10-17 08:15:28 UTC (rev 4332) @@ -1,3 +1,8 @@ +2009-10-17 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> + + * Minor update of German translation. + + 2009-10-12 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> * de.po: Minimal update of German translation. Modified: trunk/po/de.po =================================================================== --- trunk/po/de.po 2009-10-16 16:42:38 UTC (rev 4331) +++ trunk/po/de.po 2009-10-17 08:15:28 UTC (rev 4332) @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: geany 0.18\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-10-12 00:59+0200\n" +"POT-Creation-Date: 2009-10-17 10:14+0200\n" "PO-Revision-Date: 2009-10-03 09:40+0100\n" "Last-Translator: Frank Lanitz <frank(a)frank.uvena.de>\n" "Language-Team: German <geany-i18n(a)uvena.de>\n" @@ -27,7 +27,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:257 ../src/interface.c:1464 +#: ../geany.desktop.in.h:2 ../src/interface.c:260 ../src/interface.c:1480 msgid "Geany" msgstr "Geany" @@ -35,53 +35,53 @@ msgid "Integrated Development Environment" msgstr "Integrierte Entwicklungsumgebung" -#: ../src/about.c:139 +#: ../src/about.c:140 msgid "About Geany" msgstr "Über Geany" -#: ../src/about.c:189 +#: ../src/about.c:190 msgid "A fast and lightweight IDE" msgstr "Eine kleine und schnelle Entwicklungsumgebung" -#: ../src/about.c:210 +#: ../src/about.c:211 #, c-format msgid "(built on or after %s)" msgstr "(kompiliert am %s oder später)" #. gtk_container_add(GTK_CONTAINER(info_box), cop_label); -#: ../src/about.c:241 +#: ../src/about.c:242 msgid "Info" msgstr "Info" -#: ../src/about.c:257 +#: ../src/about.c:258 msgid "Developers" msgstr "Entwickler" -#: ../src/about.c:266 +#: ../src/about.c:267 msgid "maintainer" msgstr "Hauptentwickler" -#: ../src/about.c:274 +#: ../src/about.c:275 msgid "developer" msgstr "Entwickler" -#: ../src/about.c:282 +#: ../src/about.c:283 msgid "translation maintainer" msgstr "Übersetzungskoordinator" -#: ../src/about.c:291 +#: ../src/about.c:292 msgid "Translators" msgstr "Übersetzer" -#: ../src/about.c:311 +#: ../src/about.c:312 msgid "Previous Translators" msgstr "Ehemalige Übersetzer" -#: ../src/about.c:332 +#: ../src/about.c:333 msgid "Contributors" msgstr "Mitwirkende" -#: ../src/about.c:342 +#: ../src/about.c:343 #, c-format msgid "" "Some of the many contributors (for a more detailed list, see the file %s):" @@ -89,15 +89,15 @@ "Einige der vielen Leute, die an Geany mitgearbeitet haben (eine " "detailliertere Liste findet sich in der Datei %s):" -#: ../src/about.c:368 +#: ../src/about.c:369 msgid "Credits" msgstr "Credits" -#: ../src/about.c:382 +#: ../src/about.c:383 msgid "License" msgstr "Lizenz" -#: ../src/about.c:391 +#: ../src/about.c:392 msgid "" "License text could not be found, please visit http://www.gnu.org/licenses/" "gpl-2.0.txt to view it online." @@ -181,79 +181,79 @@ msgid "_Set Build Commands" msgstr "Befehle zum Übersetzen" -#: ../src/build.c:1552 ../src/toolbar.c:344 +#: ../src/build.c:1554 ../src/toolbar.c:344 msgid "Build the current file" msgstr "Kompiliert die aktuelle Datei" -#: ../src/build.c:1566 +#: ../src/build.c:1568 msgid "Build the current file with Make and the default target" msgstr "Kompiliert die aktuelle Datei mit »make« und dem Standard-Target" -#: ../src/build.c:1568 +#: ../src/build.c:1570 msgid "Build the current file with Make and the specified target" msgstr "Kompiliert die aktuelle Datei mit »make« und dem angegebenem Target" -#: ../src/build.c:1570 +#: ../src/build.c:1572 msgid "Compile the current file with Make" msgstr "Kompiliert die aktuelle Datei mit make" -#: ../src/build.c:1597 +#: ../src/build.c:1599 #, c-format msgid "Process could not be stopped (%s)." msgstr "Der Prozess konnte nicht angehalten werden (%s)." -#: ../src/build.c:1614 ../src/build.c:1626 +#: ../src/build.c:1616 ../src/build.c:1628 msgid "No more build errors." msgstr "Keine weiteren Fehlermeldungen." -#: ../src/build.c:1698 +#: ../src/build.c:1700 msgid "Item" msgstr "Eintrag" -#: ../src/build.c:1699 ../src/symbols.c:636 +#: ../src/build.c:1701 ../src/symbols.c:636 msgid "Label" msgstr "Label" -#: ../src/build.c:1700 ../src/symbols.c:631 +#: ../src/build.c:1702 ../src/symbols.c:631 msgid "Command" msgstr "Kommando" -#: ../src/build.c:1701 +#: ../src/build.c:1703 msgid "Working directory" msgstr "Arbeitsverzeichnis" -#: ../src/build.c:1702 +#: ../src/build.c:1704 msgid "Clear" msgstr "Leeren" -#: ../src/build.c:1804 ../src/build.c:1806 +#: ../src/build.c:1806 ../src/build.c:1808 #, c-format msgid "%s Commands" msgstr "Kommandos für %s" -#: ../src/build.c:1806 +#: ../src/build.c:1808 msgid "No Filetype" msgstr "Kein Dateityp" -#: ../src/build.c:1814 ../src/build.c:1849 +#: ../src/build.c:1816 ../src/build.c:1851 msgid "Error Regular Expression:" msgstr "Regulärer Ausdruck für Fehlermeldungen:" -#: ../src/build.c:1842 +#: ../src/build.c:1844 msgid "Non-Filetype Commands" msgstr "Dateitypunhängige Befehle" -#: ../src/build.c:1872 +#: ../src/build.c:1874 msgid "Note: Item 2 opens a dialog and appends the response to the command." msgstr "" "Notiz: Element 2 öffnet ein Dialog und fügt das Ergebnis am Ende des " "Kommandos an" -#: ../src/build.c:1881 +#: ../src/build.c:1883 msgid "Execute Commands" msgstr "Befehle zum Ausführen" -#: ../src/build.c:1892 +#: ../src/build.c:1894 #, c-format msgid "" "%d, %e, %f, %p are substituted in command and directory fields, see manual " @@ -262,40 +262,40 @@ "%d, %e, %f, %p werden innerhalb der Kommando- und Verzeichnisfelder ersetzt " "- Details gibt es in der Dokumentation." -#: ../src/build.c:2044 +#: ../src/build.c:2046 msgid "Set Build Commands" msgstr "Befehle zum Übersetzen" -#: ../src/build.c:2297 ../src/build.c:2478 +#: ../src/build.c:2310 ../src/build.c:2494 msgid "_Execute" msgstr "_Ausführen" -#: ../src/build.c:2475 +#: ../src/build.c:2491 msgid "_Make" msgstr "_Make" #. build the code with make custom -#: ../src/build.c:2476 ../src/build.c:2529 +#: ../src/build.c:2492 ../src/build.c:2545 msgid "Make Custom _Target" msgstr "Make (eigenes _Target)" #. build the code with make object -#: ../src/build.c:2477 ../src/build.c:2537 +#: ../src/build.c:2493 ../src/build.c:2553 msgid "Make _Object" msgstr "Make _Objekt-Datei" #. build the code -#: ../src/build.c:2509 ../src/interface.c:964 +#: ../src/build.c:2525 ../src/interface.c:967 msgid "_Build" msgstr "_Erstellen" #. build the code with make all -#: ../src/build.c:2521 +#: ../src/build.c:2537 msgid "_Make All" msgstr "_Make all" #. arguments -#: ../src/build.c:2549 +#: ../src/build.c:2565 msgid "_Set Build Menu Commands" msgstr "Kommandos zum Erstellen konfigurieren" @@ -303,7 +303,7 @@ msgid "Do you really want to quit?" msgstr "Soll Geany wirklich beendet werden?" -#: ../src/callbacks.c:471 ../src/document.c:2910 ../src/interface.c:328 +#: ../src/callbacks.c:471 ../src/document.c:2911 ../src/interface.c:331 #: ../src/sidebar.c:580 msgid "_Reload" msgstr "_Neu laden" @@ -385,7 +385,7 @@ msgid "Open File" msgstr "Datei öffnen" -#: ../src/dialogs.c:144 ../src/interface.c:679 +#: ../src/dialogs.c:144 ../src/interface.c:682 msgid "_View" msgstr "_Ansicht" @@ -401,7 +401,7 @@ msgid "Detect by file extension" msgstr "Durch Dateiendung erkennen" -#: ../src/dialogs.c:196 ../src/interface.c:3563 ../src/interface.c:5103 +#: ../src/dialogs.c:196 ../src/interface.c:3582 ../src/interface.c:5122 msgid "Detect from file" msgstr "Aus Datei lesen" @@ -610,22 +610,22 @@ msgid "Other:" msgstr "Andere:" -#: ../src/document.c:642 +#: ../src/document.c:643 #, c-format msgid "File %s closed." msgstr "Datei »%s« wurde geschlossen." -#: ../src/document.c:767 +#: ../src/document.c:768 #, c-format msgid "New file \"%s\" opened." msgstr "Neue Datei »%s« geöffnet." -#: ../src/document.c:940 ../src/document.c:1450 +#: ../src/document.c:941 ../src/document.c:1451 #, c-format msgid "Could not open file %s (%s)" msgstr "Konnte Datei »%s« nicht öffnen (%s)." -#: ../src/document.c:970 +#: ../src/document.c:971 #, c-format msgid "" "The file \"%s\" could not be opened properly and has been truncated. This " @@ -640,12 +640,12 @@ #. For translators: the second wildcard is an encoding name, e.g. #. * The file \"test.txt\" is not valid UTF-8. -#: ../src/document.c:996 +#: ../src/document.c:997 #, c-format msgid "The file \"%s\" is not valid %s." msgstr "Die Datei »%s« ist kein gültiges %s." -#: ../src/document.c:1006 +#: ../src/document.c:1007 #, c-format msgid "" "The file \"%s\" does not look like a text file or the file encoding is not " @@ -654,30 +654,30 @@ "Die Datei »%s« scheint keine Textdatei zu sein, oder die Zeichenkodierung " "wird nicht unterstützt." -#: ../src/document.c:1149 +#: ../src/document.c:1150 msgid "Spaces" msgstr "Leerzeichen" -#: ../src/document.c:1152 +#: ../src/document.c:1153 msgid "Tabs" msgstr "Tabulatoren" -#: ../src/document.c:1155 +#: ../src/document.c:1156 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:1160 +#: ../src/document.c:1161 #, c-format msgid "Setting %s indentation mode for %s." msgstr "Setze Einrückungsmodus %s für »%s«." -#: ../src/document.c:1213 +#: ../src/document.c:1214 msgid "Invalid filename" msgstr "Ungültiger Dateiname" -#: ../src/document.c:1328 +#: ../src/document.c:1329 #, c-format msgid "File %s reloaded." msgstr "Datei »%s« neu geladen." @@ -685,20 +685,20 @@ #. For translators: this is the status window message for opening a file. %d is the number #. * of the newly opened file, %s indicates whether the file is opened read-only #. * (it is replaced with the string ", read-only"). -#: ../src/document.c:1333 +#: ../src/document.c:1334 #, c-format msgid "File %s opened(%d%s)." msgstr "Datei »%s« geöffnet (%d%s)." -#: ../src/document.c:1335 +#: ../src/document.c:1336 msgid ", read-only" msgstr ", schreibgeschützt" -#: ../src/document.c:1545 +#: ../src/document.c:1546 msgid "Error renaming file." msgstr "Fehler beim Umbenennen der Datei." -#: ../src/document.c:1620 +#: ../src/document.c:1621 #, c-format msgid "" "An error occurred while converting the file from UTF-8 in \"%s\". The file " @@ -707,7 +707,7 @@ "Beim Konvertieren der Datei von UTF-8 nach »%s« ist ein Fehler aufgetreten. " "Die Datei wird nicht gespeichert." -#: ../src/document.c:1642 +#: ../src/document.c:1643 #, c-format msgid "" "Error message: %s\n" @@ -716,52 +716,52 @@ "Fehlermeldung: %s\n" "Der Fehler trat bei »%s« (Zeile: %d, Spalte: %d) auf." -#: ../src/document.c:1647 +#: ../src/document.c:1648 #, c-format msgid "Error message: %s." msgstr "Fehlermeldung: %s." -#: ../src/document.c:1750 ../src/document.c:1813 +#: ../src/document.c:1751 ../src/document.c:1814 msgid "Error saving file." msgstr "Fehler beim Speichern der Datei." -#: ../src/document.c:1812 +#: ../src/document.c:1813 #, c-format msgid "Error saving file (%s)." msgstr "Fehler beim Speichern der Datei (%s)." -#: ../src/document.c:1837 +#: ../src/document.c:1838 #, c-format msgid "File %s saved." msgstr "Datei »%s« wurde gespeichert." -#: ../src/document.c:1905 ../src/document.c:1962 ../src/document.c:1970 +#: ../src/document.c:1906 ../src/document.c:1963 ../src/document.c:1971 #, c-format msgid "\"%s\" was not found." msgstr "»%s« wurde nicht gefunden." -#: ../src/document.c:1970 +#: ../src/document.c:1971 msgid "Wrap search and find again?" msgstr "Suche vom Dokumentanfang bzw. -ende neu beginnen?" -#: ../src/document.c:2049 ../src/search.c:1085 ../src/search.c:1659 +#: ../src/document.c:2050 ../src/search.c:1085 ../src/search.c:1659 #: ../src/search.c:1660 #, c-format msgid "No matches found for \"%s\"." msgstr "Keine Treffer für »%s« gefunden." -#: ../src/document.c:2060 ../src/document.c:2069 +#: ../src/document.c:2061 ../src/document.c:2070 #, 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:2911 +#: ../src/document.c:2912 msgid "Do you want to reload it?" msgstr "Möchten Sie die Datei neu laden?" -#: ../src/document.c:2912 +#: ../src/document.c:2913 #, c-format msgid "" "The file '%s' on the disk is more recent than\n" @@ -770,20 +770,20 @@ "Die Datei »%s« auf dem Datenträger ist aktueller als die momentan geöffnete " "Version." -#: ../src/document.c:2933 +#: ../src/document.c:2934 msgid "Try to resave the file?" msgstr "Versuchen die Datei erneut zu speichern?" -#: ../src/document.c:2934 +#: ../src/document.c:2935 #, c-format msgid "File \"%s\" was not found on disk!" msgstr "»%s« wurde nicht auf dem Datenträger gefunden." -#: ../src/editor.c:4306 +#: ../src/editor.c:4320 msgid "Enter Tab Width" msgstr "Tabulatorbreite:" -#: ../src/editor.c:4307 +#: ../src/editor.c:4321 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 " @@ -934,8 +934,8 @@ msgid "%s file" msgstr "%s Quelldatei" -#: ../src/filetypes.c:118 ../src/filetypes.c:119 ../src/interface.c:3482 -#: ../src/interface.c:5022 +#: ../src/filetypes.c:118 ../src/filetypes.c:119 ../src/interface.c:3501 +#: ../src/interface.c:5041 msgid "None" msgstr "Keiner" @@ -1005,461 +1005,465 @@ msgid "untitled" msgstr "unbenannt" -#: ../src/interface.c:271 +#: ../src/interface.c:274 msgid "_File" msgstr "_Datei" -#: ../src/interface.c:282 +#: ../src/interface.c:285 msgid "New (with _Template)" msgstr "Neu (aus _Vorlage)" -#: ../src/interface.c:299 ../src/interface.c:1925 +#: ../src/interface.c:302 ../src/interface.c:1944 msgid "Open Selected F_ile" msgstr "_Markierte Datei öffnen" -#: ../src/interface.c:303 +#: ../src/interface.c:306 msgid "Recent _Files" msgstr "_Zuletzt geöffnet" -#: ../src/interface.c:320 +#: ../src/interface.c:323 msgid "Save A_ll" msgstr "A_lle speichern" -#: ../src/interface.c:336 +#: ../src/interface.c:339 msgid "R_eload As" msgstr "N_eu laden als" -#: ../src/interface.c:347 ../src/interface.c:525 ../src/interface.c:579 -#: ../src/interface.c:593 ../src/interface.c:839 ../src/interface.c:849 -#: ../src/interface.c:2003 ../src/interface.c:2057 ../src/interface.c:2071 +#: ../src/interface.c:350 ../src/interface.c:528 ../src/interface.c:582 +#: ../src/interface.c:596 ../src/interface.c:842 ../src/interface.c:852 +#: ../src/interface.c:2022 ../src/interface.c:2076 ../src/interface.c:2090 msgid "invisible" msgstr "unsichtbar" -#: ../src/interface.c:364 +#: ../src/interface.c:367 msgid "Page Set_up" msgstr "Seiteneigensc_haften" -#: ../src/interface.c:381 ../src/notebook.c:238 +#: ../src/interface.c:384 ../src/notebook.c:213 msgid "Close Ot_her Documents" msgstr "_Inaktive Dateien schließen" -#: ../src/interface.c:389 ../src/notebook.c:243 +#: ../src/interface.c:392 ../src/notebook.c:218 msgid "C_lose All" msgstr "_Alle schließen" -#: ../src/interface.c:406 +#: ../src/interface.c:409 msgid "_Edit" msgstr "_Bearbeiten" -#: ../src/interface.c:456 ../src/interface.c:1934 +#: ../src/interface.c:459 ../src/interface.c:1953 msgid "_Format" msgstr "_Format" -#: ../src/interface.c:463 ../src/interface.c:1941 +#: ../src/interface.c:466 ../src/interface.c:1960 msgid "T_oggle Case of Selection" msgstr "_Groß- und Kleinschreibung für die Auswahl tauschen" -#: ../src/interface.c:472 ../src/interface.c:1950 +#: ../src/interface.c:475 ../src/interface.c:1969 msgid "_Comment Line(s)" msgstr "Zeile(n) _auskommentieren" -#: ../src/interface.c:476 ../src/interface.c:1954 +#: ../src/interface.c:479 ../src/interface.c:1973 msgid "U_ncomment Line(s)" msgstr "Zeile(n) _einkommentieren" -#: ../src/interface.c:480 ../src/interface.c:1958 +#: ../src/interface.c:483 ../src/interface.c:1977 msgid "_Toggle Line Commentation" msgstr "Kommentierung _umschalten" -#: ../src/interface.c:484 ../src/interface.c:1962 +#: ../src/interface.c:487 ../src/interface.c:1981 msgid "Du_plicate Line or Selection" msgstr "_Zeile oder Auswahl duplizieren" -#: ../src/interface.c:493 ../src/interface.c:1971 +#: ../src/interface.c:496 ../src/interface.c:1990 msgid "_Increase Indent" msgstr "Einzug _erhöhen" -#: ../src/interface.c:501 ../src/interface.c:1979 +#: ../src/interface.c:504 ../src/interface.c:1998 msgid "_Decrease Indent" msgstr "Einzug _verringern" -#: ../src/interface.c:514 ../src/interface.c:1992 +#: ../src/interface.c:517 ../src/interface.c:2011 msgid "_Send Selection to Terminal" msgstr "_Auswahl an Terminal senden" -#: ../src/interface.c:518 ../src/interface.c:1996 +#: ../src/interface.c:521 ../src/interface.c:2015 msgid "_Send Selection to" msgstr "_Auswahl senden an" -#: ../src/interface.c:533 ../src/interface.c:2011 +#: ../src/interface.c:536 ../src/interface.c:2030 msgid "I_nsert Comments" msgstr "K_ommentare einfügen" -#: ../src/interface.c:544 ../src/interface.c:2022 +#: ../src/interface.c:547 ../src/interface.c:2041 msgid "Insert _ChangeLog Entry" msgstr "_ChangeLog-Eintrag hinzufügen" -#: ../src/interface.c:548 ../src/interface.c:2026 +#: ../src/interface.c:551 ../src/interface.c:2045 msgid "Insert File _Header" msgstr "_Dateikopf einfügen" -#: ../src/interface.c:552 ../src/interface.c:2030 +#: ../src/interface.c:555 ../src/interface.c:2049 msgid "Insert _Function Description" msgstr "_Funktionsbeschreibung einfügen" -#: ../src/interface.c:556 ../src/interface.c:2034 +#: ../src/interface.c:559 ../src/interface.c:2053 msgid "Insert _Multiline Comment" msgstr "_Mehrzeiligen Kommentar einfügen" -#: ../src/interface.c:560 ../src/interface.c:2038 +#: ../src/interface.c:563 ../src/interface.c:2057 msgid "Insert _GPL Notice" msgstr "_GPL-Hinweis einfügen" -#: ../src/interface.c:564 ../src/interface.c:2042 +#: ../src/interface.c:567 ../src/interface.c:2061 msgid "Insert _BSD License Notice" msgstr "_BSD-Lizenz-Hinweis einfügen" -#: ../src/interface.c:568 ../src/interface.c:2046 +#: ../src/interface.c:571 ../src/interface.c:2065 msgid "Insert Dat_e" msgstr "_Datum einfügen" -#: ../src/interface.c:582 ../src/interface.c:2060 +#: ../src/interface.c:585 ../src/interface.c:2079 msgid "_Insert \"include <...>\"" msgstr "\"include <...>\" ei_nfügen" -#: ../src/interface.c:601 +#: ../src/interface.c:604 msgid "Preference_s" msgstr "E_instellungen" -#: ../src/interface.c:609 +#: ../src/interface.c:612 msgid "_Search" msgstr "_Suchen" -#: ../src/interface.c:620 +#: ../src/interface.c:623 msgid "Find _Next" msgstr "_Nächstes" -#: ../src/interface.c:624 +#: ../src/interface.c:627 msgid "Find _Previous" msgstr "_Vorheriges" -#: ../src/interface.c:628 +#: ../src/interface.c:631 msgid "Find in F_iles" msgstr "In _Dateien suchen" -#: ../src/interface.c:632 ../src/search.c:524 +#: ../src/interface.c:635 ../src/search.c:524 msgid "_Replace" msgstr "_Ersetzen" -#: ../src/interface.c:645 +#: ../src/interface.c:648 msgid "Find _Selected" msgstr "Auswahl _finden" -#: ../src/interface.c:649 +#: ../src/interface.c:652 msgid "Find Pre_vious Selected" msgstr "Auswahl finden (_rückwärts)" -#: ../src/interface.c:658 +#: ../src/interface.c:661 msgid "Next _Message" msgstr "Nä_chste Nachricht" -#: ../src/interface.c:662 +#: ../src/interface.c:665 msgid "Pr_evious Message" msgstr "V_orherige Nachricht" -#: ../src/interface.c:671 ../src/interface.c:2112 +#: ../src/interface.c:674 ../src/interface.c:2131 msgid "_Go to Line" msgstr "_Gehe zu Zeile" -#: ../src/interface.c:686 +#: ../src/interface.c:689 msgid "Change _Font" msgstr "_Schriftart ändern" -#: ../src/interface.c:699 +#: ../src/interface.c:702 msgid "To_ggle All Additional Widgets" msgstr "Zusätzliche _Infofenster ein-/ausblenden" -#: ../src/interface.c:703 +#: ../src/interface.c:706 msgid "Full_screen" msgstr "_Vollbild" -#: ../src/interface.c:707 +#: ../src/interface.c:710 msgid "Show Message _Window" msgstr "_Meldungsfenster anzeigen" -#: ../src/interface.c:712 +#: ../src/interface.c:715 msgid "Show _Toolbar" msgstr "W_erkzeugleiste anzeigen" -#: ../src/interface.c:717 +#: ../src/interface.c:720 msgid "Show Side_bar" msgstr "Seiten_leiste anzeigen" -#: ../src/interface.c:722 ../src/interface.c:3898 ../src/keybindings.c:251 +#: ../src/interface.c:725 ../src/interface.c:3917 ../src/keybindings.c:252 msgid "Editor" msgstr "Editor" -#: ../src/interface.c:729 +#: ../src/interface.c:732 msgid "Show _Markers Margin" msgstr "M_arkierungsrand anzeigen" -#: ../src/interface.c:734 +#: ../src/interface.c:737 msgid "Show _Line Numbers" msgstr "_Zeilennummern anzeigen" -#: ../src/interface.c:739 +#: ../src/interface.c:742 msgid "Show _White Space" msgstr "_Leerzeichen anzeigen" -#: ../src/interface.c:743 +#: ../src/interface.c:746 msgid "Show Line _Endings" msgstr "Zeile_nenden anzeigen" -#: ../src/interface.c:747 +#: ../src/interface.c:750 msgid "Show _Indentation Guides" msgstr "Zeige _Einrückungshinweise" -#: ../src/interface.c:768 +#: ../src/interface.c:771 msgid "_Document" msgstr "D_okument" -#: ../src/interface.c:775 +#: ../src/interface.c:778 msgid "_Line Wrapping" msgstr "_Visueller Zeilenumbruch" -#: ../src/interface.c:780 +#: ../src/interface.c:783 msgid "Line _Breaking" msgstr "Automatischer Zeilen_umbruch" -#: ../src/interface.c:784 +#: ../src/interface.c:787 msgid "_Auto-indentation" msgstr "_Automatische Einrückung benutzen" -#: ../src/interface.c:789 +#: ../src/interface.c:792 msgid "In_dent Type" msgstr "Art der _Einrückung" -#: ../src/interface.c:796 ../src/interface.c:3521 ../src/interface.c:5061 +#: ../src/interface.c:799 ../src/interface.c:3540 ../src/interface.c:5080 msgid "_Tabs" msgstr "_Tabulatoren" -#: ../src/interface.c:802 ../src/interface.c:3512 ../src/interface.c:5052 +#: ../src/interface.c:805 ../src/interface.c:3531 ../src/interface.c:5071 msgid "_Spaces" msgstr "_Leerzeichen" -#: ../src/interface.c:808 ../src/interface.c:3530 ../src/interface.c:5070 +#: ../src/interface.c:811 ../src/interface.c:3549 ../src/interface.c:5089 msgid "T_abs and Spaces" msgstr "Tabulatoren _und Leerzeichen" -#: ../src/interface.c:819 +#: ../src/interface.c:822 msgid "Read _Only" msgstr "_Nur Lesen" -#: ../src/interface.c:823 +#: ../src/interface.c:826 msgid "_Write Unicode BOM" msgstr "_Unicode BOM schreiben" -#: ../src/interface.c:832 +#: ../src/interface.c:835 msgid "Set File_type" msgstr "Datei_typ festlegen" -#: ../src/interface.c:842 +#: ../src/interface.c:845 msgid "Set _Encoding" msgstr "Ze_ichenkodierung festlegen" -#: ../src/interface.c:852 +#: ../src/interface.c:855 msgid "Set Line E_ndings" msgstr "Zeilenen_den festlegen" -#: ../src/interface.c:859 +#: ../src/interface.c:862 msgid "Convert and Set to _CR/LF (Win)" msgstr "Auf _CR/LF setzen und umwandeln (Win)" -#: ../src/interface.c:865 +#: ../src/interface.c:868 msgid "Convert and Set to _LF (Unix)" msgstr "Auf _LF setzen und umwandeln (Unix)" -#: ../src/interface.c:871 +#: ../src/interface.c:874 msgid "Convert and Set to CR (_Mac)" msgstr "Auf CR setzen und umwandeln (_Mac)" -#: ../src/interface.c:882 +#: ../src/interface.c:885 msgid "_Strip Trailing Spaces" msgstr "Lee_rzeichen am Zeilenende entfernen" -#: ../src/interface.c:886 +#: ../src/interface.c:889 msgid "_Replace Tabs by Spaces" msgstr "Tabulat_oren durch Leerzeichen ersetzen" -#: ../src/interface.c:890 +#: ../src/interface.c:893 msgid "Replace Spaces b_y Tabs" msgstr "_Leerzeichen durch Tabulatoren ersetzen" -#: ../src/interface.c:899 +#: ../src/interface.c:902 msgid "_Fold All" msgstr "A_lle einklappen" -#: ../src/interface.c:903 +#: ../src/interface.c:906 msgid "_Unfold All" msgstr "_Alle ausklappen" -#: ../src/interface.c:912 +#: ../src/interface.c:915 msgid "Remove _Markers" msgstr "Alle _Markierungen entfernen" -#: ../src/interface.c:916 +#: ../src/interface.c:919 msgid "Remove Error _Indicators" msgstr "Alle _Fehlermarkierungen entfernen" -#: ../src/interface.c:920 +#: ../src/interface.c:923 msgid "_Project" msgstr "_Projekt" -#: ../src/interface.c:927 +#: ../src/interface.c:930 msgid "_New" msgstr "_Neu" -#: ../src/interface.c:935 +#: ../src/interface.c:938 msgid "_Open" msgstr "Ö_ffnen" -#: ../src/interface.c:943 +#: ../src/interface.c:946 msgid "_Recent Projects" msgstr "_Zuletzt geöffnete Projekte" -#: ../src/interface.c:947 +#: ../src/interface.c:950 msgid "_Close" msgstr "S_chließen" -#: ../src/interface.c:968 +#: ../src/interface.c:971 msgid "_Tools" msgstr "_Werkzeuge" -#: ../src/interface.c:975 +#: ../src/interface.c:978 +msgid "_Reload Configuration" +msgstr "_Einstellungen erneut laden" + +#: ../src/interface.c:986 +msgid "C_onfiguration Files" +msgstr "_Konfigurationsdateien" + +#: ../src/interface.c:999 msgid "_Color Chooser" msgstr "_Farb-Wähler" -#: ../src/interface.c:983 +#: ../src/interface.c:1007 msgid "_Word Count" msgstr "_Wörter zählen" -#: ../src/interface.c:987 +#: ../src/interface.c:1011 msgid "Load Ta_gs" msgstr "_Tags laden" -#: ../src/interface.c:991 -msgid "_Reload Configuration" -msgstr "_Einstellungen erneut laden" - -#: ../src/interface.c:999 ../src/interface.c:1006 +#: ../src/interface.c:1015 ../src/interface.c:1022 msgid "_Help" msgstr "_Hilfe" -#: ../src/interface.c:1014 +#: ../src/interface.c:1030 msgid "_Website" msgstr "_Webseite" -#: ../src/interface.c:1018 +#: ../src/interface.c:1034 msgid "_Keyboard Shortcuts" msgstr "_Tastenkürzel" -#: ../src/interface.c:1022 +#: ../src/interface.c:1038 msgid "_Debug Messages" msgstr "_Debug-Meldungen" -#: ../src/interface.c:1061 ../src/sidebar.c:121 +#: ../src/interface.c:1077 ../src/sidebar.c:121 msgid "Symbols" msgstr "Symbole" -#: ../src/interface.c:1075 +#: ../src/interface.c:1091 msgid "Documents" msgstr "Dokumente" -#: ../src/interface.c:1111 +#: ../src/interface.c:1127 msgid "Status" msgstr "Status" -#: ../src/interface.c:1125 +#: ../src/interface.c:1141 msgid "Compiler" msgstr "Compiler" -#: ../src/interface.c:1140 +#: ../src/interface.c:1156 msgid "Messages" msgstr "Meldungen" -#: ../src/interface.c:1153 +#: ../src/interface.c:1169 msgid "Scribble" msgstr "Notizen" -#: ../src/interface.c:1712 ../src/interface.c:3267 +#: ../src/interface.c:1731 ../src/interface.c:3286 msgid "Images _and Text" msgstr "Symbole _und Text" -#: ../src/interface.c:1717 ../src/interface.c:3299 +#: ../src/interface.c:1736 ../src/interface.c:3318 msgid "_Images Only" msgstr "Nur _Symbole" -#: ../src/interface.c:1722 ../src/interface.c:3291 +#: ../src/interface.c:1741 ../src/interface.c:3310 msgid "_Text Only" msgstr "Nur _Text" -#: ../src/interface.c:1733 ../src/interface.c:3283 +#: ../src/interface.c:1752 ../src/interface.c:3302 msgid "_Large Icons" msgstr "_Große Symbole" -#: ../src/interface.c:1738 ../src/interface.c:3275 +#: ../src/interface.c:1757 ../src/interface.c:3294 msgid "_Small Icons" msgstr "_Kleine Symbole" -#: ../src/interface.c:1743 ../src/interface.c:3307 +#: ../src/interface.c:1762 ../src/interface.c:3326 msgid "_Very Small Icons" msgstr "_Sehr kleine Symbole" -#: ../src/interface.c:1754 +#: ../src/interface.c:1773 msgid "_Customize Toolbar" msgstr "_Werkzeugleiste anpassen" -#: ../src/interface.c:1762 +#: ../src/interface.c:1781 msgid "_Hide Toolbar" msgstr "Werkzeugleiste _verbergen" -#: ../src/interface.c:2079 +#: ../src/interface.c:2098 msgid "Find _Usage" msgstr "_Auftreten finden" -#: ../src/interface.c:2087 +#: ../src/interface.c:2106 msgid "Find _Document Usage" msgstr "_Auftreten im Dokument finden" -#: ../src/interface.c:2095 +#: ../src/interface.c:2114 msgid "Go to _Tag Definition" msgstr "Gehe zur _Tagdefinition" -#: ../src/interface.c:2099 +#: ../src/interface.c:2118 msgid "Go to T_ag Declaration" msgstr "Gehe zur T_agdeklaration" -#: ../src/interface.c:2103 +#: ../src/interface.c:2122 msgid "Conte_xt Action" msgstr "_Kontextaktion" -#: ../src/interface.c:2648 ../src/keybindings.c:359 +#: ../src/interface.c:2667 ../src/keybindings.c:359 msgid "Preferences" msgstr "Einstellungen" -#: ../src/interface.c:2684 +#: ../src/interface.c:2703 msgid "Load files from the last session" msgstr "Dateien aus der letzten Sitzung laden" -#: ../src/interface.c:2687 +#: ../src/interface.c:2706 msgid "Opens at startup the files from the last session" msgstr "Lädt die geöffneten Dateien aus der letzten Sitzung" -#: ../src/interface.c:2689 +#: ../src/interface.c:2708 msgid "Load virtual terminal support" msgstr "Die Virtual Terminal Emulation (VTE) laden" -#: ../src/interface.c:2691 +#: ../src/interface.c:2710 msgid "" "Whether the virtual terminal emulation (VTE) should be loaded at startup, " "disable it if you do not need it" @@ -1468,41 +1472,41 @@ "soll oder nicht. Wenn sie nicht benötigt wird, sollte diese Option " "deaktiviert werden." -#: ../src/interface.c:2693 +#: ../src/interface.c:2712 msgid "Enable plugin support" msgstr "Plugins aktivieren" -#: ../src/interface.c:2697 +#: ../src/interface.c:2716 msgid "Startup" msgstr "Starten" -#: ../src/interface.c:2716 +#: ../src/interface.c:2735 msgid "Save window position and geometry" msgstr "Fensterposition und -größe speichern" -#: ../src/interface.c:2719 +#: ../src/interface.c:2738 msgid "Saves the window position and geometry and restores it at the start" msgstr "" "Speichert die Fensterposition und die Fenstergröße und stellt sie beim " "nächsten Start wieder her." -#: ../src/interface.c:2721 +#: ../src/interface.c:2740 msgid "Confirm exit" msgstr "Beenden bestätigen" -#: ../src/interface.c:2724 +#: ../src/interface.c:2743 msgid "Shows a confirmation dialog on exit" msgstr "Zeigt einen Bestätigungsdialog vor dem Beenden" -#: ../src/interface.c:2726 +#: ../src/interface.c:2745 msgid "Shutdown" msgstr "Beenden " -#: ../src/interface.c:2747 +#: ../src/interface.c:2766 msgid "Startup path:" msgstr "Startpfad:" -#: ../src/interface.c:2759 +#: ../src/interface.c:2778 msgid "" "Path to start in when opening or saving files. Must be an absolute path. " "Leave blank to use the current working directory." @@ -1511,19 +1515,19 @@ "muss absolut sein. Um das aktuelle Arbeitsverzeichnis zu benutzen, lassen " "Sie das Feld leer." -#: ../src/interface.c:2772 +#: ../src/interface.c:2791 msgid "Project files:" msgstr "Projektdateien:" -#: ../src/interface.c:2784 +#: ../src/interface.c:2803 msgid "Path to start in when opening project files" msgstr "Pfad zum Öffnen von Projektdateien" -#: ../src/interface.c:2797 +#: ../src/interface.c:2816 msgid "Extra plugin path:" msgstr "Zusätzlicher Pluginpfad" -#: ../src/interface.c:2809 +#: ../src/interface.c:2828 msgid "" "Geany looks by default in the global installation path and in the " "configuration directory. The path entered here will be searched additionally " @@ -1534,19 +1538,19 @@ "wird zusätzlich bei der Suche nach Plugins berücksichtigt. Das Feld wird " "ignoriert, falls es leer ist." -#: ../src/interface.c:2822 +#: ../src/interface.c:2841 msgid "Paths" msgstr "Pfade" -#: ../src/interface.c:2827 +#: ../src/interface.c:2846 msgid "Startup" msgstr "Starten & Beenden" -#: ../src/interface.c:2849 +#: ../src/interface.c:2868 msgid "Beep on errors or when compilation has finished" msgstr "Bei Fehlern oder beendeter Kompilierung Piepton ausgeben" -#: ../src/interface.c:2852 +#: ../src/interface.c:2871 msgid "" "Whether to beep if an error occurred or when the compilation process has " "finished" @@ -1554,11 +1558,11 @@ "Legt fest, ob bei einem Fehler oder bei beendeter Kompilierung ein Piepton " "ausgegeben werden soll" -#: ../src/interface.c:2854 +#: ../src/interface.c:2873 msgid "Switch to status message list at new message" msgstr "Bei neuen Meldungen zu den Statusmeldungen wechseln" -#: ../src/interface.c:2857 +#: ../src/interface.c:2876 msgid "" "Switch to the status message tab (in the notebook window at the bottom) if a " "new status message arrives" @@ -1566,11 +1570,11 @@ "Wechselt automatisch zu dem Reiter mit den Statusmeldungen im Infobereich, " "wenn eine neue Statusmeldung vorliegt" -#: ../src/interface.c:2859 +#: ../src/interface.c:2878 msgid "Suppress status messages in the status bar" msgstr "Statusmeldungen in der Statuszeile unterdrücken" -#: ../src/interface.c:2862 +#: ../src/interface.c:2881 msgid "" "Removes all messages from the status bar. The messages are still displayed " "in the status messages window." @@ -1578,11 +1582,11 @@ "Entfernt alle Nachrichten aus der Statuszeile. Die Nachrichten sind " "weiterhin über den »Status«-Reiter im Infobereich abrufbar." -#: ../src/interface.c:2864 +#: ../src/interface.c:2883 msgid "Auto-focus widgets (focus follows mouse)" msgstr "Autofokus (Der Fokus folgt der Maus)" -#: ../src/interface.c:2867 +#: ../src/interface.c:2886 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 " @@ -1593,15 +1597,15 @@ "das Hauptfenster, das Notizbuch, den Such- und Springe-zu-Feldern in der " "Werkzeugliste sowie für das integrierte Terminal." -#: ../src/interface.c:2869 ../src/interface.c:3195 ../src/interface.c:4107 +#: ../src/interface.c:2888 ../src/interface.c:3214 ../src/interface.c:4126 msgid "Miscellaneous" msgstr "Sonstiges" -#: ../src/interface.c:2889 +#: ../src/interface.c:2908 msgid "Always wrap search and hide the Find dialog" msgstr "Das vollständige Dokument durchsuchen und den Suchen-Dialog schließen" -#: ../src/interface.c:2892 +#: ../src/interface.c:2911 msgid "" "Always wrap search around the document and hide the Find dialog after " "clicking Find Next/Previous" @@ -1609,30 +1613,30 @@ "Immer das vollständige Dokument durchsuchen und den Suchen-Dialog nach " "Klicken auf Nächstes/Vorheriges schließen" -#: ../src/interface.c:2894 +#: ../src/interface.c:2913 msgid "Use the current word under the cursor for Find dialogs" msgstr "Aktuelle Cursorposition zur Suche heranziehen" -#: ../src/interface.c:2897 +#: ../src/interface.c:2916 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 Cursorposition" -#: ../src/interface.c:2899 +#: ../src/interface.c:2918 msgid "Use the current file's directory for Find in Files" msgstr "Verzeichnis der aktuellen Datei für »In Dateien suchen« benutzen" -#: ../src/interface.c:2903 +#: ../src/interface.c:2922 msgid "Search" msgstr "Suche" -#: ../src/interface.c:2922 +#: ../src/interface.c:2941 msgid "Use project-based session files" msgstr "Sitzung im Projekt speichern und wieder öffnen" -#: ../src/interface.c:2925 +#: ../src/interface.c:2944 msgid "" "Whether to store a project's session files and open them when re-opening the " "project" @@ -1640,11 +1644,11 @@ "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:2927 +#: ../src/interface.c:2946 msgid "Store project file inside the project base directory" msgstr "Projektdatei innerhalb des Projektbasisverzeichnis erstellen" -#: ../src/interface.c:2930 +#: ../src/interface.c:2949 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 " @@ -1656,75 +1660,75 @@ "angelegt, ansonsten wird die Datei ein Verzeichnis über dem Basisverzeichnis " "angelegt. Der Pfad kann im »Neues Projekt«-Dialog geändert werden." -#: ../src/interface.c:2932 +#: ../src/interface.c:2951 msgid "Projects" msgstr "Projekte" -#: ../src/interface.c:2937 +#: ../src/interface.c:2956 msgid "Miscellaneous" msgstr "Sonstiges" -#: ../src/interface.c:2941 +#: ../src/interface.c:2960 msgid "General" msgstr "Allgemein" -#: ../src/interface.c:2964 +#: ../src/interface.c:2983 msgid "Show symbol list" msgstr "Symbolliste anzeigen" -#: ../src/interface.c:2967 +#: ../src/interface.c:2986 msgid "Toggle the symbol list on and off" msgstr "Blendet die Symbolliste ein und aus" -#: ../src/interface.c:2969 +#: ../src/interface.c:2988 msgid "Show documents list" msgstr "Dokumentenliste anzeigen" -#: ../src/interface.c:2972 +#: ../src/interface.c:2991 msgid "Toggle the documents list on and off" msgstr "Blendet die Dokumentenliste ein und aus" -#: ../src/interface.c:2974 +#: ../src/interface.c:2993 msgid "Sidebar" msgstr "Seitenleiste" -#: ../src/interface.c:2995 +#: ../src/interface.c:3014 msgid "Symbol list:" msgstr "Symbolliste:" -#: ../src/interface.c:3002 ../src/interface.c:3117 +#: ../src/interface.c:3021 ../src/interface.c:3136 msgid "Message window:" msgstr "Meldungsfenster:" -#: ../src/interface.c:3009 ../src/interface.c:3153 +#: ../src/interface.c:3028 ../src/interface.c:3172 msgid "Editor:" msgstr "Editor:" -#: ../src/interface.c:3021 +#: ../src/interface.c:3040 msgid "Sets the font for the message window" msgstr "Ändert die Schriftart für das Meldungsfenster im Infobereich" -#: ../src/interface.c:3029 +#: ../src/interface.c:3048 msgid "Sets the font for the symbol list" msgstr "Legt die Schriftart für die Symbolliste fest" -#: ../src/interface.c:3037 +#: ../src/interface.c:3056 msgid "Sets the editor font" msgstr "Legt die Schriftart für das Editorfenster fest" -#: ../src/interface.c:3039 +#: ../src/interface.c:3058 msgid "Fonts" msgstr "Schriftarten" -#: ../src/interface.c:3058 +#: ../src/interface.c:3077 msgid "Show editor tabs" msgstr "Zeige Dateireiter für geöffnete Dateien" -#: ../src/interface.c:3062 +#: ../src/interface.c:3081 msgid "Show close buttons" msgstr "»Schließen«-Schaltflächen anzeigen" -#: ../src/interface.c:3065 +#: ../src/interface.c:3084 msgid "" "Shows a small cross button in the file tabs to easily close files when " "clicking on it (requires restart of Geany)" @@ -1732,115 +1736,115 @@ "Zeigt ein kleines Kreuz auf den Dateireitern zum einfachen Schließen einer " "Datei an. (Diese Option benötigt einen Neustart von Geany zum Aktivieren.)" -#: ../src/interface.c:3071 +#: ../src/interface.c:3090 msgid "Placement of new file tabs:" msgstr "Platzierung neuer Dateireiter:" -#: ../src/interface.c:3076 ../src/interface.c:3130 ../src/interface.c:3148 -#: ../src/interface.c:3166 +#: ../src/interface.c:3095 ../src/interface.c:3149 ../src/interface.c:3167 +#: ../src/interface.c:3185 msgid "Left" msgstr "Links" -#: ../src/interface.c:3079 +#: ../src/interface.c:3098 msgid "File tabs will be placed on the left of the notebook" msgstr "Neue Dateireiter werden links von der Dateiliste platziert" -#: ../src/interface.c:3084 ../src/interface.c:3131 ../src/interface.c:3149 -#: ../src/interface.c:3167 +#: ../src/interface.c:3103 ../src/interface.c:3150 ../src/interface.c:3168 +#: ../src/interface.c:3186 msgid "Right" msgstr "Rechts" -#: ../src/interface.c:3087 +#: ../src/interface.c:3106 msgid "File tabs will be placed on the right of the notebook" msgstr "Neue Dateireiter werden rechts von der Dateiliste platziert" -#: ../src/interface.c:3091 +#: ../src/interface.c:3110 msgid "Double-clicking hides all additional widgets" msgstr "" "Doppelklick versteckt die zusätzlichen Unterfenster und zeigt nur den Editor " "an" -#: ../src/interface.c:3094 +#: ../src/interface.c:3113 msgid "Calls the View->Toggle All Additional Widgets command" msgstr "Zusätzliche Infofenster ein-/ausblenden" -#: ../src/interface.c:3096 +#: ../src/interface.c:3115 msgid "Editor tabs" msgstr "Dateireiter" -#: ../src/interface.c:3132 ../src/interface.c:3150 ../src/interface.c:3168 +#: ../src/interface.c:3151 ../src/interface.c:3169 ../src/interface.c:3187 msgid "Top" msgstr "Oben" -#: ../src/interface.c:3133 ../src/interface.c:3151 ../src/interface.c:3169 +#: ../src/interface.c:3152 ../src/interface.c:3170 ../src/interface.c:3188 msgid "Bottom" msgstr "Unten" -#: ../src/interface.c:3135 +#: ../src/interface.c:3154 msgid "Sidebar:" msgstr "Seitenleiste:" -#: ../src/interface.c:3171 +#: ../src/interface.c:3190 msgid "Tab positions" msgstr "Reiterposition" -#: ../src/interface.c:3190 +#: ../src/interface.c:3209 msgid "Show status bar" msgstr "Statusleiste anzeigen" -#: ../src/interface.c:3193 +#: ../src/interface.c:3212 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:3200 +#: ../src/interface.c:3219 msgid "Interface" msgstr "Schnittstelle" -#: ../src/interface.c:3223 +#: ../src/interface.c:3242 msgid "Show T_oolbar" msgstr "Werkzeugleiste _anzeigen" -#: ../src/interface.c:3227 +#: ../src/interface.c:3246 msgid "_Append Toolbar to the Menu" msgstr "_Werkzeugliste direkt an das Menü anfügen" -#: ../src/interface.c:3230 +#: ../src/interface.c:3249 msgid "Pack the toolbar to the main menu to save vertical space" msgstr "" "Die Werkzeugliste direkt hinter dem Hauptmenü platzieren um etwas vertikalen " "Platz zu sparen." -#: ../src/interface.c:3232 +#: ../src/interface.c:3251 msgid "Toolbar" msgstr "Werkzeugleiste" -#: ../src/interface.c:3253 +#: ../src/interface.c:3272 msgid "Icon style:" msgstr "Symbolstil:" -#: ../src/interface.c:3260 +#: ../src/interface.c:3279 msgid "Icon size:" msgstr "Symbolgröße:" -#: ../src/interface.c:3315 +#: ../src/interface.c:3334 msgid "Appearance" msgstr "Aussehen" -#: ../src/interface.c:3340 ../src/toolbar.c:882 +#: ../src/interface.c:3359 ../src/toolbar.c:882 msgid "Customize Toolbar" msgstr "Werkzeugleiste anpassen" -#: ../src/interface.c:3344 +#: ../src/interface.c:3363 msgid "Toolbar" msgstr "Werkzeugleiste" -#: ../src/interface.c:3371 +#: ../src/interface.c:3390 msgid "Line wrapping" msgstr "Visueller Zeilenumbruch" -#: ../src/interface.c:3374 +#: ../src/interface.c:3393 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 " @@ -1850,11 +1854,11 @@ "fort. Achtung: Bei großen Dokumenten erfordert der Zeilenumbruch viel " "Rechenleistung und sollte daher auf langsameren Rechnern deaktiviert werden." -#: ../src/interface.c:3376 +#: ../src/interface.c:3395 msgid "Enable \"smart\" home key" msgstr "»Intelligente« Pos1-Taste (Home) aktivieren" -#: ../src/interface.c:3379 +#: ../src/interface.c:3398 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 " @@ -1868,11 +1872,11 @@ "ist, springt der Cursor immer zum Beginn der Zeile ohne auf die aktuelle " "Position Rücksicht zu nehmen." -#: ../src/interface.c:3381 +#: ../src/interface.c:3400 msgid "Disable Drag and Drop" msgstr "Drag and Drop deaktivieren" -#: ../src/interface.c:3384 +#: ../src/interface.c:3403 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" @@ -1880,19 +1884,19 @@ "Deaktiviert Drag and Drop für das Editorfenster. Dies verhindert, dass " "markierter Text mit der Maus verschoben werden kann." -#: ../src/interface.c:3386 +#: ../src/interface.c:3405 msgid "Enable folding" msgstr "Quelltext-Ausblendung aktivieren" -#: ../src/interface.c:3389 +#: ../src/interface.c:3408 msgid "Whether to enable folding the code" msgstr "Legt fest, ob es möglich sein soll, Teile des Quelltextes auszublenden" -#: ../src/interface.c:3391 +#: ../src/interface.c:3410 msgid "Fold/unfold all children of a fold point" msgstr "Alle untergeordneten Quelltextblöcke ein/ausklappen" -#: ../src/interface.c:3394 +#: ../src/interface.c:3413 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." @@ -1901,11 +1905,11 @@ "gedrückt halten der Umschalttaste wird das Gegenteil gemacht, wenn auf das " "Symbol geklickt wird." -#: ../src/interface.c:3396 +#: ../src/interface.c:3415 msgid "Use indicators to show compile errors" msgstr "Benutzt Markierungen, um Probleme beim Kompilieren anzuzeigen" -#: ../src/interface.c:3399 +#: ../src/interface.c:3418 msgid "" "Whether to use indicators (a squiggly underline) to highlight the lines " "where the compiler found a warning or an error" @@ -1913,26 +1917,26 @@ "Legt fest, ob Markierungen (gewellte Unterstreichungen) benutzt werden " "sollen, um Zeilen mit Fehlern beim Kompiliervorgang zu markieren" -#: ../src/interface.c:3401 +#: ../src/interface.c:3420 msgid "Newline strips trailing spaces" msgstr "Neue Zeile entfernt Leerzeichen am Zeilenende" -#: ../src/interface.c:3404 +#: ../src/interface.c:3423 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:3410 +#: ../src/interface.c:3429 msgid "Line breaking column:" msgstr "Spalte für automatischen Zeilenumbruch:" # TODO woah, hier muss noch was anderes her :D -#: ../src/interface.c:3424 +#: ../src/interface.c:3443 msgid "Comment toggle marker:" msgstr "Kommentarumschaltzeichen:" -#: ../src/interface.c:3431 +#: ../src/interface.c:3450 msgid "" "A string which is added when toggling a line comment in a source file, it is " "used to mark the comment as toggled." @@ -1941,68 +1945,68 @@ "Kommentar zu markieren, der per Tastenkombination ein- oder ausgeschaltet " "werden kann." -#: ../src/interface.c:3433 +#: ../src/interface.c:3452 msgid "Features" msgstr "Funktionen" -#: ../src/interface.c:3438 +#: ../src/interface.c:3457 msgid "Features" msgstr "Funktionen" -#: ../src/interface.c:3470 ../src/interface.c:5010 +#: ../src/interface.c:3489 ../src/interface.c:5029 msgid "Auto-indent mode:" msgstr "Modus für automatische Einrückung:" -#: ../src/interface.c:3483 ../src/interface.c:5023 +#: ../src/interface.c:3502 ../src/interface.c:5042 msgid "Basic" msgstr "Einfach" -#: ../src/interface.c:3484 ../src/interface.c:5024 +#: ../src/interface.c:3503 ../src/interface.c:5043 msgid "Current chars" msgstr "Aktuelle Zeichenkette" -#: ../src/interface.c:3485 ../src/interface.c:5025 +#: ../src/interface.c:3504 ../src/interface.c:5044 msgid "Match braces" msgstr "Übereinstimmende Klammerung" -#: ../src/interface.c:3487 ../src/interface.c:3838 ../src/interface.c:5027 +#: ../src/interface.c:3506 ../src/interface.c:3857 ../src/interface.c:5046 msgid "Type:" msgstr "Typ:" -#: ../src/interface.c:3494 ../src/interface.c:5034 +#: ../src/interface.c:3513 ../src/interface.c:5053 msgid "Width:" msgstr "Breite:" -#: ../src/interface.c:3507 ../src/interface.c:5047 +#: ../src/interface.c:3526 ../src/interface.c:5066 msgid "The width in chars of a single indent" msgstr "Die Breite einer Einrückung in Zeichen" -#: ../src/interface.c:3517 ../src/interface.c:5057 +#: ../src/interface.c:3536 ../src/interface.c:5076 msgid "Use spaces when inserting indentation" msgstr "Benutze Leerzeichen zum Einrücken" -#: ../src/interface.c:3526 ../src/interface.c:5066 +#: ../src/interface.c:3545 ../src/interface.c:5085 msgid "Use one tab per indent" msgstr "Ein Tabulator pro Einzug" -#: ../src/interface.c:3535 ../src/interface.c:5075 +#: ../src/interface.c:3554 ../src/interface.c:5094 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:3550 ../src/interface.c:5090 +#: ../src/interface.c:3569 ../src/interface.c:5109 msgid "Hard tab width:" msgstr "Tabulatorenbreite:" -#: ../src/interface.c:3558 ../src/interface.c:5098 +#: ../src/interface.c:3577 ../src/interface.c:5117 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:3568 ../src/interface.c:5108 +#: ../src/interface.c:3587 ../src/interface.c:5127 msgid "" "Whether to detect the indentation type from file contents when a file is " "opened" @@ -2011,30 +2015,30 @@ "(Tabulatoren oder Leerzeichen) automatisch aus der geöffneten Datei zu " "bestimmen" -#: ../src/interface.c:3570 +#: ../src/interface.c:3589 msgid "Tab key indents" msgstr "Einrücken mit der Tabulatortaste" -#: ../src/interface.c:3573 +#: ../src/interface.c:3592 msgid "" "Pressing tab/shift-tab indents/unindents instead of inserting a tab character" msgstr "" "Tabulator und Shift+Tabulator rückt den Text ein oder aus anstatt nur ein " "Tabulatorzeichen einzufügen" -#: ../src/interface.c:3575 +#: ../src/interface.c:3594 msgid "Indentation" msgstr "Einrückung" -#: ../src/interface.c:3580 ../src/interface.c:5110 +#: ../src/interface.c:3599 ../src/interface.c:5129 msgid "Indentation" msgstr "Einrückung" -#: ../src/interface.c:3603 +#: ../src/interface.c:3622 msgid "Snippet completion" msgstr "Vervollständigung von (Code-)Schnipseln" -#: ../src/interface.c:3606 +#: ../src/interface.c:3625 msgid "" "Type a defined short character sequence and complete it to a more complex " "string using a single keypress" @@ -2042,19 +2046,19 @@ "Mittels eines Tastenkürzels kann ein kurzer (Code-)Schnipsel zu einem " "komplexeren Text erweitert werden" -#: ../src/interface.c:3608 +#: ../src/interface.c:3627 msgid "XML tag autocompletion" msgstr "XML-Tag Autovervollständigung" -#: ../src/interface.c:3611 +#: ../src/interface.c:3630 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:3613 +#: ../src/interface.c:3632 msgid "Automatic continuation of multi-line comments" msgstr "Automatisches Weiterführen von mehrzeiligen Kommentaren" -#: ../src/interface.c:3616 +#: ../src/interface.c:3635 msgid "" "Continue automatically multi-line comments in languages like C, C++ and Java " "when a new line is entered inside such a comment" @@ -2062,11 +2066,11 @@ "Verlängert die Kommentarzeilen in den Sprachen C, C++ und Java, wenn eine " "neue Zeile innerhalb eines Kommentars hinzugefügt wird." -#: ../src/interface.c:3618 +#: ../src/interface.c:3637 msgid "Autocomplete symbols" msgstr "Autovervollständigung von Symbolen" -#: ../src/interface.c:3621 +#: ../src/interface.c:3640 msgid "" "Automatic completion of known symbols in open files (function names, global " "variables, ...)" @@ -2074,148 +2078,148 @@ "Automatische Vervollständigung von bekannten Variablen und Funktionsnamen " "aus den geöffneten Dateien" -#: ../src/interface.c:3623 +#: ../src/interface.c:3642 msgid "Autocomplete all words in document" msgstr "Autovervollständigung aller Wörter im Dokument" -#: ../src/interface.c:3627 +#: ../src/interface.c:3646 msgid "Drop rest of word on completion" msgstr "Bei Vervollständigung den Rest des Wortes ersetzen." -#: ../src/interface.c:3637 +#: ../src/interface.c:3656 msgid "Max. symbol name suggestions:" msgstr "Max. Vorschläge der Symbolvervollständigung:" -#: ../src/interface.c:3644 +#: ../src/interface.c:3663 msgid "Completion list height:" msgstr "Höhe der Vervollständigungsliste:" -#: ../src/interface.c:3651 +#: ../src/interface.c:3670 msgid "Characters to type for autocompletion:" msgstr "Zu tippende Zeichen für die Vervollständigung:" -#: ../src/interface.c:3664 +#: ../src/interface.c:3683 msgid "" "The amount of characters which are necessary to show the symbol " "autocompletion list" msgstr "Die Anzahl der Zeichen, die nötig sind um die Vorschläge anzuzeigen" -#: ../src/interface.c:3673 +#: ../src/interface.c:3692 msgid "Display height in rows for the autocompletion list" msgstr "Höhe der Liste in Zeilen" -#: ../src/interface.c:3682 +#: ../src/interface.c:3701 msgid "Maximum number of entries to display in the autocompletion list" msgstr "" "Anzahl der Elemente, die maximal angezeigt werden sollen, wenn die Liste " "angezeigt wird" -#: ../src/interface.c:3685 +#: ../src/interface.c:3704 msgid "Completions" msgstr "Vervollständigungen" -#: ../src/interface.c:3705 +#: ../src/interface.c:3724 msgid "Parenthesis ( )" msgstr "Klammern ( )" -#: ../src/interface.c:3710 +#: ../src/interface.c:3729 msgid "Auto-close parenthesis when typing an opening one" msgstr "Automatisches Schließen der Klammern beim Tippen der öffnenden Klammer" -#: ../src/interface.c:3712 +#: ../src/interface.c:3731 msgid "Single quotes ' '" msgstr "Einfache Anführungs-/Schlusszeichen" -#: ../src/interface.c:3717 +#: ../src/interface.c:3736 msgid "Auto-close simple quote when typing an opening one" msgstr "" "Automatisches Setzen der schließenden Anführungsstriche beim Tippen der " "öffnenden" -#: ../src/interface.c:3719 +#: ../src/interface.c:3738 msgid "Curly brackets { }" msgstr "Geschweifte Klammern {}" -#: ../src/interface.c:3724 +#: ../src/interface.c:3743 msgid "Auto-close curly bracket when typing an opening one" msgstr "Automatisches Schließen der Klammern beim Tippen der öffnenden Klammer" -#: ../src/interface.c:3726 +#: ../src/interface.c:3745 msgid "Square brackets [ ]" msgstr "Eckige Klammern [ ]" -#: ../src/interface.c:3731 +#: ../src/interface.c:3750 msgid "Auto-close square-bracket when typing an opening one" msgstr "" "Automatisches Schließen von eckigen Klammern beim Tippen der öffnenden " "Klammer" -#: ../src/interface.c:3733 +#: ../src/interface.c:3752 msgid "Double quotes \" \"" msgstr "Doppelte Anführungs-/Schlusszeichen" -#: ../src/interface.c:3738 +#: ../src/interface.c:3757 msgid "Auto-close double quote when typing an opening one" msgstr "" "Automatisches Setzen der schließenden Anführungsstriche beim Tippen der " "öffnenden" -#: ../src/interface.c:3740 +#: ../src/interface.c:3759 msgid "Auto-close quotes and brackets" msgstr "Automatisches Schließen von Klammern und Anführungszeichen" -#: ../src/interface.c:3745 +#: ../src/interface.c:3764 msgid "Completions" msgstr "Vervollständigungen" -#: ../src/interface.c:3768 +#: ../src/interface.c:3787 msgid "Invert syntax highlighting colors" msgstr "Invertiere Syntaxhervorhebungen" -#: ../src/interface.c:3771 +#: ../src/interface.c:3790 msgid "Invert all colors, by default using white text on a black background" msgstr "" "Vertauscht die Farben für die Anzeige. Im Standard wird weißer Text auf " "einem schwarzen Hintergrund genutzt." -#: ../src/interface.c:3773 +#: ../src/interface.c:3792 msgid "Show indentation guides" msgstr "Zeige Einrückungshinweise" -#: ../src/interface.c:3776 +#: ../src/interface.c:3795 msgid "Shows small dotted lines to help you to use the right indentation" msgstr "" "Blendet gepunktete Linien ein, um die richtige Einrückung zu erleichtern" -#: ../src/interface.c:3778 +#: ../src/interface.c:3797 msgid "Show white space" msgstr "Zeige Leerzeichen" -#: ../src/interface.c:3781 +#: ../src/interface.c:3800 msgid "Marks spaces with dots and tabs with arrows" msgstr "Markiert Leerzeichen mit Punkten und Tabulatoren mit kleinen Pfeilen" -#: ../src/interface.c:3783 +#: ../src/interface.c:3802 msgid "Show line endings" msgstr "Zeige Zeilenenden" -#: ../src/interface.c:3786 +#: ../src/interface.c:3805 msgid "Shows the line ending character" msgstr "Macht Zeilenenden mit einem Sonderzeichen sichtbar" -#: ../src/interface.c:3788 +#: ../src/interface.c:3807 msgid "Show line numbers" msgstr "Zeilennummern anzeigen" -#: ../src/interface.c:3791 +#: ../src/interface.c:3810 msgid "Shows or hides the Line Number margin" msgstr "Zeigt oder versteckt den Rand mit den Zeilennummern" -#: ../src/interface.c:3793 +#: ../src/interface.c:3812 msgid "Show markers margin" msgstr "Markierungsrand anzeigen" -#: ../src/interface.c:3796 +#: ../src/interface.c:3815 msgid "" "Shows or hides the small margin right of the line numbers, which is used to " "mark lines" @@ -2223,38 +2227,38 @@ "Zeigt oder versteckt den kleinen Rand rechts von den Zeilennummern, welcher " "zum Anzeigen von Markierungen genutzt wird" -#: ../src/interface.c:3798 +#: ../src/interface.c:3817 msgid "Stop scrolling at last line" msgstr "Am Ende des Dokuments nicht mehr weiter rollen" -#: ../src/interface.c:3801 +#: ../src/interface.c:3820 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 " "gerollt werden kann oder nicht" -#: ../src/interface.c:3803 +#: ../src/interface.c:3822 msgid "Display" msgstr "Anzeige" -#: ../src/interface.c:3824 +#: ../src/interface.c:3843 msgid "Long line marker:" msgstr "Zeilenlänge markieren bei:" -#: ../src/interface.c:3831 +#: ../src/interface.c:3850 msgid "Long line marker color:" msgstr "Farbe der Markierung:" -#: ../src/interface.c:3850 +#: ../src/interface.c:3869 msgid "Sets the color of the long line marker" msgstr "Stellt die Farbe der »Umbruchhilfe für lange Zeilen« ein" -#: ../src/interface.c:3851 ../src/toolbar.c:70 ../src/tools.c:746 +#: ../src/interface.c:3870 ../src/toolbar.c:70 ../src/tools.c:741 #: ../src/vte.c:769 ../src/vte.c:776 msgid "Color Chooser" msgstr "Farbwähler" -#: ../src/interface.c:3859 +#: ../src/interface.c:3878 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 " @@ -2265,11 +2269,11 @@ "notwendigen Zeilenumbruch hin. Werte größer als 0 geben die Spalte an, in " "der die Linie angezeigt werden soll." -#: ../src/interface.c:3869 +#: ../src/interface.c:3888 msgid "Line" msgstr "Linie" -#: ../src/interface.c:3872 +#: ../src/interface.c:3891 msgid "" "Prints a vertical line in the editor window at the given cursor position " "(see below)" @@ -2277,11 +2281,11 @@ "Zeichnet eine vertikale Linie im Editor an der angegebenen Cursor-Position " "(nur sinnvoll mit dicktengleichen Schriften)" -#: ../src/interface.c:3876 +#: ../src/interface.c:3895 msgid "Background" msgstr "Hintergrund" -#: ../src/interface.c:3879 +#: ../src/interface.c:3898 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 " @@ -2291,115 +2295,115 @@ "(siehe unten) stehen, wird auf die unten angegebene Farbe geändert (nützlich " "für proportionale Schriftarten)" -#: ../src/interface.c:3883 +#: ../src/interface.c:3902 msgid "Disabled" msgstr "Deaktiviert" -#: ../src/interface.c:3889 +#: ../src/interface.c:3908 msgid "Long line marker" msgstr "Umbruchhilfe für lange Zeilen" -#: ../src/interface.c:3894 +#: ../src/interface.c:3913 msgid "Display" msgstr "Ansicht" -#: ../src/interface.c:3925 +#: ../src/interface.c:3944 msgid "Open new documents from the command-line" msgstr "Öffne neue Dokumente von der Kommandozeile" -#: ../src/interface.c:3928 +#: ../src/interface.c:3947 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 aber nicht geöffnet werden konnte" -#: ../src/interface.c:3942 +#: ../src/interface.c:3961 msgid "Default end of line characters:" msgstr "Zeichen für das Standardzeilenende:" -#: ../src/interface.c:3949 +#: ../src/interface.c:3968 msgid "New files" msgstr "Neue Dateien" -#: ../src/interface.c:3975 +#: ../src/interface.c:3994 msgid "Sets the default encoding for newly created files" msgstr "Setzt die Zeichenkodierung für neu erstellte Dateien" -#: ../src/interface.c:3981 +#: ../src/interface.c:4000 msgid "Default encoding (new files):" msgstr "Standardzeichenkodierung (neue Dateien):" -#: ../src/interface.c:3988 -#, fuzzy +#: ../src/interface.c:4007 msgid "Default encoding (existing non-Unicode files):" -msgstr "Standardzeichenkodierung (existierende Dateien):" +msgstr "Standardzeichenkodierung (nicht Unicode-Dateien):" -#: ../src/interface.c:4000 -#, fuzzy +#: ../src/interface.c:4019 msgid "Sets the default encoding for opening existing non-Unicode files" -msgstr "Setzt die Standardzeichenkodierung für zu öffnende Dateien" +msgstr "" +"Setzt die Standardzeichenkodierung für zu öffnende Dateien, wenn kein " +"Unicode (z.B. UTF-8) zur Anwendung kommt" -#: ../src/interface.c:4006 -#, fuzzy +#: ../src/interface.c:4025 msgid "Use fixed encoding when opening non-Unicode files" -msgstr "Benutze feststehende Zeichenkodierung beim Öffnen neuer Dateien" +msgstr "" +"Benutze feststehende Zeichenkodierung beim Öffnen neuer, nicht Unicode-" +"Dateien" -#: ../src/interface.c:4011 -#, fuzzy +#: ../src/interface.c:4030 msgid "" "This option disables the automatic detection of the file encoding when " "opening non-Unicode files and opens the file with the specified encoding " "(usually not needed)" msgstr "" "Diese Option deaktiviert die automatische Erkennung der Zeichenkodierung und " -"öffnet die ausgewählten Dateien mit der angegebenen Kodierung. (Wird nur in " -"Ausnahmen benötigt)" +"öffnet die ausgewählten nicht Unicode-Dateien mit der angegebenen Kodierung. " +"(Wird nur in Ausnahmen benötigt)" -#: ../src/interface.c:4013 +#: ../src/interface.c:4032 msgid "Encodings" msgstr "Zeichenkodierungen:" -#: ../src/interface.c:4032 +#: ../src/interface.c:4051 msgid "Ensure new line at file end" msgstr "Neue Zeile am Dateiende" -#: ../src/interface.c:4035 +#: ../src/interface.c:4054 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:4037 +#: ../src/interface.c:4056 msgid "Strip trailing spaces and tabs" msgstr "Leerzeichen und Tabulatoren am Zeilenende entfernen" -#: ../src/interface.c:4040 +#: ../src/interface.c:4059 msgid "Removes trailing spaces and tabs and the end of lines" msgstr "Entfernt Leerzeichen und Tabulatoren am Ende einer Zeile" -#: ../src/interface.c:4042 ../src/keybindings.c:482 +#: ../src/interface.c:4061 ../src/keybindings.c:482 msgid "Replace tabs by space" msgstr "Tabulatoren durch Leerzeichen ersetzen" -#: ../src/interface.c:4045 +#: ../src/interface.c:4064 msgid "Replaces all tabs in document by spaces" msgstr "Ersetzt alle Tabulatoren im Dokument durch Leerzeichen" -#: ../src/interface.c:4047 +#: ../src/interface.c:4066 msgid "Saving files" msgstr "Speichern" -#: ../src/interface.c:4072 +#: ../src/interface.c:4091 msgid "Recent files list length:" msgstr "Anzahl der »Zuletzt geöffneten Dateien«" -#: ../src/interface.c:4086 +#: ../src/interface.c:4105 msgid "Specifies the number of files which are stored in the Recent files list" msgstr "Gibt die Länge der Liste der zuletzt geöffneten Dateien an" -#: ../src/interface.c:4090 +#: ../src/interface.c:4109 msgid "Disk check timeout:" msgstr "Zeitinterval zum Prüfen auf Dateiänderungen:" -#: ../src/interface.c:4103 +#: ../src/interface.c:4122 msgid "" "How often to check for changes to document files on disk, in seconds. Zero " "disables checking." @@ -2407,19 +2411,19 @@ "Wie oft soll auf Veränderungen geprüft werden? Angabe in Sekunden. 0 " "deaktiviert die Funktion." -#: ../src/interface.c:4112 ../src/symbols.c:590 ../plugins/filebrowser.c:1034 +#: ../src/interface.c:4131 ../src/symbols.c:590 ../plugins/filebrowser.c:1034 msgid "Files" msgstr "Dateien" -#: ../src/interface.c:4145 +#: ../src/interface.c:4164 msgid "Terminal:" msgstr "Terminal:" -#: ../src/interface.c:4152 +#: ../src/interface.c:4171 msgid "Browser:" msgstr "Browser:" -#: ../src/interface.c:4164 +#: ../src/interface.c:4183 msgid "" "A terminal emulator like xterm, gnome-terminal or konsole (should accept the " "-e argument)" @@ -2427,23 +2431,23 @@ "Eine Terminalemulation wie z.B. xterm, gnome-terminal oder konsole (sie " "sollte die Option -e akzeptieren)" -#: ../src/interface.c:4171 +#: ../src/interface.c:4190 msgid "Path (and possibly additional arguments) to your favorite browser" msgstr "Pfad und evtl. Argumente zum Starten eines Browsers" -#: ../src/interface.c:4193 +#: ../src/interface.c:4212 msgid "Grep:" msgstr "Grep:" -#: ../src/interface.c:4216 +#: ../src/interface.c:4235 msgid "Tool paths" msgstr "Pfade zu den Werkzeugen" -#: ../src/interface.c:4237 +#: ../src/interface.c:4256 msgid "Context action:" msgstr "Kontextaktion:" -#: ../src/interface.c:4248 +#: ../src/interface.c:4267 #, c-format msgid "" "Context action command. The currently selected word can be used with %s. It " @@ -2453,67 +2457,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:4261 +#: ../src/interface.c:4280 msgid "Commands" msgstr "Befehle" -#: ../src/interface.c:4266 ../src/keybindings.c:516 +#: ../src/interface.c:4285 ../src/keybindings.c:516 msgid "Tools" msgstr "Werkzeuge" -#: ../src/interface.c:4300 +#: ../src/interface.c:4319 msgid "email address of the developer" msgstr "E-Mailadresse des Entwicklers" -#: ../src/interface.c:4307 +#: ../src/interface.c:4326 msgid "Initials of the developer name" msgstr "Initialen des Entwicklernamens" -#: ../src/interface.c:4309 +#: ../src/interface.c:4328 msgid "Initial version:" msgstr "Anfangsversion:" -#: ../src/interface.c:4321 +#: ../src/interface.c:4340 msgid "Version number, which a new file initially has" msgstr "Versionsnummer, welche eine neue Datei zu Beginn hat" -#: ../src/interface.c:4328 +#: ../src/interface.c:4347 msgid "Company name" msgstr "Firmenname" -#: ../src/interface.c:4330 +#: ../src/interface.c:4349 msgid "Developer:" msgstr "Entwickler:" -#: ../src/interface.c:4337 +#: ../src/interface.c:4356 msgid "Company:" msgstr "Firma:" -#: ../src/interface.c:4344 +#: ../src/interface.c:4363 msgid "Mail address:" msgstr "E-Mail-Adresse:" -#: ../src/interface.c:4351 +#: ../src/interface.c:4370 msgid "Initials:" msgstr "Initialen:" -#: ../src/interface.c:4363 +#: ../src/interface.c:4382 msgid "The name of the developer" msgstr "Der Name des Entwicklers" -#: ../src/interface.c:4365 +#: ../src/interface.c:4384 msgid "Year:" msgstr "Jahr:" -#: ../src/interface.c:4372 +#: ../src/interface.c:4391 msgid "Date:" msgstr "Datum:" -#: ../src/interface.c:4379 +#: ../src/interface.c:4398 msgid "Date & Time:" msgstr "Datum / Zeit:" -#: ../src/interface.c:4391 +#: ../src/interface.c:4410 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." @@ -2522,7 +2526,7 @@ "alle Platzhalter verwendet werden, die auch in der ANSI C Funktion »strftime« " "zum Einsatz kommen können." -#: ../src/interface.c:4398 +#: ../src/interface.c:4417 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." @@ -2531,7 +2535,7 @@ "Platzhalter verwendet werden, die auch in der ANSI C Funktion »strftime« zum " "Einsatz kommen können." -#: ../src/interface.c:4405 +#: ../src/interface.c:4424 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." @@ -2540,63 +2544,63 @@ "Platzhalter verwendet werden, die auch in der ANSI C Funktion »strftime« zum " "Einsatz kommen können." -#: ../src/interface.c:4407 +#: ../src/interface.c:4426 msgid "Template data" msgstr "Daten für Vorlagen:" -#: ../src/interface.c:4412 +#: ../src/interface.c:4431 msgid "Templates" msgstr "Vorlagen" -#: ../src/interface.c:4450 +#: ../src/interface.c:4469 msgid "C_hange" msgstr "Ä_ndern" -#: ../src/interface.c:4454 +#: ../src/interface.c:4473 msgid "Keyboard shortcuts" msgstr "Tastaturkürzel" -#: ../src/interface.c:4459 +#: ../src/interface.c:4478 msgid "Keybindings" msgstr "Tastenkürzel" -#: ../src/interface.c:4482 +#: ../src/interface.c:4501 msgid "Command:" msgstr "Befehl:" -#: ../src/interface.c:4489 +#: ../src/interface.c:4508 #, 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:4499 +#: ../src/interface.c:4518 msgid "Use an external command for printing" msgstr "Ein externes Programm zum Drucken benutzen" -#: ../src/interface.c:4519 ../src/printing.c:381 +#: ../src/interface.c:4538 ../src/printing.c:381 msgid "Print line numbers" msgstr "Drucke Zeilennummern" -#: ../src/interface.c:4522 ../src/printing.c:383 +#: ../src/interface.c:4541 ../src/printing.c:383 msgid "Add line numbers to the printed page" msgstr "Zeige Zeilennummern auf der gedruckten Seite" -#: ../src/interface.c:4524 ../src/printing.c:386 +#: ../src/interface.c:4543 ../src/printing.c:386 msgid "Print page numbers" msgstr "Drucke Seitenzahlen" -#: ../src/interface.c:4527 ../src/printing.c:388 +#: ../src/interface.c:4546 ../src/printing.c:388 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. Dazu werden zwei Zeilen der Seite " "benutzt." -#: ../src/interface.c:4529 ../src/printing.c:391 +#: ../src/interface.c:4548 ../src/printing.c:391 msgid "Print page header" msgstr "Drucke Seitenkopf" -#: ../src/interface.c:4532 ../src/printing.c:393 +#: ../src/interface.c:4551 ../src/printing.c:393 msgid "" "Add 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." @@ -2604,21 +2608,21 @@ "Fügt drei Kopfzeilen am Anfang jeder Seite ein (beinhaltet die Seitenzahl, " "den Dateinamen sowie das Datum)." -#: ../src/interface.c:4549 ../src/printing.c:409 +#: ../src/interface.c:4568 ../src/printing.c:409 msgid "Use the basename of the printed file" msgstr "Basisnamen der aktuellen Datei benutzen" -#: ../src/interface.c:4552 +#: ../src/interface.c:4571 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:4558 ../src/printing.c:417 +#: ../src/interface.c:4577 ../src/printing.c:417 msgid "Date format:" msgstr "Datumsformat:" -#: ../src/interface.c:4565 ../src/printing.c:423 +#: ../src/interface.c:4584 ../src/printing.c:423 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 " @@ -2628,103 +2632,103 @@ "können alle Platzhalter verwendet werden, die auch in der ANSI C Funktion " "»strftime« zum Einsatz kommen können." -#: ../src/interface.c:4568 +#: ../src/interface.c:4587 msgid "Use native GTK printing" msgstr "GTK-Druckunterstützung benutzen" -#: ../src/interface.c:4574 +#: ../src/interface.c:4593 msgid "Printing" msgstr "Drucken" -#: ../src/interface.c:4993 +#: ../src/interface.c:5012 msgid "Project Properties" msgstr "Projekteigenschaften" -#: ../src/keybindings.c:220 ../src/plugins.c:1103 +#: ../src/keybindings.c:221 ../src/plugins.c:1106 msgid "File" msgstr "Datei" -#: ../src/keybindings.c:223 +#: ../src/keybindings.c:224 msgid "New" msgstr "Neu" -#: ../src/keybindings.c:225 +#: ../src/keybindings.c:226 msgid "Open" msgstr "Öffnen" -#: ../src/keybindings.c:228 +#: ../src/keybindings.c:229 msgid "Open selected file" msgstr "Markierte Datei öffnen" -#: ../src/keybindings.c:230 +#: ../src/keybindings.c:231 msgid "Save" msgstr "Speichern" -#: ../src/keybindings.c:232 +#: ../src/keybindings.c:233 msgid "Save as" msgstr "Speichern unter" -#: ../src/keybindings.c:234 +#: ../src/keybindings.c:235 msgid "Save all" msgstr "Alle speichern" -#: ../src/keybindings.c:237 +#: ../src/keybindings.c:238 msgid "Print" msgstr "Drucken" -#: ../src/keybindings.c:239 +#: ../src/keybindings.c:240 msgid "Close" msgstr "Schließen" -#: ../src/keybindings.c:241 +#: ../src/keybindings.c:242 msgid "Close all" msgstr "Alle Schließen" -#: ../src/keybindings.c:244 +#: ../src/keybindings.c:245 msgid "Reload file" msgstr "Neu laden" -#: ../src/keybindings.c:246 ../src/project.c:520 +#: ../src/keybindings.c:247 ../src/project.c:520 msgid "Project" msgstr "Projekt" -#: ../src/keybindings.c:249 +#: ../src/keybindings.c:250 msgid "Project properties" msgstr "Projekteigenschaften" -#: ../src/keybindings.c:254 +#: ../src/keybindings.c:255 msgid "Undo" msgstr "Zurück" -#: ../src/keybindings.c:256 +#: ../src/keybindings.c:257 msgid "Redo" msgstr "Wiederholen" -#: ../src/keybindings.c:258 +#: ../src/keybindings.c:259 msgid "Duplicate line or selection" msgstr "Zeile duplizieren" -#: ../src/keybindings.c:261 +#: ../src/keybindings.c:262 msgid "Delete current line(s)" msgstr "Aktuelle Zeile(n) löschen" -#: ../src/keybindings.c:264 +#: ../src/keybindings.c:265 msgid "Delete to line end" msgstr "Bis zum Ende der Zeile löschen" -#: ../src/keybindings.c:266 +#: ../src/keybindings.c:267 msgid "Transpose current line" msgstr "Aktuelle Zeile tauschen" -#: ../src/keybindings.c:268 +#: ../src/keybindings.c:269 msgid "Scroll to current line" msgstr "Zu der aktuellen Zeile rollen" -#: ../src/keybindings.c:270 +#: ../src/keybindings.c:271 msgid "Scroll up the view by one line" msgstr "Rollt um eine Zeile nach oben" -#: ../src/keybindings.c:272 +#: ../src/keybindings.c:273 msgid "Scroll down the view by one line" msgstr "Rollt um eine Zeile nach unten" @@ -3105,7 +3109,7 @@ msgstr "Symbolliste neuladen" #: ../src/keybindings.c:494 ../src/keybindings.c:499 ../src/project.c:481 -#: ../src/ui_utils.c:1784 +#: ../src/ui_utils.c:1788 msgid "Build" msgstr "Erstellen" @@ -3157,7 +3161,7 @@ msgid "The following keyboard shortcuts are configurable:" msgstr "Die folgenden Tastenkürzel sind frei definierbar:" -#: ../src/keybindings.c:1641 +#: ../src/keybindings.c:1659 msgid "Switch to Document" msgstr "Zum Dokument wechseln" @@ -3296,7 +3300,7 @@ "Es könnte zu Problemen bei der Verwendung von Geany kommen.\n" "Geany trotzdem starten?" -#: ../src/main.c:763 ../src/socket.c:164 ../src/templates.c:332 +#: ../src/main.c:763 ../src/socket.c:164 ../src/templates.c:339 #, c-format msgid "Could not find file '%s'." msgstr "Konnte die Datei »%s« nicht finden." @@ -3327,7 +3331,7 @@ msgid "_Hide Message Window" msgstr "Meldungs_fenster ausblenden" -#: ../src/plugins.c:419 +#: ../src/plugins.c:422 #, c-format msgid "" "The plugin \"%s\" is not binary compatible with this release of Geany - " @@ -3336,11 +3340,11 @@ "Das Plugin »%s« ist nicht kompatibel mit dieser Version von Geany. Bitte neu " "kompilieren." -#: ../src/plugins.c:861 +#: ../src/plugins.c:864 msgid "_Plugin Manager" msgstr "_Plugin Manager" -#: ../src/plugins.c:1019 +#: ../src/plugins.c:1022 #, c-format msgid "" "Plugin: %s %s\n" @@ -3351,27 +3355,27 @@ "Beschreibung: %s\n" "Autor(en): %s" -#: ../src/plugins.c:1091 +#: ../src/plugins.c:1094 msgid "Active" msgstr "Aktiv" -#: ../src/plugins.c:1097 +#: ../src/plugins.c:1100 msgid "Plugin" msgstr "Plugin" -#: ../src/plugins.c:1121 +#: ../src/plugins.c:1124 msgid "No plugins available." msgstr "Keine Plugins gefunden." -#: ../src/plugins.c:1201 +#: ../src/plugins.c:1204 msgid "Plugins" msgstr "Plugins" -#: ../src/plugins.c:1221 +#: ../src/plugins.c:1224 msgid "Choose which plugins should be loaded at startup:" msgstr "Plugins, die beim Starten geladen werden sollen:" -#: ../src/plugins.c:1233 +#: ../src/plugins.c:1236 msgid "Plugin details:" msgstr "Plugindetails" @@ -4156,6 +4160,10 @@ msgid "Sort by _Appearance" msgstr "Nach _Auftreten sortieren" +#: ../src/templates.c:264 +msgid "Old" +msgstr "Alt" + #. custom actions defined in toolbar_init(): "New", "Open", "SearchEntry", "GotoEntry", "Build" #: ../src/toolbar.c:55 msgid "Save the current file" @@ -4315,7 +4323,7 @@ msgid "Custom command failed: %s" msgstr "Benutzerdefiniertes Kommando war nicht erfolgreich: %s" -#: ../src/tools.c:304 ../src/tools.c:538 +#: ../src/tools.c:304 ../src/tools.c:533 msgid "Set Custom Commands" msgstr "Benutzerdefiniertes Kommandos einstellen" @@ -4327,35 +4335,35 @@ "Sie können die aktuelle Auswahl an ein benutzerdefiniertes Kommando senden. " "Die aktuelle Auswahl wird durch die Ausgabe des Kommandos ersetzt." -#: ../src/tools.c:506 ../src/tools.c:510 +#: ../src/tools.c:501 ../src/tools.c:505 msgid "No custom commands defined." msgstr "Keine Kommandos definiert." -#: ../src/tools.c:615 +#: ../src/tools.c:610 msgid "Word Count" msgstr "Wörter zählen" -#: ../src/tools.c:625 +#: ../src/tools.c:620 msgid "selection" msgstr "Auswahl" -#: ../src/tools.c:631 +#: ../src/tools.c:626 msgid "whole document" msgstr "Vollständiges Dokument" -#: ../src/tools.c:640 +#: ../src/tools.c:635 msgid "Range:" msgstr "Bereich:" -#: ../src/tools.c:652 +#: ../src/tools.c:647 msgid "Lines:" msgstr "Zeilen:" -#: ../src/tools.c:666 +#: ../src/tools.c:661 msgid "Words:" msgstr "Wörter:" -#: ../src/tools.c:680 +#: ../src/tools.c:675 msgid "Characters:" msgstr "Buchstaben:" @@ -4464,23 +4472,19 @@ msgid "_Set Custom Date Format" msgstr "_Benutzerdefiniertes Datumsformat einstellen" -#: ../src/ui_utils.c:1641 +#: ../src/ui_utils.c:1647 msgid "Select Folder" msgstr "Ordner wählen" -#: ../src/ui_utils.c:1641 +#: ../src/ui_utils.c:1647 msgid "Select File" msgstr "Datei wählen" -#: ../src/ui_utils.c:1764 -msgid "C_onfiguration Files" -msgstr "_Konfigurationsdateien" - -#: ../src/ui_utils.c:1782 +#: ../src/ui_utils.c:1786 msgid "Save All" msgstr "Alles speichern" -#: ../src/ui_utils.c:1783 +#: ../src/ui_utils.c:1787 msgid "Close All" msgstr "Alle schließen" @@ -5110,35 +5114,35 @@ msgid "Splits the editor view into two windows." msgstr "Teilt das Editorfenster in zwei Teilfenster." -#: ../plugins/splitwindow.c:276 +#: ../plugins/splitwindow.c:244 msgid "Show the current document" msgstr "Zeige das aktuelle Dokument" -#: ../plugins/splitwindow.c:289 ../plugins/splitwindow.c:417 +#: ../plugins/splitwindow.c:261 ../plugins/splitwindow.c:389 msgid "_Unsplit" msgstr "Teilung _aufheben" -#: ../plugins/splitwindow.c:399 +#: ../plugins/splitwindow.c:371 msgid "_Split Window" msgstr "Fenster _teilen" -#: ../plugins/splitwindow.c:407 +#: ../plugins/splitwindow.c:379 msgid "_Horizontally" msgstr "_Horizontal" -#: ../plugins/splitwindow.c:412 +#: ../plugins/splitwindow.c:384 msgid "_Vertically" msgstr "_Vertikal" -#: ../plugins/splitwindow.c:428 +#: ../plugins/splitwindow.c:400 msgid "Split Horizontally" msgstr "Horizontal teilen" -#: ../plugins/splitwindow.c:430 +#: ../plugins/splitwindow.c:402 msgid "Split Vertically" msgstr "Vertikal teilen" -#: ../plugins/splitwindow.c:432 +#: ../plugins/splitwindow.c:404 msgid "Unsplit" msgstr "Teilung aufheben" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[4331] trunk
by ntrel＠users.sourceforge.net 16 Oct '09

16 Oct '09

Revision: 4331 http://geany.svn.sourceforge.net/geany/?rev=4331&view=rev Author: ntrel Date: 2009-10-16 16:42:38 +0000 (Fri, 16 Oct 2009) Log Message: ----------- Don't complete snippets if there's a selection. Modified Paths: -------------- trunk/ChangeLog trunk/src/editor.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-10-16 16:36:09 UTC (rev 4330) +++ trunk/ChangeLog 2009-10-16 16:42:38 UTC (rev 4331) @@ -10,6 +10,8 @@ Add SCI_AUTOCGETCURRENTTEXT message (will be sent upstream). * src/editor.c: Improve CamelCase word part autocompletion for runs of capital letters. + * src/editor.c: + Don't complete snippets if there's a selection. 2009-10-16 Lex Trotman <elextr(at)gmail(dot)com> Modified: trunk/src/editor.c =================================================================== --- trunk/src/editor.c 2009-10-16 16:36:09 UTC (rev 4330) +++ trunk/src/editor.c 2009-10-16 16:42:38 UTC (rev 4331) @@ -2368,6 +2368,8 @@ g_return_val_if_fail(editor != NULL, FALSE); sci = editor->sci; + if (sci_has_selection(sci)) + return FALSE; /* return if we are editing an existing line (chars on right of cursor) */ if (keybindings_lookup_item(GEANY_KEY_GROUP_EDITOR, GEANY_KEYS_EDITOR_COMPLETESNIPPET)->key == GDK_space && This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[4330] trunk
by ntrel＠users.sourceforge.net 16 Oct '09

16 Oct '09

Revision: 4330 http://geany.svn.sourceforge.net/geany/?rev=4330&view=rev Author: ntrel Date: 2009-10-16 16:36:09 +0000 (Fri, 16 Oct 2009) Log Message: ----------- Improve CamelCase word part autocompletion for runs of capital letters. Modified Paths: -------------- trunk/ChangeLog trunk/src/editor.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-10-16 16:25:17 UTC (rev 4329) +++ trunk/ChangeLog 2009-10-16 16:36:09 UTC (rev 4330) @@ -8,6 +8,8 @@ Improve word part autocompletion so AC list is not cancelled and reshown (this also stops the selection changing). Add SCI_AUTOCGETCURRENTTEXT message (will be sent upstream). + * src/editor.c: + Improve CamelCase word part autocompletion for runs of capital letters. 2009-10-16 Lex Trotman <elextr(at)gmail(dot)com> Modified: trunk/src/editor.c =================================================================== --- trunk/src/editor.c 2009-10-16 16:25:17 UTC (rev 4329) +++ trunk/src/editor.c 2009-10-16 16:36:09 UTC (rev 4330) @@ -803,7 +803,7 @@ { if (!ptr[0]) break; - if (g_ascii_isupper(*ptr)) + if (g_ascii_isupper(*ptr) && g_ascii_islower(ptr[1])) { ptr[0] = '\0'; partial_complete(editor->sci, text); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[4329] trunk/scintilla
by ntrel＠users.sourceforge.net 16 Oct '09

16 Oct '09

Revision: 4329 http://geany.svn.sourceforge.net/geany/?rev=4329&view=rev Author: ntrel Date: 2009-10-16 16:25:17 +0000 (Fri, 16 Oct 2009) Log Message: ----------- Revert temporary change for scintilla to say if tab was used for autocompletion. Modified Paths: -------------- trunk/scintilla/ScintillaBase.cxx trunk/scintilla/ScintillaBase.h Modified: trunk/scintilla/ScintillaBase.cxx =================================================================== --- trunk/scintilla/ScintillaBase.cxx 2009-10-16 16:19:51 UTC (rev 4328) +++ trunk/scintilla/ScintillaBase.cxx 2009-10-16 16:25:17 UTC (rev 4329) @@ -166,7 +166,7 @@ EnsureCaretVisible(); return 0; case SCI_TAB: - AutoCompleteCompleted('\t'); + AutoCompleteCompleted(); return 0; case SCI_NEWLINE: AutoCompleteCompleted(); @@ -336,7 +336,7 @@ NotifyParent(scn); } -void ScintillaBase::AutoCompleteCompleted(char key) { +void ScintillaBase::AutoCompleteCompleted() { int item = ac.lb->GetSelection(); char selected[1000]; selected[0] = '\0'; @@ -357,7 +357,6 @@ scn.listType = listType; Position firstPos = ac.posStart - ac.startLen; scn.lParam = firstPos; - scn.ch = key; scn.text = listSelected.c_str(); NotifyParent(scn); Modified: trunk/scintilla/ScintillaBase.h =================================================================== --- trunk/scintilla/ScintillaBase.h 2009-10-16 16:19:51 UTC (rev 4328) +++ trunk/scintilla/ScintillaBase.h 2009-10-16 16:25:17 UTC (rev 4329) @@ -76,7 +76,7 @@ int AutoCompleteGetCurrentText(char *buffer); void AutoCompleteCharacterAdded(char ch); void AutoCompleteCharacterDeleted(); - void AutoCompleteCompleted(char key = '\0'); + void AutoCompleteCompleted(); void AutoCompleteMoveToCurrentWord(); static void AutoCompleteDoubleClick(void* p); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[4328] trunk
by ntrel＠users.sourceforge.net 16 Oct '09

16 Oct '09

Revision: 4328 http://geany.svn.sourceforge.net/geany/?rev=4328&view=rev Author: ntrel Date: 2009-10-16 16:19:51 +0000 (Fri, 16 Oct 2009) Log Message: ----------- Undo merge of Scintilla.h, Scintilla.iface from upstream - could be confusing. Keep new SCI_AUTOCGETCURRENTTEXT message though. Modified Paths: -------------- trunk/ChangeLog trunk/scintilla/include/Scintilla.h trunk/scintilla/include/Scintilla.iface Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-10-16 12:13:01 UTC (rev 4327) +++ trunk/ChangeLog 2009-10-16 16:19:51 UTC (rev 4328) @@ -8,7 +8,6 @@ Improve word part autocompletion so AC list is not cancelled and reshown (this also stops the selection changing). Add SCI_AUTOCGETCURRENTTEXT message (will be sent upstream). - Merge Scintilla.h, Scintilla.iface from upstream. 2009-10-16 Lex Trotman <elextr(at)gmail(dot)com> Modified: trunk/scintilla/include/Scintilla.h =================================================================== --- trunk/scintilla/include/Scintilla.h 2009-10-16 12:13:01 UTC (rev 4327) +++ trunk/scintilla/include/Scintilla.h 2009-10-16 16:19:51 UTC (rev 4328) @@ -15,10 +15,6 @@ typedef BOOL bool; #endif -#ifdef __cplusplus -extern "C" { -#endif - #if PLAT_WIN /* Return false on failure: */ bool Scintilla_RegisterClasses(void *hInstance); @@ -26,10 +22,6 @@ #endif int Scintilla_LinkLexers(); -#ifdef __cplusplus -} -#endif - /* Here should be placed typedefs for uptr_t, an unsigned integer type large enough to * hold a pointer and sptr_t, a signed integer large enough to hold a pointer. * May need to be changed for 64 bit platforms. */ @@ -262,8 +254,6 @@ #define SCI_INDICGETUNDER 2511 #define SCI_SETWHITESPACEFORE 2084 #define SCI_SETWHITESPACEBACK 2085 -#define SCI_SETWHITESPACESIZE 2086 -#define SCI_GETWHITESPACESIZE 2087 #define SCI_SETSTYLEBITS 2090 #define SCI_GETSTYLEBITS 2091 #define SCI_SETLINESTATE 2092 @@ -627,7 +617,6 @@ #define SC_SEL_STREAM 0 #define SC_SEL_RECTANGLE 1 #define SC_SEL_LINES 2 -#define SC_SEL_THIN 3 #define SCI_SETSELECTIONMODE 2422 #define SCI_GETSELECTIONMODE 2423 #define SCI_GETLINESELSTARTPOSITION 2424 @@ -725,55 +714,6 @@ #define SCI_ADDUNDOACTION 2560 #define SCI_CHARPOSITIONFROMPOINT 2561 #define SCI_CHARPOSITIONFROMPOINTCLOSE 2562 -#define SCI_SETMULTIPLESELECTION 2563 -#define SCI_GETMULTIPLESELECTION 2564 -#define SCI_SETADDITIONALSELECTIONTYPING 2565 -#define SCI_GETADDITIONALSELECTIONTYPING 2566 -#define SCI_SETADDITIONALCARETSBLINK 2567 -#define SCI_GETADDITIONALCARETSBLINK 2568 -#define SCI_SETADDITIONALCARETSVISIBLE 2608 -#define SCI_GETADDITIONALCARETSVISIBLE 2609 -#define SCI_GETSELECTIONS 2570 -#define SCI_CLEARSELECTIONS 2571 -#define SCI_SETSELECTION 2572 -#define SCI_ADDSELECTION 2573 -#define SCI_SETMAINSELECTION 2574 -#define SCI_GETMAINSELECTION 2575 -#define SCI_SETSELECTIONNCARET 2576 -#define SCI_GETSELECTIONNCARET 2577 -#define SCI_SETSELECTIONNANCHOR 2578 -#define SCI_GETSELECTIONNANCHOR 2579 -#define SCI_SETSELECTIONNCARETVIRTUALSPACE 2580 -#define SCI_GETSELECTIONNCARETVIRTUALSPACE 2581 -#define SCI_SETSELECTIONNANCHORVIRTUALSPACE 2582 -#define SCI_GETSELECTIONNANCHORVIRTUALSPACE 2583 -#define SCI_SETSELECTIONNSTART 2584 -#define SCI_GETSELECTIONNSTART 2585 -#define SCI_SETSELECTIONNEND 2586 -#define SCI_GETSELECTIONNEND 2587 -#define SCI_SETRECTANGULARSELECTIONCARET 2588 -#define SCI_GETRECTANGULARSELECTIONCARET 2589 -#define SCI_SETRECTANGULARSELECTIONANCHOR 2590 -#define SCI_GETRECTANGULARSELECTIONANCHOR 2591 -#define SCI_SETRECTANGULARSELECTIONCARETVIRTUALSPACE 2592 -#define SCI_GETRECTANGULARSELECTIONCARETVIRTUALSPACE 2593 -#define SCI_SETRECTANGULARSELECTIONANCHORVIRTUALSPACE 2594 -#define SCI_GETRECTANGULARSELECTIONANCHORVIRTUALSPACE 2595 -#define SCVS_NONE 0 -#define SCVS_RECTANGULARSELECTION 1 -#define SCVS_USERACCESSIBLE 2 -#define SCI_SETVIRTUALSPACEOPTIONS 2596 -#define SCI_GETVIRTUALSPACEOPTIONS 2597 -#define SCI_SETRECTANGULARSELECTIONMODIFIER 2598 -#define SCI_GETRECTANGULARSELECTIONMODIFIER 2599 -#define SCI_SETADDITIONALSELFORE 2600 -#define SCI_SETADDITIONALSELBACK 2601 -#define SCI_SETADDITIONALSELALPHA 2602 -#define SCI_GETADDITIONALSELALPHA 2603 -#define SCI_SETADDITIONALCARETFORE 2604 -#define SCI_GETADDITIONALCARETFORE 2605 -#define SCI_ROTATESELECTION 2606 -#define SCI_SWAPMAINANCHORCARET 2607 #define SCI_STARTRECORD 3001 #define SCI_STOPRECORD 3002 #define SCI_SETLEXER 4001 @@ -835,7 +775,6 @@ #define SCMOD_SHIFT 1 #define SCMOD_CTRL 2 #define SCMOD_ALT 4 -#define SCMOD_SUPER 8 #define SCN_STYLENEEDED 2000 #define SCN_CHARADDED 2001 #define SCN_SAVEPOINTREACHED 2002 Modified: trunk/scintilla/include/Scintilla.iface =================================================================== --- trunk/scintilla/include/Scintilla.iface 2009-10-16 12:13:01 UTC (rev 4327) +++ trunk/scintilla/include/Scintilla.iface 2009-10-16 16:19:51 UTC (rev 4328) @@ -477,10 +477,10 @@ # Set a style to be a hotspot or not. set void StyleSetHotSpot=2409(int style, bool hotspot) -# Set the foreground colour of the main and additional selections and whether to use this setting. +# Set the foreground colour of the selection and whether to use this setting. fun void SetSelFore=2067(bool useSetting, colour fore) -# Set the background colour of the main and additional selections and whether to use this setting. +# Set the background colour of the selection and whether to use this setting. fun void SetSelBack=2068(bool useSetting, colour back) # Get the alpha of the selection. @@ -571,12 +571,6 @@ # Set the background colour of all whitespace and whether to use this setting. fun void SetWhitespaceBack=2085(bool useSetting, colour back) -# Set the size of the dots used to mark space characters. -fun void SetWhitespaceSize=2086(int size,) - -# Get the size of the dots used to mark space characters. -fun void GetWhitespaceSize=2087(,) - # Divide each styling byte into lexical class bits (default: 5) and indicator # bits (default: 3). If a lexer requires more than 32 lexical states, then this # is used to expand the possible states. @@ -1643,9 +1637,8 @@ val SC_SEL_STREAM=0 val SC_SEL_RECTANGLE=1 val SC_SEL_LINES=2 -val SC_SEL_THIN=3 -# Set the selection mode to stream (SC_SEL_STREAM) or rectangular (SC_SEL_RECTANGLE/SC_SEL_THIN) or +# Set the selection mode to stream (SC_SEL_STREAM) or rectangular (SC_SEL_RECTANGLE) or # by lines (SC_SEL_LINES). set void SetSelectionMode=2422(int mode,) @@ -1937,122 +1930,6 @@ # Return INVALID_POSITION if not close to text. fun position CharPositionFromPointClose=2562(int x, int y) -# Set whether multiple selections can be made -set void SetMultipleSelection=2563(bool multipleSelection,) - -# Whether multiple selections can be made -get bool GetMultipleSelection=2564(,) - -# Set whether typing can be performed into multiple selections -set void SetAdditionalSelectionTyping=2565(bool additionalSelectionTyping,) - -# Whether typing can be performed into multiple selections -get bool GetAdditionalSelectionTyping=2566(,) - -# Set whether additional carets will blink -set void SetAdditionalCaretsBlink=2567(bool additionalCaretsBlink,) - -# Whether additional carets will blink -get bool GetAdditionalCaretsBlink=2568(,) - -# Set whether additional carets are visible -set void SetAdditionalCaretsVisible=2608(bool additionalCaretsBlink,) - -# Whether additional carets are visible -get bool GetAdditionalCaretsVisible=2609(,) - -# How many selections are there? -get int GetSelections=2570(,) - -# Clear selections to a single empty stream selection -fun void ClearSelections=2571(,) - -# Set a simple selection -fun int SetSelection=2572(int caret,int anchor) - -# Add a selection -fun int AddSelection=2573(int caret,int anchor) - -# Set the main selection -set void SetMainSelection=2574(int selection,) - -# Which selection is the main selection -get int GetMainSelection=2575(,) - -set void SetSelectionNCaret=2576(int selection, position pos) -get position GetSelectionNCaret=2577(int selection,) -set void SetSelectionNAnchor=2578(int selection, position posAnchor) -get position GetSelectionNAnchor=2579(int selection,) -set void SetSelectionNCaretVirtualSpace=2580(int selection, int space) -get int GetSelectionNCaretVirtualSpace=2581(int selection,) -set void SetSelectionNAnchorVirtualSpace=2582(int selection, int space) -get int GetSelectionNAnchorVirtualSpace=2583(int selection,) - -# Sets the position that starts the selection - this becomes the anchor. -set void SetSelectionNStart=2584(int selection, position pos) - -# Returns the position at the start of the selection. -get position GetSelectionNStart=2585(,) - -# Sets the position that ends the selection - this becomes the currentPosition. -set void SetSelectionNEnd=2586(int selection, position pos,) - -# Returns the position at the end of the selection. -get position GetSelectionNEnd=2587(,) - -set void SetRectangularSelectionCaret=2588(position pos,) -get position GetRectangularSelectionCaret=2589(,) -set void SetRectangularSelectionAnchor=2590(position posAnchor,) -get position GetRectangularSelectionAnchor=2591(,) -set void SetRectangularSelectionCaretVirtualSpace=2592(int space,) -get int GetRectangularSelectionCaretVirtualSpace=2593(,) -set void SetRectangularSelectionAnchorVirtualSpace=2594(int space,) -get int GetRectangularSelectionAnchorVirtualSpace=2595(,) - -enu VirtualSpace=SCVS_ -val SCVS_NONE=0 -val SCVS_RECTANGULARSELECTION=1 -val SCVS_USERACCESSIBLE=2 - -set void SetVirtualSpaceOptions=2596(int virtualSpaceOptions,) -get int GetVirtualSpaceOptions=2597(,) - -# On GTK+, allow selecting the modifier key to use for mouse-based -# rectangular selection. Often the window manager requires Alt+Mouse Drag -# for moving windows. -# Valid values are SCMOD_CTRL(default), SCMOD_ALT, or SCMOD_SUPER. - -set void SetRectangularSelectionModifier=2598(int modifier,) - -# Get the modifier key used for rectangular selection. -get int GetRectangularSelectionModifier=2599(,) - -# Set the foreground colour of additional selections. -# Must have previously called SetSelFore with non-zero first argument for this to have an effect. -set void SetAdditionalSelFore=2600(colour fore,) - -# Set the background colour of additional selections. -# Must have previously called SetSelBack with non-zero first argument for this to have an effect. -set void SetAdditionalSelBack=2601(colour back,) - -# Set the alpha of the selection. -set void SetAdditionalSelAlpha=2602(int alpha,) - -# Get the alpha of the selection. -get int GetAdditionalSelAlpha=2603(,) - -# Set the foreground colour of additional carets. -set void SetAdditionalCaretFore=2604(colour fore,) - -# Get the foreground colour of additional carets. -get colour GetAdditionalCaretFore=2605(,) - -# Set the main selection to the next selection. -fun void RotateSelection=2606(,) - -# Swap that caret and anchor of the main selection. -fun void SwapMainAnchorCaret=2607(,) - # Start notifying the container of all key presses and commands. fun void StartRecord=3001(,) @@ -2162,7 +2039,6 @@ val SCMOD_SHIFT=1 val SCMOD_CTRL=2 val SCMOD_ALT=4 -val SCMOD_SUPER=8 ################################################ # For SciLexer.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:[4327] trunk
by ntrel＠users.sourceforge.net 16 Oct '09

16 Oct '09

Revision: 4327 http://geany.svn.sourceforge.net/geany/?rev=4327&view=rev Author: ntrel Date: 2009-10-16 12:13:01 +0000 (Fri, 16 Oct 2009) Log Message: ----------- Improve word part autocompletion so AC list is not cancelled and reshown (this also stops the selection changing). Add SCI_AUTOCGETCURRENTTEXT message (will be sent upstream). Merge Scintilla.h, Scintilla.iface from upstream. Modified Paths: -------------- trunk/ChangeLog trunk/scintilla/ScintillaBase.cxx trunk/scintilla/ScintillaBase.h trunk/scintilla/include/Scintilla.h trunk/scintilla/include/Scintilla.iface trunk/src/editor.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-10-16 11:07:49 UTC (rev 4326) +++ trunk/ChangeLog 2009-10-16 12:13:01 UTC (rev 4327) @@ -2,6 +2,13 @@ * src/sciwrappers.c: Remove unnecessary line number margin padding. + * scintilla/include/Scintilla.h, scintilla/include/Scintilla.iface, + scintilla/ScintillaBase.h, scintilla/ScintillaBase.cxx, + src/editor.c: + Improve word part autocompletion so AC list is not cancelled and + reshown (this also stops the selection changing). + Add SCI_AUTOCGETCURRENTTEXT message (will be sent upstream). + Merge Scintilla.h, Scintilla.iface from upstream. 2009-10-16 Lex Trotman <elextr(at)gmail(dot)com> Modified: trunk/scintilla/ScintillaBase.cxx =================================================================== --- trunk/scintilla/ScintillaBase.cxx 2009-10-16 11:07:49 UTC (rev 4326) +++ trunk/scintilla/ScintillaBase.cxx 2009-10-16 12:13:01 UTC (rev 4327) @@ -392,6 +392,23 @@ return ac.lb->GetSelection(); } +int ScintillaBase::AutoCompleteGetCurrentText(char *buffer) { + if (ac.Active()) { + int item = ac.lb->GetSelection(); + char selected[1000]; + selected[0] = '\0'; + if (item != -1) { + ac.lb->GetValue(item, selected, sizeof(selected)); + if (buffer != NULL) + strcpy(buffer, selected); + return strlen(selected); + } + } + if (buffer != NULL) + *buffer = '\0'; + return 0; +} + void ScintillaBase::CallTipShow(Point pt, const char *defn) { ac.Cancel(); pt.y += vs.lineHeight; @@ -564,6 +581,9 @@ case SCI_AUTOCGETCURRENT: return AutoCompleteGetCurrent(); + case SCI_AUTOCGETCURRENTTEXT: + return AutoCompleteGetCurrentText(reinterpret_cast<char *>(lParam)); + case SCI_AUTOCSETCANCELATSTART: ac.cancelAtStartPos = wParam != 0; break; Modified: trunk/scintilla/ScintillaBase.h =================================================================== --- trunk/scintilla/ScintillaBase.h 2009-10-16 11:07:49 UTC (rev 4326) +++ trunk/scintilla/ScintillaBase.h 2009-10-16 12:13:01 UTC (rev 4327) @@ -73,6 +73,7 @@ void AutoCompleteCancel(); void AutoCompleteMove(int delta); int AutoCompleteGetCurrent(); + int AutoCompleteGetCurrentText(char *buffer); void AutoCompleteCharacterAdded(char ch); void AutoCompleteCharacterDeleted(); void AutoCompleteCompleted(char key = '\0'); Modified: trunk/scintilla/include/Scintilla.h =================================================================== --- trunk/scintilla/include/Scintilla.h 2009-10-16 11:07:49 UTC (rev 4326) +++ trunk/scintilla/include/Scintilla.h 2009-10-16 12:13:01 UTC (rev 4327) @@ -15,6 +15,10 @@ typedef BOOL bool; #endif +#ifdef __cplusplus +extern "C" { +#endif + #if PLAT_WIN /* Return false on failure: */ bool Scintilla_RegisterClasses(void *hInstance); @@ -22,6 +26,10 @@ #endif int Scintilla_LinkLexers(); +#ifdef __cplusplus +} +#endif + /* Here should be placed typedefs for uptr_t, an unsigned integer type large enough to * hold a pointer and sptr_t, a signed integer large enough to hold a pointer. * May need to be changed for 64 bit platforms. */ @@ -254,6 +262,8 @@ #define SCI_INDICGETUNDER 2511 #define SCI_SETWHITESPACEFORE 2084 #define SCI_SETWHITESPACEBACK 2085 +#define SCI_SETWHITESPACESIZE 2086 +#define SCI_GETWHITESPACESIZE 2087 #define SCI_SETSTYLEBITS 2090 #define SCI_GETSTYLEBITS 2091 #define SCI_SETLINESTATE 2092 @@ -617,6 +627,7 @@ #define SC_SEL_STREAM 0 #define SC_SEL_RECTANGLE 1 #define SC_SEL_LINES 2 +#define SC_SEL_THIN 3 #define SCI_SETSELECTIONMODE 2422 #define SCI_GETSELECTIONMODE 2423 #define SCI_GETLINESELSTARTPOSITION 2424 @@ -641,6 +652,7 @@ #define SCI_SETWHITESPACECHARS 2443 #define SCI_SETCHARSDEFAULT 2444 #define SCI_AUTOCGETCURRENT 2445 +#define SCI_AUTOCGETCURRENTTEXT 2610 #define SCI_ALLOCATE 2446 #define SCI_TARGETASUTF8 2447 #define SCI_SETLENGTHFORENCODE 2448 @@ -713,6 +725,55 @@ #define SCI_ADDUNDOACTION 2560 #define SCI_CHARPOSITIONFROMPOINT 2561 #define SCI_CHARPOSITIONFROMPOINTCLOSE 2562 +#define SCI_SETMULTIPLESELECTION 2563 +#define SCI_GETMULTIPLESELECTION 2564 +#define SCI_SETADDITIONALSELECTIONTYPING 2565 +#define SCI_GETADDITIONALSELECTIONTYPING 2566 +#define SCI_SETADDITIONALCARETSBLINK 2567 +#define SCI_GETADDITIONALCARETSBLINK 2568 +#define SCI_SETADDITIONALCARETSVISIBLE 2608 +#define SCI_GETADDITIONALCARETSVISIBLE 2609 +#define SCI_GETSELECTIONS 2570 +#define SCI_CLEARSELECTIONS 2571 +#define SCI_SETSELECTION 2572 +#define SCI_ADDSELECTION 2573 +#define SCI_SETMAINSELECTION 2574 +#define SCI_GETMAINSELECTION 2575 +#define SCI_SETSELECTIONNCARET 2576 +#define SCI_GETSELECTIONNCARET 2577 +#define SCI_SETSELECTIONNANCHOR 2578 +#define SCI_GETSELECTIONNANCHOR 2579 +#define SCI_SETSELECTIONNCARETVIRTUALSPACE 2580 +#define SCI_GETSELECTIONNCARETVIRTUALSPACE 2581 +#define SCI_SETSELECTIONNANCHORVIRTUALSPACE 2582 +#define SCI_GETSELECTIONNANCHORVIRTUALSPACE 2583 +#define SCI_SETSELECTIONNSTART 2584 +#define SCI_GETSELECTIONNSTART 2585 +#define SCI_SETSELECTIONNEND 2586 +#define SCI_GETSELECTIONNEND 2587 +#define SCI_SETRECTANGULARSELECTIONCARET 2588 +#define SCI_GETRECTANGULARSELECTIONCARET 2589 +#define SCI_SETRECTANGULARSELECTIONANCHOR 2590 +#define SCI_GETRECTANGULARSELECTIONANCHOR 2591 +#define SCI_SETRECTANGULARSELECTIONCARETVIRTUALSPACE 2592 +#define SCI_GETRECTANGULARSELECTIONCARETVIRTUALSPACE 2593 +#define SCI_SETRECTANGULARSELECTIONANCHORVIRTUALSPACE 2594 +#define SCI_GETRECTANGULARSELECTIONANCHORVIRTUALSPACE 2595 +#define SCVS_NONE 0 +#define SCVS_RECTANGULARSELECTION 1 +#define SCVS_USERACCESSIBLE 2 +#define SCI_SETVIRTUALSPACEOPTIONS 2596 +#define SCI_GETVIRTUALSPACEOPTIONS 2597 +#define SCI_SETRECTANGULARSELECTIONMODIFIER 2598 +#define SCI_GETRECTANGULARSELECTIONMODIFIER 2599 +#define SCI_SETADDITIONALSELFORE 2600 +#define SCI_SETADDITIONALSELBACK 2601 +#define SCI_SETADDITIONALSELALPHA 2602 +#define SCI_GETADDITIONALSELALPHA 2603 +#define SCI_SETADDITIONALCARETFORE 2604 +#define SCI_GETADDITIONALCARETFORE 2605 +#define SCI_ROTATESELECTION 2606 +#define SCI_SWAPMAINANCHORCARET 2607 #define SCI_STARTRECORD 3001 #define SCI_STOPRECORD 3002 #define SCI_SETLEXER 4001 @@ -774,6 +835,7 @@ #define SCMOD_SHIFT 1 #define SCMOD_CTRL 2 #define SCMOD_ALT 4 +#define SCMOD_SUPER 8 #define SCN_STYLENEEDED 2000 #define SCN_CHARADDED 2001 #define SCN_SAVEPOINTREACHED 2002 Modified: trunk/scintilla/include/Scintilla.iface =================================================================== --- trunk/scintilla/include/Scintilla.iface 2009-10-16 11:07:49 UTC (rev 4326) +++ trunk/scintilla/include/Scintilla.iface 2009-10-16 12:13:01 UTC (rev 4327) @@ -477,10 +477,10 @@ # Set a style to be a hotspot or not. set void StyleSetHotSpot=2409(int style, bool hotspot) -# Set the foreground colour of the selection and whether to use this setting. +# Set the foreground colour of the main and additional selections and whether to use this setting. fun void SetSelFore=2067(bool useSetting, colour fore) -# Set the background colour of the selection and whether to use this setting. +# Set the background colour of the main and additional selections and whether to use this setting. fun void SetSelBack=2068(bool useSetting, colour back) # Get the alpha of the selection. @@ -571,6 +571,12 @@ # Set the background colour of all whitespace and whether to use this setting. fun void SetWhitespaceBack=2085(bool useSetting, colour back) +# Set the size of the dots used to mark space characters. +fun void SetWhitespaceSize=2086(int size,) + +# Get the size of the dots used to mark space characters. +fun void GetWhitespaceSize=2087(,) + # Divide each styling byte into lexical class bits (default: 5) and indicator # bits (default: 3). If a lexer requires more than 32 lexical states, then this # is used to expand the possible states. @@ -1637,8 +1643,9 @@ val SC_SEL_STREAM=0 val SC_SEL_RECTANGLE=1 val SC_SEL_LINES=2 +val SC_SEL_THIN=3 -# Set the selection mode to stream (SC_SEL_STREAM) or rectangular (SC_SEL_RECTANGLE) or +# Set the selection mode to stream (SC_SEL_STREAM) or rectangular (SC_SEL_RECTANGLE/SC_SEL_THIN) or # by lines (SC_SEL_LINES). set void SetSelectionMode=2422(int mode,) @@ -1717,6 +1724,10 @@ # Get currently selected item position in the auto-completion list fun int AutoCGetCurrent=2445(,) +# Get currently selected item text in the auto-completion list +# Returns the length of the item text +fun int AutoCGetCurrentText=2610(, stringresult s) + # Enlarge the document to a particular size of text bytes. fun void Allocate=2446(int bytes,) @@ -1926,6 +1937,122 @@ # Return INVALID_POSITION if not close to text. fun position CharPositionFromPointClose=2562(int x, int y) +# Set whether multiple selections can be made +set void SetMultipleSelection=2563(bool multipleSelection,) + +# Whether multiple selections can be made +get bool GetMultipleSelection=2564(,) + +# Set whether typing can be performed into multiple selections +set void SetAdditionalSelectionTyping=2565(bool additionalSelectionTyping,) + +# Whether typing can be performed into multiple selections +get bool GetAdditionalSelectionTyping=2566(,) + +# Set whether additional carets will blink +set void SetAdditionalCaretsBlink=2567(bool additionalCaretsBlink,) + +# Whether additional carets will blink +get bool GetAdditionalCaretsBlink=2568(,) + +# Set whether additional carets are visible +set void SetAdditionalCaretsVisible=2608(bool additionalCaretsBlink,) + +# Whether additional carets are visible +get bool GetAdditionalCaretsVisible=2609(,) + +# How many selections are there? +get int GetSelections=2570(,) + +# Clear selections to a single empty stream selection +fun void ClearSelections=2571(,) + +# Set a simple selection +fun int SetSelection=2572(int caret,int anchor) + +# Add a selection +fun int AddSelection=2573(int caret,int anchor) + +# Set the main selection +set void SetMainSelection=2574(int selection,) + +# Which selection is the main selection +get int GetMainSelection=2575(,) + +set void SetSelectionNCaret=2576(int selection, position pos) +get position GetSelectionNCaret=2577(int selection,) +set void SetSelectionNAnchor=2578(int selection, position posAnchor) +get position GetSelectionNAnchor=2579(int selection,) +set void SetSelectionNCaretVirtualSpace=2580(int selection, int space) +get int GetSelectionNCaretVirtualSpace=2581(int selection,) +set void SetSelectionNAnchorVirtualSpace=2582(int selection, int space) +get int GetSelectionNAnchorVirtualSpace=2583(int selection,) + +# Sets the position that starts the selection - this becomes the anchor. +set void SetSelectionNStart=2584(int selection, position pos) + +# Returns the position at the start of the selection. +get position GetSelectionNStart=2585(,) + +# Sets the position that ends the selection - this becomes the currentPosition. +set void SetSelectionNEnd=2586(int selection, position pos,) + +# Returns the position at the end of the selection. +get position GetSelectionNEnd=2587(,) + +set void SetRectangularSelectionCaret=2588(position pos,) +get position GetRectangularSelectionCaret=2589(,) +set void SetRectangularSelectionAnchor=2590(position posAnchor,) +get position GetRectangularSelectionAnchor=2591(,) +set void SetRectangularSelectionCaretVirtualSpace=2592(int space,) +get int GetRectangularSelectionCaretVirtualSpace=2593(,) +set void SetRectangularSelectionAnchorVirtualSpace=2594(int space,) +get int GetRectangularSelectionAnchorVirtualSpace=2595(,) + +enu VirtualSpace=SCVS_ +val SCVS_NONE=0 +val SCVS_RECTANGULARSELECTION=1 +val SCVS_USERACCESSIBLE=2 + +set void SetVirtualSpaceOptions=2596(int virtualSpaceOptions,) +get int GetVirtualSpaceOptions=2597(,) + +# On GTK+, allow selecting the modifier key to use for mouse-based +# rectangular selection. Often the window manager requires Alt+Mouse Drag +# for moving windows. +# Valid values are SCMOD_CTRL(default), SCMOD_ALT, or SCMOD_SUPER. + +set void SetRectangularSelectionModifier=2598(int modifier,) + +# Get the modifier key used for rectangular selection. +get int GetRectangularSelectionModifier=2599(,) + +# Set the foreground colour of additional selections. +# Must have previously called SetSelFore with non-zero first argument for this to have an effect. +set void SetAdditionalSelFore=2600(colour fore,) + +# Set the background colour of additional selections. +# Must have previously called SetSelBack with non-zero first argument for this to have an effect. +set void SetAdditionalSelBack=2601(colour back,) + +# Set the alpha of the selection. +set void SetAdditionalSelAlpha=2602(int alpha,) + +# Get the alpha of the selection. +get int GetAdditionalSelAlpha=2603(,) + +# Set the foreground colour of additional carets. +set void SetAdditionalCaretFore=2604(colour fore,) + +# Get the foreground colour of additional carets. +get colour GetAdditionalCaretFore=2605(,) + +# Set the main selection to the next selection. +fun void RotateSelection=2606(,) + +# Swap that caret and anchor of the main selection. +fun void SwapMainAnchorCaret=2607(,) + # Start notifying the container of all key presses and commands. fun void StartRecord=3001(,) @@ -2035,6 +2162,7 @@ val SCMOD_SHIFT=1 val SCMOD_CTRL=2 val SCMOD_ALT=4 +val SCMOD_SUPER=8 ################################################ # For SciLexer.h Modified: trunk/src/editor.c =================================================================== --- trunk/src/editor.c 2009-10-16 11:07:49 UTC (rev 4326) +++ trunk/src/editor.c 2009-10-16 12:13:01 UTC (rev 4327) @@ -767,22 +767,12 @@ } -static gboolean delay_autocomplete(gpointer data) -{ - keybindings_send_command(GEANY_KEY_GROUP_EDITOR, GEANY_KEYS_EDITOR_AUTOCOMPLETE); - return FALSE; -} - - static void partial_complete(ScintillaObject *sci, const gchar *text) { gint pos = sci_get_current_position(sci); sci_insert_text(sci, pos, text); sci_set_current_position(sci, pos + strlen(text), TRUE); - sci_cancel(sci); /* cancel full AC */ - /* a timeout of 0 means the AC box doesn't flicker */ - g_timeout_add(0, delay_autocomplete, NULL); } @@ -804,6 +794,7 @@ { ptr[1] = '\0'; partial_complete(editor->sci, text); + return; } else { @@ -816,10 +807,12 @@ { ptr[0] = '\0'; partial_complete(editor->sci, text); - break; + return; } } } + /* no word part, complete normally */ + SSM(editor->sci, SCI_AUTOCCOMPLETE, 0, 0); } @@ -901,10 +894,6 @@ utils_beep(); break; } - if (nt->ch == '\t') - { - check_partial_completion(editor, nt->text); - } /* fall through */ case SCN_AUTOCCANCELLED: /* now that autocomplete is finishing or was cancelled, reshow calltips @@ -4741,6 +4730,36 @@ } +/* safe way to read Scintilla string into a buffer */ +static gchar *sci_get_string(ScintillaObject *sci, gint msg) +{ + gint size = SSM(sci, msg, 0, 0) + 1; + gchar *str = g_malloc(size); + + SSM(sci, msg, 0, (sptr_t)str); + return str; +} + + +static gboolean on_key_press_event(GtkWidget *widget, GdkEventKey *event, gpointer user_data) +{ + GeanyDocument *doc; + gchar *entry; + + if (event->state || event->keyval != GDK_Tab) + return FALSE; + + doc = document_get_current(); + if (!doc || !SSM(doc->editor->sci, SCI_AUTOCACTIVE, 0, 0)) + return FALSE; + + entry = sci_get_string(doc->editor->sci, SCI_AUTOCGETCURRENTTEXT); + check_partial_completion(doc->editor, entry); + g_free(entry); + return TRUE; +} + + void editor_init(void) { static GeanyIndentPrefs indent_prefs; @@ -4753,6 +4772,8 @@ * handler (on_editor_notify) is called */ g_signal_connect_after(geany_object, "editor-notify", G_CALLBACK(on_editor_notify), NULL); + g_signal_connect(main_widgets.window, "key-press-event", G_CALLBACK(on_key_press_event), NULL); + ui_add_config_file_menu_item(utils_build_path(app->configdir, "snippets.conf", NULL), NULL, NULL); g_signal_connect(geany_object, "document-save", G_CALLBACK(on_document_save), NULL); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[4326] trunk
by ntrel＠users.sourceforge.net 16 Oct '09

16 Oct '09

Revision: 4326 http://geany.svn.sourceforge.net/geany/?rev=4326&view=rev Author: ntrel Date: 2009-10-16 11:07:49 +0000 (Fri, 16 Oct 2009) Log Message: ----------- Remove unnecessary line number margin padding. Modified Paths: -------------- trunk/ChangeLog trunk/src/sciwrappers.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-10-16 00:53:00 UTC (rev 4325) +++ trunk/ChangeLog 2009-10-16 11:07:49 UTC (rev 4326) @@ -1,3 +1,9 @@ +2009-10-16 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/sciwrappers.c: + Remove unnecessary line number margin padding. + + 2009-10-16 Lex Trotman <elextr(at)gmail(dot)com> * src/build.c: Modified: trunk/src/sciwrappers.c =================================================================== --- trunk/src/sciwrappers.c 2009-10-16 00:53:00 UTC (rev 4325) +++ trunk/src/sciwrappers.c 2009-10-16 11:07:49 UTC (rev 4326) @@ -47,8 +47,13 @@ gint len = SSM(sci, SCI_GETLINECOUNT, 0, 0); gint width; - g_snprintf(tmp_str, 15, "_%d%d", len, extra_width); + g_snprintf(tmp_str, 15, "_%d", len); width = sci_text_width(sci, STYLE_LINENUMBER, tmp_str); + if (extra_width) + { + g_snprintf(tmp_str, 15, "%d", extra_width); + width += sci_text_width(sci, STYLE_LINENUMBER, tmp_str); + } SSM(sci, SCI_SETMARGINWIDTHN, 0, width); SSM(sci, SCI_SETMARGINSENSITIVEN, 0, FALSE); /* use default behaviour */ } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[4325] trunk
by elextr＠users.sourceforge.net 15 Oct '09

15 Oct '09

Revision: 4325 http://geany.svn.sourceforge.net/geany/?rev=4325&view=rev Author: elextr Date: 2009-10-16 00:53:00 +0000 (Fri, 16 Oct 2009) Log Message: ----------- Fix crash opening project when Geany started with no geany.conf. Modified Paths: -------------- trunk/ChangeLog trunk/src/build.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-10-15 19:20:12 UTC (rev 4324) +++ trunk/ChangeLog 2009-10-16 00:53:00 UTC (rev 4325) @@ -1,3 +1,9 @@ +2009-10-16 Lex Trotman <elextr(at)gmail(dot)com> + + * src/build.c: + Fix crash opening project when Geany started with no geany.conf. + + 2009-10-15 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * scintilla/ScintillaBase.h, scintilla/ScintillaBase.cxx, src/utils.c, Modified: trunk/src/build.c =================================================================== --- trunk/src/build.c 2009-10-15 19:20:12 UTC (rev 4324) +++ trunk/src/build.c 2009-10-16 00:53:00 UTC (rev 4325) @@ -2283,8 +2283,8 @@ ft->error_regex_string = g_key_file_get_string(config, "build_settings", "error_regex", NULL); break; case GEANY_BCS_PROJ: - if (non_ft_proj == NULL) - non_ft_proj = g_new0(GeanyBuildCommand, build_groups_count[GEANY_GBG_NON_FT]); + if (non_ft_pref == NULL) + non_ft_pref = g_new0(GeanyBuildCommand, build_groups_count[GEANY_GBG_NON_FT]); basedir = project_get_base_path(); if (basedir == NULL) basedir = g_strdup("%d"); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[4324] trunk/data/templates/files/file.tex
by frlan＠users.sourceforge.net 15 Oct '09

15 Oct '09

Revision: 4324 http://geany.svn.sourceforge.net/geany/?rev=4324&view=rev Author: frlan Date: 2009-10-15 19:20:12 +0000 (Thu, 15 Oct 2009) Log Message: ----------- Set English for default babel language Modified Paths: -------------- trunk/data/templates/files/file.tex Modified: trunk/data/templates/files/file.tex =================================================================== --- trunk/data/templates/files/file.tex 2009-10-15 17:55:30 UTC (rev 4323) +++ trunk/data/templates/files/file.tex 2009-10-15 19:20:12 UTC (rev 4324) @@ -2,7 +2,7 @@ \usepackage[T1]{fontenc} \usepackage[utf8]{inputenc} \usepackage{lmodern} -\usepackage{babel} +\usepackage[english]{babel} \begin{document} \end{document} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
13
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits October 2009