[evolution-kolab/ek-wip-porting] libekolab: cleanup and unification of translatable error strings
- From: Christian Hilberg <chilberg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-kolab/ek-wip-porting] libekolab: cleanup and unification of translatable error strings
- Date: Mon, 5 Mar 2012 14:37:09 +0000 (UTC)
commit 6d22f602b9c37340cf5f8730b9d9adb52206150e
Author: Christian Hilberg <hilberg kernelconcepts de>
Date: Mon Mar 5 15:34:13 2012 +0100
libekolab: cleanup and unification of translatable error strings
src/libekolab/kolab-mail-access.c | 12 ++++++------
src/libekolab/kolab-mail-handle.c | 12 ++++++------
src/libekolab/kolab-mail-imap-client.c | 20 +++++++++-----------
src/libekolab/kolab-mail-mime-builder.c | 4 ++--
src/libekolab/kolab-settings-handler.c | 4 ++--
5 files changed, 25 insertions(+), 27 deletions(-)
---
diff --git a/src/libekolab/kolab-mail-access.c b/src/libekolab/kolab-mail-access.c
index a7d2fdc..76af5d2 100644
--- a/src/libekolab/kolab-mail-access.c
+++ b/src/libekolab/kolab-mail-access.c
@@ -271,7 +271,7 @@ kolab_mail_access_local_handle_attach_summary (KolabMailAccess *self,
g_set_error (err,
KOLAB_BACKEND_ERROR,
KOLAB_BACKEND_ERROR_DATATYPE_INTERNAL,
- _("Internal inconsistency detected: Invalid PIM object handle, cannot get any UID"));
+ _("Internal inconsistency detected: Invalid PIM Object handle, cannot get any UID"));
return FALSE;
}
foldername = kolab_mail_handle_get_foldername (kmailhandle);
@@ -279,7 +279,7 @@ kolab_mail_access_local_handle_attach_summary (KolabMailAccess *self,
g_set_error (err,
KOLAB_BACKEND_ERROR,
KOLAB_BACKEND_ERROR_DATATYPE_INTERNAL,
- _("Internal inconsistency detected: Invalid PIM object handle, UID '%s', cannot get foldername"),
+ _("Internal inconsistency detected: Invalid PIM Object handle, cannot get foldername, UID '%s'"),
uid);
return FALSE;
}
@@ -423,7 +423,7 @@ kolab_mail_access_local_handle_get_by_uid (KolabMailAccess *self,
g_set_error (err,
KOLAB_BACKEND_ERROR,
KOLAB_BACKEND_ERROR_NOTFOUND,
- _("PIM Object UID '%s', Folder '%s', not found in internal database"),
+ _("PIM Object not found in internal database, UID '%s', Folder '%s'"),
uid, foldername);
return NULL;
}
@@ -464,7 +464,7 @@ kolab_mail_access_local_handle_get (KolabMailAccess *self,
g_set_error (err,
KOLAB_BACKEND_ERROR,
KOLAB_BACKEND_ERROR_DATATYPE_INTERNAL,
- _("Internal inconsistency detected: Invalid PIM Object handle, UID '%s', cannot get foldername"),
+ _("Internal inconsistency detected: Invalid PIM Object handle, cannot get foldername, UID '%s'"),
uid);
return NULL;
}
@@ -681,7 +681,7 @@ kolab_mail_access_local_store (KolabMailAccess *self,
g_set_error (err,
KOLAB_BACKEND_ERROR,
KOLAB_BACKEND_ERROR_SYNC_NOTSTORED,
- _("PIM Object UID '%s', Folder '%s', not stored due to selected synchronization strategy"),
+ _("PIM Object not stored due to selected synchronization strategy, UID '%s', Folder '%s'"),
uid, foldername);
return FALSE;
}
@@ -736,7 +736,7 @@ kolab_mail_access_local_delete (KolabMailAccess *self,
g_set_error (err,
KOLAB_BACKEND_ERROR,
KOLAB_BACKEND_ERROR_DATATYPE_INTERNAL,
- _("Internal inconsistency detected: PIM Object handle, UID '%s', has folder name '%s' set, but supplied folder name to delete it from is '%s'"),
+ _("Internal inconsistency detected: PIM Object handle, UID %s, has folder name '%s' set, but supplied folder name to delete it from is '%s'"),
uid, foldername_del, foldername);
if (foldername_del != NULL)
g_free (foldername_del);
diff --git a/src/libekolab/kolab-mail-handle.c b/src/libekolab/kolab-mail-handle.c
index 857c530..81bd02b 100644
--- a/src/libekolab/kolab-mail-handle.c
+++ b/src/libekolab/kolab-mail-handle.c
@@ -175,7 +175,7 @@ kolab_mail_handle_check_complete (const KolabMailHandle *self,
g_set_error (err,
KOLAB_BACKEND_ERROR,
KOLAB_BACKEND_ERROR_DATATYPE_INTERNAL,
- _("Internal inconsistency detected: PIM Object handle, UID '%s', Folder '%s', has inconsistent summary information"),
+ _("Internal inconsistency detected: PIM Object handle has inconsistent summary information, UID '%s', Folder '%s'"),
priv->kolab_uid, priv->foldername);
return FALSE;
}
@@ -186,8 +186,8 @@ kolab_mail_handle_check_complete (const KolabMailHandle *self,
g_set_error (err,
KOLAB_BACKEND_ERROR,
KOLAB_BACKEND_ERROR_CONTEXT_MISUSE,
- _("Internal inconsistency detected: PIM Object handle, UID '%s', Folder '%s', has inconsistent folder context information (expected %i, got %i)"),
- priv->kolab_uid, priv->foldername, context, folder_context);
+ _("Internal inconsistency detected: PIM Object handle has inconsistent folder context information (expected %i, got %i), UID '%s', Folder '%s'"),
+ context, folder_context, priv->kolab_uid, priv->foldername);
return FALSE;
}
@@ -197,7 +197,7 @@ kolab_mail_handle_check_complete (const KolabMailHandle *self,
g_set_error (err,
KOLAB_BACKEND_ERROR,
KOLAB_BACKEND_ERROR_HANDLE_INCOMPLETE,
- _("Internal inconsistency detected: PIM Object handle, UID '%s', Folder '%s', is incomplete"),
+ _("Internal inconsistency detected: PIM Object handle is incomplete, UID '%s', Folder '%s'"),
priv->kolab_uid, priv->foldername);
return FALSE;
}
@@ -551,7 +551,7 @@ kolab_mail_handle_convert_kconvmail_to_eds (KolabMailHandle *self,
g_set_error (err,
KOLAB_BACKEND_ERROR,
KOLAB_BACKEND_ERROR_DATATYPE_KOLAB,
- _("Invalid Kolab mail object, UID '%s', Folder '%s' (UID in subject does not match UID in data part)"),
+ _("Invalid Kolab mail object (UID in subject does not match UID in data part), UID '%s', Folder '%s'"),
priv->kolab_uid, priv->foldername);
return FALSE;
}
@@ -577,7 +577,7 @@ kolab_mail_handle_convert_kconvmail_to_eds (KolabMailHandle *self,
g_set_error (err,
KOLAB_BACKEND_ERROR,
KOLAB_BACKEND_ERROR_DATATYPE_KOLAB,
- _("Invalid Kolab mail object, UID '%s', Folder '%s' (UID in subject does not match UID in data part)"),
+ _("Invalid Kolab mail object (UID in subject does not match UID in data part), UID '%s', Folder '%s'"),
priv->kolab_uid, priv->foldername);
return FALSE;
}
diff --git a/src/libekolab/kolab-mail-imap-client.c b/src/libekolab/kolab-mail-imap-client.c
index 29e3f1e..7ff45bb 100644
--- a/src/libekolab/kolab-mail-imap-client.c
+++ b/src/libekolab/kolab-mail-imap-client.c
@@ -801,7 +801,7 @@ kolab_mail_imap_client_bringup (KolabMailImapClient *self,
g_set_error (err,
KOLAB_BACKEND_ERROR,
KOLAB_BACKEND_ERROR_INTERNAL,
- _("Internal inconsistency detected: Kolab user ID not set"));
+ _("Internal inconsistency detected: Kolab User ID not set"));
__func__);
return FALSE;
@@ -1486,8 +1486,7 @@ kolab_mail_imap_client_store (KolabMailImapClient *self,
g_set_error (&tmp_err,
KOLAB_BACKEND_ERROR,
KOLAB_BACKEND_ERROR_INTERNAL,
- "%s: folder creation not yet implemented",
- __func__);
+ _("Folder creation not yet implemented"));
goto cleanup;
}
@@ -1500,8 +1499,7 @@ kolab_mail_imap_client_store (KolabMailImapClient *self,
g_set_error (&tmp_err,
KOLAB_BACKEND_ERROR,
KOLAB_BACKEND_ERROR_INTERNAL,
- "%s: moving object to different folder not yet implemented",
- __func__);
+ _("Moving object to different folder not yet implemented"));
goto cleanup;
}
}
@@ -1528,7 +1526,7 @@ kolab_mail_imap_client_store (KolabMailImapClient *self,
g_set_error (&tmp_err,
KOLAB_BACKEND_ERROR,
KOLAB_BACKEND_ERROR_NOTFOUND,
- _("Could not get CamelFolder for %s"),
+ _("Could not get Camel folder for '%s'"),
foldername);
goto cleanup;
}
@@ -1754,7 +1752,7 @@ kolab_mail_imap_client_retrieve (KolabMailImapClient *self,
g_set_error (err,
KOLAB_BACKEND_ERROR,
KOLAB_BACKEND_ERROR_INTERNAL,
- _("Internal inconsistency detected: Kolab UID not set on PIM object handle"));
+ _("Internal inconsistency detected: Kolab UID not set on PIM Object handle"));
return FALSE;
}
@@ -1763,7 +1761,7 @@ kolab_mail_imap_client_retrieve (KolabMailImapClient *self,
g_set_error (err,
KOLAB_BACKEND_ERROR,
KOLAB_BACKEND_ERROR_INTERNAL,
- _("Internal inconsistency detected: Folder name not set on PIM object handle, UID '%s'"),
+ _("Internal inconsistency detected: Folder name not set on PIM Object handle, UID '%s'"),
kolab_uid);
return FALSE;
}
@@ -1912,7 +1910,7 @@ kolab_mail_imap_client_delete (KolabMailImapClient *self,
g_set_error (err,
KOLAB_BACKEND_ERROR,
KOLAB_BACKEND_ERROR_INTERNAL,
- _("Internal inconsistency detected: Kolab UID not set on PIM object handle"));
+ _("Internal inconsistency detected: Kolab UID not set on PIM Object handle"));
return FALSE;
}
@@ -1921,7 +1919,7 @@ kolab_mail_imap_client_delete (KolabMailImapClient *self,
g_set_error (err,
KOLAB_BACKEND_ERROR,
KOLAB_BACKEND_ERROR_INTERNAL,
- _("Internal inconsistency detected: Folder name not set on PIM object handle, UID '%s'"),
+ _("Internal inconsistency detected: Folder name not set on PIM Object handle, UID '%s'"),
kolab_uid);
return FALSE;
}
@@ -1951,7 +1949,7 @@ kolab_mail_imap_client_delete (KolabMailImapClient *self,
g_set_error (err,
KOLAB_BACKEND_ERROR,
KOLAB_BACKEND_ERROR_NOTFOUND,
- _("Could not get CamelFolder for %s"),
+ _("Could not get Camel folder for '%s'"),
foldername);
return FALSE;
}
diff --git a/src/libekolab/kolab-mail-mime-builder.c b/src/libekolab/kolab-mail-mime-builder.c
index 7191b4a..70caec5 100644
--- a/src/libekolab/kolab-mail-mime-builder.c
+++ b/src/libekolab/kolab-mail-mime-builder.c
@@ -250,7 +250,7 @@ kolab_mail_mime_builder_conv_new_from_camel (KolabMailMimeBuilder *self,
g_set_error (err,
KOLAB_BACKEND_ERROR,
KOLAB_BACKEND_ERROR_DATATYPE_KOLAB,
- _("Message does not have the expected minimum of %i mime parts, ignoring"),
+ _("Mail message does not have the expected minimum of %i mime parts, ignoring"),
KOLAB_MAIL_MIME_PARTS_MIN);
return NULL;
}
@@ -288,7 +288,7 @@ kolab_mail_mime_builder_conv_new_from_camel (KolabMailMimeBuilder *self,
g_set_error (&tmp_err,
KOLAB_BACKEND_ERROR,
KOLAB_BACKEND_ERROR_CAMEL,
- _("Message mime part has no content type set, skippting"));
+ _("Mail message mime part has no content type set, skipping"));
goto mime_part_cleanup;
}
if (name == NULL) {
diff --git a/src/libekolab/kolab-settings-handler.c b/src/libekolab/kolab-settings-handler.c
index 17b837c..018abc4 100644
--- a/src/libekolab/kolab-settings-handler.c
+++ b/src/libekolab/kolab-settings-handler.c
@@ -172,7 +172,7 @@ kolab_settings_handler_char_set_func_camel_data_dir (KolabSettingsHandler *self,
g_set_error (err,
KOLAB_BACKEND_ERROR,
KOLAB_BACKEND_ERROR_GENERIC,
- _("Cannot set Camel data directory, is a read-only resource"));
+ _("Cannot set Camel data directory, it is a read-only resource"));
return FALSE;
}
@@ -222,7 +222,7 @@ kolab_settings_handler_char_set_func_camel_config_dir (KolabSettingsHandler *sel
g_set_error (err,
KOLAB_BACKEND_ERROR,
KOLAB_BACKEND_ERROR_GENERIC,
- _("Cannot set Camel configuration directory, is a read-only resource"));
+ _("Cannot set Camel configuration directory, it is a read-only resource"));
return FALSE;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
