fixed potfile merge conflicts

1 files changed, 55 insertions, 42 deletions

diff --git a/po/am.po b/po/am.po
index 8df55143d..dda4f54c3 100644
--- a/po/am.po
+++ b/po/am.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.0\n"
-"POT-Creation-Date: 2004-01-26 12:42-0500\n"
+"POT-Creation-Date: 2004-01-29 16:26-0500\n"
 "PO-Revision-Date: 2003-02-07 17:46+EDT\n"
 "Last-Translator: Ge'ez Frontier Foundation <locales@geez.org>\n"
 "Language-Team: Amharic <locales@geez.org>\n"
@@ -68,7 +68,8 @@ msgstr ""
 #: addressbook/libebook/e-book.c:629 addressbook/libebook/e-book.c:713
 #: addressbook/libebook/e-book.c:816 addressbook/libebook/e-book.c:870
 #: addressbook/libebook/e-book.c:969 addressbook/libebook/e-book.c:1103
-#: addressbook/libebook/e-book.c:1203 addressbook/libebook/e-book.c:1441
+#: addressbook/libebook/e-book.c:1203 addressbook/libebook/e-book.c:1443
+#: addressbook/libebook/e-book.c:2020
 #, c-format
 msgid "\"%s\" on book before \"%s\""
 msgstr ""
@@ -78,7 +79,7 @@ msgstr ""
 #: addressbook/libebook/e-book.c:637 addressbook/libebook/e-book.c:721
 #: addressbook/libebook/e-book.c:824 addressbook/libebook/e-book.c:878
 #: addressbook/libebook/e-book.c:977 addressbook/libebook/e-book.c:1111
-#: addressbook/libebook/e-book.c:1211 addressbook/libebook/e-book.c:1449
+#: addressbook/libebook/e-book.c:1211 addressbook/libebook/e-book.c:1451
 msgid "book busy"
 msgstr ""
 
@@ -87,36 +88,47 @@ msgstr ""
 #: addressbook/libebook/e-book.c:663 addressbook/libebook/e-book.c:744
 #: addressbook/libebook/e-book.c:910 addressbook/libebook/e-book.c:1021
 #: addressbook/libebook/e-book.c:1139 addressbook/libebook/e-book.c:1235
-#: addressbook/libebook/e-book.c:1367 addressbook/libebook/e-book.c:1471
+#: addressbook/libebook/e-book.c:1369 addressbook/libebook/e-book.c:1473
+#: addressbook/libebook/e-book.c:2029
 #, c-format
 msgid "CORBA exception making \"%s\" call"
 msgstr ""
 
-#: addressbook/libebook/e-book.c:1348
+#: addressbook/libebook/e-book.c:1350
 msgid "e_book_cancel: there is no current operation"
 msgstr ""
 
-#: addressbook/libebook/e-book.c:1383
+#: addressbook/libebook/e-book.c:1385
 msgid "e_book_cancel: couldn't cancel"
 msgstr ""
 
-#: addressbook/libebook/e-book.c:1731
+#: addressbook/libebook/e-book.c:1739
 msgid "e_book_load_uri: Invalid source."
 msgstr ""
 
-#: addressbook/libebook/e-book.c:1739 addressbook/libebook/e-book.c:1843
+#: addressbook/libebook/e-book.c:1747 addressbook/libebook/e-book.c:1860
 #, c-format
 msgid "e_book_load_uri: no factories available for uri `%s'"
 msgstr ""
 
-#: addressbook/libebook/e-book.c:1753
+#: addressbook/libebook/e-book.c:1761
 msgid "e_book_load_uri: Could not create EBookListener"
 msgstr ""
 
-#: addressbook/libebook/e-book.c:2082
+#: addressbook/libebook/e-book.c:1854
+msgid "e_book_load_uri: cancelled"
+msgstr ""
+
+#: addressbook/libebook/e-book.c:2115
 msgid "e_book_get_self: there was no self contact uid stored in gconf"
 msgstr ""
 
+#: addressbook/libebook/e-book.c:2292
+#, c-format
+msgid ""
+"e_book_set_default_source: there was no source for uid `%s' stored in gconf."
+msgstr ""
+
 #: addressbook/libebook/e-contact.c:97
 msgid "Unique ID"
 msgstr ""
@@ -488,54 +500,55 @@ msgstr "ቶጐ"
 msgid "X.509 Certificate"
 msgstr ""
 
-#: addressbook/libebook/e-contact.c:211
+#. Contact categories
+#: addressbook/libebook/e-contact.c:210
 msgid "Category List"
 msgstr ""
 
-#: addressbook/libebook/e-contact.c:212 addressbook/libebook/e-contact.c:214
+#: addressbook/libebook/e-contact.c:211
 msgid "Categories"
 msgstr "ምድቦች"
 
 #. Collaboration fields
-#: addressbook/libebook/e-contact.c:218
+#: addressbook/libebook/e-contact.c:214
 msgid "Calendar URI"
 msgstr "የቀን መቁጠሪያ URI"
 
-#: addressbook/libebook/e-contact.c:219
+#: addressbook/libebook/e-contact.c:215
 msgid "Free/Busy URL"
 msgstr ""
 
-#: addressbook/libebook/e-contact.c:220
+#: addressbook/libebook/e-contact.c:216
 #, fuzzy
 msgid "ICS Calendar"
 msgstr "ቀን መቁጠሪያ"
 
 #. Misc fields
-#: addressbook/libebook/e-contact.c:223
+#: addressbook/libebook/e-contact.c:219
 msgid "Spouse's Name"
 msgstr ""
 
-#: addressbook/libebook/e-contact.c:224
+#: addressbook/libebook/e-contact.c:220
 msgid "Note"
 msgstr "ማስታወሻ"
 
-#: addressbook/libebook/e-contact.c:226
+#: addressbook/libebook/e-contact.c:222
 msgid "Birth Date"
 msgstr ""
 
-#: addressbook/libebook/e-contact.c:227
+#: addressbook/libebook/e-contact.c:223
 msgid "Anniversary"
 msgstr ""
 
-#: addressbook/libebook/e-contact.c:229
+#: addressbook/libebook/e-contact.c:225
 msgid "List"
 msgstr "ዝርዝር"
 
-#: addressbook/libebook/e-contact.c:230
+#: addressbook/libebook/e-contact.c:226
 msgid "List Show Addresses"
 msgstr ""
 
-#: addressbook/libebook/e-contact.c:1147
+#: addressbook/libebook/e-contact.c:1174
 #, fuzzy
 msgid "Unnamed List"
 msgstr "ስልክ ዝርዝር (_P)"
@@ -715,82 +728,82 @@ msgid "Undefined"
 msgstr ""
 
 #. actually ask the client for authentication
-#: calendar/libecal/e-cal.c:1449
+#: calendar/libecal/e-cal.c:1475
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr ""
 
-#: calendar/libecal/e-cal.c:3868
+#: calendar/libecal/e-cal.c:3894
 msgid "Invalid argument"
 msgstr ""
 
-#: calendar/libecal/e-cal.c:3870
+#: calendar/libecal/e-cal.c:3896
 msgid "Backend is busy"
 msgstr ""
 
-#: calendar/libecal/e-cal.c:3872
+#: calendar/libecal/e-cal.c:3898
 msgid "Repository is offline"
 msgstr ""
 
-#: calendar/libecal/e-cal.c:3874
+#: calendar/libecal/e-cal.c:3900
 msgid "No such calendar"
 msgstr ""
 
-#: calendar/libecal/e-cal.c:3876 calendar/libecal/e-cal.c:3886
+#: calendar/libecal/e-cal.c:3902
 #, fuzzy
 msgid "Object not found"
 msgstr "አልተገኘም"
 
-#: calendar/libecal/e-cal.c:3878
+#: calendar/libecal/e-cal.c:3904
 #, fuzzy
 msgid "Invalid object"
 msgstr "የማይሰራ"
 
-#: calendar/libecal/e-cal.c:3880
+#: calendar/libecal/e-cal.c:3906
 msgid "URI not loaded"
 msgstr ""
 
-#: calendar/libecal/e-cal.c:3882
+#: calendar/libecal/e-cal.c:3908
 msgid "URI already loaded"
 msgstr ""
 
-#: calendar/libecal/e-cal.c:3884
+#: calendar/libecal/e-cal.c:3910
 msgid "Permission denied"
 msgstr ""
 
-#: calendar/libecal/e-cal.c:3888
+#: calendar/libecal/e-cal.c:3912
 msgid "Object ID already exists"
 msgstr ""
 
-#: calendar/libecal/e-cal.c:3890
+#: calendar/libecal/e-cal.c:3914
 msgid "Protocol not supported"
 msgstr ""
 
-#: calendar/libecal/e-cal.c:3892
+#: calendar/libecal/e-cal.c:3916
 msgid "Operation has been cancelled"
 msgstr ""
 
-#: calendar/libecal/e-cal.c:3894
+#: calendar/libecal/e-cal.c:3918
 msgid "Could not cancel operation"
 msgstr ""
 
-#: calendar/libecal/e-cal.c:3896
+#: calendar/libecal/e-cal.c:3920
 msgid "Authentication failed"
 msgstr ""
 
-#: calendar/libecal/e-cal.c:3898
+#: calendar/libecal/e-cal.c:3922
 msgid "Authentication required"
 msgstr ""
 
-#: calendar/libecal/e-cal.c:3900
-msgid "A CORBA esception has occurred"
+#: calendar/libecal/e-cal.c:3924
+msgid "A CORBA exception has occurred"
 msgstr ""
 
-#: calendar/libecal/e-cal.c:3902
+#: calendar/libecal/e-cal.c:3926
 msgid "Unknown error"
 msgstr "ያልታወቀ ስህተት"
 
-#: calendar/libecal/e-cal.c:3904
+#: calendar/libecal/e-cal.c:3928
 msgid "No error"
 msgstr "ስህተት የለም"