[balsa] Use Unicode in translatable strings



commit 7e6797b49cace40a182f40ae571fd9f4f7d873fe
Author: Piotr Drąg <piotrdrag gmail com>
Date:   Sun Nov 20 17:07:25 2016 +0100

    Use Unicode in translatable strings
    
    See https://developer.gnome.org/hig/stable/typography.html
    
    Signed-off-by: Peter Bloomfield <PeterBloomfield bellsouth net>

 libbalsa/gmime-multipart-crypt.c         |    4 ++--
 libbalsa/identity.c                      |    2 +-
 libbalsa/libbalsa-gpgme.c                |    2 +-
 libbalsa/mailbox_pop3.c                  |    2 +-
 libbalsa/rfc3156.c                       |    2 +-
 libbalsa/rfc6350.c                       |    4 ++--
 libbalsa/send.c                          |    4 ++--
 libinit_balsa/assistant_helper.c         |    4 ++--
 libinit_balsa/assistant_page_directory.c |    2 +-
 libinit_balsa/assistant_page_finish.c    |    2 +-
 libinit_balsa/assistant_page_user.c      |    2 +-
 libinit_balsa/assistant_page_welcome.c   |    4 ++--
 src/ab-window.c                          |    2 +-
 src/balsa-app.c                          |    2 +-
 src/balsa-message.c                      |    4 ++--
 src/filter-run-callbacks.c               |    2 +-
 src/folder-conf.c                        |    2 +-
 src/information-dialog.c                 |    2 +-
 src/save-restore.c                       |    2 +-
 src/sendmsg-window.c                     |    6 +++---
 20 files changed, 28 insertions(+), 28 deletions(-)
---
diff --git a/libbalsa/gmime-multipart-crypt.c b/libbalsa/gmime-multipart-crypt.c
index 1e1dd3d..2820da2 100644
--- a/libbalsa/gmime-multipart-crypt.c
+++ b/libbalsa/gmime-multipart-crypt.c
@@ -243,7 +243,7 @@ g_mime_gpgme_mps_verify(GMimeMultipartSigned * mps, GError ** error)
     /* eject on unknown protocols */
     if (crypto_prot == GPGME_PROTOCOL_UNKNOWN) {
        g_set_error(error, GPGME_ERROR_QUARK, GPG_ERR_INV_VALUE,
-                   _("unsupported protocol '%s'"), protocol);
+                   _("unsupported protocol “%s”"), protocol);
        return NULL;
     }
 
@@ -452,7 +452,7 @@ g_mime_gpgme_mpe_decrypt(GMimeMultipartEncrypted * mpe,
                              protocol) != 0) {
        g_set_error(err, GMIME_ERROR, GMIME_ERROR_PROTOCOL_ERROR,
                    _
-                   ("Cannot decrypt multipart/encrypted part: unsupported encryption protocol '%s'."),
+                   ("Cannot decrypt multipart/encrypted part: unsupported encryption protocol “%s”."),
                    protocol ? protocol : _("(none)"));
        return NULL;
     }
diff --git a/libbalsa/identity.c b/libbalsa/identity.c
index cafae92..4b2a27c 100644
--- a/libbalsa/identity.c
+++ b/libbalsa/identity.c
@@ -353,7 +353,7 @@ libbalsa_identity_get_signature(LibBalsaIdentity* identity, GtkWindow *parent)
             fclose(fp);
         } else
             libbalsa_information_parented(parent, LIBBALSA_INFORMATION_ERROR,
-                                          _("Cannot open signature file '%s' "
+                                          _("Cannot open signature file “%s” "
                                             "for reading"),
                                           identity->signature_path);
     }
diff --git a/libbalsa/libbalsa-gpgme.c b/libbalsa/libbalsa-gpgme.c
index 21817a2..cba4654 100644
--- a/libbalsa/libbalsa-gpgme.c
+++ b/libbalsa/libbalsa-gpgme.c
@@ -690,7 +690,7 @@ gpgme_new_with_protocol(gpgme_ctx_t * ctx, gpgme_protocol_t protocol,
     } else {
        if ((err = gpgme_set_protocol(*ctx, protocol)) != GPG_ERR_NO_ERROR) {
            gchar *errmsg =
-               g_strdup_printf(_("could not set protocol '%s'"),
+               g_strdup_printf(_("could not set protocol “%s”"),
                                gpgme_get_protocol_name(protocol));
 
            g_set_error_from_gpgme(error, err, errmsg);
diff --git a/libbalsa/mailbox_pop3.c b/libbalsa/mailbox_pop3.c
index 6ba2c8a..50470ac 100644
--- a/libbalsa/mailbox_pop3.c
+++ b/libbalsa/mailbox_pop3.c
@@ -541,7 +541,7 @@ libbalsa_mailbox_pop3_check(LibBalsaMailbox * mailbox)
         if(m->msg_size_limit>0 && msg_size >= (unsigned)m->msg_size_limit) {
             libbalsa_information
                 (LIBBALSA_INFORMATION_WARNING,
-                 _("POP3 message %d oversized: %d kB - skipped."),
+                 _("POP3 message %d oversized: %d kB — skipped."),
                  i, msg_size);
             total_size -= msg_size;
             continue;
diff --git a/libbalsa/rfc3156.c b/libbalsa/rfc3156.c
index 2d2c382..59527dc 100644
--- a/libbalsa/rfc3156.c
+++ b/libbalsa/rfc3156.c
@@ -794,7 +794,7 @@ libbalsa_signature_info_to_gchar(GMimeGpgmeSigstat * info,
 
             uid = info->key->uids;
             if (uid->next) {
-               msg = g_string_append(msg, _("\nUser ID's:"));
+               msg = g_string_append(msg, _("\nUser IDs:"));
                lead_text = "\n\342\200\242";
             } else {
                msg = g_string_append(msg, _("\nUser ID:"));
diff --git a/libbalsa/rfc6350.c b/libbalsa/rfc6350.c
index 0c902c0..d51d78c 100644
--- a/libbalsa/rfc6350.c
+++ b/libbalsa/rfc6350.c
@@ -256,7 +256,7 @@ rfc6350_eval_line(gchar                       *line,
        /* split into name and value */
        value = strchr(line, ':');
        if (value == NULL) {
-               g_set_error(error, RFC6350_ERROR_QUARK, RFC6350_ERROR_NO_COLON, _("malformed line '%s', 
missing ':'"), line);
+               g_set_error(error, RFC6350_ERROR_QUARK, RFC6350_ERROR_NO_COLON, _("malformed line “%s”, 
missing “:”"), line);
                result = FALSE;
        } else {
                gchar *namepart;
@@ -267,7 +267,7 @@ rfc6350_eval_line(gchar                       *line,
                name = rfc6350_get_name(namepart);
                value = &value[1];
                if ((name[0] == '\0') || (value[0] == '\0')) {
-                       g_set_error(error, RFC6350_ERROR_QUARK, RFC6350_ERROR_EMPTY, _("malformed line '%s', 
empty name or value"), line);
+                       g_set_error(error, RFC6350_ERROR_QUARK, RFC6350_ERROR_EMPTY, _("malformed line “%s”, 
empty name or value"), line);
                        result = FALSE;
                } else {
                        g_debug("%s: line='%s' name='%s', value='%s'", __func__, line, name, value);
diff --git a/libbalsa/send.c b/libbalsa/send.c
index 7bc1816..a90a23b 100644
--- a/libbalsa/send.c
+++ b/libbalsa/send.c
@@ -1735,8 +1735,8 @@ libbalsa_message_create_mime_message(LibBalsaMessage* message, gboolean flow,
 
                        libbalsa_information(LIBBALSA_INFORMATION_WARNING,
                                             _("Cannot determine charset "
-                                              "for text file `%s'; "
-                                              "sending as mime type `%s'"),
+                                              "for text file “%s”; "
+                                              "sending as mime type “%s”"),
                                             libbalsa_vfs_get_uri_utf8(body->file_uri),
                                              default_type);
                        g_strfreev(mime_type);
diff --git a/libinit_balsa/assistant_helper.c b/libinit_balsa/assistant_helper.c
index d314f02..41abf1c 100644
--- a/libinit_balsa/assistant_helper.c
+++ b/libinit_balsa/assistant_helper.c
@@ -210,7 +210,7 @@ balsa_init_create_to_directory(const gchar * dir, gchar ** complaint)
             if (stat(sofar, &sb) < 0) {
                 if (mkdir(sofar, S_IRUSR | S_IWUSR | S_IXUSR) < 0) {
                     (*complaint) =
-                        g_strdup_printf(_("Couldn't create a directory:"
+                        g_strdup_printf(_("Couldn’t create a directory:"
                                           " mkdir() failed on pathname “%s”,"
                                           " with error “%s”."),
                                         sofar, g_strerror(errno));
@@ -236,7 +236,7 @@ balsa_init_create_to_directory(const gchar * dir, gchar ** complaint)
         if (mkdir(dir, S_IRUSR | S_IWUSR | S_IXUSR) < 0) {
             (*complaint) =
                 g_strdup_printf(_
-                                ("Couldn't create a directory: mkdir() failed on pathname “%s”."),
+                                ("Couldn’t create a directory: mkdir() failed on pathname “%s”."),
                                 dir);
             return TRUE;
         }
diff --git a/libinit_balsa/assistant_page_directory.c b/libinit_balsa/assistant_page_directory.c
index 7d1daf4..473a3fc 100644
--- a/libinit_balsa/assistant_page_directory.c
+++ b/libinit_balsa/assistant_page_directory.c
@@ -81,7 +81,7 @@ unconditional_mailbox(const gchar * path, const gchar * prettyname,
         (*error) =
             g_strdup_printf(_
                             ("The pathname “%s” must be specified"
-                             " canonically -- it must start with a \'/\'."),
+                             " canonically — it must start with a “/”."),
                             dup);
         g_free(dup);
         return;
diff --git a/libinit_balsa/assistant_page_finish.c b/libinit_balsa/assistant_page_finish.c
index d567632..b98c63f 100644
--- a/libinit_balsa/assistant_page_finish.c
+++ b/libinit_balsa/assistant_page_finish.c
@@ -39,7 +39,7 @@ void
 balsa_druid_page_finish(GtkAssistant * druid)
 {
     static const gchar bye[] =
-        N_("You've successfully set up Balsa. Have fun!\n"
+        N_("You’ve successfully set up Balsa. Have fun!\n"
            "   -- The Balsa development team");
     GtkWidget *page = gtk_label_new(_(bye));
 
diff --git a/libinit_balsa/assistant_page_user.c b/libinit_balsa/assistant_page_user.c
index 0a7a50d..875a538 100644
--- a/libinit_balsa/assistant_page_user.c
+++ b/libinit_balsa/assistant_page_user.c
@@ -54,7 +54,7 @@ balsa_druid_page_user_init(BalsaDruidPageUser * user,
     static const char *header2 =
         N_("The following settings are also needed "
            "(and you can find them later, if need be, in the Email "
-           "application in the 'Preferences' and 'Identities' "
+           "application in the “Preferences” and “Identities” "
            "menu items)");
 #if 0
     static const char *header21 =
diff --git a/libinit_balsa/assistant_page_welcome.c b/libinit_balsa/assistant_page_welcome.c
index b1af030..6c194f3 100644
--- a/libinit_balsa/assistant_page_welcome.c
+++ b/libinit_balsa/assistant_page_welcome.c
@@ -28,11 +28,11 @@ balsa_druid_page_welcome(GtkAssistant * druid)
     static const gchar text[] =
         N_
         ("Before you can send or receive email:\n\n"
-         "-- either you should already have Internet access and an "
+         "• either you should already have Internet access and an "
          "email account, provided by an Internet Service Provider, "
          "and you should have made that Internet connection on your "
          "computer\n\n"
-         "-- or your Network Administrator at your place of "
+         "• or your Network Administrator at your place of "
          "work/study/similar may have set up your computer to "
          "connect to the network.");
 
diff --git a/src/ab-window.c b/src/ab-window.c
index 01673d4..ebb88b2 100644
--- a/src/ab-window.c
+++ b/src/ab-window.c
@@ -727,7 +727,7 @@ balsa_ab_window_load(BalsaAbWindow *ab)
            libbalsa_address_book_strerror(ab->current_address_book, err);
         balsa_information_parented(GTK_WINDOW(ab),
                                   LIBBALSA_INFORMATION_ERROR,
-                                  _("Error opening address book '%s':\n%s"),
+                                  _("Error opening address book “%s”:\n%s"),
                                   ab->current_address_book->name, desc);
     }
     balsa_ab_window_set_title(ab);
diff --git a/src/balsa-app.c b/src/balsa-app.c
index 6edd2b2..3f68461 100644
--- a/src/balsa-app.c
+++ b/src/balsa-app.c
@@ -526,7 +526,7 @@ open_mailbox_by_url(const gchar * url, gboolean hidden)
             libbalsa_mailbox_view_free(view);
         }
         balsa_information(LIBBALSA_INFORMATION_WARNING,
-                          _("Couldn't open mailbox “%s”"), url);
+                          _("Couldn’t open mailbox “%s”"), url);
     }
 }
 
diff --git a/src/balsa-message.c b/src/balsa-message.c
index b2ab9ff..567cc57 100644
--- a/src/balsa-message.c
+++ b/src/balsa-message.c
@@ -2584,7 +2584,7 @@ create_mdn_dialog(GtkWindow *parent, gchar * sender, gchar * mdn_to_address,
                                _("The sender of this mail, %s, "
                                  "requested \n"
                                  "a Message Disposition Notification"
-                                 "(MDN) to be returned to `%s'.\n"
+                                 "(MDN) to be returned to “%s”.\n"
                                  "Do you want to send "
                                  "this notification?"),
                                sender, mdn_to_address);
@@ -2846,7 +2846,7 @@ libbalsa_msg_try_decrypt(LibBalsaMessage * message, LibBalsaMessageBody * body,
                    (chk_crypto->chk_mode == LB_MAILBOX_CHK_CRYPT_ALWAYS ?
                     LIBBALSA_INFORMATION_ERROR : LIBBALSA_INFORMATION_MESSAGE,
                      _("The message sent by %s with subject “%s” contains "
-                       "an encrypted part, but it's structure is invalid."),
+                       "an encrypted part, but its structure is invalid."),
                     chk_crypto->sender, chk_crypto->subject);
             } else if (encrres & LIBBALSA_PROTECT_RFC3156) {
                 if (!balsa_app.has_openpgp)
diff --git a/src/filter-run-callbacks.c b/src/filter-run-callbacks.c
index 6487755..2c02960 100644
--- a/src/filter-run-callbacks.c
+++ b/src/filter-run-callbacks.c
@@ -297,7 +297,7 @@ fr_add_pressed_func(GtkTreeModel * model, GtkTreePath * path,
         balsa_information(LIBBALSA_INFORMATION_ERROR,
                           _("The destination mailbox of "
                             "the filter “%s” is “%s”.\n"
-                            "You can't associate it with the same "
+                            "You can’t associate it with the same "
                             "mailbox (that causes recursion)."),
                           fil->name, p->mbox->name);
 
diff --git a/src/folder-conf.c b/src/folder-conf.c
index 9f68bdf..7408674 100644
--- a/src/folder-conf.c
+++ b/src/folder-conf.c
@@ -893,7 +893,7 @@ folder_conf_imap_sub_node(BalsaMailboxNode * mn)
                 rights_str = g_string_new(std_acls[mn->mailbox->readonly ? 1 : 3]);
                 rights_str =
                     g_string_append(rights_str,
-                                    _("\nthe server does not support ACL's"));
+                                    _("\nthe server does not support ACLs"));
             } else {
                 gint n;
                 gchar **acls;
diff --git a/src/information-dialog.c b/src/information-dialog.c
index d04da44..adaba10 100644
--- a/src/information-dialog.c
+++ b/src/information-dialog.c
@@ -228,7 +228,7 @@ balsa_information_list(GtkWindow *parent, LibBalsaInformationType type,
        GtkWidget *scrolled_window;
 
        information_dialog =
-           gtk_dialog_new_with_buttons(_("Information - Balsa"), 
+           gtk_dialog_new_with_buttons(_("Information — Balsa"), 
                                         parent,
                                         GTK_DIALOG_DESTROY_WITH_PARENT |
                                         libbalsa_dialog_flags(),
diff --git a/src/save-restore.c b/src/save-restore.c
index 6d3b389..58d1841 100644
--- a/src/save-restore.c
+++ b/src/save-restore.c
@@ -1101,7 +1101,7 @@ config_global_load(void)
         if (!libbalsa_conf_get_bool("GtkUIManager")) {
             g_idle_add((GSourceFunc) config_warning_idle,
                        _("This version of Balsa uses a new user interface; "
-                         "if you have changed Balsa's keyboard accelerators, "
+                         "if you have changed Balsa’s keyboard accelerators, "
                          "you will need to set them again."));
             libbalsa_conf_set_bool("GtkUIManager", TRUE);
         }
diff --git a/src/sendmsg-window.c b/src/sendmsg-window.c
index 1d2f048..091e300 100644
--- a/src/sendmsg-window.c
+++ b/src/sendmsg-window.c
@@ -521,7 +521,7 @@ delete_handler(BalsaSendmsg * bsmsg)
                                GTK_DIALOG_DESTROY_WITH_PARENT,
                                GTK_MESSAGE_QUESTION,
                                GTK_BUTTONS_YES_NO,
-                               _("The message to '%s' is modified.\n"
+                               _("The message to “%s” is modified.\n"
                                  "Save message to Draftbox?"), tmp);
     g_free(free_me);
 #if HAVE_MACOSX_DESKTOP
@@ -1401,11 +1401,11 @@ change_attach_mode(GtkWidget * menu_item, BalsaAttachInfo *info)
                                   GTK_MESSAGE_QUESTION,
                                   GTK_BUTTONS_YES_NO,
                                   _("Saying yes will not send the file "
-                                    "`%s' itself, but just a MIME "
+                                    "“%s” itself, but just a MIME "
                                     "message/external-body reference.  "
                                     "Note that the recipient must "
                                     "have proper permissions to see the "
-                                    "`real' file.\n\n"
+                                    "“real” file.\n\n"
                                     "Do you really want to attach "
                                     "this file as reference?"),
                                   libbalsa_vfs_get_uri_utf8(info->file_uri));


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]