changing "uri" to "URI" in user-visible strings. Fixes bug #342161.

2006-06-15  Andre Klapper <a9016009@gmx.de>

	* addressbook/libebook/e-book.c:
	* camel/camel-folder.c:
	* camel/providers/nntp/camel-nntp-folder.c:
	* camel/providers/pop3/camel-pop3-folder.c:
	changing "uri" to "URI" in user-visible strings.
	Fixes bug #342161.

8 files changed, 41 insertions, 5 deletions

diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 52e692d65..94a1b8afe 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,12 @@
+2006-06-15  Andre Klapper <a9016009@gmx.de>
+
+	* addressbook/libebook/e-book.c:
+	* camel/camel-folder.c:
+	* camel/providers/nntp/camel-nntp-folder.c:
+	* camel/providers/pop3/camel-pop3-folder.c:
+	changing "uri" to "URI" in user-visible strings.
+	Fixes bug #342161.
+
 2006-06-13  Andre Klapper <a9016009@gmx.de>
 
 	* libebook/e-book.c:
diff --git a/addressbook/libebook/e-book.c b/addressbook/libebook/e-book.c
index 9c777df44..a0517703e 100644
--- a/addressbook/libebook/e-book.c
+++ b/addressbook/libebook/e-book.c
@@ -3557,7 +3557,7 @@ e_book_get_self (EContact **contact, EBook **book, GError **error)
 		g_object_unref (*book);
 		*book = NULL;
 		g_set_error (error, E_BOOK_ERROR, E_BOOK_ERROR_NO_SELF_CONTACT,
-			     _("%s: there was no self contact uid stored in gconf"), "e_book_get_self");
+			     _("%s: there was no self contact UID stored in gconf"), "e_book_get_self");
 		return FALSE;
 	}
 
diff --git a/camel/ChangeLog b/camel/ChangeLog
index 04b0c4403..0f7ee127b 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,3 +1,12 @@
+2006-06-15  Andre Klapper <a9016009@gmx.de>
+
+	* addressbook/libebook/e-book.c:
+	* camel/camel-folder.c:
+	* camel/providers/nntp/camel-nntp-folder.c:
+	* camel/providers/pop3/camel-pop3-folder.c:
+	changing "uri" to "URI" in user-visible strings.
+	Fixes bug #342161.
+
 2006-06-09  Chris Heath  <chris@heathens.co.nz>
 
 	* camel-net-utils.c (camel_getnameinfo): Fix memory leak
diff --git a/camel/camel-folder.c b/camel/camel-folder.c
index 17293fb85..d9c8eb198 100644
--- a/camel/camel-folder.c
+++ b/camel/camel-folder.c
@@ -1275,7 +1275,7 @@ static GPtrArray *
 search_by_uids(CamelFolder *folder, const char *exp, GPtrArray *uids, CamelException *ex)
 {
 	camel_exception_setv (ex, CAMEL_EXCEPTION_FOLDER_INVALID,
-			      _("Unsupported operation: search by uids: for %s"),
+			      _("Unsupported operation: search by UIDs: for %s"),
 			      camel_type_to_name (CAMEL_OBJECT_GET_TYPE (folder)));
 	
 	w(g_warning ("CamelFolder::search_by_expression not implemented for "
diff --git a/camel/providers/nntp/ChangeLog b/camel/providers/nntp/ChangeLog
index 7023459c1..1cb8d17dc 100644
--- a/camel/providers/nntp/ChangeLog
+++ b/camel/providers/nntp/ChangeLog
@@ -1,3 +1,12 @@
+2006-06-15  Andre Klapper <a9016009@gmx.de>
+
+	* addressbook/libebook/e-book.c:
+	* camel/camel-folder.c:
+	* camel/providers/nntp/camel-nntp-folder.c:
+	* camel/providers/pop3/camel-pop3-folder.c:
+	changing "uri" to "URI" in user-visible strings.
+	Fixes bug #342161.
+
 2006-06-09  Chris Heath  <chris@heathens.co.nz>
 
 	* camel-nntp-summary.c (message_info_new_from_header): Fix memory leak.
diff --git a/camel/providers/nntp/camel-nntp-folder.c b/camel/providers/nntp/camel-nntp-folder.c
index 4c8861e7a..abfe153ae 100644
--- a/camel/providers/nntp/camel-nntp-folder.c
+++ b/camel/providers/nntp/camel-nntp-folder.c
@@ -172,7 +172,7 @@ nntp_folder_cache_message (CamelDiscoFolder *disco_folder, const char *uid, Came
 	msgid = strchr(article, ',');
 	if (!msgid) {
 		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Internal error: uid in invalid format: %s"), uid);
+				      _("Internal error: UID in invalid format: %s"), uid);
 		return;
 	}
 	*msgid++ = 0;
@@ -204,7 +204,7 @@ nntp_folder_get_message (CamelFolder *folder, const char *uid, CamelException *e
 	msgid = strchr (article, ',');
 	if (msgid == NULL) {
 		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Internal error: uid in invalid format: %s"), uid);
+				      _("Internal error: UID in invalid format: %s"), uid);
 		return NULL;
 	}
 	*msgid++ = 0;
diff --git a/camel/providers/pop3/ChangeLog b/camel/providers/pop3/ChangeLog
index 961d2e236..88f38f35f 100644
--- a/camel/providers/pop3/ChangeLog
+++ b/camel/providers/pop3/ChangeLog
@@ -1,3 +1,12 @@
+2006-06-15  Andre Klapper <a9016009@gmx.de>
+
+	* addressbook/libebook/e-book.c:
+	* camel/camel-folder.c:
+	* camel/providers/nntp/camel-nntp-folder.c:
+	* camel/providers/pop3/camel-pop3-folder.c:
+	changing "uri" to "URI" in user-visible strings.
+	Fixes bug #342161.
+
 2006-06-09  Chris Heath  <chris@heathens.co.nz>
 
 	* camel-pop3-engine.c (camel_pop3_engine_finalise): Fix memory leak.
diff --git a/camel/providers/pop3/camel-pop3-folder.c b/camel/providers/pop3/camel-pop3-folder.c
index 9fd8acade..76753b584 100644
--- a/camel/providers/pop3/camel-pop3-folder.c
+++ b/camel/providers/pop3/camel-pop3-folder.c
@@ -402,7 +402,7 @@ pop3_get_message (CamelFolder *folder, const char *uid, CamelException *ex)
 	fi = g_hash_table_lookup(pop3_folder->uids_uid, uid);
 	if (fi == NULL) {
 		camel_exception_setv (ex, CAMEL_EXCEPTION_FOLDER_INVALID_UID,
-				      _("No message with uid %s"), uid);
+				      _("No message with UID %s"), uid);
 		return NULL;
 	}