[evolution-kolab/ek-wip-porting] libekolab: added translatable strings
- From: Christian Hilberg <chilberg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-kolab/ek-wip-porting] libekolab: added translatable strings
- Date: Mon, 5 Mar 2012 11:08:56 +0000 (UTC)
commit e19278d8a53acc40bf743c6384b50e2dfea2ea8d
Author: Christian Hilberg <hilberg kernelconcepts de>
Date: Mon Mar 5 12:07:50 2012 +0100
libekolab: added translatable strings
* marked GError messages as translatable strings
* added new files to POTFILES.in
po/POTFILES.in | 8 ++++
src/libekolab/kolab-mail-access.c | 65 +++++++++++++----------------
src/libekolab/kolab-mail-handle.c | 56 +++++++++++++-----------
src/libekolab/kolab-mail-imap-client.c | 70 +++++++++++++++---------------
src/libekolab/kolab-mail-info-db.c | 52 ++++++++++++-----------
src/libekolab/kolab-mail-mime-builder.c | 23 +++++-----
src/libekolab/kolab-mail-side-cache.c | 41 +++++++++---------
src/libekolab/kolab-mail-synchronizer.c | 30 +++++++------
src/libekolab/kolab-settings-handler.c | 32 +++++++-------
src/libekolab/kolab-util-backend.c | 3 +-
10 files changed, 195 insertions(+), 185 deletions(-)
---
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 45cf7a6..9ec0dc5 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -20,4 +20,12 @@ src/eplugin/e-kolab-backend-sync-conflict.c
src/eplugin/e-kolab-folder-metadata.c
src/eplugin/e-kolab-folder-permissions.c
src/eplugin/e-kolab-plugin-ui.c
+src/libekolab/kolab-mail-access.c
+src/libekolab/kolab-mail-handle.c
+src/libekolab/kolab-mail-imap-client.c
+src/libekolab/kolab-mail-info-db.c
+src/libekolab/kolab-mail-mime-builder.c
+src/libekolab/kolab-mail-side-cache.c
+src/libekolab/kolab-mail-synchronizer.c
+src/libekolab/kolab-settings-handler.c
src/libekolab/kolab-util-backend.c
diff --git a/src/libekolab/kolab-mail-access.c b/src/libekolab/kolab-mail-access.c
index b2c55fc..a7d2fdc 100644
--- a/src/libekolab/kolab-mail-access.c
+++ b/src/libekolab/kolab-mail-access.c
@@ -25,6 +25,10 @@
/*----------------------------------------------------------------------------*/
+#include <config.h>
+
+#include <glib/gi18n-lib.h>
+
#include "kolab-util-backend.h"
#include <libekolabutil/kolab-util-glib.h>
@@ -230,8 +234,8 @@ kolab_mail_access_foldername_new_from_sourcename (KolabMailAccess *self,
g_set_error (err,
KOLAB_BACKEND_ERROR,
KOLAB_BACKEND_ERROR_INFODB_NOFOLDER,
- "%s: folder name unknown to KolabMailInfoDb: [%s]",
- __func__, foldername);
+ _("Folder name '%s' is unknown to internal database"),
+ foldername);
g_free (foldername);
return NULL;
}
@@ -267,8 +271,7 @@ kolab_mail_access_local_handle_attach_summary (KolabMailAccess *self,
g_set_error (err,
KOLAB_BACKEND_ERROR,
KOLAB_BACKEND_ERROR_DATATYPE_INTERNAL,
- "%s: invalid KolabMailHandle, cannot get any UID",
- __func__);
+ _("Internal inconsistency detected: Invalid PIM object handle, cannot get any UID"));
return FALSE;
}
foldername = kolab_mail_handle_get_foldername (kmailhandle);
@@ -276,8 +279,8 @@ kolab_mail_access_local_handle_attach_summary (KolabMailAccess *self,
g_set_error (err,
KOLAB_BACKEND_ERROR,
KOLAB_BACKEND_ERROR_DATATYPE_INTERNAL,
- "%s: UID (%s) invalid KolabMailHandle, cannot get foldername",
- __func__, uid);
+ _("Internal inconsistency detected: Invalid PIM object handle, UID '%s', cannot get foldername"),
+ uid);
return FALSE;
}
@@ -420,8 +423,8 @@ kolab_mail_access_local_handle_get_by_uid (KolabMailAccess *self,
g_set_error (err,
KOLAB_BACKEND_ERROR,
KOLAB_BACKEND_ERROR_NOTFOUND,
- "%s: UID (%s) Folder (%s) not found in database",
- __func__, uid, foldername);
+ _("PIM Object UID '%s', Folder '%s', not found in internal database"),
+ uid, foldername);
return NULL;
}
@@ -452,8 +455,7 @@ kolab_mail_access_local_handle_get (KolabMailAccess *self,
g_set_error (err,
KOLAB_BACKEND_ERROR,
KOLAB_BACKEND_ERROR_DATATYPE_INTERNAL,
- "%s: invalid KolabMailHandle, cannot get any UID",
- __func__);
+ _("Internal inconsistency detected: Invalid PIM Object handle, cannot get any UID"));
return NULL;
}
@@ -462,8 +464,8 @@ kolab_mail_access_local_handle_get (KolabMailAccess *self,
g_set_error (err,
KOLAB_BACKEND_ERROR,
KOLAB_BACKEND_ERROR_DATATYPE_INTERNAL,
- "%s: UID (%s) invalid KolabMailHandle, cannot get foldername",
- __func__, uid);
+ _("Internal inconsistency detected: Invalid PIM Object handle, UID '%s', cannot get foldername"),
+ uid);
return NULL;
}
@@ -679,8 +681,8 @@ kolab_mail_access_local_store (KolabMailAccess *self,
g_set_error (err,
KOLAB_BACKEND_ERROR,
KOLAB_BACKEND_ERROR_SYNC_NOTSTORED,
- "%s: UID (%s) Folder (%s) not stored due to selected sync strategy",
- __func__, uid, foldername);
+ _("PIM Object UID '%s', Folder '%s', not stored due to selected synchronization strategy"),
+ uid, foldername);
return FALSE;
}
@@ -734,8 +736,8 @@ kolab_mail_access_local_delete (KolabMailAccess *self,
g_set_error (err,
KOLAB_BACKEND_ERROR,
KOLAB_BACKEND_ERROR_DATATYPE_INTERNAL,
- "%s: UID (%s) KolabMailHandle/supplied folder name mismatch (%s)/(%s)",
- __func__, uid, foldername_del, foldername);
+ _("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);
return FALSE;
@@ -946,8 +948,7 @@ kolab_mail_access_strans_configured_offline (KolabMailAccess *self,
g_set_error (err,
KOLAB_BACKEND_ERROR,
KOLAB_BACKEND_ERROR_STATE_WRONG_FOR_OP,
- "%s: not in CONFIGURED state",
- __func__);
+ _("Backend not in CONFIGURED state"));
return FALSE;
}
@@ -1066,8 +1067,7 @@ kolab_mail_access_strans_offline_online (KolabMailAccess *self,
g_set_error (err,
KOLAB_BACKEND_ERROR,
KOLAB_BACKEND_ERROR_STATE_WRONG_FOR_OP,
- "%s: not in OFFLINE state",
- __func__);
+ _("Backend not in OFFLINE state"));
return FALSE;
}
@@ -1192,8 +1192,7 @@ kolab_mail_access_strans_online_offline (KolabMailAccess *self,
g_set_error (err,
KOLAB_BACKEND_ERROR,
KOLAB_BACKEND_ERROR_STATE_WRONG_FOR_OP,
- "%s: not in ONLINE state",
- __func__);
+ _("Backend not in ONLINE state"));
return FALSE;
}
@@ -1300,8 +1299,7 @@ kolab_mail_access_strans_offline_shutdown (KolabMailAccess *self,
g_set_error (err,
KOLAB_BACKEND_ERROR,
KOLAB_BACKEND_ERROR_STATE_WRONG_FOR_OP,
- "%s: not in OFFLINE state",
- __func__);
+ _("Backend not in OFFLINE state"));
return FALSE;
}
@@ -1423,8 +1421,7 @@ kolab_mail_access_strans_shutdown_configured (KolabMailAccess *self,
g_set_error (err,
KOLAB_BACKEND_ERROR,
KOLAB_BACKEND_ERROR_STATE_WRONG_FOR_OP,
- "%s: not in SHUTDOWN state",
- __func__);
+ _("Backend not in SHUTDOWN state"));
return FALSE;
}
@@ -1547,8 +1544,7 @@ kolab_mail_access_get_strans_func (KolabMailAccess *self,
g_set_error (err,
KOLAB_BACKEND_ERROR,
KOLAB_BACKEND_ERROR_STATE_WRONG_FOR_OP,
- "%s: no transition from KolabMailAccessOpmodeID [%i]",
- __func__,
+ _("No transition function defined from operational mode %i"),
priv->state->opmode);
return NULL;
}
@@ -1559,8 +1555,7 @@ kolab_mail_access_get_strans_func (KolabMailAccess *self,
g_set_error (err,
KOLAB_BACKEND_ERROR,
KOLAB_BACKEND_ERROR_STATE_WRONG_FOR_OP,
- "%s: no transition from KolabMailAccessOpmodeID [%i]->[%i]",
- __func__,
+ _("No transition function defined from operational mode %i to %i"),
priv->state->opmode,
opmode);
}
@@ -1613,8 +1608,7 @@ kolab_mail_access_configure (KolabMailAccess *self,
g_set_error (err,
KOLAB_BACKEND_ERROR,
KOLAB_BACKEND_ERROR_STATE_WRONG_FOR_OP,
- "%s: KolabMailAccess is shutting down",
- __func__);
+ _("Backend is shutting down"));
return FALSE;
}
@@ -2326,8 +2320,7 @@ kolab_mail_access_store_handle (KolabMailAccess *self,
g_set_error (err,
KOLAB_BACKEND_ERROR,
KOLAB_BACKEND_ERROR_INTERNAL,
- "%s: UID (%s) KolabMailHandle / destination folder type mismatch (%i)/(%i)",
- __func__,
+ _("PIM Object handle, UID '%s', which has PIM type %i, cannot be stored in folder of mismatching PIM type %i"),
kolab_mail_handle_get_uid (kmailhandle),
handle_ft,
sourcename_ft);
@@ -2428,7 +2421,7 @@ kolab_mail_access_retrieve_handle (KolabMailAccess *self,
g_set_error (err,
KOLAB_BACKEND_ERROR,
KOLAB_BACKEND_ERROR_INTERNAL,
- "%s: could not get local handle", __func__);
+ _("Internal inconsistency detected: Cannot get local PIM Object handle"));
return FALSE;
}
@@ -2578,7 +2571,7 @@ kolab_mail_access_delete_handle (KolabMailAccess *self,
g_set_error (err,
KOLAB_BACKEND_ERROR,
KOLAB_BACKEND_ERROR_INTERNAL,
- "%s: could not get local handle", __func__);
+ _("Internal inconsistency detected: Cannot get local PIM Object handle"));
return FALSE;
}
diff --git a/src/libekolab/kolab-mail-handle.c b/src/libekolab/kolab-mail-handle.c
index 709012f..857c530 100644
--- a/src/libekolab/kolab-mail-handle.c
+++ b/src/libekolab/kolab-mail-handle.c
@@ -25,6 +25,10 @@
/*----------------------------------------------------------------------------*/
+#include <config.h>
+
+#include <glib/gi18n-lib.h>
+
#include <libekolabutil/kolab-util-folder.h>
#include <libekolabutil/kolab-util-kconv.h>
@@ -171,8 +175,8 @@ kolab_mail_handle_check_complete (const KolabMailHandle *self,
g_set_error (err,
KOLAB_BACKEND_ERROR,
KOLAB_BACKEND_ERROR_DATATYPE_INTERNAL,
- "%s: UID (%s) Folder (%s) summary consistency check failed",
- function_name, priv->kolab_uid, priv->foldername);
+ _("Internal inconsistency detected: PIM Object handle, UID '%s', Folder '%s', has inconsistent summary information"),
+ priv->kolab_uid, priv->foldername);
return FALSE;
}
@@ -182,8 +186,8 @@ kolab_mail_handle_check_complete (const KolabMailHandle *self,
g_set_error (err,
KOLAB_BACKEND_ERROR,
KOLAB_BACKEND_ERROR_CONTEXT_MISUSE,
- "%s: UID (%s) Folder (%s) context error: expected KolabFolderContextID %i, got %i",
- function_name, priv->kolab_uid, priv->foldername, context, folder_context);
+ _("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);
return FALSE;
}
@@ -193,8 +197,8 @@ kolab_mail_handle_check_complete (const KolabMailHandle *self,
g_set_error (err,
KOLAB_BACKEND_ERROR,
KOLAB_BACKEND_ERROR_HANDLE_INCOMPLETE,
- "%s: UID (%s) Folder (%s) KolabMailHandle is still incomplete",
- function_name, priv->kolab_uid, priv->foldername);
+ _("Internal inconsistency detected: PIM Object handle, UID '%s', Folder '%s', is incomplete"),
+ priv->kolab_uid, priv->foldername);
return FALSE;
}
@@ -407,8 +411,8 @@ kolab_mail_handle_convert_eds_to_kconvmail (KolabMailHandle *self,
g_set_error (err,
KOLAB_BACKEND_ERROR,
KOLAB_BACKEND_ERROR_DATATYPE_KOLAB,
- "%s: UID (%s) Folder (%s) conversion to Kolab format failed",
- __func__, priv->kolab_uid, priv->foldername);
+ _("Data conversion to Kolab format failed for PIM Object, UID '%s', Folder '%s'"),
+ priv->kolab_uid, priv->foldername);
return FALSE;
}
@@ -489,15 +493,15 @@ kolab_mail_handle_convert_kconvmail_to_eds (KolabMailHandle *self,
g_set_error (err,
KOLAB_BACKEND_ERROR,
KOLAB_BACKEND_ERROR_DATATYPE_KOLAB,
- "%s: UID (%s) Folder (%s) JOURNAL data type not supported",
- __func__, priv->kolab_uid, priv->foldername);
+ _("JOURNAL data type not supported for PIM Object, UID '%s', Folder '%s'"),
+ priv->kolab_uid, priv->foldername);
return FALSE;
default:
g_set_error (err,
KOLAB_BACKEND_ERROR,
KOLAB_BACKEND_ERROR_DATATYPE_KOLAB,
- "%s: UID (%s) Folder (%s) unknown data type, not supported",
- __func__, priv->kolab_uid, priv->foldername);
+ _("Unknown data type for PIM Object, UID '%s', Folder '%s'"),
+ priv->kolab_uid, priv->foldername);
return FALSE;
}
@@ -527,16 +531,16 @@ kolab_mail_handle_convert_kconvmail_to_eds (KolabMailHandle *self,
g_set_error (err,
KOLAB_BACKEND_ERROR,
KOLAB_BACKEND_ERROR_DATATYPE_KOLAB,
- "%s: UID (%s) Folder (%s) conversion from Kolab calendar type failed",
- __func__, priv->kolab_uid, priv->foldername);
+ _("Conversion from Kolab calendar type to Evolution failed for PIM Object, UID '%s', Folder '%s'"),
+ priv->kolab_uid, priv->foldername);
return FALSE;
}
if (calcomptz->maincomp == NULL) {
g_set_error (err,
KOLAB_BACKEND_ERROR,
KOLAB_BACKEND_ERROR_DATATYPE_KOLAB,
- "%s: UID (%s) Folder (%s) got ECalComponentWithTZ with NULL maincomp member",
- __func__, priv->kolab_uid, priv->foldername);
+ _("Internal inconsistency detected: Corrupt timezone object for PIM Object, UID '%s', Folder '%s'"),
+ priv->kolab_uid, priv->foldername);
return FALSE;
}
e_cal_component_get_uid (calcomptz->maincomp, &component_uid);
@@ -547,8 +551,8 @@ kolab_mail_handle_convert_kconvmail_to_eds (KolabMailHandle *self,
g_set_error (err,
KOLAB_BACKEND_ERROR,
KOLAB_BACKEND_ERROR_DATATYPE_KOLAB,
- "%s: UID (%s) Folder (%s) invalid Kolab mail (UID in subject does not match UID in data part)",
- __func__, priv->kolab_uid, priv->foldername);
+ _("Invalid Kolab mail object, UID '%s', Folder '%s' (UID in subject does not match UID in data part)"),
+ priv->kolab_uid, priv->foldername);
return FALSE;
}
/* KolabMailSummary */
@@ -560,8 +564,8 @@ kolab_mail_handle_convert_kconvmail_to_eds (KolabMailHandle *self,
g_set_error (err,
KOLAB_BACKEND_ERROR,
KOLAB_BACKEND_ERROR_DATATYPE_KOLAB,
- "%s: UID (%s) Folder (%s) conversion from Kolab contact type failed",
- __func__, priv->kolab_uid, priv->foldername);
+ "Conversion from Kolab contact type to Evolution failed for PIM Object, UID '%s', Folder '%s'",
+ priv->kolab_uid, priv->foldername);
return FALSE;
}
contact_uid = e_contact_get (econtact, E_CONTACT_UID);
@@ -573,8 +577,8 @@ kolab_mail_handle_convert_kconvmail_to_eds (KolabMailHandle *self,
g_set_error (err,
KOLAB_BACKEND_ERROR,
KOLAB_BACKEND_ERROR_DATATYPE_KOLAB,
- "%s: UID (%s) Folder (%s) invalid Kolab mail (UID in subject does not match UID in data part)",
- __func__, priv->kolab_uid, priv->foldername);
+ _("Invalid Kolab mail object, UID '%s', Folder '%s' (UID in subject does not match UID in data part)"),
+ priv->kolab_uid, priv->foldername);
return FALSE;
}
g_free (contact_uid);
@@ -598,8 +602,8 @@ kolab_mail_handle_convert_kconvmail_to_eds (KolabMailHandle *self,
g_set_error (err,
KOLAB_BACKEND_ERROR,
KOLAB_BACKEND_ERROR_DATATYPE_INTERNAL,
- "%s: UID (%s) Folder (%s) invalid KolabMailSummary",
- __func__, priv->kolab_uid, priv->foldername);
+ _("Internal inconsistency detected: Invalid summary information for PIM Object, UID '%s', Folder '%s'"),
+ priv->kolab_uid, priv->foldername);
return FALSE;
}
@@ -875,8 +879,8 @@ kolab_mail_handle_set_summary (KolabMailHandle *self,
g_set_error (err,
KOLAB_BACKEND_ERROR,
KOLAB_BACKEND_ERROR_INTERNAL,
- "%s: UID (%s) Folder (%s) summary inconsistent, taking no action",
- __func__, priv->kolab_uid, priv->foldername);
+ _("Internal inconsistency detected: Invalid summary information for PIM Object, 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 3a80102..29e3f1e 100644
--- a/src/libekolab/kolab-mail-imap-client.c
+++ b/src/libekolab/kolab-mail-imap-client.c
@@ -25,6 +25,10 @@
/*----------------------------------------------------------------------------*/
+#include <config.h>
+
+#include <glib/gi18n-lib.h>
+
#include <camel/camel-kolab-imapx-provider.h>
#include <camel/camel-kolab-imapx-store.h>
#include <camel/camel-kolab-imapx-folder.h>
@@ -224,8 +228,8 @@ kolab_mail_imap_client_camel_get_folder (KolabMailImapClient *self,
g_set_error (err,
KOLAB_CAMEL_ERROR,
KOLAB_CAMEL_ERROR_GENERIC,
- "%s: cannot get folder for (%s): %s",
- __func__, foldername, "NULL folder");
+ _("Cannot get Camel folder for path '%s'"),
+ foldername);
return NULL;
}
@@ -681,8 +685,7 @@ kolab_mail_imap_client_configure (KolabMailImapClient *self,
g_set_error (err,
KOLAB_BACKEND_ERROR,
KOLAB_BACKEND_ERROR_GENERIC,
- "%s: folder context not set on settings handler",
- __func__);
+ _("Internal inconsistency detected: Folder PIM context not set"));
return FALSE;
}
@@ -780,8 +783,7 @@ kolab_mail_imap_client_bringup (KolabMailImapClient *self,
g_set_error (err,
KOLAB_BACKEND_ERROR,
KOLAB_BACKEND_ERROR_INTERNAL,
- "%s: need server name to be set",
- __func__);
+ _("Internal inconsistency detected: Kolab server name not set"));
return FALSE;
}
@@ -799,7 +801,7 @@ kolab_mail_imap_client_bringup (KolabMailImapClient *self,
g_set_error (err,
KOLAB_BACKEND_ERROR,
KOLAB_BACKEND_ERROR_INTERNAL,
- "%s: need user name to be set",
+ _("Internal inconsistency detected: Kolab user ID not set"));
__func__);
return FALSE;
@@ -851,8 +853,8 @@ kolab_mail_imap_client_bringup (KolabMailImapClient *self,
g_set_error (err,
KOLAB_BACKEND_ERROR,
KOLAB_BACKEND_ERROR_CAMEL,
- "%s: could not get service for protocol %s",
- __func__, KOLAB_CAMEL_PROVIDER_PROTOCOL);
+ _("Could not get a Camel service for protocol '%s'"),
+ KOLAB_CAMEL_PROVIDER_PROTOCOL);
return FALSE;
}
#endif
@@ -863,8 +865,8 @@ kolab_mail_imap_client_bringup (KolabMailImapClient *self,
g_set_error (err,
KOLAB_BACKEND_ERROR,
KOLAB_BACKEND_ERROR_CAMEL,
- "%s: could not set context [%i] on store",
- __func__, priv->context);
+ _("Could not set PIM folder context %i for this backend"),
+ priv->context);
return FALSE;
}
@@ -1165,8 +1167,8 @@ kolab_mail_imap_client_get_folder_type (KolabMailImapClient *self,
g_set_error (err,
KOLAB_CAMEL_ERROR,
KOLAB_CAMEL_ERROR_GENERIC,
- "%s: invalid folder type for (%s)",
- __func__, foldername);
+ _("Folder '%s' has an invalid PIM type"),
+ foldername);
return KOLAB_FOLDER_TYPE_INVAL;
}
@@ -1408,8 +1410,8 @@ kolab_mail_imap_client_query_summaries (KolabMailImapClient *self,
g_set_error (err,
KOLAB_BACKEND_ERROR,
KOLAB_BACKEND_ERROR_CONTEXT_MISUSE,
- "%s: folder type does not map to folder context for (%s)",
- __func__, foldername);
+ _("Internal inconsistency detected: Folder '%s' has a PIM type %i set which does not map to a known folder context"),
+ foldername, foldertype);
return NULL;
}
@@ -1526,8 +1528,8 @@ kolab_mail_imap_client_store (KolabMailImapClient *self,
g_set_error (&tmp_err,
KOLAB_BACKEND_ERROR,
KOLAB_BACKEND_ERROR_NOTFOUND,
- "%s: could not get CamelFolder for (%s)",
- __func__, foldername);
+ _("Could not get CamelFolder for %s"),
+ foldername);
goto cleanup;
}
@@ -1635,8 +1637,8 @@ kolab_mail_imap_client_store (KolabMailImapClient *self,
g_set_error (&tmp_err,
KOLAB_BACKEND_ERROR,
KOLAB_BACKEND_ERROR_CAMEL,
- "%s: UID (%s) Folder (%s) could not read-back message from server",
- __func__, kolab_uid, foldername);
+ _("Could not read-back mail message from server, UID '%s', Folder '%s'"),
+ kolab_uid, foldername);
goto cleanup;
}
@@ -1646,8 +1648,8 @@ kolab_mail_imap_client_store (KolabMailImapClient *self,
g_set_error (&tmp_err,
KOLAB_BACKEND_ERROR,
KOLAB_BACKEND_ERROR_INTERNAL,
- "%s: UID (%s) Folder (%s) could not get IMAP UID from message",
- __func__, kolab_uid, foldername);
+ _("Could not get IMAP UID from message, UID '%s', Folder '%s'"),
+ kolab_uid, foldername);
goto cleanup;
}
@@ -1752,8 +1754,7 @@ kolab_mail_imap_client_retrieve (KolabMailImapClient *self,
g_set_error (err,
KOLAB_BACKEND_ERROR,
KOLAB_BACKEND_ERROR_INTERNAL,
- "%s: Kolab UID not set on handle!",
- __func__);
+ _("Internal inconsistency detected: Kolab UID not set on PIM object handle"));
return FALSE;
}
@@ -1762,8 +1763,8 @@ kolab_mail_imap_client_retrieve (KolabMailImapClient *self,
g_set_error (err,
KOLAB_BACKEND_ERROR,
KOLAB_BACKEND_ERROR_INTERNAL,
- "%s: UID (%s) foldername not set",
- __func__, kolab_uid);
+ _("Internal inconsistency detected: Folder name not set on PIM object handle, UID '%s'"),
+ kolab_uid);
return FALSE;
}
@@ -1789,8 +1790,8 @@ kolab_mail_imap_client_retrieve (KolabMailImapClient *self,
g_set_error (err,
KOLAB_BACKEND_ERROR,
KOLAB_BACKEND_ERROR_DATATYPE_INTERNAL,
- "%s: UID (%s) folder context mismatch, (%i) (real) vs. (%i) (stored)",
- __func__, kolab_uid, context, s_context);
+ _("Internal inconsistency detected: Folder context mismatch, real is %i, stored is %i, UID '%s', Folder '%s'"),
+ context, s_context, kolab_uid, foldername);
return FALSE;
}
@@ -1844,8 +1845,8 @@ kolab_mail_imap_client_retrieve (KolabMailImapClient *self,
g_set_error (err,
KOLAB_BACKEND_ERROR,
KOLAB_BACKEND_ERROR_NOTFOUND,
- "%s: could not find Kolab UID (%s) in folder (%s)",
- __func__, kolab_uid, foldername);
+ _("Could not find Kolab mail message, UID '%s', Folder '%s'"),
+ kolab_uid, foldername);
return FALSE;
}
@@ -1911,8 +1912,7 @@ kolab_mail_imap_client_delete (KolabMailImapClient *self,
g_set_error (err,
KOLAB_BACKEND_ERROR,
KOLAB_BACKEND_ERROR_INTERNAL,
- "%s: Kolab UID not set on handle!",
- __func__);
+ _("Internal inconsistency detected: Kolab UID not set on PIM object handle"));
return FALSE;
}
@@ -1921,8 +1921,8 @@ kolab_mail_imap_client_delete (KolabMailImapClient *self,
g_set_error (err,
KOLAB_BACKEND_ERROR,
KOLAB_BACKEND_ERROR_INTERNAL,
- "%s: UID (%s) foldername not set",
- __func__, kolab_uid);
+ _("Internal inconsistency detected: Folder name not set on PIM object handle, UID '%s'"),
+ kolab_uid);
return FALSE;
}
@@ -1951,8 +1951,8 @@ kolab_mail_imap_client_delete (KolabMailImapClient *self,
g_set_error (err,
KOLAB_BACKEND_ERROR,
KOLAB_BACKEND_ERROR_NOTFOUND,
- "%s: could not get CamelFolder for (%s)",
- __func__, foldername);
+ _("Could not get CamelFolder for %s"),
+ foldername);
return FALSE;
}
diff --git a/src/libekolab/kolab-mail-info-db.c b/src/libekolab/kolab-mail-info-db.c
index c2d4f49..ba7d474 100644
--- a/src/libekolab/kolab-mail-info-db.c
+++ b/src/libekolab/kolab-mail-info-db.c
@@ -39,9 +39,13 @@
/*----------------------------------------------------------------------------*/
+#include <config.h>
+
#include <string.h>
#include <sqlite3.h>
+#include <glib/gi18n-lib.h>
+
#include <libekolabutil/kolab-util-glib.h>
#include <libekolabutil/kolab-util-sqlite.h>
#include <libekolabutil/kolab-util-error.h>
@@ -499,8 +503,8 @@ kolab_mail_info_db_sql_query_folder (KolabUtilSqliteDb *kdb,
g_set_error (err,
KOLAB_UTIL_ERROR,
KOLAB_UTIL_ERROR_SQLITE_DB,
- "%s: %s",
- __func__, sqlite3_errmsg (kdb->db));
+ _("SQLite Error: %s"),
+ sqlite3_errmsg (kdb->db));
}
(void)kolab_util_sqlite_fnlz_stmt (kdb, sql_stmt, NULL);
return NULL;
@@ -633,8 +637,8 @@ kolab_mail_info_db_sql_query_record (KolabUtilSqliteDb *kdb,
g_set_error (err,
KOLAB_UTIL_ERROR,
KOLAB_UTIL_ERROR_SQLITE_DB,
- "%s: %s",
- __func__, sqlite3_errmsg (kdb->db));
+ _("SQLite Error: %s"),
+ sqlite3_errmsg (kdb->db));
}
(void)kolab_util_sqlite_fnlz_stmt (kdb, sql_stmt, NULL);
g_free (tblname);
@@ -963,8 +967,8 @@ kolab_mail_info_db_query_uids (KolabMailInfoDb *self,
g_set_error (&tmp_err,
KOLAB_UTIL_ERROR,
KOLAB_UTIL_ERROR_SQLITE_DB,
- "%s: %s",
- __func__, sqlite3_errmsg (priv->kdb->db));
+ _("SQLite Error: %s"),
+ sqlite3_errmsg (priv->kdb->db));
}
break;
}
@@ -1088,8 +1092,8 @@ kolab_mail_info_db_query_changed_uids (KolabMailInfoDb *self,
g_set_error (&tmp_err,
KOLAB_UTIL_ERROR,
KOLAB_UTIL_ERROR_SQLITE_DB,
- "%s: %s",
- __func__, sqlite3_errmsg (priv->kdb->db));
+ _("SQLite Error: %s"),
+ sqlite3_errmsg (priv->kdb->db));
}
break;
}
@@ -1226,8 +1230,8 @@ kolab_mail_info_db_query_foldernames (KolabMailInfoDb *self,
g_set_error (&tmp_err,
KOLAB_UTIL_ERROR,
KOLAB_UTIL_ERROR_SQLITE_DB,
- "%s: %s",
- __func__, sqlite3_errmsg (priv->kdb->db));
+ _("SQLite Error: %s"),
+ sqlite3_errmsg (priv->kdb->db));
}
break;
}
@@ -1352,8 +1356,8 @@ kolab_mail_info_db_query_folder_summary (KolabMailInfoDb *self,
g_set_error (err,
KOLAB_BACKEND_ERROR,
KOLAB_BACKEND_ERROR_NOTFOUND,
- "%s: Folder (%s) not known to InfoDb",
- __func__, foldername);
+ _("Folder name not known to internal database: '%s'"),
+ foldername);
return NULL;
}
@@ -1444,8 +1448,8 @@ kolab_mail_info_db_remove_folder (KolabMailInfoDb *self,
g_set_error (err,
KOLAB_BACKEND_ERROR,
KOLAB_BACKEND_ERROR_NOTFOUND,
- "%s: Folder name to be removed does not exist: [%s]",
- __func__, foldername);
+ _("Folder to be removed does not exist in internal database: '%s'"),
+ foldername);
return FALSE;
}
@@ -1593,8 +1597,8 @@ kolab_mail_info_db_query_record (KolabMailInfoDb *self,
g_set_error (err,
KOLAB_BACKEND_ERROR,
KOLAB_BACKEND_ERROR_DATATYPE_INTERNAL,
- "%s: UID (%s) Folder (%s) without folder summary",
- __func__, uid, foldername);
+ _("Internal inconsistency detected: Folder without summary information, UID '%s', Folder '%s'"),
+ uid, foldername);
kolab_mail_info_db_record_free (record);
return NULL;
}
@@ -1606,8 +1610,8 @@ kolab_mail_info_db_query_record (KolabMailInfoDb *self,
g_set_error (err,
KOLAB_BACKEND_ERROR,
KOLAB_BACKEND_ERROR_DATATYPE_INTERNAL,
- "%s: UID (%s) has it's folder deleted: (%s)",
- __func__, uid, foldername);
+ _("Internal inconsistency detected: PIM Object has its folder deleted, UID '%s', Folder '%s'"),
+ uid, foldername);
kolab_mail_info_db_record_free (record);
return NULL;
}
@@ -1657,8 +1661,8 @@ kolab_mail_info_db_update_record (KolabMailInfoDb *self,
g_set_error (err,
KOLAB_BACKEND_ERROR,
KOLAB_BACKEND_ERROR_INFODB_NOFOLDER,
- "%s: Unknown folder name: (%s)",
- __func__, foldername);
+ _("Folder name not known to internal database: '%s'"),
+ foldername);
return FALSE;
}
@@ -1672,8 +1676,8 @@ kolab_mail_info_db_update_record (KolabMailInfoDb *self,
g_set_error (err,
KOLAB_BACKEND_ERROR,
KOLAB_BACKEND_ERROR_INFODB_NOFOLDER,
- "%s: Destination folder has been deleted: (%s)",
- __func__, foldername);
+ _("Destination folder has been deleted: '%s'"),
+ foldername);
return FALSE;
}
@@ -1733,8 +1737,8 @@ kolab_mail_info_db_remove_record (KolabMailInfoDb *self,
g_set_error (err,
KOLAB_BACKEND_ERROR,
KOLAB_BACKEND_ERROR_NOTFOUND,
- "%s: UID (%s) Folder (%s) not found in records DB",
- __func__, uid, foldername);
+ _("Record missing in internal database, UID '%s', Folder '%s'"),
+ uid, foldername);
return FALSE;
}
diff --git a/src/libekolab/kolab-mail-mime-builder.c b/src/libekolab/kolab-mail-mime-builder.c
index 6addd0b..7191b4a 100644
--- a/src/libekolab/kolab-mail-mime-builder.c
+++ b/src/libekolab/kolab-mail-mime-builder.c
@@ -25,8 +25,12 @@
/*----------------------------------------------------------------------------*/
+#include <config.h>
+
#include <string.h>
+#include <glib/gi18n-lib.h>
+
#include "kolab-util-backend.h"
#include "kolab-mail-mime-builder.h"
@@ -224,8 +228,7 @@ kolab_mail_mime_builder_conv_new_from_camel (KolabMailMimeBuilder *self,
g_set_error (err,
KOLAB_BACKEND_ERROR,
KOLAB_BACKEND_ERROR_CAMEL,
- "%s: cannot unpack CamelMimeMessage",
- __func__);
+ _("Cannot unpack Camel mime message"));
return NULL;
}
@@ -233,8 +236,7 @@ kolab_mail_mime_builder_conv_new_from_camel (KolabMailMimeBuilder *self,
g_set_error (err,
KOLAB_BACKEND_ERROR,
KOLAB_BACKEND_ERROR_CAMEL,
- "%s: no multipart message, ignoring",
- __func__);
+ _("Mail message is not a multipart message, ignoring"));
/* need to unref data wrapper? */
return NULL;
}
@@ -248,8 +250,8 @@ kolab_mail_mime_builder_conv_new_from_camel (KolabMailMimeBuilder *self,
g_set_error (err,
KOLAB_BACKEND_ERROR,
KOLAB_BACKEND_ERROR_DATATYPE_KOLAB,
- "%s: at least %i mime parts expected, skipping message",
- __func__, KOLAB_MAIL_MIME_PARTS_MIN);
+ _("Message does not have the expected minimum of %i mime parts, ignoring"),
+ KOLAB_MAIL_MIME_PARTS_MIN);
return NULL;
}
@@ -286,8 +288,7 @@ kolab_mail_mime_builder_conv_new_from_camel (KolabMailMimeBuilder *self,
g_set_error (&tmp_err,
KOLAB_BACKEND_ERROR,
KOLAB_BACKEND_ERROR_CAMEL,
- "%s: NULL content type, skipping mime part",
- __func__);
+ _("Message mime part has no content type set, skippting"));
goto mime_part_cleanup;
}
if (name == NULL) {
@@ -299,8 +300,7 @@ kolab_mail_mime_builder_conv_new_from_camel (KolabMailMimeBuilder *self,
g_set_error (&tmp_err,
KOLAB_BACKEND_ERROR,
KOLAB_BACKEND_ERROR_CAMEL,
- "%s: could not get data wrapper for mime part, skipping",
- __func__);
+ _("Could not get Camel data wrapper for mime part, skipping"));
goto mime_part_cleanup;
}
@@ -463,8 +463,7 @@ kolab_mail_mime_builder_camel_new_from_conv (KolabMailMimeBuilder *self,
g_set_error (&tmp_err,
KOLAB_BACKEND_ERROR,
KOLAB_BACKEND_ERROR_INTERNAL,
- "%s: invalid Kolabconv_mail_part, no CamelMimeMessage created",
- __func__);
+ _("Internal inconsistency detected: Invaldid mail part after Kolab data conversion, no Camel message created"));
goto mime_part_skip;
}
diff --git a/src/libekolab/kolab-mail-side-cache.c b/src/libekolab/kolab-mail-side-cache.c
index cfbea08..4ebcf8a 100644
--- a/src/libekolab/kolab-mail-side-cache.c
+++ b/src/libekolab/kolab-mail-side-cache.c
@@ -39,6 +39,10 @@
/*----------------------------------------------------------------------------*/
+#include <config.h>
+
+#include <glib/gi18n-lib.h>
+
#include <libekolabconv/main/src/kolab-conv.h>
#include <libekolabutil/kolab-util-glib.h>
@@ -254,8 +258,8 @@ kolab_mail_side_cache_sql_query_object (KolabUtilSqliteDb *kdb,
g_set_error (err,
KOLAB_BACKEND_ERROR,
KOLAB_BACKEND_ERROR_DATATYPE_KOLAB,
- "%s: UID (%s) Folder (%s) has zero mail parts",
- __func__, uid, foldername);
+ _("Internal inconsistency detected: Invalid cache object with zero mail message parts, UID '%s', Folder '%s'"),
+ uid, foldername);
g_free (tblname);
return NULL;
}
@@ -287,8 +291,8 @@ kolab_mail_side_cache_sql_query_object (KolabUtilSqliteDb *kdb,
g_set_error (&tmp_err,
KOLAB_UTIL_ERROR,
KOLAB_UTIL_ERROR_SQLITE_DB,
- "%s: %s",
- __func__, sqlite3_errmsg (kdb->db));
+ _("SQLite Error: %s"),
+ sqlite3_errmsg (kdb->db));
}
break;
}
@@ -307,8 +311,8 @@ kolab_mail_side_cache_sql_query_object (KolabUtilSqliteDb *kdb,
g_set_error (&tmp_err,
KOLAB_UTIL_ERROR,
KOLAB_UTIL_ERROR_SQLITE_DB,
- "%s: UID (%s) Folder (%s) expected (%i) payload bytes, got (%i)",
- __func__, uid, foldername, mpart->length, nbytes);
+ _("Internal inconsistency detected: Invalid cache object has %i payload bytes, expected %i bytes, UID '%s', Folder '%s'"),
+ mpart->length, nbytes, uid, foldername);
break;
}
mpart->name = g_strdup ((gchar *) sqlite3_column_text (sql_stmt,
@@ -418,8 +422,8 @@ kolab_mail_side_cache_sql_store_object (KolabUtilSqliteDb *kdb,
g_set_error (&tmp_err,
KOLAB_UTIL_ERROR,
KOLAB_UTIL_ERROR_SQLITE_DB,
- "%s: %s",
- __func__, sqlite3_errmsg (kdb->db));
+ _("SQLite Error: %s"),
+ sqlite3_errmsg (kdb->db));
(void)kolab_util_sqlite_fnlz_stmt (kdb, sql_stmt, NULL);
break;
}
@@ -678,8 +682,7 @@ kolab_mail_side_cache_store (KolabMailSideCache *self,
g_set_error (err,
KOLAB_BACKEND_ERROR,
KOLAB_BACKEND_ERROR_INTERNAL,
- "%s: Kolab UID not set on handle!",
- __func__);
+ _("Internal inconsistency detected: PIM Object handle has no Kolab UID set"));
return FALSE;
}
@@ -725,8 +728,7 @@ kolab_mail_side_cache_retrieve (KolabMailSideCache *self,
g_set_error (err,
KOLAB_BACKEND_ERROR,
KOLAB_BACKEND_ERROR_INTERNAL,
- "%s: Kolab UID not set on handle!",
- __func__);
+ _("Internal inconsistency detected: PIM Object handle has no Kolab UID set"));
return FALSE;
}
@@ -735,8 +737,8 @@ kolab_mail_side_cache_retrieve (KolabMailSideCache *self,
g_set_error (err,
KOLAB_BACKEND_ERROR,
KOLAB_BACKEND_ERROR_INTERNAL,
- "%s: UID (%s) foldername not set",
- __func__, kolab_uid);
+ _("Internal inconsistency detected: Folder name not set on PIM Object handle, UID '%s'"),
+ kolab_uid);
return FALSE;
}
@@ -752,8 +754,8 @@ kolab_mail_side_cache_retrieve (KolabMailSideCache *self,
g_set_error (err,
KOLAB_BACKEND_ERROR,
KOLAB_BACKEND_ERROR_NOTFOUND,
- "%s: could not find Kolab UID (%s) in folder (%s)",
- __func__, kolab_uid, foldername);
+ _("Could not find cache object, UID '%s', Folder '%s'"),
+ kolab_uid, foldername);
return FALSE;
}
@@ -819,8 +821,7 @@ kolab_mail_side_cache_delete (KolabMailSideCache *self,
g_set_error (err,
KOLAB_BACKEND_ERROR,
KOLAB_BACKEND_ERROR_INTERNAL,
- "%s: Kolab UID not set on handle!",
- __func__);
+ _("Internal inconsistency detected: PIM Object handle has no Kolab UID set"));
return FALSE;
}
@@ -829,8 +830,8 @@ kolab_mail_side_cache_delete (KolabMailSideCache *self,
g_set_error (err,
KOLAB_BACKEND_ERROR,
KOLAB_BACKEND_ERROR_INTERNAL,
- "%s: UID (%s) foldername not set",
- __func__, kolab_uid);
+ _("Internal inconsistency detected: Folder name not set on PIM Object handle, UID '%s'"),
+ kolab_uid);
return FALSE;
}
diff --git a/src/libekolab/kolab-mail-synchronizer.c b/src/libekolab/kolab-mail-synchronizer.c
index 05869ae..0fdff4f 100644
--- a/src/libekolab/kolab-mail-synchronizer.c
+++ b/src/libekolab/kolab-mail-synchronizer.c
@@ -25,8 +25,12 @@
/*----------------------------------------------------------------------------*/
+#include <config.h>
+
#include <time.h>
+#include <glib/gi18n-lib.h>
+
#include <libecal/e-cal-time-util.h>
#include <libekolabutil/kolab-util-glib.h>
@@ -208,8 +212,8 @@ kolab_mail_synchronizer_get_foldertype (KolabMailSynchronizer *self,
g_set_error (&tmp_err,
KOLAB_BACKEND_ERROR,
KOLAB_BACKEND_ERROR_NOTFOUND,
- "%s: Folder found neither in InfoDb (%s) nor in ImapClient (%s)",
- __func__, info_fn, imap_fn);
+ _("Folder not found, neither in internal database as '%s', nor on the server as '%s'"),
+ info_fn, imap_fn);
goto skip;
}
@@ -444,8 +448,7 @@ kolab_mail_synchronizer_folders_update_summary (KolabMailSynchronizer *self,
g_set_error (err,
KOLAB_BACKEND_ERROR,
KOLAB_BACKEND_ERROR_INTERNAL,
- "%s: no foldername from either InfoDb/ImapClient/SideCache",
- __func__);
+ _("Internal inconsistency detected: Could not get a folder name, no info from internal database, write cache, or the IMAP cache"));
return FALSE;
}
@@ -486,8 +489,8 @@ kolab_mail_synchronizer_folders_update_summary (KolabMailSynchronizer *self,
g_set_error (err,
KOLAB_BACKEND_ERROR,
KOLAB_BACKEND_ERROR_DATATYPE_INTERNAL,
- "%s: Folder type (%i) does not map to any folder context",
- __func__, folder_type);
+ _("Internal inconsistency detected, Folder type %i does not map to any known folder context"),
+ folder_type);
return FALSE;
}
@@ -1163,8 +1166,8 @@ kolab_mail_synchronizer_uids_update_infodb (KolabMailSynchronizer *self,
g_set_error (err,
KOLAB_BACKEND_ERROR,
KOLAB_BACKEND_ERROR_INFODB_NOFOLDER,
- "%s: Folder does not exist in InfoDb: %s",
- __func__, foldername);
+ _("Folder does not exist in internal database: '%s'"),
+ foldername);
return FALSE;
}
@@ -1867,8 +1870,7 @@ kolab_mail_synchronizer_transaction_prepare (KolabMailSynchronizer *self,
g_set_error (&tmp_err,
KOLAB_BACKEND_ERROR,
KOLAB_BACKEND_ERROR_DATATYPE_INTERNAL,
- "%s: UID not set on KolabMailHandle",
- __func__);
+ _("Internal inconsistency detected: PIM Object handle has no Kolab UID set"));
goto cleanup;
}
kmh_summary = kolab_mail_handle_get_summary (kmailhandle);
@@ -2494,8 +2496,8 @@ kolab_mail_synchronizer_info_sync (KolabMailSynchronizer *self,
g_set_error (err,
KOLAB_BACKEND_ERROR,
KOLAB_BACKEND_ERROR_INFODB_GENERIC,
- "%s: %s (%s)",
- __func__, tmp_err_2->message, tmp_err->message);
+ "%s (%s)",
+ tmp_err_2->message, tmp_err->message);
g_error_free (tmp_err);
g_error_free (tmp_err_2);
} else {
@@ -2548,8 +2550,8 @@ kolab_mail_synchronizer_info_sync (KolabMailSynchronizer *self,
g_set_error (err,
KOLAB_BACKEND_ERROR,
KOLAB_BACKEND_ERROR_INFODB_GENERIC,
- "%s: %s (%s)",
- __func__, tmp_err_2->message, tmp_err->message);
+ "%s (%s)",
+ tmp_err_2->message, tmp_err->message);
g_error_free (tmp_err);
g_error_free (tmp_err_2);
} else {
diff --git a/src/libekolab/kolab-settings-handler.c b/src/libekolab/kolab-settings-handler.c
index 1729cff..17b837c 100644
--- a/src/libekolab/kolab-settings-handler.c
+++ b/src/libekolab/kolab-settings-handler.c
@@ -25,8 +25,12 @@
/*----------------------------------------------------------------------------*/
+#include <config.h>
+
#include <errno.h>
+#include <glib/gi18n-lib.h>
+
#include <libekolabutil/kolab-util-glib.h>
#include "kolab-util-backend.h"
@@ -150,8 +154,8 @@ kolab_settings_handler_char_get_func_camel_data_dir (KolabSettingsHandler *self,
g_set_error (err,
G_FILE_ERROR,
g_file_error_from_errno (errno),
- "%s: could not create directory %s: %s",
- __func__, data_dir, g_strerror (errno));
+ _("Could not create directory '%s' ('%s')"),
+ data_dir, g_strerror (errno));
g_free (data_dir);
return FALSE;
}
@@ -168,8 +172,7 @@ kolab_settings_handler_char_set_func_camel_data_dir (KolabSettingsHandler *self,
g_set_error (err,
KOLAB_BACKEND_ERROR,
KOLAB_BACKEND_ERROR_GENERIC,
- "%s: camel data dir cannot be set",
- __func__);
+ _("Cannot set Camel data directory, is a read-only resource"));
return FALSE;
}
@@ -201,8 +204,8 @@ kolab_settings_handler_char_get_func_camel_config_dir (KolabSettingsHandler *sel
g_set_error (err,
G_FILE_ERROR,
g_file_error_from_errno (errno),
- "%s: could not create directory %s: %s",
- __func__, config_dir, g_strerror (errno));
+ _("Could not create directory '%s' ('%s')"),
+ config_dir, g_strerror (errno));
g_free (config_dir);
return FALSE;
}
@@ -219,8 +222,7 @@ kolab_settings_handler_char_set_func_camel_config_dir (KolabSettingsHandler *sel
g_set_error (err,
KOLAB_BACKEND_ERROR,
KOLAB_BACKEND_ERROR_GENERIC,
- "%s: camel config dir cannot be set",
- __func__);
+ _("Cannot set Camel configuration directory, is a read-only resource"));
return FALSE;
}
@@ -232,8 +234,7 @@ kolab_settings_handler_uint_set_func_folder_context (KolabSettingsHandler *self,
g_set_error (err,
KOLAB_BACKEND_ERROR,
KOLAB_BACKEND_ERROR_GENERIC,
- "%s: folder context cannot be re-set after configuration",
- __func__);
+ _("Cannot change folder context after it has initially been set"));
return FALSE;
}
@@ -879,8 +880,7 @@ kolab_settings_handler_get_value (KolabSettingsHandler *self,
g_set_error (err,
KOLAB_BACKEND_ERROR,
KOLAB_BACKEND_ERROR_NOTFOUND,
- "%s: no internal table, no value has ever been set",
- __func__);
+ _("Internal inconsistency detected: No settings table exists, no value has previously been set"));
return NULL;
}
@@ -890,8 +890,8 @@ kolab_settings_handler_get_value (KolabSettingsHandler *self,
g_set_error (err,
KOLAB_BACKEND_ERROR,
KOLAB_BACKEND_ERROR_NOTFOUND,
- "%s: no table with id (%i) exists",
- __func__, tbl_id);
+ _("Internal inconsistency detected: No settings table with ID '%i' exists"),
+ tbl_id);
return NULL;
}
@@ -900,8 +900,8 @@ kolab_settings_handler_get_value (KolabSettingsHandler *self,
g_set_error (err,
KOLAB_BACKEND_ERROR,
KOLAB_BACKEND_ERROR_NOTFOUND,
- "%s: no value for table id (%i) key (%s) exists",
- __func__, tbl_id, key);
+ _("Internal inconsistency detected: No settings value for table ID '%i', key ID '%s', exists"),
+ tbl_id, key);
return NULL;
}
diff --git a/src/libekolab/kolab-util-backend.c b/src/libekolab/kolab-util-backend.c
index 87b464f..9bb9778 100644
--- a/src/libekolab/kolab-util-backend.c
+++ b/src/libekolab/kolab-util-backend.c
@@ -404,8 +404,7 @@ kolab_util_backend_sqlite_db_new_open (KolabUtilSqliteDb **kdb,
g_set_error (err,
KOLAB_BACKEND_ERROR,
KOLAB_BACKEND_ERROR_CAMEL,
- "%s: could not get Camel storage path for InfoDb",
- __func__);
+ _("Could not get Camel storage path for internal database"));
return FALSE;
}
*kdb = kolab_util_sqlite_db_new ();
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
