[evolution-exchange] Bug 615714 — Miscellaneous string fixes

[Philip Withnall <pwithnall src gnome org>]

commit c41742881b07553b284032f9803237a07f1f9a40
Author: Philip Withnall <philip tecnocode co uk>
Date:   Tue Apr 13 17:41:26 2010 +0100

    Bug 615714 â?? Miscellaneous string fixes
    
    Helps: bgo#615714

 .../apps_exchange_addressbook.schemas.in.in        |    4 ++--
 camel/camel-exchange-provider.c                    |    2 +-
 eplugin/exchange-account-setup.c                   |    6 +++---
 eplugin/exchange-delegates-user.c                  |    2 +-
 eplugin/exchange-folder-permission.c               |    2 +-
 eplugin/org-gnome-exchange-operations.error.xml    |    4 ++--
 server/storage/e-storage.c                         |    2 +-
 7 files changed, 11 insertions(+), 11 deletions(-)
---
diff --git a/addressbook/apps_exchange_addressbook.schemas.in.in b/addressbook/apps_exchange_addressbook.schemas.in.in
index b51d925..a005025 100644
--- a/addressbook/apps_exchange_addressbook.schemas.in.in
+++ b/addressbook/apps_exchange_addressbook.schemas.in.in
@@ -11,8 +11,8 @@
       <default>7</default>
       <locale name="C">
         <short>Specifies the time interval to refresh the GAL Cache. </short>
-        <long>This key specifies the number of days interval between
-	the GAL cache refresh. Set this value to zero, if you don't want to 
+        <long>This key specifies the number of days' interval between
+	GAL cache refreshes. Set this value to zero if you don't want to
 	update GAL and use the current cache forever. This will work only if
 	you have enabled offline caching for GAL.</long>
       </locale>
diff --git a/camel/camel-exchange-provider.c b/camel/camel-exchange-provider.c
index f884384..8e6ca1f 100644
--- a/camel/camel-exchange-provider.c
+++ b/camel/camel-exchange-provider.c
@@ -72,7 +72,7 @@ CamelProviderConfEntry exchange_conf_entries[] = {
 	/* extra Exchange configuration settings */
 	{ CAMEL_PROVIDER_CONF_SECTION_START, "activedirectory", NULL,
 	  /* i18n: GAL is an Outlookism, AD is a Windowsism */
-	  N_("Global Address List / Active Directory") },
+	  N_("Global Address List/Active Directory") },
 	{ CAMEL_PROVIDER_CONF_ENTRY, "ad_server", NULL,
 	  /* i18n: "Global Catalog" is a Windowsism, but it's a
 	     technical term and may not have translations? */
diff --git a/eplugin/exchange-account-setup.c b/eplugin/exchange-account-setup.c
index 5666fce..ba8c04f 100644
--- a/eplugin/exchange-account-setup.c
+++ b/eplugin/exchange-account-setup.c
@@ -263,7 +263,7 @@ org_gnome_exchange_settings(EPlugin *epl, EConfigHookItemFactoryData *data)
 	vbox_settings = (GtkVBox*) g_object_new (GTK_TYPE_VBOX, "homogeneous", FALSE, "spacing", 6, NULL);
 	gtk_container_set_border_width (GTK_CONTAINER (vbox_settings), 12);
 
-	frm_oof = (GtkFrame*) g_object_new (GTK_TYPE_FRAME, "label", _("Out Of Office"), NULL);
+	frm_oof = (GtkFrame*) g_object_new (GTK_TYPE_FRAME, "label", _("Out of Office"), NULL);
 	gtk_box_pack_start (GTK_BOX (vbox_settings), GTK_WIDGET (frm_oof), FALSE, FALSE, 0);
 
 	vbox_oof = (GtkVBox*) g_object_new (GTK_TYPE_VBOX, NULL, "homogeneous", FALSE, "spacing", 12, NULL);
@@ -366,7 +366,7 @@ org_gnome_exchange_settings(EPlugin *epl, EConfigHookItemFactoryData *data)
 	/* Folder Size */
 	lbl_fsize = (GtkLabel*) g_object_new (GTK_TYPE_LABEL, "label", _("View the size of all Exchange folders"), NULL);
 	gtk_misc_set_alignment (GTK_MISC (lbl_fsize), 0, 0.5);
-	btn_fsize = (GtkButton*) g_object_new (GTK_TYPE_BUTTON, "label", _("Folders Size"), NULL);
+	btn_fsize = (GtkButton*) g_object_new (GTK_TYPE_BUTTON, "label", _("Folder Size"), NULL);
 	g_signal_connect (btn_fsize, "clicked", G_CALLBACK (btn_fsize_clicked), NULL);
 	gtk_table_attach_defaults (tbl_misc, GTK_WIDGET (lbl_fsize), 0, 1, 0, 1);
 	gtk_table_attach (tbl_misc, GTK_WIDGET (btn_fsize), 1, 2, 0, 1, GTK_FILL, GTK_FILL, 0, 0);
@@ -780,7 +780,7 @@ org_gnome_exchange_owa_url(EPlugin *epl, EConfigHookItemFactoryData *data)
 
 	row++;
 	want_mailbox_check = gtk_check_button_new_with_mnemonic (
-		_("Mailbox name is _different from user name"));
+		_("Mailbox name is _different from username"));
 	gtk_widget_show (want_mailbox_check);
 	gtk_table_attach (GTK_TABLE (data->parent), want_mailbox_check, 1, 2, row, row+1, GTK_FILL, GTK_FILL, 0, 0);
 	if (!username || !*username || !mailbox_name || !*mailbox_name ||
diff --git a/eplugin/exchange-delegates-user.c b/eplugin/exchange-delegates-user.c
index 9ffc8f9..9cd24f8 100644
--- a/eplugin/exchange-delegates-user.c
+++ b/eplugin/exchange-delegates-user.c
@@ -462,7 +462,7 @@ exchange_delegates_user_edit (ExchangeAccount *account,
 				/* To translators: This message is included if the delegatee has not been given access
 				   to the private items.
 				*/
-				camel_stream_printf (stream, "<br>%s", _("However you are not permitted "
+				camel_stream_printf (stream, "<br>%s", _("However, you are not permitted "
 							 "to see my private items."));
 			camel_data_wrapper_construct_from_stream (delegate_mail_text, stream);
 			g_free (role_name);
diff --git a/eplugin/exchange-folder-permission.c b/eplugin/exchange-folder-permission.c
index fd820c9..8744a9d 100644
--- a/eplugin/exchange-folder-permission.c
+++ b/eplugin/exchange-folder-permission.c
@@ -587,7 +587,7 @@ static GtkActionEntry addressbook_entries[] = {
 	  "folder-new",
 	  N_("Permissions..."),
 	  NULL,
-	  N_("Check addressbook permissions"),
+	  N_("Check address book permissions"),
 	  G_CALLBACK (source_permissions_cb) },
 
 	{ "eex-folder-subscribe-Contacts",
diff --git a/eplugin/org-gnome-exchange-operations.error.xml b/eplugin/org-gnome-exchange-operations.error.xml
index 2f1f276..1c72e9e 100644
--- a/eplugin/org-gnome-exchange-operations.error.xml
+++ b/eplugin/org-gnome-exchange-operations.error.xml
@@ -69,7 +69,7 @@
 you to specify the Windows domain name 
 as part of your username (eg, &quot;DOMAIN\user&quot;).
 
-Also, you may have typed your password wrongly.</_secondary>
+Also, you may have typed your password incorrectly.</_secondary>
  </error>
 
  <error id="account-mailbox-na" type="error">
@@ -144,7 +144,7 @@ administrator, please follow the link below:
  <error id="configure-error" type="error">
   <_secondary xml:space="preserve">Could not configure Exchange account because 
 an unknown error occurred. Check the URL, 
-username, and password, and try again.</_secondary>
+username and password, and try again.</_secondary>
  </error>
 
  <error id="delegates-no-gcs-error" type="error">
diff --git a/server/storage/e-storage.c b/server/storage/e-storage.c
index 8d79196..8cc2ef8 100644
--- a/server/storage/e-storage.c
+++ b/server/storage/e-storage.c
@@ -582,7 +582,7 @@ e_storage_result_to_string (EStorageResult result)
 	case E_STORAGE_INVALIDNAME:
 		return _("Cannot create a folder with that name");
 	case E_STORAGE_NOTONLINE:
-		return _("This operation cannot be performed in off-line mode");
+		return _("This operation cannot be performed in offline mode");
 	default:
 		return _("Unknown error");
 	}