From 771b41d952bf2a272f8adf681b5d30984ee87a5e Mon Sep 17 00:00:00 2001 From: Andre Klapper Date: Fri, 17 Feb 2012 15:11:39 +0100 Subject: Change 'file name' to 'filename' according to the GDP Style Guide --- data/org.gnome.evolution.mail.gschema.xml.in | 4 ++-- data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in | 2 +- filter/filter.error.xml | 8 ++++---- mail/evolution-mail.schemas.in | 6 +++--- mail/mail-config.ui | 2 +- .../mail-notification/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 8161a482d3..bc7645b6f0 100644 --- a/data/org.gnome.evolution.mail.gschema.xml.in +++ b/data/org.gnome.evolution.mail.gschema.xml.in @@ -107,8 +107,8 @@ false - <_summary>Encode file names in an Outlook/GMail way - <_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. + <_summary>Encode filenames in an Outlook/GMail way + <_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. false 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 c49d8b0e07..7bdb62b7af 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 @@ '' - <_summary>Sound file name to be played. + <_summary>Sound filename to be played. <_description>Sound file to be played when new messages arrive, if not in beep mode. diff --git a/filter/filter.error.xml b/filter/filter.error.xml index 63294dc75e..62b75193d2 100644 --- a/filter/filter.error.xml +++ b/filter/filter.error.xml @@ -7,13 +7,13 @@ - <_primary>Missing file name. - <_secondary>You must specify a file name. + <_primary>Missing filename. + <_secondary>You must specify a filename. <_primary>File "{0}" does not exist or is not a regular file. - <_secondary>You must specify a file name. + <_secondary>You must specify a filename. @@ -31,4 +31,4 @@ <_secondary>Please choose another name. - \ No newline at end of file + diff --git a/mail/evolution-mail.schemas.in b/mail/evolution-mail.schemas.in index f04a211b34..0e3eef3061 100644 --- a/mail/evolution-mail.schemas.in +++ b/mail/evolution-mail.schemas.in @@ -244,9 +244,9 @@ bool false - Encode file names in an Outlook/GMail way + Encode filenames in an Outlook/GMail way - 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. @@ -1801,7 +1801,7 @@ Format of the drag'n'drop export filename - 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) diff --git a/mail/mail-config.ui b/mail/mail-config.ui index 97d15e97fb..0d906ed6df 100644 --- a/mail/mail-config.ui +++ b/mail/mail-config.ui @@ -504,7 +504,7 @@ for display purposes only. - Encode file names in an _Outlook/GMail way + Encode filenames in an _Outlook/GMail way True True False diff --git a/plugins/mail-notification/apps-evolution-mail-notification.schemas.in b/plugins/mail-notification/apps-evolution-mail-notification.schemas.in index 628d84606f..03d742b718 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 @@ string - Sound file name to be played. + Sound filename to be played. Sound file to be played when new messages arrive, if not in beep mode. diff --git a/shell/main.c b/shell/main.c index c7345979ff..54664574c5 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, -- cgit v1.2.3