From 333247971baf5fc6d19fe441b41410d4463b5569 Mon Sep 17 00:00:00 2001
From: Srinivasa Ragavan <sragavan@novell.com>
Date: Fri, 6 May 2005 05:25:09 +0000
Subject: Changed string 'login' Rephrased photo string Rephrased photo string

2005-05-06	Srinivasa Ragavan <sragavan@novell.com>

	* addressbook/gui/component/ldap-config.glade: Changed string 'login'
	* mail/evolution-mail.schemas.in.in: Rephrased photo string
	* mail/mail-config.glade: Rephrased photo string
	* ui/evolution-mail-message.xml: Changed 'From' to 'from'

svn path=/trunk/; revision=29288
---
 ChangeLog                                   | 7 +++++++
 addressbook/gui/component/ldap-config.glade | 4 ++--
 mail/evolution-mail.schemas.in.in           | 2 +-
 mail/mail-config.glade                      | 2 +-
 ui/evolution-mail-message.xml               | 4 ++--
 5 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4bd5a4e71e..b35a07764b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-05-06	Srinivasa Ragavan <sragavan@novell.com>
+
+	* addressbook/gui/component/ldap-config.glade: Changed string 'login'
+	* mail/evolution-mail.schemas.in.in: Rephrased photo string
+	* mail/mail-config.glade: Rephrased photo string
+	* ui/evolution-mail-message.xml: Changed 'From' to 'from'
+	
 2005-05-05  Harish Krishnaswamy  <kharish@novell.com>
 
 	* configure.in: reset upgrade revision to 0
diff --git a/addressbook/gui/component/ldap-config.glade b/addressbook/gui/component/ldap-config.glade
index 32ef5a6f72..dfa5ecb0cd 100644
--- a/addressbook/gui/component/ldap-config.glade
+++ b/addressbook/gui/component/ldap-config.glade
@@ -536,7 +536,7 @@
 			  <child>
 			    <widget class="GtkLabel" id="label560">
 			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">_Log in method:</property>
+			      <property name="label" translatable="yes">_Login method:</property>
 			      <property name="use_underline">True</property>
 			      <property name="use_markup">False</property>
 			      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1945,7 +1945,7 @@
 		      <child>
 			<widget class="GtkLabel" id="label46">
 			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">_Log in method:</property>
+			  <property name="label" translatable="yes">_Login method:</property>
 			  <property name="use_underline">True</property>
 			  <property name="use_markup">False</property>
 			  <property name="justify">GTK_JUSTIFY_LEFT</property>
diff --git a/mail/evolution-mail.schemas.in.in b/mail/evolution-mail.schemas.in.in
index 4ba23ebf2c..81af9dccc7 100644
--- a/mail/evolution-mail.schemas.in.in
+++ b/mail/evolution-mail.schemas.in.in
@@ -236,7 +236,7 @@
          <long>
           Load images for HTML messages over http(s). Possible values are:
           0 - Never load images off the net
-          1 - Load images if sender is in the addressbook
+          1 - Load images in mail from contacts
           2 - Always load images off the net
          </long>
       </locale>
diff --git a/mail/mail-config.glade b/mail/mail-config.glade
index e559d2369d..442711ff02 100644
--- a/mail/mail-config.glade
+++ b/mail/mail-config.glade
@@ -5414,7 +5414,7 @@ For example: &quot;Work&quot; or &quot;Personal&quot;</property>
 			<widget class="GtkRadioButton" id="radImagesSometimes">
 			  <property name="visible">True</property>
 			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">_Load images if sender is in address book</property>
+			  <property name="label" translatable="yes">_Load images in mail from contacts</property>
 			  <property name="use_underline">True</property>
 			  <property name="relief">GTK_RELIEF_NORMAL</property>
 			  <property name="focus_on_click">True</property>
diff --git a/ui/evolution-mail-message.xml b/ui/evolution-mail-message.xml
index 6cf470f878..1d36d45a63 100644
--- a/ui/evolution-mail-message.xml
+++ b/ui/evolution-mail-message.xml
@@ -360,7 +360,7 @@
     <submenu name="Tools" _label="_Tools">
       <placeholder name="ComponentPlaceholder">
         <placeholder name="MailFilterTools">
-          <submenu name="ToolsFilterFromMessage" _label="_Create Filter From Message">
+          <submenu name="ToolsFilterFromMessage" _label="_Create Filter from Message">
             <menuitem name="ToolsFilterSubject" verb="" _label="Filter on _Subject..."/>
             <menuitem name="ToolsFilterSender" verb="" _label="Filter on Se_nder..."/>
             <menuitem name="ToolsFilterRecipient" verb="" _label="Filter on _Recipients..."/>
@@ -368,7 +368,7 @@
           </submenu>
         </placeholder>
         <placeholder name="MailVFolderTools">
-          <submenu name="ToolsVFolderFromMessage" _label="Create _vFolder From Message">
+          <submenu name="ToolsVFolderFromMessage" _label="Create _vFolder from Message">
             <menuitem name="ToolsVFolderSubject" verb="" _label="vFolder on _Subject..."/>
             <menuitem name="ToolsVFolderSender" verb="" _label="vFolder on Se_nder..."/>
             <menuitem name="ToolsVFolderRecipient" verb="" _label="vFolder on _Recipients..."/>
-- 
cgit