[evolution] Change 'file name' to 'filename' according to the GDP Style Guide

[Andre Klapper <aklapper src gnome org>]

commit 771b41d952bf2a272f8adf681b5d30984ee87a5e
Author: Andre Klapper <a9016009 gmx de>
Date:   Fri Feb 17 15:11:39 2012 +0100

    Change 'file name' to 'filename' according to the GDP Style Guide

 data/org.gnome.evolution.mail.gschema.xml.in       |    4 ++--
 ...olution.plugin.mail-notification.gschema.xml.in |    2 +-
 filter/filter.error.xml                            |    8 ++++----
 mail/evolution-mail.schemas.in                     |    6 +++---
 mail/mail-config.ui                                |    2 +-
 .../apps-evolution-mail-notification.schemas.in    |    2 +-
 shell/main.c                                       |    2 +-
 7 files changed, 13 insertions(+), 13 deletions(-)
---
diff --git a/data/org.gnome.evolution.mail.gschema.xml.in b/data/org.gnome.evolution.mail.gschema.xml.in
index 8161a48..bc7645b 100644
--- a/data/org.gnome.evolution.mail.gschema.xml.in
+++ b/data/org.gnome.evolution.mail.gschema.xml.in
@@ -107,8 +107,8 @@
     </key>
     <key name="composer-outlook-filenames" type="b">
       <default>false</default>
-      <_summary>Encode file names in an Outlook/GMail way</_summary>
-      <_description>Encode file names in the mail headers same as Outlook or GMail do, to let them display correctly file names with UTF-8 letters sent by Evolution, because they do not follow the RFC 2231, but use the incorrect RFC 2047 standard.</_description>
+      <_summary>Encode filenames in an Outlook/GMail way</_summary>
+      <_description>Encode filenames in the mail headers same as Outlook or GMail do, to let them display correctly filenames with UTF-8 letters sent by Evolution, because they do not follow the RFC 2231, but use the incorrect RFC 2047 standard.</_description>
     </key>
     <key name="composer-top-signature" type="b">
       <default>false</default>
diff --git a/data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in b/data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in
index c49d8b0..7bdb62b 100644
--- a/data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in
+++ b/data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in
@@ -32,7 +32,7 @@
     </key>
     <key name="notify-sound-file" type="s">
       <default>''</default>
-      <_summary>Sound file name to be played.</_summary>
+      <_summary>Sound filename to be played.</_summary>
       <_description>Sound file to be played when new messages arrive, if not in beep mode.</_description>
     </key>
     <key name="notify-sound-play-file" type="b">
diff --git a/filter/filter.error.xml b/filter/filter.error.xml
index 63294dc..62b7519 100644
--- a/filter/filter.error.xml
+++ b/filter/filter.error.xml
@@ -7,13 +7,13 @@
  </error>
 
  <error id="no-file" type="error">
-  <_primary>Missing file name.</_primary>
-  <_secondary>You must specify a file name.</_secondary>
+  <_primary>Missing filename.</_primary>
+  <_secondary>You must specify a filename.</_secondary>
  </error>
 
  <error id="bad-file" type="error">
   <_primary>File &quot;{0}&quot; does not exist or is not a regular file.</_primary>
-  <_secondary>You must specify a file name.</_secondary>
+  <_secondary>You must specify a filename.</_secondary>
  </error>
 
  <error id="bad-regexp" type="error">
@@ -31,4 +31,4 @@
   <_secondary>Please choose another name.</_secondary>
  </error>
 
-</error-list>
\ No newline at end of file
+</error-list>
diff --git a/mail/evolution-mail.schemas.in b/mail/evolution-mail.schemas.in
index f04a211..0e3eef3 100644
--- a/mail/evolution-mail.schemas.in
+++ b/mail/evolution-mail.schemas.in
@@ -244,9 +244,9 @@
       <type>bool</type>
       <default>false</default>
       <locale name="C">
-         <short>Encode file names in an Outlook/GMail way</short>
+         <short>Encode filenames in an Outlook/GMail way</short>
          <long>
-          Encode file names in the mail headers same as Outlook or GMail do, to let them display correctly file names with UTF-8 letters sent by Evolution, because they do not follow the RFC 2231, but use the incorrect RFC 2047 standard.
+          Encode filenames in the mail headers same as Outlook or GMail do, to let them display correctly filenames with UTF-8 letters sent by Evolution, because they do not follow the RFC 2231, but use the incorrect RFC 2047 standard.
          </long>
       </locale>
     </schema>
@@ -1801,7 +1801,7 @@
       <locale name="C">
          <short>Format of the drag'n'drop export filename</short>
          <long>
-           Exported file name will be YYYYmmDDHHMMSS_email_title
+           Exported filename will be YYYYmmDDHHMMSS_email_title
            Possible values: 1 (: email sent date), 2 (: drag'n'drop date)
          </long>
       </locale>
diff --git a/mail/mail-config.ui b/mail/mail-config.ui
index 97d15e9..0d906ed 100644
--- a/mail/mail-config.ui
+++ b/mail/mail-config.ui
@@ -504,7 +504,7 @@ for display purposes only. </property>
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="chkOutlookFilenames">
-                        <property name="label" translatable="yes">Encode file names in an _Outlook/GMail way</property>
+                        <property name="label" translatable="yes">Encode filenames in an _Outlook/GMail way</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
diff --git a/plugins/mail-notification/apps-evolution-mail-notification.schemas.in b/plugins/mail-notification/apps-evolution-mail-notification.schemas.in
index 628d846..03d742b 100644
--- a/plugins/mail-notification/apps-evolution-mail-notification.schemas.in
+++ b/plugins/mail-notification/apps-evolution-mail-notification.schemas.in
@@ -53,7 +53,7 @@
       <type>string</type>
       <default></default>
       <locale name="C">
-        <short>Sound file name to be played.</short>
+        <short>Sound filename to be played.</short>
         <long>Sound file to be played when new messages arrive, if not in beep mode.</long>
       </locale>
     </schema>
diff --git a/shell/main.c b/shell/main.c
index c734597..5466457 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -331,7 +331,7 @@ static GOptionEntry entries[] = {
 	{ "setup-only", '\0', G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_NONE,
 	  &setup_only, NULL, NULL },
 	{ "import", 'i', 0, G_OPTION_ARG_NONE, &import_uris,
-	  N_("Import URIs or file names given as rest of arguments."), NULL },
+	  N_("Import URIs or filenames given as rest of arguments."), NULL },
 	{ "quit", 'q', 0, G_OPTION_ARG_NONE, &quit,
 	  N_("Request a running Evolution process to quit"), NULL },
 	{ "version", 'v', G_OPTION_FLAG_HIDDEN | G_OPTION_FLAG_NO_ARG,