[evolution-mapi] Bug 774365 - Use Unicode in translatable strings
- From: Milan Crha <mcrha src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-mapi] Bug 774365 - Use Unicode in translatable strings
- Date: Wed, 23 Nov 2016 17:27:54 +0000 (UTC)
commit 555f1df3c96e9043c42608e8b863e4067a50bd40
Author: Piotr Drąg <piotrdrag gmail com>
Date: Wed Nov 23 18:27:18 2016 +0100
Bug 774365 - Use Unicode in translatable strings
See https://developer.gnome.org/hig/stable/typography.html
src/camel/camel-mapi-folder.c | 6 +-
src/camel/camel-mapi-store.c | 52 ++++++++++----------
src/collection/e-mapi-backend.c | 4 +-
src/configuration/e-mapi-config-utils.c | 2 +-
.../e-mapi-subscribe-foreign-folder.c | 18 +++---
src/libexchangemapi/e-mapi-connection.c | 14 +++---
6 files changed, 48 insertions(+), 48 deletions(-)
---
diff --git a/src/camel/camel-mapi-folder.c b/src/camel/camel-mapi-folder.c
index 52b8757..7530af1 100644
--- a/src/camel/camel-mapi-folder.c
+++ b/src/camel/camel-mapi-folder.c
@@ -773,7 +773,7 @@ camel_mapi_folder_fetch_summary (CamelFolder *folder, GCancellable *cancellable,
full_download = camel_offline_folder_can_downsync (CAMEL_OFFLINE_FOLDER (folder));
- 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));
si = camel_mapi_store_summary_get_folder_id (mapi_store->summary, mapi_folder->folder_id);
msi = (CamelMapiStoreInfo *) si;
@@ -841,7 +841,7 @@ camel_mapi_folder_fetch_summary (CamelFolder *folder, GCancellable *cancellable,
g_hash_table_foreach (gco.removed_uids, remove_removed_uids_cb, &gos);
if (full_download) {
- camel_operation_push_message (cancellable, _("Downloading messages in folder '%s'"),
camel_folder_get_display_name (folder));
+ camel_operation_push_message (cancellable, _("Downloading messages in folder “%s”"),
camel_folder_get_display_name (folder));
status = e_mapi_connection_transfer_objects (conn, &obj_folder, gco.to_update,
gather_object_for_offline_cb, &gos, cancellable, mapi_error);
@@ -1167,7 +1167,7 @@ mapi_folder_append_message_sync (CamelFolder *folder,
((folder_flags & CAMEL_FOLDER_TYPE_MASK) == CAMEL_FOLDER_TYPE_OUTBOX)) {
g_set_error (
error, CAMEL_ERROR, CAMEL_ERROR_GENERIC,
- _("Cannot append message to folder '%s'"),
+ _("Cannot append message to folder “%s”"),
full_name);
return FALSE;
}
diff --git a/src/camel/camel-mapi-store.c b/src/camel/camel-mapi-store.c
index d79d68e..5dbeb16 100644
--- a/src/camel/camel-mapi-store.c
+++ b/src/camel/camel-mapi-store.c
@@ -1197,7 +1197,7 @@ mapi_store_get_folder_info_sync (CamelStore *store,
if (status == CAMEL_SERVICE_DISCONNECTED) {
gchar *name = camel_service_get_name (service, TRUE);
- camel_operation_push_message (cancellable, _("Connecting to '%s'"), name);
+ camel_operation_push_message (cancellable, _("Connecting to “%s”"), name);
camel_service_connect_sync (service, cancellable, NULL);
camel_operation_pop_message (cancellable);
@@ -1263,7 +1263,7 @@ mapi_store_create_folder_sync (CamelStore *store,
if (mapi_fid_is_system_folder (mapi_store, camel_mapi_store_folder_id_lookup (mapi_store,
folder_name))) {
g_set_error (
error, CAMEL_ERROR, CAMEL_ERROR_GENERIC,
- _("Cannot create new folder '%s'"),
+ _("Cannot create new folder “%s”"),
folder_name);
return NULL;
}
@@ -1295,7 +1295,7 @@ mapi_store_create_folder_sync (CamelStore *store,
g_set_error (
error, CAMEL_SERVICE_ERROR,
CAMEL_SERVICE_ERROR_UNAVAILABLE,
- _("Cannot find folder '%s'"), parent_name ? parent_name : "");
+ _("Cannot find folder “%s”"), parent_name ? parent_name : "");
return NULL;
}
e_mapi_util_mapi_id_from_string (parent_id, &parent_fid);
@@ -1350,13 +1350,13 @@ mapi_store_create_folder_sync (CamelStore *store,
if (!e_mapi_utils_propagate_cancelled_error (mapi_error, error))
g_set_error (
error, CAMEL_ERROR, CAMEL_ERROR_GENERIC,
- _("Cannot create folder '%s': %s"), folder_name, mapi_error->message);
+ _("Cannot create folder “%s”: %s"), folder_name, mapi_error->message);
camel_mapi_store_maybe_disconnect (mapi_store, mapi_error);
g_error_free (mapi_error);
} else {
g_set_error (
error, CAMEL_ERROR, CAMEL_ERROR_GENERIC,
- _("Cannot create folder '%s'"), folder_name);
+ _("Cannot create folder “%s”"), folder_name);
}
}
@@ -1408,7 +1408,7 @@ mapi_store_delete_folder_sync (CamelStore *store,
g_set_error (
error, CAMEL_SERVICE_ERROR,
CAMEL_SERVICE_ERROR_UNAVAILABLE,
- _("Cannot find folder '%s'"), folder_name);
+ _("Cannot find folder “%s”"), folder_name);
return FALSE;
}
@@ -1454,7 +1454,7 @@ mapi_store_delete_folder_sync (CamelStore *store,
if (!e_mapi_utils_propagate_cancelled_error (local_error, error))
g_set_error (
error, CAMEL_ERROR, CAMEL_ERROR_GENERIC,
- _("Cannot remove folder '%s': %s"),
+ _("Cannot remove folder “%s”: %s"),
folder_name, local_error->message);
camel_mapi_store_maybe_disconnect (mapi_store, local_error);
@@ -1462,7 +1462,7 @@ mapi_store_delete_folder_sync (CamelStore *store,
} else {
g_set_error (
error, CAMEL_ERROR, CAMEL_ERROR_GENERIC,
- _("Cannot remove folder '%s'"),
+ _("Cannot remove folder “%s”"),
folder_name);
}
}
@@ -1517,8 +1517,8 @@ mapi_store_rename_folder_sync (CamelStore *store,
if (!old_fid_str) {
g_set_error (
error, CAMEL_ERROR, CAMEL_ERROR_GENERIC,
- /* Translators: '%s' is current name of the folder */
- _("Cannot rename MAPI folder '%s'. Folder does not exist"),
+ /* Translators: “%s” is current name of the folder */
+ _("Cannot rename MAPI folder “%s”. Folder does not exist"),
old_name);
return FALSE;
}
@@ -1527,9 +1527,9 @@ mapi_store_rename_folder_sync (CamelStore *store,
if (mapi_fid_is_system_folder (mapi_store, old_fid_str)) {
g_set_error (
error, CAMEL_ERROR, CAMEL_ERROR_GENERIC,
- /* Translators: '%s to %s' is current name of the folder and
+ /* Translators: “%s to %s” is current name of the folder and
new name of the folder.*/
- _("Cannot rename MAPI default folder '%s' to '%s'"),
+ _("Cannot rename MAPI default folder “%s” to “%s”"),
old_name, new_name);
return FALSE;
}
@@ -1555,7 +1555,7 @@ mapi_store_rename_folder_sync (CamelStore *store,
if (!e_mapi_util_mapi_id_from_string (old_fid_str, &old_fid)) {
g_set_error (
error, CAMEL_ERROR, CAMEL_ERROR_GENERIC,
- _("Cannot rename MAPI folder '%s' to '%s'"),
+ _("Cannot rename MAPI folder “%s” to “%s”"),
old_name, new_name);
g_free (old_parent);
g_free (new_parent);
@@ -1588,17 +1588,17 @@ mapi_store_rename_folder_sync (CamelStore *store,
if (!e_mapi_utils_propagate_cancelled_error (local_error, error))
g_set_error (
error, CAMEL_ERROR, CAMEL_ERROR_GENERIC,
- /* Translators: '%s to %s' is current name of the folder and
new name of the folder.
- The last '%s' is a detailed error message. */
- _("Cannot rename MAPI folder '%s' to '%s': %s"),
+ /* Translators: “%s to %s” is current name of the folder and
new name of the folder.
+ The last “%s” is a detailed error message. */
+ _("Cannot rename MAPI folder “%s” to “%s”: %s"),
old_name, new_name, local_error->message);
camel_mapi_store_maybe_disconnect (mapi_store, local_error);
g_error_free (local_error);
} else {
g_set_error (
error, CAMEL_ERROR, CAMEL_ERROR_GENERIC,
- /* Translators: '%s to %s' is current name of the folder and new name
of the folder. */
- _("Cannot rename MAPI folder '%s' to '%s'"),
+ /* Translators: “%s to %s” is current name of the folder and new name
of the folder. */
+ _("Cannot rename MAPI folder “%s” to “%s”"),
old_name, new_name);
}
@@ -1671,14 +1671,14 @@ mapi_store_rename_folder_sync (CamelStore *store,
if (!e_mapi_utils_propagate_cancelled_error (local_error, error))
g_set_error (
error, CAMEL_ERROR, CAMEL_ERROR_GENERIC,
- _("Cannot rename MAPI folder '%s' to '%s': %s"),
+ _("Cannot rename MAPI folder “%s” to “%s”: %s"),
old_name, new_name, local_error->message);
camel_mapi_store_maybe_disconnect (mapi_store, local_error);
g_error_free (local_error);
} else {
g_set_error (
error, CAMEL_ERROR, CAMEL_ERROR_GENERIC,
- _("Cannot rename MAPI folder '%s' to '%s'"),
+ _("Cannot rename MAPI folder “%s” to “%s”"),
old_name, new_name);
}
g_free (old_parent);
@@ -1785,7 +1785,7 @@ mapi_store_subscribe_folder_sync (CamelSubscribable *subscribable,
if (!si) {
g_set_error (
error, CAMEL_ERROR, CAMEL_ERROR_GENERIC,
- _("Folder '%s' not found"), folder_name);
+ _("Folder “%s” not found"), folder_name);
return FALSE;
}
@@ -2167,7 +2167,7 @@ mapi_connect_sync (CamelService *service,
}
name = camel_service_get_name (service, TRUE);
- camel_operation_push_message (cancellable, _("Connecting to '%s'"), name);
+ camel_operation_push_message (cancellable, _("Connecting to “%s”"), name);
settings = camel_service_ref_settings (service);
e_mapi_util_profiledata_from_settings (&empd, CAMEL_MAPI_SETTINGS (settings));
@@ -2202,15 +2202,15 @@ mapi_connect_sync (CamelService *service,
/* warn/alert when the last 1% lefts from the size quota */
if (send_quota != -1 && current_size * 0.95 >= send_quota) {
if (send_quota != -1 && current_size >= send_quota) {
- msg = g_strdup_printf (_("Mailbox '%s' is full, no new messages will
be received or sent."), name);
+ msg = g_strdup_printf (_("Mailbox “%s” is full, no new messages will
be received or sent."), name);
} else {
- msg = g_strdup_printf (_("Mailbox '%s' is near its size limit,
message send will be disabled soon."), name);
+ msg = g_strdup_printf (_("Mailbox “%s” is near its size limit,
message send will be disabled soon."), name);
}
} else if (receive_quota != -1 && current_size * 0.95 >= receive_quota) {
if (current_size >= receive_quota) {
- msg = g_strdup_printf (_("Mailbox '%s' is full, no new messages will
be received."), name);
+ msg = g_strdup_printf (_("Mailbox “%s” is full, no new messages will
be received."), name);
} else {
- msg = g_strdup_printf (_("Mailbox '%s' is near its size limit."),
name);
+ msg = g_strdup_printf (_("Mailbox “%s” is near its size limit."),
name);
}
}
diff --git a/src/collection/e-mapi-backend.c b/src/collection/e-mapi-backend.c
index fdf8a30..dfc2624 100644
--- a/src/collection/e-mapi-backend.c
+++ b/src/collection/e-mapi-backend.c
@@ -693,7 +693,7 @@ mapi_backend_create_resource_sync (ECollectionBackend *backend,
g_set_error (
error, G_IO_ERROR,
G_IO_ERROR_INVALID_ARGUMENT,
- _("Data source '%s' does not represent a MAPI folder"),
+ _("Data source “%s” does not represent a MAPI folder"),
e_source_get_display_name (source));
return FALSE;
}
@@ -790,7 +790,7 @@ mapi_backend_delete_resource_sync (ECollectionBackend *backend,
g_set_error (
error, G_IO_ERROR,
G_IO_ERROR_INVALID_ARGUMENT,
- _("Data source '%s' does not represent a MAPI folder"),
+ _("Data source “%s” does not represent a MAPI folder"),
e_source_get_display_name (source));
return FALSE;
}
diff --git a/src/configuration/e-mapi-config-utils.c b/src/configuration/e-mapi-config-utils.c
index 387f390..8f5636c 100644
--- a/src/configuration/e-mapi-config-utils.c
+++ b/src/configuration/e-mapi-config-utils.c
@@ -699,7 +699,7 @@ action_folder_permissions_mail_cb (GtkAction *action,
si = camel_store_summary_path (mapi_store->summary, folder_path);
if (!si) {
- 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 {
CamelMapiStoreInfo *msi = (CamelMapiStoreInfo *) si;
ESourceRegistry *registry = e_shell_get_registry (e_shell_window_get_shell (shell_window));
diff --git a/src/configuration/e-mapi-subscribe-foreign-folder.c
b/src/configuration/e-mapi-subscribe-foreign-folder.c
index 08047a0..68959a4 100644
--- a/src/configuration/e-mapi-subscribe-foreign-folder.c
+++ b/src/configuration/e-mapi-subscribe-foreign-folder.c
@@ -84,7 +84,7 @@ add_foreign_folder_to_camel (CamelMapiStore *mapi_store,
res = FALSE;
g_propagate_error (perror,
g_error_new (E_MAPI_ERROR, MAPI_E_INVALID_PARAMETER,
- _("Cannot add folder, folder already exists as '%s'"), camel_store_info_path
(mapi_store->summary, si)));
+ _("Cannot add folder, folder already exists as “%s”"), camel_store_info_path
(mapi_store->summary, si)));
} else if (parent_fid != 0 && msi->folder_id == parent_fid) {
if (g_strcmp0 (foreign_username, msi->foreign_username) == 0) {
g_free (parent_path);
@@ -107,9 +107,9 @@ add_foreign_folder_to_camel (CamelMapiStore *mapi_store,
gchar *mailbox;
/* 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);
parent_path = g_strdup_printf ("%s/%s", DISPLAY_NAME_FOREIGN_FOLDERS, mailbox);
g_free (mailbox);
@@ -138,7 +138,7 @@ add_foreign_folder_to_camel (CamelMapiStore *mapi_store,
res = FALSE;
g_propagate_error (perror,
g_error_new (E_MAPI_ERROR, MAPI_E_INVALID_PARAMETER,
- _("Cannot add folder, failed to add to store's summary")));
+ _("Cannot add folder, failed to add to store’s summary")));
}
g_free (path);
@@ -324,7 +324,7 @@ check_foreign_folder_thread (GObject *with_object,
if (g_error_matches (local_error, E_MAPI_ERROR, MAPI_E_NOT_FOUND)) {
g_clear_error (&local_error);
local_error = g_error_new (E_MAPI_ERROR, MAPI_E_NOT_FOUND,
- _("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);
}
@@ -359,7 +359,7 @@ check_foreign_folder_thread (GObject *with_object,
g_object_unref (conn);
if (!cffd->folder_container_class) {
- g_propagate_error (perror, g_error_new_literal (E_MAPI_ERROR, MAPI_E_CALL_FAILED, _("Cannot
add folder, cannot determine folder's type")));
+ g_propagate_error (perror, g_error_new_literal (E_MAPI_ERROR, MAPI_E_CALL_FAILED, _("Cannot
add folder, cannot determine folder’s type")));
return;
}
@@ -398,9 +398,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);
mapi_store = CAMEL_MAPI_STORE (with_object);
@@ -518,7 +518,7 @@ subscribe_foreign_response_cb (GObject *dialog,
cffd->folder_id = 0;
cffd->parent_folder_id = 0;
- description = g_strdup_printf (_("Testing availability of folder '%s' of user '%s', please wait..."),
cffd->orig_foldername, cffd->username);
+ description = g_strdup_printf (_("Testing availability of folder “%s” of user “%s”, please wait..."),
cffd->orig_foldername, cffd->username);
e_mapi_config_utils_run_in_thread_with_feedback (
GTK_WINDOW (dialog),
diff --git a/src/libexchangemapi/e-mapi-connection.c b/src/libexchangemapi/e-mapi-connection.c
index 2ba0d08..757bff7 100644
--- a/src/libexchangemapi/e-mapi-connection.c
+++ b/src/libexchangemapi/e-mapi-connection.c
@@ -741,7 +741,7 @@ can_reach_mapi_server (const gchar *server_address,
if (local_error)
g_propagate_error (perror, local_error);
else
- g_set_error (perror, G_IO_ERROR, G_IO_ERROR_HOST_UNREACHABLE, _("Server '%s' cannot
be reached"), server_address);
+ g_set_error (perror, G_IO_ERROR, G_IO_ERROR_HOST_UNREACHABLE, _("Server “%s” cannot
be reached"), server_address);
}
return reachable;
@@ -869,7 +869,7 @@ e_mapi_connection_test_foreign_folder (EMapiConnection *conn,
def_folder_id = olFolderJunk;
} else if (!e_mapi_util_mapi_id_from_string (folder_name, &foreign_fid)) {
ms = MAPI_E_CALL_FAILED;
- g_propagate_error (perror, g_error_new (E_MAPI_ERROR, ms, _("Folder name '%s' is not
a known default folder name, nor folder ID."), folder_name));
+ g_propagate_error (perror, g_error_new (E_MAPI_ERROR, ms, _("Folder name “%s” is not
a known default folder name, nor folder ID."), folder_name));
goto cleanup;
}
@@ -1200,7 +1200,7 @@ e_mapi_connection_open_foreign_folder (EMapiConnection *conn,
if (!ensure_foreign_store (conn->priv, username, &msg_store, perror)) {
ms = MAPI_E_CALL_FAILED;
if (perror && !*perror)
- g_propagate_error (perror, g_error_new (E_MAPI_ERROR, ms, _("Failed to open store for
user '%s'"), username));
+ g_propagate_error (perror, g_error_new (E_MAPI_ERROR, ms, _("Failed to open store for
user “%s”"), username));
} else {
ms = MAPI_E_SUCCESS;
}
@@ -1208,7 +1208,7 @@ e_mapi_connection_open_foreign_folder (EMapiConnection *conn,
if (ms == MAPI_E_SUCCESS) {
ms = OpenFolder (msg_store, fid, obj_folder);
if (ms == MAPI_E_NOT_FOUND)
- g_propagate_error (perror, g_error_new (E_MAPI_ERROR, ms, _("Folder of user '%s' not
found"), username));
+ g_propagate_error (perror, g_error_new (E_MAPI_ERROR, ms, _("Folder of user “%s” not
found"), username));
else if (ms != MAPI_E_SUCCESS)
make_mapi_error (perror, "OpenFolder", ms);
}
@@ -3860,7 +3860,7 @@ add_object_recipients (EMapiConnection *conn,
* However, if we do still get an ambiguous entry, we can't handle it :-( */
ms = MAPI_E_AMBIGUOUS_RECIP;
/* Translators: %s is replaced with an email address which was found ambiguous on a
remote server */
- g_set_error (perror, E_MAPI_ERROR, ms, _("Recipient '%s' is ambiguous"), users[ii]);
+ g_set_error (perror, E_MAPI_ERROR, ms, _("Recipient “%s” is ambiguous"), users[ii]);
goto cleanup;
} else if (flagList->aulPropTag[ii] == MAPI_UNRESOLVED) {
uint32_t last;
@@ -6820,10 +6820,10 @@ e_mapi_connection_resolve_username (EMapiConnection *conn,
} else if (ms == MAPI_E_SUCCESS) {
if (flaglist && flaglist->aulPropTag[0] == MAPI_AMBIGUOUS) {
ms = MAPI_E_AMBIGUOUS_RECIP;
- g_set_error (perror, E_MAPI_ERROR, ms, _("User name '%s' is ambiguous"), to_resolve);
+ g_set_error (perror, E_MAPI_ERROR, ms, _("User name “%s” is ambiguous"), to_resolve);
} else {
ms = MAPI_E_NOT_FOUND;
- g_set_error (perror, E_MAPI_ERROR, ms, _("User name '%s' not found"), to_resolve);
+ g_set_error (perror, E_MAPI_ERROR, ms, _("User name “%s” not found"), to_resolve);
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
