aboutsummaryrefslogtreecommitdiffstats
path: root/po
diff options
context:
space:
mode:
authorDaniel Yacob <yacob@src.gnome.org>2003-01-26 23:51:21 +0800
committerDaniel Yacob <yacob@src.gnome.org>2003-01-26 23:51:21 +0800
commit1e5a8adbc156245949b673604b8da6e9cd892b83 (patch)
tree559eb4a4723828c3846d0708b428bb1dfa56364c /po
parent981814bd2c53f61d0d617aeeb4ff7e3cf03dc91e (diff)
downloadgsoc2013-evolution-1e5a8adbc156245949b673604b8da6e9cd892b83.tar.gz
gsoc2013-evolution-1e5a8adbc156245949b673604b8da6e9cd892b83.tar.zst
gsoc2013-evolution-1e5a8adbc156245949b673604b8da6e9cd892b83.zip
Updating Amharic translation.
svn path=/trunk/; revision=19636
Diffstat (limited to 'po')
-rw-r--r--po/ChangeLog4
-rw-r--r--po/am.po2121
2 files changed, 1080 insertions, 1045 deletions
diff --git a/po/ChangeLog b/po/ChangeLog
index 68b9df41cc..f18dbe6540 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2003-01-26 Daniel Yacob <locales@geez.org>
+
+ * am.po: Updated Amharic translation.
+
2003-01-24 Marco Ciampa <ciampix@libero.it>
* it.po: Updated Italian translation.
diff --git a/po/am.po b/po/am.po
index 1185b2b364..b779a4e40e 100644
--- a/po/am.po
+++ b/po/am.po
@@ -7,8 +7,8 @@
msgid ""
msgstr ""
"Project-Id-Version: evolution 1.0\n"
-"POT-Creation-Date: 2003-01-23 10:48+0100\n"
-"PO-Revision-Date: 2003-01-24 09:30+EDT\n"
+"POT-Creation-Date: 2003-01-06 06:07+0100\n"
+"PO-Revision-Date: 2003-01-14 11:02+EDT\n"
"Last-Translator: Ge'ez Frontier Foundation <locales@geez.org>\n"
"Language-Team: Amharic <locales@geez.org>\n"
"MIME-Version: 1.0\n"
@@ -22,7 +22,7 @@ msgid "File As"
msgstr ""
#: addressbook/backend/ebook/e-card.c:1304
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:320
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:321
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
msgid "Full Name"
msgstr "ሙሉ ስም"
@@ -100,7 +100,7 @@ msgstr "መቆጣጠሪያ"
#: addressbook/backend/ebook/e-card.c:1400
#: addressbook/backend/ebook/e-card-simple.c:64
#: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/contact-editor/e-contact-editor.c:1727
+#: addressbook/gui/contact-editor/e-contact-editor.c:1835
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
msgid "Assistant"
msgstr ""
@@ -122,7 +122,7 @@ msgstr ""
msgid "Anniversary"
msgstr ""
-#: addressbook/backend/ebook/e-card.c:1427 mail/mail-format.c:933
+#: addressbook/backend/ebook/e-card.c:1427 mail/mail-format.c:930
msgid "Mailer"
msgstr ""
@@ -197,7 +197,7 @@ msgid "VCard for %s"
msgstr ""
#: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1742
+#: addressbook/gui/contact-editor/e-contact-editor.c:1850
msgid "Primary"
msgstr ""
@@ -207,9 +207,9 @@ msgstr ""
#: addressbook/backend/ebook/e-card-simple.c:65
#: addressbook/backend/ebook/e-card-simple.c:70
-#: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1728
-#: addressbook/gui/contact-editor/e-contact-editor.c:1799
+#: addressbook/gui/contact-editor/contact-editor.glade.h:5
+#: addressbook/gui/contact-editor/e-contact-editor.c:1836
+#: addressbook/gui/contact-editor/e-contact-editor.c:1907
msgid "Business"
msgstr ""
@@ -219,12 +219,12 @@ msgid "Bus"
msgstr ""
#: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1731
+#: addressbook/gui/contact-editor/e-contact-editor.c:1839
msgid "Callback"
msgstr ""
#: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:1733
+#: addressbook/gui/contact-editor/e-contact-editor.c:1841
msgid "Company"
msgstr ""
@@ -235,8 +235,8 @@ msgstr ""
#: addressbook/backend/ebook/e-card-simple.c:68
#: addressbook/backend/ebook/e-card-simple.c:71
#: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1734
-#: addressbook/gui/contact-editor/e-contact-editor.c:1800
+#: addressbook/gui/contact-editor/e-contact-editor.c:1842
+#: addressbook/gui/contact-editor/e-contact-editor.c:1908
msgid "Home"
msgstr "መጀመሪያ"
@@ -246,18 +246,18 @@ msgstr ""
#: addressbook/backend/ebook/e-card-simple.c:72
#: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1738
+#: addressbook/gui/contact-editor/e-contact-editor.c:1846
msgid "Mobile"
msgstr "ሞቢል"
#: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1732
+#: addressbook/gui/contact-editor/e-contact-editor.c:1840
msgid "Car"
msgstr ""
#: addressbook/backend/ebook/e-card-simple.c:74
-#: addressbook/gui/contact-editor/contact-editor.glade.h:7
-#: addressbook/gui/contact-editor/e-contact-editor.c:1730
+#: addressbook/gui/contact-editor/contact-editor.glade.h:6
+#: addressbook/gui/contact-editor/e-contact-editor.c:1838
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
msgid "Business Fax"
msgstr ""
@@ -267,13 +267,13 @@ msgid "Bus Fax"
msgstr ""
#: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1736
+#: addressbook/gui/contact-editor/e-contact-editor.c:1844
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
msgid "Home Fax"
msgstr "የቤት ፋክስ"
#: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1729
+#: addressbook/gui/contact-editor/e-contact-editor.c:1837
msgid "Business 2"
msgstr ""
@@ -282,43 +282,43 @@ msgid "Bus 2"
msgstr ""
#: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1735
+#: addressbook/gui/contact-editor/e-contact-editor.c:1843
msgid "Home 2"
msgstr "መጀመሪያ"
#: addressbook/backend/ebook/e-card-simple.c:78
-#: addressbook/gui/contact-editor/e-contact-editor.c:1737
+#: addressbook/gui/contact-editor/e-contact-editor.c:1845
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
msgid "ISDN"
msgstr ""
#: addressbook/backend/ebook/e-card-simple.c:79
#: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/contact-editor/e-contact-editor.c:1739
-#: addressbook/gui/contact-editor/e-contact-editor.c:1801
+#: addressbook/gui/contact-editor/e-contact-editor.c:1847
+#: addressbook/gui/contact-editor/e-contact-editor.c:1909
msgid "Other"
msgstr "ሌላ"
#: addressbook/backend/ebook/e-card-simple.c:80
-#: addressbook/gui/contact-editor/e-contact-editor.c:1740
+#: addressbook/gui/contact-editor/e-contact-editor.c:1848
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
msgid "Other Fax"
msgstr ""
#: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/contact-editor/e-contact-editor.c:1849
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
msgid "Pager"
msgstr ""
#: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1743
+#: addressbook/gui/contact-editor/e-contact-editor.c:1851
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
msgid "Radio"
msgstr "ሬዲዮ"
#: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/contact-editor/e-contact-editor.c:1744
+#: addressbook/gui/contact-editor/e-contact-editor.c:1852
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
msgid "Telex"
msgstr ""
@@ -330,14 +330,14 @@ msgstr "tty"
#: addressbook/backend/ebook/e-card-simple.c:86
#: addressbook/gui/component/e-address-popup.c:484
-#: addressbook/gui/contact-editor/e-contact-editor.c:1772
+#: addressbook/gui/contact-editor/e-contact-editor.c:1880
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
msgid "Email 2"
msgstr "ኢሜይል"
#: addressbook/backend/ebook/e-card-simple.c:87
#: addressbook/gui/component/e-address-popup.c:494
-#: addressbook/gui/contact-editor/e-contact-editor.c:1773
+#: addressbook/gui/contact-editor/e-contact-editor.c:1881
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
msgid "Email 3"
msgstr "ኢሜይል"
@@ -440,57 +440,51 @@ msgstr ""
msgid "Imports VCard files into Evolution."
msgstr ""
+#: addressbook/backend/ebook/load-gnomecard-addressbook.c:17
+#: addressbook/backend/ebook/load-pine-addressbook.c:17
#: addressbook/backend/ebook/test-client.c:31
#: addressbook/backend/ebook/test-client-list.c:15
#: addressbook/conduit/address-conduit.c:1860
#: calendar/conduits/calendar/calendar-conduit.c:1807
#: calendar/conduits/todo/todo-conduit.c:1385
-#: calendar/gui/alarm-notify/notify-main.c:170
+#: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:63
#: tools/evolution-addressbook-abuse.c:132
#: tools/evolution-addressbook-export.c:60
#: tools/evolution-addressbook-import.c:86
msgid "Could not initialize Bonobo"
msgstr "bonobo ማስጀመር አልቻልኩም!"
-#: addressbook/backend/pas/pas-backend-file.c:355
-#: addressbook/backend/pas/pas-backend-ldap.c:3027
+#: addressbook/backend/pas/pas-backend-file.c:361
+#: addressbook/backend/pas/pas-backend-ldap.c:3008
msgid "Searching..."
msgstr ""
-#: addressbook/backend/pas/pas-backend-file.c:357
+#: addressbook/backend/pas/pas-backend-file.c:363
msgid "Loading..."
msgstr "በመጫን ላይ..."
-#: addressbook/backend/pas/pas-backend-ldap.c:597
-msgid "Using Distinguished Name (DN)"
-msgstr ""
-
-#: addressbook/backend/pas/pas-backend-ldap.c:601
-msgid "Using Email Address"
-msgstr ""
-
-#: addressbook/backend/pas/pas-backend-ldap.c:736
+#: addressbook/backend/pas/pas-backend-ldap.c:717
msgid "Reconnecting to LDAP server..."
msgstr ""
-#: addressbook/backend/pas/pas-backend-ldap.c:1279
+#: addressbook/backend/pas/pas-backend-ldap.c:1260
msgid "Adding card to LDAP server..."
msgstr ""
-#: addressbook/backend/pas/pas-backend-ldap.c:1385
+#: addressbook/backend/pas/pas-backend-ldap.c:1366
msgid "Removing card from LDAP server..."
msgstr ""
-#: addressbook/backend/pas/pas-backend-ldap.c:1621
-#: addressbook/backend/pas/pas-backend-ldap.c:1624
+#: addressbook/backend/pas/pas-backend-ldap.c:1602
+#: addressbook/backend/pas/pas-backend-ldap.c:1605
msgid "Modifying card from LDAP server..."
msgstr ""
-#: addressbook/backend/pas/pas-backend-ldap.c:2938
+#: addressbook/backend/pas/pas-backend-ldap.c:2919
msgid "Receiving LDAP search results..."
msgstr ""
-#: addressbook/backend/pas/pas-backend-ldap.c:3047
+#: addressbook/backend/pas/pas-backend-ldap.c:3028
msgid "Error performing search"
msgstr ""
@@ -523,20 +517,20 @@ msgstr ""
msgid "Could not read pilot's Address application block"
msgstr ""
-#: addressbook/gui/component/addressbook.c:514
+#: addressbook/gui/component/addressbook.c:493
msgid ""
"We were unable to open this addressbook. Please check that the\n"
"path exists and that you have permission to access it."
msgstr ""
-#: addressbook/gui/component/addressbook.c:524
+#: addressbook/gui/component/addressbook.c:503
msgid ""
"We were unable to open this addressbook. This either\n"
"means you have entered an incorrect URI, or the LDAP server\n"
"is unreachable."
msgstr ""
-#: addressbook/gui/component/addressbook.c:529
+#: addressbook/gui/component/addressbook.c:508
msgid ""
"This version of Evolution does not have LDAP support\n"
"compiled in to it. If you want to use LDAP in Evolution\n"
@@ -544,56 +538,56 @@ msgid ""
"retrieving OpenLDAP from the link below.\n"
msgstr ""
-#: addressbook/gui/component/addressbook.c:539
+#: addressbook/gui/component/addressbook.c:518
msgid ""
"We were unable to open this addressbook. This either\n"
"means you have entered an incorrect URI, or the server\n"
"is unreachable."
msgstr ""
-#: addressbook/gui/component/addressbook.c:559
+#: addressbook/gui/component/addressbook.c:538
msgid "Unable to open addressbook"
msgstr ""
#. the user clicked cancel in the password dialog
-#: addressbook/gui/component/addressbook.c:619
+#: addressbook/gui/component/addressbook.c:596
msgid "Accessing LDAP Server anonymously"
msgstr ""
-#: addressbook/gui/component/addressbook.c:662
+#: addressbook/gui/component/addressbook.c:639
msgid "Failed to authenticate.\n"
msgstr ""
-#: addressbook/gui/component/addressbook.c:670
-#: addressbook/gui/component/addressbook.c:673
+#: addressbook/gui/component/addressbook.c:647
+#: addressbook/gui/component/addressbook.c:650
#, c-format
msgid "%sEnter password for %s (user %s)"
msgstr ""
-#: addressbook/gui/component/addressbook.c:821
+#: addressbook/gui/component/addressbook.c:796
msgid "Name begins with"
msgstr ""
-#: addressbook/gui/component/addressbook.c:822
+#: addressbook/gui/component/addressbook.c:797
msgid "Email begins with"
msgstr ""
-#: addressbook/gui/component/addressbook.c:823
+#: addressbook/gui/component/addressbook.c:798
#: calendar/gui/cal-search-bar.c:53
msgid "Category is"
msgstr ""
#. We attach subitems below
-#: addressbook/gui/component/addressbook.c:824
+#: addressbook/gui/component/addressbook.c:799
#: calendar/gui/cal-search-bar.c:49
msgid "Any field contains"
msgstr ""
-#: addressbook/gui/component/addressbook.c:825
+#: addressbook/gui/component/addressbook.c:800
msgid "Advanced..."
msgstr "ጠለቅ"
-#: addressbook/gui/component/addressbook.c:995
+#: addressbook/gui/component/addressbook.c:970
msgid ""
"More cards matched this query than either the server is \n"
"configured to return or Evolution is configured to display.\n"
@@ -601,7 +595,7 @@ msgid ""
"the directory server preferences for this addressbook."
msgstr ""
-#: addressbook/gui/component/addressbook.c:1001
+#: addressbook/gui/component/addressbook.c:976
msgid ""
"The time to execute this query exceeded the server limit or the limit\n"
"you have configured for this addressbook. Please make your search\n"
@@ -609,25 +603,25 @@ msgid ""
"preferences for this addressbook."
msgstr ""
-#: addressbook/gui/component/addressbook.c:1007
+#: addressbook/gui/component/addressbook.c:982
msgid "The backend for this addressbook was unable to parse this query."
msgstr ""
-#: addressbook/gui/component/addressbook.c:1010
+#: addressbook/gui/component/addressbook.c:985
msgid "The backend for this addressbook refused to perform this query."
msgstr ""
-#: addressbook/gui/component/addressbook.c:1014
+#: addressbook/gui/component/addressbook.c:989
msgid "This query did not complete successfully."
msgstr ""
#. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1089
+#: addressbook/gui/component/addressbook.c:1064
#: calendar/gui/cal-search-bar.c:352
msgid "Any Category"
msgstr ""
-#: addressbook/gui/component/addressbook.c:1169
+#: addressbook/gui/component/addressbook.c:1144
msgid "The URI that the Folder Browser will display"
msgstr ""
@@ -684,46 +678,46 @@ msgstr ""
msgid "Create a new contact list"
msgstr ""
-#: addressbook/gui/component/addressbook-config.c:206
+#: addressbook/gui/component/addressbook-config.c:205
msgid "Failed to connect to LDAP server"
msgstr ""
-#: addressbook/gui/component/addressbook-config.c:231
+#: addressbook/gui/component/addressbook-config.c:230
msgid "Failed to authenticate with LDAP server"
msgstr ""
-#: addressbook/gui/component/addressbook-config.c:259
+#: addressbook/gui/component/addressbook-config.c:258
msgid "Could not perform query on Root DSE"
msgstr ""
-#: addressbook/gui/component/addressbook-config.c:682
+#: addressbook/gui/component/addressbook-config.c:670
msgid "The server responded with no supported search bases"
msgstr ""
-#: addressbook/gui/component/addressbook-config.c:1191
+#: addressbook/gui/component/addressbook-config.c:1178
msgid "This server does not support LDAPv3 schema information"
msgstr ""
-#: addressbook/gui/component/addressbook-config.c:1213
+#: addressbook/gui/component/addressbook-config.c:1200
msgid "Error retrieving schema information"
msgstr ""
-#: addressbook/gui/component/addressbook-config.c:1221
+#: addressbook/gui/component/addressbook-config.c:1208
msgid "Server did not respond with valid schema information"
msgstr ""
-#: addressbook/gui/component/addressbook-config.c:1647
+#: addressbook/gui/component/addressbook-config.c:1656
+msgid "LDAP was not enabled in this build of Evolution"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.etspec.h:1
msgid "Account Name"
msgstr ""
-#: addressbook/gui/component/addressbook-config.c:1649
+#: addressbook/gui/component/addressbook-config.etspec.h:2
msgid "Server Name"
msgstr "የሰርቨር ስም"
-#: addressbook/gui/component/addressbook-config.c:1686
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr ""
-
#: addressbook/gui/component/addressbook-storage.c:169
msgid "Other Contacts"
msgstr ""
@@ -738,8 +732,8 @@ msgid "(none)"
msgstr "(ምንም)"
#: addressbook/gui/component/e-address-popup.c:474
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
-#: addressbook/gui/contact-editor/e-contact-editor.c:1771
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/e-contact-editor.c:1879
msgid "Primary Email"
msgstr ""
@@ -763,13 +757,13 @@ msgstr ""
#: addressbook/gui/component/e-address-popup.c:995
#: addressbook/gui/component/e-address-widget.c:391
-#: addressbook/gui/component/select-names/e-select-names-popup.c:302
+#: addressbook/gui/component/select-names/e-select-names-popup.c:301
msgid "Edit Contact Info"
msgstr ""
#: addressbook/gui/component/e-address-popup.c:1025
#: addressbook/gui/component/e-address-widget.c:427
-#: addressbook/gui/component/select-names/e-select-names-popup.c:481
+#: addressbook/gui/component/select-names/e-select-names-popup.c:480
msgid "Add to Contacts"
msgstr ""
@@ -836,77 +830,75 @@ msgid " S_how Supported Bases "
msgstr ""
#: addressbook/gui/component/ldap-config.glade.h:4
-#: addressbook/gui/component/select-names/select-names.glade.h:1
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
-#: addressbook/gui/contact-editor/fullname.glade.h:1
-#: mail/mail-config.glade.h:6
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
-msgid "*"
-msgstr "*"
-
-#: addressbook/gui/component/ldap-config.glade.h:5
msgid "1234"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:5
msgid "1:00"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:6
msgid "2:30"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:8
+#: addressbook/gui/component/ldap-config.glade.h:7
msgid "3268"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:8
msgid "380"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:9
msgid "389"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:10
msgid "5:00"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:11
msgid "636"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:13
+#: addressbook/gui/component/ldap-config.glade.h:12
msgid "666"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:14
+#: addressbook/gui/component/ldap-config.glade.h:13
msgid "<- _Remove"
msgstr "አስወግድ"
-#: addressbook/gui/component/ldap-config.glade.h:15
+#: addressbook/gui/component/ldap-config.glade.h:14
msgid "<< Fewer Options"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:15
msgid "Add (or Edit) Attribute Mappings"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:17
+#: addressbook/gui/component/ldap-config.glade.h:16
msgid "Addressbook Sources"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:60
+#: addressbook/gui/component/ldap-config.glade.h:17 mail/mail-account-gui.c:57
#: mail/mail-config.glade.h:16
msgid "Always"
msgstr "ሁል ጊዜ"
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:18
msgid "Anonymously"
msgstr ""
+#: addressbook/gui/component/ldap-config.glade.h:19
+msgid "Associated LDAP Attribute"
+msgstr ""
+
#: addressbook/gui/component/ldap-config.glade.h:20
+msgid "Attribute"
+msgstr "ጠባየ-አንቀጽ"
+
+#: addressbook/gui/component/ldap-config.glade.h:21
msgid ""
"Congratulations, you are finished setting up this LDAP server. You\n"
"are now ready to access this directory.\n"
@@ -915,120 +907,135 @@ msgid ""
"here."
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:25
msgid "Connecting"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:26
+msgid "Corresponding Evolution Attribute"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:27
msgid "DN Customization"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:28
msgid "De_lete"
msgstr "አጥፉ"
-#: addressbook/gui/component/ldap-config.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:29
msgid "Distinguished _name:"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:28
+#: addressbook/gui/component/ldap-config.glade.h:30
msgid "Email Address:"
msgstr "ኢሜያል አድራሻ"
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:31
+msgid "Evolution Attribute"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:32
msgid "Evolution will use this DN to authenticate you with the server"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:30
-msgid ""
-"Evolution will use this email address to authenticate you with the server"
+#: addressbook/gui/component/ldap-config.glade.h:33
+msgid "Evolution will use this email address to authenticate you with the server"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:31
+#: addressbook/gui/component/ldap-config.glade.h:34
msgid "Finished"
msgstr "ጨርሷል"
-#: addressbook/gui/component/ldap-config.glade.h:32
+#: addressbook/gui/component/ldap-config.glade.h:35
#: addressbook/gui/contact-editor/contact-editor.glade.h:16
msgid "General"
msgstr "አጠቃላይ"
-#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/component/ldap-config.glade.h:36
+msgid "LDAP Attribute"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:37
msgid "LDAP Configuration Assistant"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:38
msgid "Mappings"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:35 mail/mail-account-gui.c:62
+#: addressbook/gui/component/ldap-config.glade.h:39 mail/mail-account-gui.c:59
#: mail/mail-config.glade.h:75
msgid "Never"
msgstr "በፍጹም"
-#: addressbook/gui/component/ldap-config.glade.h:36
+#: addressbook/gui/component/ldap-config.glade.h:40
msgid ""
"Now, you must specify how you want to connect to the LDAP server. The SSL "
"(Secure Sockets Layer)\n"
"and TLS (Transport Layer Security) protocols are used by some servers to "
"cryptographically protect\n"
-"your connection. Ask your system administrator if your LDAP server uses "
-"these protocols."
+"your connection. Ask your system administrator if your LDAP server uses these "
+"protocols."
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:39
+#: addressbook/gui/component/ldap-config.glade.h:43
msgid "Objectclasses"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:44
msgid "Objectclasses Used in Evolution:"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:41
+#: addressbook/gui/component/ldap-config.glade.h:45
msgid "Objectclasses Used on Server:"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:46
msgid "One"
msgstr "አንድ"
-#: addressbook/gui/component/ldap-config.glade.h:43
+#: addressbook/gui/component/ldap-config.glade.h:47
msgid ""
"Please select an Evolution attribute and an\n"
"LDAP attribute to associate with it."
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:45
+#: addressbook/gui/component/ldap-config.glade.h:49
msgid "R_estore Defaults"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:46
+#: addressbook/gui/component/ldap-config.glade.h:50
msgid "Re_store Defaults"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:47
+#: addressbook/gui/component/ldap-config.glade.h:51
msgid "S_earch scope: "
msgstr ""
#. No time range is set, so don't start a query
-#: addressbook/gui/component/ldap-config.glade.h:48
-#: calendar/gui/calendar-model.c:1977 calendar/gui/e-day-view.c:1666
+#: addressbook/gui/component/ldap-config.glade.h:52
+#: calendar/gui/calendar-model.c:1977 calendar/gui/e-day-view.c:1663
#: calendar/gui/e-week-view.c:1186
msgid "Searching"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:53
+msgid "Select"
+msgstr "ምረጥ"
+
+#: addressbook/gui/component/ldap-config.glade.h:54
msgid "Selected:"
msgstr "ተመርጠዋል፦"
-#: addressbook/gui/component/ldap-config.glade.h:50
+#: addressbook/gui/component/ldap-config.glade.h:55
msgid ""
"Selecting this option means that Evolution will only connect to your LDAP "
"server if\n"
"your LDAP server supports SSL or TLS."
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:57
msgid ""
"Selecting this option means that Evolution will only try to use SSL/TLS if "
"you are in a \n"
@@ -1039,7 +1046,7 @@ msgid ""
"secure."
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:56
+#: addressbook/gui/component/ldap-config.glade.h:61
msgid ""
"Selecting this option means that your server does not support either SSL or "
"TLS. This \n"
@@ -1048,61 +1055,60 @@ msgid ""
"exploits. "
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:64
msgid ""
"Selecting this option will let you change Evolution's default settings for "
"LDAP\n"
"searches, and for creating and editing contacts. "
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:66
msgid ""
"Specifying a display name is the last required step in configuring an LDAP "
"server."
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:62
+#: addressbook/gui/component/ldap-config.glade.h:67
msgid "Step 1: Server Information"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:63
+#: addressbook/gui/component/ldap-config.glade.h:68
msgid "Step 2: Connecting to Server"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:64
+#: addressbook/gui/component/ldap-config.glade.h:69
msgid "Step 3: Searching the Directory"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:65
+#: addressbook/gui/component/ldap-config.glade.h:70
msgid "Step 4: Display Name"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:66
+#: addressbook/gui/component/ldap-config.glade.h:71
msgid "Sub"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:67
+#: addressbook/gui/component/ldap-config.glade.h:72
msgid "Supported Search Bases"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:73
msgid ""
-"The first step in configuring an LDAP server is to provide its name, and "
-"your log in\n"
+"The first step in configuring an LDAP server is to provide its name, and your "
+"log in\n"
"information. Please ask your system administrator if you are unsure of this "
"information."
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:75
msgid ""
-"The options on this page control how many entries should be included in "
-"your\n"
-"searches, and how long a search should take. Ask your system administrator "
-"if you\n"
+"The options on this page control how many entries should be included in your\n"
+"searches, and how long a search should take. Ask your system administrator if "
+"you\n"
"need to change these options."
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:78
msgid ""
"The search base is the distinguished name (DN) of the entry where your "
"searches will \n"
@@ -1110,17 +1116,17 @@ msgid ""
"directory tree."
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:80
msgid ""
"The search scope defines how deep you would like the search to extend down "
"the \n"
-"directory tree. A search scope of \"sub\" will include all entries below "
-"your search base.\n"
+"directory tree. A search scope of \"sub\" will include all entries below your "
+"search base.\n"
"A search scope of \"one\" will only include the entries one level beneath "
"your base.\n"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:79
+#: addressbook/gui/component/ldap-config.glade.h:84
msgid ""
"This assistant will help you to access online directory services\n"
"using LDAP (Lightweight Directory Access Protocol) servers. \n"
@@ -1130,46 +1136,43 @@ msgid ""
"need help finding this information."
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:90
msgid ""
-"This is the full name of your ldap server. For example, \"ldap.mycompany.com"
-"\"."
+"This is the full name of your ldap server. For example, "
+"\"ldap.mycompany.com\"."
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:91
msgid ""
-"This is the maximum number of entries to download. Setting this number to "
-"be \n"
-"too large will slow down your addressbook."
+"This is the maximum number of entries to download. Setting this number to be "
+"\ntoo large will slow down your addressbook."
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:93
msgid ""
-"This is the method evolution will use to authenticate you. Note that "
-"setting this to \"Email Address\" requires anonymous access to your ldap "
-"server."
+"This is the method evolution will use to authenticate you. Note that setting "
+"this to \"Email Address\" requires anonymous access to your ldap server."
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:94
msgid ""
"This is the name for this server that will appear in your Evolution folder "
"list.\n"
"It is for display purposes only. "
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:96
msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. "
-"A \n"
-"list of standard ports has been provided. Ask your system administrator\n"
+"This is the port on the LDAP server that Evolution will try to connect to. A "
+"\nlist of standard ports has been provided. Ask your system administrator\n"
"what port you should specify."
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:99
msgid "This option controls how long a search will be run."
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:95
+#: addressbook/gui/component/ldap-config.glade.h:100
msgid ""
"To add an attribute to the DN, select it from the list and click the \"Add "
"Attribute\" button.\n"
@@ -1178,68 +1181,68 @@ msgid ""
"that you add to the directory on the LDAP server. "
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:98
+#: addressbook/gui/component/ldap-config.glade.h:103
msgid "U_se SSL/TLS:"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:104
msgid "Using distinguished name (DN)"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:100
+#: addressbook/gui/component/ldap-config.glade.h:105
msgid "Using email address"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:101
-#: mail/mail-account-gui.c:61 mail/mail-config.glade.h:131
+#: addressbook/gui/component/ldap-config.glade.h:106
+#: mail/mail-account-gui.c:58 mail/mail-config.glade.h:131
msgid "Whenever Possible"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:102
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:107
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:14
#: mail/mail-config.glade.h:134 shell/glade/e-folder-list.glade.h:1
msgid "_Add"
msgstr "ጨምር"
-#: addressbook/gui/component/ldap-config.glade.h:103
+#: addressbook/gui/component/ldap-config.glade.h:108
msgid "_Add ->"
msgstr "ጨምር"
-#: addressbook/gui/component/ldap-config.glade.h:104
+#: addressbook/gui/component/ldap-config.glade.h:109
msgid "_Add Mapping"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:105
+#: addressbook/gui/component/ldap-config.glade.h:110
msgid "_Add to DN"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:106
+#: addressbook/gui/component/ldap-config.glade.h:111
msgid "_Always"
msgstr "ሁል ጊዜ (_A)"
-#: addressbook/gui/component/ldap-config.glade.h:107
+#: addressbook/gui/component/ldap-config.glade.h:112
msgid "_Delete Mapping"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:108
+#: addressbook/gui/component/ldap-config.glade.h:113
msgid "_Display name:"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:109
+#: addressbook/gui/component/ldap-config.glade.h:114
msgid "_Distinguished Name (DN):"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:110
+#: addressbook/gui/component/ldap-config.glade.h:115
msgid "_Don't use SSL/TLS"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:111
+#: addressbook/gui/component/ldap-config.glade.h:116
msgid "_Download limit:"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:112 filter/filter.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:117 filter/filter.glade.h:16
#: mail/mail-config.glade.h:149 ui/evolution-addressbook.xml.h:33
#: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
#: ui/evolution-mail-messagedisplay.xml.h:6
@@ -1249,91 +1252,91 @@ msgstr ""
msgid "_Edit"
msgstr "አስተካክል"
-#: addressbook/gui/component/ldap-config.glade.h:113
+#: addressbook/gui/component/ldap-config.glade.h:118
msgid "_Edit Mapping"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:114
+#: addressbook/gui/component/ldap-config.glade.h:119
msgid "_Evolution attribute:"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:115
+#: addressbook/gui/component/ldap-config.glade.h:120
msgid "_If necessary "
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:116
+#: addressbook/gui/component/ldap-config.glade.h:121
msgid "_LDAP attribute:"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:117
+#: addressbook/gui/component/ldap-config.glade.h:122
msgid "_LDAP attributes:"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:118
+#: addressbook/gui/component/ldap-config.glade.h:123
msgid "_Log in method:"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:119
+#: addressbook/gui/component/ldap-config.glade.h:124
msgid "_More Options >>"
msgstr "_ተጨማሪ ምርጫዎች >>"
-#: addressbook/gui/component/ldap-config.glade.h:120
+#: addressbook/gui/component/ldap-config.glade.h:125
msgid "_Port number:"
msgstr "የ_ፖርት ቍጥር፦"
-#: addressbook/gui/component/ldap-config.glade.h:121
+#: addressbook/gui/component/ldap-config.glade.h:126
msgid "_Restore Defaults"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:122
+#: addressbook/gui/component/ldap-config.glade.h:127
msgid "_Search base:"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:123
+#: addressbook/gui/component/ldap-config.glade.h:128
msgid "_Server name:"
msgstr "_የሰርቨር ስም፦"
-#: addressbook/gui/component/ldap-config.glade.h:124
+#: addressbook/gui/component/ldap-config.glade.h:129
msgid "_Timeout (minutes):"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:125
+#: addressbook/gui/component/ldap-config.glade.h:130
msgid "account-druid"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:126
+#: addressbook/gui/component/ldap-config.glade.h:131
msgid "account-editor"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:127
+#: addressbook/gui/component/ldap-config.glade.h:132
msgid "cards"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:128
+#: addressbook/gui/component/ldap-config.glade.h:133
msgid "connecting-tab"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:129
+#: addressbook/gui/component/ldap-config.glade.h:134
msgid "dn-customization-tab"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:130
+#: addressbook/gui/component/ldap-config.glade.h:135
msgid "edit_server_window_simple"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:131
+#: addressbook/gui/component/ldap-config.glade.h:136
msgid "general-tab"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:132
+#: addressbook/gui/component/ldap-config.glade.h:137
msgid "mappings-tab"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:133
+#: addressbook/gui/component/ldap-config.glade.h:138
msgid "objectclasses-tab"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:134
+#: addressbook/gui/component/ldap-config.glade.h:139
msgid "searching-tab"
msgstr ""
@@ -1347,34 +1350,34 @@ msgstr ""
#. Fixme: Ditto
#: addressbook/gui/component/select-names/e-select-names.c:687
-#: addressbook/gui/component/select-names/e-select-names-popup.c:162
-#: composer/e-msg-composer-attachment-bar.c:504
+#: addressbook/gui/component/select-names/e-select-names-popup.c:161
+#: composer/e-msg-composer-attachment-bar.c:501
#: my-evolution/e-summary-shown.c:536 shell/e-shortcuts-view.c:179
msgid "Remove"
msgstr "አስወግድ"
-#: addressbook/gui/component/select-names/e-select-names-popup.c:177
+#: addressbook/gui/component/select-names/e-select-names-popup.c:176
msgid "Remove All"
msgstr "ሁሉንም አስወግድ"
-#: addressbook/gui/component/select-names/e-select-names-popup.c:201
+#: addressbook/gui/component/select-names/e-select-names-popup.c:200
msgid "Send HTML Mail?"
msgstr ""
-#: addressbook/gui/component/select-names/e-select-names-popup.c:401
+#: addressbook/gui/component/select-names/e-select-names-popup.c:400
msgid "Edit Contact List"
msgstr ""
-#: addressbook/gui/component/select-names/e-select-names-popup.c:419
+#: addressbook/gui/component/select-names/e-select-names-popup.c:418
msgid "Unnamed Contact List"
msgstr ""
-#: addressbook/gui/component/select-names/e-select-names-popup.c:436
+#: addressbook/gui/component/select-names/e-select-names-popup.c:435
#, c-format
msgid "(%d not shown)"
msgstr ""
-#: addressbook/gui/component/select-names/e-select-names-popup.c:502
+#: addressbook/gui/component/select-names/e-select-names-popup.c:501
msgid "Unnamed Contact"
msgstr ""
@@ -1391,6 +1394,14 @@ msgstr ""
msgid "Factory for the Addressbook's name selection interface"
msgstr ""
+#: addressbook/gui/component/select-names/select-names.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:1
+#: mail/mail-config.glade.h:6
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+msgid "*"
+msgstr "*"
+
#: addressbook/gui/component/select-names/select-names.glade.h:2
msgid "Find"
msgstr "ፈልግ"
@@ -1421,22 +1432,26 @@ msgstr "ምድብ፦ (_C)"
msgid "_Folder:"
msgstr "_ዶሴ፦"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:2
+#: addressbook/gui/contact-editor/contact-editor.glade.h:1
msgid "A_ssistant's name:"
msgstr ""
-#: addressbook/gui/contact-editor/contact-editor.glade.h:3
+#: addressbook/gui/contact-editor/contact-editor.glade.h:2
msgid "Add_ress..."
msgstr "አድራሻ"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:4
+#: addressbook/gui/contact-editor/contact-editor.glade.h:3
msgid "Anni_versary:"
msgstr ""
-#: addressbook/gui/contact-editor/contact-editor.glade.h:5
+#: addressbook/gui/contact-editor/contact-editor.glade.h:4
msgid "Birthda_y:"
msgstr "የልደት በዓል"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:7
+msgid "C_ontacts..."
+msgstr ""
+
#: addressbook/gui/contact-editor/contact-editor.glade.h:8
#: calendar/gui/dialogs/event-page.glade.h:3
#: calendar/gui/dialogs/task-page.glade.h:1
@@ -1449,7 +1464,7 @@ msgstr ""
#. Construct the app
#: addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: addressbook/gui/contact-editor/e-contact-editor.c:1321
+#: addressbook/gui/contact-editor/e-contact-editor.c:1424
msgid "Contact Editor"
msgstr ""
@@ -1497,23 +1512,27 @@ msgstr ""
msgid "P_rofession:"
msgstr ""
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
-msgid "S_pouse:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+msgid "Phone Types"
msgstr ""
#: addressbook/gui/contact-editor/contact-editor.glade.h:27
-msgid "This is the _mailing address"
+msgid "S_pouse:"
msgstr ""
#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+msgid "This is the _mailing address"
+msgstr ""
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
msgid "Wants to receive _HTML mail"
msgstr ""
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
#: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/meeting-page.c:653 calendar/gui/e-calendar-table.c:968
-#: calendar/gui/e-day-view.c:3722 calendar/gui/e-week-view.c:3501
-#: filter/filter.glade.h:15 mail/folder-browser.c:1833
+#: calendar/gui/dialogs/meeting-page.c:652 calendar/gui/e-calendar-table.c:968
+#: calendar/gui/e-day-view.c:3719 calendar/gui/e-week-view.c:3501
+#: filter/filter.glade.h:15 mail/folder-browser.c:1770
#: mail/mail-config.glade.h:147 shell/glade/e-folder-list.glade.h:2
#: ui/evolution-addressbook.xml.h:32 ui/evolution-calendar.xml.h:27
#: ui/evolution-mail-message.xml.h:97 ui/evolution-tasks.xml.h:16
@@ -1521,27 +1540,27 @@ msgstr ""
msgid "_Delete"
msgstr "አጥፉ"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
msgid "_Job title:"
msgstr ""
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
msgid "_Manager's Name:"
msgstr ""
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
msgid "_Nickname:"
msgstr "ቅጽል ስም"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
msgid "_Office:"
msgstr "ቢሮ"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
msgid "_Public Calendar URL:"
msgstr ""
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: addressbook/gui/contact-editor/contact-editor.glade.h:37
msgid "_Web page address:"
msgstr ""
@@ -1551,7 +1570,7 @@ msgstr ""
#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:162
#: addressbook/gui/widgets/e-addressbook-model.c:311
#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:362
-#: addressbook/gui/widgets/e-minicard.c:176
+#: addressbook/gui/widgets/e-minicard.c:175
#: addressbook/gui/widgets/e-minicard-label.c:151
#: addressbook/gui/widgets/e-minicard-view.c:472
#: addressbook/gui/widgets/e-minicard-view-widget.c:118
@@ -2583,7 +2602,7 @@ msgstr "ዚምቧቤ"
#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:141
#: addressbook/gui/widgets/e-addressbook-model.c:297
#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:348
-#: addressbook/gui/widgets/e-addressbook-view.c:179
+#: addressbook/gui/widgets/e-addressbook-view.c:171
#: addressbook/gui/widgets/e-minicard-view.c:458
#: addressbook/gui/widgets/e-minicard-view-widget.c:104
msgid "Book"
@@ -2591,7 +2610,7 @@ msgstr ""
#: addressbook/gui/contact-editor/e-contact-editor.c:164
#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:148
-#: addressbook/gui/widgets/e-minicard.c:183
+#: addressbook/gui/widgets/e-minicard.c:182
#: addressbook/gui/widgets/e-minicard-widget.c:93
msgid "Card"
msgstr ""
@@ -2608,35 +2627,44 @@ msgstr ""
msgid "Changed"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor.c:814
+#: addressbook/gui/contact-editor/e-contact-editor.c:868
msgid "Category editor not available."
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor.c:822
+#: addressbook/gui/contact-editor/e-contact-editor.c:877
msgid "This contact belongs to these categories:"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor.c:996
+#: addressbook/gui/contact-editor/e-contact-editor.c:1091
msgid "Save Contact as VCard"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor.c:1042
+#: addressbook/gui/contact-editor/e-contact-editor.c:1137
msgid ""
"Are you sure you want\n"
"to delete these contacts?"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor.c:1045
+#: addressbook/gui/contact-editor/e-contact-editor.c:1140
msgid ""
"Are you sure you want\n"
"to delete this contact?"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor.c:1745
+#: addressbook/gui/contact-editor/e-contact-editor.c:1144
+#: addressbook/gui/widgets/e-addressbook-view.c:846 filter/libfilter-i18n.h:10
+#: mail/mail-accounts.c:222 shell/e-shell-folder-commands.c:407
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
+#: ui/evolution-contact-editor.xml.h:2
+#: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
+msgid "Delete"
+msgstr "አጥፉ"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1853
msgid "TTY/TDD"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor.c:2352
+#: addressbook/gui/contact-editor/e-contact-editor.c:2461
#, c-format
msgid "Could not find widget for a field: `%s'"
msgstr ""
@@ -2649,7 +2677,7 @@ msgstr ""
msgid "Edit Full"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:326
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:327
msgid "E-mail"
msgstr "ኢሜይል፦"
@@ -2674,7 +2702,7 @@ msgid ""
"Do you want to overwrite it?"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-save-as.c:215
+#: addressbook/gui/contact-editor/e-contact-save-as.c:214
msgid "Overwrite"
msgstr "በላዩ ላይ ይጻፍ"
@@ -2881,7 +2909,7 @@ msgstr ""
#: addressbook/gui/widgets/e-addressbook-model.c:304
#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:355
-#: addressbook/gui/widgets/e-addressbook-view.c:186
+#: addressbook/gui/widgets/e-addressbook-view.c:178
#: addressbook/gui/widgets/e-minicard-view.c:465
#: addressbook/gui/widgets/e-minicard-view-widget.c:111
msgid "Query"
@@ -2895,22 +2923,22 @@ msgstr ""
msgid "Model"
msgstr "ሞዴል"
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:143
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:142
#: addressbook/gui/widgets/e-addressbook-util.c:104
-#: addressbook/gui/widgets/e-minicard.c:512
+#: addressbook/gui/widgets/e-minicard.c:511
msgid "Error modifying card"
msgstr ""
#: addressbook/gui/widgets/e-addressbook-util.c:35
-#: shell/evolution-shell-component.c:1150
+#: shell/evolution-shell-component.c:1153
msgid "Success"
msgstr ""
#: addressbook/gui/widgets/e-addressbook-util.c:36
#: camel/providers/imap/camel-imap-command.c:309
#: camel/providers/imap/camel-imap-command.c:406
-#: camel/providers/pop3/camel-pop3-store.c:519 shell/e-shell.c:2098
-#: shell/e-storage.c:606 shell/evolution-shell-component.c:1189
+#: camel/providers/pop3/camel-pop3-store.c:519 shell/e-shell.c:2094
+#: shell/e-storage.c:606 shell/evolution-shell-component.c:1192
msgid "Unknown error"
msgstr "ያልታወቀ ስህተት"
@@ -2919,7 +2947,7 @@ msgid "Repository offline"
msgstr ""
#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:592
-#: shell/evolution-shell-component.c:1180
+#: shell/evolution-shell-component.c:1183
msgid "Permission denied"
msgstr ""
@@ -2938,7 +2966,7 @@ msgstr ""
#: addressbook/gui/widgets/e-addressbook-util.c:42
#: calendar/gui/calendar-model.c:753 calendar/gui/calendar-model.c:1185
#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:469 calendar/gui/print.c:2297
+#: calendar/gui/e-calendar-table.c:469 calendar/gui/print.c:2298
#: camel/camel-service.c:737 camel/camel-service.c:779
#: camel/camel-service.c:847 camel/camel-service.c:890
#: camel/providers/pop3/camel-pop3-store.c:436
@@ -2964,17 +2992,13 @@ msgstr ""
#: addressbook/gui/widgets/e-addressbook-util.c:47
msgid "Other error"
-msgstr "ሌላ ስህተት"
+msgstr ""
#: addressbook/gui/widgets/e-addressbook-util.c:74
#: calendar/gui/dialogs/save-comp.c:49
msgid "Do you want to save changes?"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-util.c:76
-msgid "_Discard"
-msgstr ""
-
#: addressbook/gui/widgets/e-addressbook-util.c:95
msgid "Error adding list"
msgstr ""
@@ -2994,7 +3018,7 @@ msgstr ""
#: addressbook/gui/widgets/e-addressbook-util.c:114
#: addressbook/gui/widgets/e-addressbook-util.c:229
-#: addressbook/gui/widgets/e-addressbook-view.c:1740
+#: addressbook/gui/widgets/e-addressbook-view.c:1609
msgid "Error removing card"
msgstr ""
@@ -3021,7 +3045,7 @@ msgstr ""
msgid "Copy cards to"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:193
+#: addressbook/gui/widgets/e-addressbook-view.c:185
#: calendar/gui/dialogs/meeting-page.etspec.h:11
#: calendar/gui/e-calendar-table.etspec.h:18
#: calendar/gui/e-meeting-time-sel.etspec.h:11
@@ -3029,100 +3053,92 @@ msgstr ""
msgid "Type"
msgstr "ዓይነት"
-#: addressbook/gui/widgets/e-addressbook-view.c:393
+#: addressbook/gui/widgets/e-addressbook-view.c:379
#: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
msgid "Addressbook"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:672
-#: addressbook/gui/widgets/e-addressbook-view.c:861
-#: addressbook/gui/widgets/e-addressbook-view.c:1868
+#: addressbook/gui/widgets/e-addressbook-view.c:641
+#: addressbook/gui/widgets/e-addressbook-view.c:830
+#: addressbook/gui/widgets/e-addressbook-view.c:1737
#: ui/evolution-addressbook.xml.h:19
msgid "Save as VCard"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:848
+#: addressbook/gui/widgets/e-addressbook-view.c:817
msgid "New Contact..."
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:849
+#: addressbook/gui/widgets/e-addressbook-view.c:818
msgid "New Contact List..."
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:852
+#: addressbook/gui/widgets/e-addressbook-view.c:821
msgid "Go to Folder..."
msgstr "ወደ ዶሴን ሂዱ..."
-#: addressbook/gui/widgets/e-addressbook-view.c:853
+#: addressbook/gui/widgets/e-addressbook-view.c:822
msgid "Import..."
msgstr "ከውጭ አስገባ"
-#: addressbook/gui/widgets/e-addressbook-view.c:855
+#: addressbook/gui/widgets/e-addressbook-view.c:824
msgid "Search for Contacts..."
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:856
+#: addressbook/gui/widgets/e-addressbook-view.c:825
msgid "Addressbook Sources..."
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:858
+#: addressbook/gui/widgets/e-addressbook-view.c:827
msgid "Pilot Settings..."
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:862
+#: addressbook/gui/widgets/e-addressbook-view.c:831
#: ui/evolution-addressbook.xml.h:10
msgid "Forward Contact"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:863
+#: addressbook/gui/widgets/e-addressbook-view.c:832
msgid "Send Message to Contact"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:864
+#: addressbook/gui/widgets/e-addressbook-view.c:833
#: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
#: ui/my-evolution.xml.h:1
msgid "Print"
msgstr "አትም"
-#: addressbook/gui/widgets/e-addressbook-view.c:866
+#: addressbook/gui/widgets/e-addressbook-view.c:835
msgid "Print Envelope"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:870
+#: addressbook/gui/widgets/e-addressbook-view.c:839
msgid "Copy to folder..."
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:871
+#: addressbook/gui/widgets/e-addressbook-view.c:840
msgid "Move to folder..."
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:874
+#: addressbook/gui/widgets/e-addressbook-view.c:843
#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
msgid "Cut"
msgstr "ቁረጥ"
-#: addressbook/gui/widgets/e-addressbook-view.c:875
+#: addressbook/gui/widgets/e-addressbook-view.c:844
#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
#: ui/evolution-tasks.xml.h:2
msgid "Copy"
msgstr "ቅጂ"
-#: addressbook/gui/widgets/e-addressbook-view.c:876
+#: addressbook/gui/widgets/e-addressbook-view.c:845
#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
msgid "Paste"
msgstr "ለጥፍ"
-#: addressbook/gui/widgets/e-addressbook-view.c:877 filter/libfilter-i18n.h:10
-#: mail/mail-accounts.c:220 shell/e-shell-folder-commands.c:407
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
-#: ui/evolution-contact-editor.xml.h:2
-#: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
-msgid "Delete"
-msgstr "አጥፉ"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:881
-#: calendar/gui/e-day-view.c:3682 calendar/gui/e-week-view.c:3466
+#: addressbook/gui/widgets/e-addressbook-view.c:850
+#: calendar/gui/e-day-view.c:3679 calendar/gui/e-week-view.c:3466
msgid "Current View"
msgstr "የአሁኑ ዕይታ"
@@ -3130,7 +3146,7 @@ msgstr "የአሁኑ ዕይታ"
#. Translators: put here a list of labels you want to see on buttons in
#. addressbook. You may use any character to separate labels but it must
#. also be placed at the begining ot the string
-#: addressbook/gui/widgets/e-addressbook-view.c:915
+#: addressbook/gui/widgets/e-addressbook-view.c:884
msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
msgstr ""
@@ -3138,11 +3154,11 @@ msgstr ""
#. in addressbook. You may use any character to separate labels but it
#. must also be placed at the begining ot the string.
#. Use lower case letters if possible.
-#: addressbook/gui/widgets/e-addressbook-view.c:920
+#: addressbook/gui/widgets/e-addressbook-view.c:889
msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:1321
+#: addressbook/gui/widgets/e-addressbook-view.c:1296
#, c-format
msgid ""
"The addressbook backend for\n"
@@ -3210,26 +3226,26 @@ msgstr ""
msgid "Primary Phone"
msgstr ""
-#: addressbook/gui/widgets/e-minicard.c:139
+#: addressbook/gui/widgets/e-minicard.c:138
#: addressbook/gui/widgets/e-minicard-label.c:102
msgid "Width"
msgstr "ስፋት"
-#: addressbook/gui/widgets/e-minicard.c:146
+#: addressbook/gui/widgets/e-minicard.c:145
#: addressbook/gui/widgets/e-minicard-label.c:109
msgid "Height"
msgstr "እርዝማኔ"
-#: addressbook/gui/widgets/e-minicard.c:154
+#: addressbook/gui/widgets/e-minicard.c:153
#: addressbook/gui/widgets/e-minicard-label.c:116
msgid "Has Focus"
msgstr ""
-#: addressbook/gui/widgets/e-minicard.c:162
+#: addressbook/gui/widgets/e-minicard.c:161
msgid "Selected"
msgstr "ተመርጠዋል"
-#: addressbook/gui/widgets/e-minicard.c:169
+#: addressbook/gui/widgets/e-minicard.c:168
msgid "Has Cursor"
msgstr ""
@@ -3286,16 +3302,16 @@ msgstr ""
msgid "Column Width"
msgstr ""
-#: addressbook/gui/widgets/gal-view-factory-minicard.c:24
+#: addressbook/gui/widgets/gal-view-factory-minicard.c:23
msgid "Card View"
msgstr ""
-#: addressbook/printing/e-contact-print.c:1125
+#: addressbook/printing/e-contact-print.c:1118
msgid "Print cards"
msgstr ""
-#: addressbook/printing/e-contact-print.c:1190
-#: addressbook/printing/e-contact-print.c:1212
+#: addressbook/printing/e-contact-print.c:1180
+#: addressbook/printing/e-contact-print.c:1202
msgid "Print card"
msgstr ""
@@ -3373,7 +3389,7 @@ msgid "Include:"
msgstr ""
#: addressbook/printing/e-contact-print.glade.h:18
-#: calendar/gui/tasks-control.c:637
+#: calendar/gui/tasks-control.c:638
msgid "Landscape"
msgstr "አግድም"
@@ -3398,7 +3414,7 @@ msgid "Options"
msgstr "&ምርጫዎች"
#: addressbook/printing/e-contact-print.glade.h:24
-#: calendar/gui/tasks-control.c:624
+#: calendar/gui/tasks-control.c:625
msgid "Orientation"
msgstr "አቀማመጥ"
@@ -3421,7 +3437,7 @@ msgstr ""
#. Portrait
#: addressbook/printing/e-contact-print.glade.h:29
-#: calendar/gui/tasks-control.c:630
+#: calendar/gui/tasks-control.c:631
msgid "Portrait"
msgstr "በቁም"
@@ -3483,20 +3499,20 @@ msgstr ""
#: calendar/cal-util/cal-util.c:499 calendar/cal-util/cal-util.c:521
#: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:393 mail/message-list.c:752
+#: calendar/gui/e-calendar-table.c:393 mail/message-list.c:749
msgid "High"
msgstr "ከፍ ያለ"
#: calendar/cal-util/cal-util.c:501 calendar/cal-util/cal-util.c:523
#: calendar/gui/calendar-model.c:1703
#: calendar/gui/dialogs/task-details-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:394 mail/message-list.c:751
+#: calendar/gui/e-calendar-table.c:394 mail/message-list.c:748
msgid "Normal"
msgstr "የተለመደ"
#: calendar/cal-util/cal-util.c:503 calendar/cal-util/cal-util.c:525
#: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:395 mail/message-list.c:750
+#: calendar/gui/e-calendar-table.c:395 mail/message-list.c:747
msgid "Low"
msgstr "ዝቅ ያለ"
@@ -3530,23 +3546,23 @@ msgstr ""
msgid "Could not read pilot's ToDo application block"
msgstr ""
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
msgid "Starting:"
msgstr "እየጀመረ ነው"
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:216
msgid "Ending:"
msgstr ""
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:228
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:229
msgid "invalid time"
msgstr ""
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:273
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:274
msgid "Evolution Alarm"
msgstr ""
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:368
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:369
#, c-format
msgid "Alarm on %s"
msgstr ""
@@ -3574,7 +3590,7 @@ msgstr ""
#: calendar/gui/alarm-notify/alarm-queue.c:741
#: calendar/gui/alarm-notify/alarm-queue.c:765
-#: calendar/gui/tasks-control.c:454 widgets/misc/e-messagebox.c:161
+#: calendar/gui/tasks-control.c:455 widgets/misc/e-messagebox.c:161
msgid "Warning"
msgstr "ማስጠንቀቂያ"
@@ -3609,11 +3625,11 @@ msgstr ""
msgid "Factory for the alarm notification service"
msgstr ""
-#: calendar/gui/alarm-notify/notify-main.c:173
+#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:155
msgid "Could not initialize gnome-vfs"
msgstr ""
-#: calendar/gui/alarm-notify/notify-main.c:180
+#: calendar/gui/alarm-notify/notify-main.c:181
msgid "Could not create the alarm notify service factory"
msgstr ""
@@ -3623,7 +3639,7 @@ msgstr "%A %d %B %Y"
#. strftime format %a = abbreviated weekday name, %d = day of month,
#. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:407 calendar/gui/e-day-view.c:1384
+#: calendar/gui/calendar-commands.c:407 calendar/gui/e-day-view.c:1381
#: calendar/gui/e-day-view-top-item.c:265
#: calendar/gui/e-week-view-main-item.c:311
msgid "%a %d %b"
@@ -3643,13 +3659,12 @@ msgstr "%d %B %Y"
#. month name. You can change the order but don't
#. change the specifiers or add anything.
#: calendar/gui/calendar-commands.c:432
-#: calendar/gui/e-week-view-main-item.c:319 calendar/gui/print.c:1489
+#: calendar/gui/e-week-view-main-item.c:319 calendar/gui/print.c:1490
msgid "%d %B"
msgstr "%d %B"
#: calendar/gui/calendar-commands.c:799
-msgid ""
-"Could not create the calendar view. Please check your ORBit and OAF setup."
+msgid "Could not create the calendar view. Please check your ORBit and OAF setup."
msgstr ""
#: calendar/gui/calendar-model.c:406 calendar/gui/calendar-model.c:965
@@ -3688,27 +3703,27 @@ msgid "Free"
msgstr "ነፃ"
#: calendar/gui/calendar-model.c:593 calendar/gui/e-calendar-table.c:446
-#: calendar/gui/e-meeting-time-sel.c:407
-#: shell/evolution-shell-component.c:1174
+#: calendar/gui/e-meeting-time-sel.c:406
+#: shell/evolution-shell-component.c:1177
msgid "Busy"
msgstr ""
#: calendar/gui/calendar-model.c:744 calendar/gui/calendar-model.c:1179
#: calendar/gui/dialogs/task-details-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:466 calendar/gui/print.c:2288
+#: calendar/gui/e-calendar-table.c:466 calendar/gui/print.c:2289
msgid "Not Started"
msgstr ""
#: calendar/gui/calendar-model.c:747 calendar/gui/calendar-model.c:1181
#: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:467 calendar/gui/print.c:2291
+#: calendar/gui/e-calendar-table.c:467 calendar/gui/print.c:2292
msgid "In Progress"
msgstr ""
#: calendar/gui/calendar-model.c:750 calendar/gui/calendar-model.c:1183
#: calendar/gui/dialogs/task-details-page.glade.h:4
#: calendar/gui/e-calendar-table.c:468 calendar/gui/e-meeting-model.c:305
-#: calendar/gui/e-meeting-model.c:328 calendar/gui/print.c:2294
+#: calendar/gui/e-meeting-model.c:328 calendar/gui/print.c:2295
msgid "Completed"
msgstr ""
@@ -3720,10 +3735,10 @@ msgid ""
msgstr ""
#. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1177 calendar/gui/dialogs/meeting-page.c:288
-#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1994
-#: mail/folder-browser.c:1795 mail/mail-account-gui.c:1229
-#: mail/mail-account-gui.c:1655 mail/mail-accounts.c:388
+#: calendar/gui/calendar-model.c:1177 calendar/gui/dialogs/meeting-page.c:287
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1970
+#: mail/folder-browser.c:1732 mail/mail-account-gui.c:1225
+#: mail/mail-account-gui.c:1639 mail/mail-accounts.c:384
#: mail/mail-config.glade.h:77
#: widgets/e-timezone-dialog/e-timezone-dialog.c:196
#: widgets/misc/e-cell-date-edit.c:254 widgets/misc/e-dateedit.c:447
@@ -3782,103 +3797,103 @@ msgstr ""
msgid "Unmatched"
msgstr ""
-#: calendar/gui/calendar-component.c:71 calendar/gui/gnome-cal.c:1341
+#: calendar/gui/component-factory.c:72 calendar/gui/gnome-cal.c:1342
#: importers/netscape-importer.c:1873 my-evolution/my-evolution.glade.h:3
#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1083
msgid "Calendar"
msgstr "ቀን መቁጠሪያ"
-#: calendar/gui/calendar-component.c:72
+#: calendar/gui/component-factory.c:73
msgid "Folder containing appointments and events"
msgstr ""
-#: calendar/gui/calendar-component.c:76
+#: calendar/gui/component-factory.c:77
msgid "Public Calendar"
msgstr ""
-#: calendar/gui/calendar-component.c:77
+#: calendar/gui/component-factory.c:78
msgid "Public folder containing appointments and events"
msgstr ""
-#: calendar/gui/calendar-component.c:81 calendar/gui/e-tasks.c:735
-#: calendar/gui/print.c:1775 calendar/gui/tasks-control.c:508
-#: calendar/importers/icalendar-importer.c:705
+#: calendar/gui/component-factory.c:82 calendar/gui/e-tasks.c:734
+#: calendar/gui/print.c:1776 calendar/gui/tasks-control.c:509
+#: calendar/importers/icalendar-importer.c:702
#: importers/netscape-importer.c:1875 my-evolution/e-summary-tasks.c:326
#: my-evolution/e-summary-tasks.c:344 shell/e-local-storage.c:183
#: shell/e-shortcuts.c:1084
msgid "Tasks"
msgstr ""
-#: calendar/gui/calendar-component.c:82
+#: calendar/gui/component-factory.c:83
msgid "Folder containing to-do items"
msgstr ""
-#: calendar/gui/calendar-component.c:86
+#: calendar/gui/component-factory.c:87
msgid "Public Tasks"
msgstr ""
-#: calendar/gui/calendar-component.c:87
+#: calendar/gui/component-factory.c:88
msgid "Public folder containing to-do items"
msgstr ""
-#: calendar/gui/calendar-component.c:739
+#: calendar/gui/component-factory.c:749
msgid "New appointment"
msgstr ""
-#: calendar/gui/calendar-component.c:739
+#: calendar/gui/component-factory.c:749
msgid "_Appointment"
msgstr ""
-#: calendar/gui/calendar-component.c:740
+#: calendar/gui/component-factory.c:750
msgid "Create a new appointment"
msgstr ""
-#: calendar/gui/calendar-component.c:744
+#: calendar/gui/component-factory.c:754
msgid "New meeting"
msgstr ""
-#: calendar/gui/calendar-component.c:744
+#: calendar/gui/component-factory.c:754
msgid "_Meeting"
msgstr "ስብሰባ"
-#: calendar/gui/calendar-component.c:745
+#: calendar/gui/component-factory.c:755
msgid "Create a new meeting request"
msgstr ""
-#: calendar/gui/calendar-component.c:749
+#: calendar/gui/component-factory.c:759
msgid "New task"
msgstr ""
-#: calendar/gui/calendar-component.c:749
+#: calendar/gui/component-factory.c:759
msgid "_Task"
msgstr ""
-#: calendar/gui/calendar-component.c:750
+#: calendar/gui/component-factory.c:760
msgid "Create a new task"
msgstr ""
-#: calendar/gui/calendar-component.c:754
+#: calendar/gui/component-factory.c:764
msgid "New All Day Appointment"
msgstr ""
-#: calendar/gui/calendar-component.c:754
+#: calendar/gui/component-factory.c:764
msgid "All _Day Appointment"
msgstr ""
-#: calendar/gui/calendar-component.c:755
+#: calendar/gui/component-factory.c:765
msgid "Create a new all-day appointment"
msgstr ""
-#: calendar/gui/control-factory.c:119
+#: calendar/gui/control-factory.c:123
#, c-format
msgid "Could not open the folder in '%s'"
msgstr ""
-#: calendar/gui/control-factory.c:163
+#: calendar/gui/control-factory.c:167
msgid "The URI that the calendar will display"
msgstr ""
-#: calendar/gui/control-factory.c:170
+#: calendar/gui/control-factory.c:174
msgid "The type of view to show"
msgstr ""
@@ -3935,7 +3950,7 @@ msgstr ""
#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:68
#: filter/filter.glade.h:20
msgid "days"
-msgstr "ቀና"
+msgstr "ቀን"
#: calendar/gui/dialogs/alarm-options.glade.h:9
msgid "extra times every"
@@ -3951,110 +3966,110 @@ msgstr "ሰዓትን"
msgid "minutes"
msgstr "ደቂቃዎች"
-#: calendar/gui/dialogs/alarm-page.c:311
+#: calendar/gui/dialogs/alarm-page.c:298
#, c-format
msgid "%d days"
-msgstr "%d ቀናት"
+msgstr "%d ቀን"
-#: calendar/gui/dialogs/alarm-page.c:314
+#: calendar/gui/dialogs/alarm-page.c:301
msgid "1 day"
msgstr "1 ቀን"
-#: calendar/gui/dialogs/alarm-page.c:319
+#: calendar/gui/dialogs/alarm-page.c:306
#, c-format
msgid "%d weeks"
msgstr "%d ሳመንት"
-#: calendar/gui/dialogs/alarm-page.c:322
+#: calendar/gui/dialogs/alarm-page.c:309
msgid "1 week"
msgstr "1 ሳመንት"
-#: calendar/gui/dialogs/alarm-page.c:327
+#: calendar/gui/dialogs/alarm-page.c:314
#, c-format
msgid "%d hours"
msgstr "%d ሰዓት"
-#: calendar/gui/dialogs/alarm-page.c:330
+#: calendar/gui/dialogs/alarm-page.c:317
msgid "1 hour"
msgstr "1 ሰዓት"
-#: calendar/gui/dialogs/alarm-page.c:335
+#: calendar/gui/dialogs/alarm-page.c:322
#, c-format
msgid "%d minutes"
msgstr "%d ደቂቃዎች"
-#: calendar/gui/dialogs/alarm-page.c:338
+#: calendar/gui/dialogs/alarm-page.c:325
msgid "1 minute"
msgstr "1 ደቂቃ"
-#: calendar/gui/dialogs/alarm-page.c:343
+#: calendar/gui/dialogs/alarm-page.c:330
#, c-format
msgid "%d seconds"
msgstr "%d ሴኮንዶች"
-#: calendar/gui/dialogs/alarm-page.c:346
+#: calendar/gui/dialogs/alarm-page.c:333
msgid "1 second"
msgstr "1 ሴኮንድ"
-#: calendar/gui/dialogs/alarm-page.c:375
+#: calendar/gui/dialogs/alarm-page.c:362
#: calendar/gui/dialogs/alarm-page.glade.h:4
msgid "Play a sound"
msgstr "ድምፅ አጫውት"
-#: calendar/gui/dialogs/alarm-page.c:379
+#: calendar/gui/dialogs/alarm-page.c:366
#: calendar/gui/dialogs/alarm-page.glade.h:3
msgid "Display a message"
msgstr ""
-#: calendar/gui/dialogs/alarm-page.c:383
+#: calendar/gui/dialogs/alarm-page.c:370
msgid "Send an email"
msgstr ""
-#: calendar/gui/dialogs/alarm-page.c:387
+#: calendar/gui/dialogs/alarm-page.c:374
#: calendar/gui/dialogs/alarm-page.glade.h:6
msgid "Run a program"
msgstr "ፕሮግራምን አስኪድ"
-#: calendar/gui/dialogs/alarm-page.c:393
+#: calendar/gui/dialogs/alarm-page.c:380
msgid "Unknown action to be performed"
msgstr ""
-#: calendar/gui/dialogs/alarm-page.c:405
+#: calendar/gui/dialogs/alarm-page.c:392
#, c-format
msgid "%s %s before the start of the appointment"
msgstr ""
-#: calendar/gui/dialogs/alarm-page.c:408
+#: calendar/gui/dialogs/alarm-page.c:395
#, c-format
msgid "%s %s after the start of the appointment"
msgstr ""
-#: calendar/gui/dialogs/alarm-page.c:413
+#: calendar/gui/dialogs/alarm-page.c:400
#, c-format
msgid "%s at the start of the appointment"
msgstr ""
-#: calendar/gui/dialogs/alarm-page.c:422
+#: calendar/gui/dialogs/alarm-page.c:409
#, c-format
msgid "%s %s before the end of the appointment"
msgstr ""
-#: calendar/gui/dialogs/alarm-page.c:425
+#: calendar/gui/dialogs/alarm-page.c:412
#, c-format
msgid "%s %s after the end of the appointment"
msgstr ""
-#: calendar/gui/dialogs/alarm-page.c:430
+#: calendar/gui/dialogs/alarm-page.c:417
#, c-format
msgid "%s at the end of the appointment"
msgstr ""
-#: calendar/gui/dialogs/alarm-page.c:454
+#: calendar/gui/dialogs/alarm-page.c:441
#, c-format
msgid "%s at %s"
msgstr "%s በ %s"
-#: calendar/gui/dialogs/alarm-page.c:460
+#: calendar/gui/dialogs/alarm-page.c:447
#, c-format
msgid "%s for an unknown trigger type"
msgstr ""
@@ -4114,23 +4129,23 @@ msgstr ""
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
msgid "05 minutes"
-msgstr ""
+msgstr "05 ደቂቃ"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
msgid "10 minutes"
-msgstr ""
+msgstr "10 ደቂቃ"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:3
msgid "15 minutes"
-msgstr ""
+msgstr "15 ደቂቃ"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
msgid "30 minutes"
-msgstr ""
+msgstr "30 ደቂቃ"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
msgid "60 minutes"
-msgstr ""
+msgstr "60 ደቂቃ"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:14
msgid "Alerts"
@@ -4154,10 +4169,10 @@ msgstr ""
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
msgid "Days"
-msgstr "ቀናት"
+msgstr "ቀን"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:1091
+#: calendar/gui/dialogs/recurrence-page.c:1116
msgid "Friday"
msgstr "ዓርብ"
@@ -4170,16 +4185,16 @@ msgid "Minutes"
msgstr "ደቂቃዎች"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:1087
+#: calendar/gui/dialogs/recurrence-page.c:1112
msgid "Monday"
msgstr "ሰኞ"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
msgid "S_un"
-msgstr "sun"
+msgstr "_እሑድ"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:1092
+#: calendar/gui/dialogs/recurrence-page.c:1117
msgid "Saturday"
msgstr "ቅዳሜ"
@@ -4192,7 +4207,7 @@ msgid "Show week _numbers in date navigator"
msgstr ""
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: calendar/gui/dialogs/recurrence-page.c:1093
+#: calendar/gui/dialogs/recurrence-page.c:1118
msgid "Sunday"
msgstr "እሑድ"
@@ -4202,14 +4217,14 @@ msgstr ""
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
msgid "T_hu"
-msgstr ""
+msgstr "_ሐሙስ"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
msgid "Task List"
msgstr ""
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:1090
+#: calendar/gui/dialogs/recurrence-page.c:1115
msgid "Thursday"
msgstr "ሐሙስ"
@@ -4226,7 +4241,7 @@ msgid "Time format:"
msgstr ""
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1088
+#: calendar/gui/dialogs/recurrence-page.c:1113
msgid "Tuesday"
msgstr "ማክሰኞ"
@@ -4235,7 +4250,7 @@ msgid "W_eek starts:"
msgstr ""
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:1089
+#: calendar/gui/dialogs/recurrence-page.c:1114
msgid "Wednesday"
msgstr "ረቡዕ"
@@ -4430,20 +4445,19 @@ msgstr ""
msgid "No summary"
msgstr ""
-#: calendar/gui/dialogs/comp-editor.c:1205
-#: calendar/gui/e-calendar-table.c:1035 calendar/gui/e-day-view.c:3937
-#: calendar/gui/e-week-view.c:3699 composer/e-msg-composer.c:1170
+#: calendar/gui/dialogs/comp-editor.c:1200
+#: calendar/gui/e-calendar-table.c:1035 calendar/gui/e-day-view.c:3934
+#: calendar/gui/e-week-view.c:3699 composer/e-msg-composer.c:1151
msgid "Save as..."
msgstr "በሌላ ስም አስቀምጥ..."
-#: calendar/gui/dialogs/comp-editor.c:1306
-#: calendar/gui/dialogs/comp-editor.c:1330
-#: calendar/gui/dialogs/comp-editor.c:1354
-msgid ""
-"Changes made to this item may be discarded if an update arrives via email"
+#: calendar/gui/dialogs/comp-editor.c:1301
+#: calendar/gui/dialogs/comp-editor.c:1325
+#: calendar/gui/dialogs/comp-editor.c:1349
+msgid "Changes made to this item may be discarded if an update arrives via email"
msgstr ""
-#: calendar/gui/dialogs/comp-editor.c:1381
+#: calendar/gui/dialogs/comp-editor.c:1376
msgid "Unable to obtain current version!"
msgstr ""
@@ -4452,23 +4466,23 @@ msgstr ""
msgid "Validation error: %s"
msgstr ""
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2206
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2207
msgid " to "
msgstr "ወደ"
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2210
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2211
msgid " (Completed "
msgstr ""
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2212
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2213
msgid "Completed "
msgstr ""
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2217
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2218
msgid " (Due "
msgstr ""
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2219
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2220
msgid "Due "
msgstr ""
@@ -4526,7 +4540,7 @@ msgstr ""
msgid "Enter Delegate"
msgstr ""
-#: calendar/gui/dialogs/event-editor.c:197 calendar/gui/print.c:2245
+#: calendar/gui/dialogs/event-editor.c:197 calendar/gui/print.c:2246
msgid "Appointment"
msgstr ""
@@ -4631,19 +4645,19 @@ msgstr ""
msgid "_Start time:"
msgstr ""
-#: calendar/gui/dialogs/meeting-page.c:393
+#: calendar/gui/dialogs/meeting-page.c:392
msgid "An organizer is required."
msgstr ""
-#: calendar/gui/dialogs/meeting-page.c:417
+#: calendar/gui/dialogs/meeting-page.c:416
msgid "At least one attendee is required."
msgstr ""
-#: calendar/gui/dialogs/meeting-page.c:573
+#: calendar/gui/dialogs/meeting-page.c:572
msgid "That person is already attending the meeting!"
msgstr ""
-#: calendar/gui/dialogs/meeting-page.c:648
+#: calendar/gui/dialogs/meeting-page.c:647
msgid "_Delegate To..."
msgstr ""
@@ -4705,26 +4719,31 @@ msgid "_Change Organizer"
msgstr ""
#: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-meeting-time-sel.c:425
+#: calendar/gui/e-meeting-time-sel.c:424
msgid "_Invite Others..."
msgstr ""
-#: calendar/gui/dialogs/recurrence-page.c:132
-#: calendar/gui/dialogs/recurrence-page.c:152
-#: calendar/gui/dialogs/recurrence-page.c:162
+#: calendar/gui/dialogs/recurrence-page.c:127
+#: calendar/gui/dialogs/recurrence-page.c:147
+#: calendar/gui/dialogs/recurrence-page.c:157
msgid "st"
msgstr ""
-#: calendar/gui/dialogs/recurrence-page.c:133
-#: calendar/gui/dialogs/recurrence-page.c:153
+#: calendar/gui/dialogs/recurrence-page.c:128
+#: calendar/gui/dialogs/recurrence-page.c:148
msgid "nd"
msgstr ""
-#: calendar/gui/dialogs/recurrence-page.c:134
-#: calendar/gui/dialogs/recurrence-page.c:154
+#: calendar/gui/dialogs/recurrence-page.c:129
+#: calendar/gui/dialogs/recurrence-page.c:149
msgid "rd"
msgstr "rd$"
+#: calendar/gui/dialogs/recurrence-page.c:130
+#: calendar/gui/dialogs/recurrence-page.c:131
+#: calendar/gui/dialogs/recurrence-page.c:132
+#: calendar/gui/dialogs/recurrence-page.c:133
+#: calendar/gui/dialogs/recurrence-page.c:134
#: calendar/gui/dialogs/recurrence-page.c:135
#: calendar/gui/dialogs/recurrence-page.c:136
#: calendar/gui/dialogs/recurrence-page.c:137
@@ -4737,66 +4756,61 @@ msgstr "rd$"
#: calendar/gui/dialogs/recurrence-page.c:144
#: calendar/gui/dialogs/recurrence-page.c:145
#: calendar/gui/dialogs/recurrence-page.c:146
-#: calendar/gui/dialogs/recurrence-page.c:147
-#: calendar/gui/dialogs/recurrence-page.c:148
-#: calendar/gui/dialogs/recurrence-page.c:149
#: calendar/gui/dialogs/recurrence-page.c:150
#: calendar/gui/dialogs/recurrence-page.c:151
+#: calendar/gui/dialogs/recurrence-page.c:152
+#: calendar/gui/dialogs/recurrence-page.c:153
+#: calendar/gui/dialogs/recurrence-page.c:154
#: calendar/gui/dialogs/recurrence-page.c:155
#: calendar/gui/dialogs/recurrence-page.c:156
-#: calendar/gui/dialogs/recurrence-page.c:157
-#: calendar/gui/dialogs/recurrence-page.c:158
-#: calendar/gui/dialogs/recurrence-page.c:159
-#: calendar/gui/dialogs/recurrence-page.c:160
-#: calendar/gui/dialogs/recurrence-page.c:161
msgid "th"
msgstr ""
-#: calendar/gui/dialogs/recurrence-page.c:582
+#: calendar/gui/dialogs/recurrence-page.c:610
msgid "This appointment contains recurrences that Evolution cannot edit."
msgstr ""
-#: calendar/gui/dialogs/recurrence-page.c:858
+#: calendar/gui/dialogs/recurrence-page.c:879
msgid "Recurrent date is wrong"
msgstr ""
-#: calendar/gui/dialogs/recurrence-page.c:963
+#: calendar/gui/dialogs/recurrence-page.c:988
msgid "on"
msgstr "አብራ"
-#: calendar/gui/dialogs/recurrence-page.c:1028
+#: calendar/gui/dialogs/recurrence-page.c:1053
msgid "first"
msgstr "መጀመሪያ"
-#: calendar/gui/dialogs/recurrence-page.c:1029 filter/filter-datespec.c:65
+#: calendar/gui/dialogs/recurrence-page.c:1054 filter/filter-datespec.c:65
msgid "second"
msgstr "ሁለተኛ"
-#: calendar/gui/dialogs/recurrence-page.c:1030
+#: calendar/gui/dialogs/recurrence-page.c:1055
msgid "third"
msgstr ""
-#: calendar/gui/dialogs/recurrence-page.c:1031
+#: calendar/gui/dialogs/recurrence-page.c:1056
msgid "fourth"
msgstr ""
-#: calendar/gui/dialogs/recurrence-page.c:1032
+#: calendar/gui/dialogs/recurrence-page.c:1057
msgid "last"
msgstr "መጨረሻ"
-#: calendar/gui/dialogs/recurrence-page.c:1058
+#: calendar/gui/dialogs/recurrence-page.c:1083
msgid "Other Date"
msgstr ""
-#: calendar/gui/dialogs/recurrence-page.c:1086 filter/filter-datespec.c:68
+#: calendar/gui/dialogs/recurrence-page.c:1111 filter/filter-datespec.c:68
msgid "day"
msgstr "ቀን ኦች"
-#: calendar/gui/dialogs/recurrence-page.c:1226
+#: calendar/gui/dialogs/recurrence-page.c:1251
msgid "on the"
msgstr ""
-#: calendar/gui/dialogs/recurrence-page.c:1411
+#: calendar/gui/dialogs/recurrence-page.c:1436
msgid "occurrences"
msgstr ""
@@ -4901,7 +4915,7 @@ msgid "Progress"
msgstr "ይሻሻል"
#: calendar/gui/dialogs/task-details-page.glade.h:13
-#: my-evolution/e-summary-preferences.c:630
+#: my-evolution/e-summary-preferences.c:627
msgid "URL:"
msgstr "url"
@@ -4985,13 +4999,13 @@ msgstr ""
msgid "100%"
msgstr "100"
-#: calendar/gui/e-calendar-table.c:715 calendar/gui/e-day-view.c:2821
+#: calendar/gui/e-calendar-table.c:715 calendar/gui/e-day-view.c:2818
#: calendar/gui/e-week-view.c:1863
msgid "Deleting selected objects"
msgstr ""
-#: calendar/gui/e-calendar-table.c:949 calendar/gui/e-day-view.c:3704
-#: calendar/gui/e-week-view.c:3483 mail/folder-browser.c:1806
+#: calendar/gui/e-calendar-table.c:949 calendar/gui/e-day-view.c:3701
+#: calendar/gui/e-week-view.c:3483 mail/folder-browser.c:1743
#: shell/e-shortcuts-view.c:409 ui/evolution-addressbook.xml.h:36
msgid "_Open"
msgstr "ክፈት"
@@ -5000,7 +5014,7 @@ msgstr "ክፈት"
msgid "_Save as..."
msgstr "በሌላ ስም አስቀምጥ"
-#: calendar/gui/e-calendar-table.c:951 calendar/gui/e-day-view.c:3706
+#: calendar/gui/e-calendar-table.c:951 calendar/gui/e-day-view.c:3703
#: calendar/gui/e-week-view.c:3458 calendar/gui/e-week-view.c:3485
#: ui/evolution-addressbook.xml.h:38 ui/evolution-calendar.xml.h:30
#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:108
@@ -5008,21 +5022,21 @@ msgstr "በሌላ ስም አስቀምጥ"
msgid "_Print..."
msgstr "አትም"
-#: calendar/gui/e-calendar-table.c:955 calendar/gui/e-day-view.c:3711
+#: calendar/gui/e-calendar-table.c:955 calendar/gui/e-day-view.c:3708
#: calendar/gui/e-week-view.c:3490 ui/evolution-addressbook.xml.h:1
#: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
msgid "C_ut"
msgstr "ቁረጥ"
-#: calendar/gui/e-calendar-table.c:956 calendar/gui/e-day-view.c:3712
+#: calendar/gui/e-calendar-table.c:956 calendar/gui/e-day-view.c:3709
#: calendar/gui/e-week-view.c:3491 ui/evolution-addressbook.xml.h:30
#: ui/evolution-calendar.xml.h:26 ui/evolution-mail-list.xml.h:24
#: ui/evolution-tasks.xml.h:15
msgid "_Copy"
msgstr "ቅጂ"
-#: calendar/gui/e-calendar-table.c:957 calendar/gui/e-day-view.c:3677
-#: calendar/gui/e-day-view.c:3713 calendar/gui/e-week-view.c:3462
+#: calendar/gui/e-calendar-table.c:957 calendar/gui/e-day-view.c:3674
+#: calendar/gui/e-day-view.c:3710 calendar/gui/e-week-view.c:3462
#: calendar/gui/e-week-view.c:3492 ui/evolution-addressbook.xml.h:37
#: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
#: ui/evolution-tasks.xml.h:19
@@ -5049,7 +5063,7 @@ msgstr ""
msgid "_Delete Selected Tasks"
msgstr ""
-#: calendar/gui/e-calendar-table.c:1239 calendar/gui/e-day-view.c:7536
+#: calendar/gui/e-calendar-table.c:1239 calendar/gui/e-day-view.c:7533
#: calendar/gui/e-week-view.c:4177
msgid "Updating objects"
msgstr ""
@@ -5124,91 +5138,91 @@ msgstr ""
#. String to use in 12-hour time format for times in the morning.
#: calendar/gui/e-day-view.c:613 calendar/gui/e-week-view.c:347
-#: calendar/gui/print.c:789
+#: calendar/gui/print.c:790
msgid "am"
msgstr "ጠዋት"
#. String to use in 12-hour time format for times in the afternoon.
#: calendar/gui/e-day-view.c:616 calendar/gui/e-week-view.c:350
-#: calendar/gui/print.c:791
+#: calendar/gui/print.c:792
msgid "pm"
msgstr "ከሳዓት"
#. strftime format %A = full weekday name, %d = day of month,
#. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view.c:1370 calendar/gui/e-day-view-top-item.c:261
-#: calendar/gui/e-week-view-main-item.c:302 calendar/gui/print.c:1505
+#: calendar/gui/e-day-view.c:1367 calendar/gui/e-day-view-top-item.c:261
+#: calendar/gui/e-week-view-main-item.c:302 calendar/gui/print.c:1506
msgid "%A %d %B"
msgstr "%A %d %B"
#. strftime format %d = day of month, %b = abbreviated month name.
#. Don't use any other specifiers.
-#: calendar/gui/e-day-view.c:1397 calendar/gui/e-day-view-top-item.c:269
+#: calendar/gui/e-day-view.c:1394 calendar/gui/e-day-view-top-item.c:269
#: calendar/gui/e-week-view-main-item.c:325
msgid "%d %b"
msgstr "%d %b"
-#: calendar/gui/e-day-view.c:3661
+#: calendar/gui/e-day-view.c:3658
msgid "New _Appointment"
msgstr ""
-#: calendar/gui/e-day-view.c:3663 calendar/gui/e-week-view.c:3452
+#: calendar/gui/e-day-view.c:3660 calendar/gui/e-week-view.c:3452
msgid "New All Day _Event"
msgstr ""
-#: calendar/gui/e-day-view.c:3665 calendar/gui/e-week-view.c:3453
+#: calendar/gui/e-day-view.c:3662 calendar/gui/e-week-view.c:3453
msgid "New Meeting"
msgstr ""
-#: calendar/gui/e-day-view.c:3667 calendar/gui/e-week-view.c:3454
+#: calendar/gui/e-day-view.c:3664 calendar/gui/e-week-view.c:3454
msgid "New Task"
msgstr ""
-#: calendar/gui/e-day-view.c:3672 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3669 ui/evolution-comp-editor.xml.h:11
msgid "Print..."
msgstr "አትም"
-#: calendar/gui/e-day-view.c:3684 calendar/gui/e-week-view.c:3468
+#: calendar/gui/e-day-view.c:3681 calendar/gui/e-week-view.c:3468
#: ui/evolution-calendar.xml.h:10
msgid "Go to _Today"
msgstr ""
-#: calendar/gui/e-day-view.c:3686 calendar/gui/e-week-view.c:3469
+#: calendar/gui/e-day-view.c:3683 calendar/gui/e-week-view.c:3469
msgid "_Go to Date..."
msgstr ""
-#: calendar/gui/e-day-view.c:3691 calendar/gui/e-week-view.c:3473
+#: calendar/gui/e-day-view.c:3688 calendar/gui/e-week-view.c:3473
#: ui/evolution-calendar.xml.h:31
msgid "_Publish Free/Busy Information"
msgstr ""
-#: calendar/gui/e-day-view.c:3696 calendar/gui/e-week-view.c:3477
+#: calendar/gui/e-day-view.c:3693 calendar/gui/e-week-view.c:3477
#: ui/evolution.xml.h:62
msgid "_Settings..."
msgstr "ምርጫዎች"
-#: calendar/gui/e-day-view.c:3705 calendar/gui/e-week-view.c:3484
-#: mail/folder-browser.c:1808 ui/evolution-mail-message.xml.h:112
+#: calendar/gui/e-day-view.c:3702 calendar/gui/e-week-view.c:3484
+#: mail/folder-browser.c:1745 ui/evolution-mail-message.xml.h:112
msgid "_Save As..."
msgstr "በሌላ ስም አስቀምጥ"
-#: calendar/gui/e-day-view.c:3717 calendar/gui/e-week-view.c:3496
+#: calendar/gui/e-day-view.c:3714 calendar/gui/e-week-view.c:3496
msgid "_Schedule Meeting..."
msgstr ""
-#: calendar/gui/e-day-view.c:3718 calendar/gui/e-week-view.c:3497
+#: calendar/gui/e-day-view.c:3715 calendar/gui/e-week-view.c:3497
msgid "_Forward as iCalendar..."
msgstr ""
-#: calendar/gui/e-day-view.c:3723 calendar/gui/e-week-view.c:3502
+#: calendar/gui/e-day-view.c:3720 calendar/gui/e-week-view.c:3502
msgid "Make this Occurrence _Movable"
msgstr ""
-#: calendar/gui/e-day-view.c:3724 calendar/gui/e-week-view.c:3503
+#: calendar/gui/e-day-view.c:3721 calendar/gui/e-week-view.c:3503
msgid "Delete this _Occurrence"
msgstr ""
-#: calendar/gui/e-day-view.c:3725 calendar/gui/e-week-view.c:3504
+#: calendar/gui/e-day-view.c:3722 calendar/gui/e-week-view.c:3504
msgid "Delete _All Occurrences"
msgstr ""
@@ -5288,8 +5302,8 @@ msgstr ""
#: calendar/gui/e-meeting-model.c:826 camel/camel-gpg-context.c:1531
#: camel/camel-gpg-context.c:1581 camel/camel-tcp-stream-openssl.c:629
#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:364
-#: mail/mail-display.c:918 widgets/misc/e-charset-picker.c:59
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:339
+#: mail/mail-display.c:907 widgets/misc/e-charset-picker.c:59
#: widgets/misc/e-charset-picker.c:446
msgid "Unknown"
msgstr "ያልታወቀ"
@@ -5307,7 +5321,7 @@ msgstr "አሻሽል"
#: calendar/gui/e-itip-control.c:898 calendar/gui/e-itip-control.c:929
#: calendar/gui/e-itip-control.c:952 calendar/gui/e-itip-control.c:965
#: calendar/gui/e-itip-control.c:978 calendar/gui/e-itip-control.c:991
-#: shell/e-shell.c:2088 widgets/misc/e-cell-date-edit.c:262
+#: shell/e-shell.c:2084 widgets/misc/e-cell-date-edit.c:262
msgid "OK"
msgstr "እሺ"
@@ -5336,7 +5350,7 @@ msgid "Send Latest Information"
msgstr ""
#: calendar/gui/e-itip-control.c:990 calendar/gui/itip-utils.c:506
-#: shell/evolution-shell-component.c:1152 ui/evolution-mail-global.xml.h:1
+#: shell/evolution-shell-component.c:1155 ui/evolution-mail-global.xml.h:1
msgid "Cancel"
msgstr "ተወው"
@@ -5681,7 +5695,7 @@ msgid "Non-Participant"
msgstr ""
#: calendar/gui/e-meeting-model.c:301 calendar/gui/e-meeting-model.c:324
-#: calendar/gui/e-meeting-model.c:854 calendar/gui/e-meeting-time-sel.c:406
+#: calendar/gui/e-meeting-model.c:854 calendar/gui/e-meeting-time-sel.c:405
msgid "Tentative"
msgstr ""
@@ -5694,76 +5708,76 @@ msgstr ""
msgid "In Process"
msgstr ""
-#: calendar/gui/e-meeting-time-sel.c:408
+#: calendar/gui/e-meeting-time-sel.c:407
msgid "Out of Office"
msgstr ""
-#: calendar/gui/e-meeting-time-sel.c:409
+#: calendar/gui/e-meeting-time-sel.c:408
msgid "No Information"
msgstr ""
-#: calendar/gui/e-meeting-time-sel.c:447
+#: calendar/gui/e-meeting-time-sel.c:446
msgid "_Options"
msgstr "ምርጫዎች"
-#: calendar/gui/e-meeting-time-sel.c:466
+#: calendar/gui/e-meeting-time-sel.c:465
msgid "Show _Only Working Hours"
msgstr ""
-#: calendar/gui/e-meeting-time-sel.c:480
+#: calendar/gui/e-meeting-time-sel.c:478
msgid "Show _Zoomed Out"
msgstr ""
-#: calendar/gui/e-meeting-time-sel.c:498
+#: calendar/gui/e-meeting-time-sel.c:496
msgid "_Update Free/Busy"
msgstr ""
-#: calendar/gui/e-meeting-time-sel.c:516
+#: calendar/gui/e-meeting-time-sel.c:514
msgid "_<<"
msgstr "_<<"
-#: calendar/gui/e-meeting-time-sel.c:533
+#: calendar/gui/e-meeting-time-sel.c:531
msgid "_Autopick"
msgstr ""
-#: calendar/gui/e-meeting-time-sel.c:547
+#: calendar/gui/e-meeting-time-sel.c:545
msgid ">_>"
msgstr ">_>"
-#: calendar/gui/e-meeting-time-sel.c:566
+#: calendar/gui/e-meeting-time-sel.c:564
msgid "_All People and Resources"
msgstr ""
-#: calendar/gui/e-meeting-time-sel.c:579
+#: calendar/gui/e-meeting-time-sel.c:577
msgid "All _People and One Resource"
msgstr ""
-#: calendar/gui/e-meeting-time-sel.c:592
+#: calendar/gui/e-meeting-time-sel.c:590
msgid "_Required People"
msgstr ""
-#: calendar/gui/e-meeting-time-sel.c:605
+#: calendar/gui/e-meeting-time-sel.c:603
msgid "Required People and _One Resource"
msgstr ""
-#: calendar/gui/e-meeting-time-sel.c:628
+#: calendar/gui/e-meeting-time-sel.c:626
msgid "Meeting _start time:"
msgstr ""
-#: calendar/gui/e-meeting-time-sel.c:647
+#: calendar/gui/e-meeting-time-sel.c:645
msgid "Meeting _end time:"
msgstr ""
#. This is a strftime() format string %A = full weekday name,
#. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel.c:2072
+#: calendar/gui/e-meeting-time-sel.c:2070
#: calendar/gui/e-meeting-time-sel-item.c:453
msgid "%A, %B %d, %Y"
msgstr "a,"
#. This is a strftime() format string %a = abbreviated weekday name,
#. %m = month number, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel.c:2102
+#: calendar/gui/e-meeting-time-sel.c:2100
#: calendar/gui/e-meeting-time-sel-item.c:457 e-util/e-time-utils.c:189
#: e-util/e-time-utils.c:282 e-util/e-time-utils.c:370
msgid "%a %m/%d/%Y"
@@ -5776,43 +5790,43 @@ msgstr "d"
msgid "%m/%d/%Y"
msgstr "d"
-#: calendar/gui/e-tasks.c:356 calendar/gui/gnome-cal.c:2011
-#: calendar/gui/gnome-cal.c:2022
+#: calendar/gui/e-tasks.c:355 calendar/gui/gnome-cal.c:2012
+#: calendar/gui/gnome-cal.c:2023
#, c-format
msgid "Opening tasks at %s"
msgstr ""
-#: calendar/gui/e-tasks.c:385 calendar/gui/tasks-control.c:196
+#: calendar/gui/e-tasks.c:384 calendar/gui/tasks-control.c:197
#, c-format
msgid "Could not load the tasks in `%s'"
msgstr ""
-#: calendar/gui/e-tasks.c:400
+#: calendar/gui/e-tasks.c:399
#, c-format
msgid "The method required to load `%s' is not supported"
msgstr ""
-#: calendar/gui/e-tasks.c:414 calendar/gui/gnome-cal.c:1531
+#: calendar/gui/e-tasks.c:413 calendar/gui/gnome-cal.c:1532
#, c-format
msgid "You don't have permission to open the folder in `%s'"
msgstr ""
-#: calendar/gui/e-tasks.c:482 calendar/gui/gnome-cal.c:1735
+#: calendar/gui/e-tasks.c:481 calendar/gui/gnome-cal.c:1736
#, c-format
msgid ""
"Error on %s:\n"
" %s"
msgstr ""
-#: calendar/gui/e-tasks.c:554
+#: calendar/gui/e-tasks.c:553
msgid "Completing tasks..."
msgstr ""
-#: calendar/gui/e-tasks.c:577
+#: calendar/gui/e-tasks.c:576
msgid "Deleting selected objects..."
msgstr ""
-#: calendar/gui/e-tasks.c:672
+#: calendar/gui/e-tasks.c:671
msgid "Expunging"
msgstr ""
@@ -5820,22 +5834,22 @@ msgstr ""
msgid "New _Appointment..."
msgstr ""
-#: calendar/gui/gnome-cal.c:1503
+#: calendar/gui/gnome-cal.c:1504
#, c-format
msgid "Could not open the folder in `%s'"
msgstr ""
-#: calendar/gui/gnome-cal.c:1517
+#: calendar/gui/gnome-cal.c:1518
#, c-format
msgid "The method required to open `%s' is not supported"
msgstr ""
-#: calendar/gui/gnome-cal.c:1563
+#: calendar/gui/gnome-cal.c:1564
#, c-format
msgid "Adding alarms for %s"
msgstr ""
-#: calendar/gui/gnome-cal.c:1755
+#: calendar/gui/gnome-cal.c:1756
#, c-format
msgid ""
"The calendar backend for\n"
@@ -5843,7 +5857,7 @@ msgid ""
" has crashed. You will have to restart Evolution in order to use it again"
msgstr ""
-#: calendar/gui/gnome-cal.c:1764
+#: calendar/gui/gnome-cal.c:1765
#, c-format
msgid ""
"The task backend for\n"
@@ -5851,12 +5865,12 @@ msgid ""
" has crashed. You will have to restart Evolution in order to use it again"
msgstr ""
-#: calendar/gui/gnome-cal.c:1993
+#: calendar/gui/gnome-cal.c:1994
#, c-format
msgid "Opening calendar at %s"
msgstr ""
-#: calendar/gui/gnome-cal.c:2033
+#: calendar/gui/gnome-cal.c:2034
msgid "Opening default tasks folder"
msgstr ""
@@ -5889,13 +5903,25 @@ msgid "Evolution component for handling the calendar."
msgstr ""
#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Factory for the Evolution Calendar objects"
+msgid "Factory for the Evolution Tasks control"
msgstr ""
#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Factory for the calendar iTip view control"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+msgid "Factory for the sample Calendar control"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
msgid "Factory to centralize calendar component editor dialogs"
msgstr ""
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+msgid "Factory to create a component editor factory"
+msgstr ""
+
#: calendar/gui/goto-dialog.glade.h:1
msgid "April"
msgstr "ኤፕረል"
@@ -6005,243 +6031,255 @@ msgstr ""
msgid "You must be an attendee of the event."
msgstr ""
-#: calendar/gui/print.c:454
+#: calendar/gui/main.c:60
+msgid "Could not initialize GNOME"
+msgstr ""
+
+#: calendar/gui/main.c:66
+msgid "Could not activate Bonobo"
+msgstr ""
+
+#: calendar/gui/main.c:95
+msgid "Could not create the component editor factory"
+msgstr ""
+
+#: calendar/gui/print.c:455
msgid "1st"
msgstr "1ኛ"
-#: calendar/gui/print.c:454
+#: calendar/gui/print.c:455
msgid "2nd"
msgstr "2ኛ"
-#: calendar/gui/print.c:454
+#: calendar/gui/print.c:455
msgid "3rd"
msgstr "3ኛ"
-#: calendar/gui/print.c:454
+#: calendar/gui/print.c:455
msgid "4th"
msgstr "4ኛ"
-#: calendar/gui/print.c:454
+#: calendar/gui/print.c:455
msgid "5th"
msgstr "5ኛ"
-#: calendar/gui/print.c:455
+#: calendar/gui/print.c:456
msgid "6th"
msgstr "6ኛ"
-#: calendar/gui/print.c:455
+#: calendar/gui/print.c:456
msgid "7th"
msgstr "7ኛ"
-#: calendar/gui/print.c:455
+#: calendar/gui/print.c:456
msgid "8th"
msgstr "8ኛ"
-#: calendar/gui/print.c:455
+#: calendar/gui/print.c:456
msgid "9th"
msgstr "9ኛ"
-#: calendar/gui/print.c:455
+#: calendar/gui/print.c:456
msgid "10th"
msgstr "10ኛ"
-#: calendar/gui/print.c:456
+#: calendar/gui/print.c:457
msgid "11th"
msgstr "11ኛ"
-#: calendar/gui/print.c:456
+#: calendar/gui/print.c:457
msgid "12th"
msgstr "12ኛ"
-#: calendar/gui/print.c:456
+#: calendar/gui/print.c:457
msgid "13th"
msgstr "13ኛ"
-#: calendar/gui/print.c:456
+#: calendar/gui/print.c:457
msgid "14th"
msgstr "14ኛ"
-#: calendar/gui/print.c:456
+#: calendar/gui/print.c:457
msgid "15th"
msgstr "15ኛ"
-#: calendar/gui/print.c:457
+#: calendar/gui/print.c:458
msgid "16th"
msgstr "16ኛ"
-#: calendar/gui/print.c:457
+#: calendar/gui/print.c:458
msgid "17th"
msgstr "17ኛ"
-#: calendar/gui/print.c:457
+#: calendar/gui/print.c:458
msgid "18th"
msgstr "18ኛ"
-#: calendar/gui/print.c:457
+#: calendar/gui/print.c:458
msgid "19th"
msgstr "19ኛ"
-#: calendar/gui/print.c:457
+#: calendar/gui/print.c:458
msgid "20th"
msgstr "20ኛ"
-#: calendar/gui/print.c:458
+#: calendar/gui/print.c:459
msgid "21st"
msgstr "21ኛ"
-#: calendar/gui/print.c:458
+#: calendar/gui/print.c:459
msgid "22nd"
msgstr "22ኛ"
-#: calendar/gui/print.c:458
+#: calendar/gui/print.c:459
msgid "23rd"
msgstr "23ኛ"
-#: calendar/gui/print.c:458
+#: calendar/gui/print.c:459
msgid "24th"
msgstr "24ኛ"
-#: calendar/gui/print.c:458
+#: calendar/gui/print.c:459
msgid "25th"
msgstr "25ኛ"
-#: calendar/gui/print.c:459
+#: calendar/gui/print.c:460
msgid "26th"
msgstr "26ኛ"
-#: calendar/gui/print.c:459
+#: calendar/gui/print.c:460
msgid "27th"
msgstr "27ኛ"
-#: calendar/gui/print.c:459
+#: calendar/gui/print.c:460
msgid "28th"
msgstr "28ኛ"
-#: calendar/gui/print.c:459
+#: calendar/gui/print.c:460
msgid "29th"
msgstr "29ኛ"
-#: calendar/gui/print.c:459
+#: calendar/gui/print.c:460
msgid "30th"
msgstr "30ኛ"
-#: calendar/gui/print.c:460
+#: calendar/gui/print.c:461
msgid "31st"
msgstr "31ኛ"
-#: calendar/gui/print.c:527
+#: calendar/gui/print.c:528
msgid "Su"
msgstr "እ"
-#: calendar/gui/print.c:527
+#: calendar/gui/print.c:528
msgid "Mo"
msgstr "ሳ"
-#: calendar/gui/print.c:527
+#: calendar/gui/print.c:528
msgid "Tu"
msgstr "ማ"
-#: calendar/gui/print.c:527
+#: calendar/gui/print.c:528
msgid "We"
msgstr "ረ"
-#: calendar/gui/print.c:528
+#: calendar/gui/print.c:529
msgid "Th"
msgstr "ሐ"
-#: calendar/gui/print.c:528
+#: calendar/gui/print.c:529
msgid "Fr"
msgstr "ዓ"
-#: calendar/gui/print.c:528
+#: calendar/gui/print.c:529
msgid "Sa"
msgstr "ቅ"
#. Day
-#: calendar/gui/print.c:1861
+#: calendar/gui/print.c:1862
msgid "Selected day (%a %b %d %Y)"
msgstr ""
-#: calendar/gui/print.c:1886 calendar/gui/print.c:1890
+#: calendar/gui/print.c:1887 calendar/gui/print.c:1891
msgid "%a %b %d"
msgstr "%a %b %d"
-#: calendar/gui/print.c:1887
+#: calendar/gui/print.c:1888
msgid "%a %d %Y"
msgstr "%a %d %Y"
-#: calendar/gui/print.c:1891 calendar/gui/print.c:1893
-#: calendar/gui/print.c:1894
+#: calendar/gui/print.c:1892 calendar/gui/print.c:1894
+#: calendar/gui/print.c:1895
msgid "%a %b %d %Y"
msgstr "%a %b %d %Y"
-#: calendar/gui/print.c:1898
+#: calendar/gui/print.c:1899
#, c-format
msgid "Selected week (%s - %s)"
msgstr ""
#. Month
-#: calendar/gui/print.c:1906
+#: calendar/gui/print.c:1907
msgid "Selected month (%b %Y)"
msgstr ""
#. Year
-#: calendar/gui/print.c:1913
+#: calendar/gui/print.c:1914
msgid "Selected year (%Y)"
msgstr ""
-#: calendar/gui/print.c:2247
+#: calendar/gui/print.c:2248
msgid "Task"
msgstr ""
-#: calendar/gui/print.c:2304
+#: calendar/gui/print.c:2305
#, c-format
msgid "Status: %s"
msgstr "ሁኔታ፦ %s"
-#: calendar/gui/print.c:2322
+#: calendar/gui/print.c:2323
#, c-format
msgid "Priority: %s"
msgstr "ቅድሚያ፦ %s"
-#: calendar/gui/print.c:2336
+#: calendar/gui/print.c:2337
#, c-format
msgid "Percent Complete: %i"
msgstr ""
-#: calendar/gui/print.c:2348
+#: calendar/gui/print.c:2349
#, c-format
msgid "URL: %s"
msgstr "URL፦ %s"
-#: calendar/gui/print.c:2362
+#: calendar/gui/print.c:2363
#, c-format
msgid "Categories: %s"
msgstr "ምድቦች፦ %s"
-#: calendar/gui/print.c:2373
+#: calendar/gui/print.c:2374
msgid "Contacts: "
msgstr ""
-#: calendar/gui/print.c:2518 calendar/gui/print.c:2612
-#: calendar/gui/tasks-control.c:590 mail/mail-callbacks.c:2917
-#: my-evolution/e-summary.c:617
+#: calendar/gui/print.c:2519 calendar/gui/print.c:2613
+#: calendar/gui/tasks-control.c:591 mail/mail-callbacks.c:2989
+#: my-evolution/e-summary.c:619
msgid "Print Preview"
msgstr "የቅድመ ህትመት ዕይታ"
-#: calendar/gui/print.c:2549
+#: calendar/gui/print.c:2550
msgid "Print Item"
msgstr ""
-#: calendar/gui/print.c:2632
+#: calendar/gui/print.c:2633
msgid "Print Setup"
msgstr "የህትመት ቅንጅት"
-#: calendar/gui/tasks-control.c:147
+#: calendar/gui/tasks-control.c:148
msgid "The URI of the tasks folder to display"
msgstr ""
-#: calendar/gui/tasks-control.c:462
+#: calendar/gui/tasks-control.c:463
msgid ""
"This operation will permanently erase all tasks marked as completed. If you "
"continue, you will not be able to recover these tasks.\n"
@@ -6249,21 +6287,25 @@ msgid ""
"Really erase these tasks?"
msgstr ""
-#: calendar/gui/tasks-control.c:469
+#: calendar/gui/tasks-control.c:470
msgid "Do not ask me again."
msgstr ""
-#: calendar/gui/tasks-control.c:621
+#: calendar/gui/tasks-control.c:622
msgid "Print Tasks"
msgstr ""
-#: calendar/gui/tasks-migrate.c:105
+#: calendar/gui/tasks-control-factory.c:74
+msgid "Could not create the tasks view. Please check your ORBit and OAF setup."
+msgstr ""
+
+#: calendar/gui/tasks-migrate.c:104
msgid ""
"Evolution has taken the tasks that were in your calendar folder and "
"automatically migrated them to the new tasks folder."
msgstr ""
-#: calendar/gui/tasks-migrate.c:108
+#: calendar/gui/tasks-migrate.c:107
msgid ""
"Evolution has tried to take the tasks that were in your calendar folder and "
"migrate them to the new tasks folder.\n"
@@ -6271,18 +6313,18 @@ msgid ""
"again in the future."
msgstr ""
-#: calendar/gui/tasks-migrate.c:120
+#: calendar/gui/tasks-migrate.c:119
#, c-format
msgid ""
"Could not open `%s'; no items from the calendar folder will be migrated to "
"the tasks folder."
msgstr ""
-#: calendar/gui/tasks-migrate.c:133
+#: calendar/gui/tasks-migrate.c:132
#, c-format
msgid ""
-"The method required to load `%s' is not supported; no items from the "
-"calendar folder will be migrated to the tasks folder."
+"The method required to load `%s' is not supported; no items from the calendar "
+"folder will be migrated to the tasks folder."
msgstr ""
#: calendar/gui/weekday-picker.c:280 calendar/gui/weekday-picker.c:377
@@ -6301,31 +6343,31 @@ msgstr ""
msgid "Imports vCalendar files into Evolution"
msgstr ""
-#: calendar/importers/icalendar-importer.c:169
+#: calendar/importers/icalendar-importer.c:166
#, c-format
msgid "Can't get storage list from registry: %s"
msgstr ""
-#: calendar/importers/icalendar-importer.c:181
+#: calendar/importers/icalendar-importer.c:178
#, c-format
msgid "Can't call getFolderAtPath on storage: %s"
msgstr ""
-#: calendar/importers/icalendar-importer.c:484
+#: calendar/importers/icalendar-importer.c:481
msgid "Reminder!!"
msgstr ""
-#: calendar/importers/icalendar-importer.c:698
+#: calendar/importers/icalendar-importer.c:695
msgid "Calendar Events"
msgstr ""
-#: calendar/importers/icalendar-importer.c:723
+#: calendar/importers/icalendar-importer.c:720
msgid ""
"Evolution has found Gnome Calendar files.\n"
"Would you like to import them into Evolution?"
msgstr ""
-#: calendar/importers/icalendar-importer.c:730
+#: calendar/importers/icalendar-importer.c:727
msgid "Gnome Calendar"
msgstr ""
@@ -6403,8 +6445,8 @@ msgstr ""
#: calendar/pcs/query.c:734
msgid ""
-"contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
-"\""
+"contains? expects argument 1 to be one of \"any\", \"summary\", "
+"\"description\""
msgstr ""
#: calendar/pcs/query.c:776
@@ -8176,7 +8218,7 @@ msgstr ""
#: camel/camel-gpg-context.c:780 camel/camel-gpg-context.c:1246
#: camel/camel-gpg-context.c:1353 camel/camel-gpg-context.c:1428
-#: camel/camel-gpg-context.c:1485 mail/mail-send-recv.c:565
+#: camel/camel-gpg-context.c:1485 mail/mail-send-recv.c:544
msgid "Cancelled."
msgstr ""
@@ -8405,8 +8447,8 @@ msgstr ""
#: camel/camel-sasl-digest-md5.c:45
msgid ""
-"This option will connect to the server using a secure DIGEST-MD5 password, "
-"if the server supports it."
+"This option will connect to the server using a secure DIGEST-MD5 password, if "
+"the server supports it."
msgstr ""
#: camel/camel-sasl-digest-md5.c:810
@@ -8559,12 +8601,12 @@ msgstr ""
msgid "For reading mail as a query of another set of folders"
msgstr ""
-#: camel/camel-session.c:354 camel/camel-session.c:422
+#: camel/camel-session.c:351 camel/camel-session.c:419
#, c-format
msgid "No provider available for protocol `%s'"
msgstr ""
-#: camel/camel-session.c:548
+#: camel/camel-session.c:545
#, c-format
msgid ""
"Could not create directory %s:\n"
@@ -8969,7 +9011,7 @@ msgstr ""
msgid "Check for new messages in all folders"
msgstr ""
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1134
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1154
msgid "Folders"
msgstr "ዶሴዎች"
@@ -9084,8 +9126,7 @@ msgstr ""
#: camel/providers/imap/camel-imap-store.c:1838
#, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it containes the character \"%c\""
+msgid "The folder name \"%s\" is invalid because it containes the character \"%c\""
msgstr ""
#: camel/providers/imap/camel-imap-store.c:1850
@@ -9193,7 +9234,7 @@ msgstr ""
msgid "Local mail file %s"
msgstr ""
-#: camel/providers/local/camel-local-store.c:308 mail/mail-local.c:904
+#: camel/providers/local/camel-local-store.c:308 mail/mail-local.c:905
#, c-format
msgid "Could not rename folder %s to %s: %s"
msgstr ""
@@ -9676,8 +9717,8 @@ msgstr ""
#: camel/providers/pop3/camel-pop3-provider.c:81
msgid ""
"This option will connect to the POP server using an encrypted password via "
-"the APOP protocol. This may not work for all users even on servers that "
-"claim to support it."
+"the APOP protocol. This may not work for all users even on servers that claim "
+"to support it."
msgstr ""
#: camel/providers/pop3/camel-pop3-store.c:183
@@ -9958,7 +9999,7 @@ msgstr ""
msgid "Sending message"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:704
+#: camel/providers/smtp/camel-smtp-transport.c:703
msgid "Cannot send message: no recipients defined."
msgstr ""
@@ -10060,35 +10101,35 @@ msgstr ""
msgid "QUIT response error"
msgstr ""
-#: composer/e-msg-composer-attachment-bar.c:102
+#: composer/e-msg-composer-attachment-bar.c:99
#, c-format
msgid "%.0fK"
msgstr ""
-#: composer/e-msg-composer-attachment-bar.c:105
+#: composer/e-msg-composer-attachment-bar.c:102
#, c-format
msgid "%.0fM"
msgstr ""
-#: composer/e-msg-composer-attachment-bar.c:108
+#: composer/e-msg-composer-attachment-bar.c:105
#, c-format
msgid "%.0fG"
msgstr ""
#. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:364 mail/mail-display.c:222
+#: composer/e-msg-composer-attachment-bar.c:361 mail/mail-display.c:218
msgid "attachment"
msgstr ""
-#: composer/e-msg-composer-attachment-bar.c:505
+#: composer/e-msg-composer-attachment-bar.c:502
msgid "Remove selected items from the attachment list"
msgstr ""
-#: composer/e-msg-composer-attachment-bar.c:535
+#: composer/e-msg-composer-attachment-bar.c:532
msgid "Add attachment..."
msgstr ""
-#: composer/e-msg-composer-attachment-bar.c:536
+#: composer/e-msg-composer-attachment-bar.c:533
msgid "Attach a file to the message"
msgstr ""
@@ -10120,75 +10161,75 @@ msgstr "የmime ዓይነት"
msgid "Suggest automatic display of attachment"
msgstr ""
-#: composer/e-msg-composer.c:523
+#: composer/e-msg-composer.c:504
msgid "Could not create a PGP signature context"
msgstr ""
-#: composer/e-msg-composer.c:802
+#: composer/e-msg-composer.c:783
#, c-format
msgid ""
"Error while reading file %s:\n"
"%s"
msgstr ""
-#: composer/e-msg-composer.c:1183
+#: composer/e-msg-composer.c:1164
msgid "File exists, overwrite?"
msgstr ""
-#: composer/e-msg-composer.c:1201
+#: composer/e-msg-composer.c:1182
#, c-format
msgid "Error saving file: %s"
msgstr ""
-#: composer/e-msg-composer.c:1224
+#: composer/e-msg-composer.c:1205
#, c-format
msgid "Error loading file: %s"
msgstr ""
-#: composer/e-msg-composer.c:1259
+#: composer/e-msg-composer.c:1240
#, c-format
msgid "Error accessing file: %s"
msgstr ""
-#: composer/e-msg-composer.c:1267
+#: composer/e-msg-composer.c:1248
msgid "Unable to retrieve message from editor"
msgstr ""
-#: composer/e-msg-composer.c:1274
+#: composer/e-msg-composer.c:1255
#, c-format
msgid ""
"Unable to seek on file: %s\n"
"%s"
msgstr ""
-#: composer/e-msg-composer.c:1281
+#: composer/e-msg-composer.c:1262
#, c-format
msgid ""
"Unable to truncate file: %s\n"
"%s"
msgstr ""
-#: composer/e-msg-composer.c:1290
+#: composer/e-msg-composer.c:1271
#, c-format
msgid ""
"Unable to copy file descriptor: %s\n"
"%s"
msgstr ""
-#: composer/e-msg-composer.c:1299
+#: composer/e-msg-composer.c:1280
#, c-format
msgid ""
"Error autosaving message: %s\n"
" %s"
msgstr ""
-#: composer/e-msg-composer.c:1394
+#: composer/e-msg-composer.c:1375
msgid ""
"Ximian Evolution has found unsaved files from a previous session.\n"
"Would you like to try to recover them?"
msgstr ""
-#: composer/e-msg-composer.c:1556
+#: composer/e-msg-composer.c:1536
#, c-format
msgid ""
"The message \"%s\" has not been sent.\n"
@@ -10196,37 +10237,33 @@ msgid ""
"Do you wish to save your changes?"
msgstr ""
-#: composer/e-msg-composer.c:1561
-msgid "_Discard Changes"
-msgstr ""
-
-#: composer/e-msg-composer.c:1565
+#: composer/e-msg-composer.c:1540
msgid "Warning: Modified Message"
msgstr ""
-#: composer/e-msg-composer.c:1597
+#: composer/e-msg-composer.c:1572
msgid "Open file"
msgstr "ፋይል ክፈት"
-#: composer/e-msg-composer.c:1955
+#: composer/e-msg-composer.c:1930
msgid "Signature:"
msgstr ""
-#: composer/e-msg-composer.c:1995 mail/mail-account-gui.c:1230
+#: composer/e-msg-composer.c:1971 mail/mail-account-gui.c:1226
msgid "Autogenerated"
msgstr ""
-#: composer/e-msg-composer.c:2179 composer/e-msg-composer.c:2794
+#: composer/e-msg-composer.c:2155 composer/e-msg-composer.c:2770
msgid "Compose a message"
msgstr ""
-#: composer/e-msg-composer.c:2825
+#: composer/e-msg-composer.c:2801
msgid ""
"Could not create composer window:\n"
"Unable to activate address selector control."
msgstr ""
-#: composer/e-msg-composer.c:2851
+#: composer/e-msg-composer.c:2827
msgid ""
"Could not create composer window:\n"
"Unable to activate HTML editor component.\n"
@@ -10234,19 +10271,19 @@ msgid ""
"of gtkhtml and libgtkhtml installed.\n"
msgstr ""
-#: composer/e-msg-composer.c:2911
+#: composer/e-msg-composer.c:2887
msgid ""
"Could not create composer window:\n"
"Unable to activate HTML editor component."
msgstr ""
-#: composer/e-msg-composer.c:3899
+#: composer/e-msg-composer.c:3868
msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
+"<b>(The composer contains a non-text message body, which cannot be "
+"edited.)<b>"
msgstr ""
-#: composer/e-msg-composer-hdrs.c:375
+#: composer/e-msg-composer-hdrs.c:361
msgid "Click here for the address book"
msgstr ""
@@ -10257,45 +10294,45 @@ msgstr ""
#. * because that causes from_changed to be called, which
#. * expects the reply_to fields to be initialized.
#.
-#: composer/e-msg-composer-hdrs.c:407
+#: composer/e-msg-composer-hdrs.c:393
msgid "Reply-To:"
msgstr ""
#.
#. * From
#.
-#: composer/e-msg-composer-hdrs.c:418
+#: composer/e-msg-composer-hdrs.c:404
msgid "From:"
msgstr "ከ፦"
#.
#. * Subject
#.
-#: composer/e-msg-composer-hdrs.c:424
+#: composer/e-msg-composer-hdrs.c:410
msgid "Subject:"
msgstr "ጉዳዩ፦"
-#: composer/e-msg-composer-hdrs.c:438
+#: composer/e-msg-composer-hdrs.c:424
msgid "To:"
msgstr "ወደ፦"
-#: composer/e-msg-composer-hdrs.c:439
+#: composer/e-msg-composer-hdrs.c:425
msgid "Enter the recipients of the message"
msgstr ""
-#: composer/e-msg-composer-hdrs.c:442
+#: composer/e-msg-composer-hdrs.c:428
msgid "Cc:"
msgstr "Cc፦"
-#: composer/e-msg-composer-hdrs.c:443
+#: composer/e-msg-composer-hdrs.c:429
msgid "Enter the addresses that will receive a carbon copy of the message"
msgstr ""
-#: composer/e-msg-composer-hdrs.c:446
+#: composer/e-msg-composer-hdrs.c:432
msgid "Bcc:"
msgstr "Bcc፦"
-#: composer/e-msg-composer-hdrs.c:447
+#: composer/e-msg-composer-hdrs.c:433
msgid ""
"Enter the addresses that will receive a carbon copy of the message without "
"appearing in the recipient list of the message."
@@ -10304,11 +10341,11 @@ msgstr ""
#.
#. * Post-To
#.
-#: composer/e-msg-composer-hdrs.c:454
+#: composer/e-msg-composer-hdrs.c:440
msgid "Post To:"
msgstr ""
-#: composer/e-msg-composer-hdrs.c:456
+#: composer/e-msg-composer-hdrs.c:442
msgid "Posting destination"
msgstr ""
@@ -10317,13 +10354,13 @@ msgstr ""
msgid "Attach file(s)"
msgstr ""
-#: composer/evolution-composer.c:417
+#: composer/evolution-composer.c:407
msgid ""
"Could not create composer window, because you have not yet\n"
"configured any identities in the mail component."
msgstr ""
-#: composer/evolution-composer.c:432
+#: composer/evolution-composer.c:422
msgid "Cannot initialize the Evolution composer."
msgstr ""
@@ -10376,21 +10413,20 @@ msgid "Subject does not contain"
msgstr ""
#: e-util/e-component-listener.c:128
-msgid ""
-"ping_timeout_callback: could not determine if the CORBA object is nil or not"
+msgid "ping_timeout_callback: could not determine if the CORBA object is nil or not"
msgstr ""
-#: e-util/e-dialog-utils.c:230
+#: e-util/e-dialog-utils.c:237
msgid ""
"A file by that name already exists.\n"
"Overwrite it?"
msgstr ""
-#: e-util/e-passwords.c:344
+#: e-util/e-passwords.c:343
msgid "Remember this password"
msgstr "ይህንን ሚስጢራዊ ቃል አስታውሱ"
-#: e-util/e-passwords.c:346
+#: e-util/e-passwords.c:345
msgid "Remember this password for the remainder of this session"
msgstr ""
@@ -10552,7 +10588,7 @@ msgstr ""
msgid "Select a time to compare against"
msgstr ""
-#: filter/filter-editor.c:115 filter/filter.glade.h:4
+#: filter/filter-editor.c:114 filter/filter.glade.h:4
msgid "Filter Rules"
msgstr ""
@@ -10579,7 +10615,7 @@ msgid "You must specify a folder."
msgstr ""
#: filter/filter-folder.c:241 filter/vfolder-rule.c:406
-#: mail/mail-account-gui.c:1475 mail/mail-account-gui.c:1489
+#: mail/mail-account-gui.c:1459 mail/mail-account-gui.c:1473
msgid "Select Folder"
msgstr "ዶሴ ምረጡ"
@@ -10621,7 +10657,7 @@ msgid ""
"the current time when filtering occurs."
msgstr ""
-#: filter/filter.glade.h:13 filter/vfolder-editor.c:115
+#: filter/filter.glade.h:13 filter/vfolder-editor.c:114
msgid "Virtual Folders"
msgstr ""
@@ -10668,30 +10704,30 @@ msgid ""
"%s"
msgstr ""
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:68
+#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:63
#: mail/mail-config.glade.h:63
msgid "Important"
msgstr "አስፈላጊ"
#. red
-#: filter/filter-label.c:122 mail/mail-config.c:69
+#: filter/filter-label.c:122 mail/mail-config.c:64
#: mail/mail-config.glade.h:132
msgid "Work"
msgstr "መሥራት"
#. orange
-#: filter/filter-label.c:123 mail/mail-config.c:70 mail/mail-config.glade.h:86
+#: filter/filter-label.c:123 mail/mail-config.c:65 mail/mail-config.glade.h:86
msgid "Personal"
msgstr "የግል"
#. forest green
-#: filter/filter-label.c:124 mail/mail-config.c:71
+#: filter/filter-label.c:124 mail/mail-config.c:66
#: mail/mail-config.glade.h:123
msgid "To Do"
msgstr ""
#. blue
-#: filter/filter-label.c:125 mail/mail-config.c:72 mail/mail-config.glade.h:67
+#: filter/filter-label.c:125 mail/mail-config.c:67 mail/mail-config.glade.h:67
msgid "Later"
msgstr ""
@@ -10699,39 +10735,39 @@ msgstr ""
msgid "Test"
msgstr "ፈተና"
-#: filter/filter-rule.c:219
+#: filter/filter-rule.c:218
msgid "You must name this filter."
msgstr ""
-#: filter/filter-rule.c:751
+#: filter/filter-rule.c:750
msgid "Rule name: "
msgstr ""
-#: filter/filter-rule.c:755
+#: filter/filter-rule.c:754
msgid "Untitled"
msgstr "ያልተሰየመ"
-#: filter/filter-rule.c:772
+#: filter/filter-rule.c:771
msgid "If"
msgstr ""
-#: filter/filter-rule.c:790
+#: filter/filter-rule.c:789
msgid "Execute actions"
msgstr ""
-#: filter/filter-rule.c:794
+#: filter/filter-rule.c:793
msgid "if all criteria are met"
msgstr ""
-#: filter/filter-rule.c:799
+#: filter/filter-rule.c:798
msgid "if any criteria are met"
msgstr ""
-#: filter/filter-rule.c:894
+#: filter/filter-rule.c:893
msgid "incoming"
msgstr ""
-#: filter/filter-rule.c:894
+#: filter/filter-rule.c:893
msgid "outgoing"
msgstr ""
@@ -10792,7 +10828,7 @@ msgstr ""
msgid "Follow Up"
msgstr ""
-#: filter/libfilter-i18n.h:18 mail/folder-browser.c:1843
+#: filter/libfilter-i18n.h:18 mail/folder-browser.c:1780
msgid "Label"
msgstr "መለያ"
@@ -10820,7 +10856,7 @@ msgstr ""
msgid "Play Sound"
msgstr "ድምፅ አጫውት"
-#: filter/libfilter-i18n.h:25 mail/message-tag-followup.c:68
+#: filter/libfilter-i18n.h:25 mail/message-tag-followup.c:55
msgid "Read"
msgstr "አንብብ"
@@ -10841,7 +10877,7 @@ msgstr ""
msgid "Score"
msgstr "ነጥብ"
-#: filter/libfilter-i18n.h:30 mail/mail-callbacks.c:1799
+#: filter/libfilter-i18n.h:30 mail/mail-callbacks.c:1762
msgid "Sender"
msgstr ""
@@ -10869,8 +10905,8 @@ msgstr ""
msgid "Stop Processing"
msgstr ""
-#: filter/libfilter-i18n.h:38 mail/mail-format.c:906
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
+#: filter/libfilter-i18n.h:38 mail/mail-format.c:902
+#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:264
#: mail/message-tags.glade.h:4
msgid "Subject"
msgstr "ጉዳዩ"
@@ -10967,28 +11003,28 @@ msgstr ""
msgid "starts with"
msgstr ""
-#: filter/rule-editor.c:170
+#: filter/rule-editor.c:169
msgid "Rules"
msgstr ""
-#: filter/rule-editor.c:241 filter/rule-editor.c:325
+#: filter/rule-editor.c:240 filter/rule-editor.c:317
#, c-format
msgid "Rule name '%s' is not unique, choose another."
msgstr ""
-#: filter/rule-editor.c:291
+#: filter/rule-editor.c:283
msgid "Add Rule"
msgstr ""
-#: filter/rule-editor.c:372
+#: filter/rule-editor.c:362
msgid "Edit Rule"
msgstr ""
-#: filter/rule-editor.c:689
+#: filter/rule-editor.c:661
msgid "Rule name"
msgstr ""
-#: filter/score-editor.c:114
+#: filter/score-editor.c:113
msgid "Score Rules"
msgstr ""
@@ -11031,8 +11067,8 @@ msgid "Scanning %s"
msgstr ""
#: importers/elm-importer.c:525 importers/netscape-importer.c:2128
-#: importers/pine-importer.c:637 mail/component-factory.c:113
-#: mail/folder-browser-ui.c:357
+#: importers/pine-importer.c:637 mail/component-factory.c:104
+#: mail/folder-browser-ui.c:354
msgid "Mail"
msgstr "ፖስታ"
@@ -11139,264 +11175,264 @@ msgstr ""
msgid "Pine"
msgstr ""
-#: mail/component-factory.c:113
+#: mail/component-factory.c:104
msgid "Folder containing mail"
msgstr ""
-#: mail/component-factory.c:114
+#: mail/component-factory.c:105
msgid "Public Mail"
msgstr ""
-#: mail/component-factory.c:114
+#: mail/component-factory.c:105
msgid "Public folder containing mail"
msgstr ""
-#: mail/component-factory.c:115
+#: mail/component-factory.c:106
msgid "Virtual Trash"
msgstr ""
-#: mail/component-factory.c:115
+#: mail/component-factory.c:106
msgid "Virtual Trash folder"
msgstr ""
-#: mail/component-factory.c:143
+#: mail/component-factory.c:134
msgid "This folder cannot contain messages."
msgstr ""
-#: mail/component-factory.c:437
+#: mail/component-factory.c:428
msgid "Properties..."
msgstr "ምርጫዎች..."
-#: mail/component-factory.c:437
+#: mail/component-factory.c:428
msgid "Change this folder's properties"
msgstr ""
-#: mail/component-factory.c:821
+#: mail/component-factory.c:814
msgid ""
"Some of your mail settings seem corrupt, please check that everything is in "
"order."
msgstr ""
-#: mail/component-factory.c:988
+#: mail/component-factory.c:979
msgid "You have not set a mail transport method"
msgstr ""
-#: mail/component-factory.c:1012
+#: mail/component-factory.c:1003
msgid "You have unsent messages, do you wish to quit anyway?"
msgstr ""
-#: mail/component-factory.c:1052
+#: mail/component-factory.c:1045
msgid "New Mail Message"
msgstr ""
-#: mail/component-factory.c:1052
+#: mail/component-factory.c:1045
msgid "_Mail Message"
msgstr ""
-#: mail/component-factory.c:1053
+#: mail/component-factory.c:1046
msgid "Compose a new mail message"
msgstr ""
-#: mail/component-factory.c:1061
+#: mail/component-factory.c:1054
msgid "New Message Post"
msgstr ""
-#: mail/component-factory.c:1061
+#: mail/component-factory.c:1054
msgid "_Post Message"
msgstr ""
-#: mail/component-factory.c:1062
+#: mail/component-factory.c:1055
msgid "Post a new mail message"
msgstr ""
-#: mail/component-factory.c:1090
+#: mail/component-factory.c:1083
msgid "Cannot initialize the Evolution mail component."
msgstr ""
-#: mail/component-factory.c:1099
+#: mail/component-factory.c:1092
msgid "Cannot initialize Evolution's mail config component."
msgstr ""
-#: mail/component-factory.c:1105
+#: mail/component-factory.c:1098
msgid "Cannot initialize Evolution's folder info component."
msgstr ""
-#: mail/component-factory.c:1346 mail/component-factory.c:1376
+#: mail/component-factory.c:1339 mail/component-factory.c:1369
msgid "Connecting..."
msgstr ""
-#: mail/component-factory.c:1387
+#: mail/component-factory.c:1380
msgid "Cannot register storage with shell"
msgstr ""
-#: mail/folder-browser.c:346 mail/mail-display.c:388 mail/mail-display.c:907
+#: mail/folder-browser.c:321 mail/mail-display.c:377 mail/mail-display.c:896
#, c-format
msgid "Could not create temporary directory: %s"
msgstr ""
-#: mail/folder-browser.c:801
+#: mail/folder-browser.c:776
#, c-format
msgid "%d new"
msgstr "%d አዲስ"
-#: mail/folder-browser.c:804 mail/folder-browser.c:812
-#: mail/folder-browser.c:815
+#: mail/folder-browser.c:779 mail/folder-browser.c:787
+#: mail/folder-browser.c:790
msgid ", "
msgstr "፣ "
-#: mail/folder-browser.c:806
+#: mail/folder-browser.c:781
#, c-format
msgid "%d hidden"
msgstr "%d የተደበቀ"
-#: mail/folder-browser.c:808
+#: mail/folder-browser.c:783
#, c-format
msgid "%d visible"
msgstr "%d የሚታይ"
-#: mail/folder-browser.c:813
+#: mail/folder-browser.c:788
#, c-format
msgid "%d selected"
msgstr "%d ተመርጠዋል"
-#: mail/folder-browser.c:818
+#: mail/folder-browser.c:793
#, c-format
msgid "%d unsent"
msgstr ""
-#: mail/folder-browser.c:820
+#: mail/folder-browser.c:795
#, c-format
msgid "%d sent"
msgstr "%d ተልኳል"
-#: mail/folder-browser.c:822
+#: mail/folder-browser.c:797
#, c-format
msgid "%d total"
msgstr "%d አጠቃላይ"
-#: mail/folder-browser.c:1187
+#: mail/folder-browser.c:1136
msgid "Create _Virtual Folder From Search..."
msgstr ""
-#: mail/folder-browser.c:1779
+#: mail/folder-browser.c:1716
msgid "VFolder on _Subject"
msgstr ""
-#: mail/folder-browser.c:1780
+#: mail/folder-browser.c:1717
msgid "VFolder on Se_nder"
msgstr ""
-#: mail/folder-browser.c:1781
+#: mail/folder-browser.c:1718
msgid "VFolder on _Recipients"
msgstr ""
-#: mail/folder-browser.c:1782
+#: mail/folder-browser.c:1719
msgid "VFolder on Mailing _List"
msgstr ""
-#: mail/folder-browser.c:1786
+#: mail/folder-browser.c:1723
msgid "Filter on Sub_ject"
msgstr ""
-#: mail/folder-browser.c:1787
+#: mail/folder-browser.c:1724
msgid "Filter on Sen_der"
msgstr ""
-#: mail/folder-browser.c:1788
+#: mail/folder-browser.c:1725
msgid "Filter on Re_cipients"
msgstr ""
-#: mail/folder-browser.c:1789 mail/folder-browser.c:2112
+#: mail/folder-browser.c:1726 mail/folder-browser.c:2049
msgid "Filter on _Mailing List"
msgstr ""
-#: mail/folder-browser.c:1807
+#: mail/folder-browser.c:1744
msgid "_Edit as New Message..."
msgstr ""
-#: mail/folder-browser.c:1809
+#: mail/folder-browser.c:1746
msgid "_Print"
msgstr "አትም"
-#: mail/folder-browser.c:1813 ui/evolution-mail-message.xml.h:110
+#: mail/folder-browser.c:1750 ui/evolution-mail-message.xml.h:110
msgid "_Reply to Sender"
msgstr ""
-#: mail/folder-browser.c:1814 ui/evolution-mail-message.xml.h:75
+#: mail/folder-browser.c:1751 ui/evolution-mail-message.xml.h:75
msgid "Reply to _List"
msgstr ""
-#: mail/folder-browser.c:1815 ui/evolution-mail-message.xml.h:74
+#: mail/folder-browser.c:1752 ui/evolution-mail-message.xml.h:74
msgid "Reply to _All"
msgstr ""
-#: mail/folder-browser.c:1816
+#: mail/folder-browser.c:1753
msgid "_Forward"
msgstr "ወደፊት፦"
-#: mail/folder-browser.c:1820
+#: mail/folder-browser.c:1757
msgid "Follo_w Up..."
msgstr ""
-#: mail/folder-browser.c:1821
+#: mail/folder-browser.c:1758
msgid "Fla_g Completed"
msgstr ""
-#: mail/folder-browser.c:1822
+#: mail/folder-browser.c:1759
msgid "Cl_ear Flag"
msgstr ""
#. separator here?
-#: mail/folder-browser.c:1826 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1763 ui/evolution-mail-message.xml.h:43
msgid "Mar_k as Read"
msgstr ""
-#: mail/folder-browser.c:1827
+#: mail/folder-browser.c:1764
msgid "Mark as _Unread"
msgstr ""
-#: mail/folder-browser.c:1828
+#: mail/folder-browser.c:1765
msgid "Mark as _Important"
msgstr ""
-#: mail/folder-browser.c:1829
+#: mail/folder-browser.c:1766
msgid "_Mark as Unimportant"
msgstr ""
-#: mail/folder-browser.c:1834
+#: mail/folder-browser.c:1771
msgid "U_ndelete"
msgstr "አታጥፋ"
-#: mail/folder-browser.c:1838
+#: mail/folder-browser.c:1775
msgid "Mo_ve to Folder..."
msgstr ""
-#: mail/folder-browser.c:1839 ui/evolution-addressbook.xml.h:31
+#: mail/folder-browser.c:1776 ui/evolution-addressbook.xml.h:31
msgid "_Copy to Folder..."
msgstr ""
-#: mail/folder-browser.c:1847
+#: mail/folder-browser.c:1784
msgid "Add Sender to Address_book"
msgstr ""
-#: mail/folder-browser.c:1851
+#: mail/folder-browser.c:1788
msgid "Appl_y Filters"
msgstr ""
-#: mail/folder-browser.c:1855
+#: mail/folder-browser.c:1792
msgid "Crea_te Rule From Message"
msgstr ""
-#: mail/folder-browser.c:2113
+#: mail/folder-browser.c:2050
msgid "VFolder on M_ailing List"
msgstr ""
-#: mail/folder-browser.c:2115
+#: mail/folder-browser.c:2052
#, c-format
msgid "Filter on _Mailing List (%s)"
msgstr ""
-#: mail/folder-browser.c:2116
+#: mail/folder-browser.c:2053
#, c-format
msgid "VFolder on M_ailing List (%s)"
msgstr ""
@@ -11405,12 +11441,12 @@ msgstr ""
msgid "Default"
msgstr "የነበረው"
-#: mail/folder-browser-ui.c:484
+#: mail/folder-browser-ui.c:481
#, c-format
msgid "Properties for \"%s\""
msgstr "ለ \"%s\"ን ምርጫዎች"
-#: mail/folder-browser-ui.c:486
+#: mail/folder-browser-ui.c:483
msgid "Properties"
msgstr "ምርጫዎች"
@@ -11445,8 +11481,7 @@ msgstr ""
#: mail/GNOME_Evolution_Mail.oaf.in.h:6
#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid ""
-"Configure mail preferences, including security and message display, here"
+msgid "Configure mail preferences, including security and message display, here"
msgstr ""
#: mail/GNOME_Evolution_Mail.oaf.in.h:7
@@ -11485,41 +11520,40 @@ msgid "Evolution mail folder display component."
msgstr ""
#: mail/GNOME_Evolution_Mail.oaf.in.h:14
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14
msgid "Evolution mail folder factory component."
msgstr ""
#: mail/GNOME_Evolution_Mail.oaf.in.h:15
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
msgid "Factory for the Evolution composer."
msgstr ""
#: mail/GNOME_Evolution_Mail.oaf.in.h:16
+#: mail/GNOME_Evolution_Mail.server.in.in.h:16
msgid "Factory for the Mail Summary component."
msgstr ""
#: mail/GNOME_Evolution_Mail.oaf.in.h:17
-#: mail/GNOME_Evolution_Mail.server.in.in.h:15
+#: mail/GNOME_Evolution_Mail.server.in.in.h:17
msgid "Font Preferences"
msgstr "የፊደል ቅርጽ ምርጫዎች"
#: mail/GNOME_Evolution_Mail.oaf.in.h:18
-#: mail/GNOME_Evolution_Mail.server.in.in.h:16
+#: mail/GNOME_Evolution_Mail.server.in.in.h:18
msgid "Mail Accounts"
msgstr ""
#: mail/GNOME_Evolution_Mail.oaf.in.h:19
-#: mail/GNOME_Evolution_Mail.server.in.in.h:17 mail/mail-config.glade.h:70
+#: mail/GNOME_Evolution_Mail.server.in.in.h:19 mail/mail-config.glade.h:70
msgid "Mail Preferences"
msgstr ""
#: mail/GNOME_Evolution_Mail.oaf.in.h:20
-#: mail/GNOME_Evolution_Mail.server.in.in.h:18
+#: mail/GNOME_Evolution_Mail.server.in.in.h:20
msgid "Mail configuration interface"
msgstr ""
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14
-msgid "Factory for the controls exported by the Evolution Mailer"
-msgstr ""
-
#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:1
msgid "Factory to import mbox into Evolution"
@@ -11580,55 +11614,55 @@ msgstr ""
msgid "Evolution Account Editor"
msgstr ""
-#: mail/mail-account-gui.c:743 mail/mail-config.glade.h:156
+#: mail/mail-account-gui.c:739 mail/mail-config.glade.h:156
msgid "_Host:"
msgstr "እንግዳ ተቀባይ"
-#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:126
+#: mail/mail-account-gui.c:743 mail/mail-config.glade.h:126
msgid "User_name:"
msgstr "የተጠቃሚ ስም"
-#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:163
+#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:163
msgid "_Path:"
msgstr "መተላለፊያ"
-#: mail/mail-account-gui.c:1850
+#: mail/mail-account-gui.c:1834
msgid "You may not create two accounts with the same name."
msgstr ""
-#: mail/mail-accounts.c:217
+#: mail/mail-accounts.c:219
msgid "Are you sure you want to delete this account?"
msgstr ""
-#: mail/mail-accounts.c:225
+#: mail/mail-accounts.c:226
msgid "Don't delete"
msgstr ""
-#: mail/mail-accounts.c:299 mail/mail-accounts.c:337
-#: mail/mail-composer-prefs.c:650 mail/mail-composer-prefs.c:668
+#: mail/mail-accounts.c:335 mail/mail-composer-prefs.c:644
+#: mail/mail-composer-prefs.c:662
msgid "Disable"
msgstr "አበላሽ"
-#: mail/mail-accounts.c:299 mail/mail-accounts.c:339
-#: mail/mail-composer-prefs.c:650 mail/mail-composer-prefs.c:668
+#: mail/mail-accounts.c:337 mail/mail-composer-prefs.c:644
+#: mail/mail-composer-prefs.c:662
msgid "Enable"
msgstr "አስቻለ"
#. translators: default account indicator
-#: mail/mail-accounts.c:379
+#: mail/mail-accounts.c:375
msgid "[Default]"
msgstr "የነበረው"
-#: mail/mail-accounts.c:424 mail/mail-accounts.etspec.h:2
-#: mail/mail-composer-prefs.c:811
+#: mail/mail-accounts.c:417 mail/mail-accounts.etspec.h:2
+#: mail/mail-composer-prefs.c:805
msgid "Enabled"
msgstr "ያስችላል"
-#: mail/mail-accounts.c:429 mail/mail-accounts.etspec.h:1
+#: mail/mail-accounts.c:422 mail/mail-accounts.etspec.h:1
msgid "Account name"
msgstr ""
-#: mail/mail-accounts.c:431 mail/mail-accounts.etspec.h:3
+#: mail/mail-accounts.c:424 mail/mail-accounts.etspec.h:3
msgid "Protocol"
msgstr ""
@@ -11669,11 +11703,11 @@ msgid ""
msgstr ""
#. Add the "Don't show this message again." checkbox
-#: mail/mail-callbacks.c:102 widgets/misc/e-messagebox.c:226
+#: mail/mail-callbacks.c:98 widgets/misc/e-messagebox.c:226
msgid "Don't show this message again."
msgstr ""
-#: mail/mail-callbacks.c:191
+#: mail/mail-callbacks.c:187
msgid ""
"You have not configured the mail client.\n"
"You need to do this before you can send,\n"
@@ -11681,133 +11715,139 @@ msgid ""
"Would you like to configure it now?"
msgstr ""
-#: mail/mail-callbacks.c:214
+#: mail/mail-callbacks.c:210
msgid ""
"You need to configure an account\n"
"before you can compose mail."
msgstr ""
-#: mail/mail-callbacks.c:228
+#: mail/mail-callbacks.c:224
msgid ""
"You need to configure an identity\n"
"before you can compose mail."
msgstr ""
-#: mail/mail-callbacks.c:235
+#: mail/mail-callbacks.c:231
msgid ""
"You need to configure a mail transport\n"
"before you can compose mail."
msgstr ""
#. FIXME: this wording sucks
-#: mail/mail-callbacks.c:257
+#: mail/mail-callbacks.c:250
msgid ""
"You are sending an HTML-formatted message. Please make sure that\n"
"the following recipients are willing and able to receive HTML mail:\n"
msgstr ""
-#: mail/mail-callbacks.c:269
+#: mail/mail-callbacks.c:262
msgid "Send anyway?"
msgstr ""
-#: mail/mail-callbacks.c:291
+#: mail/mail-callbacks.c:280
msgid ""
"This message has no subject.\n"
"Really send?"
msgstr ""
-#: mail/mail-callbacks.c:317
+#: mail/mail-callbacks.c:302
msgid ""
"Since the contact list you are sending to is configured to hide the list's "
"addresses, this message will contain only Bcc recipients."
msgstr ""
-#: mail/mail-callbacks.c:321
+#: mail/mail-callbacks.c:306
msgid "This message contains only Bcc recipients."
msgstr ""
-#: mail/mail-callbacks.c:326
+#: mail/mail-callbacks.c:311
msgid ""
"It is possible that the mail server may reveal the recipients by adding an "
"Apparently-To header.\n"
"Send anyway?"
msgstr ""
-#: mail/mail-callbacks.c:460
+#: mail/mail-callbacks.c:440
msgid "You must specify recipients in order to send this message."
msgstr ""
-#: mail/mail-callbacks.c:716
+#: mail/mail-callbacks.c:696
msgid ""
"Unable to open the drafts folder for this account.\n"
"Would you like to use the default drafts folder?"
msgstr ""
-#: mail/mail-callbacks.c:1177
+#: mail/mail-callbacks.c:1148
msgid "an unknown sender"
msgstr ""
-#: mail/mail-callbacks.c:1181
+#: mail/mail-callbacks.c:1152
msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
msgstr ""
-#: mail/mail-callbacks.c:1679 mail/message-browser.c:143
+#: mail/mail-callbacks.c:1642 mail/message-browser.c:136
msgid "Move message(s) to"
msgstr ""
-#: mail/mail-callbacks.c:1681 mail/message-browser.c:145
+#: mail/mail-callbacks.c:1644 mail/message-browser.c:138
msgid "Copy message(s) to"
msgstr ""
-#: mail/mail-callbacks.c:2325
+#: mail/mail-callbacks.c:2288
#, c-format
msgid "Are you sure you want to edit all %d messages?"
msgstr ""
-#: mail/mail-callbacks.c:2341
+#: mail/mail-callbacks.c:2304
msgid ""
"You may only edit messages saved\n"
"in the Drafts folder."
msgstr ""
-#: mail/mail-callbacks.c:2377
+#: mail/mail-callbacks.c:2340
msgid ""
"You may only resend messages\n"
"in the Sent folder."
msgstr ""
-#: mail/mail-callbacks.c:2387
+#: mail/mail-callbacks.c:2350
#, c-format
msgid "Are you sure you want to resend all %d messages?"
msgstr ""
-#: mail/mail-callbacks.c:2407
+#: mail/mail-callbacks.c:2370
msgid "No Message Selected"
msgstr ""
-#: mail/mail-callbacks.c:2448
+#: mail/mail-callbacks.c:2411
#, c-format
msgid ""
"Cannot save to `%s'\n"
" %s"
msgstr ""
-#: mail/mail-callbacks.c:2453
+#: mail/mail-callbacks.c:2416
#, c-format
msgid ""
"`%s' already exists.\n"
"Overwrite it?"
msgstr ""
-#: mail/mail-callbacks.c:2494
+#: mail/mail-callbacks.c:2457
msgid "Save Message As..."
msgstr ""
-#: mail/mail-callbacks.c:2496
+#: mail/mail-callbacks.c:2459
msgid "Save Messages As..."
msgstr ""
-#: mail/mail-callbacks.c:2664
+#: mail/mail-callbacks.c:2530
+msgid ""
+"There are no more new messages in this folder.\n"
+"Would you like to go to the next folder?"
+msgstr ""
+
+#: mail/mail-callbacks.c:2745
msgid ""
"This operation will permanently erase all messages marked as\n"
"deleted. If you continue, you will not be able to recover these messages.\n"
@@ -11815,31 +11855,31 @@ msgid ""
"Really erase these messages?"
msgstr ""
-#: mail/mail-callbacks.c:2750
+#: mail/mail-callbacks.c:2831
#, c-format
msgid ""
"Error loading filter information:\n"
"%s"
msgstr ""
-#: mail/mail-callbacks.c:2758
+#: mail/mail-callbacks.c:2839
msgid "Filters"
msgstr "አጣራዎች"
-#: mail/mail-callbacks.c:2800
+#: mail/mail-callbacks.c:2881
#, c-format
msgid "Page %d of %d"
msgstr ""
-#: mail/mail-callbacks.c:2856
+#: mail/mail-callbacks.c:2936
msgid "Print Message"
msgstr ""
-#: mail/mail-callbacks.c:2923
+#: mail/mail-callbacks.c:2995
msgid "Printing of message failed"
msgstr ""
-#: mail/mail-callbacks.c:3113
+#: mail/mail-callbacks.c:3186
#, c-format
msgid "Are you sure you want to open all %d messages in separate windows?"
msgstr ""
@@ -11851,62 +11891,67 @@ msgid ""
msgstr ""
#: mail/mail-composer-prefs.c:245 mail/mail-composer-prefs.c:247
-#: mail/mail-composer-prefs.c:376 mail/mail-composer-prefs.c:431
+#: mail/mail-composer-prefs.c:370 mail/mail-composer-prefs.c:425
msgid "[script]"
msgstr "ጽሑፍ"
-#: mail/mail-composer-prefs.c:320
+#: mail/mail-composer-prefs.c:314
msgid "You must specify a valid script name."
msgstr ""
-#: mail/mail-composer-prefs.c:335 mail/mail-config.c:1321
+#: mail/mail-composer-prefs.c:329 mail/mail-config.c:2571
msgid "Unnamed"
msgstr ""
-#: mail/mail-composer-prefs.c:815
+#: mail/mail-composer-prefs.c:809
msgid "Language(s)"
msgstr "ቋንቋ"
-#: mail/mail-composer-prefs.c:859
+#: mail/mail-composer-prefs.c:851
msgid "Add script signature"
msgstr ""
-#: mail/mail-composer-prefs.c:878
+#: mail/mail-composer-prefs.c:870
msgid "Signature(s)"
msgstr ""
-#: mail/mail-config.c:1025
+#: mail/mail-config.c:598
+#, c-format
+msgid "Account %d"
+msgstr ""
+
+#: mail/mail-config.c:2262
msgid "Checking Service"
msgstr ""
-#: mail/mail-config.c:1103 mail/mail-config.c:1107
+#: mail/mail-config.c:2340 mail/mail-config.c:2343
msgid "Connecting to server..."
msgstr ""
-#: mail/mail-config-druid.c:147
+#: mail/mail-config-druid.c:150
msgid ""
-"Please enter your name and email address below. The \"optional\" fields "
-"below do not need to be filled in, unless you wish to include this "
-"information in email you send."
+"Please enter your name and email address below. The \"optional\" fields below "
+"do not need to be filled in, unless you wish to include this information in "
+"email you send."
msgstr ""
-#: mail/mail-config-druid.c:149
+#: mail/mail-config-druid.c:152
msgid ""
"Please enter information about your incoming mail server below. If you are "
"not sure, ask your system administrator or Internet Service Provider."
msgstr ""
-#: mail/mail-config-druid.c:151
+#: mail/mail-config-druid.c:154
msgid "Please select among the following options"
msgstr ""
-#: mail/mail-config-druid.c:153
+#: mail/mail-config-druid.c:156
msgid ""
"Please enter information about the way you will send mail. If you are not "
"sure, ask your system administrator or Internet Service Provider."
msgstr ""
-#: mail/mail-config-druid.c:155
+#: mail/mail-config-druid.c:158
msgid ""
"You are almost done with the mail configuration process. The identity, "
"incoming mail server and outgoing mail transport method which you provided "
@@ -11916,7 +11961,7 @@ msgid ""
msgstr ""
#. set window title
-#: mail/mail-config-druid.c:645
+#: mail/mail-config-druid.c:643
msgid "Evolution Account Assistant"
msgstr ""
@@ -12168,8 +12213,8 @@ msgstr ""
#: mail/mail-config.glade.h:78
msgid ""
-"Note: you will not be prompted for a password until you connect for the "
-"first time"
+"Note: you will not be prompted for a password until you connect for the first "
+"time"
msgstr ""
#: mail/mail-config.glade.h:79
@@ -12519,81 +12564,81 @@ msgstr ""
msgid "Could not create a S/MIME decode context."
msgstr ""
-#: mail/mail-display.c:192
+#: mail/mail-display.c:188
#, c-format
msgid ""
"File `%s' already exists.\n"
"Overwrite it?"
msgstr ""
-#: mail/mail-display.c:195
+#: mail/mail-display.c:191
msgid "Overwrite file?"
msgstr ""
-#: mail/mail-display.c:330
+#: mail/mail-display.c:316
msgid "Save Attachment"
msgstr ""
-#: mail/mail-display.c:403
+#: mail/mail-display.c:392
#, c-format
msgid "Could not create temporary file '%s': %s"
msgstr ""
-#: mail/mail-display.c:451
+#: mail/mail-display.c:440
msgid "Save Attachment..."
msgstr ""
-#: mail/mail-display.c:452
+#: mail/mail-display.c:441
msgid "View Inline"
msgstr ""
-#: mail/mail-display.c:453
+#: mail/mail-display.c:442
#, c-format
msgid "Open in %s..."
msgstr ""
-#: mail/mail-display.c:509
+#: mail/mail-display.c:498
#, c-format
msgid "View Inline (via %s)"
msgstr ""
-#: mail/mail-display.c:513
+#: mail/mail-display.c:502
msgid "Hide"
msgstr "ደብቅ"
-#: mail/mail-display.c:533
+#: mail/mail-display.c:522
msgid "External Viewer"
msgstr ""
-#: mail/mail-display.c:1333
+#: mail/mail-display.c:1316
msgid "Downloading images"
msgstr ""
-#: mail/mail-display.c:1510
+#: mail/mail-display.c:1493
msgid "Loading message content"
msgstr ""
-#: mail/mail-display.c:1852
+#: mail/mail-display.c:1825
msgid "Overdue:"
msgstr ""
-#: mail/mail-display.c:1856
+#: mail/mail-display.c:1829
msgid "by %B %d, %Y, %l:%M %P"
msgstr ""
-#: mail/mail-display.c:2209
+#: mail/mail-display.c:2178
msgid "Open Link in Browser"
msgstr ""
-#: mail/mail-display.c:2210
+#: mail/mail-display.c:2179
msgid "Copy Link Location"
msgstr "አያያዝ ቦታ ቅጂ"
-#: mail/mail-display.c:2212
+#: mail/mail-display.c:2181
msgid "Save Link as (FIXME)"
msgstr ""
-#: mail/mail-display.c:2214
+#: mail/mail-display.c:2183
msgid "Save Image as..."
msgstr "ምስሉን በሌላ ስም አስቀምጥ"
@@ -12602,152 +12647,151 @@ msgstr "ምስሉን በሌላ ስም አስቀምጥ"
msgid "Pinging %s"
msgstr ""
-#: mail/mail-format.c:639
+#: mail/mail-format.c:635
#, c-format
msgid "%s attachment"
msgstr ""
-#: mail/mail-format.c:681 mail/mail-format.c:1367 mail/mail-format.c:1436
-#: mail/mail-format.c:1556 mail/mail-format.c:1680 mail/mail-format.c:1705
+#: mail/mail-format.c:677 mail/mail-format.c:1345 mail/mail-format.c:1414
+#: mail/mail-format.c:1534 mail/mail-format.c:1658 mail/mail-format.c:1683
msgid "Could not parse MIME message. Displaying as source."
msgstr ""
-#: mail/mail-format.c:759 mail/message-list.etspec.h:2
+#: mail/mail-format.c:755 mail/message-list.etspec.h:2
msgid "Date"
msgstr "ቀን"
-#: mail/mail-format.c:843
+#: mail/mail-format.c:839
msgid "Bad Address"
msgstr ""
-#: mail/mail-format.c:884 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:301 mail/message-tags.glade.h:3
+#: mail/mail-format.c:880 mail/message-list.etspec.h:7
+#: mail/message-tag-followup.c:260 mail/message-tags.glade.h:3
msgid "From"
msgstr "ከ"
-#: mail/mail-format.c:888
+#: mail/mail-format.c:884
msgid "Reply-To"
msgstr ""
-#: mail/mail-format.c:893 mail/message-list.etspec.h:14
+#: mail/mail-format.c:889 mail/message-list.etspec.h:14
msgid "To"
msgstr "ወደ"
-#: mail/mail-format.c:898
+#: mail/mail-format.c:894
msgid "Cc"
msgstr "Cc"
-#: mail/mail-format.c:903
+#: mail/mail-format.c:899
msgid "Bcc"
msgstr "Bcc"
-#: mail/mail-format.c:1479
-msgid ""
-"This message is digitally signed. Click the lock icon for more information."
+#: mail/mail-format.c:1457
+msgid "This message is digitally signed. Click the lock icon for more information."
msgstr ""
-#: mail/mail-format.c:1507
+#: mail/mail-format.c:1485
msgid "Could not create a PGP verfication context"
msgstr ""
-#: mail/mail-format.c:1515
+#: mail/mail-format.c:1493
msgid "This message is digitally signed and has been found to be authentic."
msgstr ""
-#: mail/mail-format.c:1522
+#: mail/mail-format.c:1500
msgid "This message is digitally signed but can not be proven to be authentic."
msgstr ""
-#: mail/mail-format.c:1786
+#: mail/mail-format.c:1764
#, c-format
msgid "Pointer to FTP site (%s)"
msgstr ""
-#: mail/mail-format.c:1797
+#: mail/mail-format.c:1775
#, c-format
msgid "Pointer to local file (%s) valid at site \"%s\""
msgstr ""
-#: mail/mail-format.c:1800
+#: mail/mail-format.c:1778
#, c-format
msgid "Pointer to local file (%s)"
msgstr ""
-#: mail/mail-format.c:1827
+#: mail/mail-format.c:1805
#, c-format
msgid "Pointer to remote data (%s)"
msgstr ""
-#: mail/mail-format.c:1833
+#: mail/mail-format.c:1811
#, c-format
msgid "Pointer to unknown external data (\"%s\" type)"
msgstr ""
-#: mail/mail-format.c:1835
+#: mail/mail-format.c:1813
msgid "Malformed external-body part."
msgstr ""
-#: mail/mail-local.c:536 mail/mail-local.c:538
+#: mail/mail-local.c:537 mail/mail-local.c:539
#, c-format
msgid "Local folders/%s"
msgstr ""
-#: mail/mail-local.c:666
+#: mail/mail-local.c:667
msgid "Reconfiguring folder"
msgstr ""
-#: mail/mail-local.c:747
+#: mail/mail-local.c:748
#, c-format
msgid ""
"Cannot save folder metainfo; you may find you can't\n"
"open this folder anymore: %s: %s"
msgstr ""
-#: mail/mail-local.c:803
+#: mail/mail-local.c:804
#, c-format
msgid "Cannot save folder metainfo to %s: %s"
msgstr ""
-#: mail/mail-local.c:855
+#: mail/mail-local.c:856
#, c-format
msgid "Cannot delete folder metadata %s: %s"
msgstr ""
-#: mail/mail-local.c:1325
+#: mail/mail-local.c:1326
#, c-format
msgid "Changing folder \"%s\" to \"%s\" format"
msgstr ""
-#: mail/mail-local.c:1347
+#: mail/mail-local.c:1348
msgid ""
"If you can no longer open this mailbox, then\n"
"you may need to repair it manually."
msgstr ""
-#: mail/mail-local.c:1446
+#: mail/mail-local.c:1447
#, c-format
msgid "Reconfigure /%s"
msgstr ""
-#: mail/mail-local.c:1510
+#: mail/mail-local.c:1511
msgid "You cannot change the format of a non-local folder."
msgstr ""
-#: mail/mail-mt.c:256
+#: mail/mail-mt.c:254
#, c-format
msgid ""
"Error while '%s':\n"
"%s"
msgstr ""
-#: mail/mail-mt.c:259
+#: mail/mail-mt.c:257
#, c-format
msgid ""
"Error while performing operation:\n"
"%s"
msgstr ""
-#: mail/mail-mt.c:902
+#: mail/mail-mt.c:899
msgid "Working"
msgstr ""
@@ -12778,7 +12822,7 @@ msgstr ""
msgid "Failed on message %d of %d"
msgstr ""
-#: mail/mail-ops.c:750 mail/mail-send-recv.c:569
+#: mail/mail-ops.c:750 mail/mail-send-recv.c:548
msgid "Complete."
msgstr ""
@@ -12932,55 +12976,55 @@ msgstr "ፈልግ"
msgid "Cancelling..."
msgstr ""
-#: mail/mail-send-recv.c:248
+#: mail/mail-send-recv.c:251
#, c-format
msgid "Server: %s, Type: %s"
msgstr ""
-#: mail/mail-send-recv.c:250
+#: mail/mail-send-recv.c:253
#, c-format
msgid "Path: %s, Type: %s"
msgstr ""
-#: mail/mail-send-recv.c:252
+#: mail/mail-send-recv.c:255
#, c-format
msgid "Type: %s"
msgstr "ዓይነት፦ %s"
-#: mail/mail-send-recv.c:297
+#: mail/mail-send-recv.c:298
msgid "Send & Receive Mail"
msgstr ""
-#: mail/mail-send-recv.c:299
+#: mail/mail-send-recv.c:300
msgid "Cancel All"
msgstr ""
-#: mail/mail-send-recv.c:378
+#: mail/mail-send-recv.c:359
msgid "Updating..."
msgstr ""
-#: mail/mail-send-recv.c:379 mail/mail-send-recv.c:434
+#: mail/mail-send-recv.c:360 mail/mail-send-recv.c:413
msgid "Waiting..."
msgstr ""
-#: mail/mail-session.c:214
+#: mail/mail-session.c:211
msgid "User canceled operation."
msgstr ""
-#: mail/mail-session.c:247
+#: mail/mail-session.c:244
#, c-format
msgid "Enter Password for %s"
msgstr ""
-#: mail/mail-session.c:249
+#: mail/mail-session.c:246
msgid "Enter Password"
msgstr "ሚስጢራዊ ቃል አስገቡ"
-#: mail/mail-session.c:264
+#: mail/mail-session.c:261
msgid "_Remember this password"
msgstr "ይህንን ሚስጢራዊ ቃል አስታውሱ (_R)"
-#: mail/mail-session.c:265
+#: mail/mail-session.c:262
msgid "_Remember this password for the remainder of this session"
msgstr ""
@@ -12997,49 +13041,45 @@ msgid ""
msgstr ""
#: mail/mail-signature-editor.c:178
-msgid "_Discard changes"
-msgstr ""
-
-#: mail/mail-signature-editor.c:182
msgid "Save signature"
msgstr ""
-#: mail/mail-signature-editor.c:327
+#: mail/mail-signature-editor.c:323
msgid "Edit signature"
msgstr ""
-#: mail/mail-signature-editor.c:365
+#: mail/mail-signature-editor.c:359
msgid "Enter a name for this signature."
msgstr ""
-#: mail/mail-signature-editor.c:368 my-evolution/e-summary-preferences.c:622
+#: mail/mail-signature-editor.c:362 my-evolution/e-summary-preferences.c:619
msgid "Name:"
msgstr "ስም"
-#: mail/mail-tools.c:267
+#: mail/mail-tools.c:262
#, c-format
msgid "Forwarded message - %s"
msgstr ""
-#: mail/mail-tools.c:269
+#: mail/mail-tools.c:264
msgid "Forwarded message"
msgstr ""
-#: mail/mail-tools.c:429
+#: mail/mail-tools.c:413
msgid "Forwarded Message"
msgstr ""
-#: mail/mail-vfolder.c:91
+#: mail/mail-vfolder.c:79
#, c-format
msgid "Setting up vfolder: %s"
msgstr ""
-#: mail/mail-vfolder.c:209
+#: mail/mail-vfolder.c:197
#, c-format
msgid "Updating vfolders for uri: %s"
msgstr ""
-#: mail/mail-vfolder.c:467
+#: mail/mail-vfolder.c:444
#, c-format
msgid ""
"The following vFolder(s):\n"
@@ -13048,97 +13088,97 @@ msgid ""
"And have been updated."
msgstr ""
-#: mail/mail-vfolder.c:776 my-evolution/e-summary-mail.c:732
+#: mail/mail-vfolder.c:753 my-evolution/e-summary-mail.c:731
msgid "VFolders"
msgstr ""
-#: mail/mail-vfolder.c:834
+#: mail/mail-vfolder.c:810
msgid "vFolders"
msgstr ""
-#: mail/mail-vfolder.c:874
+#: mail/mail-vfolder.c:850
msgid "Edit VFolder"
msgstr ""
-#: mail/mail-vfolder.c:892
+#: mail/mail-vfolder.c:868
#, c-format
msgid "Trying to edit a vfolder '%s' which doesn't exist."
msgstr ""
-#: mail/mail-vfolder.c:945
+#: mail/mail-vfolder.c:921
msgid "New VFolder"
msgstr ""
-#: mail/message-browser.c:219
+#: mail/message-browser.c:212
msgid "(No subject)"
msgstr ""
-#: mail/message-browser.c:221
+#: mail/message-browser.c:214
#, c-format
msgid "%s - Message"
msgstr "%s - መልእክት"
-#: mail/message-list.c:740
+#: mail/message-list.c:737
msgid "Unseen"
msgstr ""
-#: mail/message-list.c:741
+#: mail/message-list.c:738
msgid "Seen"
msgstr ""
-#: mail/message-list.c:742
+#: mail/message-list.c:739
msgid "Answered"
msgstr ""
-#: mail/message-list.c:743
+#: mail/message-list.c:740
msgid "Multiple Unseen Messages"
msgstr ""
-#: mail/message-list.c:744
+#: mail/message-list.c:741
msgid "Multiple Messages"
msgstr ""
-#: mail/message-list.c:748
+#: mail/message-list.c:745
msgid "Lowest"
msgstr ""
-#: mail/message-list.c:749
+#: mail/message-list.c:746
msgid "Lower"
msgstr "ዝቅተኛ"
-#: mail/message-list.c:753
+#: mail/message-list.c:750
msgid "Higher"
msgstr ""
-#: mail/message-list.c:754
+#: mail/message-list.c:751
msgid "Highest"
msgstr ""
-#: mail/message-list.c:1070
+#: mail/message-list.c:1067
msgid "?"
msgstr "?"
-#: mail/message-list.c:1077
+#: mail/message-list.c:1074
msgid "Today %l:%M %p"
msgstr "ዛሬ %l:%M %p"
-#: mail/message-list.c:1086
+#: mail/message-list.c:1083
msgid "Yesterday %l:%M %p"
msgstr "ትናንት %l:%M %p"
-#: mail/message-list.c:1098
+#: mail/message-list.c:1095
msgid "%a %l:%M %p"
msgstr "%a %l:%M %p"
-#: mail/message-list.c:1106
+#: mail/message-list.c:1103
msgid "%b %d %l:%M %p"
msgstr "%b %d %l:%M %p"
-#: mail/message-list.c:1108
+#: mail/message-list.c:1105
msgid "%b %d %Y"
msgstr "%b %d %Y"
-#: mail/message-list.c:2594
+#: mail/message-list.c:2589
msgid "Generating message list"
msgstr ""
@@ -13170,43 +13210,43 @@ msgstr ""
msgid "Size"
msgstr "መጠን"
-#: mail/message-tag-followup.c:62
+#: mail/message-tag-followup.c:49
msgid "Call"
msgstr ""
-#: mail/message-tag-followup.c:63
+#: mail/message-tag-followup.c:50
msgid "Do Not Forward"
msgstr ""
-#: mail/message-tag-followup.c:64
+#: mail/message-tag-followup.c:51
msgid "Follow-Up"
msgstr ""
-#: mail/message-tag-followup.c:65
+#: mail/message-tag-followup.c:52
msgid "For Your Information"
msgstr ""
-#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:36
+#: mail/message-tag-followup.c:53 ui/evolution-mail-message.xml.h:36
msgid "Forward"
msgstr "ወደፊት"
-#: mail/message-tag-followup.c:67
+#: mail/message-tag-followup.c:54
msgid "No Response Necessary"
msgstr ""
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:72
+#: mail/message-tag-followup.c:56 ui/evolution-mail-message.xml.h:72
msgid "Reply"
msgstr ""
-#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:73
+#: mail/message-tag-followup.c:57 ui/evolution-mail-message.xml.h:73
msgid "Reply to All"
msgstr ""
-#: mail/message-tag-followup.c:71
+#: mail/message-tag-followup.c:58
msgid "Review"
msgstr ""
-#: mail/message-tag-followup.c:283 mail/message-tags.glade.h:2
+#: mail/message-tag-followup.c:242 mail/message-tags.glade.h:2
msgid "Flag to Follow Up"
msgstr ""
@@ -13257,15 +13297,15 @@ msgstr ""
msgid "Folder"
msgstr "ዶሴ"
-#: mail/subscribe-dialog.c:1427
+#: mail/subscribe-dialog.c:1439
msgid "Scanning folders..."
msgstr ""
-#: mail/subscribe-dialog.c:1549
+#: mail/subscribe-dialog.c:1546
msgid "No server has been selected"
msgstr ""
-#: mail/subscribe-dialog.c:1624
+#: mail/subscribe-dialog.c:1621
msgid "Please select a server."
msgstr ""
@@ -13326,15 +13366,15 @@ msgstr ""
msgid "%A, %B %e %Y"
msgstr "%A, %B %e %Y"
-#: my-evolution/e-summary.c:512
+#: my-evolution/e-summary.c:514
msgid "Please wait..."
msgstr ""
-#: my-evolution/e-summary.c:590 ui/my-evolution.xml.h:2
+#: my-evolution/e-summary.c:592 ui/my-evolution.xml.h:2
msgid "Print Summary"
msgstr ""
-#: my-evolution/e-summary.c:624
+#: my-evolution/e-summary.c:626
msgid "Printing of Summary failed"
msgstr ""
@@ -13362,24 +13402,24 @@ msgstr "መግለጫ የለም"
msgid "Mail summary"
msgstr ""
-#: my-evolution/e-summary-mail.c:411 my-evolution/e-summary-mail.c:735
+#: my-evolution/e-summary-mail.c:411 my-evolution/e-summary-mail.c:734
#: shell/e-local-storage.c:1119
msgid "Local Folders"
msgstr ""
-#: my-evolution/e-summary-preferences.c:356
+#: my-evolution/e-summary-preferences.c:353
msgid "Dictionary.com Word of the Day"
msgstr ""
-#: my-evolution/e-summary-preferences.c:374
+#: my-evolution/e-summary-preferences.c:371
msgid "Quotes of the Day"
msgstr ""
-#: my-evolution/e-summary-preferences.c:612
+#: my-evolution/e-summary-preferences.c:609
msgid "Add a news feed"
msgstr ""
-#: my-evolution/e-summary-preferences.c:618
+#: my-evolution/e-summary-preferences.c:615
msgid "Enter the URL of the news feed you wish to add"
msgstr ""
@@ -23255,7 +23295,7 @@ msgstr "inHg"
#: my-evolution/metar.c:39
msgid "mmHg"
-msgstr "mmHg"
+msgstr "mmHg"
#: my-evolution/metar.c:42
msgid "miles"
@@ -24527,8 +24567,8 @@ msgstr ""
msgid "Drafts"
msgstr ""
-#: shell/e-local-storage.c:180 shell/e-shell-view.c:466
-#: shell/e-shell-view.c:470 shell/e-shortcuts.c:1082
+#: shell/e-local-storage.c:180 shell/e-shell-view.c:486
+#: shell/e-shell-view.c:490 shell/e-shortcuts.c:1082
msgid "Inbox"
msgstr ""
@@ -24540,25 +24580,25 @@ msgstr ""
msgid "Sent"
msgstr "ተልኳል"
-#: shell/e-setup.c:130
+#: shell/e-setup.c:129
msgid "Evolution installation"
msgstr ""
-#: shell/e-setup.c:134
+#: shell/e-setup.c:133
msgid ""
"This new version of Evolution needs to install additional files\n"
"into your personal Evolution directory"
msgstr ""
-#: shell/e-setup.c:135
+#: shell/e-setup.c:134
msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
msgstr ""
-#: shell/e-setup.c:175
+#: shell/e-setup.c:174
msgid "Could not update files correctly"
msgstr ""
-#: shell/e-setup.c:196
+#: shell/e-setup.c:197
#, c-format
msgid ""
"Cannot create the directory\n"
@@ -24566,14 +24606,14 @@ msgid ""
"Error: %s"
msgstr ""
-#: shell/e-setup.c:207
+#: shell/e-setup.c:212
#, c-format
msgid ""
"An error occurred in copying files into\n"
"`%s'."
msgstr ""
-#: shell/e-setup.c:272
+#: shell/e-setup.c:285
#, c-format
msgid ""
"Evolution could not create directory\n"
@@ -24581,7 +24621,7 @@ msgid ""
"%s"
msgstr ""
-#: shell/e-setup.c:290
+#: shell/e-setup.c:303
#, c-format
msgid ""
"Directory %s\n"
@@ -24589,7 +24629,7 @@ msgid ""
"readable and executable and restart Evolution."
msgstr ""
-#: shell/e-setup.c:296
+#: shell/e-setup.c:309
#, c-format
msgid ""
"File %s\n"
@@ -24597,7 +24637,7 @@ msgid ""
"Please remove this file and restart Evolution."
msgstr ""
-#: shell/e-setup.c:319
+#: shell/e-setup.c:332
#, c-format
msgid ""
"The file `%s' is not a directory.\n"
@@ -24605,7 +24645,7 @@ msgid ""
"of the Evolution user files."
msgstr ""
-#: shell/e-setup.c:333
+#: shell/e-setup.c:346
msgid ""
"Evolution has detected an old\n"
"Executive-Summary directory.\n"
@@ -24614,7 +24654,7 @@ msgid ""
"Do you want me to remove this directory?"
msgstr ""
-#: shell/e-setup.c:358
+#: shell/e-setup.c:371
#, c-format
msgid ""
"The directory `%s' exists but is not the\n"
@@ -24639,7 +24679,7 @@ msgstr ""
msgid "Cannot set up local storage -- %s"
msgstr ""
-#: shell/e-shell.c:1825
+#: shell/e-shell.c:1821
#, c-format
msgid ""
"The Evolution component that handles folders of type \"%s\"\n"
@@ -24647,23 +24687,23 @@ msgid ""
"in order to access that data again."
msgstr ""
-#: shell/e-shell.c:2090
+#: shell/e-shell.c:2086
msgid "Invalid arguments"
msgstr ""
-#: shell/e-shell.c:2092
+#: shell/e-shell.c:2088
msgid "Cannot register on OAF"
msgstr ""
-#: shell/e-shell.c:2094
+#: shell/e-shell.c:2090
msgid "Configuration Database not found"
msgstr ""
-#: shell/e-shell.c:2096 shell/e-storage.c:576
+#: shell/e-shell.c:2092 shell/e-storage.c:576
msgid "Generic error"
msgstr "አጠቃላይ ስህተት"
-#: shell/e-shell-config-autocompletion.c:110
+#: shell/e-shell-config-autocompletion.c:112
msgid "Extra Completion folders"
msgstr ""
@@ -24784,7 +24824,7 @@ msgstr ""
msgid "Create New Folder"
msgstr "አዲስ ዶሴ ፍጠር"
-#: shell/e-shell-folder-title-bar.c:654 shell/e-shell-folder-title-bar.c:655
+#: shell/e-shell-folder-title-bar.c:653 shell/e-shell-folder-title-bar.c:654
msgid "(Untitled)"
msgstr "(ያልተሰየመ)"
@@ -24822,7 +24862,7 @@ msgid "File %s does not exist"
msgstr ""
#: shell/e-shell-importer.c:491 shell/e-shell-importer.c:508
-#: shell/e-shell-importer.c:555
+#: shell/e-shell-importer.c:554
msgid "Evolution Error"
msgstr ""
@@ -24837,78 +24877,78 @@ msgstr ""
msgid "Importing"
msgstr ""
-#: shell/e-shell-importer.c:523
+#: shell/e-shell-importer.c:522
#, c-format
msgid ""
"Importing %s.\n"
"Starting %s"
msgstr ""
-#: shell/e-shell-importer.c:535
+#: shell/e-shell-importer.c:534
#, c-format
msgid "Error starting %s"
msgstr ""
-#: shell/e-shell-importer.c:554
+#: shell/e-shell-importer.c:553
#, c-format
msgid "Error loading %s"
msgstr ""
-#: shell/e-shell-importer.c:571
+#: shell/e-shell-importer.c:570
#, c-format
msgid ""
"Importing %s\n"
"Importing item 1."
msgstr ""
-#: shell/e-shell-importer.c:625
+#: shell/e-shell-importer.c:624
msgid "Automatic"
msgstr "አውቶማቲክ"
-#: shell/e-shell-importer.c:674
+#: shell/e-shell-importer.c:673
msgid "Filename:"
msgstr "የፋይል ስም፦"
-#: shell/e-shell-importer.c:679
+#: shell/e-shell-importer.c:678
msgid "Select a file"
msgstr "ፋይል ምረጡ"
-#: shell/e-shell-importer.c:688
+#: shell/e-shell-importer.c:687
msgid "File type:"
msgstr "የፋይሉ ዓይነት፦"
-#: shell/e-shell-importer.c:713
+#: shell/e-shell-importer.c:712
msgid "Import data and settings from older programs"
msgstr ""
-#: shell/e-shell-importer.c:717
+#: shell/e-shell-importer.c:716
msgid "Import a single file"
msgstr ""
-#: shell/e-shell-importer.c:783 shell/e-shell-startup-wizard.c:642
+#: shell/e-shell-importer.c:782 shell/e-shell-startup-wizard.c:642
msgid ""
"Please wait...\n"
"Scanning for existing setups"
msgstr ""
-#: shell/e-shell-importer.c:786 shell/e-shell-startup-wizard.c:645
+#: shell/e-shell-importer.c:785 shell/e-shell-startup-wizard.c:645
msgid "Starting Intelligent Importers"
msgstr ""
-#: shell/e-shell-importer.c:910 shell/e-shell-startup-wizard.c:770
+#: shell/e-shell-importer.c:909 shell/e-shell-startup-wizard.c:770
#, c-format
msgid "From %s:"
msgstr "ከ %s፦"
-#: shell/e-shell-importer.c:1080
+#: shell/e-shell-importer.c:1079
msgid "Select folder"
msgstr "ዶሴ ምረጡ"
-#: shell/e-shell-importer.c:1081
+#: shell/e-shell-importer.c:1080
msgid "Select a destination folder for importing this data"
msgstr ""
-#: shell/e-shell-importer.c:1193 shell/importer/intelligent.c:191
+#: shell/e-shell-importer.c:1192 shell/importer/intelligent.c:191
msgid "Import"
msgstr "ከውጭ አስገባ"
@@ -24933,7 +24973,7 @@ msgstr ""
msgid "Synchronizing \"%s\" (%d of %d) ..."
msgstr ""
-#: shell/e-shell-settings-dialog.c:346
+#: shell/e-shell-settings-dialog.c:345
msgid "Evolution Settings"
msgstr ""
@@ -24993,31 +25033,29 @@ msgstr ""
msgid "'.' and '..' are reserved folder names."
msgstr ""
-#: shell/e-shell-view.c:233
+#: shell/e-shell-view.c:235
msgid "(No folder displayed)"
msgstr ""
-#: shell/e-shell-view.c:1997
+#: shell/e-shell-view.c:1996
#, c-format
msgid "%s (%d)"
msgstr "%s (%d)"
-#: shell/e-shell-view.c:1999
+#: shell/e-shell-view.c:1998
msgid "(None)"
msgstr "(ምንም)"
-#: shell/e-shell-view.c:2042
-msgid ""
-"Ximian Evolution is currently online. Click on this button to work offline."
+#: shell/e-shell-view.c:2041
+msgid "Ximian Evolution is currently online. Click on this button to work offline."
msgstr ""
-#: shell/e-shell-view.c:2049
+#: shell/e-shell-view.c:2048
msgid "Ximian Evolution is in the process of going offline."
msgstr ""
-#: shell/e-shell-view.c:2055
-msgid ""
-"Ximian Evolution is currently offline. Click on this button to work online."
+#: shell/e-shell-view.c:2054
+msgid "Ximian Evolution is currently offline. Click on this button to work online."
msgstr ""
#: shell/e-shell-view-menu.c:91
@@ -25029,43 +25067,43 @@ msgstr ""
msgid "Error executing %s."
msgstr ""
-#: shell/e-shell-view-menu.c:195
+#: shell/e-shell-view-menu.c:193
msgid "Bug buddy was not found in your $PATH."
msgstr ""
-#: shell/e-shell-view-menu.c:203
+#: shell/e-shell-view-menu.c:201
msgid "Bug buddy could not be run."
msgstr ""
-#: shell/e-shell-view-menu.c:249
+#: shell/e-shell-view-menu.c:247
msgid "About Ximian Evolution"
msgstr ""
-#: shell/e-shell-view-menu.c:504
+#: shell/e-shell-view-menu.c:502
msgid "Go to folder..."
msgstr "ወደ ዶሴን ሂዱ..."
-#: shell/e-shell-view-menu.c:505
+#: shell/e-shell-view-menu.c:503
msgid "Select the folder that you want to open"
msgstr ""
-#: shell/e-shell-view-menu.c:619
+#: shell/e-shell-view-menu.c:617
msgid "Create New Shortcut"
msgstr ""
-#: shell/e-shell-view-menu.c:620
+#: shell/e-shell-view-menu.c:618
msgid "Select the folder you want the shortcut to point to:"
msgstr ""
-#: shell/e-shell-view-menu.c:778
+#: shell/e-shell-view-menu.c:776
msgid "_Work Online"
msgstr ""
-#: shell/e-shell-view-menu.c:791 ui/evolution.xml.h:67
+#: shell/e-shell-view-menu.c:789 ui/evolution.xml.h:67
msgid "_Work Offline"
msgstr ""
-#: shell/e-shell-view-menu.c:804 ui/evolution.xml.h:42
+#: shell/e-shell-view-menu.c:802 ui/evolution.xml.h:42
msgid "Work Offline"
msgstr ""
@@ -25270,63 +25308,63 @@ msgstr ""
msgid "<click here to select a folder>"
msgstr ""
-#: shell/evolution-shell-component.c:1154
+#: shell/evolution-shell-component.c:1157
msgid "CORBA error"
msgstr "የCORBA ብልሽት"
-#: shell/evolution-shell-component.c:1156
+#: shell/evolution-shell-component.c:1159
msgid "Interrupted"
msgstr ""
-#: shell/evolution-shell-component.c:1158
+#: shell/evolution-shell-component.c:1161
msgid "Invalid argument"
msgstr ""
-#: shell/evolution-shell-component.c:1160
+#: shell/evolution-shell-component.c:1163
msgid "Already has an owner"
msgstr ""
-#: shell/evolution-shell-component.c:1162
+#: shell/evolution-shell-component.c:1165
msgid "No owner"
msgstr "ባለቤት የለም"
-#: shell/evolution-shell-component.c:1164
+#: shell/evolution-shell-component.c:1167
msgid "Not found"
msgstr "አልተገኘም"
-#: shell/evolution-shell-component.c:1166
+#: shell/evolution-shell-component.c:1169
msgid "Unsupported type"
msgstr ""
-#: shell/evolution-shell-component.c:1168
+#: shell/evolution-shell-component.c:1171
msgid "Unsupported schema"
msgstr ""
-#: shell/evolution-shell-component.c:1170
+#: shell/evolution-shell-component.c:1173
msgid "Unsupported operation"
msgstr ""
-#: shell/evolution-shell-component.c:1172
+#: shell/evolution-shell-component.c:1175
msgid "Internal error"
msgstr "የውስጥ ብልሽት"
-#: shell/evolution-shell-component.c:1176
+#: shell/evolution-shell-component.c:1179
msgid "Exists"
msgstr ""
-#: shell/evolution-shell-component.c:1178
+#: shell/evolution-shell-component.c:1181
msgid "Invalid URI"
msgstr "የማይሰራ URI"
-#: shell/evolution-shell-component.c:1182
+#: shell/evolution-shell-component.c:1185
msgid "Has subfolders"
msgstr ""
-#: shell/evolution-shell-component.c:1184
+#: shell/evolution-shell-component.c:1187
msgid "No space left"
msgstr ""
-#: shell/evolution-shell-component.c:1186
+#: shell/evolution-shell-component.c:1189
msgid "Old owner has died"
msgstr ""
@@ -25527,7 +25565,7 @@ msgstr ""
msgid "Evolution can import data from the following files:"
msgstr ""
-#: shell/main.c:104 shell/main.c:474
+#: shell/main.c:104 shell/main.c:466
msgid "Evolution"
msgstr ""
@@ -25594,7 +25632,7 @@ msgstr ""
msgid "Force upgrading of configuration files from Evolution 1.0.x"
msgstr ""
-#: shell/main.c:478
+#: shell/main.c:470
#, c-format
msgid ""
"%s: --online and --offline cannot be used together.\n"
@@ -26035,8 +26073,7 @@ msgid "Hide _Read Messages"
msgstr ""
#: ui/evolution-mail-list.xml.h:8
-msgid ""
-"Hide deleted messages rather than displaying them with a line through them"
+msgid "Hide deleted messages rather than displaying them with a line through them"
msgstr ""
#: ui/evolution-mail-list.xml.h:9
@@ -27294,9 +27331,3 @@ msgstr ""
#: wombat/GNOME_Evolution_WombatNOLDAP.server.in.in.h:2
msgid "The Personal Calendar Server; calendar factory"
msgstr ""
-
-#~ msgid "Attribute"
-#~ msgstr "ጠባየ-አንቀጽ"
-
-#~ msgid "Select"
-#~ msgstr "ምረጥ"