Commits November 2009

commits@lists.geany.org

3 participants
68 discussions

SF.net SVN: geany:[4451] trunk/po
by frlan＠users.sourceforge.net 27 Nov '09

27 Nov '09

Revision: 4451 http://geany.svn.sourceforge.net/geany/?rev=4451&view=rev Author: frlan Date: 2009-11-27 17:11:45 +0000 (Fri, 27 Nov 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-11-27 17:10:43 UTC (rev 4450) +++ trunk/po/ChangeLog 2009-11-27 17:11:45 UTC (rev 4451) @@ -1,5 +1,6 @@ 2009-11-26 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> + * de.po: Minor update of German translation. * nl.po: Update of Dutch translation. Thanks to Peter Scholtens and Ayke van Laethem Modified: trunk/po/de.po =================================================================== --- trunk/po/de.po 2009-11-27 17:10:43 UTC (rev 4450) +++ trunk/po/de.po 2009-11-27 17:11:45 UTC (rev 4451) @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: geany 0.18\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-10-17 10:14+0200\n" -"PO-Revision-Date: 2009-10-03 09:40+0100\n" +"POT-Creation-Date: 2009-11-26 22:43+0100\n" +"PO-Revision-Date: 2009-11-26 22:49+0100\n" "Last-Translator: Frank Lanitz <frank(a)frank.uvena.de>\n" "Language-Team: German <geany-i18n(a)uvena.de>\n" "MIME-Version: 1.0\n" @@ -27,7 +27,9 @@ 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:260 ../src/interface.c:1480 +#: ../geany.desktop.in.h:2 +#: ../src/interface.c:280 +#: ../src/interface.c:1618 msgid "Geany" msgstr "Geany" @@ -35,373 +37,373 @@ msgid "Integrated Development Environment" msgstr "Integrierte Entwicklungsumgebung" -#: ../src/about.c:140 +#: ../src/about.c:144 msgid "About Geany" msgstr "Über Geany" -#: ../src/about.c:190 +#: ../src/about.c:194 msgid "A fast and lightweight IDE" msgstr "Eine kleine und schnelle Entwicklungsumgebung" -#: ../src/about.c:211 +#: ../src/about.c:215 #, 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:242 +#: ../src/about.c:246 msgid "Info" msgstr "Info" -#: ../src/about.c:258 +#: ../src/about.c:262 msgid "Developers" msgstr "Entwickler" -#: ../src/about.c:267 +#: ../src/about.c:271 msgid "maintainer" msgstr "Hauptentwickler" -#: ../src/about.c:275 +#: ../src/about.c:279 msgid "developer" msgstr "Entwickler" -#: ../src/about.c:283 +#: ../src/about.c:287 msgid "translation maintainer" msgstr "Übersetzungskoordinator" -#: ../src/about.c:292 +#: ../src/about.c:296 msgid "Translators" msgstr "Übersetzer" -#: ../src/about.c:312 +#: ../src/about.c:316 msgid "Previous Translators" msgstr "Ehemalige Übersetzer" -#: ../src/about.c:333 +#: ../src/about.c:337 msgid "Contributors" msgstr "Mitwirkende" -#: ../src/about.c:343 +#: ../src/about.c:347 #, c-format -msgid "" -"Some of the many contributors (for a more detailed list, see the file %s):" -msgstr "" -"Einige der vielen Leute, die an Geany mitgearbeitet haben (eine " -"detailliertere Liste findet sich in der Datei %s):" +msgid "Some of the many contributors (for a more detailed list, see the file %s):" +msgstr "Einige der vielen Leute, die an Geany mitgearbeitet haben (eine detailliertere Liste findet sich in der Datei %s):" -#: ../src/about.c:369 +#: ../src/about.c:373 msgid "Credits" msgstr "Credits" -#: ../src/about.c:383 +#: ../src/about.c:387 msgid "License" msgstr "Lizenz" -#: ../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." -msgstr "" -"Der Lizenztext konnte nicht gefunden werden. Bitte besuchen Sie http://www." -"gnu.org/licenses/gpl-2.0.txt um die Lizenz online zu lesen." +#: ../src/about.c:396 +msgid "License text could not be found, please visit http://www.gnu.org/licenses/gpl-2.0.txt to view it online." +msgstr "Der Lizenztext konnte nicht gefunden werden. Bitte besuchen Sie http://www.gnu.org/licenses/gpl-2.0.txt um die Lizenz online zu lesen." #. fall back to %d -#: ../src/build.c:582 +#: ../src/build.c:626 #, c-format msgid "failed to substitute %%p, no project active" msgstr "konnte %%p nicht ersetzen. Kein Projekt aktiv." -#: ../src/build.c:620 +#: ../src/build.c:664 msgid "Process failed, no working directory" msgstr "Ausführung fehlgeschlagen. Kein Arbeitsverzeichnis gefunden." -#: ../src/build.c:646 +#: ../src/build.c:690 #, c-format msgid "%s (in directory: %s)" msgstr "%s (im Verzeichnis: %s)" -#: ../src/build.c:666 ../src/build.c:890 ../src/search.c:1412 +#: ../src/build.c:710 +#: ../src/build.c:934 +#: ../src/search.c:1412 #, c-format msgid "Process failed (%s)" msgstr "Prozess fehlgeschlagen (%s)" -#: ../src/build.c:736 +#: ../src/build.c:780 #, c-format msgid "Failed to change the working directory to \"%s\"" msgstr "Konnte nicht in das Arbeitsverzeichnis »%s« wechseln" -#: ../src/build.c:765 +#: ../src/build.c:809 #, c-format msgid "Failed to execute \"%s\" (start-script could not be created)" msgstr "Konnte »%s« nicht ausführen (Start-Script konnte nicht erzeugt werden)" -#: ../src/build.c:819 -msgid "" -"Could not execute the file in the VTE because it probably contains a command." -msgstr "" -"Konnte die Datei nicht in der VTE ausführen. Eventuell steht bereits ein " -"Befehl auf der Kommandozeile." +#: ../src/build.c:863 +msgid "Could not execute the file in the VTE because it probably contains a command." +msgstr "Konnte die Datei nicht in der VTE ausführen. Eventuell steht bereits ein Befehl auf der Kommandozeile." -#: ../src/build.c:857 +#: ../src/build.c:901 #, c-format -msgid "" -"Could not find terminal \"%s\" (check path for Terminal tool setting in " -"Preferences)" -msgstr "" -"Konnte das Terminalprogramm »%s« nicht finden (Pfad zum Terminalprogramm in " -"den Einstellungen überprüfen)" +msgid "Could not find terminal \"%s\" (check path for Terminal tool setting in Preferences)" +msgstr "Konnte das Terminalprogramm »%s« nicht finden (Pfad zum Terminalprogramm in den Einstellungen überprüfen)" -#: ../src/build.c:1027 +#: ../src/build.c:1071 msgid "Compilation failed." msgstr "Kompilierung fehlgeschlagen." -#: ../src/build.c:1041 +#: ../src/build.c:1085 msgid "Compilation finished successfully." msgstr "Kompilierung erfolgreich beendet." -#: ../src/build.c:1197 +#: ../src/build.c:1241 msgid "Custom Text" msgstr "Freitext" -#: ../src/build.c:1198 +#: ../src/build.c:1242 msgid "Enter custom text here, all entered text is appended to the command." -msgstr "" -"Hier kann freier Text eingefügt werden, welcher an das Kommando angefügt " -"wird." +msgstr "Hier kann freier Text eingefügt werden, welcher an das Kommando angefügt wird." -#: ../src/build.c:1276 +#: ../src/build.c:1320 msgid "_Next Error" msgstr "Nächster _Fehler" -#: ../src/build.c:1278 +#: ../src/build.c:1322 msgid "_Previous Error" msgstr "_Vorheriger Fehler" -#: ../src/build.c:1288 +#: ../src/build.c:1332 msgid "_Set Build Commands" msgstr "Befehle zum Übersetzen" -#: ../src/build.c:1554 ../src/toolbar.c:344 +#: ../src/build.c:1610 +#: ../src/toolbar.c:352 msgid "Build the current file" msgstr "Kompiliert die aktuelle Datei" -#: ../src/build.c:1568 +#: ../src/build.c:1624 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:1570 +#: ../src/build.c:1626 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:1572 +#: ../src/build.c:1628 msgid "Compile the current file with Make" msgstr "Kompiliert die aktuelle Datei mit make" -#: ../src/build.c:1599 +#: ../src/build.c:1655 #, c-format msgid "Process could not be stopped (%s)." msgstr "Der Prozess konnte nicht angehalten werden (%s)." -#: ../src/build.c:1616 ../src/build.c:1628 +#: ../src/build.c:1672 +#: ../src/build.c:1684 msgid "No more build errors." msgstr "Keine weiteren Fehlermeldungen." -#: ../src/build.c:1700 +#: ../src/build.c:1756 msgid "Item" msgstr "Eintrag" -#: ../src/build.c:1701 ../src/symbols.c:636 +#: ../src/build.c:1757 +#: ../src/symbols.c:639 msgid "Label" msgstr "Label" -#: ../src/build.c:1702 ../src/symbols.c:631 +#: ../src/build.c:1758 +#: ../src/symbols.c:634 msgid "Command" msgstr "Kommando" -#: ../src/build.c:1703 +#: ../src/build.c:1759 msgid "Working directory" msgstr "Arbeitsverzeichnis" -#: ../src/build.c:1704 +#: ../src/build.c:1760 msgid "Clear" msgstr "Leeren" -#: ../src/build.c:1806 ../src/build.c:1808 +#: ../src/build.c:1862 +#: ../src/build.c:1864 #, c-format msgid "%s Commands" msgstr "Kommandos für %s" -#: ../src/build.c:1808 +#: ../src/build.c:1864 msgid "No Filetype" msgstr "Kein Dateityp" -#: ../src/build.c:1816 ../src/build.c:1851 +#: ../src/build.c:1872 +#: ../src/build.c:1907 msgid "Error Regular Expression:" msgstr "Regulärer Ausdruck für Fehlermeldungen:" -#: ../src/build.c:1844 +#: ../src/build.c:1900 msgid "Non-Filetype Commands" msgstr "Dateitypunhängige Befehle" -#: ../src/build.c:1874 +#: ../src/build.c:1930 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" +msgstr "Notiz: Element 2 öffnet ein Dialog und fügt das Ergebnis am Ende des Kommandos an" -#: ../src/build.c:1883 +#: ../src/build.c:1939 msgid "Execute Commands" msgstr "Befehle zum Ausführen" -#: ../src/build.c:1894 +#: ../src/build.c:1950 #, c-format -msgid "" -"%d, %e, %f, %p are substituted in command and directory fields, see manual " -"for details." -msgstr "" -"%d, %e, %f, %p werden innerhalb der Kommando- und Verzeichnisfelder ersetzt " -"- Details gibt es in der Dokumentation." +msgid "%d, %e, %f, %p are substituted in command and directory fields, see manual for details." +msgstr "%d, %e, %f, %p werden innerhalb der Kommando- und Verzeichnisfelder ersetzt - Details gibt es in der Dokumentation." -#: ../src/build.c:2046 +#: ../src/build.c:2102 msgid "Set Build Commands" msgstr "Befehle zum Übersetzen" -#: ../src/build.c:2310 ../src/build.c:2494 +#: ../src/build.c:2368 +#: ../src/build.c:2553 msgid "_Execute" msgstr "_Ausführen" -#: ../src/build.c:2491 +#: ../src/build.c:2550 msgid "_Make" msgstr "_Make" #. build the code with make custom -#: ../src/build.c:2492 ../src/build.c:2545 +#: ../src/build.c:2551 +#: ../src/build.c:2604 msgid "Make Custom _Target" msgstr "Make (eigenes _Target)" #. build the code with make object -#: ../src/build.c:2493 ../src/build.c:2553 +#: ../src/build.c:2552 +#: ../src/build.c:2612 msgid "Make _Object" msgstr "Make _Objekt-Datei" #. build the code -#: ../src/build.c:2525 ../src/interface.c:967 +#: ../src/build.c:2584 +#: ../src/interface.c:1069 msgid "_Build" msgstr "_Erstellen" #. build the code with make all -#: ../src/build.c:2537 +#: ../src/build.c:2596 msgid "_Make All" msgstr "_Make all" #. arguments -#: ../src/build.c:2565 +#: ../src/build.c:2624 msgid "_Set Build Menu Commands" msgstr "Kommandos zum Erstellen konfigurieren" -#: ../src/callbacks.c:152 +#: ../src/callbacks.c:153 msgid "Do you really want to quit?" msgstr "Soll Geany wirklich beendet werden?" -#: ../src/callbacks.c:471 ../src/document.c:2911 ../src/interface.c:331 +#: ../src/callbacks.c:231 +#, c-format +msgid "%d file saved." +msgid_plural "%d files saved." +msgstr[0] "%d Datei gespeichert." +msgstr[1] "%d Dateien gespeichert." + +#: ../src/callbacks.c:491 +#: ../src/document.c:2923 +#: ../src/interface.c:351 #: ../src/sidebar.c:580 msgid "_Reload" msgstr "_Neu laden" -#: ../src/callbacks.c:472 +#: ../src/callbacks.c:492 msgid "Any unsaved changes will be lost." msgstr "Alle ungesicherten Änderungen werden verloren gehen." -#: ../src/callbacks.c:473 +#: ../src/callbacks.c:493 #, c-format msgid "Are you sure you want to reload '%s'?" msgstr "Möchten Sie »%s« wirklich neu laden?" -#: ../src/callbacks.c:1260 ../src/keybindings.c:398 +#: ../src/callbacks.c:1280 +#: ../src/keybindings.c:420 msgid "Go to Line" msgstr "Gehe zu Zeile" -#: ../src/callbacks.c:1260 +#: ../src/callbacks.c:1280 msgid "Enter the line you want to go to:" msgstr "Geben Sie die Zeile an, zu der Sie springen möchten:" -#: ../src/callbacks.c:1357 ../src/callbacks.c:1382 -msgid "" -"Please set the filetype for the current file before using this function." +#: ../src/callbacks.c:1362 +#: ../src/callbacks.c:1387 +msgid "Please set the filetype for the current file before using this function." msgstr "Bitte legen Sie den Dateityp fest, bevor Sie diese Funktion benutzen." -#: ../src/callbacks.c:1494 ../src/ui_utils.c:542 +#: ../src/callbacks.c:1499 +#: ../src/ui_utils.c:544 msgid "dd.mm.yyyy" msgstr "TT.MM.JJJJ" -#: ../src/callbacks.c:1496 ../src/ui_utils.c:543 +#: ../src/callbacks.c:1501 +#: ../src/ui_utils.c:545 msgid "mm.dd.yyyy" msgstr "MM.TT.JJJJ" -#: ../src/callbacks.c:1498 ../src/ui_utils.c:544 +#: ../src/callbacks.c:1503 +#: ../src/ui_utils.c:546 msgid "yyyy/mm/dd" msgstr "JJJJ/MM/TT" -#: ../src/callbacks.c:1500 ../src/ui_utils.c:553 +#: ../src/callbacks.c:1505 +#: ../src/ui_utils.c:555 msgid "dd.mm.yyyy hh:mm:ss" msgstr "TT.MM.JJJJ HH:MM:SS" -#: ../src/callbacks.c:1502 ../src/ui_utils.c:554 +#: ../src/callbacks.c:1507 +#: ../src/ui_utils.c:556 msgid "mm.dd.yyyy hh:mm:ss" msgstr "MM.TT.JJJJ HH:MM:SS" -#: ../src/callbacks.c:1504 ../src/ui_utils.c:555 +#: ../src/callbacks.c:1509 +#: ../src/ui_utils.c:557 msgid "yyyy/mm/dd hh:mm:ss" msgstr "JJJJ/MM/TT HH:MM:SS" -#: ../src/callbacks.c:1506 ../src/ui_utils.c:564 +#: ../src/callbacks.c:1511 +#: ../src/ui_utils.c:566 msgid "_Use Custom Date Format" msgstr "Benutze selbst erstelltes _Datumsformat" -#: ../src/callbacks.c:1510 +#: ../src/callbacks.c:1515 msgid "Custom Date Format" msgstr "Benutzerdefiniertes Datumsformat" -#: ../src/callbacks.c:1511 -msgid "" -"Enter here a custom date and time format. You can use any conversion " -"specifiers which can be used with the ANSI C strftime function." -msgstr "" -"Hier kann ein benutzerdefiniertes Datumsformat eingegeben werden. Dabei " -"können alle Platzhalter verwendet werden, die auch in der ANSI C Funktion " -"»strftime« zum Einsatz kommen können." +#: ../src/callbacks.c:1516 +msgid "Enter here a custom date and time format. You can use any conversion specifiers which can be used with the ANSI C strftime function." +msgstr "Hier kann ein benutzerdefiniertes Datumsformat eingegeben werden. Dabei können alle Platzhalter verwendet werden, die auch in der ANSI C Funktion »strftime« zum Einsatz kommen können." -#: ../src/callbacks.c:1529 +#: ../src/callbacks.c:1534 msgid "Date format string could not be converted (possibly too long)." -msgstr "" -"Das Datenformat konnte nicht umgewandelt werden. Eventuell ist es zu lang." +msgstr "Das Datenformat konnte nicht umgewandelt werden. Eventuell ist es zu lang." -#: ../src/callbacks.c:1751 ../src/callbacks.c:1761 +#: ../src/callbacks.c:1748 +#: ../src/callbacks.c:1758 msgid "No more message items." msgstr "Keine weiteren Nachrichten." -#. initialize the dialog -#: ../src/dialogs.c:140 ../src/prefs.c:1651 +#: ../src/dialogs.c:140 msgid "Open File" msgstr "Datei öffnen" -#: ../src/dialogs.c:144 ../src/interface.c:682 +#: ../src/dialogs.c:144 +#: ../src/interface.c:784 msgid "_View" msgstr "_Ansicht" #: ../src/dialogs.c:147 -msgid "" -"Opens the file in read-only mode. If you choose more than one file to open, " -"all files will be opened read-only." -msgstr "" -"Öffnet die Datei schreibgeschützt. Wenn Sie mehrere Dateien zum Öffnen " -"wählen, werden alle schreibgeschützt geöffnet." +msgid "Opens the file in read-only mode. If you choose more than one file to open, all files will be opened read-only." +msgstr "Öffnet die Datei schreibgeschützt. Wenn Sie mehrere Dateien zum Öffnen wählen, werden alle schreibgeschützt geöffnet." #: ../src/dialogs.c:169 msgid "Detect by file extension" msgstr "Durch Dateiendung erkennen" -#: ../src/dialogs.c:196 ../src/interface.c:3582 ../src/interface.c:5122 +#: ../src/dialogs.c:196 +#: ../src/interface.c:3649 +#: ../src/interface.c:5173 msgid "Detect from file" msgstr "Aus Datei lesen" @@ -420,16 +422,11 @@ #: ../src/dialogs.c:286 msgid "" -"Explicitly defines an encoding for the file, if it would not be detected. " -"This is useful when you know that the encoding of a file cannot be detected " -"correctly by Geany.\n" -"Note if you choose multiple files, they will all be opened with the chosen " -"encoding." +"Explicitly defines an encoding for the file, if it would not be detected. This is useful when you know that the encoding of a file cannot be detected correctly by Geany.\n" +"Note if you choose multiple files, they will all be opened with the chosen encoding." msgstr "" -"Definiert explizit eine bestimmte Zeichenkodierung, wenn sie nicht " -"automatisch erkannt werden kann.\n" -"Beachten Sie: Wenn Sie mehrere Dateien auswählen, werden alle mit der " -"gewählten Zeichenkodierung geöffnet." +"Definiert explizit eine bestimmte Zeichenkodierung, wenn sie nicht automatisch erkannt werden kann.\n" +"Beachten Sie: Wenn Sie mehrere Dateien auswählen, werden alle mit der gewählten Zeichenkodierung geöffnet." #. line 2 with filetype combo #: ../src/dialogs.c:293 @@ -438,15 +435,11 @@ #: ../src/dialogs.c:303 msgid "" -"Explicitly defines a filetype for the file, if it would not be detected by " -"filename extension.\n" -"Note if you choose multiple files, they will all be opened with the chosen " -"filetype." +"Explicitly defines a filetype for the file, if it would not be detected by filename extension.\n" +"Note if you choose multiple files, they will all be opened with the chosen filetype." msgstr "" -"Definiert explizit einen bestimmten Dateityp, wenn er nicht durch die " -"Dateiendung erkannt werden kann.\n" -"Beachten Sie: Wenn Sie mehrere Dateien auswählen, werden alle mit dem " -"gewählten Dateityp geöffnet." +"Definiert explizit einen bestimmten Dateityp, wenn er nicht durch die Dateiendung erkannt werden kann.\n" +"Beachten Sie: Wenn Sie mehrere Dateien auswählen, werden alle mit dem gewählten Dateityp geöffnet." #: ../src/dialogs.c:389 msgid "Overwrite?" @@ -473,27 +466,28 @@ msgstr "_Datei in einem neuen Reiter öffnen" #: ../src/dialogs.c:444 -msgid "" -"Keep the current unsaved document open and open the newly saved file in a " -"new tab" -msgstr "" -"Lässt das ungesicherte Dokument geöffnet und öffnet das gesicherte in einem " -"neuen Reiter." +msgid "Keep the current unsaved document open and open the newly saved file in a new tab" +msgstr "Lässt das ungesicherte Dokument geöffnet und öffnet das gesicherte in einem neuen Reiter." -#: ../src/dialogs.c:566 ../src/win32.c:562 +#: ../src/dialogs.c:566 +#: ../src/win32.c:562 msgid "Error" msgstr "Fehler" -#: ../src/dialogs.c:569 ../src/dialogs.c:1382 ../src/win32.c:568 +#: ../src/dialogs.c:569 +#: ../src/dialogs.c:1382 +#: ../src/win32.c:568 #: ../src/win32.c:627 msgid "Question" msgstr "Frage" -#: ../src/dialogs.c:572 ../src/win32.c:574 +#: ../src/dialogs.c:572 +#: ../src/win32.c:574 msgid "Warning" msgstr "Warnung" -#: ../src/dialogs.c:575 ../src/win32.c:580 +#: ../src/dialogs.c:575 +#: ../src/win32.c:580 msgid "Information" msgstr "Information" @@ -515,21 +509,24 @@ msgstr "Schriftart auswählen" #: ../src/dialogs.c:1004 -msgid "" -"An error occurred or file information could not be retrieved (e.g. from a " -"new file)." -msgstr "" -"Es ist ein Fehler aufgetreten oder Datei-Informationen konnten nicht gelesen " -"werden (z.B. bei einer neuen, noch nicht gespeicherten Datei)." +msgid "An error occurred or file information could not be retrieved (e.g. from a new file)." +msgstr "Es ist ein Fehler aufgetreten oder Datei-Informationen konnten nicht gelesen werden (z.B. bei einer neuen, noch nicht gespeicherten Datei)." -#: ../src/dialogs.c:1023 ../src/dialogs.c:1024 ../src/dialogs.c:1025 -#: ../src/dialogs.c:1031 ../src/dialogs.c:1032 ../src/dialogs.c:1033 -#: ../src/symbols.c:1692 ../src/symbols.c:1713 ../src/symbols.c:1765 -#: ../src/ui_utils.c:216 +#: ../src/dialogs.c:1023 +#: ../src/dialogs.c:1024 +#: ../src/dialogs.c:1025 +#: ../src/dialogs.c:1031 +#: ../src/dialogs.c:1032 +#: ../src/dialogs.c:1033 +#: ../src/symbols.c:1703 +#: ../src/symbols.c:1724 +#: ../src/symbols.c:1776 +#: ../src/ui_utils.c:218 msgid "unknown" msgstr "unbekannt" -#: ../src/dialogs.c:1038 ../src/symbols.c:779 +#: ../src/dialogs.c:1038 +#: ../src/symbols.c:782 msgid "Properties" msgstr "Eigenschaften" @@ -558,7 +555,8 @@ msgstr "Kodierung:" #. BOM = byte order mark -#: ../src/dialogs.c:1137 ../src/ui_utils.c:219 +#: ../src/dialogs.c:1137 +#: ../src/ui_utils.c:221 msgid "(with BOM)" msgstr "(mit BOM)" @@ -620,7 +618,8 @@ msgid "New file \"%s\" opened." msgstr "Neue Datei »%s« geöffnet." -#: ../src/document.c:941 ../src/document.c:1451 +#: ../src/document.c:941 +#: ../src/document.c:1456 #, c-format msgid "Could not open file %s (%s)" msgstr "Konnte Datei »%s« nicht öffnen (%s)." @@ -628,14 +627,10 @@ #: ../src/document.c:971 #, c-format msgid "" -"The file \"%s\" could not be opened properly and has been truncated. This " -"can occur if the file contains a NULL byte. Be aware that saving it can " -"cause data loss.\n" +"The file \"%s\" could not be opened properly and has been truncated. This can occur if the file contains a NULL byte. Be aware that saving it can cause data loss.\n" "The file was set to read-only." msgstr "" -"Die Datei »%s« konnte nicht ordnungsgemäß geladen werden und wurde eventuell " -"abgeschnitten. Dies passiert beispielsweise, wenn die Datei ein »NULL-Byte« " -"enthält und kann zu Datenverlust beim Speichern führen!\n" +"Die Datei »%s« konnte nicht ordnungsgemäß geladen werden und wurde eventuell abgeschnitten. Dies passiert beispielsweise, wenn die Datei ein »NULL-Byte« enthält und kann zu Datenverlust beim Speichern führen!\n" "Die Datei wird schreibgeschützt geöffnet." #. For translators: the second wildcard is an encoding name, e.g. @@ -647,37 +642,33 @@ #: ../src/document.c:1007 #, c-format -msgid "" -"The file \"%s\" does not look like a text file or the file encoding is not " -"supported." -msgstr "" -"Die Datei »%s« scheint keine Textdatei zu sein, oder die Zeichenkodierung " -"wird nicht unterstützt." +msgid "The file \"%s\" does not look like a text file or the file encoding is not supported." +msgstr "Die Datei »%s« scheint keine Textdatei zu sein, oder die Zeichenkodierung wird nicht unterstützt." -#: ../src/document.c:1150 +#: ../src/document.c:1155 msgid "Spaces" msgstr "Leerzeichen" -#: ../src/document.c:1153 +#: ../src/document.c:1158 msgid "Tabs" msgstr "Tabulatoren" -#: ../src/document.c:1156 +#: ../src/document.c:1161 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:1161 +#: ../src/document.c:1166 #, c-format msgid "Setting %s indentation mode for %s." msgstr "Setze Einrückungsmodus %s für »%s«." -#: ../src/document.c:1214 +#: ../src/document.c:1219 msgid "Invalid filename" msgstr "Ungültiger Dateiname" -#: ../src/document.c:1329 +#: ../src/document.c:1334 #, c-format msgid "File %s reloaded." msgstr "Datei »%s« neu geladen." @@ -685,29 +676,25 @@ #. 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:1334 +#: ../src/document.c:1339 #, c-format msgid "File %s opened(%d%s)." msgstr "Datei »%s« geöffnet (%d%s)." -#: ../src/document.c:1336 +#: ../src/document.c:1341 msgid ", read-only" msgstr ", schreibgeschützt" -#: ../src/document.c:1546 +#: ../src/document.c:1551 msgid "Error renaming file." msgstr "Fehler beim Umbenennen der Datei." -#: ../src/document.c:1621 +#: ../src/document.c:1626 #, c-format -msgid "" -"An error occurred while converting the file from UTF-8 in \"%s\". The file " -"remains unsaved." -msgstr "" -"Beim Konvertieren der Datei von UTF-8 nach »%s« ist ein Fehler aufgetreten. " -"Die Datei wird nicht gespeichert." +msgid "An error occurred while converting the file from UTF-8 in \"%s\". The file remains unsaved." +msgstr "Beim Konvertieren der Datei von UTF-8 nach »%s« ist ein Fehler aufgetreten. Die Datei wird nicht gespeichert." -#: ../src/document.c:1643 +#: ../src/document.c:1648 #, c-format msgid "" "Error message: %s\n" @@ -716,84 +703,87 @@ "Fehlermeldung: %s\n" "Der Fehler trat bei »%s« (Zeile: %d, Spalte: %d) auf." -#: ../src/document.c:1648 +#: ../src/document.c:1653 #, c-format msgid "Error message: %s." msgstr "Fehlermeldung: %s." -#: ../src/document.c:1751 ../src/document.c:1814 +#: ../src/document.c:1756 +#: ../src/document.c:1819 msgid "Error saving file." msgstr "Fehler beim Speichern der Datei." -#: ../src/document.c:1813 +#: ../src/document.c:1818 #, c-format msgid "Error saving file (%s)." msgstr "Fehler beim Speichern der Datei (%s)." -#: ../src/document.c:1838 +#: ../src/document.c:1843 #, c-format msgid "File %s saved." msgstr "Datei »%s« wurde gespeichert." -#: ../src/document.c:1906 ../src/document.c:1963 ../src/document.c:1971 +#: ../src/document.c:1911 +#: ../src/document.c:1968 +#: ../src/document.c:1976 #, c-format msgid "\"%s\" was not found." msgstr "»%s« wurde nicht gefunden." -#: ../src/document.c:1971 +#: ../src/document.c:1976 msgid "Wrap search and find again?" msgstr "Suche vom Dokumentanfang bzw. -ende neu beginnen?" -#: ../src/document.c:2050 ../src/search.c:1085 ../src/search.c:1659 +#: ../src/document.c:2055 +#: ../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:2061 ../src/document.c:2070 +#: ../src/document.c:2066 +#: ../src/document.c:2075 #, 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:2912 +#: ../src/document.c:2924 msgid "Do you want to reload it?" msgstr "Möchten Sie die Datei neu laden?" -#: ../src/document.c:2913 +#: ../src/document.c:2925 #, c-format msgid "" "The file '%s' on the disk is more recent than\n" "the current buffer." -msgstr "" -"Die Datei »%s« auf dem Datenträger ist aktueller als die momentan geöffnete " -"Version." +msgstr "Die Datei »%s« auf dem Datenträger ist aktueller als die momentan geöffnete Version." -#: ../src/document.c:2934 +#: ../src/document.c:2946 msgid "Try to resave the file?" msgstr "Versuchen die Datei erneut zu speichern?" -#: ../src/document.c:2935 +#: ../src/document.c:2947 #, c-format msgid "File \"%s\" was not found on disk!" msgstr "»%s« wurde nicht auf dem Datenträger gefunden." -#: ../src/editor.c:4320 +#: ../src/editor.c:4366 msgid "Enter Tab Width" msgstr "Tabulatorbreite:" -#: ../src/editor.c:4321 +#: ../src/editor.c:4367 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 " -"werden sollen." +msgstr "Geben Sie die Anzahl der Leerzeichen an, welche durch den Tabulator ersetzt werden sollen." #: ../src/encodings.c:76 msgid "Celtic" msgstr "Keltisch" -#: ../src/encodings.c:77 ../src/encodings.c:78 +#: ../src/encodings.c:77 +#: ../src/encodings.c:78 msgid "Greek" msgstr "Griechisch" @@ -805,22 +795,31 @@ msgid "South European" msgstr "Südeuropäisch" -#: ../src/encodings.c:81 ../src/encodings.c:82 ../src/encodings.c:83 +#: ../src/encodings.c:81 +#: ../src/encodings.c:82 +#: ../src/encodings.c:83 #: ../src/encodings.c:84 msgid "Western" msgstr "Westlich" -#: ../src/encodings.c:86 ../src/encodings.c:87 ../src/encodings.c:88 +#: ../src/encodings.c:86 +#: ../src/encodings.c:87 +#: ../src/encodings.c:88 msgid "Baltic" msgstr "Baltisch" -#: ../src/encodings.c:89 ../src/encodings.c:90 ../src/encodings.c:91 +#: ../src/encodings.c:89 +#: ../src/encodings.c:90 +#: ../src/encodings.c:91 msgid "Central European" msgstr "Mitteleuropäisch" #. ISO-IR-111 not available on Windows -#: ../src/encodings.c:92 ../src/encodings.c:93 ../src/encodings.c:95 -#: ../src/encodings.c:96 ../src/encodings.c:97 +#: ../src/encodings.c:92 +#: ../src/encodings.c:93 +#: ../src/encodings.c:95 +#: ../src/encodings.c:96 +#: ../src/encodings.c:97 msgid "Cyrillic" msgstr "Kyrillisch" @@ -836,12 +835,16 @@ msgid "Romanian" msgstr "Rumänisch" -#: ../src/encodings.c:102 ../src/encodings.c:103 ../src/encodings.c:104 +#: ../src/encodings.c:102 +#: ../src/encodings.c:103 +#: ../src/encodings.c:104 msgid "Arabic" msgstr "Arabisch" #. not available at all, ? -#: ../src/encodings.c:105 ../src/encodings.c:107 ../src/encodings.c:108 +#: ../src/encodings.c:105 +#: ../src/encodings.c:107 +#: ../src/encodings.c:108 msgid "Hebrew" msgstr "Hebräisch" @@ -861,36 +864,53 @@ msgid "Thai" msgstr "Thai" -#: ../src/encodings.c:114 ../src/encodings.c:115 ../src/encodings.c:116 +#: ../src/encodings.c:114 +#: ../src/encodings.c:115 +#: ../src/encodings.c:116 msgid "Turkish" msgstr "Türkisch" -#: ../src/encodings.c:117 ../src/encodings.c:118 ../src/encodings.c:119 +#: ../src/encodings.c:117 +#: ../src/encodings.c:118 +#: ../src/encodings.c:119 msgid "Vietnamese" msgstr "Vietnamesisch" -#: ../src/encodings.c:121 ../src/encodings.c:122 ../src/encodings.c:123 -#: ../src/encodings.c:124 ../src/encodings.c:125 ../src/encodings.c:126 -#: ../src/encodings.c:127 ../src/encodings.c:128 +#: ../src/encodings.c:121 +#: ../src/encodings.c:122 +#: ../src/encodings.c:123 +#: ../src/encodings.c:124 +#: ../src/encodings.c:125 +#: ../src/encodings.c:126 +#: ../src/encodings.c:127 +#: ../src/encodings.c:128 msgid "Unicode" msgstr "Unicode" #. maybe not available on Linux -#: ../src/encodings.c:130 ../src/encodings.c:131 ../src/encodings.c:132 +#: ../src/encodings.c:130 +#: ../src/encodings.c:131 +#: ../src/encodings.c:132 #: ../src/encodings.c:134 msgid "Chinese Simplified" msgstr "Chinesisch, vereinfacht" -#: ../src/encodings.c:135 ../src/encodings.c:136 ../src/encodings.c:137 +#: ../src/encodings.c:135 +#: ../src/encodings.c:136 +#: ../src/encodings.c:137 msgid "Chinese Traditional" msgstr "Chinesisch, traditionell" -#: ../src/encodings.c:138 ../src/encodings.c:139 ../src/encodings.c:140 +#: ../src/encodings.c:138 +#: ../src/encodings.c:139 +#: ../src/encodings.c:140 #: ../src/encodings.c:141 msgid "Japanese" msgstr "Japanisch" -#: ../src/encodings.c:142 ../src/encodings.c:143 ../src/encodings.c:144 +#: ../src/encodings.c:142 +#: ../src/encodings.c:143 +#: ../src/encodings.c:144 #: ../src/encodings.c:145 msgid "Korean" msgstr "Koreanisch" @@ -923,8 +943,11 @@ msgid "_Unicode" msgstr "_Unicode" -#: ../src/filetypes.c:101 ../src/filetypes.c:209 ../src/filetypes.c:231 -#: ../src/filetypes.c:242 ../src/filetypes.c:264 +#: ../src/filetypes.c:101 +#: ../src/filetypes.c:209 +#: ../src/filetypes.c:231 +#: ../src/filetypes.c:242 +#: ../src/filetypes.c:264 #, c-format msgid "%s source file" msgstr "%s Quelldatei" @@ -934,8 +957,10 @@ msgid "%s file" msgstr "%s Quelldatei" -#: ../src/filetypes.c:118 ../src/filetypes.c:119 ../src/interface.c:3501 -#: ../src/interface.c:5041 +#: ../src/filetypes.c:118 +#: ../src/filetypes.c:119 +#: ../src/interface.c:3568 +#: ../src/interface.c:5116 msgid "None" msgstr "Keiner" @@ -988,15 +1013,17 @@ msgid "M_iscellaneous Languages" msgstr "_Sonstige Sprachen" -#: ../src/filetypes.c:1369 ../src/win32.c:107 +#: ../src/filetypes.c:1386 +#: ../src/win32.c:107 msgid "All Source" msgstr "Alle Quellen" -#: ../src/filetypes.c:1394 ../src/project.c:292 +#: ../src/filetypes.c:1411 +#: ../src/project.c:292 msgid "All files" msgstr "Alle Dateien" -#: ../src/filetypes.c:1452 +#: ../src/filetypes.c:1470 #, c-format msgid "Bad regex for filetype %s: %s" msgstr "Schlechter RegEx für Dateityp %s: %s" @@ -1005,2188 +1032,2138 @@ msgid "untitled" msgstr "unbenannt" -#: ../src/interface.c:274 +#: ../src/highlighting.c:3369 +#: ../src/main.c:772 +#: ../src/socket.c:164 +#: ../src/templates.c:339 +#, c-format +msgid "Could not find file '%s'." +msgstr "Konnte die Datei »%s« nicht finden." + +#: ../src/highlighting.c:3418 +msgid "_Color Schemes" +msgstr "_FarbsSchemata" + +#: ../src/highlighting.c:3425 +msgid "_Default" +msgstr "_Standard" + +#: ../src/interface.c:294 msgid "_File" msgstr "_Datei" -#: ../src/interface.c:285 +#: ../src/interface.c:305 msgid "New (with _Template)" msgstr "Neu (aus _Vorlage)" -#: ../src/interface.c:302 ../src/interface.c:1944 +#: ../src/interface.c:322 +#: ../src/interface.c:2086 msgid "Open Selected F_ile" msgstr "_Markierte Datei öffnen" -#: ../src/interface.c:306 +#: ../src/interface.c:326 msgid "Recent _Files" msgstr "_Zuletzt geöffnet" -#: ../src/interface.c:323 +#: ../src/interface.c:343 msgid "Save A_ll" msgstr "A_lle speichern" -#: ../src/interface.c:339 +#: ../src/interface.c:359 msgid "R_eload As" msgstr "N_eu laden als" -#: ../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 +#: ../src/interface.c:370 +#: ../src/interface.c:556 +#: ../src/interface.c:676 +#: ../src/interface.c:690 +#: ../src/interface.c:944 +#: ../src/interface.c:954 +#: ../src/interface.c:2154 +#: ../src/interface.c:2168 msgid "invisible" msgstr "unsichtbar" -#: ../src/interface.c:367 +#: ../src/interface.c:387 msgid "Page Set_up" msgstr "Seiteneigensc_haften" -#: ../src/interface.c:384 ../src/notebook.c:213 +#: ../src/interface.c:404 +#: ../src/notebook.c:213 msgid "Close Ot_her Documents" msgstr "_Inaktive Dateien schließen" -#: ../src/interface.c:392 ../src/notebook.c:218 +#: ../src/interface.c:412 +#: ../src/notebook.c:218 msgid "C_lose All" msgstr "_Alle schließen" -#: ../src/interface.c:409 +#: ../src/interface.c:429 msgid "_Edit" msgstr "_Bearbeiten" -#: ../src/interface.c:459 ../src/interface.c:1953 +#: ../src/interface.c:479 +#: ../src/interface.c:2095 msgid "_Format" msgstr "_Format" -#: ../src/interface.c:466 ../src/interface.c:1960 +#: ../src/interface.c:486 +#: ../src/keybindings.c:364 +msgid "_Reflow Lines/Block" +msgstr "_Neuformatieren der Zeile/des Abschnitts" + +#: ../src/interface.c:490 msgid "T_oggle Case of Selection" msgstr "_Groß- und Kleinschreibung für die Auswahl tauschen" -#: ../src/interface.c:475 ../src/interface.c:1969 +#: ../src/interface.c:494 +#: ../src/keybindings.c:270 +#, fuzzy +msgid "_Transpose Current Line" +msgstr "Aktuelle Zeile tauschen" + +#: ../src/interface.c:503 msgid "_Comment Line(s)" msgstr "Zeile(n) _auskommentieren" -#: ../src/interface.c:479 ../src/interface.c:1973 +#: ../src/interface.c:507 msgid "U_ncomment Line(s)" msgstr "Zeile(n) _einkommentieren" -#: ../src/interface.c:483 ../src/interface.c:1977 +#: ../src/interface.c:511 msgid "_Toggle Line Commentation" msgstr "Kommentierung _umschalten" -#: ../src/interface.c:487 ../src/interface.c:1981 -msgid "Du_plicate Line or Selection" -msgstr "_Zeile oder Auswahl duplizieren" - -#: ../src/interface.c:496 ../src/interface.c:1990 +#: ../src/interface.c:520 msgid "_Increase Indent" msgstr "Einzug _erhöhen" -#: ../src/interface.c:504 ../src/interface.c:1998 +#: ../src/interface.c:528 msgid "_Decrease Indent" msgstr "Einzug _verringern" -#: ../src/interface.c:517 ../src/interface.c:2011 +#: ../src/interface.c:536 +#: ../src/keybindings.c:354 +#, fuzzy +msgid "_Smart Line Indent" +msgstr "Intelligentes Einrücken" + +#: ../src/interface.c:545 msgid "_Send Selection to Terminal" msgstr "_Auswahl an Terminal senden" -#: ../src/interface.c:521 ../src/interface.c:2015 +#: ../src/interface.c:549 msgid "_Send Selection to" msgstr "_Auswahl senden an" -#: ../src/interface.c:536 ../src/interface.c:2030 +#: ../src/interface.c:559 +#: ../src/interface.c:2099 +msgid "_Commands" +msgstr "_Kommandos" + +#: ../src/interface.c:566 +#: ../src/keybindings.c:311 +msgid "Cut current line(s)" +msgstr "Aktuelle Zeile(n) ausschneiden" + +#: ../src/interface.c:574 +#: ../src/keybindings.c:308 +msgid "Copy current line(s)" +msgstr "Aktuelle Zeile(n) kopieren" + +#: ../src/interface.c:582 +#: ../src/keybindings.c:263 +msgid "Delete current line(s)" +msgstr "Aktuelle Zeile(n) löschen" + +#: ../src/interface.c:586 +#: ../src/keybindings.c:260 +msgid "Duplicate line or selection" +msgstr "Zeile duplizieren" + +#: ../src/interface.c:595 +#: ../src/keybindings.c:321 +msgid "Select current line(s)" +msgstr "Aktuelle Zeile(n) auswählen" + +#: ../src/interface.c:599 +#: ../src/keybindings.c:324 +msgid "Select current paragraph" +msgstr "Aktuellen Absatz auswählen" + +#: ../src/interface.c:608 +#: ../src/keybindings.c:373 +msgid "Insert alternative white space" +msgstr "Alternatives Leerzeichen einfügen" + +#: ../src/interface.c:617 +#: ../src/keybindings.c:429 +msgid "Go to next marker" +msgstr "Zur nächsten Markierung springen" + +#: ../src/interface.c:621 +#: ../src/keybindings.c:432 +msgid "Go to previous marker" +msgstr "Zur vorherigen Markierung springen" + +#: ../src/interface.c:630 +#: ../src/interface.c:2108 msgid "I_nsert Comments" msgstr "K_ommentare einfügen" -#: ../src/interface.c:547 ../src/interface.c:2041 +#: ../src/interface.c:641 +#: ../src/interface.c:2119 msgid "Insert _ChangeLog Entry" msgstr "_ChangeLog-Eintrag hinzufügen" -#: ../src/interface.c:551 ../src/interface.c:2045 +#: ../src/interface.c:645 +#: ../src/interface.c:2123 msgid "Insert File _Header" msgstr "_Dateikopf einfügen" -#: ../src/interface.c:555 ../src/interface.c:2049 +#: ../src/interface.c:649 +#: ../src/interface.c:2127 msgid "Insert _Function Description" msgstr "_Funktionsbeschreibung einfügen" -#: ../src/interface.c:559 ../src/interface.c:2053 +#: ../src/interface.c:653 +#: ../src/interface.c:2131 msgid "Insert _Multiline Comment" msgstr "_Mehrzeiligen Kommentar einfügen" -#: ../src/interface.c:563 ../src/interface.c:2057 +#: ../src/interface.c:657 +#: ../src/interface.c:2135 msgid "Insert _GPL Notice" msgstr "_GPL-Hinweis einfügen" -#: ../src/interface.c:567 ../src/interface.c:2061 +#: ../src/interface.c:661 +#: ../src/interface.c:2139 msgid "Insert _BSD License Notice" msgstr "_BSD-Lizenz-Hinweis einfügen" -#: ../src/interface.c:571 ../src/interface.c:2065 +#: ../src/interface.c:665 +#: ../src/interface.c:2143 msgid "Insert Dat_e" msgstr "_Datum einfügen" -#: ../src/interface.c:585 ../src/interface.c:2079 +#: ../src/interface.c:679 +#: ../src/interface.c:2157 msgid "_Insert \"include <...>\"" msgstr "\"include <...>\" ei_nfügen" -#: ../src/interface.c:604 +#: ../src/interface.c:698 msgid "Preference_s" msgstr "E_instellungen" -#: ../src/interface.c:612 +#: ../src/interface.c:706 +#: ../src/keybindings.c:382 +msgid "P_lugin Preferences" +msgstr "Plugin-_Einstellungen" + +#: ../src/interface.c:714 msgid "_Search" msgstr "_Suchen" -#: ../src/interface.c:623 +#: ../src/interface.c:725 msgid "Find _Next" msgstr "_Nächstes" -#: ../src/interface.c:627 +#: ../src/interface.c:729 msgid "Find _Previous" msgstr "_Vorheriges" -#: ../src/interface.c:631 +#: ../src/interface.c:733 msgid "Find in F_iles" msgstr "In _Dateien suchen" -#: ../src/interface.c:635 ../src/search.c:524 +#: ../src/interface.c:737 +#: ../src/search.c:524 msgid "_Replace" msgstr "_Ersetzen" -#: ../src/interface.c:648 +#: ../src/interface.c:750 msgid "Find _Selected" msgstr "Auswahl _finden" -#: ../src/interface.c:652 +#: ../src/interface.c:754 msgid "Find Pre_vious Selected" msgstr "Auswahl finden (_rückwärts)" -#: ../src/interface.c:661 +#: ../src/interface.c:763 msgid "Next _Message" msgstr "Nä_chste Nachricht" -#: ../src/interface.c:665 +#: ../src/interface.c:767 msgid "Pr_evious Message" msgstr "V_orherige Nachricht" -#: ../src/interface.c:674 ../src/interface.c:2131 +#: ../src/interface.c:776 +#: ../src/interface.c:2209 msgid "_Go to Line" msgstr "_Gehe zu Zeile" -#: ../src/interface.c:689 +#: ../src/interface.c:791 msgid "Change _Font" msgstr "_Schriftart ändern" -#: ../src/interface.c:702 +#: ../src/interface.c:804 msgid "To_ggle All Additional Widgets" msgstr "Zusätzliche _Infofenster ein-/ausblenden" -#: ../src/interface.c:706 +#: ../src/interface.c:808 msgid "Full_screen" msgstr "_Vollbild" -#: ../src/interface.c:710 +#: ../src/interface.c:812 msgid "Show Message _Window" msgstr "_Meldungsfenster anzeigen" -#: ../src/interface.c:715 +#: ../src/interface.c:817 msgid "Show _Toolbar" msgstr "W_erkzeugleiste anzeigen" -#: ../src/interface.c:720 +#: ../src/interface.c:822 msgid "Show Side_bar" msgstr "Seiten_leiste anzeigen" -#: ../src/interface.c:725 ../src/interface.c:3917 ../src/keybindings.c:252 +#: ../src/interface.c:827 +#: ../src/interface.c:3984 +#: ../src/keybindings.c:253 +#: ../src/prefs.c:1480 msgid "Editor" msgstr "Editor" -#: ../src/interface.c:732 +#: ../src/interface.c:834 msgid "Show _Markers Margin" msgstr "M_arkierungsrand anzeigen" -#: ../src/interface.c:737 +#: ../src/interface.c:839 msgid "Show _Line Numbers" msgstr "_Zeilennummern anzeigen" -#: ../src/interface.c:742 +#: ../src/interface.c:844 msgid "Show _White Space" msgstr "_Leerzeichen anzeigen" -#: ../src/interface.c:746 +#: ../src/interface.c:848 msgid "Show Line _Endings" msgstr "Zeile_nenden anzeigen" -#: ../src/interface.c:750 +#: ../src/interface.c:852 msgid "Show _Indentation Guides" msgstr "Zeige _Einrückungshinweise" -#: ../src/interface.c:771 +#: ../src/interface.c:873 msgid "_Document" msgstr "D_okument" -#: ../src/interface.c:778 +#: ../src/interface.c:880 msgid "_Line Wrapping" msgstr "_Visueller Zeilenumbruch" -#: ../src/interface.c:783 +#: ../src/interface.c:885 msgid "Line _Breaking" msgstr "Automatischer Zeilen_umbruch" -#: ../src/interface.c:787 +#: ../src/interface.c:889 msgid "_Auto-indentation" msgstr "_Automatische Einrückung benutzen" -#: ../src/interface.c:792 +#: ../src/interface.c:894 msgid "In_dent Type" msgstr "Art der _Einrückung" -#: ../src/interface.c:799 ../src/interface.c:3540 ../src/interface.c:5080 +#: ../src/interface.c:901 +#: ../src/interface.c:3607 +#: ../src/interface.c:5155 msgid "_Tabs" msgstr "_Tabulatoren" -#: ../src/interface.c:805 ../src/interface.c:3531 ../src/interface.c:5071 +#: ../src/interface.c:907 +#: ../src/interface.c:3598 +#: ../src/interface.c:5146 msgid "_Spaces" msgstr "_Leerzeichen" -#: ../src/interface.c:811 ../src/interface.c:3549 ../src/interface.c:5089 +#: ../src/interface.c:913 +#: ../src/interface.c:3616 +#: ../src/interface.c:5164 msgid "T_abs and Spaces" msgstr "Tabulatoren _und Leerzeichen" -#: ../src/interface.c:822 +#: ../src/interface.c:924 msgid "Read _Only" msgstr "_Nur Lesen" -#: ../src/interface.c:826 +#: ../src/interface.c:928 msgid "_Write Unicode BOM" msgstr "_Unicode BOM schreiben" -#: ../src/interface.c:835 +#: ../src/interface.c:937 msgid "Set File_type" msgstr "Datei_typ festlegen" -#: ../src/interface.c:845 +#: ../src/interface.c:947 msgid "Set _Encoding" msgstr "Ze_ichenkodierung festlegen" -#: ../src/interface.c:855 +#: ../src/interface.c:957 msgid "Set Line E_ndings" msgstr "Zeilenen_den festlegen" -#: ../src/interface.c:862 +#: ../src/interface.c:964 msgid "Convert and Set to _CR/LF (Win)" msgstr "Auf _CR/LF setzen und umwandeln (Win)" -#: ../src/interface.c:868 +#: ../src/interface.c:970 msgid "Convert and Set to _LF (Unix)" msgstr "Auf _LF setzen und umwandeln (Unix)" -#: ../src/interface.c:874 +#: ../src/interface.c:976 msgid "Convert and Set to CR (_Mac)" msgstr "Auf CR setzen und umwandeln (_Mac)" -#: ../src/interface.c:885 +#: ../src/interface.c:987 msgid "_Strip Trailing Spaces" msgstr "Lee_rzeichen am Zeilenende entfernen" -#: ../src/interface.c:889 +#: ../src/interface.c:991 msgid "_Replace Tabs by Spaces" msgstr "Tabulat_oren durch Leerzeichen ersetzen" -#: ../src/interface.c:893 +#: ../src/interface.c:995 msgid "Replace Spaces b_y Tabs" msgstr "_Leerzeichen durch Tabulatoren ersetzen" -#: ../src/interface.c:902 +#: ../src/interface.c:1004 msgid "_Fold All" msgstr "A_lle einklappen" -#: ../src/interface.c:906 +#: ../src/interface.c:1008 msgid "_Unfold All" msgstr "_Alle ausklappen" -#: ../src/interface.c:915 +#: ../src/interface.c:1017 msgid "Remove _Markers" msgstr "Alle _Markierungen entfernen" -#: ../src/interface.c:919 +#: ../src/interface.c:1021 msgid "Remove Error _Indicators" msgstr "Alle _Fehlermarkierungen entfernen" -#: ../src/interface.c:923 +#: ../src/interface.c:1025 msgid "_Project" msgstr "_Projekt" -#: ../src/interface.c:930 +#: ../src/interface.c:1032 msgid "_New" msgstr "_Neu" -#: ../src/interface.c:938 +#: ../src/interface.c:1040 msgid "_Open" msgstr "Ö_ffnen" -#: ../src/interface.c:946 +#: ../src/interface.c:1048 msgid "_Recent Projects" msgstr "_Zuletzt geöffnete Projekte" -#: ../src/interface.c:950 +#: ../src/interface.c:1052 msgid "_Close" msgstr "S_chließen" -#: ../src/interface.c:971 +#: ../src/interface.c:1073 msgid "_Tools" msgstr "_Werkzeuge" -#: ../src/interface.c:978 +#: ../src/interface.c:1080 msgid "_Reload Configuration" msgstr "_Einstellungen erneut laden" -#: ../src/interface.c:986 +#: ../src/interface.c:1088 msgid "C_onfiguration Files" msgstr "_Konfigurationsdateien" -#: ../src/interface.c:999 +#: ../src/interface.c:1101 msgid "_Color Chooser" msgstr "_Farb-Wähler" -#: ../src/interface.c:1007 +#: ../src/interface.c:1109 msgid "_Word Count" msgstr "_Wörter zählen" -#: ../src/interface.c:1011 +#: ../src/interface.c:1113 msgid "Load Ta_gs" msgstr "_Tags laden" -#: ../src/interface.c:1015 ../src/interface.c:1022 +#: ../src/interface.c:1117 +#: ../src/interface.c:1124 msgid "_Help" msgstr "_Hilfe" -#: ../src/interface.c:1030 +#: ../src/interface.c:1132 msgid "_Website" msgstr "_Webseite" -#: ../src/interface.c:1034 +#: ../src/interface.c:1136 msgid "_Keyboard Shortcuts" msgstr "_Tastenkürzel" -#: ../src/interface.c:1038 +#: ../src/interface.c:1140 msgid "_Debug Messages" msgstr "_Debug-Meldungen" -#: ../src/interface.c:1077 ../src/sidebar.c:121 +#: ../src/interface.c:1179 +#: ../src/sidebar.c:121 msgid "Symbols" msgstr "Symbole" -#: ../src/interface.c:1091 +#: ../src/interface.c:1193 msgid "Documents" msgstr "Dokumente" -#: ../src/interface.c:1127 +#: ../src/interface.c:1229 msgid "Status" msgstr "Status" -#: ../src/interface.c:1141 +#: ../src/interface.c:1243 msgid "Compiler" msgstr "Compiler" -#: ../src/interface.c:1156 +#: ../src/interface.c:1258 msgid "Messages" msgstr "Meldungen" -#: ../src/interface.c:1169 +#: ../src/interface.c:1271 msgid "Scribble" msgstr "Notizen" -#: ../src/interface.c:1731 ../src/interface.c:3286 +#: ../src/interface.c:1889 +#: ../src/interface.c:3353 msgid "Images _and Text" msgstr "Symbole _und Text" -#: ../src/interface.c:1736 ../src/interface.c:3318 +#: ../src/interface.c:1894 +#: ../src/interface.c:3385 msgid "_Images Only" msgstr "Nur _Symbole" -#: ../src/interface.c:1741 ../src/interface.c:3310 +#: ../src/interface.c:1899 +#: ../src/interface.c:3377 msgid "_Text Only" msgstr "Nur _Text" -#: ../src/interface.c:1752 ../src/interface.c:3302 +#: ../src/interface.c:1910 +#: ../src/interface.c:3369 msgid "_Large Icons" msgstr "_Große Symbole" -#: ../src/interface.c:1757 ../src/interface.c:3294 +#: ../src/interface.c:1915 +#: ../src/interface.c:3361 msgid "_Small Icons" msgstr "_Kleine Symbole" -#: ../src/interface.c:1762 ../src/interface.c:3326 +#: ../src/interface.c:1920 +#: ../src/interface.c:3393 msgid "_Very Small Icons" msgstr "_Sehr kleine Symbole" -#: ../src/interface.c:1773 +#: ../src/interface.c:1931 msgid "_Customize Toolbar" msgstr "_Werkzeugleiste anpassen" -#: ../src/interface.c:1781 +#: ../src/interface.c:1939 msgid "_Hide Toolbar" msgstr "Werkzeugleiste _verbergen" -#: ../src/interface.c:2098 +#: ../src/interface.c:2176 msgid "Find _Usage" msgstr "_Auftreten finden" -#: ../src/interface.c:2106 +#: ../src/interface.c:2184 msgid "Find _Document Usage" msgstr "_Auftreten im Dokument finden" -#: ../src/interface.c:2114 +#: ../src/interface.c:2192 msgid "Go to _Tag Definition" msgstr "Gehe zur _Tagdefinition" -#: ../src/interface.c:2118 +#: ../src/interface.c:2196 msgid "Go to T_ag Declaration" msgstr "Gehe zur T_agdeklaration" -#: ../src/interface.c:2122 +#: ../src/interface.c:2200 msgid "Conte_xt Action" msgstr "_Kontextaktion" -#: ../src/interface.c:2667 ../src/keybindings.c:359 +#: ../src/interface.c:2713 +#: ../src/keybindings.c:379 msgid "Preferences" msgstr "Einstellungen" -#: ../src/interface.c:2703 +#: ../src/interface.c:2749 msgid "Load files from the last session" msgstr "Dateien aus der letzten Sitzung laden" -#: ../src/interface.c:2706 +#: ../src/interface.c:2752 msgid "Opens at startup the files from the last session" msgstr "Lädt die geöffneten Dateien aus der letzten Sitzung" -#: ../src/interface.c:2708 +#: ../src/interface.c:2754 msgid "Load virtual terminal support" msgstr "Die Virtual Terminal Emulation (VTE) laden" -#: ../src/interface.c:2710 -msgid "" -"Whether the virtual terminal emulation (VTE) should be loaded at startup, " -"disable it if you do not need it" -msgstr "" -"Stellt ein, ob die Virtual Terminal Emulation beim Starten geladen werden " -"soll oder nicht. Wenn sie nicht benötigt wird, sollte diese Option " -"deaktiviert werden." +#: ../src/interface.c:2756 +msgid "Whether the virtual terminal emulation (VTE) should be loaded at startup, disable it if you do not need it" +msgstr "Stellt ein, ob die Virtual Terminal Emulation beim Starten geladen werden soll oder nicht. Wenn sie nicht benötigt wird, sollte diese Option deaktiviert werden." -#: ../src/interface.c:2712 +#: ../src/interface.c:2758 msgid "Enable plugin support" msgstr "Plugins aktivieren" -#: ../src/interface.c:2716 +#: ../src/interface.c:2762 msgid "Startup" msgstr "Starten" -#: ../src/interface.c:2735 +#: ../src/interface.c:2781 msgid "Save window position and geometry" msgstr "Fensterposition und -größe speichern" -#: ../src/interface.c:2738 +#: ../src/interface.c:2784 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." +msgstr "Speichert die Fensterposition und die Fenstergröße und stellt sie beim nächsten Start wieder her." -#: ../src/interface.c:2740 +#: ../src/interface.c:2786 msgid "Confirm exit" msgstr "Beenden bestätigen" -#: ../src/interface.c:2743 +#: ../src/interface.c:2789 msgid "Shows a confirmation dialog on exit" msgstr "Zeigt einen Bestätigungsdialog vor dem Beenden" -#: ../src/interface.c:2745 +#: ../src/interface.c:2791 msgid "Shutdown" msgstr "Beenden " -#: ../src/interface.c:2766 +#: ../src/interface.c:2812 msgid "Startup path:" msgstr "Startpfad:" -#: ../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." -msgstr "" -"Startpfad, wenn Dateien geöffnet oder gespeichert werden sollen. Der Pfad " -"muss absolut sein. Um das aktuelle Arbeitsverzeichnis zu benutzen, lassen " -"Sie das Feld leer." +#: ../src/interface.c:2824 +msgid "Path to start in when opening or saving files. Must be an absolute path. Leave blank to use the current working directory." +msgstr "Startpfad, wenn Dateien geöffnet oder gespeichert werden sollen. Der Pfad muss absolut sein. Um das aktuelle Arbeitsverzeichnis zu benutzen, lassen Sie das Feld leer." -#: ../src/interface.c:2791 +#: ../src/interface.c:2837 msgid "Project files:" msgstr "Projektdateien:" -#: ../src/interface.c:2803 +#: ../src/interface.c:2849 msgid "Path to start in when opening project files" msgstr "Pfad zum Öffnen von Projektdateien" -#: ../src/interface.c:2816 +#: ../src/interface.c:2862 msgid "Extra plugin path:" msgstr "Zusätzlicher Pluginpfad" -#: ../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 " -"for plugins. Leave blank to disable." -msgstr "" -"Geany schaut standardmäßig im Installationsverzeichnis und im " -"Konfigurationsverzeichnis nach Plugins. Ein Pfad, der hier eingegeben wird, " -"wird zusätzlich bei der Suche nach Plugins berücksichtigt. Das Feld wird " -"ignoriert, falls es leer ist." +#: ../src/interface.c:2874 +msgid "Geany looks by default in the global installation path and in the configuration directory. The path entered here will be searched additionally for plugins. Leave blank to disable." +msgstr "Geany schaut standardmäßig im Installationsverzeichnis und im Konfigurationsverzeichnis nach Plugins. Ein Pfad, der hier eingegeben wird, wird zusätzlich bei der Suche nach Plugins berücksichtigt. Das Feld wird ignoriert, falls es leer ist." -#: ../src/interface.c:2841 +#: ../src/interface.c:2887 msgid "Paths" msgstr "Pfade" -#: ../src/interface.c:2846 +#: ../src/interface.c:2892 msgid "Startup" msgstr "Starten & Beenden" -#: ../src/interface.c:2868 +#: ../src/interface.c:2914 msgid "Beep on errors or when compilation has finished" msgstr "Bei Fehlern oder beendeter Kompilierung Piepton ausgeben" -#: ../src/interface.c:2871 -msgid "" -"Whether to beep if an error occurred or when the compilation process has " -"finished" -msgstr "" -"Legt fest, ob bei einem Fehler oder bei beendeter Kompilierung ein Piepton " -"ausgegeben werden soll" +#: ../src/interface.c:2917 +msgid "Whether to beep if an error occurred or when the compilation process has finished" +msgstr "Legt fest, ob bei einem Fehler oder bei beendeter Kompilierung ein Piepton ausgegeben werden soll" -#: ../src/interface.c:2873 +#: ../src/interface.c:2919 msgid "Switch to status message list at new message" msgstr "Bei neuen Meldungen zu den Statusmeldungen wechseln" -#: ../src/interface.c:2876 -msgid "" -"Switch to the status message tab (in the notebook window at the bottom) if a " -"new status message arrives" -msgstr "" -"Wechselt automatisch zu dem Reiter mit den Statusmeldungen im Infobereich, " -"wenn eine neue Statusmeldung vorliegt" +#: ../src/interface.c:2922 +msgid "Switch to the status message tab (in the notebook window at the bottom) if a new status message arrives" +msgstr "Wechselt automatisch zu dem Reiter mit den Statusmeldungen im Infobereich, wenn eine neue Statusmeldung vorliegt" -#: ../src/interface.c:2878 +#: ../src/interface.c:2924 msgid "Suppress status messages in the status bar" msgstr "Statusmeldungen in der Statuszeile unterdrücken" -#: ../src/interface.c:2881 -msgid "" -"Removes all messages from the status bar. The messages are still displayed " -"in the status messages window." -msgstr "" -"Entfernt alle Nachrichten aus der Statuszeile. Die Nachrichten sind " -"weiterhin über den »Status«-Reiter im Infobereich abrufbar." +#: ../src/interface.c:2927 +msgid "Removes all messages from the status bar. The messages are still displayed in the status messages window." +msgstr "Entfernt alle Nachrichten aus der Statuszeile. Die Nachrichten sind weiterhin über den »Status«-Reiter im Infobereich abrufbar." -#: ../src/interface.c:2883 +#: ../src/interface.c:2929 msgid "Auto-focus widgets (focus follows mouse)" msgstr "Autofokus (Der Fokus folgt der Maus)" -#: ../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 " -"fields and the VTE." -msgstr "" -"Wenn diese Option aktiviert ist, gibt Geany dem Fenster den Fokus, über dem " -"sich im Moment der Zeiger der Maus befindet. Diese Option funktioniert für " -"das Hauptfenster, das Notizbuch, den Such- und Springe-zu-Feldern in der " -"Werkzeugliste sowie für das integrierte Terminal." +#: ../src/interface.c:2932 +msgid "Gives the focus automatically to widgets below the mouse cursor. Works for the main editor widget, the scribble, the toolbar search and goto line fields and the VTE." +msgstr "Wenn diese Option aktiviert ist, gibt Geany dem Fenster den Fokus, über dem sich im Moment der Zeiger der Maus befindet. Diese Option funktioniert für das Hauptfenster, das Notizbuch, den Such- und Springe-zu-Feldern in der Werkzeugliste sowie für das integrierte Terminal." -#: ../src/interface.c:2888 ../src/interface.c:3214 ../src/interface.c:4126 +#: ../src/interface.c:2934 +#: ../src/interface.c:3281 +#: ../src/interface.c:4189 msgid "Miscellaneous" msgstr "Sonstiges" -#: ../src/interface.c:2908 +#: ../src/interface.c:2954 msgid "Always wrap search and hide the Find dialog" msgstr "Das vollständige Dokument durchsuchen und den Suchen-Dialog schließen" -#: ../src/interface.c:2911 -msgid "" -"Always wrap search around the document and hide the Find dialog after " -"clicking Find Next/Previous" -msgstr "" -"Immer das vollständige Dokument durchsuchen und den Suchen-Dialog nach " -"Klicken auf Nächstes/Vorheriges schließen" +#: ../src/interface.c:2957 +msgid "Always wrap search around the document and hide the Find dialog after clicking Find Next/Previous" +msgstr "Immer das vollständige Dokument durchsuchen und den Suchen-Dialog nach Klicken auf Nächstes/Vorheriges schließen" -#: ../src/interface.c:2913 +#: ../src/interface.c:2959 msgid "Use the current word under the cursor for Find dialogs" msgstr "Aktuelle Cursorposition zur Suche heranziehen" -#: ../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:2962 +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:2918 +#: ../src/interface.c:2964 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:2922 +#: ../src/interface.c:2968 msgid "Search" msgstr "Suche" -#: ../src/interface.c:2941 +#: ../src/interface.c:2987 msgid "Use project-based session files" msgstr "Sitzung im Projekt speichern und wieder öffnen" -#: ../src/interface.c:2944 -msgid "" -"Whether to store a project's session files and open them when re-opening the " -"project" -msgstr "" -"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:2990 +msgid "Whether to store a project's session files and open them when re-opening the project" +msgstr "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:2946 +#: ../src/interface.c:2992 msgid "Store project file inside the project base directory" msgstr "Projektdatei innerhalb des Projektbasisverzeichnis erstellen" -#: ../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 " -"directory. You can still change the path of the project file in the New " -"Project dialog." -msgstr "" -"Wenn diese Option eingeschaltet ist, wird beim Erzeugen eines neuen Projekts " -"die Projektdatei standardmäßig innerhalb des Basisverzeichnis des Projekts " -"angelegt, ansonsten wird die Datei ein Verzeichnis über dem Basisverzeichnis " -"angelegt. Der Pfad kann im »Neues Projekt«-Dialog geändert werden." +#: ../src/interface.c:2995 +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 directory. You can still change the path of the project file in the New Project dialog." +msgstr "Wenn diese Option eingeschaltet ist, wird beim Erzeugen eines neuen Projekts die Projektdatei standardmäßig innerhalb des Basisverzeichnis des Projekts angelegt, ansonsten wird die Datei ein Verzeichnis über dem Basisverzeichnis angelegt. Der Pfad kann im »Neues Projekt«-Dialog geändert werden." -#: ../src/interface.c:2951 +#: ../src/interface.c:2997 msgid "Projects" msgstr "Projekte" -#: ../src/interface.c:2956 +#: ../src/interface.c:3002 msgid "Miscellaneous" msgstr "Sonstiges" -#: ../src/interface.c:2960 +#. TODO Find a better way to map the current notebook page to the +#. * corresponding chapter in the documentation, comparing translatable +#. * strings is easy to break. Maybe attach an identifying string to the +#. * tab label object. +#: ../src/interface.c:3006 +#: ../src/prefs.c:1474 msgid "General" msgstr "Allgemein" -#: ../src/interface.c:2983 +#: ../src/interface.c:3029 msgid "Show symbol list" msgstr "Symbolliste anzeigen" -#: ../src/interface.c:2986 +#: ../src/interface.c:3032 msgid "Toggle the symbol list on and off" msgstr "Blendet die Symbolliste ein und aus" -#: ../src/interface.c:2988 +#: ../src/interface.c:3034 msgid "Show documents list" msgstr "Dokumentenliste anzeigen" -#: ../src/interface.c:2991 +#: ../src/interface.c:3037 msgid "Toggle the documents list on and off" msgstr "Blendet die Dokumentenliste ein und aus" -#: ../src/interface.c:2993 +#: ../src/interface.c:3043 +msgid "Position:" +msgstr "Position:" + +#: ../src/interface.c:3047 +#: ../src/interface.c:3162 +#: ../src/interface.c:3216 +#: ../src/interface.c:3234 +#: ../src/interface.c:3252 +msgid "Left" +msgstr "Links" + +#: ../src/interface.c:3054 +#: ../src/interface.c:3170 +#: ../src/interface.c:3217 +#: ../src/interface.c:3235 +#: ../src/interface.c:3253 +msgid "Right" +msgstr "Rechts" + +#: ../src/interface.c:3060 msgid "Sidebar" msgstr "Seitenleiste" -#: ../src/interface.c:3014 +#: ../src/interface.c:3081 msgid "Symbol list:" msgstr "Symbolliste:" -#: ../src/interface.c:3021 ../src/interface.c:3136 +#: ../src/interface.c:3088 +#: ../src/interface.c:3203 msgid "Message window:" msgstr "Meldungsfenster:" -#: ../src/interface.c:3028 ../src/interface.c:3172 +#: ../src/interface.c:3095 +#: ../src/interface.c:3239 msgid "Editor:" msgstr "Editor:" -#: ../src/interface.c:3040 +#: ../src/interface.c:3107 msgid "Sets the font for the message window" msgstr "Ändert die Schriftart für das Meldungsfenster im Infobereich" -#: ../src/interface.c:3048 +#: ../src/interface.c:3115 msgid "Sets the font for the symbol list" msgstr "Legt die Schriftart für die Symbolliste fest" -#: ../src/interface.c:3056 +#: ../src/interface.c:3123 msgid "Sets the editor font" msgstr "Legt die Schriftart für das Editorfenster fest" -#: ../src/interface.c:3058 +#: ../src/interface.c:3125 msgid "Fonts" msgstr "Schriftarten" -#: ../src/interface.c:3077 +#: ../src/interface.c:3144 msgid "Show editor tabs" msgstr "Zeige Dateireiter für geöffnete Dateien" -#: ../src/interface.c:3081 +#: ../src/interface.c:3148 msgid "Show close buttons" msgstr "»Schließen«-Schaltflächen anzeigen" -#: ../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)" -msgstr "" -"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:3151 +msgid "Shows a small cross button in the file tabs to easily close files when clicking on it (requires restart of Geany)" +msgstr "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:3090 +#: ../src/interface.c:3157 msgid "Placement of new file tabs:" msgstr "Platzierung neuer Dateireiter:" -#: ../src/interface.c:3095 ../src/interface.c:3149 ../src/interface.c:3167 -#: ../src/interface.c:3185 -msgid "Left" -msgstr "Links" - -#: ../src/interface.c:3098 +#: ../src/interface.c:3165 msgid "File tabs will be placed on the left of the notebook" msgstr "Neue Dateireiter werden links von der Dateiliste platziert" -#: ../src/interface.c:3103 ../src/interface.c:3150 ../src/interface.c:3168 -#: ../src/interface.c:3186 -msgid "Right" -msgstr "Rechts" - -#: ../src/interface.c:3106 +#: ../src/interface.c:3173 msgid "File tabs will be placed on the right of the notebook" msgstr "Neue Dateireiter werden rechts von der Dateiliste platziert" -#: ../src/interface.c:3110 +#: ../src/interface.c:3177 msgid "Double-clicking hides all additional widgets" -msgstr "" -"Doppelklick versteckt die zusätzlichen Unterfenster und zeigt nur den Editor " -"an" +msgstr "Doppelklick versteckt die zusätzlichen Unterfenster und zeigt nur den Editor an" -#: ../src/interface.c:3113 +#: ../src/interface.c:3180 msgid "Calls the View->Toggle All Additional Widgets command" msgstr "Zusätzliche Infofenster ein-/ausblenden" -#: ../src/interface.c:3115 +#: ../src/interface.c:3182 msgid "Editor tabs" msgstr "Dateireiter" -#: ../src/interface.c:3151 ../src/interface.c:3169 ../src/interface.c:3187 +#: ../src/interface.c:3218 +#: ../src/interface.c:3236 +#: ../src/interface.c:3254 msgid "Top" msgstr "Oben" -#: ../src/interface.c:3152 ../src/interface.c:3170 ../src/interface.c:3188 +#: ../src/interface.c:3219 +#: ../src/interface.c:3237 +#: ../src/interface.c:3255 msgid "Bottom" msgstr "Unten" -#: ../src/interface.c:3154 +#: ../src/interface.c:3221 msgid "Sidebar:" msgstr "Seitenleiste:" -#: ../src/interface.c:3190 +#: ../src/interface.c:3257 msgid "Tab positions" msgstr "Reiterposition" -#: ../src/interface.c:3209 +#: ../src/interface.c:3276 msgid "Show status bar" msgstr "Statusleiste anzeigen" -#: ../src/interface.c:3212 +#: ../src/interface.c:3279 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" +msgstr "Legt fest, ob die Statuszeile an der unteren Seite des Fensters angezeigt werden soll oder nicht" -#: ../src/interface.c:3219 +#: ../src/interface.c:3286 +#: ../src/prefs.c:1476 msgid "Interface" msgstr "Schnittstelle" -#: ../src/interface.c:3242 +#: ../src/interface.c:3309 msgid "Show T_oolbar" msgstr "Werkzeugleiste _anzeigen" -#: ../src/interface.c:3246 +#: ../src/interface.c:3313 msgid "_Append Toolbar to the Menu" msgstr "_Werkzeugliste direkt an das Menü anfügen" -#: ../src/interface.c:3249 +#: ../src/interface.c:3316 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." +msgstr "Die Werkzeugliste direkt hinter dem Hauptmenü platzieren um etwas vertikalen Platz zu sparen." -#: ../src/interface.c:3251 +#: ../src/interface.c:3318 msgid "Toolbar" msgstr "Werkzeugleiste" -#: ../src/interface.c:3272 +#: ../src/interface.c:3339 msgid "Icon style:" msgstr "Symbolstil:" -#: ../src/interface.c:3279 +#: ../src/interface.c:3346 msgid "Icon size:" msgstr "Symbolgröße:" -#: ../src/interface.c:3334 +#: ../src/interface.c:3401 msgid "Appearance" msgstr "Aussehen" -#: ../src/interface.c:3359 ../src/toolbar.c:882 +#: ../src/interface.c:3426 +#: ../src/toolbar.c:893 msgid "Customize Toolbar" msgstr "Werkzeugleiste anpassen" -#: ../src/interface.c:3363 +#: ../src/interface.c:3430 +#: ../src/prefs.c:1478 msgid "Toolbar" msgstr "Werkzeugleiste" -#: ../src/interface.c:3390 +#: ../src/interface.c:3457 msgid "Line wrapping" msgstr "Visueller Zeilenumbruch" -#: ../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 " -"disabled on slow machines." -msgstr "" -"Bricht lange Zeilen am Fensterrand um und setzt sie auf der nächsten Zeile " -"fort. Achtung: Bei großen Dokumenten erfordert der Zeilenumbruch viel " -"Rechenleistung und sollte daher auf langsameren Rechnern deaktiviert werden." +#: ../src/interface.c:3460 +msgid "Wrap the line at the window border and continue it on the next line. Note: line wrapping has a high performance cost for large documents so should be disabled on slow machines." +msgstr "Bricht lange Zeilen am Fensterrand um und setzt sie auf der nächsten Zeile fort. Achtung: Bei großen Dokumenten erfordert der Zeilenumbruch viel Rechenleistung und sollte daher auf langsameren Rechnern deaktiviert werden." -#: ../src/interface.c:3395 +#: ../src/interface.c:3462 msgid "Enable \"smart\" home key" msgstr "»Intelligente« Pos1-Taste (Home) aktivieren" -#: ../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 " -"to the very beginning of the line. When this feature is disabled, the HOME " -"key always moves the caret to the start of the current line, regardless of " -"its current position." -msgstr "" -"Wenn die intelligente Pos1-Taste (Home) aktiviert ist, springt der Cursor " -"bei Tastendruck zum ersten Zeichen der Zeile. Sollte er sich bereits dort " -"befinden, springt er zum Beginn der Zeile. Wenn diese Option nicht aktiviert " -"ist, springt der Cursor immer zum Beginn der Zeile ohne auf die aktuelle " -"Position Rücksicht zu nehmen." +#: ../src/interface.c:3465 +msgid "When \"smart\" home is enabled, the HOME key will move the caret to the first non-blank character of the line, unless it is already there, it moves to the very beginning of the line. When this feature is disabled, the HOME key always moves the caret to the start of the current line, regardless of its current position." +msgstr "Wenn die intelligente Pos1-Taste (Home) aktiviert ist, springt der Cursor bei Tastendruck zum ersten Zeichen der Zeile. Sollte er sich bereits dort befinden, springt er zum Beginn der Zeile. Wenn diese Option nicht aktiviert ist, springt der Cursor immer zum Beginn der Zeile ohne auf die aktuelle Position Rücksicht zu nehmen." -#: ../src/interface.c:3400 +#: ../src/interface.c:3467 msgid "Disable Drag and Drop" msgstr "Drag and Drop deaktivieren" -#: ../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" -msgstr "" -"Deaktiviert Drag and Drop für das Editorfenster. Dies verhindert, dass " -"markierter Text mit der Maus verschoben werden kann." +#: ../src/interface.c:3470 +msgid "Disable drag and drop completely in the editor window so you can't drag and drop any selections within or outside of the editor window" +msgstr "Deaktiviert Drag and Drop für das Editorfenster. Dies verhindert, dass markierter Text mit der Maus verschoben werden kann." -#: ../src/interface.c:3405 +#: ../src/interface.c:3472 msgid "Enable folding" msgstr "Quelltext-Ausblendung aktivieren" -#: ../src/interface.c:3408 +#: ../src/interface.c:3475 msgid "Whether to enable folding the code" msgstr "Legt fest, ob es möglich sein soll, Teile des Quelltextes auszublenden" -#: ../src/interface.c:3410 +#: ../src/interface.c:3477 msgid "Fold/unfold all children of a fold point" msgstr "Alle untergeordneten Quelltextblöcke ein/ausklappen" -#: ../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." -msgstr "" -"Ein- oder Ausklappen aller Unterpunkte eines Quelltextabschnittes. Bei " -"gedrückt halten der Umschalttaste wird das Gegenteil gemacht, wenn auf das " -"Symbol geklickt wird." +#: ../src/interface.c:3480 +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." +msgstr "Ein- oder Ausklappen aller Unterpunkte eines Quelltextabschnittes. Bei gedrückt halten der Umschalttaste wird das Gegenteil gemacht, wenn auf das Symbol geklickt wird." -#: ../src/interface.c:3415 +#: ../src/interface.c:3482 msgid "Use indicators to show compile errors" msgstr "Benutzt Markierungen, um Probleme beim Kompilieren anzuzeigen" -#: ../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" -msgstr "" -"Legt fest, ob Markierungen (gewellte Unterstreichungen) benutzt werden " -"sollen, um Zeilen mit Fehlern beim Kompiliervorgang zu markieren" +#: ../src/interface.c:3485 +msgid "Whether to use indicators (a squiggly underline) to highlight the lines where the compiler found a warning or an error" +msgstr "Legt fest, ob Markierungen (gewellte Unterstreichungen) benutzt werden sollen, um Zeilen mit Fehlern beim Kompiliervorgang zu markieren" -#: ../src/interface.c:3420 +#: ../src/interface.c:3487 msgid "Newline strips trailing spaces" msgstr "Neue Zeile entfernt Leerzeichen am Zeilenende" -#: ../src/interface.c:3423 +#: ../src/interface.c:3490 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" +msgstr "Legt fest, ob unnötige Leerzeichen am Ende einer Zeile automatisch beim Wechseln in eine neue Zeile entfernt werden sollen" -#: ../src/interface.c:3429 +#: ../src/interface.c:3496 msgid "Line breaking column:" msgstr "Spalte für automatischen Zeilenumbruch:" # TODO woah, hier muss noch was anderes her :D -#: ../src/interface.c:3443 +#: ../src/interface.c:3510 msgid "Comment toggle marker:" msgstr "Kommentarumschaltzeichen:" -#: ../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." -msgstr "" -"Eine Zeichenkette, welche bei einem Zeilenkommentar benutzt wird um den " -"Kommentar zu markieren, der per Tastenkombination ein- oder ausgeschaltet " -"werden kann." +#: ../src/interface.c:3517 +msgid "A string which is added when toggling a line comment in a source file, it is used to mark the comment as toggled." +msgstr "Eine Zeichenkette, welche bei einem Zeilenkommentar benutzt wird um den Kommentar zu markieren, der per Tastenkombination ein- oder ausgeschaltet werden kann." -#: ../src/interface.c:3452 +#: ../src/interface.c:3519 msgid "Features" msgstr "Funktionen" -#: ../src/interface.c:3457 +#: ../src/interface.c:3524 msgid "Features" msgstr "Funktionen" -#: ../src/interface.c:3489 ../src/interface.c:5029 +#: ../src/interface.c:3556 +#: ../src/interface.c:5104 msgid "Auto-indent mode:" msgstr "Modus für automatische Einrückung:" -#: ../src/interface.c:3502 ../src/interface.c:5042 +#: ../src/interface.c:3569 +#: ../src/interface.c:5117 msgid "Basic" msgstr "Einfach" -#: ../src/interface.c:3503 ../src/interface.c:5043 +#: ../src/interface.c:3570 +#: ../src/interface.c:5118 msgid "Current chars" msgstr "Aktuelle Zeichenkette" -#: ../src/interface.c:3504 ../src/interface.c:5044 +#: ../src/interface.c:3571 +#: ../src/interface.c:5119 msgid "Match braces" msgstr "Übereinstimmende Klammerung" -#: ../src/interface.c:3506 ../src/interface.c:3857 ../src/interface.c:5046 +#: ../src/interface.c:3573 +#: ../src/interface.c:3924 +#: ../src/interface.c:5121 msgid "Type:" msgstr "Typ:" -#: ../src/interface.c:3513 ../src/interface.c:5053 +#: ../src/interface.c:3580 +#: ../src/interface.c:5128 msgid "Width:" msgstr "Breite:" -#: ../src/interface.c:3526 ../src/interface.c:5066 +#: ../src/interface.c:3593 +#: ../src/interface.c:5141 msgid "The width in chars of a single indent" msgstr "Die Breite einer Einrückung in Zeichen" -#: ../src/interface.c:3536 ../src/interface.c:5076 +#: ../src/interface.c:3603 +#: ../src/interface.c:5151 msgid "Use spaces when inserting indentation" msgstr "Benutze Leerzeichen zum Einrücken" -#: ../src/interface.c:3545 ../src/interface.c:5085 +#: ../src/interface.c:3612 +#: ../src/interface.c:5160 msgid "Use one tab per indent" msgstr "Ein Tabulator pro Einzug" -#: ../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:3621 +#: ../src/interface.c:5169 +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:3569 ../src/interface.c:5109 +#: ../src/interface.c:3636 +#: ../src/interface.c:5191 msgid "Hard tab width:" msgstr "Tabulatorenbreite:" -#: ../src/interface.c:3577 ../src/interface.c:5117 +#: ../src/interface.c:3644 +#: ../src/interface.c:5199 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" +msgstr "Die Breite eines Tabulators, wenn »Tabulatoren & Leerzeichen« für das Dokument ausgewählt ist" -#: ../src/interface.c:3587 ../src/interface.c:5127 -msgid "" -"Whether to detect the indentation type from file contents when a file is " -"opened" -msgstr "" -"Wenn diese Option aktiviert ist, versucht Geany den Typ der Einrückung " -"(Tabulatoren oder Leerzeichen) automatisch aus der geöffneten Datei zu " -"bestimmen" +#: ../src/interface.c:3654 +#: ../src/interface.c:5178 +msgid "Whether to detect the indentation type from file contents when a file is opened" +msgstr "Wenn diese Option aktiviert ist, versucht Geany den Typ der Einrückung (Tabulatoren oder Leerzeichen) automatisch aus der geöffneten Datei zu bestimmen" -#: ../src/interface.c:3589 +#: ../src/interface.c:3656 msgid "Tab key indents" msgstr "Einrücken mit der Tabulatortaste" -#: ../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:3659 +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:3594 +#: ../src/interface.c:3661 msgid "Indentation" msgstr "Einrückung" -#: ../src/interface.c:3599 ../src/interface.c:5129 +#: ../src/interface.c:3666 +#: ../src/interface.c:5204 msgid "Indentation" msgstr "Einrückung" -#: ../src/interface.c:3622 +#: ../src/interface.c:3689 msgid "Snippet completion" msgstr "Vervollständigung von (Code-)Schnipseln" -#: ../src/interface.c:3625 -msgid "" -"Type a defined short character sequence and complete it to a more complex " -"string using a single keypress" -msgstr "" -"Mittels eines Tastenkürzels kann ein kurzer (Code-)Schnipsel zu einem " -"komplexeren Text erweitert werden" +#: ../src/interface.c:3692 +msgid "Type a defined short character sequence and complete it to a more complex string using a single keypress" +msgstr "Mittels eines Tastenkürzels kann ein kurzer (Code-)Schnipsel zu einem komplexeren Text erweitert werden" -#: ../src/interface.c:3627 +#: ../src/interface.c:3694 msgid "XML tag autocompletion" msgstr "XML-Tag Autovervollständigung" -#: ../src/interface.c:3630 +#: ../src/interface.c:3697 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:3632 +#: ../src/interface.c:3699 msgid "Automatic continuation of multi-line comments" msgstr "Automatisches Weiterführen von mehrzeiligen Kommentaren" -#: ../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" -msgstr "" -"Verlängert die Kommentarzeilen in den Sprachen C, C++ und Java, wenn eine " -"neue Zeile innerhalb eines Kommentars hinzugefügt wird." +#: ../src/interface.c:3702 +msgid "Continue automatically multi-line comments in languages like C, C++ and Java when a new line is entered inside such a comment" +msgstr "Verlängert die Kommentarzeilen in den Sprachen C, C++ und Java, wenn eine neue Zeile innerhalb eines Kommentars hinzugefügt wird." -#: ../src/interface.c:3637 +#: ../src/interface.c:3704 msgid "Autocomplete symbols" msgstr "Autovervollständigung von Symbolen" -#: ../src/interface.c:3640 -msgid "" -"Automatic completion of known symbols in open files (function names, global " -"variables, ...)" -msgstr "" -"Automatische Vervollständigung von bekannten Variablen und Funktionsnamen " -"aus den geöffneten Dateien" +#: ../src/interface.c:3707 +msgid "Automatic completion of known symbols in open files (function names, global variables, ...)" +msgstr "Automatische Vervollständigung von bekannten Variablen und Funktionsnamen aus den geöffneten Dateien" -#: ../src/interface.c:3642 +#: ../src/interface.c:3709 msgid "Autocomplete all words in document" msgstr "Autovervollständigung aller Wörter im Dokument" -#: ../src/interface.c:3646 +#: ../src/interface.c:3713 msgid "Drop rest of word on completion" msgstr "Bei Vervollständigung den Rest des Wortes ersetzen." -#: ../src/interface.c:3656 +#: ../src/interface.c:3723 msgid "Max. symbol name suggestions:" msgstr "Max. Vorschläge der Symbolvervollständigung:" -#: ../src/interface.c:3663 +#: ../src/interface.c:3730 msgid "Completion list height:" msgstr "Höhe der Vervollständigungsliste:" -#: ../src/interface.c:3670 +#: ../src/interface.c:3737 msgid "Characters to type for autocompletion:" msgstr "Zu tippende Zeichen für die Vervollständigung:" -#: ../src/interface.c:3683 -msgid "" -"The amount of characters which are necessary to show the symbol " -"autocompletion list" +#: ../src/interface.c:3750 +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:3692 +#: ../src/interface.c:3759 msgid "Display height in rows for the autocompletion list" msgstr "Höhe der Liste in Zeilen" -#: ../src/interface.c:3701 +#: ../src/interface.c:3768 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" +msgstr "Anzahl der Elemente, die maximal angezeigt werden sollen, wenn die Liste angezeigt wird" -#: ../src/interface.c:3704 +#: ../src/interface.c:3771 msgid "Completions" msgstr "Vervollständigungen" -#: ../src/interface.c:3724 +#: ../src/interface.c:3791 msgid "Parenthesis ( )" msgstr "Klammern ( )" -#: ../src/interface.c:3729 +#: ../src/interface.c:3796 msgid "Auto-close parenthesis when typing an opening one" msgstr "Automatisches Schließen der Klammern beim Tippen der öffnenden Klammer" -#: ../src/interface.c:3731 +#: ../src/interface.c:3798 msgid "Single quotes ' '" msgstr "Einfache Anführungs-/Schlusszeichen" -#: ../src/interface.c:3736 +#: ../src/interface.c:3803 msgid "Auto-close simple quote when typing an opening one" -msgstr "" -"Automatisches Setzen der schließenden Anführungsstriche beim Tippen der " -"öffnenden" +msgstr "Automatisches Setzen der schließenden Anführungsstriche beim Tippen der öffnenden" -#: ../src/interface.c:3738 +#: ../src/interface.c:3805 msgid "Curly brackets { }" msgstr "Geschweifte Klammern {}" -#: ../src/interface.c:3743 +#: ../src/interface.c:3810 msgid "Auto-close curly bracket when typing an opening one" msgstr "Automatisches Schließen der Klammern beim Tippen der öffnenden Klammer" -#: ../src/interface.c:3745 +#: ../src/interface.c:3812 msgid "Square brackets [ ]" msgstr "Eckige Klammern [ ]" -#: ../src/interface.c:3750 +#: ../src/interface.c:3817 msgid "Auto-close square-bracket when typing an opening one" -msgstr "" -"Automatisches Schließen von eckigen Klammern beim Tippen der öffnenden " -"Klammer" +msgstr "Automatisches Schließen von eckigen Klammern beim Tippen der öffnenden Klammer" -#: ../src/interface.c:3752 +#: ../src/interface.c:3819 msgid "Double quotes \" \"" msgstr "Doppelte Anführungs-/Schlusszeichen" -#: ../src/interface.c:3757 +#: ../src/interface.c:3824 msgid "Auto-close double quote when typing an opening one" -msgstr "" -"Automatisches Setzen der schließenden Anführungsstriche beim Tippen der " -"öffnenden" +msgstr "Automatisches Setzen der schließenden Anführungsstriche beim Tippen der öffnenden" -#: ../src/interface.c:3759 +#: ../src/interface.c:3826 msgid "Auto-close quotes and brackets" msgstr "Automatisches Schließen von Klammern und Anführungszeichen" -#: ../src/interface.c:3764 +#: ../src/interface.c:3831 msgid "Completions" msgstr "Vervollständigungen" -#: ../src/interface.c:3787 +#: ../src/interface.c:3854 msgid "Invert syntax highlighting colors" msgstr "Invertiere Syntaxhervorhebungen" -#: ../src/interface.c:3790 +#: ../src/interface.c:3857 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." +msgstr "Vertauscht die Farben für die Anzeige. Im Standard wird weißer Text auf einem schwarzen Hintergrund genutzt." -#: ../src/interface.c:3792 +#: ../src/interface.c:3859 msgid "Show indentation guides" msgstr "Zeige Einrückungshinweise" -#: ../src/interface.c:3795 +#: ../src/interface.c:3862 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" +msgstr "Blendet gepunktete Linien ein, um die richtige Einrückung zu erleichtern" -#: ../src/interface.c:3797 +#: ../src/interface.c:3864 msgid "Show white space" msgstr "Zeige Leerzeichen" -#: ../src/interface.c:3800 +#: ../src/interface.c:3867 msgid "Marks spaces with dots and tabs with arrows" msgstr "Markiert Leerzeichen mit Punkten und Tabulatoren mit kleinen Pfeilen" -#: ../src/interface.c:3802 +#: ../src/interface.c:3869 msgid "Show line endings" msgstr "Zeige Zeilenenden" -#: ../src/interface.c:3805 +#: ../src/interface.c:3872 msgid "Shows the line ending character" msgstr "Macht Zeilenenden mit einem Sonderzeichen sichtbar" -#: ../src/interface.c:3807 +#: ../src/interface.c:3874 msgid "Show line numbers" msgstr "Zeilennummern anzeigen" -#: ../src/interface.c:3810 +#: ../src/interface.c:3877 msgid "Shows or hides the Line Number margin" msgstr "Zeigt oder versteckt den Rand mit den Zeilennummern" -#: ../src/interface.c:3812 +#: ../src/interface.c:3879 msgid "Show markers margin" msgstr "Markierungsrand anzeigen" -#: ../src/interface.c:3815 -msgid "" -"Shows or hides the small margin right of the line numbers, which is used to " -"mark lines" -msgstr "" -"Zeigt oder versteckt den kleinen Rand rechts von den Zeilennummern, welcher " -"zum Anzeigen von Markierungen genutzt wird" +#: ../src/interface.c:3882 +msgid "Shows or hides the small margin right of the line numbers, which is used to mark lines" +msgstr "Zeigt oder versteckt den kleinen Rand rechts von den Zeilennummern, welcher zum Anzeigen von Markierungen genutzt wird" -#: ../src/interface.c:3817 +#: ../src/interface.c:3884 msgid "Stop scrolling at last line" msgstr "Am Ende des Dokuments nicht mehr weiter rollen" -#: ../src/interface.c:3820 +#: ../src/interface.c:3887 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" +msgstr "Legt fest, ob am Ende des Dokuments noch eine Seite weiter nach unten gerollt werden kann oder nicht" -#: ../src/interface.c:3822 +#: ../src/interface.c:3889 msgid "Display" msgstr "Anzeige" -#: ../src/interface.c:3843 +#: ../src/interface.c:3910 msgid "Long line marker:" msgstr "Zeilenlänge markieren bei:" -#: ../src/interface.c:3850 +#: ../src/interface.c:3917 msgid "Long line marker color:" msgstr "Farbe der Markierung:" -#: ../src/interface.c:3869 +#: ../src/interface.c:3936 msgid "Sets the color of the long line marker" msgstr "Stellt die Farbe der »Umbruchhilfe für lange Zeilen« ein" -#: ../src/interface.c:3870 ../src/toolbar.c:70 ../src/tools.c:741 -#: ../src/vte.c:769 ../src/vte.c:776 +#: ../src/interface.c:3937 +#: ../src/toolbar.c:70 +#: ../src/tools.c:717 +#: ../src/vte.c:797 +#: ../src/vte.c:804 msgid "Color Chooser" msgstr "Farbwähler" -#: ../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 " -"greater than 0 to specify the column where it should appear." -msgstr "" -"Die Umbruchhilfe für lange Zeilen ist eine dünne vertikale Linie im Editor. " -"Sie hilft dabei, lange Zeilen zu finden und weist dabei auf einen eventuell " -"notwendigen Zeilenumbruch hin. Werte größer als 0 geben die Spalte an, in " -"der die Linie angezeigt werden soll." +#: ../src/interface.c:3945 +msgid "The long line marker is a thin vertical line in the editor, it helps to mark long lines, or as a hint to break the line. Set this value to a value greater than 0 to specify the column where it should appear." +msgstr "Die Umbruchhilfe für lange Zeilen ist eine dünne vertikale Linie im Editor. Sie hilft dabei, lange Zeilen zu finden und weist dabei auf einen eventuell notwendigen Zeilenumbruch hin. Werte größer als 0 geben die Spalte an, in der die Linie angezeigt werden soll." -#: ../src/interface.c:3888 +#: ../src/interface.c:3955 msgid "Line" msgstr "Linie" -#: ../src/interface.c:3891 -msgid "" -"Prints a vertical line in the editor window at the given cursor position " -"(see below)" -msgstr "" -"Zeichnet eine vertikale Linie im Editor an der angegebenen Cursor-Position " -"(nur sinnvoll mit dicktengleichen Schriften)" +#: ../src/interface.c:3958 +msgid "Prints a vertical line in the editor window at the given cursor position (see below)" +msgstr "Zeichnet eine vertikale Linie im Editor an der angegebenen Cursor-Position (nur sinnvoll mit dicktengleichen Schriften)" -#: ../src/interface.c:3895 +#: ../src/interface.c:3962 msgid "Background" msgstr "Hintergrund" -#: ../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 " -"proportional fonts)" -msgstr "" -"Die Hintergrundfarbe der Zeichen, die hinter der angegebenen Cursor-Position " -"(siehe unten) stehen, wird auf die unten angegebene Farbe geändert (nützlich " -"für proportionale Schriftarten)" +#: ../src/interface.c:3965 +msgid "The background color of characters after the given cursor position (see below) changed to the color set below, (this is recommended if you use proportional fonts)" +msgstr "Die Hintergrundfarbe der Zeichen, die hinter der angegebenen Cursor-Position (siehe unten) stehen, wird auf die unten angegebene Farbe geändert (nützlich für proportionale Schriftarten)" -#: ../src/interface.c:3902 +#: ../src/interface.c:3969 msgid "Disabled" msgstr "Deaktiviert" -#: ../src/interface.c:3908 +#: ../src/interface.c:3975 msgid "Long line marker" msgstr "Umbruchhilfe für lange Zeilen" -#: ../src/interface.c:3913 +#: ../src/interface.c:3980 msgid "Display" msgstr "Ansicht" -#: ../src/interface.c:3944 +#: ../src/interface.c:4011 msgid "Open new documents from the command-line" msgstr "Öffne neue Dokumente von der Kommandozeile" -#: ../src/interface.c:3947 +#: ../src/interface.c:4014 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" +msgstr "Öffnet eine neue Datei für jeden Dateinamen, der auf der Kommandozeile angegeben wurde aber nicht geöffnet werden konnte" -#: ../src/interface.c:3961 +#: ../src/interface.c:4028 msgid "Default end of line characters:" msgstr "Zeichen für das Standardzeilenende:" -#: ../src/interface.c:3968 +#: ../src/interface.c:4035 msgid "New files" msgstr "Neue Dateien" -#: ../src/interface.c:3994 +#: ../src/interface.c:4058 +msgid "Default encoding (new files):" +msgstr "Standardzeichenkodierung (neue Dateien):" + +#: ../src/interface.c:4066 msgid "Sets the default encoding for newly created files" msgstr "Setzt die Zeichenkodierung für neu erstellte Dateien" -#: ../src/interface.c:4000 -msgid "Default encoding (new files):" -msgstr "Standardzeichenkodierung (neue Dateien):" +#: ../src/interface.c:4072 +msgid "Use fixed encoding when opening non-Unicode files" +msgstr "Benutze feststehende Zeichenkodierung beim Öffnen neuer, nicht Unicode-Dateien" -#: ../src/interface.c:4007 +#: ../src/interface.c:4075 +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 nicht Unicode-Dateien mit der angegebenen Kodierung. (Wird nur in Ausnahmen benötigt)" + +#: ../src/interface.c:4081 msgid "Default encoding (existing non-Unicode files):" msgstr "Standardzeichenkodierung (nicht Unicode-Dateien):" -#: ../src/interface.c:4019 +#: ../src/interface.c:4089 msgid "Sets the default encoding for opening existing non-Unicode files" -msgstr "" -"Setzt die Standardzeichenkodierung für zu öffnende Dateien, wenn kein " -"Unicode (z.B. UTF-8) zur Anwendung kommt" +msgstr "Setzt die Standardzeichenkodierung für zu öffnende Dateien, wenn kein Unicode (z.B. UTF-8) zur Anwendung kommt" -#: ../src/interface.c:4025 -msgid "Use fixed encoding when opening non-Unicode files" -msgstr "" -"Benutze feststehende Zeichenkodierung beim Öffnen neuer, nicht Unicode-" -"Dateien" - -#: ../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 nicht Unicode-Dateien mit der angegebenen Kodierung. " -"(Wird nur in Ausnahmen benötigt)" - -#: ../src/interface.c:4032 +#: ../src/interface.c:4095 msgid "Encodings" msgstr "Zeichenkodierungen:" -#: ../src/interface.c:4051 +#: ../src/interface.c:4114 msgid "Ensure new line at file end" msgstr "Neue Zeile am Dateiende" -#: ../src/interface.c:4054 +#: ../src/interface.c:4117 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:4056 +#: ../src/interface.c:4119 msgid "Strip trailing spaces and tabs" msgstr "Leerzeichen und Tabulatoren am Zeilenende entfernen" -#: ../src/interface.c:4059 +#: ../src/interface.c:4122 msgid "Removes trailing spaces and tabs and the end of lines" msgstr "Entfernt Leerzeichen und Tabulatoren am Ende einer Zeile" -#: ../src/interface.c:4061 ../src/keybindings.c:482 +#: ../src/interface.c:4124 +#: ../src/keybindings.c:506 msgid "Replace tabs by space" msgstr "Tabulatoren durch Leerzeichen ersetzen" -#: ../src/interface.c:4064 +#: ../src/interface.c:4127 msgid "Replaces all tabs in document by spaces" msgstr "Ersetzt alle Tabulatoren im Dokument durch Leerzeichen" -#: ../src/interface.c:4066 +#: ../src/interface.c:4129 msgid "Saving files" msgstr "Speichern" -#: ../src/interface.c:4091 +#: ../src/interface.c:4154 msgid "Recent files list length:" msgstr "Anzahl der »Zuletzt geöffneten Dateien«" -#: ../src/interface.c:4105 +#: ../src/interface.c:4168 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:4109 +#: ../src/interface.c:4172 msgid "Disk check timeout:" msgstr "Zeitinterval zum Prüfen auf Dateiänderungen:" -#: ../src/interface.c:4122 -msgid "" -"How often to check for changes to document files on disk, in seconds. Zero " -"disables checking." -msgstr "" -"Wie oft soll auf Veränderungen geprüft werden? Angabe in Sekunden. 0 " -"deaktiviert die Funktion." +#: ../src/interface.c:4185 +msgid "How often to check for changes to document files on disk, in seconds. Zero disables checking." +msgstr "Wie oft soll auf Veränderungen geprüft werden? Angabe in Sekunden. 0 deaktiviert die Funktion." -#: ../src/interface.c:4131 ../src/symbols.c:590 ../plugins/filebrowser.c:1034 +#: ../src/interface.c:4194 +#: ../src/prefs.c:1482 +#: ../src/symbols.c:593 +#: ../plugins/filebrowser.c:1031 msgid "Files" msgstr "Dateien" -#: ../src/interface.c:4164 +#: ../src/interface.c:4227 msgid "Terminal:" msgstr "Terminal:" -#: ../src/interface.c:4171 +#: ../src/interface.c:4234 msgid "Browser:" msgstr "Browser:" -#: ../src/interface.c:4183 -msgid "" -"A terminal emulator like xterm, gnome-terminal or konsole (should accept the " -"-e argument)" -msgstr "" -"Eine Terminalemulation wie z.B. xterm, gnome-terminal oder konsole (sie " -"sollte die Option -e akzeptieren)" +#: ../src/interface.c:4246 +msgid "A terminal emulator like xterm, gnome-terminal or konsole (should accept the -e argument)" +msgstr "Eine Terminalemulation wie z.B. xterm, gnome-terminal oder konsole (sie sollte die Option -e akzeptieren)" -#: ../src/interface.c:4190 +#: ../src/interface.c:4253 msgid "Path (and possibly additional arguments) to your favorite browser" msgstr "Pfad und evtl. Argumente zum Starten eines Browsers" -#: ../src/interface.c:4212 +#: ../src/interface.c:4275 msgid "Grep:" msgstr "Grep:" -#: ../src/interface.c:4235 +#: ../src/interface.c:4298 msgid "Tool paths" msgstr "Pfade zu den Werkzeugen" -#: ../src/interface.c:4256 +#: ../src/interface.c:4319 msgid "Context action:" msgstr "Kontextaktion:" -#: ../src/interface.c:4267 +#: ../src/interface.c:4330 #, c-format -msgid "" -"Context action command. The currently selected word can be used with %s. It " -"can appear anywhere in the given command and will be replaced before " -"execution." -msgstr "" -"Der aktuell markierte Text kann mit %s angegeben werden. Es darf überall in " -"der Kommandozeile vorkommen und wird vor dem Ausführen ersetzt." +msgid "Context action command. The currently selected word can be used with %s. It can appear anywhere in the given command and will be replaced before execution." +msgstr "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:4280 +#: ../src/interface.c:4343 msgid "Commands" msgstr "Befehle" -#: ../src/interface.c:4285 ../src/keybindings.c:516 +#: ../src/interface.c:4348 +#: ../src/keybindings.c:540 +#: ../src/prefs.c:1484 msgid "Tools" msgstr "Werkzeuge" -#: ../src/interface.c:4319 +#: ../src/interface.c:4382 msgid "email address of the developer" msgstr "E-Mailadresse des Entwicklers" -#: ../src/interface.c:4326 +#: ../src/interface.c:4389 msgid "Initials of the developer name" msgstr "Initialen des Entwicklernamens" -#: ../src/interface.c:4328 +#: ../src/interface.c:4391 msgid "Initial version:" msgstr "Anfangsversion:" -#: ../src/interface.c:4340 +#: ../src/interface.c:4403 msgid "Version number, which a new file initially has" msgstr "Versionsnummer, welche eine neue Datei zu Beginn hat" -#: ../src/interface.c:4347 +#: ../src/interface.c:4410 msgid "Company name" msgstr "Firmenname" -#: ../src/interface.c:4349 +#: ../src/interface.c:4412 msgid "Developer:" msgstr "Entwickler:" -#: ../src/interface.c:4356 +#: ../src/interface.c:4419 msgid "Company:" msgstr "Firma:" -#: ../src/interface.c:4363 +#: ../src/interface.c:4426 msgid "Mail address:" msgstr "E-Mail-Adresse:" -#: ../src/interface.c:4370 +#: ../src/interface.c:4433 msgid "Initials:" msgstr "Initialen:" -#: ../src/interface.c:4382 +#: ../src/interface.c:4445 msgid "The name of the developer" msgstr "Der Name des Entwicklers" -#: ../src/interface.c:4384 +#: ../src/interface.c:4447 msgid "Year:" msgstr "Jahr:" -#: ../src/interface.c:4391 +#: ../src/interface.c:4454 msgid "Date:" msgstr "Datum:" -#: ../src/interface.c:4398 +#: ../src/interface.c:4461 msgid "Date & Time:" msgstr "Datum / Zeit:" -#: ../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." -msgstr "" -"Geben Sie ein Datumsformat für den Platzhalter {datetime} an. Dabei können " -"alle Platzhalter verwendet werden, die auch in der ANSI C Funktion »strftime« " -"zum Einsatz kommen können." +#: ../src/interface.c:4473 +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." +msgstr "Geben Sie ein Datumsformat für den Platzhalter {datetime} an. Dabei können alle Platzhalter verwendet werden, die auch in der ANSI C Funktion »strftime« zum Einsatz kommen können." -#: ../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." -msgstr "" -"Geben Sie ein Datumsformat für den Platzhalter {year} an. Dabei können alle " @@ Diff output truncated at 100000 characters. @@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[4450] trunk
by frlan＠users.sourceforge.net 27 Nov '09

27 Nov '09

Revision: 4450 http://geany.svn.sourceforge.net/geany/?rev=4450&view=rev Author: frlan Date: 2009-11-27 17:10:43 +0000 (Fri, 27 Nov 2009) Log Message: ----------- Set Peter Scholtens and Ayke van Laethem as maintainer of Dutch translation Modified Paths: -------------- trunk/ChangeLog trunk/THANKS trunk/src/about.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-11-27 17:10:08 UTC (rev 4449) +++ trunk/ChangeLog 2009-11-27 17:10:43 UTC (rev 4450) @@ -1,3 +1,10 @@ +2009-11-26 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> + + * src/about.c, THANKS: + Add Peter Scholtens and Ayke van Laethem to list of translators. Move + Kurt de Bree into section of previous translators. + + 2009-11-26 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * src/about.c, src/symbols.c, THANKS, tagmanager/vhdl.c: Modified: trunk/THANKS =================================================================== --- trunk/THANKS 2009-11-27 17:10:08 UTC (rev 4449) +++ trunk/THANKS 2009-11-27 17:10:43 UTC (rev 4450) @@ -105,6 +105,7 @@ Laurent Hoeltgen <hoeltgman(at)gmail(dot)com> - lb Kurt De Bree <kdebree(at)telenet(dot)be> - nl Peter Scholtens <<peter(dot)scholtens(at)xs4all(dot)nl> - nl +Ayke van Laethem <aykevanlaethem(at)gmail(dot)com> - nl Jacek Wolszczak <shutdownrunner(at)o2(dot)pl> - pl_PL Jarosław Foksa <jfoksa(at)gmail(dot)com> - pl_PL Krzysztof Troska <elleander86(at)gmail(dot)com> - pl_PL Modified: trunk/src/about.c =================================================================== --- trunk/src/about.c 2009-11-27 17:10:08 UTC (rev 4449) +++ trunk/src/about.c 2009-11-27 17:10:43 UTC (rev 4450) @@ -60,7 +60,7 @@ { "ja", "Tarot Osuji <tarot(a)sdf.lonestar.org>\nChikahiro Masami <cmasa.z321(a)gmail.com>" }, { "ko", "Park Jang-heon <dotkabi(a)gmail.com>" }, { "lb", "Laurent Hoeltgen <hoeltgman(a)gmail.com>" }, - { "nl", "Kurt De Bree <kdebree(a)telenet.be>" }, + { "nl", "Peter Scholtens <peter.scholtens(a)xs4all.nl>\nAyke van Laethem <aykevanlaethem(a)gmail.com>" }, { "pl_PL", "Jarosław Foksa <jfoksa(a)gmail.com>" }, { "pt_BR", "Alexandra Moreire <alexandream(a)gmail.com>\nAdrovane Marques Kade <adrovane(a)gmail.com>" }, { "ro", "Alex Eftimie <alex(a)rosedu.org>" }, @@ -77,6 +77,7 @@ const gchar *prev_translators[][2] = { { "pl_PL", "Jacek Wolszczak <shutdownrunner(a)o2.pl>" }, + { "nl", "Kurt De Bree <kdebree(a)telenet.be>" } }; static const gint prev_translators_len = G_N_ELEMENTS(prev_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:[4449] trunk/po
by frlan＠users.sourceforge.net 27 Nov '09

27 Nov '09

Revision: 4449 http://geany.svn.sourceforge.net/geany/?rev=4449&view=rev Author: frlan Date: 2009-11-27 17:10:08 +0000 (Fri, 27 Nov 2009) Log Message: ----------- Update of Dutch translation Modified Paths: -------------- trunk/po/ChangeLog trunk/po/nl.po Modified: trunk/po/ChangeLog =================================================================== --- trunk/po/ChangeLog 2009-11-26 12:33:28 UTC (rev 4448) +++ trunk/po/ChangeLog 2009-11-27 17:10:08 UTC (rev 4449) @@ -1,3 +1,9 @@ +2009-11-26 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> + + * nl.po: Update of Dutch translation. Thanks to Peter Scholtens and + Ayke van Laethem + + 2009-11-23 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> * es.po: Update of Spanish translation. Thanks to Antonio Jiménez @@ -6,8 +12,8 @@ 2009-11-18 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> - * nl.po: Update of Dutch translation. Thanks to Peter and - Ayke for sending the update. + * nl.po: Update of Dutch translation. Thanks to Peter and + Ayke for sending the update. 2009-11-15 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> Modified: trunk/po/nl.po =================================================================== --- trunk/po/nl.po 2009-11-26 12:33:28 UTC (rev 4448) +++ trunk/po/nl.po 2009-11-27 17:10:08 UTC (rev 4449) @@ -3,19 +3,21 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER. # Kurt De Bree <kdebree(a)telenet.be>, 2006. # Peter Scholtens <peter.scholtens(a)xs4all.nl>, 2009 +# Ayke van Laethem <aykevanlaethem(a)gmail.com>, 2009 msgid "" msgstr "" -"Project-Id-Version: Geany 0.18\n" +"Project-Id-Version: Geany 0.19\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-19 19:06+0100\n" -"PO-Revision-Date: 2009-11-18 23:48+0100\n" -"Last-Translator: Peter Scholtens <peter.scholtens(a)xs4all.nl>\n" +"POT-Creation-Date: 2009-11-26 22:10+0100\n" +"PO-Revision-Date: 2009-11-23 22:24+0100\n" +"Last-Translator: Ayke van Laethem <aykevanlaethem(a)gmail.com>\n" "Language-Team: Dutch <geany-i18n(a)uvena.de>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: KBabel 1.9.1\n" +"X-Poedit-Language: Dutch\n" #: ../geany.desktop.in.h:1 msgid "A fast and lightweight IDE using GTK2" @@ -29,54 +31,53 @@ msgid "Integrated Development Environment" msgstr "Geintegreerde Ontwikkel Omgeving" -#: ../src/about.c:140 +#: ../src/about.c:143 msgid "About Geany" msgstr "Over Geany" -#: ../src/about.c:190 +#: ../src/about.c:193 msgid "A fast and lightweight IDE" msgstr "Een snel en lichtgewicht IDE" -#: ../src/about.c:211 -#, fuzzy, c-format +#: ../src/about.c:214 +#, c-format msgid "(built on or after %s)" -msgstr "(gebouwd op %s)" +msgstr "(gebouwd op of na %s)" #. gtk_container_add(GTK_CONTAINER(info_box), cop_label); -#: ../src/about.c:242 +#: ../src/about.c:245 msgid "Info" msgstr "Info" -#: ../src/about.c:258 +#: ../src/about.c:261 msgid "Developers" msgstr "Ontwikkelaars" -#: ../src/about.c:267 -#, fuzzy +#: ../src/about.c:270 msgid "maintainer" -msgstr "Hoofdontwikkelaar" +msgstr "beheerder" -#: ../src/about.c:275 +#: ../src/about.c:278 msgid "developer" msgstr "ontwikkelaar" -#: ../src/about.c:283 +#: ../src/about.c:286 msgid "translation maintainer" msgstr "vertalingscoördinator" -#: ../src/about.c:292 +#: ../src/about.c:295 msgid "Translators" msgstr "Vertalers" -#: ../src/about.c:312 +#: ../src/about.c:315 msgid "Previous Translators" msgstr "Vorige vertalers" -#: ../src/about.c:333 +#: ../src/about.c:336 msgid "Contributors" msgstr "Ontwikkelaars" -#: ../src/about.c:343 +#: ../src/about.c:346 #, c-format msgid "" "Some of the many contributors (for a more detailed list, see the file %s):" @@ -84,15 +85,15 @@ "Enkele van de vele ontwikkelaars (voor een gedetailleerde lijst, raadpleeg " "bestand %s):" -#: ../src/about.c:369 +#: ../src/about.c:372 msgid "Credits" msgstr "Credits" -#: ../src/about.c:383 +#: ../src/about.c:386 msgid "License" msgstr "Licentie" -#: ../src/about.c:392 +#: ../src/about.c:395 msgid "" "License text could not be found, please visit http://www.gnu.org/licenses/" "gpl-2.0.txt to view it online." @@ -102,9 +103,9 @@ #. fall back to %d #: ../src/build.c:626 -#, c-format +#, fuzzy, c-format msgid "failed to substitute %%p, no project active" -msgstr "" +msgstr "mislukt om %%p te vervangen, geen geopend project" #: ../src/build.c:664 #, fuzzy @@ -139,13 +140,13 @@ "bevat." #: ../src/build.c:901 -#, fuzzy, c-format +#, c-format msgid "" "Could not find terminal \"%s\" (check path for Terminal tool setting in " "Preferences)" msgstr "" -"Kon terminal '%s' niet vinden (controleer de instelling van het pad voor " -"hulpprogramma terminal in Voorkeuren)" +"Kon terminal \"%s\" niet vinden (controleer het pad voor de terminal in " +"Voorkeuren)" #: ../src/build.c:1071 msgid "Compilation failed." @@ -156,16 +157,14 @@ msgstr "Compilatie met succes beëindigd." #: ../src/build.c:1241 -#, fuzzy msgid "Custom Text" -msgstr "Make aangepast doel" +msgstr "Aangepaste tekst" #: ../src/build.c:1242 -#, fuzzy msgid "Enter custom text here, all entered text is appended to the command." msgstr "" "Voer hier de aangepaste opties in, alle ingevoerde tekst wordt aan het " -"commando 'make' overgegeven." +"commando 'make' doorgegeven." #: ../src/build.c:1320 msgid "_Next Error" @@ -176,11 +175,10 @@ msgstr "Zoek Vor_ige Fout" #: ../src/build.c:1332 -#, fuzzy msgid "_Set Build Commands" -msgstr "Aangepast datumformaat instellen" +msgstr "Bouwcommando's instellen" -#: ../src/build.c:1610 ../src/toolbar.c:344 +#: ../src/build.c:1610 ../src/toolbar.c:352 msgid "Build the current file" msgstr "Huidig bestand bouwen" @@ -208,8 +206,9 @@ msgstr "Geen bouwfouten meer." #: ../src/build.c:1756 +#, fuzzy msgid "Item" -msgstr "" +msgstr "Item" #: ../src/build.c:1757 ../src/symbols.c:639 msgid "Label" @@ -220,18 +219,17 @@ msgstr "Commando" #: ../src/build.c:1759 -#, fuzzy msgid "Working directory" -msgstr "Map:" +msgstr "Werkmap" #: ../src/build.c:1760 msgid "Clear" msgstr "Ruim op" #: ../src/build.c:1862 ../src/build.c:1864 -#, fuzzy, c-format +#, c-format msgid "%s Commands" -msgstr "%s commandos" +msgstr "%s commando's" #: ../src/build.c:1864 msgid "No Filetype" @@ -243,7 +241,7 @@ #: ../src/build.c:1900 msgid "Non-Filetype Commands" -msgstr "" +msgstr "Geen-bestandstype commando's" #: ../src/build.c:1930 msgid "Note: Item 2 opens a dialog and appends the response to the command." @@ -261,21 +259,20 @@ "%d, %e, %f, %p are substituted in command and directory fields, see manual " "for details." msgstr "" -"%d, %e, %f, %p zijn vervangen in de commando en directory velden, zie de " -"handlieding voor details." +"%d, %e, %f, %p worden vervangen in de commando en directory velden, zie " +"handleiding voor details." #: ../src/build.c:2102 msgid "Set Build Commands" -msgstr "Build commando's instellen" +msgstr "Bouwcommando's instellen" #: ../src/build.c:2368 ../src/build.c:2553 msgid "_Execute" msgstr "Uitvo_eren" #: ../src/build.c:2550 -#, fuzzy msgid "_Make" -msgstr "Make" +msgstr "_Make" #. build the code with make custom #: ../src/build.c:2551 ../src/build.c:2604 @@ -285,7 +282,6 @@ #. build the code with make object #: ../src/build.c:2552 ../src/build.c:2612 -#, fuzzy msgid "Make _Object" msgstr "Make _object" @@ -296,7 +292,6 @@ #. build the code with make all #: ../src/build.c:2596 -#, fuzzy msgid "_Make All" msgstr "_Make all" @@ -314,8 +309,8 @@ #, c-format msgid "%d file saved." msgid_plural "%d files saved." -msgstr[0] "%d bestand opgeslagen." -msgstr[1] "%d bestanden opgeslagen." +msgstr[0] "%d Bestand opgeslagen." +msgstr[1] "%d Bestanden opgeslagen." #: ../src/callbacks.c:491 ../src/document.c:2923 ../src/interface.c:351 #: ../src/sidebar.c:580 @@ -339,46 +334,46 @@ msgid "Enter the line you want to go to:" msgstr "Voer het regelnummer in waarnaar u wilt springen:" -#: ../src/callbacks.c:1377 ../src/callbacks.c:1402 +#: ../src/callbacks.c:1362 ../src/callbacks.c:1387 msgid "" "Please set the filetype for the current file before using this function." msgstr "" "Gelieve het bestandstype voor het huidige bestand in te stellen vooraleer " "deze functie te gebruiken." -#: ../src/callbacks.c:1514 ../src/ui_utils.c:544 +#: ../src/callbacks.c:1499 ../src/ui_utils.c:544 msgid "dd.mm.yyyy" -msgstr "dd.mm.yyyy" +msgstr "dd.mm.jjjj" -#: ../src/callbacks.c:1516 ../src/ui_utils.c:545 +#: ../src/callbacks.c:1501 ../src/ui_utils.c:545 msgid "mm.dd.yyyy" -msgstr "mm.dd.yyyy" +msgstr "mm.dd.jjjj" -#: ../src/callbacks.c:1518 ../src/ui_utils.c:546 +#: ../src/callbacks.c:1503 ../src/ui_utils.c:546 msgid "yyyy/mm/dd" -msgstr "yyyy/mm/dd" +msgstr "jjjj/mm/dd" -#: ../src/callbacks.c:1520 ../src/ui_utils.c:555 +#: ../src/callbacks.c:1505 ../src/ui_utils.c:555 msgid "dd.mm.yyyy hh:mm:ss" -msgstr "dd.mm.yyyy hh:mm:ss" +msgstr "dd.mm.jjjj uu:mm:ss" -#: ../src/callbacks.c:1522 ../src/ui_utils.c:556 +#: ../src/callbacks.c:1507 ../src/ui_utils.c:556 msgid "mm.dd.yyyy hh:mm:ss" -msgstr "mm.dd.yyyy hh:mm:ss" +msgstr "mm.dd.jjjj uu:mm:ss" -#: ../src/callbacks.c:1524 ../src/ui_utils.c:557 +#: ../src/callbacks.c:1509 ../src/ui_utils.c:557 msgid "yyyy/mm/dd hh:mm:ss" -msgstr "yyyy/mm/dd hh:mm:ss" +msgstr "jjjj/mm/dd uu:mm:ss" -#: ../src/callbacks.c:1526 ../src/ui_utils.c:566 +#: ../src/callbacks.c:1511 ../src/ui_utils.c:566 msgid "_Use Custom Date Format" msgstr "Gebr_uik een aangepast datumformaat" -#: ../src/callbacks.c:1530 +#: ../src/callbacks.c:1515 msgid "Custom Date Format" msgstr "Aangepast datumformaat" -#: ../src/callbacks.c:1531 +#: ../src/callbacks.c:1516 #, fuzzy msgid "" "Enter here a custom date and time format. You can use any conversion " @@ -388,12 +383,12 @@ "het even welke conversie specifieerder welke kan gebruikt worden met de ANSI " "C strftime functie. Lees \"man strftime\" voor meer informatie." -#: ../src/callbacks.c:1549 +#: ../src/callbacks.c:1534 msgid "Date format string could not be converted (possibly too long)." msgstr "" -"Datumformaatstring kon niet worden geconverteerd (waarschijlijk te lang)." +"Datumformaatstring kon niet worden geconverteerd (waarschijnlijk te lang)." -#: ../src/callbacks.c:1763 ../src/callbacks.c:1773 +#: ../src/callbacks.c:1748 ../src/callbacks.c:1758 msgid "No more message items." msgstr "Niet meer opmerkingen." @@ -401,6 +396,7 @@ msgid "Open File" msgstr "Bestand openen" +# Wordt voor twee dingen gebruikt, ook voor het 'openen' dialoogvenster. Daar zou 'alleen-lezen' meer passen. #: ../src/dialogs.c:144 ../src/interface.c:784 msgid "_View" msgstr "_Beeld" @@ -417,7 +413,7 @@ msgid "Detect by file extension" msgstr "Herken door bestandsextensie" -#: ../src/dialogs.c:196 ../src/interface.c:3648 ../src/interface.c:5166 +#: ../src/dialogs.c:196 ../src/interface.c:3649 ../src/interface.c:5173 msgid "Detect from file" msgstr "Haal uit bestand" @@ -428,15 +424,13 @@ #. line 1 with checkbox and encoding combo #: ../src/dialogs.c:265 msgid "Show _hidden files" -msgstr "_Verborgen bestanden weergeven" +msgstr "Verborgen bestanden _weergeven" #: ../src/dialogs.c:276 -#, fuzzy msgid "Set encoding:" -msgstr "_Codering instellen" +msgstr "Stel Codering in:" #: ../src/dialogs.c:286 -#, fuzzy msgid "" "Explicitly defines an encoding for the file, if it would not be detected. " "This is useful when you know that the encoding of a file cannot be detected " @@ -444,10 +438,11 @@ "Note if you choose multiple files, they will all be opened with the chosen " "encoding." msgstr "" -"Definieert uitdrukkelijk een bestandstype voor het bestand, indien het niet " -"wordt herkend via de bestandsextensie.\n" -"Notitie: indien u meerdere bestanden kiest, worden deze allen geopend met " -"het gekozen bestandstype." +"Definieert uitdrukkelijk een codering voor het bestand, als het niet wordt " +"herkend. Dit is handig als je al weet dat de codering niet correct " +"gedetecteerd kan worden door Geany.\n" +"Opmerking: als u meerdere bestanden kiest, worden deze allemaal geopend met " +"de gekozen codering." #. line 2 with filetype combo #: ../src/dialogs.c:293 @@ -463,8 +458,8 @@ msgstr "" "Definieert uitdrukkelijk een bestandstype voor het bestand, indien het niet " "wordt herkend via de bestandsextensie.\n" -"Notitie: indien u meerdere bestanden kiest, worden deze allen geopend met " -"het gekozen bestandstype." +"Opmerking: indien u meerdere bestanden kiest, worden deze allemaal geopend " +"met het gekozen bestandstype." #: ../src/dialogs.c:389 msgid "Overwrite?" @@ -586,7 +581,7 @@ #: ../src/dialogs.c:1148 msgid "Modified:" -msgstr "Gemodifieert:" +msgstr "Gemodificeerd:" #: ../src/dialogs.c:1162 msgid "Changed:" @@ -737,7 +732,7 @@ #: ../src/document.c:1653 #, fuzzy, c-format msgid "Error message: %s." -msgstr "Fout bij het opslaan van het bestand (%s)." +msgstr "Foutbericht: %s." #: ../src/document.c:1756 ../src/document.c:1819 msgid "Error saving file." @@ -769,11 +764,11 @@ msgstr "Geen overeenkomsten gevonden voor '%s'" #: ../src/document.c:2066 ../src/document.c:2075 -#, fuzzy, c-format +#, c-format msgid "%s: replaced %d occurrence of \"%s\" with \"%s\"." msgid_plural "%s: replaced %d occurrences of \"%s\" with \"%s\"." -msgstr[0] "Verving %d keer \"%s\" door\"%s\"." -msgstr[1] "Verving %d keren \"%s\" door\"%s\"." +msgstr[0] "%s: verving %d keer \"%s\" door \"%s\"." +msgstr[1] "%s: verving %d keer \"%s\" door \"%s\"." #: ../src/document.c:2924 msgid "Do you want to reload it?" @@ -951,8 +946,8 @@ msgid "%s file" msgstr "%s bronbestand" -#: ../src/filetypes.c:118 ../src/filetypes.c:119 ../src/interface.c:3567 -#: ../src/interface.c:5109 +#: ../src/filetypes.c:118 ../src/filetypes.c:119 ../src/interface.c:3568 +#: ../src/interface.c:5116 msgid "None" msgstr "Geen" @@ -1024,20 +1019,19 @@ msgid "untitled" msgstr "naamloos" -#: ../src/highlighting.c:3436 ../src/main.c:766 ../src/socket.c:164 +#: ../src/highlighting.c:3369 ../src/main.c:772 ../src/socket.c:164 #: ../src/templates.c:339 #, c-format msgid "Could not find file '%s'." msgstr "Kan bestand %s niet vinden." -#: ../src/highlighting.c:3485 -#, fuzzy +#: ../src/highlighting.c:3418 msgid "_Color Schemes" msgstr "Kleurkiezer" -#: ../src/highlighting.c:3492 +#: ../src/highlighting.c:3425 msgid "_Default" -msgstr "" +msgstr "_Standaard" #: ../src/interface.c:294 msgid "_File" @@ -1095,9 +1089,8 @@ msgstr "" #: ../src/interface.c:490 -#, fuzzy msgid "T_oggle Case of Selection" -msgstr "Kloon regel of selectie" +msgstr "Maak selectie onder- of bovenkast" #: ../src/interface.c:494 ../src/keybindings.c:270 msgid "_Transpose Current Line" @@ -1266,7 +1259,7 @@ #: ../src/interface.c:804 msgid "To_ggle All Additional Widgets" -msgstr "Verberg alle _extra widgets" +msgstr "Verberg/toon alle _extra widgets" #: ../src/interface.c:808 msgid "Full_screen" @@ -1284,7 +1277,8 @@ msgid "Show Side_bar" msgstr "_Zijbalk weergeven" -#: ../src/interface.c:827 ../src/interface.c:3983 ../src/keybindings.c:253 +#: ../src/interface.c:827 ../src/interface.c:3984 ../src/keybindings.c:253 +#: ../src/prefs.c:1480 msgid "Editor" msgstr "Editor" @@ -1297,57 +1291,50 @@ msgstr "_Regelnummers weergeven" #: ../src/interface.c:844 -#, fuzzy msgid "Show _White Space" -msgstr "Lege spaties weergeven" +msgstr "Lege spaties _weergeven" #: ../src/interface.c:848 -#, fuzzy msgid "Show Line _Endings" -msgstr "Regeleinden weergeven" +msgstr "Regel_einden weergeven" #: ../src/interface.c:852 -#, fuzzy msgid "Show _Indentation Guides" -msgstr "Inspringingsmarkeringen weergeven" +msgstr "_Inspringingsmarkeringen weergeven" #: ../src/interface.c:873 msgid "_Document" msgstr "_Document" #: ../src/interface.c:880 -#, fuzzy msgid "_Line Wrapping" msgstr "_Regelterugloop" #: ../src/interface.c:885 -#, fuzzy msgid "Line _Breaking" -msgstr "Regelterugloop" +msgstr "Regelaf_breking" #: ../src/interface.c:889 -#, fuzzy msgid "_Auto-indentation" -msgstr "Gebruik _auto-inspringing" +msgstr "_Automatisch inspringen" #: ../src/interface.c:894 msgid "In_dent Type" -msgstr "Inspring type" +msgstr "I_nspringingstype" -#: ../src/interface.c:901 ../src/interface.c:3606 ../src/interface.c:5148 +#: ../src/interface.c:901 ../src/interface.c:3607 ../src/interface.c:5155 msgid "_Tabs" -msgstr "_Tabbladen" +msgstr "_Tabs" -#: ../src/interface.c:907 ../src/interface.c:3597 ../src/interface.c:5139 +#: ../src/interface.c:907 ../src/interface.c:3598 ../src/interface.c:5146 msgid "_Spaces" msgstr "_Spaties" -#: ../src/interface.c:913 ../src/interface.c:3615 ../src/interface.c:5157 +#: ../src/interface.c:913 ../src/interface.c:3616 ../src/interface.c:5164 msgid "T_abs and Spaces" msgstr "T_abs en Spaties" #: ../src/interface.c:924 -#, fuzzy msgid "Read _Only" msgstr "Alleen _lezen" @@ -1356,71 +1343,60 @@ msgstr "_Unicode BOM schrijven" #: ../src/interface.c:937 -#, fuzzy msgid "Set File_type" -msgstr "_Bestandstype instellen" +msgstr "Bestandst_ype instellen" #: ../src/interface.c:947 -#, fuzzy msgid "Set _Encoding" msgstr "_Codering instellen" #: ../src/interface.c:957 -#, fuzzy msgid "Set Line E_ndings" msgstr "Regel_einden instellen" #: ../src/interface.c:964 -#, fuzzy msgid "Convert and Set to _CR/LF (Win)" msgstr "Converteren en instellen op CR/LF (_Win)" #: ../src/interface.c:970 -#, fuzzy msgid "Convert and Set to _LF (Unix)" msgstr "Converteren en instellen op LF (_Unix)" #: ../src/interface.c:976 -#, fuzzy msgid "Convert and Set to CR (_Mac)" msgstr "Converteren en instellen op CR (_Mac)" #: ../src/interface.c:987 -#, fuzzy msgid "_Strip Trailing Spaces" -msgstr "Lege spaties aan regeleinde verwijderen" +msgstr "Lege spaties aan regeleinden verwijderen" #: ../src/interface.c:991 -#, fuzzy msgid "_Replace Tabs by Spaces" -msgstr "_Vervang tabs door spaties" +msgstr "Vervang tabs door s_paties" #: ../src/interface.c:995 msgid "Replace Spaces b_y Tabs" -msgstr "_Vervang spaties door tabs" +msgstr "Vervang spaties door _tabs" #: ../src/interface.c:1004 msgid "_Fold All" -msgstr "Alles _samenvouwen" +msgstr "Alles samen_vouwen" #: ../src/interface.c:1008 -#, fuzzy msgid "_Unfold All" -msgstr "Alles _uitvouwen" +msgstr "Alles uitvou_wen" #: ../src/interface.c:1017 msgid "Remove _Markers" -msgstr "Verwijders _Markers" +msgstr "Verwijder _Markers" #: ../src/interface.c:1021 -#, fuzzy msgid "Remove Error _Indicators" -msgstr "Alle _markeringen verwijderen" +msgstr "Verwijder fout_indicaties" #: ../src/interface.c:1025 -#, fuzzy msgid "_Project" -msgstr "Make _object" +msgstr "_Project" #: ../src/interface.c:1032 msgid "_New" @@ -1439,29 +1415,28 @@ msgstr "_Sluiten" #: ../src/interface.c:1073 -#, fuzzy msgid "_Tools" -msgstr "Hulpprogramma's" +msgstr "_Extra" #: ../src/interface.c:1080 msgid "_Reload Configuration" -msgstr "He_rlaad Configuratie" +msgstr "He_rlaad configuratie" #: ../src/interface.c:1088 msgid "C_onfiguration Files" -msgstr "Configuratiebestanden" +msgstr "C_onfiguratiebestanden" #: ../src/interface.c:1101 msgid "_Color Chooser" -msgstr "Kleurkiezer" +msgstr "_Kleurkiezer" #: ../src/interface.c:1109 msgid "_Word Count" -msgstr "Woorden tellen" +msgstr "_Woorden tellen" #: ../src/interface.c:1113 msgid "Load Ta_gs" -msgstr "Verwijder Labels" +msgstr "Labels laden" #: ../src/interface.c:1117 ../src/interface.c:1124 msgid "_Help" @@ -1472,7 +1447,6 @@ msgstr "_Website" #: ../src/interface.c:1136 -#, fuzzy msgid "_Keyboard Shortcuts" msgstr "_Sneltoetsen" @@ -1504,27 +1478,27 @@ msgid "Scribble" msgstr "Notities" -#: ../src/interface.c:1889 ../src/interface.c:3352 +#: ../src/interface.c:1889 ../src/interface.c:3353 msgid "Images _and Text" msgstr "Pictogr_ammen en tekst" -#: ../src/interface.c:1894 ../src/interface.c:3384 +#: ../src/interface.c:1894 ../src/interface.c:3385 msgid "_Images Only" msgstr "Enkel p_ictogrammen" -#: ../src/interface.c:1899 ../src/interface.c:3376 +#: ../src/interface.c:1899 ../src/interface.c:3377 msgid "_Text Only" msgstr "Enkel _tekst" -#: ../src/interface.c:1910 ../src/interface.c:3368 +#: ../src/interface.c:1910 ../src/interface.c:3369 msgid "_Large Icons" msgstr "Grote pictogrammen" -#: ../src/interface.c:1915 ../src/interface.c:3360 +#: ../src/interface.c:1915 ../src/interface.c:3361 msgid "_Small Icons" msgstr "_Kleine pictogrammen" -#: ../src/interface.c:1920 ../src/interface.c:3392 +#: ../src/interface.c:1920 ../src/interface.c:3393 msgid "_Very Small Icons" msgstr "Miniscule pictogrammen" @@ -1555,27 +1529,26 @@ msgstr "Ga naar t_ag declaratie" #: ../src/interface.c:2200 -#, fuzzy msgid "Conte_xt Action" -msgstr "_In selectie" +msgstr "Conte_xtactie" -#: ../src/interface.c:2712 ../src/keybindings.c:379 +#: ../src/interface.c:2713 ../src/keybindings.c:379 msgid "Preferences" msgstr "Voorkeuren" -#: ../src/interface.c:2748 +#: ../src/interface.c:2749 msgid "Load files from the last session" msgstr "Laad bestanden van de laatste sessie" -#: ../src/interface.c:2751 +#: ../src/interface.c:2752 msgid "Opens at startup the files from the last session" msgstr "Opent bij opstarten de bestanden van de laatste sessie" -#: ../src/interface.c:2753 +#: ../src/interface.c:2754 msgid "Load virtual terminal support" msgstr "Virtuele terminal laden bij opstarten" -#: ../src/interface.c:2755 +#: ../src/interface.c:2756 msgid "" "Whether the virtual terminal emulation (VTE) should be loaded at startup, " "disable it if you do not need it" @@ -1583,39 +1556,39 @@ "Of de virtuele terminalemulatie (VTE) moet worden geladen bij het opstarten. " "Schakel deze functie uit indien u dit niet nodig heeft" -#: ../src/interface.c:2757 +#: ../src/interface.c:2758 msgid "Enable plugin support" msgstr "Zet plugin ondersteuning aan" -#: ../src/interface.c:2761 +#: ../src/interface.c:2762 msgid "Startup" msgstr "Opstarten" -#: ../src/interface.c:2780 +#: ../src/interface.c:2781 msgid "Save window position and geometry" msgstr "Bewaar vensterpositie en geometrie" -#: ../src/interface.c:2783 +#: ../src/interface.c:2784 msgid "Saves the window position and geometry and restores it at the start" msgstr "Bewaart de vensterpositie en geometrie en herstelt dat bij het begin" -#: ../src/interface.c:2785 +#: ../src/interface.c:2786 msgid "Confirm exit" msgstr "afsluiten bevestigen" -#: ../src/interface.c:2788 +#: ../src/interface.c:2789 msgid "Shows a confirmation dialog on exit" msgstr "Toont een bevestigingsvenster bij afsluiten." -#: ../src/interface.c:2790 +#: ../src/interface.c:2791 msgid "Shutdown" msgstr "Afsluiten" -#: ../src/interface.c:2811 +#: ../src/interface.c:2812 msgid "Startup path:" msgstr "Opstart pad:" -#: ../src/interface.c:2823 +#: ../src/interface.c:2824 msgid "" "Path to start in when opening or saving files. Must be an absolute path. " "Leave blank to use the current working directory." @@ -1623,65 +1596,65 @@ "Beginpad om bestand te openen of te schrijven. Moet absoluut zijn. Laat veld " "leeg om de huidige werk directory te gebruiken." -#: ../src/interface.c:2836 +#: ../src/interface.c:2837 msgid "Project files:" msgstr "Project bestanden:" -#: ../src/interface.c:2848 +#: ../src/interface.c:2849 msgid "Path to start in when opening project files" msgstr "Begin pad voor het openen van project bestanden" -#: ../src/interface.c:2861 +#: ../src/interface.c:2862 msgid "Extra plugin path:" msgstr "Extra plugin pad:" -#: ../src/interface.c:2873 +#: ../src/interface.c:2874 msgid "" "Geany looks by default in the global installation path and in the " "configuration directory. The path entered here will be searched additionally " "for plugins. Leave blank to disable." msgstr "" -"Geany kijkt standaard in het globale installatie pad en in de configuratie " -"directory. Eventueel kan hier een pad worden toegevoegd om ook naar plugins " -"te zoeken. Laat leeg om uit te zetten." +"Geany kijkt standaard in het globale installatie pad en in de " +"configuratiemap. Eventueel kan hier een pad worden toegevoegd om ook naar " +"plugins te zoeken. Laat leeg om uit te zetten." -#: ../src/interface.c:2886 +#: ../src/interface.c:2887 msgid "Paths" msgstr "Bestandspaden" -#: ../src/interface.c:2891 +#: ../src/interface.c:2892 msgid "Startup" msgstr "Opstarten" -#: ../src/interface.c:2913 +#: ../src/interface.c:2914 msgid "Beep on errors or when compilation has finished" msgstr "Beep bij fouten of wanneer compilatie is beëindigd" -#: ../src/interface.c:2916 +#: ../src/interface.c:2917 msgid "" "Whether to beep if an error occurred or when the compilation process has " "finished" msgstr "" -"Of er een pieptoon moet worden weergegeven bij een fout of wanneer het " +"Of er een pieptoon moet worden gegeven bij een fout of wanneer het " "compilatieproces is beëindigd." -#: ../src/interface.c:2918 +#: ../src/interface.c:2919 msgid "Switch to status message list at new message" msgstr "Schakel naar statusmeldingsvenster bij nieuw bericht" -#: ../src/interface.c:2921 +#: ../src/interface.c:2922 msgid "" "Switch to the status message tab (in the notebook window at the bottom) if a " "new status message arrives" msgstr "" -"Schakel naar het statusmeldingsvenster (onderaan in het tabvenster) als er " -"een nieuw bericht is." +"Schakel naar het statusvenster (onderaan in het berichtenvenster) als er een " +"nieuw bericht is" -#: ../src/interface.c:2923 +#: ../src/interface.c:2924 msgid "Suppress status messages in the status bar" msgstr "Onderdruk status mededelingen in de statusregel" -#: ../src/interface.c:2926 +#: ../src/interface.c:2927 msgid "" "Removes all messages from the status bar. The messages are still displayed " "in the status messages window." @@ -1689,11 +1662,11 @@ "Verwijder alle mededelingen van de statusregel. De medelingen blijven " "zichtbaar in het statusmededelingenvenster." -#: ../src/interface.c:2928 +#: ../src/interface.c:2929 msgid "Auto-focus widgets (focus follows mouse)" msgstr "Auto focus widgets (focus volgt muis)" -#: ../src/interface.c:2931 +#: ../src/interface.c:2932 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 " @@ -1703,15 +1676,15 @@ "hoofdeditor, de notities, het werkbalkzoekvenster, de ga naar regel velden " "en de VTE." -#: ../src/interface.c:2933 ../src/interface.c:3280 ../src/interface.c:4188 +#: ../src/interface.c:2934 ../src/interface.c:3281 ../src/interface.c:4189 msgid "Miscellaneous" msgstr "Overige" -#: ../src/interface.c:2953 +#: ../src/interface.c:2954 msgid "Always wrap search and hide the Find dialog" msgstr "Ga door met zoeken en verberg het zoekdialoog" -#: ../src/interface.c:2956 +#: ../src/interface.c:2957 msgid "" "Always wrap search around the document and hide the Find dialog after " "clicking Find Next/Previous" @@ -1719,11 +1692,11 @@ "Zoek altijd opnieuw en verberg het zoekvenster na klikken op Zoek volgende/" "vorige" -#: ../src/interface.c:2958 +#: ../src/interface.c:2959 msgid "Use the current word under the cursor for Find dialogs" msgstr "Gebruik het woord onder de cursor voor het zoekdialoog" -#: ../src/interface.c:2961 +#: ../src/interface.c:2962 msgid "" "Use current word under the cursor when opening the Find, Find in Files or " "Replace dialog and there is no selection" @@ -1731,19 +1704,19 @@ "Gebruik het huidige woord onder de cursor als het Zoek, Zoek in bestanden of " "Vervangen dialoog als er geen selectie is" -#: ../src/interface.c:2963 +#: ../src/interface.c:2964 msgid "Use the current file's directory for Find in Files" msgstr "Gebruik de map van het huidige bestand voor Zoek in bestanden" -#: ../src/interface.c:2967 +#: ../src/interface.c:2968 msgid "Search" msgstr "Zoek" -#: ../src/interface.c:2986 +#: ../src/interface.c:2987 msgid "Use project-based session files" msgstr "Gebruik project-gebaseerde sessiebestanden" -#: ../src/interface.c:2989 +#: ../src/interface.c:2990 msgid "" "Whether to store a project's session files and open them when re-opening the " "project" @@ -1751,11 +1724,11 @@ "Of het project's sessiebestand opgeslagen moet worden en weer geopend moet " "worden als het project weer geopend wordt" -#: ../src/interface.c:2991 +#: ../src/interface.c:2992 msgid "Store project file inside the project base directory" msgstr "Sla het projectbestand in de projectbasismap op" -#: ../src/interface.c:2994 +#: ../src/interface.c:2995 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 " @@ -1767,194 +1740,197 @@ "daarboven. Je kunt het projectbestandspad dan nog steeds veranderen in het " "Nieuw Projectdialoogvenster." -#: ../src/interface.c:2996 +#: ../src/interface.c:2997 msgid "Projects" msgstr "Projecten" -#: ../src/interface.c:3001 +#: ../src/interface.c:3002 msgid "Miscellaneous" msgstr "Overige" -#: ../src/interface.c:3005 +#. TODO Find a better way to map the current notebook page to the +#. * corresponding chapter in the documentation, comparing translatable +#. * strings is easy to break. Maybe attach an identifying string to the +#. * tab label object. +#: ../src/interface.c:3006 ../src/prefs.c:1474 msgid "General" msgstr "Algemeen" -#: ../src/interface.c:3028 +#: ../src/interface.c:3029 msgid "Show symbol list" msgstr "Toon symbolenlijst" -#: ../src/interface.c:3031 +#: ../src/interface.c:3032 msgid "Toggle the symbol list on and off" msgstr "Schakelt de symbolenlijst aan en uit" -#: ../src/interface.c:3033 +#: ../src/interface.c:3034 msgid "Show documents list" msgstr "Toon bestandenlijst" -#: ../src/interface.c:3036 +#: ../src/interface.c:3037 msgid "Toggle the documents list on and off" msgstr "Schakelt de bestandenlijst aan en uit" -#: ../src/interface.c:3042 -#, fuzzy +#: ../src/interface.c:3043 msgid "Position:" -msgstr "Beschrijving:" +msgstr "Positie:" -#: ../src/interface.c:3046 ../src/interface.c:3161 ../src/interface.c:3215 -#: ../src/interface.c:3233 ../src/interface.c:3251 +#: ../src/interface.c:3047 ../src/interface.c:3162 ../src/interface.c:3216 +#: ../src/interface.c:3234 ../src/interface.c:3252 msgid "Left" msgstr "Links" -#: ../src/interface.c:3053 ../src/interface.c:3169 ../src/interface.c:3216 -#: ../src/interface.c:3234 ../src/interface.c:3252 +#: ../src/interface.c:3054 ../src/interface.c:3170 ../src/interface.c:3217 +#: ../src/interface.c:3235 ../src/interface.c:3253 msgid "Right" msgstr "Rechts" -#: ../src/interface.c:3059 +#: ../src/interface.c:3060 msgid "Sidebar" msgstr "Zijbalk" -#: ../src/interface.c:3080 +#: ../src/interface.c:3081 msgid "Symbol list:" msgstr "Lĳst van symbolen:" -#: ../src/interface.c:3087 ../src/interface.c:3202 +#: ../src/interface.c:3088 ../src/interface.c:3203 msgid "Message window:" msgstr "Berichtenvenster:" -#: ../src/interface.c:3094 ../src/interface.c:3238 +#: ../src/interface.c:3095 ../src/interface.c:3239 msgid "Editor:" msgstr "Editor:" -#: ../src/interface.c:3106 +#: ../src/interface.c:3107 msgid "Sets the font for the message window" msgstr "Stelt het lettertype in voor het berichtenvenster" -#: ../src/interface.c:3114 +#: ../src/interface.c:3115 #, fuzzy msgid "Sets the font for the symbol list" msgstr "Stelt het lettertype in voor de symbolenlijst" -#: ../src/interface.c:3122 +#: ../src/interface.c:3123 #, fuzzy msgid "Sets the editor font" msgstr "Lettertype editor" -#: ../src/interface.c:3124 +#: ../src/interface.c:3125 msgid "Fonts" msgstr "Lettertypes" -#: ../src/interface.c:3143 +#: ../src/interface.c:3144 msgid "Show editor tabs" msgstr "Laat editor tabs zien" -#: ../src/interface.c:3147 +#: ../src/interface.c:3148 msgid "Show close buttons" msgstr "Toon afsluit knoppen" -#: ../src/interface.c:3150 +#: ../src/interface.c:3151 msgid "" "Shows a small cross button in the file tabs to easily close files when " "clicking on it (requires restart of Geany)" msgstr "" -"Toont een kleine button met kruis in de bestandstabs, om gemakkelijk " -"bestanden te sluiten door daar op te klikken (vereist herstart van Geany)" +"Toont een kleine knop met kruis in de bestandstabs, om gemakkelijk bestanden " +"te sluiten door daar op te klikken (vereist herstart van Geany)" -#: ../src/interface.c:3156 +#: ../src/interface.c:3157 msgid "Placement of new file tabs:" msgstr "Plaats van nieuwe tabs:" -#: ../src/interface.c:3164 +#: ../src/interface.c:3165 #, fuzzy msgid "File tabs will be placed on the left of the notebook" msgstr "Nieuwe bestanden tabs zullen links van de tab lijst worden geplaatst" -#: ../src/interface.c:3172 +#: ../src/interface.c:3173 #, fuzzy msgid "File tabs will be placed on the right of the notebook" msgstr "Nieuwe bestanden tabs zullen rechts van de tab lijst worden geplaatst" -#: ../src/interface.c:3176 +#: ../src/interface.c:3177 msgid "Double-clicking hides all additional widgets" msgstr "Dubbelklikken verbergt alle toegevoegde widgets" -#: ../src/interface.c:3179 +#: ../src/interface.c:3180 msgid "Calls the View->Toggle All Additional Widgets command" -msgstr "Roept Bewerken->Verberg alle extra widgets aan" +msgstr "Roept Bewerken->Verberg/toon alle extra widgets aan" -#: ../src/interface.c:3181 +#: ../src/interface.c:3182 msgid "Editor tabs" msgstr "Editor tabbladen" -#: ../src/interface.c:3217 ../src/interface.c:3235 ../src/interface.c:3253 +#: ../src/interface.c:3218 ../src/interface.c:3236 ../src/interface.c:3254 msgid "Top" msgstr "Bovenaan" -#: ../src/interface.c:3218 ../src/interface.c:3236 ../src/interface.c:3254 +#: ../src/interface.c:3219 ../src/interface.c:3237 ../src/interface.c:3255 msgid "Bottom" msgstr "Onderaan" -#: ../src/interface.c:3220 +#: ../src/interface.c:3221 msgid "Sidebar:" msgstr "Zijbalk:" -#: ../src/interface.c:3256 +#: ../src/interface.c:3257 msgid "Tab positions" msgstr "Tab posities" -#: ../src/interface.c:3275 +#: ../src/interface.c:3276 msgid "Show status bar" msgstr "Statusregel weergeven" -#: ../src/interface.c:3278 +#: ../src/interface.c:3279 msgid "Whether to show the status bar at the bottom of the main window" -msgstr "" +msgstr "Of de statusregel onder aan het hoofdvenster weergegeven moet worden" -#: ../src/interface.c:3285 +#: ../src/interface.c:3286 ../src/prefs.c:1476 msgid "Interface" msgstr "Interface" -#: ../src/interface.c:3308 +#: ../src/interface.c:3309 msgid "Show T_oolbar" msgstr "Werkbalk weergeven" -#: ../src/interface.c:3312 +#: ../src/interface.c:3313 msgid "_Append Toolbar to the Menu" msgstr "Voeg de toolbar toe aan het menu" -#: ../src/interface.c:3315 +#: ../src/interface.c:3316 msgid "Pack the toolbar to the main menu to save vertical space" msgstr "Zet de werkbalk naast het menu om verticale ruimte te besparen" -#: ../src/interface.c:3317 +#: ../src/interface.c:3318 msgid "Toolbar" msgstr "Werkbalk" -#: ../src/interface.c:3338 +#: ../src/interface.c:3339 msgid "Icon style:" msgstr "Pictogramstijl:" -#: ../src/interface.c:3345 +#: ../src/interface.c:3346 msgid "Icon size:" msgstr "Pictogramgrootte:" -#: ../src/interface.c:3400 +#: ../src/interface.c:3401 msgid "Appearance" msgstr "Uiterlijk" -#: ../src/interface.c:3425 ../src/toolbar.c:883 +#: ../src/interface.c:3426 ../src/toolbar.c:893 msgid "Customize Toolbar" msgstr "Werkbalk aanpassen" -#: ../src/interface.c:3429 +#: ../src/interface.c:3430 ../src/prefs.c:1478 msgid "Toolbar" msgstr "Werkbalk" -#: ../src/interface.c:3456 +#: ../src/interface.c:3457 msgid "Line wrapping" msgstr "Regelterugloop" -#: ../src/interface.c:3459 +#: ../src/interface.c:3460 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 " @@ -1964,11 +1940,11 @@ "volgende regel. Let op: regelterugloop eist veel van uw systeem voor grote " "documenten, dus zou moeten worden uitgeschakeld op trage systemen." -#: ../src/interface.c:3461 +#: ../src/interface.c:3462 msgid "Enable \"smart\" home key" msgstr "Pas \"slimme\" home toets toe." -#: ../src/interface.c:3464 +#: ../src/interface.c:3465 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 " @@ -1982,31 +1958,31 @@ "optie uitgeschakeld is, beweegt de HOME toets de cursor altijd naar het " "begin van de regel." -#: ../src/interface.c:3466 +#: ../src/interface.c:3467 msgid "Disable Drag and Drop" msgstr "'Drag and Drop' uitzetten" -#: ../src/interface.c:3469 +#: ../src/interface.c:3470 msgid "" "Disable drag and drop completely in the editor window so you can't drag and " "drop any selections within or outside of the editor window" msgstr "" -"'Drag and Drop' geheel uitzetten in het editorvenster zodat je selecties van " -"of naar het venster kunt uitvoeren" +"'Drag and Drop' geheel uitzetten in het editorvenster zodat je geen " +"selecties van of naar het venster kunt verslepen" -#: ../src/interface.c:3471 +#: ../src/interface.c:3472 msgid "Enable folding" msgstr "Invouwen activeren" -#: ../src/interface.c:3474 +#: ../src/interface.c:3475 msgid "Whether to enable folding the code" msgstr "Of invouwen van code moet worden geactiveerd" -#: ../src/interface.c:3476 +#: ../src/interface.c:3477 msgid "Fold/unfold all children of a fold point" msgstr "Samenvoegen/uitklappen van onderliggende objecten van een vouwpunt" -#: ../src/interface.c:3479 +#: ../src/interface.c:3480 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." @@ -2014,11 +1990,11 @@ "Samenvoegen of uitklappen van een vouwpunt. Door tijdens het klikken op de " "Shift toets te drukken wordt het tegenovergestelde gedrag bereikt." -#: ../src/interface.c:3481 +#: ../src/interface.c:3482 msgid "Use indicators to show compile errors" msgstr "Gebruik markeringen om compile fouten weer te geven" -#: ../src/interface.c:3484 +#: ../src/interface.c:3485 msgid "" "Whether to use indicators (a squiggly underline) to highlight the lines " "where the compiler found a warning or an error" @@ -2027,124 +2003,124 @@ "regels te markeren waarin de compiler een waarschuwing of een fout heeft " "gevonden." -#: ../src/interface.c:3486 +#: ../src/interface.c:3487 msgid "Newline strips trailing spaces" msgstr "Enter verwijderd lege spaties" -#: ../src/interface.c:3489 +#: ../src/interface.c:3490 msgid "Enable newline to strip the trailing spaces on the previous line" msgstr "" "Gebruik enter om lege spaties aan het einde van de vorige regel te " "verwijderen" -#: ../src/interface.c:3495 +#: ../src/interface.c:3496 msgid "Line breaking column:" msgstr "Afbreekkolom:" -#: ../src/interface.c:3509 +#: ../src/interface.c:3510 #, fuzzy msgid "Comment toggle marker:" msgstr "'Lange regel' marker" -#: ../src/interface.c:3516 +#: ../src/interface.c:3517 msgid "" "A string which is added when toggling a line comment in a source file, it is " "used to mark the comment as toggled." msgstr "" -#: ../src/interface.c:3518 +#: ../src/interface.c:3519 msgid "Features" msgstr "Functies" -#: ../src/interface.c:3523 +#: ../src/interface.c:3524 msgid "Features" msgstr "Functies" -#: ../src/interface.c:3555 ../src/interface.c:5097 +#: ../src/interface.c:3556 ../src/interface.c:5104 msgid "Auto-indent mode:" msgstr "Automatische inspringingsmode:" -#: ../src/interface.c:3568 ../src/interface.c:5110 +#: ../src/interface.c:3569 ../src/interface.c:5117 msgid "Basic" msgstr "Basis" -#: ../src/interface.c:3569 ../src/interface.c:5111 +#: ../src/interface.c:3570 ../src/interface.c:5118 msgid "Current chars" msgstr "Huidige chars" -#: ../src/interface.c:3570 ../src/interface.c:5112 +#: ../src/interface.c:3571 ../src/interface.c:5119 msgid "Match braces" msgstr "haakjes" -#: ../src/interface.c:3572 ../src/interface.c:3923 ../src/interface.c:5114 +#: ../src/interface.c:3573 ../src/interface.c:3924 ../src/interface.c:5121 msgid "Type:" msgstr "Type:" -#: ../src/interface.c:3579 ../src/interface.c:5121 +#: ../src/interface.c:3580 ../src/interface.c:5128 msgid "Width:" msgstr "Breedte:" -#: ../src/interface.c:3592 ../src/interface.c:5134 +#: ../src/interface.c:3593 ../src/interface.c:5141 msgid "The width in chars of a single indent" msgstr "De breedte in tekens van een inspringing" -#: ../src/interface.c:3602 ../src/interface.c:5144 +#: ../src/interface.c:3603 ../src/interface.c:5151 msgid "Use spaces when inserting indentation" msgstr "Voeg spaties toe bij inspringen" -#: ../src/interface.c:3611 ../src/interface.c:5153 +#: ../src/interface.c:3612 ../src/interface.c:5160 msgid "Use one tab per indent" msgstr "Gebruik enkele inspringing" -#: ../src/interface.c:3620 ../src/interface.c:5162 +#: ../src/interface.c:3621 ../src/interface.c:5169 msgid "" "Use spaces if the total indent is less than the tab width, otherwise use both" msgstr "" "Gebruik spaties als de inspringing kleiner is dan een tabbreedte, gebruik " "anders beide" -#: ../src/interface.c:3635 ../src/interface.c:5184 +#: ../src/interface.c:3636 ../src/interface.c:5191 #, fuzzy msgid "Hard tab width:" msgstr "Tabgrootte:" -#: ../src/interface.c:3643 ../src/interface.c:5192 +#: ../src/interface.c:3644 ../src/interface.c:5199 msgid "The width of a tab when Tabs & Spaces is set for a document" msgstr "" "De breedte van een tab als Tabs en Spaties voor een document is ingesteld" -#: ../src/interface.c:3653 ../src/interface.c:5171 +#: ../src/interface.c:3654 ../src/interface.c:5178 msgid "" "Whether to detect the indentation type from file contents when a file is " "opened" msgstr "" -"Of het inspringingstype van het bestand gedetecteerd moet worden als het " -"wordt geopend" +"Of het inspringingstype van het bestand gedetecteerd moet worden als het is " +"geopend" -#: ../src/interface.c:3655 +#: ../src/interface.c:3656 msgid "Tab key indents" msgstr "Tabtoets springt in" -#: ../src/interface.c:3658 +#: ../src/interface.c:3659 msgid "" "Pressing tab/shift-tab indents/unindents instead of inserting a tab character" msgstr "" "Drukken op tab/shift-tab springt in/uit in plaat van een tabteken in te " "voegen" -#: ../src/interface.c:3660 +#: ../src/interface.c:3661 msgid "Indentation" msgstr "Inspringing" -#: ../src/interface.c:3665 ../src/interface.c:5197 +#: ../src/interface.c:3666 ../src/interface.c:5204 msgid "Indentation" msgstr "Inspringing" -#: ../src/interface.c:3688 +#: ../src/interface.c:3689 msgid "Snippet completion" msgstr "Fragment voltooiing" -#: ../src/interface.c:3691 +#: ../src/interface.c:3692 msgid "" "Type a defined short character sequence and complete it to a more complex " "string using a single keypress" @@ -2152,32 +2128,32 @@ "Typ een ingegeven afkorting en voltooi het in een complexere string met een " "druk op een knop" -#: ../src/interface.c:3693 +#: ../src/interface.c:3694 msgid "XML tag autocompletion" msgstr "XML-tag voltooiing" -#: ../src/interface.c:3696 +#: ../src/interface.c:3697 msgid "Automatic completion and closing of XML tags (includes HTML tags)" msgstr "" "Automatische voltooiing en sluiting van open XML-tags (inclusief HTML-tags)" -#: ../src/interface.c:3698 +#: ../src/interface.c:3699 msgid "Automatic continuation of multi-line comments" -msgstr "Automatisch doorgaan met multiregel commentaar" +msgstr "Automatisch doorgaan met multiregelcommentaar" -#: ../src/interface.c:3701 +#: ../src/interface.c:3702 msgid "" "Continue automatically multi-line comments in languages like C, C++ and Java " "when a new line is entered inside such a comment" msgstr "" -"Automatisch doorgaan met multiregel commentaar in talen als C, C++ en Java " +"Automatisch doorgaan met multiregelcommentaar in talen als C, C++ en Java " "als er een nieuwe regel in zo'n commentaar wordt ingevoegd" -#: ../src/interface.c:3703 +#: ../src/interface.c:3704 msgid "Autocomplete symbols" msgstr "Symbolen automatisch aanvullen" -#: ../src/interface.c:3706 +#: ../src/interface.c:3707 msgid "" "Automatic completion of known symbols in open files (function names, global " "variables, ...)" @@ -2185,141 +2161,141 @@ "Automatisch aanvullen van bekende symbolen in open bestanden (functienamen, " "globale variabelen, ...)" -#: ../src/interface.c:3708 +#: ../src/interface.c:3709 msgid "Autocomplete all words in document" msgstr "Vul automatisch aan met alle woorden in het document" -#: ../src/interface.c:3712 +#: ../src/interface.c:3713 msgid "Drop rest of word on completion" msgstr "Automatische voltooiing onderdrukken" -#: ../src/interface.c:3722 +#: ../src/interface.c:3723 msgid "Max. symbol name suggestions:" msgstr "Max. aantal symboolnaam suggesties:" -#: ../src/interface.c:3729 +#: ../src/interface.c:3730 msgid "Completion list height:" msgstr "Aanvullingslijst hoogte:" -#: ../src/interface.c:3736 +#: ../src/interface.c:3737 msgid "Characters to type for autocompletion:" msgstr "Automatische voltooiing van constructies" -#: ../src/interface.c:3749 +#: ../src/interface.c:3750 msgid "" "The amount of characters which are necessary to show the symbol " "autocompletion list" -msgstr "Het aantal tekens dat nodig is om de autovoltooiingslijst te tonen" +msgstr "Het aantal karakters dat nodig is om de autovoltooiingslijst te tonen" -#: ../src/interface.c:3758 +#: ../src/interface.c:3759 msgid "Display height in rows for the autocompletion list" msgstr "Weergavehoogte in regels van de autovoltooiingslijst" -#: ../src/interface.c:3767 +#: ../src/interface.c:3768 msgid "Maximum number of entries to display in the autocompletion list" msgstr "Maximum aantal items weer te geven in de autovoltooiingslijst" -#: ../src/interface.c:3770 +#: ../src/interface.c:3771 msgid "Completions" msgstr "Automatisch voltooien" -#: ../src/interface.c:3790 +#: ../src/interface.c:3791 msgid "Parenthesis ( )" msgstr "Haakjes ( )" -#: ../src/interface.c:3795 +#: ../src/interface.c:3796 msgid "Auto-close parenthesis when typing an opening one" msgstr "Sluit haakjes automatisch af bij het typen van een nieuw haakje" -#: ../src/interface.c:3797 +#: ../src/interface.c:3798 msgid "Single quotes ' '" msgstr "Enkele aanhalingstekens" -#: ../src/interface.c:3802 +#: ../src/interface.c:3803 msgid "Auto-close simple quote when typing an opening one" msgstr "Sluit bij een nieuw aanhalingsteken deze automatisch af" -#: ../src/interface.c:3804 +#: ../src/interface.c:3805 msgid "Curly brackets { }" msgstr "Gekrulde haken { }" -#: ../src/interface.c:3809 +#: ../src/interface.c:3810 msgid "Auto-close curly bracket when typing an opening one" msgstr "Sluit bij een nieuw gekrulde haakje deze automatisch af" -#: ../src/interface.c:3811 +#: ../src/interface.c:3812 msgid "Square brackets [ ]" msgstr "Vierkante haken [ ]" -#: ../src/interface.c:3816 +#: ../src/interface.c:3817 msgid "Auto-close square-bracket when typing an opening one" msgstr "Sluit bij een nieuw vierkant haakje deze automatisch af" -#: ../src/interface.c:3818 +#: ../src/interface.c:3819 msgid "Double quotes \" \"" msgstr "Aanhalingstekens \" \"" -#: ../src/interface.c:3823 +#: ../src/interface.c:3824 msgid "Auto-close double quote when typing an opening one" msgstr "Sluit bij een nieuw aanhalingsteken deze automatisch af" -#: ../src/interface.c:3825 +#: ../src/interface.c:3826 msgid "Auto-close quotes and brackets" msgstr "Automatisch sluiten van haakjes en aanhalingstekens" -#: ../src/interface.c:3830 +#: ../src/interface.c:3831 msgid "Completions" msgstr "Voltooiing" -#: ../src/interface.c:3853 +#: ../src/interface.c:3854 msgid "Invert syntax highlighting colors" msgstr "Draai syntaxisaccentuering kleuren om" -#: ../src/interface.c:3856 +#: ../src/interface.c:3857 msgid "Invert all colors, by default using white text on a black background" msgstr "" "Draai alle kleuren om, standaard met een witte tekst op een zwarte " "achtergrond" -#: ../src/interface.c:3858 +#: ../src/interface.c:3859 msgid "Show indentation guides" msgstr "Inspringingsmarkeringen weergeven" -#: ../src/interface.c:3861 +#: ../src/interface.c:3862 msgid "Shows small dotted lines to help you to use the right indentation" msgstr "" "Toont kleine stippellijnen om het gebruik van de juiste inspringing te " "vergemakkelijken" -#: ../src/interface.c:3863 +#: ../src/interface.c:3864 msgid "Show white space" msgstr "Lege spaties weergeven" -#: ../src/interface.c:3866 +#: ../src/interface.c:3867 msgid "Marks spaces with dots and tabs with arrows" msgstr "Markeert spaties met punten en tabs met pijlen" -#: ../src/interface.c:3868 +#: ../src/interface.c:3869 msgid "Show line endings" msgstr "Regeleinden weergeven" -#: ../src/interface.c:3871 +#: ../src/interface.c:3872 msgid "Shows the line ending character" msgstr "Toont het regeleindeteken" -#: ../src/interface.c:3873 +#: ../src/interface.c:3874 msgid "Show line numbers" msgstr "Regelnummers weergeven" -#: ../src/interface.c:3876 +#: ../src/interface.c:3877 msgid "Shows or hides the Line Number margin" msgstr "Toont of verbergt de regelnummerrand" -#: ../src/interface.c:3878 +#: ../src/interface.c:3879 msgid "Show markers margin" msgstr "Markeerrand weergeven" -#: ../src/interface.c:3881 +#: ../src/interface.c:3882 msgid "" "Shows or hides the small margin right of the line numbers, which is used to " "mark lines" @@ -2327,38 +2303,38 @@ "Toont of verbergt de smalle rand rechts van de regelnummers die wordt " "gebruikt om regels te markeren" -#: ../src/interface.c:3883 +#: ../src/interface.c:3884 msgid "Stop scrolling at last line" msgstr "Stop scrollen bij de laatste regel" -#: ../src/interface.c:3886 +#: ../src/interface.c:3887 msgid "Whether to stop scrolling one page past the last line of a document" msgstr "" "Of scrollen van een pagina na de laatste regel van een document gestopt moet " "worden" -#: ../src/interface.c:3888 +#: ../src/interface.c:3889 msgid "Display" msgstr "Weergave" -#: ../src/interface.c:3909 +#: ../src/interface.c:3910 msgid "Long line marker:" msgstr "'Lange regel' marker:" -#: ../src/interface.c:3916 +#: ../src/interface.c:3917 msgid "Long line marker color:" msgstr "Kleur van 'lange regel' marker:" -#: ../src/interface.c:3935 +#: ../src/interface.c:3936 msgid "Sets the color of the long line marker" msgstr "Stelt de kleur van de 'lange regel' marker in" -#: ../src/interface.c:3936 ../src/toolbar.c:70 ../src/tools.c:717 +#: ../src/interface.c:3937 ../src/toolbar.c:70 ../src/tools.c:717 #: ../src/vte.c:797 ../src/vte.c:804 msgid "Color Chooser" msgstr "Kleurkiezer" -#: ../src/interface.c:3944 +#: ../src/interface.c:3945 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 " @@ -2369,11 +2345,11 @@ "een grotere waarde dan '0' in om de kolom te bepalen waar deze moet " "verschijnen." -#: ../src/interface.c:3954 +#: ../src/interface.c:3955 msgid "Line" msgstr "Lijn" -#: ../src/interface.c:3957 +#: ../src/interface.c:3958 msgid "" "Prints a vertical line in the editor window at the given cursor position " "(see below)" @@ -2381,62 +2357,62 @@ "Geeft een verticale lijn weer in het venster van de editor op de huidige " "cursorpositie (zie hieronder)" -#: ../src/interface.c:3961 +#: ../src/interface.c:3962 msgid "Background" msgstr "Achtergrond" -#: ../src/interface.c:3964 +#: ../src/interface.c:3965 msgid "" "The background color of characters after the given cursor position (see " "below) changed to the color set below, (this is recommended if you use " "proportional fonts)" msgstr "" -"De achtergrondkleur van tekens na de bepaalde cursorpositie (zie hieronder) " -"veranderde naar de kleurinstelling hieronder. (Aangeraden indien u " -"proportionele lettertypen gebruikt)" +"De achtergrondkleur van karakters na de bepaalde cursorpositie (zie " +"hieronder) veranderde naar de kleurinstelling hieronder. (Aangeraden indien " +"u proportionele lettertypen gebruikt)" -#: ../src/interface.c:3968 +#: ../src/interface.c:3969 msgid "Disabled" msgstr "Uitgeschakeld" -#: ../src/interface.c:3974 +#: ../src/interface.c:3975 msgid "Long line marker" msgstr "Lange regel marker" -#: ../src/interface.c:3979 +#: ../src/interface.c:3980 msgid "Display" msgstr "Weergave" -#: ../src/interface.c:4010 +#: ../src/interface.c:4011 msgid "Open new documents from the command-line" msgstr "Open nieuwe bestanden van de opdrachtregel" -#: ../src/interface.c:4013 +#: ../src/interface.c:4014 msgid "Start a new file for each command-line filename that doesn't exist" msgstr "" "Open een nieuw bestand voor elk bestand op de opdrachtregel die niet bestaat" -#: ../src/interface.c:4027 +#: ../src/interface.c:4028 msgid "Default end of line characters:" msgstr "Standaard regeleindetekens:" -#: ../src/interface.c:4034 +#: ../src/interface.c:4035 msgid "New files" msgstr "Nieuwe bestanden" -#: ../src/interface.c:4057 +#: ../src/interface.c:4058 msgid "Default encoding (new files):" msgstr "Standaard codering (nieuwe bestanden):" -#: ../src/interface.c:4065 +#: ../src/interface.c:4066 msgid "Sets the default encoding for newly created files" msgstr "Stelt de standaard codering in voor nieuw aangemaakte bestanden" -#: ../src/interface.c:4071 +#: ../src/interface.c:4072 msgid "Use fixed encoding when opening non-Unicode files" msgstr "Gebruik vaste codering bij het openen van niet-Unicode bestanden" -#: ../src/interface.c:4074 +#: ../src/interface.c:4075 msgid "" "This option disables the automatic detection of the file encoding when " "opening non-Unicode files and opens the file with the specified encoding " @@ -2446,64 +2422,63 @@ "bij openen van niet-Unicode bestanden en opent het bestand met de opgegeven " "codering (meestal niet nodig)" -#: ../src/interface.c:4080 +#: ../src/interface.c:4081 msgid "Default encoding (existing non-Unicode files):" msgstr "Standaard codering (bestaande niet-Unicode bestanden):" -#: ../src/interface.c:4088 +#: ../src/interface.c:4089 msgid "Sets the default encoding for opening existing non-Unicode files" msgstr "" "Stelt de standaard codering in voor bij het openen van niet-Unicode bestanden" -#: ../src/interface.c:4094 +#: ../src/interface.c:4095 msgid "Encodings" msgstr "Coderingen" -#: ../src/interface.c:4113 +#: ../src/interface.c:4114 msgid "Ensure new line at file end" msgstr "Nieuwe regel aan einde van het bestand" -#: ../src/interface.c:4116 +#: ../src/interface.c:4117 msgid "Ensures that at the end of the file is a new line" msgstr "" -"Voegt aan het einde van het bestand een nieuwe regel in als er geen " -"voorhanden is" +"Voegt aan het einde van het bestand een nieuwe regel toe als er nog geen is" -#: ../src/interface.c:4118 +#: ../src/interface.c:4119 msgid "Strip trailing spaces and tabs" msgstr "Lege spaties aan regeleinden verwijderen" -#: ../src/interface.c:4121 +#: ../src/interface.c:4122 msgid "Removes trailing spaces and tabs and the end of lines" msgstr "Verwijdert lege spaties aan regeleinden" -#: ../src/interface.c:4123 ../src/keybindings.c:506 +#: ../src/interface.c:4124 ../src/keybindings.c:506 msgid "Replace tabs by space" msgstr "Vervang tabs door spaties" -#: ../src/interface.c:4126 +#: ../src/interface.c:4127 msgid "Replaces all tabs in document by spaces" msgstr "Vervangt alle tabs in het document door spaties" -#: ../src/interface.c:4128 +#: ../src/interface.c:4129 msgid "Saving files" msgstr "Bij opslaan van bestanden" -#: ../src/interface.c:4153 +#: ../src/interface.c:4154 msgid "Recent files list length:" msgstr "Lengte 'laatst geopende bestanden' lijst:" -#: ../src/interface.c:4167 +#: ../src/interface.c:4168 msgid "Specifies the number of files which are stored in the Recent files list" msgstr "" "Specificeert het aantal bestanden die opgeslagen zijn in de 'laatst geopende " "bestanden' lijst" -#: ../src/interface.c:4171 +#: ../src/interface.c:4172 msgid "Disk check timeout:" msgstr "Time-out van disk:" -#: ../src/interface.c:4184 +#: ../src/interface.c:4185 msgid "" "How often to check for changes to document files on disk, in seconds. Zero " "disables checking." @@ -2511,19 +2486,20 @@ "Hoe vaak er naar veranderingen van documenten op de schijf gekeken moet " "worden, uitgedrukt in seconden. Nul zet de controle uit." -#: ../src/interface.c:4193 ../src/symbols.c:593 ../plugins/filebrowser.c:1031 +#: ../src/interface.c:4194 ../src/prefs.c:1482 ../src/symbols.c:593 +#: ../plugins/filebrowser.c:1031 msgid "Files" msgstr "Bestanden" -#: ../src/interface.c:4226 +#: ../src/interface.c:4227 msgid "Terminal:" msgstr "Terminal:" -#: ../src/interface.c:4233 +#: ../src/interface.c:4234 msgid "Browser:" msgstr "Browser:" -#: ../src/interface.c:4245 +#: ../src/interface.c:4246 msgid "" "A terminal emulator like xterm, gnome-terminal or konsole (should accept the " "-e argument)" @@ -2531,92 +2507,93 @@ "Een terminalemulator zoals xterm, gnome-terminal of konsole (zou het -e " "argument moeten accepteren" -#: ../src/interface.c:4252 +#: ../src/interface.c:4253 msgid "Path (and possibly additional arguments) to your favorite browser" msgstr "Pad (en mogelijke bijkomende argumenten)" -#: ../src/interface.c:4274 +#: ../src/interface.c:4275 msgid "Grep:" msgstr "Grep:" -#: ../src/interface.c:4297 +#: ../src/interface.c:4298 msgid "Tool paths" msgstr "Hulpprogramma plaatsen" -#: ../src/interface.c:4318 -#, fuzzy +#: ../src/interface.c:4319 msgid "Context action:" -msgstr "_In selectie" +msgstr "Contextactie:" -#: ../src/interface.c:4329 +#: ../src/interface.c:4330 #, c-format msgid "" "Context action command. The currently selected word can be used with %s. It " "can appear anywhere in the given command and will be replaced before " "execution." msgstr "" +"Contextactie commando. Het geselecteerde woord kan gebruikt worden met %s. " +"Het kan overal in het commando zitten en wordt vervangen voor uitvoering." -#: ../src/interface.c:4342 +#: ../src/interface.c:4343 msgid "Commands" msgstr "Commando's" -#: ../src/interface.c:4347 ../src/keybindings.c:540 +#: ../src/interface.c:4348 ../src/keybindings.c:540 ../src/prefs.c:1484 msgid "Tools" msgstr "Hulpprogramma's" -#: ../src/interface.c:4381 +#: ../src/interface.c:4382 msgid "email address of the developer" msgstr "E-mailadres van de ontwikkelaar" -#: ../src/interface.c:4388 +#: ../src/interface.c:4389 msgid "Initials of the developer name" msgstr "Initialen van de ontwikkelaar" -#: ../src/interface.c:4390 +#: ../src/interface.c:4391 msgid "Initial version:" msgstr "Initiële versie:" -#: ../src/interface.c:4402 +#: ../src/interface.c:4403 msgid "Version number, which a new file initially has" msgstr "Versienummer, welke een nieuw bestand initieel heeft" -#: ../src/interface.c:4409 +#: ../src/interface.c:4410 msgid "Company name" msgstr "Bedrijfsnaam" -#: ../src/interface.c:4411 +#: ../src/interface.c:4412 msgid "Developer:" msgstr "Ontwikkelaar:" -#: ../src/interface.c:4418 +#: ../src/interface.c:4419 msgid "Company:" msgstr "Bedrijf:" -#: ../src/interface.c:4425 +#: ../src/interface.c:4426 msgid "Mail address:" msgstr "E-mailadres:" -#: ../src/interface.c:4432 +#: ../src/interface.c:4433 msgid "Initials:" msgstr "Initialen:" -#: ../src/interface.c:4444 +#: ../src/interface.c:4445 msgid "The name of the developer" msgstr "De naam van de ontwikkelaar" -#: ../src/interface.c:4446 +#: ../src/interface.c:4447 msgid "Year:" msgstr "Jaar:" -#: ../src/interface.c:4453 +#: ../src/interface.c:4454 msgid "Date:" msgstr "Datum:" -#: ../src/interface.c:4460 +#: ../src/interface.c:4461 msgid "Date & Time:" msgstr "Datum & Tijd;" -#: ../src/interface.c:4472 +#: ../src/interface.c:4473 #, fuzzy msgid "" "Specify a format for the the {datetime} wildcard. You can use any conversion " @@ -2626,7 +2603,7 @@ "maken van elke conversie specifieerder welke kan gebruikt worden met de ANSI " "C strftime functie. Lees \"man strftime\" voor meer informatie." -#: ../src/interface.c:4479 +#: ../src/interface.c:4480 #, fuzzy msgid "" "Specify a format for the the {year} wildcard. You can use any conversion " @@ -2636,7 +2613,7 @@ "het even welke conversie specifieerder welke kan gebruikt worden met de ANSI " "C strftime functie. Lees \"man strftime\" voor meer informatie." -#: ../src/interface.c:4486 +#: ../src/interface.c:4487 #, fuzzy msgid "" "Specify a format for the the {date} wildcard. You can use any conversion " @@ -2646,65 +2623,65 @@ "het even welke conversie specifieerder welke kan gebruikt worden met de ANSI " "C strftime functie. Lees \"man strftime\" voor meer informatie." -#: ../src/interface.c:4488 +#: ../src/interface.c:4489 msgid "Template data" msgstr "Sjablooninformatie" -#: ../src/interface.c:4493 +#: ../src/interface.c:4494 ../src/prefs.c:1486 msgid "Templates" msgstr "Sjablonen" -#: ../src/interface.c:4531 +#: ../src/interface.c:4532 msgid "C_hange" msgstr "_Wijzigen" -#: ../src/interface.c:4535 +#: ../src/interface.c:4536 msgid "Keyboard shortcuts" msgstr "Sneltoetsen" -#: ../src/interface.c:4540 +#: ../src/interface.c:4541 ../src/prefs.c:1488 msgid "Keybindings" msgstr "Sneltoetsen" -#: ../src/interface.c:4563 +#: ../src/interface.c:4564 msgid "Command:" msgstr "Commando:" -#: ../src/interface.c:4570 +#: ../src/interface.c:4571 #, c-format msgid "Path to the command for printing files (use %f for the filename)" msgstr "" "Pad naar het commando om bestanden af te drukken (gebruik %f voor de " "bestandsnaam)" -#: ../src/interface.c:4580 +#: ../src/interface.c:4581 msgid "Use an external command for printing" msgstr "Gebruik een externe opdrachtregel om te printen" -#: ../src/interface.c:4600 ../src/printing.c:381 +#: ../src/interface.c:4601 ../src/printing.c:381 msgid "Print line numbers" msgstr "Print regelnummers" -#: ../src/interface.c:4603 ../src/printing.c:383 +#: ../src/interface.c:4604 ../src/printing.c:383 msgid "Add line numbers to the printed page" msgstr "Voeg regelnummers toe aan het te printen bestand" -#: ../src/interface.c:4605 ../src/printing.c:386 +#: ../src/interface.c:4606 ../src/printing.c:386 msgid "Print page numbers" msgstr "Print paginanummers" -#: ../src/interface.c:4608 ../src/printing.c:388 +#: ../src/interface.c:4609 ../src/printing.c:388 msgid "" "Add page numbers at the bottom of each page. It takes 2 lines of the page." msgstr "" "Voeg paginanummers toe aan de onderkant van elke pagina. Kost 2 regels per " "pagina." -#: ../src/interface.c:4610 ../src/printing.c:391 +#: ../src/interface.c:4611 ../src/printing.c:391 msgid "Print page header" msgstr "Print paginahoofd" -#: ../src/interface.c:4613 ../src/printing.c:393 +#: ../src/interface.c:4614 ../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." @@ -2713,21 +2690,21 @@ "bestandsnaam en de huidige datum (zie hieronder). Kost 3 regels van de " "pagina." -#: ../src/interface.c:4630 ../src/printing.c:409 +#: ../src/interface.c:4631 ../src/printing.c:409 msgid "Use the basename of the printed file" msgstr "Gebruik de naam van het te printen bestand" -#: ../src/interface.c:4633 +#: ../src/interface.c:4634 msgid "Print only the basename (without the path) of the printed file" msgstr "" "Print alleen de naam van het bestand (zonder het pad) van het te printen " "bestand" -#: ../src/interface.c:4639 ../src/printing.c:417 +#: ../src/interface.c:4640 ../src/printing.c:417 msgid "Date format:" msgstr "Datumformaat:" -#: ../src/interface.c:4646 ../src/printing.c:423 +#: ../src/interface.c:4647 ../src/printing.c:423 #, fuzzy msgid "" "Specify a format for the date and time stamp which is added to the page " @@ -2738,16 +2715,16 @@ "het even welke conversie specifieerder welke kan gebruikt worden met de ANSI " "C strftime functie. Lees \"man strftime\" voor meer informatie." -#: ../src/interface.c:4649 +#: ../src/interface.c:4650 msgid "Use native GTK printing" msgstr "Gebruik standaard GTK printing" -#: ../src/interface.c:4655 +#: ../src/interface.c:4656 ../src/prefs.c:1490 #, fuzzy msgid "Printing" msgstr "Afdrukken" -#: ../src/interface.c:5080 +#: ../src/interface.c:5087 msgid "Project Properties" msgstr "Eigenschappen" @@ -2796,9 +2773,8 @@ msgstr "Bestand herladen" #: ../src/keybindings.c:248 ../src/project.c:522 -#, fuzzy msgid "Project" -msgstr "Make _object" +msgstr "Project" #: ../src/keybindings.c:251 msgid "Project properties" @@ -2841,9 +2817,8 @@ msgstr "Automatisch voltooien onderdrukken" #: ../src/keybindings.c:285 -#, fuzzy msgid "Context Action" -msgstr "_In selectie" +msgstr "Contextactie" #: ../src/keybindings.c:287 msgid "Complete word" @@ -2912,9 +2887,8 @@ msgstr "Indeling" #: ../src/keybindings.c:335 -#, fuzzy msgid "Toggle Case of Selection" -msgstr "Schakel regelcommentaar uit" +msgstr "Maak selectie onder- of bovenkast" #: ../src/keybindings.c:337 msgid "Toggle line commentation" @@ -2972,7 +2946,7 @@ msgid "Settings" msgstr "Instellingen" -#: ../src/keybindings.c:384 ../src/toolbar.c:350 +#: ../src/keybindings.c:384 ../src/toolbar.c:360 msgid "Search" msgstr "Zoeken" @@ -3081,7 +3055,7 @@ #: ../src/keybindings.c:451 msgid "Toggle All Additional Widgets" -msgstr "Verberg alle extra widgets" +msgstr "Verberg/toon alle extra widgets" #: ../src/keybindings.c:454 msgid "Fullscreen" @@ -3104,9 +3078,8 @@ msgstr "Uitzoomen" #: ../src/keybindings.c:465 -#, fuzzy msgid "Focus" -msgstr "_Document" +msgstr "Focus" #: ../src/keybindings.c:468 msgid "Switch to Editor" @@ -3257,7 +3230,7 @@ msgid "The following keyboard shortcuts are configurable:" msgstr "Volgende sneltoetsen zijn gedefinieert:" -#: ../src/keybindings.c:1694 +#: ../src/keybindings.c:1740 msgid "Switch to Document" msgstr "Schakel naar document" @@ -3266,9 +3239,8 @@ msgstr "Type hier wat u wilt, gebruik het als notitie/krabbelbord" #: ../src/keyfile.c:1027 -#, fuzzy msgid "Failed to load one or more session files." -msgstr "bestanden van vorige sessies niet laden" +msgstr "Kon bestanden van vorige sessies niet laden." #: ../src/log.c:181 #, fuzzy @@ -3280,15 +3252,16 @@ "Set initial column number for the first opened file (useful in conjunction " "with --line)" msgstr "" +"Stel initiële kolomnummer in voor het eerstgeopende bestand (handig in " +"samenwerking met --line)" #: ../src/main.c:123 -#, fuzzy msgid "Use an alternate configuration directory" -msgstr "gebruik een alternatieve configuratiemap" +msgstr "Gebruik een alternatieve configuratiemap" #: ../src/main.c:124 msgid "Print internal filetype names" -msgstr "" +msgstr "Geef interne bestandstype-namen weer" #: ../src/main.c:125 #, fuzzy @@ -3298,96 +3271,97 @@ #: ../src/main.c:126 msgid "Don't preprocess C/C++ files when generating tags" msgstr "" +"Laat voorbewerking C/C++ bestanden achterwege bij het genereren van labels" #: ../src/main.c:128 #, fuzzy msgid "Don't open files in a running instance, force opening a new instance" msgstr "" -"open geen bestanden tijdens een actie, forceer openen van een nieuwe " -"instantie" +"Open geen bestanden in een al geopend venster van Geany, forceer het openen " +"in een nieuw venster" -#: ../src/main.c:130 -msgid "Set initial line number for the first opened file" +#: ../src/main.c:129 +msgid "" +"Use this socket filename for communication with a running Geany instance" msgstr "" #: ../src/main.c:131 -#, fuzzy +msgid "Set initial line number for the first opened file" +msgstr "Stel initiële regelnummer in voor het eerstgeopende bestand" + +#: ../src/main.c:132 msgid "Don't show message window at startup" msgstr "toon geen berichtenvenster bij opstarten" -#: ../src/main.c:132 -#, fuzzy +#: ../src/main.c:133 msgid "Don't load auto completion data (see documentation)" -msgstr "autovoltooiingsdata niet laden (zie documentatie)" +msgstr "Autovoltooiingsdata niet laden (zie documentatie)" -#: ../src/main.c:134 +#: ../src/main.c:135 msgid "Don't load plugins" msgstr "Plugins niet laden" -#: ../src/main.c:136 +# Of installatiedirectory's? +#: ../src/main.c:137 msgid "Print Geany's installation prefix" -msgstr "" +msgstr "Print Geany's installatieprefix" -#: ../src/main.c:137 +#: ../src/main.c:138 msgid "Don't load the previous session's files" msgstr "bestanden van vorige sessies niet laden" -#: ../src/main.c:139 -#, fuzzy +#: ../src/main.c:140 msgid "Don't load terminal support" -msgstr "terminalondersteuning niet laden" +msgstr "Terminalondersteuning niet laden" -#: ../src/main.c:140 -#, fuzzy +#: ../src/main.c:141 msgid "Filename of libvte.so" -msgstr "bestandsnaam van libvte.so" +msgstr "Bestandsnaam van libvte.so" -#: ../src/main.c:142 +#: ../src/main.c:143 msgid "Be verbose" -msgstr "" +msgstr "Uitvoerig toelichten" -#: ../src/main.c:143 -#, fuzzy +#: ../src/main.c:144 msgid "Show version and exit" -msgstr "toon versie en sluit af" +msgstr "Toon versie en sluit af" -#: ../src/main.c:470 +#: ../src/main.c:471 msgid "[FILES...]" -msgstr "" +msgstr "[BESTANDEN...]" -#: ../src/main.c:487 +#: ../src/main.c:488 #, c-format msgid "(built on %s with GTK %d.%d.%d, GLib %d.%d.%d)" msgstr "(gebouwd op %s met GTK %d.%d.%d, GLib %d.%d.%d)" -#: ../src/main.c:578 +#: ../src/main.c:584 msgid "Move it now?" msgstr "Nu verplaatsen?" -#: ../src/main.c:580 +#: ../src/main.c:586 msgid "Geany needs to move your old configuration directory before starting." -msgstr "" +msgstr "Geany moet je oude configuratiemap verplaatsen voor het starten." -#: ../src/main.c:589 +#: ../src/main.c:595 #, c-format msgid "" "Your configuration directory has been successfully moved from \"%s\" to \"%s" "\"." -msgstr "" -"Je configuratie directory is succesvol verschoven van \"%s\" naar \"%s\"." +msgstr "Je configuratiemap is succesvol verplaatst van \"%s\" naar \"%s\"." #. for translators: the third %s in brackets is the error message which #. * describes why moving the dir didn't work -#: ../src/main.c:599 +#: ../src/main.c:605 #, c-format msgid "" "Your old configuration directory \"%s\" could not be moved to \"%s\" (%s). " "Please move manually the directory to the new location." msgstr "" -"Je oude configuratie directory \"%s\" kon niet worden verschoven naar \"%s" -"\" (%s). Zet de directory handmatig op de nieuwe locatie." +"Je oude configuratiemap \"%s\" kon niet worden verplaatst naar \"%s\" (%s). " +"Verplaats de map alstublieft naar de nieuwe plaats." -#: ../src/main.c:680 +#: ../src/main.c:686 #, c-format msgid "" "Configuration directory could not be created (%s).\n" @@ -3399,17 +3373,17 @@ "configuratiemap.\n" "Geany sowieso starten?" -#: ../src/main.c:977 +#: ../src/main.c:983 #, c-format msgid "This is Geany %s." msgstr "Dit is Geany %s." -#: ../src/main.c:979 +#: ../src/main.c:985 #, c-format msgid "Configuration directory could not be created (%s)." msgstr "Configuratiemap kon niet worden aangemaakt (%s)." -#: ../src/main.c:1199 +#: ../src/main.c:1205 #, fuzzy msgid "Configuration files reloaded." msgstr "%s configuratiebestand, bewerk het inien nodig" @@ -3420,12 +3394,11 @@ #: ../src/msgwindow.c:515 msgid "Copy _All" -msgstr "_Alles copiëren" +msgstr "_Alles kopiëren" #: ../src/msgwindow.c:545 -#, fuzzy msgid "_Hide Message Window" -msgstr "Berichtenvenster" +msgstr "Ver_berg berichtenvenster" #: ../src/plugins.c:424 #, c-format @@ -3433,12 +3406,12 @@ "The plugin \"%s\" is not binary compatible with this release of Geany - " "please recompile it." msgstr "" -"Plugin \"%s\" is niet binary compatibel met deze release van Geany - " +"Plugin \"%s\" is binair niet compatibel met deze release van Geany - " "hercompileren vereist." #: ../src/plugins.c:866 msgid "_Plugin Manager" -msgstr "_Plugin Manager" +msgstr "_Plugin beheer" #: ../src/plugins.c:1024 #, c-format @@ -3452,9 +3425,8 @@ "Auteur(s): %s" #: ../src/plugins.c:1096 -#, fuzzy msgid "Active" -msgstr "Actie" +msgstr "Actief" #: ../src/plugins.c:1102 msgid "Plugin" @@ -3495,9 +3467,8 @@ msgstr "_Alles uitvouwen" #: ../src/prefs.c:215 ../src/symbols.c:1850 -#, fuzzy msgid "_Collapse All" -msgstr "_Alles sluiten" +msgstr "Alles _invouwen" #: ../src/prefs.c:274 msgid "Action" @@ -3509,34 +3480,35 @@ #: ../src/prefs.c:1373 msgid "_Override" -msgstr "" +msgstr "_Overschrijf" #: ../src/prefs.c:1373 msgid "_Allow" -msgstr "" +msgstr "_Toestaan" #: ../src/prefs.c:1374 msgid "Override that keybinding?" -msgstr "" +msgstr "Overschrijf die sneltoets?" #: ../src/prefs.c:1375 -#, fuzzy, c-format +#, c-format msgid "The combination '%s' is already used for \"%s\"." -msgstr "" -"Ge combinatie '%s' is reeds in gebruik voor \"%s\". Gelieve een andere te " -"kiezen." +msgstr "De combinatie '%s' is al in gebruik voor \"%s\"." +#: ../src/prefs.c:1492 ../src/vte.c:301 ../src/vte.c:760 +msgid "Terminal" +msgstr "Terminal" + #. add manually GeanyWrapLabels because they can't be added with Glade #. page Tools -#: ../src/prefs.c:1493 +#: ../src/prefs.c:1564 msgid "Enter tool paths below. Tools you do not need can be left blank." msgstr "" "Voer hier de paden in voor hulpprogramma's. Hulpprogramma's die je niet " -"gebruikt kunnen leeg gelaten worden.(hulpprogramma's die u niet nodig heeft " -"kunt u leeg laten)" +"gebruikt kunnen leeg gelaten worden." #. page Templates -#: ../src/prefs.c:1498 +#: ../src/prefs.c:1569 #, fuzzy msgid "" "Set the information to be used in templates. See the documentation for " @@ -3545,7 +3517,7 @@ "Specificeer hier de informatie die u wenst te gebruiken in sjablonen.\n" "Lees de documentatie indien u niet weet hoe sjablonen werken." -#: ../src/prefs.c:1502 +#: ../src/prefs.c:1573 msgid "" "Notice: For all changes you make here to take effect, you need to restart " "Geany or force the reload of the settings using Tools->Reload Configuration." @@ -3556,20 +3528,18 @@ ">Herlaad Configuratie." #. page Keybindings -#: ../src/prefs.c:1508 -#, fuzzy +#: ../src/prefs.c:1579 msgid "" "Here you can change keyboard shortcuts for various actions. Select one and " "press the Change button to enter a new shortcut, or double click on an " "action to edit the string representation of the shortcut directly." msgstr "" "Hier kunt u sneltoetsen wijzigen voor allerlei acties. Selecteer er een en " -"druk op de Dubbelklik op of selecteer een actie en druk op de knop " -"'Wijzigen' om een nieuwe snelkoppeling in te geven. U kunt ook de " -"stringrepresentatie rechtstreeks wijzigen." +"druk op de 'Wijzigen' knop om een nieuwe sneltoets toe te wijzen, of " +"dubbelklik op een actie om de stringrepresentatie direct te wijzigen." #. page Printing -#: ../src/prefs.c:1513 +#: ../src/prefs.c:1584 msgid "" "Notice: Native GTK printing is only available if Geany was built against " "GTK 2.10 (or above) and Geany is running with GTK 2.10 (or above)." @@ -3579,11 +3549,13 @@ "nieuwer)." #. page Editor->Indentation -#: ../src/prefs.c:1519 +#: ../src/prefs.c:1590 msgid "" "Warning: these settings are overridden by the current project. See " "Project->Properties." msgstr "" +"Waarschuwing: deze instellingen worden overschreven door het huidige " +"project. Zie Project->Eigenschappen." #: ../src/printing.c:188 msgid "The editor font is not a monospaced font!" @@ -3609,24 +3581,24 @@ "bestand" #: ../src/printing.c:527 -#, fuzzy, c-format +#, c-format msgid "Page %d of %d" -msgstr "Gewijzigd:" +msgstr "Bladzijde %d van %d" #: ../src/printing.c:781 #, c-format msgid "Did not send document %s to the printing subsystem." -msgstr "" +msgstr "Kon document %s niet naar printer verzenden." #: ../src/printing.c:783 #, c-format msgid "Document %s was sent to the printing subsystem." -msgstr "" +msgstr "Document %s verzonden naar printer." #: ../src/printing.c:835 -#, fuzzy, c-format +#, c-format msgid "Printing of %s failed (%s)." -msgstr "Afdrukken van \"%s\" mislukt (foutcode: %d)." +msgstr "Afdrukken van %s mislukt (%s)." #: ../src/printing.c:875 msgid "Please set a print command in the preferences dialog first." @@ -3646,7 +3618,7 @@ #: ../src/printing.c:899 #, fuzzy, c-format msgid "Printing of \"%s\" failed (return code: %s)." -msgstr "Afdrukken van \"%s\" mislukt (foutcode: %d)." +msgstr "Afdrukken van \"%s\" mislukt (foutcode: %s)." #: ../src/printing.c:905 #, c-format @@ -3691,7 +3663,7 @@ #: ../src/project.c:174 ../src/project.c:474 msgid "Choose Project Base Path" -msgstr "Kies Basis Project Path" +msgstr "Kies Project Basispad" #: ../src/project.c:239 ../src/project.c:270 ../src/project.c:937 #, fuzzy, c-format @@ -3735,11 +3707,8 @@ msgstr "Bestandspatroon:" #: ../src/project.c:601 -#, fuzzy msgid "Do you want to close it before proceeding?" -msgstr "" -"Het bestand werd niet opgeslagen.\n" -"Wenst u het op te slaan vooraleer af te sluiten?" +msgstr "Wil je het sluiten voordat je doorgaat?" #: ../src/project.c:602 #, c-format @@ -3792,7 +3761,7 @@ #. initialise the dialog #: ../src/project.c:847 ../src/project.c:858 msgid "Choose Project Filename" -msgstr "" +msgstr "Kies project bestandsnaam" #: ../src/project.c:927 #, c-format @@ -3888,9 +3857,8 @@ msgstr "Verva_ngen & zoeken" #: ../src/search.c:538 -#, fuzzy msgid "Replace wit_h:" -msgstr "Vervangen met:" +msgstr "Verv_angen met:" #. Now add the multiple replace options #: ../src/search.c:588 @@ -3907,7 +3875,6 @@ "Vervang alle overeenkomsten die werden gevonden in de geselecteerde tekst" #: ../src/search.c:696 -#, fuzzy msgid "_Directory:" msgstr "Map:" @@ -3954,11 +3921,11 @@ msgstr "Andere opties die aan Grep meegegeven moeten worden" #: ../src/search.c:1088 ../src/search.c:1665 ../src/search.c:1668 -#, c-format +#, fuzzy, c-format msgid "Found %d match for \"%s\"." msgid_plural "Found %d matches for \"%s\"." -msgstr[0] "%d overeenkomst gevonden voor \"%s\"" -msgstr[1] "%d overeenkomsten gevonden voor \"%s\"" +msgstr[0] "Geen overeenkomsten gevonden voor '%s'" +msgstr[1] "Geen overeenkomsten gevonden voor '%s'" #: ../src/search.c:1204 #, c-format @@ -3983,14 +3950,13 @@ "Voorkeuren." #: ../src/search.c:1420 -#, fuzzy msgid "Searching..." -msgstr "_Zoeken" +msgstr "Zoeken..." #: ../src/search.c:1432 -#, fuzzy, c-format +#, c-format msgid "%s %s -- %s (in directory: %s)" -msgstr "%s (in map: %s)" +msgstr "%s %s -- %s (in map: %s)" #: ../src/search.c:1460 #, c-format @@ -4005,8 +3971,8 @@ #, c-format msgid "Search completed with %d match." msgid_plural "Search completed with %d matches." -msgstr[0] "%d overeenkomst, zoeken beëindigd." -msgstr[1] "%d overeenkomsten, zoeken beëindigd." +msgstr[0] "Zoeken beëindigd met %d resultaat." +msgstr[1] "Zoeken beëindigd met %d resultaten." #: ../src/search.c:1566 msgid "No matches found." @@ -4039,8 +4005,9 @@ #. &(tv_iters.tag_macro), _("Macros"), #. &(tv_iters.tag_variable), _("Variables"), #: ../src/symbols.c:605 ../src/symbols.c:641 ../src/symbols.c:660 -#: ../src/symbols.c:771 ../src/symbols.c:785 ../src/symbols.c:797 -#: ../src/symbols.c:809 ../src/symbols.c:824 ../src/symbols.c:869 +#: ../src/symbols.c:757 ../src/symbols.c:771 ../src/symbols.c:785 +#: ../src/symbols.c:797 ../src/symbols.c:809 ../src/symbols.c:824 +#: ../src/symbols.c:869 msgid "Other" msgstr "Andere" @@ -4048,11 +4015,10 @@ msgid "Module" msgstr "Module" -#: ../src/symbols.c:613 ../src/symbols.c:795 ../src/symbols.c:807 -#: ../src/symbols.c:822 ../src/symbols.c:834 -#, fuzzy +#: ../src/symbols.c:613 ../src/symbols.c:753 ../src/symbols.c:795 +#: ../src/symbols.c:807 ../src/symbols.c:822 ../src/symbols.c:834 msgid "Types" -msgstr "Type" +msgstr "Types" #: ../src/symbols.c:614 #, fuzzy @@ -4061,8 +4027,8 @@ #: ../src/symbols.c:615 ../src/symbols.c:627 ../src/symbols.c:648 #: ../src/symbols.c:657 ../src/symbols.c:669 ../src/symbols.c:681 -#: ../src/symbols.c:736 ../src/symbols.c:750 ../src/symbols.c:781 -#: ../src/symbols.c:804 ../src/symbols.c:819 ../src/symbols.c:856 +#: ../src/symbols.c:736 ../src/symbols.c:781 ../src/symbols.c:804 +#: ../src/symbols.c:819 ../src/symbols.c:856 msgid "Functions" msgstr "Functies" @@ -4075,12 +4041,9 @@ msgid "Keys" msgstr "Sleutels" -#. &(tv_iters.tag_class), _("Constants"), -#. &(tv_iters.tag_member), _("Members"), -#. &(tv_iters.tag_macro), _("Macros"), #: ../src/symbols.c:628 ../src/symbols.c:671 ../src/symbols.c:737 -#: ../src/symbols.c:754 ../src/symbols.c:783 ../src/symbols.c:796 -#: ../src/symbols.c:805 ../src/symbols.c:821 ../src/symbols.c:868 +#: ../src/symbols.c:783 ../src/symbols.c:796 ../src/symbols.c:805 +#: ../src/symbols.c:821 ../src/symbols.c:868 msgid "Variables" msgstr "Variabelen" @@ -4097,18 +4060,17 @@ msgstr "Subsubsectie" #: ../src/symbols.c:649 -#, fuzzy msgid "Structures" -msgstr "Status" +msgstr "Structures" -#: ../src/symbols.c:656 ../src/symbols.c:764 ../src/symbols.c:778 +#: ../src/symbols.c:656 ../src/symbols.c:750 ../src/symbols.c:764 +#: ../src/symbols.c:778 msgid "Package" msgstr "Pakket" #: ../src/symbols.c:658 ../src/symbols.c:808 ../src/symbols.c:831 -#, fuzzy msgid "Labels" -msgstr "Label" +msgstr "Labels" #: ../src/symbols.c:659 ../src/symbols.c:670 ../src/symbols.c:784 #: ../src/symbols.c:806 @@ -4117,9 +4079,8 @@ #: ../src/symbols.c:667 ../src/symbols.c:765 ../src/symbols.c:779 #: ../src/symbols.c:792 ../src/symbols.c:818 -#, fuzzy msgid "Interfaces" -msgstr "Interface" +msgstr "Interfaces" #: ../src/symbols.c:668 ../src/symbols.c:692 ../src/symbols.c:713 #: ../src/symbols.c:725 ../src/symbols.c:734 ../src/symbols.c:766 @@ -4171,14 +4132,37 @@ msgstr "Naamruimtes" #: ../src/symbols.c:727 -#, fuzzy msgid "Procedures" -msgstr "Eigenschappen" +msgstr "Procedures" #: ../src/symbols.c:738 msgid "Imports" msgstr "" +#: ../src/symbols.c:751 +#, fuzzy +msgid "Entities" +msgstr "naamloos" + +#: ../src/symbols.c:752 +#, fuzzy +msgid "Architectures" +msgstr "Structures" + +#: ../src/symbols.c:754 +#, fuzzy +msgid "Functions / Procedures" +msgstr "Procedures" + +#: ../src/symbols.c:755 +#, fuzzy +msgid "Variables / Signals" +msgstr "Variabelen" + +#: ../src/symbols.c:756 +msgid "Processes / Components" +msgstr "" + #: ../src/symbols.c:768 ../src/symbols.c:857 msgid "Members" msgstr "Leden" @@ -4196,18 +4180,16 @@ msgstr "Macro's" #: ../src/symbols.c:833 -#, fuzzy msgid "Defines" -msgstr "Lijn" +msgstr "Definities" #: ../src/symbols.c:840 msgid "Targets" msgstr "" #: ../src/symbols.c:858 -#, fuzzy msgid "Structs" -msgstr "Status" +msgstr "Constructies" #: ../src/symbols.c:859 msgid "Typedefs / Enums" @@ -4216,7 +4198,7 @@ #: ../src/symbols.c:1347 #, c-format msgid "Unknown filetype extension for \"%s\".\n" -msgstr "" +msgstr "Onbekende bestandsextensie \"%s\".\n" #: ../src/symbols.c:1368 #, c-format @@ -4241,7 +4223,7 @@ #: ../src/symbols.c:1390 msgid "Load Tags" -msgstr "" +msgstr "Laad Labels" #: ../src/symbols.c:1397 msgid "Geany tag files (*.tags)" @@ -4249,14 +4231,14 @@ #. For translators: the first wildcard is the filetype, the second the filename #: ../src/symbols.c:1417 -#, fuzzy, c-format +#, c-format msgid "Loaded %s tags file '%s'." -msgstr "Kon pixmap bestand %s niet vinden" +msgstr "Bestand met %s labels geladen '%s'." #: ../src/symbols.c:1419 -#, fuzzy, c-format +#, c-format msgid "Could not load tags file '%s'." -msgstr "Kon pixmap bestand %s niet vinden" +msgstr "Kon labe bestand '%s' niet laden." #: ../src/symbols.c:1552 #, fuzzy, c-format @@ -4274,7 +4256,7 @@ #: ../src/symbols.c:1867 msgid "Sort by _Appearance" -msgstr "Sorteer op verschijning" +msgstr "Sorteer op _plaats in document" #: ../src/templates.c:264 msgid "Old" @@ -4298,27 +4280,24 @@ msgstr "Huidig bestand sluiten" #: ../src/toolbar.c:59 -#, fuzzy msgid "Close all open files" -msgstr "Sluit alle bestanden af" +msgstr "Sluit alle open bestanden" #: ../src/toolbar.c:60 -#, fuzzy msgid "Cut the current selection" -msgstr "Converteert de hoofdletter van de huidige selectie" +msgstr "Knip de huidige selectie" #: ../src/toolbar.c:61 msgid "Copy the current selection" -msgstr "Huidige selectie kopieren" +msgstr "Kopieer de huidige selectie" #: ../src/toolbar.c:62 msgid "Paste the contents of the clipboard" -msgstr "Voeg de inhoud van het clipboard toe." +msgstr "Plak de inhoud van het klembord" #: ../src/toolbar.c:63 -#, fuzzy msgid "Delete the current selection" -msgstr "Converteert de hoofdletter van de huidige selectie" +msgstr "Verwijder de huidige selectie" #: ../src/toolbar.c:64 msgid "Undo the last modification" @@ -4352,26 +4331,24 @@ msgstr "Uitzoomen" #: ../src/toolbar.c:73 -#, fuzzy msgid "Decrease indentation" msgstr "Inspringing verkleinen" #: ../src/toolbar.c:74 -#, fuzzy msgid "Increase indentation" msgstr "Inspringing vergroten" -#: ../src/toolbar.c:75 ../src/toolbar.c:350 +#: ../src/toolbar.c:75 ../src/toolbar.c:360 msgid "Find the entered text in the current file" msgstr "Zoek de aangegeven tekst in het huidig document" -#: ../src/toolbar.c:76 ../src/toolbar.c:358 +#: ../src/toolbar.c:76 ../src/toolbar.c:368 msgid "Jump to the entered line number" msgstr "Ga naar het ingevoerde regelnummer" #: ../src/toolbar.c:77 msgid "Show the preferences dialog" -msgstr "Laat de voorkeuren dialoog zien" +msgstr "Laat het voorkeurendialoog zien" #: ../src/toolbar.c:78 msgid "Quit Geany" @@ -4382,32 +4359,43 @@ msgstr "Document afdrukken" #: ../src/toolbar.c:80 -#, fuzzy msgid "Replace text in the current document" -msgstr "Verwijdert alle markeringen in het huidige document." +msgstr "Vervang tekst in het huidige document" -#. Create our custom actions -#: ../src/toolbar.c:334 +#: ../src/toolbar.c:336 msgid "Create a new file" msgstr "Nieuw bestand aanmaken" -#: ../src/toolbar.c:339 +#: ../src/toolbar.c:337 +msgid "Create a new file from a template" +msgstr "Nieuw bestand aanmaken van sjabloon" + +#: ../src/toolbar.c:344 msgid "Open an existing file" msgstr "Bestaand bestand openen" -#: ../src/toolbar.c:358 +#: ../src/toolbar.c:345 +msgid "Open a recent file" +msgstr "Open een recent bestand" + +#: ../src/toolbar.c:353 +#, fuzzy +msgid "Choose more build actions" +msgstr "Geen bouwfouten meer." + +#: ../src/toolbar.c:368 msgid "Goto" -msgstr "Ga naar regel" +msgstr "Ga naar" -#: ../src/toolbar.c:534 +#: ../src/toolbar.c:544 msgid "Separator" msgstr "Scheidingsteken" -#: ../src/toolbar.c:535 +#: ../src/toolbar.c:545 msgid "--- Separator ---" msgstr "--- Scheidingsteken ---" -#: ../src/toolbar.c:899 +#: ../src/toolbar.c:909 msgid "" "Select items to be displayed on the toolbar. Items can be reordered by drag " "and drop." @@ -4415,11 +4403,11 @@ "Selecteer items die in de werkbalk moeten komen. Je kunt ze verplaatsen door " "te slepen." -#: ../src/toolbar.c:915 +#: ../src/toolbar.c:925 msgid "Available Items" msgstr "Beschikbare Items" -#: ../src/toolbar.c:936 +#: ../src/toolbar.c:946 msgid "Displayed Items" msgstr "Getoonde items" @@ -4429,6 +4417,8 @@ "The executed custom command returned an error. Your selection was not " "changed. Error message: %s" msgstr "" +"Het uitgevoerde commando geeft een foutmelding. Je selectie is niet " +"gewijzigd. Foutmelding: %s" #: ../src/tools.c:219 msgid "The executed custom command exited with an unsuccessful exit code." @@ -4495,19 +4485,16 @@ msgstr "Toon s_ymbolenlijst" #: ../src/sidebar.c:518 -#, fuzzy msgid "Show _Document List" -msgstr "Toon open bestanden lijst" +msgstr "Toon _bestandenlijst" #: ../src/sidebar.c:526 ../plugins/filebrowser.c:601 -#, fuzzy msgid "H_ide Sidebar" -msgstr "Zijbalk verbergen" +msgstr "Zijbalk _verbergen" #: ../src/sidebar.c:593 -#, fuzzy msgid "Show _Paths" -msgstr "Werkbalk weergeven" +msgstr "_Paden weergeven" #. Status bar statistics: col = column, sel = selection. #: ../src/ui_utils.c:190 @@ -4515,10 +4502,11 @@ msgid "line: %d\t col: %d\t sel: %d\t " msgstr "regel: %d\t kol: %d\t sel: %d\t " +# Alleen Lezen #. RO = read-only #: ../src/ui_utils.c:196 msgid "RO " -msgstr "" +msgstr "AL" #. OVR = overwrite/overtype, INS = insert #: ../src/ui_utils.c:198 @@ -4531,15 +4519,15 @@ #: ../src/ui_utils.c:204 msgid "TAB" -msgstr "" +msgstr "TAB" #: ../src/ui_utils.c:207 msgid "SP" -msgstr "" +msgstr "SP" #: ../src/ui_utils.c:210 msgid "T/S" -msgstr "" +msgstr "T/S" #: ../src/ui_utils.c:214 #, c-format @@ -4547,18 +4535,19 @@ msgstr "mode: %s" #: ../src/ui_utils.c:217 -#, fuzzy, c-format +#, c-format msgid "encoding: %s %s" -msgstr "_Codering instellen" +msgstr "codering: %s %s" #: ../src/ui_utils.c:223 -#, fuzzy, c-format +#, c-format msgid "filetype: %s" -msgstr "Bestandstype instellen:" +msgstr "bestandstype: %s" +# Gewijzigd #: ../src/ui_utils.c:227 msgid "MOD" -msgstr "" +msgstr "WIJ" #: ../src/ui_utils.c:232 #, c-format @@ -4595,23 +4584,20 @@ msgstr "Aangepast _datumformaat instellen" #: ../src/ui_utils.c:1660 -#, fuzzy msgid "Select Folder" msgstr "Map selecteren" #: ../src/ui_utils.c:1660 -#, fuzzy msgid "Select File" -msgstr "Alles selecteren" +msgstr "Bestand selecteren" #: ../src/ui_utils.c:1814 msgid "Save All" msgstr "Alles opslaan" #: ../src/ui_utils.c:1815 -#, fuzzy msgid "Close All" -msgstr "_Alles sluiten" +msgstr "Alles sluiten" #: ../src/utils.c:324 msgid "Win (CRLF)" @@ -4625,14 +4611,9 @@ msgid "Unix (LF)" msgstr "Unix (LF)" -#: ../src/vte.c:301 ../src/vte.c:760 -msgid "Terminal" -msgstr "Terminal" - #: ../src/vte.c:548 -#, fuzzy msgid "_Set Path From Document" -msgstr "Schakel naar linker document" +msgstr "_Haal pad van document" #: ../src/vte.c:553 msgid "_Restart Terminal" @@ -4647,6 +4628,8 @@ "Could not change the directory in the VTE because it probably contains a " "command." msgstr "" +"Kon de directory niet veranderen in de terminal omdat er waarschijnlijk een " +"commando in staat." #: ../src/vte.c:755 msgid "Terminal plugin" @@ -4791,9 +4774,8 @@ msgstr "Uitvoerbare" #: ../plugins/classbuilder.c:37 -#, fuzzy msgid "Class Builder" -msgstr "Klassen" +msgstr "Class Maker" #: ../plugins/classbuilder.c:37 msgid "Creates source files for new class types." @@ -4804,23 +4786,20 @@ msgstr "Creer Class" #: ../plugins/classbuilder.c:332 -#, fuzzy msgid "Class" -msgstr "Klassen" +msgstr "Class" #: ../plugins/classbuilder.c:341 -#, fuzzy msgid "Class name:" -msgstr "Klassen" +msgstr "Class naam:" #: ../plugins/classbuilder.c:352 -#, fuzzy msgid "Header file:" -msgstr "Bestand herladen" +msgstr "Headerbestand:" #: ../plugins/classbuilder.c:361 msgid "Source file:" -msgstr "Bronbestand" +msgstr "Bronbestand:" #: ../plugins/classbuilder.c:367 msgid "Inheritance" @@ -4839,23 +4818,20 @@ msgstr "Globaal" #: ../plugins/classbuilder.c:406 -#, fuzzy msgid "Base GType:" -msgstr "Type" +msgstr "" #: ../plugins/classbuilder.c:414 msgid "Options" msgstr "Opties" #: ../plugins/classbuilder.c:423 -#, fuzzy msgid "Create constructor" -msgstr "Woord vervolledigen" +msgstr "Maak constructor" #: ../plugins/classbuilder.c:427 -#, fuzzy msgid "Create destructor" -msgstr "Woord vervolledigen" +msgstr "Maak destructor" #: ../plugins/classbuilder.c:437 msgid "GTK+ constructor type" @@ -4866,19 +4842,16 @@ msgstr "Creer Cla_ss" #: ../plugins/classbuilder.c:750 -#, fuzzy msgid "_C++ Class" -msgstr "Klassen" +msgstr "_C++ Class" #: ../plugins/classbuilder.c:753 -#, fuzzy msgid "_GTK+ Class" -msgstr "Klassen" +msgstr "_GTK+ Class" #: ../plugins/htmlchars.c:38 -#, fuzzy msgid "HTML Characters" -msgstr "Hoofdstuk" +msgstr "HTML Karakters" #: ../plugins/htmlchars.c:38 msgid "Inserts HTML character entities like '&'." @@ -4887,9 +4860,8 @@ #: ../plugins/htmlchars.c:39 ../plugins/export.c:38 #: ../plugins/filebrowser.c:41 ../plugins/saveactions.c:40 #: ../plugins/splitwindow.c:37 -#, fuzzy msgid "The Geany developer team" -msgstr "De naam van de ontwikkelaar" +msgstr "Het Geany ontwikkelingsteam" #: ../plugins/htmlchars.c:72 msgid "HTML characters" @@ -4924,27 +4896,24 @@ msgstr "Overige karakters" #: ../plugins/htmlchars.c:449 -#, fuzzy msgid "Special Characters" -msgstr "Hoofdstuk" +msgstr "Speciale karakters" #: ../plugins/htmlchars.c:451 -#, fuzzy msgid "_Insert" -msgstr "Datum invoegen" +msgstr "_Invoegen" #: ../plugins/htmlchars.c:460 msgid "" "Choose a special character from the list below and double click on it or use " "the button to insert it at the current cursor position." msgstr "" -"Kies een special karakter uit de lijst hieronder en dubbelklik erop of " -"gebruik de insertknop om het op de huidige cursor positie in te voegen." +"Kies een speciaal karakter uit de lijst hieronder en dubbelklik erop of " +"gebruik de invoegknop om het op de huidige cursor positie in te voegen." #: ../plugins/htmlchars.c:474 -#, fuzzy msgid "Character" -msgstr "Hoofdstuk" +msgstr "Karakter" #: ../plugins/htmlchars.c:480 msgid "HTML (name)" @@ -4952,69 +4921,65 @@ #: ../plugins/htmlchars.c:681 msgid "_Insert Special HTML Characters" -msgstr "Voeg Spec_iale HTML Characters toe" +msgstr "Voeg spec_iale HTML karakters toe" #. Add menuitem for html replacement functions #: ../plugins/htmlchars.c:693 -#, fuzzy msgid "HTML Replacement" -msgstr "Tab plaatsing" +msgstr "HTML vervanging" #: ../plugins/htmlchars.c:700 +#, fuzzy msgid "_HTMLToggle" -msgstr "" +msgstr "_HTML Tekens vervangen" #: ../plugins/htmlchars.c:709 -#, fuzzy msgid "Bulk replacement of special chars" -msgstr "Plaatsing van nieuwe bestanden tabs:" +msgstr "Alle speciale tekens in selectie _vervangen" #: ../plugins/htmlchars.c:724 msgid "Insert Special HTML Characters" -msgstr "Voeg Speciale HTML Karakters toe." +msgstr "Voeg Speciale HTML Karakters in." #: ../plugins/htmlchars.c:727 -#, fuzzy msgid "Replace special characters" -msgstr "Hoofdstuk" +msgstr "" #: ../plugins/htmlchars.c:730 -#, fuzzy msgid "Toggle plugin status" -msgstr "Schakel regelcommentaar uit" +msgstr "" #: ../plugins/export.c:37 msgid "Export" msgstr "Exporteer" #: ../plugins/export.c:37 -#, fuzzy msgid "Exports the current file into different formats." -msgstr "Compileert het huidig bestand in een DVI bestand" +msgstr "Exporteert het huidige bestand naar verschillende formaten." #: ../plugins/export.c:166 -#, fuzzy msgid "Export File" -msgstr "Bestand openen" +msgstr "Bestand exporteren" #: ../plugins/export.c:183 msgid "_Use current zoom level" -msgstr "" +msgstr "_Gebruik huidig zoom niveau" #: ../plugins/export.c:185 +#, fuzzy msgid "" "Renders the font size of the document together with the current zoom level" -msgstr "" +msgstr "Slaat de huidige lettergrootte samen met het huidige zoomniveau op" #: ../plugins/export.c:267 #, c-format msgid "Document successfully exported as '%s'." -msgstr "" +msgstr "Document succesvol geëxporteerd als '%s'." #: ../plugins/export.c:269 -#, fuzzy, c-format +#, c-format msgid "File '%s' could not be written (%s)." -msgstr "Configuratiemap kon niet worden aangemaakt (%s)." +msgstr "Bestand '%s' kon niet worden opgeslagen (%s)." #: ../plugins/export.c:316 #, c-format @@ -5036,9 +5001,8 @@ msgstr "Als _LaTeX" #: ../plugins/filebrowser.c:40 -#, fuzzy msgid "File Browser" -msgstr "Browser" +msgstr "Bestandsbrowser" #: ../plugins/filebrowser.c:40 msgid "Adds a file browser tab to the sidebar." @@ -5051,21 +5015,19 @@ #: ../plugins/filebrowser.c:405 #, c-format msgid "Could not execute configured external command '%s' (%s)." -msgstr "" +msgstr "Kon extern geconfigureerd commando '%s' niet uitvoeren (%s)." #: ../plugins/filebrowser.c:567 msgid "Open _externally" msgstr "Open _extern" #: ../plugins/filebrowser.c:573 -#, fuzzy msgid "_Find in Files" -msgstr "Zoek in _bestanden" +msgstr "_Zoek in bestanden" #: ../plugins/filebrowser.c:583 -#, fuzzy msgid "Show _Hidden Files" -msgstr "_Verborgen bestanden weergeven" +msgstr "Ver_borgen bestanden weergeven" #: ../plugins/filebrowser.c:781 msgid "Up" @@ -5073,21 +5035,19 @@ #: ../plugins/filebrowser.c:786 msgid "Refresh" -msgstr "Ververs" +msgstr "Vernieuwen" #: ../plugins/filebrowser.c:791 msgid "Home" msgstr "Thuis" #: ../plugins/filebrowser.c:796 -#, fuzzy msgid "Set path from document" -msgstr "Schakel naar linker document" +msgstr "Haal pad van document" #: ../plugins/filebrowser.c:804 -#, fuzzy msgid "Clear the filter" -msgstr "Huidig bestand sluiten" +msgstr "Filter leegmaken" #: ../plugins/filebrowser.c:818 msgid "Filter:" @@ -5095,21 +5055,19 @@ #: ../plugins/filebrowser.c:1037 msgid "Focus File List" -msgstr "" +msgstr "Focus bestandenlijst" #: ../plugins/filebrowser.c:1039 msgid "Focus Path Entry" -msgstr "" +msgstr "Focus pad invoerveld" #: ../plugins/filebrowser.c:1085 ../plugins/saveactions.c:470 -#, fuzzy msgid "Plugin configuration directory could not be created." -msgstr "Configuratiemap kon niet worden aangemaakt (%s)." +msgstr "Plugin configuratiemap kon niet worden aangemaakt." #: ../plugins/filebrowser.c:1112 -#, fuzzy msgid "External open command:" -msgstr " commandos" +msgstr "Extern open commando:" #: ../plugins/filebrowser.c:1121 #, c-format @@ -5120,11 +5078,15 @@ "%d will be replaced with the path name of the selected file without the " "filename" msgstr "" +"Het commando dat wordt uitgevoerd als \"Openen met\" wordt gebruikt. Je kunt " +"%f en %d wildcards gebruiken.\n" +"%f wordt vervangen door de bestandsnaam met het volle pad\n" +"%d wordt vervangen door het pad van het geselecteerde bestand zonder de " +"bestandsnaam" -# #: ../plugins/filebrowser.c:1129 msgid "Show hidden files" -msgstr "_Verborgen bestanden weergeven" +msgstr "Verborgen bestanden weergeven" # #: ../plugins/filebrowser.c:1135 @@ -5159,20 +5121,20 @@ msgstr "Deze plugin bevat verschillende acties mbt. het opslaan van bestanden." #: ../plugins/saveactions.c:169 -#, fuzzy, c-format +#, c-format msgid "Backup Copy: Directory could not be created (%s)." -msgstr "Configuratiemap kon niet worden aangemaakt (%s)." +msgstr "Backupkopie: Directory kon niet worden aangemaakt (%s)." #. it's unlikely that this happens #: ../plugins/saveactions.c:201 -#, fuzzy, c-format +#, c-format msgid "Backup Copy: File could not be read (%s)." -msgstr "Configuratiemap kon niet worden aangemaakt (%s)." +msgstr "Backupkopie: Bestand kon niet worden gelezen (%s)." #: ../plugins/saveactions.c:219 -#, fuzzy, c-format +#, c-format msgid "Backup Copy: File could not be saved (%s)." -msgstr "Configuratiemap kon niet worden aangemaakt (%s)." +msgstr "Backupkopie: Bestand kon niet worden opgeslagen (%s)." #: ../plugins/saveactions.c:311 #, c-format @@ -5183,59 +5145,54 @@ #. initialize the dialog #: ../plugins/saveactions.c:380 -#, fuzzy msgid "Select Directory" -msgstr "Huidig bestand opslaan" +msgstr "Kies directory" #: ../plugins/saveactions.c:463 msgid "Backup directory does not exist or is not writable." msgstr "Backup directory bestaat niet of er kan niet in weggeschreven worden." #: ../plugins/saveactions.c:543 -#, fuzzy msgid "Auto Save" -msgstr "Opslaan" +msgstr "Automatisch opslaan" #: ../plugins/saveactions.c:545 ../plugins/saveactions.c:607 #: ../plugins/saveactions.c:648 msgid "_Enable" -msgstr "Laat to_e" +msgstr "Aanz_etten" #: ../plugins/saveactions.c:553 msgid "Auto save _interval:" msgstr "_Interval voor automatische backup:" #: ../plugins/saveactions.c:561 -#, fuzzy msgid "seconds" -msgstr " commandos" +msgstr "seconden" #: ../plugins/saveactions.c:570 msgid "_Print status message if files have been automatically saved" msgstr "Druk status informatie af als bestanden automatisch o_pgeslagen worden" #: ../plugins/saveactions.c:578 -#, fuzzy msgid "Save only current open _file" -msgstr "Huidig bestand opslaan" +msgstr "Sla alleen _huidig open bestand op" #: ../plugins/saveactions.c:585 -#, fuzzy msgid "Sa_ve all open files" -msgstr "Alle geopende bestanden opslaan" +msgstr "_Alle geopende bestanden opslaan" #: ../plugins/saveactions.c:605 msgid "Instant Save" -msgstr "Instantaan opslaan" +msgstr "Instant opslaan" +# Of nieuw aangemaakte bestanden? #: ../plugins/saveactions.c:615 -#, fuzzy msgid "_Filetype to use for newly opened files:" -msgstr "Stelt de standaard codering in voor nieuw aangemaakte bestanden" +msgstr "_Bestandstype voor nieuw geopende bestanden:" #: ../plugins/saveactions.c:646 msgid "Backup Copy" -msgstr "Backup Kopie" +msgstr "Backupkopie" #: ../plugins/saveactions.c:656 msgid "_Directory to save backup files in:" @@ -5248,16 +5205,15 @@ #: ../plugins/saveactions.c:692 msgid "Directory _levels to include in the backup destination:" -msgstr "Aanta_l directory nivo's dat bij een backup wordt meegenomen:" +msgstr "Aanta_l directory niveau's dat bij een backup wordt meegenomen:" #: ../plugins/splitwindow.c:36 msgid "Split Window" msgstr "Splits Venster" #: ../plugins/splitwindow.c:36 -#, fuzzy msgid "Splits the editor view into two windows." -msgstr "Stelt het lettertype in voor de editorvensters" +msgstr "Splitst de editor in twee delen." #: ../plugins/splitwindow.c:244 msgid "Show the current document" @@ -5288,9 +5244,8 @@ msgid "Split Vertically" msgstr "Splits Verticaal" -#, fuzzy #~ msgid "Printing of file %s was cancelled." -#~ msgstr "Afdrukken van \"%s\" mislukt (foutcode: %d)." +#~ msgstr "Afdrukken van bestand \"%s\" is geannuleerd." #~ msgid "" #~ "These settings for the virtual terminal emulator widget (VTE) only apply " This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[4448] trunk
by ntrel＠users.sourceforge.net 26 Nov '09

26 Nov '09

Revision: 4448 http://geany.svn.sourceforge.net/geany/?rev=4448&view=rev Author: ntrel Date: 2009-11-26 12:33:28 +0000 (Thu, 26 Nov 2009) Log Message: ----------- Fix VHDL symbol list to display all tags (patch from Kelvin Gardiner, thanks). Modified Paths: -------------- trunk/ChangeLog trunk/THANKS trunk/src/about.c trunk/src/symbols.c trunk/tagmanager/vhdl.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-11-24 16:47:35 UTC (rev 4447) +++ trunk/ChangeLog 2009-11-26 12:33:28 UTC (rev 4448) @@ -1,3 +1,10 @@ +2009-11-26 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/about.c, src/symbols.c, THANKS, tagmanager/vhdl.c: + Fix VHDL symbol list to display all tags (patch from Kelvin Gardiner, + thanks). + + 2009-11-24 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * src/highlighting.c: Modified: trunk/THANKS =================================================================== --- trunk/THANKS 2009-11-24 16:47:35 UTC (rev 4447) +++ trunk/THANKS 2009-11-26 12:33:28 UTC (rev 4448) @@ -72,6 +72,7 @@ Ross McKay <rosko<at>zeta<dot>org<dot>au> - ASP preferred language option Alexey Antipov <1a_antipov(at)mail(dot)ru> - Apply file open encoding only to non-Unicode files Jörn Reder <joern(at)zyn(dot)de> - --socket-file command line option patch +Kelvin Gardiner <kelvin.mbmn.net> - VHDL symbol list patch Translators: ------------ Modified: trunk/src/about.c =================================================================== --- trunk/src/about.c 2009-11-24 16:47:35 UTC (rev 4447) +++ trunk/src/about.c 2009-11-26 12:33:28 UTC (rev 4448) @@ -87,7 +87,7 @@ "Dirk Weber, Elias Pschernig, Eric Forgeot, Eugene Arshinov, Felipe Pena, François Cami, " "Giuseppe Torelli, Guillaume de Rorthais, Guillaume Hoffmann, Herbert Voss, Jason Oster, " "Jean-François Wauthy, Jeff Pohlmeyer, Jesse Mayes, John Gabriele, Jon Strait, Josef Whiter, " -"Jörn Reder, Kevin Ellwood, Kristoffer A. Tjernås, Lex Trotman, Marko Peric, Matti Mårds, " +"Jörn Reder, Kelvin Gardiner, Kevin Ellwood, Kristoffer A. Tjernås, Lex Trotman, Marko Peric, Matti Mårds, " "Moritz Barsnick, Peter Strand, Philipp Gildein, Pierre Joye, Rob van der Linde, Robert McGinley, " "Roland Baudin, Ross McKay, S Jagannathan, Saleem Abdulrasool, " "Sebastian Kraft, Shiv, Slava Semushin, Stefan Oltmanns, Tamim, Thomas Martitz, Tomás Vírseda, " Modified: trunk/src/symbols.c =================================================================== --- trunk/src/symbols.c 2009-11-24 16:47:35 UTC (rev 4447) +++ trunk/src/symbols.c 2009-11-26 12:33:28 UTC (rev 4448) @@ -747,14 +747,13 @@ case GEANY_FILETYPES_VHDL: { tag_list_add_groups(tag_store, - &(tv_iters.tag_function), _("Functions"), "classviewer-method", - /*&(tv_iters.tag_class), _("Constants"),*/ - /*&(tv_iters.tag_member), _("Members"),*/ - /*&(tv_iters.tag_macro), _("Macros"),*/ - &(tv_iters.tag_variable), _("Variables"), "classviewer-var", - &(tv_iters.tag_struct), _("Signals"), NULL, &(tv_iters.tag_namespace), _("Package"), "classviewer-namespace", - &(tv_iters.tag_type), _("Types"), NULL, + &(tv_iters.tag_class), _("Entities"), "classviewer-class", + &(tv_iters.tag_struct), _("Architectures"), "classviewer-struct", + &(tv_iters.tag_type), _("Types"), "classviewer-other", + &(tv_iters.tag_function), _("Functions / Procedures"), "classviewer-method", + &(tv_iters.tag_variable), _("Variables / Signals"), "classviewer-var", + &(tv_iters.tag_member), _("Processes / Components"), "classviewer-member", &(tv_iters.tag_other), _("Other"), "classviewer-other", NULL); break; Modified: trunk/tagmanager/vhdl.c =================================================================== --- trunk/tagmanager/vhdl.c 2009-11-24 16:47:35 UTC (rev 4447) +++ trunk/tagmanager/vhdl.c 2009-11-26 12:33:28 UTC (rev 4448) @@ -43,7 +43,8 @@ K_PROCESS, K_ENTITY, K_ARCHITECTURE, - K_PORT + K_PORT, + K_ALIAS } vhdlKind; typedef struct { @@ -63,20 +64,21 @@ static vString* TagName=NULL; static kindOption VhdlKinds [] = { - { TRUE, 'c', "other", "constants" }, + { TRUE, 'c', "variable", "constants" }, { TRUE, 't', "typedef", "types" }, { TRUE, 'v', "variable", "variables" }, { TRUE, 'a', "atribute", "atributes" }, - { TRUE, 's', "struct", "signals" }, + { TRUE, 's', "variable", "signals" }, { TRUE, 'f', "function", "functions" }, - { TRUE, 'p', "prototype", "procedure" }, - { TRUE, 'k', "component", "components" }, - { TRUE, 'l', "package", "packages" }, - { TRUE, 'm', "process", "process" }, - { TRUE, 'n', "entity", "entity" }, - { TRUE, 'o', "architecture", "architecture" }, - { TRUE, 'u', "port", "ports" } -}; + { TRUE, 'p', "function", "procedure" }, + { TRUE, 'k', "member", "components" }, + { TRUE, 'l', "namespace", "packages" }, + { TRUE, 'm', "member", "process" }, + { TRUE, 'n', "class", "entity" }, + { TRUE, 'o', "struct", "architecture" }, + { TRUE, 'u', "port", "ports" }, + { TRUE, 'v', "typedef", "alias" } + }; static keywordAssoc VhdlKeywordTable [] = { { "constant", K_CONSTANT }, @@ -93,7 +95,8 @@ { "architecture", K_ARCHITECTURE }, { "inout", K_PORT }, { "in", K_PORT }, - { "out", K_PORT } + { "out", K_PORT }, + { "alias", K_ALIAS } }; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[4447] trunk
by ntrel＠users.sourceforge.net 24 Nov '09

24 Nov '09

Revision: 4447 http://geany.svn.sourceforge.net/geany/?rev=4447&view=rev Author: ntrel Date: 2009-11-24 16:47:35 +0000 (Tue, 24 Nov 2009) Log Message: ----------- Fix lexer settings for custom filetypes. Modified Paths: -------------- trunk/ChangeLog trunk/src/highlighting.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-11-24 16:27:37 UTC (rev 4446) +++ trunk/ChangeLog 2009-11-24 16:47:35 UTC (rev 4447) @@ -8,6 +8,8 @@ have properties set. * src/symbols.c, tagmanager/vhdl.c: Parse VHDL signals. + * src/highlighting.c: + Fix lexer settings for custom filetypes. 2009-11-23 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> Modified: trunk/src/highlighting.c =================================================================== --- trunk/src/highlighting.c 2009-11-24 16:27:37 UTC (rev 4446) +++ trunk/src/highlighting.c 2009-11-24 16:47:35 UTC (rev 4447) @@ -3164,6 +3164,7 @@ void highlighting_init_styles(gint filetype_idx, GKeyFile *config, GKeyFile *configh) { GeanyFiletype *ft = filetypes[filetype_idx]; + gint lexer_id = ft->lexer_filetype ? ft->lexer_filetype->id : ft->id; if (!style_sets) style_sets = g_new0(StyleSet, filetypes_array->len); @@ -3175,7 +3176,7 @@ if (filetype_idx != GEANY_FILETYPES_NONE) filetypes_load_config(GEANY_FILETYPES_NONE, FALSE); - switch (filetype_idx) + switch (lexer_id) { init_styleset_case(GEANY_FILETYPES_NONE, styleset_common_init); init_styleset_case(GEANY_FILETYPES_ADA, styleset_ada_init); @@ -3233,7 +3234,7 @@ /* lang_name is the name used for the styleset_foo function, e.g. foo. */ #define styleset_case(ft_id, styleset_func) \ case (ft_id): \ - styleset_func(sci, ft_id); \ + styleset_func(sci, ft->id); \ break /** Setup highlighting and other visual settings. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[4446] trunk
by ntrel＠users.sourceforge.net 24 Nov '09

24 Nov '09

Revision: 4446 http://geany.svn.sourceforge.net/geany/?rev=4446&view=rev Author: ntrel Date: 2009-11-24 16:27:37 +0000 (Tue, 24 Nov 2009) Log Message: ----------- Parse VHDL signals. Modified Paths: -------------- trunk/ChangeLog trunk/src/symbols.c trunk/tagmanager/vhdl.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-11-24 16:22:14 UTC (rev 4445) +++ trunk/ChangeLog 2009-11-24 16:27:37 UTC (rev 4446) @@ -6,6 +6,8 @@ * src/highlighting.c: Fix setting filetype properties when both the system and the user file have properties set. + * src/symbols.c, tagmanager/vhdl.c: + Parse VHDL signals. 2009-11-23 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> Modified: trunk/src/symbols.c =================================================================== --- trunk/src/symbols.c 2009-11-24 16:22:14 UTC (rev 4445) +++ trunk/src/symbols.c 2009-11-24 16:27:37 UTC (rev 4446) @@ -752,10 +752,11 @@ /*&(tv_iters.tag_member), _("Members"),*/ /*&(tv_iters.tag_macro), _("Macros"),*/ &(tv_iters.tag_variable), _("Variables"), "classviewer-var", + &(tv_iters.tag_struct), _("Signals"), NULL, + &(tv_iters.tag_namespace), _("Package"), "classviewer-namespace", + &(tv_iters.tag_type), _("Types"), NULL, + &(tv_iters.tag_other), _("Other"), "classviewer-other", NULL); - /*&(tv_iters.tag_namespace), _("Namespaces"),*/ - /*&(tv_iters.tag_struct), _("Signals"),*/ - /*&(tv_iters.tag_other), _("Other"), NULL);*/ break; } case GEANY_FILETYPES_JAVA: Modified: trunk/tagmanager/vhdl.c =================================================================== --- trunk/tagmanager/vhdl.c 2009-11-24 16:22:14 UTC (rev 4445) +++ trunk/tagmanager/vhdl.c 2009-11-24 16:27:37 UTC (rev 4446) @@ -63,13 +63,13 @@ static vString* TagName=NULL; static kindOption VhdlKinds [] = { - { TRUE, 'c', "constant", "constants" }, - { TRUE, 't', "type", "types" }, + { TRUE, 'c', "other", "constants" }, + { TRUE, 't', "typedef", "types" }, { TRUE, 'v', "variable", "variables" }, { TRUE, 'a', "atribute", "atributes" }, - { TRUE, 's', "signal", "signals" }, + { TRUE, 's', "struct", "signals" }, { TRUE, 'f', "function", "functions" }, - { TRUE, 'p', "procedure", "procedure" }, + { TRUE, 'p', "prototype", "procedure" }, { TRUE, 'k', "component", "components" }, { TRUE, 'l', "package", "packages" }, { TRUE, 'm', "process", "process" }, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[4445] trunk
by ntrel＠users.sourceforge.net 24 Nov '09

24 Nov '09

Revision: 4445 http://geany.svn.sourceforge.net/geany/?rev=4445&view=rev Author: ntrel Date: 2009-11-24 16:22:14 +0000 (Tue, 24 Nov 2009) Log Message: ----------- Fix setting filetype properties when both the system and the user file have properties set. Modified Paths: -------------- trunk/ChangeLog trunk/src/highlighting.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-11-24 15:47:44 UTC (rev 4444) +++ trunk/ChangeLog 2009-11-24 16:22:14 UTC (rev 4445) @@ -3,6 +3,9 @@ * src/highlighting.c: Make stylesets take a ft_id argument so they can be reused fully with custom filetypes, so custom styles and keywords can be set. + * src/highlighting.c: + Fix setting filetype properties when both the system and the user file + have properties set. 2009-11-23 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> Modified: trunk/src/highlighting.c =================================================================== --- trunk/src/highlighting.c 2009-11-24 15:47:44 UTC (rev 4444) +++ trunk/src/highlighting.c 2009-11-24 16:22:14 UTC (rev 4445) @@ -3114,17 +3114,36 @@ } +#define foreach_strv(strptr, strv) \ + for (strptr = strv; *strptr; strptr++) + static void read_properties(GeanyFiletype *ft, GKeyFile *config, GKeyFile *configh) { gchar group[] = "lexer_properties"; gchar **keys = g_key_file_get_keys(config, group, NULL, NULL); + gchar **keysh = g_key_file_get_keys(configh, group, NULL, NULL); + /* move/merge keysh into keys */ if (!keys) - keys = g_key_file_get_keys(configh, group, NULL, NULL); + keys = keysh; + else if (keysh) + { + gchar **strv = g_new0(gchar*, g_strv_length(keys) + g_strv_length(keysh) + 1); + gchar **read, **write = strv; + /* may have same key in each, but home will override so it's OK */ + foreach_strv(read, keys) + *write++ = *read; + foreach_strv(read, keysh) + *write++ = *read; + g_free(keys); + g_free(keysh); + keys = strv; + } + if (keys) { - gchar **values = g_new0(gchar*, g_strv_length(keys)); + gchar **values = g_new0(gchar*, g_strv_length(keys) + 1); style_sets[ft->id].property_keys = keys; style_sets[ft->id].property_values = values; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[4444] trunk
by ntrel＠users.sourceforge.net 24 Nov '09

24 Nov '09

Revision: 4444 http://geany.svn.sourceforge.net/geany/?rev=4444&view=rev Author: ntrel Date: 2009-11-24 15:47:44 +0000 (Tue, 24 Nov 2009) Log Message: ----------- Make stylesets take a ft_id argument so they can be reused fully with custom filetypes, so custom styles and keywords can be set. Modified Paths: -------------- trunk/ChangeLog trunk/src/highlighting.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-11-23 23:03:39 UTC (rev 4443) +++ trunk/ChangeLog 2009-11-24 15:47:44 UTC (rev 4444) @@ -1,3 +1,10 @@ +2009-11-24 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/highlighting.c: + Make stylesets take a ft_id argument so they can be reused fully with + custom filetypes, so custom styles and keywords can be set. + + 2009-11-23 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * tagmanager/php.c: Modified: trunk/src/highlighting.c =================================================================== --- trunk/src/highlighting.c 2009-11-23 23:03:39 UTC (rev 4443) +++ trunk/src/highlighting.c 2009-11-24 15:47:44 UTC (rev 4444) @@ -937,103 +937,95 @@ static void styleset_c_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) { - styleset_c_like_init(config, config_home, GEANY_FILETYPES_C); + styleset_c_like_init(config, config_home, ft_id); - style_sets[GEANY_FILETYPES_C].keywords = g_new(gchar*, 4); - get_keyfile_keywords(config, config_home, "primary", GEANY_FILETYPES_C, 0); - get_keyfile_keywords(config, config_home, "secondary", GEANY_FILETYPES_C, 1); - get_keyfile_keywords(config, config_home, "docComment", GEANY_FILETYPES_C, 2); - style_sets[GEANY_FILETYPES_C].keywords[3] = NULL; + style_sets[ft_id].keywords = g_new(gchar*, 4); + get_keyfile_keywords(config, config_home, "primary", ft_id, 0); + get_keyfile_keywords(config, config_home, "secondary", ft_id, 1); + get_keyfile_keywords(config, config_home, "docComment", ft_id, 2); + style_sets[ft_id].keywords[3] = NULL; } -static void styleset_c(ScintillaObject *sci) +static void styleset_c(ScintillaObject *sci, gint ft_id) { - const filetype_id ft_id = GEANY_FILETYPES_C; - styleset_c_like(sci, ft_id, TRUE, TRUE); - sci_set_keywords(sci, 0, style_sets[GEANY_FILETYPES_C].keywords[0]); - sci_set_keywords(sci, 2, style_sets[GEANY_FILETYPES_C].keywords[2]); + sci_set_keywords(sci, 0, style_sets[ft_id].keywords[0]); + sci_set_keywords(sci, 2, style_sets[ft_id].keywords[2]); /* assign global types, merge them with user defined keywords and set them */ - assign_global_and_user_keywords(sci, style_sets[GEANY_FILETYPES_C].keywords[1], + assign_global_and_user_keywords(sci, style_sets[ft_id].keywords[1], filetypes[ft_id]->lang); } static void styleset_cpp_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) { - styleset_c_like_init(config, config_home, GEANY_FILETYPES_CPP); + styleset_c_like_init(config, config_home, ft_id); - style_sets[GEANY_FILETYPES_CPP].keywords = g_new(gchar*, 4); - get_keyfile_keywords(config, config_home, "primary", GEANY_FILETYPES_CPP, 0); - get_keyfile_keywords(config, config_home, "secondary", GEANY_FILETYPES_CPP, 1); - get_keyfile_keywords(config, config_home, "docComment", GEANY_FILETYPES_CPP, 2); - style_sets[GEANY_FILETYPES_CPP].keywords[3] = NULL; + style_sets[ft_id].keywords = g_new(gchar*, 4); + get_keyfile_keywords(config, config_home, "primary", ft_id, 0); + get_keyfile_keywords(config, config_home, "secondary", ft_id, 1); + get_keyfile_keywords(config, config_home, "docComment", ft_id, 2); + style_sets[ft_id].keywords[3] = NULL; } -static void styleset_cpp(ScintillaObject *sci) +static void styleset_cpp(ScintillaObject *sci, gint ft_id) { - const filetype_id ft_id = GEANY_FILETYPES_CPP; - styleset_c_like(sci, ft_id, TRUE, TRUE); - sci_set_keywords(sci, 0, style_sets[GEANY_FILETYPES_CPP].keywords[0]); + sci_set_keywords(sci, 0, style_sets[ft_id].keywords[0]); /* for SCI_SETKEYWORDS = 1, see below*/ - sci_set_keywords(sci, 2, style_sets[GEANY_FILETYPES_CPP].keywords[2]); + sci_set_keywords(sci, 2, style_sets[ft_id].keywords[2]); /* assign global types, merge them with user defined keywords and set them */ - assign_global_and_user_keywords(sci, style_sets[GEANY_FILETYPES_CPP].keywords[1], + assign_global_and_user_keywords(sci, style_sets[ft_id].keywords[1], filetypes[ft_id]->lang); } static void styleset_glsl_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) { - styleset_c_like_init(config, config_home, GEANY_FILETYPES_GLSL); + styleset_c_like_init(config, config_home, ft_id); - style_sets[GEANY_FILETYPES_GLSL].keywords = g_new(gchar*, 4); - get_keyfile_keywords(config, config_home, "primary", GEANY_FILETYPES_GLSL, 0); - get_keyfile_keywords(config, config_home, "secondary", GEANY_FILETYPES_GLSL, 1); - get_keyfile_keywords(config, config_home, "docComment", GEANY_FILETYPES_GLSL, 2); - style_sets[GEANY_FILETYPES_GLSL].keywords[3] = NULL; + style_sets[ft_id].keywords = g_new(gchar*, 4); + get_keyfile_keywords(config, config_home, "primary", ft_id, 0); + get_keyfile_keywords(config, config_home, "secondary", ft_id, 1); + get_keyfile_keywords(config, config_home, "docComment", ft_id, 2); + style_sets[ft_id].keywords[3] = NULL; } -static void styleset_glsl(ScintillaObject *sci) +static void styleset_glsl(ScintillaObject *sci, gint ft_id) { - const filetype_id ft_id = GEANY_FILETYPES_GLSL; - styleset_c_like(sci, ft_id, TRUE, TRUE); - sci_set_keywords(sci, 0, style_sets[GEANY_FILETYPES_GLSL].keywords[0]); + sci_set_keywords(sci, 0, style_sets[ft_id].keywords[0]); /* for SCI_SETKEYWORDS = 1, see below*/ - sci_set_keywords(sci, 2, style_sets[GEANY_FILETYPES_GLSL].keywords[2]); + sci_set_keywords(sci, 2, style_sets[ft_id].keywords[2]); /* assign global types, merge them with user defined keywords and set them */ - assign_global_and_user_keywords(sci, style_sets[GEANY_FILETYPES_GLSL].keywords[1], + assign_global_and_user_keywords(sci, style_sets[ft_id].keywords[1], filetypes[ft_id]->lang); } static void styleset_cs_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) { - styleset_c_like_init(config, config_home, GEANY_FILETYPES_CS); + styleset_c_like_init(config, config_home, ft_id); - style_sets[GEANY_FILETYPES_CS].keywords = g_new(gchar*, 4); - get_keyfile_keywords(config, config_home, "primary", GEANY_FILETYPES_CS, 0); - get_keyfile_keywords(config, config_home, "secondary", GEANY_FILETYPES_CS, 1); - get_keyfile_keywords(config, config_home, "docComment", GEANY_FILETYPES_CS, 2); - style_sets[GEANY_FILETYPES_CS].keywords[3] = NULL; + style_sets[ft_id].keywords = g_new(gchar*, 4); + get_keyfile_keywords(config, config_home, "primary", ft_id, 0); + get_keyfile_keywords(config, config_home, "secondary", ft_id, 1); + get_keyfile_keywords(config, config_home, "docComment", ft_id, 2); + style_sets[ft_id].keywords[3] = NULL; } -static void styleset_cs(ScintillaObject *sci) +static void styleset_cs(ScintillaObject *sci, gint ft_id) { - const filetype_id ft_id = GEANY_FILETYPES_CS; - styleset_c_like(sci, ft_id, TRUE, FALSE); sci_set_keywords(sci, 0, style_sets[ft_id].keywords[0]); @@ -1046,20 +1038,18 @@ static void styleset_vala_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) { - styleset_c_like_init(config, config_home, GEANY_FILETYPES_VALA); + styleset_c_like_init(config, config_home, ft_id); - style_sets[GEANY_FILETYPES_VALA].keywords = g_new(gchar*, 4); - get_keyfile_keywords(config, config_home, "primary", GEANY_FILETYPES_VALA, 0); - get_keyfile_keywords(config, config_home, "secondary", GEANY_FILETYPES_VALA, 1); - get_keyfile_keywords(config, config_home, "docComment", GEANY_FILETYPES_VALA, 2); - style_sets[GEANY_FILETYPES_VALA].keywords[3] = NULL; + style_sets[ft_id].keywords = g_new(gchar*, 4); + get_keyfile_keywords(config, config_home, "primary", ft_id, 0); + get_keyfile_keywords(config, config_home, "secondary", ft_id, 1); + get_keyfile_keywords(config, config_home, "docComment", ft_id, 2); + style_sets[ft_id].keywords[3] = NULL; } -static void styleset_vala(ScintillaObject *sci) +static void styleset_vala(ScintillaObject *sci, gint ft_id) { - const filetype_id ft_id = GEANY_FILETYPES_VALA; - styleset_c_like(sci, ft_id, TRUE, FALSE); sci_set_keywords(sci, 0, style_sets[ft_id].keywords[0]); @@ -1072,165 +1062,155 @@ static void styleset_pascal_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) { - new_styleset(GEANY_FILETYPES_PASCAL, 15); - get_keyfile_style(config, config_home, "default", &style_sets[GEANY_FILETYPES_PASCAL].styling[0]); - get_keyfile_style(config, config_home, "identifier", &style_sets[GEANY_FILETYPES_PASCAL].styling[1]); - get_keyfile_style(config, config_home, "comment", &style_sets[GEANY_FILETYPES_PASCAL].styling[2]); - get_keyfile_style(config, config_home, "comment2", &style_sets[GEANY_FILETYPES_PASCAL].styling[3]); - get_keyfile_style(config, config_home, "commentline", &style_sets[GEANY_FILETYPES_PASCAL].styling[4]); - get_keyfile_style(config, config_home, "preprocessor", &style_sets[GEANY_FILETYPES_PASCAL].styling[5]); - get_keyfile_style(config, config_home, "preprocessor2", &style_sets[GEANY_FILETYPES_PASCAL].styling[6]); - get_keyfile_style(config, config_home, "number", &style_sets[GEANY_FILETYPES_PASCAL].styling[7]); - get_keyfile_style(config, config_home, "hexnumber", &style_sets[GEANY_FILETYPES_PASCAL].styling[8]); - get_keyfile_style(config, config_home, "word", &style_sets[GEANY_FILETYPES_PASCAL].styling[9]); - get_keyfile_style(config, config_home, "string", &style_sets[GEANY_FILETYPES_PASCAL].styling[10]); - get_keyfile_style(config, config_home, "stringeol", &style_sets[GEANY_FILETYPES_PASCAL].styling[11]); - get_keyfile_style(config, config_home, "character", &style_sets[GEANY_FILETYPES_PASCAL].styling[12]); - get_keyfile_style(config, config_home, "operator", &style_sets[GEANY_FILETYPES_PASCAL].styling[13]); - get_keyfile_style(config, config_home, "asm", &style_sets[GEANY_FILETYPES_PASCAL].styling[14]); + new_styleset(ft_id, 15); + get_keyfile_style(config, config_home, "default", &style_sets[ft_id].styling[0]); + get_keyfile_style(config, config_home, "identifier", &style_sets[ft_id].styling[1]); + get_keyfile_style(config, config_home, "comment", &style_sets[ft_id].styling[2]); + get_keyfile_style(config, config_home, "comment2", &style_sets[ft_id].styling[3]); + get_keyfile_style(config, config_home, "commentline", &style_sets[ft_id].styling[4]); + get_keyfile_style(config, config_home, "preprocessor", &style_sets[ft_id].styling[5]); + get_keyfile_style(config, config_home, "preprocessor2", &style_sets[ft_id].styling[6]); + get_keyfile_style(config, config_home, "number", &style_sets[ft_id].styling[7]); + get_keyfile_style(config, config_home, "hexnumber", &style_sets[ft_id].styling[8]); + get_keyfile_style(config, config_home, "word", &style_sets[ft_id].styling[9]); + get_keyfile_style(config, config_home, "string", &style_sets[ft_id].styling[10]); + get_keyfile_style(config, config_home, "stringeol", &style_sets[ft_id].styling[11]); + get_keyfile_style(config, config_home, "character", &style_sets[ft_id].styling[12]); + get_keyfile_style(config, config_home, "operator", &style_sets[ft_id].styling[13]); + get_keyfile_style(config, config_home, "asm", &style_sets[ft_id].styling[14]); - style_sets[GEANY_FILETYPES_PASCAL].keywords = g_new(gchar*, 2); - get_keyfile_keywords(config, config_home, "primary", GEANY_FILETYPES_PASCAL, 0); - style_sets[GEANY_FILETYPES_PASCAL].keywords[1] = NULL; + style_sets[ft_id].keywords = g_new(gchar*, 2); + get_keyfile_keywords(config, config_home, "primary", ft_id, 0); + style_sets[ft_id].keywords[1] = NULL; } -static void styleset_pascal(ScintillaObject *sci) +static void styleset_pascal(ScintillaObject *sci, gint ft_id) { - const filetype_id ft_id = GEANY_FILETYPES_PASCAL; - apply_filetype_properties(sci, SCLEX_PASCAL, ft_id); - sci_set_keywords(sci, 0, style_sets[GEANY_FILETYPES_PASCAL].keywords[0]); + sci_set_keywords(sci, 0, style_sets[ft_id].keywords[0]); - set_sci_style(sci, STYLE_DEFAULT, GEANY_FILETYPES_PASCAL, 0); - set_sci_style(sci, SCE_PAS_DEFAULT, GEANY_FILETYPES_PASCAL, 0); - set_sci_style(sci, SCE_PAS_IDENTIFIER, GEANY_FILETYPES_PASCAL, 1); - set_sci_style(sci, SCE_PAS_COMMENT, GEANY_FILETYPES_PASCAL, 2); - set_sci_style(sci, SCE_PAS_COMMENT2, GEANY_FILETYPES_PASCAL, 3); - set_sci_style(sci, SCE_PAS_COMMENTLINE, GEANY_FILETYPES_PASCAL, 4); - set_sci_style(sci, SCE_PAS_PREPROCESSOR, GEANY_FILETYPES_PASCAL, 5); - set_sci_style(sci, SCE_PAS_PREPROCESSOR2, GEANY_FILETYPES_PASCAL, 6); - set_sci_style(sci, SCE_PAS_NUMBER, GEANY_FILETYPES_PASCAL, 7); - set_sci_style(sci, SCE_PAS_HEXNUMBER, GEANY_FILETYPES_PASCAL, 8); - set_sci_style(sci, SCE_PAS_WORD, GEANY_FILETYPES_PASCAL, 9); - set_sci_style(sci, SCE_PAS_STRING, GEANY_FILETYPES_PASCAL, 10); - set_sci_style(sci, SCE_PAS_STRINGEOL, GEANY_FILETYPES_PASCAL, 11); - set_sci_style(sci, SCE_PAS_CHARACTER, GEANY_FILETYPES_PASCAL, 12); - set_sci_style(sci, SCE_PAS_OPERATOR, GEANY_FILETYPES_PASCAL, 13); - set_sci_style(sci, SCE_PAS_ASM, GEANY_FILETYPES_PASCAL, 14); + set_sci_style(sci, STYLE_DEFAULT, ft_id, 0); + set_sci_style(sci, SCE_PAS_DEFAULT, ft_id, 0); + set_sci_style(sci, SCE_PAS_IDENTIFIER, ft_id, 1); + set_sci_style(sci, SCE_PAS_COMMENT, ft_id, 2); + set_sci_style(sci, SCE_PAS_COMMENT2, ft_id, 3); + set_sci_style(sci, SCE_PAS_COMMENTLINE, ft_id, 4); + set_sci_style(sci, SCE_PAS_PREPROCESSOR, ft_id, 5); + set_sci_style(sci, SCE_PAS_PREPROCESSOR2, ft_id, 6); + set_sci_style(sci, SCE_PAS_NUMBER, ft_id, 7); + set_sci_style(sci, SCE_PAS_HEXNUMBER, ft_id, 8); + set_sci_style(sci, SCE_PAS_WORD, ft_id, 9); + set_sci_style(sci, SCE_PAS_STRING, ft_id, 10); + set_sci_style(sci, SCE_PAS_STRINGEOL, ft_id, 11); + set_sci_style(sci, SCE_PAS_CHARACTER, ft_id, 12); + set_sci_style(sci, SCE_PAS_OPERATOR, ft_id, 13); + set_sci_style(sci, SCE_PAS_ASM, ft_id, 14); } static void styleset_makefile_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) { - new_styleset(GEANY_FILETYPES_MAKE, 7); - get_keyfile_style(config, config_home, "default", &style_sets[GEANY_FILETYPES_MAKE].styling[0]); - get_keyfile_style(config, config_home, "comment", &style_sets[GEANY_FILETYPES_MAKE].styling[1]); - get_keyfile_style(config, config_home, "preprocessor", &style_sets[GEANY_FILETYPES_MAKE].styling[2]); - get_keyfile_style(config, config_home, "identifier", &style_sets[GEANY_FILETYPES_MAKE].styling[3]); - get_keyfile_style(config, config_home, "operator", &style_sets[GEANY_FILETYPES_MAKE].styling[4]); - get_keyfile_style(config, config_home, "target", &style_sets[GEANY_FILETYPES_MAKE].styling[5]); - get_keyfile_style(config, config_home, "ideol", &style_sets[GEANY_FILETYPES_MAKE].styling[6]); + new_styleset(ft_id, 7); + get_keyfile_style(config, config_home, "default", &style_sets[ft_id].styling[0]); + get_keyfile_style(config, config_home, "comment", &style_sets[ft_id].styling[1]); + get_keyfile_style(config, config_home, "preprocessor", &style_sets[ft_id].styling[2]); + get_keyfile_style(config, config_home, "identifier", &style_sets[ft_id].styling[3]); + get_keyfile_style(config, config_home, "operator", &style_sets[ft_id].styling[4]); + get_keyfile_style(config, config_home, "target", &style_sets[ft_id].styling[5]); + get_keyfile_style(config, config_home, "ideol", &style_sets[ft_id].styling[6]); - style_sets[GEANY_FILETYPES_MAKE].keywords = NULL; + style_sets[ft_id].keywords = NULL; } -static void styleset_makefile(ScintillaObject *sci) +static void styleset_makefile(ScintillaObject *sci, gint ft_id) { - const filetype_id ft_id = GEANY_FILETYPES_MAKE; - apply_filetype_properties(sci, SCLEX_MAKEFILE, ft_id); - set_sci_style(sci, STYLE_DEFAULT, GEANY_FILETYPES_MAKE, 0); - set_sci_style(sci, SCE_MAKE_DEFAULT, GEANY_FILETYPES_MAKE, 0); - set_sci_style(sci, SCE_MAKE_COMMENT, GEANY_FILETYPES_MAKE, 1); - set_sci_style(sci, SCE_MAKE_PREPROCESSOR, GEANY_FILETYPES_MAKE, 2); - set_sci_style(sci, SCE_MAKE_IDENTIFIER, GEANY_FILETYPES_MAKE, 3); - set_sci_style(sci, SCE_MAKE_OPERATOR, GEANY_FILETYPES_MAKE, 4); - set_sci_style(sci, SCE_MAKE_TARGET, GEANY_FILETYPES_MAKE, 5); - set_sci_style(sci, SCE_MAKE_IDEOL, GEANY_FILETYPES_MAKE, 6); + set_sci_style(sci, STYLE_DEFAULT, ft_id, 0); + set_sci_style(sci, SCE_MAKE_DEFAULT, ft_id, 0); + set_sci_style(sci, SCE_MAKE_COMMENT, ft_id, 1); + set_sci_style(sci, SCE_MAKE_PREPROCESSOR, ft_id, 2); + set_sci_style(sci, SCE_MAKE_IDENTIFIER, ft_id, 3); + set_sci_style(sci, SCE_MAKE_OPERATOR, ft_id, 4); + set_sci_style(sci, SCE_MAKE_TARGET, ft_id, 5); + set_sci_style(sci, SCE_MAKE_IDEOL, ft_id, 6); } static void styleset_diff_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) { - new_styleset(GEANY_FILETYPES_DIFF, 8); - get_keyfile_style(config, config_home, "default", &style_sets[GEANY_FILETYPES_DIFF].styling[0]); - get_keyfile_style(config, config_home, "comment", &style_sets[GEANY_FILETYPES_DIFF].styling[1]); - get_keyfile_style(config, config_home, "command", &style_sets[GEANY_FILETYPES_DIFF].styling[2]); - get_keyfile_style(config, config_home, "header", &style_sets[GEANY_FILETYPES_DIFF].styling[3]); - get_keyfile_style(config, config_home, "position", &style_sets[GEANY_FILETYPES_DIFF].styling[4]); - get_keyfile_style(config, config_home, "deleted", &style_sets[GEANY_FILETYPES_DIFF].styling[5]); - get_keyfile_style(config, config_home, "added", &style_sets[GEANY_FILETYPES_DIFF].styling[6]); - get_keyfile_style(config, config_home, "changed", &style_sets[GEANY_FILETYPES_DIFF].styling[7]); + new_styleset(ft_id, 8); + get_keyfile_style(config, config_home, "default", &style_sets[ft_id].styling[0]); + get_keyfile_style(config, config_home, "comment", &style_sets[ft_id].styling[1]); + get_keyfile_style(config, config_home, "command", &style_sets[ft_id].styling[2]); + get_keyfile_style(config, config_home, "header", &style_sets[ft_id].styling[3]); + get_keyfile_style(config, config_home, "position", &style_sets[ft_id].styling[4]); + get_keyfile_style(config, config_home, "deleted", &style_sets[ft_id].styling[5]); + get_keyfile_style(config, config_home, "added", &style_sets[ft_id].styling[6]); + get_keyfile_style(config, config_home, "changed", &style_sets[ft_id].styling[7]); - style_sets[GEANY_FILETYPES_DIFF].keywords = NULL; + style_sets[ft_id].keywords = NULL; } -static void styleset_diff(ScintillaObject *sci) +static void styleset_diff(ScintillaObject *sci, gint ft_id) { - const filetype_id ft_id = GEANY_FILETYPES_DIFF; - apply_filetype_properties(sci, SCLEX_DIFF, ft_id); - set_sci_style(sci, STYLE_DEFAULT, GEANY_FILETYPES_DIFF, 0); - set_sci_style(sci, SCE_DIFF_DEFAULT, GEANY_FILETYPES_DIFF, 0); - set_sci_style(sci, SCE_DIFF_COMMENT, GEANY_FILETYPES_DIFF, 1); - set_sci_style(sci, SCE_DIFF_COMMAND, GEANY_FILETYPES_DIFF, 2); - set_sci_style(sci, SCE_DIFF_HEADER, GEANY_FILETYPES_DIFF, 3); - set_sci_style(sci, SCE_DIFF_POSITION, GEANY_FILETYPES_DIFF, 4); - set_sci_style(sci, SCE_DIFF_DELETED, GEANY_FILETYPES_DIFF, 5); - set_sci_style(sci, SCE_DIFF_ADDED, GEANY_FILETYPES_DIFF, 6); - set_sci_style(sci, SCE_DIFF_CHANGED, GEANY_FILETYPES_DIFF, 7); + set_sci_style(sci, STYLE_DEFAULT, ft_id, 0); + set_sci_style(sci, SCE_DIFF_DEFAULT, ft_id, 0); + set_sci_style(sci, SCE_DIFF_COMMENT, ft_id, 1); + set_sci_style(sci, SCE_DIFF_COMMAND, ft_id, 2); + set_sci_style(sci, SCE_DIFF_HEADER, ft_id, 3); + set_sci_style(sci, SCE_DIFF_POSITION, ft_id, 4); + set_sci_style(sci, SCE_DIFF_DELETED, ft_id, 5); + set_sci_style(sci, SCE_DIFF_ADDED, ft_id, 6); + set_sci_style(sci, SCE_DIFF_CHANGED, ft_id, 7); } static void styleset_latex_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) { - new_styleset(GEANY_FILETYPES_LATEX, 5); - get_keyfile_style(config, config_home, "default", &style_sets[GEANY_FILETYPES_LATEX].styling[0]); - get_keyfile_style(config, config_home, "command", &style_sets[GEANY_FILETYPES_LATEX].styling[1]); - get_keyfile_style(config, config_home, "tag", &style_sets[GEANY_FILETYPES_LATEX].styling[2]); - get_keyfile_style(config, config_home, "math", &style_sets[GEANY_FILETYPES_LATEX].styling[3]); - get_keyfile_style(config, config_home, "comment", &style_sets[GEANY_FILETYPES_LATEX].styling[4]); + new_styleset(ft_id, 5); + get_keyfile_style(config, config_home, "default", &style_sets[ft_id].styling[0]); + get_keyfile_style(config, config_home, "command", &style_sets[ft_id].styling[1]); + get_keyfile_style(config, config_home, "tag", &style_sets[ft_id].styling[2]); + get_keyfile_style(config, config_home, "math", &style_sets[ft_id].styling[3]); + get_keyfile_style(config, config_home, "comment", &style_sets[ft_id].styling[4]); - style_sets[GEANY_FILETYPES_LATEX].keywords = g_new(gchar*, 2); - get_keyfile_keywords(config, config_home, "primary", GEANY_FILETYPES_LATEX, 0); - style_sets[GEANY_FILETYPES_LATEX].keywords[1] = NULL; + style_sets[ft_id].keywords = g_new(gchar*, 2); + get_keyfile_keywords(config, config_home, "primary", ft_id, 0); + style_sets[ft_id].keywords[1] = NULL; } -static void styleset_latex(ScintillaObject *sci) +static void styleset_latex(ScintillaObject *sci, gint ft_id) { - const filetype_id ft_id = GEANY_FILETYPES_LATEX; - apply_filetype_properties(sci, SCLEX_LATEX, ft_id); - sci_set_keywords(sci, 0, style_sets[GEANY_FILETYPES_LATEX].keywords[0]); + sci_set_keywords(sci, 0, style_sets[ft_id].keywords[0]); - set_sci_style(sci, STYLE_DEFAULT, GEANY_FILETYPES_LATEX, 0); - set_sci_style(sci, SCE_L_DEFAULT, GEANY_FILETYPES_LATEX, 0); - set_sci_style(sci, SCE_L_COMMAND, GEANY_FILETYPES_LATEX, 1); - set_sci_style(sci, SCE_L_TAG, GEANY_FILETYPES_LATEX, 2); - set_sci_style(sci, SCE_L_MATH, GEANY_FILETYPES_LATEX, 3); - set_sci_style(sci, SCE_L_COMMENT, GEANY_FILETYPES_LATEX, 4); + set_sci_style(sci, STYLE_DEFAULT, ft_id, 0); + set_sci_style(sci, SCE_L_DEFAULT, ft_id, 0); + set_sci_style(sci, SCE_L_COMMAND, ft_id, 1); + set_sci_style(sci, SCE_L_TAG, ft_id, 2); + set_sci_style(sci, SCE_L_MATH, ft_id, 3); + set_sci_style(sci, SCE_L_COMMENT, ft_id, 4); } static void styleset_php_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) { - style_sets[GEANY_FILETYPES_PHP].styling = NULL; - style_sets[GEANY_FILETYPES_PHP].keywords = NULL; + style_sets[ft_id].styling = NULL; + style_sets[ft_id].keywords = NULL; } -static void styleset_php(ScintillaObject *sci) +static void styleset_php(ScintillaObject *sci, gint ft_id) { - const filetype_id ft_id = GEANY_FILETYPES_PHP; - apply_filetype_properties(sci, SCLEX_HTML, ft_id); /* use the same colouring as for XML */ @@ -1240,15 +1220,13 @@ static void styleset_html_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) { - style_sets[GEANY_FILETYPES_HTML].styling = NULL; - style_sets[GEANY_FILETYPES_HTML].keywords = NULL; + style_sets[ft_id].styling = NULL; + style_sets[ft_id].keywords = NULL; } -static void styleset_html(ScintillaObject *sci) +static void styleset_html(ScintillaObject *sci, gint ft_id) { - const filetype_id ft_id = GEANY_FILETYPES_HTML; - apply_filetype_properties(sci, SCLEX_HTML, ft_id); /* use the same colouring for HTML; XML and so on */ @@ -1490,27 +1468,25 @@ static void styleset_java_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) { - styleset_c_like_init(config, config_home, GEANY_FILETYPES_JAVA); + styleset_c_like_init(config, config_home, ft_id); - style_sets[GEANY_FILETYPES_JAVA].keywords = g_new(gchar*, 5); - get_keyfile_keywords(config, config_home, "primary", GEANY_FILETYPES_JAVA, 0); - get_keyfile_keywords(config, config_home, "secondary", GEANY_FILETYPES_JAVA, 1); - get_keyfile_keywords(config, config_home, "doccomment", GEANY_FILETYPES_JAVA, 2); - get_keyfile_keywords(config, config_home, "typedefs", GEANY_FILETYPES_JAVA, 3); - style_sets[GEANY_FILETYPES_JAVA].keywords[4] = NULL; + style_sets[ft_id].keywords = g_new(gchar*, 5); + get_keyfile_keywords(config, config_home, "primary", ft_id, 0); + get_keyfile_keywords(config, config_home, "secondary", ft_id, 1); + get_keyfile_keywords(config, config_home, "doccomment", ft_id, 2); + get_keyfile_keywords(config, config_home, "typedefs", ft_id, 3); + style_sets[ft_id].keywords[4] = NULL; } -static void styleset_java(ScintillaObject *sci) +static void styleset_java(ScintillaObject *sci, gint ft_id) { - const filetype_id ft_id = GEANY_FILETYPES_JAVA; - styleset_c_like(sci, ft_id, FALSE, FALSE); - sci_set_keywords(sci, 0, style_sets[GEANY_FILETYPES_JAVA].keywords[0]); - sci_set_keywords(sci, 1, style_sets[GEANY_FILETYPES_JAVA].keywords[1]); - sci_set_keywords(sci, 2, style_sets[GEANY_FILETYPES_JAVA].keywords[2]); - sci_set_keywords(sci, 4, style_sets[GEANY_FILETYPES_JAVA].keywords[3]); + sci_set_keywords(sci, 0, style_sets[ft_id].keywords[0]); + sci_set_keywords(sci, 1, style_sets[ft_id].keywords[1]); + sci_set_keywords(sci, 2, style_sets[ft_id].keywords[2]); + sci_set_keywords(sci, 4, style_sets[ft_id].keywords[3]); /* assign global types, merge them with user defined keywords and set them */ assign_global_and_user_keywords(sci, style_sets[ft_id].keywords[1], filetypes[ft_id]->lang); @@ -1519,406 +1495,392 @@ static void styleset_perl_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) { - new_styleset(GEANY_FILETYPES_PERL, 35); - get_keyfile_style(config, config_home, "default", &style_sets[GEANY_FILETYPES_PERL].styling[0]); - get_keyfile_style(config, config_home, "error", &style_sets[GEANY_FILETYPES_PERL].styling[1]); - get_keyfile_style(config, config_home, "commentline", &style_sets[GEANY_FILETYPES_PERL].styling[2]); - get_keyfile_style(config, config_home, "number", &style_sets[GEANY_FILETYPES_PERL].styling[3]); - get_keyfile_style(config, config_home, "word", &style_sets[GEANY_FILETYPES_PERL].styling[4]); - get_keyfile_style(config, config_home, "string", &style_sets[GEANY_FILETYPES_PERL].styling[5]); - get_keyfile_style(config, config_home, "character", &style_sets[GEANY_FILETYPES_PERL].styling[6]); - get_keyfile_style(config, config_home, "preprocessor", &style_sets[GEANY_FILETYPES_PERL].styling[7]); - get_keyfile_style(config, config_home, "operator", &style_sets[GEANY_FILETYPES_PERL].styling[8]); - get_keyfile_style(config, config_home, "identifier", &style_sets[GEANY_FILETYPES_PERL].styling[9]); - get_keyfile_style(config, config_home, "scalar", &style_sets[GEANY_FILETYPES_PERL].styling[10]); - get_keyfile_style(config, config_home, "pod", &style_sets[GEANY_FILETYPES_PERL].styling[11]); - get_keyfile_style(config, config_home, "regex", &style_sets[GEANY_FILETYPES_PERL].styling[12]); - get_keyfile_style(config, config_home, "array", &style_sets[GEANY_FILETYPES_PERL].styling[13]); - get_keyfile_style(config, config_home, "hash", &style_sets[GEANY_FILETYPES_PERL].styling[14]); - get_keyfile_style(config, config_home, "symboltable", &style_sets[GEANY_FILETYPES_PERL].styling[15]); - get_keyfile_style(config, config_home, "backticks", &style_sets[GEANY_FILETYPES_PERL].styling[16]); - get_keyfile_style(config, config_home, "pod_verbatim", &style_sets[GEANY_FILETYPES_PERL].styling[17]); - get_keyfile_style(config, config_home, "reg_subst", &style_sets[GEANY_FILETYPES_PERL].styling[18]); - get_keyfile_style(config, config_home, "datasection", &style_sets[GEANY_FILETYPES_PERL].styling[19]); - get_keyfile_style(config, config_home, "here_delim", &style_sets[GEANY_FILETYPES_PERL].styling[20]); - get_keyfile_style(config, config_home, "here_q", &style_sets[GEANY_FILETYPES_PERL].styling[21]); - get_keyfile_style(config, config_home, "here_qq", &style_sets[GEANY_FILETYPES_PERL].styling[22]); - get_keyfile_style(config, config_home, "here_qx", &style_sets[GEANY_FILETYPES_PERL].styling[23]); - get_keyfile_style(config, config_home, "string_q", &style_sets[GEANY_FILETYPES_PERL].styling[24]); - get_keyfile_style(config, config_home, "string_qq", &style_sets[GEANY_FILETYPES_PERL].styling[25]); - get_keyfile_style(config, config_home, "string_qx", &style_sets[GEANY_FILETYPES_PERL].styling[26]); - get_keyfile_style(config, config_home, "string_qr", &style_sets[GEANY_FILETYPES_PERL].styling[27]); - get_keyfile_style(config, config_home, "string_qw", &style_sets[GEANY_FILETYPES_PERL].styling[28]); - get_keyfile_style(config, config_home, "variable_indexer", &style_sets[GEANY_FILETYPES_PERL].styling[29]); - get_keyfile_style(config, config_home, "punctuation", &style_sets[GEANY_FILETYPES_PERL].styling[30]); - get_keyfile_style(config, config_home, "longquote", &style_sets[GEANY_FILETYPES_PERL].styling[31]); - get_keyfile_style(config, config_home, "sub_prototype", &style_sets[GEANY_FILETYPES_PERL].styling[32]); - get_keyfile_style(config, config_home, "format_ident", &style_sets[GEANY_FILETYPES_PERL].styling[33]); - get_keyfile_style(config, config_home, "format", &style_sets[GEANY_FILETYPES_PERL].styling[34]); + new_styleset(ft_id, 35); + get_keyfile_style(config, config_home, "default", &style_sets[ft_id].styling[0]); + get_keyfile_style(config, config_home, "error", &style_sets[ft_id].styling[1]); + get_keyfile_style(config, config_home, "commentline", &style_sets[ft_id].styling[2]); + get_keyfile_style(config, config_home, "number", &style_sets[ft_id].styling[3]); + get_keyfile_style(config, config_home, "word", &style_sets[ft_id].styling[4]); + get_keyfile_style(config, config_home, "string", &style_sets[ft_id].styling[5]); + get_keyfile_style(config, config_home, "character", &style_sets[ft_id].styling[6]); + get_keyfile_style(config, config_home, "preprocessor", &style_sets[ft_id].styling[7]); + get_keyfile_style(config, config_home, "operator", &style_sets[ft_id].styling[8]); + get_keyfile_style(config, config_home, "identifier", &style_sets[ft_id].styling[9]); + get_keyfile_style(config, config_home, "scalar", &style_sets[ft_id].styling[10]); + get_keyfile_style(config, config_home, "pod", &style_sets[ft_id].styling[11]); + get_keyfile_style(config, config_home, "regex", &style_sets[ft_id].styling[12]); + get_keyfile_style(config, config_home, "array", &style_sets[ft_id].styling[13]); + get_keyfile_style(config, config_home, "hash", &style_sets[ft_id].styling[14]); + get_keyfile_style(config, config_home, "symboltable", &style_sets[ft_id].styling[15]); + get_keyfile_style(config, config_home, "backticks", &style_sets[ft_id].styling[16]); + get_keyfile_style(config, config_home, "pod_verbatim", &style_sets[ft_id].styling[17]); + get_keyfile_style(config, config_home, "reg_subst", &style_sets[ft_id].styling[18]); + get_keyfile_style(config, config_home, "datasection", &style_sets[ft_id].styling[19]); + get_keyfile_style(config, config_home, "here_delim", &style_sets[ft_id].styling[20]); + get_keyfile_style(config, config_home, "here_q", &style_sets[ft_id].styling[21]); + get_keyfile_style(config, config_home, "here_qq", &style_sets[ft_id].styling[22]); + get_keyfile_style(config, config_home, "here_qx", &style_sets[ft_id].styling[23]); + get_keyfile_style(config, config_home, "string_q", &style_sets[ft_id].styling[24]); + get_keyfile_style(config, config_home, "string_qq", &style_sets[ft_id].styling[25]); + get_keyfile_style(config, config_home, "string_qx", &style_sets[ft_id].styling[26]); + get_keyfile_style(config, config_home, "string_qr", &style_sets[ft_id].styling[27]); + get_keyfile_style(config, config_home, "string_qw", &style_sets[ft_id].styling[28]); + get_keyfile_style(config, config_home, "variable_indexer", &style_sets[ft_id].styling[29]); + get_keyfile_style(config, config_home, "punctuation", &style_sets[ft_id].styling[30]); + get_keyfile_style(config, config_home, "longquote", &style_sets[ft_id].styling[31]); + get_keyfile_style(config, config_home, "sub_prototype", &style_sets[ft_id].styling[32]); + get_keyfile_style(config, config_home, "format_ident", &style_sets[ft_id].styling[33]); + get_keyfile_style(config, config_home, "format", &style_sets[ft_id].styling[34]); - style_sets[GEANY_FILETYPES_PERL].keywords = g_new(gchar*, 2); - get_keyfile_keywords(config, config_home, "primary", GEANY_FILETYPES_PERL, 0); - style_sets[GEANY_FILETYPES_PERL].keywords[1] = NULL; + style_sets[ft_id].keywords = g_new(gchar*, 2); + get_keyfile_keywords(config, config_home, "primary", ft_id, 0); + style_sets[ft_id].keywords[1] = NULL; } -static void styleset_perl(ScintillaObject *sci) +static void styleset_perl(ScintillaObject *sci, gint ft_id) { - const filetype_id ft_id = GEANY_FILETYPES_PERL; - apply_filetype_properties(sci, SCLEX_PERL, ft_id); - sci_set_keywords(sci, 0, style_sets[GEANY_FILETYPES_PERL].keywords[0]); + sci_set_keywords(sci, 0, style_sets[ft_id].keywords[0]); - set_sci_style(sci, STYLE_DEFAULT, GEANY_FILETYPES_PERL, 0); - set_sci_style(sci, SCE_PL_DEFAULT, GEANY_FILETYPES_PERL, 0); - set_sci_style(sci, SCE_PL_ERROR, GEANY_FILETYPES_PERL, 1); - set_sci_style(sci, SCE_PL_COMMENTLINE, GEANY_FILETYPES_PERL, 2); - set_sci_style(sci, SCE_PL_NUMBER, GEANY_FILETYPES_PERL, 3); - set_sci_style(sci, SCE_PL_WORD, GEANY_FILETYPES_PERL, 4); - set_sci_style(sci, SCE_PL_STRING, GEANY_FILETYPES_PERL, 5); - set_sci_style(sci, SCE_PL_CHARACTER, GEANY_FILETYPES_PERL, 6); - set_sci_style(sci, SCE_PL_PREPROCESSOR, GEANY_FILETYPES_PERL, 7); - set_sci_style(sci, SCE_PL_OPERATOR, GEANY_FILETYPES_PERL, 8); - set_sci_style(sci, SCE_PL_IDENTIFIER, GEANY_FILETYPES_PERL, 9); - set_sci_style(sci, SCE_PL_SCALAR, GEANY_FILETYPES_PERL, 10); - set_sci_style(sci, SCE_PL_POD, GEANY_FILETYPES_PERL, 11); - set_sci_style(sci, SCE_PL_REGEX, GEANY_FILETYPES_PERL, 12); - set_sci_style(sci, SCE_PL_ARRAY, GEANY_FILETYPES_PERL, 13); - set_sci_style(sci, SCE_PL_HASH, GEANY_FILETYPES_PERL, 14); - set_sci_style(sci, SCE_PL_SYMBOLTABLE, GEANY_FILETYPES_PERL, 15); - set_sci_style(sci, SCE_PL_BACKTICKS, GEANY_FILETYPES_PERL, 16); - set_sci_style(sci, SCE_PL_POD_VERB, GEANY_FILETYPES_PERL, 17); - set_sci_style(sci, SCE_PL_REGSUBST, GEANY_FILETYPES_PERL, 18); - set_sci_style(sci, SCE_PL_DATASECTION, GEANY_FILETYPES_PERL, 19); - set_sci_style(sci, SCE_PL_HERE_DELIM, GEANY_FILETYPES_PERL, 20); - set_sci_style(sci, SCE_PL_HERE_Q, GEANY_FILETYPES_PERL, 21); - set_sci_style(sci, SCE_PL_HERE_QQ, GEANY_FILETYPES_PERL, 22); - set_sci_style(sci, SCE_PL_HERE_QX, GEANY_FILETYPES_PERL, 23); - set_sci_style(sci, SCE_PL_STRING_Q, GEANY_FILETYPES_PERL, 24); - set_sci_style(sci, SCE_PL_STRING_QQ, GEANY_FILETYPES_PERL, 25); - set_sci_style(sci, SCE_PL_STRING_QX, GEANY_FILETYPES_PERL, 26); - set_sci_style(sci, SCE_PL_STRING_QR, GEANY_FILETYPES_PERL, 27); - set_sci_style(sci, SCE_PL_STRING_QW, GEANY_FILETYPES_PERL, 28); - set_sci_style(sci, SCE_PL_VARIABLE_INDEXER, GEANY_FILETYPES_PERL, 29); - set_sci_style(sci, SCE_PL_PUNCTUATION, GEANY_FILETYPES_PERL, 30); - set_sci_style(sci, SCE_PL_LONGQUOTE, GEANY_FILETYPES_PERL, 31); - set_sci_style(sci, SCE_PL_SUB_PROTOTYPE, GEANY_FILETYPES_PERL, 32); - set_sci_style(sci, SCE_PL_FORMAT_IDENT, GEANY_FILETYPES_PERL, 33); - set_sci_style(sci, SCE_PL_FORMAT, GEANY_FILETYPES_PERL, 34); + set_sci_style(sci, STYLE_DEFAULT, ft_id, 0); + set_sci_style(sci, SCE_PL_DEFAULT, ft_id, 0); + set_sci_style(sci, SCE_PL_ERROR, ft_id, 1); + set_sci_style(sci, SCE_PL_COMMENTLINE, ft_id, 2); + set_sci_style(sci, SCE_PL_NUMBER, ft_id, 3); + set_sci_style(sci, SCE_PL_WORD, ft_id, 4); + set_sci_style(sci, SCE_PL_STRING, ft_id, 5); + set_sci_style(sci, SCE_PL_CHARACTER, ft_id, 6); + set_sci_style(sci, SCE_PL_PREPROCESSOR, ft_id, 7); + set_sci_style(sci, SCE_PL_OPERATOR, ft_id, 8); + set_sci_style(sci, SCE_PL_IDENTIFIER, ft_id, 9); + set_sci_style(sci, SCE_PL_SCALAR, ft_id, 10); + set_sci_style(sci, SCE_PL_POD, ft_id, 11); + set_sci_style(sci, SCE_PL_REGEX, ft_id, 12); + set_sci_style(sci, SCE_PL_ARRAY, ft_id, 13); + set_sci_style(sci, SCE_PL_HASH, ft_id, 14); + set_sci_style(sci, SCE_PL_SYMBOLTABLE, ft_id, 15); + set_sci_style(sci, SCE_PL_BACKTICKS, ft_id, 16); + set_sci_style(sci, SCE_PL_POD_VERB, ft_id, 17); + set_sci_style(sci, SCE_PL_REGSUBST, ft_id, 18); + set_sci_style(sci, SCE_PL_DATASECTION, ft_id, 19); + set_sci_style(sci, SCE_PL_HERE_DELIM, ft_id, 20); + set_sci_style(sci, SCE_PL_HERE_Q, ft_id, 21); + set_sci_style(sci, SCE_PL_HERE_QQ, ft_id, 22); + set_sci_style(sci, SCE_PL_HERE_QX, ft_id, 23); + set_sci_style(sci, SCE_PL_STRING_Q, ft_id, 24); + set_sci_style(sci, SCE_PL_STRING_QQ, ft_id, 25); + set_sci_style(sci, SCE_PL_STRING_QX, ft_id, 26); + set_sci_style(sci, SCE_PL_STRING_QR, ft_id, 27); + set_sci_style(sci, SCE_PL_STRING_QW, ft_id, 28); + set_sci_style(sci, SCE_PL_VARIABLE_INDEXER, ft_id, 29); + set_sci_style(sci, SCE_PL_PUNCTUATION, ft_id, 30); + set_sci_style(sci, SCE_PL_LONGQUOTE, ft_id, 31); + set_sci_style(sci, SCE_PL_SUB_PROTOTYPE, ft_id, 32); + set_sci_style(sci, SCE_PL_FORMAT_IDENT, ft_id, 33); + set_sci_style(sci, SCE_PL_FORMAT, ft_id, 34); } static void styleset_python_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) { - new_styleset(GEANY_FILETYPES_PYTHON, 16); - get_keyfile_style(config, config_home, "default", &style_sets[GEANY_FILETYPES_PYTHON].styling[0]); - get_keyfile_style(config, config_home, "commentline", &style_sets[GEANY_FILETYPES_PYTHON].styling[1]); - get_keyfile_style(config, config_home, "number", &style_sets[GEANY_FILETYPES_PYTHON].styling[2]); - get_keyfile_style(config, config_home, "string", &style_sets[GEANY_FILETYPES_PYTHON].styling[3]); - get_keyfile_style(config, config_home, "character", &style_sets[GEANY_FILETYPES_PYTHON].styling[4]); - get_keyfile_style(config, config_home, "word", &style_sets[GEANY_FILETYPES_PYTHON].styling[5]); - get_keyfile_style(config, config_home, "triple", &style_sets[GEANY_FILETYPES_PYTHON].styling[6]); - get_keyfile_style(config, config_home, "tripledouble", &style_sets[GEANY_FILETYPES_PYTHON].styling[7]); - get_keyfile_style(config, config_home, "classname", &style_sets[GEANY_FILETYPES_PYTHON].styling[8]); - get_keyfile_style(config, config_home, "defname", &style_sets[GEANY_FILETYPES_PYTHON].styling[9]); - get_keyfile_style(config, config_home, "operator", &style_sets[GEANY_FILETYPES_PYTHON].styling[10]); - get_keyfile_style(config, config_home, "identifier", &style_sets[GEANY_FILETYPES_PYTHON].styling[11]); - get_keyfile_style(config, config_home, "commentblock", &style_sets[GEANY_FILETYPES_PYTHON].styling[12]); - get_keyfile_style(config, config_home, "stringeol", &style_sets[GEANY_FILETYPES_PYTHON].styling[13]); - get_keyfile_style(config, config_home, "word2", &style_sets[GEANY_FILETYPES_PYTHON].styling[14]); - get_keyfile_style(config, config_home, "decorator", &style_sets[GEANY_FILETYPES_PYTHON].styling[15]); + new_styleset(ft_id, 16); + get_keyfile_style(config, config_home, "default", &style_sets[ft_id].styling[0]); + get_keyfile_style(config, config_home, "commentline", &style_sets[ft_id].styling[1]); + get_keyfile_style(config, config_home, "number", &style_sets[ft_id].styling[2]); + get_keyfile_style(config, config_home, "string", &style_sets[ft_id].styling[3]); + get_keyfile_style(config, config_home, "character", &style_sets[ft_id].styling[4]); + get_keyfile_style(config, config_home, "word", &style_sets[ft_id].styling[5]); + get_keyfile_style(config, config_home, "triple", &style_sets[ft_id].styling[6]); + get_keyfile_style(config, config_home, "tripledouble", &style_sets[ft_id].styling[7]); + get_keyfile_style(config, config_home, "classname", &style_sets[ft_id].styling[8]); + get_keyfile_style(config, config_home, "defname", &style_sets[ft_id].styling[9]); + get_keyfile_style(config, config_home, "operator", &style_sets[ft_id].styling[10]); + get_keyfile_style(config, config_home, "identifier", &style_sets[ft_id].styling[11]); + get_keyfile_style(config, config_home, "commentblock", &style_sets[ft_id].styling[12]); + get_keyfile_style(config, config_home, "stringeol", &style_sets[ft_id].styling[13]); + get_keyfile_style(config, config_home, "word2", &style_sets[ft_id].styling[14]); + get_keyfile_style(config, config_home, "decorator", &style_sets[ft_id].styling[15]); - style_sets[GEANY_FILETYPES_PYTHON].keywords = g_new(gchar*, 3); - get_keyfile_keywords(config, config_home, "primary", GEANY_FILETYPES_PYTHON, 0); - get_keyfile_keywords(config, config_home, "identifiers", GEANY_FILETYPES_PYTHON, 1); - style_sets[GEANY_FILETYPES_PYTHON].keywords[2] = NULL; + style_sets[ft_id].keywords = g_new(gchar*, 3); + get_keyfile_keywords(config, config_home, "primary", ft_id, 0); + get_keyfile_keywords(config, config_home, "identifiers", ft_id, 1); + style_sets[ft_id].keywords[2] = NULL; } -static void styleset_python(ScintillaObject *sci) +static void styleset_python(ScintillaObject *sci, gint ft_id) { - const filetype_id ft_id = GEANY_FILETYPES_PYTHON; - apply_filetype_properties(sci, SCLEX_PYTHON, ft_id); - sci_set_keywords(sci, 0, style_sets[GEANY_FILETYPES_PYTHON].keywords[0]); - sci_set_keywords(sci, 1, style_sets[GEANY_FILETYPES_PYTHON].keywords[1]); + sci_set_keywords(sci, 0, style_sets[ft_id].keywords[0]); + sci_set_keywords(sci, 1, style_sets[ft_id].keywords[1]); - set_sci_style(sci, STYLE_DEFAULT, GEANY_FILETYPES_PYTHON, 0); - set_sci_style(sci, SCE_P_DEFAULT, GEANY_FILETYPES_PYTHON, 0); - set_sci_style(sci, SCE_P_COMMENTLINE, GEANY_FILETYPES_PYTHON, 1); - set_sci_style(sci, SCE_P_NUMBER, GEANY_FILETYPES_PYTHON, 2); - set_sci_style(sci, SCE_P_STRING, GEANY_FILETYPES_PYTHON, 3); - set_sci_style(sci, SCE_P_CHARACTER, GEANY_FILETYPES_PYTHON, 4); - set_sci_style(sci, SCE_P_WORD, GEANY_FILETYPES_PYTHON, 5); - set_sci_style(sci, SCE_P_TRIPLE, GEANY_FILETYPES_PYTHON, 6); - set_sci_style(sci, SCE_P_TRIPLEDOUBLE, GEANY_FILETYPES_PYTHON, 7); - set_sci_style(sci, SCE_P_CLASSNAME, GEANY_FILETYPES_PYTHON, 8); - set_sci_style(sci, SCE_P_DEFNAME, GEANY_FILETYPES_PYTHON, 9); - set_sci_style(sci, SCE_P_OPERATOR, GEANY_FILETYPES_PYTHON, 10); - set_sci_style(sci, SCE_P_IDENTIFIER, GEANY_FILETYPES_PYTHON, 11); - set_sci_style(sci, SCE_P_COMMENTBLOCK, GEANY_FILETYPES_PYTHON, 12); - set_sci_style(sci, SCE_P_STRINGEOL, GEANY_FILETYPES_PYTHON, 13); - set_sci_style(sci, SCE_P_WORD2, GEANY_FILETYPES_PYTHON, 14); - set_sci_style(sci, SCE_P_DECORATOR, GEANY_FILETYPES_PYTHON, 15); + set_sci_style(sci, STYLE_DEFAULT, ft_id, 0); + set_sci_style(sci, SCE_P_DEFAULT, ft_id, 0); + set_sci_style(sci, SCE_P_COMMENTLINE, ft_id, 1); + set_sci_style(sci, SCE_P_NUMBER, ft_id, 2); + set_sci_style(sci, SCE_P_STRING, ft_id, 3); + set_sci_style(sci, SCE_P_CHARACTER, ft_id, 4); + set_sci_style(sci, SCE_P_WORD, ft_id, 5); + set_sci_style(sci, SCE_P_TRIPLE, ft_id, 6); + set_sci_style(sci, SCE_P_TRIPLEDOUBLE, ft_id, 7); + set_sci_style(sci, SCE_P_CLASSNAME, ft_id, 8); + set_sci_style(sci, SCE_P_DEFNAME, ft_id, 9); + set_sci_style(sci, SCE_P_OPERATOR, ft_id, 10); + set_sci_style(sci, SCE_P_IDENTIFIER, ft_id, 11); + set_sci_style(sci, SCE_P_COMMENTBLOCK, ft_id, 12); + set_sci_style(sci, SCE_P_STRINGEOL, ft_id, 13); + set_sci_style(sci, SCE_P_WORD2, ft_id, 14); + set_sci_style(sci, SCE_P_DECORATOR, ft_id, 15); } static void styleset_cmake_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) { - new_styleset(GEANY_FILETYPES_CMAKE, 15); - get_keyfile_style(config, config_home, "default", &style_sets[GEANY_FILETYPES_CMAKE].styling[0]); - get_keyfile_style(config, config_home, "comment", &style_sets[GEANY_FILETYPES_CMAKE].styling[1]); - get_keyfile_style(config, config_home, "stringdq", &style_sets[GEANY_FILETYPES_CMAKE].styling[2]); - get_keyfile_style(config, config_home, "stringlq", &style_sets[GEANY_FILETYPES_CMAKE].styling[3]); - get_keyfile_style(config, config_home, "stringrq", &style_sets[GEANY_FILETYPES_CMAKE].styling[4]); - get_keyfile_style(config, config_home, "command", &style_sets[GEANY_FILETYPES_CMAKE].styling[5]); - get_keyfile_style(config, config_home, "parameters", &style_sets[GEANY_FILETYPES_CMAKE].styling[6]); - get_keyfile_style(config, config_home, "variable", &style_sets[GEANY_FILETYPES_CMAKE].styling[7]); - get_keyfile_style(config, config_home, "userdefined", &style_sets[GEANY_FILETYPES_CMAKE].styling[8]); - get_keyfile_style(config, config_home, "whiledef", &style_sets[GEANY_FILETYPES_CMAKE].styling[9]); - get_keyfile_style(config, config_home, "foreachdef", &style_sets[GEANY_FILETYPES_CMAKE].styling[10]); - get_keyfile_style(config, config_home, "ifdefinedef", &style_sets[GEANY_FILETYPES_CMAKE].styling[11]); - get_keyfile_style(config, config_home, "macrodef", &style_sets[GEANY_FILETYPES_CMAKE].styling[12]); - get_keyfile_style(config, config_home, "stringvar", &style_sets[GEANY_FILETYPES_CMAKE].styling[13]); - get_keyfile_style(config, config_home, "number", &style_sets[GEANY_FILETYPES_CMAKE].styling[14]); + new_styleset(ft_id, 15); + get_keyfile_style(config, config_home, "default", &style_sets[ft_id].styling[0]); + get_keyfile_style(config, config_home, "comment", &style_sets[ft_id].styling[1]); + get_keyfile_style(config, config_home, "stringdq", &style_sets[ft_id].styling[2]); + get_keyfile_style(config, config_home, "stringlq", &style_sets[ft_id].styling[3]); + get_keyfile_style(config, config_home, "stringrq", &style_sets[ft_id].styling[4]); + get_keyfile_style(config, config_home, "command", &style_sets[ft_id].styling[5]); + get_keyfile_style(config, config_home, "parameters", &style_sets[ft_id].styling[6]); + get_keyfile_style(config, config_home, "variable", &style_sets[ft_id].styling[7]); + get_keyfile_style(config, config_home, "userdefined", &style_sets[ft_id].styling[8]); + get_keyfile_style(config, config_home, "whiledef", &style_sets[ft_id].styling[9]); + get_keyfile_style(config, config_home, "foreachdef", &style_sets[ft_id].styling[10]); + get_keyfile_style(config, config_home, "ifdefinedef", &style_sets[ft_id].styling[11]); + get_keyfile_style(config, config_home, "macrodef", &style_sets[ft_id].styling[12]); + get_keyfile_style(config, config_home, "stringvar", &style_sets[ft_id].styling[13]); + get_keyfile_style(config, config_home, "number", &style_sets[ft_id].styling[14]); - style_sets[GEANY_FILETYPES_CMAKE].keywords = g_new(gchar*, 4); - get_keyfile_keywords(config, config_home, "commands", GEANY_FILETYPES_CMAKE, 0); - get_keyfile_keywords(config, config_home, "parameters", GEANY_FILETYPES_CMAKE, 1); - get_keyfile_keywords(config, config_home, "userdefined", GEANY_FILETYPES_CMAKE, 2); - style_sets[GEANY_FILETYPES_CMAKE].keywords[3] = NULL; + style_sets[ft_id].keywords = g_new(gchar*, 4); + get_keyfile_keywords(config, config_home, "commands", ft_id, 0); + get_keyfile_keywords(config, config_home, "parameters", ft_id, 1); + get_keyfile_keywords(config, config_home, "userdefined", ft_id, 2); + style_sets[ft_id].keywords[3] = NULL; } -static void styleset_cmake(ScintillaObject *sci) +static void styleset_cmake(ScintillaObject *sci, gint ft_id) { - const filetype_id ft_id = GEANY_FILETYPES_CMAKE; - apply_filetype_properties(sci, SCLEX_CMAKE, ft_id); - sci_set_keywords(sci, 0, style_sets[GEANY_FILETYPES_CMAKE].keywords[0]); - sci_set_keywords(sci, 1, style_sets[GEANY_FILETYPES_CMAKE].keywords[1]); - sci_set_keywords(sci, 2, style_sets[GEANY_FILETYPES_CMAKE].keywords[2]); + sci_set_keywords(sci, 0, style_sets[ft_id].keywords[0]); + sci_set_keywords(sci, 1, style_sets[ft_id].keywords[1]); + sci_set_keywords(sci, 2, style_sets[ft_id].keywords[2]); - set_sci_style(sci, STYLE_DEFAULT, GEANY_FILETYPES_CMAKE, 0); - set_sci_style(sci, SCE_CMAKE_DEFAULT, GEANY_FILETYPES_CMAKE, 0); - set_sci_style(sci, SCE_CMAKE_COMMENT, GEANY_FILETYPES_CMAKE, 1); - set_sci_style(sci, SCE_CMAKE_STRINGDQ, GEANY_FILETYPES_CMAKE, 2); - set_sci_style(sci, SCE_CMAKE_STRINGLQ, GEANY_FILETYPES_CMAKE, 3); - set_sci_style(sci, SCE_CMAKE_STRINGRQ, GEANY_FILETYPES_CMAKE, 4); - set_sci_style(sci, SCE_CMAKE_COMMANDS, GEANY_FILETYPES_CMAKE, 5); - set_sci_style(sci, SCE_CMAKE_PARAMETERS, GEANY_FILETYPES_CMAKE, 6); - set_sci_style(sci, SCE_CMAKE_VARIABLE, GEANY_FILETYPES_CMAKE, 7); - set_sci_style(sci, SCE_CMAKE_USERDEFINED, GEANY_FILETYPES_CMAKE, 8); - set_sci_style(sci, SCE_CMAKE_WHILEDEF, GEANY_FILETYPES_CMAKE, 9); - set_sci_style(sci, SCE_CMAKE_FOREACHDEF, GEANY_FILETYPES_CMAKE, 10); - set_sci_style(sci, SCE_CMAKE_IFDEFINEDEF, GEANY_FILETYPES_CMAKE, 11); - set_sci_style(sci, SCE_CMAKE_MACRODEF, GEANY_FILETYPES_CMAKE, 12); - set_sci_style(sci, SCE_CMAKE_STRINGVAR, GEANY_FILETYPES_CMAKE, 13); - set_sci_style(sci, SCE_CMAKE_NUMBER, GEANY_FILETYPES_CMAKE, 14); + set_sci_style(sci, STYLE_DEFAULT, ft_id, 0); + set_sci_style(sci, SCE_CMAKE_DEFAULT, ft_id, 0); + set_sci_style(sci, SCE_CMAKE_COMMENT, ft_id, 1); + set_sci_style(sci, SCE_CMAKE_STRINGDQ, ft_id, 2); + set_sci_style(sci, SCE_CMAKE_STRINGLQ, ft_id, 3); + set_sci_style(sci, SCE_CMAKE_STRINGRQ, ft_id, 4); + set_sci_style(sci, SCE_CMAKE_COMMANDS, ft_id, 5); + set_sci_style(sci, SCE_CMAKE_PARAMETERS, ft_id, 6); + set_sci_style(sci, SCE_CMAKE_VARIABLE, ft_id, 7); + set_sci_style(sci, SCE_CMAKE_USERDEFINED, ft_id, 8); + set_sci_style(sci, SCE_CMAKE_WHILEDEF, ft_id, 9); + set_sci_style(sci, SCE_CMAKE_FOREACHDEF, ft_id, 10); + set_sci_style(sci, SCE_CMAKE_IFDEFINEDEF, ft_id, 11); + set_sci_style(sci, SCE_CMAKE_MACRODEF, ft_id, 12); + set_sci_style(sci, SCE_CMAKE_STRINGVAR, ft_id, 13); + set_sci_style(sci, SCE_CMAKE_NUMBER, ft_id, 14); } static void styleset_r_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) { - new_styleset(GEANY_FILETYPES_R, 12); + new_styleset(ft_id, 12); - get_keyfile_style(config, config_home, "default", &style_sets[GEANY_FILETYPES_R].styling[0]); - get_keyfile_style(config, config_home, "comment", &style_sets[GEANY_FILETYPES_R].styling[1]); - get_keyfile_style(config, config_home, "kword", &style_sets[GEANY_FILETYPES_R].styling[2]); - get_keyfile_style(config, config_home, "operator", &style_sets[GEANY_FILETYPES_R].styling[3]); - get_keyfile_style(config, config_home, "basekword", &style_sets[GEANY_FILETYPES_R].styling[4]); - get_keyfile_style(config, config_home, "otherkword", &style_sets[GEANY_FILETYPES_R].styling[5]); - get_keyfile_style(config, config_home, "number", &style_sets[GEANY_FILETYPES_R].styling[6]); - get_keyfile_style(config, config_home, "string", &style_sets[GEANY_FILETYPES_R].styling[7]); - get_keyfile_style(config, config_home, "string2", &style_sets[GEANY_FILETYPES_R].styling[8]); - get_keyfile_style(config, config_home, "identifier", &style_sets[GEANY_FILETYPES_R].styling[9]); - get_keyfile_style(config, config_home, "infix", &style_sets[GEANY_FILETYPES_R].styling[10]); - get_keyfile_style(config, config_home, "infixeol", &style_sets[GEANY_FILETYPES_R].styling[11]); + get_keyfile_style(config, config_home, "default", &style_sets[ft_id].styling[0]); + get_keyfile_style(config, config_home, "comment", &style_sets[ft_id].styling[1]); + get_keyfile_style(config, config_home, "kword", &style_sets[ft_id].styling[2]); + get_keyfile_style(config, config_home, "operator", &style_sets[ft_id].styling[3]); + get_keyfile_style(config, config_home, "basekword", &style_sets[ft_id].styling[4]); + get_keyfile_style(config, config_home, "otherkword", &style_sets[ft_id].styling[5]); + get_keyfile_style(config, config_home, "number", &style_sets[ft_id].styling[6]); + get_keyfile_style(config, config_home, "string", &style_sets[ft_id].styling[7]); + get_keyfile_style(config, config_home, "string2", &style_sets[ft_id].styling[8]); + get_keyfile_style(config, config_home, "identifier", &style_sets[ft_id].styling[9]); + get_keyfile_style(config, config_home, "infix", &style_sets[ft_id].styling[10]); + get_keyfile_style(config, config_home, "infixeol", &style_sets[ft_id].styling[11]); - style_sets[GEANY_FILETYPES_R].keywords = g_new(gchar*, 4); - get_keyfile_keywords(config, config_home, "primary", GEANY_FILETYPES_R, 0); - get_keyfile_keywords(config, config_home, "package", GEANY_FILETYPES_R, 1); - get_keyfile_keywords(config, config_home, "package_other", GEANY_FILETYPES_R, 2); - style_sets[GEANY_FILETYPES_R].keywords[3] = NULL; + style_sets[ft_id].keywords = g_new(gchar*, 4); + get_keyfile_keywords(config, config_home, "primary", ft_id, 0); + get_keyfile_keywords(config, config_home, "package", ft_id, 1); + get_keyfile_keywords(config, config_home, "package_other", ft_id, 2); + style_sets[ft_id].keywords[3] = NULL; } -static void styleset_r(ScintillaObject *sci) +static void styleset_r(ScintillaObject *sci, gint ft_id) { - const filetype_id ft_id = GEANY_FILETYPES_R; - apply_filetype_properties(sci, SCLEX_R, ft_id); - sci_set_keywords(sci, 0, style_sets[GEANY_FILETYPES_R].keywords[0]); - sci_set_keywords(sci, 1, style_sets[GEANY_FILETYPES_R].keywords[1]); - sci_set_keywords(sci, 2, style_sets[GEANY_FILETYPES_R].keywords[2]); + sci_set_keywords(sci, 0, style_sets[ft_id].keywords[0]); + sci_set_keywords(sci, 1, style_sets[ft_id].keywords[1]); + sci_set_keywords(sci, 2, style_sets[ft_id].keywords[2]); - set_sci_style(sci, STYLE_DEFAULT, GEANY_FILETYPES_R, 0); - set_sci_style(sci, SCE_R_DEFAULT, GEANY_FILETYPES_R, 0); - set_sci_style(sci, SCE_R_COMMENT, GEANY_FILETYPES_R, 1); - set_sci_style(sci, SCE_R_KWORD, GEANY_FILETYPES_R, 2); - set_sci_style(sci, SCE_R_OPERATOR, GEANY_FILETYPES_R, 3); - set_sci_style(sci, SCE_R_BASEKWORD, GEANY_FILETYPES_R, 4); - set_sci_style(sci, SCE_R_OTHERKWORD, GEANY_FILETYPES_R, 5); - set_sci_style(sci, SCE_R_NUMBER, GEANY_FILETYPES_R, 6); - set_sci_style(sci, SCE_R_STRING, GEANY_FILETYPES_R, 7); - set_sci_style(sci, SCE_R_STRING2, GEANY_FILETYPES_R, 8); - set_sci_style(sci, SCE_R_IDENTIFIER, GEANY_FILETYPES_R, 9); - set_sci_style(sci, SCE_R_INFIX, GEANY_FILETYPES_R, 10); - set_sci_style(sci, SCE_R_INFIXEOL, GEANY_FILETYPES_R, 11); + set_sci_style(sci, STYLE_DEFAULT, ft_id, 0); + set_sci_style(sci, SCE_R_DEFAULT, ft_id, 0); + set_sci_style(sci, SCE_R_COMMENT, ft_id, 1); + set_sci_style(sci, SCE_R_KWORD, ft_id, 2); + set_sci_style(sci, SCE_R_OPERATOR, ft_id, 3); + set_sci_style(sci, SCE_R_BASEKWORD, ft_id, 4); + set_sci_style(sci, SCE_R_OTHERKWORD, ft_id, 5); + set_sci_style(sci, SCE_R_NUMBER, ft_id, 6); + set_sci_style(sci, SCE_R_STRING, ft_id, 7); + set_sci_style(sci, SCE_R_STRING2, ft_id, 8); + set_sci_style(sci, SCE_R_IDENTIFIER, ft_id, 9); + set_sci_style(sci, SCE_R_INFIX, ft_id, 10); + set_sci_style(sci, SCE_R_INFIXEOL, ft_id, 11); } static void styleset_ruby_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) { - new_styleset(GEANY_FILETYPES_RUBY, 35); - get_keyfile_style(config, config_home, "default", &style_sets[GEANY_FILETYPES_RUBY].styling[0]); - get_keyfile_style(config, config_home, "commentline", &style_sets[GEANY_FILETYPES_RUBY].styling[1]); - get_keyfile_style(config, config_home, "number", &style_sets[GEANY_FILETYPES_RUBY].styling[2]); - get_keyfile_style(config, config_home, "string", &style_sets[GEANY_FILETYPES_RUBY].styling[3]); - get_keyfile_style(config, config_home, "character", &style_sets[GEANY_FILETYPES_RUBY].styling[4]); - get_keyfile_style(config, config_home, "word", &style_sets[GEANY_FILETYPES_RUBY].styling[5]); - get_keyfile_style(config, config_home, "global", &style_sets[GEANY_FILETYPES_RUBY].styling[6]); - get_keyfile_style(config, config_home, "symbol", &style_sets[GEANY_FILETYPES_RUBY].styling[7]); - get_keyfile_style(config, config_home, "classname", &style_sets[GEANY_FILETYPES_RUBY].styling[8]); - get_keyfile_style(config, config_home, "defname", &style_sets[GEANY_FILETYPES_RUBY].styling[9]); - get_keyfile_style(config, config_home, "operator", &style_sets[GEANY_FILETYPES_RUBY].styling[10]); - get_keyfile_style(config, config_home, "identifier", &style_sets[GEANY_FILETYPES_RUBY].styling[11]); - get_keyfile_style(config, config_home, "modulename", &style_sets[GEANY_FILETYPES_RUBY].styling[12]); - get_keyfile_style(config, config_home, "backticks", &style_sets[GEANY_FILETYPES_RUBY].styling[13]); - get_keyfile_style(config, config_home, "instancevar", &style_sets[GEANY_FILETYPES_RUBY].styling[14]); - get_keyfile_style(config, config_home, "classvar", &style_sets[GEANY_FILETYPES_RUBY].styling[15]); - get_keyfile_style(config, config_home, "datasection", &style_sets[GEANY_FILETYPES_RUBY].styling[16]); - get_keyfile_style(config, config_home, "heredelim", &style_sets[GEANY_FILETYPES_RUBY].styling[17]); - get_keyfile_style(config, config_home, "worddemoted", &style_sets[GEANY_FILETYPES_RUBY].styling[18]); - get_keyfile_style(config, config_home, "stdin", &style_sets[GEANY_FILETYPES_RUBY].styling[19]); - get_keyfile_style(config, config_home, "stdout", &style_sets[GEANY_FILETYPES_RUBY].styling[20]); - get_keyfile_style(config, config_home, "stderr", &style_sets[GEANY_FILETYPES_RUBY].styling[21]); - get_keyfile_style(config, config_home, "datasection", &style_sets[GEANY_FILETYPES_RUBY].styling[22]); - get_keyfile_style(config, config_home, "regex", &style_sets[GEANY_FILETYPES_RUBY].styling[23]); - get_keyfile_style(config, config_home, "here_q", &style_sets[GEANY_FILETYPES_RUBY].styling[24]); - get_keyfile_style(config, config_home, "here_qq", &style_sets[GEANY_FILETYPES_RUBY].styling[25]); - get_keyfile_style(config, config_home, "here_qx", &style_sets[GEANY_FILETYPES_RUBY].styling[26]); - get_keyfile_style(config, config_home, "string_q", &style_sets[GEANY_FILETYPES_RUBY].styling[27]); - get_keyfile_style(config, config_home, "string_qq", &style_sets[GEANY_FILETYPES_RUBY].styling[28]); - get_keyfile_style(config, config_home, "string_qx", &style_sets[GEANY_FILETYPES_RUBY].styling[29]); - get_keyfile_style(config, config_home, "string_qr", &style_sets[GEANY_FILETYPES_RUBY].styling[30]); - get_keyfile_style(config, config_home, "string_qw", &style_sets[GEANY_FILETYPES_RUBY].styling[31]); - get_keyfile_style(config, config_home, "upper_bound", &style_sets[GEANY_FILETYPES_RUBY].styling[32]); - get_keyfile_style(config, config_home, "error", &style_sets[GEANY_FILETYPES_RUBY].styling[33]); - get_keyfile_style(config, config_home, "pod", &style_sets[GEANY_FILETYPES_RUBY].styling[34]); + new_styleset(ft_id, 35); + get_keyfile_style(config, config_home, "default", &style_sets[ft_id].styling[0]); + get_keyfile_style(config, config_home, "commentline", &style_sets[ft_id].styling[1]); + get_keyfile_style(config, config_home, "number", &style_sets[ft_id].styling[2]); + get_keyfile_style(config, config_home, "string", &style_sets[ft_id].styling[3]); + get_keyfile_style(config, config_home, "character", &style_sets[ft_id].styling[4]); + get_keyfile_style(config, config_home, "word", &style_sets[ft_id].styling[5]); + get_keyfile_style(config, config_home, "global", &style_sets[ft_id].styling[6]); + get_keyfile_style(config, config_home, "symbol", &style_sets[ft_id].styling[7]); + get_keyfile_style(config, config_home, "classname", &style_sets[ft_id].styling[8]); + get_keyfile_style(config, config_home, "defname", &style_sets[ft_id].styling[9]); + get_keyfile_style(config, config_home, "operator", &style_sets[ft_id].styling[10]); + get_keyfile_style(config, config_home, "identifier", &style_sets[ft_id].styling[11]); + get_keyfile_style(config, config_home, "modulename", &style_sets[ft_id].styling[12]); + get_keyfile_style(config, config_home, "backticks", &style_sets[ft_id].styling[13]); + get_keyfile_style(config, config_home, "instancevar", &style_sets[ft_id].styling[14]); + get_keyfile_style(config, config_home, "classvar", &style_sets[ft_id].styling[15]); + get_keyfile_style(config, config_home, "datasection", &style_sets[ft_id].styling[16]); + get_keyfile_style(config, config_home, "heredelim", &style_sets[ft_id].styling[17]); + get_keyfile_style(config, config_home, "worddemoted", &style_sets[ft_id].styling[18]); + get_keyfile_style(config, config_home, "stdin", &style_sets[ft_id].styling[19]); + get_keyfile_style(config, config_home, "stdout", &style_sets[ft_id].styling[20]); + get_keyfile_style(config, config_home, "stderr", &style_sets[ft_id].styling[21]); + get_keyfile_style(config, config_home, "datasection", &style_sets[ft_id].styling[22]); + get_keyfile_style(config, config_home, "regex", &style_sets[ft_id].styling[23]); + get_keyfile_style(config, config_home, "here_q", &style_sets[ft_id].styling[24]); + get_keyfile_style(config, config_home, "here_qq", &style_sets[ft_id].styling[25]); + get_keyfile_style(config, config_home, "here_qx", &style_sets[ft_id].styling[26]); + get_keyfile_style(config, config_home, "string_q", &style_sets[ft_id].styling[27]); + get_keyfile_style(config, config_home, "string_qq", &style_sets[ft_id].styling[28]); + get_keyfile_style(config, config_home, "string_qx", &style_sets[ft_id].styling[29]); + get_keyfile_style(config, config_home, "string_qr", &style_sets[ft_id].styling[30]); + get_keyfile_style(config, config_home, "string_qw", &style_sets[ft_id].styling[31]); + get_keyfile_style(config, config_home, "upper_bound", &style_sets[ft_id].styling[32]); + get_keyfile_style(config, config_home, "error", &style_sets[ft_id].styling[33]); + get_keyfile_style(config, config_home, "pod", &style_sets[ft_id].styling[34]); - style_sets[GEANY_FILETYPES_RUBY].keywords = g_new(gchar*, 2); - get_keyfile_keywords(config, config_home, "primary", GEANY_FILETYPES_RUBY, 0); - style_sets[GEANY_FILETYPES_RUBY].keywords[1] = NULL; + style_sets[ft_id].keywords = g_new(gchar*, 2); + get_keyfile_keywords(config, config_home, "primary", ft_id, 0); + style_sets[ft_id].keywords[1] = NULL; } -static void styleset_ruby(ScintillaObject *sci) +static void styleset_ruby(ScintillaObject *sci, gint ft_id) { - const filetype_id ft_id = GEANY_FILETYPES_RUBY; - apply_filetype_properties(sci, SCLEX_RUBY, ft_id); - sci_set_keywords(sci, 0, style_sets[GEANY_FILETYPES_RUBY].keywords[0]); + sci_set_keywords(sci, 0, style_sets[ft_id].keywords[0]); - set_sci_style(sci, STYLE_DEFAULT, GEANY_FILETYPES_RUBY, 0); - set_sci_style(sci, SCE_RB_DEFAULT, GEANY_FILETYPES_RUBY, 0); - set_sci_style(sci, SCE_RB_COMMENTLINE, GEANY_FILETYPES_RUBY, 1); - set_sci_style(sci, SCE_RB_NUMBER, GEANY_FILETYPES_RUBY, 2); - set_sci_style(sci, SCE_RB_STRING, GEANY_FILETYPES_RUBY, 3); - set_sci_style(sci, SCE_RB_CHARACTER, GEANY_FILETYPES_RUBY, 4); - set_sci_style(sci, SCE_RB_WORD, GEANY_FILETYPES_RUBY, 5); - set_sci_style(sci, SCE_RB_GLOBAL, GEANY_FILETYPES_RUBY, 6); - set_sci_style(sci, SCE_RB_SYMBOL, GEANY_FILETYPES_RUBY, 7); - set_sci_style(sci, SCE_RB_CLASSNAME, GEANY_FILETYPES_RUBY, 8); - set_sci_style(sci, SCE_RB_DEFNAME, GEANY_FILETYPES_RUBY, 9); - set_sci_style(sci, SCE_RB_OPERATOR, GEANY_FILETYPES_RUBY, 10); - set_sci_style(sci, SCE_RB_IDENTIFIER, GEANY_FILETYPES_RUBY, 11); - set_sci_style(sci, SCE_RB_MODULE_NAME, GEANY_FILETYPES_RUBY, 12); - set_sci_style(sci, SCE_RB_BACKTICKS, GEANY_FILETYPES_RUBY, 13); - set_sci_style(sci, SCE_RB_INSTANCE_VAR, GEANY_FILETYPES_RUBY, 14); - set_sci_style(sci, SCE_RB_CLASS_VAR, GEANY_FILETYPES_RUBY, 15); - set_sci_style(sci, SCE_RB_DATASECTION, GEANY_FILETYPES_RUBY, 16); - set_sci_style(sci, SCE_RB_HERE_DELIM, GEANY_FILETYPES_RUBY, 17); - set_sci_style(sci, SCE_RB_WORD_DEMOTED, GEANY_FILETYPES_RUBY, 18); - set_sci_style(sci, SCE_RB_STDIN, GEANY_FILETYPES_RUBY, 19); - set_sci_style(sci, SCE_RB_STDOUT, GEANY_FILETYPES_RUBY, 20); - set_sci_style(sci, SCE_RB_STDERR, GEANY_FILETYPES_RUBY, 21); - set_sci_style(sci, SCE_RB_DATASECTION, GEANY_FILETYPES_RUBY, 22); - set_sci_style(sci, SCE_RB_REGEX, GEANY_FILETYPES_RUBY, 23); - set_sci_style(sci, SCE_RB_HERE_Q, GEANY_FILETYPES_RUBY, 24); - set_sci_style(sci, SCE_RB_HERE_QQ, GEANY_FILETYPES_RUBY, 25); - set_sci_style(sci, SCE_RB_HERE_QX, GEANY_FILETYPES_RUBY, 26); - set_sci_style(sci, SCE_RB_STRING_Q, GEANY_FILETYPES_RUBY, 27); - set_sci_style(sci, SCE_RB_STRING_QQ, GEANY_FILETYPES_RUBY, 28); - set_sci_style(sci, SCE_RB_STRING_QX, GEANY_FILETYPES_RUBY, 29); - set_sci_style(sci, SCE_RB_STRING_QR, GEANY_FILETYPES_RUBY, 30); - set_sci_style(sci, SCE_RB_STRING_QW, GEANY_FILETYPES_RUBY, 31); - set_sci_style(sci, SCE_RB_UPPER_BOUND, GEANY_FILETYPES_RUBY, 32); - set_sci_style(sci, SCE_RB_ERROR, GEANY_FILETYPES_RUBY, 33); - set_sci_style(sci, SCE_RB_POD, GEANY_FILETYPES_RUBY, 34); + set_sci_style(sci, STYLE_DEFAULT, ft_id, 0); + set_sci_style(sci, SCE_RB_DEFAULT, ft_id, 0); + set_sci_style(sci, SCE_RB_COMMENTLINE, ft_id, 1); + set_sci_style(sci, SCE_RB_NUMBER, ft_id, 2); + set_sci_style(sci, SCE_RB_STRING, ft_id, 3); + set_sci_style(sci, SCE_RB_CHARACTER, ft_id, 4); + set_sci_style(sci, SCE_RB_WORD, ft_id, 5); + set_sci_style(sci, SCE_RB_GLOBAL, ft_id, 6); + set_sci_style(sci, SCE_RB_SYMBOL, ft_id, 7); + set_sci_style(sci, SCE_RB_CLASSNAME, ft_id, 8); + set_sci_style(sci, SCE_RB_DEFNAME, ft_id, 9); + set_sci_style(sci, SCE_RB_OPERATOR, ft_id, 10); + set_sci_style(sci, SCE_RB_IDENTIFIER, ft_id, 11); + set_sci_style(sci, SCE_RB_MODULE_NAME, ft_id, 12); + set_sci_style(sci, SCE_RB_BACKTICKS, ft_id, 13); + set_sci_style(sci, SCE_RB_INSTANCE_VAR, ft_id, 14); + set_sci_style(sci, SCE_RB_CLASS_VAR, ft_id, 15); + set_sci_style(sci, SCE_RB_DATASECTION, ft_id, 16); + set_sci_style(sci, SCE_RB_HERE_DELIM, ft_id, 17); + set_sci_style(sci, SCE_RB_WORD_DEMOTED, ft_id, 18); + set_sci_style(sci, SCE_RB_STDIN, ft_id, 19); + set_sci_style(sci, SCE_RB_STDOUT, ft_id, 20); + set_sci_style(sci, SCE_RB_STDERR, ft_id, 21); + set_sci_style(sci, SCE_RB_DATASECTION, ft_id, 22); + set_sci_style(sci, SCE_RB_REGEX, ft_id, 23); + set_sci_style(sci, SCE_RB_HERE_Q, ft_id, 24); + set_sci_style(sci, SCE_RB_HERE_QQ, ft_id, 25); + set_sci_style(sci, SCE_RB_HERE_QX, ft_id, 26); + set_sci_style(sci, SCE_RB_STRING_Q, ft_id, 27); + set_sci_style(sci, SCE_RB_STRING_QQ, ft_id, 28); + set_sci_style(sci, SCE_RB_STRING_QX, ft_id, 29); + set_sci_style(sci, SCE_RB_STRING_QR, ft_id, 30); + set_sci_style(sci, SCE_RB_STRING_QW, ft_id, 31); + set_sci_style(sci, SCE_RB_UPPER_BOUND, ft_id, 32); + set_sci_style(sci, SCE_RB_ERROR, ft_id, 33); + set_sci_style(sci, SCE_RB_POD, ft_id, 34); } static void styleset_sh_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) { - new_styleset(GEANY_FILETYPES_SH, 14); - get_keyfile_style(config, config_home, "default", &style_sets[GEANY_FILETYPES_SH].styling[0]); - get_keyfile_style(config, config_home, "commentline", &style_sets[GEANY_FILETYPES_SH].styling[1]); - get_keyfile_style(config, config_home, "number", &style_sets[GEANY_FILETYPES_SH].styling[2]); - get_keyfile_style(config, config_home, "word", &style_sets[GEANY_FILETYPES_SH].styling[3]); - get_keyfile_style(config, config_home, "string", &style_sets[GEANY_FILETYPES_SH].styling[4]); - get_keyfile_style(config, config_home, "character", &style_sets[GEANY_FILETYPES_SH].styling[5]); - get_keyfile_style(config, config_home, "operator", &style_sets[GEANY_FILETYPES_SH].styling[6]); - get_keyfile_style(config, config_home, "identifier", &style_sets[GEANY_FILETYPES_SH].styling[7]); - get_keyfile_style(config, config_home, "backticks", &style_sets[GEANY_FILETYPES_SH].styling[8]); - get_keyfile_style(config, config_home, "param", &style_sets[GEANY_FILETYPES_SH].styling[9]); - get_keyfile_style(config, config_home, "scalar", &style_sets[GEANY_FILETYPES_SH].styling[10]); - get_keyfile_style(config, config_home, "error", &style_sets[GEANY_FILETYPES_SH].styling[11]); - get_keyfile_style(config, config_home, "here_delim", &style_sets[GEANY_FILETYPES_SH].styling[12]); - get_keyfile_style(config, config_home, "here_q", &style_sets[GEANY_FILETYPES_SH].styling[13]); + new_styleset(ft_id, 14); + get_keyfile_style(config, config_home, "default", &style_sets[ft_id].styling[0]); + get_keyfile_style(config, config_home, "commentline", &style_sets[ft_id].styling[1]); + get_keyfile_style(config, config_home, "number", &style_sets[ft_id].styling[2]); + get_keyfile_style(config, config_home, "word", &style_sets[ft_id].styling[3]); + get_keyfile_style(config, config_home, "string", &style_sets[ft_id].styling[4]); + get_keyfile_style(config, config_home, "character", &style_sets[ft_id].styling[5]); + get_keyfile_style(config, config_home, "operator", &style_sets[ft_id].styling[6]); + get_keyfile_style(config, config_home, "identifier", &style_sets[ft_id].styling[7]); + get_keyfile_style(config, config_home, "backticks", &style_sets[ft_id].styling[8]); + get_keyfile_style(config, config_home, "param", &style_sets[ft_id].styling[9]); + get_keyfile_style(config, config_home, "scalar", &style_sets[ft_id].styling[10]); + get_keyfile_style(config, config_home, "error", &style_sets[ft_id].styling[11]); + get_keyfile_style(config, config_home, "here_delim", &style_sets[ft_id].styling[12]); + get_keyfile_style(config, config_home, "here_q", &style_sets[ft_id].styling[13]); - style_sets[GEANY_FILETYPES_SH].keywords = g_new(gchar*, 2); - get_keyfile_keywords(config, config_home, "primary", GEANY_FILETYPES_SH, 0); - style_sets[GEANY_FILETYPES_SH].keywords[1] = NULL; + style_sets[ft_id].keywords = g_new(gchar*, 2); + get_keyfile_keywords(config, config_home, "primary", ft_id, 0); + style_sets[ft_id].keywords[1] = NULL; } -static void styleset_sh(ScintillaObject *sci) +static void styleset_sh(ScintillaObject *sci, gint ft_id) { - const filetype_id ft_id = GEANY_FILETYPES_SH; - apply_filetype_properties(sci, SCLEX_BASH, ft_id); - sci_set_keywords(sci, 0, style_sets[GEANY_FILETYPES_SH].keywords[0]); + sci_set_keywords(sci, 0, style_sets[ft_id].keywords[0]); - set_sci_style(sci, STYLE_DEFAULT, GEANY_FILETYPES_SH, 0); - set_sci_style(sci, SCE_SH_DEFAULT, GEANY_FILETYPES_SH, 0); - set_sci_style(sci, SCE_SH_COMMENTLINE, GEANY_FILETYPES_SH, 1); - set_sci_style(sci, SCE_SH_NUMBER, GEANY_FILETYPES_SH, 2); - set_sci_style(sci, SCE_SH_WORD, GEANY_FILETYPES_SH, 3); - set_sci_style(sci, SCE_SH_STRING, GEANY_FILETYPES_SH, 4); - set_sci_style(sci, SCE_SH_CHARACTER, GEANY_FILETYPES_SH, 5); - set_sci_style(sci, SCE_SH_OPERATOR, GEANY_FILETYPES_SH, 6); - set_sci_style(sci, SCE_SH_IDENTIFIER, GEANY_FILETYPES_SH, 7); - set_sci_style(sci, SCE_SH_BACKTICKS, GEANY_FILETYPES_SH, 8); - set_sci_style(sci, SCE_SH_PARAM, GEANY_FILETYPES_SH, 9); - set_sci_style(sci, SCE_SH_SCALAR, GEANY_FILETYPES_SH, 10); - set_sci_style(sci, SCE_SH_ERROR, GEANY_FILETYPES_SH, 11); - set_sci_style(sci, SCE_SH_HERE_DELIM, GEANY_FILETYPES_SH, 12); - set_sci_style(sci, SCE_SH_HERE_Q, GEANY_FILETYPES_SH, 13); + set_sci_style(sci, STYLE_DEFAULT, ft_id, 0); + set_sci_style(sci, SCE_SH_DEFAULT, ft_id, 0); + set_sci_style(sci, SCE_SH_COMMENTLINE, ft_id, 1); + set_sci_style(sci, SCE_SH_NUMBER, ft_id, 2); + set_sci_style(sci, SCE_SH_WORD, ft_id, 3); + set_sci_style(sci, SCE_SH_STRING, ft_id, 4); + set_sci_style(sci, SCE_SH_CHARACTER, ft_id, 5); + set_sci_style(sci, SCE_SH_OPERATOR, ft_id, 6); + set_sci_style(sci, SCE_SH_IDENTIFIER, ft_id, 7); + set_sci_style(sci, SCE_SH_BACKTICKS, ft_id, 8); + set_sci_style(sci, SCE_SH_PARAM, ft_id, 9); + set_sci_style(sci, SCE_SH_SCALAR, ft_id, 10); + set_sci_style(sci, SCE_SH_ERROR, ft_id, 11); + set_sci_style(sci, SCE_SH_HERE_DELIM, ft_id, 12); + set_sci_style(sci, SCE_SH_HERE_Q, ft_id, 13); } -static void styleset_xml(ScintillaObject *sci) +static void styleset_xml(ScintillaObject *sci, gint ft_id) { - const filetype_id ft_id = GEANY_FILETYPES_XML; - apply_filetype_properties(sci, SCLEX_XML, ft_id); /* use the same colouring for HTML; XML and so on */ @@ -1928,87 +1890,85 @@ static void styleset_docbook_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) { - new_styleset(GEANY_FILETYPES_DOCBOOK, 29); - get_keyfile_style(config, config_home, "default", &style_sets[GEANY_FILETYPES_DOCBOOK].styling[0]); - get_keyfile_style(config, config_home, "tag", &style_sets[GEANY_FILETYPES_DOCBOOK].styling[1]); - get_keyfile_style(config, config_home, "tagunknown", &style_sets[GEANY_FILETYPES_DOCBOOK].styling[2]); - get_keyfile_style(config, config_home, "attribute", &style_sets[GEANY_FILETYPES_DOCBOOK].styling[3]); - get_keyfile_style(config, config_home, "attributeunknown", &style_sets[GEANY_FILETYPES_DOCBOOK].styling[4]); - get_keyfile_style(config, config_home, "number", &style_sets[GEANY_FILETYPES_DOCBOOK].styling[5]); - get_keyfile_style(config, config_home, "doublestring", &style_sets[GEANY_FILETYPES_DOCBOOK].styling[6]); - get_keyfile_style(config, config_home, "singlestring", &style_sets[GEANY_FILETYPES_DOCBOOK].styling[7]); - get_keyfile_style(config, config_home, "other", &style_sets[GEANY_FILETYPES_DOCBOOK].styling[8]); - get_keyfile_style(config, config_home, "comment", &style_sets[GEANY_FILETYPES_DOCBOOK].styling[9]); - get_keyfile_style(config, config_home, "entity", &style_sets[GEANY_FILETYPES_DOCBOOK].styling[10]); - get_keyfile_style(config, config_home, "tagend", &style_sets[GEANY_FILETYPES_DOCBOOK].styling[11]); - get_keyfile_style(config, config_home, "xmlstart", &style_sets[GEANY_FILETYPES_DOCBOOK].styling[12]); - get_keyfile_style(config, config_home, "xmlend", &style_sets[GEANY_FILETYPES_DOCBOOK].styling[13]); - get_keyfile_style(config, config_home, "cdata", &style_sets[GEANY_FILETYPES_DOCBOOK].styling[14]); - get_keyfile_style(config, config_home, "question", &style_sets[GEANY_FILETYPES_DOCBOOK].styling[15]); - get_keyfile_style(config, config_home, "value", &style_sets[GEANY_FILETYPES_DOCBOOK].styling[16]); - get_keyfile_style(config, config_home, "xccomment", &style_sets[GEANY_FILETYPES_DOCBOOK].styling[17]); - get_keyfile_style(config, config_home, "sgml_default", &style_sets[GEANY_FILETYPES_DOCBOOK].styling[18]); - get_keyfile_style(config, config_home, "sgml_comment", &style_sets[GEANY_FILETYPES_DOCBOOK].styling[19]); - get_keyfile_style(config, config_home, "sgml_special", &style_sets[GEANY_FILETYPES_DOCBOOK].styling[20]); - get_keyfile_style(config, config_home, "sgml_command", &style_sets[GEANY_FILETYPES_DOCBOOK].styling[21]); - get_keyfile_style(config, config_home, "sgml_doublestring", &style_sets[GEANY_FILETYPES_DOCBOOK].styling[22]); - get_keyfile_style(config, config_home, "sgml_simplestring", &style_sets[GEANY_FILETYPES_DOCBOOK].styling[23]); - get_keyfile_style(config, config_home, "sgml_1st_param", &style_sets[GEANY_FILETYPES_DOCBOOK].styling[24]); - get_keyfile_style(config, config_home, "sgml_entity", &style_sets[GEANY_FILETYPES_DOCBOOK].styling[25]); - get_keyfile_style(config, config_home, "sgml_block_default", &style_sets[GEANY_FILETYPES_DOCBOOK].styling[26]); - get_keyfile_style(config, config_home, "sgml_1st_param_comment", &style_sets[GEANY_FILETYPES_DOCBOOK].styling[27]); - get_keyfile_style(config, config_home, "sgml_error", &style_sets[GEANY_FILETYPES_DOCBOOK].styling[28]); + new_styleset(ft_id, 29); + get_keyfile_style(config, config_home, "default", &style_sets[ft_id].styling[0]); + get_keyfile_style(config, config_home, "tag", &style_sets[ft_id].styling[1]); + get_keyfile_style(config, config_home, "tagunknown", &style_sets[ft_id].styling[2]); + get_keyfile_style(config, config_home, "attribute", &style_sets[ft_id].styling[3]); + get_keyfile_style(config, config_home, "attributeunknown", &style_sets[ft_id].styling[4]); + get_keyfile_style(config, config_home, "number", &style_sets[ft_id].styling[5]); + get_keyfile_style(config, config_home, "doublestring", &style_sets[ft_id].styling[6]); + get_keyfile_style(config, config_home, "singlestring", &style_sets[ft_id].styling[7]); + get_keyfile_style(config, config_home, "other", &style_sets[ft_id].styling[8]); + get_keyfile_style(config, config_home, "comment", &style_sets[ft_id].styling[9]); + get_keyfile_style(config, config_home, "entity", &style_sets[ft_id].styling[10]); + get_keyfile_style(config, config_home, "tagend", &style_sets[ft_id].styling[11]); + get_keyfile_style(config, config_home, "xmlstart", &style_sets[ft_id].styling[12]); + get_keyfile_style(config, config_home, "xmlend", &style_sets[ft_id].styling[13]); + get_keyfile_style(config, config_home, "cdata", &style_sets[ft_id].styling[14]); + get_keyfile_style(config, config_home, "question", &style_sets[ft_id].styling[15]); + get_keyfile_style(config, config_home, "value", &style_sets[ft_id].styling[16]); + get_keyfile_style(config, config_home, "xccomment", &style_sets[ft_id].styling[17]); + get_keyfile_style(config, config_home, "sgml_default", &style_sets[ft_id].styling[18]); + get_keyfile_style(config, config_home, "sgml_comment", &style_sets[ft_id].styling[19]); + get_keyfile_style(config, config_home, "sgml_special", &style_sets[ft_id].styling[20]); + get_keyfile_style(config, config_home, "sgml_command", &style_sets[ft_id].styling[21]); + get_keyfile_style(config, config_home, "sgml_doublestring", &style_sets[ft_id].styling[22]); + get_keyfile_style(config, config_home, "sgml_simplestring", &style_sets[ft_id].styling[23]); + get_keyfile_style(config, config_home, "sgml_1st_param", &style_sets[ft_id].styling[24]); + get_keyfile_style(config, config_home, "sgml_entity", &style_sets[ft_id].styling[25]); + get_keyfile_style(config, config_home, "sgml_block_default", &style_sets[ft_id].styling[26]); + get_keyfile_style(config, config_home, "sgml_1st_param_comment", &style_sets[ft_id].styling[27]); + get_keyfile_style(config, config_home, "sgml_error", &style_sets[ft_id].styling[28]); - style_sets[GEANY_FILETYPES_DOCBOOK].keywords = g_new(gchar*, 3); - get_keyfile_keywords(config, config_home, "elements", GEANY_FILETYPES_DOCBOOK, 0); - get_keyfile_keywords(config, config_home, "dtd", GEANY_FILETYPES_DOCBOOK, 1); - style_sets[GEANY_FILETYPES_DOCBOOK].keywords[2] = NULL; + style_sets[ft_id].keywords = g_new(gchar*, 3); + get_keyfile_keywords(config, config_home, "elements", ft_id, 0); + get_keyfile_keywords(config, config_home, "dtd", ft_id, 1); + style_sets[ft_id].keywords[2] = NULL; } -static void styleset_docbook(ScintillaObject *sci) +static void styleset_docbook(ScintillaObject *sci, gint ft_id) { - const filetype_id ft_id = GEANY_FILETYPES_DOCBOOK; - apply_filetype_properties(sci, SCLEX_XML, ft_id); - sci_set_keywords(sci, 0, style_sets[GEANY_FILETYPES_DOCBOOK].keywords[0]); - sci_set_keywords(sci, 5, style_sets[GEANY_FILETYPES_DOCBOOK].keywords[1]); + sci_set_keywords(sci, 0, style_sets[ft_id].keywords[0]); + sci_set_keywords(sci, 5, style_sets[ft_id].keywords[1]); /* Unknown tags and attributes are highlighed in red. * If a tag is actually OK, it should be added in lower case to the htmlKeyWords string. */ - set_sci_style(sci, STYLE_DEFAULT, GEANY_FILETYPES_DOCBOOK, 0); - set_sci_style(sci, SCE_H_DEFAULT, GEANY_FILETYPES_DOCBOOK, 0); - set_sci_style(sci, SCE_H_TAG, GEANY_FILETYPES_DOCBOOK, 1); - set_sci_style(sci, SCE_H_TAGUNKNOWN, GEANY_FILETYPES_DOCBOOK, 2); - set_sci_style(sci, SCE_H_ATTRIBUTE, GEANY_FILETYPES_DOCBOOK, 3); - set_sci_style(sci, SCE_H_ATTRIBUTEUNKNOWN, GEANY_FILETYPES_DOCBOOK, 4); - set_sci_style(sci, SCE_H_NUMBER, GEANY_FILETYPES_DOCBOOK, 5); - set_sci_style(sci, SCE_H_DOUBLESTRING, GEANY_FILETYPES_DOCBOOK, 6); - set_sci_style(sci, SCE_H_SINGLESTRING, GEANY_FILETYPES_DOCBOOK, 7); - set_sci_style(sci, SCE_H_OTHER, GEANY_FILETYPES_DOCBOOK, 8); - set_sci_style(sci, SCE_H_COMMENT, GEANY_FILETYPES_DOCBOOK, 9); - set_sci_style(sci, SCE_H_ENTITY, GEANY_FILETYPES_DOCBOOK, 10); - set_sci_style(sci, SCE_H_TAGEND, GEANY_FILETYPES_DOCBOOK, 11); + set_sci_style(sci, STYLE_DEFAULT, ft_id, 0); + set_sci_style(sci, SCE_H_DEFAULT, ft_id, 0); + set_sci_style(sci, SCE_H_TAG, ft_id, 1); + set_sci_style(sci, SCE_H_TAGUNKNOWN, ft_id, 2); + set_sci_style(sci, SCE_H_ATTRIBUTE, ft_id, 3); + set_sci_style(sci, SCE_H_ATTRIBUTEUNKNOWN, ft_id, 4); + set_sci_style(sci, SCE_H_NUMBER, ft_id, 5); + set_sci_style(sci, SCE_H_DOUBLESTRING, ft_id, 6); + set_sci_style(sci, SCE_H_SINGLESTRING, ft_id, 7); + set_sci_style(sci, SCE_H_OTHER, ft_id, 8); + set_sci_style(sci, SCE_H_COMMENT, ft_id, 9); + set_sci_style(sci, SCE_H_ENTITY, ft_id, 10); + set_sci_style(sci, SCE_H_TAGEND, ft_id, 11); SSM(sci, SCI_STYLESETEOLFILLED, SCE_H_XMLSTART, 1); - set_sci_style(sci, SCE_H_XMLSTART, GEANY_FILETYPES_DOCBOOK, 12); - set_sci_style(sci, SCE_H_XMLEND, GEANY_FILETYPES_DOCBOOK, 13); - set_sci_style(sci, SCE_H_CDATA, GEANY_FILETYPES_DOCBOOK, 14); - set_sci_style(sci, SCE_H_QUESTION, GEANY_FILETYPES_DOCBOOK, 15); - set_sci_style(sci, SCE_H_VALUE, GEANY_FILETYPES_DOCBOOK, 16); - set_sci_style(sci, SCE_H_XCCOMMENT, GEANY_FILETYPES_DOCBOOK, 17); - set_sci_style(sci, SCE_H_SGML_DEFAULT, GEANY_FILETYPES_DOCBOOK, 18); - set_sci_style(sci, SCE_H_DEFAULT, GEANY_FILETYPES_DOCBOOK, 19); - set_sci_style(sci, SCE_H_SGML_SPECIAL, GEANY_FILETYPES_DOCBOOK, 20); - set_sci_style(sci, SCE_H_SGML_COMMAND, GEANY_FILETYPES_DOCBOOK, 21); - set_sci_style(sci, SCE_H_SGML_DOUBLESTRING, GEANY_FILETYPES_DOCBOOK, 22); - set_sci_style(sci, SCE_H_SGML_SIMPLESTRING, GEANY_FILETYPES_DOCBOOK, 23); - set_sci_style(sci, SCE_H_SGML_1ST_PARAM, GEANY_FILETYPES_DOCBOOK, 24); - set_sci_style(sci, SCE_H_SGML_ENTITY, GEANY_FILETYPES_DOCBOOK, 25); - set_sci_style(sci, SCE_H_SGML_BLOCK_DEFAULT, GEANY_FILETYPES_DOCBOOK, 26); - set_sci_style(sci, SCE_H_SGML_1ST_PARAM_COMMENT, GEANY_FILETYPES_DOCBOOK, 27); - set_sci_style(sci, SCE_H_SGML_ERROR, GEANY_FILETYPES_DOCBOOK, 28); + set_sci_style(sci, SCE_H_XMLSTART, ft_id, 12); + set_sci_style(sci, SCE_H_XMLEND, ft_id, 13); + set_sci_style(sci, SCE_H_CDATA, ft_id, 14); + set_sci_style(sci, SCE_H_QUESTION, ft_id, 15); + set_sci_style(sci, SCE_H_VALUE, ft_id, 16); + set_sci_style(sci, SCE_H_XCCOMMENT, ft_id, 17); + set_sci_style(sci, SCE_H_SGML_DEFAULT, ft_id, 18); + set_sci_style(sci, SCE_H_DEFAULT, ft_id, 19); + set_sci_style(sci, SCE_H_SGML_SPECIAL, ft_id, 20); + set_sci_style(sci, SCE_H_SGML_COMMAND, ft_id, 21); + set_sci_style(sci, SCE_H_SGML_DOUBLESTRING, ft_id, 22); + set_sci_style(sci, SCE_H_SGML_SIMPLESTRING, ft_id, 23); + set_sci_style(sci, SCE_H_SGML_1ST_PARAM, ft_id, 24); + set_sci_style(sci, SCE_H_SGML_ENTITY, ft_id, 25); + set_sci_style(sci, SCE_H_SGML_BLOCK_DEFAULT, ft_id, 26); + set_sci_style(sci, SCE_H_SGML_1ST_PARAM_COMMENT, ft_id, 27); + set_sci_style(sci, SCE_H_SGML_ERROR, ft_id, 28); } @@ -2025,1162 +1985,1117 @@ static void styleset_css_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) { - new_styleset(GEANY_FILETYPES_CSS, 22); - get_keyfile_style(config, config_home, "default", &style_sets[GEANY_FILETYPES_CSS].styling[0]); - get_keyfile_style(config, config_home, "comment", &style_sets[GEANY_FILETYPES_CSS].styling[1]); - get_keyfile_style(config, config_home, "tag", &style_sets[GEANY_FILETYPES_CSS].styling[2]); - get_keyfile_style(config, config_home, "class", &style_sets[GEANY_FILETYPES_CSS].styling[3]); - get_keyfile_style(config, config_home, "pseudoclass", &style_sets[GEANY_FILETYPES_CSS].styling[4]); - get_keyfile_style(config, config_home, "unknown_pseudoclass", &style_sets[GEANY_FILETYPES_CSS].styling[5]); - get_keyfile_style(config, config_home, "unknown_identifier", &style_sets[GEANY_FILETYPES_CSS].styling[6]); - get_keyfile_style(config, config_home, "operator", &style_sets[GEANY_FILETYPES_CSS].styling[7]); - get_keyfile_style(config, config_home, "identifier", &style_sets[GEANY_FILETYPES_CSS].styling[8]); - get_keyfile_style(config, config_home, "doublestring", &style_sets[GEANY_FILETYPES_CSS].styling[9]); - get_keyfile_style(config, config_home, "singlestring", &style_sets[GEANY_FILETYPES_CSS].styling[10]); - get_keyfile_style(config, config_home, "attribute", &style_sets[GEANY_FILETYPES_CSS].styling[11]); - get_keyfile_style(config, config_home, "value", &style_sets[GEANY_FILETYPES_CSS].styling[12]); - get_keyfile_style(config, config_home, "id", &style_sets[GEANY_FILETYPES_CSS].styling[13]); - get_keyfile_style(config, config_home, "identifier2", &style_sets[GEANY_FILETYPES_CSS].styling[14]); - get_keyfile_style(config, config_home, "important", &style_sets[GEANY_FILETYPES_CSS].styling[15]); - get_keyfile_style(config, config_home, "directive", &style_sets[GEANY_FILETYPES_CSS].styling[16]); - get_keyfile_style(config, config_home, "identifier3", &style_sets[GEANY_FILETYPES_CSS].styling[17]); - get_keyfile_style(config, config_home, "pseudoelement", &style_sets[GEANY_FILETYPES_CSS].styling[18]); - get_keyfile_style(config, config_home, "extended_identifier", &style_sets[GEANY_FILETYPES_CSS].styling[19]); - get_keyfile_style(config, config_home, "extended_pseudoclass", &style_sets[GEANY_FILETYPES_CSS].styling[20]); - get_keyfile_style(config, config_home, "extended_pseudoelement", &style_sets[GEANY_FILETYPES_CSS].styling[21]); + new_styleset(ft_id, 22); + get_keyfile_style(config, config_home, "default", &style_sets[ft_id].styling[0]); + get_keyfile_style(config, config_home, "comment", &style_sets[ft_id].styling[1]); + get_keyfile_style(config, config_home, "tag", &style_sets[ft_id].styling[2]); + get_keyfile_style(config, config_home, "class", &style_sets[ft_id].styling[3]); + get_keyfile_style(config, config_home, "pseudoclass", &style_sets[ft_id].styling[4]); + get_keyfile_style(config, config_home, "unknown_pseudoclass", &style_sets[ft_id].styling[5]); + get_keyfile_style(config, config_home, "unknown_identifier", &style_sets[ft_id].styling[6]); + get_keyfile_style(config, config_home, "operator", &style_sets[ft_id].styling[7]); + get_keyfile_style(config, config_home, "identifier", &style_sets[ft_id].styling[8]); + get_keyfile_style(config, config_home, "doublestring", &style_sets[ft_id].styling[9]); + get_keyfile_style(config, config_home, "singlestring", &style_sets[ft_id].styling[10]); + get_keyfile_style(config, config_home, "attribute", &style_sets[ft_id].styling[11]); + get_keyfile_style(config, config_home, "value", &style_sets[ft_id].styling[12]); + get_keyfile_style(config, config_home, "id", &style_sets[ft_id].styling[13]); + get_keyfile_style(config, config_home, "identifier2", &style_sets[ft_id].styling[14]); + get_keyfile_style(config, config_home, "important", &style_sets[ft_id].styling[15]); + get_keyfile_style(config, config_home, "directive", &style_sets[ft_id].styling[16]); + get_keyfile_style(config, config_home, "identifier3", &style_sets[ft_id].styling[17]); + get_keyfile_style(config, config_home, "pseudoelement", &style_sets[ft_id].styling[18]); + get_keyfile_style(config, config_home, "extended_identifier", &style_sets[ft_id].styling[19]); + get_keyfile_style(config, config_home, "extended_pseudoclass", &style_sets[ft_id].styling[20]); + get_keyfile_style(config, config_home, "extended_pseudoelement", &style_sets[ft_id].styling[21]); - style_sets[GEANY_FILETYPES_CSS].keywords = g_new(gchar*, 9); - get_keyfile_keywords(config, config_home, "primary", GEANY_FILETYPES_CSS, 0); - get_keyfile_keywords(config, config_home, "pseudoclasses", GEANY_FILETYPES_CSS, 1); - get_keyfile_keywords(config, config_home, "secondary", GEANY_FILETYPES_CSS, 2); - get_keyfile_keywords(config, config_home, "css3_properties", GEANY_FILETYPES_CSS, 3); - get_keyfile_keywords(config, config_home, "pseudo_elements", GEANY_FILETYPES_CSS, 4); - get_keyfile_keywords(config, config_home, "browser_css_properties", GEANY_FILETYPES_CSS, 5); - get_keyfile_keywords(config, config_home, "browser_pseudo_classes", GEANY_FILETYPES_CSS, 6); - get_keyfile_keywords(config, config_home, "browser_pseudo_elements", GEANY_FILETYPES_CSS, 7); - style_sets[GEANY_FILETYPES_CSS].keywords[8] = NULL; + style_sets[ft_id].keywords = g_new(gchar*, 9); + get_keyfile_keywords(config, config_home, "primary", ft_id, 0); + get_keyfile_keywords(config, config_home, "pseudoclasses", ft_id, 1); + get_keyfile_keywords(config, config_home, "secondary", ft_id, 2); + get_keyfile_keywords(config, config_home, "css3_properties", ft_id, 3); + get_keyfile_keywords(config, config_home, "pseudo_elements", ft_id, 4); + get_keyfile_keywords(config, config_home, "browser_css_properties", ft_id, 5); + get_keyfile_keywords(config, config_home, "browser_pseudo_classes", ft_id, 6); + get_keyfile_keywords(config, config_home, "browser_pseudo_elements", ft_id, 7); + style_sets[ft_id].keywords[8] = NULL; } -static void styleset_css(ScintillaObject *sci) +static void styleset_css(ScintillaObject *sci, gint ft_id) { - const filetype_id ft_id = GEANY_FILETYPES_CSS; guint i; apply_filetype_properties(sci, SCLEX_CSS, ft_id); for (i = 0; i < 8; i++) { - sci_set_keywords(sci, i, style_sets[GEANY_FILETYPES_CSS].keywords[i]); + sci_set_keywords(sci, i, style_sets[ft_id].keywords[i]); } - set_sci_style(sci, STYLE_DEFAULT, GEANY_FILETYPES_CSS, 0); - set_sci_style(sci, SCE_CSS_DEFAULT, GEANY_FILETYPES_CSS, 0); - set_sci_style(sci, SCE_CSS_COMMENT, GEANY_FILETYPES_CSS, 1); - set_sci_style(sci, SCE_CSS_TAG, GEANY_FILETYPES_CSS, 2); - set_sci_style(sci, SCE_CSS_CLASS, GEANY_FILETYPES_CSS, 3); - set_sci_style(sci, SCE_CSS_PSEUDOCLASS, GEANY_FILETYPES_CSS, 4); - set_sci_style(sci, SCE_CSS_UNKNOWN_PSEUDOCLASS, GEANY_FILETYPES_CSS, 5); - set_sci_style(sci, SCE_CSS_UNKNOWN_IDENTIFIER, GEANY_FILETYPES_CSS, 6); - set_sci_style(sci, SCE_CSS_OPERATOR, GEANY_FILETYPES_CSS, 7); - set_sci_style(sci, SCE_CSS_IDENTIFIER, GEANY_FILETYPES_CSS, 8); - set_sci_style(sci, SCE_CSS_DOUBLESTRING, GEANY_FILETYPES_CSS, 9); - set_sci_style(sci, SCE_CSS_SINGLESTRING, GEANY_FILETYPES_CSS, 10); - set_sci_style(sci, SCE_CSS_ATTRIBUTE, GEANY_FILETYPES_CSS, 11); - set_sci_style(sci, SCE_CSS_VALUE, GEANY_FILETYPES_CSS, 12); - set_sci_style(sci, SCE_CSS_ID, GEANY_FILETYPES_CSS, 13); - set_sci_style(sci, SCE_CSS_IDENTIFIER2, GEANY_FILETYPES_CSS, 14); - set_sci_style(sci, SCE_CSS_IMPORTANT, GEANY_FILETYPES_CSS, 15); - set_sci_style(sci, SCE_CSS_DIRECTIVE, GEANY_FILETYPES_CSS, 16); - set_sci_style(sci, SCE_CSS_IDENTIFIER3, GEANY_FILETYPES_CSS, 17); - set_sci_style(sci, SCE_CSS_PSEUDOELEMENT, GEANY_FILETYPES_CSS, 18); - set_sci_style(sci, SCE_CSS_EXTENDED_IDENTIFIER, GEANY_FILETYPES_CSS, 19); - set_sci_style(sci, SCE_CSS_EXTENDED_PSEUDOCLASS, GEANY_FILETYPES_CSS, 20); - set_sci_style(sci, SCE_CSS_EXTENDED_PSEUDOELEMENT, GEANY_FILETYPES_CSS, 21); + set_sci_style(sci, STYLE_DEFAULT, ft_id, 0); + set_sci_style(sci, SCE_CSS_DEFAULT, ft_id, 0); + set_sci_style(sci, SCE_CSS_COMMENT, ft_id, 1); + set_sci_style(sci, SCE_CSS_TAG, ft_id, 2); + set_sci_style(sci, SCE_CSS_CLASS, ft_id, 3); + set_sci_style(sci, SCE_CSS_PSEUDOCLASS, ft_id, 4); + set_sci_style(sci, SCE_CSS_UNKNOWN_PSEUDOCLASS, ft_id, 5); + set_sci_style(sci, SCE_CSS_UNKNOWN_IDENTIFIER, ft_id, 6); + set_sci_style(sci, SCE_CSS_OPERATOR, ft_id, 7); + set_sci_style(sci, SCE_CSS_IDENTIFIER, ft_id, 8); + set_sci_style(sci, SCE_CSS_DOUBLESTRING, ft_id, 9); + set_sci_style(sci, SCE_CSS_SINGLESTRING, ft_id, 10); + set_sci_style(sci, SCE_CSS_ATTRIBUTE, ft_id, 11); + set_sci_style(sci, SCE_CSS_VALUE, ft_id, 12); + set_sci_style(sci, SCE_CSS_ID, ft_id, 13); + set_sci_style(sci, SCE_CSS_IDENTIFIER2, ft_id, 14); + set_sci_style(sci, SCE_CSS_IMPORTANT, ft_id, 15); + set_sci_style(sci, SCE_CSS_DIRECTIVE, ft_id, 16); + set_sci_style(sci, SCE_CSS_IDENTIFIER3, ft_id, 17); + set_sci_style(sci, SCE_CSS_PSEUDOELEMENT, ft_id, 18); + set_sci_style(sci, SCE_CSS_EXTENDED_IDENTIFIER, ft_id, 19); + set_sci_style(sci, SCE_CSS_EXTENDED_PSEUDOCLASS, ft_id, 20); + set_sci_style(sci, SCE_CSS_EXTENDED_PSEUDOELEMENT, ft_id, 21); } static void styleset_nsis_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) { - new_styleset(GEANY_FILETYPES_NSIS, 19); - get_keyfile_style(config, config_home, "default", &style_sets[GEANY_FILETYPES_NSIS].styling[0]); - get_keyfile_style(config, config_home, "comment", &style_sets[GEANY_FILETYPES_NSIS].styling[1]); - get_keyfile_style(config, config_home, "stringdq", &style_sets[GEANY_FILETYPES_NSIS].styling[2]); - get_keyfile_style(config, config_home, "stringlq", &style_sets[GEANY_FILETYPES_NSIS].styling[3]); - get_keyfile_style(config, config_home, "stringrq", &style_sets[GEANY_FILETYPES_NSIS].styling[4]); - get_keyfile_style(config, config_home, "function", &style_sets[GEANY_FILETYPES_NSIS].styling[5]); - get_keyfile_style(config, config_home, "variable", &style_sets[GEANY_FILETYPES_NSIS].styling[6]); - get_keyfile_style(config, config_home, "label", &style_sets[GEANY_FILETYPES_NSIS].styling[7]); - get_keyfile_style(config, config_home, "userdefined", &style_sets[GEANY_FILETYPES_NSIS].styling[8]); - get_keyfile_style(config, config_home, "sectiondef", &style_sets[GEANY_FILETYPES_NSIS].styling[9]); - get_keyfile_style(config, config_home, "subsectiondef", &style_sets[GEANY_FILETYPES_NSIS].styling[10]); - get_keyfile_style(config, config_home, "ifdefinedef", &style_sets[GEANY_FILETYPES_NSIS].styling[11]); - get_keyfile_style(config, config_home, "macrodef", &style_sets[GEANY_FILETYPES_NSIS].styling[12]); - get_keyfile_style(config, config_home, "stringvar", &style_sets[GEANY_FILETYPES_NSIS].styling[13]); - get_keyfile_style(config, config_home, "number", &style_sets[GEANY_FILETYPES_NSIS].styling[14]); - get_keyfile_style(config, config_home, "sectiongroup", &style_sets[GEANY_FILETYPES_NSIS].styling[15]); - get_keyfile_style(config, config_home, "pageex", &style_sets[GEANY_FILETYPES_NSIS].styling[16]); - get_keyfile_style(config, config_home, "functiondef", &style_sets[GEANY_FILETYPES_NSIS].styling[17]); - get_keyfile_style(config, config_home, "commentbox", &style_sets[GEANY_FILETYPES_NSIS].styling[18]); + new_styleset(ft_id, 19); + get_keyfile_style(config, config_home, "default", &style_sets[ft_id].styling[0]); + get_keyfile_style(config, config_home, "comment", &style_sets[ft_id].styling[1]); + get_keyfile_style(config, config_home, "stringdq", &style_sets[ft_id].styling[2]); + get_keyfile_style(config, config_home, "stringlq", &style_sets[ft_id].styling[3]); + get_keyfile_style(config, config_home, "stringrq", &style_sets[ft_id].styling[4]); + get_keyfile_style(config, config_home, "function", &style_sets[ft_id].styling[5]); + get_keyfile_style(config, config_home, "variable", &style_sets[ft_id].styling[6]); + get_keyfile_style(config, config_home, "label", &style_sets[ft_id].styling[7]); + get_keyfile_style(config, config_home, "userdefined", &style_sets[ft_id].styling[8]); + get_keyfile_style(config, config_home, "sectiondef", &style_sets[ft_id].styling[9]); + get_keyfile_style(config, config_home, "subsectiondef", &style_sets[ft_id].styling[10]); + get_keyfile_style(config, config_home, "ifdefinedef", &style_sets[ft_id].styling[11]); + get_keyfile_style(config, config_home, "macrodef", &style_sets[ft_id].styling[12]); + get_keyfile_style(config, config_home, "stringvar", &style_sets[ft_id].styling[13]); + get_keyfile_style(config, config_home, "number", &style_sets[ft_id].styling[14]); + get_keyfile_style(config, config_home, "sectiongroup", &style_sets[ft_id].styling[15]); + get_keyfile_style(config, config_home, "pageex", &style_sets[ft_id].styling[16]); + get_keyfile_style(config, config_home, "functiondef", &style_sets[ft_id].styling[17]); + get_keyfile_style(config, config_home, "commentbox", &style_sets[ft_id].styling[18]); - style_sets[GEANY_FILETYPES_NSIS].keywords = g_new(gchar*, 5); - get_keyfile_keywords(config, config_home, "functions", GEANY_FILETYPES_NSIS, 0); - get_keyfile_keywords(config, config_home, "variables", GEANY_FILETYPES_NSIS, 1); - get_keyfile_keywords(config, config_home, "lables", GEANY_FILETYPES_NSIS, 2); - get_keyfile_keywords(config, config_home, "userdefined", GEANY_FILETYPES_NSIS, 3); - style_sets[GEANY_FILETYPES_NSIS].keywords[4] = NULL; + style_sets[ft_id].keywords = g_new(gchar*, 5); + get_keyfile_keywords(config, config_home, "functions", ft_id, 0); + get_keyfile_keywords(config, config_home, "variables", ft_id, 1); + get_keyfile_keywords(config, config_home, "lables", ft_id, 2); + get_keyfile_keywords(config, config_home, "userdefined", ft_id, 3); + style_sets[ft_id].keywords[4] = NULL; } -static void styleset_nsis(ScintillaObject *sci) +static void styleset_nsis(ScintillaObject *sci, gint ft_id) { - const filetype_id ft_id = GEANY_FILETYPES_NSIS; - apply_filetype_properties(sci, SCLEX_NSIS, ft_id); - sci_set_keywords(sci, 0, style_sets[GEANY_FILETYPES_NSIS].keywords[0]); - sci_set_keywords(sci, 1, style_sets[GEANY_FILETYPES_NSIS].keywords[1]); - sci_set_keywords(sci, 2, style_sets[GEANY_FILETYPES_NSIS].keywords[2]); - sci_set_keywords(sci, 3, style_sets[GEANY_FILETYPES_NSIS].keywords[3]); + sci_set_keywords(sci, 0, style_sets[ft_id].keywords[0]); + sci_set_keywords(sci, 1, style_sets[ft_id].keywords[1]); + sci_set_keywords(sci, 2, style_sets[ft_id].keywords[2]); + sci_set_keywords(sci, 3, style_sets[ft_id].keywords[3]); - set_sci_style(sci, STYLE_DEFAULT, GEANY_FILETYPES_NSIS, 0); - set_sci_style(sci, SCE_NSIS_DEFAULT, GEANY_FILETYPES_NSIS, 0); - set_sci_style(sci, SCE_NSIS_COMMENT, GEANY_FILETYPES_NSIS, 1); - set_sci_style(sci, SCE_NSIS_STRINGDQ, GEANY_FILETYPES_NSIS, 2); - set_sci_style(sci, SCE_NSIS_STRINGLQ, GEANY_FILETYPES_NSIS, 3); - set_sci_style(sci, SCE_NSIS_STRINGRQ, GEANY_FILETYPES_NSIS, 4); - set_sci_style(sci, SCE_NSIS_FUNCTION, GEANY_FILETYPES_NSIS, 5); - set_sci_style(sci, SCE_NSIS_VARIABLE, GEANY_FILETYPES_NSIS, 6); - set_sci_style(sci, SCE_NSIS_LABEL, GEANY_FILETYPES_NSIS, 7); - set_sci_style(sci, SCE_NSIS_USERDEFINED, GEANY_FILETYPES_NSIS, 8); - set_sci_style(sci, SCE_NSIS_SECTIONDEF, GEANY_FILETYPES_NSIS, 9); - set_sci_style(sci, SCE_NSIS_SUBSECTIONDEF, GEANY_FILETYPES_NSIS, 10); - set_sci_style(sci, SCE_NSIS_IFDEFINEDEF, GEANY_FILETYPES_NSIS, 11); - set_sci_style(sci, SCE_NSIS_MACRODEF, GEANY_FILETYPES_NSIS, 12); - set_sci_style(sci, SCE_NSIS_STRINGVAR, GEANY_FILETYPES_NSIS, 13); - set_sci_style(sci, SCE_NSIS_NUMBER, GEANY_FILETYPES_NSIS, 14); - set_sci_style(sci, SCE_NSIS_SECTIONGROUP, GEANY_FILETYPES_NSIS, 15); - set_sci_style(sci, SCE_NSIS_PAGEEX, GEANY_FILETYPES_NSIS, 16); - set_sci_style(sci, SCE_NSIS_FUNCTIONDEF, GEANY_FILETYPES_NSIS, 17); - set_sci_style(sci, SCE_NSIS_COMMENTBOX, GEANY_FILETYPES_NSIS, 18); + set_sci_style(sci, STYLE_DEFAULT, ft_id, 0); + set_sci_style(sci, SCE_NSIS_DEFAULT, ft_id, 0); + set_sci_style(sci, SCE_NSIS_COMMENT, ft_id, 1); + set_sci_style(sci, SCE_NSIS_STRINGDQ, ft_id, 2); + set_sci_style(sci, SCE_NSIS_STRINGLQ, ft_id, 3); + set_sci_style(sci, SCE_NSIS_STRINGRQ, ft_id, 4); + set_sci_style(sci, SCE_NSIS_FUNCTION, ft_id, 5); + set_sci_style(sci, SCE_NSIS_VARIABLE, ft_id, 6); + set_sci_style(sci, SCE_NSIS_LABEL, ft_id, 7); + set_sci_style(sci, SCE_NSIS_USERDEFINED, ft_id, 8); + set_sci_style(sci, SCE_NSIS_SECTIONDEF, ft_id, 9); + set_sci_style(sci, SCE_NSIS_SUBSECTIONDEF, ft_id, 10); + set_sci_style(sci, SCE_NSIS_IFDEFINEDEF, ft_id, 11); + set_sci_style(sci, SCE_NSIS_MACRODEF, ft_id, 12); + set_sci_style(sci, SCE_NSIS_STRINGVAR, ft_id, 13); + set_sci_style(sci, SCE_NSIS_NUMBER, ft_id, 14); + set_sci_style(sci, SCE_NSIS_SECTIONGROUP, ft_id, 15); + set_sci_style(sci, SCE_NSIS_PAGEEX, ft_id, 16); + set_sci_style(sci, SCE_NSIS_FUNCTIONDEF, ft_id, 17); + set_sci_style(sci, SCE_NSIS_COMMENTBOX, ft_id, 18); } static void styleset_po_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) { - new_styleset(GEANY_FILETYPES_PO, 9); - get_keyfile_style(config, config_home, "default", &style_sets[GEANY_FILETYPES_PO].styling[0]); - get_keyfile_style(config, config_home, "comment", &style_sets[GEANY_FILETYPES_PO].styling[1]); - get_keyfile_style(config, config_home, "msgid", &style_sets[GEANY_FILETYPES_PO].styling[2]); - get_keyfile_style(config, config_home, "msgid_text", &style_sets[GEANY_FILETYPES_PO].styling[3]); - get_keyfile_style(config, config_home, "msgstr", &style_sets[GEANY_FILETYPES_PO].styling[4]); - get_keyfile_style(config, config_home, "msgstr_text", &style_sets[GEANY_FILETYPES_PO].styling[5]); - get_keyfile_style(config, config_home, "msgctxt", &style_sets[GEANY_FILETYPES_PO].styling[6]); - get_keyfile_style(config, config_home, "msgctxt_text", &style_sets[GEANY_FILETYPES_PO].styling[7]); - get_keyfile_style(config, config_home, "fuzzy", &style_sets[GEANY_FILETYPES_PO].styling[8]); + new_styleset(ft_id, 9); + get_keyfile_style(config, config_home, "default", &style_sets[ft_id].styling[0]); + get_keyfile_style(config, config_home, "comment", &style_sets[ft_id].styling[1]); + get_keyfile_style(config, config_home, "msgid", &style_sets[ft_id].styling[2]); + get_keyfile_style(config, config_home, "msgid_text", &style_sets[ft_id].styling[3]); + get_keyfile_style(config, config_home, "msgstr", &style_sets[ft_id].styling[4]); + get_keyfile_style(config, config_home, "msgstr_text", &style_sets[ft_id].styling[5]); + get_keyfile_style(config, config_home, "msgctxt", &style_sets[ft_id].styling[6]); + get_keyfile_style(config, config_home, "msgctxt_text", &style_sets[ft_id].styling[7]); + get_keyfile_style(config, config_home, "fuzzy", &style_sets[ft_id].styling[8]); - style_sets[GEANY_FILETYPES_PO].keywords = NULL; + style_sets[ft_id].keywords = NULL; } -static void styleset_po(ScintillaObject *sci) +static void styleset_po(ScintillaObject *sci, gint ft_id) { - const filetype_id ft_id = GEANY_FILETYPES_PO; - apply_filetype_properties(sci, SCLEX_PO, ft_id); - set_sci_style(sci, STYLE_DEFAULT, GEANY_FILETYPES_PO, 0); - set_sci_style(sci, SCE_PO_DEFAULT, GEANY_FILETYPES_PO, 0); - set_sci_style(sci, SCE_PO_COMMENT, GEANY_FILETYPES_PO, 1); - set_sci_style(sci, SCE_PO_MSGID, GEANY_FILETYPES_PO, 2); - set_sci_style(sci, SCE_PO_MSGID_TEXT, GEANY_FILETYPES_PO, 3); - set_sci_style(sci, SCE_PO_MSGSTR, GEANY_FILETYPES_PO, 4); - set_sci_style(sci, SCE_PO_MSGSTR_TEXT, GEANY_FILETYPES_PO, 5); - set_sci_style(sci, SCE_PO_MSGCTXT, GEANY_FILETYPES_PO, 6); - set_sci_style(sci, SCE_PO_MSGCTXT_TEXT, GEANY_FILETYPES_PO, 7); - set_sci_style(sci, SCE_PO_FUZZY, GEANY_FILETYPES_PO, 8); + set_sci_style(sci, STYLE_DEFAULT, ft_id, 0); + set_sci_style(sci, SCE_PO_DEFAULT, ft_id, 0); + set_sci_style(sci, SCE_PO_COMMENT, ft_id, 1); + set_sci_style(sci, SCE_PO_MSGID, ft_id, 2); + set_sci_style(sci, SCE_PO_MSGID_TEXT, ft_id, 3); + set_sci_style(sci, SCE_PO_MSGSTR, ft_id, 4); + set_sci_style(sci, SCE_PO_MSGSTR_TEXT, ft_id, 5); + set_sci_style(sci, SCE_PO_MSGCTXT, ft_id, 6); + set_sci_style(sci, SCE_PO_MSGCTXT_TEXT, ft_id, 7); + set_sci_style(sci, SCE_PO_FUZZY, ft_id, 8); } static void styleset_conf_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) { - new_styleset(GEANY_FILETYPES_CONF, 6); - get_keyfile_style(config, config_home, "default", &style_sets[GEANY_FILETYPES_CONF].styling[0]); - get_keyfile_style(config, config_home, "comment", &style_sets[GEANY_FILETYPES_CONF].styling[1]); - get_keyfile_style(config, config_home, "section", &style_sets[GEANY_FILETYPES_CONF].styling[2]); @@ Diff output truncated at 100000 characters. @@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[4443] trunk
by eht16＠users.sourceforge.net 24 Nov '09

24 Nov '09

Revision: 4443 http://geany.svn.sourceforge.net/geany/?rev=4443&view=rev Author: eht16 Date: 2009-11-23 23:03:39 +0000 (Mon, 23 Nov 2009) Log Message: ----------- Add a Help button to the preferences dialog. Handle Help keybinding events for the preferences dialog especially and open the manual with the corresponding anchor link to the current preferences page (same goes for the new Help button). Modified Paths: -------------- trunk/ChangeLog trunk/geany.glade trunk/src/interface.c trunk/src/prefs.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-11-23 22:59:36 UTC (rev 4442) +++ trunk/ChangeLog 2009-11-23 23:03:39 UTC (rev 4443) @@ -13,6 +13,11 @@ Geany's keybindings. * src/callbacks.c, src/utils.c, src/utils.h: Add and use utils_get_help_url(). + * geany.glade, src/interface.c, src/prefs.c: + Add a Help button to the preferences dialog. + Handle Help keybinding events for the preferences dialog especially + and open the manual with the corresponding anchor link to the current + preferences page (same goes for the new Help button). 2009-11-22 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> Modified: trunk/geany.glade =================================================================== --- trunk/geany.glade 2009-11-23 22:59:36 UTC (rev 4442) +++ trunk/geany.glade 2009-11-23 23:03:39 UTC (rev 4443) @@ -2832,6 +2832,19 @@ <property name="response_id">-5</property> </widget> </child> + + <child> + <widget class="GtkButton" id="button_help"> + <property name="visible">True</property> + <property name="can_default">True</property> + <property name="can_focus">True</property> + <property name="label">gtk-help</property> + <property name="use_stock">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <property name="response_id">-11</property> + </widget> + </child> </widget> <packing> <property name="padding">0</property> Modified: trunk/src/interface.c =================================================================== --- trunk/src/interface.c 2009-11-23 22:59:36 UTC (rev 4442) +++ trunk/src/interface.c 2009-11-23 23:03:39 UTC (rev 4443) @@ -2704,6 +2704,7 @@ GtkWidget *button3; GtkWidget *button4; GtkWidget *button5; + GtkWidget *button_help; GtkTooltips *tooltips; tooltips = gtk_tooltips_new (); @@ -4675,6 +4676,11 @@ gtk_dialog_add_action_widget (GTK_DIALOG (prefs_dialog), button5, GTK_RESPONSE_OK); GTK_WIDGET_SET_FLAGS (button5, GTK_CAN_DEFAULT); + button_help = gtk_button_new_from_stock ("gtk-help"); + gtk_widget_show (button_help); + gtk_dialog_add_action_widget (GTK_DIALOG (prefs_dialog), button_help, GTK_RESPONSE_HELP); + GTK_WIDGET_SET_FLAGS (button_help, GTK_CAN_DEFAULT); + g_signal_connect ((gpointer) button_customize_toolbar, "clicked", G_CALLBACK (on_button_customize_toolbar_clicked), NULL); @@ -5039,6 +5045,7 @@ GLADE_HOOKUP_OBJECT (prefs_dialog, button3, "button3"); GLADE_HOOKUP_OBJECT (prefs_dialog, button4, "button4"); GLADE_HOOKUP_OBJECT (prefs_dialog, button5, "button5"); + GLADE_HOOKUP_OBJECT (prefs_dialog, button_help, "button_help"); GLADE_HOOKUP_OBJECT_NO_REF (prefs_dialog, tooltips, "tooltips"); gtk_widget_grab_default (button5); Modified: trunk/src/prefs.c =================================================================== --- trunk/src/prefs.c 2009-11-23 22:59:36 UTC (rev 4442) +++ trunk/src/prefs.c 2009-11-23 23:03:39 UTC (rev 4443) @@ -1456,6 +1456,77 @@ } +static void open_preferences_help(void) +{ + gchar *uri; + const gchar *label, *suffix; + GtkNotebook *notebook = GTK_NOTEBOOK( + ui_lookup_widget(ui_widgets.prefs_dialog, "notebook2")); + gint page_nr = gtk_notebook_get_current_page(notebook); + GtkWidget *page = gtk_notebook_get_nth_page(notebook, page_nr); + + label = gtk_notebook_get_tab_label_text(notebook, page); + + /* TODO Find a better way to map the current notebook page to the + * corresponding chapter in the documentation, comparing translatable + * strings is easy to break. Maybe attach an identifying string to the + * tab label object. */ + if (utils_str_equal(label, _("General"))) + suffix = "#general-startup-preferences"; + else if (utils_str_equal(label, _("Interface"))) + suffix = "#interface-preferences"; + else if (utils_str_equal(label, _("Toolbar"))) + suffix = "#toolbar-preferences"; + else if (utils_str_equal(label, _("Editor"))) + suffix = "#editor-features-preferences"; + else if (utils_str_equal(label, _("Files"))) + suffix = "#files-preferences"; + else if (utils_str_equal(label, _("Tools"))) + suffix = "#tools-preferences"; + else if (utils_str_equal(label, _("Templates"))) + suffix = "#template-preferences"; + else if (utils_str_equal(label, _("Keybindings"))) + suffix = "#keybinding-preferences"; + else if (utils_str_equal(label, _("Printing"))) + suffix = "#printing-preferences"; + else if (utils_str_equal(label, _("Terminal"))) + suffix = "#terminal-vte-preferences"; + + uri = utils_get_help_url(suffix); + utils_open_browser(uri); + g_free(uri); +} + + +static gboolean prefs_dialog_key_press_response_cb(GtkWidget *dialog, GdkEventKey *event, + gpointer data) +{ + gint group, keybinding; + + if (keybindings_check_event(event, &group, &keybinding) != NULL) + { + if (group == GEANY_KEY_GROUP_HELP && keybinding == GEANY_KEYS_HELP_HELP) + { + open_preferences_help(); + return TRUE; + } + } + return FALSE; +} + + +static gboolean prefs_dialog_button_press_event_cb(GtkWidget *dialog, GdkEventButton *event, + gpointer data) +{ + if (event->button == 1) + { + open_preferences_help(); + return TRUE; + } + return FALSE; +} + + void prefs_show_dialog(void) { if (ui_widgets.prefs_dialog == NULL) @@ -1614,6 +1685,11 @@ "toggled", G_CALLBACK(on_use_folding_toggled), NULL); g_signal_connect(ui_lookup_widget(ui_widgets.prefs_dialog, "check_open_encoding"), "toggled", G_CALLBACK(on_open_encoding_toggled), NULL); + + g_signal_connect(ui_lookup_widget(ui_widgets.prefs_dialog, "button_help"), + "button-press-event", G_CALLBACK(prefs_dialog_button_press_event_cb), NULL); + g_signal_connect(ui_widgets.prefs_dialog, + "key-press-event", G_CALLBACK(prefs_dialog_key_press_response_cb), NULL); } prefs_init_dialog(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[4442] trunk
by eht16＠users.sourceforge.net 23 Nov '09

23 Nov '09

Revision: 4442 http://geany.svn.sourceforge.net/geany/?rev=4442&view=rev Author: eht16 Date: 2009-11-23 22:59:36 +0000 (Mon, 23 Nov 2009) Log Message: ----------- Add and use utils_get_help_url(). Modified Paths: -------------- trunk/ChangeLog trunk/src/callbacks.c trunk/src/utils.c trunk/src/utils.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-11-23 22:25:11 UTC (rev 4441) +++ trunk/ChangeLog 2009-11-23 22:59:36 UTC (rev 4442) @@ -3,19 +3,21 @@ * tagmanager/php.c: Remove duplicate regular expression for parsing classes. Fix and improve parsing of constants (patch by Harold Aling, thanks). - * doc/geany.1.in, doc/geany.html, doc/geany.txt, src/main.c, + * doc/geany.1.in, doc/geany.html, doc/geany.txt, src/main.c, src/main.h, THANKS, src/about.c: Add new command line option "--socket-file" to be able to specify - separate socket filenames for instances + separate socket filenames for instances (closes #2896027, patch by Jörn Reder, thanks). * src/keybindings.c, src/keybindings.h: Add keybindings_check_event() to manually check GdkKeyEvents against Geany's keybindings. + * src/callbacks.c, src/utils.c, src/utils.h: + Add and use utils_get_help_url(). 2009-11-22 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * src/toolbar.c, src/geanymenubuttonaction.c, + * src/toolbar.c, src/geanymenubuttonaction.c, src/geanymenubuttonaction.h: Use separate tooltips for toolbar menu buttons and their attached drop-down arrows. Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2009-11-23 22:25:11 UTC (rev 4441) +++ trunk/src/callbacks.c 2009-11-23 22:59:36 UTC (rev 4442) @@ -1323,24 +1323,9 @@ on_help1_activate (GtkMenuItem *menuitem, gpointer user_data) { - gint skip; gchar *uri; -#ifdef G_OS_WIN32 - skip = 8; - uri = g_strconcat("file:///", app->docdir, "/Manual.html", NULL); - g_strdelimit(uri, "\\", '/'); /* replace '\\' by '/' */ -#else - skip = 7; - uri = g_strconcat("file://", app->docdir, "index.html", NULL); -#endif - - if (! g_file_test(uri + skip, G_FILE_TEST_IS_REGULAR)) - { /* fall back to online documentation if it is not found on the hard disk */ - g_free(uri); - uri = g_strconcat(GEANY_HOMEPAGE, "manual/", VERSION, "/index.html", NULL); - } - + uri = utils_get_help_url(NULL); utils_open_browser(uri); g_free(uri); } Modified: trunk/src/utils.c =================================================================== --- trunk/src/utils.c 2009-11-23 22:25:11 UTC (rev 4441) +++ trunk/src/utils.c 2009-11-23 22:59:36 UTC (rev 4442) @@ -1864,3 +1864,33 @@ } +/* Suffix can be NULL or a string which should be appended to the Help URL like + * an anchor link, e.g. "#some_anchor". */ +gchar *utils_get_help_url(const gchar *suffix) +{ + gint skip; + gchar *uri; + +#ifdef G_OS_WIN32 + skip = 8; + uri = g_strconcat("file:///", app->docdir, "/Manual.html", NULL); + g_strdelimit(uri, "\\", '/'); /* replace '\\' by '/' */ +#else + skip = 7; + uri = g_strconcat("file://", app->docdir, "index.html", NULL); +#endif + + if (! g_file_test(uri + skip, G_FILE_TEST_IS_REGULAR)) + { /* fall back to online documentation if it is not found on the hard disk */ + g_free(uri); + uri = g_strconcat(GEANY_HOMEPAGE, "manual/", VERSION, "/index.html", NULL); + } + + if (suffix != NULL) + { + setptr(uri, g_strconcat(uri, suffix, NULL)); + } + + return uri; +} + Modified: trunk/src/utils.h =================================================================== --- trunk/src/utils.h 2009-11-23 22:25:11 UTC (rev 4441) +++ trunk/src/utils.h 2009-11-23 22:59:36 UTC (rev 4442) @@ -200,6 +200,8 @@ GSList *utils_get_config_files(const gchar *subdir); +gchar *utils_get_help_url(const gchar *suffix); + gboolean utils_str_has_upper(const gchar *str); gint utils_is_file_writeable(const gchar *locale_filename); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits November 2009