Commits August 2011

commits@lists.geany.org

2 participants
26 discussions

SF.net SVN: geany:[5905] trunk/po
by frlan＠users.sourceforge.net 27 Aug '11

27 Aug '11

Revision: 5905 http://geany.svn.sourceforge.net/geany/?rev=5905&view=rev Author: frlan Date: 2011-08-27 19:03:21 +0000 (Sat, 27 Aug 2011) Log Message: ----------- Minor update of German translation Modified Paths: -------------- trunk/po/ChangeLog trunk/po/de.po Modified: trunk/po/ChangeLog =================================================================== --- trunk/po/ChangeLog 2011-08-25 20:15:02 UTC (rev 5904) +++ trunk/po/ChangeLog 2011-08-27 19:03:21 UTC (rev 5905) @@ -1,13 +1,18 @@ +2011-08-27 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> + + * de.po: Minor update of German translation. + + 2011-07-29 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> - * de.po: Update of German transalation. + * de.po: Update of German transalation. 2011-07-28 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> * de.po: Update of German translation. - * zh_TW.po: Update of Traditional Chinese translation. - Thanks to Wei-Lun Chao for providing update. + * zh_TW.po: Update of Traditional Chinese translation. + Thanks to Wei-Lun Chao for providing update. 2011-07-16 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> Modified: trunk/po/de.po =================================================================== --- trunk/po/de.po 2011-08-25 20:15:02 UTC (rev 5904) +++ trunk/po/de.po 2011-08-27 19:03:21 UTC (rev 5905) @@ -11,14 +11,14 @@ msgstr "" "Project-Id-Version: geany 0.20\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-07-29 13:35+0200\n" +"POT-Creation-Date: 2011-08-27 21:01+0200\n" "PO-Revision-Date: 2011-07-29 13:44+0100\n" "Last-Translator: Frank Lanitz <frank(a)frank.uvena.de>\n" "Language-Team: German <geany-i18n(a)uvena.de>\n" +"Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: de\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Poedit-Country: GERMANY\n" "X-Poedit-SourceCharset: utf-8\n" @@ -28,9 +28,7 @@ msgid "A fast and lightweight IDE using GTK2" msgstr "Eine kleine und schnelle Entwicklungsumgebung für GTK2" -#: ../geany.desktop.in.h:2 -#: ../src/interface.c:310 -#: ../src/interface.c:1814 +#: ../geany.desktop.in.h:2 ../src/interface.c:314 ../src/interface.c:1842 msgid "Geany" msgstr "Geany" @@ -64,8 +62,7 @@ msgid "maintainer" msgstr "Hauptentwickler" -#: ../src/about.c:289 -#: ../src/about.c:297 +#: ../src/about.c:289 ../src/about.c:297 msgid "developer" msgstr "Entwickler" @@ -87,8 +84,11 @@ #: ../src/about.c:365 #, 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:391 msgid "Credits" @@ -99,8 +99,12 @@ msgstr "Lizenz" #: ../src/about.c:414 -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." +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:657 @@ -117,9 +121,7 @@ msgid "%s (in directory: %s)" msgstr "%s (im Verzeichnis: %s)" -#: ../src/build.c:741 -#: ../src/build.c:963 -#: ../src/search.c:1626 +#: ../src/build.c:741 ../src/build.c:963 ../src/search.c:1626 #, c-format msgid "Process failed (%s)" msgstr "Prozess fehlgeschlagen (%s)" @@ -135,13 +137,20 @@ msgstr "Konnte »%s« nicht ausführen (Start-Script konnte nicht erzeugt werden)" #: ../src/build.c:892 -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." +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:930 #, 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:1103 msgid "Compilation failed." @@ -157,7 +166,9 @@ #: ../src/build.c:1277 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:1355 msgid "_Next Error" @@ -168,13 +179,11 @@ msgstr "_Vorheriger Fehler" #. arguments -#: ../src/build.c:1367 -#: ../src/build.c:2745 +#: ../src/build.c:1367 ../src/build.c:2745 msgid "_Set Build Commands" msgstr "_Kommandos zum Erstellen konfigurieren" -#: ../src/build.c:1651 -#: ../src/toolbar.c:374 +#: ../src/build.c:1651 ../src/toolbar.c:374 msgid "Build the current file" msgstr "Kompiliert die aktuelle Datei" @@ -195,8 +204,7 @@ msgid "Process could not be stopped (%s)." msgstr "Der Prozess konnte nicht angehalten werden (%s)." -#: ../src/build.c:1710 -#: ../src/build.c:1722 +#: ../src/build.c:1710 ../src/build.c:1722 msgid "No more build errors." msgstr "Keine weiteren Fehlermeldungen." @@ -205,14 +213,11 @@ msgid "Set menu item label" msgstr "Bezeichnung für den Menüeintrag definieren" -#: ../src/build.c:1844 -#: ../src/symbols.c:737 +#: ../src/build.c:1844 ../src/symbols.c:737 msgid "Label" msgstr "Label" -#: ../src/build.c:1845 -#: ../src/symbols.c:732 -#: ../src/tools.c:534 +#: ../src/build.c:1845 ../src/symbols.c:732 ../src/tools.c:526 msgid "Command" msgstr "Kommando" @@ -228,8 +233,7 @@ msgid "Click to set menu item label" msgstr "Klicken, um die Bezeichnung für den Menüeintrag zu definieren" -#: ../src/build.c:1976 -#: ../src/build.c:1978 +#: ../src/build.c:1976 ../src/build.c:1978 #, c-format msgid "%s commands" msgstr "Kommandos für %s" @@ -238,8 +242,7 @@ msgid "No filetype" msgstr "Kein Dateityp" -#: ../src/build.c:1987 -#: ../src/build.c:2022 +#: ../src/build.c:1987 ../src/build.c:2022 msgid "Error regular expression:" msgstr "Regulärer Ausdruck für Fehlermeldungen:" @@ -249,7 +252,9 @@ #: ../src/build.c:2047 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:2056 msgid "Execute commands" @@ -257,8 +262,12 @@ #: ../src/build.c:2068 #, 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:2225 msgid "Set Build Commands" @@ -269,34 +278,25 @@ msgstr "_Kompilieren" #. build the code -#: ../src/build.c:2443 -#: ../src/build.c:2705 -#: ../src/interface.c:1223 +#: ../src/build.c:2443 ../src/build.c:2705 ../src/interface.c:1245 msgid "_Build" msgstr "_Erstellen" -#: ../src/build.c:2450 -#: ../src/build.c:2480 -#: ../src/build.c:2673 +#: ../src/build.c:2450 ../src/build.c:2480 ../src/build.c:2673 msgid "_Execute" msgstr "_Ausführen" #. build the code with make custom -#: ../src/build.c:2495 -#: ../src/build.c:2671 -#: ../src/build.c:2725 +#: ../src/build.c:2495 ../src/build.c:2671 ../src/build.c:2725 msgid "Make Custom _Target" msgstr "Make (eigenes _Target)" #. build the code with make object -#: ../src/build.c:2497 -#: ../src/build.c:2672 -#: ../src/build.c:2733 +#: ../src/build.c:2497 ../src/build.c:2672 ../src/build.c:2733 msgid "Make _Object" msgstr "Make _Objekt-Datei" -#: ../src/build.c:2499 -#: ../src/build.c:2670 +#: ../src/build.c:2499 ../src/build.c:2670 msgid "_Make" msgstr "_Make" @@ -305,96 +305,90 @@ msgid "_Make All" msgstr "_Make all" -#: ../src/callbacks.c:150 +#: ../src/callbacks.c:149 msgid "Do you really want to quit?" msgstr "Soll Geany wirklich beendet werden?" -#: ../src/callbacks.c:228 +#: ../src/callbacks.c:219 #, c-format msgid "%d file saved." msgid_plural "%d files saved." msgstr[0] "%d Datei gespeichert." msgstr[1] "%d Dateien gespeichert." -#: ../src/callbacks.c:486 -#: ../src/document.c:2920 -#: ../src/interface.c:381 +#: ../src/callbacks.c:443 ../src/document.c:2925 ../src/interface.c:385 #: ../src/sidebar.c:684 msgid "_Reload" msgstr "_Neu laden" -#: ../src/callbacks.c:487 +#: ../src/callbacks.c:444 msgid "Any unsaved changes will be lost." msgstr "Alle ungesicherten Änderungen werden verloren gehen." -#: ../src/callbacks.c:488 +#: ../src/callbacks.c:445 #, c-format msgid "Are you sure you want to reload '%s'?" msgstr "Möchten Sie »%s« wirklich neu laden?" -#: ../src/callbacks.c:1207 -#: ../src/keybindings.c:425 +#: ../src/callbacks.c:1066 ../src/keybindings.c:425 msgid "Go to Line" msgstr "Gehe zu Zeile" -#: ../src/callbacks.c:1208 +#: ../src/callbacks.c:1067 msgid "Enter the line you want to go to:" msgstr "Geben Sie die Zeile an, zu der Sie springen möchten:" -#: ../src/callbacks.c:1302 -#: ../src/callbacks.c:1329 -msgid "Please set the filetype for the current file before using this function." +#: ../src/callbacks.c:1150 ../src/callbacks.c:1175 +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:1445 -#: ../src/ui_utils.c:619 +#: ../src/callbacks.c:1280 ../src/ui_utils.c:619 msgid "dd.mm.yyyy" msgstr "TT.MM.JJJJ" -#: ../src/callbacks.c:1447 -#: ../src/ui_utils.c:620 +#: ../src/callbacks.c:1282 ../src/ui_utils.c:620 msgid "mm.dd.yyyy" msgstr "MM.TT.JJJJ" -#: ../src/callbacks.c:1449 -#: ../src/ui_utils.c:621 +#: ../src/callbacks.c:1284 ../src/ui_utils.c:621 msgid "yyyy/mm/dd" msgstr "JJJJ/MM/TT" -#: ../src/callbacks.c:1451 -#: ../src/ui_utils.c:630 +#: ../src/callbacks.c:1286 ../src/ui_utils.c:630 msgid "dd.mm.yyyy hh:mm:ss" msgstr "TT.MM.JJJJ HH:MM:SS" -#: ../src/callbacks.c:1453 -#: ../src/ui_utils.c:631 +#: ../src/callbacks.c:1288 ../src/ui_utils.c:631 msgid "mm.dd.yyyy hh:mm:ss" msgstr "MM.TT.JJJJ HH:MM:SS" -#: ../src/callbacks.c:1455 -#: ../src/ui_utils.c:632 +#: ../src/callbacks.c:1290 ../src/ui_utils.c:632 msgid "yyyy/mm/dd hh:mm:ss" msgstr "JJJJ/MM/TT HH:MM:SS" -#: ../src/callbacks.c:1457 -#: ../src/ui_utils.c:641 +#: ../src/callbacks.c:1292 ../src/ui_utils.c:641 msgid "_Use Custom Date Format" msgstr "Benutze selbst erstelltes _Datumsformat" -#: ../src/callbacks.c:1461 +#: ../src/callbacks.c:1296 msgid "Custom Date Format" msgstr "Benutzerdefiniertes Datumsformat" -#: ../src/callbacks.c:1462 -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 funktionieren alle Platzhalter der ANSI C Funktion »strftime«." +#: ../src/callbacks.c:1297 +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 " +"funktionieren alle Platzhalter der ANSI C Funktion »strftime«." -#: ../src/callbacks.c:1485 +#: ../src/callbacks.c:1320 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:1713 -#: ../src/callbacks.c:1723 +#: ../src/callbacks.c:1515 ../src/callbacks.c:1523 msgid "No more message items." msgstr "Keine weiteren Nachrichten." @@ -422,15 +416,9 @@ msgid "Middle Eastern" msgstr "Nahöstlich" -#: ../src/dialogs.c:242 -#: ../src/encodings.c:120 -#: ../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/dialogs.c:242 ../src/encodings.c:120 ../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 msgid "Unicode" msgstr "Unicode" @@ -449,11 +437,16 @@ #: ../src/dialogs.c:318 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:325 @@ -462,25 +455,31 @@ #: ../src/dialogs.c:335 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:364 -#: ../src/dialogs.c:469 +#: ../src/dialogs.c:364 ../src/dialogs.c:469 msgid "Open File" msgstr "Datei öffnen" -#: ../src/dialogs.c:368 -#: ../src/interface.c:873 +#: ../src/dialogs.c:368 ../src/interface.c:877 msgid "_View" msgstr "_Ansicht" #: ../src/dialogs.c:370 -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. Bei Auswahl mehrerer Dateien, 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. Bei Auswahl mehrerer Dateien, werden alle " +"schreibgeschützt geöffnet." #: ../src/dialogs.c:391 msgid "Detect by file extension" @@ -494,8 +493,7 @@ msgid "Filename already exists!" msgstr "Der Dateiname existiert bereits!" -#: ../src/dialogs.c:584 -#: ../src/dialogs.c:710 +#: ../src/dialogs.c:584 ../src/dialogs.c:710 msgid "Save File" msgstr "Datei speichern" @@ -512,28 +510,27 @@ msgstr "_Datei in einem neuen Reiter öffnen" #: ../src/dialogs.c:605 -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:728 -#: ../src/win32.c:679 +#: ../src/dialogs.c:728 ../src/win32.c:679 msgid "Error" msgstr "Fehler" -#: ../src/dialogs.c:731 -#: ../src/dialogs.c:1614 -#: ../src/win32.c:685 +#: ../src/dialogs.c:731 ../src/dialogs.c:1609 ../src/win32.c:685 #: ../src/win32.c:744 msgid "Question" msgstr "Frage" -#: ../src/dialogs.c:734 -#: ../src/win32.c:691 +#: ../src/dialogs.c:734 ../src/win32.c:691 msgid "Warning" msgstr "Warnung" -#: ../src/dialogs.c:737 -#: ../src/win32.c:697 +#: ../src/dialogs.c:737 ../src/win32.c:697 msgid "Information" msgstr "Information" @@ -550,106 +547,102 @@ msgid "Do you want to save it before closing?" msgstr "Möchten Sie vor dem Schließen speichern?" -#: ../src/dialogs.c:926 +#: ../src/dialogs.c:923 msgid "Choose font" msgstr "Schriftart auswählen" -#: ../src/dialogs.c:1226 -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:1221 +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:1245 -#: ../src/dialogs.c:1246 -#: ../src/dialogs.c:1247 -#: ../src/dialogs.c:1253 -#: ../src/dialogs.c:1254 -#: ../src/dialogs.c:1255 -#: ../src/symbols.c:1992 -#: ../src/symbols.c:2013 -#: ../src/symbols.c:2065 +#: ../src/dialogs.c:1240 ../src/dialogs.c:1241 ../src/dialogs.c:1242 +#: ../src/dialogs.c:1248 ../src/dialogs.c:1249 ../src/dialogs.c:1250 +#: ../src/symbols.c:1991 ../src/symbols.c:2012 ../src/symbols.c:2064 #: ../src/ui_utils.c:244 msgid "unknown" msgstr "unbekannt" -#: ../src/dialogs.c:1260 -#: ../src/symbols.c:887 +#: ../src/dialogs.c:1255 ../src/symbols.c:887 msgid "Properties" msgstr "Eigenschaften" -#: ../src/dialogs.c:1291 +#: ../src/dialogs.c:1286 msgid "<b>Type:</b>" msgstr "<b>Dateityp:</b>" -#: ../src/dialogs.c:1305 +#: ../src/dialogs.c:1300 msgid "<b>Size:</b>" msgstr "<b>Größe:</b>" -#: ../src/dialogs.c:1321 +#: ../src/dialogs.c:1316 msgid "<b>Location:</b>" msgstr "<b>Ort:</b>" -#: ../src/dialogs.c:1335 +#: ../src/dialogs.c:1330 msgid "<b>Read-only:</b>" msgstr "<b>Schreibgeschützt:</b>" -#: ../src/dialogs.c:1342 +#: ../src/dialogs.c:1337 msgid "(only inside Geany)" msgstr "(nur innerhalb von Geany)" -#: ../src/dialogs.c:1351 +#: ../src/dialogs.c:1346 msgid "<b>Encoding:</b>" msgstr "<b>Kodierung:</b>" -#: ../src/dialogs.c:1361 -#: ../src/ui_utils.c:248 +#: ../src/dialogs.c:1356 ../src/ui_utils.c:248 msgid "(with BOM)" msgstr "(mit BOM)" -#: ../src/dialogs.c:1361 +#: ../src/dialogs.c:1356 msgid "(without BOM)" msgstr "(ohne BOM)" -#: ../src/dialogs.c:1372 +#: ../src/dialogs.c:1367 msgid "<b>Modified:</b>" msgstr "<b>Modifiziert:</b>" -#: ../src/dialogs.c:1386 +#: ../src/dialogs.c:1381 msgid "<b>Changed:</b>" msgstr "<b>Geändert:</b>" -#: ../src/dialogs.c:1400 +#: ../src/dialogs.c:1395 msgid "<b>Accessed:</b>" msgstr "<b>Zugriff:</b>" -#: ../src/dialogs.c:1422 +#: ../src/dialogs.c:1417 msgid "<b>Permissions:</b>" msgstr "<b>Zugriffsrechte:</b>" #. Header -#: ../src/dialogs.c:1430 +#: ../src/dialogs.c:1425 msgid "Read:" msgstr "Lesen:" -#: ../src/dialogs.c:1437 +#: ../src/dialogs.c:1432 msgid "Write:" msgstr "Schreiben:" -#: ../src/dialogs.c:1444 +#: ../src/dialogs.c:1439 msgid "Execute:" msgstr "Ausführen:" #. Owner -#: ../src/dialogs.c:1452 +#: ../src/dialogs.c:1447 msgid "Owner:" msgstr "Eigentümer:" #. Group -#: ../src/dialogs.c:1488 +#: ../src/dialogs.c:1483 msgid "Group:" msgstr "Gruppe:" #. Other -#: ../src/dialogs.c:1524 +#: ../src/dialogs.c:1519 msgid "Other:" msgstr "Andere:" @@ -663,8 +656,7 @@ msgid "New file \"%s\" opened." msgstr "Neue Datei »%s« geöffnet." -#: ../src/document.c:840 -#: ../src/document.c:1362 +#: ../src/document.c:840 ../src/document.c:1362 #, c-format msgid "Could not open file %s (%s)" msgstr "Konnte Datei »%s« nicht öffnen (%s)." @@ -676,44 +668,51 @@ #: ../src/document.c:866 #, 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:876 #, 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." -#: ../src/document.c:1082 +#: ../src/document.c:1078 msgid "Spaces" msgstr "Leerzeichen" -#: ../src/document.c:1085 +#: ../src/document.c:1081 msgid "Tabs" msgstr "Tabulatoren" -#: ../src/document.c:1088 +#: ../src/document.c:1084 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:1093 +#: ../src/document.c:1089 #, c-format msgid "Setting %s indentation mode for %s." msgstr "Setze Einrückungsmodus %s für »%s«." -#: ../src/document.c:1103 +#: ../src/document.c:1100 #, c-format msgid "Setting indentation width to %d for %s." msgstr "Setze Einrückungsbreite auf %d für »%s«." -#: ../src/document.c:1137 -#: ../src/document.c:1737 +#: ../src/document.c:1137 ../src/document.c:1737 msgid "Invalid filename" msgstr "Ungültiger Dateiname" @@ -740,8 +739,12 @@ #: ../src/document.c:1543 #, 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 <i>nicht</i> 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 <i>nicht</i> gespeichert." #: ../src/document.c:1565 #, c-format @@ -760,20 +763,22 @@ #: ../src/document.c:1630 #, c-format msgid "Failed to open file '%s' for writing: fopen() failed: %s" -msgstr "Konnte Datei »%s« nicht zum Schreiben öffnen: fopen() fehlgeschlagen: %s" +msgstr "" +"Konnte Datei »%s« nicht zum Schreiben öffnen: fopen() fehlgeschlagen: %s" #: ../src/document.c:1648 #, c-format msgid "Failed to write file '%s': fwrite() failed: %s" -msgstr "Konnte Datei »%s« nicht zum Schreiben öffnen: fwrite() fehlgeschlagen: %s" +msgstr "" +"Konnte Datei »%s« nicht zum Schreiben öffnen: fwrite() fehlgeschlagen: %s" #: ../src/document.c:1662 #, c-format msgid "Failed to close file '%s': fclose() failed: %s" -msgstr "Konnte Datei »%s« nicht zum Schreiben öffnen: fclose() fehlgeschlagen: %s" +msgstr "" +"Konnte Datei »%s« nicht zum Schreiben öffnen: fclose() fehlgeschlagen: %s" -#: ../src/document.c:1737 -#: ../src/document.c:1802 +#: ../src/document.c:1737 ../src/document.c:1802 #, c-format msgid "Error saving file (%s)." msgstr "Fehler beim Speichern der Datei (%s)." @@ -798,9 +803,7 @@ msgid "File %s saved." msgstr "Datei »%s« wurde gespeichert." -#: ../src/document.c:1910 -#: ../src/document.c:1974 -#: ../src/document.c:1982 +#: ../src/document.c:1910 ../src/document.c:1974 ../src/document.c:1982 #, c-format msgid "\"%s\" was not found." msgstr "»%s« wurde nicht gefunden." @@ -809,11 +812,8 @@ msgid "Wrap search and find again?" msgstr "Suche vom Dokumentanfang bzw. -ende neu beginnen?" -#: ../src/document.c:2068 -#: ../src/search.c:1281 -#: ../src/search.c:1325 -#: ../src/search.c:2063 -#: ../src/search.c:2064 +#: ../src/document.c:2068 ../src/search.c:1281 ../src/search.c:1325 +#: ../src/search.c:2063 ../src/search.c:2064 #, c-format msgid "No matches found for \"%s\"." msgstr "Keine Treffer für »%s« gefunden." @@ -825,39 +825,43 @@ msgstr[0] "%s: %d mal wurde »%s« mit »%s« ersetzt." msgstr[1] "%s: %d mal wurde »%s« mit »%s« ersetzt." -#: ../src/document.c:2921 +#: ../src/document.c:2926 msgid "Do you want to reload it?" msgstr "Möchten Sie die Datei neu laden?" -#: ../src/document.c:2922 +#: ../src/document.c:2927 #, 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:2940 +#: ../src/document.c:2945 msgid "Close _without saving" msgstr "Schließen _ohne Speichern" -#: ../src/document.c:2943 +#: ../src/document.c:2948 msgid "Try to resave the file?" msgstr "Versuchen die Datei erneut zu speichern?" -#: ../src/document.c:2944 +#: ../src/document.c:2949 #, c-format msgid "File \"%s\" was not found on disk!" msgstr "»%s« wurde nicht auf dem Datenträger gefunden." -#: ../src/editor.c:4343 +#: ../src/editor.c:4341 msgid "Enter Tab Width" msgstr "Tabulatorbreite:" -#: ../src/editor.c:4344 +#: ../src/editor.c:4342 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/editor.c:4490 +#: ../src/editor.c:4494 #, c-format msgid "Warning: non-standard hard tab width: %d != 8!" msgstr "Achtung: Keine gewöhnliche harte Tabulatorbreite:: %d != 8!" @@ -866,8 +870,7 @@ msgid "Celtic" msgstr "Keltisch" -#: ../src/encodings.c:76 -#: ../src/encodings.c:77 +#: ../src/encodings.c:76 ../src/encodings.c:77 msgid "Greek" msgstr "Griechisch" @@ -879,31 +882,22 @@ msgid "South European" msgstr "Südeuropäisch" -#: ../src/encodings.c:80 -#: ../src/encodings.c:81 -#: ../src/encodings.c:82 +#: ../src/encodings.c:80 ../src/encodings.c:81 ../src/encodings.c:82 #: ../src/encodings.c:83 msgid "Western" msgstr "Westlich" -#: ../src/encodings.c:85 -#: ../src/encodings.c:86 -#: ../src/encodings.c:87 +#: ../src/encodings.c:85 ../src/encodings.c:86 ../src/encodings.c:87 msgid "Baltic" msgstr "Baltisch" -#: ../src/encodings.c:88 -#: ../src/encodings.c:89 -#: ../src/encodings.c:90 +#: ../src/encodings.c:88 ../src/encodings.c:89 ../src/encodings.c:90 msgid "Central European" msgstr "Mitteleuropäisch" #. ISO-IR-111 not available on Windows -#: ../src/encodings.c:91 -#: ../src/encodings.c:92 -#: ../src/encodings.c:94 -#: ../src/encodings.c:95 -#: ../src/encodings.c:96 +#: ../src/encodings.c:91 ../src/encodings.c:92 ../src/encodings.c:94 +#: ../src/encodings.c:95 ../src/encodings.c:96 msgid "Cyrillic" msgstr "Kyrillisch" @@ -919,16 +913,12 @@ msgid "Romanian" msgstr "Rumänisch" -#: ../src/encodings.c:101 -#: ../src/encodings.c:102 -#: ../src/encodings.c:103 +#: ../src/encodings.c:101 ../src/encodings.c:102 ../src/encodings.c:103 msgid "Arabic" msgstr "Arabisch" #. not available at all, ? -#: ../src/encodings.c:104 -#: ../src/encodings.c:106 -#: ../src/encodings.c:107 +#: ../src/encodings.c:104 ../src/encodings.c:106 ../src/encodings.c:107 msgid "Hebrew" msgstr "Hebräisch" @@ -948,42 +938,30 @@ msgid "Thai" msgstr "Thai" -#: ../src/encodings.c:113 -#: ../src/encodings.c:114 -#: ../src/encodings.c:115 +#: ../src/encodings.c:113 ../src/encodings.c:114 ../src/encodings.c:115 msgid "Turkish" msgstr "Türkisch" -#: ../src/encodings.c:116 -#: ../src/encodings.c:117 -#: ../src/encodings.c:118 +#: ../src/encodings.c:116 ../src/encodings.c:117 ../src/encodings.c:118 msgid "Vietnamese" msgstr "Vietnamesisch" #. maybe not available on Linux -#: ../src/encodings.c:129 -#: ../src/encodings.c:130 -#: ../src/encodings.c:131 +#: ../src/encodings.c:129 ../src/encodings.c:130 ../src/encodings.c:131 #: ../src/encodings.c:133 msgid "Chinese Simplified" msgstr "Chinesisch, vereinfacht" -#: ../src/encodings.c:134 -#: ../src/encodings.c:135 -#: ../src/encodings.c:136 +#: ../src/encodings.c:134 ../src/encodings.c:135 ../src/encodings.c:136 msgid "Chinese Traditional" msgstr "Chinesisch, traditionell" -#: ../src/encodings.c:137 -#: ../src/encodings.c:138 -#: ../src/encodings.c:139 +#: ../src/encodings.c:137 ../src/encodings.c:138 ../src/encodings.c:139 #: ../src/encodings.c:140 msgid "Japanese" msgstr "Japanisch" -#: ../src/encodings.c:141 -#: ../src/encodings.c:142 -#: ../src/encodings.c:143 +#: ../src/encodings.c:141 ../src/encodings.c:142 ../src/encodings.c:143 #: ../src/encodings.c:144 msgid "Korean" msgstr "Koreanisch" @@ -1016,11 +994,8 @@ msgid "_Unicode" msgstr "_Unicode" -#: ../src/filetypes.c:84 -#: ../src/filetypes.c:166 -#: ../src/filetypes.c:180 -#: ../src/filetypes.c:188 -#: ../src/filetypes.c:202 +#: ../src/filetypes.c:84 ../src/filetypes.c:166 ../src/filetypes.c:180 +#: ../src/filetypes.c:188 ../src/filetypes.c:202 #, c-format msgid "%s source file" msgstr "%s Quelldatei" @@ -1030,10 +1005,8 @@ msgid "%s file" msgstr "%s Quelldatei" -#: ../src/filetypes.c:103 -#: ../src/filetypes.c:1744 -#: ../src/interface.c:3886 -#: ../src/interface.c:5604 +#: ../src/filetypes.c:103 ../src/filetypes.c:1748 ../src/interface.c:3918 +#: ../src/interface.c:5636 msgid "None" msgstr "Keiner" @@ -1061,37 +1034,33 @@ msgid "Gettext translation file" msgstr "Gettext-Übersetzungsdatei" -#: ../src/filetypes.c:707 +#: ../src/filetypes.c:709 msgid "_Programming Languages" msgstr "_Kompilersprachen" -#: ../src/filetypes.c:708 +#: ../src/filetypes.c:710 msgid "_Scripting Languages" msgstr "_Interpretersprachen" -#: ../src/filetypes.c:709 +#: ../src/filetypes.c:711 msgid "_Markup Languages" msgstr "_Markup-Sprachen" -#: ../src/filetypes.c:710 +#: ../src/filetypes.c:712 msgid "M_iscellaneous" msgstr "_Sonstiges" -#: ../src/filetypes.c:1423 -#: ../src/win32.c:105 +#: ../src/filetypes.c:1427 ../src/win32.c:105 msgid "All Source" msgstr "Alle Quellen" #. create meta file filter "All files" -#: ../src/filetypes.c:1448 -#: ../src/project.c:294 -#: ../src/win32.c:95 -#: ../src/win32.c:143 -#: ../src/win32.c:145 +#: ../src/filetypes.c:1452 ../src/project.c:294 ../src/win32.c:95 +#: ../src/win32.c:143 ../src/win32.c:145 msgid "All files" msgstr "Alle Dateien" -#: ../src/filetypes.c:1506 +#: ../src/filetypes.c:1510 #, c-format msgid "Bad regex for filetype %s: %s" msgstr "Schlechter RegEx für Dateityp %s: %s" @@ -1100,9 +1069,7 @@ msgid "untitled" msgstr "unbenannt" -#: ../src/highlighting.c:3623 -#: ../src/main.c:805 -#: ../src/socket.c:165 +#: ../src/highlighting.c:3623 ../src/main.c:808 ../src/socket.c:165 #: ../src/templates.c:226 #, c-format msgid "Could not find file '%s'." @@ -1116,757 +1083,767 @@ msgid "_Color Schemes" msgstr "_Farbschemata" -#: ../src/interface.c:324 +#: ../src/interface.c:328 msgid "_File" msgstr "_Datei" -#: ../src/interface.c:335 +#: ../src/interface.c:339 msgid "New (with _Template)" msgstr "Neu (aus _Vorlage)" -#: ../src/interface.c:352 -#: ../src/interface.c:2346 +#: ../src/interface.c:356 ../src/interface.c:2378 msgid "Open Selected F_ile" msgstr "_Markierte Datei öffnen" -#: ../src/interface.c:356 +#: ../src/interface.c:360 msgid "Recent _Files" msgstr "_Zuletzt geöffnet" -#: ../src/interface.c:373 +#: ../src/interface.c:377 msgid "Save A_ll" msgstr "A_lle speichern" -#: ../src/interface.c:389 +#: ../src/interface.c:393 msgid "R_eload As" msgstr "N_eu laden als" -#: ../src/interface.c:400 -#: ../src/interface.c:635 -#: ../src/interface.c:694 -#: ../src/interface.c:708 -#: ../src/interface.c:1088 -#: ../src/interface.c:1098 -#: ../src/interface.c:2311 -#: ../src/interface.c:2325 +#: ../src/interface.c:404 ../src/interface.c:639 ../src/interface.c:698 +#: ../src/interface.c:712 ../src/interface.c:1110 ../src/interface.c:1120 +#: ../src/interface.c:2343 ../src/interface.c:2357 msgid "invisible" msgstr "unsichtbar" -#: ../src/interface.c:417 +#: ../src/interface.c:421 msgid "Page Set_up" msgstr "Seiteneigensc_haften" -#: ../src/interface.c:434 -#: ../src/notebook.c:246 +#: ../src/interface.c:438 ../src/notebook.c:246 msgid "Close Ot_her Documents" msgstr "_Inaktive Dateien schließen" -#: ../src/interface.c:442 -#: ../src/notebook.c:251 +#: ../src/interface.c:446 ../src/notebook.c:251 msgid "C_lose All" msgstr "_Alle schließen" -#: ../src/interface.c:459 -#: ../src/interface.c:2241 +#: ../src/interface.c:463 ../src/interface.c:2273 msgid "_Edit" msgstr "_Bearbeiten" -#: ../src/interface.c:509 +#: ../src/interface.c:513 msgid "_Commands" msgstr "_Kommandos" -#: ../src/interface.c:516 -#: ../src/keybindings.c:311 +#: ../src/interface.c:520 ../src/keybindings.c:311 msgid "_Cut Current Line(s)" msgstr "Aktuelle Zeile(n) _ausschneiden" -#: ../src/interface.c:524 -#: ../src/keybindings.c:308 +#: ../src/interface.c:528 ../src/keybindings.c:308 msgid "_Copy Current Line(s)" msgstr "Aktuelle Zeile(n) _kopieren" -#: ../src/interface.c:532 -#: ../src/keybindings.c:263 +#: ../src/interface.c:536 ../src/keybindings.c:263 msgid "_Delete Current Line(s)" msgstr "Aktuelle Zeile(n) _löschen" -#: ../src/interface.c:536 -#: ../src/keybindings.c:260 +#: ../src/interface.c:540 ../src/keybindings.c:260 msgid "_Duplicate Line or Selection" msgstr "_Zeile oder Auswahl duplizieren" -#: ../src/interface.c:545 -#: ../src/keybindings.c:321 +#: ../src/interface.c:549 ../src/keybindings.c:321 msgid "_Select Current Line(s)" msgstr "Aktuelle Zeile(n) a_uswählen" -#: ../src/interface.c:549 -#: ../src/keybindings.c:324 +#: ../src/interface.c:553 ../src/keybindings.c:324 msgid "_Select Current Paragraph" msgstr "Aktuellen Absatz au_swählen" -#: ../src/interface.c:558 -#: ../src/keybindings.c:363 +#: ../src/interface.c:562 ../src/keybindings.c:363 msgid "_Send Selection to Terminal" msgstr "_Auswahl an Terminal senden" -#: ../src/interface.c:562 -#: ../src/interface.c:2245 +#: ../src/interface.c:566 ../src/interface.c:2277 msgid "_Format" msgstr "_Format" -#: ../src/interface.c:569 -#: ../src/keybindings.c:365 +#: ../src/interface.c:573 ../src/keybindings.c:365 msgid "_Reflow Lines/Block" msgstr "_Neuformatieren der Zeile/des Abschnitts" -#: ../src/interface.c:573 -#: ../src/keybindings.c:335 +#: ../src/interface.c:577 ../src/keybindings.c:335 msgid "T_oggle Case of Selection" msgstr "_Groß- und Kleinschreibung für die Auswahl tauschen" -#: ../src/interface.c:577 -#: ../src/keybindings.c:270 +#: ../src/interface.c:581 ../src/keybindings.c:270 msgid "_Transpose Current Line" msgstr "Aktuelle Zeile _tauschen" -#: ../src/interface.c:586 +#: ../src/interface.c:590 msgid "_Comment Line(s)" msgstr "Zeile(n) _auskommentieren" -#: ../src/interface.c:590 +#: ../src/interface.c:594 msgid "U_ncomment Line(s)" msgstr "Zeile(n) _einkommentieren" -#: ../src/interface.c:594 +#: ../src/interface.c:598 msgid "_Toggle Line Commentation" msgstr "Kommentierung _umschalten" -#: ../src/interface.c:603 +#: ../src/interface.c:607 msgid "_Increase Indent" msgstr "Einzug _erhöhen" -#: ../src/interface.c:611 +#: ../src/interface.c:615 msgid "_Decrease Indent" msgstr "Einzug _verringern" -#: ../src/interface.c:619 -#: ../src/keybindings.c:354 +#: ../src/interface.c:623 ../src/keybindings.c:354 msgid "_Smart Line Indent" msgstr "Intelligentes _Einrücken" -#: ../src/interface.c:628 +#: ../src/interface.c:632 msgid "_Send Selection to" msgstr "_Auswahl senden an" -#: ../src/interface.c:643 +#: ../src/interface.c:647 msgid "I_nsert Comments" msgstr "K_ommentare einfügen" -#: ../src/interface.c:654 -#: ../src/interface.c:2260 +#: ../src/interface.c:658 ../src/interface.c:2292 msgid "Insert _ChangeLog Entry" msgstr "_ChangeLog-Eintrag hinzufügen" -#: ../src/interface.c:658 -#: ../src/interface.c:2264 +#: ../src/interface.c:662 ../src/interface.c:2296 msgid "Insert _Function Description" msgstr "_Funktionsbeschreibung einfügen" -#: ../src/interface.c:662 -#: ../src/interface.c:2268 +#: ../src/interface.c:666 ../src/interface.c:2300 msgid "Insert _Multiline Comment" msgstr "_Mehrzeiligen Kommentar einfügen" -#: ../src/interface.c:671 -#: ../src/interface.c:2283 +#: ../src/interface.c:675 ../src/interface.c:2315 msgid "Insert File _Header" msgstr "_Dateikopf einfügen" -#: ../src/interface.c:675 -#: ../src/interface.c:2287 +#: ../src/interface.c:679 ../src/interface.c:2319 msgid "Insert _GPL Notice" msgstr "_GPL-Hinweis einfügen" -#: ../src/interface.c:679 -#: ../src/interface.c:2291 +#: ../src/interface.c:683 ../src/interface.c:2323 msgid "Insert _BSD License Notice" msgstr "_BSD-Lizenz-Hinweis einfügen" -#: ../src/interface.c:683 -#: ../src/interface.c:2300 +#: ../src/interface.c:687 ../src/interface.c:2332 msgid "Insert Dat_e" msgstr "_Datum einfügen" -#: ../src/interface.c:697 -#: ../src/interface.c:2314 +#: ../src/interface.c:701 ../src/interface.c:2346 msgid "_Insert \"include <...>\"" msgstr "\"include <...>\" ei_nfügen" -#: ../src/interface.c:711 -#: ../src/interface.c:2333 -#: ../src/keybindings.c:374 +#: ../src/interface.c:715 ../src/interface.c:2365 ../src/keybindings.c:374 msgid "_Insert Alternative White Space" msgstr "Alternatives _Leerzeichen einfügen" -#: ../src/interface.c:720 +#: ../src/interface.c:724 msgid "Preference_s" msgstr "E_instellungen" -#: ../src/interface.c:728 -#: ../src/keybindings.c:387 +#: ../src/interface.c:732 ../src/keybindings.c:387 msgid "P_lugin Preferences" msgstr "Plugin-_Einstellungen" -#: ../src/interface.c:736 -#: ../src/interface.c:2337 +#: ../src/interface.c:740 ../src/interface.c:2369 msgid "_Search" msgstr "_Suchen" -#: ../src/interface.c:747 +#: ../src/interface.c:751 msgid "Find _Next" msgstr "_Nächstes" -#: ../src/interface.c:751 +#: ../src/interface.c:755 msgid "Find _Previous" msgstr "_Vorheriges" -#: ../src/interface.c:760 +#: ../src/interface.c:764 msgid "Find in F_iles" msgstr "In _Dateien suchen" -#: ../src/interface.c:768 -#: ../src/search.c:632 +#: ../src/interface.c:772 ../src/search.c:632 msgid "_Replace" msgstr "_Ersetzen" -#: ../src/interface.c:781 +#: ../src/interface.c:785 msgid "Next _Message" msgstr "Nä_chste Nachricht" -#: ../src/interface.c:789 +#: ../src/interface.c:793 msgid "Pr_evious Message" msgstr "V_orherige Nachricht" -#: ../src/interface.c:802 -#: ../src/keybindings.c:434 +#: ../src/interface.c:806 ../src/keybindings.c:434 msgid "_Go to Next Marker" msgstr "Zur _nächsten Markierung springen" -#: ../src/interface.c:806 -#: ../src/keybindings.c:437 +#: ../src/interface.c:810 ../src/keybindings.c:437 msgid "_Go to Previous Marker" msgstr "Zur _vorherigen Markierung springen" -#: ../src/interface.c:815 +#: ../src/interface.c:819 msgid "_Go to Line" msgstr "_Gehe zu Zeile" -#: ../src/interface.c:823 -#: ../src/interface.c:2272 +#: ../src/interface.c:827 ../src/interface.c:2304 msgid "_More" msgstr "_Weitere" -#: ../src/interface.c:830 -#: ../src/keybindings.c:399 +#: ../src/interface.c:834 ../src/keybindings.c:399 msgid "Find Next _Selection" msgstr "Auswahl _vorwärts im Dokument finden " -#: ../src/interface.c:834 -#: ../src/keybindings.c:401 +#: ../src/interface.c:838 ../src/keybindings.c:401 msgid "Find Pre_vious Selection" msgstr "Auswahl _rückwärts im Dokument finden" -#: ../src/interface.c:843 -#: ../src/interface.c:2354 +#: ../src/interface.c:847 ../src/interface.c:2386 msgid "Find _Usage" msgstr "_Auftreten finden" -#: ../src/interface.c:847 -#: ../src/interface.c:2362 +#: ../src/interface.c:851 ../src/interface.c:2394 msgid "Find _Document Usage" msgstr "_Auftreten im Dokument finden" -#: ../src/interface.c:856 -#: ../src/keybindings.c:416 +#: ../src/interface.c:860 ../src/keybindings.c:416 msgid "_Mark All" msgstr "_Alles markieren" -#: ../src/interface.c:865 -#: ../src/interface.c:2370 +#: ../src/interface.c:869 ../src/interface.c:2402 msgid "Go to _Tag Definition" msgstr "Gehe zur _Tagdefinition" -#: ../src/interface.c:869 +#: ../src/interface.c:873 msgid "Go to T_ag Declaration" msgstr "Gehe zur T_agdeklaration" -#: ../src/interface.c:880 +#: ../src/interface.c:884 msgid "Change _Font" msgstr "_Schriftart ändern" -#: ../src/interface.c:893 +#: ../src/interface.c:897 msgid "To_ggle All Additional Widgets" msgstr "Zusätzliche _Infofenster ein-/ausblenden" -#: ../src/interface.c:897 +#: ../src/interface.c:901 msgid "Full_screen" msgstr "_Vollbild" -#: ../src/interface.c:901 +#: ../src/interface.c:905 msgid "Show Message _Window" msgstr "_Meldungsfenster anzeigen" -#: ../src/interface.c:906 +#: ../src/interface.c:910 msgid "Show _Toolbar" msgstr "W_erkzeugleiste anzeigen" -#: ../src/interface.c:911 +#: ../src/interface.c:915 msgid "Show Side_bar" msgstr "Seiten_leiste anzeigen" -#: ../src/interface.c:916 -#: ../src/interface.c:4322 -#: ../src/interface.c:5734 -#: ../src/keybindings.c:253 -#: ../src/prefs.c:1571 +#: ../src/interface.c:920 ../src/interface.c:4354 ../src/interface.c:5766 +#: ../src/keybindings.c:253 ../src/prefs.c:1571 msgid "Editor" msgstr "Editor" -#: ../src/interface.c:923 +#: ../src/interface.c:927 msgid "Show _Markers Margin" msgstr "M_arkierungsrand anzeigen" -#: ../src/interface.c:928 +#: ../src/interface.c:932 msgid "Show _Line Numbers" msgstr "_Zeilennummern anzeigen" -#: ../src/interface.c:933 +#: ../src/interface.c:937 msgid "Show _White Space" msgstr "_Leerzeichen anzeigen" -#: ../src/interface.c:937 +#: ../src/interface.c:941 msgid "Show Line _Endings" msgstr "Zeile_nenden anzeigen" -#: ../src/interface.c:941 +#: ../src/interface.c:945 msgid "Show _Indentation Guides" msgstr "Zeige _Einrückungshinweise" -#: ../src/interface.c:962 +#: ../src/interface.c:966 msgid "_Document" msgstr "D_okument" -#: ../src/interface.c:969 +#: ../src/interface.c:973 msgid "_Line Wrapping" msgstr "_Visueller Zeilenumbruch" -#: ../src/interface.c:974 +#: ../src/interface.c:978 msgid "Line _Breaking" msgstr "Automatischer Zeilen_umbruch" -#: ../src/interface.c:978 +#: ../src/interface.c:982 msgid "_Auto-indentation" msgstr "_Automatische Einrückung benutzen" -#: ../src/interface.c:983 +#: ../src/interface.c:987 msgid "In_dent Type" msgstr "Art der _Einrückung" -#: ../src/interface.c:990 -#: ../src/interface.c:3916 -#: ../src/interface.c:5634 +#: ../src/interface.c:994 ../src/interface.c:1028 +msgid "_Detect from Content" +msgstr "Aus Inhalt lesen" + +#: ../src/interface.c:1003 ../src/interface.c:3948 ../src/interface.c:5666 msgid "_Tabs" msgstr "_Tabulatoren" -#: ../src/interface.c:996 -#: ../src/interface.c:3907 -#: ../src/interface.c:5625 +#: ../src/interface.c:1009 ../src/interface.c:3939 ../src/interface.c:5657 msgid "_Spaces" msgstr "_Leerzeichen" -#: ../src/interface.c:1002 +#: ../src/interface.c:1015 msgid "T_abs and Spaces" msgstr "Tabulatoren _und Leerzeichen" -#: ../src/interface.c:1008 +#: ../src/interface.c:1021 msgid "Indent Widt_h" msgstr "Einzugsbreite" -#: ../src/interface.c:1015 +#: ../src/interface.c:1037 msgid "_1" msgstr "_1" -#: ../src/interface.c:1021 +#: ../src/interface.c:1043 msgid "_2" msgstr "_2" -#: ../src/interface.c:1027 +#: ../src/interface.c:1049 msgid "_3" msgstr "_3" -#: ../src/interface.c:1033 +#: ../src/interface.c:1055 msgid "_4" msgstr "_4" -#: ../src/interface.c:1039 +#: ../src/interface.c:1061 msgid "_5" msgstr "_5" -#: ../src/interface.c:1045 +#: ../src/interface.c:1067 msgid "_6" msgstr "_6" -#: ../src/interface.c:1051 +#: ../src/interface.c:1073 msgid "_7" msgstr "_7" -#: ../src/interface.c:1057 +#: ../src/interface.c:1079 msgid "_8" msgstr "_8" -#: ../src/interface.c:1068 +#: ../src/interface.c:1090 msgid "Read _Only" msgstr "_Nur Lesen" -#: ../src/interface.c:1072 +#: ../src/interface.c:1094 msgid "_Write Unicode BOM" msgstr "_Unicode BOM schreiben" -#: ../src/interface.c:1081 +#: ../src/interface.c:1103 msgid "Set File_type" msgstr "Datei_typ festlegen" -#: ../src/interface.c:1091 +#: ../src/interface.c:1113 msgid "Set _Encoding" msgstr "Ze_ichenkodierung festlegen" -#: ../src/interface.c:1101 +#: ../src/interface.c:1123 msgid "Set Line E_ndings" msgstr "Zeilenen_den festlegen" -#: ../src/interface.c:1108 +#: ../src/interface.c:1130 msgid "Convert and Set to _CR/LF (Win)" msgstr "Auf _CR/LF setzen und umwandeln (Win)" -#: ../src/interface.c:1114 +#: ../src/interface.c:1136 msgid "Convert and Set to _LF (Unix)" msgstr "Auf _LF setzen und umwandeln (Unix)" -#: ../src/interface.c:1120 +#: ../src/interface.c:1142 msgid "Convert and Set to CR (_Mac)" msgstr "Auf CR setzen und umwandeln (_Mac)" -#: ../src/interface.c:1131 +#: ../src/interface.c:1153 msgid "_Strip Trailing Spaces" msgstr "Lee_rzeichen am Zeilenende entfernen" -#: ../src/interface.c:1135 +#: ../src/interface.c:1157 msgid "_Replace Tabs by Spaces" msgstr "Tabulat_oren durch Leerzeichen ersetzen" -#: ../src/interface.c:1139 +#: ../src/interface.c:1161 msgid "Replace Spaces b_y Tabs" msgstr "_Leerzeichen durch Tabulatoren ersetzen" -#: ../src/interface.c:1148 +#: ../src/interface.c:1170 msgid "_Fold All" msgstr "A_lle einklappen" -#: ../src/interface.c:1152 +#: ../src/interface.c:1174 msgid "_Unfold All" msgstr "_Alle ausklappen" -#: ../src/interface.c:1161 +#: ../src/interface.c:1183 msgid "Remove _Markers" msgstr "Alle _Markierungen entfernen" -#: ../src/interface.c:1165 +#: ../src/interface.c:1187 msgid "Remove Error _Indicators" msgstr "Alle _Fehlermarkierungen entfernen" -#: ../src/interface.c:1169 +#: ../src/interface.c:1191 msgid "_Project" msgstr "_Projekt" -#: ../src/interface.c:1176 +#: ../src/interface.c:1198 msgid "_New" msgstr "_Neu" -#: ../src/interface.c:1184 +#: ../src/interface.c:1206 msgid "_Open" msgstr "Ö_ffnen" -#: ../src/interface.c:1192 +#: ../src/interface.c:1214 msgid "_Recent Projects" msgstr "_Zuletzt geöffnete Projekte" -#: ../src/interface.c:1196 +#: ../src/interface.c:1218 msgid "_Close" msgstr "S_chließen" -#: ../src/interface.c:1209 +#: ../src/interface.c:1231 msgid "_Apply Default Indentation" msgstr "_Standardeinrückung anwenden" -#: ../src/interface.c:1212 +#: ../src/interface.c:1234 msgid "Apply the default indentation settings to all documents" msgstr "Wende die Standardeinreckü" -#: ../src/interface.c:1227 +#: ../src/interface.c:1249 msgid "_Tools" msgstr "_Werkzeuge" -#: ../src/interface.c:1234 +#: ../src/interface.c:1256 msgid "_Reload Configuration" msgstr "_Einstellungen erneut laden" -#: ../src/interface.c:1242 +#: ../src/interface.c:1264 msgid "C_onfiguration Files" msgstr "_Konfigurationsdateien" -#: ../src/interface.c:1255 +#: ../src/interface.c:1277 msgid "_Color Chooser" msgstr "_Farb-Wähler" -#: ../src/interface.c:1263 +#: ../src/interface.c:1285 msgid "_Word Count" msgstr "_Wörter zählen" -#: ../src/interface.c:1267 +#: ../src/interface.c:1289 msgid "Load Ta_gs" msgstr "_Tags laden" -#: ../src/interface.c:1271 -#: ../src/interface.c:1278 +#: ../src/interface.c:1293 ../src/interface.c:1300 msgid "_Help" msgstr "_Hilfe" -#: ../src/interface.c:1286 +#: ../src/interface.c:1308 msgid "_Website" msgstr "_Webseite" -#: ../src/interface.c:1290 +#: ../src/interface.c:1312 msgid "_Keyboard Shortcuts" msgstr "_Tastenkürzel" -#: ../src/interface.c:1294 +#: ../src/interface.c:1316 msgid "_Debug Messages" msgstr "_Debug-Meldungen" -#: ../src/interface.c:1333 -#: ../src/sidebar.c:124 +#: ../src/interface.c:1355 ../src/sidebar.c:124 msgid "Symbols" msgstr "Symbole" -#: ../src/interface.c:1347 +#: ../src/interface.c:1369 msgid "Documents" msgstr "Dokumente" -#: ../src/interface.c:1383 +#: ../src/interface.c:1405 msgid "Status" msgstr "Status" -#: ../src/interface.c:1397 +#: ../src/interface.c:1419 msgid "Compiler" msgstr "Compiler" -#: ../src/interface.c:1412 +#: ../src/interface.c:1434 msgid "Messages" msgstr "Meldungen" -#: ../src/interface.c:1425 +#: ../src/interface.c:1447 msgid "Scribble" msgstr "Notizen" -#: ../src/interface.c:2103 +#: ../src/interface.c:2135 msgid "_Toolbar Preferences" msgstr "Werkzeugleisteneinstellungen" -#: ../src/interface.c:2116 +#: ../src/interface.c:2148 msgid "_Hide Toolbar" msgstr "Werkzeugleiste _verbergen" -#: ../src/interface.c:2249 +#: ../src/interface.c:2281 msgid "I_nsert" msgstr "_Einfügen" -#: ../src/interface.c:2378 +#: ../src/interface.c:2410 msgid "Conte_xt Action" msgstr "_Kontextaktion" -#: ../src/interface.c:2920 -#: ../src/keybindings.c:384 +#: ../src/interface.c:2952 ../src/keybindings.c:384 msgid "Preferences" msgstr "Einstellungen" -#: ../src/interface.c:2956 +#: ../src/interface.c:2988 msgid "Load files from the last session" msgstr "Dateien aus der letzten Sitzung laden" -#: ../src/interface.c:2959 +#: ../src/interface.c:2991 msgid "Opens at startup the files from the last session" msgstr "Lädt die geöffneten Dateien aus der letzten Sitzung" -#: ../src/interface.c:2961 +#: ../src/interface.c:2993 msgid "Load virtual terminal support" msgstr "Die Virtual Terminal Emulation (VTE) laden" -#: ../src/interface.c:2963 -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:2995 +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:2965 +#: ../src/interface.c:2997 msgid "Enable plugin support" msgstr "Plugins aktivieren" -#: ../src/interface.c:2969 +#: ../src/interface.c:3001 msgid "<b>Startup</b>" msgstr "<b>Starten</b>" -#: ../src/interface.c:2988 +#: ../src/interface.c:3020 msgid "Save window position and geometry" msgstr "Fensterposition und -größe speichern" -#: ../src/interface.c:2991 +#: ../src/interface.c:3023 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:2993 +#: ../src/interface.c:3025 msgid "Confirm exit" msgstr "Beenden bestätigen" -#: ../src/interface.c:2996 +#: ../src/interface.c:3028 msgid "Shows a confirmation dialog on exit" msgstr "Zeigt einen Bestätigungsdialog vor dem Beenden" -#: ../src/interface.c:2998 +#: ../src/interface.c:3030 msgid "<b>Shutdown</b>" msgstr "<b>Beenden </b>" -#: ../src/interface.c:3019 +#: ../src/interface.c:3051 msgid "Startup path:" msgstr "Startpfad:" -#: ../src/interface.c:3031 -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:3063 +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:3044 +#: ../src/interface.c:3076 msgid "Project files:" msgstr "Projektdateien:" -#: ../src/interface.c:3056 +#: ../src/interface.c:3088 msgid "Path to start in when opening project files" msgstr "Pfad zum Öffnen von Projektdateien" -#: ../src/interface.c:3069 +#: ../src/interface.c:3101 msgid "Extra plugin path:" msgstr "Zusätzlicher Pluginpfad" -#: ../src/interface.c:3081 -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:3113 +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:3094 +#: ../src/interface.c:3126 msgid "<b>Paths</b>" msgstr "<b>Pfade</b>" -#: ../src/interface.c:3099 +#: ../src/interface.c:3131 msgid "Startup" msgstr "Starten & Beenden" -#: ../src/interface.c:3122 +#: ../src/interface.c:3154 msgid "Beep on errors or when compilation has finished" msgstr "Bei Fehlern oder beendeter Kompilierung Piepton ausgeben" -#: ../src/interface.c:3125 -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:3157 +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:3127 +#: ../src/interface.c:3159 msgid "Switch to status message list at new message" msgstr "Bei neuen Meldungen zu den Statusmeldungen wechseln" -#: ../src/interface.c:3130 -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:3162 +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:3132 +#: ../src/interface.c:3164 msgid "Suppress status messages in the status bar" msgstr "Meldungen in der Statuszeile unterdrücken" -#: ../src/interface.c:3135 -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:3167 +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:3137 +#: ../src/interface.c:3169 msgid "Auto-focus widgets (focus follows mouse)" msgstr "Autofokus (Der Fokus folgt der Maus)" -#: ../src/interface.c:3140 -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:3172 +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:3142 +#: ../src/interface.c:3174 msgid "Use Windows File Open/Save dialogs" msgstr "Benutze den Windows Datei öffnen/speichern Dialog" -#: ../src/interface.c:3145 -msgid "Defines whether to use the native Windows File Open/Save dialogs or whether to use the GTK default dialogs" -msgstr "Bestimmt, ob der native Windows Datei öffnen/speichern anstelle des GTK-Dialogs genutzt werden soll." +#: ../src/interface.c:3177 +msgid "" +"Defines whether to use the native Windows File Open/Save dialogs or whether " +"to use the GTK default dialogs" +msgstr "" +"Bestimmt, ob der native Windows Datei öffnen/speichern anstelle des GTK-" +"Dialogs genutzt werden soll." -#: ../src/interface.c:3147 -#: ../src/interface.c:3383 -#: ../src/interface.c:4532 +#: ../src/interface.c:3179 ../src/interface.c:3415 ../src/interface.c:4564 msgid "<b>Miscellaneous</b>" msgstr "<b>Sonstiges</b>" -#: ../src/interface.c:3166 +#: ../src/interface.c:3198 msgid "Always wrap search and hide the Find dialog" msgstr "Das vollständige Dokument durchsuchen und den Suchen-Dialog schließen" -#: ../src/interface.c:3169 -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:3201 +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:3171 +#: ../src/interface.c:3203 msgid "Use the current word under the cursor for Find dialogs" msgstr "Aktuelle Cursorposition zur Suche heranziehen" -#: ../src/interface.c:3174 -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:3206 +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:3176 +#: ../src/interface.c:3208 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:3180 +#: ../src/interface.c:3212 msgid "<b>Search</b>" msgstr "<b>Suche</b>" -#: ../src/interface.c:3199 +#: ../src/interface.c:3231 msgid "Use project-based session files" msgstr "Sitzung im Projekt speichern und wieder öffnen" -#: ../src/interface.c:3202 -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:3234 +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:3204 +#: ../src/interface.c:3236 msgid "Store project file inside the project base directory" msgstr "Projektdatei innerhalb des Projektbasisverzeichnis erstellen" -#: ../src/interface.c:3207 -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:3239 +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:3209 +#: ../src/interface.c:3241 msgid "<b>Projects</b>" msgstr "<b>Projekte</b>" -#: ../src/interface.c:3214 +#: ../src/interface.c:3246 msgid "Miscellaneous" msgstr "Sonstiges" @@ -1874,1010 +1851,1139 @@ #. * 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:3218 -#: ../src/prefs.c:1565 +#: ../src/interface.c:3250 ../src/prefs.c:1565 msgid "General" msgstr "Allgemein" -#: ../src/interface.c:3259 +#: ../src/interface.c:3291 msgid "Show symbol list" msgstr "Symbolliste anzeigen" -#: ../src/interface.c:3262 +#: ../src/interface.c:3294 msgid "Toggle the symbol list on and off" msgstr "Blendet die Symbolliste ein und aus" -#: ../src/interface.c:3264 +#: ../src/interface.c:3296 msgid "Show documents list" msgstr "Dokumentenliste anzeigen" -#: ../src/interface.c:3267 +#: ../src/interface.c:3299 msgid "Toggle the documents list on and off" msgstr "Blendet die Dokumentenliste ein und aus" -#: ../src/interface.c:3269 +#: ../src/interface.c:3301 msgid "Show sidebar" msgstr "Seitenleiste anzeigen" -#: ../src/interface.c:3277 +#: ../src/interface.c:3309 msgid "Position:" msgstr "Position:" -#: ../src/interface.c:3281 -#: ../src/interface.c:3437 -#: ../src/interface.c:3498 -#: ../src/interface.c:3516 -#: ../src/interface.c:3534 +#: ../src/interface.c:3313 ../src/interface.c:3469 ../src/interface.c:3530 +#: ../src/interface.c:3548 ../src/interface.c:3566 msgid "Left" msgstr "Links" -#: ../src/interface.c:3288 -#: ../src/interface.c:3445 -#: ../src/interface.c:3499 -#: ../src/interface.c:3517 -#: ../src/interface.c:3535 +#: ../src/interface.c:3320 ../src/interface.c:3477 ../src/interface.c:3531 +#: ../src/interface.c:3549 ../src/interface.c:3567 msgid "Right" msgstr "Rechts" -#: ../src/interface.c:3294 +#: ../src/interface.c:3326 msgid "<b>Sidebar</b>" msgstr "<b>Seitenleiste</b>" -#: ../src/interface.c:3315 +#: ../src/interface.c:3347 msgid "Symbol list:" msgstr "Symbolliste:" -#: ../src/interface.c:3322 -#: ../src/interface.c:3485 +#: ../src/interface.c:3354 ../src/interface.c:3517 msgid "Message window:" msgstr "Meldungsfenster:" -#: ../src/interface.c:3329 -#: ../src/interface.c:3521 +#: ../src/interface.c:3361 ../src/interface.c:3553 msgid "Editor:" msgstr "Editor:" -#: ../src/interface.c:3341 +#: ../src/interface.c:3373 msgid "Sets the font for the message window" msgstr "Ändert die Schriftart für das Meldungsfenster im Infobereich" -#: ../src/interface.c:3349 +#: ../src/interface.c:3381 msgid "Sets the font for the symbol list" msgstr "Legt die Schriftart für die Symbolliste fest" -#: ../src/interface.c:3357 +#: ../src/interface.c:3389 msgid "Sets the editor font" msgstr "Legt die Schriftart für das Editorfenster fest" -#: ../src/interface.c:3359 +#: ../src/interface.c:3391 msgid "<b>Fonts</b>" msgstr "<b>Schriftarten</b>" -#: ../src/interface.c:3378 +#: ../src/interface.c:3410 msgid "Show status bar" msgstr "Statusleiste anzeigen" -#: ../src/interface.c:3381 +#: ../src/interface.c:3413 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:3388 -#: ../src/interface.c:3723 -#: ../src/prefs.c:1567 +#: ../src/interface.c:3420 ../src/interface.c:3755 ../src/prefs.c:1567 msgid "Interface" msgstr "Schnittstelle" -#: ../src/interface.c:3411 +#: ../src/interface.c:3443 msgid "Show editor tabs" msgstr "Zeige Dateireiter für geöffnete Dateien" -#: ../src/interface.c:3415 +#: ../src/interface.c:3447 msgid "Show close buttons" msgstr "»Schließen«-Schaltflächen anzeigen" -#: ../src/interface.c:3418 -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:3450 +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:3424 +#: ../src/interface.c:3456 msgid "Placement of new file tabs:" msgstr "Platzierung neuer Dateireiter:" -#: ../src/interface.c:3440 +#: ../src/interface.c:3472 msgid "File tabs will be placed on the left of the notebook" msgstr "Neue Dateireiter werden links von der Dateiliste platziert" -#: ../src/interface.c:3448 +#: ../src/interface.c:3480 msgid "File tabs will be placed on the right of the notebook" msgstr "Neue Dateireiter werden rechts von der Dateiliste platziert" -#: ../src/interface.c:3452 +#: ../src/interface.c:3484 msgid "Next to current" msgstr "Reiter neben aktuellem öffnen" -#: ../src/interface.c:3457 -msgid "Whether to place file tabs next to the current tab rather than at the edges of the notebook" -msgstr "Legt fest, ob neue Reiter direkt neben dem aktuellen oder an den Enden der Liste eingefügt werden." +#: ../src/interface.c:3489 +msgid "" +"Whether to place file tabs next to the current tab rather than at the edges " +"of the notebook" +msgstr "" +"Legt fest, ob neue Reiter direkt neben dem aktuellen oder an den Enden der " +"Liste eingefügt werden." -#: ../src/interface.c:3459 +#: ../src/interface.c:3491 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:3462 +#: ../src/interface.c:3494 msgid "Calls the View->Toggle All Additional Widgets command" msgstr "Zusätzliche Infofenster ein-/ausblenden" -#: ../src/interface.c:3464 +#: ../src/interface.c:3496 msgid "<b>Editor tabs</b>" msgstr "<b>Dateireiter</b>" -#: ../src/interface.c:3500 -#: ../src/interface.c:3518 -#: ../src/interface.c:3536 +#: ../src/interface.c:3532 ../src/interface.c:3550 ../src/interface.c:3568 msgid "Top" msgstr "Oben" -#: ../src/interface.c:3501 -#: ../src/interface.c:3519 -#: ../src/interface.c:3537 +#: ../src/interface.c:3533 ../src/interface.c:3551 ../src/interface.c:3569 msgid "Bottom" msgstr "Unten" -#: ../src/interface.c:3503 +#: ../src/interface.c:3535 msgid "Sidebar:" msgstr "Seitenleiste:" -#: ../src/interface.c:3539 +#: ../src/interface.c:3571 msgid "<b>Tab positions</b>" msgstr "<b>Reiterposition</b>" -#: ../src/interface.c:3544 +#: ../src/interface.c:3576 msgid "Notebook tabs" msgstr "Notizbuchreiter" -#: ../src/interface.c:3575 +#: ../src/interface.c:3607 msgid "Show t_oolbar" msgstr "Werkzeugleiste _anzeigen" -#: ../src/interface.c:3579 +#: ../src/interface.c:3611 msgid "_Append toolbar to the menu" msgstr "_Werkzeugliste direkt an das Menü anfügen" -#: ../src/interface.c:3582 +#: ../src/interface.c:3614 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:3604 -#: ../src/toolbar.c:936 +#: ../src/interface.c:3636 ../src/toolbar.c:936 msgid "Customize Toolbar" msgstr "Werkzeugleiste anpassen" -#: ../src/interface.c:3624 +#: ../src/interface.c:3656 msgid "System _default" msgstr "S_ystemvorgabe" -#: ../src/interface.c:3632 +#: ../src/interface.c:3664 msgid "Images _and text" msgstr "Symbole _und Text" -#: ../src/interface.c:3640 +#: ../src/interface.c:3672 msgid "_Images only" msgstr "Nur _Symbole" -#: ../src/interface.c:3648 +#: ../src/interface.c:3680 msgid "_Text only" msgstr "Nur _Text" -#: ../src/interface.c:3656 +#: ../src/interface.c:3688 msgid "<b>Icon style</b>" msgstr "<b>Symbolstil</b>" -#: ../src/interface.c:3677 +#: ../src/interface.c:3709 msgid "S_ystem default" msgstr "S_ystemvorgabe" -#: ../src/interface.c:3685 +#: ../src/interface.c:3717 msgid "_Small icons" msgstr "_Kleine Symbole" -#: ../src/interface.c:3693 +#: ../src/interface.c:3725 msgid "_Very small icons" msgstr "_Sehr kleine Symbole" -#: ../src/interface.c:3701 +#: ../src/interface.c:3733 msgid "_Large icons" msgstr "_Große Symbole" -#: ../src/interface.c:3709 +#: ../src/interface.c:3741 msgid "<b>Icon size</b>" msgstr "<b>Symbolgröße</b>" -#: ../src/interface.c:3714 +#: ../src/interface.c:3746 msgid "<b>Toolbar</b>" msgstr "<b>Werkzeugleiste</b>" -#: ../src/interface.c:3719 -#: ../src/prefs.c:1569 +#: ../src/interface.c:3751 ../src/prefs.c:1569 msgid "Toolbar" msgstr "Werkzeugleiste" -#: ../src/interface.c:3750 +#: ../src/interface.c:3782 msgid "Line wrapping" msgstr "Visueller Zeilenumbruch" -#: ../src/interface.c:3753 -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:3785 +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:3755 +#: ../src/interface.c:3787 msgid "\"Smart\" home key" msgstr "»Intelligente« Pos1-Taste (Home)" -#: ../src/interface.c:3758 -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:3790 +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:3760 +#: ../src/interface.c:3792 msgid "Disable Drag and Drop" msgstr "Drag and Drop deaktivieren" -#: ../src/interface.c:3763 -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:3795 +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:3765 +#: ../src/interface.c:3797 msgid "Code folding" msgstr "Quelltext-Ausblendung" -#: ../src/interface.c:3769 +#: ../src/interface.c:3801 msgid "Fold/unfold all children of a fold point" msgstr "Alle untergeordneten Quelltextblöcke ein/ausklappen" -#: ../src/interface.c:3772 -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:3804 +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:3774 +#: ../src/interface.c:3806 msgid "Use indicators to show compile errors" msgstr "Benutzt Markierungen, um Probleme beim Kompilieren anzuzeigen" -#: ../src/interface.c:3777 -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:3809 +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:3779 +#: ../src/interface.c:3811 msgid "Newline strips trailing spaces" msgstr "Neue Zeile entfernt Leerzeichen am Zeilenende" -#: ../src/interface.c:3782 +#: ../src/interface.c:3814 msgid "Enable newline to strip the trailing spaces on the previous line" -msgstr "Legt fest ob beim Wechseln in eine neue Zeile unnötige Leerzeichen am Ende einer Zeile automatisch entfernt werden sollen" +msgstr "" +"Legt fest ob beim Wechseln in eine neue Zeile unnötige Leerzeichen am Ende " +"einer Zeile automatisch entfernt werden sollen" -#: ../src/interface.c:3788 +#: ../src/interface.c:3820 msgid "Line breaking column:" msgstr "Spalte für automatischen Zeilenumbruch:" # TODO woah, hier muss noch was anderes her :D -#: ../src/interface.c:3802 +#: ../src/interface.c:3834 msgid "Comment toggle marker:" msgstr "Kommentarumschaltzeichen:" -#: ../src/interface.c:3809 -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:3841 +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:3811 +#: ../src/interface.c:3843 msgid "<b>Features</b>" msgstr "<b>Funktionen</b>" -#: ../src/interface.c:3816 +#: ../src/interface.c:3848 msgid "Features" msgstr "Funktionen" -#: ../src/interface.c:3829 -msgid "Note: To apply these settings to all currently open documents, use <i>Project->Apply Default Indentation</i>." -msgstr "Anmerkung: Um diese Einstellungen auf alle geöffneten Dokumente anzuwenden, bitte nutzen Sie <i>Projekt->Standardeinrückung anwenden</i>." +#: ../src/interface.c:3861 +msgid "" +"Note: To apply these settings to all currently open documents, use " +"<i>Project->Apply Default Indentation</i>." +msgstr "" +"Anmerkung: Um diese Einstellungen auf alle geöffneten Dokumente anzuwenden, " +"bitte nutzen Sie <i>Projekt->Standardeinrückung anwenden</i>." -#: ../src/interface.c:3856 -#: ../src/interface.c:5574 +#: ../src/interface.c:3888 ../src/interface.c:5606 msgid "Width:" msgstr "Breite:" -#: ../src/interface.c:3869 -#: ../src/interface.c:5587 +#: ../src/interface.c:3901 ../src/interface.c:5619 msgid "The width in chars of a single indent" msgstr "Die Breite einer Einrückung in Zeichen" -#: ../src/interface.c:3874 -#: ../src/interface.c:5592 +#: ../src/interface.c:3906 ../src/interface.c:5624 msgid "Auto-indent mode:" msgstr "Modus für automatische Einrückung:" -#: ../src/interface.c:3887 -#: ../src/interface.c:5605 +#: ../src/interface.c:3919 ../src/interface.c:5637 msgid "Basic" msgstr "Einfach" -#: ../src/interface.c:3888 -#: ../src/interface.c:5606 +#: ../src/interface.c:3920 ../src/interface.c:5638 msgid "Current chars" msgstr "Aktuelle Zeichenkette" -#: ../src/interface.c:3889 -#: ../src/interface.c:5607 +#: ../src/interface.c:3921 ../src/interface.c:5639 msgid "Match braces" msgstr "Übereinstimmende Klammerung" -#: ../src/interface.c:3891 -#: ../src/interface.c:5609 +#: ../src/interface.c:3923 ../src/interface.c:5641 msgid "Detect type from file" msgstr "Einrücktyp aus Datei lesen" -#: ../src/interface.c:3896 -#: ../src/interface.c:5614 -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:3928 ../src/interface.c:5646 +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:3898 -#: ../src/interface.c:5616 +#: ../src/interface.c:3930 ../src/interface.c:5648 msgid "T_abs and spaces" msgstr "Tabulatoren _und Leerzeichen" -#: ../src/interface.c:3903 -#: ../src/interface.c:5621 -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:3935 ../src/interface.c:5653 +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:3912 -#: ../src/interface.c:5630 +#: ../src/interface.c:3944 ../src/interface.c:5662 msgid "Use spaces when inserting indentation" msgstr "Benutze Leerzeichen zum Einrücken" -#: ../src/interface.c:3921 -#: ../src/interface.c:5639 +#: ../src/interface.c:3953 ../src/interface.c:5671 msgid "Use one tab per indent" msgstr "Ein Tabulator pro Einzug" -#: ../src/interface.c:3925 -#: ../src/interface.c:5650 +#: ../src/interface.c:3957 ../src/interface.c:5682 msgid "Detect width from file" msgstr "Einrücktiefe aus Datei lesen" -#: ../src/interface.c:3930 -#: ../src/interface.c:5655 -msgid "Whether to detect the indentation width from file contents when a file is opened" -msgstr "Wenn diese Option aktiviert ist, versucht Geany den Breite der Einrückung automatisch aus der geöffneten Datei zu bestimmen" +#: ../src/interface.c:3962 ../src/interface.c:5687 +msgid "" +"Whether to detect the indentation width from file contents when a file is " +"opened" +msgstr "" +"Wenn diese Option aktiviert ist, versucht Geany den Breite der Einrückung " +"automatisch aus der geöffneten Datei zu bestimmen" -#: ../src/interface.c:3932 -#: ../src/interface.c:4222 -#: ../src/interface.c:5643 +#: ../src/interface.c:3964 ../src/interface.c:4254 ../src/interface.c:5675 msgid "Type:" msgstr "Typ:" -#: ../src/interface.c:3939 +#: ../src/interface.c:3971 msgid "Tab key indents" msgstr "Einrücken mit der Tabulatortaste" -#: ../src/interface.c:3942 -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:3974 +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:3944 +#: ../src/interface.c:3976 msgid "<b>Indentation</b>" msgstr "<b>Einrückung</b>" -#: ../src/interface.c:3949 -#: ../src/interface.c:5657 +#: ../src/interface.c:3981 ../src/interface.c:5689 msgid "Indentation" msgstr "Einrückung" -#: ../src/interface.c:3972 +#: ../src/interface.c:4004 msgid "Snippet completion" msgstr "Vervollständigung von (Code-)Schnipseln" -#: ../src/interface.c:3975 -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:4007 +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:3977 +#: ../src/interface.c:4009 msgid "XML/HTML tag auto-closing" msgstr "Automatischen Schließen von XML/HTML-Tag " -#: ../src/interface.c:3980 +#: ../src/interface.c:4012 msgid "Insert matching closing tag for XML/HTML" msgstr "Passendes schließendes Tag für XML/HTML einfügen" -#: ../src/interface.c:3982 +#: ../src/interface.c:4014 msgid "Automatic continuation of multi-line comments" msgstr "Automatisches Weiterführen von mehrzeiligen Kommentaren" -#: ../src/interface.c:3985 -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 Sprachen wie C, C++ und Java, wenn eine neue Zeile innerhalb eines Kommentars hinzugefügt wird." +#: ../src/interface.c:4017 +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 Sprachen wie C, C++ und Java, wenn eine " +"neue Zeile innerhalb eines Kommentars hinzugefügt wird." -#: ../src/interface.c:3987 +#: ../src/interface.c:4019 msgid "Autocomplete symbols" msgstr "Autovervollständigung von Symbolen" -#: ../src/interface.c:3990 -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:4022 +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:3992 +#: ../src/interface.c:4024 msgid "Autocomplete all words in document" msgstr "Autovervollständigung aller Wörter im Dokument" -#: ../src/interface.c:3996 +#: ../src/interface.c:4028 msgid "Drop rest of word on completion" msgstr "Bei Vervollständigung den Rest des Wortes ersetzen." -#: ../src/interface.c:4006 +#: ../src/interface.c:4038 msgid "Max. symbol name suggestions:" msgstr "Max. Vorschläge der Symbolvervollständigung:" -#: ../src/interface.c:4013 +#: ../src/interface.c:4045 msgid "Completion list height:" msgstr "Höhe der Vervollständigungsliste:" -#: ../src/interface.c:4020 +#: ../src/interface.c:4052 msgid "Characters to type for autocompletion:" msgstr "Zu tippende Zeichen für die Vervollständigung:" -#: ../src/interface.c:4033 -msgid "The amount of characters which are necessary to show the symbol autocompletion list" +#: ../src/interface.c:4065 +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:4042 +#: ../src/interface.c:4074 msgid "Display height in rows for the autocompletion list" msgstr "Höhe der Liste in Zeilen" -#: ../src/interface.c:4051 +#: ../src/interface.c:4083 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:4054 +#: ../src/interface.c:4086 msgid "Symbol list update frequency:" msgstr "Aktualisierungsfrequenz der Symbolliste:" -#: ../src/interface.c:4067 -msgid "Minimal delay (in milliseconds) between two automatic updates of the symbol list. Note that a too short delay may have performance impact, especially with large files. A delay of 0 disables real-time updates." -msgstr "Minimale Pause (in Millisekunden) zwischen Aktualisierungen der Symbolliste. Vorsicht! Ein zu geringer Wert kann vor allem bei großen Dokumenten Geschwindigkeitseinbußen nach sich ziehen. Ein Wert von 0 deaktiviert die dynamischen Aktualisierungen." +#: ../src/interface.c:4099 +msgid "" +"Minimal delay (in milliseconds) between two automatic updates of the symbol " +"list. Note that a too short delay may have performance impact, especially " +"with large files. A delay of 0 disables real-time updates." +msgstr "" +"Minimale Pause (in Millisekunden) zwischen Aktualisierungen der Symbolliste. " +"Vorsicht! Ein zu geringer Wert kann vor allem bei großen Dokumenten " +"Geschwindigkeitseinbußen nach sich ziehen. Ein Wert von 0 deaktiviert die " +"dynamischen Aktualisierungen." -#: ../src/interface.c:4070 +#: ../src/interface.c:4102 msgid "<b>Completions</b>" msgstr "<b>Vervollständigungen</b>" -#: ../src/interface.c:4089 +#: ../src/interface.c:4121 msgid "Parenthesis ( )" msgstr "Klammern ( )" -#: ../src/interface.c:4094 +#: ../src/interface.c:4126 msgid "Auto-close parenthesis when typing an opening one" msgstr "Automatisches Schließen der Klammern beim Tippen der öffnenden Klammer" -#: ../src/interface.c:4096 +#: ../src/interface.c:4128 msgid "Single quotes ' '" msgstr "Einfache Anführungs-/Schlusszeichen" -#: ../src/interface.c:4101 +#: ../src/interface.c:4133 msgid "Auto-close single 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:4103 +#: ../src/interface.c:4135 msgid "Curly brackets { }" msgstr "Geschweifte Klammern {}" -#: ../src/interface.c:4108 +#: ../src/interface.c:4140 msgid "Auto-close curly bracket when typing an opening one" msgstr "Automatisches Schließen der Klammern beim Tippen der öffnenden Klammer" -#: ../src/interface.c:4110 +#: ../src/interface.c:4142 msgid "Square brackets [ ]" msgstr "Eckige Klammern [ ]" -#: ../src/interface.c:4115 +#: ../src/interface.c:4147 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:4117 +#: ../src/interface.c:4149 msgid "Double quotes \" \"" msgstr "Doppelte Anführungs-/Schlusszeichen" -#: ../src/interface.c:4122 +#: ../src/interface.c:4154 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:4124 +#: ../src/interface.c:4156 msgid "<b>Auto-close quotes and brackets</b>" msgstr "<b>Automatisches Schließen von Klammern und Anführungszeichen</b>" -#: ../src/interface.c:4129 +#: ../src/interface.c:4161 msgid "Completions" msgstr "Vervollständigungen" -#: ../src/interface.c:4152 +#: ../src/interface.c:4184 msgid "Invert syntax highlighting colors" msgstr "Invertiere Syntaxhervorhebungen" -#: ../src/interface.c:4155 +#: ../src/interface.c:4187 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:4157 +#: ../src/interface.c:4189 msgid "Show indentation guides" msgstr "Zeige Einrückungshinweise" -#: ../src/interface.c:4160 +#: ../src/interface.c:4192 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:4162 +#: ../src/interface.c:4194 msgid "Show white space" msgstr "Zeige Leerzeichen" -#: ../src/interface.c:4165 +#: ../src/interface.c:4197 msgid "Marks spaces with dots and tabs with arrows" msgstr "Markiert Leerzeichen mit Punkten und Tabulatoren mit kleinen Pfeilen" -#: ../src/interface.c:4167 +#: ../src/interface.c:4199 msgid "Show line endings" msgstr "Zeige Zeilenenden" -#: ../src/interface.c:4170 +#: ../src/interface.c:4202 msgid "Shows the line ending character" msgstr "Macht Zeilenenden mit einem Sonderzeichen sichtbar" -#: ../src/interface.c:4172 +#: ../src/interface.c:4204 msgid "Show line numbers" msgstr "Zeilennummern anzeigen" -#: ../src/interface.c:4175 +#: ../src/interface.c:4207 msgid "Shows or hides the Line Number margin" msgstr "Zeigt oder versteckt den Rand mit den Zeilennummern" -#: ../src/interface.c:4177 +#: ../src/interface.c:4209 msgid "Show markers margin" msgstr "Markierungsrand anzeigen" -#: ../src/interface.c:4180 -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:4212 +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:4182 +#: ../src/interface.c:4214 msgid "Stop scrolling at last line" msgstr "Am Ende des Dokuments nicht mehr weiter rollen" -#: ../src/interface.c:4185 +#: ../src/interface.c:4217 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:4187 +#: ../src/interface.c:4219 msgid "<b>Display</b>" msgstr "<b>Anzeige</b>" -#: ../src/interface.c:4208 -#: ../src/interface.c:5689 +#: ../src/interface.c:4240 ../src/interface.c:5721 msgid "Column:" msgstr "Spalte:" -#: ../src/interface.c:4215 +#: ../src/interface.c:4247 msgid "Color:" msgstr "Farbe:" -#: ../src/interface.c:4234 +#: ../src/interface.c:4266 msgid "Sets the color of the long line marker" msgstr "Stellt die Farbe der »Umbruchhilfe für lange Zeilen« ein" -#: ../src/interface.c:4235 -#: ../src/toolbar.c:72 -#: ../src/tools.c:941 -#: ../src/vte.c:794 -#: ../src/vte.c:801 +#: ../src/interface.c:4267 ../src/toolbar.c:72 ../src/tools.c:931 +#: ../src/vte.c:794 ../src/vte.c:801 msgid "Color Chooser" msgstr "Farbwähler" -#: ../src/interface.c:4243 -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:4275 +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:4253 +#: ../src/interface.c:4285 msgid "Line" msgstr "Linie" -#: ../src/interface.c:4256 -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:4288 +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:4260 +#: ../src/interface.c:4292 msgid "Background" msgstr "Hintergrund" -#: ../src/interface.c:4263 -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:4295 +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:4267 +#: ../src/interface.c:4299 msgid "Enabled" msgstr "Aktiviert" -#: ../src/interface.c:4273 -#: ../src/interface.c:5729 +#: ../src/interface.c:4305 ../src/interface.c:5761 msgid "<b>Long line marker</b>" msgstr "<b>Umbruchhilfe für lange Zeilen</b>" -#: ../src/interface.c:4292 -#: ../src/interface.c:5696 +#: ../src/interface.c:4324 ../src/interface.c:5728 msgid "Disabled" msgstr "Deaktiviert" -#: ../src/interface.c:4295 +#: ../src/interface.c:4327 msgid "Do not show virtual spaces" msgstr "Keine virtuellen Leerzeichen anzeigen" -#: ../src/interface.c:4299 +#: ../src/interface.c:4331 msgid "Only for rectangular selections" msgstr "Nur für rechteckige Auswahl" -#: ../src/interface.c:4302 -msgid "Only show virtual spaces beyond the end of lines when drawing a rectangular selection" -msgstr "Virtuelle Leerzeichen nur in Zeilen anzeigen, in denen gerade eine rechteckige Auswahl statt findet." +#: ../src/interface.c:4334 +msgid "" +"Only show virtual spaces beyond the end of lines when drawing a rectangular " +"selection" +msgstr "" +"Virtuelle Leerzeichen nur in Zeilen anzeigen, in denen gerade eine " +"rechteckige Auswahl statt findet." -#: ../src/interface.c:4306 +#: ../src/interface.c:4338 msgid "Always" msgstr "Immer" -#: ../src/interface.c:4309 +#: ../src/interface.c:4341 msgid "Always show virtual spaces beyond the end of lines" msgstr "Immer virtuelle Leerzeichen am Ende der Zeilen anzeigen" -#: ../src/interface.c:4313 +#: ../src/interface.c:4345 msgid "<b>Virtual spaces</b>" msgstr "<b>Virtuelle Leerzeichen</b>" -#: ../src/interface.c:4318 +#: ../src/interface.c:4350 msgid "Display" msgstr "Ansicht" -#: ../src/interface.c:4349 +#: ../src/interface.c:4381 msgid "Open new documents from the command-line" msgstr "Öffne neue Dokumente von der Kommandozeile" -#: ../src/interface.c:4352 +#: ../src/interface.c:4384 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:4366 +#: ../src/interface.c:4398 msgid "Default end of line characters:" msgstr "Zeichen für das Standardzeilenende:" -#: ../src/interface.c:4373 +#: ../src/interface.c:4405 msgid "<b>New files</b>" msgstr "<b>Neue Dateien</b>" -#: ../src/interface.c:4396 +#: ../src/interface.c:4428 msgid "Default encoding (new files):" msgstr "Standardzeichenkodierung (neue Dateien):" -#: ../src/interface.c:4404 +#: ../src/interface.c:4436 msgid "Sets the default encoding for newly created files" msgstr "Setzt die Zeichenkodierung für neu erstellte Dateien" -#: ../src/interface.c:4410 +#: ../src/interface.c:4442 msgid "Use fixed encoding when opening non-Unicode files" -msgstr "Benutze feststehende Zeichenkodierung beim Öffnen neuer, nicht Unicode-Dateien" +msgstr "" +"Benutze feststehende Zeichenkodierung beim Öffnen neuer, nicht Unicode-" +"Dateien" -#: ../src/interface.c:4413 -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:4445 +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:4419 +#: ../src/interface.c:4451 msgid "Default encoding (existing non-Unicode files):" msgstr "Standardzeichenkodierung (nicht Unicode-Dateien):" -#: ../src/interface.c:4427 +#: ../src/interface.c:4459 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:4433 +#: ../src/interface.c:4465 msgid "<b>Encodings</b>" msgstr "<b>Zeichenkodierungen:</b>" -#: ../src/interface.c:4452 +#: ../src/interface.c:4484 @@ 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:[5904] trunk
by colombanw＠users.sourceforge.net 25 Aug '11

25 Aug '11

Revision: 5904 http://geany.svn.sourceforge.net/geany/?rev=5904&view=rev Author: colombanw Date: 2011-08-25 20:15:02 +0000 (Thu, 25 Aug 2011) Log Message: ----------- Add menu items to detect indentation settings from document's content Modified Paths: -------------- trunk/ChangeLog trunk/geany.glade trunk/src/callbacks.c trunk/src/callbacks.h trunk/src/document.c trunk/src/document.h trunk/src/interface.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2011-08-25 20:14:40 UTC (rev 5903) +++ trunk/ChangeLog 2011-08-25 20:15:02 UTC (rev 5904) @@ -6,6 +6,10 @@ #3339420 and #3390435). * src/callbacks.c, src/editor.c, src/editor.h: Add editor_set_indent_width() to only set indentation width. + * src/callbacks.c, src/callbacks.h, src/document.c, src/document.h, + src/interface.c, geany.glade: + Add menu items to detect indentation settings from document's + content. 2011-08-24 Colomban Wendling <colomban(at)geany(dot)org> Modified: trunk/geany.glade =================================================================== --- trunk/geany.glade 2011-08-25 20:14:40 UTC (rev 5903) +++ trunk/geany.glade 2011-08-25 20:15:02 UTC (rev 5904) @@ -1416,6 +1416,21 @@ <widget class="GtkMenu" id="indent_type1_menu"> <child> + <widget class="GtkMenuItem" id="detect_type_from_file"> + <property name="visible">True</property> + <property name="label" translatable="yes">_Detect from Content</property> + <property name="use_underline">True</property> + <signal name="activate" handler="on_detect_type_from_file_activate" last_modification_time="Thu, 25 Aug 2011 15:36:43 GMT"/> + </widget> + </child> + + <child> + <widget class="GtkSeparatorMenuItem" id="separator61"> + <property name="visible">True</property> + </widget> + </child> + + <child> <widget class="GtkRadioMenuItem" id="tabs1"> <property name="visible">True</property> <property name="label" translatable="yes">_Tabs</property> @@ -1461,6 +1476,21 @@ <widget class="GtkMenu" id="indent_width1_menu"> <child> + <widget class="GtkMenuItem" id="detect_width_from_file"> + <property name="visible">True</property> + <property name="label" translatable="yes">_Detect from Content</property> + <property name="use_underline">True</property> + <signal name="activate" handler="on_detect_width_from_file_activate" last_modification_time="Thu, 25 Aug 2011 15:36:43 GMT"/> + </widget> + </child> + + <child> + <widget class="GtkSeparatorMenuItem" id="separator62"> + <property name="visible">True</property> + </widget> + </child> + + <child> <widget class="GtkRadioMenuItem" id="indent_width_1"> <property name="visible">True</property> <property name="label" translatable="yes">_1</property> Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2011-08-25 20:14:40 UTC (rev 5903) +++ trunk/src/callbacks.c 2011-08-25 20:15:02 UTC (rev 5904) @@ -2101,3 +2101,29 @@ { keybindings_send_command(GEANY_KEY_GROUP_SEARCH, GEANY_KEYS_SEARCH_MARKALL); } + + +void on_detect_type_from_file_activate(GtkMenuItem *menuitem, gpointer user_data) +{ + GeanyDocument *doc = document_get_current(); + GeanyIndentType type; + + if (doc != NULL && document_detect_indent_type(doc, &type)) + { + editor_set_indent_type(doc->editor, type); + ui_document_show_hide(doc); + } +} + + +void on_detect_width_from_file_activate(GtkMenuItem *menuitem, gpointer user_data) +{ + GeanyDocument *doc = document_get_current(); + gint width; + + if (doc != NULL && document_detect_indent_width(doc, &width)) + { + editor_set_indent_width(doc->editor, width); + ui_document_show_hide(doc); + } +} Modified: trunk/src/callbacks.h =================================================================== --- trunk/src/callbacks.h 2011-08-25 20:14:40 UTC (rev 5903) +++ trunk/src/callbacks.h 2011-08-25 20:15:02 UTC (rev 5904) @@ -662,3 +662,11 @@ void on_mark_all1_activate (GtkMenuItem *menuitem, gpointer user_data); + +void +on_detect_type_from_file_activate (GtkMenuItem *menuitem, + gpointer user_data); + +void +on_detect_width_from_file_activate (GtkMenuItem *menuitem, + gpointer user_data); Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2011-08-25 20:14:40 UTC (rev 5903) +++ trunk/src/document.c 2011-08-25 20:15:02 UTC (rev 5904) @@ -952,8 +952,9 @@ /* Detect the indent type based on counting the leading indent characters for each line. * Returns whether detection succeeded, and the detected type in *type_ upon success */ -static gboolean detect_indent_type(GeanyEditor *editor, GeanyIndentType *type_) +gboolean document_detect_indent_type(GeanyDocument *doc, GeanyIndentType *type_) { + GeanyEditor *editor = doc->editor; ScintillaObject *sci = editor->sci; gint line, line_count; gsize tabs = 0, spaces = 0; @@ -1052,13 +1053,20 @@ } +/* same as detect_indent_width() but uses editor's indent type */ +gboolean document_detect_indent_width(GeanyDocument *doc, gint *width_) +{ + return detect_indent_width(doc->editor, doc->editor->indent_type, width_); +} + + void document_apply_indent_settings(GeanyDocument *doc) { const GeanyIndentPrefs *iprefs = editor_get_indent_prefs(NULL); GeanyIndentType type = iprefs->type; gint width = iprefs->width; - if (iprefs->detect_type && detect_indent_type(doc->editor, &type)) + if (iprefs->detect_type && document_detect_indent_type(doc, &type)) { if (type != iprefs->type) { Modified: trunk/src/document.h =================================================================== --- trunk/src/document.h 2011-08-25 20:14:40 UTC (rev 5903) +++ trunk/src/document.h 2011-08-25 20:15:02 UTC (rev 5904) @@ -33,6 +33,7 @@ #include "Scintilla.h" #include "ScintillaWidget.h" +#include "editor.h" #if defined(G_OS_WIN32) # define GEANY_DEFAULT_EOL_CHARACTER SC_EOL_CRLF @@ -260,6 +261,10 @@ gboolean document_need_save_as(GeanyDocument *doc); +gboolean document_detect_indent_type(GeanyDocument *doc, GeanyIndentType *type_); + +gboolean document_detect_indent_width(GeanyDocument *doc, gint *width_); + void document_apply_indent_settings(GeanyDocument *doc); gint document_compare_by_display_name(gconstpointer a, gconstpointer b); Modified: trunk/src/interface.c =================================================================== --- trunk/src/interface.c 2011-08-25 20:14:40 UTC (rev 5903) +++ trunk/src/interface.c 2011-08-25 20:15:02 UTC (rev 5904) @@ -197,12 +197,16 @@ GtkWidget *menu_use_auto_indentation1; GtkWidget *indent_type1; GtkWidget *indent_type1_menu; + GtkWidget *detect_type_from_file; + GtkWidget *separator61; GSList *tabs1_group = NULL; GtkWidget *tabs1; GtkWidget *spaces1; GtkWidget *tabs_and_spaces1; GtkWidget *indent_width1; GtkWidget *indent_width1_menu; + GtkWidget *detect_width_from_file; + GtkWidget *separator62; GSList *indent_width_1_group = NULL; GtkWidget *indent_width_1; GtkWidget *indent_width_2; @@ -987,6 +991,15 @@ indent_type1_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (indent_type1), indent_type1_menu); + detect_type_from_file = gtk_menu_item_new_with_mnemonic (_("_Detect from Content")); + gtk_widget_show (detect_type_from_file); + gtk_container_add (GTK_CONTAINER (indent_type1_menu), detect_type_from_file); + + separator61 = gtk_separator_menu_item_new (); + gtk_widget_show (separator61); + gtk_container_add (GTK_CONTAINER (indent_type1_menu), separator61); + gtk_widget_set_sensitive (separator61, FALSE); + tabs1 = gtk_radio_menu_item_new_with_mnemonic (tabs1_group, _("_Tabs")); tabs1_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (tabs1)); gtk_widget_show (tabs1); @@ -1012,6 +1025,15 @@ indent_width1_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (indent_width1), indent_width1_menu); + detect_width_from_file = gtk_menu_item_new_with_mnemonic (_("_Detect from Content")); + gtk_widget_show (detect_width_from_file); + gtk_container_add (GTK_CONTAINER (indent_width1_menu), detect_width_from_file); + + separator62 = gtk_separator_menu_item_new (); + gtk_widget_show (separator62); + gtk_container_add (GTK_CONTAINER (indent_width1_menu), separator62); + gtk_widget_set_sensitive (separator62, FALSE); + indent_width_1 = gtk_radio_menu_item_new_with_mnemonic (indent_width_1_group, _("_1")); indent_width_1_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (indent_width_1)); gtk_widget_show (indent_width_1); @@ -1683,6 +1705,9 @@ g_signal_connect ((gpointer) menu_use_auto_indentation1, "toggled", G_CALLBACK (on_use_auto_indentation1_toggled), NULL); + g_signal_connect ((gpointer) detect_type_from_file, "activate", + G_CALLBACK (on_detect_type_from_file_activate), + NULL); g_signal_connect ((gpointer) tabs1, "activate", G_CALLBACK (on_tabs1_activate), NULL); @@ -1692,6 +1717,9 @@ g_signal_connect ((gpointer) tabs_and_spaces1, "activate", G_CALLBACK (on_tabs_and_spaces1_activate), NULL); + g_signal_connect ((gpointer) detect_width_from_file, "activate", + G_CALLBACK (on_detect_width_from_file_activate), + NULL); g_signal_connect ((gpointer) indent_width_1, "activate", G_CALLBACK (on_indent_width_activate), NULL); @@ -1982,11 +2010,15 @@ GLADE_HOOKUP_OBJECT (window1, menu_use_auto_indentation1, "menu_use_auto_indentation1"); GLADE_HOOKUP_OBJECT (window1, indent_type1, "indent_type1"); GLADE_HOOKUP_OBJECT (window1, indent_type1_menu, "indent_type1_menu"); + GLADE_HOOKUP_OBJECT (window1, detect_type_from_file, "detect_type_from_file"); + GLADE_HOOKUP_OBJECT (window1, separator61, "separator61"); GLADE_HOOKUP_OBJECT (window1, tabs1, "tabs1"); GLADE_HOOKUP_OBJECT (window1, spaces1, "spaces1"); GLADE_HOOKUP_OBJECT (window1, tabs_and_spaces1, "tabs_and_spaces1"); GLADE_HOOKUP_OBJECT (window1, indent_width1, "indent_width1"); GLADE_HOOKUP_OBJECT (window1, indent_width1_menu, "indent_width1_menu"); + GLADE_HOOKUP_OBJECT (window1, detect_width_from_file, "detect_width_from_file"); + GLADE_HOOKUP_OBJECT (window1, separator62, "separator62"); GLADE_HOOKUP_OBJECT (window1, indent_width_1, "indent_width_1"); GLADE_HOOKUP_OBJECT (window1, indent_width_2, "indent_width_2"); GLADE_HOOKUP_OBJECT (window1, indent_width_3, "indent_width_3"); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5903] trunk
by colombanw＠users.sourceforge.net 25 Aug '11

25 Aug '11

Revision: 5903 http://geany.svn.sourceforge.net/geany/?rev=5903&view=rev Author: colombanw Date: 2011-08-25 20:14:40 +0000 (Thu, 25 Aug 2011) Log Message: ----------- Add and use editor_set_indent_width() to only set indentation width Modified Paths: -------------- trunk/ChangeLog trunk/src/callbacks.c trunk/src/editor.c trunk/src/editor.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2011-08-25 20:14:17 UTC (rev 5902) +++ trunk/ChangeLog 2011-08-25 20:14:40 UTC (rev 5903) @@ -4,6 +4,8 @@ doc/geany.html, data/filetypes.*: Add support for filetype-specific indentation settings (closes #3339420 and #3390435). + * src/callbacks.c, src/editor.c, src/editor.h: + Add editor_set_indent_width() to only set indentation width. 2011-08-24 Colomban Wendling <colomban(at)geany(dot)org> Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2011-08-25 20:14:17 UTC (rev 5902) +++ trunk/src/callbacks.c 2011-08-25 20:14:40 UTC (rev 5903) @@ -2066,31 +2066,25 @@ } -static void set_indent_width(guint width) +void on_indent_width_activate(GtkMenuItem *menuitem, gpointer user_data) { GeanyDocument *doc; + gchar *label; + gint width; if (ignore_callback) return; - doc = document_get_current(); - g_return_if_fail(doc != NULL); + label = ui_menu_item_get_text(menuitem); + width = atoi(label); + g_free(label); - editor_set_indent(doc->editor, doc->editor->indent_type, width); + doc = document_get_current(); + if (doc != NULL && width > 0) + editor_set_indent_width(doc->editor, width); } -void on_indent_width_activate(GtkMenuItem *menuitem, gpointer user_data) -{ - gchar *label = ui_menu_item_get_text(menuitem); - gint width = atoi(label); - - g_free(label); - if (width) - set_indent_width(width); -} - - void on_reset_indentation1_activate(GtkMenuItem *menuitem, gpointer user_data) { guint i; Modified: trunk/src/editor.c =================================================================== --- trunk/src/editor.c 2011-08-25 20:14:17 UTC (rev 5902) +++ trunk/src/editor.c 2011-08-25 20:14:40 UTC (rev 5903) @@ -4468,6 +4468,12 @@ } +void editor_set_indent_width(GeanyEditor *editor, gint width) +{ + editor_set_indent(editor, editor->indent_type, width); +} + + void editor_set_indent(GeanyEditor *editor, GeanyIndentType type, gint width) { const GeanyIndentPrefs *iprefs = editor_get_indent_prefs(editor); Modified: trunk/src/editor.h =================================================================== --- trunk/src/editor.h 2011-08-25 20:14:17 UTC (rev 5902) +++ trunk/src/editor.h 2011-08-25 20:14:40 UTC (rev 5903) @@ -294,6 +294,8 @@ void editor_set_indent_type(GeanyEditor *editor, GeanyIndentType type); +void editor_set_indent_width(GeanyEditor *editor, gint width); + void editor_set_indent(GeanyEditor *editor, GeanyIndentType type, gint width); void editor_set_line_wrapping(GeanyEditor *editor, gboolean wrap); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5902] trunk
by colombanw＠users.sourceforge.net 25 Aug '11

25 Aug '11

Revision: 5902 http://geany.svn.sourceforge.net/geany/?rev=5902&view=rev Author: colombanw Date: 2011-08-25 20:14:17 +0000 (Thu, 25 Aug 2011) Log Message: ----------- Add support for filetype-specific indentation settings Closes #3339420 and #3390435. Modified Paths: -------------- trunk/ChangeLog trunk/data/filetypes.actionscript trunk/data/filetypes.ada trunk/data/filetypes.asm trunk/data/filetypes.c trunk/data/filetypes.caml trunk/data/filetypes.cmake trunk/data/filetypes.cobol trunk/data/filetypes.conf trunk/data/filetypes.cpp trunk/data/filetypes.cs trunk/data/filetypes.css trunk/data/filetypes.d trunk/data/filetypes.diff trunk/data/filetypes.docbook trunk/data/filetypes.erlang trunk/data/filetypes.f77 trunk/data/filetypes.ferite trunk/data/filetypes.forth trunk/data/filetypes.fortran trunk/data/filetypes.freebasic trunk/data/filetypes.glsl trunk/data/filetypes.haskell trunk/data/filetypes.haxe trunk/data/filetypes.html trunk/data/filetypes.java trunk/data/filetypes.javascript trunk/data/filetypes.latex trunk/data/filetypes.lisp trunk/data/filetypes.lua trunk/data/filetypes.makefile trunk/data/filetypes.matlab trunk/data/filetypes.nsis trunk/data/filetypes.pascal trunk/data/filetypes.perl trunk/data/filetypes.php trunk/data/filetypes.po trunk/data/filetypes.python trunk/data/filetypes.r trunk/data/filetypes.restructuredtext trunk/data/filetypes.ruby trunk/data/filetypes.sh trunk/data/filetypes.sql trunk/data/filetypes.tcl trunk/data/filetypes.vala trunk/data/filetypes.verilog trunk/data/filetypes.vhdl trunk/data/filetypes.xml trunk/data/filetypes.yaml trunk/doc/geany.html trunk/doc/geany.txt trunk/src/document.c trunk/src/filetypes.c trunk/src/filetypes.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2011-08-25 20:12:56 UTC (rev 5901) +++ trunk/ChangeLog 2011-08-25 20:14:17 UTC (rev 5902) @@ -1,3 +1,11 @@ +2011-08-25 Colomban Wendling <colomban(at)geany(dot)org> + + * src/document.c, src/filetypes.c, src/filetypes.h, doc/geany.txt, + doc/geany.html, data/filetypes.*: + Add support for filetype-specific indentation settings (closes + #3339420 and #3390435). + + 2011-08-24 Colomban Wendling <colomban(at)geany(dot)org> * src/editor.c: Modified: trunk/data/filetypes.actionscript =================================================================== --- trunk/data/filetypes.actionscript 2011-08-25 20:12:56 UTC (rev 5901) +++ trunk/data/filetypes.actionscript 2011-08-25 20:14:17 UTC (rev 5902) @@ -54,6 +54,11 @@ # context action command (please see Geany's main documentation for details) context_action_cmd= +[indentation] +#width=4 +# 0 is spaces, 1 is tabs, 2 is tab & spaces +#type=1 + [build_settings] # %f will be replaced by the complete filename # %e will be replaced by the filename without extension Modified: trunk/data/filetypes.ada =================================================================== --- trunk/data/filetypes.ada 2011-08-25 20:12:56 UTC (rev 5901) +++ trunk/data/filetypes.ada 2011-08-25 20:14:17 UTC (rev 5902) @@ -43,7 +43,12 @@ # context action command (please see Geany's main documentation for details) context_action_cmd= +[indentation] +#width=4 +# 0 is spaces, 1 is tabs, 2 is tab & spaces +#type=1 + [build_settings] # %f will be replaced by the complete filename # %e will be replaced by the filename without extension Modified: trunk/data/filetypes.asm =================================================================== --- trunk/data/filetypes.asm 2011-08-25 20:12:56 UTC (rev 5901) +++ trunk/data/filetypes.asm 2011-08-25 20:14:17 UTC (rev 5902) @@ -49,6 +49,11 @@ # context action command (please see Geany's main documentation for details) context_action_cmd= +[indentation] +#width=4 +# 0 is spaces, 1 is tabs, 2 is tab & spaces +#type=1 + [build_settings] # %f will be replaced by the complete filename # %e will be replaced by the filename without extension Modified: trunk/data/filetypes.c =================================================================== --- trunk/data/filetypes.c 2011-08-25 20:12:56 UTC (rev 5901) +++ trunk/data/filetypes.c 2011-08-25 20:14:17 UTC (rev 5902) @@ -63,6 +63,11 @@ # context action command (please see Geany's main documentation for details) context_action_cmd= +[indentation] +#width=4 +# 0 is spaces, 1 is tabs, 2 is tab & spaces +#type=1 + [build_settings] # %f will be replaced by the complete filename # %e will be replaced by the filename without extension Modified: trunk/data/filetypes.caml =================================================================== --- trunk/data/filetypes.caml 2011-08-25 20:12:56 UTC (rev 5901) +++ trunk/data/filetypes.caml 2011-08-25 20:14:17 UTC (rev 5902) @@ -46,6 +46,11 @@ # context action command (please see Geany's main documentation for details) context_action_cmd= +[indentation] +#width=4 +# 0 is spaces, 1 is tabs, 2 is tab & spaces +#type=1 + [build_settings] # %f will be replaced by the complete filename # %e will be replaced by the filename without extension Modified: trunk/data/filetypes.cmake =================================================================== --- trunk/data/filetypes.cmake 2011-08-25 20:12:56 UTC (rev 5901) +++ trunk/data/filetypes.cmake 2011-08-25 20:14:17 UTC (rev 5902) @@ -47,3 +47,8 @@ # context action command (please see Geany's main documentation for details) context_action_cmd= + +[indentation] +#width=4 +# 0 is spaces, 1 is tabs, 2 is tab & spaces +#type=1 Modified: trunk/data/filetypes.cobol =================================================================== --- trunk/data/filetypes.cobol 2011-08-25 20:12:56 UTC (rev 5901) +++ trunk/data/filetypes.cobol 2011-08-25 20:14:17 UTC (rev 5902) @@ -41,3 +41,8 @@ # context action command (please see Geany's main documentation for details) context_action_cmd= + +[indentation] +#width=4 +# 0 is spaces, 1 is tabs, 2 is tab & spaces +#type=1 Modified: trunk/data/filetypes.conf =================================================================== --- trunk/data/filetypes.conf 2011-08-25 20:12:56 UTC (rev 5901) +++ trunk/data/filetypes.conf 2011-08-25 20:14:17 UTC (rev 5902) @@ -36,3 +36,8 @@ # context action command (please see Geany's main documentation for details) context_action_cmd= + +[indentation] +#width=4 +# 0 is spaces, 1 is tabs, 2 is tab & spaces +#type=1 Modified: trunk/data/filetypes.cpp =================================================================== --- trunk/data/filetypes.cpp 2011-08-25 20:12:56 UTC (rev 5901) +++ trunk/data/filetypes.cpp 2011-08-25 20:14:17 UTC (rev 5902) @@ -65,6 +65,11 @@ # context action command (please see Geany's main documentation for details) context_action_cmd= +[indentation] +#width=4 +# 0 is spaces, 1 is tabs, 2 is tab & spaces +#type=1 + [build_settings] # %f will be replaced by the complete filename # %e will be replaced by the filename without extension Modified: trunk/data/filetypes.cs =================================================================== --- trunk/data/filetypes.cs 2011-08-25 20:12:56 UTC (rev 5901) +++ trunk/data/filetypes.cs 2011-08-25 20:14:17 UTC (rev 5902) @@ -65,6 +65,11 @@ # context action command (please see Geany's main documentation for details) context_action_cmd= +[indentation] +#width=4 +# 0 is spaces, 1 is tabs, 2 is tab & spaces +#type=1 + [build_settings] # %f will be replaced by the complete filename # %e will be replaced by the filename without extension Modified: trunk/data/filetypes.css =================================================================== --- trunk/data/filetypes.css 2011-08-25 20:12:56 UTC (rev 5901) +++ trunk/data/filetypes.css 2011-08-25 20:14:17 UTC (rev 5902) @@ -61,3 +61,8 @@ # context action command (please see Geany's main documentation for details) context_action_cmd= + +[indentation] +#width=4 +# 0 is spaces, 1 is tabs, 2 is tab & spaces +#type=1 Modified: trunk/data/filetypes.d =================================================================== --- trunk/data/filetypes.d 2011-08-25 20:12:56 UTC (rev 5901) +++ trunk/data/filetypes.d 2011-08-25 20:14:17 UTC (rev 5902) @@ -55,6 +55,11 @@ # context action command (please see Geany's main documentation for details) context_action_cmd= +[indentation] +#width=4 +# 0 is spaces, 1 is tabs, 2 is tab & spaces +#type=1 + [build_settings] # %f will be replaced by the complete filename # %e will be replaced by the filename without extension Modified: trunk/data/filetypes.diff =================================================================== --- trunk/data/filetypes.diff 2011-08-25 20:12:56 UTC (rev 5901) +++ trunk/data/filetypes.diff 2011-08-25 20:14:17 UTC (rev 5902) @@ -26,3 +26,8 @@ # context action command (please see Geany's main documentation for details) context_action_cmd= +[indentation] +#width=4 +# 0 is spaces, 1 is tabs, 2 is tab & spaces +#type=1 + Modified: trunk/data/filetypes.docbook =================================================================== --- trunk/data/filetypes.docbook 2011-08-25 20:12:56 UTC (rev 5901) +++ trunk/data/filetypes.docbook 2011-08-25 20:14:17 UTC (rev 5902) @@ -67,3 +67,8 @@ # if this setting is set to true, a new line after a line ending with an # unclosed tag will be automatically indented xml_indent_tags=true + +[indentation] +#width=4 +# 0 is spaces, 1 is tabs, 2 is tab & spaces +#type=1 Modified: trunk/data/filetypes.erlang =================================================================== --- trunk/data/filetypes.erlang 2011-08-25 20:12:56 UTC (rev 5901) +++ trunk/data/filetypes.erlang 2011-08-25 20:14:17 UTC (rev 5902) @@ -65,6 +65,11 @@ # context action command (please see Geany's main documentation for details) context_action_cmd= +[indentation] +#width=4 +# 0 is spaces, 1 is tabs, 2 is tab & spaces +#type=1 + [build_settings] # %f will be replaced by the complete filename # %e will be replaced by the filename without extension Modified: trunk/data/filetypes.f77 =================================================================== --- trunk/data/filetypes.f77 2011-08-25 20:12:56 UTC (rev 5901) +++ trunk/data/filetypes.f77 2011-08-25 20:14:17 UTC (rev 5902) @@ -50,6 +50,10 @@ # context action command (please see Geany's main documentation for details) context_action_cmd= +[indentation] +#width=4 +# 0 is spaces, 1 is tabs, 2 is tab & spaces +type=0 [build_settings] # %f will be replaced by the complete filename Modified: trunk/data/filetypes.ferite =================================================================== --- trunk/data/filetypes.ferite 2011-08-25 20:12:56 UTC (rev 5901) +++ trunk/data/filetypes.ferite 2011-08-25 20:14:17 UTC (rev 5902) @@ -54,6 +54,11 @@ # context action command (please see Geany's main documentation for details) context_action_cmd= +[indentation] +#width=4 +# 0 is spaces, 1 is tabs, 2 is tab & spaces +#type=1 + [build_settings] # %f will be replaced by the complete filename # %e will be replaced by the filename without extension Modified: trunk/data/filetypes.forth =================================================================== --- trunk/data/filetypes.forth 2011-08-25 20:12:56 UTC (rev 5901) +++ trunk/data/filetypes.forth 2011-08-25 20:14:17 UTC (rev 5902) @@ -45,3 +45,8 @@ # context action command (please see Geany's main documentation for details) context_action_cmd= + +[indentation] +#width=4 +# 0 is spaces, 1 is tabs, 2 is tab & spaces +#type=1 Modified: trunk/data/filetypes.fortran =================================================================== --- trunk/data/filetypes.fortran 2011-08-25 20:12:56 UTC (rev 5901) +++ trunk/data/filetypes.fortran 2011-08-25 20:14:17 UTC (rev 5902) @@ -50,7 +50,12 @@ # context action command (please see Geany's main documentation for details) context_action_cmd= +[indentation] +#width=4 +# 0 is spaces, 1 is tabs, 2 is tab & spaces +#type=1 + [build_settings] # %f will be replaced by the complete filename # %e will be replaced by the filename without extension Modified: trunk/data/filetypes.freebasic =================================================================== --- trunk/data/filetypes.freebasic 2011-08-25 20:12:56 UTC (rev 5901) +++ trunk/data/filetypes.freebasic 2011-08-25 20:14:17 UTC (rev 5902) @@ -54,6 +54,11 @@ # context action command (please see Geany's main documentation for details) context_action_cmd= +[indentation] +#width=4 +# 0 is spaces, 1 is tabs, 2 is tab & spaces +#type=1 + [build_settings] # %f will be replaced by the complete filename # %e will be replaced by the filename without extension Modified: trunk/data/filetypes.glsl =================================================================== --- trunk/data/filetypes.glsl 2011-08-25 20:12:56 UTC (rev 5901) +++ trunk/data/filetypes.glsl 2011-08-25 20:14:17 UTC (rev 5902) @@ -68,6 +68,11 @@ # context action command (please see Geany's main documentation for details) context_action_cmd= +[indentation] +#width=4 +# 0 is spaces, 1 is tabs, 2 is tab & spaces +#type=1 + [build_settings] # %f will be replaced by the complete filename # %e will be replaced by the filename without extension Modified: trunk/data/filetypes.haskell =================================================================== --- trunk/data/filetypes.haskell 2011-08-25 20:12:56 UTC (rev 5901) +++ trunk/data/filetypes.haskell 2011-08-25 20:14:17 UTC (rev 5902) @@ -48,6 +48,11 @@ # context action command (please see Geany's main documentation for details) context_action_cmd= +[indentation] +#width=4 +# 0 is spaces, 1 is tabs, 2 is tab & spaces +#type=1 + [build_settings] # %f will be replaced by the complete filename # %e will be replaced by the filename without extension Modified: trunk/data/filetypes.haxe =================================================================== --- trunk/data/filetypes.haxe 2011-08-25 20:12:56 UTC (rev 5901) +++ trunk/data/filetypes.haxe 2011-08-25 20:14:17 UTC (rev 5902) @@ -55,6 +55,11 @@ # context action command (please see Geany's main documentation for details) context_action_cmd= +[indentation] +#width=4 +# 0 is spaces, 1 is tabs, 2 is tab & spaces +#type=1 + [build_settings] # %f will be replaced by the complete filename # %e will be replaced by the filename without extension Modified: trunk/data/filetypes.html =================================================================== --- trunk/data/filetypes.html 2011-08-25 20:12:56 UTC (rev 5901) +++ trunk/data/filetypes.html 2011-08-25 20:14:17 UTC (rev 5902) @@ -38,6 +38,11 @@ # unclosed tag will be automatically indented xml_indent_tags=true +[indentation] +#width=4 +# 0 is spaces, 1 is tabs, 2 is tab & spaces +#type=1 + [build_settings] # %f will be replaced by the complete filename # %e will be replaced by the filename without extension Modified: trunk/data/filetypes.java =================================================================== --- trunk/data/filetypes.java 2011-08-25 20:12:56 UTC (rev 5901) +++ trunk/data/filetypes.java 2011-08-25 20:14:17 UTC (rev 5902) @@ -56,7 +56,12 @@ # context action command (please see Geany's main documentation for details) context_action_cmd= +[indentation] +#width=4 +# 0 is spaces, 1 is tabs, 2 is tab & spaces +#type=1 + [build_settings] # %f will be replaced by the complete filename # %e will be replaced by the filename without extension Modified: trunk/data/filetypes.javascript =================================================================== --- trunk/data/filetypes.javascript 2011-08-25 20:12:56 UTC (rev 5901) +++ trunk/data/filetypes.javascript 2011-08-25 20:14:17 UTC (rev 5902) @@ -53,6 +53,11 @@ # context action command (please see Geany's main documentation for details) context_action_cmd= +[indentation] +#width=4 +# 0 is spaces, 1 is tabs, 2 is tab & spaces +#type=1 + [build_settings] # %f will be replaced by the complete filename # %e will be replaced by the filename without extension Modified: trunk/data/filetypes.latex =================================================================== --- trunk/data/filetypes.latex 2011-08-25 20:12:56 UTC (rev 5901) +++ trunk/data/filetypes.latex 2011-08-25 20:14:17 UTC (rev 5902) @@ -36,6 +36,11 @@ # context action command (please see Geany's main documentation for details) context_action_cmd= +[indentation] +#width=4 +# 0 is spaces, 1 is tabs, 2 is tab & spaces +#type=1 + [build_settings] # %f will be replaced by the complete filename # %e will be replaced by the filename without extension Modified: trunk/data/filetypes.lisp =================================================================== --- trunk/data/filetypes.lisp 2011-08-25 20:12:56 UTC (rev 5901) +++ trunk/data/filetypes.lisp 2011-08-25 20:14:17 UTC (rev 5902) @@ -46,6 +46,11 @@ # context action command (please see Geany's main documentation for details) context_action_cmd= +[indentation] +#width=4 +# 0 is spaces, 1 is tabs, 2 is tab & spaces +#type=1 + [build_settings] # %f will be replaced by the complete filename # %e will be replaced by the filename without extension Modified: trunk/data/filetypes.lua =================================================================== --- trunk/data/filetypes.lua 2011-08-25 20:12:56 UTC (rev 5901) +++ trunk/data/filetypes.lua 2011-08-25 20:14:17 UTC (rev 5902) @@ -61,6 +61,11 @@ # context action command (please see Geany's main documentation for details) context_action_cmd= +[indentation] +#width=4 +# 0 is spaces, 1 is tabs, 2 is tab & spaces +#type=1 + [build_settings] # %f will be replaced by the complete filename # %e will be replaced by the filename without extension Modified: trunk/data/filetypes.makefile =================================================================== --- trunk/data/filetypes.makefile 2011-08-25 20:12:56 UTC (rev 5901) +++ trunk/data/filetypes.makefile 2011-08-25 20:14:17 UTC (rev 5902) @@ -35,3 +35,8 @@ # context action command (please see Geany's main documentation for details) context_action_cmd= + +[indentation] +#width=4 +# 0 is spaces, 1 is tabs, 2 is tab & spaces +type=1 Modified: trunk/data/filetypes.matlab =================================================================== --- trunk/data/filetypes.matlab 2011-08-25 20:12:56 UTC (rev 5901) +++ trunk/data/filetypes.matlab 2011-08-25 20:14:17 UTC (rev 5902) @@ -39,6 +39,11 @@ # context action command (please see Geany's main documentation for details) context_action_cmd= +[indentation] +#width=4 +# 0 is spaces, 1 is tabs, 2 is tab & spaces +#type=1 + [build_settings] # %f will be replaced by the complete filename # %e will be replaced by the filename without extension Modified: trunk/data/filetypes.nsis =================================================================== --- trunk/data/filetypes.nsis 2011-08-25 20:12:56 UTC (rev 5901) +++ trunk/data/filetypes.nsis 2011-08-25 20:14:17 UTC (rev 5902) @@ -57,6 +57,11 @@ # context action command (please see Geany's main documentation for details) context_action_cmd= +[indentation] +#width=4 +# 0 is spaces, 1 is tabs, 2 is tab & spaces +#type=1 + [build_settings] # %f will be replaced by the complete filename # %e will be replaced by the filename without extension Modified: trunk/data/filetypes.pascal =================================================================== --- trunk/data/filetypes.pascal 2011-08-25 20:12:56 UTC (rev 5901) +++ trunk/data/filetypes.pascal 2011-08-25 20:14:17 UTC (rev 5902) @@ -50,6 +50,11 @@ # context action command (please see Geany's main documentation for details) context_action_cmd= +[indentation] +#width=4 +# 0 is spaces, 1 is tabs, 2 is tab & spaces +#type=1 + [build_settings] # %f will be replaced by the complete filename # %e will be replaced by the filename without extension Modified: trunk/data/filetypes.perl =================================================================== --- trunk/data/filetypes.perl 2011-08-25 20:12:56 UTC (rev 5901) +++ trunk/data/filetypes.perl 2011-08-25 20:14:17 UTC (rev 5902) @@ -69,6 +69,11 @@ # context action command (please see Geany's main documentation for details) context_action_cmd= +[indentation] +#width=4 +# 0 is spaces, 1 is tabs, 2 is tab & spaces +#type=1 + [build_settings] # %f will be replaced by the complete filename # %e will be replaced by the filename without extension Modified: trunk/data/filetypes.php =================================================================== --- trunk/data/filetypes.php 2011-08-25 20:12:56 UTC (rev 5901) +++ trunk/data/filetypes.php 2011-08-25 20:14:17 UTC (rev 5902) @@ -34,6 +34,11 @@ # unclosed tag will be automatically indented xml_indent_tags=true +[indentation] +#width=4 +# 0 is spaces, 1 is tabs, 2 is tab & spaces +#type=1 + [build_settings] # %f will be replaced by the complete filename # %e will be replaced by the filename without extension Modified: trunk/data/filetypes.po =================================================================== --- trunk/data/filetypes.po 2011-08-25 20:12:56 UTC (rev 5901) +++ trunk/data/filetypes.po 2011-08-25 20:14:17 UTC (rev 5902) @@ -38,7 +38,12 @@ # context action command (please see Geany's main documentation for details) context_action_cmd= +[indentation] +#width=4 +# 0 is spaces, 1 is tabs, 2 is tab & spaces +#type=1 + [build_settings] # %f will be replaced by the complete filename # %e will be replaced by the filename without extension Modified: trunk/data/filetypes.python =================================================================== --- trunk/data/filetypes.python 2011-08-25 20:12:56 UTC (rev 5901) +++ trunk/data/filetypes.python 2011-08-25 20:14:17 UTC (rev 5902) @@ -54,6 +54,11 @@ # context action command (please see Geany's main documentation for details) context_action_cmd= +[indentation] +#width=4 +# 0 is spaces, 1 is tabs, 2 is tab & spaces +#type=0 + [build_settings] # %f will be replaced by the complete filename # %e will be replaced by the filename without extension Modified: trunk/data/filetypes.r =================================================================== --- trunk/data/filetypes.r 2011-08-25 20:12:56 UTC (rev 5901) +++ trunk/data/filetypes.r 2011-08-25 20:14:17 UTC (rev 5902) @@ -49,3 +49,8 @@ # context action command (please see Geany's main documentation for details) context_action_cmd= +[indentation] +#width=4 +# 0 is spaces, 1 is tabs, 2 is tab & spaces +#type=1 + Modified: trunk/data/filetypes.restructuredtext =================================================================== --- trunk/data/filetypes.restructuredtext 2011-08-25 20:12:56 UTC (rev 5901) +++ trunk/data/filetypes.restructuredtext 2011-08-25 20:14:17 UTC (rev 5902) @@ -28,3 +28,8 @@ # sort tags by appearance symbol_list_sort_mode=1 + +[indentation] +#width=4 +# 0 is spaces, 1 is tabs, 2 is tab & spaces +#type=1 Modified: trunk/data/filetypes.ruby =================================================================== --- trunk/data/filetypes.ruby 2011-08-25 20:12:56 UTC (rev 5901) +++ trunk/data/filetypes.ruby 2011-08-25 20:14:17 UTC (rev 5902) @@ -66,6 +66,11 @@ # context action command (please see Geany's main documentation for details) context_action_cmd= +[indentation] +#width=4 +# 0 is spaces, 1 is tabs, 2 is tab & spaces +#type=1 + [build_settings] # %f will be replaced by the complete filename # %e will be replaced by the filename without extension Modified: trunk/data/filetypes.sh =================================================================== --- trunk/data/filetypes.sh 2011-08-25 20:12:56 UTC (rev 5901) +++ trunk/data/filetypes.sh 2011-08-25 20:14:17 UTC (rev 5902) @@ -44,6 +44,11 @@ # context action command (please see Geany's main documentation for details) context_action_cmd= +[indentation] +#width=4 +# 0 is spaces, 1 is tabs, 2 is tab & spaces +#type=1 + [build_settings] # %f will be replaced by the complete filename # %e will be replaced by the filename without extension Modified: trunk/data/filetypes.sql =================================================================== --- trunk/data/filetypes.sql 2011-08-25 20:12:56 UTC (rev 5901) +++ trunk/data/filetypes.sql 2011-08-25 20:14:17 UTC (rev 5902) @@ -45,3 +45,8 @@ # context action command (please see Geany's main documentation for details) context_action_cmd= + +[indentation] +#width=4 +# 0 is spaces, 1 is tabs, 2 is tab & spaces +#type=1 Modified: trunk/data/filetypes.tcl =================================================================== --- trunk/data/filetypes.tcl 2011-08-25 20:12:56 UTC (rev 5901) +++ trunk/data/filetypes.tcl 2011-08-25 20:14:17 UTC (rev 5902) @@ -51,7 +51,12 @@ # context action command (please see Geany's main documentation for details) context_action_cmd= +[indentation] +#width=4 +# 0 is spaces, 1 is tabs, 2 is tab & spaces +#type=1 + [build_settings] # %f will be replaced by the complete filename # %e will be replaced by the filename without extension Modified: trunk/data/filetypes.vala =================================================================== --- trunk/data/filetypes.vala 2011-08-25 20:12:56 UTC (rev 5901) +++ trunk/data/filetypes.vala 2011-08-25 20:14:17 UTC (rev 5902) @@ -66,6 +66,11 @@ # context action command (please see Geany's main documentation for details) #context_action_cmd= +[indentation] +#width=4 +# 0 is spaces, 1 is tabs, 2 is tab & spaces +#type=1 + [build_settings] # %f will be replaced by the complete filename # %e will be replaced by the filename without extension Modified: trunk/data/filetypes.verilog =================================================================== --- trunk/data/filetypes.verilog 2011-08-25 20:12:56 UTC (rev 5901) +++ trunk/data/filetypes.verilog 2011-08-25 20:14:17 UTC (rev 5902) @@ -46,4 +46,9 @@ # context action command (please see Geany's main documentation for details) context_action_cmd= +[indentation] +#width=4 +# 0 is spaces, 1 is tabs, 2 is tab & spaces +#type=1 + Modified: trunk/data/filetypes.vhdl =================================================================== --- trunk/data/filetypes.vhdl 2011-08-25 20:12:56 UTC (rev 5901) +++ trunk/data/filetypes.vhdl 2011-08-25 20:14:17 UTC (rev 5902) @@ -51,4 +51,9 @@ # context action command (please see Geany's main documentation for details) context_action_cmd= +[indentation] +#width=4 +# 0 is spaces, 1 is tabs, 2 is tab & spaces +#type=1 + Modified: trunk/data/filetypes.xml =================================================================== --- trunk/data/filetypes.xml 2011-08-25 20:12:56 UTC (rev 5901) +++ trunk/data/filetypes.xml 2011-08-25 20:14:17 UTC (rev 5902) @@ -108,3 +108,8 @@ # if this setting is set to true, a new line after a line ending with an # unclosed tag will be automatically indented xml_indent_tags=true + +[indentation] +#width=4 +# 0 is spaces, 1 is tabs, 2 is tab & spaces +#type=1 Modified: trunk/data/filetypes.yaml =================================================================== --- trunk/data/filetypes.yaml 2011-08-25 20:12:56 UTC (rev 5901) +++ trunk/data/filetypes.yaml 2011-08-25 20:14:17 UTC (rev 5902) @@ -41,3 +41,8 @@ # context action command (please see Geany's main documentation for details) context_action_cmd= + +[indentation] +#width=4 +# 0 is spaces, 1 is tabs, 2 is tab & spaces +#type=1 Modified: trunk/doc/geany.html =================================================================== --- trunk/doc/geany.html 2011-08-25 20:12:56 UTC (rev 5901) +++ trunk/doc/geany.html 2011-08-25 20:14:17 UTC (rev 5902) @@ -430,88 +430,89 @@ <li><a class="reference internal" href="#keywords-section" id="id189">[keywords] section</a></li> <li><a class="reference internal" href="#lexer-properties-section" id="id190">[lexer_properties] section</a></li> <li><a class="reference internal" href="#settings-section" id="id191">[settings] section</a></li> -<li><a class="reference internal" href="#build-settings-section" id="id192">[build_settings] section</a></li> +<li><a class="reference internal" href="#indentation-section" id="id192">[indentation] section</a></li> +<li><a class="reference internal" href="#build-settings-section" id="id193">[build_settings] section</a></li> </ul> </li> -<li><a class="reference internal" href="#special-file-filetypes-common" id="id193">Special file filetypes.common</a><ul> -<li><a class="reference internal" href="#named-styles-section" id="id194">[named_styles] section</a></li> -<li><a class="reference internal" href="#id4" id="id195">[styling] section</a></li> -<li><a class="reference internal" href="#id5" id="id196">[settings] section</a></li> +<li><a class="reference internal" href="#special-file-filetypes-common" id="id194">Special file filetypes.common</a><ul> +<li><a class="reference internal" href="#named-styles-section" id="id195">[named_styles] section</a></li> +<li><a class="reference internal" href="#id4" id="id196">[styling] section</a></li> +<li><a class="reference internal" href="#id5" id="id197">[settings] section</a></li> </ul> </li> </ul> </li> -<li><a class="reference internal" href="#filetype-extensions" id="id197">Filetype extensions</a></li> -<li><a class="reference internal" href="#filetype-group-membership" id="id198">Filetype group membership</a></li> -<li><a class="reference internal" href="#preferences-file-format" id="id199">Preferences file format</a><ul> -<li><a class="reference internal" href="#build-menu-section" id="id200">[build-menu] section</a></li> +<li><a class="reference internal" href="#filetype-extensions" id="id198">Filetype extensions</a></li> +<li><a class="reference internal" href="#filetype-group-membership" id="id199">Filetype group membership</a></li> +<li><a class="reference internal" href="#preferences-file-format" id="id200">Preferences file format</a><ul> +<li><a class="reference internal" href="#build-menu-section" id="id201">[build-menu] section</a></li> </ul> </li> -<li><a class="reference internal" href="#project-file-format" id="id201">Project file format</a><ul> -<li><a class="reference internal" href="#build-menu-additions" id="id202">[build-menu] additions</a></li> +<li><a class="reference internal" href="#project-file-format" id="id202">Project file format</a><ul> +<li><a class="reference internal" href="#build-menu-additions" id="id203">[build-menu] additions</a></li> </ul> </li> -<li><a class="reference internal" href="#templates" id="id203">Templates</a><ul> -<li><a class="reference internal" href="#template-meta-data" id="id204">Template meta data</a></li> -<li><a class="reference internal" href="#file-templates" id="id205">File templates</a><ul> -<li><a class="reference internal" href="#adding-file-templates" id="id206">Adding file templates</a></li> +<li><a class="reference internal" href="#templates" id="id204">Templates</a><ul> +<li><a class="reference internal" href="#template-meta-data" id="id205">Template meta data</a></li> +<li><a class="reference internal" href="#file-templates" id="id206">File templates</a><ul> +<li><a class="reference internal" href="#adding-file-templates" id="id207">Adding file templates</a></li> </ul> </li> -<li><a class="reference internal" href="#customizing-templates" id="id207">Customizing templates</a><ul> -<li><a class="reference internal" href="#template-wildcards" id="id208">Template wildcards</a><ul> -<li><a class="reference internal" href="#special-command-wildcard" id="id209">Special {command:} wildcard</a></li> +<li><a class="reference internal" href="#customizing-templates" id="id208">Customizing templates</a><ul> +<li><a class="reference internal" href="#template-wildcards" id="id209">Template wildcards</a><ul> +<li><a class="reference internal" href="#special-command-wildcard" id="id210">Special {command:} wildcard</a></li> </ul> </li> </ul> </li> </ul> </li> -<li><a class="reference internal" href="#customizing-the-toolbar" id="id210">Customizing the toolbar</a><ul> -<li><a class="reference internal" href="#manually-editing-the-toolbar-layout" id="id211">Manually editing the toolbar layout</a></li> -<li><a class="reference internal" href="#available-toolbar-elements" id="id212">Available toolbar elements</a></li> +<li><a class="reference internal" href="#customizing-the-toolbar" id="id211">Customizing the toolbar</a><ul> +<li><a class="reference internal" href="#manually-editing-the-toolbar-layout" id="id212">Manually editing the toolbar layout</a></li> +<li><a class="reference internal" href="#available-toolbar-elements" id="id213">Available toolbar elements</a></li> </ul> </li> </ul> </li> -<li><a class="reference internal" href="#plugin-documentation" id="id213">Plugin documentation</a><ul> -<li><a class="reference internal" href="#html-characters" id="id214">HTML Characters</a><ul> -<li><a class="reference internal" href="#insert-entity-dialog" id="id215">Insert entity dialog</a></li> -<li><a class="reference internal" href="#replace-special-chars-by-its-entity" id="id216">Replace special chars by its entity</a><ul> -<li><a class="reference internal" href="#at-typing-time" id="id217">At typing time</a></li> -<li><a class="reference internal" href="#bulk-replacement" id="id218">Bulk replacement</a></li> +<li><a class="reference internal" href="#plugin-documentation" id="id214">Plugin documentation</a><ul> +<li><a class="reference internal" href="#html-characters" id="id215">HTML Characters</a><ul> +<li><a class="reference internal" href="#insert-entity-dialog" id="id216">Insert entity dialog</a></li> +<li><a class="reference internal" href="#replace-special-chars-by-its-entity" id="id217">Replace special chars by its entity</a><ul> +<li><a class="reference internal" href="#at-typing-time" id="id218">At typing time</a></li> +<li><a class="reference internal" href="#bulk-replacement" id="id219">Bulk replacement</a></li> </ul> </li> </ul> </li> -<li><a class="reference internal" href="#save-actions" id="id219">Save Actions</a><ul> -<li><a class="reference internal" href="#instant-save" id="id220">Instant Save</a></li> -<li><a class="reference internal" href="#backup-copy" id="id221">Backup Copy</a></li> +<li><a class="reference internal" href="#save-actions" id="id220">Save Actions</a><ul> +<li><a class="reference internal" href="#instant-save" id="id221">Instant Save</a></li> +<li><a class="reference internal" href="#backup-copy" id="id222">Backup Copy</a></li> </ul> </li> </ul> </li> -<li><a class="reference internal" href="#contributing-to-this-document" id="id222">Contributing to this document</a></li> -<li><a class="reference internal" href="#scintilla-keyboard-commands" id="id223">Scintilla keyboard commands</a><ul> -<li><a class="reference internal" href="#keyboard-commands" id="id224">Keyboard commands</a></li> +<li><a class="reference internal" href="#contributing-to-this-document" id="id223">Contributing to this document</a></li> +<li><a class="reference internal" href="#scintilla-keyboard-commands" id="id224">Scintilla keyboard commands</a><ul> +<li><a class="reference internal" href="#keyboard-commands" id="id225">Keyboard commands</a></li> </ul> </li> -<li><a class="reference internal" href="#tips-and-tricks" id="id225">Tips and tricks</a><ul> -<li><a class="reference internal" href="#document-notebook" id="id226">Document notebook</a></li> -<li><a class="reference internal" href="#editor" id="id227">Editor</a></li> -<li><a class="reference internal" href="#interface" id="id228">Interface</a></li> -<li><a class="reference internal" href="#gtk-related" id="id229">GTK-related</a></li> +<li><a class="reference internal" href="#tips-and-tricks" id="id226">Tips and tricks</a><ul> +<li><a class="reference internal" href="#document-notebook" id="id227">Document notebook</a></li> +<li><a class="reference internal" href="#editor" id="id228">Editor</a></li> +<li><a class="reference internal" href="#interface" id="id229">Interface</a></li> +<li><a class="reference internal" href="#gtk-related" id="id230">GTK-related</a></li> </ul> </li> -<li><a class="reference internal" href="#compile-time-options" id="id230">Compile-time options</a><ul> -<li><a class="reference internal" href="#src-geany-h" id="id231">src/geany.h</a></li> -<li><a class="reference internal" href="#project-h" id="id232">project.h</a></li> -<li><a class="reference internal" href="#editor-h" id="id233">editor.h</a></li> -<li><a class="reference internal" href="#keyfile-c" id="id234">keyfile.c</a></li> -<li><a class="reference internal" href="#build-c" id="id235">build.c</a></li> +<li><a class="reference internal" href="#compile-time-options" id="id231">Compile-time options</a><ul> +<li><a class="reference internal" href="#src-geany-h" id="id232">src/geany.h</a></li> +<li><a class="reference internal" href="#project-h" id="id233">project.h</a></li> +<li><a class="reference internal" href="#editor-h" id="id234">editor.h</a></li> +<li><a class="reference internal" href="#keyfile-c" id="id235">keyfile.c</a></li> +<li><a class="reference internal" href="#build-c" id="id236">build.c</a></li> </ul> </li> -<li><a class="reference internal" href="#gnu-general-public-license" id="id236">GNU General Public License</a></li> -<li><a class="reference internal" href="#license-for-scintilla-and-scite" id="id237">License for Scintilla and SciTE</a></li> +<li><a class="reference internal" href="#gnu-general-public-license" id="id237">GNU General Public License</a></li> +<li><a class="reference internal" href="#license-for-scintilla-and-scite" id="id238">License for Scintilla and SciTE</a></li> </ul> </div> <div class="section" id="introduction"> @@ -4914,8 +4915,44 @@ this setting in their system configuration files.</dd> </dl> </div> +<div class="section" id="indentation-section"> +<h4><a class="toc-backref" href="#id192">[indentation] section</a></h4> +<p>This section allows definition of default indentation settings specific to +the file type, overriding the ones configured in the preferences. This can +be useful for file types requiring specific indentation settings (e.g. tabs +only for Makefile). These settings don't override auto-detection if activated.</p> +<dl class="docutils"> +<dt>width</dt> +<dd>The forced indentation width.</dd> +<dt>type</dt> +<dd><p class="first">The forced indentation type.</p> +<table border="1" class="last docutils"> +<colgroup> +<col width="18%" /> +<col width="82%" /> +</colgroup> +<thead valign="bottom"> +<tr><th class="head">Value</th> +<th class="head">Indentation type</th> +</tr> +</thead> +<tbody valign="top"> +<tr><td>0</td> +<td>Spaces only</td> +</tr> +<tr><td>1</td> +<td>Tabs only</td> +</tr> +<tr><td>2</td> +<td>Mixed (tabs and spaces)</td> +</tr> +</tbody> +</table> +</dd> +</dl> +</div> <div class="section" id="build-settings-section"> -<h4><a class="toc-backref" href="#id192">[build_settings] section</a></h4> +<h4><a class="toc-backref" href="#id193">[build_settings] section</a></h4> <p>As of Geany 0.19 this section is supplemented by the <a class="reference internal" href="#build-menu-section">[build-menu] section</a>. Values that are set in the [build-menu] section will override those in this section.</p> <dl class="docutils"> @@ -4968,7 +5005,7 @@ </div> </div> <div class="section" id="special-file-filetypes-common"> -<h3><a class="toc-backref" href="#id193">Special file filetypes.common</a></h3> +<h3><a class="toc-backref" href="#id194">Special file filetypes.common</a></h3> <p>There is a special filetype definition file called filetypes.common. This file defines some general non-filetype-specific settings.</p> @@ -4983,7 +5020,7 @@ <p class="last">See the <a class="reference internal" href="#filetype-configuration">Filetype configuration</a> section for how to define styles.</p> </div> <div class="section" id="named-styles-section"> -<h4><a class="toc-backref" href="#id194">[named_styles] section</a></h4> +<h4><a class="toc-backref" href="#id195">[named_styles] section</a></h4> <p>Named styles declared here can be used in the [styling] section of any filetypes.* file.</p> <p>For example:</p> @@ -5010,7 +5047,7 @@ schemes menu</a>.</p> </div> <div class="section" id="id4"> -<h4><a class="toc-backref" href="#id195">[styling] section</a></h4> +<h4><a class="toc-backref" href="#id196">[styling] section</a></h4> <dl class="docutils"> <dt>default</dt> <dd><p class="first">This is the default style. It is used for styling files without a @@ -5194,7 +5231,7 @@ </dl> </div> <div class="section" id="id5"> -<h4><a class="toc-backref" href="#id196">[settings] section</a></h4> +<h4><a class="toc-backref" href="#id197">[settings] section</a></h4> <dl class="docutils"> <dt>whitespace_chars</dt> <dd><p class="first">Characters to treat as whitespace. These characters are ignored @@ -5208,7 +5245,7 @@ </div> </div> <div class="section" id="filetype-extensions"> -<h2><a class="toc-backref" href="#id197">Filetype extensions</a></h2> +<h2><a class="toc-backref" href="#id198">Filetype extensions</a></h2> <p>To change the default filetype extension used when saving a new file, see <a class="reference internal" href="#filetype-definition-files">Filetype definition files</a>.</p> <p>You can override the list of file extensions that Geany uses to detect @@ -5228,7 +5265,7 @@ </pre> </div> <div class="section" id="filetype-group-membership"> -<h2><a class="toc-backref" href="#id198">Filetype group membership</a></h2> +<h2><a class="toc-backref" href="#id199">Filetype group membership</a></h2> <p>Group membership is also stored in <tt class="docutils literal">filetype_extensions.conf</tt>. This file is used to store information Geany needs at startup, whereas the separate filetype definition files hold information only needed when @@ -5249,13 +5286,13 @@ </div> </div> <div class="section" id="preferences-file-format"> -<h2><a class="toc-backref" href="#id199">Preferences file format</a></h2> +<h2><a class="toc-backref" href="#id200">Preferences file format</a></h2> <p>The user preferences file <tt class="docutils literal">geany.conf</tt> holds settings for all the items configured in the preferences dialog. This file should not be edited while Geany is running as the file will be overwritten when the preferences in Geany are changed or Geany is quit.</p> <div class="section" id="build-menu-section"> -<h3><a class="toc-backref" href="#id200">[build-menu] section</a></h3> +<h3><a class="toc-backref" href="#id201">[build-menu] section</a></h3> <p>The [build-menu] section contains the configuration of the build menu. This section can occur in filetype, preferences and project files and always has the format described here. Different menu items are loaded @@ -5287,11 +5324,11 @@ </div> </div> <div class="section" id="project-file-format"> -<h2><a class="toc-backref" href="#id201">Project file format</a></h2> +<h2><a class="toc-backref" href="#id202">Project file format</a></h2> <p>The project file contains project related settings and possibly a record of the current session files.</p> <div class="section" id="build-menu-additions"> -<h3><a class="toc-backref" href="#id202">[build-menu] additions</a></h3> +<h3><a class="toc-backref" href="#id203">[build-menu] additions</a></h3> <p>The project file also can have extra fields in the [build-menu] section in addition to those listed in <a class="reference internal" href="#build-menu-section">[build-menu] section</a> above.</p> <p>When filetype menu items are configured for the project they are stored @@ -5307,7 +5344,7 @@ </div> </div> <div class="section" id="templates"> -<h2><a class="toc-backref" href="#id203">Templates</a></h2> +<h2><a class="toc-backref" href="#id204">Templates</a></h2> <p>Geany supports the following templates:</p> <ul class="simple"> <li>ChangeLog entry</li> @@ -5336,7 +5373,7 @@ also force this by selecting <em>Tools->Reload Configuration</em>.</p> </div> <div class="section" id="template-meta-data"> -<h3><a class="toc-backref" href="#id204">Template meta data</a></h3> +<h3><a class="toc-backref" href="#id205">Template meta data</a></h3> <p>Meta data can be used with all templates, but by default user set meta data is only used for the ChangeLog and File header templates.</p> <p>In the configuration dialog you can find a tab "Templates" (see @@ -5344,7 +5381,7 @@ which will be inserted in the templates.</p> </div> <div class="section" id="file-templates"> -<h3><a class="toc-backref" href="#id205">File templates</a></h3> +<h3><a class="toc-backref" href="#id206">File templates</a></h3> <p>File templates are templates used as the basis of a new file. To use them, choose the <em>New (with Template)</em> menu item from the <em>File</em> menu.</p> @@ -5356,7 +5393,7 @@ wildcard can be placed anywhere, but it's usually put on the first line of the file, followed by a blank line.</p> <div class="section" id="adding-file-templates"> -<h4><a class="toc-backref" href="#id206">Adding file templates</a></h4> +<h4><a class="toc-backref" href="#id207">Adding file templates</a></h4> <p>File templates are read from <tt class="docutils literal">templates/files</tt> under the <a class="reference internal" href="#configuration-file-paths">Configuration file paths</a>.</p> <p>The filetype to use is detected from the template file's extension, if @@ -5367,7 +5404,7 @@ </div> </div> <div class="section" id="customizing-templates"> -<h3><a class="toc-backref" href="#id207">Customizing templates</a></h3> +<h3><a class="toc-backref" href="#id208">Customizing templates</a></h3> <p>Each template can be customized to your needs. The templates are stored in the <tt class="docutils literal"><span class="pre">~/.config/geany/templates/</span></tt> directory (see the section called <a class="reference internal" href="#command-line-options">Command line options</a> for further information about the configuration @@ -5375,7 +5412,7 @@ Geany ;-) ) and edit the template to your needs. There are some wildcards which will be automatically replaced by Geany at startup.</p> <div class="section" id="template-wildcards"> -<h4><a class="toc-backref" href="#id208">Template wildcards</a></h4> +<h4><a class="toc-backref" href="#id209">Template wildcards</a></h4> <p>All wildcards must be enclosed by "{" and "}", e.g. {date}.</p> <p><strong>Wildcards for character escaping</strong></p> <table border="1" class="docutils"> @@ -5588,7 +5625,7 @@ </tbody> </table> <div class="section" id="special-command-wildcard"> -<h5><a class="toc-backref" href="#id209">Special {command:} wildcard</a></h5> +<h5><a class="toc-backref" href="#id210">Special {command:} wildcard</a></h5> <p>The {command:} wildcard is a special one because it can execute a specified command and put the command's output (stdout) into the template.</p> @@ -5623,14 +5660,14 @@ </div> </div> <div class="section" id="customizing-the-toolbar"> -<h2><a class="toc-backref" href="#id210">Customizing the toolbar</a></h2> +<h2><a class="toc-backref" href="#id211">Customizing the toolbar</a></h2> <p>You can add, remove and reorder the elements in the toolbar by using the toolbar editor, or by manually editing the configuration file <tt class="docutils literal">ui_toolbar.xml</tt>.</p> <p>The toolbar editor can be opened from the preferences editor on the Toolbar tab or by right-clicking on the toolbar itself and choosing it from the menu.</p> <div class="section" id="manually-editing-the-toolbar-layout"> -<h3><a class="toc-backref" href="#id211">Manually editing the toolbar layout</a></h3> +<h3><a class="toc-backref" href="#id212">Manually editing the toolbar layout</a></h3> <p>To override the system-wide configuration file, copy it to your user configuration directory (see <a class="reference internal" href="#configuration-file-paths">Configuration file paths</a>).</p> <p>For example:</p> @@ -5652,7 +5689,7 @@ </div> </div> <div class="section" id="available-toolbar-elements"> -<h3><a class="toc-backref" href="#id212">Available toolbar elements</a></h3> +<h3><a class="toc-backref" href="#id213">Available toolbar elements</a></h3> <table border="1" class="docutils"> <colgroup> <col width="19%" /> @@ -5766,13 +5803,13 @@ </div> </div> <div class="section" id="plugin-documentation"> -<h1><a class="toc-backref" href="#id213">Plugin documentation</a></h1> +<h1><a class="toc-backref" href="#id214">Plugin documentation</a></h1> <div class="section" id="html-characters"> -<h2><a class="toc-backref" href="#id214">HTML Characters</a></h2> +<h2><a class="toc-backref" href="#id215">HTML Characters</a></h2> <p>The HTML Characters plugin helps when working with special characters in XML/HTML, e.g. German Umlauts ü and ä.</p> <div class="section" id="insert-entity-dialog"> -<h3><a class="toc-backref" href="#id215">Insert entity dialog</a></h3> +<h3><a class="toc-backref" href="#id216">Insert entity dialog</a></h3> <p>When the plugin is enabled, you can insert special character entities using <em>Tools->Insert Special HTML Characters</em>.</p> <p>This opens up a dialog where you can find a huge amount of special @@ -5784,7 +5821,7 @@ might also like to double click the chosen entity instead.</p> </div> <div class="section" id="replace-special-chars-by-its-entity"> -<h3><a class="toc-backref" href="#id216">Replace special chars by its entity</a></h3> +<h3><a class="toc-backref" href="#id217">Replace special chars by its entity</a></h3> <p>To help make a XML/HTML document valid the plugin supports replacement of special chars known by the plugin. Both bulk replacement and immediate replacement during typing are supported.</p> @@ -5800,7 +5837,7 @@ </dd> </dl> <div class="section" id="at-typing-time"> -<h4><a class="toc-backref" href="#id217">At typing time</a></h4> +<h4><a class="toc-backref" href="#id218">At typing time</a></h4> <p>You can activate/deactivate this feature using the <em>Tools->HTML Replacement->Auto-replace Special Characters</em> menu item. If it's activated, all special characters (beside the given exceptions from @@ -5809,7 +5846,7 @@ of this feature.</p> </div> <div class="section" id="bulk-replacement"> -<h4><a class="toc-backref" href="#id218">Bulk replacement</a></h4> +<h4><a class="toc-backref" href="#id219">Bulk replacement</a></h4> <p>After inserting a huge amount of text, e.g. by using copy & paste, the plugin allows bulk replacement of all known characters (beside the mentioned exceptions). You can find the function under the same @@ -5819,9 +5856,9 @@ </div> </div> <div class="section" id="save-actions"> -<h2><a class="toc-backref" href="#id219">Save Actions</a></h2> +<h2><a class="toc-backref" href="#id220">Save Actions</a></h2> <div class="section" id="instant-save"> -<h3><a class="toc-backref" href="#id220">Instant Save</a></h3> +<h3><a class="toc-backref" href="#id221">Instant Save</a></h3> <p>This plugin sets on every new file (<em>File->New</em> or <em>File->New (with template)</em>) a randomly chosen filename and set its filetype appropriate to the used template or when no template was used, to a configurable default filetype. @@ -5831,7 +5868,7 @@ similar.</p> </div> <div class="section" id="backup-copy"> -<h3><a class="toc-backref" href="#id221">Backup Copy</a></h3> +<h3><a class="toc-backref" href="#id222">Backup Copy</a></h3> <p>This plugin creates a backup copy of the current file in Geany when it is saved. You can specify the directory where the backup copy is saved and you can configure the automatically added extension in the configure dialog @@ -5842,7 +5879,7 @@ </div> </div> <div class="section" id="contributing-to-this-document"> -<h1><a class="toc-backref" href="#id222">Contributing to this document</a></h1> +<h1><a class="toc-backref" href="#id223">Contributing to this document</a></h1> <p>This document (<tt class="docutils literal">geany.txt</tt>) is written in <a class="reference external" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> (or "reST"). The source file for it is located in Geany's <tt class="docutils literal">doc</tt> subdirectory. If you intend on making changes, you should grab the @@ -5862,7 +5899,7 @@ and Fedora systems.</p> </div> <div class="section" id="scintilla-keyboard-commands"> -<h1><a class="toc-backref" href="#id223">Scintilla keyboard commands</a></h1> +<h1><a class="toc-backref" href="#id224">Scintilla keyboard commands</a></h1> <p>Copyright © 1998, 2006 Neil Hodgson <neilh(at)scintilla(dot)org></p> <p>This appendix is distributed under the terms of the License for Scintilla and SciTE. A copy of this license can be found in the file @@ -5871,7 +5908,7 @@ Scintilla and SciTE</a>.</p> <p>20 June 2006</p> <div class="section" id="keyboard-commands"> -<h2><a class="toc-backref" href="#id224">Keyboard commands</a></h2> +<h2><a class="toc-backref" href="#id225">Keyboard commands</a></h2> <p>Keyboard commands for Scintilla mostly follow common Windows and GTK+ conventions. All move keys (arrows, page up/down, home and end) allows to extend or reduce the stream selection when holding the @@ -5953,9 +5990,9 @@ </div> </div> <div class="section" id="tips-and-tricks"> -<h1><a class="toc-backref" href="#id225">Tips and tricks</a></h1> +<h1><a class="toc-backref" href="#id226">Tips and tricks</a></h1> <div class="section" id="document-notebook"> -<h2><a class="toc-backref" href="#id226">Document notebook</a></h2> +<h2><a class="toc-backref" href="#id227">Document notebook</a></h2> <ul class="simple"> <li>Double-click on empty space in the notebook tab bar to open a new document.</li> @@ -5968,7 +6005,7 @@ </ul> </div> <div class="section" id="editor"> -<h2><a class="toc-backref" href="#id227">Editor</a></h2> +<h2><a class="toc-backref" href="#id228">Editor</a></h2> <ul class="simple"> <li>Alt-scroll wheel moves up/down a page.</li> <li>Ctrl-scroll wheel zooms in/out.</li> @@ -5978,13 +6015,13 @@ </ul> </div> <div class="section" id="interface"> -<h2><a class="toc-backref" href="#id228">Interface</a></h2> +<h2><a class="toc-backref" href="#id229">Interface</a></h2> <ul class="simple"> <li>Double-click on a symbol-list group to expand or compact it.</li> </ul> </div> <div class="section" id="gtk-related"> -<h2><a class="toc-backref" href="#id229">GTK-related</a></h2> +<h2><a class="toc-backref" href="#id230">GTK-related</a></h2> <ul class="simple"> <li>Scrolling the mouse wheel over a notebook tab bar will switch notebook pages.</li> @@ -5999,7 +6036,7 @@ </div> </div> <div class="section" id="compile-time-options"> -<h1><a class="toc-backref" href="#id230">Compile-time options</a></h1> +<h1><a class="toc-backref" href="#id231">Compile-time options</a></h1> <p>There are some options which can only be changed at compile time, and some options which are used as the default for configurable options. To change these options, edit the appropriate source file @@ -6011,7 +6048,7 @@ <p class="last">Most users should not need to change these options.</p> </div> <div class="section" id="src-geany-h"> -<h2><a class="toc-backref" href="#id231">src/geany.h</a></h2> +<h2><a class="toc-backref" href="#id232">src/geany.h</a></h2> <table border="1" class="docutils"> <colgroup> <col width="33%" /> @@ -6068,7 +6105,7 @@ </table> </div> <div class="section" id="project-h"> -<h2><a class="toc-backref" href="#id232">project.h</a></h2> +<h2><a class="toc-backref" href="#id233">project.h</a></h2> <table border="1" class="docutils"> <colgroup> <col width="33%" /> @@ -6093,7 +6130,7 @@ </table> </div> <div class="section" id="editor-h"> -<h2><a class="toc-backref" href="#id233">editor.h</a></h2> +<h2><a class="toc-backref" href="#id234">editor.h</a></h2> <table border="1" class="docutils"> <colgroup> <col width="33%" /> @@ -6119,7 +6156,7 @@ </table> </div> <div class="section" id="keyfile-c"> -<h2><a class="toc-backref" href="#id234">keyfile.c</a></h2> +<h2><a class="toc-backref" href="#id235">keyfile.c</a></h2> <p>These are default settings that can be overridden in the <a class="reference internal" href="#preferences">Preferences</a> dialog.</p> <table border="1" class="docutils"> <colgroup> @@ -6200,7 +6237,7 @@ </table> </div> <div class="section" id="build-c"> -<h2><a class="toc-backref" href="#id235">build.c</a></h2> +<h2><a class="toc-backref" href="#id236">build.c</a></h2> <table border="1" class="docutils"> <colgroup> <col width="33%" /> @@ -6245,7 +6282,7 @@ </div> </div> <div class="section" id="gnu-general-public-license"> -<h1><a class="toc-backref" href="#id236">GNU General Public License</a></h1> +<h1><a class="toc-backref" href="#id237">GNU General Public License</a></h1> <pre class="literal-block"> GNU GENERAL PUBLIC LICENSE Version 2, June 1991 @@ -6590,7 +6627,7 @@ </pre> </div> <div class="section" id="license-for-scintilla-and-scite"> -<h1><a class="toc-backref" href="#id237">License for Scintilla and SciTE</a></h1> +<h1><a class="toc-backref" href="#id238">License for Scintilla and SciTE</a></h1> <p>Copyright 1998-2003 by Neil Hodgson <neilh(at)scintilla(dot)org></p> <p>All Rights Reserved</p> <p>Permission to use, copy, modify, and distribute this software and @@ -6610,7 +6647,7 @@ <div class="footer"> <hr class="footer" /> <a class="reference external" href="geany.txt">View document source</a>. -Generated on: 2011-07-28 17:42 UTC. +Generated on: 2011-08-25 15:23 UTC. Generated by <a class="reference external" href="http://docutils.sourceforge.net/">Docutils</a> from <a class="reference external" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> source. </div> Modified: trunk/doc/geany.txt =================================================================== --- trunk/doc/geany.txt 2011-08-25 20:12:56 UTC (rev 5901) +++ trunk/doc/geany.txt 2011-08-25 20:14:17 UTC (rev 5902) @@ -4050,6 +4050,29 @@ this setting in their system configuration files. +[indentation] section +````````````````````` + +This section allows definition of default indentation settings specific to +the file type, overriding the ones configured in the preferences. This can +be useful for file types requiring specific indentation settings (e.g. tabs +only for Makefile). These settings don't override auto-detection if activated. + +width + The forced indentation width. + +type + The forced indentation type. + + ===== ======================= + Value Indentation type + ===== ======================= + 0 Spaces only + 1 Tabs only + 2 Mixed (tabs and spaces) + ===== ======================= + + [build_settings] section ```````````````````````` Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2011-08-25 20:12:56 UTC (rev 5901) +++ trunk/src/document.c 2011-08-25 20:14:17 UTC (rev 5902) @@ -950,16 +950,19 @@ } -/* Detect the indent type based on counting the leading indent characters for each line. */ -static GeanyIndentType detect_indent_type(GeanyEditor *editor) +/* Detect the indent type based on counting the leading indent characters for each line. + * Returns whether detection succeeded, and the detected type in *type_ upon success */ +static gboolean detect_indent_type(GeanyEditor *editor, GeanyIndentType *type_) { - const GeanyIndentPrefs *iprefs = editor_get_indent_prefs(editor); ScintillaObject *sci = editor->sci; gint line, line_count; gsize tabs = 0, spaces = 0; if (detect_tabs_and_spaces(editor)) - return GEANY_INDENT_TYPE_BOTH; + { + *type_ = GEANY_INDENT_TYPE_BOTH; + return TRUE; + } line_count = sci_get_line_count(sci); for (line = 0; line < line_count; line++) @@ -980,20 +983,23 @@ spaces++; } if (spaces == 0 && tabs == 0) - return iprefs->type; + return FALSE; /* the factors may need to be tweaked */ if (spaces > tabs * 4) - return GEANY_INDENT_TYPE_SPACES; + *type_ = GEANY_INDENT_TYPE_SPACES; else if (tabs > spaces * 4) - return GEANY_INDENT_TYPE_TABS; + *type_ = GEANY_INDENT_TYPE_TABS; else - return GEANY_INDENT_TYPE_BOTH; + *type_ = GEANY_INDENT_TYPE_BOTH; + + return TRUE; } -/* Detect the indent width based on counting the leading indent characters for each line. */ -static gint detect_indent_width(GeanyEditor *editor, GeanyIndentType type) +/* Detect the indent width based on counting the leading indent characters for each line. + * Returns whether detection succeeded, and the detected width in *width_ upon success */ +static gboolean detect_indent_width(GeanyEditor *editor, GeanyIndentType type, gint *width_) { const GeanyIndentPrefs *iprefs = editor_get_indent_prefs(editor); ScintillaObject *sci = editor->sci; @@ -1003,7 +1009,7 @@ /* can't easily detect the supposed width of a tab, guess the default is OK */ if (type == GEANY_INDENT_TYPE_TABS) - return iprefs->width; + return FALSE; /* force 8 at detection time for tab & spaces -- anyway we don't use tabs at this point */ sci_set_tab_width(sci, 8); @@ -1038,41 +1044,23 @@ } } - return width; -} + if (count == 0) + return FALSE; - -/* returns the forced indent type or -1 if none is forced */ -static gint get_forced_indent_type(GeanyDocument *doc) -{ - switch (doc->file_type->id) - { - case GEANY_FILETYPES_MAKE: - /* force using tabs for indentation for Makefiles */ - return GEANY_INDENT_TYPE_TABS; - case GEANY_FILETYPES_F77: - /* force using spaces for indentation for Fortran 77 */ - return GEANY_INDENT_TYPE_SPACES; - default: - return -1; - } + *width_ = width; + return TRUE; } void document_apply_indent_settings(GeanyDocument *doc) { const GeanyIndentPrefs *iprefs = editor_get_indent_prefs(NULL); - gint type; + GeanyIndentType type = iprefs->type; gint width = iprefs->width; - type = get_forced_indent_type(doc); - if (type < 0 && ! iprefs->detect_type) - type = iprefs->type; - else if (type < 0) + if (iprefs->detect_type && detect_indent_type(doc->editor, &type)) { - type = detect_indent_type(doc->editor); - - if (type != (gint)iprefs->type) + if (type != iprefs->type) { const gchar *name = NULL; @@ -1094,16 +1082,20 @@ DOC_FILENAME(doc)); } } - if (iprefs->detect_width) - { - width = detect_indent_width(doc->editor, type); + else if (doc->file_type->indent_type > -1) + type = doc->file_type->indent_type; + if (iprefs->detect_width && detect_indent_width(doc->editor, type, &width)) + { if (width != iprefs->width) { ui_set_statusbar(TRUE, _("Setting indentation width to %d for %s."), width, DOC_FILENAME(doc)); } } + else if (doc->file_type->indent_width > -1) + width = doc->file_type->indent_width; + editor_set_indent(doc->editor, type, width); } @@ -2499,13 +2491,18 @@ if (ft_changed) { - gint forced_indent_type = get_forced_indent_type(doc); + const GeanyIndentPrefs *iprefs = editor_get_indent_prefs(NULL); - if (forced_indent_type >= 0) - { /* update forced indents, like Makefiles and F77 */ - editor_set_indent_type(doc->editor, forced_indent_type); + /* assume that if previous filetype was none and the settings are the default ones, this + * is the first time the filetype is carefully set, so we should apply indent settings */ + if (old_ft && old_ft->id == GEANY_FILETYPES_NONE && + doc->editor->indent_type == iprefs->type && + doc->editor->indent_width == iprefs->width) + { + document_apply_indent_settings(doc); ui_document_show_hide(doc); } + sidebar_openfiles_update(doc); /* to update the icon */ g_signal_emit_by_name(geany_object, "document-filetype-set", doc, old_ft); } Modified: trunk/src/filetypes.c =================================================================== --- trunk/src/filetypes.c 2011-08-25 20:12:56 UTC (rev 5901) +++ trunk/src/filetypes.c 2011-08-25 20:14:17 UTC (rev 5902) @@ -498,6 +498,8 @@ /* pattern must not be null */ ft->pattern = g_new0(gchar*, 1); ft->project_list_entry = -1; /* no entry */ + ft->indent_width = -1; + ft->indent_type = -1; ft->priv = g_new0(GeanyFiletypePrivate, 1); return ft; @@ -1118,6 +1120,27 @@ } +static void load_indent_settings(GeanyFiletype *ft, GKeyFile *config, GKeyFile *configh) +{ + ft->indent_width = utils_get_setting(integer, configh, config, "indentation", "width", -1); + ft->indent_type = utils_get_setting(integer, configh, config, "indentation", "type", -1); + /* check whether the indent type is OK */ + switch (ft->indent_type) + { + case GEANY_INDENT_TYPE_TABS: + case GEANY_INDENT_TYPE_SPACES: + case GEANY_INDENT_TYPE_BOTH: + case -1: + break; + + default: + g_warning("Invalid indent type %d in file type %s", ft->indent_type, ft->name); + ft->indent_type = -1; + break; + } +} + + static void load_settings(gint ft_id, GKeyFile *config, GKeyFile *configh) { GeanyFiletype *ft = filetypes[ft_id]; @@ -1188,6 +1211,9 @@ ft->priv->xml_indent_tags = utils_get_setting(boolean, configh, config, "settings", "xml_indent_tags", FALSE); + /* read indent settings */ + load_indent_settings(ft, config, configh); + /* read build settings */ build_load_menu(config, GEANY_BCS_FT, (gpointer)ft); build_load_menu(configh, GEANY_BCS_HOME_FT, (gpointer)ft); Modified: trunk/src/filetypes.h =================================================================== --- trunk/src/filetypes.h 2011-08-25 20:12:56 UTC (rev 5901) +++ trunk/src/filetypes.h 2011-08-25 20:14:17 UTC (rev 5902) @@ -136,6 +136,9 @@ gchar *mime_type; GdkPixbuf *icon; gchar *comment_single; /* single-line comment */ + /* filetype indent settings, -1 if not set */ + gint indent_type; + gint indent_width; struct GeanyFiletypePrivate *priv; /* must be last, append fields before this item */ #ifdef GEANY_PRIVATE This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5901] trunk
by colombanw＠users.sourceforge.net 25 Aug '11

25 Aug '11

Revision: 5901 http://geany.svn.sourceforge.net/geany/?rev=5901&view=rev Author: colombanw Date: 2011-08-25 20:12:56 +0000 (Thu, 25 Aug 2011) Log Message: ----------- Support for non-ASCII characters in word completion Closes #3386129. Modified Paths: -------------- trunk/ChangeLog trunk/src/editor.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2011-08-25 20:12:36 UTC (rev 5900) +++ trunk/ChangeLog 2011-08-25 20:12:56 UTC (rev 5901) @@ -1,3 +1,10 @@ +2011-08-24 Colomban Wendling <colomban(at)geany(dot)org> + + * src/editor.c: + Make completion and word completion support non-ASCII characters + (closes #3313351). + + 2011-08-21 Colomban Wendling <colomban(at)geany(dot)org> * src/callbacks.c, src/editor.c, src/editor.h, src/keybindings.c: Modified: trunk/src/editor.c =================================================================== --- trunk/src/editor.c 2011-08-25 20:12:36 UTC (rev 5900) +++ trunk/src/editor.c 2011-08-25 20:12:56 UTC (rev 5901) @@ -2080,8 +2080,7 @@ word_end = pos_find + rootlen; if (pos_find != current) { - while (word_end < len && strchr(GEANY_WORDCHARS, sci_get_char_at(sci, word_end)) != NULL) - word_end++; + word_end = SSM(sci, SCI_WORDENDPOSITION, word_end, TRUE); word_length = word_end - pos_find; if (word_length > rootlen) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5900] trunk/src/editor.c
by colombanw＠users.sourceforge.net 25 Aug '11

25 Aug '11

Revision: 5900 http://geany.svn.sourceforge.net/geany/?rev=5900&view=rev Author: colombanw Date: 2011-08-25 20:12:36 +0000 (Thu, 25 Aug 2011) Log Message: ----------- Cleanup code duplication in editor_start_auto_complete() Use read_current_word() in editor_start_auto_complete() not to duplicate some code. This also brings non-ASCII characters as part of a word, first step for non-ASCII word completions. Modified Paths: -------------- trunk/src/editor.c Modified: trunk/src/editor.c =================================================================== --- trunk/src/editor.c 2011-08-25 20:12:20 UTC (rev 5899) +++ trunk/src/editor.c 2011-08-25 20:12:36 UTC (rev 5900) @@ -2144,18 +2144,19 @@ gboolean editor_start_auto_complete(GeanyEditor *editor, gint pos, gboolean force) { - gint line, line_start, current, rootlen, startword, lexer, style; - gchar *linebuf, *root; + gint rootlen, lexer, style; + gchar *root; + gchar cword[GEANY_MAX_WORD_LENGTH]; ScintillaObject *sci; gboolean ret = FALSE; const gchar *wordchars; GeanyFiletype *ft; + g_return_val_if_fail(editor != NULL, FALSE); + if (! editor_prefs.auto_complete_symbols && ! force) return FALSE; - g_return_val_if_fail(editor != NULL, FALSE); - /* If we are at the beginning of the document, we skip autocompletion as we can't determine the * necessary styling information */ if (G_UNLIKELY(pos < 2)) @@ -2164,10 +2165,6 @@ sci = editor->sci; ft = editor->document->file_type; - line = sci_get_line_from_position(sci, pos); - line_start = sci_get_position_from_line(sci, line); - current = pos - line_start; - startword = current; lexer = sci_get_lexer(sci); style = sci_get_style_at(sci, pos - 2); @@ -2177,8 +2174,6 @@ autocomplete_scope(editor); - linebuf = sci_get_line(sci, line); - if (ft->id == GEANY_FILETYPES_LATEX) wordchars = GEANY_WORDCHARS"\\"; /* add \ to word chars if we are in a LaTeX file */ else if (ft->id == GEANY_FILETYPES_HTML || ft->id == GEANY_FILETYPES_PHP) @@ -2186,12 +2181,9 @@ else wordchars = GEANY_WORDCHARS; - /* find the start of the current word */ - while ((startword > 0) && (strchr(wordchars, linebuf[startword - 1]))) - startword--; - linebuf[current] = '\0'; - root = linebuf + startword; - rootlen = current - startword; + read_current_word(editor, pos, cword, sizeof(cword), wordchars, TRUE); + root = cword; + rootlen = strlen(root); if (rootlen > 0) { @@ -2209,7 +2201,8 @@ ret = autocomplete_html(sci, root, rootlen); } else if (ft->id == GEANY_FILETYPES_PHP && style == SCE_HPHP_DEFAULT && - startword >= 2 && rootlen == 3 && strcmp(&root[-2], "<?php") == 0) + rootlen == 3 && strcmp(root, "php") == 0 && pos >= 5 && + sci_get_char_at(sci, pos - 5) == '<' && sci_get_char_at(sci, pos - 4) == '?') { /* nothing, don't complete PHP open tags */ } @@ -2232,7 +2225,6 @@ if (!ret && force) utils_beep(); - g_free(linebuf); return ret; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5899] trunk/src
by colombanw＠users.sourceforge.net 25 Aug '11

25 Aug '11

Revision: 5899 http://geany.svn.sourceforge.net/geany/?rev=5899&view=rev Author: colombanw Date: 2011-08-25 20:12:20 +0000 (Thu, 25 Aug 2011) Log Message: ----------- Use gsize instead of C99 type size_t in Geany's core Modified Paths: -------------- trunk/src/editor.c trunk/src/editor.h trunk/src/prefix.c Modified: trunk/src/editor.c =================================================================== --- trunk/src/editor.c 2011-08-25 20:11:59 UTC (rev 5898) +++ trunk/src/editor.c 2011-08-25 20:12:20 UTC (rev 5899) @@ -110,7 +110,7 @@ static void auto_close_chars(ScintillaObject *sci, gint pos, gchar c); static void close_block(GeanyEditor *editor, gint pos); static void editor_highlight_braces(GeanyEditor *editor, gint cur_pos); -static void read_current_word(GeanyEditor *editor, gint pos, gchar *word, size_t wordlen, +static void read_current_word(GeanyEditor *editor, gint pos, gchar *word, gsize wordlen, const gchar *wc, gboolean stem); static gsize count_indent_size(GeanyEditor *editor, const gchar *base_indent); static const gchar *snippets_find_completion_by_name(const gchar *type, const gchar *name); @@ -1609,7 +1609,7 @@ * NULL terminated in any case, even when the word is truncated because wordlen is too small. * position can be -1, then the current position is used. * wc are the wordchars to use, if NULL, GEANY_WORDCHARS will be used */ -static void read_current_word(GeanyEditor *editor, gint pos, gchar *word, size_t wordlen, +static void read_current_word(GeanyEditor *editor, gint pos, gchar *word, gsize wordlen, const gchar *wc, gboolean stem) { gint line, line_start, startword, endword; @@ -1661,7 +1661,7 @@ * NULL terminated in any case, even when the word is truncated because wordlen is too small. * position can be -1, then the current position is used. * wc are the wordchars to use, if NULL, GEANY_WORDCHARS will be used */ -void editor_find_current_word(GeanyEditor *editor, gint pos, gchar *word, size_t wordlen, +void editor_find_current_word(GeanyEditor *editor, gint pos, gchar *word, gsize wordlen, const gchar *wc) { read_current_word(editor, pos, word, wordlen, wc, FALSE); Modified: trunk/src/editor.h =================================================================== --- trunk/src/editor.h 2011-08-25 20:11:59 UTC (rev 5898) +++ trunk/src/editor.h 2011-08-25 20:12:20 UTC (rev 5899) @@ -237,7 +237,7 @@ /* General editing functions */ -void editor_find_current_word(GeanyEditor *editor, gint pos, gchar *word, size_t wordlen, +void editor_find_current_word(GeanyEditor *editor, gint pos, gchar *word, gsize wordlen, const gchar *wc); void editor_find_current_word_sciwc(GeanyEditor *editor, gint pos, gchar *word, gsize wordlen); Modified: trunk/src/prefix.c =================================================================== --- trunk/src/prefix.c 2011-08-25 20:11:59 UTC (rev 5898) +++ trunk/src/prefix.c 2011-08-25 20:12:20 UTC (rev 5899) @@ -152,7 +152,7 @@ if (symbol >= (void *) start && symbol < (void *) end) { char *tmp; - size_t len; + gsize len; /* Extract the filename; it is always an absolute path */ path = strchr (line, '/'); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5898] trunk/src/editor.c
by colombanw＠users.sourceforge.net 25 Aug '11

25 Aug '11

Revision: 5898 http://geany.svn.sourceforge.net/geany/?rev=5898&view=rev Author: colombanw Date: 2011-08-25 20:11:59 +0000 (Thu, 25 Aug 2011) Log Message: ----------- Fix checks for non-ASCII characters not to rely on signed char Modified Paths: -------------- trunk/src/editor.c Modified: trunk/src/editor.c =================================================================== --- trunk/src/editor.c 2011-08-25 20:11:43 UTC (rev 5897) +++ trunk/src/editor.c 2011-08-25 20:11:59 UTC (rev 5898) @@ -1601,6 +1601,10 @@ } +/* checks whether @p c is an ASCII character (e.g. < 0x80) */ +#define IS_ASCII(c) (((unsigned char)(c)) < 0x80) + + /* Reads the word at given cursor position and writes it into the given buffer. The buffer will be * NULL terminated in any case, even when the word is truncated because wordlen is too small. * position can be -1, then the current position is used. @@ -1632,11 +1636,11 @@ /* the checks for "c < 0" are to allow any Unicode character which should make the code * a little bit more Unicode safe, anyway, this allows also any Unicode punctuation, * TODO: improve this code */ - while (startword > 0 && (strchr(wc, chunk[startword - 1]) || chunk[startword - 1] < 0)) + while (startword > 0 && (strchr(wc, chunk[startword - 1]) || ! IS_ASCII(chunk[startword - 1]))) startword--; if (!stem) { - while (chunk[endword] != 0 && (strchr(wc, chunk[endword]) || chunk[endword] < 0)) + while (chunk[endword] != 0 && (strchr(wc, chunk[endword]) || ! IS_ASCII(chunk[endword]))) endword++; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5897] trunk/src/editor.c
by colombanw＠users.sourceforge.net 25 Aug '11

25 Aug '11

Revision: 5897 http://geany.svn.sourceforge.net/geany/?rev=5897&view=rev Author: colombanw Date: 2011-08-25 20:11:43 +0000 (Thu, 25 Aug 2011) Log Message: ----------- Cleanup word search for word completion Modified Paths: -------------- trunk/src/editor.c Modified: trunk/src/editor.c =================================================================== --- trunk/src/editor.c 2011-08-25 20:11:25 UTC (rev 5896) +++ trunk/src/editor.c 2011-08-25 20:11:43 UTC (rev 5897) @@ -2047,15 +2047,16 @@ } -/* Algorithm based on based on Scite's StartAutoCompleteWord() */ -static GString *get_doc_words(ScintillaObject *sci, gchar *root, gsize rootlen) +/* Algorithm based on based on Scite's StartAutoCompleteWord() + * @returns a sorted list of words matching @p root */ +static GSList *get_doc_words(ScintillaObject *sci, gchar *root, gsize rootlen) { gchar *word; gint len, current, word_end; gint pos_find, flags; guint word_length; gsize nmatches = 0; - GString *words; + GSList *words = NULL; struct Sci_TextToFind ttf; len = sci_get_length(sci); @@ -2068,10 +2069,6 @@ ttf.chrgText.cpMax = 0; flags = SCFIND_WORDSTART | SCFIND_MATCHCASE; - words = g_string_sized_new(256); - /* put space before first entry to make searching with strstr easy */ - g_string_append_c(words, ' '); - /* search the whole document for the word root and collect results */ pos_find = scintilla_send_message(sci, SCI_FINDTEXT, flags, (uptr_t) &ttf); while (pos_find >= 0 && pos_find < len) @@ -2085,17 +2082,15 @@ word_length = word_end - pos_find; if (word_length > rootlen) { - word = g_malloc0(word_length + 3); - sci_get_text_range(sci, pos_find, word_end, word + 1); - word[0] = ' '; - word[word_length + 1] = ' '; - /* search the words string whether we already have the word in, otherwise add it */ - if (strstr(words->str, word) == NULL) + word = sci_get_contents_range(sci, pos_find, word_end); + /* search whether we already have the word in, otherwise add it */ + if (g_slist_find_custom(words, word, (GCompareFunc)utils_str_casecmp) != NULL) + g_free(word); + else { - g_string_append(words, word + 1); + words = g_slist_prepend(words, word); nmatches++; } - g_free(word); if (nmatches == editor_prefs.autocompletion_max_entries) break; @@ -2105,24 +2100,16 @@ pos_find = scintilla_send_message(sci, SCI_FINDTEXT, flags, (uptr_t) &ttf); } - if (words->len > 1) - { - g_strdelimit(words->str, " ", '\n'); - words->str[words->len - 1] = '\0'; /* remove the trailing '\n' */ - return words; - } - g_string_free(words, TRUE); - return NULL; + return g_slist_sort(words, (GCompareFunc)utils_str_casecmp); } static gboolean autocomplete_doc_word(GeanyEditor *editor, gchar *root, gsize rootlen) { ScintillaObject *sci = editor->sci; - GString *words; + GSList *words, *node; GString *str; - gchar *ptr; - GSList *node, *list = NULL; + guint n_words = 0; words = get_doc_words(sci, root, rootlen); if (!words) @@ -2131,31 +2118,19 @@ return FALSE; } - /* words are unsorted, make list of words */ - foreach_str(ptr, words->str) + str = g_string_sized_new(editor_prefs.autocompletion_max_entries * (rootlen + 1)); + foreach_slist(node, words) { - if (*ptr == '\n') - { - list = g_slist_prepend(list, ptr + 1); - /* terminate previous string in list */ - ptr[0] = 0x0; - ptr++; - } - } - list = g_slist_sort(list, (GCompareFunc)utils_str_casecmp); - - str = g_string_sized_new(words->len); - foreach_slist(node, list) - { g_string_append(str, node->data); + g_free(node->data); if (node->next) g_string_append_c(str, '\n'); + n_words++; } - if (g_slist_length(list) >= editor_prefs.autocompletion_max_entries) + if (n_words >= editor_prefs.autocompletion_max_entries) g_string_append(str, "\n..."); - g_slist_free(list); - g_string_free(words, TRUE); + g_slist_free(words); show_autocomplete(sci, rootlen, str->str); g_string_free(str, TRUE); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5896] trunk/src/filetypes.c
by colombanw＠users.sourceforge.net 25 Aug '11

25 Aug '11

Revision: 5896 http://geany.svn.sourceforge.net/geany/?rev=5896&view=rev Author: colombanw Date: 2011-08-25 20:11:25 +0000 (Thu, 25 Aug 2011) Log Message: ----------- Use utils_get_setting() to cleanup filetypes.c:load_settings() Modified Paths: -------------- trunk/src/filetypes.c Modified: trunk/src/filetypes.c =================================================================== --- trunk/src/filetypes.c 2011-08-21 17:15:19 UTC (rev 5895) +++ trunk/src/filetypes.c 2011-08-25 20:11:25 UTC (rev 5896) @@ -1122,36 +1122,28 @@ { GeanyFiletype *ft = filetypes[ft_id]; gchar *result; - GError *error = NULL; - gboolean tmp; /* default extension */ - result = g_key_file_get_string(configh, "settings", "extension", NULL); - if (result == NULL) result = g_key_file_get_string(config, "settings", "extension", NULL); + result = utils_get_setting(string, configh, config, "settings", "extension", NULL); if (result != NULL) { setptr(filetypes[ft_id]->extension, result); } /* read comment notes */ - result = g_key_file_get_string(configh, "settings", "comment_open", NULL); - if (result == NULL) result = g_key_file_get_string(config, "settings", "comment_open", NULL); + result = utils_get_setting(string, configh, config, "settings", "comment_open", NULL); if (result != NULL) { - g_free(filetypes[ft_id]->comment_open); - filetypes[ft_id]->comment_open = result; + setptr(filetypes[ft_id]->comment_open, result); } - result = g_key_file_get_string(configh, "settings", "comment_close", NULL); - if (result == NULL) result = g_key_file_get_string(config, "settings", "comment_close", NULL); + result = utils_get_setting(string, configh, config, "settings", "comment_close", NULL); if (result != NULL) { - g_free(filetypes[ft_id]->comment_close); - filetypes[ft_id]->comment_close = result; + setptr(filetypes[ft_id]->comment_close, result); } - result = g_key_file_get_string(configh, "settings", "comment_single", NULL); - if (result == NULL) result = g_key_file_get_string(config, "settings", "comment_single", NULL); + result = utils_get_setting(string, configh, config, "settings", "comment_single", NULL); if (result != NULL) { setptr(filetypes[ft_id]->comment_single, result); @@ -1163,29 +1155,18 @@ filetypes[ft_id]->comment_open = NULL; } - tmp = g_key_file_get_boolean(configh, "settings", "comment_use_indent", &error); - if (error) - { - g_error_free(error); - error = NULL; - tmp = g_key_file_get_boolean(config, "settings", "comment_use_indent", &error); - if (error) g_error_free(error); - else filetypes[ft_id]->comment_use_indent = tmp; - } - else filetypes[ft_id]->comment_use_indent = tmp; + filetypes[ft_id]->comment_use_indent = utils_get_setting(boolean, configh, config, + "settings", "comment_use_indent", FALSE); /* read context action */ - result = g_key_file_get_string(configh, "settings", "context_action_cmd", NULL); - if (result == NULL) result = g_key_file_get_string(config, "settings", "context_action_cmd", NULL); + result = utils_get_setting(string, configh, config, "settings", "context_action_cmd", NULL); if (result != NULL) { setptr(filetypes[ft_id]->context_action_cmd, result); } - result = utils_get_setting_string(configh, "settings", "tag_parser", NULL); - if (!result) - result = utils_get_setting_string(config, "settings", "tag_parser", NULL); - if (result) + result = utils_get_setting(string, configh, config, "settings", "tag_parser", NULL); + if (result != NULL) { ft->lang = tm_source_file_get_named_lang(result); if (ft->lang < 0) @@ -1193,10 +1174,8 @@ g_free(result); } - result = utils_get_setting_string(configh, "settings", "lexer_filetype", NULL); - if (!result) - result = utils_get_setting_string(config, "settings", "lexer_filetype", NULL); - if (result) + result = utils_get_setting(string, configh, config, "settings", "lexer_filetype", NULL); + if (result != NULL) { ft->lexer_filetype = filetypes_lookup_by_name(result); if (!ft->lexer_filetype) 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 August 2011