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

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index dfe359a51c7b0ea5ea8a712e9fab9a362224f947..0c9c69e0e1ff67b096d75d2aa50c8dee37448f69 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,33 @@
+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

diff --git a/PATCHSETS b/PATCHSETS
index c6a5224724bac45a5755e1e4903b1e51a5d5e9b2..ebd10cf7a71a7e3270d951a4acb3c8a673f47a03 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -664,3 +664,4 @@
 ( 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

diff --git a/configure.ac b/configure.ac
index cd72c82599b59358cd719e315fbb07039458362a..090ad5f31b14d0e01d865c2616349dc91c16dbb2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=12
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=69
+EXTRA_VERSION=70
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/account.c b/src/account.c
index f6cebe81c25f724ee295f24ef475ddcd49e260c5..572d390485d6c328b77fd7023cbb99671b72c20f 100644 (file)
--- a/src/account.c
+++ b/src/account.c
@@ -645,7 +645,7 @@ static void account_edit_create(void)
 
        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);
@@ -796,13 +796,13 @@ static void account_clone(GtkWidget *widget, gpointer data)
                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);

diff --git a/src/action.c b/src/action.c
index 55d64410e02557c197ebb662cfa099926fa95bfd..7f15b7cff6ace4c1f46dc5577e2cf932ea6fe7bd 100644 (file)
--- a/src/action.c
+++ b/src/action.c
@@ -1418,7 +1418,7 @@ static gchar *get_user_string(const gchar *action, ActionType type)
        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
@@ -1427,7 +1427,7 @@ static gchar *get_user_string(const gchar *action, ActionType type)
        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

diff --git a/src/addressbook.c b/src/addressbook.c
index c61c571da8d9f23edfa1e091e35b24942822c83c..8ee706b5921b96bde45818e6b4f1942982322149 100644 (file)
--- a/src/addressbook.c
+++ b/src/addressbook.c
@@ -2371,7 +2371,7 @@ static void addressbook_treenode_delete_cb(
                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 );
@@ -2382,7 +2382,7 @@ static void addressbook_treenode_delete_cb(
                }
                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,
@@ -2398,7 +2398,7 @@ static void addressbook_treenode_delete_cb(
                }
        }
        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;

diff --git a/src/common/defs.h b/src/common/defs.h
index c4cff97e854c6724aa2cb9d4dba89af4954f9a8f..3163a3ac553a34ee43d3e3479abb7b3869cd74e4 100644 (file)
--- a/src/common/defs.h
+++ b/src/common/defs.h
@@ -70,9 +70,9 @@
 #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"

diff --git a/src/common/utils.c b/src/common/utils.c
index e6c8cec5979da674e7beeb6208b87f735f9dca2a..66e63d78eb3a453d064064708a232ebfcc6480c9 100644 (file)
--- a/src/common/utils.c
+++ b/src/common/utils.c
@@ -1705,7 +1705,7 @@ const gchar *get_home_dir(void)
             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 */

diff --git a/src/common/xml.c b/src/common/xml.c
index 2222eb13769c4b50b954f5077adb6c4584d9469b..614e2a8d01b6d57a835f6c56ce6fa884c1bb8690 100644 (file)
--- a/src/common/xml.c
+++ b/src/common/xml.c
@@ -502,7 +502,7 @@ gint xml_unescape_str(gchar *str)
 
        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;
                }

diff --git a/src/compose.c b/src/compose.c
index ede0fcb9f9cbe27e5519cf8c3ef8d2a26f6158cf..06204f4e313e507ccc316d4a06ca53a089b84048 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -6064,7 +6064,7 @@ static gint compose_exec_ext_editor_real(const gchar *file)
                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);
        }
@@ -6664,7 +6664,7 @@ static void compose_template_activate_cb(GtkWidget *widget, gpointer data)
        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);

diff --git a/src/foldersel.c b/src/foldersel.c
index 3d4393f8861e15ba2a0edb764490f39945638402..4dfedf3310bc816e198bed405236009825e682cb 100644 (file)
--- a/src/foldersel.c
+++ b/src/foldersel.c
@@ -538,7 +538,7 @@ static void foldersel_new_folder(GtkButton *button, gpointer data)
        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;
        }
@@ -548,14 +548,14 @@ static void foldersel_new_folder(GtkButton *button, gpointer data)
 
        /* 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;
        }
 

diff --git a/src/folderview.c b/src/folderview.c
index c3ef2409383f63b817b728a1a3a420f53032cda7..c2fa342c38b7153f1f7cac6d47d750704edbdede 100644 (file)
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -1949,8 +1949,8 @@ void folderview_move_folder(FolderView *folderview, FolderItem *from_folder,
        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);

diff --git a/src/html.c b/src/html.c
index 790697a1c83e0764b0db963f130e468716f7a6cc..af635276cceb51f85eb7714649a8c951817b5b18 100644 (file)
--- a/src/html.c
+++ b/src/html.c
@@ -42,6 +42,10 @@ static HTMLSymbol symbol_list[] = {
        {">"    , ">"},
        {"&"   , "&"},
        {"""  , "\""},
+       {"‘",  "'"},
+       {"’",  "'"},
+       {"“",  "\""},
+       {"”",  "\""},
        {" "  , " "},
        {"™" , "(TM)"},
 
@@ -527,6 +531,9 @@ static void html_parse_special(HTMLParser *parser)
                        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;
@@ -560,8 +567,6 @@ static void html_parse_special(HTMLParser *parser)
                                symb = "--";  
                                break;
                        case 8216:      /* l single quot mark   ‘  */
-                               symb = "`";  
-                               break;
                        case 8217:      /* r single quot mark   ’  */
                                symb = "'";  
                                break;
@@ -569,10 +574,8 @@ static void html_parse_special(HTMLParser *parser)
                                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 = ",,";  

diff --git a/src/imap_gtk.c b/src/imap_gtk.c
index 6485728f8506448ad7fa34bd10279242fd789d40..a838f5c0b6df08dd3b499171031cd6267737191a 100644 (file)
--- a/src/imap_gtk.c
+++ b/src/imap_gtk.c
@@ -129,14 +129,14 @@ static void new_folder_cb(FolderView *folderview, guint action,
                (_("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;
        }
@@ -146,13 +146,13 @@ static void new_folder_cb(FolderView *folderview, guint action,
 
        /* 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();
@@ -176,7 +176,7 @@ static void rename_folder_cb(FolderView *folderview, guint action,
        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);
@@ -195,7 +195,7 @@ static void rename_folder_cb(FolderView *folderview, guint action,
 */
        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;
        }
@@ -266,7 +266,7 @@ static void remove_server_cb(FolderView *folderview, guint action, GtkWidget *wi
        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);
@@ -312,7 +312,7 @@ static void delete_folder_cb(FolderView *folderview, guint action,
        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,
@@ -333,7 +333,7 @@ static void delete_folder_cb(FolderView *folderview, guint action,
 
        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;
        }
@@ -386,7 +386,7 @@ static void download_cb(FolderView *folderview, guint action,
                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);

diff --git a/src/main.c b/src/main.c
index 43d5d10704b090ff56f771b7949134101667b5c5..cfdb98f324f224e9d5b7778a13f5aff4934334e7 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -166,7 +166,7 @@ static void exit_sylpheed           (MainWindow *mainwin);
        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; \

diff --git a/src/mainwindow.c b/src/mainwindow.c
index c590a1926e92b9b8371bef3a23efd6d2351141c8..3d3d728fdf3686f8d489e4b8bf2d4b44f401ae8e 100644 (file)
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -1664,7 +1664,7 @@ void main_window_add_mailbox(MainWindow *mainwin)
                            "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;
        }

diff --git a/src/messageview.c b/src/messageview.c
index 1fe120de2ffeccdf06c9633f4cfcac97ae71b826..2d10c63f1e9e51bd053fe7a9c3d79925658eb567 100644 (file)
--- a/src/messageview.c
+++ b/src/messageview.c
@@ -1029,7 +1029,7 @@ void messageview_save_as(MessageView *messageview)
        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);
@@ -1313,12 +1313,12 @@ static void print_cb(gpointer data, guint action, GtkWidget *widget)
 #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;

diff --git a/src/mh_gtk.c b/src/mh_gtk.c
index c6f917a96e6d7c0e2f68fc8815b7da48bac8b676..3d77496581496c9b2ea26f097a3777139a2f2743 100644 (file)
--- a/src/mh_gtk.c
+++ b/src/mh_gtk.c
@@ -123,7 +123,7 @@ static void new_folder_cb(FolderView *folderview, guint action,
 
        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;
        }
@@ -133,13 +133,13 @@ static void new_folder_cb(FolderView *folderview, guint action,
 
        /* 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;
        }
 
@@ -164,7 +164,7 @@ static void delete_folder_cb(FolderView *folderview, guint action,
        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,
@@ -185,7 +185,7 @@ static void delete_folder_cb(FolderView *folderview, guint action,
 
        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;
        }
@@ -215,7 +215,7 @@ static void rename_folder_cb(FolderView *folderview, guint action,
        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);
@@ -225,14 +225,14 @@ static void rename_folder_cb(FolderView *folderview, guint action,
        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;
        }
@@ -308,7 +308,7 @@ static void remove_mailbox_cb(FolderView *folderview, guint action,
 
        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);

diff --git a/src/mimeview.c b/src/mimeview.c
index 06a01a1cab0e19c875f2fa6b757cefd8c935885a..b2b10d264986ae7fa4dd147964b50b27630606dd 100644 (file)
--- a/src/mimeview.c
+++ b/src/mimeview.c
@@ -1072,7 +1072,7 @@ static void mimeview_save_all(MimeView *mimeview)
        }
 
        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;
@@ -1259,7 +1259,7 @@ static void mimeview_open_with(MimeView *mimeview)
        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);
@@ -1318,7 +1318,7 @@ static void mimeview_view_file(const gchar *filename, MimeInfo *partinfo,
                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

diff --git a/src/news_gtk.c b/src/news_gtk.c
index ba14bf7f883a46f1be39f3a7f81f744f3d9ba9d5..42bdc844ac51ee4bf50565114aabae544be65f3c 100644 (file)
--- a/src/news_gtk.c
+++ b/src/news_gtk.c
@@ -201,7 +201,7 @@ static void unsubscribe_newsgroup_cb(FolderView *folderview, guint action,
        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);
@@ -250,7 +250,7 @@ static void remove_news_server_cb(FolderView *folderview, guint action,
        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);
@@ -323,7 +323,7 @@ static void download_cb(FolderView *folderview, guint action,
                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);

diff --git a/src/plugins/pgpcore/passphrase.c b/src/plugins/pgpcore/passphrase.c
index a717f1befcd56f9f800e51c9c4704a4b42ed8d8a..913b0ba7d97e5f56b67634435308246228b8c6fb 100644 (file)
--- a/src/plugins/pgpcore/passphrase.c
+++ b/src/plugins/pgpcore/passphrase.c
@@ -292,7 +292,7 @@ gpgmegtk_passphrase_cb(void *opaque, const char *uid_hint,
         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) {

diff --git a/src/plugins/pgpcore/select-keys.c b/src/plugins/pgpcore/select-keys.c
index 1cd365ee202bf6997556404796f32c7cb975e381..2ef3ede788852123ad6995c9c181ab1c443beb55 100644 (file)
--- a/src/plugins/pgpcore/select-keys.c
+++ b/src/plugins/pgpcore/select-keys.c
@@ -102,10 +102,10 @@ update_progress (struct select_keys_s *sk, int running, const char *pattern)
     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);
@@ -232,7 +232,7 @@ fill_clist (struct select_keys_s *sk, const char *pattern)
     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);

diff --git a/src/prefs_account.c b/src/prefs_account.c
index 2ceb7916b747888a915668d9b98a8bbf17233d9b..6b830c8ca0dfd2fb0d9dad09e7aa5190493843a1 100644 (file)
--- a/src/prefs_account.c
+++ b/src/prefs_account.c
@@ -1512,7 +1512,7 @@ static void prefs_account_receive_create(void)
 
        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;

diff --git a/src/prefs_send.c b/src/prefs_send.c
index dedef2d5a64e4a67e3e917b2bd96ced320d67835..01c0b5d61c33e8c275dc7c6551154e3bdff31cb1 100644 (file)
--- a/src/prefs_send.c
+++ b/src/prefs_send.c
@@ -177,7 +177,7 @@ void prefs_send_create_widget(PrefsPage *_page, GtkWindow *window,
        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);

diff --git a/src/prefs_summaries.c b/src/prefs_summaries.c
index fa1f308826294c10f3fce5597d8a6cbe5b870c82..f6c628ceea9724dbadc9f7f43a43f4b82744dec2 100644 (file)
--- a/src/prefs_summaries.c
+++ b/src/prefs_summaries.c
@@ -729,7 +729,7 @@ void prefs_summaries_create_widget(PrefsPage *_page, GtkWindow *window,
 
        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"));
@@ -771,7 +771,7 @@ void prefs_summaries_create_widget(PrefsPage *_page, GtkWindow *window,
 
        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"));

diff --git a/src/procmsg.c b/src/procmsg.c
index ba07eeb7174121863a01420d703d0f37746b1c5f..e60ba45eefdfc317ba611c57229b725da0e3fbb3 100644 (file)
--- a/src/procmsg.c
+++ b/src/procmsg.c
@@ -1015,7 +1015,7 @@ void procmsg_print_message(MsgInfo *msginfo, const gchar *cmdline)
                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);
        }

diff --git a/src/summaryview.c b/src/summaryview.c
index d177b4545b6bad56e07e0f95cb41f723b48c51b2..4383095015dbdcc3e5084950943ad5a673283509 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -3430,10 +3430,10 @@ void summary_save_as(SummaryView *summaryview)
 
        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);
        
@@ -3448,7 +3448,7 @@ void summary_save_as(SummaryView *summaryview)
                        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);
        }
@@ -3474,12 +3474,12 @@ void summary_print(SummaryView *summaryview)
 #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;