Mailfromd goes international

git-svn-id: file:///svnroot/mailfromd/trunk@1428 7a8a7f39-df28-0410-adc6-e0d955640f24

1 files changed, 15 insertions, 15 deletions

diff --git a/src/bi_db.m4 b/src/bi_db.m4
index 9fa94f05..8ec821d2 100644
--- a/src/bi_db.m4
+++ b/src/bi_db.m4
@@ -32,7 +32,7 @@ dbmap_lookup(eval_environ_t env, char *dbname, const char *keystr,
 		defval = "";
 	if (mu_dbm_open(dbname, &db, MU_STREAM_READ, 0, NULL))
 		MF_THROW(mf_dbfailure,
-			 "mu_dbm_open(%s) failed: %s",
+			 _("mu_dbm_open(%s) failed: %s"),
 			 dbname,
 			 mu_dbm_strerror());
 
@@ -94,7 +94,7 @@ MF_DEFUN(dbput, VOID, STRING dbname, STRING keystr, STRING value,
 	
 	if (mu_dbm_open(dbname, &db, MU_STREAM_RDWR, 0640, NULL))
 		MF_THROW(mf_dbfailure,
-			 "mu_dbm_open(%s) failed: %s",
+			 _("mu_dbm_open(%s) failed: %s"),
 			 dbname,
 			 mu_dbm_strerror());
 	memset(&key, 0, sizeof key);
@@ -111,7 +111,7 @@ MF_DEFUN(dbput, VOID, STRING dbname, STRING keystr, STRING value,
 	mu_dbm_close(&db);
 	MF_ASSERT(rc == 0,
 		  mf_dbfailure,
-		  "failed to insert data to %s: %s %s: %s",
+		  _("Failed to insert data to %s: %s %s: %s"),
 		  dbname,
 		  keystr,
 		  value,
@@ -126,7 +126,7 @@ MF_DEFUN(dbdel, VOID, STRING dbname, STRING keystr, OPTIONAL, NUMBER null)
 	int rc;	
 	if (mu_dbm_open(dbname, &db, MU_STREAM_RDWR, 0640, NULL))
 		MF_THROW(mf_dbfailure,
-			 "mu_dbm_open(%s) failed: %s",
+			 _("mu_dbm_open(%s) failed: %s"),
 			 dbname,
 			 mu_dbm_strerror());
 	memset(&key, 0, sizeof key);
@@ -138,7 +138,7 @@ MF_DEFUN(dbdel, VOID, STRING dbname, STRING keystr, OPTIONAL, NUMBER null)
 	mu_dbm_close(&db);
 	MF_ASSERT(rc == 0,
                   mf_dbfailure,
-                  "failed to delete data `%s' from `%s': %s",
+                  _("Failed to delete data `%s' from `%s': %s"),
 		  key,
                   dbname,
 		  mu_dbm_strerror());
@@ -194,7 +194,7 @@ MF_DEFUN(greylist, NUMBER, STRING email, NUMBER interval)
 
 	rc = mu_dbm_open(greylist_format->dbname, &db, MU_STREAM_RDWR, 0600,
 			 &readonly);
-        MF_ASSERT(rc == 0, mf_dbfailure, "mu_dbm_open(%s) failed: %s",
+        MF_ASSERT(rc == 0, mf_dbfailure, _("mu_dbm_open(%s) failed: %s"),
 			      greylist_format->dbname, mu_dbm_strerror());
 	
 	memset(&key, 0, sizeof key);
@@ -208,7 +208,7 @@ MF_DEFUN(greylist, NUMBER, STRING email, NUMBER interval)
 
 		MF_ASSERT(MU_DATUM_SIZE(contents) == sizeof timestamp,
 			 mf_dbfailure,
-		         "greylist database %s has wrong data size",
+		         _("Greylist database %s has wrong data size"),
 			 greylist_format->dbname);
 		
 		timestamp = *(time_t*) MU_DATUM_PTR(contents);
@@ -240,8 +240,8 @@ MF_DEFUN(greylist, NUMBER, STRING email, NUMBER interval)
 				memcpy(MU_DATUM_PTR(contents),
 				       &now, sizeof now);
 				if (mu_dbm_insert(&db, key, contents, 1))
-					mu_error("Cannot insert datum `%s' in "
-						 "greylist database %s: %s",
+					mu_error(_("Cannot insert datum `%s' in "
+						   "greylist database %s: %s"),
 			                         key,
 						 greylist_format->dbname,
 	                                         mu_dbm_strerror());
@@ -261,8 +261,8 @@ MF_DEFUN(greylist, NUMBER, STRING email, NUMBER interval)
 		MU_DATUM_PTR(contents) = (void*)&now;
 		MU_DATUM_SIZE(contents) = sizeof now;
 		if (mu_dbm_insert(&db, key, contents, 1))
-			mu_error("Cannot insert datum `%s' in greylist "
-				 "database %s: %s",
+			mu_error(_("Cannot insert datum `%s' in greylist "
+				   "database %s: %s"),
 		                 key,
 				 greylist_format->dbname,
 	                         mu_dbm_strerror());
@@ -281,7 +281,7 @@ MF_DEFUN(db_name, STRING, STRING fmtid)
 	struct db_format *fmt = db_format_lookup(fmtid);
 	MF_ASSERT(fmt != NULL,
 		  mf_not_found,
-		  "no such db format: %s", fmtid);
+		  _("No such db format: %s"), fmtid);
 	MF_RETURN_STRING(fmt->dbname);
 }
 END
@@ -291,7 +291,7 @@ MF_DEFUN(db_get_active, NUMBER, STRING fmtid)
 	struct db_format *fmt = db_format_lookup(fmtid);
 	MF_ASSERT(fmt != NULL,
 		  mf_not_found,
-		  "no such db format: %s", fmtid);
+		  _("No such db format: %s"), fmtid);
 	MF_RETURN(fmt->enabled);
 }
 END
@@ -301,7 +301,7 @@ MF_DEFUN(db_set_active, VOID, STRING fmtid, NUMBER active)
 	struct db_format *fmt = db_format_lookup(fmtid);
 	MF_ASSERT(fmt != NULL,
 		  mf_not_found,
-		  "no such db format: %s", fmtid);
+		  _("No such db format: %s"), fmtid);
 	fmt->enabled = active;
 }
 END
@@ -311,7 +311,7 @@ MF_DEFUN(db_expire_interval, NUMBER, STRING fmtid)
 	struct db_format *fmt = db_format_lookup(fmtid);
 	MF_ASSERT(fmt != NULL,
 		  mf_not_found,
-		  "no such db format: %s", fmtid);
+		  _("No such db format: %s"), fmtid);
 	MF_RETURN(fmt->expire_interval);
 }
 END