+2006-01-20 [paul] 1.9.100cvs174
+
+ * src/addressbook.c
+ * src/addrgather.c
+ * src/addrharvest.c
+ * src/editaddress.c
+ * src/editgroup.c
+ * src/exphtmldlg.c
+ * src/expldifdlg.c
+ * src/exporthtml.c
+ * src/exportldif.c
+ * src/ldif.c
+ replace 'e-mail' with 'email'
+ * src/summary_search.c
+ add mnemonic to "Find all" button
+
2006-01-20 [wwp] 1.9.100cvs173
* src/export.c
( cvs diff -u -r 1.43.2.38 -r 1.43.2.39 src/toolbar.c; ) > 1.9.100cvs171.patchset
( cvs diff -u -r 1.1.2.3 -r 1.1.2.4 manual/account.xml; cvs diff -u -r 1.1.2.2 -r 1.1.2.3 manual/addrbook.xml; cvs diff -u -r 1.1.2.7 -r 1.1.2.8 manual/advanced.xml; cvs diff -u -r 1.1.2.5 -r 1.1.2.6 manual/faq.xml; cvs diff -u -r 1.1.2.3 -r 1.1.2.4 manual/handling.xml; cvs diff -u -r 1.1.2.2 -r 1.1.2.3 manual/intro.xml; cvs diff -u -r 1.1.2.4 -r 1.1.2.5 manual/plugins.xml; cvs diff -u -r 1.1.2.2 -r 1.1.2.3 manual/starting.xml; ) > 1.9.100cvs172.patchset
( cvs diff -u -r 1.8.2.16 -r 1.8.2.17 src/export.c; cvs diff -u -r 1.13.2.15 -r 1.13.2.16 src/import.c; ) > 1.9.100cvs173.patchset
+( cvs diff -u -r 1.60.2.46 -r 1.60.2.47 src/addressbook.c; cvs diff -u -r 1.5.10.12 -r 1.5.10.13 src/addrgather.c; cvs diff -u -r 1.6.10.10 -r 1.6.10.11 src/addrharvest.c; cvs diff -u -r 1.14.2.14 -r 1.14.2.15 src/editaddress.c; cvs diff -u -r 1.11.2.10 -r 1.11.2.11 src/editgroup.c; cvs diff -u -r 1.3.2.15 -r 1.3.2.16 src/exphtmldlg.c; cvs diff -u -r 1.1.4.18 -r 1.1.4.19 src/expldifdlg.c; cvs diff -u -r 1.5.2.10 -r 1.5.2.11 src/exporthtml.c; cvs diff -u -r 1.1.4.9 -r 1.1.4.10 src/exportldif.c; cvs diff -u -r 1.12.2.7 -r 1.12.2.8 src/ldif.c; cvs diff -u -r 1.15.2.20 -r 1.15.2.21 src/summary_search.c; ) > 1.9.100cvs174.patchset
MICRO_VERSION=100
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=173
+EXTRA_VERSION=174
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
index_titles[COL_SOURCES] = _("Sources");
list_titles[COL_NAME] = _("Name");
- list_titles[COL_ADDRESS] = _("E-Mail address");
+ list_titles[COL_ADDRESS] = _("Email Address");
list_titles[COL_REMARKS] = _("Remarks");
/* Address book window */
addrgather_dlg.btnCancel = btnCancel;
addrgather_dlg.statusbar = statusbar;
addrgather_dlg.status_cid = gtk_statusbar_get_context_id(
- GTK_STATUSBAR(statusbar), "Harvest E-Mail Address Dialog" );
+ GTK_STATUSBAR(statusbar), "Harvest Email Address Dialog" );
/* Create notebook pages */
addrgather_page_warning( PAGE_WARNING, _( "Warning" ) );
/* Apply window title */
if( sourceInd ) {
gtk_window_set_title( GTK_WINDOW(addrgather_dlg.window),
- _("Harvest E-Mail Addresses - from Selected Messages") );
+ _("Harvest Email Addresses - from Selected Messages") );
gtk_widget_set_sensitive( addrgather_dlg.checkRecurse, FALSE );
if( msgList == NULL ) {
errFlag = TRUE;
}
else {
gtk_window_set_title( GTK_WINDOW(addrgather_dlg.window),
- _("Harvest E-Mail Addresses - from Folder") );
+ _("Harvest Email Addresses - from Folder") );
gtk_widget_set_sensitive( addrgather_dlg.checkRecurse, TRUE );
}
gtk_toggle_button_set_active(
#define DFL_FOLDER_SIZE 20
/* Noise strings included by some other E-Mail clients */
-#define REM_NAME_STRING "(E-mail)"
-#define REM_NAME_STRING2 "(E-mail 2)"
+#define REM_NAME_STRING "(Email)"
+#define REM_NAME_STRING2 "(Email 2)"
/* Directories to ignore */
#define DIR_IGNORE ".\t..\t.sylpheed_mark\t.sylpheed_cache"
*error = FALSE;
}
else {
- edit_person_status_show( _( "An E-Mail address must be supplied." ) );
+ edit_person_status_show( _( "An Email address must be supplied." ) );
}
g_free( sEmail );
gchar *titles[ EMAIL_N_COLS ];
gint i;
- titles[ EMAIL_COL_EMAIL ] = _("E-Mail Address");
+ titles[ EMAIL_COL_EMAIL ] = _("Email Address");
titles[ EMAIL_COL_ALIAS ] = _("Alias");
titles[ EMAIL_COL_REMARKS ] = _("Remarks");
/* First row */
top = 0;
- label = gtk_label_new(_("E-Mail Address"));
+ label = gtk_label_new(_("Email Address"));
gtk_table_attach(GTK_TABLE(table), label, 0, 1, top, (top + 1), GTK_FILL, 0, 0, 0);
gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
static void addressbook_edit_person_create( gboolean *cancelled ) {
addressbook_edit_person_dialog_create( cancelled );
addressbook_edit_person_page_basic( PAGE_BASIC, _( "User Data" ) );
- addressbook_edit_person_page_email( PAGE_EMAIL, _( "E-Mail Addresses" ) );
+ addressbook_edit_person_page_email( PAGE_EMAIL, _( "Email Addresses" ) );
addressbook_edit_person_page_attrib( PAGE_ATTRIBUTES, _( "Other Attributes" ) );
gtk_widget_show_all( personeditdlg.window );
}
gint i;
titles[ GROUP_COL_NAME ] = _( "Name" );
- titles[ GROUP_COL_EMAIL ] = _("E-Mail Address");
+ titles[ GROUP_COL_EMAIL ] = _("Email Address");
titles[ GROUP_COL_REMARKS ] = _("Remarks");
window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
groupeditdlg.clist_avail = GTK_CLIST( clist_avail );
if( ! _edit_group_dfl_message_ ) {
- _edit_group_dfl_message_ = _( "Move E-Mail Addresses to or from Group with arrow buttons" );
+ _edit_group_dfl_message_ = _( "Move Email Addresses to or from Group with arrow buttons" );
}
}
/* Fourth row */
top++;
- checkLinkEMail = gtk_check_button_new_with_label( _( "Format E-Mail Links" ) );
+ checkLinkEMail = gtk_check_button_new_with_label( _( "Format Email Links" ) );
gtk_table_attach(GTK_TABLE(table), checkLinkEMail, 1, 2, top, (top + 1),
GTK_FILL, 0, 0, 0);
" cn=John Doe,ou=people,dc=sylpheed,dc=org"
), NULL );
- menuItem = gtk_menu_item_new_with_label( _( "E-Mail Address" ) );
+ menuItem = gtk_menu_item_new_with_label( _( "Email Address" ) );
gtk_object_set_user_data( GTK_OBJECT( menuItem ),
GINT_TO_POINTER( EXPORT_LDIF_ID_EMAIL ) );
gtk_menu_append( GTK_MENU(menu), menuItem );
toolTip = gtk_tooltips_new();
gtk_tooltips_set_tip(
GTK_TOOLTIPS(toolTip), menuItem, _(
- "The first E-Mail Address belonging to a person is used to " \
+ "The first Email Address belonging to a person is used to " \
"create a DN that is formatted similar to:\n" \
" mail=john.doe@domain.com,ou=people,dc=sylpheed,dc=org"
), NULL );
/* Fourth row */
top++;
checkEMail = gtk_check_button_new_with_label(
- _( "Exclude record if no E-Mail Address" ) );
+ _( "Exclude record if no Email Address" ) );
gtk_table_attach(GTK_TABLE(table), checkEMail, 1, 2, top, (top + 1),
GTK_FILL, 0, 0, 0);
gtk_tooltips_set_tip(
GTK_TOOLTIPS(toolTip), checkEMail, _(
"An addressbook may contain entries without " \
- "E-Mail Addresses. Check this option to ignore " \
+ "Email Addresses. Check this option to ignore " \
"these records."
), NULL );
fprintf( stream, "%s", _( "Group Name" ) );
fprintf( stream, "</th>\n" );
fprintf( stream, " <th width=\"300\">" );
- fprintf( stream, "%s", _( "E-Mail Address" ) );
+ fprintf( stream, "%s", _( "Email Address" ) );
fprintf( stream, "</th>\n" );
fprintf( stream, "</tr>\n" );
list = exporthtml_sort_name( folder->listGroup );
fprintf( stream, "%s", _( "Display Name" ) );
fprintf( stream, "</th>\n" );
fprintf( stream, " <th width=\"300\">" );
- fprintf( stream, "%s", _( "E-Mail Address" ) );
+ fprintf( stream, "%s", _( "Email Address" ) );
fprintf( stream, "</th>\n" );
fprintf( stream, " <th width=\"200\">" );
fprintf( stream, "%s", _( "Full Name" ) );
* <ul>
* <li><code>EXPORT_LDIF_ID_UID</code> - Use Sylpheed UID.</li>
* <li><code>EXPORT_LDIF_ID_DNAME</code> - Use Sylpheed display name.</li>
- * <li><code>EXPORT_LDIF_ID_EMAIL</code> - Use first E-Mail address.</li>
+ * <li><code>EXPORT_LDIF_ID_EMAIL</code> - Use first Email address.</li>
* </ul>
*/
void exportldif_set_rdn( ExportLdifCtl *ctl, const gint value ) {
}
else if( g_utf8_collate( tag, LDIF_TAG_EMAIL ) == 0 ) {
rec->reserved = rec->selected = TRUE;
- rec->userName = g_strdup( _( "E-Mail Address" ) );
+ rec->userName = g_strdup( _( "Email Address" ) );
}
g_hash_table_insert( table, key, rec );
}
GTK_BUTTONBOX_END);
gtk_box_set_spacing(GTK_BOX(confirm_area), 5);
- all_btn = gtk_button_new_from_stock(_("Find all"));
+ all_btn = gtk_button_new_with_mnemonic(_("Find _all"));
GTK_WIDGET_SET_FLAGS(all_btn, GTK_CAN_DEFAULT);
gtk_box_pack_start(GTK_BOX(confirm_area), all_btn, TRUE, TRUE, 0);
gtk_widget_show(all_btn);