evolution r34982 - in trunk: addressbook calendar calendar/gui calendar/gui/dialogs mail

[msuman svn gnome org]

Author: msuman
Date: Sun Feb 10 17:01:10 2008
New Revision: 34982
URL: http://svn.gnome.org/viewvc/evolution?rev=34982&view=rev

Log:
String changes for improved error-messages and a schema-description. 

M    addressbook/ChangeLog
M    addressbook/addressbook.error.xml
M    mail/ChangeLog
M    mail/mail-config.glade
M    mail/evolution-mail.schemas.in
M    calendar/calendar.error.xml
M    calendar/gui/dialogs/comp-editor.c
M    calendar/gui/e-calendar-view.c
M    calendar/ChangeLog


Modified:
   trunk/addressbook/ChangeLog
   trunk/addressbook/addressbook.error.xml
   trunk/calendar/ChangeLog
   trunk/calendar/calendar.error.xml
   trunk/calendar/gui/dialogs/comp-editor.c
   trunk/calendar/gui/e-calendar-view.c
   trunk/mail/ChangeLog
   trunk/mail/evolution-mail.schemas.in
   trunk/mail/mail-config.glade

Modified: trunk/addressbook/addressbook.error.xml
==============================================================================
--- trunk/addressbook/addressbook.error.xml	(original)
+++ trunk/addressbook/addressbook.error.xml	Sun Feb 10 17:01:10 2008
@@ -120,7 +120,8 @@
 
  <error id="error-read-only" type="error" default="GTK_RESPONSE_YES">
   <_primary>Cannot add new contact</_primary>
-  <_secondary>The address book {0} is read only, thus you cannot add contacts there. Select other address book, please.</_secondary>
+  <!-- For Translators: {0} is the name of the address book source -->
+  <_secondary>'{0}' is a read-only address book source. Switch to Contacts View and highlight an address book that can accept contacts.</_secondary>
   <button stock ="gtk-ok" response="GTK_RESPONSE_YES"/>
  </error>
 

Modified: trunk/calendar/calendar.error.xml
==============================================================================
--- trunk/calendar/calendar.error.xml	(original)
+++ trunk/calendar/calendar.error.xml	Sun Feb 10 17:01:10 2008
@@ -230,7 +230,8 @@
  
  <error id="prompt-read-only-cal" type="error" default="GTK_RESPONSE_YES">
   <_primary>Cannot create a new event</_primary>
-  <_secondary>You have a read-only calendar source selected. Change to Calendar View and highlight a calendar that can accept appointments.</_secondary>
+  <!-- For Translators: {0} is the name of the calendar source -->
+  <_secondary>'{0}' is a read-only calendar source. Switch to Calendar View and highlight a calendar that can accept appointments.</_secondary>
   <button stock ="gtk-ok" response="GTK_RESPONSE_YES"/>
  </error>
 

Modified: trunk/calendar/gui/dialogs/comp-editor.c
==============================================================================
--- trunk/calendar/gui/dialogs/comp-editor.c	(original)
+++ trunk/calendar/gui/dialogs/comp-editor.c	Sun Feb 10 17:01:10 2008
@@ -921,7 +921,7 @@
 	switch (save_component_dialog (GTK_WINDOW(editor), priv->comp)) {
 	case GTK_RESPONSE_YES: /* Save */
 		if (!e_cal_is_read_only (priv->client, &read_only, NULL) || read_only) {
-			e_error_run ((GtkWindow *) gtk_widget_get_toplevel (GTK_WIDGET (editor)), "calendar:prompt-read-only-cal", NULL);
+			e_error_run ((GtkWindow *) gtk_widget_get_toplevel (GTK_WIDGET (editor)), "calendar:prompt-read-only-cal", e_source_peek_name (e_cal_get_source (priv->client)), NULL);
 			/* don't discard changes when selected readonly calendar */
 			return FALSE;
 		}
@@ -1296,7 +1296,7 @@
 	}
 
 	if (!e_cal_is_read_only (priv->client, &read_only, NULL) || read_only) {
-		e_error_run ((GtkWindow *) gtk_widget_get_toplevel (GTK_WIDGET (editor)), "calendar:prompt-read-only-cal", NULL);
+		e_error_run ((GtkWindow *) gtk_widget_get_toplevel (GTK_WIDGET (editor)), "calendar:prompt-read-only-cal", e_source_peek_name (e_cal_get_source (priv->client)), NULL);
 		return;
 	}
 

Modified: trunk/calendar/gui/e-calendar-view.c
==============================================================================
--- trunk/calendar/gui/e-calendar-view.c	(original)
+++ trunk/calendar/gui/e-calendar-view.c	Sun Feb 10 17:01:10 2008
@@ -1822,7 +1822,7 @@
 	if (e_cal_is_read_only (default_client, &readonly, NULL) && readonly) {
 		GtkWidget *widget;
 
-		widget = e_error_new (NULL, "calendar:prompt-read-only-cal", NULL);
+		widget = e_error_new (NULL, "calendar:prompt-read-only-cal", e_source_peek_name (e_cal_get_source (default_client)), NULL);
 
 		g_signal_connect ((GtkDialog *)widget, "response", G_CALLBACK (gtk_widget_destroy),
 				  widget);

Modified: trunk/mail/evolution-mail.schemas.in
==============================================================================
--- trunk/mail/evolution-mail.schemas.in	(original)
+++ trunk/mail/evolution-mail.schemas.in	Sun Feb 10 17:01:10 2008
@@ -378,9 +378,9 @@
       <type>bool</type>
       <default>false</default>
       <locale name="C">
-         <short>Show the sender email in the messages column in the message list</short>
+         <short>Sender email-address column in the message list</short>
          <long>
-          Show the email of the sender in the messages composite column in the message list.
+          Show the email-address of the sender in a separate column in the message list.
          </long>
       </locale>
     </schema>
@@ -956,9 +956,9 @@
       <type>int</type>
       <default>60</default>
       <locale name="C">
-         <short>Amount of time in seconds the error should be showed on the status bar.</short>
+         <short>Amount of time in seconds the error should be shown on the status bar.</short>
          <long>
-	Amount of time in seconds the error should be showed on the status bar.
+	Amount of time in seconds the error should be shown on the status bar.
          </long>
       </locale>
     </schema>

Modified: trunk/mail/mail-config.glade
==============================================================================
--- trunk/mail/mail-config.glade	(original)
+++ trunk/mail/mail-config.glade	Sun Feb 10 17:01:10 2008
@@ -5297,7 +5297,7 @@
 			      <child>
 				<widget class="GtkLabel" id="lblEnableSFRestart">
 				  <property name="visible">True</property>
-				  <property name="label" translatable="yes">(Note: Requires restart)</property>
+				  <property name="label" translatable="yes">(Note: Requires restart of the application)</property>
 				  <property name="use_underline">False</property>
 				  <property name="use_markup">False</property>
 				  <property name="justify">GTK_JUSTIFY_CENTER</property>