Bug 604822 - Drop more alert titles

Drop all alert titles to be found in *.error.xml. HIG suggests alerts
do not have a title.

8 files changed, 3 insertions, 17 deletions

diff --git a/addressbook/addressbook.error.xml b/addressbook/addressbook.error.xml
index 76aea53e49..8a8bb68ddc 100644
--- a/addressbook/addressbook.error.xml
+++ b/addressbook/addressbook.error.xml
@@ -51,8 +51,7 @@
  </error>
 
  <error id="load-error" type="error">
-  <_title>Unable to open address book</_title>
-  <_primary>Error loading address book.</_primary>
+  <_primary>Unable to open address book</_primary>
   <!-- For Translators: {0} is string describing the error why the address book could not be loaded -->
   <_secondary>{0}</_secondary>
  </error>
@@ -103,7 +102,6 @@
  </error>
  
  <error id="server-version" type="warning">
-  <_title>Server Version</_title> 
   <_primary>Some features may not work properly with your current server</_primary> 
   <_secondary>You are connecting to an unsupported GroupWise server and may encounter problems using Evolution. For best results the server should be upgraded to a supported version</_secondary>
  </error>
diff --git a/calendar/calendar.error.xml b/calendar/calendar.error.xml
index 346070bc83..b6afd2ea40 100644
--- a/calendar/calendar.error.xml
+++ b/calendar/calendar.error.xml
@@ -100,7 +100,6 @@
  </error>
 
  <error id="prompt-save-meeting" type="warning" default="GTK_RESPONSE_YES">
-  <_title>Save Meeting</_title>
   <_primary>Would you like to save your changes to this meeting?</_primary>
   <_secondary>You have changed this meeting, but not yet saved it.</_secondary>
   <button _label="_Discard Changes" response="GTK_RESPONSE_NO"/>
@@ -109,7 +108,6 @@
  </error>
 
  <error id="prompt-save-appointment" type="warning" default="GTK_RESPONSE_YES">
-  <_title>Save Appointment</_title>
   <_primary>Would you like to save your changes to this appointment?</_primary>
   <_secondary>You have changed this appointment, but not yet saved it.</_secondary>
   <button _label="_Discard Changes" response="GTK_RESPONSE_NO"/>
@@ -118,7 +116,6 @@
  </error>
 
  <error id="prompt-save-task" type="warning" default="GTK_RESPONSE_YES">
- <_title>Save Task</_title>
  <_primary>Would you like to save your changes to this task?</_primary>
  <_secondary>You have changed this task, but not yet saved it.</_secondary>
  <button _label="_Discard Changes" response="GTK_RESPONSE_NO"/>
@@ -127,7 +124,6 @@
  </error>
 
  <error id="prompt-save-memo" type="warning" default="GTK_RESPONSE_YES">
- <_title>Save Memo</_title>
  <_primary>Would you like to save your changes to this memo?</_primary>
  <_secondary>You have made changes to this memo, but not yet saved them.</_secondary>
  <button _label="_Discard Changes" response="GTK_RESPONSE_NO"/>
@@ -288,7 +284,6 @@
  </error>
 
  <error id="server-version" type="warning">
- <_title>Server Version</_title> 
  <_primary>Some features may not work properly with your current server.</_primary>
  <_secondary>You are connecting to an unsupported GroupWise server and may encounter problems using Evolution. For best results, the server should be upgraded to a supported version.</_secondary>
  </error>
diff --git a/composer/mail-composer.error.xml b/composer/mail-composer.error.xml
index d622c80520..6865e7d5dc 100644
--- a/composer/mail-composer.error.xml
+++ b/composer/mail-composer.error.xml
@@ -22,7 +22,6 @@
  </error>
 
  <error id="recover-autosave" type="question" default="GTK_RESPONSE_YES">
-  <_title>Unfinished messages found</_title>
   <_primary>Do you want to recover unfinished messages?</_primary>
   <_secondary>Evolution quit unexpectedly while you were composing a new message. Recovering the message will allow you to continue where you left off.</_secondary>
   <button _label="_Do not Recover" response="GTK_RESPONSE_CANCEL"/>
@@ -42,7 +41,6 @@
  </error>
 
  <error id="exit-unsaved" modal="true" type="warning" default="GTK_RESPONSE_YES">
-  <_title>Warning: Modified Message</_title>
   <_primary>Are you sure you want to discard the message, titled '{0}', you are composing?</_primary>
   <_secondary>Closing this composer window will discard the message permanently, unless you choose to save the message in your Drafts folder. This will allow you to continue the message at a later date.</_secondary>
   <button _label="_Discard Changes" response="GTK_RESPONSE_NO"/>
diff --git a/e-util/e-system.error.xml b/e-util/e-system.error.xml
index 1ee6cbd9c2..9e91c7bc26 100644
--- a/e-util/e-system.error.xml
+++ b/e-util/e-system.error.xml
@@ -2,7 +2,6 @@
 <error-list domain="system">
 
  <error id="ask-save-file-exists-overwrite" type="error" default="GTK_RESPONSE_CANCEL">
-  <_title>Overwrite file?</_title>
   <_primary>File exists "{0}".</_primary>
   <_secondary>Do you wish to overwrite it?</_secondary>
   <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
diff --git a/plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml b/plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml
index c5e83387d4..4d77f4475b 100644
--- a/plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml
+++ b/plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml
@@ -2,7 +2,6 @@
 
 <error-list domain="org.gnome.evolution.plugins.attachment_reminder" default="GTK_RESPONSE_YES">
 	<error id="attachment-reminder" type="info">
-		<_title>Attachment Reminder</_title>
 		<_primary>Message has no attachments</_primary>
 		<_secondary>Evolution has found some keywords that suggest that this message should contain an attachment, but cannot find one.</_secondary>
 		<button response="GTK_RESPONSE_OK" _label="_Add attachment..."/>
diff --git a/plugins/backup-restore/org-gnome-backup-restore.error.xml b/plugins/backup-restore/org-gnome-backup-restore.error.xml
index 6b3bb8ad52..b2e961a87b 100644
--- a/plugins/backup-restore/org-gnome-backup-restore.error.xml
+++ b/plugins/backup-restore/org-gnome-backup-restore.error.xml
@@ -2,7 +2,7 @@
 <error-list domain="org.gnome.backup-restore">
 
  <error id="invalid-backup" type="warning">
-  <_title>Invalid Evolution backup file</_title>
+  <_primary>Invalid Evolution backup file</_primary>
   <_secondary>Please select a valid backup file to restore.</_secondary>
  </error>
    <error id="backup-confirm" type="warning" default="GTK_RESPONSE_NO">
@@ -18,7 +18,7 @@
     <button stock="gtk-yes" response="GTK_RESPONSE_YES"/>
   </error>  
    <error id="insufficient-permissions" type="error">
-   	<_title>Insufficient Permissions</_title>
+   	<_primary>Insufficient Permissions</_primary>
 	<_secondary>The selected folder is not writable.</_secondary>
    </error>
 </error-list>
diff --git a/plugins/default-mailer/org-gnome-default-mailer.error.xml b/plugins/default-mailer/org-gnome-default-mailer.error.xml
index fe9cf5a409..03e2e8262d 100644
--- a/plugins/default-mailer/org-gnome-default-mailer.error.xml
+++ b/plugins/default-mailer/org-gnome-default-mailer.error.xml
@@ -2,7 +2,6 @@
 <error-list domain="org.gnome.default.mailer">
 
  <error id="check-default" type="question" default="GTK_RESPONSE_YES">
-  <_title>Evolution</_title>
   <_secondary>Do you want to make Evolution your default e-mail client?</_secondary>
   <button stock="gtk-yes" response="GTK_RESPONSE_YES"/>
   <button stock="gtk-no"  response="GTK_RESPONSE_NO"/>
diff --git a/shell/shell.error.xml b/shell/shell.error.xml
index 603d5ed955..3f3f0e2f86 100644
--- a/shell/shell.error.xml
+++ b/shell/shell.error.xml
@@ -26,7 +26,6 @@ If you choose to continue, you may not have access to some of your old data.
  </error>
 
  <error id="upgrade-remove-1-4" type="question" default="GTK_RESPONSE_CANCEL">
-  <_title>Delete old data from version {0}?</_title>
   <_primary>Delete old data from version {0}?</_primary>
   <_secondary xml:space="preserve">The previous version of Evolution stored its data in a different location.
 
@@ -38,7 +37,6 @@ If you choose to remove this data, the entire contents of the &quot;evolution&qu
  </error>
 
  <error id="upgrade-remove-1-4-confirm" type="warning" default="GTK_RESPONSE_CANCEL">
-  <_title>Really delete old data?</_title>
   <_primary>Really delete old data?</_primary>
   <_secondary xml:space="preserve">The entire contents of the &quot;evolution&quot; directory are about to be permanently removed.