diff options
22 files changed, 102 insertions, 41 deletions
diff --git a/a11y/ChangeLog b/a11y/ChangeLog index 9fbbabaf19..368038b437 100644 --- a/a11y/ChangeLog +++ b/a11y/ChangeLog @@ -1,3 +1,13 @@ +2008-08-27 Philip Withnall <philip@tecnocode.co.uk> + + ** Fix for bug #534762 + + * addressbook/ea-addressbook-view.c: (ea_ab_view_get_name), + (ea_ab_view_get_description): + * addressbook/ea-minicard-view.c: + (ea_minicard_view_get_description): Change "addressbook" to + "address book" in translatable strings. + 2008-08-27 Sankar P <psankar@novell.com> License Changes diff --git a/a11y/addressbook/ea-addressbook-view.c b/a11y/addressbook/ea-addressbook-view.c index be6a1e6212..174fff71f7 100644 --- a/a11y/addressbook/ea-addressbook-view.c +++ b/a11y/addressbook/ea-addressbook-view.c @@ -91,7 +91,7 @@ ea_ab_view_get_name (AtkObject *accessible) if (accessible->name) return accessible->name; - return _("evolution addressbook"); + return _("evolution address book"); } static G_CONST_RETURN gchar* @@ -100,7 +100,7 @@ ea_ab_view_get_description (AtkObject *accessible) if (accessible->description) return accessible->description; - return _("evolution addressbook"); + return _("evolution address book"); } AtkObject* diff --git a/a11y/addressbook/ea-minicard-view.c b/a11y/addressbook/ea-minicard-view.c index b617bef24b..fc5638d51d 100644 --- a/a11y/addressbook/ea-minicard-view.c +++ b/a11y/addressbook/ea-minicard-view.c @@ -175,7 +175,7 @@ ea_minicard_view_get_description (AtkObject *accessible) if (accessible->description) return accessible->description; - return _("evolution addressbook"); + return _("evolution address book"); } AtkObject* 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"), diff --git a/mail/ChangeLog b/mail/ChangeLog index 4d9c93d0a8..855033b555 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,11 @@ +2008-08-27 Philip Withnall <philip@tecnocode.co.uk> + + ** Fix for bug #534762 + + * evolution-mail.schemas.in: + * mail-config.glade: Change "addressbook" to "address book" in + translatable strings. + 2008-08-27 Sankar P <psankar@novell.com> License Changes diff --git a/mail/evolution-mail.schemas.in b/mail/evolution-mail.schemas.in index 7868d1f44c..f32428aa4a 100644 --- a/mail/evolution-mail.schemas.in +++ b/mail/evolution-mail.schemas.in @@ -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> diff --git a/mail/mail-config.glade b/mail/mail-config.glade index 41e5b27465..05e1843bbf 100644 --- a/mail/mail-config.glade +++ b/mail/mail-config.glade @@ -6196,7 +6196,7 @@ For example: "Work" or "Personal"</property> <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 @@ For example: "Work" or "Personal"</property> <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 @@ For example: "Work" or "Personal"</property> <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> diff --git a/plugins/bbdb/ChangeLog b/plugins/bbdb/ChangeLog index 06ac8a80ba..d201691e9a 100644 --- a/plugins/bbdb/ChangeLog +++ b/plugins/bbdb/ChangeLog @@ -1,3 +1,11 @@ +2008-08-27 Philip Withnall <philip@tecnocode.co.uk> + + ** Fix for bug #534762 + + * bbdb.c: (bbdb_page_factory): + * org-gnome-evolution-bbdb.eplug.xml: Change "addressbook" to + "address book" in translatable strings. + 2008-08-27 Sankar P <psankar@novell.com> License Changes diff --git a/plugins/bbdb/bbdb.c b/plugins/bbdb/bbdb.c index 98db91fb99..f5f09274a1 100644 --- a/plugins/bbdb/bbdb.c +++ b/plugins/bbdb/bbdb.c @@ -564,7 +564,7 @@ bbdb_page_factory (EPlugin *ep, EConfigHookItemFactoryData *hook_data) 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); diff --git a/plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml b/plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml index 970ff6e90f..ff3ff9f8d8 100644 --- a/plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml +++ b/plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml @@ -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"/> diff --git a/plugins/default-source/ChangeLog b/plugins/default-source/ChangeLog index e62c363bc2..cecebed736 100644 --- a/plugins/default-source/ChangeLog +++ b/plugins/default-source/ChangeLog @@ -1,3 +1,10 @@ +2008-08-27 Philip Withnall <philip@tecnocode.co.uk> + + ** Fix for bug #534762 + + * org-gnome-default-source.eplug.xml: Change "addressbook" to + "address book" in translatable strings. + 2008-04-21 Milan Crha <mcrha@redhat.com> ** Fix for bug #448863 diff --git a/plugins/default-source/org-gnome-default-source.eplug.xml b/plugins/default-source/org-gnome-default-source.eplug.xml index ec354e517e..92c6fb7078 100644 --- a/plugins/default-source/org-gnome-default-source.eplug.xml +++ b/plugins/default-source/org-gnome-default-source.eplug.xml @@ -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" diff --git a/plugins/ipod-sync/ChangeLog b/plugins/ipod-sync/ChangeLog index f69e3827b6..0344a7b5bc 100644 --- a/plugins/ipod-sync/ChangeLog +++ b/plugins/ipod-sync/ChangeLog @@ -1,3 +1,10 @@ +2008-08-27 Philip Withnall <philip@tecnocode.co.uk> + + ** Fix for bug #534762 + + * org-gnome-ipod-sync-evolution.eplug.xml: Change "addressbook" to + "address book" in translatable strings. + 2008-08-27 Sankar P <psankar@novell.com> License Changes diff --git a/plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml b/plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml index 6e3afa8037..e95b63b3b9 100644 --- a/plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml +++ b/plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml @@ -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"> diff --git a/ui/ChangeLog b/ui/ChangeLog index b6402cb979..b1ee2caa0a 100644 --- a/ui/ChangeLog +++ b/ui/ChangeLog @@ -1,3 +1,10 @@ +2008-08-27 Philip Withnall <philip@tecnocode.co.uk> + + ** Fix for bug #534762 + + * evolution-addressbook.xml: Change "addressbook" to "address book" + in translatable strings. + 2008-08-07 Paul Bolle <pebolle@tiscali.nl> ** Fix for bug #546788 diff --git a/ui/evolution-addressbook.xml b/ui/evolution-addressbook.xml index 999509013b..49c47d5b60 100644 --- a/ui/evolution-addressbook.xml +++ b/ui/evolution-addressbook.xml @@ -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" |