String Fixes (Bug #325122)

2006-01-01   Harish Krishnaswamy <kharish@novell.com>

* String Fixes (Bug #325122)

svn path=/trunk/; revision=31006

6 files changed, 16 insertions, 16 deletions

diff --git a/addressbook/addressbook.error.xml b/addressbook/addressbook.error.xml
index bf2c8f4c84..e5052416af 100644
--- a/addressbook/addressbook.error.xml
+++ b/addressbook/addressbook.error.xml
@@ -92,7 +92,7 @@
 
  <error id="ask-list-add-exists" type="question" default="GTK_RESPONSE_NO">
   <_primary>Address '{0}' already exists.</_primary>
-  <_secondary>A contact already exists with this address.  Would you like to add a new card with the same address anyway?</_secondary>
+  <_secondary>A contact already exists with this address. Would you like to add a new card with the same address anyway?</_secondary>
   <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
   <button stock="gtk-ok" _label="_Add" response="GTK_RESPONSE_YES"/>
  </error>
diff --git a/mail/em-format-html-display.c b/mail/em-format-html-display.c
index 8bddc98a5e..54cc0c4448 100644
--- a/mail/em-format-html-display.c
+++ b/mail/em-format-html-display.c
@@ -735,10 +735,10 @@ static const struct {
 static const struct {
 	const char *icon, *shortdesc, *description;
 } smime_encrypt_table[4] = {
-	{ "stock_lock-broken", N_("Unencrypted"), N_("This message is not encrypted.  Its content may be viewed in transit across the Internet.") },
-	{ "stock_lock-ok", N_("Encrypted, weak"), N_("This message is encrypted, but with a weak encryption algorithm.  It would be difficult, but not impossible for an outsider to view the content of this message in a practical amount of time.") },
+	{ "stock_lock-broken", N_("Unencrypted"), N_("This message is not encrypted. Its content may be viewed in transit across the Internet.") },
+	{ "stock_lock-ok", N_("Encrypted, weak"), N_("This message is encrypted, but with a weak encryption algorithm. It would be difficult, but not impossible for an outsider to view the content of this message in a practical amount of time.") },
 	{ "stock_lock-ok", N_("Encrypted"), N_("This message is encrypted.  It would be difficult for an outsider to view the content of this message.") },
-	{ "stock_lock-ok", N_("Encrypted, strong"), N_("This message is encrypted, with a strong encryption algorithm.  It would be very difficult for an outsider to view the content of this message in a practical amount of time.") },
+	{ "stock_lock-ok", N_("Encrypted, strong"), N_("This message is encrypted, with a strong encryption algorithm. It would be very difficult for an outsider to view the content of this message in a practical amount of time.") },
 };
 
 static const char *smime_sign_colour[4] = {
diff --git a/mail/mail.error.xml b/mail/mail.error.xml
index 98feead1ec..dcbe33653d 100644
--- a/mail/mail.error.xml
+++ b/mail/mail.error.xml
@@ -8,7 +8,7 @@
 
  <error id="camel-service-auth-failed" type="warning">
   <_primary>Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed.</_primary>
-  <_secondary xml:space="preserve">Check to make sure your password is spelled correctly.  Remember that many passwords are case sensitive; your caps lock might be on.</_secondary>
+  <_secondary xml:space="preserve">Check to make sure your password is spelled correctly. Remember that many passwords are case sensitive; your caps lock might be on.</_secondary>
  </error>
 
  <error id="ask-send-html" type="question" default="GTK_RESPONSE_YES">
@@ -50,7 +50,7 @@ Many email systems add an Apparently-To header to messages that only have BCC re
 
  <error id="ask-default-drafts" type="question" default="GTK_RESPONSE_YES">
   <_primary>Use default drafts folder?</_primary>
-  <_secondary xml:space="preserve">Unable to open the drafts folder for this account.  Use the system drafts folder instead?</_secondary>
+  <_secondary xml:space="preserve">Unable to open the drafts folder for this account. Use the system drafts folder instead?</_secondary>
   <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
   <button _label="Use _Default" response="GTK_RESPONSE_YES"/>
  </error>
@@ -85,8 +85,8 @@ Many email systems add an Apparently-To header to messages that only have BCC re
 
  <error id="camel-exception" type="warning">
   <_primary>Your message with the subject &quot;{0}&quot; was not delivered.</_primary>
-  <_secondary xml:space="preserve">The message was sent via the &quot;sendmail&quot; external application.  Sendmail reports the following error: status 67: mail not sent.
-The message is stored in the Outbox folder.  Check the message for errors and resend.</_secondary>
+  <_secondary xml:space="preserve">The message was sent via the &quot;sendmail&quot; external application. Sendmail reports the following error: status 67: mail not sent.
+The message is stored in the Outbox folder. Check the message for errors and resend.</_secondary>
  </error>
 
  <error id="async-error" type="error">
@@ -336,7 +336,7 @@ You can choose to ignore this folder, overwrite or append its contents, or quit.
 
  <error id="no-load-license" type="error">
   <_primary>Unable to read license file.</_primary>
-  <_secondary xml:space="preserve">Cannot read the license file &quot;{0}&quot;, due to an installation problem.  You will not be able to use this provider until you can accept its license.</_secondary>
+  <_secondary xml:space="preserve">Cannot read the license file &quot;{0}&quot;, due to an installation problem. You will not be able to use this provider until you can accept its license.</_secondary>
  </error>
 
   <error id="checking-service" type="info">
@@ -354,7 +354,7 @@ You can choose to ignore this folder, overwrite or append its contents, or quit.
   <error id="ask-receipt" type="question" default="GTK_RESPONSE_NO">
     <_title>Read receipt requested.</_title>
     <_primary>Read receipt requested.</_primary>
-    <_secondary xml:space="preserve">A read receipt notification has been requested for &quot;{1}&quot;.  Send the receipt notification to {0}?</_secondary>
+    <_secondary xml:space="preserve">A read receipt notification has been requested for &quot;{1}&quot;. Send the receipt notification to {0}?</_secondary>
     <button stock="gtk-no" response="GTK_RESPONSE_NO"/>
     <button stock="gtk-yes" _label="Send Receipt" response="GTK_RESPONSE_YES"/>
   </error>
diff --git a/plugins/exchange-operations/org-gnome-exchange-operations.error.xml b/plugins/exchange-operations/org-gnome-exchange-operations.error.xml
index 4786ed72f8..1edd1dd8f5 100644
--- a/plugins/exchange-operations/org-gnome-exchange-operations.error.xml
+++ b/plugins/exchange-operations/org-gnome-exchange-operations.error.xml
@@ -119,10 +119,10 @@ supports Microsoft Exchange 2000 and 2003 only.</_secondary>
   <_primary>Could not connect to Exchange server.</_primary>
   <_secondary xml:space="preserve">Exchange Connector requires access to certain
 functionality on the Exchange Server that appears
-to be disabled or blocked.  (This is usually 
-unintentional.)  Your Exchange Administrator will 
+to be disabled or blocked. (This is usually 
+unintentional.) Your Exchange Administrator will 
 need to enable this functionality in order for 
-you to be able to use Ximian Connector.
+you to be able to use Evolution Exchange Connector.
 
 For information to provide to your Exchange 
 administrator, please follow the link below:
diff --git a/shell/e-shell-window.c b/shell/e-shell-window.c
index af9ece83de..8ee5ab88ef 100644
--- a/shell/e-shell-window.c
+++ b/shell/e-shell-window.c
@@ -367,7 +367,7 @@ update_offline_toggle_status (EShellWindow *window)
 		icon_pixmap = online_pixmap;
 		icon_mask   = online_mask;
 		sensitive   = TRUE;
-		tooltip     = _("Evolution is currently online.  "
+		tooltip     = _("Evolution is currently online."
 				"Click on this button to work offline.");
 		flags = ES_MENU_SHELL_ONLINE;
 		break;
@@ -382,7 +382,7 @@ update_offline_toggle_status (EShellWindow *window)
 		icon_pixmap = offline_pixmap;
 		icon_mask   = offline_mask;
 		sensitive   = TRUE;
-		tooltip     = _("Evolution is currently offline.  "
+		tooltip     = _("Evolution is currently offline."
 				"Click on this button to work online.");
 		flags = ES_MENU_SHELL_OFFLINE;
 		break;
diff --git a/shell/shell.error.xml b/shell/shell.error.xml
index 8a0605dea4..96fa2d04b4 100644
--- a/shell/shell.error.xml
+++ b/shell/shell.error.xml
@@ -31,7 +31,7 @@ If you choose to continue, you may not have access to some of your old data.
   <_primary>Delete old data from version {0}?</_primary>
   <_secondary xml:space="preserve">The previous version of evolution stored its data in a different location.
 
-If you choose to remove this data, the entire contents of the &quot;evolution&quot; directory will be removed permanently.  If you choose to keep this data, then you may manually remove the contents of &quot;evolution&quot; at your convenience.
+If you choose to remove this data, the entire contents of the &quot;evolution&quot; directory will be removed permanently. If you choose to keep this data, then you may manually remove the contents of &quot;evolution&quot; at your convenience.
 </_secondary>
   <button _label="_Remind Me Later" response="GTK_RESPONSE_CANCEL"/>
   <button _label="_Keep Data" response="GTK_RESPONSE_ACCEPT"/>