GNOME.org
 

evolution r36117 - in trunk: a11y a11y/addressbook addressbook addressbook/conduit addressbook/gui/widgets addressbook/tools mail plugins/bbdb plugins/default-source plugins/ipod-sync ui

Author: pwithnall
Date: Wed Aug 27 10:37:32 2008
New Revision: 36117
URL: http://svn.gnome.org/viewvc/evolution?rev=36117&view=rev

Log:
2008-08-27  Philip Withnall  <philip tecnocode co uk>

	** Fix for bug #534762

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



Modified:
   trunk/a11y/ChangeLog
   trunk/a11y/addressbook/ea-addressbook-view.c
   trunk/a11y/addressbook/ea-minicard-view.c
   trunk/addressbook/ChangeLog
   trunk/addressbook/addressbook.error.xml
   trunk/addressbook/conduit/address-conduit.c
   trunk/addressbook/gui/widgets/eab-gui-util.c
   trunk/addressbook/gui/widgets/eab-vcard-control.c
   trunk/addressbook/tools/evolution-addressbook-export-list-folders.c
   trunk/addressbook/tools/evolution-addressbook-export.c
   trunk/mail/ChangeLog
   trunk/mail/evolution-mail.schemas.in
   trunk/mail/mail-config.glade
   trunk/plugins/bbdb/ChangeLog
   trunk/plugins/bbdb/bbdb.c
   trunk/plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml
   trunk/plugins/default-source/ChangeLog
   trunk/plugins/default-source/org-gnome-default-source.eplug.xml
   trunk/plugins/ipod-sync/ChangeLog
   trunk/plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml
   trunk/ui/ChangeLog
   trunk/ui/evolution-addressbook.xml

Modified: trunk/a11y/addressbook/ea-addressbook-view.c
==============================================================================
--- trunk/a11y/addressbook/ea-addressbook-view.c	(original)
+++ trunk/a11y/addressbook/ea-addressbook-view.c	Wed Aug 27 10:37:32 2008
@@ -91,7 +91,7 @@
 	if (accessible->name)
 		return accessible->name;
 
-	return _("evolution addressbook");
+	return _("evolution address book");
 }
 
 static G_CONST_RETURN gchar*
@@ -100,7 +100,7 @@
 	if (accessible->description)
 		return accessible->description;
 
-	return _("evolution addressbook");
+	return _("evolution address book");
 }
 
 AtkObject*

Modified: trunk/a11y/addressbook/ea-minicard-view.c
==============================================================================
--- trunk/a11y/addressbook/ea-minicard-view.c	(original)
+++ trunk/a11y/addressbook/ea-minicard-view.c	Wed Aug 27 10:37:32 2008
@@ -175,7 +175,7 @@
 	if (accessible->description)
 		return accessible->description;
 
-	return _("evolution addressbook");
+	return _("evolution address book");
 }
 
 AtkObject*

Modified: trunk/addressbook/addressbook.error.xml
==============================================================================
--- trunk/addressbook/addressbook.error.xml	(original)
+++ trunk/addressbook/addressbook.error.xml	Wed Aug 27 10:37:32 2008
@@ -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>
 

Modified: trunk/addressbook/conduit/address-conduit.c
==============================================================================
--- trunk/addressbook/conduit/address-conduit.c	(original)
+++ trunk/addressbook/conduit/address-conduit.c	Wed Aug 27 10:37:32 2008
@@ -1317,8 +1317,8 @@
 				  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;
 	}

Modified: trunk/addressbook/gui/widgets/eab-gui-util.c
==============================================================================
--- trunk/addressbook/gui/widgets/eab-gui-util.c	(original)
+++ trunk/addressbook/gui/widgets/eab-gui-util.c	Wed Aug 27 10:37:32 2008
@@ -99,16 +99,16 @@
 	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 @@
 		/* 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 @@
 	} 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 @@
 		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.");

Modified: trunk/addressbook/gui/widgets/eab-vcard-control.c
==============================================================================
--- trunk/addressbook/gui/widgets/eab-vcard-control.c	(original)
+++ trunk/addressbook/gui/widgets/eab-vcard-control.c	Wed Aug 27 10:37:32 2008
@@ -281,7 +281,7 @@
 			  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);

Modified: trunk/addressbook/tools/evolution-addressbook-export-list-folders.c
==============================================================================
--- trunk/addressbook/tools/evolution-addressbook-export-list-folders.c	(original)
+++ trunk/addressbook/tools/evolution-addressbook-export-list-folders.c	Wed Aug 27 10:37:32 2008
@@ -41,7 +41,7 @@
 	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);
 	}
 

Modified: trunk/addressbook/tools/evolution-addressbook-export.c
==============================================================================
--- trunk/addressbook/tools/evolution-addressbook-export.c	(original)
+++ trunk/addressbook/tools/evolution-addressbook-export.c	Wed Aug 27 10:37:32 2008
@@ -50,7 +50,7 @@
 	  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"),

Modified: trunk/mail/evolution-mail.schemas.in
==============================================================================
--- trunk/mail/evolution-mail.schemas.in	(original)
+++ trunk/mail/evolution-mail.schemas.in	Wed Aug 27 10:37:32 2008
@@ -376,7 +376,7 @@
       <type>bool</type>
       <default>true</default>
       <locale name="C">
-         <short>Search for the sender photo in local addressbooks </short>
+         <short>Search for the sender photo in local address books </short>
          <long>
           This option would help in improving the speed of fetching.
          </long>
@@ -1163,9 +1163,9 @@
       <type>bool</type>
       <default>false</default>
       <locale name="C">
-         <short>Determines whether to lookup in addressbook for sender email</short>
+         <short>Determines whether to lookup in address book for sender email</short>
          <long>
-	 Determines whether to loopup the sender email in addressbook. If found, it shouldn't be a spam. It looks up in the books marked for autocompletion. It can be slow, if remote addressbooks (like ldap) are marked for autocompletion.
+	 Determines whether to lookup the sender email in address book. If found, it shouldn't be a spam. It looks up in the books marked for autocompletion. It can be slow, if remote address books (like LDAP) are marked for autocompletion.
          </long>
       </locale>
     </schema>
@@ -1177,9 +1177,9 @@
       <type>bool</type>
       <default>false</default>
       <locale name="C">
-         <short>Determines whether to look up addresses for junk filtering in local addressbook only</short>
+         <short>Determines whether to look up addresses for junk filtering in local address book only</short>
          <long>
-	 This option is related to the key lookup_addressbook and is used to determine whether to look up addresses in local addressbook only to exclude mail sent by known contacts from junk filtering.
+	 This option is related to the key lookup_addressbook and is used to determine whether to look up addresses in local address book only to exclude mail sent by known contacts from junk filtering.
          </long>
       </locale>
     </schema>

Modified: trunk/mail/mail-config.glade
==============================================================================
--- trunk/mail/mail-config.glade	(original)
+++ trunk/mail/mail-config.glade	Wed Aug 27 10:37:32 2008
@@ -6196,7 +6196,7 @@
 			<widget class="GtkCheckButton" id="photo_local">
 			  <property name="visible">True</property>
 			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">S_earch for sender photograph only in local addressbooks</property>
+			  <property name="label" translatable="yes">S_earch for sender photograph only in local address books</property>
 			  <property name="use_underline">True</property>
 			  <property name="relief">GTK_RELIEF_NORMAL</property>
 			  <property name="focus_on_click">True</property>
@@ -6779,7 +6779,7 @@
 		    <widget class="GtkCheckButton" id="lookup_book">
 		      <property name="visible">True</property>
 		      <property name="can_focus">True</property>
-		      <property name="label" translatable="yes">Do not mar_k messages as junk if sender is in my addressbook</property>
+		      <property name="label" translatable="yes">Do not mar_k messages as junk if sender is in my address book</property>
 		      <property name="use_underline">True</property>
 		      <property name="relief">GTK_RELIEF_NORMAL</property>
 		      <property name="focus_on_click">True</property>
@@ -6802,7 +6802,7 @@
 		    <widget class="GtkCheckButton" id="junk_lookup_local_only">
 		      <property name="visible">True</property>
 		      <property name="can_focus">True</property>
-		      <property name="label" translatable="yes">_Lookup in local addressbook only</property>
+		      <property name="label" translatable="yes">_Lookup in local address book only</property>
 		      <property name="use_underline">True</property>
 		      <property name="relief">GTK_RELIEF_NORMAL</property>
 		      <property name="focus_on_click">True</property>

Modified: trunk/plugins/bbdb/bbdb.c
==============================================================================
--- trunk/plugins/bbdb/bbdb.c	(original)
+++ trunk/plugins/bbdb/bbdb.c	Wed Aug 27 10:37:32 2008
@@ -564,7 +564,7 @@
 	gtk_box_pack_start (GTK_BOX (hbox), inner_vbox, FALSE, FALSE, 0);
 
 	/* Enable BBDB checkbox */
-	check = gtk_check_button_new_with_mnemonic (_("_Auto-create addressbook entries when replying to messages"));
+	check = gtk_check_button_new_with_mnemonic (_("_Auto-create address book entries when replying to messages"));
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), gconf_client_get_bool (target->gconf, GCONF_KEY_ENABLE, NULL));
 	g_signal_connect (GTK_TOGGLE_BUTTON (check), "toggled", G_CALLBACK (enable_toggled_cb), stuff);
 	gtk_box_pack_start (GTK_BOX (inner_vbox), check, FALSE, FALSE, 0);

Modified: trunk/plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml
==============================================================================
--- trunk/plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml	(original)
+++ trunk/plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml	Wed Aug 27 10:37:32 2008
@@ -5,7 +5,7 @@
 	  _name="Automatic Contacts"
  	  location="@PLUGINDIR@/liborg-gnome-evolution-bbdb SOEXT@">
 
-	  	<_description>Automatically fills your addressbook with names and email addresses as you reply to messages.  Also fills in IM contact information from your buddy lists.</_description>
+	  	<_description>Automatically fills your address book with names and email addresses as you reply to messages.  Also fills in IM contact information from your buddy lists.</_description>
 
 		<author name="Nat Friedman" email="nat novell com"/>
 

Modified: trunk/plugins/default-source/org-gnome-default-source.eplug.xml
==============================================================================
--- trunk/plugins/default-source/org-gnome-default-source.eplug.xml	(original)
+++ trunk/plugins/default-source/org-gnome-default-source.eplug.xml	Wed Aug 27 10:37:32 2008
@@ -6,7 +6,7 @@
      id="org.gnome.evolution.plugin.default-source"
      _name="Default Sources">
      <author name="Sivaiah Nallagatla" email="snallagatla novell com"/>
-     <_description>Provides functionality for marking a calendar or an addressbook as the default one.</_description>
+     <_description>Provides functionality for marking a calendar or an address book as the default one.</_description>
         <hook class="org.gnome.evolution.calendar.config:1.0">
             <group
 	     target="source"

Modified: trunk/plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml
==============================================================================
--- trunk/plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml	(original)
+++ trunk/plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml	Wed Aug 27 10:37:32 2008
@@ -4,7 +4,7 @@
 	_name="iPod Synchronization"
 	    location="@PLUGINDIR@/liborg-gnome-ipod-sync-evolution SOEXT@"> 
 	    <author name="Srinivasa Ragavan" email="sragavan novell com"/>
-	    <_description>Synchronize the selected task/memo/calendar/addressbook with Apple iPod</_description>
+	    <_description>Synchronize the selected task/memo/calendar/address book with Apple iPod</_description>
 	
 		<hook class="org.gnome.evolution.calendar.popup:1.0">
 			<menu id="org.gnome.evolution.tasks.source.popup" target="source">

Modified: trunk/ui/evolution-addressbook.xml
==============================================================================
--- trunk/ui/evolution-addressbook.xml	(original)
+++ trunk/ui/evolution-addressbook.xml	Wed Aug 27 10:37:32 2008
@@ -63,7 +63,7 @@
 	 type="toggle"/>
  
     <cmd name="FolderCreate" _label="_New"
-         _tip="Create a new addressbook folder"
+         _tip="Create a new address book folder"
 	 pixtype="pixbuf"/>
 
     <cmd name="FolderCopy" _label="_Copy Folder Contacts To"
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]