From 4376c78a5ba55c94f50a18c7a6d64580b0c5ddbc Mon Sep 17 00:00:00 2001
From: Benno Schulenberg <bensberg@justemail.net>
Date: Sun, 18 Aug 2013 13:00:03 +0200
Subject: [PATCH] Improve some descriptions of the configuration rules.

The informal name for ISO-8859-15 is "Latin-9", capitalized;
use "US" instead of "USA" as an adjective;
consistenly speak of "Compose" instead of "Multi_Key";
use the same wording ("only") where the same thing is meant;
spell "semicolon" correctly;
use the "ShiftLock" word that is also used elsewhere;
don't hyphenate "Shift keys";
make a description more "descriptive" using third person;
remove inconsistent trailing periods;
Esperanto accents are not just circumflexes but also a breve; and
it are not the "accents" that are added but the "accented letters".

Signed-off-by: Benno Schulenberg <bensberg@justemail.net>
---
 rules/base.xml.in | 34 +++++++++++++++++-----------------
 symbols/be        |  2 +-
 symbols/br        |  2 +-
 symbols/fr        |  4 ++--
 symbols/pt        |  2 +-
 symbols/us        |  2 +-
 6 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/rules/base.xml.in b/rules/base.xml.in
index 04ed220..51c4ca5 100644
--- a/rules/base.xml.in
+++ b/rules/base.xml.in
@@ -1414,7 +1414,7 @@
         <variant>
           <configItem>
             <name>olpc2</name>
-            <_description>English (layout toggle on multiply/divide key)</_description>
+            <_description>English (the divide/multiply keys toggle the layout)</_description>
           </configItem>
         </variant>
         <variant>
@@ -1724,7 +1724,7 @@
         <variant>
           <configItem>
             <name>oss_latin9</name>
-            <_description>Belgian (alternative, latin-9 only)</_description>
+            <_description>Belgian (alternative, Latin-9 only)</_description>
           </configItem>
         </variant>
         <variant>
@@ -2180,7 +2180,7 @@
         <variant>
           <configItem>
             <name>nativo-us</name>
-            <_description>Portuguese (Brazil, nativo for USA keyboards)</_description>
+            <_description>Portuguese (Brazil, nativo for US keyboards)</_description>
           </configItem>
         </variant>
         <variant>
@@ -2935,7 +2935,7 @@
         <variant>
           <configItem>
             <name>oss_latin9</name>
-            <_description>French (alternative, latin-9 only)</_description>
+            <_description>French (alternative, Latin-9 only)</_description>
           </configItem>
         </variant>
         <variant>
@@ -2977,7 +2977,7 @@
         <variant>
           <configItem>
             <name>bepo_latin9</name>
-            <_description>French (Bepo, ergonomic, Dvorak way, latin-9 only)</_description>
+            <_description>French (Bepo, ergonomic, Dvorak way, Latin-9 only)</_description>
           </configItem>
         </variant>
         <variant>
@@ -4142,7 +4142,7 @@
         <variant>
           <configItem>
             <name>nativo-us</name>
-            <_description>Portuguese (Nativo for USA keyboards)</_description>
+            <_description>Portuguese (Nativo for US keyboards)</_description>
           </configItem>
         </variant>
         <variant>
@@ -5924,7 +5924,7 @@
       <option>
         <configItem>
           <name>lv3:ralt_switch_multikey</name>
-          <_description>Right Alt, Shift+Right Alt key is Multi_Key</_description>
+          <_description>Right Alt, Shift+Right Alt key is Compose</_description>
         </configItem>
       </option>
       <option>
@@ -6141,7 +6141,7 @@
       <option>
         <configItem>
           <name>kpdl:dotoss_latin9</name>
-          <_description>Four-level key with dot, latin-9 restriction</_description>
+          <_description>Four-level key with dot, Latin-9 only</_description>
        </configItem>
       </option>
       <option>
@@ -6167,7 +6167,7 @@
       <option>
         <configItem>
           <name>kpdl:semi</name>
-          <_description>Semi-colon on third level</_description>
+          <_description>Semicolon on third level</_description>
        </configItem>
       </option>
     </group>
@@ -6248,7 +6248,7 @@
       <option>
         <configItem>
           <name>caps:shiftlock</name>
-          <_description>Caps Lock toggles Shift so all keys are affected</_description>
+          <_description>Caps Lock toggles ShiftLock (affects all keys)</_description>
         </configItem>
       </option>
       <option>
@@ -6502,25 +6502,25 @@
       <option>
         <configItem>
           <name>shift:both_capslock</name>
-          <_description>Both Shift-Keys together toggle Caps Lock</_description>
+          <_description>Both Shift keys together toggle Caps Lock</_description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>shift:both_capslock_cancel</name>
-          <_description>Both Shift-Keys together activate Caps Lock, one Shift-Key deactivates</_description>
+          <_description>Both Shift keys together activate Caps Lock, one Shift key deactivates</_description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>shift:both_shiftlock</name>
-          <_description>Both Shift-Keys together toggle ShiftLock</_description>
+          <_description>Both Shift keys together toggle ShiftLock</_description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>keypad:pointerkeys</name>
-          <_description>Toggle PointerKeys with Shift + NumLock.</_description>
+          <_description>Shift + NumLock toggles PointerKeys</_description>
         </configItem>
       </option>
       <option>
@@ -6765,18 +6765,18 @@
     <group allowMultipleSelection="false">
       <configItem>
         <name>esperanto</name>
-        <_description>Adding Esperanto circumflexes (supersigno)</_description>
+        <_description>Adding Esperanto supersigned letters</_description>
       </configItem>
       <option>
         <configItem>
           <name>esperanto:qwerty</name>
-          <_description>To the corresponding key in a Qwerty keyboard.</_description>
+          <_description>To the corresponding key in a Qwerty layout</_description>
        </configItem>
       </option>
       <option>
         <configItem>
           <name>esperanto:dvorak</name>
-          <_description>To the corresponding key in a Dvorak keyboard.</_description>
+          <_description>To the corresponding key in a Dvorak layout</_description>
        </configItem>
       </option>
     </group>
diff --git a/symbols/be b/symbols/be
index cf8e068..286e928 100644
--- a/symbols/be
+++ b/symbols/be
@@ -110,7 +110,7 @@ xkb_symbols "oss_latin9" {
     include "be(oss_frbe)"
     include "keypad(oss_latin9)"
 
-    name[Group1]="Belgian (alternative, latin-9 only)";
+    name[Group1]="Belgian (alternative, Latin-9 only)";
 
     // First row
     key <TLDE>	{ [      twosuperior,    threesuperior,          onesuperior,                  less ] }; // ² ³ ¹ < 
diff --git a/symbols/br b/symbols/br
index dee7188..b75ffc9 100644
--- a/symbols/br
+++ b/symbols/br
@@ -283,7 +283,7 @@ partial alphanumeric_keys
 xkb_symbols "nativo-us" {
     include "br(nativo)"
 
-    name[Group1]="Portuguese (Brazil, nativo for USA keyboards)";
+    name[Group1]="Portuguese (Brazil, nativo for US keyboards)";
 
 // Lower row
     key <AB01> { [            y,               Y,              ccedilla,        Ccedilla ] };
diff --git a/symbols/fr b/symbols/fr
index 0d1d13d..418ff52 100644
--- a/symbols/fr
+++ b/symbols/fr
@@ -200,7 +200,7 @@ xkb_symbols "oss_latin9" {
     include "fr(oss)"
     include "keypad(oss_latin9)"
 
-    name[Group1]="French (alternative, latin-9 only)";
+    name[Group1]="French (alternative, Latin-9 only)";
 
     // First row
     key <AE01>	{ [        ampersand,                1,           dead_caron,          dead_cedilla ] }; // & 1 ˇ ¸
@@ -547,7 +547,7 @@ xkb_symbols "bepo_latin9" {
     include "fr(bepo)"
     include "keypad(oss_latin9)"
 
-    name[Group1]="French (Bepo, ergonomic, Dvorak way, latin-9 only)";
+    name[Group1]="French (Bepo, ergonomic, Dvorak way, Latin-9 only)";
 
     key <TLDE> { [          dollar,   numbersign,        dollar,       paragraph ] }; // $ # $ ¶
 
diff --git a/symbols/pt b/symbols/pt
index e42b408..b2e0b12 100644
--- a/symbols/pt
+++ b/symbols/pt
@@ -186,7 +186,7 @@ partial alphanumeric_keys
 xkb_symbols "nativo-us" {
     include "pt(nativo)"
 
-    name[Group1]="Portuguese (Nativo for USA keyboards)";
+    name[Group1]="Portuguese (Nativo for US keyboards)";
 
 // Lower row
     key <AB01> { [            y,               Y,              ccedilla,        Ccedilla ] };
diff --git a/symbols/us b/symbols/us
index b34bedc..2ab72d1 100644
--- a/symbols/us
+++ b/symbols/us
@@ -1052,7 +1052,7 @@ xkb_symbols "olpc" {
 partial alphanumeric_keys
 xkb_symbols "olpc2" {
    include "us(olpc)"
-   name[Group1]= "English (layout toggle on multiply/divide key)";
+   name[Group1]= "English (the divide/multiply keys toggle the layout)";
    include "group(olpc)"
 };
 
-- 
2.7.4