[gcalctool] Use upper case for boolean operators (Bug #610475)

[Robert Ancell <rancell src gnome org>]

commit 9b1bc72bb8ae70db2e526a6c358d347068d3b723
Author: Robert Ancell <robert ancell gmail com>
Date:   Mon Feb 22 09:16:29 2010 +1100

    Use upper case for boolean operators (Bug #610475)

 data/gcalctool.ui   |    8 ++++----
 help/C/boolean.page |    8 ++++----
 src/gtk.c           |   10 +++++-----
 3 files changed, 13 insertions(+), 13 deletions(-)
---
diff --git a/data/gcalctool.ui b/data/gcalctool.ui
index 9d9be6f..9d98b7a 100644
--- a/data/gcalctool.ui
+++ b/data/gcalctool.ui
@@ -3139,7 +3139,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="calc_and_button">
-                    <property name="label">and</property>
+                    <property name="label">AND</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -3158,7 +3158,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="calc_or_button">
-                    <property name="label">or</property>
+                    <property name="label">OR</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -3177,7 +3177,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="calc_not_button">
-                    <property name="label">not</property>
+                    <property name="label">NOT</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -3196,7 +3196,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="calc_xor_button">
-                    <property name="label">xor</property>
+                    <property name="label">XOR</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
diff --git a/help/C/boolean.page b/help/C/boolean.page
index 263a121..080c28e 100644
--- a/help/C/boolean.page
+++ b/help/C/boolean.page
@@ -9,23 +9,23 @@
 	<title>Boolean Algebra</title>
     
     <p>
-    Boolean algebra can be calculated using the and, or and xor operators.
+    Boolean algebra can be calculated using the AND, OR and XOR operators.
     </p>
     <example>
     <p>
-    010011â?? and 110101â??
+    010011â?? AND 110101â??
     </p>
     </example>
     <p>
     Buttons for these symbols are available in <link xref="mouse">programming mode</link>.
     </p>
     <p>
-    The not <link xref="function">function</link> inverts the bits in a number.
+    The NOT <link xref="function">function</link> inverts the bits in a number.
     The word size is set from the <guiseq><gui>Calculator</gui><gui>Preferences</gui></guiseq> menu.
     </p>
     <example>
     <p>
-    not 010011â??
+    NOT 010011â??
     </p>
     </example>
 </page>
diff --git a/src/gtk.c b/src/gtk.c
index 3261f59..62f89f4 100644
--- a/src/gtk.c
+++ b/src/gtk.c
@@ -59,7 +59,7 @@ static ButtonData button_data[] = {
     {"subtract",           "â??"},
     {"multiply",           "Ã?"},
     {"divide",             "÷"},
-    {"modulus_divide",     "mod"},
+    {"modulus_divide",     " mod "},
     {"x_pow_y",            "^"},
     {"exponential",        "Ã?10^"},
     {"percentage",         "%"},
@@ -78,10 +78,10 @@ static ButtonData button_data[] = {
     {"base_2",             "â??"},
     {"base_8",             "â??"},
     {"base_16",            "â??â??"},
-    {"and",                "and"},
-    {"or",                 "or"},
-    {"xor",                "xor"},
-    {"not",                "not"},
+    {"and",                " AND "},
+    {"or",                 " OR "},
+    {"xor",                " XOR "},
+    {"not",                " NOT "},
     {"integer_portion",    "int"},
     {"fractional_portion", "frac"},
     {"ones_complement",    "ones"},