SF.net SVN: geany:[5429] trunk

ntrel at users.sourceforge.net ntrel at xxxxx
Tue Nov 23 13:43:36 UTC 2010


Revision: 5429
          http://geany.svn.sourceforge.net/geany/?rev=5429&view=rev
Author:   ntrel
Date:     2010-11-23 13:43:36 +0000 (Tue, 23 Nov 2010)

Log Message:
-----------
Don't use 'Enable' in pref labels when unnecessary.
Rename XML/HTML tag autocompletion -> auto-closing.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/doc/geany.html
    trunk/doc/geany.txt
    trunk/geany.glade
    trunk/src/interface.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2010-11-23 13:17:42 UTC (rev 5428)
+++ trunk/ChangeLog	2010-11-23 13:43:36 UTC (rev 5429)
@@ -8,6 +8,9 @@
    Definition look for a tag declaration instead, as this is more
    useful. Likewise make Go to Tag Declaration search for a tag
    definition in this case also.
+ * src/interface.c, doc/geany.txt, doc/geany.html, geany.glade:
+   Don't use 'Enable' in pref labels when unnecessary.
+   Rename XML/HTML tag autocompletion -> auto-closing.
 
 
 2010-11-22  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>

Modified: trunk/doc/geany.html
===================================================================
--- trunk/doc/geany.html	2010-11-23 13:17:42 UTC (rev 5428)
+++ trunk/doc/geany.html	2010-11-23 13:43:36 UTC (rev 5429)
@@ -6,7 +6,7 @@
 <meta name="generator" content="Docutils 0.4: http://docutils.sourceforge.net/" />
 <title>Geany</title>
 <meta name="authors" content="Enrico Tröger  Nick Treleaven  Frank Lanitz" />
-<meta name="date" content="2010-11-22" />
+<meta name="date" content="2010-11-23" />
 <style type="text/css">
 
 /*
@@ -139,7 +139,7 @@
 <br />Nick Treleaven
 <br />Frank Lanitz</td></tr>
 <tr><th class="docinfo-name">Date:</th>
-<td>2010-11-22</td></tr>
+<td>2010-11-23</td></tr>
 <tr><th class="docinfo-name">Version:</th>
 <td>0.20</td></tr>
 </tbody>
@@ -2263,13 +2263,13 @@
 <dl class="docutils">
 <dt>Line wrapping</dt>
 <dd>Show long lines wrapped around to new display lines.</dd>
-<dt>Enable "smart" home key</dt>
+<dt>"Smart" home key</dt>
 <dd>Whether to move the cursor to the first non-whitespace character
 on the line when you hit the home key on your keyboard. Pressing it
 again will go to the very start of the line.</dd>
 <dt>Disable Drag and Drop</dt>
 <dd>Do not allow the dragging and dropping of selected text in documents.</dd>
-<dt>Enable folding</dt>
+<dt>Code folding</dt>
 <dd>Allow groups of lines in a document to be collapsed for easier
 navigation/editing.</dd>
 <dt>Fold/Unfold all children of a fold point</dt>
@@ -2352,8 +2352,9 @@
 <dd>Whether to replace special keywords after typing Tab into a
 pre-defined text snippet.
 See <a class="reference" href="#user-definable-snippets">User-definable snippets</a>.</dd>
-<dt>XML/HTML tag autocompletion</dt>
-<dd>When you open an XML tag automatically generate its completion tag.</dd>
+<dt>XML/HTML tag auto-closing</dt>
+<dd>When you open an XML/HTML tag automatically generate its
+completion tag.</dd>
 <dt>Automatic continuation multi-line comments</dt>
 <dd><p class="first">Continue automatically multi-line comments in languages like C, C++
 and Java when a new line is entered inside such a comment.
@@ -6366,7 +6367,7 @@
 <div class="footer">
 <hr class="footer" />
 <a class="reference" href="geany.txt">View document source</a>.
-Generated on: 2010-11-23 13:12 UTC.
+Generated on: 2010-11-23 13:39 UTC.
 Generated by <a class="reference" href="http://docutils.sourceforge.net/">Docutils</a> from <a class="reference" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> source.
 
 </div>

Modified: trunk/doc/geany.txt
===================================================================
--- trunk/doc/geany.txt	2010-11-23 13:17:42 UTC (rev 5428)
+++ trunk/doc/geany.txt	2010-11-23 13:43:36 UTC (rev 5429)
@@ -1921,7 +1921,7 @@
 Line wrapping
     Show long lines wrapped around to new display lines.
 
-Enable "smart" home key
+"Smart" home key
     Whether to move the cursor to the first non-whitespace character
     on the line when you hit the home key on your keyboard. Pressing it
     again will go to the very start of the line.
@@ -1929,7 +1929,7 @@
 Disable Drag and Drop
     Do not allow the dragging and dropping of selected text in documents.
 
-Enable folding
+Code folding
     Allow groups of lines in a document to be collapsed for easier
     navigation/editing.
 
@@ -2019,8 +2019,9 @@
     pre-defined text snippet.
     See `User-definable snippets`_.
 
-XML/HTML tag autocompletion
-    When you open an XML tag automatically generate its completion tag.
+XML/HTML tag auto-closing
+    When you open an XML/HTML tag automatically generate its
+    completion tag.
 
 Automatic continuation multi-line comments
     Continue automatically multi-line comments in languages like C, C++

Modified: trunk/geany.glade
===================================================================
--- trunk/geany.glade	2010-11-23 13:17:42 UTC (rev 5428)
+++ trunk/geany.glade	2010-11-23 13:43:36 UTC (rev 5429)
@@ -5673,7 +5673,7 @@
 				  <property name="visible">True</property>
 				  <property name="tooltip" translatable="yes">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.</property>
 				  <property name="can_focus">True</property>
-				  <property name="label" translatable="yes">Enable "smart" home key</property>
+				  <property name="label" translatable="yes">"Smart" home key</property>
 				  <property name="use_underline">True</property>
 				  <property name="relief">GTK_RELIEF_NORMAL</property>
 				  <property name="focus_on_click">True</property>
@@ -5711,9 +5711,8 @@
 			      <child>
 				<widget class="GtkCheckButton" id="check_folding">
 				  <property name="visible">True</property>
-				  <property name="tooltip" translatable="yes">Whether to enable folding the code</property>
 				  <property name="can_focus">True</property>
-				  <property name="label" translatable="yes">Enable folding</property>
+				  <property name="label" translatable="yes">Code folding</property>
 				  <property name="use_underline">True</property>
 				  <property name="relief">GTK_RELIEF_NORMAL</property>
 				  <property name="focus_on_click">True</property>
@@ -6391,7 +6390,7 @@
 				  <property name="visible">True</property>
 				  <property name="tooltip" translatable="yes">Insert matching closing tag for XML/HTML</property>
 				  <property name="can_focus">True</property>
-				  <property name="label" translatable="yes">XML/HTML tag autocompletion</property>
+				  <property name="label" translatable="yes">XML/HTML tag auto-closing</property>
 				  <property name="use_underline">True</property>
 				  <property name="relief">GTK_RELIEF_NORMAL</property>
 				  <property name="focus_on_click">True</property>
@@ -6738,7 +6737,7 @@
 			      <child>
 				<widget class="GtkCheckButton" id="check_autoclose_squote">
 				  <property name="visible">True</property>
-				  <property name="tooltip" translatable="yes">Auto-close simple quote when typing an opening one</property>
+				  <property name="tooltip" translatable="yes">Auto-close single quote when typing an opening one</property>
 				  <property name="can_focus">True</property>
 				  <property name="label" translatable="yes">Single quotes ' '</property>
 				  <property name="use_underline">True</property>

Modified: trunk/src/interface.c
===================================================================
--- trunk/src/interface.c	2010-11-23 13:17:42 UTC (rev 5428)
+++ trunk/src/interface.c	2010-11-23 13:43:36 UTC (rev 5429)
@@ -3699,7 +3699,7 @@
   gtk_box_pack_start (GTK_BOX (vbox17), check_line_wrapping, FALSE, FALSE, 0);
   gtk_tooltips_set_tip (tooltips, check_line_wrapping, _("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."), NULL);
 
-  check_smart_home = gtk_check_button_new_with_mnemonic (_("Enable \"smart\" home key"));
+  check_smart_home = gtk_check_button_new_with_mnemonic (_("\"Smart\" home key"));
   gtk_widget_show (check_smart_home);
   gtk_box_pack_start (GTK_BOX (vbox17), check_smart_home, FALSE, FALSE, 0);
   gtk_tooltips_set_tip (tooltips, check_smart_home, _("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."), NULL);
@@ -3709,10 +3709,9 @@
   gtk_box_pack_start (GTK_BOX (vbox17), check_disable_dnd, FALSE, FALSE, 0);
   gtk_tooltips_set_tip (tooltips, check_disable_dnd, _("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"), NULL);
 
-  check_folding = gtk_check_button_new_with_mnemonic (_("Enable folding"));
+  check_folding = gtk_check_button_new_with_mnemonic (_("Code folding"));
   gtk_widget_show (check_folding);
   gtk_box_pack_start (GTK_BOX (vbox17), check_folding, FALSE, FALSE, 0);
-  gtk_tooltips_set_tip (tooltips, check_folding, _("Whether to enable folding the code"), NULL);
 
   check_unfold_children = gtk_check_button_new_with_mnemonic (_("Fold/unfold all children of a fold point"));
   gtk_widget_show (check_unfold_children);
@@ -3908,7 +3907,7 @@
   gtk_box_pack_start (GTK_BOX (vbox19), check_complete_snippets, FALSE, FALSE, 0);
   gtk_tooltips_set_tip (tooltips, check_complete_snippets, _("Type a defined short character sequence and complete it to a more complex string using a single keypress"), NULL);
 
-  check_xmltag = gtk_check_button_new_with_mnemonic (_("XML/HTML tag autocompletion"));
+  check_xmltag = gtk_check_button_new_with_mnemonic (_("XML/HTML tag auto-closing"));
   gtk_widget_show (check_xmltag);
   gtk_box_pack_start (GTK_BOX (vbox19), check_xmltag, FALSE, FALSE, 0);
   gtk_tooltips_set_tip (tooltips, check_xmltag, _("Insert matching closing tag for XML/HTML"), NULL);
@@ -4016,7 +4015,7 @@
   gtk_table_attach (GTK_TABLE (table16), check_autoclose_squote, 0, 1, 3, 4,
                     (GtkAttachOptions) (GTK_FILL),
                     (GtkAttachOptions) (0), 0, 0);
-  gtk_tooltips_set_tip (tooltips, check_autoclose_squote, _("Auto-close simple quote when typing an opening one"), NULL);
+  gtk_tooltips_set_tip (tooltips, check_autoclose_squote, _("Auto-close single quote when typing an opening one"), NULL);
 
   check_autoclose_cbracket = gtk_check_button_new_with_mnemonic (_("Curly brackets { }"));
   gtk_widget_show (check_autoclose_cbracket);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.



More information about the Commits mailing list