[evolution] Bug #261062 - Do not translate untranslatable texts

[Milan Crha <mcrha src gnome org>]

commit 816614eb40ad857b550fe25d3ac84bdeefda7c18
Author: Milan Crha <mcrha redhat com>
Date:   Thu Apr 1 18:37:05 2010 +0200

    Bug #261062 - Do not translate untranslatable texts

 addressbook/addressbook.error.xml |   12 ++++--------
 calendar/calendar.error.xml       |    2 +-
 mail/mail.error.xml               |    6 +++---
 po/POTFILES.in                    |    1 -
 4 files changed, 8 insertions(+), 13 deletions(-)
---
diff --git a/addressbook/addressbook.error.xml b/addressbook/addressbook.error.xml
index 8a8bb68..a93ea85 100644
--- a/addressbook/addressbook.error.xml
+++ b/addressbook/addressbook.error.xml
@@ -44,22 +44,18 @@
  </error>
 
  <error id="generic-error" type="error">
- <!--For Translators: '{0}' is the type of error (eg: "invalid contact", "error adding contact", "error modifying contact", "error removing contact") -->
-  <_primary>{0}</_primary>
-  <!-- For Translators: {1} is the error status string (eg: "E_BOOK_ERROR_NO_SELF_CONTACT") -->
-  <_secondary>{1}</_secondary>
+  <primary>{0}</primary>
+  <secondary>{1}</secondary>
  </error>
 
  <error id="load-error" type="error">
   <_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>
+  <secondary>{0}</secondary>
  </error>
 
  <error id="search-error" type="error">
   <_primary>Unable to perform search.</_primary>
-  <!-- For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this address book was unable to parse this query." -->
-  <_secondary>{0}</_secondary>
+  <secondary>{0}</secondary>
  </error>
 
  <error id="prompt-save" type="question" default="GTK_RESPONSE_YES">
diff --git a/calendar/calendar.error.xml b/calendar/calendar.error.xml
index b6afd2e..cab0525 100644
--- a/calendar/calendar.error.xml
+++ b/calendar/calendar.error.xml
@@ -207,7 +207,7 @@
 
  <error id="editor-error" type="error">
   <_primary>Editor could not be loaded.</_primary>
-  <_secondary>{0}.</_secondary>
+  <secondary>{0}.</secondary>
  </error>
 
  <error id="prompt-delete-calendar" type="question" modal="true" default="GTK_RESPONSE_CANCEL">
diff --git a/mail/mail.error.xml b/mail/mail.error.xml
index ef1b5da..a889dfc 100644
--- a/mail/mail.error.xml
+++ b/mail/mail.error.xml
@@ -424,17 +424,17 @@ You can choose to ignore this folder, overwrite or append its contents, or quit.
 
   <error id="junk-check-error" type="error">
     <_primary>Check Junk Failed</_primary>
-    <_secondary xml:space="preserve">{0}</_secondary>
+    <secondary xml:space="preserve">{0}</secondary>
   </error>
 
   <error id="junk-report-error" type="error">
     <_primary>Report Junk Failed</_primary>
-    <_secondary xml:space="preserve">{0}</_secondary>
+    <secondary xml:space="preserve">{0}</secondary>
   </error>
 
   <error id="junk-not-report-error" type="error">
     <_primary>Report Not Junk Failed</_primary>
-    <_secondary xml:space="preserve">{0}</_secondary>
+    <secondary xml:space="preserve">{0}</secondary>
   </error>
 </error-list>
 
diff --git a/po/POTFILES.in b/po/POTFILES.in
index d165c72..f538e62 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -407,7 +407,6 @@ plugins/vcard-inline/vcard-inline.c
 plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml
 plugins/webdav-account-setup/webdav-contacts-source.c
 shell/apps_evolution_shell.schemas.in
-shell/e-config-upgrade.c
 shell/e-shell-backend.c
 shell/e-shell-content.c
 shell/e-shell-migrate.c