+2005-07-17 [paul] 1.9.12cvs70
+
+ * src/common/defs.h
+ update urls
+ * src/account.c
+ * src/action.c
+ * src/addressbook.c
+ * src/compose.c
+ * src/foldersel.c
+ * src/folderview.c
+ * src/html.c
+ * src/imap_gtk.c
+ * src/main.c
+ * src/mainwindow.c
+ * src/messageview.c
+ * src/mh_gtk.c
+ * src/mimeview.c
+ * src/news_gtk.c
+ * src/prefs_account.c
+ * src/prefs_send.c
+ * src/prefs_summaries.c
+ * src/procmsg.c
+ * src/summaryview.c
+ * src/common/utils.c
+ * src/common/xml.c
+ * src/plugins/pgpcore/passphrase.c
+ * src/plugins/pgpcore/select-keys.c
+ replace inappropriately used backticks
+ with single quotes
+
2005-07-16 [colin] 1.9.12cvs69
* src/image_viewer.c
( cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/pgpcore/sgpgme.c; ) > 1.9.12cvs67.patchset
( cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/pgpcore/prefs_gpg.c; ) > 1.9.12cvs68.patchset
( cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/image_viewer.c; ) > 1.9.12cvs69.patchset
+( cvs diff -u -r 1.61.2.32 -r 1.61.2.33 src/account.c; cvs diff -u -r 1.12.2.23 -r 1.12.2.24 src/action.c; cvs diff -u -r 1.60.2.19 -r 1.60.2.20 src/addressbook.c; cvs diff -u -r 1.382.2.142 -r 1.382.2.143 src/compose.c; cvs diff -u -r 1.26.2.17 -r 1.26.2.18 src/foldersel.c; cvs diff -u -r 1.207.2.45 -r 1.207.2.46 src/folderview.c; cvs diff -u -r 1.12.2.8 -r 1.12.2.9 src/html.c; cvs diff -u -r 1.1.2.15 -r 1.1.2.16 src/imap_gtk.c; cvs diff -u -r 1.115.2.44 -r 1.115.2.45 src/main.c; cvs diff -u -r 1.274.2.45 -r 1.274.2.46 src/mainwindow.c; cvs diff -u -r 1.94.2.56 -r 1.94.2.57 src/messageview.c; cvs diff -u -r 1.2.2.8 -r 1.2.2.9 src/mh_gtk.c; cvs diff -u -r 1.83.2.34 -r 1.83.2.35 src/mimeview.c; cvs diff -u -r 1.2.2.5 -r 1.2.2.6 src/news_gtk.c; cvs diff -u -r 1.105.2.27 -r 1.105.2.28 src/prefs_account.c; cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/prefs_send.c; cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/prefs_summaries.c; cvs diff -u -r 1.150.2.30 -r 1.150.2.31 src/procmsg.c; cvs diff -u -r 1.395.2.93 -r 1.395.2.94 src/summaryview.c; cvs diff -u -r 1.9.2.11 -r 1.9.2.12 src/common/defs.h; cvs diff -u -r 1.36.2.36 -r 1.36.2.37 src/common/utils.c; cvs diff -u -r 1.1.4.7 -r 1.1.4.8 src/common/xml.c; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/pgpcore/passphrase.c; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/pgpcore/select-keys.c; ) > 1.9.12cvs70.patchset
MICRO_VERSION=12
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=69
+EXTRA_VERSION=70
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
label = gtk_label_new
(_("New messages will be checked in this order. Check the boxes\n"
- "on the `G' column to enable message retrieval by `Get all'."));
+ "on the 'G' column to enable message retrieval by 'Get all'."));
gtk_widget_show (label);
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 4);
gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT);
return;
if (ac_prefs->protocol == A_IMAP4 || ac_prefs->protocol == A_NNTP) {
- alertpanel_error(_("Accounts with remote folders cannot be cloned"));
+ alertpanel_error(_("Accounts with remote folders cannot be copied."));
return;
}
ac_clon = prefs_account_new();
/* copy fields */
- ac_clon->account_name = g_strdup_printf(_("Cloned %s"),
+ ac_clon->account_name = g_strdup_printf(_("Copy of %s"),
ac_prefs->account_name);
/* personal */
ACP_FDUP(name);
case ACTION_USER_HIDDEN_STR:
message = g_strdup_printf
(_("Enter the argument for the following action:\n"
- "(`%%h' will be replaced with the argument)\n"
+ "('%%h' will be replaced with the argument)\n"
" %s"),
action);
user_str = input_dialog_with_invisible
case ACTION_USER_STR:
message = g_strdup_printf
(_("Enter the argument for the following action:\n"
- "(`%%u' will be replaced with the argument)\n"
+ "('%%u' will be replaced with the argument)\n"
" %s"),
action);
user_str = input_dialog
if( iface->externalQuery ) {
message = g_strdup_printf( _(
"Do you want to delete the query " \
- "results and addresses in `%s' ?" ),
+ "results and addresses in '%s' ?" ),
obj->name );
aval = alertpanel( _("Delete"), message,
GTK_STOCK_YES, GTK_STOCK_NO, NULL );
}
else {
message = g_strdup_printf
- ( _( "Do you want to delete the folder AND all addresses in `%s' ?\n"
+ ( _( "Do you want to delete the folder AND all addresses in '%s' ?\n"
"If deleting the folder only, addresses will be moved into parent folder." ),
obj->name );
aval = alertpanel( _("Delete folder"), message,
}
}
else {
- message = g_strdup_printf(_("Really delete `%s' ?"), obj->name);
+ message = g_strdup_printf(_("Really delete '%s' ?"), obj->name);
aval = alertpanel(_("Delete"), message, GTK_STOCK_YES, GTK_STOCK_NO, NULL);
g_free(message);
if( aval == G_ALERTDEFAULT ) delType = ADDRTREE_DEL_DATA;
#define SYLDOC_URI "http://sylpheeddoc.sourceforge.net/"
#define SYLDOC_MANUAL_HTML_INDEX "/manual/manual.html"
#define SYLDOC_FAQ_HTML_INDEX "/faq/faq.html"
-#define CLAWS_FAQ_URI "http://sylpheed-claws.sourceforge.net/phpwiki/index.php"
+#define CLAWS_FAQ_URI "http://claws.sylpheed.org/faq.php"
#define CLAWS_BUGZILLA_URI "http://www.thewildbeast.co.uk/sylpheed-claws/bugzilla/enter_bug.cgi"
-#define CLAWS_THEMES_URI "http://sylpheed-claws.sourceforge.net/themes.php"
+#define CLAWS_THEMES_URI "http://claws.sylpheed.org/themes.php"
#define THEMEINFO_FILE ".sylpheed_themeinfo"
#define FOLDER_LIST "folderlist.xml"
#define CACHE_FILE ".sylpheed_claws_cache"
if (!home_dir || !*home_dir)
home_dir = g_strdup ("c:\\sylpheed");
}
- debug_print("initialized home_dir to `%s'\n", home_dir);
+ debug_print("initialized home_dir to '%s'\n", home_dir);
}
return home_dir;
#else /* standard glib */
while ((start = strchr(p, '&')) != NULL) {
if ((end = strchr(start + 1, ';')) == NULL) {
- g_warning("Unescaped `&' appeared\n");
+ g_warning("Unescaped '&' appeared\n");
p = start + 1;
continue;
}
g_snprintf(buf, sizeof(buf), prefs_common.ext_editor_cmd, file);
} else {
if (prefs_common.ext_editor_cmd)
- g_warning("External editor command line is invalid: `%s'\n",
+ g_warning("External editor command line is invalid: '%s'\n",
prefs_common.ext_editor_cmd);
g_snprintf(buf, sizeof(buf), def_cmd, file);
}
tmpl = g_object_get_data(G_OBJECT(widget), "template");
g_return_if_fail(tmpl != NULL);
- msg = g_strdup_printf(_("Do you want to apply the template `%s' ?"),
+ msg = g_strdup_printf(_("Do you want to apply the template '%s' ?"),
tmpl->name);
val = alertpanel(_("Apply template"), msg,
_("_Replace"), _("_Insert"), GTK_STOCK_CANCEL);
if ((p && FOLDER_TYPE(selected_item->folder) != F_IMAP) ||
(p && FOLDER_TYPE(selected_item->folder) == F_IMAP &&
*(p + 1) != '\0')) {
- alertpanel_error(_("`%c' can't be included in folder name."),
+ alertpanel_error(_("'%c' can't be included in folder name."),
G_DIR_SEPARATOR);
return;
}
/* find whether the directory already exists */
if (folder_find_child_item_by_name(selected_item, new_folder)) {
- alertpanel_error(_("The folder `%s' already exists."),
+ alertpanel_error(_("The folder '%s' already exists."),
disp_name);
return;
}
new_item = folder_create_folder(selected_item, new_folder);
if (!new_item) {
- alertpanel_error(_("Can't create the folder `%s'."), disp_name);
+ alertpanel_error(_("Can't create the folder '%s'."), disp_name);
return;
}
from_parent = folder_item_parent(from_folder);
if (prefs_common.warn_dnd) {
- buf = g_strdup_printf(_("Do you really want to move folder `%s' to a "
- "sub-folder of `%s' ?"), from_folder->name,
+ buf = g_strdup_printf(_("Do you really want to make folder '%s' a "
+ "sub-folder of '%s' ?"), from_folder->name,
to_folder->name);
status = alertpanel_message_with_disable(_("Move folder"), buf,
_("Yes"), _("No"), NULL, ALERT_QUESTION);
{">" , ">"},
{"&" , "&"},
{""" , "\""},
+ {"‘", "'"},
+ {"’", "'"},
+ {"“", "\""},
+ {"”", "\""},
{" " , " "},
{"™" , "(TM)"},
char *symb = NULL;
switch (ch) {
/* http://www.w3schools.com/html/html_entitiesref.asp */
+ case 96: /* backtick */
+ symb = "`";
+ break;
case 338: /* capital ligature OE Π*/
symb = "OE";
break;
symb = "--";
break;
case 8216: /* l single quot mark ‘ */
- symb = "`";
- break;
case 8217: /* r single quot mark ’ */
symb = "'";
break;
symb = ",";
break;
case 8220: /* l double quot mark “ */
- symb = "``";
- break;
case 8221: /* r double quot mark ” */
- symb = "''";
+ symb = "\"";
break;
case 8222: /* double low-9 quot „ */
symb = ",,";
(_("New folder"),
_("Input the name of new folder:\n"
"(if you want to create a folder to store subfolders,\n"
- " append `/' at the end of the name)"),
+ " append '/' at the end of the name)"),
_("NewFolder"));
if (!new_folder) return;
AUTORELEASE_STR(new_folder, {g_free(new_folder); return;});
p = strchr(new_folder, G_DIR_SEPARATOR);
if (p && *(p + 1) != '\0') {
- alertpanel_error(_("`%c' can't be included in folder name."),
+ alertpanel_error(_("'%c' can't be included in folder name."),
G_DIR_SEPARATOR);
return;
}
/* find whether the directory already exists */
if (folder_find_child_item_by_name(item, new_folder)) {
- alertpanel_error(_("The folder `%s' already exists."), name);
+ alertpanel_error(_("The folder '%s' already exists."), name);
return;
}
new_item = folder_create_folder(item, new_folder);
if (!new_item) {
- alertpanel_error(_("Can't create the folder `%s'."), name);
+ alertpanel_error(_("Can't create the folder '%s'."), name);
return;
}
folder_write_list();
g_return_if_fail(item->folder != NULL);
name = trim_string(item->name, 32);
- message = g_strdup_printf(_("Input new name for `%s':"), name);
+ message = g_strdup_printf(_("Input new name for '%s':"), name);
base = g_path_get_basename(item->path);
new_folder = input_dialog(_("Rename folder"), message, base);
g_free(base);
*/
if (folder_find_child_item_by_name(folder_item_parent(item), new_folder)) {
name = trim_string(new_folder, 32);
- alertpanel_error(_("The folder `%s' already exists."), name);
+ alertpanel_error(_("The folder '%s' already exists."), name);
g_free(name);
return;
}
g_return_if_fail(item->folder->account != NULL);
name = trim_string(item->folder->name, 32);
- message = g_strdup_printf(_("Really delete IMAP4 account `%s'?"), name);
+ message = g_strdup_printf(_("Really delete IMAP4 account '%s'?"), name);
avalue = alertpanel(_("Delete IMAP4 account"), message,
_("Yes"), _("+No"), NULL);
g_free(message);
name = trim_string(item->name, 32);
AUTORELEASE_STR(name, {g_free(name); return;});
message = g_strdup_printf
- (_("All folders and messages under `%s' will be permanently deleted. "
+ (_("All folders and messages under '%s' will be permanently deleted. "
"Recovery will not be possible.\n\n"
"Do you really want to delete?"), name);
avalue = alertpanel(_("Delete folder"), message,
if (item->folder->klass->remove_folder(item->folder, item) < 0) {
folder_item_scan(item);
- alertpanel_error(_("Can't remove the folder `%s'."), name);
+ alertpanel_error(_("Can't remove the folder '%s'."), name);
g_free(old_id);
return;
}
gchar *name;
name = trim_string(item->name, 32);
- alertpanel_error(_("Error occurred while downloading messages in `%s'."), name);
+ alertpanel_error(_("Error occurred while downloading messages in '%s'."), name);
g_free(name);
}
folder_set_ui_func(item->folder, NULL, NULL);
if (!is_dir_exist(dir)) { \
if (is_file_exist(dir)) { \
alertpanel_warning \
- (_("File `%s' already exists.\n" \
+ (_("File '%s' already exists.\n" \
"Can't create folder."), \
dir); \
return 1; \
"Mail");
if (!path) return;
if (folder_find_from_path(path)) {
- alertpanel_error(_("The mailbox `%s' already exists."), path);
+ alertpanel_error(_("The mailbox '%s' already exists."), path);
g_free(path);
return;
}
src = procmsg_get_message_file(msginfo);
if (copy_file(src, dest, TRUE) < 0) {
tmp = g_path_get_basename(dest);
- alertpanel_error(_("Can't save the file `%s'."), tmp);
+ alertpanel_error(_("Can't save the file '%s'."), tmp);
g_free(tmp);
}
g_free(dest);
#ifndef USE_GNOMEPRINT
cmdline = input_dialog(_("Print"),
_("Enter the print command line:\n"
- "(`%s' will be replaced with file name)"),
+ "('%s' will be replaced with file name)"),
prefs_common.print_cmd);
if (!cmdline) return;
if (!(p = strchr(cmdline, '%')) || *(p + 1) != 's' ||
strchr(p + 2, '%')) {
- alertpanel_error(_("Print command line is invalid:\n`%s'"),
+ alertpanel_error(_("Print command line is invalid:\n'%s'"),
cmdline);
g_free(cmdline);
return;
p = strchr(new_folder, G_DIR_SEPARATOR);
if (p) {
- alertpanel_error(_("`%c' can't be included in folder name."),
+ alertpanel_error(_("'%c' can't be included in folder name."),
G_DIR_SEPARATOR);
return;
}
/* find whether the directory already exists */
if (folder_find_child_item_by_name(item, new_folder)) {
- alertpanel_error(_("The folder `%s' already exists."), name);
+ alertpanel_error(_("The folder '%s' already exists."), name);
return;
}
new_item = folder_create_folder(item, new_folder);
if (!new_item) {
- alertpanel_error(_("Can't create the folder `%s'."), name);
+ alertpanel_error(_("Can't create the folder '%s'."), name);
return;
}
name = trim_string(item->name, 32);
AUTORELEASE_STR(name, {g_free(name); return;});
message = g_strdup_printf
- (_("All folders and messages under `%s' will be permanently deleted. "
+ (_("All folders and messages under '%s' will be permanently deleted. "
"Recovery will not be possible.\n\n"
"Do you really want to delete?"), name);
avalue = alertpanel_with_type(_("Delete folder"), message,
if (item->folder->klass->remove_folder(item->folder, item) < 0) {
folder_item_scan(item);
- alertpanel_error(_("Can't remove the folder `%s'."), name);
+ alertpanel_error(_("Can't remove the folder '%s'."), name);
g_free(old_id);
return;
}
g_return_if_fail(item->folder != NULL);
name = trim_string(item->name, 32);
- message = g_strdup_printf(_("Input new name for `%s':"), name);
+ message = g_strdup_printf(_("Input new name for '%s':"), name);
base = g_path_get_basename(item->path);
new_folder = input_dialog(_("Rename folder"), message, base);
g_free(message);
AUTORELEASE_STR(new_folder, {g_free(new_folder); return;});
if (strchr(new_folder, G_DIR_SEPARATOR) != NULL) {
- alertpanel_error(_("`%c' can't be included in folder name."),
+ alertpanel_error(_("'%c' can't be included in folder name."),
G_DIR_SEPARATOR);
return;
}
if (folder_find_child_item_by_name(folder_item_parent(item), new_folder)) {
name = trim_string(new_folder, 32);
- alertpanel_error(_("The folder `%s' already exists."), name);
+ alertpanel_error(_("The folder '%s' already exists."), name);
g_free(name);
return;
}
name = trim_string(item->folder->name, 32);
message = g_strdup_printf
- (_("Really remove the mailbox `%s' ?\n"
+ (_("Really remove the mailbox '%s' ?\n"
"(The messages are NOT deleted from the disk)"), name);
avalue = alertpanel(_("Remove mailbox"), message,
_("Yes"), _("+No"), NULL);
}
if (!is_dir_exist (dirname)) {
- alertpanel_error(_("`%s' is not a directory."),
+ alertpanel_error(_("'%s' is not a directory."),
dirname);
if (startdir) g_free(startdir);
return;
cmd = input_dialog_combo
(_("Open with"),
_("Enter the command line to open file:\n"
- "(`%s' will be replaced with file name)"),
+ "('%s' will be replaced with file name)"),
prefs_common.mime_open_cmd,
prefs_common.mime_open_cmd_history,
TRUE);
g_snprintf(buf, sizeof(buf), cmd, filename);
else {
if (cmd)
- g_warning("MIME viewer command line is invalid: `%s'", cmd);
+ g_warning("MIME viewer command line is invalid: '%s'", cmd);
if (def_cmd)
g_snprintf(buf, sizeof(buf), def_cmd, filename);
else
old_id = folder_item_get_identifier(item);
name = trim_string(item->path, 32);
- message = g_strdup_printf(_("Really unsubscribe newsgroup `%s'?"), name);
+ message = g_strdup_printf(_("Really unsubscribe newsgroup '%s'?"), name);
avalue = alertpanel(_("Unsubscribe newsgroup"), message,
_("Yes"), _("+No"), NULL);
g_free(message);
g_return_if_fail(item->folder->account != NULL);
name = trim_string(item->folder->name, 32);
- message = g_strdup_printf(_("Really delete news account `%s'?"), name);
+ message = g_strdup_printf(_("Really delete news account '%s'?"), name);
avalue = alertpanel(_("Delete news account"), message,
_("Yes"), _("+No"), NULL);
g_free(message);
gchar *name;
name = trim_string(item->name, 32);
- alertpanel_error(_("Error occurred while downloading messages in `%s'."), name);
+ alertpanel_error(_("Error occurred while downloading messages in '%s'."), name);
g_free(name);
}
folder_set_ui_func(item->folder, NULL, NULL);
return GPG_ERR_NO_ERROR;
}
gpgmegtk_set_passphrase_grab (prefs_gpg_get_config()->passphrase_grab);
- debug_print ("%% requesting passphrase for `%s': ", uid_hint);
+ debug_print ("%% requesting passphrase for '%s': ", uid_hint);
pass = passphrase_mbox (uid_hint, passphrase_hint, prev_bad);
gpgmegtk_free_passphrase();
if (!pass) {
char *buf;
if (!running)
- buf = g_strdup_printf (_("Please select key for `%s'"),
+ buf = g_strdup_printf (_("Please select key for '%s'"),
pattern);
else
- buf = g_strdup_printf (_("Collecting info for `%s' ... %c"),
+ buf = g_strdup_printf (_("Collecting info for '%s' ... %c"),
pattern,
windmill[running%DIM(windmill)]);
gtk_label_set_text (sk->toplabel, buf);
clist = sk->clist;
g_return_if_fail (clist);
- debug_print ("select_keys:fill_clist: pattern `%s'\n", pattern);
+ debug_print ("select_keys:fill_clist: pattern '%s'\n", pattern);
/*gtk_clist_freeze (select_keys.clist);*/
err = gpgme_new (&ctx);
PACK_CHECK_BUTTON
(vbox1, recvatgetall_chkbtn,
- _("`Get all' checks for new messages on this account"));
+ _("'Get all' checks for new messages on this account"));
receive.pop3_frame = frame1;
receive.use_apop_chkbtn = use_apop_chkbtn;
optmenu_charset = gtk_option_menu_new ();
gtk_widget_show (optmenu_charset);
gtk_tooltips_set_tip(GTK_TOOLTIPS(charset_tooltip), optmenu_charset,
- _("If `Automatic' is selected, the optimal encoding"
+ _("If 'Automatic' is selected, the optimal encoding"
" for the current locale will be used"),
NULL);
gtk_box_pack_start (GTK_BOX (hbox1), optmenu_charset, FALSE, FALSE, 0);
PACK_CHECK_BUTTON
(vbox2, chkbtn_transhdr,
- _("Translate header name (such as `From:', `Subject:')"));
+ _("Translate header name (such as 'From:', 'Subject:')"));
PACK_CHECK_BUTTON (vbox2, chkbtn_folder_unread,
_("Display unread number next to folder name"));
PACK_CHECK_BUTTON
(vbox2, chkbtn_swapfrom,
- _("Display recipient in `From' column if sender is yourself"));
+ _("Display recipient in 'From' column if sender is yourself"));
PACK_CHECK_BUTTON
(vbox2, chkbtn_useaddrbook,
_("Display sender using address book"));
g_snprintf(buf, sizeof(buf) - 1, cmdline, prtmp);
else {
if (cmdline)
- g_warning("Print command line is invalid: `%s'\n",
+ g_warning("Print command line is invalid: '%s'\n",
cmdline);
g_snprintf(buf, sizeof(buf) - 1, def_cmd, prtmp);
}
if ( aval==0 ) { /* append */
if (append_file(src, dest, TRUE) < 0)
- alertpanel_error(_("Can't save the file `%s'."), tmp);
+ alertpanel_error(_("Can't save the file '%s'."), tmp);
} else { /* overwrite */
if (copy_file(src, dest, TRUE) < 0)
- alertpanel_error(_("Can't save the file `%s'."), tmp);
+ alertpanel_error(_("Can't save the file '%s'."), tmp);
}
g_free(src);
if (!msginfo) break;
src = procmsg_get_message_file(msginfo);
if (append_file(src, dest, TRUE) < 0)
- alertpanel_error(_("Can't save the file `%s'."), tmp);
+ alertpanel_error(_("Can't save the file '%s'."), tmp);
}
g_free(src);
}
#ifndef USE_GNOMEPRINT
cmdline = input_dialog(_("Print"),
_("Enter the print command line:\n"
- "(`%s' will be replaced with file name)"),
+ "('%s' will be replaced with file name)"),
prefs_common.print_cmd);
if (!cmdline) return;
if (!(p = strchr(cmdline, '%')) || *(p + 1) != 's' ||
strchr(p + 2, '%')) {
- alertpanel_error(_("Print command line is invalid:\n`%s'"),
+ alertpanel_error(_("Print command line is invalid:\n'%s'"),
cmdline);
g_free(cmdline);
return;
projects / claws.git / commitdiff