[evolution-ews] Bug 774364 - Use Unicode in translatable strings



commit 3a4929bbe295892316627973b4e43fb05838a763
Author: Piotr Drąg <piotrdrag gmail com>
Date:   Wed Nov 23 18:24:54 2016 +0100

    Bug 774364 - Use Unicode in translatable strings
    
    See https://developer.gnome.org/hig/stable/typography.html

 src/addressbook/e-book-backend-ews.c               |    4 +-
 src/calendar/e-cal-backend-ews.c                   |    2 +-
 src/camel/camel-ews-folder.c                       |    8 +++---
 src/camel/camel-ews-store.c                        |   22 ++++++++++----------
 src/collection/e-ews-backend.c                     |    4 +-
 src/configuration/e-ews-config-utils.c             |    2 +-
 src/configuration/e-ews-ooo-notificator.c          |    2 +-
 src/configuration/e-ews-subscribe-foreign-folder.c |   20 +++++++++---------
 .../e-mail-config-ews-delegates-page.c             |    4 +-
 src/configuration/e-mail-config-ews-ooo-page.c     |    2 +-
 .../module-ews-configuration.error.xml             |   14 ++++++------
 src/server/e-ews-connection.c                      |    2 +-
 src/server/e-ews-folder.c                          |    2 +-
 13 files changed, 44 insertions(+), 44 deletions(-)
---
diff --git a/src/addressbook/e-book-backend-ews.c b/src/addressbook/e-book-backend-ews.c
index 9ca7da9..71aa14e 100644
--- a/src/addressbook/e-book-backend-ews.c
+++ b/src/addressbook/e-book-backend-ews.c
@@ -1539,7 +1539,7 @@ e_book_backend_ews_create_contacts (EBookBackend *backend,
                                opid,
                                EDB_ERROR_EX (
                                        NOT_SUPPORTED,
-                                       _("Cannot save contact list, it's only supported on EWS Server 2010 
or later")),
+                                       _("Cannot save contact list, it’s only supported on EWS Server 2010 
or later")),
                                NULL);
                        return;
                }
@@ -1906,7 +1906,7 @@ e_book_backend_ews_modify_contacts (EBookBackend *backend,
                                opid,
                                EDB_ERROR_EX (
                                        NOT_SUPPORTED,
-                                       _("Cannot save contact list, it's only supported on EWS Server 2010 
or later")),
+                                       _("Cannot save contact list, it’s only supported on EWS Server 2010 
or later")),
                                NULL);
                        return;
                }
diff --git a/src/calendar/e-cal-backend-ews.c b/src/calendar/e-cal-backend-ews.c
index 41a36cd..677ed2d 100644
--- a/src/calendar/e-cal-backend-ews.c
+++ b/src/calendar/e-cal-backend-ews.c
@@ -2402,7 +2402,7 @@ ews_cal_do_method_request_publish_reply (ECalBackendEws *cbews,
        GSList *ids = NULL;
 
        if (!response_type) {
-               g_set_error (error, E_DATA_CAL_ERROR, UnknownUser, _("Cannot find user '%s' between 
attendees"), cbews->priv->user_email ? cbews->priv->user_email : "NULL");
+               g_set_error (error, E_DATA_CAL_ERROR, UnknownUser, _("Cannot find user “%s” between 
attendees"), cbews->priv->user_email ? cbews->priv->user_email : "NULL");
                return;
        }
 
diff --git a/src/camel/camel-ews-folder.c b/src/camel/camel-ews-folder.c
index a45c051..06ee358 100644
--- a/src/camel/camel-ews-folder.c
+++ b/src/camel/camel-ews-folder.c
@@ -581,7 +581,7 @@ camel_ews_folder_get_message (CamelFolder *folder,
            g_mkdir_with_parents (mime_dir, 0700) == -1) {
                g_set_error (
                        error, CAMEL_ERROR, CAMEL_ERROR_GENERIC,
-                       _("Unable to create cache path '%s': %s"),
+                       _("Unable to create cache path “%s”: %s"),
                        mime_dir, g_strerror (errno));
                g_free (mime_dir);
                goto exit;
@@ -673,7 +673,7 @@ camel_ews_folder_get_message (CamelFolder *folder,
        if (g_mkdir_with_parents (dir, 0700) == -1) {
                g_set_error (
                        error, CAMEL_ERROR, CAMEL_ERROR_GENERIC,
-                       _("Unable to create cache path '%s': %s"),
+                       _("Unable to create cache path “%s”: %s"),
                        dir, g_strerror (errno));
                g_free (dir);
                g_free (cache_file);
@@ -687,7 +687,7 @@ camel_ews_folder_get_message (CamelFolder *folder,
                        /* Translators: The first %s consists of the source file name,
                           the second %s of the destination file name and
                           the third %s of the error message. */
-                       _("Failed to move message cache file from '%s' to '%s': %s"),
+                       _("Failed to move message cache file from “%s” to “%s”: %s"),
                        mime_content, cache_file, g_strerror (errno));
                g_free (cache_file);
                goto exit;
@@ -1879,7 +1879,7 @@ ews_refresh_info_sync (CamelFolder *folder,
        id = camel_ews_store_summary_get_folder_id_from_name (
                ews_store->summary, full_name);
 
-       camel_operation_push_message (cancellable, _("Refreshing folder '%s'"), camel_folder_get_display_name 
(folder));
+       camel_operation_push_message (cancellable, _("Refreshing folder “%s”"), camel_folder_get_display_name 
(folder));
 
        /* Sync folder items does not return the fields ToRecipients,
         * CCRecipients. With the item_type unknown, its not possible
diff --git a/src/camel/camel-ews-store.c b/src/camel/camel-ews-store.c
index e086470..6abc6b9 100644
--- a/src/camel/camel-ews-store.c
+++ b/src/camel/camel-ews-store.c
@@ -643,7 +643,7 @@ ews_update_has_ooo_set (CamelSession *session,
        if (!cnc)
                return;
 
-       camel_operation_push_message (cancellable, _("Checking \"Out of Office\" settings"));
+       camel_operation_push_message (cancellable, _("Checking “Out of Office” settings"));
 
        oof_settings = e_ews_oof_settings_new_sync (cnc, cancellable, &local_error);
 
@@ -1246,7 +1246,7 @@ ews_connect_sync (CamelService *service,
                state = camel_ews_store_get_ooo_alert_state (ews_store);
                if (state == CAMEL_EWS_STORE_OOO_ALERT_STATE_UNKNOWN)
                        camel_session_submit_job (
-                               session, _("Checking \"Out of Office\" settings"),
+                               session, _("Checking “Out of Office” settings"),
                                ews_update_has_ooo_set,
                                g_object_ref (ews_store),
                                g_object_unref);
@@ -2484,7 +2484,7 @@ ews_create_folder_sync (CamelStore *store,
                g_free (fid);
                g_set_error (
                        error, CAMEL_ERROR, CAMEL_ERROR_GENERIC,
-                       _("Cannot create folder '%s', folder already exists"),
+                       _("Cannot create folder “%s”, folder already exists"),
                        full_name);
                g_free (full_name);
                return NULL;
@@ -2509,7 +2509,7 @@ ews_create_folder_sync (CamelStore *store,
 
                        g_set_error (
                                error, CAMEL_ERROR, CAMEL_ERROR_GENERIC,
-                               _("Cannot create folder under '%s', it is used for folders of other users 
only"),
+                               _("Cannot create folder under “%s”, it is used for folders of other users 
only"),
                                parent_name);
                        return NULL;
                }
@@ -2519,7 +2519,7 @@ ews_create_folder_sync (CamelStore *store,
 
                        g_set_error (
                                error, CAMEL_ERROR, CAMEL_ERROR_GENERIC,
-                               _("Cannot create folder under '%s', it is used for public folders only"),
+                               _("Cannot create folder under “%s”, it is used for public folders only"),
                                parent_name);
                        return NULL;
                }
@@ -2633,7 +2633,7 @@ ews_delete_folder_sync (CamelStore *store,
 
                g_set_error (
                        error, CAMEL_ERROR, CAMEL_ERROR_GENERIC,
-                       _("Cannot remove folder '%s', it is used for folders of other users only"),
+                       _("Cannot remove folder “%s”, it is used for folders of other users only"),
                        folder_name);
                return FALSE;
        }
@@ -2644,7 +2644,7 @@ ews_delete_folder_sync (CamelStore *store,
 
                g_set_error (
                        error, CAMEL_ERROR, CAMEL_ERROR_GENERIC,
-                       _("Cannot remove folder '%s', it is used for public folders only"),
+                       _("Cannot remove folder “%s”, it is used for public folders only"),
                        folder_name);
                return FALSE;
        }
@@ -3259,7 +3259,7 @@ ews_store_subscribe_folder_sync (CamelSubscribable *subscribable,
 
                g_set_error (
                        error, CAMEL_STORE_ERROR, CAMEL_STORE_ERROR_NO_FOLDER,
-                       _("Cannot subscribe folder '%s', no public folder available"), folder_name);
+                       _("Cannot subscribe folder “%s”, no public folder available"), folder_name);
                return FALSE;
        }
 
@@ -3269,7 +3269,7 @@ ews_store_subscribe_folder_sync (CamelSubscribable *subscribable,
 
                g_set_error (
                        error, CAMEL_STORE_ERROR, CAMEL_STORE_ERROR_NO_FOLDER,
-                       _("Cannot subscribe folder '%s', folder not found"), folder_name);
+                       _("Cannot subscribe folder “%s”, folder not found"), folder_name);
                return FALSE;
        }
 
@@ -3521,7 +3521,7 @@ ews_store_unset_oof_settings_state (CamelSession *session,
        EEwsOofState state;
        GError *local_error = NULL;
 
-       camel_operation_push_message (cancellable, _("Unsetting the \"Out of Office\" status"));
+       camel_operation_push_message (cancellable, _("Unsetting the “Out of Office” status"));
 
        connection = camel_ews_store_ref_connection (ews_store);
        oof_settings = e_ews_oof_settings_new_sync (connection, cancellable, &local_error);
@@ -3558,7 +3558,7 @@ camel_ews_store_unset_oof_settings_state (CamelEwsStore *ews_store)
        session = camel_service_ref_session (service);
 
        camel_session_submit_job (
-               session, _("Unsetting the \"Out of Office\" status"),
+               session, _("Unsetting the “Out of Office” status"),
                ews_store_unset_oof_settings_state,
                g_object_ref (ews_store),
                g_object_unref);
diff --git a/src/collection/e-ews-backend.c b/src/collection/e-ews-backend.c
index ef47c93..76545dd 100644
--- a/src/collection/e-ews-backend.c
+++ b/src/collection/e-ews-backend.c
@@ -853,7 +853,7 @@ ews_backend_create_resource_sync (ECollectionBackend *backend,
                                error, G_IO_ERROR,
                                G_IO_ERROR_INVALID_ARGUMENT,
                                _("Could not determine a suitable folder "
-                               "class for a new folder named '%s'"),
+                               "class for a new folder named “%s”"),
                                e_source_get_display_name (source));
                        goto exit;
                }
@@ -940,7 +940,7 @@ ews_backend_delete_resource_sync (ECollectionBackend *backend,
                g_set_error (
                        error, G_IO_ERROR,
                        G_IO_ERROR_INVALID_ARGUMENT,
-                       _("Data source '%s' does not represent "
+                       _("Data source “%s” does not represent "
                        "an Exchange Web Services folder"),
                        e_source_get_display_name (source));
                goto exit;
diff --git a/src/configuration/e-ews-config-utils.c b/src/configuration/e-ews-config-utils.c
index c7b9684..4d9bc9b 100644
--- a/src/configuration/e-ews-config-utils.c
+++ b/src/configuration/e-ews-config-utils.c
@@ -914,7 +914,7 @@ action_folder_permissions_mail_cb (GtkAction *action,
 
        str_folder_id = camel_ews_store_summary_get_folder_id_from_name (ews_store->summary, folder_path);
        if (!str_folder_id) {
-               e_notice (parent, GTK_MESSAGE_ERROR, _("Cannot edit permissions of folder '%s', choose other 
folder."), folder_path);
+               e_notice (parent, GTK_MESSAGE_ERROR, _("Cannot edit permissions of folder “%s”, choose other 
folder."), folder_path);
        } else {
                EShell *shell;
                ESource *source;
diff --git a/src/configuration/e-ews-ooo-notificator.c b/src/configuration/e-ews-ooo-notificator.c
index d8dac0e..4db83a3 100644
--- a/src/configuration/e-ews-ooo-notificator.c
+++ b/src/configuration/e-ews-ooo-notificator.c
@@ -180,7 +180,7 @@ e_ews_ooo_notificator_show_notification (EEwsOooNotificator *extension,
        action = gtk_action_new (
                        "ooo-unset-on-server",
                        _("Unset on Server"),
-                       _("Unset the \"Out of Office\" status"),
+                       _("Unset the “Out of Office” status"),
                        GTK_STOCK_OK);
        g_signal_connect_swapped (
                        action,
diff --git a/src/configuration/e-ews-subscribe-foreign-folder.c 
b/src/configuration/e-ews-subscribe-foreign-folder.c
index e0e79b3..20136a4 100644
--- a/src/configuration/e-ews-subscribe-foreign-folder.c
+++ b/src/configuration/e-ews-subscribe-foreign-folder.c
@@ -92,7 +92,7 @@ add_foreign_folder_to_camel (CamelEwsStore *ews_store,
                g_propagate_error (
                        perror,
                        g_error_new (EWS_CONNECTION_ERROR, EWS_CONNECTION_ERROR_FOLDEREXISTS,
-                       _("Cannot add folder, folder already exists as '%s'"), full_name));
+                       _("Cannot add folder, folder already exists as “%s”"), full_name));
 
                g_free (full_name);
 
@@ -100,9 +100,9 @@ add_foreign_folder_to_camel (CamelEwsStore *ews_store,
        }
 
        /* Translators: The '%s' is replaced with user name, to whom the foreign mailbox belongs.
-        * Example result: "Mailbox - John Smith"
+        * Example result: "Mailbox — John Smith"
        */
-       mailbox = g_strdup_printf (C_("ForeignFolder", "Mailbox - %s"), display_username);
+       mailbox = g_strdup_printf (C_("ForeignFolder", "Mailbox — %s"), display_username);
 
        foreign_mailbox_id = g_strdup_printf ("ForeignMailbox::%s", foreign_email);
        if (!camel_ews_store_summary_has_folder (ews_store->summary, foreign_mailbox_id)) {
@@ -295,7 +295,7 @@ check_foreign_folder_thread (GObject *with_object,
                if (!mailboxes) {
                        g_set_error (
                                perror, EWS_CONNECTION_ERROR, EWS_CONNECTION_ERROR_MAILRECIPIENTNOTFOUND,
-                               _("User '%s' was not found on the server"), cffd->email);
+                               _("User “%s” was not found on the server"), cffd->email);
                        g_object_unref (conn);
                        return;
                }
@@ -331,7 +331,7 @@ check_foreign_folder_thread (GObject *with_object,
                if (!mailbox) {
                        g_set_error (
                                perror, EWS_CONNECTION_ERROR, EWS_CONNECTION_ERROR_ITEMNOTFOUND,
-                               _("User name '%s' is ambiguous, specify it more precisely, please"), 
cffd->email);
+                               _("User name “%s” is ambiguous, specify it more precisely, please"), 
cffd->email);
                        g_object_unref (conn);
                        return;
                }
@@ -353,7 +353,7 @@ check_foreign_folder_thread (GObject *with_object,
                        g_clear_error (&local_error);
                        local_error = g_error_new (
                                EWS_CONNECTION_ERROR, EWS_CONNECTION_ERROR_FOLDERNOTFOUND,
-                               _("Folder '%s' not found. Either it does not exist or you do not have 
permission to access it."),
+                               _("Folder “%s” not found. Either it does not exist or you do not have 
permission to access it."),
                                cffd->orig_foldername);
                }
 
@@ -371,7 +371,7 @@ check_foreign_folder_thread (GObject *with_object,
        if (e_ews_folder_get_folder_type (folder) == E_EWS_FOLDER_TYPE_UNKNOWN) {
                g_propagate_error (
                        perror, g_error_new_literal (EWS_CONNECTION_ERROR,
-                       EWS_CONNECTION_ERROR_FOLDERNOTFOUND, _("Cannot add folder, cannot determine folder's 
type")));
+                       EWS_CONNECTION_ERROR_FOLDERNOTFOUND, _("Cannot add folder, cannot determine folder’s 
type")));
                g_object_unref (folder);
                g_object_unref (conn);
                return;
@@ -414,9 +414,9 @@ check_foreign_folder_idle (GObject *with_object,
        /* Translators: This is used to name foreign folder.
         * The first '%s' is replaced with user name to whom the folder belongs,
         * the second '%s' is replaced with folder name.
-        * Example result: "John Smith - Calendar"
+        * Example result: "John Smith — Calendar"
        */
-       folder_name = g_strdup_printf (C_("ForeignFolder", "%s - %s"), base_username, base_foldername);
+       folder_name = g_strdup_printf (C_("ForeignFolder", "%s — %s"), base_username, base_foldername);
        if (folder_type != E_EWS_FOLDER_TYPE_MAILBOX)
                e_ews_folder_set_name (cffd->folder, folder_name);
 
@@ -535,7 +535,7 @@ subscribe_foreign_response_cb (GObject *dialog,
        cffd->folder = NULL;
 
        description = g_strdup_printf (
-               _("Testing availability of folder '%s' of user '%s', please wait..."),
+               _("Testing availability of folder “%s” of user “%s”, please wait..."),
                show_foldername ? show_foldername : cffd->orig_foldername, cffd->email);
 
        e_ews_config_utils_run_in_thread_with_feedback (
diff --git a/src/configuration/e-mail-config-ews-delegates-page.c 
b/src/configuration/e-mail-config-ews-delegates-page.c
index a9a9b2d..fa95151 100644
--- a/src/configuration/e-mail-config-ews-delegates-page.c
+++ b/src/configuration/e-mail-config-ews-delegates-page.c
@@ -562,7 +562,7 @@ show_delegate_properties_modal (EMailConfigEwsDelegatesPage *page,
        lev_journal = add_permission_level_combo_row (grid, row, NULL, _("_Journal"), di->journal);
        row++;
 
-       text = g_strdup_printf (_("Delegate '%s' has the following permissions"), name);
+       text = g_strdup_printf (_("Delegate “%s” has the following permissions"), name);
        widget = gtk_frame_new (text);
        gtk_container_add (GTK_CONTAINER (widget), GTK_WIDGET (grid));
        g_free (text);
@@ -1714,7 +1714,7 @@ e_mail_config_ews_delegates_page_refresh (EMailConfigEwsDelegatesPage *page)
        page->priv->refresh_cancellable = g_object_ref (cancellable);
 
        e_activity_set_text (
-               activity, _("Retrieving \"Delegates\" settings"));
+               activity, _("Retrieving “Delegates” settings"));
 
        settings = mail_config_ews_delegates_page_get_settings (page);
 
diff --git a/src/configuration/e-mail-config-ews-ooo-page.c b/src/configuration/e-mail-config-ews-ooo-page.c
index 4b6e152..01ba775 100644
--- a/src/configuration/e-mail-config-ews-ooo-page.c
+++ b/src/configuration/e-mail-config-ews-ooo-page.c
@@ -998,7 +998,7 @@ e_mail_config_ews_ooo_page_refresh (EMailConfigEwsOooPage *page)
        page->priv->refresh_cancellable = g_object_ref (cancellable);
 
        e_activity_set_text (
-               activity, _("Retrieving \"Out of Office\" settings"));
+               activity, _("Retrieving “Out of Office” settings"));
 
        settings = mail_config_ews_ooo_page_get_settings (page);
 
diff --git a/src/configuration/module-ews-configuration.error.xml 
b/src/configuration/module-ews-configuration.error.xml
index f950531..33a0128 100644
--- a/src/configuration/module-ews-configuration.error.xml
+++ b/src/configuration/module-ews-configuration.error.xml
@@ -3,26 +3,26 @@
 
   <error type="warning" id="autodiscovery-error">
     <_primary>Autodiscovery query failed.</_primary>
-    <_secondary>The reported error was &quot;{0}&quot;.</_secondary>
+    <_secondary>The reported error was “{0}”.</_secondary>
   </error>
 
   <error type="warning" id="query-oal-error">
     <_primary>Failed to locate offline address books.</_primary>
-    <_secondary>The reported error was &quot;{0}&quot;.</_secondary>
+    <_secondary>The reported error was “{0}”.</_secondary>
   </error>
 
   <error type="warning" id="query-ooo-error">
-    <_primary>Failed to retrieve &quot;Out of Office&quot; settings.</_primary>
-    <_secondary>The reported error was &quot;{0}&quot;.</_secondary>
+    <_primary>Failed to retrieve “Out of Office” settings.</_primary>
+    <_secondary>The reported error was “{0}”.</_secondary>
   </error>
 
   <error type="warning" id="query-delegates-error">
-    <_primary>Failed to retrieve &quot;Delegates&quot; settings.</_primary>
-    <_secondary>The reported error was &quot;{0}&quot;.</_secondary>
+    <_primary>Failed to retrieve “Delegates” settings.</_primary>
+    <_secondary>The reported error was “{0}”.</_secondary>
   </error>
 
   <error type="info" id="has-ooo-set">
-    <_primary>Your Exchange account "{0}" has the status set as "Out of Office".</_primary>
+    <_primary>Your Exchange account “{0}” has the status set as “Out of Office”.</_primary>
   </error>
 
 </error-list>
diff --git a/src/server/e-ews-connection.c b/src/server/e-ews-connection.c
index 46392e5..c4f2f4c 100644
--- a/src/server/e-ews-connection.c
+++ b/src/server/e-ews-connection.c
@@ -2671,7 +2671,7 @@ e_ews_get_msg_for_url (CamelEwsSettings *settings,
        if (!msg) {
                g_set_error (
                        error, G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT,
-                       _("URL '%s' is not valid"), url);
+                       _("URL “%s” is not valid"), url);
                return NULL;
        }
 
diff --git a/src/server/e-ews-folder.c b/src/server/e-ews-folder.c
index c7dccae..69f99bf 100644
--- a/src/server/e-ews-folder.c
+++ b/src/server/e-ews-folder.c
@@ -745,7 +745,7 @@ e_ews_folder_utils_add_as_esource (ESourceRegistry *pregistry,
                g_propagate_error (
                        perror,
                        g_error_new (EWS_CONNECTION_ERROR, EWS_CONNECTION_ERROR_FOLDEREXISTS,
-                       _("Cannot add folder, folder already exists as '%s'"), e_source_get_display_name 
(old_source)));
+                       _("Cannot add folder, folder already exists as “%s”"), e_source_get_display_name 
(old_source)));
        } else if (e_ews_folder_utils_populate_esource (
                source,
                sources,


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