aboutsummaryrefslogtreecommitdiffstats
path: root/help
diff options
context:
space:
mode:
authorAndre Klapper <a9016009@gmx.de>2012-02-17 21:58:55 +0800
committerAndre Klapper <a9016009@gmx.de>2012-02-17 21:58:55 +0800
commit1d7b8896736a48e0336d8b291653a2c08e70f16f (patch)
tree15e99378db983c82c2749630eda53db5db769e52 /help
parent933ba0f066f65a7c8a91205540e41c46b0a7a45e (diff)
downloadgsoc2013-evolution-1d7b8896736a48e0336d8b291653a2c08e70f16f.tar
gsoc2013-evolution-1d7b8896736a48e0336d8b291653a2c08e70f16f.tar.gz
gsoc2013-evolution-1d7b8896736a48e0336d8b291653a2c08e70f16f.tar.bz2
gsoc2013-evolution-1d7b8896736a48e0336d8b291653a2c08e70f16f.tar.lz
gsoc2013-evolution-1d7b8896736a48e0336d8b291653a2c08e70f16f.tar.xz
gsoc2013-evolution-1d7b8896736a48e0336d8b291653a2c08e70f16f.tar.zst
gsoc2013-evolution-1d7b8896736a48e0336d8b291653a2c08e70f16f.zip
User help: Replace the term program by application, as recommended by the GDP style guide
Diffstat (limited to 'help')
-rw-r--r--help/C/intro-application.page2
-rw-r--r--help/C/intro-first-run.page6
-rw-r--r--help/C/mail-composer-html.page2
-rw-r--r--help/C/mail-displaying-character-encodings.page2
-rw-r--r--help/C/mail-filters-actions.page2
5 files changed, 7 insertions, 7 deletions
diff --git a/help/C/intro-application.page b/help/C/intro-application.page
index 9a2ad11ee2..8d074e0b74 100644
--- a/help/C/intro-application.page
+++ b/help/C/intro-application.page
@@ -24,7 +24,7 @@
<title>Getting Started</title>
<p>Evolution is a stable and versatile personal information manager for the GNOME project. Evolution allows you to keep your calendar, email, address book and tasks in one place. Evolution has the ability to <link type="topic" xref="mail-spam">filter Junk/Spam Mail</link>, add your favorite web calenders, and <link type="topic" xref="mail-encryption">to keep your information safe and secure</link>.</p>
-<p>By default Evolution opens the mail client view. This is were you can view all your mail. You can change to other aspects of the program by going to the bottom of the left pane in the window (the so-called "switcher") and selecting the desired view. <link type="topic" xref="intro-main-window">Click here</link> for more information on the elements of the window.</p>
+<p>By default Evolution opens the mail client view. This is were you can view all your mail. You can change to other aspects of the application by going to the bottom of the left pane in the window (the so-called "switcher") and selecting the desired view. <link type="topic" xref="intro-main-window">Click here</link> for more information on the elements of the window.</p>
</page>
diff --git a/help/C/intro-first-run.page b/help/C/intro-first-run.page
index e611ebde0c..e3b3427ed4 100644
--- a/help/C/intro-first-run.page
+++ b/help/C/intro-first-run.page
@@ -72,9 +72,9 @@
<list>
<item><p>Local delivery: If you want to move email from the spool (the location where mail waits for delivery) and store it in your home directory. You need to provide the path to the mail spool you want to use. If you want to leave email in your system's spool files, choose the <gui>Standard Unix Mbox Spool</gui> option instead.</p><p>Continue <link xref="mail-receiving-options-local-delivery">here</link> for configuration.</p></item>
-<item><p>MH-Format Mail Directories: For downloading email using MH or another MH-style program.</p><p>You need to provide the path to the directory you want to use.</p><p>Continue <link xref="mail-receiving-options-mh-format-directories">here</link> for configuration.</p></item>
+<item><p>MH-Format Mail Directories: For downloading email using MH or another MH-style application.</p><p>You need to provide the path to the directory you want to use.</p><p>Continue <link xref="mail-receiving-options-mh-format-directories">here</link> for configuration.</p></item>
-<item><p>Maildir-Format Mail Directories: For downloading your email using Qmail or another Maildir-style program.</p><p>You need to provide the path to the directory you want to use.</p><p>Continue <link xref="mail-receiving-options-maildir-format-directories">here</link> for configuration.</p></item>
+<item><p>Maildir-Format Mail Directories: For downloading your email using Qmail or another Maildir-style application.</p><p>You need to provide the path to the directory you want to use.</p><p>Continue <link xref="mail-receiving-options-maildir-format-directories">here</link> for configuration.</p></item>
<item><p>Standard Unix mbox spool file: For reading and storing email in the mail spool file on your local system.</p><p>You need to provide the path to the mail spool file you want to use.</p><p>Continue <link xref="mail-receiving-options-unix-mbox-spool-file">here</link> for configuration.</p></item>
@@ -91,7 +91,7 @@
<p>Available server types are:</p>
<list>
<item><p>SMTP: Sends mail using an outbound mail server. This is the most common choice for sending mail.</p><p>Continue <link xref="mail-sending-options-smtp">here</link> for configuration.</p></item>
-<item><p>Sendmail: Uses the Sendmail program to send mail from your system. It is not easy to configure, so you should select this option only if you know how to set up a Sendmail service.</p></item>
+<item><p>Sendmail: Uses the Sendmail application to send mail from your system. It is not easy to configure, so you should select this option only if you know how to set up a Sendmail service.</p></item>
</list>
</section>
diff --git a/help/C/mail-composer-html.page b/help/C/mail-composer-html.page
index 520b7269d4..28f75058f5 100644
--- a/help/C/mail-composer-html.page
+++ b/help/C/mail-composer-html.page
@@ -20,7 +20,7 @@
<title>Using HTML format to enhance emails</title>
-<p>Normally, you cannot set text styles or insert pictures in email. However, most newer email programs can display images and text styles in addition to basic alignment and paragraph formatting. They do this with HTML, just like web pages do.</p>
+<p>Normally, you cannot set text styles or insert pictures in email. However, most newer email applications can display images and text styles in addition to basic alignment and paragraph formatting. They do this with HTML, just like web pages do.</p>
<p>Some people do not have HTML-capable mail clients, or prefer not to receive HTML-enhanced mail because it is slower to download and display. Because of this, Evolution sends plain text unless you explicitly ask for HTML.</p>
diff --git a/help/C/mail-displaying-character-encodings.page b/help/C/mail-displaying-character-encodings.page
index ca56374fea..45aff217ea 100644
--- a/help/C/mail-displaying-character-encodings.page
+++ b/help/C/mail-displaying-character-encodings.page
@@ -21,7 +21,7 @@
<!-- TODO: Recheck once https://bugzilla.gnome.org/show_bug.cgi?id=655021 is fixed -->
-<p>If the email program of the sender is broken or misconfigured, plain text emails might not include information about the character encoding used. If you receive such messages, choose <guiseq><gui>View</gui><gui>Character Encoding</gui></guiseq> from the main menu and change the currently chosen character encoding to an appropriate one that might be the encoding used by the sender. You have to make this change every time you view the message.</p>
+<p>If the email application of the sender is broken or misconfigured, plain text emails might not include information about the character encoding used. If you receive such messages, choose <guiseq><gui>View</gui><gui>Character Encoding</gui></guiseq> from the main menu and change the currently chosen character encoding to an appropriate one that might be the encoding used by the sender. You have to make this change every time you view the message.</p>
<p>To make this the default setting, go to <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Preferences</gui><gui>General</gui><gui>Message Display</gui><gui>Default character encoding</gui></guiseq>.</p>
</page>
diff --git a/help/C/mail-filters-actions.page b/help/C/mail-filters-actions.page
index 587429ac5b..48b13d3e70 100644
--- a/help/C/mail-filters-actions.page
+++ b/help/C/mail-filters-actions.page
@@ -63,7 +63,7 @@
<p>Evolution runs an application.</p></item>
<item><p>Pipe to Program:</p>
-<p>Sends the message to a program of your choice. No return value is expected. This feature can be used to create automatic Web postings from email messages or to perform additional message post processing not supported by Evolution.</p></item>
+<p>Sends the message to an application of your choice. No return value is expected. This feature can be used to create automatic Web postings from email messages or to perform additional message post processing not supported by Evolution.</p></item>
<item><p>Forward to:</p>
<p>Forwards the message to another email address.</p></item>