From bed73a2742be1d566a82e3cdd478a27853e988bd Mon Sep 17 00:00:00 2001
From: Albert Astals Cid <aacid@kde.org>
Date: Sun, 8 Dec 2013 22:50:06 +0100
Subject: [PATCH] french -> French

Found by Marce Villarino
(cherry picked from commit 1628ba91f150d31132ae2118846c14e1f4628c56)
backport to 4.12.1
---
 doc/kmail/configure.docbook                                       | 2 +-
 messagecomposer/autocorrection/ui/composerautocorrectionwidget.ui | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/kmail/configure.docbook b/doc/kmail/configure.docbook
index 102357767a..e6dae87952 100644
--- a/doc/kmail/configure.docbook
+++ b/doc/kmail/configure.docbook
@@ -1242,7 +1242,7 @@ of key words can be modified.</para>
              <listitem>
                <para>
                You can replace double or single quotes with typographical quotes by checking the appropriate box.
-               You can also add non breaking space before specific punctuation marks in french text by selecting the option.
+               You can also add non breaking space before specific punctuation marks in French text by selecting the option.
                </para>
              </listitem>
            </varlistentry>
diff --git a/messagecomposer/autocorrection/ui/composerautocorrectionwidget.ui b/messagecomposer/autocorrection/ui/composerautocorrectionwidget.ui
index 130ac50c97..970140c4f0 100644
--- a/messagecomposer/autocorrection/ui/composerautocorrectionwidget.ui
+++ b/messagecomposer/autocorrection/ui/composerautocorrectionwidget.ui
@@ -267,7 +267,7 @@
        <item row="4" column="0" colspan="2">
         <widget class="QCheckBox" name="addNonBreakingSpaceInFrench">
          <property name="text">
-          <string>Add non breaking space before specific punctuation marks in french text</string>
+          <string>Add non breaking space before specific punctuation marks in French text</string>
          </property>
         </widget>
        </item>
-- 
2.11.4.GIT