use 'Address Book' instead of 'Addressbook'.

git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@1627 ee746299-78ed-0310-b773-934348b2243d

4 files changed, 21 insertions, 10 deletions

diff --git a/ChangeLog b/ChangeLog
index b28bb6db..de0a2d12 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2007-04-12
 
+	* src/addressbook.c
+	  src/editbook.c: use 'Address Book' instead of 'Addressbook'.
+
+2007-04-12
+
 	* libsylph/codeconv.[ch]: supported ISO-8859-16.
 
 2007-04-11
diff --git a/ChangeLog.ja b/ChangeLog.ja
index af16be46..8d8af1cc 100644
--- a/ChangeLog.ja
+++ b/ChangeLog.ja
@@ -1,5 +1,11 @@
 2007-04-12
 
+	* src/addressbook.c
+	  src/editbook.c: 'Addressbook' ではなく 'Address Book' を使用する
+	  ようにした。
+
+2007-04-12
+
 	* libsylph/codeconv.[ch]: ISO-8859-16 に対応。
 
 2007-04-11
diff --git a/src/addressbook.c b/src/addressbook.c
index 6c4289f5..a515dcb3 100644
--- a/src/addressbook.c
+++ b/src/addressbook.c
@@ -775,7 +775,7 @@ static void addressbook_create(void)
 	addrbook.clist   = clist;
 	addrbook.entry   = entry;
 	addrbook.statusbar = statusbar;
-	addrbook.status_cid = gtk_statusbar_get_context_id( GTK_STATUSBAR(statusbar), "Addressbook Window" );
+	addrbook.status_cid = gtk_statusbar_get_context_id( GTK_STATUSBAR(statusbar), "Address Book Window" );
 
 	addrbook.to_btn  = to_btn;
 	addrbook.cc_btn  = cc_btn;
@@ -2493,11 +2493,11 @@ static gboolean addressbook_convert( AddressIndex *addrIndex ) {
 	}
 	if( errFlag ) {
 		debug_print( "Error\n%s\n", msg );
-		alertpanel( _( "Addressbook conversion error" ), msg, GTK_STOCK_CLOSE, NULL, NULL );
+		alertpanel( _( "Address book conversion error" ), msg, GTK_STOCK_CLOSE, NULL, NULL );
 	}
 	else if( msg ) {
 		debug_print( "Warning\n%s\n", msg );
-		alertpanel( _( "Addressbook conversion" ), msg, GTK_STOCK_CLOSE, NULL, NULL );
+		alertpanel( _( "Address book conversion" ), msg, GTK_STOCK_CLOSE, NULL, NULL );
 	}
 
 	return retVal;
@@ -2532,7 +2532,7 @@ void addressbook_read_file( void ) {
 		/* Error reading address book */
 		debug_print( "Could not read address index.\n" );
 		addrindex_print_index( addrIndex, stdout );
-		alertpanel( _( "Addressbook Error" ),
+		alertpanel( _( "Address Book Error" ),
 			    _( "Could not read address index" ),
 			    GTK_STOCK_CLOSE, NULL, NULL );
 	}
@@ -2639,13 +2639,13 @@ void addressbook_read_file_old( void ) {
 
 	if( errFlag ) {
 		debug_print( "Error\n%s\n", msg );
-		alertpanel( _( "Addressbook Conversion Error" ), msg,
+		alertpanel( _( "Address Book Conversion Error" ), msg,
 			    GTK_STOCK_CLOSE, NULL, NULL );
 	}
 	else {
 		if( msg ) {
 			debug_print( "Warning\n%s\n", msg );
-			alertpanel( _( "Addressbook Conversion" ), msg,
+			alertpanel( _( "Address Book Conversion" ), msg,
 				    GTK_STOCK_CLOSE, NULL, NULL );
 		}
 	}
diff --git a/src/editbook.c b/src/editbook.c
index e77b0ec1..b3106f36 100644
--- a/src/editbook.c
+++ b/src/editbook.c
@@ -171,7 +171,7 @@ static void addressbook_edit_book_create( gboolean *cancelled ) {
 	window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
 	gtk_widget_set_size_request(window, 450, -1);
 	gtk_container_set_border_width( GTK_CONTAINER(window), 0 );
-	gtk_window_set_title(GTK_WINDOW(window), _("Edit Addressbook"));
+	gtk_window_set_title(GTK_WINDOW(window), _("Edit Address Book"));
 	gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
 	gtk_window_set_modal(GTK_WINDOW(window), TRUE);	
 	g_signal_connect(G_OBJECT(window), "delete_event",
@@ -255,7 +255,7 @@ static void addressbook_edit_book_create( gboolean *cancelled ) {
 	addrbookedit_dlg.check_btn  = check_btn;
 	/* addrbookedit_dlg.file_btn   = file_btn; */
 	addrbookedit_dlg.statusbar  = statusbar;
-	addrbookedit_dlg.status_cid = gtk_statusbar_get_context_id( GTK_STATUSBAR(statusbar), "Edit Addressbook Dialog" );
+	addrbookedit_dlg.status_cid = gtk_statusbar_get_context_id( GTK_STATUSBAR(statusbar), "Edit Address Book Dialog" );
 }
 
 AdapterDSource *addressbook_edit_book( AddressIndex *addrIndex, AdapterDSource *ads ) {
@@ -285,7 +285,7 @@ AdapterDSource *addressbook_edit_book( AddressIndex *addrIndex, AdapterDSource *
 			gtk_entry_set_text(GTK_ENTRY(addrbookedit_dlg.name_entry), abf->name);
 		if( abf->fileName )
 			gtk_label_set_text(GTK_LABEL(addrbookedit_dlg.file_label), abf->fileName);
-		gtk_window_set_title( GTK_WINDOW(addrbookedit_dlg.window), _("Edit Addressbook"));
+		gtk_window_set_title( GTK_WINDOW(addrbookedit_dlg.window), _("Edit Address Book"));
 		edit_book_enable_buttons( TRUE );
 	}
 	else {
@@ -304,7 +304,7 @@ AdapterDSource *addressbook_edit_book( AddressIndex *addrIndex, AdapterDSource *
 		g_free( newFile );
 
 		gtk_entry_set_text( GTK_ENTRY(addrbookedit_dlg.name_entry), ADDRESSBOOK_GUESS_BOOK );
-		gtk_window_set_title( GTK_WINDOW(addrbookedit_dlg.window), _("Add New Addressbook") );
+		gtk_window_set_title( GTK_WINDOW(addrbookedit_dlg.window), _("Add New Address Book") );
 		edit_book_enable_buttons( FALSE );
 	}