From 0368e5866b2e700a7b7642775c6fb81ab1aef18e Mon Sep 17 00:00:00 2001
From: Philip Withnall <philip@tecnocode.co.uk>
Date: Wed, 27 Aug 2008 10:37:32 +0000
Subject: ** Fix for bug #534762

2008-08-27  Philip Withnall  <philip@tecnocode.co.uk>

	** Fix for bug #534762

	Change "addressbook" to "address book" in translatable strings.


svn path=/trunk/; revision=36117
---
 addressbook/ChangeLog                                | 14 ++++++++++++++
 addressbook/addressbook.error.xml                    | 20 ++++++++++----------
 addressbook/conduit/address-conduit.c                |  4 ++--
 addressbook/gui/widgets/eab-gui-util.c               | 20 ++++++++++----------
 addressbook/gui/widgets/eab-vcard-control.c          |  2 +-
 .../evolution-addressbook-export-list-folders.c      |  2 +-
 addressbook/tools/evolution-addressbook-export.c     |  2 +-
 7 files changed, 39 insertions(+), 25 deletions(-)

(limited to 'addressbook')

diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 2d78093bab..0551364313 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,17 @@
+2008-08-27  Philip Withnall  <philip@tecnocode.co.uk>
+
+	** Fix for bug #534762
+
+	* addressbook.error.xml:
+	* conduit/address-conduit.c:
+	* gui/widgets/eab-gui-util.c: (eab_load_error_dialog),
+	(eab_search_result_dialog):
+	* gui/widgets/eab-vcard-control.c: (eab_vcard_control_new):
+	* tools/evolution-addressbook-export-list-folders.c:
+	(action_list_folders_init):
+	* tools/evolution-addressbook-export.c: Change "addressbook" to
+	"address book" in translatable strings.
+
 2008-08-27  Sankar P  <psankar@novell.com>
 
 License Changes
diff --git a/addressbook/addressbook.error.xml b/addressbook/addressbook.error.xml
index bfea4ce405..9ca302cdd0 100644
--- a/addressbook/addressbook.error.xml
+++ b/addressbook/addressbook.error.xml
@@ -2,8 +2,8 @@
 <error-list domain="addressbook">
 
  <error id="ldap-init" type="error" modal="true">
-  <_primary>This addressbook could not be opened.</_primary>
-  <_secondary>This addressbook server might be unreachable or the server name may be misspelled or your network connection could be down.</_secondary>
+  <_primary>This address book could not be opened.</_primary>
+  <_secondary>This address book server might be unreachable or the server name may be misspelled or your network connection could be down.</_secondary>
  </error>
 
  <error id="ldap-auth" type="error" modal="true">
@@ -12,7 +12,7 @@
  </error>
 
  <error id="ldap-search-base" type="error" modal="true">
-  <_primary>This addressbook server does not have any suggested search bases.</_primary>
+  <_primary>This address book server does not have any suggested search bases.</_primary>
   <_secondary>This LDAP server may use an older version of LDAP, which does not support this functionality or it may be misconfigured. Ask your administrator for supported search bases.</_secondary>
  </error>
 
@@ -29,7 +29,7 @@
  </error>
 
  <error id="remove-addressbook" type="error" modal="true">
-  <_primary>Could not remove addressbook.</_primary>
+  <_primary>Could not remove address book.</_primary>
  </error>
 
  <error id="ask-delete-addressbook" type="question" modal="true" default="GTK_RESPONSE_CANCEL">
@@ -51,15 +51,15 @@
  </error>
 
  <error id="load-error" type="error">
-  <_title>Unable to open addressbook</_title>
-  <_primary>Error loading addressbook.</_primary>
-  <!-- For Translators: {0} is string describing the error why the addressbook could not be loaded -->
+  <_title>Unable to open address book</_title>
+  <_primary>Error loading address book.</_primary>
+  <!-- For Translators: {0} is string describing the error why the address book could not be loaded -->
   <_secondary>{0}</_secondary>
  </error>
 
  <error id="search-error" type="error">
   <_primary>Unable to perform search.</_primary>
-  <!-- For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this addressbook was unable to parse this query." -->
+  <!-- For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this address book was unable to parse this query." -->
   <_secondary>{0}</_secondary>
  </error>
 
@@ -73,7 +73,7 @@
 
  <error id="prompt-move" type="question" default="GTK_RESPONSE_NO">
   <_primary>Cannot move contact.</_primary>
-  <_secondary>You are attempting to move a contact from one addressbook to another but it cannot be removed from the source. Do you want to save a copy instead?</_secondary>
+  <_secondary>You are attempting to move a contact from one address book to another but it cannot be removed from the source. Do you want to save a copy instead?</_secondary>
   <button stock="gtk-no" response="GTK_RESPONSE_NO"/>
   <button stock="gtk-yes" response="GTK_RESPONSE_YES"/>
  </error>
@@ -91,7 +91,7 @@
  </error>
 
  <error id="backend-died" type="error">
-  <_primary>The Evolution addressbook has quit unexpectedly.</_primary>
+  <_primary>The Evolution address book has quit unexpectedly.</_primary>
   <_secondary>Your contacts for {0} will not be available until Evolution is restarted.</_secondary>
  </error>
 
diff --git a/addressbook/conduit/address-conduit.c b/addressbook/conduit/address-conduit.c
index b88a85eb96..3a370fa060 100644
--- a/addressbook/conduit/address-conduit.c
+++ b/addressbook/conduit/address-conduit.c
@@ -1317,8 +1317,8 @@ pre_sync (GnomePilotConduit *conduit,
 				  G_CALLBACK (addressbook_authenticate), ctxt->cfg->source);
 	}
 	if (!ctxt->ebook || !e_book_open (ctxt->ebook, TRUE, NULL)) {
-		WARN(_("Could not load addressbook"));
-		gnome_pilot_conduit_error (conduit, _("Could not load addressbook"));
+		WARN(_("Could not load address book"));
+		gnome_pilot_conduit_error (conduit, _("Could not load address book"));
 
 		return -1;
 	}
diff --git a/addressbook/gui/widgets/eab-gui-util.c b/addressbook/gui/widgets/eab-gui-util.c
index 42ce9cd8f2..5f21e4da29 100644
--- a/addressbook/gui/widgets/eab-gui-util.c
+++ b/addressbook/gui/widgets/eab-gui-util.c
@@ -99,16 +99,16 @@ eab_load_error_dialog (GtkWidget *parent, ESource *source, EBookStatus status)
 	uri = e_source_get_uri (source);
 
 	if (status == E_BOOK_ERROR_OFFLINE_UNAVAILABLE) {
-		label_string = _("We were unable to open this addressbook. This either means "
+		label_string = _("We were unable to open this address book. This either means "
                                  "this book is not marked for offline usage or not yet downloaded "
-                                 "for offline usage. Please load the addressbook once in online mode "
+                                 "for offline usage. Please load the address book once in online mode "
                                  "to download its contents");
 	}
 
 	else if (!strncmp (uri, "file:", 5)) {
 		char *path = g_filename_from_uri (uri, NULL, NULL);
 		label = g_strdup_printf (
-			_("We were unable to open this addressbook.  Please check that the "
+			_("We were unable to open this address book.  Please check that the "
 			  "path %s exists and that you have permission to access it."), path);
 		g_free (path);
 		label_string = label;
@@ -117,7 +117,7 @@ eab_load_error_dialog (GtkWidget *parent, ESource *source, EBookStatus status)
 		/* special case for ldap: contact folders so we can tell the user about openldap */
 #ifdef HAVE_LDAP
 		label_string =
-			_("We were unable to open this addressbook.  This either "
+			_("We were unable to open this address book.  This either "
 			  "means you have entered an incorrect URI, or the LDAP server "
 			  "is unreachable.");
 #else
@@ -129,7 +129,7 @@ eab_load_error_dialog (GtkWidget *parent, ESource *source, EBookStatus status)
 	} else {
 		/* other network folders */
 		label_string =
-			_("We were unable to open this addressbook.  This either "
+			_("We were unable to open this address book.  This either "
 			  "means you have entered an incorrect URI, or the server "
 			  "is unreachable.");
 
@@ -161,19 +161,19 @@ eab_search_result_dialog      (GtkWidget *parent,
 		str = _("More cards matched this query than either the server is \n"
 			"configured to return or Evolution is configured to display.\n"
 			"Please make your search more specific or raise the result limit in\n"
-			"the directory server preferences for this addressbook.");
+			"the directory server preferences for this address book.");
 		break;
 	case E_BOOK_VIEW_STATUS_TIME_LIMIT_EXCEEDED:
 		str = _("The time to execute this query exceeded the server limit or the limit\n"
-			"you have configured for this addressbook.  Please make your search\n"
+			"you have configured for this address book.  Please make your search\n"
 			"more specific or raise the time limit in the directory server\n"
-			"preferences for this addressbook.");
+			"preferences for this address book.");
 		break;
 	case E_BOOK_VIEW_ERROR_INVALID_QUERY:
-		str = _("The backend for this addressbook was unable to parse this query.");
+		str = _("The backend for this address book was unable to parse this query.");
 		break;
 	case E_BOOK_VIEW_ERROR_QUERY_REFUSED:
-		str = _("The backend for this addressbook refused to perform this query.");
+		str = _("The backend for this address book refused to perform this query.");
 		break;
 	case E_BOOK_VIEW_ERROR_OTHER_ERROR:
 		str = _("This query did not complete successfully.");
diff --git a/addressbook/gui/widgets/eab-vcard-control.c b/addressbook/gui/widgets/eab-vcard-control.c
index 7b81ec64a7..2379559e3d 100644
--- a/addressbook/gui/widgets/eab-vcard-control.c
+++ b/addressbook/gui/widgets/eab-vcard-control.c
@@ -281,7 +281,7 @@ eab_vcard_control_new (void)
 			  G_CALLBACK (toggle_full_vcard), vcard_control);
 	gtk_box_pack_start (GTK_BOX (bbox), button1, FALSE, FALSE, 0);
 
-	button2 = gtk_button_new_with_label(_("Save in addressbook"));
+	button2 = gtk_button_new_with_label(_("Save in address book"));
 	g_signal_connect (button2, "clicked",
 			  G_CALLBACK (save_in_addressbook), vcard_control);
 	gtk_box_pack_start (GTK_BOX (bbox), button2, FALSE, FALSE, 0);
diff --git a/addressbook/tools/evolution-addressbook-export-list-folders.c b/addressbook/tools/evolution-addressbook-export-list-folders.c
index 03a6575dd1..f9679b3378 100644
--- a/addressbook/tools/evolution-addressbook-export-list-folders.c
+++ b/addressbook/tools/evolution-addressbook-export-list-folders.c
@@ -41,7 +41,7 @@ action_list_folders_init (ActionContext * p_actctx)
 	FILE *outputfile = NULL;
 
 	if (!e_book_get_addressbooks (&addressbooks, NULL)) {
-		g_warning (_("Couldn't get list of addressbooks"));
+		g_warning (_("Couldn't get list of address books"));
 		exit (-1);
 	}
 
diff --git a/addressbook/tools/evolution-addressbook-export.c b/addressbook/tools/evolution-addressbook-export.c
index 71372dbbfb..2f9df1fabc 100644
--- a/addressbook/tools/evolution-addressbook-export.c
+++ b/addressbook/tools/evolution-addressbook-export.c
@@ -50,7 +50,7 @@ static GOptionEntry entries[] = {
 	  N_("OUTPUTFILE") },
 	{ "list-addressbook-folders", 'l', 0,
 	  G_OPTION_ARG_NONE, &opt_list_folders_mode,
-	  N_("List local addressbook folders") },
+	  N_("List local address book folders") },
 	{ "format", '\0', 0,
 	  G_OPTION_ARG_STRING, &opt_output_format,
 	  N_("Show cards as vcard or csv file"),
-- 
cgit v1.2.3