** Fix for bug #553148

2008-09-25  Philip Withnall  <philip@tecnocode.co.uk>

	** Fix for bug #553148

	* addressbook/gui/contact-editor/contact-editor.glade:
	* addressbook/gui/contact-editor/e-contact-editor-im.c:
	* composer/mail-composer.error.xml:
	* 
plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml:
	* plugins/groupwise-features/org-gnome-compose-send-options.xml:
	* 
plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml:
	Standardise "GroupWise" usage in translatable strings.


svn path=/trunk/; revision=36453

10 files changed, 38 insertions, 8 deletions

diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 870f836a1d..c5502d07c4 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,11 @@
+2008-09-25  Philip Withnall  <philip@tecnocode.co.uk>
+
+	** Fix for bug #553148
+
+	* gui/contact-editor/contact-editor.glade:
+	* gui/contact-editor/e-contact-editor-im.c: Standardise "GroupWise"
+	usage in translatable strings.
+
 2008-09-24  Sankar P  <psankar@novell.com>
 
 License Changes
diff --git a/addressbook/gui/contact-editor/contact-editor.glade b/addressbook/gui/contact-editor/contact-editor.glade
index 2d6854cca1..bc6cbf1e54 100644
--- a/addressbook/gui/contact-editor/contact-editor.glade
+++ b/addressbook/gui/contact-editor/contact-editor.glade
@@ -1422,7 +1422,7 @@
 				  <child>
 				    <widget class="GtkMenuItem" id="menuitem389">
 				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">Novell Groupwise</property>
+				      <property name="label" translatable="yes">Novell GroupWise</property>
 				      <property name="use_underline">True</property>
 				      <signal name="activate" handler="on_novell_groupwise1_activate" last_modification_time="Fri, 12 Mar 2004 18:38:59 GMT"/>
 				    </widget>
diff --git a/addressbook/gui/contact-editor/e-contact-editor-im.c b/addressbook/gui/contact-editor/e-contact-editor-im.c
index 6121eb8be8..7facb68b45 100644
--- a/addressbook/gui/contact-editor/e-contact-editor-im.c
+++ b/addressbook/gui/contact-editor/e-contact-editor-im.c
@@ -52,7 +52,7 @@ enum {
 
 static const char *im_labels[] = {
 	N_("AOL Instant Messenger"),
-        N_("Novell Groupwise"),
+        N_("Novell GroupWise"),
 	N_("Jabber"),
 	N_("Yahoo Messenger"),
 	N_("Gadu-Gadu Messenger"),
diff --git a/composer/ChangeLog b/composer/ChangeLog
index f18cb91c33..e295558692 100644
--- a/composer/ChangeLog
+++ b/composer/ChangeLog
@@ -1,3 +1,10 @@
+2008-09-25  Philip Withnall  <philip@tecnocode.co.uk>
+
+	** Fix for bug #553148
+
+	* mail-composer.error.xml: Standardise "GroupWise" usage in
+	translatable strings.
+
 2008-09-23  Milan Crha  <mcrha@redhat.com>
 
 	** Part of fix for bug #553273
diff --git a/composer/mail-composer.error.xml b/composer/mail-composer.error.xml
index 6f76887bc8..a13fe34054 100644
--- a/composer/mail-composer.error.xml
+++ b/composer/mail-composer.error.xml
@@ -79,6 +79,6 @@ Please make sure that you have the correct version of gtkhtml and libgtkhtml ins
 
  <error id="send-options-support" type="error" modal="true">
   <_primary>Send options not available.</_primary>
-  <_secondary>Send options available only for Novell Groupwise and Microsoft Exchange accounts.</_secondary>
+  <_secondary>Send options available only for Novell GroupWise and Microsoft Exchange accounts.</_secondary>
  </error>
 </error-list>
diff --git a/plugins/groupwise-account-setup/ChangeLog b/plugins/groupwise-account-setup/ChangeLog
index 3eb01e4627..8674762787 100644
--- a/plugins/groupwise-account-setup/ChangeLog
+++ b/plugins/groupwise-account-setup/ChangeLog
@@ -1,3 +1,10 @@
+2008-09-25  Philip Withnall  <philip@tecnocode.co.uk>
+
+	** Fix for bug #553148
+
+	* org-gnome-gw-account-setup.eplug.xml: Standardise "GroupWise"
+	usage in translatable strings.
+
 2008-09-02  Sankar P  <psankar@novell.com>
 
 License Changes
diff --git a/plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml b/plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml
index 3174226137..d8f52a49f5 100644
--- a/plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml
+++ b/plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
 <e-plugin-list>
-  <e-plugin id="org.gnome.evolution.plugin.gw-account-setup" type="shlib" _name="Groupwise Account Setup"
+  <e-plugin id="org.gnome.evolution.plugin.gw-account-setup" type="shlib" _name="GroupWise Account Setup"
     location="@PLUGINDIR@/liborg-gnome-gw-account-setup@SOEXT@" load-on-startup="true" system_plugin="true">
     <author name="Sivaiah Nallagatla" email="snallagatla@novell.com"/>
-    <_description>A plugin to setup groupwise calendar and contacts sources.</_description>
+    <_description>A plugin to setup GroupWise calendar and contacts sources.</_description>
     
     <hook class="org.gnome.evolution.mail.config:1.0">
       <group target="account" id="org.gnome.evolution.mail.config.accountDruid">
diff --git a/plugins/groupwise-features/ChangeLog b/plugins/groupwise-features/ChangeLog
index 1bf828a4f2..214d115e40 100644
--- a/plugins/groupwise-features/ChangeLog
+++ b/plugins/groupwise-features/ChangeLog
@@ -1,3 +1,11 @@
+2008-09-25  Philip Withnall  <philip@tecnocode.co.uk>
+
+	** Fix for bug #553148
+
+	* org-gnome-compose-send-options.xml:
+	* org-gnome-groupwise-features.eplug.xml: Standardise "GroupWise"
+	usage in translatable strings.
+
 2008-09-24  Sankar P  <psankar@novell.com>
 
 License Changes
diff --git a/plugins/groupwise-features/org-gnome-compose-send-options.xml b/plugins/groupwise-features/org-gnome-compose-send-options.xml
index c5947c6a33..25ff89803e 100644
--- a/plugins/groupwise-features/org-gnome-compose-send-options.xml
+++ b/plugins/groupwise-features/org-gnome-compose-send-options.xml
@@ -1,7 +1,7 @@
 <Root>
   <commands>
   <cmd name="EPSOSendOptions" _label="Send Options"
-	  _tip="Add Send Options to groupwise messages"/>
+	  _tip="Add Send Options to GroupWise messages"/>
   </commands>
 
   <menu>
diff --git a/plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml b/plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml
index 47f74060ec..7a707fdcc9 100644
--- a/plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml
+++ b/plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <e-plugin-list>
-	<e-plugin id="org.gnome.evolution.groupwise_features" type="shlib" _name="Groupwise Features" 
+	<e-plugin id="org.gnome.evolution.groupwise_features" type="shlib" _name="GroupWise Features" 
 		location="@PLUGINDIR@/liborg-gnome-groupwise-features@SOEXT@">
 		<author name="Sivaiah Nallagatla" email="snallagatla@novell.com" />
 		<author name="Vivek Jain" email="jvivek@novell.com" />
@@ -10,7 +10,7 @@
     		<author name="Shreyas Srinivasan" email="sshreyas@novell.com"/>
 		<author name="Raghavendran R" email="raghavguru7@gmail.com"/>
 
-		<_description>A plugin for the features in Groupwise accounts.</_description>
+		<_description>A plugin for the features in GroupWise accounts.</_description>
 		<hook class="org.gnome.evolution.mail.config:1.0">
 			<group id="org.gnome.evolution.mail.folderConfig" target="folder"
 				check= "shared_folder_check"