diff --git a/ChangeLog b/ChangeLog index d1c9ce18..3faf1ed6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-03-09 Nick Treleaven + + * src/interface.c, doc/geany.docbook, data/filetypes.*, geany.glade: + Fix indentation spelling. + + 2007-03-08 Nick Treleaven * src/document.c: diff --git a/data/filetypes.asm b/data/filetypes.asm index 44c3a1de..be42a58a 100644 --- a/data/filetypes.asm +++ b/data/filetypes.asm @@ -34,7 +34,7 @@ comment_open=; comment_close= # set to false if a comment character/string should start at column 0 of a line, true uses any -# indention of the line, e.g. setting to true causes the following on pressing CTRL+d +# indentation of the line, e.g. setting to true causes the following on pressing CTRL+d #command_example(); # setting to false would generate this # command_example(); diff --git a/data/filetypes.c b/data/filetypes.c index ddbaa300..c60af2be 100644 --- a/data/filetypes.c +++ b/data/filetypes.c @@ -44,7 +44,7 @@ comment_close= #comment_close=*/ # set to false if a comment character/string should start at column 0 of a line, true uses any -# indention of the line, e.g. setting to true causes the following on pressing CTRL+d +# indentation of the line, e.g. setting to true causes the following on pressing CTRL+d #command_example(); # setting to false would generate this # command_example(); diff --git a/data/filetypes.caml b/data/filetypes.caml index db420760..a3595568 100644 --- a/data/filetypes.caml +++ b/data/filetypes.caml @@ -31,7 +31,7 @@ comment_open=(* comment_close=*) # set to false if a comment character/string should start at column 0 of a line, true uses any -# indention of the line, e.g. setting to true causes the following on pressing CTRL+d +# indentation of the line, e.g. setting to true causes the following on pressing CTRL+d #command_example(); # setting to false would generate this # command_example(); diff --git a/data/filetypes.conf b/data/filetypes.conf index 4a004efe..6a4819fd 100644 --- a/data/filetypes.conf +++ b/data/filetypes.conf @@ -20,7 +20,7 @@ comment_open=# comment_close= # set to false if a comment character/string should start at column 0 of a line, true uses any -# indention of the line, e.g. setting to true causes the following on pressing CTRL+d +# indentation of the line, e.g. setting to true causes the following on pressing CTRL+d #command_example(); # setting to false would generate this # command_example(); diff --git a/data/filetypes.cpp b/data/filetypes.cpp index bd7dd02d..5532255e 100644 --- a/data/filetypes.cpp +++ b/data/filetypes.cpp @@ -44,7 +44,7 @@ comment_close= #comment_close=*/ # set to false if a comment character/string should start at column 0 of a line, true uses any -# indention of the line, e.g. setting to true causes the following on pressing CTRL+d +# indentation of the line, e.g. setting to true causes the following on pressing CTRL+d #command_example(); # setting to false would generate this # command_example(); diff --git a/data/filetypes.css b/data/filetypes.css index d6b4c79c..68a23630 100644 --- a/data/filetypes.css +++ b/data/filetypes.css @@ -33,7 +33,7 @@ comment_open=/* comment_close=*/ # set to false if a comment character/string should start at column 0 of a line, true uses any -# indention of the line, e.g. setting to true causes the following on pressing CTRL+d +# indentation of the line, e.g. setting to true causes the following on pressing CTRL+d #command_example(); # setting to false would generate this # command_example(); diff --git a/data/filetypes.d b/data/filetypes.d index 413e2ce0..3b2d1934 100644 --- a/data/filetypes.d +++ b/data/filetypes.d @@ -43,7 +43,7 @@ comment_close= #comment_close=+/ # set to false if a comment character/string should start at column 0 of a line, true uses any -# indention of the line, e.g. setting to true causes the following on pressing CTRL+d +# indentation of the line, e.g. setting to true causes the following on pressing CTRL+d #command_example(); # setting to false would generate this # command_example(); diff --git a/data/filetypes.docbook b/data/filetypes.docbook index 1855c875..cce25714 100644 --- a/data/filetypes.docbook +++ b/data/filetypes.docbook @@ -46,7 +46,7 @@ comment_open= # set to false if a comment character/string should start at column 0 of a line, true uses any -# indention of the line, e.g. setting to true causes the following on pressing CTRL+d +# indentation of the line, e.g. setting to true causes the following on pressing CTRL+d #command_example(); # setting to false would generate this # command_example(); diff --git a/data/filetypes.ferite b/data/filetypes.ferite index 0c79030c..bdf68b26 100644 --- a/data/filetypes.ferite +++ b/data/filetypes.ferite @@ -40,7 +40,7 @@ comment_close= #comment_close=*/ # set to false if a comment character/string should start at column 0 of a line, true uses any -# indention of the line, e.g. setting to true causes the following on pressing CTRL+d +# indentation of the line, e.g. setting to true causes the following on pressing CTRL+d #command_example(); # setting to false would generate this # command_example(); diff --git a/data/filetypes.fortran b/data/filetypes.fortran index 3c492cef..e83ca514 100644 --- a/data/filetypes.fortran +++ b/data/filetypes.fortran @@ -35,7 +35,7 @@ comment_open=c comment_close= # set to false if a comment character/string should start at column 0 of a line, true uses any -# indention of the line, e.g. setting to true causes the following on pressing CTRL+d +# indentation of the line, e.g. setting to true causes the following on pressing CTRL+d #command_example(); # setting to false would generate this # command_example(); diff --git a/data/filetypes.html b/data/filetypes.html index 196cb037..b0752d3d 100644 --- a/data/filetypes.html +++ b/data/filetypes.html @@ -13,7 +13,7 @@ comment_open= # set to false if a comment character/string should start at column 0 of a line, true uses any -# indention of the line, e.g. setting to true causes the following on pressing CTRL+d +# indentation of the line, e.g. setting to true causes the following on pressing CTRL+d #command_example(); # setting to false would generate this # command_example(); diff --git a/data/filetypes.java b/data/filetypes.java index bf4d7f4d..b8a3e48b 100644 --- a/data/filetypes.java +++ b/data/filetypes.java @@ -39,7 +39,7 @@ comment_open=/* comment_close=*/ # set to false if a comment character/string should start at column 0 of a line, true uses any -# indention of the line, e.g. setting to true causes the following on pressing CTRL+d +# indentation of the line, e.g. setting to true causes the following on pressing CTRL+d #command_example(); # setting to false would generate this # command_example(); diff --git a/data/filetypes.javascript b/data/filetypes.javascript index 97488d9c..c36dda73 100644 --- a/data/filetypes.javascript +++ b/data/filetypes.javascript @@ -35,7 +35,7 @@ comment_open=// comment_close= # set to false if a comment character/string should start at column 0 of a line, true uses any -# indention of the line, e.g. setting to true causes the following on pressing CTRL+d +# indentation of the line, e.g. setting to true causes the following on pressing CTRL+d #command_example(); # setting to false would generate this # command_example(); diff --git a/data/filetypes.latex b/data/filetypes.latex index 2ce81395..b6c605a1 100644 --- a/data/filetypes.latex +++ b/data/filetypes.latex @@ -21,7 +21,7 @@ comment_open=% comment_close= # set to false if a comment character/string should start at column 0 of a line, true uses any -# indention of the line, e.g. setting to true causes the following on pressing CTRL+d +# indentation of the line, e.g. setting to true causes the following on pressing CTRL+d #command_example(); # setting to false would generate this # command_example(); diff --git a/data/filetypes.lua b/data/filetypes.lua index 525977a8..377dd2a1 100644 --- a/data/filetypes.lua +++ b/data/filetypes.lua @@ -49,7 +49,7 @@ comment_close= #comment_close=]]-- # set to false if a comment character/string should start at column 0 of a line, true uses any -# indention of the line, e.g. setting to true causes the following on pressing CTRL+d +# indentation of the line, e.g. setting to true causes the following on pressing CTRL+d #command_example(); # setting to false would generate this # command_example(); diff --git a/data/filetypes.makefile b/data/filetypes.makefile index 16c0ade3..089ae1f4 100644 --- a/data/filetypes.makefile +++ b/data/filetypes.makefile @@ -21,7 +21,7 @@ comment_open=# comment_close= # set to false if a comment character/string should start at column 0 of a line, true uses any -# indention of the line, e.g. setting to true causes the following on pressing CTRL+d +# indentation of the line, e.g. setting to true causes the following on pressing CTRL+d #command_example(); # setting to false would generate this # command_example(); diff --git a/data/filetypes.oms b/data/filetypes.oms index 01038b3b..3a8641a7 100644 --- a/data/filetypes.oms +++ b/data/filetypes.oms @@ -27,7 +27,7 @@ comment_open=# comment_close= # set to false if a comment character/string should start at column 0 of a line, true uses any -# indention of the line, e.g. setting to true causes the following on pressing CTRL+d +# indentation of the line, e.g. setting to true causes the following on pressing CTRL+d #command_example(); # setting to false would generate this # command_example(); diff --git a/data/filetypes.pascal b/data/filetypes.pascal index ca68b954..b78c9387 100644 --- a/data/filetypes.pascal +++ b/data/filetypes.pascal @@ -27,7 +27,7 @@ comment_open={ comment_close=} # set to false if a comment character/string should start at column 0 of a line, true uses any -# indention of the line, e.g. setting to true causes the following on pressing CTRL+d +# indentation of the line, e.g. setting to true causes the following on pressing CTRL+d #command_example(); # setting to false would generate this # command_example(); diff --git a/data/filetypes.perl b/data/filetypes.perl index 2e981cf9..d02dfa08 100644 --- a/data/filetypes.perl +++ b/data/filetypes.perl @@ -45,7 +45,7 @@ comment_open=# comment_close= # set to false if a comment character/string should start at column 0 of a line, true uses any -# indention of the line, e.g. setting to true causes the following on pressing CTRL+d +# indentation of the line, e.g. setting to true causes the following on pressing CTRL+d #command_example(); # setting to false would generate this # command_example(); diff --git a/data/filetypes.php b/data/filetypes.php index bef46b95..50a749fd 100644 --- a/data/filetypes.php +++ b/data/filetypes.php @@ -13,7 +13,7 @@ comment_open=/* comment_close=*/ # set to false if a comment character/string should start at column 0 of a line, true uses any -# indention of the line, e.g. setting to true causes the following on pressing CTRL+d +# indentation of the line, e.g. setting to true causes the following on pressing CTRL+d #command_example(); # setting to false would generate this # command_example(); diff --git a/data/filetypes.python b/data/filetypes.python index 3dd797ff..6c31c119 100644 --- a/data/filetypes.python +++ b/data/filetypes.python @@ -30,7 +30,7 @@ comment_open=# comment_close= # set to false if a comment character/string should start at column 0 of a line, true uses any -# indention of the line, e.g. setting to true causes the following on pressing CTRL+d +# indentation of the line, e.g. setting to true causes the following on pressing CTRL+d #command_example(); # setting to false would generate this # command_example(); diff --git a/data/filetypes.ruby b/data/filetypes.ruby index c3526649..0054fd98 100644 --- a/data/filetypes.ruby +++ b/data/filetypes.ruby @@ -49,7 +49,7 @@ comment_open=# comment_close= # set to false if a comment character/string should start at column 0 of a line, true uses any -# indention of the line, e.g. setting to true causes the following on pressing CTRL+d +# indentation of the line, e.g. setting to true causes the following on pressing CTRL+d #command_example(); # setting to false would generate this # command_example(); diff --git a/data/filetypes.sh b/data/filetypes.sh index 416d44e2..d31dcfec 100644 --- a/data/filetypes.sh +++ b/data/filetypes.sh @@ -26,7 +26,7 @@ comment_open=# comment_close= # set to false if a comment character/string should start a column 0 of a line, true uses any -# indention of the line, e.g. setting to true causes the following on pressing CTRL+d +# indentation of the line, e.g. setting to true causes the following on pressing CTRL+d #command_example(); # setting to false would generate this # command_example(); diff --git a/data/filetypes.sql b/data/filetypes.sql index c6db2e6e..66310221 100644 --- a/data/filetypes.sql +++ b/data/filetypes.sql @@ -31,7 +31,7 @@ comment_open=/* comment_close=*/ # set to false if a comment character/string should start at column 0 of a line, true uses any -# indention of the line, e.g. setting to true causes the following on pressing CTRL+d +# indentation of the line, e.g. setting to true causes the following on pressing CTRL+d #command_example(); # setting to false would generate this # command_example(); diff --git a/data/filetypes.tcl b/data/filetypes.tcl index 46afbe07..fa319736 100644 --- a/data/filetypes.tcl +++ b/data/filetypes.tcl @@ -37,7 +37,7 @@ comment_open=# comment_close= # set to false if a comment character/string should start at column 0 of a line, true uses any -# indention of the line, e.g. setting to true causes the following on pressing CTRL+d +# indentation of the line, e.g. setting to true causes the following on pressing CTRL+d #command_example(); # setting to false would generate this # command_example(); diff --git a/data/filetypes.vhdl b/data/filetypes.vhdl index ee016e8a..3a74b59b 100644 --- a/data/filetypes.vhdl +++ b/data/filetypes.vhdl @@ -36,7 +36,7 @@ comment_open=-- comment_close= # set to false if a comment character/string should start at column 0 of a line, true uses any -# indention of the line, e.g. setting to true causes the following on pressing CTRL+d +# indentation of the line, e.g. setting to true causes the following on pressing CTRL+d #command_example(); # setting to false would generate this # command_example(); diff --git a/data/filetypes.xml b/data/filetypes.xml index a2423595..15e3b433 100644 --- a/data/filetypes.xml +++ b/data/filetypes.xml @@ -83,7 +83,7 @@ comment_open= # set to false if a comment character/string should start at column 0 of a line, true uses any -# indention of the line, e.g. setting to true causes the following on pressing CTRL+d +# indentation of the line, e.g. setting to true causes the following on pressing CTRL+d #command_example(); # setting to false would generate this # command_example(); diff --git a/doc/geany.docbook b/doc/geany.docbook index 966bb7ba..ea115ba3 100644 --- a/doc/geany.docbook +++ b/doc/geany.docbook @@ -380,16 +380,16 @@ was copied to the new position. -
- Auto indention +
+ Auto indentation - Geany knows three types of auto indention: + Geany knows three types of auto indentation: None, Basic and Advanced. - Auto indention types + Auto indentation types None - Disables auto indention completely. + Disables auto indentation completely. diff --git a/geany.glade b/geany.glade index 25b2b24d..65c0b1ff 100644 --- a/geany.glade +++ b/geany.glade @@ -5319,7 +5319,7 @@ Bottom True - Auto indention mode: + Auto indentation mode: False False GTK_JUSTIFY_LEFT @@ -5344,7 +5344,7 @@ Bottom True - Selects the indention mode. Use None to disable auto indention completely. Basic indents new lines with the same indention as the previous line. Advanced does the same and indents also curly brackets. + Selects the indentation mode. Use None to disable auto indentation completely. Basic indents new lines with the same indentation as the previous line. Advanced does the same and indents also curly brackets. True False diff --git a/src/interface.c b/src/interface.c index 4e6e1b3f..0629504e 100644 --- a/src/interface.c +++ b/src/interface.c @@ -3334,14 +3334,14 @@ create_prefs_dialog (void) gtk_widget_show (hbox7); gtk_box_pack_start (GTK_BOX (vbox17), hbox7, FALSE, FALSE, 0); - label183 = gtk_label_new (_("Auto indention mode:")); + label183 = gtk_label_new (_("Auto indentation mode:")); gtk_widget_show (label183); gtk_box_pack_start (GTK_BOX (hbox7), label183, FALSE, FALSE, 0); eventbox2 = gtk_event_box_new (); gtk_widget_show (eventbox2); gtk_box_pack_start (GTK_BOX (hbox7), eventbox2, FALSE, TRUE, 5); - gtk_tooltips_set_tip (tooltips, eventbox2, _("Selects the indention mode. Use None to disable auto indention completely. Basic indents new lines with the same indention as the previous line. Advanced does the same and indents also curly brackets."), NULL); + gtk_tooltips_set_tip (tooltips, eventbox2, _("Selects the indentation mode. Use None to disable auto indentation completely. Basic indents new lines with the same indentation as the previous line. Advanced does the same and indents also curly brackets."), NULL); combo_auto_indent_mode = gtk_combo_box_new_text (); gtk_widget_show (combo_auto_indent_mode);