lots of i18n fixes

svn path=/trunk/; revision=6143

5 files changed, 20 insertions, 20 deletions

diff --git a/camel/providers/nntp/camel-nntp-auth.c b/camel/providers/nntp/camel-nntp-auth.c
index 1a7402a339..1f1e6ab2d8 100644
--- a/camel/providers/nntp/camel-nntp-auth.c
+++ b/camel/providers/nntp/camel-nntp-auth.c
@@ -38,7 +38,7 @@ camel_nntp_auth_authenticate (CamelNNTPStore *store, CamelException *ex)
 	if (!service->url->authmech && !service->url->passwd) {
 		gchar *prompt;
 			
-		prompt = g_strdup_printf ("Please enter the NNTP password for %s@%s",
+		prompt = g_strdup_printf (_("Please enter the NNTP password for %s@%s"),
 					  service->url->user, service->url->host);
 		service->url->passwd =
 			camel_session_query_authenticator (session,
@@ -59,13 +59,13 @@ camel_nntp_auth_authenticate (CamelNNTPStore *store, CamelException *ex)
 
 	if (resp == NNTP_AUTH_REJECTED) {
 		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_CANT_AUTHENTICATE,
-				      "Server rejected username");
+				      _("Server rejected username"));
 		goto done;
 
 	}
 	else if (resp != NNTP_AUTH_CONTINUE) {
 		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_CANT_AUTHENTICATE,
-				      "Failed to send username to server");
+				      _("Failed to send username to server"));
 		goto done;
 	}
 
@@ -74,7 +74,7 @@ camel_nntp_auth_authenticate (CamelNNTPStore *store, CamelException *ex)
 
 	if (resp == NNTP_AUTH_REJECTED) {
 		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_CANT_AUTHENTICATE,
-				      "Server rejected username/password");
+				      _("Server rejected username/password"));
 		goto done;
 	}
 
diff --git a/camel/providers/nntp/camel-nntp-folder.c b/camel/providers/nntp/camel-nntp-folder.c
index c9fb19373a..e4d53d779f 100644
--- a/camel/providers/nntp/camel-nntp-folder.c
+++ b/camel/providers/nntp/camel-nntp-folder.c
@@ -137,7 +137,7 @@ nntp_folder_get_message (CamelFolder *folder, const gchar *uid, CamelException *
 	if (status == NNTP_NO_SUCH_ARTICLE) {
 		camel_exception_setv (ex, 
 				     CAMEL_EXCEPTION_FOLDER_INVALID_UID,
-				     "message %s not found.",
+				     _("Message %s not found."),
 				      message_id);
 		return NULL;
 	}
@@ -161,7 +161,7 @@ nntp_folder_get_message (CamelFolder *folder, const gchar *uid, CamelException *
 		char *line;
 
 		if (camel_remote_store_recv_line (CAMEL_REMOTE_STORE (parent_store), &line, ex) < 0) {
-			g_error ("recv_line failed while building message\n");
+			g_warning ("recv_line failed while building message\n");
 			break;
 		}
 
diff --git a/camel/providers/nntp/camel-nntp-grouplist.c b/camel/providers/nntp/camel-nntp-grouplist.c
index ee1da0da6f..98aac2a03b 100644
--- a/camel/providers/nntp/camel-nntp-grouplist.c
+++ b/camel/providers/nntp/camel-nntp-grouplist.c
@@ -42,7 +42,7 @@ camel_nntp_get_grouplist_from_server (CamelNNTPStore *store, CamelException *ex)
 
 	if (status != NNTP_LIST_FOLLOWS) {
 		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      "Could not get group list from server.");
+				      _("Could not get group list from server."));
 		return NULL;
 	}
 
@@ -90,7 +90,7 @@ camel_nntp_get_grouplist_from_file (CamelNNTPStore *store, CamelException *ex)
 
 	if (fp == NULL) {
 		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,
-				      "Unable to load grouplist file for %s: %s",
+				      _("Unable to load grouplist file for %s: %s"),
 				      CAMEL_SERVICE(store)->url->host,
 				      strerror(errno));
 		return NULL;
@@ -99,7 +99,7 @@ camel_nntp_get_grouplist_from_file (CamelNNTPStore *store, CamelException *ex)
 	/* read the time */
 	if (!fgets (buf, 300, fp)) {
 		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,
-				      "Unable to load grouplist file for %s: %s",
+				      _("Unable to load grouplist file for %s: %s"),
 				      CAMEL_SERVICE(store)->url->host,
 				      strerror(errno));
 		fclose (fp);
@@ -148,7 +148,7 @@ camel_nntp_grouplist_save (CamelNNTPGroupList *group_list, CamelException *ex)
 
 	if (fp == NULL) {
 		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,
-				      "Unable to save grouplist file for %s: %s",
+				      _("Unable to save grouplist file for %s: %s"),
 				      CAMEL_SERVICE(group_list->store)->url->host,
 				      strerror(errno));
 		return;
diff --git a/camel/providers/nntp/camel-nntp-provider.c b/camel/providers/nntp/camel-nntp-provider.c
index 7041c81c31..59a251a795 100644
--- a/camel/providers/nntp/camel-nntp-provider.c
+++ b/camel/providers/nntp/camel-nntp-provider.c
@@ -35,10 +35,10 @@ static gint nntp_url_equal (gconstpointer a, gconstpointer b);
 
 static CamelProvider news_provider = {
 	"nntp",
-	"USENET news",
+	N_("USENET news"),
 
-	"This is a provider for reading from and posting to"
-	"USENET newsgroups.",
+	N_("This is a provider for reading from and posting to"
+	   "USENET newsgroups."),
 
 	"news",
 
diff --git a/camel/providers/nntp/camel-nntp-store.c b/camel/providers/nntp/camel-nntp-store.c
index 0cd37b29de..9bc59e7150 100644
--- a/camel/providers/nntp/camel-nntp-store.c
+++ b/camel/providers/nntp/camel-nntp-store.c
@@ -223,7 +223,7 @@ nntp_store_connect (CamelService *service, CamelException *ex)
 
 	if (!ensure_news_dir_exists(store)) {
 		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      "Could not open directory for news server: %s",
+				      _("Could not open directory for news server: %s"),
 				      strerror (errno));
 		return FALSE;
 	}
@@ -284,15 +284,15 @@ nntp_store_get_name (CamelService *service, gboolean brief)
 	if (brief)
 		return g_strdup_printf ("%s", service->url->host);
 	else
-		return g_strdup_printf ("USENET News via %s", service->url->host);
+		return g_strdup_printf (_("USENET News via %s"), service->url->host);
 	
 }
 
 static CamelServiceAuthType password_authtype = {
-	"Password",
+	N_("Password"),
 	
-	"This option will authenticate with the NNTP server using a "
-	"plaintext password.",
+	N_("This option will authenticate with the NNTP server using a "
+	   "plaintext password."),
 	
 	"",
 	TRUE
@@ -330,7 +330,7 @@ nntp_store_get_folder (CamelStore *store, const gchar *folder_name,
 
 	if (!nntp_store->newsrc) {
 		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,
-				      "Unable to open or create .newsrc file for %s: %s",
+				      _("Unable to open or create .newsrc file for %s: %s"),
 				      CAMEL_SERVICE(store)->url->host,
 				      strerror(errno));
 		return NULL;
@@ -496,7 +496,7 @@ nntp_store_get_folder_info (CamelStore *store, const char *top,
 
 	if (!nntp_store->newsrc) {
 		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,
-				      "Unable to open or create .newsrc file for %s: %s",
+				      _("Unable to open or create .newsrc file for %s: %s"),
 				      CAMEL_SERVICE(store)->url->host,
 				      strerror(errno));
 		return NULL;