added all the new gal widgets & a couple of other missing files. re-sorted

2005-06-21 Not Zed <NotZed@Ximian.com> * POTFILES.in: added all the new gal widgets & a couple of other missing files. re-sorted properly (it wasn't). *.po: merged in gal strings and updated (many strings no longer exist). svn path=/trunk/; revision=29559
author: Not Zed <NotZed@Ximian.com> 2005-06-21 16:35:06 +0800
committer: Michael Zucci <zucchi@src.gnome.org> 2005-06-21 16:35:06 +0800
commit: 9960d26ccfc41ddf4d73823932a52b4b89cb1fe9 (patch)
tree: 4398d7f80572abc78954d7cbb3d57234fdfa2fa9 /po/rw.po
parent: 0efd94d86fa3c5a70dbcf1bc79c5f017508639b0 (diff)
download: gsoc2013-evolution-9960d26ccfc41ddf4d73823932a52b4b89cb1fe9.tar.gz
gsoc2013-evolution-9960d26ccfc41ddf4d73823932a52b4b89cb1fe9.tar.zst
gsoc2013-evolution-9960d26ccfc41ddf4d73823932a52b4b89cb1fe9.zip
1 files changed, 7420 insertions, 6046 deletions
diff --git a/po/rw.po b/po/rw.po
index b40a45c4d2..0b1b3c78aa 100644
--- a/po/rw.po
+++ b/po/rw.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution 2.12\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-03-31 16:47-0700\n"
+"POT-Creation-Date: 2005-06-21 13:59+0800\n"
 "PO-Revision-Date: 2005-03-28 19:34-0700\n"
 "Last-Translator: Steve Murphy <murf@e-tools.com>\n"
 "Language-Team: Kinyarwanda <translation-team-rw@lists.sourceforge.net>\n"
@@ -24,24 +24,24 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: a11y/addressbook/ea-addressbook-view.c:94
-#: a11y/addressbook/ea-addressbook-view.c:103
-#: a11y/addressbook/ea-minicard-view.c:166
+#: ../a11y/addressbook/ea-addressbook-view.c:94
+#: ../a11y/addressbook/ea-addressbook-view.c:103
+#: ../a11y/addressbook/ea-minicard-view.c:169
 #, fuzzy
 msgid "evolution addressbook"
 msgstr "Impinduka"
 
-#: a11y/addressbook/ea-minicard-view.c:34
-#: addressbook/gui/component/addressbook-component.c:196
+#: ../a11y/addressbook/ea-minicard-view.c:34
+#: ../addressbook/gui/component/addressbook-component.c:196
 msgid "New Contact"
 msgstr ""
 
-#: a11y/addressbook/ea-minicard-view.c:35
-#: addressbook/gui/component/addressbook-component.c:204
+#: ../a11y/addressbook/ea-minicard-view.c:35
+#: ../addressbook/gui/component/addressbook-component.c:204
 msgid "New Contact List"
 msgstr ""
 
-#: a11y/addressbook/ea-minicard-view.c:149
+#: ../a11y/addressbook/ea-minicard-view.c:152
 #, fuzzy, c-format
 msgid "current addressbook folder has %d card"
 msgid_plural "current addressbook folder has %d cards"
@@ -53,13 +53,13 @@ msgstr[0] "KIGEZWEHO Ububiko"
 # sfx2/source\dialog\cfg.src:STR_OPEN.text
 # #-#-#-#-#  sfx2.pot (Gnome 2.12)  #-#-#-#-#
 # sfx2/source\dialog\versdlg.src:DLG_VERSIONS.PB_OPEN.text
-#: a11y/addressbook/ea-minicard.c:31
-#: calendar/gui/alarm-notify/alarm-queue.c:878
-#: ui/evolution-message-composer.xml.h:10
+#: ../a11y/addressbook/ea-minicard.c:31
+#: ../calendar/gui/alarm-notify/alarm-queue.c:953
+#: ../ui/evolution-message-composer.xml.h:11
 msgid "Open"
 msgstr "Gufungura"
 
-#: a11y/addressbook/ea-minicard.c:138
+#: ../a11y/addressbook/ea-minicard.c:141
 msgid "Contact List: "
 msgstr ""
 
@@ -100,108 +100,109 @@ msgstr ""
 #
 # ***** END LICENSE BLOCK *****
 # Box Headings
-#: a11y/addressbook/ea-minicard.c:139
+#: ../a11y/addressbook/ea-minicard.c:142
 #, fuzzy
 msgid "Contact: "
 msgstr "Umuntu"
 
-#: a11y/addressbook/ea-minicard.c:165
+#: ../a11y/addressbook/ea-minicard.c:168
 #, fuzzy
 msgid "evolution minicard"
 msgstr "Impinduka"
 
-#: a11y/calendar/ea-cal-view-event.c:235
+#: ../a11y/calendar/ea-cal-view-event.c:235
 msgid "It has alarms."
 msgstr ""
 
-#: a11y/calendar/ea-cal-view-event.c:238
+#: ../a11y/calendar/ea-cal-view-event.c:238
 msgid "It has recurrences."
 msgstr ""
 
-#: a11y/calendar/ea-cal-view-event.c:241
+#: ../a11y/calendar/ea-cal-view-event.c:241
 #, fuzzy
 msgid "It is a meeting."
 msgstr "ni a"
 
-#: a11y/calendar/ea-cal-view-event.c:247
+#: ../a11y/calendar/ea-cal-view-event.c:247
 #, fuzzy, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "ni"
 
-#: a11y/calendar/ea-cal-view-event.c:249
+#: ../a11y/calendar/ea-cal-view-event.c:249
 #, fuzzy
 msgid "Calendar Event: It has no summary."
 msgstr "Oya Inshamake"
 
-#: a11y/calendar/ea-cal-view-event.c:268
+#: ../a11y/calendar/ea-cal-view-event.c:268
 #, fuzzy
 msgid "calendar view event"
 msgstr "Kalindari Kureba Icyabaye"
 
-#: a11y/calendar/ea-cal-view-event.c:485
+#: ../a11y/calendar/ea-cal-view-event.c:485
 msgid "Grab Focus"
 msgstr ""
 
-#: a11y/calendar/ea-cal-view.c:306
+#: ../a11y/calendar/ea-cal-view.c:306
 msgid "New Appointment"
 msgstr ""
 
-#: a11y/calendar/ea-cal-view.c:307
+#: ../a11y/calendar/ea-cal-view.c:307
 msgid "New All Day Event"
 msgstr ""
 
-#: a11y/calendar/ea-cal-view.c:308 calendar/gui/e-calendar-view.c:1376
+#: ../a11y/calendar/ea-cal-view.c:308 ../calendar/gui/e-calendar-view.c:1483
 msgid "New Meeting"
 msgstr ""
 
-#: a11y/calendar/ea-cal-view.c:309
+#: ../a11y/calendar/ea-cal-view.c:309
 #, fuzzy
 msgid "Go to Today"
 msgstr "Kuri"
 
-#: a11y/calendar/ea-cal-view.c:310
+#: ../a11y/calendar/ea-cal-view.c:310
 #, fuzzy
 msgid "Go to Date"
 msgstr "Kuri"
 
-#: a11y/calendar/ea-day-view-main-item.c:299
-#: a11y/calendar/ea-week-view-main-item.c:301
+#: ../a11y/calendar/ea-day-view-main-item.c:299
+#: ../a11y/calendar/ea-week-view-main-item.c:301
 #, fuzzy
 msgid "a table to view and select the current time range"
 msgstr "a imbonerahamwe# Kuri Kureba Na Guhitamo KIGEZWEHO Igihe Urutonde"
 
-#: a11y/calendar/ea-day-view.c:146 a11y/calendar/ea-week-view.c:148
+#: ../a11y/calendar/ea-day-view.c:146 ../a11y/calendar/ea-week-view.c:148
 #, fuzzy, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
 msgstr[0] "Icyabaye"
 
-#: a11y/calendar/ea-day-view.c:148 a11y/calendar/ea-week-view.c:150
+#: ../a11y/calendar/ea-day-view.c:148 ../a11y/calendar/ea-week-view.c:150
 #, fuzzy
 msgid "It has no events."
 msgstr "Oya Ibyabaye"
 
-#: a11y/calendar/ea-day-view.c:152
+#: ../a11y/calendar/ea-day-view.c:152
 #, c-format
 msgid "Work Week View: %s. %s"
 msgstr ""
 
-#: a11y/calendar/ea-day-view.c:155
+#: ../a11y/calendar/ea-day-view.c:155
 #, c-format
 msgid "Day View: %s. %s"
 msgstr ""
 
-#: a11y/calendar/ea-day-view.c:186
+#: ../a11y/calendar/ea-day-view.c:186
 #, fuzzy
 msgid "calendar view for a work week"
 msgstr "Kalindari Kureba kugirango a Akazi Icyumweru"
 
-#: a11y/calendar/ea-day-view.c:188
+#: ../a11y/calendar/ea-day-view.c:188
 #, fuzzy
 msgid "calendar view for one or more days"
 msgstr "Kalindari Kureba kugirango Cyangwa Birenzeho Iminsi"
 
-#: a11y/calendar/ea-gnome-calendar.c:187 calendar/gui/calendar-component.c:660
+#: ../a11y/calendar/ea-gnome-calendar.c:187
+#: ../calendar/gui/calendar-component.c:660
 msgid "%A %d %b %Y"
 msgstr ""
 
@@ -212,24 +213,32 @@ msgstr ""
 #. %d = day of month, %b = abbreviated month name.
 #. You can change the order but don't change the
 #. specifiers or add anything.
-#: a11y/calendar/ea-gnome-calendar.c:190 calendar/gui/calendar-component.c:663
-#: calendar/gui/e-day-view-top-item.c:719 calendar/gui/e-day-view.c:1511
-#: calendar/gui/e-week-view-main-item.c:321
+#: ../a11y/calendar/ea-gnome-calendar.c:190
+#: ../calendar/gui/calendar-component.c:663
+#: ../calendar/gui/e-day-view-top-item.c:719 ../calendar/gui/e-day-view.c:1516
+#: ../calendar/gui/e-week-view-main-item.c:321
 #, fuzzy
 msgid "%a %d %b"
 msgstr "%a%d%b"
 
-#: a11y/calendar/ea-gnome-calendar.c:192 a11y/calendar/ea-gnome-calendar.c:197
-#: a11y/calendar/ea-gnome-calendar.c:199 calendar/gui/calendar-component.c:665
-#: calendar/gui/calendar-component.c:670 calendar/gui/calendar-component.c:672
+#: ../a11y/calendar/ea-gnome-calendar.c:192
+#: ../a11y/calendar/ea-gnome-calendar.c:197
+#: ../a11y/calendar/ea-gnome-calendar.c:199
+#: ../calendar/gui/calendar-component.c:665
+#: ../calendar/gui/calendar-component.c:670
+#: ../calendar/gui/calendar-component.c:672
 msgid "%a %d %b %Y"
 msgstr ""
 
 # desktop/source\app\ssodlg.src:DLG_SSOLOGIN.text
-#: a11y/calendar/ea-gnome-calendar.c:216 a11y/calendar/ea-gnome-calendar.c:222
-#: a11y/calendar/ea-gnome-calendar.c:228 a11y/calendar/ea-gnome-calendar.c:230
-#: calendar/gui/calendar-component.c:684 calendar/gui/calendar-component.c:691
-#: calendar/gui/calendar-component.c:697 calendar/gui/calendar-component.c:699
+#: ../a11y/calendar/ea-gnome-calendar.c:216
+#: ../a11y/calendar/ea-gnome-calendar.c:222
+#: ../a11y/calendar/ea-gnome-calendar.c:228
+#: ../a11y/calendar/ea-gnome-calendar.c:230
+#: ../calendar/gui/calendar-component.c:684
+#: ../calendar/gui/calendar-component.c:691
+#: ../calendar/gui/calendar-component.c:697
+#: ../calendar/gui/calendar-component.c:699
 #, fuzzy
 msgid "%d %b %Y"
 msgstr "%d%b%Y"
@@ -242,109 +251,197 @@ msgstr "%d%b%Y"
 #. strftime format %d = day of month, %b = abbreviated
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: a11y/calendar/ea-gnome-calendar.c:220 calendar/gui/calendar-component.c:689
-#: calendar/gui/e-day-view-top-item.c:723 calendar/gui/e-day-view.c:1527
-#: calendar/gui/e-week-view-main-item.c:335
+#: ../a11y/calendar/ea-gnome-calendar.c:220
+#: ../calendar/gui/calendar-component.c:689
+#: ../calendar/gui/e-day-view-top-item.c:723 ../calendar/gui/e-day-view.c:1532
+#: ../calendar/gui/e-week-view-main-item.c:335
 #, fuzzy
 msgid "%d %b"
 msgstr "%d%b"
 
-#: a11y/calendar/ea-gnome-calendar.c:247 a11y/calendar/ea-gnome-calendar.c:255
-#: calendar/importers/icalendar-importer.c:726
+#: ../a11y/calendar/ea-gnome-calendar.c:247
+#: ../a11y/calendar/ea-gnome-calendar.c:255
+#: ../calendar/importers/icalendar-importer.c:726
 msgid "Gnome Calendar"
 msgstr ""
 
-#: a11y/calendar/ea-gnome-calendar.c:290
+#: ../a11y/calendar/ea-gnome-calendar.c:290
 #, fuzzy
 msgid "search bar"
 msgstr "Umurongo ntambika w'ishakisha"
 
-#: a11y/calendar/ea-gnome-calendar.c:291
+#: ../a11y/calendar/ea-gnome-calendar.c:291
 #, fuzzy
 msgid "evolution calendar search bar"
 msgstr "Impinduka Kalindari Gushaka"
 
-#: a11y/calendar/ea-jump-button.c:149
+#: ../a11y/calendar/ea-jump-button.c:149
 #, fuzzy
 msgid "Jump button"
 msgstr "Akabuto"
 
-#: a11y/calendar/ea-jump-button.c:158
+#: ../a11y/calendar/ea-jump-button.c:158
 #, fuzzy
 msgid "Click here, you can find more events."
 msgstr "Gushaka Birenzeho Ibyabaye"
 
-#: a11y/calendar/ea-week-view.c:155
+#: ../a11y/calendar/ea-week-view.c:155
 #, c-format
 msgid "Month View: %s. %s"
 msgstr ""
 
-#: a11y/calendar/ea-week-view.c:159
+#: ../a11y/calendar/ea-week-view.c:159
 #, c-format
 msgid "Week View: %s. %s"
 msgstr ""
 
-#: a11y/calendar/ea-week-view.c:190
+#: ../a11y/calendar/ea-week-view.c:190
 #, fuzzy
 msgid "calendar view for a month"
 msgstr "Kalindari Kureba kugirango a Ukwezi"
 
-#: a11y/calendar/ea-week-view.c:192
+#: ../a11y/calendar/ea-week-view.c:192
 #, fuzzy
 msgid "calendar view for one or more weeks"
 msgstr "Kalindari Kureba kugirango Cyangwa Birenzeho IBYUMWERU"
 
+#: ../a11y/e-table/gal-a11y-e-cell-popup.c:124
+msgid "popup"
+msgstr ""
+
+#. action name
+#: ../a11y/e-table/gal-a11y-e-cell-popup.c:125
+#, fuzzy
+msgid "popup a child"
+msgstr "a"
+
+# #-#-#-#-#  basctl.pot (Gnome 2.12)  #-#-#-#-#
+# basctl/source\basicide\basidesh.src:RID_BASICMENU.MN_EDIT.text
+# #-#-#-#-#  basctl.pot (Gnome 2.12)  #-#-#-#-#
+# basctl/source\basicide\basidesh.src:RID_BASICPLUGINMENU.MN_PLEDIT.text
+# #-#-#-#-#  basctl.pot (Gnome 2.12)  #-#-#-#-#
+# basctl/source\basicide\macrodlg.src:RID_MACROCHOOSER.RID_PB_EDIT.text
+# #-#-#-#-#  basctl.pot (Gnome 2.12)  #-#-#-#-#
+# basctl/source\basicide\moduldlg.src:RID_TP_MODULS.RID_PB_EDIT.text
+# #-#-#-#-#  basctl.pot (Gnome 2.12)  #-#-#-#-#
+# basctl/source\basicide\moduldlg.src:RID_TP_LIBS.RID_PB_EDIT.text
+#: ../a11y/e-table/gal-a11y-e-cell-text.c:612
+#, fuzzy
+msgid "edit"
+msgstr "Guhindura"
+
+#: ../a11y/e-table/gal-a11y-e-cell-text.c:613
+#, fuzzy
+msgid "begin editing this cell"
+msgstr "iyi Akazu"
+
+# officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....Navigator.GlobalDocMode.text
+#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:151
+#, fuzzy
+msgid "toggle"
+msgstr "Mukomatanya"
+
+#. action name
+#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:152
+#, fuzzy
+msgid "toggle the cell"
+msgstr "Mukomatanya Akazu"
+
+# svtools/source\Accessibility\accessiblelistboxentry.src:STR_SVT_ACC_ACTION_EXPAND.text
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:171
+#, fuzzy
+msgid "expand"
+msgstr "Kwagura"
+
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:172
+#, fuzzy
+msgid "expands the row in the ETree containing this cell"
+msgstr "Urubariro in iyi Akazu"
+
+# svtools/source\Accessibility\accessiblelistboxentry.src:STR_SVT_ACC_ACTION_COLLAPSE.text
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:177
+#, fuzzy
+msgid "collapse"
+msgstr "Gusenyuka"
+
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:178
+#, fuzzy
+msgid "collapses the row in the ETree containing this cell"
+msgstr "Urubariro in iyi Akazu"
+
+#: ../a11y/e-table/gal-a11y-e-cell.c:107
+msgid "Table Cell"
+msgstr "Akadirishya k'Imbonerahamwe"
+
+#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:44
+#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:119
+#: ../widgets/table/e-table-click-to-add.c:575
+#, fuzzy
+msgid "click to add"
+msgstr "Kanda Kuri Kongeramo"
+
+#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:53
+#, fuzzy
+msgid "click"
+msgstr "Kanda"
+
+#: ../a11y/e-table/gal-a11y-e-table-column-header.c:135
+#, fuzzy
+msgid "sort"
+msgstr "Ishungura"
+
 # desktop/source\app\ssodlg.src:DLG_SSOLOGIN.text
-#: a11y/widgets/ea-calendar-item.c:296 a11y/widgets/ea-calendar-item.c:302
+#: ../a11y/widgets/ea-calendar-item.c:296
+#: ../a11y/widgets/ea-calendar-item.c:302
 #, fuzzy
 msgid "%d %B %Y"
 msgstr "%d%B%Y"
 
-#: a11y/widgets/ea-calendar-item.c:304
+#: ../a11y/widgets/ea-calendar-item.c:304
 #, fuzzy, c-format
 msgid "Calendar: from %s to %s"
 msgstr "Bivuye Kuri"
 
-#: a11y/widgets/ea-calendar-item.c:339
+#: ../a11y/widgets/ea-calendar-item.c:339
 #, fuzzy
 msgid "evolution calendar item"
 msgstr "Impinduka Kalindari Ikintu"
 
-#: a11y/widgets/ea-combo-button.c:40
+#: ../a11y/widgets/ea-combo-button.c:40
 msgid "Combo Button"
 msgstr ""
 
-#: a11y/widgets/ea-combo-button.c:50
+#: ../a11y/widgets/ea-combo-button.c:50
 msgid "Activate Default"
 msgstr ""
 
-#: a11y/widgets/ea-combo-button.c:52
+#: ../a11y/widgets/ea-combo-button.c:52
 msgid "Popup Menu"
 msgstr ""
 
-#. addressbook:ldap-init primary
-#: addressbook/addressbook-errors.xml.h:2
+#: ../addressbook/addressbook.error.xml.h:1
 #, fuzzy
-msgid "This addressbook could not be opened."
-msgstr "OYA"
+msgid ""
+"A contact already exists with this address. Would you like to add a new card "
+"with the same address anyway?"
+msgstr "A Umuntu Na: iyi Aderesi nka Kuri Kongeramo a Gishya Na: Aderesi"
 
-#. addressbook:ldap-init secondary
-#: addressbook/addressbook-errors.xml.h:4
+#: ../addressbook/addressbook.error.xml.h:2
 #, fuzzy
-msgid ""
-"This addressbook server might be unreachable or the server name may be "
-"misspelled or your network connection could be down."
-msgstr ""
-"Seriveri Cyangwa Seriveri Izina: Gicurasi Cyangwa urusobe Ukwihuza Hasi"
+msgid "Address '{0}' already exists."
+msgstr "0"
 
-#. addressbook:ldap-auth primary
-#: addressbook/addressbook-errors.xml.h:6
+#: ../addressbook/addressbook.error.xml.h:3
 #, fuzzy
-msgid "Failed to authenticate with LDAP server."
-msgstr "Kuri Na: Seriveri"
+msgid "Cannot move contact."
+msgstr "Kwimura Umuntu"
 
-#. addressbook:ldap-auth secondary
-#: addressbook/addressbook-errors.xml.h:8
+#: ../addressbook/addressbook.error.xml.h:4
+#, fuzzy
+msgid "Category editor not available."
+msgstr "Muhinduzi OYA Bihari"
+
+#: ../addressbook/addressbook.error.xml.h:5
 #, fuzzy
 msgid ""
 "Check to make sure your password is spelled correctly and that you are using "
@@ -354,142 +451,115 @@ msgstr ""
 "Kuri Ubwoko Ijambobanga... ni Na ikoresha a Ifashayinjira Uburyo Amagambo "
 "banga Inyuguti nkuru ku"
 
-#. addressbook:ldap-search-base primary
-#: addressbook/addressbook-errors.xml.h:10
+#: ../addressbook/addressbook.error.xml.h:6
 #, fuzzy
-msgid "This addressbook server does not have any suggested search bases."
-msgstr "Seriveri OYA Gushaka"
+msgid "Could not get schema information for LDAP server."
+msgstr "OYA Kubona Igishushanyo Ibisobanuro kugirango Seriveri"
 
-#. addressbook:ldap-search-base secondary
-#: addressbook/addressbook-errors.xml.h:12
+#: ../addressbook/addressbook.error.xml.h:7
 #, fuzzy
-msgid ""
-"This LDAP server may use an older version of LDAP, which does not support "
-"this functionality or it may be misconfigured. Ask your administrator for "
-"supported search bases."
-msgstr ""
-"Seriveri Gicurasi Gukoresha Verisiyo Bya OYA Gushigikira iyi Cyangwa "
-"Gicurasi umuyobozi/ uyobora kugirango Gushaka"
+msgid "Could not remove addressbook."
+msgstr "OYA Gukuraho..."
 
-#. addressbook:ldap-v3-schema primary
-#: addressbook/addressbook-errors.xml.h:14
+#: ../addressbook/addressbook.error.xml.h:8
 #, fuzzy
-msgid "This server does not support LDAPv3 schema information."
-msgstr "Seriveri OYA Gushigikira Igishushanyo Ibisobanuro"
+msgid "Delete address book '{0}'?"
+msgstr "Aderesi Igitabo 0"
 
-#. addressbook:ldap-get-schema primary
-#: addressbook/addressbook-errors.xml.h:16
+#: ../addressbook/addressbook.error.xml.h:9
 #, fuzzy
-msgid "Could not get schema information for LDAP server."
-msgstr "OYA Kubona Igishushanyo Ibisobanuro kugirango Seriveri"
+msgid "Error loading addressbook."
+msgstr "Itangira..."
+
+#: ../addressbook/addressbook.error.xml.h:10
+#, fuzzy
+msgid "Error saving {0} to {1}: {2}"
+msgstr "Mu kubika Aho kubariza Kuri 0 1."
+
+#: ../addressbook/addressbook.error.xml.h:11
+#, fuzzy
+msgid "Failed to authenticate with LDAP server."
+msgstr "Kuri Na: Seriveri"
 
-#. addressbook:ldap-invalid-schema primary
-#: addressbook/addressbook-errors.xml.h:18
+#: ../addressbook/addressbook.error.xml.h:12
 #, fuzzy
 msgid "LDAP server did not respond with valid schema information."
 msgstr "Seriveri OYA Na: Byemewe Igishushanyo Ibisobanuro"
 
-#. addressbook:remove-addressbook primary
-#: addressbook/addressbook-errors.xml.h:20
+#: ../addressbook/addressbook.error.xml.h:13
+msgid "Server Version"
+msgstr ""
+
+#: ../addressbook/addressbook.error.xml.h:14
+#: ../calendar/calendar.error.xml.h:44
 #, fuzzy
-msgid "Could not remove addressbook."
-msgstr "OYA Gukuraho..."
+msgid "Some features may not work properly with your current server"
+msgstr "Ibiranga Gicurasi OYA Akazi Na: KIGEZWEHO Seriveri Verisiyo"
 
-#. addressbook:ask-delete-addressbook primary
-#: addressbook/addressbook-errors.xml.h:22
+#: ../addressbook/addressbook.error.xml.h:15
 #, fuzzy
-msgid "Delete address book '{0}'?"
-msgstr "Aderesi Igitabo 0"
+msgid "The Evolution addressbook has quit unexpectedly."
+msgstr "Kuvamo"
 
-#. addressbook:ask-delete-addressbook secondary
-#: addressbook/addressbook-errors.xml.h:24
+#: ../addressbook/addressbook.error.xml.h:16
+#, fuzzy
+msgid ""
+"This LDAP server may use an older version of LDAP, which does not support "
+"this functionality or it may be misconfigured. Ask your administrator for "
+"supported search bases."
+msgstr ""
+"Seriveri Gicurasi Gukoresha Verisiyo Bya OYA Gushigikira iyi Cyangwa "
+"Gicurasi umuyobozi/ uyobora kugirango Gushaka"
+
+#: ../addressbook/addressbook.error.xml.h:17
 #, fuzzy
 msgid "This address book will be removed permanently."
 msgstr "Aderesi Igitabo Cyavanyweho"
 
-#. addressbook:edit-categories primary
-#: addressbook/addressbook-errors.xml.h:26
+#: ../addressbook/addressbook.error.xml.h:18
 #, fuzzy
-msgid "Category editor not available."
-msgstr "Muhinduzi OYA Bihari"
+msgid "This addressbook could not be opened."
+msgstr "OYA"
 
-#. addressbook:generic-error primary
-#. addressbook:load-error secondary
-#. addressbook:search-error secondary
-#. mail:session-message-info secondary
-#. mail:session-message-info-cancel secondary
-#. mail:session-message-warning secondary
-#. mail:session-message-warning-cancel secondary
-#. mail:session-message-error secondary
-#. mail:session-message-error-cancel secondary
-#. mail:ask-session-password secondary
-#. mail:filter-load-error secondary
-#: addressbook/addressbook-errors.xml.h:28
-#: addressbook/addressbook-errors.xml.h:36
-#: addressbook/addressbook-errors.xml.h:40 mail/mail-errors.xml.h:75
-#: mail/mail-errors.xml.h:77 mail/mail-errors.xml.h:79
-#: mail/mail-errors.xml.h:81 mail/mail-errors.xml.h:83
-#: mail/mail-errors.xml.h:85 mail/mail-errors.xml.h:89
-#: mail/mail-errors.xml.h:93
+#: ../addressbook/addressbook.error.xml.h:19
 #, fuzzy
-msgid "{0}"
-msgstr "{0"
+msgid "This addressbook server does not have any suggested search bases."
+msgstr "Seriveri OYA Gushaka"
 
-#. addressbook:generic-error secondary
-#. mail-composer:no-attach secondary
-#. mail:no-save-path secondary
-#: addressbook/addressbook-errors.xml.h:30
-#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:97
+#: ../addressbook/addressbook.error.xml.h:20
 #, fuzzy
-msgid "{1}"
-msgstr "{1."
+msgid ""
+"This addressbook server might be unreachable or the server name may be "
+"misspelled or your network connection could be down."
+msgstr ""
+"Seriveri Cyangwa Seriveri Izina: Gicurasi Cyangwa urusobe Ukwihuza Hasi"
 
-#. addressbook:load-error title
-#: addressbook/addressbook-errors.xml.h:32
+#: ../addressbook/addressbook.error.xml.h:21
 #, fuzzy
-msgid "Unable to open addressbook"
-msgstr "Kuri Gufungura"
+msgid "This server does not support LDAPv3 schema information."
+msgstr "Seriveri OYA Gushigikira Igishushanyo Ibisobanuro"
 
-#. addressbook:load-error primary
-#: addressbook/addressbook-errors.xml.h:34
+#: ../addressbook/addressbook.error.xml.h:22
 #, fuzzy
-msgid "Error loading addressbook."
-msgstr "Itangira..."
+msgid "Unable to open addressbook"
+msgstr "Kuri Gufungura"
 
-#. addressbook:search-error primary
-#: addressbook/addressbook-errors.xml.h:38
+#: ../addressbook/addressbook.error.xml.h:23
 #, fuzzy
 msgid "Unable to perform search."
 msgstr "Kuri Gushaka"
 
-#. addressbook:prompt-save primary
-#: addressbook/addressbook-errors.xml.h:42
-#, fuzzy
-msgid "Would you like to save your changes?"
-msgstr "nka Kuri Kubika Amahinduka"
-
-#. addressbook:prompt-save secondary
-#: addressbook/addressbook-errors.xml.h:44
-#, fuzzy
-msgid ""
-"You have made modifications to this contact. Do you want to save these "
-"changes?"
-msgstr "Kuri iyi Umuntu Kuri Kubika Amahinduka"
-
-# sc/source\ui\src\optdlg.src:RID_SCPAGE_USERLISTS.STR_DISMISS.text
-#: addressbook/addressbook-errors.xml.h:45
+#: ../addressbook/addressbook.error.xml.h:24
 #, fuzzy
-msgid "_Discard"
-msgstr "Kwanga"
+msgid "Unable to save {0}."
+msgstr "Kuri Kubika Umuntu S"
 
-#. addressbook:prompt-move primary
-#: addressbook/addressbook-errors.xml.h:47
+#: ../addressbook/addressbook.error.xml.h:25
 #, fuzzy
-msgid "Cannot move contact."
-msgstr "Kwimura Umuntu"
+msgid "Would you like to save your changes?"
+msgstr "nka Kuri Kubika Amahinduka"
 
-#. addressbook:prompt-move secondary
-#: addressbook/addressbook-errors.xml.h:49
+#: ../addressbook/addressbook.error.xml.h:26
 #, fuzzy
 msgid ""
 "You are attempting to move a contact from one addressbook to another but it "
@@ -498,154 +568,133 @@ msgstr ""
 "Kuri Kwimura a Umuntu Bivuye Kuri Cyavanyweho Bivuye Inkomoko Kuri Kubika a "
 "Gukoporora"
 
-#. addressbook:save-error primary
-#: addressbook/addressbook-errors.xml.h:51
-#, fuzzy
-msgid "Unable to save contact(s)."
-msgstr "Kuri Kubika Umuntu S"
-
-#. addressbook:save-error secondary
-#: addressbook/addressbook-errors.xml.h:53
-#, fuzzy
-msgid "Error saving contacts to {0}: {1}"
-msgstr "Mu kubika Aho kubariza Kuri 0 1."
+#: ../addressbook/addressbook.error.xml.h:27
+#: ../calendar/calendar.error.xml.h:59
+msgid ""
+"You are connecting to an unsupported GroupWise server and may encounter "
+"problems using Evolution. For best results the server should be upgraded to "
+"a supported version"
+msgstr ""
 
-#. addressbook:backend-died primary
-#: addressbook/addressbook-errors.xml.h:55
+#: ../addressbook/addressbook.error.xml.h:28
 #, fuzzy
-msgid "The Evolution addressbook has quit unexpectedly."
-msgstr "Kuvamo"
+msgid ""
+"You have made modifications to this contact. Do you want to save these "
+"changes?"
+msgstr "Kuri iyi Umuntu Kuri Kubika Amahinduka"
 
-#. addressbook:backend-died secondary
-#: addressbook/addressbook-errors.xml.h:57
+#: ../addressbook/addressbook.error.xml.h:29
 #, fuzzy
 msgid ""
 "Your contacts for {0} will not be available until Evolution is restarted."
 msgstr "Aho kubariza kugirango 0 OYA Bihari ni"
 
-#. addressbook:ask-list-add-exists primary
-#: addressbook/addressbook-errors.xml.h:59
-#, fuzzy
-msgid "Address '{0}' already exists."
-msgstr "0"
-
-#. addressbook:ask-list-add-exists secondary
-#: addressbook/addressbook-errors.xml.h:61
-#, fuzzy
-msgid ""
-"A contact already exists with this address.  Would you like to add a new "
-"card with the same address anyway?"
-msgstr "A Umuntu Na: iyi Aderesi nka Kuri Kongeramo a Gishya Na: Aderesi"
-
-#: addressbook/addressbook-errors.xml.h:62 mail/em-vfolder-rule.c:494
-#: plugins/shared-folder/properties.glade.h:10
+#: ../addressbook/addressbook.error.xml.h:30 ../mail/em-vfolder-rule.c:494
+#: ../plugins/groupwise-features/properties.glade.h:10
 #, fuzzy
 msgid "_Add"
 msgstr "Kongeramo"
 
-#. addressbook:server-version title
-#. calendar:server-version title
-#: addressbook/addressbook-errors.xml.h:64 calendar/calendar-errors.xml.h:142
-msgid "Server Version"
-msgstr ""
+# sc/source\ui\src\optdlg.src:RID_SCPAGE_USERLISTS.STR_DISMISS.text
+#: ../addressbook/addressbook.error.xml.h:31
+#, fuzzy
+msgid "_Discard"
+msgstr "Kwanga"
 
-#. addressbook:server-version primary
-#. calendar:server-version primary
-#: addressbook/addressbook-errors.xml.h:66 calendar/calendar-errors.xml.h:144
+#: ../addressbook/addressbook.error.xml.h:32
 #, fuzzy
-msgid "Your server needs to be updated"
-msgstr "Seriveri Kuri"
+msgid "{0}"
+msgstr "{0"
 
-#. addressbook:server-version secondary
-#: addressbook/addressbook-errors.xml.h:68
+#: ../addressbook/addressbook.error.xml.h:33
 #, fuzzy
-msgid "Some features may not work correctly with your current server version"
-msgstr "Ibiranga Gicurasi OYA Akazi Na: KIGEZWEHO Seriveri Verisiyo"
+msgid "{1}"
+msgstr "{1."
 
-#: addressbook/conduit/address-conduit.c:298
+#: ../addressbook/conduit/address-conduit.c:298
 msgid "Default Sync Address:"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:1183
-#: addressbook/conduit/address-conduit.c:1184
+#: ../addressbook/conduit/address-conduit.c:1183
+#: ../addressbook/conduit/address-conduit.c:1184
 #, fuzzy
 msgid "Could not load addressbook"
 msgstr "OYA Ibirimo"
 
-#: addressbook/conduit/address-conduit.c:1252
-#: addressbook/conduit/address-conduit.c:1255
+#: ../addressbook/conduit/address-conduit.c:1252
+#: ../addressbook/conduit/address-conduit.c:1255
 #, fuzzy
 msgid "Could not read pilot's Address application block"
 msgstr "OYA Gusoma Porogaramu Funga"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
 msgid "Autocompletion"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
 #, fuzzy
 msgid "C_ontacts"
 msgstr "Aho kubariza"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
 msgid "Certificates"
 msgstr "Impamyabushobozi"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
 msgid "Configure autocomplete here"
 msgstr ""
 
 #. Create the contacts group
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: addressbook/gui/component/addressbook-view.c:1119
-#: calendar/gui/calendar-component.c:246 calendar/gui/migration.c:385
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#: ../addressbook/gui/component/addressbook-view.c:1119
+#: ../calendar/gui/calendar-component.c:246 ../calendar/gui/migration.c:388
 msgid "Contacts"
 msgstr "Aho kubariza"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
 msgid "Evolution Addressbook"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
 #, fuzzy
 msgid "Evolution Addressbook address pop-up"
 msgstr "Aderesi Hejuru"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
 #, fuzzy
 msgid "Evolution Addressbook address viewer"
 msgstr "Aderesi"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
 msgid "Evolution Addressbook card viewer"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
 msgid "Evolution Addressbook component"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
 msgid "Evolution S/Mime Certificate Management Control"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
 #, fuzzy
 msgid "Evolution folder settings configuration control"
 msgstr "Ububiko Amagenamiterere Iboneza Igenzura"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
 #, fuzzy
 msgid "Manage your S/MIME certificates here"
 msgstr "Impamyabushobozi"
 
 #. create the local source group
 #. On This Computer is always first and vFolders is always last
-#: addressbook/gui/component/addressbook-component.c:133
-#: addressbook/gui/component/addressbook-migrate.c:493
-#: calendar/gui/calendar-component.c:208 calendar/gui/migration.c:459
-#: calendar/gui/migration.c:552 calendar/gui/tasks-component.c:188
-#: mail/em-folder-tree-model.c:197 mail/em-folder-tree-model.c:199
-#: mail/mail-component.c:290 mail/mail-vfolder.c:222
+#: ../addressbook/gui/component/addressbook-component.c:133
+#: ../addressbook/gui/component/addressbook-migrate.c:493
+#: ../calendar/gui/calendar-component.c:208 ../calendar/gui/migration.c:462
+#: ../calendar/gui/migration.c:555 ../calendar/gui/tasks-component.c:188
+#: ../mail/em-folder-tree-model.c:197 ../mail/em-folder-tree-model.c:199
+#: ../mail/mail-component.c:291 ../mail/mail-vfolder.c:223
 msgid "On This Computer"
 msgstr ""
 
@@ -655,19 +704,19 @@ msgstr ""
 #. Create the default Person task list
 #. Create the default Person addressbook
 #. orange
-#: addressbook/gui/component/addressbook-component.c:141
-#: addressbook/gui/component/addressbook-migrate.c:501
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: calendar/gui/calendar-component.c:216 calendar/gui/migration.c:467
-#: calendar/gui/migration.c:560 calendar/gui/tasks-component.c:196
-#: filter/filter-label.c:123 mail/em-migrate.c:1043 mail/mail-config.c:78
-#: mail/mail-config.glade.h:103
+#: ../addressbook/gui/component/addressbook-component.c:141
+#: ../addressbook/gui/component/addressbook-migrate.c:501
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: ../calendar/gui/calendar-component.c:216 ../calendar/gui/migration.c:470
+#: ../calendar/gui/migration.c:563 ../calendar/gui/tasks-component.c:196
+#: ../filter/filter-label.c:123 ../mail/em-migrate.c:1043
+#: ../mail/mail-config.c:78 ../mail/mail-config.glade.h:104
 msgid "Personal"
 msgstr "Bwite"
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-component.c:149
-#: addressbook/gui/component/addressbook-migrate.c:509
+#: ../addressbook/gui/component/addressbook-component.c:149
+#: ../addressbook/gui/component/addressbook-migrate.c:509
 msgid "On LDAP Servers"
 msgstr ""
 
@@ -708,44 +757,44 @@ msgstr ""
 #
 # ***** END LICENSE BLOCK *****
 # Box Headings
-#: addressbook/gui/component/addressbook-component.c:197
+#: ../addressbook/gui/component/addressbook-component.c:197
 #, fuzzy
 msgid "_Contact"
 msgstr "Umuntu"
 
-#: addressbook/gui/component/addressbook-component.c:198
+#: ../addressbook/gui/component/addressbook-component.c:198
 #, fuzzy
 msgid "Create a new contact"
 msgstr "a Gishya Umuntu"
 
-#: addressbook/gui/component/addressbook-component.c:205
+#: ../addressbook/gui/component/addressbook-component.c:205
 msgid "Contact _List"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:206
+#: ../addressbook/gui/component/addressbook-component.c:206
 #, fuzzy
 msgid "Create a new contact list"
 msgstr "a Gishya Umuntu Urutonde"
 
 # For address books
-#: addressbook/gui/component/addressbook-component.c:212
-#: addressbook/gui/component/addressbook-config.c:1120
-#: addressbook/gui/component/addressbook-view.c:757
+#: ../addressbook/gui/component/addressbook-component.c:212
+#: ../addressbook/gui/component/addressbook-config.c:1120
+#: ../addressbook/gui/component/addressbook-view.c:757
 msgid "New Address Book"
 msgstr "Igitabo kya ma aderesi gishya"
 
 # offmgr/source\offapp\dialog\hyprlink.src:RID_SVXDLG_HYPERLINK.STR_ADDRESS.text
-#: addressbook/gui/component/addressbook-component.c:213
+#: ../addressbook/gui/component/addressbook-component.c:213
 #, fuzzy
 msgid "Address _Book"
 msgstr "Agatabo k'Aderesi"
 
-#: addressbook/gui/component/addressbook-component.c:214
+#: ../addressbook/gui/component/addressbook-component.c:214
 #, fuzzy
 msgid "Create a new address book"
 msgstr "a Gishya Aderesi Igitabo"
 
-#: addressbook/gui/component/addressbook-component.c:287
+#: ../addressbook/gui/component/addressbook-component.c:287
 #, fuzzy
 msgid "Failed upgrading Addressbook settings or folders."
 msgstr "Amagenamiterere Cyangwa"
@@ -754,19 +803,19 @@ msgstr "Amagenamiterere Cyangwa"
 # sc/source\ui\src\scfuncs.src:RID_SC_FUNCTION_DESCRIPTIONS1.SC_OPCODE_POWER.2.text
 # #-#-#-#-#  sc.pot (Gnome 2.12)  #-#-#-#-#
 # sc/source\ui\src\scfuncs.src:RID_SC_FUNCTION_DESCRIPTIONS1.SC_OPCODE_LOG.4.text
-#: addressbook/gui/component/addressbook-config.c:315
+#: ../addressbook/gui/component/addressbook-config.c:315
 msgid "Base"
 msgstr "Shingiro"
 
 # sfx2/source\dialog\dinfdlg.src:TP_DOCINFODOC.FT_FILE_TYP.text
-#: addressbook/gui/component/addressbook-config.c:510
-#: calendar/gui/dialogs/calendar-setup.c:191
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
+#: ../addressbook/gui/component/addressbook-config.c:510
+#: ../calendar/gui/dialogs/calendar-setup.c:192
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:10
 #, fuzzy
 msgid "_Type:"
 msgstr "Ubwoko"
 
-#: addressbook/gui/component/addressbook-config.c:609
+#: ../addressbook/gui/component/addressbook-config.c:609
 #, fuzzy
 msgid "Copy book content locally for offline operation"
 msgstr "Igitabo Ibikubiyemo kugirango Ntibicometse kuri interineti"
@@ -780,71 +829,72 @@ msgstr "Igitabo Ibikubiyemo kugirango Ntibicometse kuri interineti"
 # #-#-#-#-#  dbaccess.pot (Gnome 2.12)  #-#-#-#-#
 # #-#-#-#-#  dbaccess.pot (Gnome 2.12)  #-#-#-#-#
 # #-#-#-#-#  dbaccess.pot (Gnome 2.12)  #-#-#-#-#
-#: addressbook/gui/component/addressbook-config.c:904
-#: addressbook/gui/component/ldap-config.glade.h:23
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#: calendar/gui/dialogs/calendar-setup.c:361
-#: calendar/gui/dialogs/calendar-setup.c:372 mail/em-folder-properties.c:215
-#: mail/mail-config.glade.h:84 smime/gui/smime-ui.glade.h:28
+#: ../addressbook/gui/component/addressbook-config.c:904
+#: ../addressbook/gui/component/ldap-config.glade.h:23
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: ../calendar/gui/dialogs/calendar-setup.c:368
+#: ../calendar/gui/dialogs/calendar-setup.c:379
+#: ../mail/em-folder-properties.c:215 ../mail/mail-config.glade.h:85
+#: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "Rusange"
 
-#: addressbook/gui/component/addressbook-config.c:905
-#: mail/importers/pine-importer.c:479
+#: ../addressbook/gui/component/addressbook-config.c:905
+#: ../mail/importers/pine-importer.c:479
 msgid "Addressbook"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:909
+#: ../addressbook/gui/component/addressbook-config.c:909
 msgid "Server Information"
 msgstr "Amakuru ya seriveri"
 
-#: addressbook/gui/component/addressbook-config.c:911
+#: ../addressbook/gui/component/addressbook-config.c:911
 msgid "Authentication"
 msgstr ""
 
 # #-#-#-#-#  dbaccess.pot (Gnome 2.12)  #-#-#-#-#
 # #-#-#-#-#  dbaccess.pot (Gnome 2.12)  #-#-#-#-#
-#: addressbook/gui/component/addressbook-config.c:914
-#: addressbook/gui/component/ldap-config.glade.h:18
-#: mail/mail-dialogs.glade.h:8 smime/gui/smime-ui.glade.h:20
+#: ../addressbook/gui/component/addressbook-config.c:914
+#: ../addressbook/gui/component/ldap-config.glade.h:18
+#: ../mail/mail-dialogs.glade.h:8 ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "Birambuye"
 
 # 5374
-#: addressbook/gui/component/addressbook-config.c:915
+#: ../addressbook/gui/component/addressbook-config.c:915
 msgid "Searching"
 msgstr "Ishakisha "
 
-#: addressbook/gui/component/addressbook-config.c:917
+#: ../addressbook/gui/component/addressbook-config.c:917
 #, fuzzy
 msgid "Downloading"
 msgstr "Iyimura..."
 
-#: addressbook/gui/component/addressbook-config.c:1118
-#: addressbook/gui/component/ldap-config.glade.h:14
+#: ../addressbook/gui/component/addressbook-config.c:1118
+#: ../addressbook/gui/component/ldap-config.glade.h:14
 msgid "Address Book Properties"
 msgstr "Indangabintu y'Igitabo kya ma aderesi"
 
-#: addressbook/gui/component/addressbook-migrate.c:72
-#: calendar/gui/migration.c:142 mail/em-migrate.c:1190
+#: ../addressbook/gui/component/addressbook-migrate.c:72
+#: ../calendar/gui/migration.c:142 ../mail/em-migrate.c:1190
 msgid "Migrating..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:124
-#: calendar/gui/migration.c:189 mail/em-migrate.c:1231
+#: ../addressbook/gui/component/addressbook-migrate.c:124
+#: ../calendar/gui/migration.c:189 ../mail/em-migrate.c:1231
 #, c-format
 msgid "Migrating `%s':"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:637
+#: ../addressbook/gui/component/addressbook-migrate.c:637
 msgid "LDAP Servers"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:752
+#: ../addressbook/gui/component/addressbook-migrate.c:752
 msgid "Autocompletion Settings"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1123
+#: ../addressbook/gui/component/addressbook-migrate.c:1123
 #, fuzzy
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
@@ -853,7 +903,7 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr "X."
 
-#: addressbook/gui/component/addressbook-migrate.c:1137
+#: ../addressbook/gui/component/addressbook-migrate.c:1137
 #, fuzzy
 msgid ""
 "The format of mailing list contacts has changed.\n"
@@ -861,7 +911,7 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr "Imiterere Bya Urutonde Aho kubariza Byahinduwe"
 
-#: addressbook/gui/component/addressbook-migrate.c:1146
+#: ../addressbook/gui/component/addressbook-migrate.c:1146
 #, fuzzy
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
@@ -869,7 +919,7 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr "Telefone Imibare Byahinduwe"
 
-#: addressbook/gui/component/addressbook-migrate.c:1156
+#: ../addressbook/gui/component/addressbook-migrate.c:1156
 #, fuzzy
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
@@ -881,12 +931,12 @@ msgstr "Na Idosiye Byahinduwe Ibyatanzwe"
 # basctl/source\basicide\basidesh.src:RID_POPUP_TABBAR.SID_BASICIDE_DELETECURRENT.text
 # #-#-#-#-#  basctl.pot (Gnome 2.12)  #-#-#-#-#
 # basctl/source\basicide\brkdlg.src:RID_BASICIDE_BREAKPOINTDLG.RID_PB_DEL.text
-#: addressbook/gui/component/addressbook-view.c:758
-#: addressbook/gui/widgets/e-addressbook-view.c:935
-#: calendar/gui/calendar-component.c:537 calendar/gui/tasks-component.c:441
-#: mail/em-filter-i18n.h:11 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-calendar.xml.h:5 ui/evolution-mail-message.xml.h:24
-#: ui/evolution-tasks.xml.h:6
+#: ../addressbook/gui/component/addressbook-view.c:758
+#: ../addressbook/gui/widgets/e-addressbook-view.c:937
+#: ../calendar/gui/calendar-component.c:537
+#: ../calendar/gui/tasks-component.c:441 ../mail/em-filter-i18n.h:11
+#: ../ui/evolution-addressbook.xml.h:8 ../ui/evolution-calendar.xml.h:5
+#: ../ui/evolution-mail-message.xml.h:25 ../ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Gusiba"
 
@@ -894,158 +944,159 @@ msgstr "Gusiba"
 # basctl/source\basicide\basidesh.src:RID_POPUP_BRKPROPS.RID_BRKPROPS.text
 # #-#-#-#-#  basctl.pot (Gnome 2.12)  #-#-#-#-#
 # basctl/source\basicide\basidesh.src:RID_POPUP_DLGED.SID_SHOW_PROPERTYBROWSER.text
-#: addressbook/gui/component/addressbook-view.c:760
-#: calendar/gui/calendar-component.c:538 calendar/gui/tasks-component.c:442
+#: ../addressbook/gui/component/addressbook-view.c:760
+#: ../calendar/gui/calendar-component.c:538
+#: ../calendar/gui/tasks-component.c:442
 msgid "Properties..."
 msgstr "Indangakintu..."
 
-#: addressbook/gui/component/addressbook-view.c:1130
+#: ../addressbook/gui/component/addressbook-view.c:1130
 msgid "Contact Source Selector"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:98
+#: ../addressbook/gui/component/addressbook.c:99
 msgid "Accessing LDAP Server anonymously"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:194
-#: plugins/groupwise-account-setup/camel-gw-listener.c:478
+#: ../addressbook/gui/component/addressbook.c:193
+#: ../plugins/groupwise-features/camel-gw-listener.c:478
 #, fuzzy
 msgid "Failed to authenticate.\n"
 msgstr "Kuri"
 
-#: addressbook/gui/component/addressbook.c:201
-#: plugins/groupwise-account-setup/camel-gw-listener.c:461
+#: ../addressbook/gui/component/addressbook.c:200
+#: ../plugins/groupwise-features/camel-gw-listener.c:461
 #, fuzzy, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Ijambobanga... kugirango Ukoresha:"
 
-#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 #, fuzzy
 msgid "Autocomplete length"
 msgstr "Uburebure"
 
-#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:2
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:2
 #, fuzzy
 msgid "EFolderList XML for the list of completion URIs"
 msgstr "kugirango Urutonde Bya"
 
-#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:3
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:3
 #, fuzzy
 msgid "EFolderList XML for the list of completion URIs."
 msgstr "kugirango Urutonde Bya"
 
-#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:4
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:4
 #, fuzzy
 msgid ""
 "Position of the vertical pane, between the card and list views and the "
 "preview pane, in pixels."
 msgstr "Bya Bihagaritse hagati Na Urutonde Na Igaragazambere in Pigiseli"
 
-#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:5
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:5
 #, fuzzy
 msgid "Show preview pane"
 msgstr "Igaragazambere"
 
-#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:6
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:6
 #, fuzzy
 msgid ""
 "The number of characters that must be typed before Evolution will attempt to "
 "autocomplete."
 msgstr "Umubare Bya Inyuguti Mbere Kuri"
 
-#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:7
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:7
 #, fuzzy
 msgid "URI for the folder last used in the select names dialog"
 msgstr "kugirango Ububiko Iheruka in Guhitamo Amazina Ikiganiro"
 
-#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:8
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:8
 #, fuzzy
 msgid "URI for the folder last used in the select names dialog."
 msgstr "kugirango Ububiko Iheruka in Guhitamo Amazina Ikiganiro"
 
-#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:9
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:9
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
 #, fuzzy
 msgid "Vertical pane position"
 msgstr "Ibirindiro"
 
-#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:10
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:10
 #, fuzzy
 msgid "Whether to show the preview pane."
 msgstr "Kuri Garagaza Igaragazambere"
 
-#: addressbook/gui/component/ldap-config.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
-#: addressbook/gui/contact-editor/im.glade.h:1
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-#: calendar/gui/dialogs/cal-attachment.glade.h:1
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
-#: calendar/gui/dialogs/calendar-setup.glade.h:1
-#: calendar/gui/dialogs/event-page.glade.h:1
-#: calendar/gui/dialogs/meeting-page.glade.h:1
-#: calendar/gui/dialogs/new-calendar.glade.h:1
-#: calendar/gui/dialogs/new-task-list.glade.h:1
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-dialogs.glade.h:2
-#: mail/message-tags.glade.h:1 plugins/shared-folder/properties.glade.h:1
-#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
+#: ../addressbook/gui/component/ldap-config.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
+#: ../addressbook/gui/contact-editor/im.glade.h:1
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+#: ../calendar/gui/dialogs/cal-attachment.glade.h:1
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:1
+#: ../calendar/gui/dialogs/event-page.glade.h:1
+#: ../calendar/gui/dialogs/new-calendar.glade.h:1
+#: ../calendar/gui/dialogs/new-task-list.glade.h:1
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:1
+#: ../composer/e-msg-composer-attachment.glade.h:1
+#: ../mail/mail-dialogs.glade.h:2 ../mail/message-tags.glade.h:1
+#: ../plugins/groupwise-features/properties.glade.h:1
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr "*"
 
-#: addressbook/gui/component/ldap-config.glade.h:2
+#: ../addressbook/gui/component/ldap-config.glade.h:2
 msgid "1"
 msgstr "1"
 
-#: addressbook/gui/component/ldap-config.glade.h:3
+#: ../addressbook/gui/component/ldap-config.glade.h:3
 msgid "3268"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:4
+#: ../addressbook/gui/component/ldap-config.glade.h:4
 msgid "389"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: ../addressbook/gui/component/ldap-config.glade.h:5
 msgid "5"
 msgstr "5"
 
-#: addressbook/gui/component/ldap-config.glade.h:6
+#: ../addressbook/gui/component/ldap-config.glade.h:6
 msgid "636"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:7
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
+#: ../addressbook/gui/component/ldap-config.glade.h:7
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:2
 #, fuzzy
 msgid "<b>Authentication</b>"
 msgstr "<B B"
 
-#: addressbook/gui/component/ldap-config.glade.h:8
+#: ../addressbook/gui/component/ldap-config.glade.h:8
 #, fuzzy
 msgid "<b>Display</b>"
 msgstr "<B B"
 
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: ../addressbook/gui/component/ldap-config.glade.h:9
 #, fuzzy
 msgid "<b>Downloading</b>"
 msgstr "<B B"
 
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: ../addressbook/gui/component/ldap-config.glade.h:10
 #, fuzzy
 msgid "<b>Searching</b>"
 msgstr "<B B"
 
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: ../addressbook/gui/component/ldap-config.glade.h:11
 #, fuzzy
 msgid "<b>Server Information</b>"
 msgstr "<B B"
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: ../addressbook/gui/component/ldap-config.glade.h:12
 #, fuzzy
 msgid "<b>Type:</b>"
 msgstr "<B B"
 
-#: addressbook/gui/component/ldap-config.glade.h:13
+#: ../addressbook/gui/component/ldap-config.glade.h:13
 msgid "Add Address Book"
 msgstr ""
 
@@ -1057,40 +1108,40 @@ msgstr ""
 # officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....Wizard.Letter.Print.Sender..0.text
 # #-#-#-#-#  officecfg.pot (Gnome 2.12)  #-#-#-#-#
 # officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....Wizard.Letter.Print.Logo..0.text
-#: addressbook/gui/component/ldap-config.glade.h:15
-#: mail/em-account-editor.c:302
+#: ../addressbook/gui/component/ldap-config.glade.h:15
+#: ../mail/em-account-editor.c:302 ../mail/em-account-editor.c:757
 msgid "Always"
 msgstr "Buri gihe"
 
-#: addressbook/gui/component/ldap-config.glade.h:16
+#: ../addressbook/gui/component/ldap-config.glade.h:16
 msgid "Anonymously"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:17
+#: ../addressbook/gui/component/ldap-config.glade.h:17
 msgid "Basic"
 msgstr "By'ibanze"
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: ../addressbook/gui/component/ldap-config.glade.h:19
 #, fuzzy
 msgid "Distinguished name"
 msgstr "Izina:"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: ../addressbook/gui/component/ldap-config.glade.h:20
 #, fuzzy
 msgid "Email address"
 msgstr "Imeli"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: ../addressbook/gui/component/ldap-config.glade.h:21
 #, fuzzy
 msgid ""
 "Evolution will use this email address to authenticate you with the server."
 msgstr "Gukoresha iyi imeli Aderesi Kuri Na: Seriveri"
 
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: ../addressbook/gui/component/ldap-config.glade.h:22
 msgid "Find Possible Search Bases"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: ../addressbook/gui/component/ldap-config.glade.h:24
 #, fuzzy
 msgid "Lo_gin:"
 msgstr "Kwinjira:"
@@ -1099,28 +1150,28 @@ msgstr "Kwinjira:"
 # officecfg/registry\schema\org\openoffice\Office\Common.xcs:....Security.Scripting.OfficeBasic..0.text
 # #-#-#-#-#  officecfg.pot (Gnome 2.12)  #-#-#-#-#
 # officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....Content.Update.Link..2.text
-#: addressbook/gui/component/ldap-config.glade.h:25
-#: mail/em-account-editor.c:300
+#: ../addressbook/gui/component/ldap-config.glade.h:25
+#: ../mail/em-account-editor.c:300 ../mail/em-account-editor.c:756
 msgid "Never"
 msgstr "Nta narimwe"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: ../addressbook/gui/component/ldap-config.glade.h:26
 msgid "One"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:27
+#: ../addressbook/gui/component/ldap-config.glade.h:27
 #, fuzzy
 msgid "Search _base:"
 msgstr "SHINGIRO"
 
-#: addressbook/gui/component/ldap-config.glade.h:28
+#: ../addressbook/gui/component/ldap-config.glade.h:28
 #, fuzzy
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports SSL or TLS."
 msgstr "iyi Ihitamo Kwihuza Kuri Seriveri NIBA Seriveri Cyangwa"
 
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: ../addressbook/gui/component/ldap-config.glade.h:29
 #, fuzzy
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
@@ -1131,7 +1182,7 @@ msgstr ""
 "iyi Ihitamo Kuri Gukoresha NIBA in a Urugero NIBA Na Seriveri a ku Akazi "
 "Hanyuma Kuri Gukoresha Ukwihuza ni"
 
-#: addressbook/gui/component/ldap-config.glade.h:30
+#: ../addressbook/gui/component/ldap-config.glade.h:30
 #, fuzzy
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
@@ -1140,15 +1191,15 @@ msgid ""
 msgstr ""
 "iyi Ihitamo Seriveri OYA Gushigikira Cyangwa Ukwihuza Na Kuri Umutekano"
 
-#: addressbook/gui/component/ldap-config.glade.h:31
+#: ../addressbook/gui/component/ldap-config.glade.h:31
 msgid "Sub"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:32
+#: ../addressbook/gui/component/ldap-config.glade.h:32
 msgid "Supported Search Bases"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:33
+#: ../addressbook/gui/component/ldap-config.glade.h:33
 #, fuzzy
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
@@ -1158,7 +1209,7 @@ msgstr ""
 "Gushaka SHINGIRO ni Izina: Bya Icyinjijwe iyi Ahatanditseho Gushaka ku Imizi "
 "Bya bushyinguro"
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: ../addressbook/gui/component/ldap-config.glade.h:34
 #, fuzzy
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
@@ -1170,14 +1221,14 @@ msgstr ""
 "Ingano: Bya Gushyiramo Byose Ibyinjijwe munsi Gushaka SHINGIRO A Gushaka "
 "Ingano: Bya Gushyiramo Ibyinjijwe urwego SHINGIRO"
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: ../addressbook/gui/component/ldap-config.glade.h:35
 #, fuzzy
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr "com."
 
-#: addressbook/gui/component/ldap-config.glade.h:36
+#: ../addressbook/gui/component/ldap-config.glade.h:36
 #, fuzzy
 msgid ""
 "This is the maximum number of entries to download. Setting this number to be "
@@ -1186,7 +1237,7 @@ msgstr ""
 "ni Kinini Umubare Bya Ibyinjijwe Kuri Gufungura iyi Umubare Kuri Binini "
 "Buhoro Hasi Aderesi Igitabo"
 
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: ../addressbook/gui/component/ldap-config.glade.h:37
 #, fuzzy
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
@@ -1194,7 +1245,7 @@ msgid ""
 "server."
 msgstr "ni Uburyo Gukoresha Kuri Igenamiterere iyi Kuri Kuri LDAP Seriveri"
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: ../addressbook/gui/component/ldap-config.glade.h:38
 #, fuzzy
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
@@ -1203,7 +1254,7 @@ msgstr ""
 "ni Izina: kugirango iyi Seriveri Kugaragara in Ububiko Urutonde ni kugirango "
 "Kugaragaza Impamvu"
 
-#: addressbook/gui/component/ldap-config.glade.h:39
+#: ../addressbook/gui/component/ldap-config.glade.h:39
 #, fuzzy
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. A "
@@ -1213,132 +1264,134 @@ msgstr ""
 "ni Umuyoboro ku Seriveri Kuri Kwihuza Kuri A Urutonde Bya Bisanzwe Sisitemu "
 "umuyobozi/ uyobora Umuyoboro"
 
-#: addressbook/gui/component/ldap-config.glade.h:40
+#: ../addressbook/gui/component/ldap-config.glade.h:40
 #, fuzzy
 msgid "Using distinguished name (DN)"
 msgstr "Izina:"
 
-#: addressbook/gui/component/ldap-config.glade.h:41
+#: ../addressbook/gui/component/ldap-config.glade.h:41
 #, fuzzy
 msgid "Using email address"
 msgstr "imeli Aderesi"
 
-#: addressbook/gui/component/ldap-config.glade.h:42
-#: mail/em-account-editor.c:301
+#: ../addressbook/gui/component/ldap-config.glade.h:42
+#: ../mail/em-account-editor.c:301
 msgid "Whenever Possible"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:43
+#: ../addressbook/gui/component/ldap-config.glade.h:43
 msgid "_Add Address Book"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:44
+#: ../addressbook/gui/component/ldap-config.glade.h:44
 msgid "_Download limit:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:45
+#: ../addressbook/gui/component/ldap-config.glade.h:45
 msgid "_Find Possible Search Bases"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:46
+#: ../addressbook/gui/component/ldap-config.glade.h:46
 #, fuzzy
-msgid "_Log in method:"
+msgid "_Login method:"
 msgstr "in Uburyo"
 
 # basctl/source\basicide\moduldlg.src:RID_DLG_NEWLIB.RID_FT_NEWLIB.text
-#: addressbook/gui/component/ldap-config.glade.h:47
-#: calendar/gui/dialogs/calendar-setup.c:243
-#: calendar/gui/dialogs/calendar-setup.glade.h:8 mail/mail-config.glade.h:163
+#: ../addressbook/gui/component/ldap-config.glade.h:47
+#: ../calendar/gui/dialogs/calendar-setup.c:244
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:8
+#: ../mail/mail-config.glade.h:165
 #, fuzzy
 msgid "_Name:"
 msgstr "Izina:"
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: ../addressbook/gui/component/ldap-config.glade.h:48
 #, fuzzy
 msgid "_Port:"
 msgstr "Impagikiro:"
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: ../addressbook/gui/component/ldap-config.glade.h:49
 #, fuzzy
 msgid "_Search scope:"
 msgstr "Ingano:"
 
-#: addressbook/gui/component/ldap-config.glade.h:50
+#: ../addressbook/gui/component/ldap-config.glade.h:50
 #, fuzzy
 msgid "_Server:"
 msgstr "Seriveri"
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: ../addressbook/gui/component/ldap-config.glade.h:51
 #, fuzzy
 msgid "_Timeout:"
 msgstr "Igihe cyarenze:"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: ../addressbook/gui/component/ldap-config.glade.h:52
 #, fuzzy
 msgid "_Use secure connection:"
 msgstr "Gukoresha ukwihuza kwizewe"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: ../addressbook/gui/component/ldap-config.glade.h:53
 msgid "cards"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:54
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:12
-#: calendar/gui/dialogs/alarm-dialog.glade.h:26
-#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:16
-#: mail/em-account-editor.c:1882 plugins/calendar-http/calendar-http.c:263
-#: plugins/calendar-weather/calendar-weather.c:564
+#: ../addressbook/gui/component/ldap-config.glade.h:54
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:14
+#: ../filter/filter.glade.h:16 ../mail/em-account-editor.c:1940
+#: ../plugins/calendar-http/calendar-http.c:263
+#: ../plugins/calendar-weather/calendar-weather.c:564
 msgid "minutes"
 msgstr "iminota"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:2
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:2
 #, fuzzy
 msgid "<b>Email</b>"
 msgstr "<B B"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:3
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:3
 #, fuzzy
 msgid "<b>Home</b>"
 msgstr "<B B"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:4
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:4
 #, fuzzy
 msgid "<b>Instant Messaging</b>"
 msgstr "<B B"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:5
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:5
 #, fuzzy
 msgid "<b>Job</b>"
 msgstr "<B B"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:6
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:6
 #, fuzzy
 msgid "<b>Miscellaneous</b>"
 msgstr "<B B"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:7
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:7
 #, fuzzy
 msgid "<b>Other</b>"
 msgstr "<B B"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:8
 #, fuzzy
 msgid "<b>Telephone</b>"
 msgstr "<B B"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:9
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:9
 #, fuzzy
 msgid "<b>Web Addresses</b>"
 msgstr "<B Aderesi B"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:10
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
 #, fuzzy
 msgid "<b>Work</b>"
 msgstr "<B B"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:182
-#: addressbook/gui/widgets/eab-contact-display.c:346
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:182
+#: ../addressbook/gui/widgets/eab-contact-display.c:348
 msgid "AIM"
 msgstr ""
 
@@ -1379,20 +1432,20 @@ msgstr ""
 #
 # ***** END LICENSE BLOCK *****
 # Box Headings
-#: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: addressbook/gui/contact-editor/e-contact-editor.c:270
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:169
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
-#: addressbook/gui/widgets/e-minicard.c:181
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:270
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:169
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
+#: ../addressbook/gui/widgets/e-minicard.c:181
 msgid "Contact"
 msgstr "Umuntu"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: addressbook/gui/contact-editor/e-contact-editor.c:531
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:531
 msgid "Contact Editor"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "Full _Name..."
 msgstr ""
 
@@ -1400,71 +1453,71 @@ msgstr ""
 # officecfg/registry\schema\org\openoffice\Office\Common.xcs:....Image.text
 # #-#-#-#-#  officecfg.pot (Gnome 2.12)  #-#-#-#-#
 # officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....Insert.Caption.OfficeObject.Image.Enable.text
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "Image"
 msgstr "Ishusho"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:66
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:66
 msgid "MSN Messenger"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:17
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "Mailing Address"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:18
 #, fuzzy
 msgid "Ni_ckname:"
 msgstr "Akazina gato:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:63
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:63
 msgid "Novell Groupwise"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
 msgid "Personal Information"
 msgstr ""
 
 # 6175
-#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "Telephone"
 msgstr "terefoni"
 
 #. red
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:235
-#: addressbook/gui/contact-editor/e-contact-editor.c:199
-#: filter/filter-label.c:122 mail/em-migrate.c:1042 mail/mail-config.c:77
-#: mail/mail-config.glade.h:151
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:235
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:199
+#: ../filter/filter-label.c:122 ../mail/em-migrate.c:1042
+#: ../mail/mail-config.c:77 ../mail/mail-config.glade.h:153
 msgid "Work"
 msgstr "Akazi"
 
 # svx/source\dialog\imapdlg.src:RID_SVXDLG_IMAP.FT_URL.text
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
-#: addressbook/gui/contact-editor/fulladdr.glade.h:6
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:6
 #, fuzzy
 msgid "_Address:"
 msgstr "Aderesi:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
 #, fuzzy
 msgid "_Anniversary:"
 msgstr "Izabukuru:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Assistant:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
 #, fuzzy
 msgid "_Birthday:"
 msgstr "Umunsi wo kuvuka:"
 
 # svtools/source\dialogs\addresstemplate.src:STR_FIELD_CALENDAR.text
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: plugins/itip-formatter/itip-view.c:1619
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: ../plugins/itip-formatter/itip-view.c:1631
 #, fuzzy
 msgid "_Calendar:"
 msgstr "Kalindari"
@@ -1473,12 +1526,12 @@ msgstr "Kalindari"
 # sfx2/source\doc\doctdlg.src:DLG_DOC_TEMPLATE.FT_SECTION.text
 # #-#-#-#-#  sfx2.pot (Gnome 2.12)  #-#-#-#-#
 # sfx2/source\doc\new.src:DLG_NEW_FILE.FT_REGION.text
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
 #, fuzzy
 msgid "_Categories"
 msgstr "Ibyiciro"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
 #, fuzzy
 msgid "_City:"
 msgstr "Umujyi:"
@@ -1487,37 +1540,37 @@ msgstr "Umujyi:"
 # officecfg/registry\data\org\openoffice\Office\DataAccess.xcu:..DataAccess.DriverSettings.com.sun.star.comp.sdbc.MozabDriver.ColumnAliases.Company.text
 # #-#-#-#-#  officecfg.pot (Gnome 2.12)  #-#-#-#-#
 # officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....BusinessCard.BusinessAddress.Company.text
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
 #, fuzzy
 msgid "_Company:"
 msgstr "Isosiyeti"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
 #, fuzzy
 msgid "_Country:"
 msgstr "igihugu"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
 #, fuzzy
 msgid "_Department:"
 msgstr "Ishami:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
 #, fuzzy
 msgid "_File under:"
 msgstr "Idosiye"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_Free/Busy:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
 #, fuzzy
 msgid "_Home Page:"
 msgstr "Ipaji yo kwinjira"
 
 # sfx2/source\dialog\dialog.src:BTN_MANAGER.text
-#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
 #, fuzzy
 msgid "_Manager:"
 msgstr "Muyobozi"
@@ -1530,1214 +1583,1218 @@ msgstr "Muyobozi"
 # officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....Content.Display.Note.text
 # #-#-#-#-#  officecfg.pot (Gnome 2.12)  #-#-#-#-#
 # officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....Wizard.Agenda.Elements.Notes.text
-#: addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
 #, fuzzy
 msgid "_Notes:"
 msgstr "Ibisobanuro"
 
 # svx/source\gallery2\galtheme.src:RID_GALLERYSTR_THEME_OFFICE.text
-#: addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
 #, fuzzy
 msgid "_Office:"
 msgstr "Ofise"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:40
-#: addressbook/gui/contact-editor/fulladdr.glade.h:7
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_PO Box:"
 msgstr ""
 
 # officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....BusinessCard.PrivateAddress.Profession.text
-#: addressbook/gui/contact-editor/contact-editor.glade.h:41
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
 #, fuzzy
 msgid "_Profession:"
 msgstr "Umwuga"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:42
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
 msgid "_Spouse:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: addressbook/gui/contact-editor/fulladdr.glade.h:8
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:8
 #, fuzzy
 msgid "_State/Province:"
 msgstr "Intara:"
 
 # sch/source\ui\app\menu.src:RID_MENU.WORKAROUND_22.SID_INSERT_TITLE.text
-#: addressbook/gui/contact-editor/contact-editor.glade.h:44
-#: addressbook/gui/contact-editor/fullname.glade.h:18
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
+#: ../addressbook/gui/contact-editor/fullname.glade.h:18
 #, fuzzy
 msgid "_Title:"
 msgstr "Umutwe..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:45
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:45
 msgid "_Video Chat:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:46
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:46
 #, fuzzy
 msgid "_Wants to receive HTML mail"
 msgstr "Kuri Akira Ubutumwa"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:47
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
 msgid "_Web Log:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:48
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:13
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:48
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:13
 msgid "_Where:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:49
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:49
 #, fuzzy
 msgid "_Zip/Postal Code:"
 msgstr "Nomero ya ZIP/ y'Iposita"
 
 # framework/source\services\logindialog.src:RID_DLG_LOGIN.RID_FT_SECURITYPROXYHOST.text
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:365
-#: addressbook/gui/widgets/eab-contact-display.c:380
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:96
+#: ../addressbook/gui/widgets/eab-contact-display.c:367
+#: ../addressbook/gui/widgets/eab-contact-display.c:382
 msgid "Address"
 msgstr "Aderesi"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-editor/e-contact-editor.c:298
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:183
-#: addressbook/gui/widgets/e-addressbook-model.c:310
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:398
-#: addressbook/gui/widgets/e-minicard-label.c:164
-#: addressbook/gui/widgets/e-minicard-view-widget.c:119
-#: addressbook/gui/widgets/e-minicard-view.c:519
-#: addressbook/gui/widgets/e-minicard.c:174
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:103
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:141
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:298
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:183
+#: ../addressbook/gui/widgets/e-addressbook-model.c:310
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:398
+#: ../addressbook/gui/widgets/e-minicard-label.c:164
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:121
+#: ../addressbook/gui/widgets/e-minicard-view.c:519
+#: ../addressbook/gui/widgets/e-minicard.c:174
+#: ../widgets/table/e-cell-text.c:1768 ../widgets/text/e-entry.c:1312
+#: ../widgets/text/e-entry.c:1313 ../widgets/text/e-text.c:3584
+#: ../widgets/text/e-text.c:3585
 msgid "Editable"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:136
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:136
 msgid "United States"
 msgstr "Leta Zunze Ubumwe"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:137
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
 msgid "Afghanistan"
 msgstr "Afuganisita"
 
 # setup2/source\ui\pages\paddr.src:RESID_PAGE_PAGEADDRESS.LB_COUNTRY.2.text
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:138
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
 msgid "Albania"
 msgstr "Arubaniya"
 
 # setup2/source\ui\pages\paddr.src:RESID_PAGE_PAGEADDRESS.LB_COUNTRY.3.text
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:139
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
 msgid "Algeria"
 msgstr "Arijeriya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:140
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
 msgid "American Samoa"
 msgstr "Samowa Nyamerika"
 
 # setup2/source\ui\pages\paddr.src:RESID_PAGE_PAGEADDRESS.LB_COUNTRY.4.text
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:141
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
 msgid "Andorra"
 msgstr "Andora"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:142
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
 msgid "Angola"
 msgstr "Angola"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:143
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
 msgid "Anguilla"
 msgstr "Angwiya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:144
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
 msgid "Antarctica"
 msgstr "Antarigitika"
 
 # setup2/source\ui\pages\paddr.src:RESID_PAGE_PAGEADDRESS.LB_COUNTRY.5.text
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:145
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
 #, fuzzy
 msgid "Antigua And Barbuda"
 msgstr "Antigwa na Baribuda"
 
 # setup2/source\ui\pages\paddr.src:RESID_PAGE_PAGEADDRESS.LB_COUNTRY.6.text
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:146
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
 msgid "Argentina"
 msgstr "Arijantine"
 
 # setup2/source\ui\pages\paddr.src:RESID_PAGE_PAGEADDRESS.LB_COUNTRY.7.text
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:147
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
 msgid "Armenia"
 msgstr "Arumeniya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:148
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
 msgid "Aruba"
 msgstr "Aruba"
 
 # setup2/source\ui\pages\paddr.src:RESID_PAGE_PAGEADDRESS.LB_COUNTRY.8.text
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:149
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
 msgid "Australia"
 msgstr "Ositarariya"
 
 # setup2/source\ui\pages\paddr.src:RESID_PAGE_PAGEADDRESS.LB_COUNTRY.78.text
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:150
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
 msgid "Austria"
 msgstr "Otirishi"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:151
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
 msgid "Azerbaijan"
 msgstr "Azeribayijani"
 
 # setup2/source\ui\pages\paddr.src:RESID_PAGE_PAGEADDRESS.LB_COUNTRY.9.text
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:152
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
 msgid "Bahamas"
 msgstr "Ibirwa bya Bahama"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:153
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
 msgid "Bahrain"
 msgstr "Bahirayini"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:154
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
 msgid "Bangladesh"
 msgstr "Bangaladeshi"
 
 # setup2/source\ui\pages\paddr.src:RESID_PAGE_PAGEADDRESS.LB_COUNTRY.10.text
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:155
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
 msgid "Barbados"
 msgstr "Barubado"
 
 # setup2/source\ui\pages\paddr.src:RESID_PAGE_PAGEADDRESS.LB_COUNTRY.93.text
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:156
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
 msgid "Belarus"
 msgstr "Berarusi"
 
 # setup2/source\ui\pages\paddr.src:RESID_PAGE_PAGEADDRESS.LB_COUNTRY.11.text
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:157
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
 msgid "Belgium"
 msgstr "Ububirigi"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
 msgid "Belize"
 msgstr "Belize"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:159
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
 msgid "Benin"
 msgstr "Bene"
 
 # setup2/source\ui\pages\paddr.src:RESID_PAGE_PAGEADDRESS.LB_COUNTRY.12.text
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:160
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
 msgid "Bermuda"
 msgstr "Berimuda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:161
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
 msgid "Bhutan"
 msgstr "Butani"
 
 # setup2/source\ui\pages\paddr.src:RESID_PAGE_PAGEADDRESS.LB_COUNTRY.13.text
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:162
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
 msgid "Bolivia"
 msgstr "Boriviya"
 
 # setup2/source\ui\pages\paddr.src:RESID_PAGE_PAGEADDRESS.LB_COUNTRY.14.text
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:163
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
 #, fuzzy
 msgid "Bosnia And Herzegowina"
 msgstr "Bosiniya na Herizegovina"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:164
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
 msgid "Botswana"
 msgstr "Botswana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:165
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
 msgid "Bouvet Island"
 msgstr "Ikirwa cya Bouve"
 
 # setup2/source\ui\pages\paddr.src:RESID_PAGE_PAGEADDRESS.LB_COUNTRY.15.text
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:166
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
 msgid "Brazil"
 msgstr "Bureziri"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:167
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
 msgid "British Indian Ocean Territory"
 msgstr "Teritwari y'Inyanja y'Abahinde Nyongereza"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:168
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
 msgid "Brunei Darussalam"
 msgstr "Buruneyi Darisalamu"
 
 # setup2/source\ui\pages\paddr.src:RESID_PAGE_PAGEADDRESS.LB_COUNTRY.16.text
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:169
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
 msgid "Bulgaria"
 msgstr "Burugariya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:170
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
 msgid "Burkina Faso"
 msgstr "Burukina Faso"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:171
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
 msgid "Burundi"
 msgstr "Uburundi"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "Cambodia"
 msgstr "Kambodiya"
 
 # setup2/source\ui\pages\paddr.src:RESID_PAGE_PAGEADDRESS.LB_COUNTRY.54.text
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:173
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
 msgid "Cameroon"
 msgstr "Kameruni"
 
 # setup2/source\ui\pages\paddr.src:RESID_PAGE_PAGEADDRESS.LB_COUNTRY.55.text
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:174
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
 msgid "Canada"
 msgstr "Kanada"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:175
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
 msgid "Cape Verde"
 msgstr "Kapu Veri"
 
 # setup2/source\ui\pages\paddr.src:RESID_PAGE_PAGEADDRESS.LB_COUNTRY.53.text
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:176
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
 msgid "Cayman Islands"
 msgstr "Ibirwa bya Kayima"
 
 # setup2/source\ui\pages\paddr.src:RESID_PAGE_PAGEADDRESS.LB_COUNTRY.94.text
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:177
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
 msgid "Central African Republic"
 msgstr "Repuburika ya Santarafurika"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:178
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
 msgid "Chad"
 msgstr "Cade"
 
 # setup2/source\ui\pages\paddr.src:RESID_PAGE_PAGEADDRESS.LB_COUNTRY.18.text
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:179
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
 msgid "Chile"
 msgstr "Shiri"
 
 # setup2/source\ui\pages\paddr.src:RESID_PAGE_PAGEADDRESS.LB_COUNTRY.19.text
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:180
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
 msgid "China"
 msgstr "Ubushinwa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:181
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
 msgid "Christmas Island"
 msgstr "Ikirwa cya Noheli"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:182
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
 msgid "Cocos (Keeling) Islands"
 msgstr "Ibirwa bya Koko"
 
 # setup2/source\ui\pages\paddr.src:RESID_PAGE_PAGEADDRESS.LB_COUNTRY.56.text
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:183
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
 msgid "Colombia"
 msgstr "Korombiya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
 msgid "Comoros"
 msgstr "Komore"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:185
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
 msgid "Congo"
 msgstr "Kongo"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:186
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
 #, fuzzy
 msgid "Congo, The Democratic Republic Of The"
 msgstr "Repubulika Iharanira Demokarasi ya Kongo"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:187
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
 msgid "Cook Islands"
 msgstr "Ibirwa bya Kuke"
 
 # setup2/source\ui\pages\paddr.src:RESID_PAGE_PAGEADDRESS.LB_COUNTRY.20.text
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
 msgid "Costa Rica"
 msgstr "Kosita Rika"
 
 # 1209
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:189
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
 msgid "Cote d'Ivoire"
 msgstr "kotedivuwari"
 
 # setup2/source\ui\pages\paddr.src:RESID_PAGE_PAGEADDRESS.LB_COUNTRY.57.text
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:190
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
 msgid "Croatia"
 msgstr "Korowasiya"
 
 # setup2/source\ui\pages\paddr.src:RESID_PAGE_PAGEADDRESS.LB_COUNTRY.58.text
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
 msgid "Cuba"
 msgstr "Kiba"
 
 # setup2/source\ui\pages\paddr.src:RESID_PAGE_PAGEADDRESS.LB_COUNTRY.122.text
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:192
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
 msgid "Cyprus"
 msgstr "Shipure"
 
 # setup2/source\ui\pages\paddr.src:RESID_PAGE_PAGEADDRESS.LB_COUNTRY.111.text
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:193
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
 msgid "Czech Republic"
 msgstr "Repuburika ya Ceki"
 
 # setup2/source\ui\pages\paddr.src:RESID_PAGE_PAGEADDRESS.LB_COUNTRY.22.text
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:194
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
 msgid "Denmark"
 msgstr "Danemarike"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
 msgid "Djibouti"
 msgstr "Jibuti"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:196
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
 msgid "Dominica"
 msgstr "Dominika"
 
 # setup2/source\ui\pages\paddr.src:RESID_PAGE_PAGEADDRESS.LB_COUNTRY.21.text
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "Dominican Republic"
 msgstr "Repuburika ya Dominikani"
 
 # setup2/source\ui\pages\paddr.src:RESID_PAGE_PAGEADDRESS.LB_COUNTRY.23.text
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
 msgid "Ecuador"
 msgstr "Ekwateri"
 
 # setup2/source\ui\pages\paddr.src:RESID_PAGE_PAGEADDRESS.LB_COUNTRY.1.text
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
 msgid "Egypt"
 msgstr "Misiri"
 
 # setup2/source\ui\pages\paddr.src:RESID_PAGE_PAGEADDRESS.LB_COUNTRY.24.text
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:200
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
 msgid "El Salvador"
 msgstr "El Salvador"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:201
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
 msgid "Equatorial Guinea"
 msgstr "Gineya Ekwatoriyale"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:202
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
 msgid "Eritrea"
 msgstr "Eritereya"
 
 # setup2/source\ui\pages\paddr.src:RESID_PAGE_PAGEADDRESS.LB_COUNTRY.26.text
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:203
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
 msgid "Estonia"
 msgstr "Esitoniya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:204
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
 msgid "Ethiopia"
 msgstr "Etiyopiya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "Falkland Islands"
 msgstr ""
 
 # setup2/source\ui\pages\paddr.src:RESID_PAGE_PAGEADDRESS.LB_COUNTRY.29.text
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "Faroe Islands"
 msgstr "Ibirwa bya Farowe"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:207
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
 msgid "Fiji"
 msgstr "Fiji"
 
 # setup2/source\ui\pages\paddr.src:RESID_PAGE_PAGEADDRESS.LB_COUNTRY.27.text
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:208
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
 msgid "Finland"
 msgstr "Finirandi"
 
 # setup2/source\ui\pages\paddr.src:RESID_PAGE_PAGEADDRESS.LB_COUNTRY.28.text
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:209
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
 msgid "France"
 msgstr "Ubufaransa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:210
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
 msgid "French Guiana"
 msgstr "Guyane Nyamfaransa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:211
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
 msgid "French Polynesia"
 msgstr "Polinesiya Nyamfaransa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
 msgid "French Southern Territories"
 msgstr "Ibihugu by'Amajyepfo Nyamfaransa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:213
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
 msgid "Gabon"
 msgstr "Gabo"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:214
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
 msgid "Gambia"
 msgstr "Gambiya"
 
 # setup2/source\ui\pages\paddr.src:RESID_PAGE_PAGEADDRESS.LB_COUNTRY.32.text
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:215
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
 msgid "Georgia"
 msgstr "Jeworujiya"
 
 # setup2/source\ui\pages\paddr.src:RESID_PAGE_PAGEADDRESS.LB_COUNTRY.17.text
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:216
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
 msgid "Germany"
 msgstr "Ubudage"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
 msgid "Ghana"
 msgstr "Gana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:218
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
 msgid "Gibraltar"
 msgstr "Giburalitari"
 
 # setup2/source\ui\pages\paddr.src:RESID_PAGE_PAGEADDRESS.LB_COUNTRY.34.text
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:219
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
 msgid "Greece"
 msgstr "Ubugereki"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:220
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
 msgid "Greenland"
 msgstr "Goronulande"
 
 # setup2/source\ui\pages\paddr.src:RESID_PAGE_PAGEADDRESS.LB_COUNTRY.33.text
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
 msgid "Grenada"
 msgstr "Gerenada"
 
 # setup2/source\ui\pages\paddr.src:RESID_PAGE_PAGEADDRESS.LB_COUNTRY.36.text
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:222
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
 msgid "Guadeloupe"
 msgstr "Gwaderupe"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:223
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
 msgid "Guam"
 msgstr "Gwami"
 
 # setup2/source\ui\pages\paddr.src:RESID_PAGE_PAGEADDRESS.LB_COUNTRY.37.text
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:224
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
 msgid "Guatemala"
 msgstr "Gwatemara"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:225
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
 msgid "Guernsey"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:226
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
 msgid "Guinea"
 msgstr "Gineya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:227
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
 #, fuzzy
 msgid "Guinea-bissau"
 msgstr "Guneya- Biso"
 
 # setup2/source\ui\pages\paddr.src:RESID_PAGE_PAGEADDRESS.LB_COUNTRY.38.text
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:228
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
 msgid "Guyana"
 msgstr "Giyane"
 
 # setup2/source\ui\pages\paddr.src:RESID_PAGE_PAGEADDRESS.LB_COUNTRY.39.text
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:229
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
 msgid "Haiti"
 msgstr "Hayiti"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:230
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
 msgid "Heard And McDonald Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:231
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
 msgid "Holy See"
 msgstr ""
 
 # setup2/source\ui\pages\paddr.src:RESID_PAGE_PAGEADDRESS.LB_COUNTRY.40.text
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:232
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
 msgid "Honduras"
 msgstr "Hondurasi"
 
 # setup2/source\ui\pages\paddr.src:RESID_PAGE_PAGEADDRESS.LB_COUNTRY.41.text
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:233
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
 msgid "Hong Kong"
 msgstr "Hong Kongo"
 
 # setup2/source\ui\pages\paddr.src:RESID_PAGE_PAGEADDRESS.LB_COUNTRY.116.text
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:234
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
 msgid "Hungary"
 msgstr "Hongiriya"
 
 # setup2/source\ui\pages\paddr.src:RESID_PAGE_PAGEADDRESS.LB_COUNTRY.46.text
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:235
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
 msgid "Iceland"
 msgstr "Isirandi"
 
 # setup2/source\ui\pages\paddr.src:RESID_PAGE_PAGEADDRESS.LB_COUNTRY.42.text
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
 msgid "India"
 msgstr "Ubuhindi"
 
 # setup2/source\ui\pages\paddr.src:RESID_PAGE_PAGEADDRESS.LB_COUNTRY.43.text
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:237
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
 msgid "Indonesia"
 msgstr "Indonesiya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Iran"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
 msgid "Iraq"
 msgstr "Irake"
 
 # setup2/source\ui\pages\paddr.src:RESID_PAGE_PAGEADDRESS.LB_COUNTRY.45.text
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
 msgid "Ireland"
 msgstr "Irirandi"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
 #, fuzzy
 msgid "Isle of Man"
 msgstr "Bya"
 
 # setup2/source\ui\pages\paddr.src:RESID_PAGE_PAGEADDRESS.LB_COUNTRY.47.text
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:242
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
 msgid "Israel"
 msgstr "Isiraheri"
 
 # setup2/source\ui\pages\paddr.src:RESID_PAGE_PAGEADDRESS.LB_COUNTRY.48.text
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
 msgid "Italy"
 msgstr "Ubutariyani"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
 msgid "Jamaica"
 msgstr "Jamayika"
 
 # setup2/source\ui\pages\paddr.src:RESID_PAGE_PAGEADDRESS.LB_COUNTRY.50.text
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:245
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
 msgid "Japan"
 msgstr "Ubuyapani"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
 msgid "Jersey"
 msgstr ""
 
 # setup2/source\ui\pages\paddr.src:RESID_PAGE_PAGEADDRESS.LB_COUNTRY.51.text
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:247
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
 msgid "Jordan"
 msgstr "Yorudaniya"
 
 # setup2/source\ui\pages\paddr.src:RESID_PAGE_PAGEADDRESS.LB_COUNTRY.88.text
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:248
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
 msgid "Kazakhstan"
 msgstr "Kazakisitani"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
 msgid "Kenya"
 msgstr "Kenya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:250
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
 msgid "Kiribati"
 msgstr "Kiribati"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
 #, fuzzy
 msgid "Korea, Democratic People's Republic Of"
 msgstr "Koreya, Repubulika Iharanira Demokarasi ya Rubanda ya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:252
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
 #, fuzzy
 msgid "Korea, Republic Of"
 msgstr "Koreya, Repubulika ya"
 
 # setup2/source\ui\pages\paddr.src:RESID_PAGE_PAGEADDRESS.LB_COUNTRY.59.text
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:253
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
 msgid "Kuwait"
 msgstr "Koweti"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
 msgid "Kyrgyzstan"
 msgstr "Kirigizasitani"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
 msgid "Laos"
 msgstr ""
 
 # setup2/source\ui\pages\paddr.src:RESID_PAGE_PAGEADDRESS.LB_COUNTRY.89.text
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:256
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
 msgid "Latvia"
 msgstr "Letoniya"
 
 # setup2/source\ui\pages\paddr.src:RESID_PAGE_PAGEADDRESS.LB_COUNTRY.60.text
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
 msgid "Lebanon"
 msgstr "Libani"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:258
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
 msgid "Lesotho"
 msgstr "Lesoto"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:259
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
 msgid "Liberia"
 msgstr "Liberiya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:260
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
 msgid "Libya"
 msgstr "Libiya"
 
 # setup2/source\ui\pages\paddr.src:RESID_PAGE_PAGEADDRESS.LB_COUNTRY.30.text
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Liechtenstein"
 msgstr "Liechtenstein"
 
 # setup2/source\ui\pages\paddr.src:RESID_PAGE_PAGEADDRESS.LB_COUNTRY.61.text
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Lithuania"
 msgstr "Lituwaniya"
 
 # setup2/source\ui\pages\paddr.src:RESID_PAGE_PAGEADDRESS.LB_COUNTRY.62.text
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
 msgid "Luxembourg"
 msgstr "Lugusamburu"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
 msgid "Macao"
 msgstr "Makawo"
 
 # setup2/source\ui\pages\paddr.src:RESID_PAGE_PAGEADDRESS.LB_COUNTRY.67.text
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:265
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
 msgid "Macedonia"
 msgstr "Masedoniya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:266
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
 msgid "Madagascar"
 msgstr "Madagasikari"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:267
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
 msgid "Malawi"
 msgstr "Malawi"
 
 # setup2/source\ui\pages\paddr.src:RESID_PAGE_PAGEADDRESS.LB_COUNTRY.63.text
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:268
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
 msgid "Malaysia"
 msgstr "Mareziya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
 msgid "Maldives"
 msgstr "Malidivezi"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
 msgid "Mali"
 msgstr "Mali"
 
 # setup2/source\ui\pages\paddr.src:RESID_PAGE_PAGEADDRESS.LB_COUNTRY.64.text
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:271
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
 msgid "Malta"
 msgstr "Marita"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
 msgid "Marshall Islands"
 msgstr "Ibirwa bya Marishali"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:273
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
 msgid "Martinique"
 msgstr "Maritike"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:274
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Mauritania"
 msgstr "Moritaniya"
 
 # setup2/source\ui\pages\paddr.src:RESID_PAGE_PAGEADDRESS.LB_COUNTRY.66.text
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
 msgid "Mauritius"
 msgstr "Ibirwa bya Morisi"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
 msgid "Mayotte"
 msgstr "Mayoti"
 
 # setup2/source\ui\pages\paddr.src:RESID_PAGE_PAGEADDRESS.LB_COUNTRY.68.text
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:277
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
 msgid "Mexico"
 msgstr "Megizike"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
 msgid "Micronesia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
 #, fuzzy
 msgid "Moldova, Republic Of"
 msgstr "Molidova, Repubulika ya"
 
 # setup2/source\ui\pages\paddr.src:RESID_PAGE_PAGEADDRESS.LB_COUNTRY.69.text
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:280
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
 msgid "Monaco"
 msgstr "Monako"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:281
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
 msgid "Mongolia"
 msgstr "Mongoliya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
 msgid "Montserrat"
 msgstr "Monserati"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
 msgid "Morocco"
 msgstr "Maroke"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:284
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
 msgid "Mozambique"
 msgstr "Mozambike"
 
 # svx/source\dialog\charmap.src:RID_SUBSETMAP.RID_SUBSETSTR_MYANMAR.text
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
 msgid "Myanmar"
 msgstr "Myanmar"
 
 # setup2/source\ui\pages\paddr.src:RESID_PAGE_PAGEADDRESS.LB_COUNTRY.70.text
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
 msgid "Namibia"
 msgstr "Namibiya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:287
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
 msgid "Nauru"
 msgstr "Ikinawuru"
 
 # setup2/source\ui\pages\paddr.src:RESID_PAGE_PAGEADDRESS.LB_COUNTRY.71.text
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:288
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
 msgid "Nepal"
 msgstr "Nepari"
 
 # setup2/source\ui\pages\paddr.src:RESID_PAGE_PAGEADDRESS.LB_COUNTRY.74.text
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:289
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
 msgid "Netherlands"
 msgstr "UBuhorandi"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
 msgid "Netherlands Antilles"
 msgstr "Antiye za nederilande"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:291
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
 msgid "New Caledonia"
 msgstr "Nuveli Kalidoniya"
 
 # setup2/source\ui\pages\paddr.src:RESID_PAGE_PAGEADDRESS.LB_COUNTRY.72.text
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
 msgid "New Zealand"
 msgstr "Nouvelle Zelande"
 
 # setup2/source\ui\pages\paddr.src:RESID_PAGE_PAGEADDRESS.LB_COUNTRY.73.text
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
 msgid "Nicaragua"
 msgstr "Nikaragwa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:294
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
 msgid "Niger"
 msgstr "Nigeri"
 
 # setup2/source\ui\pages\paddr.src:RESID_PAGE_PAGEADDRESS.LB_COUNTRY.76.text
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:295
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
 msgid "Nigeria"
 msgstr "Nijeriya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
 msgid "Niue"
 msgstr "Niyuwe"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
 msgid "Norfolk Island"
 msgstr "Ibirwa bya Norufoluki"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:298
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
 msgid "Northern Mariana Islands"
 msgstr "Ibirwa bya Mariyana y'Amajyaruguru"
 
 # setup2/source\ui\pages\paddr.src:RESID_PAGE_PAGEADDRESS.LB_COUNTRY.77.text
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
 msgid "Norway"
 msgstr "Noruveji"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
 msgid "Oman"
 msgstr "Omani"
 
 # setup2/source\ui\pages\paddr.src:RESID_PAGE_PAGEADDRESS.LB_COUNTRY.79.text
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:301
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
 msgid "Pakistan"
 msgstr "Pakisitani"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Palau"
 msgstr "Palawu"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:303
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
 msgid "Palestinian Territory"
 msgstr ""
 
 # setup2/source\ui\pages\paddr.src:RESID_PAGE_PAGEADDRESS.LB_COUNTRY.80.text
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
 msgid "Panama"
 msgstr "Panama"
 
 # setup2/source\ui\pages\paddr.src:RESID_PAGE_PAGEADDRESS.LB_COUNTRY.81.text
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
 msgid "Papua New Guinea"
 msgstr "Papouasie Nouvelle Guine"
 
 # setup2/source\ui\pages\paddr.src:RESID_PAGE_PAGEADDRESS.LB_COUNTRY.82.text
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:306
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
 msgid "Paraguay"
 msgstr "Paragwe"
 
 # setup2/source\ui\pages\paddr.src:RESID_PAGE_PAGEADDRESS.LB_COUNTRY.83.text
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
 msgid "Peru"
 msgstr "Peru"
 
 # setup2/source\ui\pages\paddr.src:RESID_PAGE_PAGEADDRESS.LB_COUNTRY.84.text
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
 msgid "Philippines"
 msgstr "Firipine"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:309
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Pitcairn"
 msgstr "Piticayirine"
 
 # setup2/source\ui\pages\paddr.src:RESID_PAGE_PAGEADDRESS.LB_COUNTRY.85.text
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:310
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
 msgid "Poland"
 msgstr "Poronye"
 
 # setup2/source\ui\pages\paddr.src:RESID_PAGE_PAGEADDRESS.LB_COUNTRY.86.text
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:311
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
 msgid "Portugal"
 msgstr "Porutigari"
 
 # setup2/source\ui\pages\paddr.src:RESID_PAGE_PAGEADDRESS.LB_COUNTRY.87.text
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:312
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
 msgid "Puerto Rico"
 msgstr "Puwerito Riko"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
 msgid "Qatar"
 msgstr "Katari"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
 msgid "Reunion"
 msgstr "Reyiniyo"
 
 # setup2/source\ui\pages\paddr.src:RESID_PAGE_PAGEADDRESS.LB_COUNTRY.95.text
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:315
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
 msgid "Romania"
 msgstr "Rumaniya"
 
 # setup2/source\ui\pages\paddr.src:RESID_PAGE_PAGEADDRESS.LB_COUNTRY.96.text
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:316
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
 msgid "Russian Federation"
 msgstr "UBurusiya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
 msgid "Rwanda"
 msgstr "Rwanda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
 #, fuzzy
 msgid "Saint Kitts And Nevis"
 msgstr "Mutagatifu Kitsi na Nevisi"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
 msgid "Saint Lucia"
 msgstr "Mutagatifu Lusiya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:320
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
 #, fuzzy
 msgid "Saint Vincent And The Grenadines"
 msgstr "Mutagatifu Visenti na Gerenadine"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:321
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
 msgid "Samoa"
 msgstr "Samowa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
 msgid "San Marino"
 msgstr "Mutagatifu Marino"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:323
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
 #, fuzzy
 msgid "Sao Tome And Principe"
 msgstr "Sawo Tome na Purensipe"
 
 # setup2/source\ui\pages\paddr.src:RESID_PAGE_PAGEADDRESS.LB_COUNTRY.97.text
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:324
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
 msgid "Saudi Arabia"
 msgstr "Arabiya Sawudite"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:325
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
 msgid "Senegal"
 msgstr "Senegali"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
 #, fuzzy
 msgid "Serbia And Montenegro"
 msgstr "Seribiya na Montenegoro"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:327
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
 msgid "Seychelles"
 msgstr "Seyishele"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
 msgid "Sierra Leone"
 msgstr "Siyera Lewone"
 
 # setup2/source\ui\pages\paddr.src:RESID_PAGE_PAGEADDRESS.LB_COUNTRY.100.text
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
 msgid "Singapore"
 msgstr "Singapure"
 
 # setup2/source\ui\pages\paddr.src:RESID_PAGE_PAGEADDRESS.LB_COUNTRY.101.text
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
 msgid "Slovakia"
 msgstr "Sorovakiya"
 
 # setup2/source\ui\pages\paddr.src:RESID_PAGE_PAGEADDRESS.LB_COUNTRY.102.text
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:331
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
 msgid "Slovenia"
 msgstr "Soroveniya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:332
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
 msgid "Solomon Islands"
 msgstr "Ibirwa bya Solomoni"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:333
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
 msgid "Somalia"
 msgstr "Somaliya"
 
 # setup2/source\ui\pages\paddr.src:RESID_PAGE_PAGEADDRESS.LB_COUNTRY.91.text
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
 msgid "South Africa"
 msgstr "Afurika y'epfo"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
 #, fuzzy
 msgid "South Georgia And The South Sandwich Islands"
 msgstr "Geworugiya y'Epfo n'Ibirwa bya Sanduwice y'Epfo"
 
 # setup2/source\ui\pages\paddr.src:RESID_PAGE_PAGEADDRESS.LB_COUNTRY.103.text
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
 msgid "Spain"
 msgstr "Esipanye"
 
 # setup2/source\ui\pages\paddr.src:RESID_PAGE_PAGEADDRESS.LB_COUNTRY.104.text
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
 msgid "Sri Lanka"
 msgstr "Siri Lanka"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
 msgid "St. Helena"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "St. Pierre And Miquelon"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
 msgid "Sudan"
 msgstr "Sudani"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Suriname"
 msgstr "Surinamu"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:342
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
 msgid "Svalbard And Jan Mayen Islands"
 msgstr ""
 
 # setup2/source\ui\pages\paddr.src:RESID_PAGE_PAGEADDRESS.LB_COUNTRY.105.text
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:343
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
 msgid "Swaziland"
 msgstr "Suwazirandi"
 
 # setup2/source\ui\pages\paddr.src:RESID_PAGE_PAGEADDRESS.LB_COUNTRY.98.text
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:344
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
 msgid "Sweden"
 msgstr "Suwedi"
 
 # setup2/source\ui\pages\paddr.src:RESID_PAGE_PAGEADDRESS.LB_COUNTRY.99.text
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
 msgid "Switzerland"
 msgstr "UBusuwisi"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
 msgid "Syria"
 msgstr "Ikinyasiriya"
 
 # setup2/source\ui\pages\paddr.src:RESID_PAGE_PAGEADDRESS.LB_COUNTRY.108.text
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
 msgid "Taiwan"
 msgstr "Tayiwani"
 
 # setup2/source\ui\pages\paddr.src:RESID_PAGE_PAGEADDRESS.LB_COUNTRY.107.text
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:348
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
 msgid "Tajikistan"
 msgstr "Tajikisitani"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:349
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
 #, fuzzy
 msgid "Tanzania, United Republic Of"
 msgstr "Tanzaniya, Repubulika Yunze Ubumwe ya"
 
 # setup2/source\ui\pages\paddr.src:RESID_PAGE_PAGEADDRESS.LB_COUNTRY.109.text
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:350
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
 msgid "Thailand"
 msgstr "Tayirandi"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:351
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
 msgid "Timor-Leste"
 msgstr "Timoro-Lesite"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
 msgid "Togo"
 msgstr "Togo"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
 msgid "Tokelau"
 msgstr "Tokelawu"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
 msgid "Tonga"
 msgstr "Tonga"
 
 # setup2/source\ui\pages\paddr.src:RESID_PAGE_PAGEADDRESS.LB_COUNTRY.110.text
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:355
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
 #, fuzzy
 msgid "Trinidad And Tobago"
 msgstr "Tirinite na Tabago"
 
 # setup2/source\ui\pages\paddr.src:RESID_PAGE_PAGEADDRESS.LB_COUNTRY.112.text
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
 msgid "Tunisia"
 msgstr "Tuniziya"
 
 # setup2/source\ui\pages\paddr.src:RESID_PAGE_PAGEADDRESS.LB_COUNTRY.114.text
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
 msgid "Turkey"
 msgstr "Turukiya"
 
 # setup2/source\ui\pages\paddr.src:RESID_PAGE_PAGEADDRESS.LB_COUNTRY.113.text
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
 msgid "Turkmenistan"
 msgstr "Turukumenisitani"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
 #, fuzzy
 msgid "Turks And Caicos Islands"
 msgstr "Ibirwa bya Takisi na Kayikosi"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:360
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
 msgid "Tuvalu"
 msgstr "Tuvalu"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:361
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
 msgid "Uganda"
 msgstr "Yuganda"
 
 # setup2/source\ui\pages\paddr.src:RESID_PAGE_PAGEADDRESS.LB_COUNTRY.115.text
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:362
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
 msgid "Ukraine"
 msgstr "Ukereni"
 
 # setup2/source\ui\pages\paddr.src:RESID_PAGE_PAGEADDRESS.LB_COUNTRY.119.text
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:363
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
 msgid "United Arab Emirates"
 msgstr "Leta Zunze Ubumwe z'Abarabu"
 
 # setup2/source\ui\pages\paddr.src:RESID_PAGE_PAGEADDRESS.LB_COUNTRY.35.text
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:364
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
 msgid "United Kingdom"
 msgstr "Ubwongereza"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:365
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
 msgid "United States Minor Outlying Islands"
 msgstr "Ibirwa Bito Bikikije Leta Zunze Ubumwe"
 
 # setup2/source\ui\pages\paddr.src:RESID_PAGE_PAGEADDRESS.LB_COUNTRY.117.text
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:366
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
 msgid "Uruguay"
 msgstr "Irigwe"
 
 # setup2/source\ui\pages\paddr.src:RESID_PAGE_PAGEADDRESS.LB_COUNTRY.92.text
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:367
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
 msgid "Uzbekistan"
 msgstr "Uzubekisitani"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:368
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
 msgid "Vanuatu"
 msgstr "Vanuwatu"
 
 # setup2/source\ui\pages\paddr.src:RESID_PAGE_PAGEADDRESS.LB_COUNTRY.118.text
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:369
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
 msgid "Venezuela"
 msgstr "Venezuwera"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:370
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
 msgid "Viet Nam"
 msgstr "Viyetinamu"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:371
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
 msgid "Virgin Islands, British"
 msgstr "Ibirwa bya Virigini, Nyongereza"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:372
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
 msgid "Virgin Islands, U.S."
 msgstr "Ibirwa bya Virigini, Leta Zunze Ubumwe"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:373
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:373
 msgid "Wallis And Futuna Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:374
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:374
 msgid "Western Sahara"
 msgstr "Sahara y'Uburengerazuba"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:375
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:375
 msgid "Yemen"
 msgstr "Yemeni"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:376
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:376
 msgid "Zambia"
 msgstr "Zambiya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:377
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:377
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
-#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
-#: plugins/plugin-manager/plugin-manager.c:44
-#: plugins/save-attachments/save-attachments.c:362
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
+#: ../plugins/plugin-manager/plugin-manager.c:44
+#: ../plugins/save-attachments/save-attachments.c:362
+#: ../widgets/menus/gal-view-new-dialog.c:73
 msgid "Name"
 msgstr "Izina"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:62
 msgid "AOL Instant Messenger"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/contact-editor/e-contact-editor.c:183
-#: addressbook/gui/widgets/eab-contact-display.c:349
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:183
+#: ../addressbook/gui/widgets/eab-contact-display.c:351
 msgid "Jabber"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:65
 msgid "Yahoo Messenger"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:186
-#: addressbook/gui/widgets/eab-contact-display.c:348
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:67
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:186
+#: ../addressbook/gui/widgets/eab-contact-display.c:350
 msgid "ICQ"
 msgstr ""
 
 # 5501
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:118
 msgid "Service"
 msgstr "Imirimo"
 
@@ -2747,318 +2804,333 @@ msgstr "Imirimo"
 # officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....Wizard.Fax.Save.AutoPath.text
 # #-#-#-#-#  officecfg.pot (Gnome 2.12)  #-#-#-#-#
 # officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....Wizard.Memo.Save.AutoDocName.text
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
-#: calendar/gui/dialogs/cal-prefs-dialog.c:587
-#: calendar/gui/e-cal-list-view.etspec.h:3
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:127
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:587
+#: ../calendar/gui/e-cal-list-view.etspec.h:3
+#: ../plugins/save-calendar/csv-format.c:400
 msgid "Location"
 msgstr "Ahantu"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:134
 msgid "Username"
 msgstr "Izina ry'ukoresha"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:231
-#: addressbook/gui/contact-editor/e-contact-editor.c:200
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:231
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:200
 msgid "Home"
 msgstr "Home"
 
 # framework/source\classes\fltdlg.src:STR_FILTER_OTHERS.text
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:239
-#: addressbook/gui/contact-editor/e-contact-editor.c:201
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:239
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:201
 msgid "Other"
 msgstr "Ikindi"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
-#: addressbook/gui/widgets/eab-contact-display.c:351
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:184
+#: ../addressbook/gui/widgets/eab-contact-display.c:353
 msgid "Yahoo"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:185
-#: addressbook/gui/widgets/eab-contact-display.c:350
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:185
+#: ../addressbook/gui/widgets/eab-contact-display.c:352
 msgid "MSN"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:187
-#: addressbook/gui/widgets/eab-contact-display.c:347
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
+#: ../addressbook/gui/widgets/eab-contact-display.c:349
 msgid "GroupWise"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:256
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:256
 msgid "Source Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:263
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:263
 msgid "Target Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:277
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:277
 msgid "Is New Contact"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:284
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:284
 msgid "Writable Fields"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:291
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:291
 msgid "Required Fields"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:305
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:305
 msgid "Changed"
 msgstr "Byahinduwe"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2578
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2578
 #, fuzzy
 msgid "Please select an image for this contact"
 msgstr "Guhitamo Ishusho kugirango iyi Umuntu"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2579
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2579
 #, fuzzy
 msgid "No image"
 msgstr "Ishusho"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2855
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2855
 #, fuzzy
 msgid ""
 "The contact data is invalid:\n"
 "\n"
 msgstr "Umuntu Ibyatanzwe ni Sibyo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2907
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2907
 #, fuzzy
 msgid "Invalid contact."
 msgstr "Umuntu"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:277
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:277
 msgid "Contact Quick-Add"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:280
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "_Edit Full"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:306
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:306
 #, fuzzy
 msgid "_Full name:"
 msgstr "Izina:"
 
 # sw/source\ui\wizard\wizbmp.src:STR_Usr_ElektrMail.text
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:316
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:316
 #, fuzzy
 msgid "E-_mail:"
 msgstr "Aderesi ya interineti:"
 
-#: addressbook/gui/contact-editor/eab-editor.c:326
+#: ../addressbook/gui/contact-editor/eab-editor.c:323
+#, fuzzy, c-format
+msgid ""
+"Are you sure you want\n"
+"to delete contact list (%s) ?"
+msgstr "Gusiba Aho kubariza"
+
+#: ../addressbook/gui/contact-editor/eab-editor.c:326
 #, fuzzy
 msgid ""
 "Are you sure you want\n"
-"to delete these contacts?"
+"to delete these contact lists?"
+msgstr "Gusiba Aho kubariza"
+
+#: ../addressbook/gui/contact-editor/eab-editor.c:331
+#, fuzzy, c-format
+msgid ""
+"Are you sure you want\n"
+"to delete contact (%s) ?"
 msgstr "Gusiba Aho kubariza"
 
-#: addressbook/gui/contact-editor/eab-editor.c:329
+#: ../addressbook/gui/contact-editor/eab-editor.c:334
 #, fuzzy
 msgid ""
 "Are you sure you want\n"
-"to delete this contact?"
-msgstr "Gusiba iyi Umuntu"
+"to delete these contacts?"
+msgstr "Gusiba Aho kubariza"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:2
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:3
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:3
 #, fuzzy
 msgid "Ci_ty:"
 msgstr "Umujyi:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:4
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:4
 #, fuzzy
 msgid "Countr_y:"
 msgstr "igihugu"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:5
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "Full Address"
 msgstr ""
 
 # svtools/source\dialogs\addresstemplate.src:STR_FIELD_ZIPCODE.text
-#: addressbook/gui/contact-editor/fulladdr.glade.h:9
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:9
 #, fuzzy
 msgid "_ZIP Code:"
 msgstr "Inomero Z'IPOSITA"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:2
+#: ../addressbook/gui/contact-editor/fullname.glade.h:2
 msgid "Dr."
 msgstr ""
 
-#: addressbook/gui/contact-editor/fullname.glade.h:3
+#: ../addressbook/gui/contact-editor/fullname.glade.h:3
 msgid "Esq."
 msgstr ""
 
-#: addressbook/gui/contact-editor/fullname.glade.h:4
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
+#: ../addressbook/gui/contact-editor/fullname.glade.h:4
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "Full Name"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fullname.glade.h:5
+#: ../addressbook/gui/contact-editor/fullname.glade.h:5
 msgid "I"
 msgstr "I"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:6
+#: ../addressbook/gui/contact-editor/fullname.glade.h:6
 msgid "II"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fullname.glade.h:7
+#: ../addressbook/gui/contact-editor/fullname.glade.h:7
 msgid "III"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fullname.glade.h:8
+#: ../addressbook/gui/contact-editor/fullname.glade.h:8
 msgid "Jr."
 msgstr ""
 
-#: addressbook/gui/contact-editor/fullname.glade.h:9
+#: ../addressbook/gui/contact-editor/fullname.glade.h:9
 msgid "Miss"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fullname.glade.h:10
+#: ../addressbook/gui/contact-editor/fullname.glade.h:10
 msgid "Mr."
 msgstr ""
 
-#: addressbook/gui/contact-editor/fullname.glade.h:11
+#: ../addressbook/gui/contact-editor/fullname.glade.h:11
 msgid "Mrs."
 msgstr ""
 
-#: addressbook/gui/contact-editor/fullname.glade.h:12
+#: ../addressbook/gui/contact-editor/fullname.glade.h:12
 msgid "Ms."
 msgstr ""
 
-#: addressbook/gui/contact-editor/fullname.glade.h:13
+#: ../addressbook/gui/contact-editor/fullname.glade.h:13
 msgid "Sr."
 msgstr ""
 
-#: addressbook/gui/contact-editor/fullname.glade.h:14
+#: ../addressbook/gui/contact-editor/fullname.glade.h:14
 #, fuzzy
 msgid "_First:"
 msgstr "Ya mbere:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:15
+#: ../addressbook/gui/contact-editor/fullname.glade.h:15
 #, fuzzy
 msgid "_Last:"
 msgstr "Ya nyuma:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:16
+#: ../addressbook/gui/contact-editor/fullname.glade.h:16
 #, fuzzy
 msgid "_Middle:"
 msgstr "Yo hagati:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:17
+#: ../addressbook/gui/contact-editor/fullname.glade.h:17
 #, fuzzy
 msgid "_Suffix:"
 msgstr "Ingereka:"
 
-#: addressbook/gui/contact-editor/im.glade.h:2
+#: ../addressbook/gui/contact-editor/im.glade.h:2
 msgid "Add IM Account"
 msgstr ""
 
-#: addressbook/gui/contact-editor/im.glade.h:3
+#: ../addressbook/gui/contact-editor/im.glade.h:3
 #, fuzzy
 msgid "_Account name:"
 msgstr "Izina rya konti:"
 
-#: addressbook/gui/contact-editor/im.glade.h:4
+#: ../addressbook/gui/contact-editor/im.glade.h:4
 msgid "_IM Service:"
 msgstr ""
 
 # padmin/source\padialog.src:RID_PADIALOG.RID_PA_TXT_LOCATION.text
-#: addressbook/gui/contact-editor/im.glade.h:5
-#: plugins/calendar-weather/calendar-weather.c:410
+#: ../addressbook/gui/contact-editor/im.glade.h:5
+#: ../plugins/calendar-weather/calendar-weather.c:410
 #, fuzzy
 msgid "_Location:"
 msgstr "Intaho:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
 msgid "\n"
 msgstr ""
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 #, fuzzy
 msgid "Add an email to the List"
 msgstr "imeli Kuri"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:817
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:817
 msgid "Contact List Editor"
 msgstr ""
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
 #, fuzzy
-msgid "Insert email adresses from Adress Book"
+msgid "Insert email addresses from Address Book"
 msgstr "imeli Bivuye"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
 msgid "Members"
 msgstr ""
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
 #, fuzzy
 msgid "Remove an email address from the List"
 msgstr "imeli Aderesi Bivuye"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 #, fuzzy
 msgid "_Hide addresses when sending mail to this list"
 msgstr "Amaderesi Ryari: Ubutumwa Kuri iyi Urutonde"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
 #, fuzzy
 msgid "_List name:"
 msgstr "Izina rya lisiti:"
 
 # basctl/source\basicide\tbxctl.src:RID_TOOLBOX.SID_INSERT_SELECT.text
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
 #, fuzzy
 msgid "_Select"
 msgstr "Guhitamo"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12
 #, fuzzy
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "imeli Aderesi Cyangwa Kurura a Umuntu Urutonde munsi"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:162
-#: addressbook/gui/widgets/e-addressbook-model.c:296
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:384
-#: addressbook/gui/widgets/e-addressbook-view.c:223
-#: addressbook/gui/widgets/e-minicard-view-widget.c:105
-#: addressbook/gui/widgets/e-minicard-view.c:505
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:162
+#: ../addressbook/gui/widgets/e-addressbook-model.c:296
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:384
+#: ../addressbook/gui/widgets/e-addressbook-view.c:222
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:107
+#: ../addressbook/gui/widgets/e-minicard-view.c:505
 msgid "Book"
 msgstr "Igitabo"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:176
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:176
 msgid "Is New List"
 msgstr ""
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:707
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:707
 msgid "_Members"
 msgstr ""
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:710
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:710
 msgid "Contact List Members"
 msgstr ""
 
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
 msgid "Changed Contact:"
 msgstr ""
 
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
 msgid "Conflicting Contact:"
 msgstr ""
 
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:3
-#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:3
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
 msgid "Duplicate Contact Detected"
 msgstr ""
 
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
 #, fuzzy
 msgid ""
 "The changed email or name of this contact already\n"
@@ -3067,15 +3139,15 @@ msgstr ""
 "Byahinduwe imeli Cyangwa Izina: Bya iyi Umuntu in iyi Ububiko nka Kuri "
 "Kongeramo"
 
-#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
 msgid "New Contact:"
 msgstr ""
 
-#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:3
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:3
 msgid "Original Contact:"
 msgstr ""
 
-#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:4
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:4
 #, fuzzy
 msgid ""
 "The name or email address of this contact already exists\n"
@@ -3084,327 +3156,334 @@ msgstr ""
 "Izina: Cyangwa imeli Aderesi Bya iyi Umuntu iyi Ububiko nka Kuri Kongeramo"
 
 #. FIXME: get the toplevel window...
-#: addressbook/gui/search/e-addressbook-search-dialog.c:160
-#: widgets/misc/e-filter-bar.c:156
+#: ../addressbook/gui/search/e-addressbook-search-dialog.c:160
+#: ../widgets/misc/e-filter-bar.c:156
 msgid "Advanced Search"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-model.c:148
+#: ../addressbook/gui/widgets/e-addressbook-model.c:148
 #, fuzzy
 msgid "No contacts"
 msgstr "Aho kubariza"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:151
+#: ../addressbook/gui/widgets/e-addressbook-model.c:151
 #, fuzzy, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
 msgstr[0] "%dUmuntu"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:303
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:391
-#: addressbook/gui/widgets/e-addressbook-view.c:237
-#: addressbook/gui/widgets/e-minicard-view-widget.c:112
-#: addressbook/gui/widgets/e-minicard-view.c:512
+#: ../addressbook/gui/widgets/e-addressbook-model.c:303
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:391
+#: ../addressbook/gui/widgets/e-addressbook-view.c:236
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:114
+#: ../addressbook/gui/widgets/e-minicard-view.c:512
 msgid "Query"
 msgstr "Ikibazo"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:446
+#: ../addressbook/gui/widgets/e-addressbook-model.c:446
 #, fuzzy
 msgid "Error getting book view"
 msgstr "Igitabo Kureba"
 
 # padmin/source\padialog.src:RID_TXT_TESTPAGE_MODEL.text
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:405
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:405
+#: ../widgets/table/e-table-click-to-add.c:503
+#: ../widgets/table/e-table-selection-model.c:311
+#: ../widgets/table/e-table.c:3344
+#: ../widgets/table/e-tree-selection-model.c:825
+#: ../widgets/text/e-entry.c:1235 ../widgets/text/e-entry.c:1236
+#: ../widgets/text/e-text.c:3448 ../widgets/text/e-text.c:3449
 msgid "Model"
 msgstr "Urugero"
 
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:103
+#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:103
 msgid "Error modifying card"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:169
+#: ../addressbook/gui/widgets/e-addressbook-view.c:168
 #, fuzzy
 msgid "Name begins with"
 msgstr "Na:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:170
+#: ../addressbook/gui/widgets/e-addressbook-view.c:169
 #, fuzzy
 msgid "Email begins with"
 msgstr "Na:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:171
-#: calendar/gui/cal-search-bar.c:53
+#: ../addressbook/gui/widgets/e-addressbook-view.c:170
+#: ../calendar/gui/cal-search-bar.c:53
 #, fuzzy
 msgid "Category is"
 msgstr "ni"
 
 #. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:172
-#: calendar/gui/cal-search-bar.c:48
+#: ../addressbook/gui/widgets/e-addressbook-view.c:171
+#: ../calendar/gui/cal-search-bar.c:48
 #, fuzzy
 msgid "Any field contains"
 msgstr "Umwanya Kirimo"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:173
-#: addressbook/gui/widgets/e-addressbook-view.c:178
+#: ../addressbook/gui/widgets/e-addressbook-view.c:172
+#: ../addressbook/gui/widgets/e-addressbook-view.c:177
 #, fuzzy
 msgid "Advanced..."
 msgstr "Urwego rwo hejuru..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:230
+#: ../addressbook/gui/widgets/e-addressbook-view.c:229
 msgid "Source"
 msgstr "Inkomoko"
 
 # filter/source\xsltdialog\xmlfilterdialogstrings.src:STR_COLUMN_HEADER_TYPE.text
-#: addressbook/gui/widgets/e-addressbook-view.c:244
-#: calendar/gui/dialogs/meeting-page.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:13
-#: calendar/gui/e-meeting-list-view.c:320
-#: calendar/gui/e-meeting-time-sel.etspec.h:11
+#: ../addressbook/gui/widgets/e-addressbook-view.c:243
+#: ../calendar/gui/dialogs/meeting-page.etspec.h:11
+#: ../calendar/gui/e-calendar-table.etspec.h:13
+#: ../calendar/gui/e-meeting-list-view.c:370
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "Ubwoko"
 
 # offmgr/source\offapp\dialog\hyprlink.src:RID_SVXDLG_HYPERLINK.STR_ADDRESS.text
-#: addressbook/gui/widgets/e-addressbook-view.c:541
+#: ../addressbook/gui/widgets/e-addressbook-view.c:543
 msgid "Address Book"
 msgstr "Agatabo k'Aderesi"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:804
-#: addressbook/gui/widgets/e-addressbook-view.c:922
-#: addressbook/gui/widgets/e-addressbook-view.c:1982
-#: ui/evolution-addressbook.xml.h:19
+#: ../addressbook/gui/widgets/e-addressbook-view.c:806
+#: ../addressbook/gui/widgets/e-addressbook-view.c:924
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1986
+#: ../ui/evolution-addressbook.xml.h:19
 #, fuzzy
 msgid "Save as VCard..."
 msgstr "Kubika Nka"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:918
+#: ../addressbook/gui/widgets/e-addressbook-view.c:920
 msgid "New Contact..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:919
+#: ../addressbook/gui/widgets/e-addressbook-view.c:921
 msgid "New Contact List..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:923
-#: ui/evolution-addressbook.xml.h:10
+#: ../addressbook/gui/widgets/e-addressbook-view.c:925
+#: ../ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:924
+#: ../addressbook/gui/widgets/e-addressbook-view.c:926
 #, fuzzy
 msgid "Send Message to Contact"
 msgstr "Kuri"
 
 # #-#-#-#-#  dbaccess.pot (Gnome 2.12)  #-#-#-#-#
 # #-#-#-#-#  dbaccess.pot (Gnome 2.12)  #-#-#-#-#
-#: addressbook/gui/widgets/e-addressbook-view.c:925
-#: calendar/gui/calendar-commands.c:120 calendar/gui/print.c:2501
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
-#: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
+#: ../addressbook/gui/widgets/e-addressbook-view.c:927
+#: ../calendar/gui/calendar-commands.c:120 ../calendar/gui/print.c:2501
+#: ../ui/evolution-addressbook.xml.h:16 ../ui/evolution-calendar.xml.h:19
+#: ../ui/evolution-mail-message.xml.h:74 ../ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Gucapa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:928
+#: ../addressbook/gui/widgets/e-addressbook-view.c:930
 #, fuzzy
 msgid "Copy to Address Book..."
 msgstr "Kuri"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:929
+#: ../addressbook/gui/widgets/e-addressbook-view.c:931
 #, fuzzy
 msgid "Move to Address Book..."
 msgstr "Kuri"
 
 # dbaccess/source/ui/inc/toolbox.hrc:MID_SBA_QRY_CUT.text
-#: addressbook/gui/widgets/e-addressbook-view.c:932
-#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
+#: ../addressbook/gui/widgets/e-addressbook-view.c:934
+#: ../ui/evolution-addressbook.xml.h:6 ../ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Gukata"
 
 # dbaccess/source/ui/inc/toolbox.hrc:MID_SBA_QRY_COPY.text
-#: addressbook/gui/widgets/e-addressbook-view.c:933
-#: calendar/gui/calendar-component.c:536 calendar/gui/tasks-component.c:440
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
-#: ui/evolution-tasks.xml.h:2
+#: ../addressbook/gui/widgets/e-addressbook-view.c:935
+#: ../calendar/gui/calendar-component.c:536
+#: ../calendar/gui/tasks-component.c:440 ../ui/evolution-addressbook.xml.h:2
+#: ../ui/evolution-mail-message.xml.h:11 ../ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Gukoporora"
 
 # dbaccess/source/ui/inc/toolbox.hrc:MID_SBA_QRY_PASTE.text
-#: addressbook/gui/widgets/e-addressbook-view.c:934
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
+#: ../addressbook/gui/widgets/e-addressbook-view.c:936
+#: ../ui/evolution-addressbook.xml.h:13 ../ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Komeka"
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1537
-#: calendar/gui/cal-search-bar.c:346
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1539
+#: ../calendar/gui/cal-search-bar.c:346
 msgid "Any Category"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1750
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1738
 msgid "Print cards"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:1
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
 msgid "Assistant"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 msgid "Assistant Phone"
 msgstr ""
 
 # sw/source\ui\envelp\label.src:TP_BUSINESS_DATA.FL_DATA.text
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:3
 #, fuzzy
 msgid "Business Fax"
 msgstr "Fagisi Akazi"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:4
 msgid "Business Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 #, fuzzy
 msgid "Business Phone 2"
 msgstr "2."
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:6
 msgid "Callback Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:7
 msgid "Car Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: calendar/gui/dialogs/task-page.glade.h:6
-#: calendar/gui/e-cal-list-view.etspec.h:1
-#: calendar/gui/e-calendar-table.etspec.h:3
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: ../calendar/gui/dialogs/task-page.glade.h:6
+#: ../calendar/gui/e-cal-list-view.etspec.h:1
+#: ../calendar/gui/e-calendar-table.etspec.h:3
 msgid "Categories"
 msgstr "Ibyiciro"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
 msgid "Company Phone"
 msgstr ""
 
 # officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....BusinessCard.BusinessAddress.Email.text
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:560 smime/lib/e-cert.c:826
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: ../addressbook/gui/widgets/eab-contact-display.c:562
+#: ../smime/lib/e-cert.c:826
 msgid "Email"
 msgstr "imeli"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: addressbook/gui/widgets/eab-popup-control.c:441
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+#: ../addressbook/gui/widgets/eab-popup-control.c:441
 #, fuzzy
 msgid "Email 2"
 msgstr "2."
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-#: addressbook/gui/widgets/eab-popup-control.c:451
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: ../addressbook/gui/widgets/eab-popup-control.c:451
 #, fuzzy
 msgid "Email 3"
 msgstr "3."
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Family Name"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 #, fuzzy
 msgid "File As"
 msgstr "Idosiye"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:16
 msgid "Given Name"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 msgid "Home Fax"
 msgstr ""
 
 # wizards/source\template\template.src:CorrespondenceFields+14.text
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:18
 msgid "Home Phone"
 msgstr "Telefoni yo mu rugo"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 #, fuzzy
 msgid "Home Phone 2"
 msgstr "2."
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:20
 msgid "ISDN Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:21
 msgid "Journal"
 msgstr "Ikinyamakuru"
 
 # 3718
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "Manager"
 msgstr "umuyobozi"
 
 # wizards/source\template\template.src:CorrespondenceFields+28.text
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: addressbook/gui/widgets/eab-contact-display.c:379
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: ../addressbook/gui/widgets/eab-contact-display.c:381
 msgid "Mobile Phone"
 msgstr "Telefoni igendanwa"
 
 # officecfg/registry\data\org\openoffice\Office\DataAccess.xcu:..DataAccess.DriverSettings.com.sun.star.comp.sdbc.MozabDriver.ColumnAliases.NickName.text
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "Irihimbano"
 
 # sc/source\ui\pagedlg\hfedtdlg.src:RID_HFBASE.FL_INFO.text
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:390
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: ../addressbook/gui/widgets/eab-contact-display.c:392
 msgid "Note"
 msgstr "Igisobanuro"
 
 # svx/source\gallery2\galtheme.src:RID_GALLERYSTR_THEME_OFFICE.text
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "Ofise"
 
 # sw/source\ui\utlui\initui.src:STR_AUTH_FIELD_ORGANIZATIONS.text
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:360
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+#: ../addressbook/gui/widgets/eab-contact-display.c:362
 msgid "Organization"
 msgstr "Ishyirahamwe"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr ""
 
 # wizards/source\template\template.src:CorrespondenceFields+29.text
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:29
 msgid "Other Phone"
 msgstr "Izindi telefoni"
 
 # officecfg/registry\data\org\openoffice\Office\DataAccess.xcu:..DataAccess.DriverSettings.com.sun.star.comp.sdbc.MozabDriver.ColumnAliases.PagerNumber.text
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Pager"
 msgstr "Peja"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:31
 msgid "Primary Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:32
 msgid "Radio"
 msgstr ""
 
 # VCARD_LDAP_ROLE
 # # @name VCARD_LDAP_ROLE
 # # @loc None
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:327
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: ../calendar/gui/dialogs/meeting-page.etspec.h:9
+#: ../calendar/gui/e-meeting-list-view.c:378
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "Inshingano"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Spouse"
 msgstr ""
 
@@ -3414,68 +3493,85 @@ msgstr ""
 #. Device for Deaf". However, you probably want to leave this
 #. abbreviation unchanged unless you know that there is actually a
 #. different and established translation for this in your language.
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:41
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:41
 msgid "TTYTDD"
 msgstr ""
 
 # VCARD_LDAP_TLX_TYPE
 # # @name VCARD_LDAP_TLX_TYPE
 # # @loc None
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:42
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:42
 msgid "Telex"
 msgstr "Telegisi"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:43
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:43
 msgid "Title"
 msgstr "Umutwe"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:44
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:44
 #, fuzzy
 msgid "Unit"
 msgstr "Igice:"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:45
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:45
 msgid "Web Site"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-label.c:115
-#: addressbook/gui/widgets/e-minicard.c:137
+#: ../addressbook/gui/widgets/e-minicard-label.c:115
+#: ../addressbook/gui/widgets/e-minicard.c:137
+#: ../widgets/misc/e-canvas-vbox.c:96 ../widgets/misc/e-canvas-vbox.c:97
+#: ../widgets/misc/e-reflow.c:1437 ../widgets/misc/e-reflow.c:1438
+#: ../widgets/table/e-table-click-to-add.c:517
+#: ../widgets/table/e-table-col.c:98
+#: ../widgets/table/e-table-field-chooser-item.c:667
+#: ../widgets/table/e-table-group-leaf.c:629
+#: ../widgets/table/e-table-group-leaf.c:630
+#: ../widgets/table/e-table-item.c:3008 ../widgets/table/e-table-item.c:3009
+#: ../widgets/text/e-text.c:3626 ../widgets/text/e-text.c:3627
 msgid "Width"
 msgstr "Ubugari"
 
-#: addressbook/gui/widgets/e-minicard-label.c:122
-#: addressbook/gui/widgets/e-minicard.c:144
+#: ../addressbook/gui/widgets/e-minicard-label.c:122
+#: ../addressbook/gui/widgets/e-minicard.c:144
+#: ../widgets/misc/e-canvas-vbox.c:108 ../widgets/misc/e-canvas-vbox.c:109
+#: ../widgets/misc/e-reflow.c:1445 ../widgets/misc/e-reflow.c:1446
+#: ../widgets/table/e-table-click-to-add.c:524
+#: ../widgets/table/e-table-field-chooser-item.c:674
+#: ../widgets/table/e-table-group-leaf.c:622
+#: ../widgets/table/e-table-group-leaf.c:623
+#: ../widgets/table/e-table-item.c:3014 ../widgets/table/e-table-item.c:3015
+#: ../widgets/text/e-text.c:3634 ../widgets/text/e-text.c:3635
 msgid "Height"
 msgstr "Ubuhagarike"
 
-#: addressbook/gui/widgets/e-minicard-label.c:129
-#: addressbook/gui/widgets/e-minicard.c:152
+#: ../addressbook/gui/widgets/e-minicard-label.c:129
+#: ../addressbook/gui/widgets/e-minicard.c:152
 msgid "Has Focus"
 msgstr ""
 
 # wizards/source\formwizard\dbwizres.src:RID_DB_REPORT_WIZARD_START_+_71.text
-#: addressbook/gui/widgets/e-minicard-label.c:136
+#: ../addressbook/gui/widgets/e-minicard-label.c:136
 msgid "Field"
 msgstr "Umwanya"
 
-#: addressbook/gui/widgets/e-minicard-label.c:143
+#: ../addressbook/gui/widgets/e-minicard-label.c:143
 msgid "Field Name"
 msgstr "Izina ry'Umwanya"
 
-#: addressbook/gui/widgets/e-minicard-label.c:150
+#: ../addressbook/gui/widgets/e-minicard-label.c:150
 msgid "Text Model"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-label.c:157
+#: ../addressbook/gui/widgets/e-minicard-label.c:157
 #, fuzzy
 msgid "Max field name length"
 msgstr "Umwanya Izina: Uburebure"
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:126
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:128
 msgid "Column Width"
 msgstr "Ubugari bw'inkingi"
 
-#: addressbook/gui/widgets/e-minicard-view.c:171
+#: ../addressbook/gui/widgets/e-minicard-view.c:171
 #, fuzzy
 msgid ""
 "\n"
@@ -3485,7 +3581,7 @@ msgid ""
 "or double-click here to create a new Contact."
 msgstr "kugirango MAHARAKUBIRI Kanda Kuri Kurema a Gishya"
 
-#: addressbook/gui/widgets/e-minicard-view.c:174
+#: ../addressbook/gui/widgets/e-minicard-view.c:174
 #, fuzzy
 msgid ""
 "\n"
@@ -3495,7 +3591,7 @@ msgid ""
 "Double-click here to create a new Contact."
 msgstr "Oya Kuri Garagaza in iyi Kureba Kanda Kuri Kurema a Gishya"
 
-#: addressbook/gui/widgets/e-minicard-view.c:179
+#: ../addressbook/gui/widgets/e-minicard-view.c:179
 #, fuzzy
 msgid ""
 "\n"
@@ -3503,7 +3599,7 @@ msgid ""
 "Search for the Contact."
 msgstr "kugirango"
 
-#: addressbook/gui/widgets/e-minicard-view.c:181
+#: ../addressbook/gui/widgets/e-minicard-view.c:181
 #, fuzzy
 msgid ""
 "\n"
@@ -3511,30 +3607,30 @@ msgid ""
 "There are no items to show in this view."
 msgstr "Oya Kuri Garagaza in iyi Kureba"
 
-#: addressbook/gui/widgets/e-minicard-view.c:498
+#: ../addressbook/gui/widgets/e-minicard-view.c:498
 msgid "Adapter"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard.c:160
+#: ../addressbook/gui/widgets/e-minicard.c:160
 msgid "Selected"
 msgstr "Byahiswemo"
 
-#: addressbook/gui/widgets/e-minicard.c:167
+#: ../addressbook/gui/widgets/e-minicard.c:167
 msgid "Has Cursor"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:133
-#: addressbook/gui/widgets/eab-contact-display.c:196
+#: ../addressbook/gui/widgets/eab-contact-display.c:135
+#: ../addressbook/gui/widgets/eab-contact-display.c:198
 msgid "(map)"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:143
-#: addressbook/gui/widgets/eab-contact-display.c:209
+#: ../addressbook/gui/widgets/eab-contact-display.c:145
+#: ../addressbook/gui/widgets/eab-contact-display.c:211
 msgid "map"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:274
-#: addressbook/gui/widgets/eab-contact-display.c:541
+#: ../addressbook/gui/widgets/eab-contact-display.c:276
+#: ../addressbook/gui/widgets/eab-contact-display.c:543
 msgid "List Members"
 msgstr ""
 
@@ -3542,8 +3638,8 @@ msgstr ""
 # officecfg/registry\data\org\openoffice\Office\DataAccess.xcu:..DataAccess.DriverSettings.com.sun.star.comp.sdbc.MozabDriver.ColumnAliases.PrimaryEmail.text
 # #-#-#-#-#  officecfg.pot (Gnome 2.12)  #-#-#-#-#
 # officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....BusinessCard.PrivateAddress.Email.text
-#: addressbook/gui/widgets/eab-contact-display.c:337
-#: addressbook/gui/widgets/eab-contact-display.c:339
+#: ../addressbook/gui/widgets/eab-contact-display.c:339
+#: ../addressbook/gui/widgets/eab-contact-display.c:341
 msgid "E-mail"
 msgstr "Imeli"
 
@@ -3567,11 +3663,11 @@ msgstr "Imeli"
 # officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....Insert.Caption.OfficeObject.OLEMisc.Settings.Position.text
 # #-#-#-#-#  officecfg.pot (Gnome 2.12)  #-#-#-#-#
 # officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....BusinessCard.BusinessAddress.Position.text
-#: addressbook/gui/widgets/eab-contact-display.c:361
+#: ../addressbook/gui/widgets/eab-contact-display.c:363
 msgid "Position"
 msgstr "Ibirindiro"
 
-#: addressbook/gui/widgets/eab-contact-display.c:362
+#: ../addressbook/gui/widgets/eab-contact-display.c:364
 msgid "Video Conferencing"
 msgstr ""
 
@@ -3583,8 +3679,8 @@ msgstr ""
 # officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....Wizard.Fax.Sender.TelNumber.text
 # #-#-#-#-#  officecfg.pot (Gnome 2.12)  #-#-#-#-#
 # officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....Wizard.Fax.Recipient.TelNumber.text
-#: addressbook/gui/widgets/eab-contact-display.c:363
-#: addressbook/gui/widgets/eab-contact-display.c:378
+#: ../addressbook/gui/widgets/eab-contact-display.c:365
+#: ../addressbook/gui/widgets/eab-contact-display.c:380
 msgid "Phone"
 msgstr "Telefone"
 
@@ -3600,140 +3696,141 @@ msgstr "Telefone"
 # officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....BusinessCard.BusinessAddress.Fax.text
 # #-#-#-#-#  officecfg.pot (Gnome 2.12)  #-#-#-#-#
 # officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....Wizard.Fax.Recipient.FaxNumber.text
-#: addressbook/gui/widgets/eab-contact-display.c:364
+#: ../addressbook/gui/widgets/eab-contact-display.c:366
 msgid "Fax"
 msgstr "Fagisi"
 
-#: addressbook/gui/widgets/eab-contact-display.c:368
+#: ../addressbook/gui/widgets/eab-contact-display.c:370
 #, fuzzy
 msgid "work"
 msgstr "Akazi"
 
-#: addressbook/gui/widgets/eab-contact-display.c:375
+#: ../addressbook/gui/widgets/eab-contact-display.c:377
 #, fuzzy
 msgid "WWW"
 msgstr "www"
 
-#: addressbook/gui/widgets/eab-contact-display.c:376
-#: addressbook/gui/widgets/eab-contact-display.c:595
+#: ../addressbook/gui/widgets/eab-contact-display.c:378
+#: ../addressbook/gui/widgets/eab-contact-display.c:597
 msgid "Blog"
 msgstr ""
 
 # WalletMisc.xul
-#: addressbook/gui/widgets/eab-contact-display.c:383
+#: ../addressbook/gui/widgets/eab-contact-display.c:385
 #, fuzzy
 msgid "personal"
 msgstr "Bwite"
 
 # officecfg/registry\data\org\openoffice\Office\DataAccess.xcu:..DataAccess.DriverSettings.com.sun.star.comp.sdbc.MozabDriver.ColumnAliases.JobTitle.text
-#: addressbook/gui/widgets/eab-contact-display.c:556
+#: ../addressbook/gui/widgets/eab-contact-display.c:558
 msgid "Job Title"
 msgstr "Izina ry'Akazi"
 
-#: addressbook/gui/widgets/eab-contact-display.c:587
+#: ../addressbook/gui/widgets/eab-contact-display.c:589
 #, fuzzy
 msgid "Home page"
 msgstr "Ipaji yo kwinjira"
 
 #. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:49
+#: ../addressbook/gui/widgets/eab-gui-util.c:49
 msgid "Success"
 msgstr "Ibyatunganye"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:51
+#: ../addressbook/gui/widgets/eab-gui-util.c:51
 #, fuzzy
 msgid "Backend busy"
 msgstr "Irahuze"
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: ../addressbook/gui/widgets/eab-gui-util.c:52
 #, fuzzy
 msgid "Repository offline"
 msgstr "Ntibicometse kuri interineti"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: ../addressbook/gui/widgets/eab-gui-util.c:53
 #, fuzzy
 msgid "Address Book does not exist"
 msgstr "OYA"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: ../addressbook/gui/widgets/eab-gui-util.c:54
 msgid "No Self Contact defined"
 msgstr ""
 
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
-#: addressbook/gui/widgets/eab-gui-util.c:57
+#: ../addressbook/gui/widgets/eab-gui-util.c:57
 msgid "Permission denied"
 msgstr ""
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:58
+#: ../addressbook/gui/widgets/eab-gui-util.c:58
 #, fuzzy
 msgid "Contact not found"
 msgstr "OYA Byabonetse"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:59
+#: ../addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Contact ID already exists"
 msgstr ""
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:60
+#: ../addressbook/gui/widgets/eab-gui-util.c:60
 #, fuzzy
 msgid "Protocol not supported"
 msgstr "OYA"
 
 #. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:61
-#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-component-preview.c:232
-#: calendar/gui/e-cal-model-tasks.c:347 calendar/gui/e-cal-model-tasks.c:660
-#: calendar/gui/e-calendar-table.c:458 calendar/gui/print.c:2364
+#: ../addressbook/gui/widgets/eab-gui-util.c:61
+#: ../calendar/gui/dialogs/task-details-page.glade.h:3
+#: ../calendar/gui/e-cal-component-preview.c:232
+#: ../calendar/gui/e-cal-model-tasks.c:347
+#: ../calendar/gui/e-cal-model-tasks.c:660
+#: ../calendar/gui/e-calendar-table.c:458 ../calendar/gui/print.c:2364
 msgid "Cancelled"
 msgstr "Kureka"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:62
+#: ../addressbook/gui/widgets/eab-gui-util.c:62
 #, fuzzy
 msgid "Could not cancel"
 msgstr "OYA Kureka"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:63
-#: calendar/gui/comp-editor-factory.c:431
+#: ../addressbook/gui/widgets/eab-gui-util.c:63
+#: ../calendar/gui/comp-editor-factory.c:431
 msgid "Authentication Failed"
 msgstr ""
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:64
+#: ../addressbook/gui/widgets/eab-gui-util.c:64
 msgid "Authentication Required"
 msgstr ""
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:65
+#: ../addressbook/gui/widgets/eab-gui-util.c:65
 #, fuzzy
 msgid "TLS not Available"
 msgstr "OYA"
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:67
+#: ../addressbook/gui/widgets/eab-gui-util.c:67
 #, fuzzy
 msgid "No such source"
 msgstr "Inkomoko"
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:68
+#: ../addressbook/gui/widgets/eab-gui-util.c:68
 #, fuzzy
 msgid "Other error"
 msgstr "Ikosa"
 
-#: addressbook/gui/widgets/eab-gui-util.c:90
+#: ../addressbook/gui/widgets/eab-gui-util.c:90
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook. This either means this book is not "
@@ -3745,21 +3842,21 @@ msgstr ""
 "interineti Ikoresha: Ibirimo Rimwe in kiri kuri interineti Ubwoko Kuri "
 "Gufungura Ibigize"
 
-#: addressbook/gui/widgets/eab-gui-util.c:98
+#: ../addressbook/gui/widgets/eab-gui-util.c:98
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  Please check that the path exists "
 "and that you have permission to access it."
 msgstr "Kuri Gufungura iyi Kugenzura... Inzira Na Kuri"
 
-#: addressbook/gui/widgets/eab-gui-util.c:105
+#: ../addressbook/gui/widgets/eab-gui-util.c:105
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the LDAP server is unreachable."
 msgstr "Kuri Gufungura iyi Cyangwa Seriveri ni"
 
-#: addressbook/gui/widgets/eab-gui-util.c:110
+#: ../addressbook/gui/widgets/eab-gui-util.c:110
 #, fuzzy
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
@@ -3769,14 +3866,14 @@ msgstr ""
 "Verisiyo Bya OYA Gushigikira in Kuri Kuri Gukoresha in Kwinjiza porogaramu "
 "Bikora"
 
-#: addressbook/gui/widgets/eab-gui-util.c:117
+#: ../addressbook/gui/widgets/eab-gui-util.c:117
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the server is unreachable."
 msgstr "Kuri Gufungura iyi Cyangwa Seriveri ni"
 
-#: addressbook/gui/widgets/eab-gui-util.c:137
+#: ../addressbook/gui/widgets/eab-gui-util.c:137
 #, fuzzy
 msgid ""
 "More cards matched this query than either the server is \n"
@@ -3788,7 +3885,7 @@ msgstr ""
 "Gushaka Birenzeho Cyangwa Igisubizo bushyinguro Seriveri Ibyahiswemo "
 "kugirango iyi"
 
-#: addressbook/gui/widgets/eab-gui-util.c:143
+#: ../addressbook/gui/widgets/eab-gui-util.c:143
 #, fuzzy
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
@@ -3799,54 +3896,54 @@ msgstr ""
 "Igihe Kuri Gukora iyi Ikibazo# Seriveri Cyangwa kugirango iyi Ubwoko Cyangwa "
 "Igihe in bushyinguro kugirango iyi"
 
-#: addressbook/gui/widgets/eab-gui-util.c:149
+#: ../addressbook/gui/widgets/eab-gui-util.c:149
 #, fuzzy
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr "kugirango iyi Kuri iyi Ikibazo#"
 
-#: addressbook/gui/widgets/eab-gui-util.c:152
+#: ../addressbook/gui/widgets/eab-gui-util.c:152
 #, fuzzy
 msgid "The backend for this addressbook refused to perform this query."
 msgstr "kugirango iyi Kuri iyi Ikibazo#"
 
-#: addressbook/gui/widgets/eab-gui-util.c:155
+#: ../addressbook/gui/widgets/eab-gui-util.c:155
 #, fuzzy
 msgid "This query did not complete successfully."
 msgstr "Ikibazo# OYA Byuzuye"
 
-#: addressbook/gui/widgets/eab-gui-util.c:177
+#: ../addressbook/gui/widgets/eab-gui-util.c:177
 #, fuzzy
 msgid "Error adding list"
 msgstr "Wongera Urutonde"
 
-#: addressbook/gui/widgets/eab-gui-util.c:177
-#: addressbook/gui/widgets/eab-gui-util.c:650
+#: ../addressbook/gui/widgets/eab-gui-util.c:177
+#: ../addressbook/gui/widgets/eab-gui-util.c:675
 #, fuzzy
 msgid "Error adding contact"
 msgstr "Wongera Umuntu"
 
-#: addressbook/gui/widgets/eab-gui-util.c:188
+#: ../addressbook/gui/widgets/eab-gui-util.c:188
 #, fuzzy
 msgid "Error modifying list"
 msgstr "Urutonde"
 
-#: addressbook/gui/widgets/eab-gui-util.c:188
+#: ../addressbook/gui/widgets/eab-gui-util.c:188
 #, fuzzy
 msgid "Error modifying contact"
 msgstr "Umuntu"
 
-#: addressbook/gui/widgets/eab-gui-util.c:200
+#: ../addressbook/gui/widgets/eab-gui-util.c:200
 #, fuzzy
 msgid "Error removing list"
 msgstr "Urutonde"
 
-#: addressbook/gui/widgets/eab-gui-util.c:200
-#: addressbook/gui/widgets/eab-gui-util.c:608
+#: ../addressbook/gui/widgets/eab-gui-util.c:200
+#: ../addressbook/gui/widgets/eab-gui-util.c:633
 #, fuzzy
 msgid "Error removing contact"
 msgstr "Umuntu"
 
-#: addressbook/gui/widgets/eab-gui-util.c:282
+#: ../addressbook/gui/widgets/eab-gui-util.c:282
 #, fuzzy, c-format
 msgid ""
 "Opening %d contact will open %d new window as well.\n"
@@ -3856,7 +3953,7 @@ msgid_plural ""
 "Do you really want to display all of these contacts?"
 msgstr[0] "Umuntu Gufungura Gishya Idirishya Nka Kuri Kugaragaza iyi Umuntu"
 
-#: addressbook/gui/widgets/eab-gui-util.c:311
+#: ../addressbook/gui/widgets/eab-gui-util.c:311
 #, fuzzy, c-format
 msgid ""
 "%s already exists\n"
@@ -3864,12 +3961,60 @@ msgid ""
 msgstr "%sKuri Guhindura"
 
 # sw/source\ui\wrtsh\wrtsh.src:STR_OVR_UNDO.text
-#: addressbook/gui/widgets/eab-gui-util.c:315
+#: ../addressbook/gui/widgets/eab-gui-util.c:315
 msgid "Overwrite"
 msgstr "Gusimbuza"
 
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is Mozilla Communicator client code, released
+# March 31, 1998.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 1998-1999
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either of the GNU General Public License Version 2 or later (the "GPL"),
+# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
+# Box Headings
+#. more than one, finding the total number of contacts might
+#. * hit performance while saving large number of contacts
+#.
+#: ../addressbook/gui/widgets/eab-gui-util.c:360
+#: ../addressbook/gui/widgets/eab-gui-util.c:363
+#, fuzzy
+msgid "contact"
+msgid_plural "contacts"
+msgstr[0] "Umuntu"
+msgstr[1] "Umuntu"
+
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:393
+#: ../addressbook/gui/widgets/eab-gui-util.c:410
 msgid "card.vcf"
 msgstr ""
 
@@ -3879,41 +4024,41 @@ msgstr ""
 # officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....DefaultFontCJK.List.text
 # #-#-#-#-#  officecfg.pot (Gnome 2.12)  #-#-#-#-#
 # officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....DefaultFontCTL.List.text
-#: addressbook/gui/widgets/eab-gui-util.c:555
+#: ../addressbook/gui/widgets/eab-gui-util.c:580
 #, fuzzy
 msgid "list"
 msgstr "Urutonde"
 
-#: addressbook/gui/widgets/eab-gui-util.c:704
+#: ../addressbook/gui/widgets/eab-gui-util.c:729
 #, fuzzy
 msgid "Move contact to"
 msgstr "Umuntu Kuri"
 
-#: addressbook/gui/widgets/eab-gui-util.c:706
+#: ../addressbook/gui/widgets/eab-gui-util.c:731
 #, fuzzy
 msgid "Copy contact to"
 msgstr "Umuntu Kuri"
 
-#: addressbook/gui/widgets/eab-gui-util.c:709
+#: ../addressbook/gui/widgets/eab-gui-util.c:734
 #, fuzzy
 msgid "Move contacts to"
 msgstr "Aho kubariza Kuri"
 
-#: addressbook/gui/widgets/eab-gui-util.c:711
+#: ../addressbook/gui/widgets/eab-gui-util.c:736
 #, fuzzy
 msgid "Copy contacts to"
 msgstr "Aho kubariza Kuri"
 
-#: addressbook/gui/widgets/eab-gui-util.c:714
+#: ../addressbook/gui/widgets/eab-gui-util.c:739
 #, fuzzy
 msgid "Select target addressbook."
 msgstr "Intego"
 
-#: addressbook/gui/widgets/eab-gui-util.c:937
+#: ../addressbook/gui/widgets/eab-gui-util.c:962
 msgid "Multiple VCards"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:940
+#: ../addressbook/gui/widgets/eab-gui-util.c:965
 #, fuzzy, c-format
 msgid "VCard for %s"
 msgstr "kugirango"
@@ -3929,128 +4074,128 @@ msgstr "kugirango"
 #. * addresses (and *only* the e-mail addresses) associated with an existing
 #. * contact.
 #.
-#: addressbook/gui/widgets/eab-popup-control.c:198
+#: ../addressbook/gui/widgets/eab-popup-control.c:198
 msgid "(none)"
 msgstr "(ntacyo)"
 
-#: addressbook/gui/widgets/eab-popup-control.c:431
+#: ../addressbook/gui/widgets/eab-popup-control.c:431
 msgid "Primary Email"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-popup-control.c:567
+#: ../addressbook/gui/widgets/eab-popup-control.c:567
 msgid "Select an Action"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-popup-control.c:575
+#: ../addressbook/gui/widgets/eab-popup-control.c:575
 #, fuzzy, c-format
 msgid "Create a new contact \"%s\""
 msgstr "a Gishya Umuntu"
 
-#: addressbook/gui/widgets/eab-popup-control.c:591
+#: ../addressbook/gui/widgets/eab-popup-control.c:591
 #, fuzzy, c-format
 msgid "Add address to existing contact \"%s\""
 msgstr "Aderesi Kuri Umuntu"
 
-#: addressbook/gui/widgets/eab-popup-control.c:869
+#: ../addressbook/gui/widgets/eab-popup-control.c:869
 msgid "Querying Address Book..."
 msgstr ""
 
-#: addressbook/gui/widgets/eab-popup-control.c:970
+#: ../addressbook/gui/widgets/eab-popup-control.c:970
 #, fuzzy
 msgid "Merge E-Mail Address"
 msgstr "E"
 
-#: addressbook/gui/widgets/eab-vcard-control.c:139
+#: ../addressbook/gui/widgets/eab-vcard-control.c:139
 #, fuzzy, c-format
 msgid "There is one other contact."
 msgid_plural "There are %d other contacts."
 msgstr[0] "ni Ikindi Umuntu"
 
-#: addressbook/gui/widgets/eab-vcard-control.c:223
-#: addressbook/gui/widgets/eab-vcard-control.c:272
+#: ../addressbook/gui/widgets/eab-vcard-control.c:223
+#: ../addressbook/gui/widgets/eab-vcard-control.c:272
 msgid "Show Full VCard"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-vcard-control.c:227
+#: ../addressbook/gui/widgets/eab-vcard-control.c:227
 msgid "Show Compact VCard"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-vcard-control.c:277
+#: ../addressbook/gui/widgets/eab-vcard-control.c:277
 #, fuzzy
 msgid "Save in addressbook"
 msgstr "Kubika in"
 
-#: addressbook/gui/widgets/gal-view-factory-minicard.c:25
+#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:25
 msgid "Card View"
 msgstr ""
 
-#: addressbook/gui/widgets/gal-view-factory-treeview.c:26
+#: ../addressbook/gui/widgets/gal-view-factory-treeview.c:26
 msgid "GTK Tree View"
 msgstr ""
 
-#: addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
+#: ../addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
 #, fuzzy
 msgid "Evolution LDIF importer"
 msgstr "LDIF"
 
-#: addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
+#: ../addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
 #, fuzzy
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "ldif"
 
-#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
+#: ../addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
 msgid "Evolution VCard Importer"
 msgstr ""
 
-#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
+#: ../addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
 msgid "VCard (.vcf, .gcrd)"
 msgstr ""
 
-#: addressbook/printing/e-contact-print-envelope.c:213
-#: addressbook/printing/e-contact-print-envelope.c:234
+#: ../addressbook/printing/e-contact-print-envelope.c:213
+#: ../addressbook/printing/e-contact-print-envelope.c:234
 #, fuzzy
 msgid "Print envelope"
 msgstr "Ibahasha"
 
-#: addressbook/printing/e-contact-print.c:1001
+#: ../addressbook/printing/e-contact-print.c:1001
 #, fuzzy
 msgid "Print contacts"
 msgstr "Aho kubariza"
 
-#: addressbook/printing/e-contact-print.c:1066
-#: addressbook/printing/e-contact-print.c:1093
+#: ../addressbook/printing/e-contact-print.c:1066
+#: ../addressbook/printing/e-contact-print.c:1093
 #, fuzzy
 msgid "Print contact"
 msgstr "Umuntu"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: ../addressbook/printing/e-contact-print.glade.h:1
 #, fuzzy
 msgid "10 pt. Tahoma"
 msgstr "10 pt"
 
-#: addressbook/printing/e-contact-print.glade.h:2
+#: ../addressbook/printing/e-contact-print.glade.h:2
 #, fuzzy
 msgid "8 pt. Tahoma"
 msgstr "8 pt"
 
-#: addressbook/printing/e-contact-print.glade.h:3
+#: ../addressbook/printing/e-contact-print.glade.h:3
 #, fuzzy
 msgid "Blank forms at end:"
 msgstr "Amafishi ku Impera"
 
-#: addressbook/printing/e-contact-print.glade.h:4
+#: ../addressbook/printing/e-contact-print.glade.h:4
 msgid "Body"
 msgstr "Umubiri"
 
-#: addressbook/printing/e-contact-print.glade.h:5
+#: ../addressbook/printing/e-contact-print.glade.h:5
 msgid "Bottom:"
 msgstr "Hasi:"
 
-#: addressbook/printing/e-contact-print.glade.h:6
+#: ../addressbook/printing/e-contact-print.glade.h:6
 msgid "Dimensions:"
 msgstr "Ingano:"
 
-#: addressbook/printing/e-contact-print.glade.h:7
+#: ../addressbook/printing/e-contact-print.glade.h:7
 #, fuzzy
 msgid "F_ont..."
 msgstr "Imyandikire:"
@@ -4059,17 +4204,17 @@ msgstr "Imyandikire:"
 # offmgr/source\offapp\dialog\fontsubs.src:RID_SVX_FONT_SUBSTITUTION.FT_FONTNAME.text
 # #-#-#-#-#  offmgr.pot (Gnome 2.12)  #-#-#-#-#
 # offmgr/source\offapp\dialog\treeopt.src:RID_OFADLG_OPTIONS_TREE_PAGES.SID_GENERAL_OPTIONS.10.text
-#: addressbook/printing/e-contact-print.glade.h:8
+#: ../addressbook/printing/e-contact-print.glade.h:8
 msgid "Fonts"
 msgstr "Imyandikire"
 
 # sw/source\ui\docvw\access.src:STR_ACCESS_FOOTER_NAME.text
-#: addressbook/printing/e-contact-print.glade.h:9
+#: ../addressbook/printing/e-contact-print.glade.h:9
 #, fuzzy
 msgid "Footer:"
 msgstr "Impera"
 
-#: addressbook/printing/e-contact-print.glade.h:10
+#: ../addressbook/printing/e-contact-print.glade.h:10
 msgid "Format"
 msgstr "Imiterere"
 
@@ -4077,11 +4222,17 @@ msgstr "Imiterere"
 # officecfg/registry\schema\org\openoffice\Office\WriterWeb.xcs:....Insert.Table.Header.text
 # #-#-#-#-#  officecfg.pot (Gnome 2.12)  #-#-#-#-#
 # officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....Insert.Table.Header.text
-#: addressbook/printing/e-contact-print.glade.h:11
+#: ../addressbook/printing/e-contact-print.glade.h:11
+#: ../widgets/table/e-table-click-to-add.c:496
+#: ../widgets/table/e-table-field-chooser-dialog.c:91
+#: ../widgets/table/e-table-field-chooser-item.c:660
+#: ../widgets/table/e-table-field-chooser.c:93
+#: ../widgets/table/e-table-header-item.c:1831
+#: ../widgets/table/e-table-selection-model.c:318
 msgid "Header"
 msgstr "Umutwempangano"
 
-#: addressbook/printing/e-contact-print.glade.h:12
+#: ../addressbook/printing/e-contact-print.glade.h:12
 msgid "Header/Footer"
 msgstr ""
 
@@ -4089,105 +4240,106 @@ msgstr ""
 # sw/source\ui\ribbar\workctrl.src:RID_SCROLL_NAVIGATION_WIN.ST_OUTL.text
 # #-#-#-#-#  sw.pot (Gnome 2.12)  #-#-#-#-#
 # sw/source\ui\utlui\utlui.src:STR_CONTENT_TYPE_OUTLINE.text
-#: addressbook/printing/e-contact-print.glade.h:13
+#: ../addressbook/printing/e-contact-print.glade.h:13
 msgid "Headings"
 msgstr "Imitwe"
 
-#: addressbook/printing/e-contact-print.glade.h:14
+#: ../addressbook/printing/e-contact-print.glade.h:14
 #, fuzzy
 msgid "Headings for each letter"
 msgstr "kugirango Ibaruwa..."
 
 # sc/source\ui\src\globstr.src:RID_GLOBSTR.STR_TIP_HEIGHT.text
-#: addressbook/printing/e-contact-print.glade.h:15
+#: ../addressbook/printing/e-contact-print.glade.h:15
 msgid "Height:"
 msgstr "Ubuhagarike:"
 
-#: addressbook/printing/e-contact-print.glade.h:16
+#: ../addressbook/printing/e-contact-print.glade.h:16
 #, fuzzy
 msgid "Immediately follow each other"
 msgstr "Ikindi"
 
 # sc/source\ui\src\miscdlgs.src:RID_SCDLG_GROUP.STR_GROUP.text
-#: addressbook/printing/e-contact-print.glade.h:17
+#: ../addressbook/printing/e-contact-print.glade.h:17
 #, fuzzy
 msgid "Include:"
 msgstr "Gushyiramo"
 
 # svx/source\items\svxitems.src:RID_SVXITEMS_PAGE_LAND_TRUE.text
-#: addressbook/printing/e-contact-print.glade.h:18
+#: ../addressbook/printing/e-contact-print.glade.h:18
 msgid "Landscape"
 msgstr "Urupapuro-ntambike"
 
-#: addressbook/printing/e-contact-print.glade.h:19
+#: ../addressbook/printing/e-contact-print.glade.h:19
 msgid "Left:"
 msgstr "Ibumoso:"
 
-#: addressbook/printing/e-contact-print.glade.h:20
+#: ../addressbook/printing/e-contact-print.glade.h:20
 #, fuzzy
 msgid "Letter tabs on side"
 msgstr "Amasimbuka ku"
 
 # svx/source\dialog\page.src:RID_SVXPAGE_PAGE.FL_MARGIN.text
-#: addressbook/printing/e-contact-print.glade.h:21
+#: ../addressbook/printing/e-contact-print.glade.h:21
 msgid "Margins"
 msgstr "Marije"
 
-#: addressbook/printing/e-contact-print.glade.h:22
+#: ../addressbook/printing/e-contact-print.glade.h:22
 #, fuzzy
 msgid "Number of columns:"
 msgstr "Bya Inkingi"
 
 # basctl/source\basicide\moduldlg.src:RID_DLG_LIBS.RID_FL_OPTIONS.text
-#: addressbook/printing/e-contact-print.glade.h:23
+#: ../addressbook/printing/e-contact-print.glade.h:23
 msgid "Options"
 msgstr "Amahitamo"
 
-#: addressbook/printing/e-contact-print.glade.h:24 e-util/eggtrayicon.c:118
+#: ../addressbook/printing/e-contact-print.glade.h:24
+#: ../e-util/eggtrayicon.c:118
 msgid "Orientation"
 msgstr "Icyerekezo"
 
 # basctl/source\basicide\basidesh.src:RID_STR_PAGE.text
-#: addressbook/printing/e-contact-print.glade.h:25
+#: ../addressbook/printing/e-contact-print.glade.h:25
 msgid "Page"
 msgstr "Ipaji"
 
-#: addressbook/printing/e-contact-print.glade.h:26
+#: ../addressbook/printing/e-contact-print.glade.h:26
 #, fuzzy
 msgid "Page Setup:"
 msgstr "Iboneza ry'Ipaji..."
 
 # padmin/source\rtsetup.src:RID_RTS_RTSDIALOG.RID_RTS_RTSDIALOG_TABCONTROL.RID_RTS_PAPERPAGE.text
-#: addressbook/printing/e-contact-print.glade.h:27
+#: ../addressbook/printing/e-contact-print.glade.h:27
 msgid "Paper"
 msgstr "urupapuro"
 
-#: addressbook/printing/e-contact-print.glade.h:28
+#: ../addressbook/printing/e-contact-print.glade.h:28
 #, fuzzy
 msgid "Paper source:"
 msgstr "Inkomoko y'urupapuro"
 
 # svx/source\items\svxitems.src:RID_SVXITEMS_PAGE_LAND_FALSE.text
-#: addressbook/printing/e-contact-print.glade.h:29
+#: ../addressbook/printing/e-contact-print.glade.h:29
 msgid "Portrait"
 msgstr "Urupapuro-mpagarike"
 
 # svx/source\dialog\rubydialog.src:RID_SVXDLG_RUBY.FT_PREVIEW.text
-#: addressbook/printing/e-contact-print.glade.h:30
+#: ../addressbook/printing/e-contact-print.glade.h:30
 msgid "Preview:"
 msgstr "Igaragazambere:"
 
-#: addressbook/printing/e-contact-print.glade.h:31
+#: ../addressbook/printing/e-contact-print.glade.h:31
 #, fuzzy
 msgid "Print using gray shading"
 msgstr "ikoresha Ikigina Ubwijime"
 
-#: addressbook/printing/e-contact-print.glade.h:32
+#: ../addressbook/printing/e-contact-print.glade.h:32
 #, fuzzy
 msgid "Reverse on even pages"
 msgstr "ku ATARIIGIHARWE Amapaji"
 
-#: addressbook/printing/e-contact-print.glade.h:33
+#: ../addressbook/printing/e-contact-print.glade.h:33
 msgid "Right:"
 msgstr "Iburyo:"
 
@@ -4195,446 +4347,408 @@ msgstr "Iburyo:"
 # sw/source\ui\inc\swmn.hrc:MN_OBJECTMENU_TEXT.FN_EDIT_REGION.text
 # #-#-#-#-#  sw.pot (Gnome 2.12)  #-#-#-#-#
 # sw/source\ui\inc\swmn.hrc:MN_OBJECTMENU_TABLE.FN_EDIT_REGION.text
-#: addressbook/printing/e-contact-print.glade.h:34
+#: ../addressbook/printing/e-contact-print.glade.h:34
 #, fuzzy
 msgid "Sections:"
 msgstr "Ibyiciro..."
 
-#: addressbook/printing/e-contact-print.glade.h:35
+#: ../addressbook/printing/e-contact-print.glade.h:35
 msgid "Shading"
 msgstr "Ubwijime"
 
 # sfx2/source\dialog\dinfdlg.src:TP_DOCINFODOC.FT_FILE_SIZE.text
-#: addressbook/printing/e-contact-print.glade.h:36
+#: ../addressbook/printing/e-contact-print.glade.h:36
 msgid "Size:"
 msgstr "Ingano"
 
-#: addressbook/printing/e-contact-print.glade.h:37
+#: ../addressbook/printing/e-contact-print.glade.h:37
 #, fuzzy
 msgid "Start on a new page"
 msgstr "Gutangira ku a Gishya Ipaji"
 
 # sfx2/source\dialog\newstyle.src:DLG_NEW_STYLE_BY_EXAMPLE.FL_COL.text
-#: addressbook/printing/e-contact-print.glade.h:38
+#: ../addressbook/printing/e-contact-print.glade.h:38
 #, fuzzy
 msgid "Style name:"
 msgstr "Izina ry'imisusire"
 
-#: addressbook/printing/e-contact-print.glade.h:39
+#: ../addressbook/printing/e-contact-print.glade.h:39
 msgid "Top:"
 msgstr "Hejuru:"
 
 # sfx2/source\dialog\dinfdlg.src:TP_DOCINFODOC.FT_FILE_TYP.text
-#: addressbook/printing/e-contact-print.glade.h:40
-#: calendar/gui/dialogs/calendar-setup.c:175
+#: ../addressbook/printing/e-contact-print.glade.h:40
+#: ../calendar/gui/dialogs/calendar-setup.c:176
 msgid "Type:"
 msgstr "Ubwoko"
 
 # sc/source\ui\src\globstr.src:RID_GLOBSTR.STR_TIP_WIDTH.text
-#: addressbook/printing/e-contact-print.glade.h:41
+#: ../addressbook/printing/e-contact-print.glade.h:41
 msgid "Width:"
 msgstr "Ubugari:"
 
-#: addressbook/printing/e-contact-print.glade.h:42
+#: ../addressbook/printing/e-contact-print.glade.h:42
 #, fuzzy
 msgid "_Font..."
 msgstr "Imyandikire:"
 
-#: addressbook/printing/test-contact-print-style-editor.c:53
+#: ../addressbook/printing/test-contact-print-style-editor.c:53
 msgid "Contact Print Style Editor Test"
 msgstr ""
 
-#: addressbook/printing/test-contact-print-style-editor.c:54
-#: addressbook/printing/test-print.c:53
+#: ../addressbook/printing/test-contact-print-style-editor.c:54
+#: ../addressbook/printing/test-print.c:53
 #, fuzzy
 msgid "Copyright (C) 2000, Ximian, Inc."
 msgstr "C"
 
-#: addressbook/printing/test-contact-print-style-editor.c:56
+#: ../addressbook/printing/test-contact-print-style-editor.c:56
 #, fuzzy
 msgid "This should test the contact print style editor widget"
 msgstr "Igerageza Umuntu Gucapa IMISUSIRE Muhinduzi"
 
-#: addressbook/printing/test-print.c:52
+#: ../addressbook/printing/test-print.c:52
 msgid "Contact Print Test"
 msgstr ""
 
-#: addressbook/printing/test-print.c:55
+#: ../addressbook/printing/test-print.c:55
 #, fuzzy
 msgid "This should test the contact print code"
 msgstr "Igerageza Umuntu Gucapa ITEGEKONGENGA"
 
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:657
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:693
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:49
 #, fuzzy
 msgid "Can not open file"
 msgstr "OYA Gufungura IDOSIYE"
 
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:43
 #, fuzzy
 msgid "Couldn't get list of addressbooks"
 msgstr "Kubona Urutonde Bya"
 
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:71
 #, fuzzy
 msgid "failed to open book"
 msgstr "Byanze Kuri Gufungura Igitabo"
 
-#: addressbook/tools/evolution-addressbook-export.c:56
+#: ../addressbook/tools/evolution-addressbook-export.c:56
 #, fuzzy
 msgid "Specify the output file instead of standard output"
 msgstr "Ibisohoka IDOSIYE Bya Bisanzwe Ibisohoka"
 
-#: addressbook/tools/evolution-addressbook-export.c:57
+#: ../addressbook/tools/evolution-addressbook-export.c:57
 msgid "OUTPUTFILE"
 msgstr ""
 
-#: addressbook/tools/evolution-addressbook-export.c:58
+#: ../addressbook/tools/evolution-addressbook-export.c:58
 msgid "List local addressbook folders"
 msgstr ""
 
-#: addressbook/tools/evolution-addressbook-export.c:60
+#: ../addressbook/tools/evolution-addressbook-export.c:60
 #, fuzzy
 msgid "Show cards as vcard or csv file"
 msgstr "Nka Cyangwa IDOSIYE"
 
-#: addressbook/tools/evolution-addressbook-export.c:60
+#: ../addressbook/tools/evolution-addressbook-export.c:60
 #, fuzzy
 msgid "[vcard|csv]"
 msgstr "[csv"
 
-#: addressbook/tools/evolution-addressbook-export.c:61
+#: ../addressbook/tools/evolution-addressbook-export.c:61
 #, fuzzy
 msgid "Export in asynchronous mode"
 msgstr "in Ubwoko"
 
-#: addressbook/tools/evolution-addressbook-export.c:63
+#: ../addressbook/tools/evolution-addressbook-export.c:63
 #, fuzzy
 msgid ""
 "The number of cards in one output file in asychronous mode, default size 100."
 msgstr "Umubare Bya in Ibisohoka IDOSIYE in Ubwoko Mburabuzi Ingano 100"
 
-#: addressbook/tools/evolution-addressbook-export.c:63
+#: ../addressbook/tools/evolution-addressbook-export.c:63
 #, fuzzy
 msgid "NUMBER"
 msgstr "Umubare"
 
-#: addressbook/tools/evolution-addressbook-export.c:91
+#: ../addressbook/tools/evolution-addressbook-export.c:91
 #, fuzzy
 msgid ""
 "Command line arguments error, please use --help option to see the usage."
 msgstr "Umurongo ingingo Ikosa Gukoresha Ifashayobora Ihitamo Kuri Ikoresha:"
 
-#: addressbook/tools/evolution-addressbook-export.c:105
+#: ../addressbook/tools/evolution-addressbook-export.c:105
 #, fuzzy
 msgid "Only support csv or vcard format."
 msgstr "Gushigikira Cyangwa Imiterere"
 
-#: addressbook/tools/evolution-addressbook-export.c:114
+#: ../addressbook/tools/evolution-addressbook-export.c:114
 #, fuzzy
 msgid "In async mode, output must be file."
 msgstr "Ubwoko Ibisohoka IDOSIYE"
 
-#: addressbook/tools/evolution-addressbook-export.c:122
+#: ../addressbook/tools/evolution-addressbook-export.c:122
 #, fuzzy
 msgid "In normal mode, there is no need for the size option."
 msgstr "Bisanzwe Ubwoko ni Oya kugirango Ingano Ihitamo"
 
-#: addressbook/tools/evolution-addressbook-export.c:153
+#: ../addressbook/tools/evolution-addressbook-export.c:153
 #, fuzzy
 msgid "Unhandled error"
 msgstr "Ikosa"
 
-#: addressbook/tools/evolution-addressbook-import.c:46
+#: ../addressbook/tools/evolution-addressbook-import.c:46
 #, fuzzy
 msgid "Error loading default addressbook."
 msgstr "Itangira... Mburabuzi"
 
-#: addressbook/tools/evolution-addressbook-import.c:67
+#: ../addressbook/tools/evolution-addressbook-import.c:67
 #, fuzzy
 msgid "Input File"
 msgstr "Idosiye"
 
-#: addressbook/tools/evolution-addressbook-import.c:82
+#: ../addressbook/tools/evolution-addressbook-import.c:82
 #, fuzzy
 msgid "No filename provided."
 msgstr "Izina ry'idosiye:"
 
-#. calendar:prompt-cancel-meeting primary
-#. calendar:prompt-cancel-task primary
-#: calendar/calendar-errors.xml.h:2 calendar/calendar-errors.xml.h:12
-#, fuzzy
-msgid "Would you like to send all the participants a cancellation notice?"
-msgstr "nka Kuri Kohereza Byose Abitabiriye a"
-
-#. calendar:prompt-cancel-meeting secondary
-#: calendar/calendar-errors.xml.h:4
-#, fuzzy
+#: ../calendar/calendar.error.xml.h:1
 msgid ""
-"If you don't send a cancellation notice, the other participants may not know "
-"the meeting is canceled."
-msgstr "Kohereza a Ikindi Abitabiriye Gicurasi OYA ni"
-
-#: calendar/calendar-errors.xml.h:5 calendar/calendar-errors.xml.h:15
-#: calendar/calendar-errors.xml.h:25 calendar/calendar-errors.xml.h:87
-#: calendar/calendar-errors.xml.h:93 calendar/calendar-errors.xml.h:99
-#: calendar/calendar-errors.xml.h:105
-msgid "Don't Send"
+" There are few attachments getting downloaded. Saving the appointment will "
+"cause the appointment to be saved without those pending attachments "
 msgstr ""
 
-#: calendar/calendar-errors.xml.h:6 calendar/calendar-errors.xml.h:16
-#: calendar/calendar-errors.xml.h:26
-msgid "Send Notice"
+#: ../calendar/calendar.error.xml.h:2
+msgid ""
+" There are few attachments getting downloaded. Saving the task will cause "
+"the task to be saved without those pending attachments "
 msgstr ""
 
-#. calendar:prompt-delete-meeting primary
-#: calendar/calendar-errors.xml.h:8
+#: ../calendar/calendar.error.xml.h:3
 #, fuzzy
-msgid "Are you sure you want to delete this meeting?"
-msgstr "Kuri Gusiba iyi"
+msgid ""
+"Adding a meaningful Summary to your appointment will give your recipients an "
+"idea of what your appointment is about."
+msgstr "a Kuri Abandikiwe... Bya ni Ibyerekeye"
 
-#. calendar:prompt-delete-meeting secondary
-#: calendar/calendar-errors.xml.h:10
+#: ../calendar/calendar.error.xml.h:4
 #, fuzzy
 msgid ""
-"All information on this meeting will be deleted and can not be restored."
-msgstr "Ibisobanuro ku iyi Cyasibwe Na OYA"
+"Adding a meaningful Summary to your task will give your recipients an idea "
+"of what your task is about."
+msgstr "a Kuri Igikorwa Abandikiwe... Bya Igikorwa ni Ibyerekeye"
 
-#. calendar:prompt-cancel-task secondary
-#: calendar/calendar-errors.xml.h:14
+#: ../calendar/calendar.error.xml.h:5
 #, fuzzy
 msgid ""
-"If you don't send a cancellation notice, the other participants may not know "
-"the task has been deleted."
-msgstr "Kohereza a Ikindi Abitabiriye Gicurasi OYA Igikorwa Cyasibwe"
+"All information in these journal entries will be deleted and can not be "
+"restored."
+msgstr "Ibisobanuro in Ikinyamakuru Ibyinjijwe Cyasibwe Na OYA"
 
-#. calendar:prompt-delete-task primary
-#: calendar/calendar-errors.xml.h:18 calendar/calendar-errors.xml.h:44
+#: ../calendar/calendar.error.xml.h:6
 #, fuzzy
-msgid "Are you sure you want to delete this task?"
-msgstr "Kuri Gusiba iyi Igikorwa"
+msgid ""
+"All information in this journal will be deleted and can not be restored."
+msgstr "Ibisobanuro in iyi Ikinyamakuru Cyasibwe Na OYA"
 
-#. calendar:prompt-delete-task secondary
-#. calendar:prompt-delete-named-task secondary
-#. calendar:prompt-delete-task secondary
-#: calendar/calendar-errors.xml.h:20 calendar/calendar-errors.xml.h:42
-#: calendar/calendar-errors.xml.h:46
+#: ../calendar/calendar.error.xml.h:7
 #, fuzzy
-msgid "All information on this task will be deleted and can not be restored."
-msgstr "Ibisobanuro ku iyi Igikorwa Cyasibwe Na OYA"
+msgid ""
+"All information on these appointments will be deleted and can not be "
+"restored."
+msgstr "Ibisobanuro ku Cyasibwe Na OYA"
 
-#. calendar:prompt-cancel-journal primary
-#: calendar/calendar-errors.xml.h:22
+#: ../calendar/calendar.error.xml.h:8
 #, fuzzy
-msgid "Would you like to send a cancellation notice for this journal entry?"
-msgstr "nka Kuri Kohereza a kugirango iyi Ikinyamakuru Icyinjijwe"
+msgid "All information on these tasks will be deleted and can not be restored."
+msgstr "Ibisobanuro ku Ibikorwa Cyasibwe Na OYA"
 
-#. calendar:prompt-cancel-journal secondary
-#: calendar/calendar-errors.xml.h:24
+#: ../calendar/calendar.error.xml.h:9
 #, fuzzy
 msgid ""
-"If you don't send a cancellation notice, the other participants may not know "
-"the journal has been deleted."
-msgstr "Kohereza a Ikindi Abitabiriye Gicurasi OYA Ikinyamakuru Cyasibwe"
-
-#. calendar:prompt-delete-journal primary
-#: calendar/calendar-errors.xml.h:28 calendar/calendar-errors.xml.h:52
-#, fuzzy
-msgid "Are you sure you want to delete this journal entry?"
-msgstr "Kuri Gusiba iyi Ikinyamakuru Icyinjijwe"
+"All information on this appointment will be deleted and can not be restored."
+msgstr "Ibisobanuro ku iyi Cyasibwe Na OYA"
 
-#. calendar:prompt-delete-journal secondary
-#: calendar/calendar-errors.xml.h:30
+#: ../calendar/calendar.error.xml.h:10
 #, fuzzy
 msgid ""
 "All information on this journal entry will be deleted and can not be "
 "restored."
 msgstr "Ibisobanuro ku iyi Ikinyamakuru Icyinjijwe Cyasibwe Na OYA"
 
-#. calendar:prompt-delete-titled-appointment primary
-#: calendar/calendar-errors.xml.h:32
-#, fuzzy
-msgid "Are you sure you want to delete the appointment titled '{0}'?"
-msgstr "Kuri Gusiba 0"
-
-#. calendar:prompt-delete-titled-appointment secondary
-#. calendar:prompt-delete-appointment secondary
-#: calendar/calendar-errors.xml.h:34 calendar/calendar-errors.xml.h:38
+#: ../calendar/calendar.error.xml.h:11
 #, fuzzy
 msgid ""
-"All information on this appointment will be deleted and can not be restored."
+"All information on this meeting will be deleted and can not be restored."
 msgstr "Ibisobanuro ku iyi Cyasibwe Na OYA"
 
-#. calendar:prompt-delete-appointment primary
-#: calendar/calendar-errors.xml.h:36
+#: ../calendar/calendar.error.xml.h:12
 #, fuzzy
-msgid "Are you sure you want to delete this appointment?"
-msgstr "Kuri Gusiba iyi"
+msgid "All information on this task will be deleted and can not be restored."
+msgstr "Ibisobanuro ku iyi Igikorwa Cyasibwe Na OYA"
 
-#. calendar:prompt-delete-named-task primary
-#: calendar/calendar-errors.xml.h:40
+#: ../calendar/calendar.error.xml.h:13
 #, fuzzy
 msgid "Are you sure you want to delete the '{0}' task?"
 msgstr "Kuri Gusiba 0 Igikorwa"
 
-#. calendar:prompt-delete-named-journal primary
-#: calendar/calendar-errors.xml.h:48
+#: ../calendar/calendar.error.xml.h:14
 #, fuzzy
-msgid "Are you sure you want to delete the journal entry '{0}'?"
-msgstr "Kuri Gusiba Ikinyamakuru Icyinjijwe 0"
+msgid "Are you sure you want to delete the appointment titled '{0}'?"
+msgstr "Kuri Gusiba 0"
 
-#. calendar:prompt-delete-named-journal secondary
-#. calendar:prompt-delete-journal secondary
-#: calendar/calendar-errors.xml.h:50 calendar/calendar-errors.xml.h:54
+#: ../calendar/calendar.error.xml.h:15
 #, fuzzy
-msgid ""
-"All information in this journal will be deleted and can not be restored."
-msgstr "Ibisobanuro in iyi Ikinyamakuru Cyasibwe Na OYA"
+msgid "Are you sure you want to delete the journal entry '{0}'?"
+msgstr "Kuri Gusiba Ikinyamakuru Icyinjijwe 0"
 
-#. calendar:prompt-delete-appointments primary
-#: calendar/calendar-errors.xml.h:56
+#: ../calendar/calendar.error.xml.h:16
 #, fuzzy
 msgid "Are you sure you want to delete these {0} appointments?"
 msgstr "Kuri Gusiba 0"
 
-#. calendar:prompt-delete-appointments secondary
-#: calendar/calendar-errors.xml.h:58
+#: ../calendar/calendar.error.xml.h:17
 #, fuzzy
-msgid ""
-"All information on these appointments will be deleted and can not be "
-"restored."
-msgstr "Ibisobanuro ku Cyasibwe Na OYA"
+msgid "Are you sure you want to delete these {0} journal entries?"
+msgstr "Kuri Gusiba 0 Ikinyamakuru Ibyinjijwe"
 
-#. calendar:prompt-delete-tasks primary
-#: calendar/calendar-errors.xml.h:60
+#: ../calendar/calendar.error.xml.h:18
 #, fuzzy
 msgid "Are you sure you want to delete these {0} tasks?"
 msgstr "Kuri Gusiba 0 Ibikorwa"
 
-#. calendar:prompt-delete-tasks secondary
-#: calendar/calendar-errors.xml.h:62
+#: ../calendar/calendar.error.xml.h:19
 #, fuzzy
-msgid "All information on these tasks will be deleted and can not be restored."
-msgstr "Ibisobanuro ku Ibikorwa Cyasibwe Na OYA"
+msgid "Are you sure you want to delete this appointment?"
+msgstr "Kuri Gusiba iyi"
 
-#. calendar:prompt-delete-journals primary
-#: calendar/calendar-errors.xml.h:64
+#: ../calendar/calendar.error.xml.h:20
 #, fuzzy
-msgid "Are you sure you want to delete these {0} journal entries?"
-msgstr "Kuri Gusiba 0 Ikinyamakuru Ibyinjijwe"
+msgid "Are you sure you want to delete this journal entry?"
+msgstr "Kuri Gusiba iyi Ikinyamakuru Icyinjijwe"
 
-#. calendar:prompt-delete-journals secondary
-#: calendar/calendar-errors.xml.h:66
+#: ../calendar/calendar.error.xml.h:21
 #, fuzzy
-msgid ""
-"All information in these journal entries will be deleted and can not be "
-"restored."
-msgstr "Ibisobanuro in Ikinyamakuru Ibyinjijwe Cyasibwe Na OYA"
+msgid "Are you sure you want to delete this meeting?"
+msgstr "Kuri Gusiba iyi"
 
-#. calendar:prompt-save-appointment title
-#: calendar/calendar-errors.xml.h:68
+#: ../calendar/calendar.error.xml.h:22
 #, fuzzy
-msgid "Save Appointment"
-msgstr "Kubika"
+msgid "Are you sure you want to delete this task?"
+msgstr "Kuri Gusiba iyi Igikorwa"
 
-#. calendar:prompt-save-appointment primary
-#: calendar/calendar-errors.xml.h:70
+#: ../calendar/calendar.error.xml.h:23
 #, fuzzy
-msgid "Would you like to save your changes to this appointment?"
-msgstr "nka Kuri Kubika Amahinduka Kuri iyi"
+msgid "Are you sure you want to send the appointment without a summary?"
+msgstr "Kuri Kohereza a Inshamake"
 
-#. calendar:prompt-save-appointment secondary
-#: calendar/calendar-errors.xml.h:72
+#: ../calendar/calendar.error.xml.h:24
 #, fuzzy
-msgid "You have made changes to this appointment, but not yet saved them."
-msgstr "Amahinduka Kuri iyi OYA"
+msgid "Are you sure you want to send the task without a summary?"
+msgstr "Kuri Kohereza Igikorwa a Inshamake"
+
+#: ../calendar/calendar.error.xml.h:25
+#, fuzzy
+msgid "Delete calendar '{0}'?"
+msgstr "Kalindari 0"
+
+#: ../calendar/calendar.error.xml.h:26
+#, fuzzy
+msgid "Delete task list '{0}'?"
+msgstr "Igikorwa Urutonde 0"
 
 # framework/source\services\documentlist.src:RID_DOCUMENTS_POPUP.ID_DISCARD.text
-#: calendar/calendar-errors.xml.h:73 calendar/calendar-errors.xml.h:81
+#: ../calendar/calendar.error.xml.h:27
 msgid "Discard Changes"
 msgstr "Kureka impinduka"
 
-#: calendar/calendar-errors.xml.h:74 calendar/calendar-errors.xml.h:82
-#, fuzzy
-msgid "Save Changes"
-msgstr "Kubika"
-
-#. calendar:prompt-save-task title
-#: calendar/calendar-errors.xml.h:76
-#, fuzzy
-msgid "Save Task"
-msgstr "Kubika"
+#: ../calendar/calendar.error.xml.h:28
+msgid "Don't Send"
+msgstr ""
 
-#. calendar:prompt-save-task primary
-#: calendar/calendar-errors.xml.h:78
+#: ../calendar/calendar.error.xml.h:29
 #, fuzzy
-msgid "Would you like to save your changes to this task?"
-msgstr "nka Kuri Kubika Amahinduka Kuri iyi Igikorwa"
+msgid "Download in progress. Do you want to save the appointment?"
+msgstr "Kuri Gusiba iyi"
 
-#. calendar:prompt-save-task secondary
-#: calendar/calendar-errors.xml.h:80
-#, fuzzy
-msgid "You have made changes to this task, but not yet saved them."
-msgstr "Amahinduka Kuri iyi Igikorwa OYA"
+#: ../calendar/calendar.error.xml.h:30
+msgid "Download in progress. Do you want to save the task?"
+msgstr ""
 
-#. calendar:prompt-meeting-invite primary
-#: calendar/calendar-errors.xml.h:84
+#: ../calendar/calendar.error.xml.h:31
 #, fuzzy
-msgid "Would you like to send meeting invitations to participants?"
-msgstr "nka Kuri Kohereza Kuri Abitabiriye"
+msgid "Editor could not be loaded."
+msgstr "OYA"
 
-#. calendar:prompt-meeting-invite secondary
-#: calendar/calendar-errors.xml.h:86
+#: ../calendar/calendar.error.xml.h:32
 #, fuzzy
 msgid ""
 "Email invitations will be sent to all participants and allow them to RSVP."
 msgstr "Yoherejwe: Kuri Byose Abitabiriye Na Kwemerera Kuri"
 
-# sfx2/source\dialog\mailwindow.src:RID_MAIL_WINDOW.PB_MAILWIN_SEND.text
-#: calendar/calendar-errors.xml.h:88 calendar/calendar-errors.xml.h:94
-#: calendar/calendar-errors.xml.h:100 calendar/calendar-errors.xml.h:106
-#: ui/evolution-message-composer.xml.h:24
-msgid "Send"
-msgstr "Kohereza"
+#: ../calendar/calendar.error.xml.h:33
+#, fuzzy
+msgid ""
+"Email invitations will be sent to all participants and allow them to accept "
+"this task."
+msgstr ""
+"Yoherejwe: Kuri Byose Abitabiriye Na Kwemerera Kuri Kwemera iyi Igikorwa"
 
-#. calendar:prompt-send-updated-meeting-info primary
-#: calendar/calendar-errors.xml.h:90
+#: ../calendar/calendar.error.xml.h:34
 #, fuzzy
-msgid "Would you like to send updated meeting information to participants?"
-msgstr "nka Kuri Kohereza Ibisobanuro Kuri Abitabiriye"
+msgid "Error loading calendar"
+msgstr "Itangira... Kalindari"
+
+#: ../calendar/calendar.error.xml.h:35
+#, fuzzy
+msgid "Error loading task list"
+msgstr "Itangira... Igikorwa Urutonde"
 
-#. calendar:prompt-send-updated-meeting-info secondary
-#: calendar/calendar-errors.xml.h:92
+#: ../calendar/calendar.error.xml.h:36
 #, fuzzy
 msgid ""
-"Sending updated information allows other participants to keep their "
-"calendars up to date."
-msgstr "Ibisobanuro Ikindi Abitabiriye Kuri Hejuru Kuri Itariki"
+"If you don't send a cancellation notice, the other participants may not know "
+"the journal has been deleted."
+msgstr "Kohereza a Ikindi Abitabiriye Gicurasi OYA Ikinyamakuru Cyasibwe"
 
-#. calendar:prompt-send-task primary
-#: calendar/calendar-errors.xml.h:96
+#: ../calendar/calendar.error.xml.h:37
 #, fuzzy
-msgid "Would you like to send this task to participants?"
-msgstr "nka Kuri Kohereza iyi Igikorwa Kuri Abitabiriye"
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the meeting is canceled."
+msgstr "Kohereza a Ikindi Abitabiriye Gicurasi OYA ni"
 
-#. calendar:prompt-send-task secondary
-#: calendar/calendar-errors.xml.h:98
+#: ../calendar/calendar.error.xml.h:38
 #, fuzzy
 msgid ""
-"Email invitations will be sent to all participants and allow them to accept "
-"this task."
+"If you don't send a cancellation notice, the other participants may not know "
+"the task has been deleted."
+msgstr "Kohereza a Ikindi Abitabiriye Gicurasi OYA Igikorwa Cyasibwe"
+
+#: ../calendar/calendar.error.xml.h:39
+#, fuzzy
+msgid "Save Changes"
+msgstr "Kubika"
+
+# sfx2/source\dialog\mailwindow.src:RID_MAIL_WINDOW.PB_MAILWIN_SEND.text
+#: ../calendar/calendar.error.xml.h:40
+#: ../ui/evolution-message-composer.xml.h:26
+msgid "Send"
+msgstr "Kohereza"
+
+#: ../calendar/calendar.error.xml.h:41
+msgid "Send Notice"
 msgstr ""
-"Yoherejwe: Kuri Byose Abitabiriye Na Kwemerera Kuri Kwemera iyi Igikorwa"
 
-#. calendar:prompt-send-updated-task-info primary
-#: calendar/calendar-errors.xml.h:102
+#: ../calendar/calendar.error.xml.h:42
 #, fuzzy
-msgid "Would you like to send updated task information to participants?"
-msgstr "nka Kuri Kohereza Igikorwa Ibisobanuro Kuri Abitabiriye"
+msgid ""
+"Sending updated information allows other participants to keep their "
+"calendars up to date."
+msgstr "Ibisobanuro Ikindi Abitabiriye Kuri Hejuru Kuri Itariki"
 
-#. calendar:prompt-send-updated-task-info secondary
-#: calendar/calendar-errors.xml.h:104
+#: ../calendar/calendar.error.xml.h:43
 #, fuzzy
 msgid ""
 "Sending updated information allows other participants to keep their task "
@@ -4642,270 +4756,262 @@ msgid ""
 msgstr ""
 "Ibisobanuro Ikindi Abitabiriye Kuri Igikorwa Intonde Hejuru Kuri Itariki"
 
-#. calendar:tasks-crashed primary
-#: calendar/calendar-errors.xml.h:108
+#: ../calendar/calendar.error.xml.h:45
+#, fuzzy
+msgid "The Evolution calendar has quit unexpectedly."
+msgstr "Kalindari Kuvamo"
+
+#: ../calendar/calendar.error.xml.h:46
 #, fuzzy
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "Ibikorwa Kuvamo"
 
-#. calendar:tasks-crashed secondary
-#: calendar/calendar-errors.xml.h:110
+#: ../calendar/calendar.error.xml.h:47
 #, fuzzy
-msgid "Your tasks will not be available until Evolution is restarted."
-msgstr "Ibikorwa OYA Bihari ni"
+msgid "The calendar is not marked for offline usage"
+msgstr ""
+"Kalindari ni OYA cy/ byagarajwe kugirango Ntibicometse kuri interineti "
+"Ikoresha:"
 
-#. calendar:calendar-crashed primary
-#: calendar/calendar-errors.xml.h:112
+#: ../calendar/calendar.error.xml.h:48
 #, fuzzy
-msgid "The Evolution calendar has quit unexpectedly."
-msgstr "Kalindari Kuvamo"
+msgid "The task list is not marked for offline usage"
+msgstr ""
+"Igikorwa Urutonde ni OYA cy/ byagarajwe kugirango Ntibicometse kuri "
+"interineti Ikoresha:"
 
-#. calendar:calendar-crashed secondary
-#: calendar/calendar-errors.xml.h:114
+#: ../calendar/calendar.error.xml.h:49
 #, fuzzy
-msgid "Your calendars will not be available until Evolution is restarted."
-msgstr "OYA Bihari ni"
+msgid "This calendar will be removed permanently."
+msgstr "Kalindari Cyavanyweho"
 
-#. calendar:prompt-delete-calendar primary
-#: calendar/calendar-errors.xml.h:116
+#: ../calendar/calendar.error.xml.h:50
 #, fuzzy
-msgid "Delete calendar '{0}'?"
-msgstr "Kalindari 0"
+msgid "This task list will be removed permanently."
+msgstr "Igikorwa Urutonde Cyavanyweho"
 
-#. calendar:prompt-delete-calendar secondary
-#: calendar/calendar-errors.xml.h:118
+#: ../calendar/calendar.error.xml.h:51
 #, fuzzy
-msgid "This calendar will be removed permanently."
-msgstr "Kalindari Cyavanyweho"
+msgid "Would you like to save your changes to this appointment?"
+msgstr "nka Kuri Kubika Amahinduka Kuri iyi"
 
-#. calendar:prompt-delete-task-list primary
-#: calendar/calendar-errors.xml.h:120
+#: ../calendar/calendar.error.xml.h:52
 #, fuzzy
-msgid "Delete task list '{0}'?"
-msgstr "Igikorwa Urutonde 0"
+msgid "Would you like to save your changes to this task?"
+msgstr "nka Kuri Kubika Amahinduka Kuri iyi Igikorwa"
 
-#. calendar:prompt-delete-task-list secondary
-#: calendar/calendar-errors.xml.h:122
+#: ../calendar/calendar.error.xml.h:53
 #, fuzzy
-msgid "This task list will be removed permanently."
-msgstr "Igikorwa Urutonde Cyavanyweho"
+msgid "Would you like to send a cancellation notice for this journal entry?"
+msgstr "nka Kuri Kohereza a kugirango iyi Ikinyamakuru Icyinjijwe"
 
-#. calendar:prompt-send-no-subject-calendar primary
-#: calendar/calendar-errors.xml.h:124
+#: ../calendar/calendar.error.xml.h:54
 #, fuzzy
-msgid "Are you sure you want to send the appointment without a summary?"
-msgstr "Kuri Kohereza a Inshamake"
+msgid "Would you like to send all the participants a cancellation notice?"
+msgstr "nka Kuri Kohereza Byose Abitabiriye a"
 
-#. calendar:prompt-send-no-subject-calendar secondary
-#: calendar/calendar-errors.xml.h:126
+#: ../calendar/calendar.error.xml.h:55
 #, fuzzy
-msgid ""
-"Adding a meaningful Summary to your appointment will give your recipients an "
-"idea of what your appointment is about."
-msgstr "a Kuri Abandikiwe... Bya ni Ibyerekeye"
+msgid "Would you like to send meeting invitations to participants?"
+msgstr "nka Kuri Kohereza Kuri Abitabiriye"
 
-# crashrep/source\all\crashrep.lng:%SEND_BUTTON%.text
-#: calendar/calendar-errors.xml.h:127 calendar/calendar-errors.xml.h:132
-#: mail/mail-errors.xml.h:15 mail/mail-errors.xml.h:20
-#: mail/mail-errors.xml.h:27 mail/mail-errors.xml.h:32
+#: ../calendar/calendar.error.xml.h:56
 #, fuzzy
-msgid "_Send"
-msgstr "Kohereza"
+msgid "Would you like to send this task to participants?"
+msgstr "nka Kuri Kohereza iyi Igikorwa Kuri Abitabiriye"
 
-#. calendar:prompt-send-no-subject-task primary
-#: calendar/calendar-errors.xml.h:129
+#: ../calendar/calendar.error.xml.h:57
 #, fuzzy
-msgid "Are you sure you want to send the task without a summary?"
-msgstr "Kuri Kohereza Igikorwa a Inshamake"
+msgid "Would you like to send updated meeting information to participants?"
+msgstr "nka Kuri Kohereza Ibisobanuro Kuri Abitabiriye"
 
-#. calendar:prompt-send-no-subject-task secondary
-#: calendar/calendar-errors.xml.h:131
+#: ../calendar/calendar.error.xml.h:58
 #, fuzzy
-msgid ""
-"Adding a meaningful Summary to your task will give your recipients an idea "
-"of what your task is about."
-msgstr "a Kuri Igikorwa Abandikiwe... Bya Igikorwa ni Ibyerekeye"
+msgid "Would you like to send updated task information to participants?"
+msgstr "nka Kuri Kohereza Igikorwa Ibisobanuro Kuri Abitabiriye"
 
-#. calendar:prompt-no-contents-offline-calendar primary
-#: calendar/calendar-errors.xml.h:134
+#: ../calendar/calendar.error.xml.h:60
 #, fuzzy
-msgid "Error loading calendar"
-msgstr "Itangira... Kalindari"
+msgid "You have made changes to this appointment, but not yet saved them."
+msgstr "Amahinduka Kuri iyi OYA"
 
-#. calendar:prompt-no-contents-offline-calendar secondary
-#: calendar/calendar-errors.xml.h:136
+#: ../calendar/calendar.error.xml.h:61
 #, fuzzy
-msgid "The calendar is not marked for offline usage"
-msgstr ""
-"Kalindari ni OYA cy/ byagarajwe kugirango Ntibicometse kuri interineti "
-"Ikoresha:"
+msgid "You have made changes to this task, but not yet saved them."
+msgstr "Amahinduka Kuri iyi Igikorwa OYA"
 
-#. calendar:prompt-no-contents-offline-tasks primary
-#: calendar/calendar-errors.xml.h:138
+#: ../calendar/calendar.error.xml.h:62
 #, fuzzy
-msgid "Error loading task list"
-msgstr "Itangira... Igikorwa Urutonde"
+msgid "Your calendars will not be available until Evolution is restarted."
+msgstr "OYA Bihari ni"
 
-#. calendar:prompt-no-contents-offline-tasks secondary
-#: calendar/calendar-errors.xml.h:140
+#: ../calendar/calendar.error.xml.h:63
 #, fuzzy
-msgid "The task list is not marked for offline usage"
-msgstr ""
-"Igikorwa Urutonde ni OYA cy/ byagarajwe kugirango Ntibicometse kuri "
-"interineti Ikoresha:"
+msgid "Your tasks will not be available until Evolution is restarted."
+msgstr "Ibikorwa OYA Bihari ni"
 
-#. calendar:server-version secondary
-#: calendar/calendar-errors.xml.h:146
+# basctl/source\basicide\basidesh.src:RID_STR_SAVE.text
+#: ../calendar/calendar.error.xml.h:64
+#: ../ui/evolution-message-composer.xml.h:49
+#: ../ui/evolution-signature-editor.xml.h:15
 #, fuzzy
-msgid "Some features may not work correctly with your current server version "
-msgstr "Ibiranga Gicurasi OYA Akazi Na: KIGEZWEHO Seriveri Verisiyo"
+msgid "_Save"
+msgstr "Kubika"
+
+# crashrep/source\all\crashrep.lng:%SEND_BUTTON%.text
+#: ../calendar/calendar.error.xml.h:65
+#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:118
+#, fuzzy
+msgid "_Send"
+msgstr "Kohereza"
+
+#: ../calendar/calendar.error.xml.h:66
+#, fuzzy
+msgid "{0}."
+msgstr "{0"
 
 # uui/source\passworddlg.src:DLG_UUI_PASSWORD.FT_PASSWORD.text
-#: calendar/common/authentication.c:49 calendar/gui/e-pub-utils.c:301
-#: smime/gui/component.c:48
+#: ../calendar/common/authentication.c:49 ../calendar/gui/e-pub-utils.c:301
+#: ../smime/gui/component.c:48
 msgid "Enter password"
 msgstr "kwinjiza ijambobanga"
 
-#: calendar/conduits/calendar/calendar-conduit.c:246
+#: ../calendar/conduits/calendar/calendar-conduit.c:246
 msgid "Split Multi-Day Events:"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:1359
-#: calendar/conduits/calendar/calendar-conduit.c:1360
-#: calendar/conduits/todo/todo-conduit.c:879
-#: calendar/conduits/todo/todo-conduit.c:880
+#: ../calendar/conduits/calendar/calendar-conduit.c:1359
+#: ../calendar/conduits/calendar/calendar-conduit.c:1360
+#: ../calendar/conduits/todo/todo-conduit.c:879
+#: ../calendar/conduits/todo/todo-conduit.c:880
 #, fuzzy
 msgid "Could not start evolution-data-server"
 msgstr "OYA Gutangira Impinduka Ibyatanzwe Seriveri"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1468
-#: calendar/conduits/calendar/calendar-conduit.c:1471
+#: ../calendar/conduits/calendar/calendar-conduit.c:1468
+#: ../calendar/conduits/calendar/calendar-conduit.c:1471
 #, fuzzy
 msgid "Could not read pilot's Calendar application block"
 msgstr "OYA Gusoma Porogaramu Funga"
 
-#: calendar/conduits/todo/todo-conduit.c:234
+#: ../calendar/conduits/todo/todo-conduit.c:234
 msgid "Default Priority:"
 msgstr ""
 
-#: calendar/conduits/todo/todo-conduit.c:959
-#: calendar/conduits/todo/todo-conduit.c:962
+#: ../calendar/conduits/todo/todo-conduit.c:959
+#: ../calendar/conduits/todo/todo-conduit.c:962
 #, fuzzy
 msgid "Could not read pilot's ToDo application block"
 msgstr "OYA Gusoma Porogaramu Funga"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
 #, fuzzy
 msgid "Calendar and Tasks"
 msgstr "Na"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: calendar/gui/calendar-component.c:1290
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+#: ../calendar/gui/calendar-component.c:1292
 msgid "Calendars"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
 #, fuzzy
 msgid "Configure your timezone, Calendar and Task List here "
 msgstr "Na"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
 #, fuzzy
 msgid "Evolution Calendar and Tasks"
 msgstr "Na"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
 #, fuzzy
 msgid "Evolution Calendar configuration control"
 msgstr "Iboneza Igenzura"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
 #, fuzzy
 msgid "Evolution Calendar scheduling message viewer"
 msgstr "Ubutumwa"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
 #, fuzzy
 msgid "Evolution Calendar/Task editor"
 msgstr "Muhinduzi"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
 msgid "Evolution's Calendar component"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
 msgid "Evolution's Tasks component"
 msgstr ""
 
 # officecfg/registry\schema\org\openoffice\Office\Common.xcs:....View.Window.Flag..10.text
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-#: calendar/gui/e-tasks.c:1219 calendar/gui/print.c:1822
-#: calendar/gui/tasks-component.c:519 calendar/gui/tasks-component.c:992
-#: calendar/gui/tasks-control.c:408 calendar/importers/icalendar-importer.c:83
-#: calendar/importers/icalendar-importer.c:701
-#: plugins/groupwise-account-setup/camel-gw-listener.c:383
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+#: ../calendar/gui/e-tasks.c:1222 ../calendar/gui/print.c:1822
+#: ../calendar/gui/tasks-component.c:519 ../calendar/gui/tasks-component.c:994
+#: ../calendar/gui/tasks-control.c:408
+#: ../calendar/importers/icalendar-importer.c:83
+#: ../calendar/importers/icalendar-importer.c:701
+#: ../plugins/groupwise-features/camel-gw-listener.c:383
 msgid "Tasks"
 msgstr "Ibikorwa"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
 msgid "_Calendars"
 msgstr ""
 
 # officecfg/registry\schema\org\openoffice\Office\Common.xcs:....View.Window.Flag..10.text
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: views/tasks/galview.xml.h:3
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: ../views/tasks/galview.xml.h:3
 #, fuzzy
 msgid "_Tasks"
 msgstr "Ibikorwa"
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+#: ../calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
 #, fuzzy
 msgid "Evolution Calendar alarm notification service"
 msgstr "Ikimenyetso Serivisi"
 
 # sc/source\ui\src\scfuncs.src:RID_SC_FUNCTION_DESCRIPTIONS1.SC_OPCODE_GET_TIME.4.text
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:79
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:115
 #, fuzzy
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "iminota"
 msgstr[1] "iminota"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:1
-#: calendar/gui/dialogs/event-editor.c:140 calendar/gui/print.c:2298
-msgid "Appointment"
-msgstr ""
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:215
+#, fuzzy
+msgid "Start time"
+msgstr "Gutangira Igihe"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
-msgid "Appointment Title"
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:312
+#, c-format
+msgid ""
+"<big><b>%s</b></big>\n"
+"%s until %s"
 msgstr ""
 
-#. End time
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
-#: plugins/itip-formatter/itip-view.c:876
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:1
 #, fuzzy
-msgid "End time:"
-msgstr "Impera Igihe"
+msgid "Appointments"
+msgstr "Kubika"
 
 # padmin/source\padialog.src:RID_PADIALOG.RID_PA_TXT_LOCATION.text
 #. Location
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
-#: calendar/gui/e-itip-control.c:1118 plugins/itip-formatter/itip-view.c:859
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
+#: ../calendar/gui/e-itip-control.c:1118
+#: ../plugins/itip-formatter/itip-view.c:863
 msgid "Location:"
 msgstr "Intaho:"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:5
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:3
 #, fuzzy
 msgid "Snooze _time:"
 msgstr "Igihe"
 
-#. Start time
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:6
-#: plugins/itip-formatter/itip-view.c:867
-#, fuzzy
-msgid "Start time:"
-msgstr "Gutangira Igihe"
-
 # #-#-#-#-#  basctl.pot (Gnome 2.12)  #-#-#-#-#
 # basctl/source\basicide\basidesh.src:RID_BASICMENU.MN_EDIT.text
 # #-#-#-#-#  basctl.pot (Gnome 2.12)  #-#-#-#-#
@@ -4916,67 +5022,60 @@ msgstr "Gutangira Igihe"
 # basctl/source\basicide\moduldlg.src:RID_TP_MODULS.RID_PB_EDIT.text
 # #-#-#-#-#  basctl.pot (Gnome 2.12)  #-#-#-#-#
 # basctl/source\basicide\moduldlg.src:RID_TP_LIBS.RID_PB_EDIT.text
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:7
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
-#: calendar/gui/dialogs/recurrence-page.glade.h:6 filter/filter.glade.h:11
-#: mail/mail-config.glade.h:156 ui/evolution-addressbook.xml.h:34
-#: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
-#: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution-message-composer.xml.h:43
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-tasks.xml.h:22 ui/evolution.xml.h:38
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:6
+#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:158
+#: ../ui/evolution-addressbook.xml.h:34 ../ui/evolution-calendar.xml.h:41
+#: ../ui/evolution-composer-entries.xml.h:8
+#: ../ui/evolution-mail-messagedisplay.xml.h:5
+#: ../ui/evolution-message-composer.xml.h:42
+#: ../ui/evolution-signature-editor.xml.h:12
+#: ../ui/evolution-subscribe.xml.h:10 ../ui/evolution-tasks.xml.h:22
+#: ../ui/evolution.xml.h:32
 #, fuzzy
 msgid "_Edit"
 msgstr "Guhindura"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:8
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:5
 msgid "_Snooze"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:9
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
 #, fuzzy
 msgid "description of appointment"
 msgstr "Isobanuramiterere Bya"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:10
-#, fuzzy
-msgid "end-time"
-msgstr "Impera Igihe"
-
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:11
-msgid "location"
-msgstr "Inturo"
-
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:13
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:7
 #, fuzzy
-msgid "start-time"
-msgstr "Gutangira Igihe"
+msgid "location of appointment"
+msgstr "Isobanuramiterere Bya"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:879
+#: ../calendar/gui/alarm-notify/alarm-queue.c:954
 msgid "Dismiss"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:880
+#: ../calendar/gui/alarm-notify/alarm-queue.c:955
 msgid "Dismiss All"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:962
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1037
 #, fuzzy
 msgid "No summary available."
 msgstr "Inshamake Bihari"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:971
-#: calendar/gui/alarm-notify/alarm-queue.c:973
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1046
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1048
 #, fuzzy
 msgid "No description available."
 msgstr "Isobanuramiterere Bihari"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:981
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1056
 #, fuzzy
 msgid "No location information available."
 msgstr "Ahantu Ibisobanuro Bihari"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:997
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1072
 #, fuzzy, c-format
 msgid ""
 "Alarm on %s\n"
@@ -4985,12 +5084,12 @@ msgid ""
 "Ending at %s"
 msgstr "ku ku ku"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1100
-#: calendar/gui/alarm-notify/alarm-queue.c:1124
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1175
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1199
 msgid "Warning"
 msgstr "Iburira"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1104
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1179
 #, fuzzy
 msgid ""
 "Evolution does not support calendar reminders with\n"
@@ -5001,7 +5100,7 @@ msgstr ""
 "OYA Gushigikira Kalindari iyi Mwibutsa Kuri Kohereza imeli Bisanzwe Mwibutsa "
 "Ikiganiro Agasanduku"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1130
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1205
 #, fuzzy, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -5014,166 +5113,192 @@ msgstr ""
 "Mwibutsa ni Ibyerekeye Kuri Imbarutso Mwibutsa ni Kuri Gukoresha Porogaramu "
 "Kuri Gukoresha iyi Porogaramu"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1144
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1219
 #, fuzzy
 msgid "Do not ask me about this program again."
 msgstr "OYA Ibyerekeye iyi Porogaramu"
 
-#: calendar/gui/alarm-notify/notify-main.c:139
+#: ../calendar/gui/alarm-notify/notify-main.c:139
 #, fuzzy
 msgid "Could not initialize Bonobo"
 msgstr "OYA gutangiza"
 
-#: calendar/gui/alarm-notify/notify-main.c:150
+#: ../calendar/gui/alarm-notify/notify-main.c:150
 #, fuzzy
 msgid "Could not create the alarm notify service factory"
 msgstr "OYA Kurema Serivisi"
 
-#: calendar/gui/alarm-notify/util.c:41
+#: ../calendar/gui/alarm-notify/util.c:41
 #, fuzzy
 msgid "invalid time"
 msgstr "Sibyo Igihe"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:1
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:1
 #, fuzzy
 msgid "Alarm programs"
 msgstr "Porogaramu"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:2
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:2
 #, fuzzy
 msgid "Ask for confirmation when deleting items"
 msgstr "kugirango Iyemeza Ryari:"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:3
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:3
 #, fuzzy
 msgid "Background color of tasks that are due today, in \"#rrggbb\" format."
 msgstr "Ibara Bya Ibikorwa UYUMUNSI in Imiterere"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:4
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:4
 #, fuzzy
 msgid "Background color of tasks that are overdue, in \"#rrggbb\" format."
 msgstr "Ibara Bya Ibikorwa in Imiterere"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:5
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:5
 #, fuzzy
 msgid "Calendars to run alarms for"
 msgstr "Kuri Gukoresha kugirango"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:6
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:6
+msgid ""
+"Color to draw the Marcus Bains Line in the Time bar (empty for default)."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:7
+msgid "Color to draw the Marcus Bains line in the Day View."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:8
 #, fuzzy
 msgid "Compress weekends in month view"
 msgstr "Wikendi in Ukwezi Kureba"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:7
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:9
 msgid "Confirm expunge"
 msgstr ""
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:8
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:10
 #, fuzzy
 msgid "Days on which the start and end of work hours should be indicated."
 msgstr "ku Gutangira Na Impera Bya Akazi amasaha"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:9
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:11
 #, fuzzy
 msgid "Default appointment reminder"
 msgstr "Mwibutsa"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:10
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:12
 #, fuzzy
 msgid "Default reminder units"
 msgstr "Mwibutsa"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:11
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:13
 #, fuzzy
 msgid "Default reminder value"
 msgstr "Mwibutsa Agaciro"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:12
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
 #, fuzzy
 msgid "Free/busy server urls"
 msgstr "Irahuze Seriveri"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:13
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
 #, fuzzy
 msgid "Free/busy template url"
 msgstr "Irahuze Inyandikorugero URL"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
 #, fuzzy
 msgid "Hide completed tasks"
 msgstr "Ibikorwa"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
 #, fuzzy
 msgid "Hide task units"
 msgstr "Igikorwa"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
 #, fuzzy
 msgid "Hide task value"
 msgstr "Igikorwa Agaciro"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
 #, fuzzy
 msgid "Horizontal pane position"
 msgstr "Ibirindiro"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
 #, fuzzy
 msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
 msgstr "WORKDAY ku in ISAHA Imiterere 0 Kuri"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
 #, fuzzy
 msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
 msgstr "WORKDAY ku in ISAHA Imiterere 0 Kuri"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
+#, fuzzy
+msgid "Intervals shown in Day and Work Week views, in minutes."
+msgstr "in Na in Iminota"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
 #, fuzzy
 msgid "Last alarm time"
 msgstr "Igihe"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
 #, fuzzy
 msgid "List of server urls for free/busy publishing."
 msgstr "Bya Seriveri kugirango Kigenga Irahuze Gutangaza:%title%"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
+msgid "Marcus Bains Line"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+msgid "Marcus Bains Line Color - Day View"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+msgid "Marcus Bains Line Color - Time bar"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
 #, fuzzy
-msgid "Minute the workday ends on, 0 to 59"
+msgid "Minute the workday ends on, 0 to 59."
 msgstr "WORKDAY ku 0 Kuri"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
 #, fuzzy
 msgid "Minute the workday starts on, 0 to 59."
 msgstr "WORKDAY ku 0 Kuri"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
 #, fuzzy
 msgid "Month view horizontal pane position"
 msgstr "Kureba Gitambitse Ibirindiro"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
 #, fuzzy
 msgid "Month view vertical pane position"
 msgstr "Kureba Bihagaritse Ibirindiro"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
 #, fuzzy
 msgid "Number of units for determining for a default reminder."
 msgstr "Bya kugirango kugirango a Mburabuzi Mwibutsa"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
 #, fuzzy
 msgid "Number of units for determining when to hide tasks."
 msgstr "Bya kugirango Ryari: Kuri Gushisha Ibikorwa"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:34
 #, fuzzy
 msgid "Overdue tasks color"
 msgstr "Ibikorwa Ibara"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:35
 #, fuzzy
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
@@ -5182,7 +5307,7 @@ msgstr ""
 "Bya Gitambitse hagati Itariki Mutemberezi Kalindari Na Igikorwa Urutonde "
 "Ryari: OYA in Ukwezi Kureba in Pigiseli"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:36
 #, fuzzy
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
@@ -5191,16 +5316,16 @@ msgstr ""
 "Bya Gitambitse hagati Kureba Na Itariki Mutemberezi Kalindari Na Igikorwa "
 "Urutonde in Ukwezi Kureba in Pigiseli"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:37
 #, fuzzy
 msgid ""
-"Position of the vertical pane, between task list and the task preview pane, "
-"in pixels."
+"Position of the vertical pane, between the task list and the task preview "
+"pane, in pixels."
 msgstr ""
 "Bya Bihagaritse hagati Igikorwa Urutonde Na Igikorwa Igaragazambere in "
 "Pigiseli"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:38
 #, fuzzy
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
@@ -5209,7 +5334,7 @@ msgstr ""
 "Bya Bihagaritse hagati Kureba Na Itariki Mutemberezi Kalindari Na Igikorwa "
 "Urutonde in Ukwezi Kureba in Pigiseli"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:39
 #, fuzzy
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
@@ -5218,37 +5343,37 @@ msgstr ""
 "Bya Bihagaritse hagati Kureba Na Itariki Mutemberezi Kalindari Na Igikorwa "
 "Urutonde Ryari: OYA in Ukwezi Kureba in Pigiseli"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:34
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:40
 #, fuzzy
 msgid "Programs that are allowed to be run by alarms."
 msgstr "Kuri Gukoresha ku"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:35
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:41
 #, fuzzy
 msgid "Show appointment end times in week and month views"
 msgstr "Impera Times in Icyumweru Na Ukwezi"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:36
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
 #, fuzzy
 msgid "Show display alarms in notification tray"
 msgstr "Kugaragaza in Ikimenyetso"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:37
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
 #, fuzzy
 msgid "Show week numbers in date navigator"
 msgstr "Icyumweru Imibare in Itariki Mutemberezi"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:38
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
 #, fuzzy
 msgid "Tasks due today color"
 msgstr "UYUMUNSI Ibara"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:39
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
 #, fuzzy
 msgid "Tasks vertical pane position"
 msgstr "Bihagaritse Ibirindiro"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:40
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
 #, fuzzy
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
@@ -5257,7 +5382,7 @@ msgstr ""
 "Mburabuzi Kuri Gukoresha kugirango Amatariki Na Times in Kalindari Nka "
 "Ububikoshingiro Ahantu nka"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
 #, fuzzy, no-c-format
 msgid ""
 "The url template to use as a free/busy data fallback, %u is replaced by the "
@@ -5266,64 +5391,62 @@ msgstr ""
 "URL Inyandikorugero Kuri Gukoresha Nka a Kigenga Irahuze Ibyatanzwe ni ku "
 "Ukoresha: Bya Ubutumwa Aderesi Na ni ku Urwego"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
 #, fuzzy
-msgid ""
-"Time divisions</short> <short>Intervals shown in Day and Work Week views, in "
-"minutes."
-msgstr "in Na in Iminota"
+msgid "Time divisions"
+msgstr "%02iUMUNOTA"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
 #, fuzzy
 msgid "Time the last alarm ran, in time_t."
 msgstr "Iheruka in"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
 msgid "Timezone"
 msgstr ""
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
 #, fuzzy
 msgid "Twenty four hour time format"
 msgstr "ISAHA Igihe Imiterere"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:47
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
 #, fuzzy
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr "kugirango a Mburabuzi Mwibutsa Iminota amasaha Cyangwa Iminsi"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:54
 #, fuzzy
 msgid ""
 "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr "kugirango Ryari: Kuri Gushisha Ibikorwa Iminota amasaha Cyangwa Iminsi"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
 #, fuzzy
 msgid "Week start"
 msgstr "Gutangira"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
 #, fuzzy
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr "Icyumweru ku Bivuye 0 Kuri 6"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:58
 #, fuzzy
 msgid "Whether or not to use the notification tray for display alarms."
 msgstr "Cyangwa OYA Kuri Gukoresha Ikimenyetso kugirango Kugaragaza"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
 #, fuzzy
 msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr "Kuri kugirango Iyemeza Ryari: Cyangwa Igikorwa"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:54
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
 #, fuzzy
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr "Kuri kugirango Iyemeza Ryari: Na Ibikorwa"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
 #, fuzzy
 msgid ""
 "Whether to compress weekends in the month view, which puts Saturday and "
@@ -5331,90 +5454,97 @@ msgid ""
 msgstr ""
 "Kuri Kwegeranya Wikendi in Ukwezi Kureba Na in Umwanya Bya UMUNSIICYUMWERU"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
 #, fuzzy
 msgid "Whether to display the end time of events in the week and month views."
 msgstr "Kuri Kugaragaza Impera Igihe Bya Ibyabaye in Icyumweru Na Ukwezi"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
+msgid ""
+"Whether to draw the Marcus Bains Line (line at current time) in the calendar."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
 #, fuzzy
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr "Kuri Gushisha Ibikorwa in Ibikorwa Kureba"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:58
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
 #, fuzzy
 msgid "Whether to set a default reminder for appointments."
 msgstr "Kuri Gushyiraho a Mburabuzi Mwibutsa kugirango"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
 #, fuzzy
 msgid ""
 "Whether to show times in twenty four hour format instead of using am/pm."
 msgstr "Kuri Garagaza Times in ISAHA Imiterere Bya ikoresha"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
 #, fuzzy
 msgid "Whether to show week numbers in the date navigator."
 msgstr "Kuri Garagaza Icyumweru Imibare in Itariki Mutemberezi"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
 #, fuzzy
 msgid "Work days"
 msgstr "Iminsi"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
 #, fuzzy
 msgid "Workday end hour"
 msgstr "Impera ISAHA"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:70
 #, fuzzy
 msgid "Workday end minute"
 msgstr "Impera UMUNOTA"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
 #, fuzzy
 msgid "Workday start hour"
 msgstr "Gutangira ISAHA"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
 #, fuzzy
 msgid "Workday start minute"
 msgstr "Gutangira UMUNOTA"
 
-#: calendar/gui/cal-search-bar.c:49
+#: ../calendar/gui/cal-search-bar.c:49
 #, fuzzy
 msgid "Summary contains"
 msgstr "Kirimo"
 
-#: calendar/gui/cal-search-bar.c:50
+#: ../calendar/gui/cal-search-bar.c:50
 #, fuzzy
 msgid "Description contains"
 msgstr "Kirimo"
 
-#: calendar/gui/cal-search-bar.c:51
+#: ../calendar/gui/cal-search-bar.c:51
 #, fuzzy
 msgid "Comment contains"
 msgstr "Kirimo"
 
-#: calendar/gui/cal-search-bar.c:52
+#: ../calendar/gui/cal-search-bar.c:52
 #, fuzzy
 msgid "Location contains"
 msgstr "Kirimo"
 
-#: calendar/gui/cal-search-bar.c:350
+#: ../calendar/gui/cal-search-bar.c:350
 msgid "Unmatched"
 msgstr ""
 
 # svtools/source\dialogs\addresstemplate.src:STR_FIELD_CALENDAR.text
-#: calendar/gui/calendar-commands.c:120 calendar/gui/calendar-component.c:708
-#: calendar/gui/dialogs/calendar-setup.c:362 calendar/gui/gnome-cal.c:1950
-#: plugins/groupwise-account-setup/camel-gw-listener.c:382
-#: plugins/groupwise-account-setup/camel-gw-listener.c:412
+#: ../calendar/gui/calendar-commands.c:120
+#: ../calendar/gui/calendar-component.c:708
+#: ../calendar/gui/dialogs/calendar-setup.c:369
+#: ../calendar/gui/gnome-cal.c:1974
+#: ../plugins/groupwise-features/camel-gw-listener.c:382
+#: ../plugins/groupwise-features/camel-gw-listener.c:412
 msgid "Calendar"
 msgstr "Kalindari"
 
-#: calendar/gui/calendar-commands.c:355
+#: ../calendar/gui/calendar-commands.c:355
 #, fuzzy
 msgid ""
 "This operation will permanently erase all events older than the selected "
@@ -5424,299 +5554,301 @@ msgstr ""
 "Byose Ibyabaye Byahiswemo Igiteranyo Bya Igihe urifuzagukomeza OYA Kuri "
 "Ibyabaye"
 
-#: calendar/gui/calendar-commands.c:361
+#: ../calendar/gui/calendar-commands.c:361
 #, fuzzy
 msgid "Purge events older than"
 msgstr "Ibyabaye"
 
-#: calendar/gui/calendar-commands.c:366
-#: calendar/gui/dialogs/alarm-dialog.glade.h:20
-#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:14
-#: plugins/calendar-http/calendar-http.c:265
-#: plugins/calendar-weather/calendar-weather.c:566
-#: widgets/misc/e-send-options.glade.h:39
+#: ../calendar/gui/calendar-commands.c:366
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:20
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:12
+#: ../filter/filter.glade.h:14 ../plugins/calendar-http/calendar-http.c:265
+#: ../plugins/calendar-weather/calendar-weather.c:566
+#: ../widgets/misc/e-send-options.glade.h:36
 msgid "days"
 msgstr "iminsi"
 
 #. Create the On the web source group
 #. Create the Webcal source group
 #. Create the LDAP source group
-#: calendar/gui/calendar-component.c:234 calendar/gui/migration.c:486
-#: calendar/gui/migration.c:579 calendar/gui/tasks-component.c:215
+#: ../calendar/gui/calendar-component.c:234 ../calendar/gui/migration.c:489
+#: ../calendar/gui/migration.c:582 ../calendar/gui/tasks-component.c:215
 msgid "On The Web"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:252 calendar/gui/migration.c:388
+#: ../calendar/gui/calendar-component.c:252 ../calendar/gui/migration.c:391
 msgid "Birthdays & Anniversaries"
 msgstr ""
 
 #. Create the weather group
-#: calendar/gui/calendar-component.c:258
-#: plugins/calendar-weather/calendar-weather.c:100
+#: ../calendar/gui/calendar-component.c:258
+#: ../plugins/calendar-weather/calendar-weather.c:100
 msgid "Weather"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:535
-#: calendar/gui/dialogs/calendar-setup.c:442
+#: ../calendar/gui/calendar-component.c:535
+#: ../calendar/gui/dialogs/calendar-setup.c:450
 msgid "New Calendar"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:843
+#: ../calendar/gui/calendar-component.c:843
 msgid "Failed upgrading calendars."
 msgstr ""
 
-#: calendar/gui/calendar-component.c:1139
+#: ../calendar/gui/calendar-component.c:1139
 #, fuzzy, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "Kuri Gufungura Kalindari kugirango Ibyabaye Na"
 
-#: calendar/gui/calendar-component.c:1155
+#: ../calendar/gui/calendar-component.c:1155
 #, fuzzy
 msgid "There is no calendar available for creating events and meetings"
 msgstr "ni Oya Kalindari Bihari kugirango Ibyabaye Na"
 
-#: calendar/gui/calendar-component.c:1265
+#: ../calendar/gui/calendar-component.c:1267
 msgid "Calendar Source Selector"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:1456
+#: ../calendar/gui/calendar-component.c:1458
 msgid "New appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:1457
+#: ../calendar/gui/calendar-component.c:1459
 msgid "_Appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:1458
+#: ../calendar/gui/calendar-component.c:1460
 #, fuzzy
 msgid "Create a new appointment"
 msgstr "a Gishya"
 
-#: calendar/gui/calendar-component.c:1464
+#: ../calendar/gui/calendar-component.c:1466
 msgid "New meeting"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:1465
+#: ../calendar/gui/calendar-component.c:1467
 msgid "M_eeting"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:1466
+#: ../calendar/gui/calendar-component.c:1468
 #, fuzzy
 msgid "Create a new meeting request"
 msgstr "a Gishya Kubaza..."
 
-#: calendar/gui/calendar-component.c:1472
+#: ../calendar/gui/calendar-component.c:1474
 #, fuzzy
 msgid "New all day appointment"
 msgstr "Byose UMUNSI"
 
-#: calendar/gui/calendar-component.c:1473
+#: ../calendar/gui/calendar-component.c:1475
 msgid "All Day A_ppointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:1474
+#: ../calendar/gui/calendar-component.c:1476
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "a Gishya Byose UMUNSI"
 
-#: calendar/gui/calendar-component.c:1480
+#: ../calendar/gui/calendar-component.c:1482
 #, fuzzy
 msgid "New calendar"
 msgstr "Kalindari"
 
 # svtools/source\dialogs\addresstemplate.src:STR_FIELD_CALENDAR.text
-#: calendar/gui/calendar-component.c:1481
+#: ../calendar/gui/calendar-component.c:1483
 #, fuzzy
 msgid "Cale_ndar"
 msgstr "Kalindari"
 
-#: calendar/gui/calendar-component.c:1482
+#: ../calendar/gui/calendar-component.c:1484
 #, fuzzy
 msgid "Create a new calendar"
 msgstr "a Gishya Kalindari"
 
-#: calendar/gui/calendar-view-factory.c:109
+#: ../calendar/gui/calendar-view-factory.c:109
 msgid "Day View"
 msgstr ""
 
-#: calendar/gui/calendar-view-factory.c:112
+#: ../calendar/gui/calendar-view-factory.c:112
 msgid "Work Week View"
 msgstr ""
 
-#: calendar/gui/calendar-view-factory.c:115
+#: ../calendar/gui/calendar-view-factory.c:115
 msgid "Week View"
 msgstr ""
 
-#: calendar/gui/calendar-view-factory.c:118
+#: ../calendar/gui/calendar-view-factory.c:118
 msgid "Month View"
 msgstr ""
 
-#: calendar/gui/comp-editor-factory.c:413
+#: ../calendar/gui/comp-editor-factory.c:413
 #, fuzzy
 msgid "Error while opening the calendar"
 msgstr "Gufungura%S Kalindari"
 
-#: calendar/gui/comp-editor-factory.c:419
+#: ../calendar/gui/comp-editor-factory.c:419
 #, fuzzy
 msgid "Method not supported when opening the calendar"
 msgstr "OYA Ryari: Gufungura%S Kalindari"
 
-#: calendar/gui/comp-editor-factory.c:425
+#: ../calendar/gui/comp-editor-factory.c:425
 #, fuzzy
 msgid "Permission denied to open the calendar"
 msgstr "Kuri Gufungura Kalindari"
 
 # # @name OTHER
 # # @loc none
-#: calendar/gui/comp-editor-factory.c:437 shell/e-shell.c:1264
+#: ../calendar/gui/comp-editor-factory.c:437 ../shell/e-shell.c:1288
 msgid "Unknown error"
 msgstr "Ikosa itazwi"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:1
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:1
 #, fuzzy
 msgid "<b>Alarm</b>"
 msgstr "<B B"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:2
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:2
 #, fuzzy
 msgid "<b>Options</b>"
 msgstr "<B B"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:3
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:3
 #, fuzzy
 msgid "<b>Repeat</b>"
 msgstr "<B B"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:4
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:4
 msgid "Add Alarm"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:5
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:5
 #, fuzzy
 msgid "Custom _message"
 msgstr "Kugena Ubutumwa"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:6
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:6
 #, fuzzy
 msgid "Custom alarm sound"
 msgstr "Kugena Ijwi"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:7
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:7
 #, fuzzy
 msgid "Mes_sage:"
 msgstr "Ubutumwa:"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:8 calendar/gui/e-alarm-list.c:444
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:8
+#: ../calendar/gui/e-alarm-list.c:444
 #, fuzzy
 msgid "Play a sound"
 msgstr "Vuza ijwi"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:9 calendar/gui/e-alarm-list.c:448
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
+#: ../calendar/gui/e-alarm-list.c:448
 #, fuzzy
 msgid "Pop up an alert"
 msgstr "Hejuru Ikimenyetso"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:10
-#: calendar/gui/e-alarm-list.c:456
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:10
+#: ../calendar/gui/e-alarm-list.c:456
 #, fuzzy
 msgid "Run a program"
 msgstr "a Porogaramu"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:11
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:11
 msgid "Send To:"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:12
-#: calendar/gui/e-alarm-list.c:452
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:12
+#: ../calendar/gui/e-alarm-list.c:452
 #, fuzzy
 msgid "Send an email"
 msgstr "imeli"
 
 # 286
-#: calendar/gui/dialogs/alarm-dialog.glade.h:13
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
 #, fuzzy
 msgid "_Arguments:"
 msgstr "ingingo"
 
 # offmgr/source\offapp\dialog\optgdlg.src:OFA_TP_HELPERPROG.FT_PROGRAM.text
-#: calendar/gui/dialogs/alarm-dialog.glade.h:14
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:14
 #, fuzzy
 msgid "_Program:"
 msgstr "Porogaramu"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:15
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:15
 #, fuzzy
 msgid "_Repeat the alarm"
 msgstr "i"
 
 # svx/inc\globlmn.hrc:TMP_SID_INSERT_SOUND.SID_INSERT_SOUND.text
-#: calendar/gui/dialogs/alarm-dialog.glade.h:16
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:16
 #, fuzzy
 msgid "_Sound:"
 msgstr "Ijwi..."
 
 # sfx2/source\dialog\dinfdlg.src:TP_DOCINFORELOAD.FT_AFTER.text
-#: calendar/gui/dialogs/alarm-dialog.glade.h:17
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:17
 msgid "after"
 msgstr "nyuma"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:18
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:18
 #, fuzzy
 msgid "before"
 msgstr "Mbere"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:19
-#: calendar/gui/dialogs/recurrence-page.glade.h:7
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:19
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "day(s)"
 msgstr "iminsi"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:21
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:21
 #, fuzzy
 msgid "end of appointment"
 msgstr "Impera Bya"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:22
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:22
 #, fuzzy
 msgid "extra times every"
 msgstr "Birenga Times buri"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:23
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:23
 msgid "hour(s)"
 msgstr "amasaha"
 
 # 2852
-#: calendar/gui/dialogs/alarm-dialog.glade.h:24
-#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:15
-#: plugins/calendar-http/calendar-http.c:264
-#: plugins/calendar-weather/calendar-weather.c:565
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:24
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:13
+#: ../filter/filter.glade.h:15 ../plugins/calendar-http/calendar-http.c:264
+#: ../plugins/calendar-weather/calendar-weather.c:565
 #, fuzzy
 msgid "hours"
 msgstr "amasaha"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:25
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:25
 msgid "minute(s)"
 msgstr "iminota"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:27
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:27
 #, fuzzy
 msgid "start of appointment"
 msgstr "Gutangira Bya"
 
-#: calendar/gui/dialogs/alarm-list-dialog.c:199
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:199
 msgid "Action/Trigger"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-list-dialog.glade.h:1
+#: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:1
 #, fuzzy
 msgid "A_dd"
 msgstr "Kongeramo"
 
-#: calendar/gui/dialogs/alarm-list-dialog.glade.h:2
+#: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
 msgid "Alarms"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-attachment-bar.c:108
-#: composer/e-msg-composer-attachment-bar.c:103
+#: ../calendar/gui/dialogs/cal-attachment-bar.c:110
+#: ../composer/e-msg-composer-attachment-bar.c:105
 #, fuzzy, c-format
 msgid "%.0fK"
 msgstr ""
@@ -5729,8 +5861,8 @@ msgstr ""
 "X- Generator: KBabel 1. 0\n"
 "."
 
-#: calendar/gui/dialogs/cal-attachment-bar.c:111
-#: composer/e-msg-composer-attachment-bar.c:106
+#: ../calendar/gui/dialogs/cal-attachment-bar.c:113
+#: ../composer/e-msg-composer-attachment-bar.c:108
 #, fuzzy, c-format
 msgid "%.0fM"
 msgstr ""
@@ -5743,8 +5875,8 @@ msgstr ""
 "X- Generator: KBabel 1. 0\n"
 "."
 
-#: calendar/gui/dialogs/cal-attachment-bar.c:114
-#: composer/e-msg-composer-attachment-bar.c:109
+#: ../calendar/gui/dialogs/cal-attachment-bar.c:116
+#: ../composer/e-msg-composer-attachment-bar.c:111
 #, fuzzy, c-format
 msgid "%.0fG"
 msgstr ""
@@ -5758,9 +5890,9 @@ msgstr ""
 "."
 
 # 361
-#: calendar/gui/dialogs/cal-attachment-bar.c:298
-#: calendar/gui/dialogs/cal-attachment-bar.c:922
-#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:438
+#: ../calendar/gui/dialogs/cal-attachment-bar.c:311
+#: ../calendar/gui/dialogs/cal-attachment-bar.c:1106
+#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:438
 #, fuzzy
 msgid "attachment"
 msgstr "umugereka"
@@ -5769,10 +5901,10 @@ msgstr "umugereka"
 # padmin/source\rtsetup.src:RID_RTS_FONTSUBSTPAGE.RID_RTS_FS_REMOVE_BTN.text
 # #-#-#-#-#  padmin.pot (Gnome 2.12)  #-#-#-#-#
 # padmin/source\rtsetup.src:RID_RTS_COMMANDPAGE.RID_RTS_CMD_BTN_REMOVE.text
-#: calendar/gui/dialogs/cal-attachment-bar.c:439
-#: calendar/gui/dialogs/meeting-page.c:784
-#: composer/e-msg-composer-attachment-bar.c:437
-#: plugins/shared-folder/properties.glade.h:14
+#: ../calendar/gui/dialogs/cal-attachment-bar.c:473
+#: ../calendar/gui/dialogs/meeting-page.c:889
+#: ../composer/e-msg-composer-attachment-bar.c:470
+#: ../plugins/groupwise-features/properties.glade.h:14
 #, fuzzy
 msgid "_Remove"
 msgstr "Gukuraho"
@@ -5781,228 +5913,239 @@ msgstr "Gukuraho"
 # basctl/source\basicide\basidesh.src:RID_POPUP_BRKPROPS.text
 # #-#-#-#-#  basctl.pot (Gnome 2.12)  #-#-#-#-#
 # basctl/source\basicide\tbxctl.src:RID_TOOLBOX.SID_SHOW_PROPERTYBROWSER.text
-#: calendar/gui/dialogs/cal-attachment-bar.c:440
-#: composer/e-msg-composer-attachment-bar.c:438 mail/em-folder-tree.c:2819
-#: ui/evolution-mail-list.xml.h:27
+#: ../calendar/gui/dialogs/cal-attachment-bar.c:474
+#: ../composer/e-msg-composer-attachment-bar.c:471
+#: ../mail/em-folder-tree.c:2123 ../ui/evolution-mail-list.xml.h:28
 #, fuzzy
 msgid "_Properties"
 msgstr "indangakintu"
 
-#: calendar/gui/dialogs/cal-attachment-bar.c:442
-#: composer/e-msg-composer-attachment-bar.c:440
+#: ../calendar/gui/dialogs/cal-attachment-bar.c:476
+#: ../composer/e-msg-composer-attachment-bar.c:473
 #, fuzzy
 msgid "_Add attachment..."
 msgstr "umugereka"
 
-#: calendar/gui/dialogs/cal-attachment-bar.c:699
-#: composer/e-msg-composer-attachment-bar.c:703
+#: ../calendar/gui/dialogs/cal-attachment-bar.c:736
+#: ../composer/e-msg-composer-attachment-bar.c:740
 msgid "Attachment Bar"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-attachment-select-file.c:96
-#: calendar/gui/dialogs/cal-attachment-select-file.c:115
-#: calendar/gui/dialogs/cal-attachment.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:6
-#: composer/e-msg-composer-select-file.c:95
-#: composer/e-msg-composer-select-file.c:115
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:96
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:115
+#: ../calendar/gui/dialogs/cal-attachment.glade.h:6
+#: ../composer/e-msg-composer-attachment.glade.h:6
+#: ../composer/e-msg-composer-select-file.c:96
+#: ../composer/e-msg-composer-select-file.c:116
 #, fuzzy
 msgid "Suggest automatic display of attachment"
 msgstr "Byikoresha Kugaragaza Bya umugereka"
 
-#: calendar/gui/dialogs/cal-attachment-select-file.c:190
-#: composer/e-msg-composer-select-file.c:231
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:190
+#: ../composer/e-msg-composer-select-file.c:235
 #, fuzzy
 msgid "Attach file(s)"
 msgstr "Gerekaho I( Ama) dosiye"
 
-#: calendar/gui/dialogs/cal-attachment.c:197
-#: calendar/gui/dialogs/cal-attachment.c:213
-#: composer/e-msg-composer-attachment.c:174
-#: composer/e-msg-composer-attachment.c:190
+#: ../calendar/gui/dialogs/cal-attachment.c:210
+#: ../calendar/gui/dialogs/cal-attachment.c:226
+#: ../calendar/gui/dialogs/cal-attachment.c:319
+#: ../calendar/gui/dialogs/cal-attachment.c:335
+#: ../composer/e-msg-composer-attachment.c:187
+#: ../composer/e-msg-composer-attachment.c:203
+#: ../composer/e-msg-composer-attachment.c:297
+#: ../composer/e-msg-composer-attachment.c:313
 #, fuzzy, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "gereka IDOSIYE"
 
-#: calendar/gui/dialogs/cal-attachment.c:205
-#: composer/e-msg-composer-attachment.c:182
+#: ../calendar/gui/dialogs/cal-attachment.c:218
+#: ../calendar/gui/dialogs/cal-attachment.c:327
+#: ../composer/e-msg-composer-attachment.c:195
+#: ../composer/e-msg-composer-attachment.c:305
 #, fuzzy, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "gereka IDOSIYE OYA a Ibisanzwe IDOSIYE"
 
-#: calendar/gui/dialogs/cal-attachment.glade.h:2
-#: composer/e-msg-composer-attachment.glade.h:2
+#: ../calendar/gui/dialogs/cal-attachment.glade.h:2
+#: ../composer/e-msg-composer-attachment.glade.h:2
 msgid "Attachment Properties"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-attachment.glade.h:3
-#: calendar/gui/e-cal-component-preview.c:267
-#: calendar/gui/e-itip-control.c:1164 calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:68
+#: ../calendar/gui/dialogs/cal-attachment.glade.h:3
+#: ../calendar/gui/e-cal-component-preview.c:267
+#: ../calendar/gui/e-itip-control.c:1164
+#: ../calendar/gui/e-itip-control.glade.h:6
+#: ../composer/e-msg-composer-attachment.glade.h:3
+#: ../mail/mail-config.glade.h:69
 msgid "Description:"
 msgstr "Umwirondoro"
 
 # basctl/source\basicide\basidesh.src:RID_STR_FILENAME.text
-#: calendar/gui/dialogs/cal-attachment.glade.h:4
-#: composer/e-msg-composer-attachment.glade.h:4
+#: ../calendar/gui/dialogs/cal-attachment.glade.h:4
+#: ../composer/e-msg-composer-attachment.glade.h:4
 msgid "File name:"
 msgstr "Izina ry'idosiye"
 
 # framework/source\classes\fltdlg.src:DLG_FILTER_SELECT.FT_DLG_MIMETYPE.text
-#: calendar/gui/dialogs/cal-attachment.glade.h:5
-#: composer/e-msg-composer-attachment.glade.h:5
+#: ../calendar/gui/dialogs/cal-attachment.glade.h:5
+#: ../composer/e-msg-composer-attachment.glade.h:5
 #, fuzzy
 msgid "MIME type:"
 msgstr "Ubwoko bwa MIME:"
 
 #. g_object_set((GObject *)renderer, "activatable", TRUE, NULL);
-#: calendar/gui/dialogs/cal-prefs-dialog.c:576 mail/em-account-prefs.c:476
-#: mail/em-composer-prefs.c:888 plugins/plugin-manager/plugin-manager.c:213
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:576
+#: ../mail/em-account-prefs.c:476 ../mail/em-composer-prefs.c:888
+#: ../plugins/plugin-manager/plugin-manager.c:213
 msgid "Enabled"
 msgstr "Bikora"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.c:730
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:730
 #, fuzzy
 msgid "Are you sure you want to remove this URL?"
 msgstr "Kuri Gukuraho... iyi"
 
 # sc/source\ui\dbgui\pivot.src:RID_SCDLG_PIVOT_LAYOUT.BTN_REMOVE.text
-#: calendar/gui/dialogs/cal-prefs-dialog.c:733
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:733
 msgid "Remove"
 msgstr "Gukuraho"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.c:738
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:738
 msgid "Don't Remove"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.c:787
-#: calendar/gui/dialogs/cal-prefs-dialog.c:820
-#: calendar/gui/dialogs/cal-prefs-dialog.c:853 mail/em-account-prefs.c:323
-#: mail/em-account-prefs.c:351 mail/em-account-prefs.c:382
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:787
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:820
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:853
+#: ../mail/em-account-prefs.c:323 ../mail/em-account-prefs.c:351
+#: ../mail/em-account-prefs.c:382
 msgid "Disable"
 msgstr ""
 
 # svx/source\dialog\paragrph.src:RID_SVXPAGE_EXT_PARAGRAPH.BTN_PAGEBREAK.text
-#: calendar/gui/dialogs/cal-prefs-dialog.c:787
-#: calendar/gui/dialogs/cal-prefs-dialog.c:820
-#: calendar/gui/dialogs/cal-prefs-dialog.c:855 mail/em-account-prefs.c:323
-#: mail/em-account-prefs.c:351 mail/em-account-prefs.c:384
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:787
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:820
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:855
+#: ../mail/em-account-prefs.c:323 ../mail/em-account-prefs.c:351
+#: ../mail/em-account-prefs.c:384
 msgid "Enable"
 msgstr "Gushoboza"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
 #, fuzzy
 msgid "05 minutes"
 msgstr "05 Iminota"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:3
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:3
 #, fuzzy
 msgid "10 minutes"
 msgstr "10 Iminota"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
 #, fuzzy
 msgid "15 minutes"
 msgstr "15 Iminota"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
 #, fuzzy
 msgid "30 minutes"
 msgstr "Iminota"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
 #, fuzzy
 msgid "60 minutes"
 msgstr "Iminota"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 #, fuzzy
 msgid "<b>Alerts</b>"
 msgstr "<B B"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 #, fuzzy
 msgid "<b>Default Free/Busy Server</b>"
 msgstr "<B B"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 #, fuzzy
 msgid "<b>General</b>"
 msgstr "<B B"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 #, fuzzy
 msgid "<b>Publishing</b>"
 msgstr "<B B"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 #, fuzzy
 msgid "<b>Task List</b>"
 msgstr "<B B"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #, fuzzy
 msgid "<b>Time</b>"
 msgstr "<B B"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 #, fuzzy
 msgid "<b>Work Week</b>"
 msgstr "<B B"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #, fuzzy, no-c-format
 msgid ""
 "<i>%u and %d will be replaced by user and domain from the email address.</i>"
 msgstr "<i Na ku Ukoresha: Na Urwego Bivuye imeli Aderesi i"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 #, fuzzy
 msgid "Calendar and Tasks Settings"
 msgstr "Na"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #, fuzzy
 msgid "Color for overdue tasks"
 msgstr "kugirango Ibikorwa"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 #, fuzzy
 msgid "Color for tasks due today"
 msgstr "kugirango Ibikorwa UYUMUNSI"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "Day _ends:"
 msgstr ""
 
 # scaddins/source\analysis\analysis.src:RID_ANALYSIS_FUNCTION_DESCRIPTIONS.ANALYSIS_Workday.4.text
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "Days"
 msgstr "Iminsi"
 
 # offmgr/source\offapp\dialog\optgdlg.src:OFA_TP_VIEW.GB_APPEARANCE.text
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid "Display"
 msgstr "Kugaragaza"
 
 # svx/source\dialog\paragrph.src:RID_SVXPAGE_EXT_PARAGRAPH.BTN_PAGEBREAK.text
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: mail/mail-config.glade.h:73
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: ../mail/mail-config.glade.h:74
 #, fuzzy
 msgid "E_nable"
 msgstr "Gushoboza"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 msgid "Free/Busy"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:732
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: ../calendar/gui/dialogs/recurrence-page.c:1046
+#: ../calendar/gui/e-itip-control.c:732
 msgid "Friday"
 msgstr ""
 
 # 2852
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid "Hours"
 msgstr "amasaha"
 
@@ -6010,340 +6153,346 @@ msgstr "amasaha"
 # officecfg/registry\schema\org\openoffice\Office\Common.xcs:....Save.Document.AutoSaveTimeIntervall.text
 # #-#-#-#-#  officecfg.pot (Gnome 2.12)  #-#-#-#-#
 # officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....Wizard.Agenda.Elements.Minutes.text
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Minutes"
 msgstr "Iminota"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1040
-#: calendar/gui/e-itip-control.c:728
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: ../calendar/gui/dialogs/recurrence-page.c:1042
+#: ../calendar/gui/e-itip-control.c:728
 msgid "Monday"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 msgid "Publishing Table"
 msgstr ""
 
 # svx/source\dialog\sdstring.src:RID_SVXSTR_COLOR_SUN.text
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 #, fuzzy
 msgid "S_un"
 msgstr "Izuba"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:733
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: ../calendar/gui/dialogs/recurrence-page.c:1047
+#: ../calendar/gui/e-itip-control.c:733
 msgid "Saturday"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 #, fuzzy
 msgid "Sh_ow a reminder"
 msgstr "a Mwibutsa"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 #, fuzzy
 msgid "Show week _numbers in date navigator"
 msgstr "Icyumweru Imibare in Itariki Mutemberezi"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:727
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: ../calendar/gui/dialogs/recurrence-page.c:1048
+#: ../calendar/gui/e-itip-control.c:727
 msgid "Sunday"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 #, fuzzy
 msgid "T_asks due today:"
 msgstr "UYUMUNSI"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "T_hu"
 msgstr ""
 
 # sfx2/source\dialog\dinfdlg.src:TP_DOCINFODOC.FT_TEMPL.text
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "Template:"
 msgstr "Inyandikorugero"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: calendar/gui/dialogs/recurrence-page.c:1043
-#: calendar/gui/e-itip-control.c:731
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: ../calendar/gui/dialogs/recurrence-page.c:1045
+#: ../calendar/gui/e-itip-control.c:731
 msgid "Thursday"
 msgstr ""
 
 # VCARD_LDAP_TZ
 # # @name VCARD_LDAP_TZ
 # # @loc None
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 #, fuzzy
 msgid "Time _zone:"
 msgstr "Igihe kya karere"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 #, fuzzy
 msgid "Time format:"
 msgstr "Imiterere y'igihe"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-#: calendar/gui/dialogs/recurrence-page.c:1041
-#: calendar/gui/e-itip-control.c:729
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: ../calendar/gui/dialogs/recurrence-page.c:1043
+#: ../calendar/gui/e-itip-control.c:729
 msgid "Tuesday"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "W_eek starts:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
-#: calendar/gui/dialogs/recurrence-page.c:1042
-#: calendar/gui/e-itip-control.c:730
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: ../calendar/gui/dialogs/recurrence-page.c:1044
+#: ../calendar/gui/e-itip-control.c:730
 msgid "Wednesday"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 #, fuzzy
 msgid "Work days:"
 msgstr "Iminsi"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 #, fuzzy
 msgid "_12 hour (AM/PM)"
 msgstr "ISAHA"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 #, fuzzy
 msgid "_24 hour"
 msgstr "ISAHA"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "_Add URL"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 #, fuzzy
 msgid "_Ask for confirmation when deleting items"
 msgstr "kugirango Iyemeza Ryari:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 #, fuzzy
 msgid "_Compress weekends in month view"
 msgstr "Wikendi in Ukwezi Kureba"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 msgid "_Day begins:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "_Fri"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 #, fuzzy
 msgid "_Hide completed tasks after"
 msgstr "Ibikorwa Nyuma"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 msgid "_Mon"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
 #, fuzzy
 msgid "_Overdue tasks:"
 msgstr "Ibikorwa"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
 msgid "_Sat"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
 #, fuzzy
 msgid "_Show appointment end times in week and month views"
 msgstr "Impera Times in Icyumweru Na Ukwezi"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
 msgid "_Time divisions:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
 msgid "_Tue"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
 msgid "_Wed"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
 #, fuzzy
 msgid "before every appointment"
 msgstr "Mbere buri"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
 #, fuzzy
 msgid "option menu to choose reminder units"
 msgstr "Ihitamo Ibikubiyemo Kuri Guhitamo Mwibutsa"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
 #, fuzzy
 msgid "option menu to choose time units"
 msgstr "Ihitamo Ibikubiyemo Kuri Guhitamo Igihe"
 
-#: calendar/gui/dialogs/calendar-setup.c:284
+#: ../calendar/gui/dialogs/calendar-setup.c:287
 #, fuzzy
 msgid "Copy calendar contents locally for offline operation"
 msgstr "Kalindari Ibigize kugirango Ntibicometse kuri interineti"
 
-#: calendar/gui/dialogs/calendar-setup.c:336
-#: calendar/gui/dialogs/calendar-setup.glade.h:4
+#: ../calendar/gui/dialogs/calendar-setup.c:290
+#, fuzzy
+msgid "Copy task list contents locally for offline operation"
+msgstr "Igitabo Ibikubiyemo kugirango Ntibicometse kuri interineti"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:343
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:4
 #, fuzzy
 msgid "C_olor:"
 msgstr "Ibara:"
 
-#: calendar/gui/dialogs/calendar-setup.c:373
+#: ../calendar/gui/dialogs/calendar-setup.c:380
 msgid "Tasks List"
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.c:440
+#: ../calendar/gui/dialogs/calendar-setup.c:448
 msgid "Calendar Properties"
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.c:506
+#: ../calendar/gui/dialogs/calendar-setup.c:515
 msgid "Task List Properties"
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:2
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:2
 msgid "Add Calendar"
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:3
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:3
 msgid "Add Task List"
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:104
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:5
+#: ../mail/mail-config.glade.h:105
 #, fuzzy
 msgid "Pick a color"
 msgstr "a Ibara"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:6
 msgid "_Add Calendar"
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:7
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:7
 msgid "_Add Task List"
 msgstr ""
 
 # dbaccess/source/ui/inc/toolbox.hrc:MID_SBA_QRY_REFRESH.text
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-#: plugins/calendar-http/calendar-http.c:248
-#: plugins/calendar-weather/calendar-weather.c:549
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:9
+#: ../plugins/calendar-http/calendar-http.c:248
+#: ../plugins/calendar-weather/calendar-weather.c:549
 #, fuzzy
 msgid "_Refresh:"
 msgstr "Kugira gishya"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
-#: plugins/calendar-http/calendar-http.c:120
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:11
+#: ../plugins/calendar-http/calendar-http.c:120
 #, fuzzy
 msgid "_URL:"
 msgstr "URL"
 
 # scaddins/source\datefunc\datefunc.src:RID_DATE_FUNCTION_NAMES.DATE_FUNCNAME_DiffWeeks.text
-#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:21
-#: plugins/calendar-http/calendar-http.c:266
-#: plugins/calendar-weather/calendar-weather.c:567
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:15
+#: ../filter/filter.glade.h:21 ../plugins/calendar-http/calendar-http.c:266
+#: ../plugins/calendar-weather/calendar-weather.c:567
 #, fuzzy
 msgid "weeks"
 msgstr "IBYUMWERU"
 
-#: calendar/gui/dialogs/changed-comp.c:60
+#: ../calendar/gui/dialogs/changed-comp.c:60
 #, fuzzy
 msgid "This event has been deleted."
 msgstr "Icyabaye Cyasibwe"
 
-#: calendar/gui/dialogs/changed-comp.c:64
+#: ../calendar/gui/dialogs/changed-comp.c:64
 #, fuzzy
 msgid "This task has been deleted."
 msgstr "Igikorwa Cyasibwe"
 
-#: calendar/gui/dialogs/changed-comp.c:68
+#: ../calendar/gui/dialogs/changed-comp.c:68
 #, fuzzy
 msgid "This journal entry has been deleted."
 msgstr "Ikinyamakuru Icyinjijwe Cyasibwe"
 
-#: calendar/gui/dialogs/changed-comp.c:77
+#: ../calendar/gui/dialogs/changed-comp.c:77
 #, fuzzy, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr "%sAmahinduka Amahinduka Na Gufunga Muhinduzi"
 
-#: calendar/gui/dialogs/changed-comp.c:79
+#: ../calendar/gui/dialogs/changed-comp.c:79
 #, fuzzy, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%sOya Amahinduka Gufunga Muhinduzi"
 
-#: calendar/gui/dialogs/changed-comp.c:84
+#: ../calendar/gui/dialogs/changed-comp.c:84
 #, fuzzy
 msgid "This event has been changed."
 msgstr "Icyabaye Byahinduwe"
 
-#: calendar/gui/dialogs/changed-comp.c:88
+#: ../calendar/gui/dialogs/changed-comp.c:88
 #, fuzzy
 msgid "This task has been changed."
 msgstr "Igikorwa Byahinduwe"
 
-#: calendar/gui/dialogs/changed-comp.c:92
+#: ../calendar/gui/dialogs/changed-comp.c:92
 #, fuzzy
 msgid "This journal entry has been changed."
 msgstr "Ikinyamakuru Icyinjijwe Byahinduwe"
 
-#: calendar/gui/dialogs/changed-comp.c:101
+#: ../calendar/gui/dialogs/changed-comp.c:101
 #, fuzzy, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr "%sAmahinduka Amahinduka Na Kuvugurura Muhinduzi"
 
-#: calendar/gui/dialogs/changed-comp.c:103
+#: ../calendar/gui/dialogs/changed-comp.c:103
 #, fuzzy, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%sOya Amahinduka Kuvugurura Muhinduzi"
 
-#: calendar/gui/dialogs/comp-editor-page.c:464
+#: ../calendar/gui/dialogs/comp-editor-page.c:464
 #, fuzzy, c-format
 msgid "Validation error: %s"
 msgstr "Ikosa"
 
 # officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....Wizard.Memo.Elements.To.text
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2261
+#: ../calendar/gui/dialogs/comp-editor-util.c:187 ../calendar/gui/print.c:2261
 #, fuzzy
 msgid " to "
 msgstr "Kuri"
 
 # setup2/source\ui\pages\phavefun.src:RESID_PAGE_PAGEHAVEFUN.STR_TITLE.text
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2265
+#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2265
 #, fuzzy
 msgid " (Completed "
 msgstr "(Yarangiye"
 
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2267
+#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2267
 msgid "Completed "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2272
+#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2272
 msgid " (Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2274
+#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2274
 msgid "Due "
 msgstr ""
 
 # # String used for attachment pretty name, when attachment is a message
-#: calendar/gui/dialogs/comp-editor.c:181 composer/e-msg-composer.c:2676
+#: ../calendar/gui/dialogs/comp-editor.c:184 ../composer/e-msg-composer.c:2654
 #, fuzzy, c-format
 msgid "Attached message - %s"
 msgstr "Ubutumwa bwageretsweho"
 
 # # String used for attachment pretty name, when attachment is a message
 #. translators, this count will always be >1
-#: calendar/gui/dialogs/comp-editor.c:186
-#: calendar/gui/dialogs/comp-editor.c:349 composer/e-msg-composer.c:2681
-#: composer/e-msg-composer.c:2844
+#: ../calendar/gui/dialogs/comp-editor.c:189
+#: ../calendar/gui/dialogs/comp-editor.c:358 ../composer/e-msg-composer.c:2659
+#: ../composer/e-msg-composer.c:2835
 #, fuzzy, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
@@ -6351,612 +6500,632 @@ msgstr[0] "Ubutumwa bwageretsweho"
 msgstr[1] "Ubutumwa bwageretsweho"
 
 # dbaccess/source/ui/inc/toolbox.hrc:MID_SBA_QRY_COPY.text
-#: calendar/gui/dialogs/comp-editor.c:412 calendar/gui/e-calendar-table.c:1164
-#: calendar/gui/e-calendar-view.c:1406 composer/e-msg-composer.c:2906
-#: mail/em-folder-tree.c:1047 mail/em-folder-view.c:980
-#: mail/message-list.c:1707 ui/evolution-addressbook.xml.h:31
-#: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-message.xml.h:105 ui/evolution-tasks.xml.h:20
+#: ../calendar/gui/dialogs/comp-editor.c:421
+#: ../calendar/gui/e-calendar-table.c:1164
+#: ../calendar/gui/e-calendar-view.c:1513 ../composer/e-msg-composer.c:2899
+#: ../mail/em-folder-tree.c:1047 ../mail/em-folder-view.c:1033
+#: ../mail/message-list.c:1708 ../ui/evolution-addressbook.xml.h:31
+#: ../ui/evolution-calendar.xml.h:39 ../ui/evolution-composer-entries.xml.h:7
+#: ../ui/evolution-mail-message.xml.h:100 ../ui/evolution-tasks.xml.h:20
 #, fuzzy
 msgid "_Copy"
 msgstr "Gukoporora"
 
 # sc/source\ui\src\globstr.src:RID_GLOBSTR.STR_UNDO_MOVE.text
-#: calendar/gui/dialogs/comp-editor.c:413 composer/e-msg-composer.c:2907
-#: mail/em-folder-tree.c:1048 mail/em-folder-tree.c:2312
-#: mail/em-folder-view.c:876 mail/message-list.c:1708
+#: ../calendar/gui/dialogs/comp-editor.c:422 ../composer/e-msg-composer.c:2900
+#: ../mail/em-folder-tree.c:1048 ../mail/em-folder-utils.c:383
+#: ../mail/em-folder-view.c:929 ../mail/message-list.c:1709
 #, fuzzy
 msgid "_Move"
 msgstr "Kwimura"
 
-#: calendar/gui/dialogs/comp-editor.c:415 composer/e-msg-composer.c:2909
-#: mail/em-folder-tree.c:1050 mail/message-list.c:1710
+#: ../calendar/gui/dialogs/comp-editor.c:424 ../composer/e-msg-composer.c:2902
+#: ../mail/em-folder-tree.c:1050 ../mail/message-list.c:1711
 msgid "Cancel _Drag"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:682
+#: ../calendar/gui/dialogs/comp-editor.c:697
 #, fuzzy
 msgid "Could not update object"
 msgstr "OYA Kuvugurura Igikoresho"
 
-#: calendar/gui/dialogs/comp-editor.c:843 composer/e-msg-composer.c:2310
+#: ../calendar/gui/dialogs/comp-editor.c:883 ../composer/e-msg-composer.c:2308
 #, fuzzy, c-format
-msgid "<b>%d</b> File Attached"
-msgid_plural "<b>%d</b> Files Attached"
+msgid "<b>%d</b> Attachment"
+msgid_plural "<b>%d</b> Attachments"
 msgstr[0] "<B B Idosiye"
 
-#: calendar/gui/dialogs/comp-editor.c:900 composer/e-msg-composer.c:2339
-#, fuzzy
-msgid "Hide _Attachment Bar (drop attachments here)"
-msgstr "Imigereka"
-
-#: calendar/gui/dialogs/comp-editor.c:903
-#: calendar/gui/dialogs/comp-editor.c:955 composer/e-msg-composer.c:2342
-#: composer/e-msg-composer.c:3487
+#: ../calendar/gui/dialogs/comp-editor.c:978
 #, fuzzy
-msgid "Show _Attachment Bar (drop attachments here)"
+msgid "_Attachment Bar (drop attachments here)"
 msgstr "Imigereka"
 
-#: calendar/gui/dialogs/comp-editor.c:979 composer/e-msg-composer.c:3509
-#, fuzzy
-msgid "Attachment Button: Press space key to toggle attachment bar"
-msgstr "Umwanya Urufunguzo Kuri Mukomatanya umugereka"
-
-#: calendar/gui/dialogs/comp-editor.c:1526
-#: calendar/gui/dialogs/comp-editor.c:1569
+#: ../calendar/gui/dialogs/comp-editor.c:1588
+#: ../calendar/gui/dialogs/comp-editor.c:1631
 msgid "Edit Appointment"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1532
-#: calendar/gui/dialogs/comp-editor.c:1575
+#: ../calendar/gui/dialogs/comp-editor.c:1594
+#: ../calendar/gui/dialogs/comp-editor.c:1637
 #, c-format
 msgid "Meeting - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1534
-#: calendar/gui/dialogs/comp-editor.c:1577
+#: ../calendar/gui/dialogs/comp-editor.c:1596
+#: ../calendar/gui/dialogs/comp-editor.c:1639
 #, c-format
 msgid "Appointment - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1538
-#: calendar/gui/dialogs/comp-editor.c:1581
+#: ../calendar/gui/dialogs/comp-editor.c:1600
+#: ../calendar/gui/dialogs/comp-editor.c:1643
 #, c-format
 msgid "Assigned Task - %s"
 msgstr ""
 
 # officecfg/registry\schema\org\openoffice\Office\Common.xcs:....View.Window.Flag..10.text
-#: calendar/gui/dialogs/comp-editor.c:1540
-#: calendar/gui/dialogs/comp-editor.c:1583
+#: ../calendar/gui/dialogs/comp-editor.c:1602
+#: ../calendar/gui/dialogs/comp-editor.c:1645
 #, fuzzy, c-format
 msgid "Task - %s"
 msgstr "Igikorwa"
 
-#: calendar/gui/dialogs/comp-editor.c:1543
-#: calendar/gui/dialogs/comp-editor.c:1586
+#: ../calendar/gui/dialogs/comp-editor.c:1605
+#: ../calendar/gui/dialogs/comp-editor.c:1648
 #, fuzzy, c-format
 msgid "Journal entry - %s"
 msgstr "Icyinjijwe"
 
-#: calendar/gui/dialogs/comp-editor.c:1554
-#: calendar/gui/dialogs/comp-editor.c:1596
+#: ../calendar/gui/dialogs/comp-editor.c:1616
+#: ../calendar/gui/dialogs/comp-editor.c:1658
 #, fuzzy
 msgid "No summary"
 msgstr "Inshamake"
 
-#: calendar/gui/dialogs/comp-editor.c:2033
-#: calendar/gui/dialogs/comp-editor.c:2066
-#: calendar/gui/dialogs/comp-editor.c:2090
+#: ../calendar/gui/dialogs/comp-editor.c:2137
+#: ../calendar/gui/dialogs/comp-editor.c:2170
+#: ../calendar/gui/dialogs/comp-editor.c:2194
 #, fuzzy
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "Kuri iyi Ikintu Gicurasi NIBA Kuvugurura"
 
-#: calendar/gui/dialogs/comp-editor.c:2114
+#: ../calendar/gui/dialogs/comp-editor.c:2218
 #, fuzzy
 msgid "Unable to use current version!"
 msgstr "Kuri Gukoresha KIGEZWEHO Verisiyo"
 
-#: calendar/gui/dialogs/copy-source-dialog.c:61
+#: ../calendar/gui/dialogs/copy-source-dialog.c:61
 #, fuzzy
 msgid "Could not open source"
 msgstr "OYA Gufungura Inkomoko"
 
-#: calendar/gui/dialogs/copy-source-dialog.c:69
+#: ../calendar/gui/dialogs/copy-source-dialog.c:69
 #, fuzzy
 msgid "Could not open destination"
 msgstr "OYA Gufungura Ishyika"
 
-#: calendar/gui/dialogs/copy-source-dialog.c:78
+#: ../calendar/gui/dialogs/copy-source-dialog.c:78
 #, fuzzy
 msgid "Destination is read only"
 msgstr "ni Gusoma"
 
-#: calendar/gui/dialogs/delete-error.c:54
+#: ../calendar/gui/dialogs/delete-error.c:54
 #, fuzzy
 msgid "The event could not be deleted due to a corba error"
 msgstr "Icyabaye OYA Cyasibwe Kuri a Ikosa"
 
-#: calendar/gui/dialogs/delete-error.c:57
+#: ../calendar/gui/dialogs/delete-error.c:57
 #, fuzzy
 msgid "The task could not be deleted due to a corba error"
 msgstr "Igikorwa OYA Cyasibwe Kuri a Ikosa"
 
-#: calendar/gui/dialogs/delete-error.c:60
+#: ../calendar/gui/dialogs/delete-error.c:60
 #, fuzzy
 msgid "The journal entry could not be deleted due to a corba error"
 msgstr "Ikinyamakuru Icyinjijwe OYA Cyasibwe Kuri a Ikosa"
 
-#: calendar/gui/dialogs/delete-error.c:63
+#: ../calendar/gui/dialogs/delete-error.c:63
 #, fuzzy
 msgid "The item could not be deleted due to a corba error"
 msgstr "Ikintu OYA Cyasibwe Kuri a Ikosa"
 
-#: calendar/gui/dialogs/delete-error.c:70
+#: ../calendar/gui/dialogs/delete-error.c:70
 #, fuzzy
 msgid "The event could not be deleted because permission was denied"
 msgstr "Icyabaye OYA Cyasibwe"
 
-#: calendar/gui/dialogs/delete-error.c:73
+#: ../calendar/gui/dialogs/delete-error.c:73
 #, fuzzy
 msgid "The task could not be deleted because permission was denied"
 msgstr "Igikorwa OYA Cyasibwe"
 
-#: calendar/gui/dialogs/delete-error.c:76
+#: ../calendar/gui/dialogs/delete-error.c:76
 #, fuzzy
 msgid "The journal entry could not be deleted because permission was denied"
 msgstr "Ikinyamakuru Icyinjijwe OYA Cyasibwe"
 
-#: calendar/gui/dialogs/delete-error.c:79
+#: ../calendar/gui/dialogs/delete-error.c:79
 #, fuzzy
 msgid "The item could not be deleted because permission was denied"
 msgstr "Ikintu OYA Cyasibwe"
 
-#: calendar/gui/dialogs/delete-error.c:86
+#: ../calendar/gui/dialogs/delete-error.c:86
 #, fuzzy
 msgid "The event could not be deleted due to an error"
 msgstr "Icyabaye OYA Cyasibwe Kuri Ikosa"
 
-#: calendar/gui/dialogs/delete-error.c:89
+#: ../calendar/gui/dialogs/delete-error.c:89
 #, fuzzy
 msgid "The task could not be deleted due to an error"
 msgstr "Igikorwa OYA Cyasibwe Kuri Ikosa"
 
-#: calendar/gui/dialogs/delete-error.c:92
+#: ../calendar/gui/dialogs/delete-error.c:92
 #, fuzzy
 msgid "The journal entry could not be deleted due to an error"
 msgstr "Ikinyamakuru Icyinjijwe OYA Cyasibwe Kuri Ikosa"
 
-#: calendar/gui/dialogs/delete-error.c:95
+#: ../calendar/gui/dialogs/delete-error.c:95
 #, fuzzy
 msgid "The item could not be deleted due to an error"
 msgstr "Ikintu OYA Cyasibwe Kuri Ikosa"
 
-#: calendar/gui/dialogs/e-delegate-dialog.glade.h:1
+#: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:1
 #, fuzzy
 msgid "Contacts..."
 msgstr "Aho kubariza"
 
-#: calendar/gui/dialogs/e-delegate-dialog.glade.h:2
+#: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:2
 msgid "Delegate To:"
 msgstr ""
 
-#: calendar/gui/dialogs/e-delegate-dialog.glade.h:3
+#: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:3
 msgid "Enter Delegate"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:149
+#: ../calendar/gui/dialogs/event-editor.c:141 ../calendar/gui/print.c:2298
+msgid "Appointment"
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-editor.c:150
 msgid "Recurrence"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:161
-#: calendar/gui/dialogs/event-editor.c:233
-#: calendar/gui/dialogs/event-editor.c:397
+#: ../calendar/gui/dialogs/event-editor.c:166
+#: ../calendar/gui/dialogs/event-editor.c:249
+#: ../calendar/gui/dialogs/event-editor.c:422
 msgid "Scheduling"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:168
-#: calendar/gui/dialogs/event-editor.c:236
-#: calendar/gui/dialogs/event-editor.c:400
+# #-#-#-#-#  basctl.pot (Gnome 2.12)  #-#-#-#-#
+# basctl/source\basicide\basidesh.src:RID_POPUP_TABBAR.SID_BASICIDE_DELETECURRENT.text
+# #-#-#-#-#  basctl.pot (Gnome 2.12)  #-#-#-#-#
+# basctl/source\basicide\brkdlg.src:RID_BASICIDE_BREAKPOINTDLG.RID_PB_DEL.text
+#: ../calendar/gui/dialogs/event-editor.c:175
+#, fuzzy
+msgid "Delegatees"
+msgstr "Gusiba"
+
+#: ../calendar/gui/dialogs/event-editor.c:179
+#, fuzzy
+msgid "Attendees"
+msgstr "<B B"
+
+#: ../calendar/gui/dialogs/event-editor.c:252
+#: ../calendar/gui/dialogs/event-editor.c:425
 msgid "Invitations"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:721
+#: ../calendar/gui/dialogs/event-page.c:725
 #, fuzzy
 msgid "Event with no start date"
 msgstr "Na: Oya Gutangira Itariki"
 
-#: calendar/gui/dialogs/event-page.c:724
+#: ../calendar/gui/dialogs/event-page.c:728
 #, fuzzy
 msgid "Event with no end date"
 msgstr "Na: Oya Impera Itariki"
 
-#: calendar/gui/dialogs/event-page.c:890 calendar/gui/dialogs/task-page.c:557
+#: ../calendar/gui/dialogs/event-page.c:894
+#: ../calendar/gui/dialogs/task-page.c:556
 #, fuzzy
 msgid "Start date is wrong"
 msgstr "Gutangira Itariki ni"
 
-#: calendar/gui/dialogs/event-page.c:900
+#: ../calendar/gui/dialogs/event-page.c:904
 #, fuzzy
 msgid "End date is wrong"
 msgstr "Impera Itariki ni"
 
-#: calendar/gui/dialogs/event-page.c:923
+#: ../calendar/gui/dialogs/event-page.c:927
 #, fuzzy
 msgid "Start time is wrong"
 msgstr "Gutangira Igihe ni"
 
-#: calendar/gui/dialogs/event-page.c:930
+#: ../calendar/gui/dialogs/event-page.c:934
 #, fuzzy
 msgid "End time is wrong"
 msgstr "Impera Igihe ni"
 
-#: calendar/gui/dialogs/event-page.c:1676
+#: ../calendar/gui/dialogs/event-page.c:1680
 #, fuzzy, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Kuri Gufungura Kalindari"
 
-#: calendar/gui/dialogs/event-page.c:1882
+#: ../calendar/gui/dialogs/event-page.c:1886
 #, fuzzy, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "%dUMUNSI Mbere"
 
-#: calendar/gui/dialogs/event-page.c:1890
+#: ../calendar/gui/dialogs/event-page.c:1894
 #, fuzzy, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "%dISAHA Mbere"
 
-#: calendar/gui/dialogs/event-page.c:1898
+#: ../calendar/gui/dialogs/event-page.c:1902
 #, fuzzy, c-format
 msgid "%d minute before appointement"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "%dUMUNOTA Mbere"
 
-#: calendar/gui/dialogs/event-page.glade.h:2
+#: ../calendar/gui/dialogs/event-page.glade.h:2
 #, fuzzy
 msgid "1 day before appointment"
 msgstr "1. UMUNSI Mbere"
 
-#: calendar/gui/dialogs/event-page.glade.h:3
+#: ../calendar/gui/dialogs/event-page.glade.h:3
 #, fuzzy
 msgid "1 hour before appointment"
 msgstr "1. ISAHA Mbere"
 
-#: calendar/gui/dialogs/event-page.glade.h:4
+#: ../calendar/gui/dialogs/event-page.glade.h:4
 #, fuzzy
 msgid "15 minutes before appointment"
 msgstr "15 Iminota Mbere"
 
-#: calendar/gui/dialogs/event-page.glade.h:5
-#: calendar/gui/dialogs/task-page.glade.h:1
+#: ../calendar/gui/dialogs/event-page.glade.h:5
+#: ../calendar/gui/dialogs/task-page.glade.h:1
 #, fuzzy
 msgid "<b>Basics</b>"
 msgstr "<B B"
 
-#: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:2
+#: ../calendar/gui/dialogs/event-page.glade.h:6
+#: ../calendar/gui/dialogs/task-page.glade.h:2
 #, fuzzy
 msgid "<b>Date and Time</b>"
 msgstr "<B Na B"
 
-#: calendar/gui/dialogs/event-page.glade.h:7
-#: calendar/gui/dialogs/task-page.glade.h:3
+#: ../calendar/gui/dialogs/event-page.glade.h:7
+#: ../calendar/gui/dialogs/task-page.glade.h:3
 #, fuzzy
 msgid "<b>Send Options</b>"
 msgstr "<B B"
 
-#: calendar/gui/dialogs/event-page.glade.h:8
+#: ../calendar/gui/dialogs/event-page.glade.h:8
 #, fuzzy
 msgid "A_ll day event"
 msgstr "UMUNSI Icyabaye"
 
-#: calendar/gui/dialogs/event-page.glade.h:9
+#: ../calendar/gui/dialogs/event-page.glade.h:9
+#: ../calendar/gui/dialogs/task-page.glade.h:4
 #, fuzzy
-msgid "Ad_vanced  send options"
+msgid "Ad_vanced send options"
 msgstr "Kohereza Amahitamo"
 
 # #-#-#-#-#  basctl.pot (Gnome 2.12)  #-#-#-#-#
 # basctl/source\basicide\basidesh.src:RID_BASICMENU.MN_VIEW.S~ymbolleisten.SID_CUSTOMIZETOOLBOX.text
 # #-#-#-#-#  basctl.pot (Gnome 2.12)  #-#-#-#-#
 # basctl/source\basicide\basidesh.src:RID_BASICPLUGINMENU.MN_PLVIEW.S~ymbolleisten.SID_CUSTOMIZETOOLBOX.text
-#: calendar/gui/dialogs/event-page.glade.h:10
+#: ../calendar/gui/dialogs/event-page.glade.h:10
 #, fuzzy
 msgid "C_ustomize..."
 msgstr "Guhanga..."
 
 # sw/source\ui\misc\glossary.src:DLG_GLOSSARY.PB_BIB.text
-#: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/dialogs/task-page.glade.h:5
+#: ../calendar/gui/dialogs/event-page.glade.h:11
+#: ../calendar/gui/dialogs/task-page.glade.h:5
 #, fuzzy
 msgid "Ca_tegories..."
 msgstr "Ibyiciro..."
 
 # svtools/source\dialogs\addresstemplate.src:STR_FIELD_CALENDAR.text
-#: calendar/gui/dialogs/event-page.glade.h:12
+#: ../calendar/gui/dialogs/event-page.glade.h:12
 #, fuzzy
 msgid "Cale_ndar:"
 msgstr "Kalindari"
 
-#: calendar/gui/dialogs/event-page.glade.h:13
-#: calendar/gui/dialogs/task-page.glade.h:7
+#: ../calendar/gui/dialogs/event-page.glade.h:13
+#: ../calendar/gui/dialogs/task-page.glade.h:7
 msgid "Classi_fication:"
 msgstr ""
 
 # sw/source\ui\wizard\wizmmdlg.src:DLG_WIZARD_MM.DLG_MM3_Edit_FVertr.text
-#: calendar/gui/dialogs/event-page.glade.h:14
-#: calendar/gui/dialogs/task-page.glade.h:8 calendar/gui/e-cal-list-view.c:255
-#: calendar/gui/e-cal-model.c:305 calendar/gui/e-calendar-table.c:362
+#: ../calendar/gui/dialogs/event-page.glade.h:14
+#: ../calendar/gui/dialogs/task-page.glade.h:8
+#: ../calendar/gui/e-cal-list-view.c:255 ../calendar/gui/e-cal-model.c:305
+#: ../calendar/gui/e-calendar-table.c:362
 msgid "Confidential"
 msgstr "Ibanga"
 
-#: calendar/gui/dialogs/event-page.glade.h:15
+#: ../calendar/gui/dialogs/event-page.glade.h:15
 msgid "Event Description"
 msgstr ""
 
 # padmin/source\padialog.src:RID_PADIALOG.RID_PA_TXT_LOCATION.text
-#: calendar/gui/dialogs/event-page.glade.h:16
+#: ../calendar/gui/dialogs/event-page.glade.h:16
 #, fuzzy
 msgid "Locat_ion:"
 msgstr "Intaho:"
 
 # sw/source\ui\envelp\label.src:DLG_LAB.1.TP_PRIVATE_DATA.text
-#: calendar/gui/dialogs/event-page.glade.h:17
-#: calendar/gui/dialogs/task-page.glade.h:10
-#: calendar/gui/e-cal-list-view.c:254 calendar/gui/e-cal-model.c:303
-#: calendar/gui/e-calendar-table.c:361
+#: ../calendar/gui/dialogs/event-page.glade.h:17
+#: ../calendar/gui/dialogs/task-page.glade.h:10
+#: ../calendar/gui/e-cal-list-view.c:254 ../calendar/gui/e-cal-model.c:303
+#: ../calendar/gui/e-calendar-table.c:361
 msgid "Private"
 msgstr "By'umwihariko"
 
 # 4900
-#: calendar/gui/dialogs/event-page.glade.h:18
-#: calendar/gui/dialogs/task-page.glade.h:11
-#: calendar/gui/e-cal-list-view.c:253 calendar/gui/e-cal-model.c:294
-#: calendar/gui/e-cal-model.c:301 calendar/gui/e-calendar-table.c:360
+#: ../calendar/gui/dialogs/event-page.glade.h:18
+#: ../calendar/gui/dialogs/task-page.glade.h:11
+#: ../calendar/gui/e-cal-list-view.c:253 ../calendar/gui/e-cal-model.c:294
+#: ../calendar/gui/e-cal-model.c:301 ../calendar/gui/e-calendar-table.c:360
 msgid "Public"
 msgstr "Rusange"
 
-#: calendar/gui/dialogs/event-page.glade.h:19
+#: ../calendar/gui/dialogs/event-page.glade.h:19
 #, fuzzy
 msgid "Show time as _busy"
 msgstr "Igihe Nka Irahuze"
 
 # wizards/source\importwizard\importwi.src:sSummaryHeader.text
-#: calendar/gui/dialogs/event-page.glade.h:20
-#: calendar/gui/dialogs/task-page.glade.h:13
+#: ../calendar/gui/dialogs/event-page.glade.h:20
+#: ../calendar/gui/dialogs/task-page.glade.h:13
 #, fuzzy
 msgid "Su_mmary:"
 msgstr "Incamake:"
 
-#: calendar/gui/dialogs/event-page.glade.h:21
+#: ../calendar/gui/dialogs/event-page.glade.h:21
 msgid "This appointment has customized alarms"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.glade.h:22
+#: ../calendar/gui/dialogs/event-page.glade.h:22
 msgid "_Alarm"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.glade.h:23
+#: ../calendar/gui/dialogs/event-page.glade.h:23
 #, fuzzy
 msgid "_Description:"
 msgstr "Umwirondoro:"
 
-#: calendar/gui/dialogs/event-page.glade.h:24
-#: calendar/gui/e-meeting-time-sel.c:642
+#: ../calendar/gui/dialogs/event-page.glade.h:24
+#: ../calendar/gui/e-meeting-time-sel.c:642
 #, fuzzy
 msgid "_End time:"
 msgstr "Impera Igihe"
 
-#: calendar/gui/dialogs/event-page.glade.h:25
-#: calendar/gui/e-meeting-time-sel.c:615
+#: ../calendar/gui/dialogs/event-page.glade.h:25
+#: ../calendar/gui/e-meeting-time-sel.c:615
 #, fuzzy
 msgid "_Start time:"
 msgstr "Gutangira Igihe"
 
+#: ../calendar/gui/dialogs/meeting-page.c:303
+#, fuzzy
+msgid "<b>Dele_gatees</b>"
+msgstr "<B B"
+
+#: ../calendar/gui/dialogs/meeting-page.c:307
+#, fuzzy
+msgid "<b>From:</b>"
+msgstr "<B B"
+
 # goodies/source\filter.vcl\eps\dlgeps.src:DLG_EXPORT_EPS.RB_COMPRESSION_NONE.text
 #. an empty string is the same as 'None'
 #. Put the "None" and "UTC" entries at the top of the combo's list.
 #. When "None" is selected we want the field to be cleared.
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: calendar/gui/dialogs/meeting-page.c:296
-#: calendar/gui/dialogs/meeting-page.glade.h:5
-#: calendar/gui/e-cal-model-tasks.c:652 calendar/gui/e-itip-control.c:1104
-#: composer/e-msg-composer.c:2117 filter/filter-rule.c:878
-#: mail/em-account-editor.c:683 mail/em-account-editor.c:1288
-#: mail/em-account-prefs.c:437 mail/em-folder-view.c:1007
-#: plugins/calendar-weather/calendar-weather.c:371
-#: plugins/calendar-weather/calendar-weather.c:425
-#: plugins/itip-formatter/itip-formatter.c:1390
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:190
-#: widgets/misc/e-cell-date-edit.c:248 widgets/misc/e-dateedit.c:458
-#: widgets/misc/e-dateedit.c:1497 widgets/misc/e-dateedit.c:1651
+#: ../calendar/gui/dialogs/meeting-page.c:313
+#: ../calendar/gui/dialogs/meeting-page.glade.h:4
+#: ../calendar/gui/e-cal-model-tasks.c:652
+#: ../calendar/gui/e-itip-control.c:1104 ../composer/e-msg-composer.c:2112
+#: ../filter/filter-rule.c:881 ../mail/em-account-editor.c:683
+#: ../mail/em-account-editor.c:1346 ../mail/em-account-prefs.c:437
+#: ../mail/em-folder-view.c:1062
+#: ../plugins/calendar-weather/calendar-weather.c:371
+#: ../plugins/calendar-weather/calendar-weather.c:425
+#: ../plugins/itip-formatter/itip-formatter.c:1539
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:190
+#: ../widgets/misc/e-cell-date-edit.c:248 ../widgets/misc/e-dateedit.c:465
+#: ../widgets/misc/e-dateedit.c:1504 ../widgets/misc/e-dateedit.c:1673
 msgid "None"
 msgstr "Nta na kimwe"
 
-#: calendar/gui/dialogs/meeting-page.c:435
+#: ../calendar/gui/dialogs/meeting-page.c:463
 #, fuzzy
 msgid "The organizer selected no longer has an account."
 msgstr "Igitunganya... Byahiswemo Oya Aderesi"
 
-#: calendar/gui/dialogs/meeting-page.c:441
+#: ../calendar/gui/dialogs/meeting-page.c:469
 #, fuzzy
 msgid "An organizer is required."
 msgstr "Igitunganya... ni Bya ngombwa"
 
-#: calendar/gui/dialogs/meeting-page.c:456
+#: ../calendar/gui/dialogs/meeting-page.c:484
 #, fuzzy
 msgid "At least one attendee is required."
 msgstr "ni Bya ngombwa"
 
-#: calendar/gui/dialogs/meeting-page.c:781
+#: ../calendar/gui/dialogs/meeting-page.c:886
 msgid "_Delegate To..."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-meeting-list-view.c:309
-#: calendar/gui/e-meeting-time-sel.etspec.h:1
+#: ../calendar/gui/dialogs/meeting-page.etspec.h:1
+#: ../calendar/gui/e-meeting-list-view.c:358
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Attendee"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:2
-#: calendar/gui/e-meeting-time-sel.etspec.h:2
+#: ../calendar/gui/dialogs/meeting-page.etspec.h:2
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:2
 #, fuzzy
 msgid "Click here to add an attendee"
 msgstr "Kuri Kongeramo"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:3
-#: calendar/gui/e-meeting-time-sel.etspec.h:3
+#: ../calendar/gui/dialogs/meeting-page.etspec.h:3
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:3
 msgid "Common Name"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:4
-#: calendar/gui/e-meeting-time-sel.etspec.h:4
+#: ../calendar/gui/dialogs/meeting-page.etspec.h:4
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:4
 msgid "Delegated From"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:5
-#: calendar/gui/e-meeting-time-sel.etspec.h:5
+#: ../calendar/gui/dialogs/meeting-page.etspec.h:5
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:5
 msgid "Delegated To"
 msgstr ""
 
 # setup2/source\ui\pages\plang.src:RESID_PAGE_PAGELANGUAGE.STR_LANGUAGE.text
-#: calendar/gui/dialogs/meeting-page.etspec.h:6
-#: calendar/gui/e-meeting-time-sel.etspec.h:6
+#: ../calendar/gui/dialogs/meeting-page.etspec.h:6
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:6
 msgid "Language"
 msgstr "Ururimi"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:7
-#: calendar/gui/e-meeting-time-sel.etspec.h:7
+#: ../calendar/gui/dialogs/meeting-page.etspec.h:7
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:7
 msgid "Member"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-meeting-list-view.c:334
-#: calendar/gui/e-meeting-time-sel.etspec.h:8
+#: ../calendar/gui/dialogs/meeting-page.etspec.h:8
+#: ../calendar/gui/e-meeting-list-view.c:386
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/dialogs/task-editor.c:146
-#: calendar/gui/e-calendar-table.etspec.h:10
-#: calendar/gui/e-meeting-list-view.c:341
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/em-filter-i18n.h:63
-#: mail/message-list.etspec.h:12
+#: ../calendar/gui/dialogs/meeting-page.etspec.h:10
+#: ../calendar/gui/dialogs/task-editor.c:147
+#: ../calendar/gui/e-calendar-table.etspec.h:10
+#: ../calendar/gui/e-meeting-list-view.c:394
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:63
+#: ../mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Imimerere"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:2
+#: ../calendar/gui/dialogs/meeting-page.glade.h:1
 #, fuzzy
 msgid "<b>Att_endees</b>"
 msgstr "<B B"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:3
+#: ../calendar/gui/dialogs/meeting-page.glade.h:2
 msgid "C_hange Organizer"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-meeting-time-sel.c:428
+#: ../calendar/gui/dialogs/meeting-page.glade.h:3
+#: ../calendar/gui/e-meeting-time-sel.c:428
 #, fuzzy
 msgid "Con_tacts..."
 msgstr "Aho kubariza"
 
 # basctl/source\basicide\macrodlg.src:RID_MACROCHOOSER.RID_PB_ORG.text
-#: calendar/gui/dialogs/meeting-page.glade.h:6
+#: ../calendar/gui/dialogs/meeting-page.glade.h:5
 #, fuzzy
 msgid "Or_ganizer:"
 msgstr "Igitunganya..."
 
 # sfx2/source\dialog\dialog.src:STR_TABPAGE_MANAGESTYLES.text
-#: calendar/gui/dialogs/meeting-page.glade.h:7
+#: ../calendar/gui/dialogs/meeting-page.glade.h:6
 msgid "Organizer"
 msgstr "Muteguzi"
 
 # basctl/source\basicide\macrodlg.src:RID_MACROCHOOSER.RID_PB_ORG.text
-#: calendar/gui/dialogs/meeting-page.glade.h:8
-#: calendar/gui/e-itip-control.glade.h:9
+#: ../calendar/gui/dialogs/meeting-page.glade.h:7
+#: ../calendar/gui/e-itip-control.glade.h:9
 #, fuzzy
 msgid "Organizer:"
 msgstr "Igitunganya..."
 
-#: calendar/gui/dialogs/new-calendar.glade.h:2
+#: ../calendar/gui/dialogs/new-calendar.glade.h:2
 #, fuzzy
 msgid "<b>Calendar options</b>"
 msgstr "<B Amahitamo B"
 
-#: calendar/gui/dialogs/new-calendar.glade.h:3
+#: ../calendar/gui/dialogs/new-calendar.glade.h:3
 msgid "Add New Calendar"
 msgstr ""
 
-#: calendar/gui/dialogs/new-calendar.glade.h:4
+#: ../calendar/gui/dialogs/new-calendar.glade.h:4
 msgid "Calendar Group"
 msgstr ""
 
-#: calendar/gui/dialogs/new-calendar.glade.h:5
+#: ../calendar/gui/dialogs/new-calendar.glade.h:5
 msgid "Calendar Location"
 msgstr ""
 
-#: calendar/gui/dialogs/new-calendar.glade.h:6
+#: ../calendar/gui/dialogs/new-calendar.glade.h:6
 msgid "Calendar Name"
 msgstr ""
 
-#: calendar/gui/dialogs/new-task-list.glade.h:2
+#: ../calendar/gui/dialogs/new-task-list.glade.h:2
 #, fuzzy
 msgid "<b>Task List Options</b>"
 msgstr "<B B"
 
-#: calendar/gui/dialogs/new-task-list.glade.h:3
+#: ../calendar/gui/dialogs/new-task-list.glade.h:3
 msgid "Add New Task List"
 msgstr ""
 
-#: calendar/gui/dialogs/new-task-list.glade.h:4
+#: ../calendar/gui/dialogs/new-task-list.glade.h:4
 msgid "Task List Group"
 msgstr ""
 
-#: calendar/gui/dialogs/new-task-list.glade.h:5
+#: ../calendar/gui/dialogs/new-task-list.glade.h:5
 msgid "Task List Name"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:52
+#: ../calendar/gui/dialogs/recur-comp.c:51
 #, fuzzy
 msgid "You are modifying a recurring event, what would you like to modify?"
 msgstr "a Icyabaye nka Kuri Guhindura"
 
-#: calendar/gui/dialogs/recur-comp.c:56
+#: ../calendar/gui/dialogs/recur-comp.c:55
 #, fuzzy
 msgid "You are modifying a recurring task, what would you like to modify?"
 msgstr "a Igikorwa nka Kuri Guhindura"
 
-#: calendar/gui/dialogs/recur-comp.c:60
+#: ../calendar/gui/dialogs/recur-comp.c:59
 #, fuzzy
 msgid ""
 "You are modifying a recurring journal entry, what would you like to modify?"
 msgstr "a Ikinyamakuru Icyinjijwe nka Kuri Guhindura"
 
-#: calendar/gui/dialogs/recur-comp.c:88
+#: ../calendar/gui/dialogs/recur-comp.c:87
 msgid "This Instance Only"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:92
+#: ../calendar/gui/dialogs/recur-comp.c:91
 #, fuzzy
 msgid "This and Prior Instances"
 msgstr "Na"
 
-#: calendar/gui/dialogs/recur-comp.c:98
+#: ../calendar/gui/dialogs/recur-comp.c:97
 #, fuzzy
 msgid "This and Future Instances"
 msgstr "Na"
 
-#: calendar/gui/dialogs/recur-comp.c:103
+#: ../calendar/gui/dialogs/recur-comp.c:102
 msgid "All Instances"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:493
+#: ../calendar/gui/dialogs/recurrence-page.c:494
 #, fuzzy
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Kirimo Guhindura"
 
-#: calendar/gui/dialogs/recurrence-page.c:812
+#: ../calendar/gui/dialogs/recurrence-page.c:815
 #, fuzzy
 msgid "Recurrence date is invalid"
 msgstr "Itariki ni Sibyo"
@@ -6965,233 +7134,233 @@ msgstr "Itariki ni Sibyo"
 # sc/source\ui\dbgui\scendlg.src:RID_SCDLG_NEWSCENARIO.STR_ON.text
 # #-#-#-#-#  sc.pot (Gnome 2.12)  #-#-#-#-#
 # sc/source\ui\src\globstr.src:RID_GLOBSTR.STR_ON.text
-#: calendar/gui/dialogs/recurrence-page.c:923
+#: ../calendar/gui/dialogs/recurrence-page.c:926
 msgid "on"
 msgstr "ku"
 
-#: calendar/gui/dialogs/recurrence-page.c:984
+#: ../calendar/gui/dialogs/recurrence-page.c:986
 #, fuzzy
 msgid "first"
 msgstr "Itangira"
 
 # sc/source\ui\src\scfuncs.src:RID_SC_FUNCTION_DESCRIPTIONS1.SC_OPCODE_GET_TIME.6.text
-#: calendar/gui/dialogs/recurrence-page.c:985
+#: ../calendar/gui/dialogs/recurrence-page.c:987
 msgid "second"
 msgstr "isegonda"
 
-#: calendar/gui/dialogs/recurrence-page.c:986
+#: ../calendar/gui/dialogs/recurrence-page.c:988
 msgid "third"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:987
+#: ../calendar/gui/dialogs/recurrence-page.c:989
 msgid "fourth"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:988
+#: ../calendar/gui/dialogs/recurrence-page.c:990
 #, fuzzy
 msgid "last"
 msgstr "Iheruka"
 
-#: calendar/gui/dialogs/recurrence-page.c:1011
+#: ../calendar/gui/dialogs/recurrence-page.c:1013
 msgid "Other Date"
 msgstr ""
 
 # sc/source\ui\src\scfuncs.src:RID_SC_FUNCTION_DESCRIPTIONS1.SC_OPCODE_GET_DATE.6.text
-#: calendar/gui/dialogs/recurrence-page.c:1039
+#: ../calendar/gui/dialogs/recurrence-page.c:1041
 msgid "day"
 msgstr "umunsi"
 
-#: calendar/gui/dialogs/recurrence-page.c:1176
+#: ../calendar/gui/dialogs/recurrence-page.c:1178
 #, fuzzy
 msgid "on the"
 msgstr "ku"
 
-#: calendar/gui/dialogs/recurrence-page.c:1362
+#: ../calendar/gui/dialogs/recurrence-page.c:1367
 msgid "occurrences"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:2315
+#: ../calendar/gui/dialogs/recurrence-page.c:2323
 msgid "Date/Time"
 msgstr "Itariki/Igihe"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:1
 #, fuzzy
 msgid "<b>Exceptions</b>"
 msgstr "<B B"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:2 mail/mail-config.glade.h:3
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:2
+#: ../mail/mail-config.glade.h:3
 #, fuzzy
 msgid "<b>Preview</b>"
 msgstr "<B B"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:3
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:3
 #, fuzzy
 msgid "<b>Recurrence</b>"
 msgstr "<B B"
 
 # sw/source\ui\misc\linenum.src:TP_LINENUMBERING.FT_DIV_INTERVAL.text
-#: calendar/gui/dialogs/recurrence-page.glade.h:4
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:4
 msgid "Every"
 msgstr "Buri"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:5
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:5
 msgid "This appointment rec_urs"
 msgstr ""
 
 # sw/source\ui\index\cnttab.src:TP_TOX_SELECT.FT_AREA.text
-#: calendar/gui/dialogs/recurrence-page.glade.h:8
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:8
 msgid "for"
 msgstr "Cya"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:9
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:9
 msgid "forever"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:10
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:10
 msgid "month(s)"
 msgstr "amezi"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:11
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:11
 msgid "until"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:12
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:12
 msgid "week(s)"
 msgstr "ibyumweru"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:13
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:13
 #, fuzzy
 msgid "year(s)"
 msgstr "Umwaka S"
 
-#: calendar/gui/dialogs/task-details-page.c:410
-#: calendar/gui/dialogs/task-details-page.c:429
+#: ../calendar/gui/dialogs/task-details-page.c:410
+#: ../calendar/gui/dialogs/task-details-page.c:429
 #, fuzzy
 msgid "Completed date is wrong"
 msgstr "Itariki ni"
 
-#: calendar/gui/dialogs/task-details-page.c:522
+#: ../calendar/gui/dialogs/task-details-page.c:522
 msgid "Web Page"
 msgstr "Ipaji y'Urubuga"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:1
+#: ../calendar/gui/dialogs/task-details-page.glade.h:1
 #, fuzzy
 msgid "<span weight=\"bold\">Miscellaneous</span>"
 msgstr "<Uburemere UTSINDAGIYE"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:2
+#: ../calendar/gui/dialogs/task-details-page.glade.h:2
 #, fuzzy
 msgid "<span weight=\"bold\">Status</span>"
 msgstr "<Uburemere UTSINDAGIYE"
 
 #. Pass TRUE as is_utc, so it gets converted to the current
 #. timezone.
-#: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-cal-component-preview.c:229
-#: calendar/gui/e-cal-model-tasks.c:345 calendar/gui/e-cal-model-tasks.c:658
-#: calendar/gui/e-calendar-table.c:457 calendar/gui/e-itip-control.c:896
-#: calendar/gui/e-meeting-store.c:196 calendar/gui/e-meeting-store.c:219
-#: calendar/gui/print.c:2361
+#: ../calendar/gui/dialogs/task-details-page.glade.h:4
+#: ../calendar/gui/e-cal-component-preview.c:229
+#: ../calendar/gui/e-cal-model-tasks.c:345
+#: ../calendar/gui/e-cal-model-tasks.c:658
+#: ../calendar/gui/e-calendar-table.c:457 ../calendar/gui/e-itip-control.c:896
+#: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
+#: ../calendar/gui/print.c:2361 ../plugins/save-calendar/csv-format.c:390
 msgid "Completed"
 msgstr ""
 
 # 2806
-#: calendar/gui/dialogs/task-details-page.glade.h:5
-#: calendar/gui/e-cal-component-preview.c:248
-#: calendar/gui/e-calendar-table.c:382 mail/message-list.c:1007
+#: ../calendar/gui/dialogs/task-details-page.glade.h:5
+#: ../calendar/gui/e-cal-component-preview.c:248
+#: ../calendar/gui/e-calendar-table.c:382 ../mail/message-list.c:1008
 msgid "High"
 msgstr "kirekire"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-cal-component-preview.c:226
-#: calendar/gui/e-cal-model-tasks.c:343 calendar/gui/e-cal-model-tasks.c:656
-#: calendar/gui/e-cal-model-tasks.c:731 calendar/gui/e-calendar-table.c:456
-#: calendar/gui/print.c:2358
+#: ../calendar/gui/dialogs/task-details-page.glade.h:6
+#: ../calendar/gui/e-cal-component-preview.c:226
+#: ../calendar/gui/e-cal-model-tasks.c:343
+#: ../calendar/gui/e-cal-model-tasks.c:656
+#: ../calendar/gui/e-cal-model-tasks.c:731
+#: ../calendar/gui/e-calendar-table.c:456 ../calendar/gui/print.c:2358
 msgid "In Progress"
 msgstr ""
 
 # sfx2/source\dialog\mailwindow.src:RID_MAIL_WINDOW.LB_MAILWIN_PRIO.4.text
-#: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-cal-component-preview.c:252
-#: calendar/gui/e-calendar-table.c:384 mail/message-list.c:1005
+#: ../calendar/gui/dialogs/task-details-page.glade.h:7
+#: ../calendar/gui/e-cal-component-preview.c:252
+#: ../calendar/gui/e-calendar-table.c:384 ../mail/message-list.c:1006
 msgid "Low"
 msgstr "Byo hasi"
 
 # officecfg/registry\schema\org\openoffice\Office\Common.xcs:....Save.Graphic.Format..0.text
-#: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-component-preview.c:250 calendar/gui/e-cal-model.c:899
-#: calendar/gui/e-calendar-table.c:383 mail/message-list.c:1006
+#: ../calendar/gui/dialogs/task-details-page.glade.h:8
+#: ../calendar/gui/e-cal-component-preview.c:250
+#: ../calendar/gui/e-cal-model.c:899 ../calendar/gui/e-calendar-table.c:383
+#: ../mail/message-list.c:1007
 msgid "Normal"
 msgstr "Bisanzwe"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-cal-component-preview.c:236
-#: calendar/gui/e-cal-model-tasks.c:341 calendar/gui/e-cal-model-tasks.c:654
-#: calendar/gui/e-calendar-table.c:455 calendar/gui/print.c:2355
+#: ../calendar/gui/dialogs/task-details-page.glade.h:9
+#: ../calendar/gui/e-cal-component-preview.c:236
+#: ../calendar/gui/e-cal-model-tasks.c:341
+#: ../calendar/gui/e-cal-model-tasks.c:654
+#: ../calendar/gui/e-calendar-table.c:455 ../calendar/gui/print.c:2355
 msgid "Not Started"
 msgstr "Itaratangira"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: ../calendar/gui/dialogs/task-details-page.glade.h:10
 #, fuzzy
 msgid "P_ercent complete:"
 msgstr "Byuzuye"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:385
+#: ../calendar/gui/dialogs/task-details-page.glade.h:11
+#: ../calendar/gui/e-calendar-table.c:385
 #, fuzzy
 msgid "Undefined"
 msgstr "kidasobanuye"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:12
+#: ../calendar/gui/dialogs/task-details-page.glade.h:12
 msgid "_Date completed:"
 msgstr ""
 
 # sfx2/source\dialog\mailwindow.src:RID_MAIL_WINDOW.FT_MAILWIN_PRIO.text
-#: calendar/gui/dialogs/task-details-page.glade.h:13
-#: widgets/misc/e-send-options.glade.h:34
+#: ../calendar/gui/dialogs/task-details-page.glade.h:13
+#: ../widgets/misc/e-send-options.glade.h:31
 #, fuzzy
 msgid "_Priority:"
 msgstr "By'ibanze"
 
 # svx/source\dialog\spldlg.src:RID_SVXDLG_SPELLCHECK.FI_STATE.quickhelptext
-#: calendar/gui/dialogs/task-details-page.glade.h:14
+#: ../calendar/gui/dialogs/task-details-page.glade.h:14
 #, fuzzy
 msgid "_Status:"
 msgstr "Imimerere:"
 
 # scp/source\office\profile.lng:STR_DIR_MENU_WIZARD_WEBSEITE.text
-#: calendar/gui/dialogs/task-details-page.glade.h:15
+#: ../calendar/gui/dialogs/task-details-page.glade.h:15
 #, fuzzy
 msgid "_Web Page:"
 msgstr "Ipaji y'Urubuga..."
 
 # officecfg/registry\schema\org\openoffice\Office\Common.xcs:....View.Window.Flag..10.text
-#: calendar/gui/dialogs/task-editor.c:137 calendar/gui/print.c:2300
+#: ../calendar/gui/dialogs/task-editor.c:138 ../calendar/gui/print.c:2300
 msgid "Task"
 msgstr "Igikorwa"
 
-#: calendar/gui/dialogs/task-editor.c:157
-#: calendar/gui/dialogs/task-editor.c:219
-#: calendar/gui/dialogs/task-editor.c:373
+#: ../calendar/gui/dialogs/task-editor.c:163
+#: ../calendar/gui/dialogs/task-editor.c:225
+#: ../calendar/gui/dialogs/task-editor.c:379
 msgid "Assignment"
 msgstr "Igenera"
 
-#: calendar/gui/dialogs/task-page.c:530
+#: ../calendar/gui/dialogs/task-page.c:529
 #, fuzzy
 msgid "Due date is wrong"
 msgstr "Itariki ni"
 
-#: calendar/gui/dialogs/task-page.c:874
+#: ../calendar/gui/dialogs/task-page.c:873
 #, fuzzy, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Kuri Gufungura Ibikorwa in"
 
-#: calendar/gui/dialogs/task-page.glade.h:4
-#, fuzzy
-msgid "Ad_vanced send options"
-msgstr "Kohereza Amahitamo"
-
-#: calendar/gui/dialogs/task-page.glade.h:9
+#: ../calendar/gui/dialogs/task-page.glade.h:9
 #, fuzzy
 msgid "D_escription:"
 msgstr "Umwirondoro:"
@@ -7212,16 +7381,16 @@ msgstr "Umwirondoro:"
 # scaddins/source\datefunc\datefunc.src:RID_DATE_FUNCTION_DESCRIPTIONS.DATE_FUNCDESC_DiffMonths.2.text
 # #-#-#-#-#  scaddins.pot (Gnome 2.12)  #-#-#-#-#
 # scaddins/source\datefunc\datefunc.src:RID_DATE_FUNCTION_DESCRIPTIONS.DATE_FUNCDESC_DiffYears.2.text
-#: calendar/gui/dialogs/task-page.glade.h:12
+#: ../calendar/gui/dialogs/task-page.glade.h:12
 #, fuzzy
 msgid "Sta_rt date:"
 msgstr "Itariki y'itangira"
 
-#: calendar/gui/dialogs/task-page.glade.h:14
+#: ../calendar/gui/dialogs/task-page.glade.h:14
 msgid "Task Description"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.glade.h:15
+#: ../calendar/gui/dialogs/task-page.glade.h:15
 #, fuzzy
 msgid "_Due date:"
 msgstr "Itariki"
@@ -7230,148 +7399,155 @@ msgstr "Itariki"
 # sc/source\ui\src\menue.src:SCCFG_PLUGINMENU.SUBMENU_DATA.SUBMENU_OUTLINE.SID_OUTLINE_MAKE.text
 # #-#-#-#-#  sc.pot (Gnome 2.12)  #-#-#-#-#
 # sc/source\ui\src\menue.src:SCCFG_MENUBAR.SUBMENU_DATA.SUBMENU_OUTLINE.SID_OUTLINE_MAKE.text
-#: calendar/gui/dialogs/task-page.glade.h:16
+#: ../calendar/gui/dialogs/task-page.glade.h:16
 #, fuzzy
 msgid "_Group:"
 msgstr "Itsinda..."
 
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:3
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:3
 #, fuzzy
 msgid "<b>Free/Busy C_alendars</b>"
 msgstr "<B B"
 
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:4
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:4
 #, fuzzy
 msgid "<b>Publishing Frequency</b>"
 msgstr "<B B"
 
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:5
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:5
 #, fuzzy
 msgid "<b>Publishing _Location</b>"
 msgstr "<B B"
 
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:6
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:6
 msgid "Free/Busy Publishing Settings"
 msgstr ""
 
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:7
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:7
 msgid "_Daily"
 msgstr ""
 
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:8
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:8
 #, fuzzy
 msgid "_Manual"
 msgstr "Bikorwa"
 
 # basctl/source\basicide\moduldlg.src:RID_TP_LIBS.RID_PB_PASSWORD.text
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:9
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:9
 #, fuzzy
 msgid "_Password:"
 msgstr "Ijambobanga..."
 
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:10
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:10
 #, fuzzy
 msgid "_Remember password"
 msgstr "Kwibuka ijambobanga"
 
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:11
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:11
 #, fuzzy
 msgid "_Username:"
 msgstr "Izina ry'ukoresha"
 
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:12
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:12
 #, fuzzy
 msgid "_Weekly"
 msgstr "Buri kyumweru"
 
-#: calendar/gui/e-alarm-list.c:395
+#: ../calendar/gui/e-alarm-list.c:395
 #, fuzzy, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%dUMUNSI"
 
-#: calendar/gui/e-alarm-list.c:400
+#: ../calendar/gui/e-alarm-list.c:400
 #, fuzzy, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%dIcyumweru"
 
-#: calendar/gui/e-alarm-list.c:405
+#: ../calendar/gui/e-alarm-list.c:405
 #, fuzzy, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%dISAHA"
 
-#: calendar/gui/e-alarm-list.c:410
+#: ../calendar/gui/e-alarm-list.c:410
 #, fuzzy, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%dUMUNOTA"
 
-#: calendar/gui/e-alarm-list.c:415
+#: ../calendar/gui/e-alarm-list.c:415
 #, fuzzy, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%dISEGONDA"
 
-#: calendar/gui/e-alarm-list.c:462
+#: ../calendar/gui/e-alarm-list.c:462
 #, fuzzy
 msgid "Unknown action to be performed"
 msgstr "Igikorwa Kuri"
 
-#: calendar/gui/e-alarm-list.c:474
+#. Translator: The first %s refers to the base, which would be actions like
+#. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
+#: ../calendar/gui/e-alarm-list.c:476
 #, fuzzy, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s%sMbere Gutangira Bya"
 
-#: calendar/gui/e-alarm-list.c:477
+#. Translator: The first %s refers to the base, which would be actions like
+#. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
+#: ../calendar/gui/e-alarm-list.c:481
 #, fuzzy, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "%s%sNyuma Gutangira Bya"
 
-#: calendar/gui/e-alarm-list.c:482
+#. Translator: The %s refers to the base, which would be actions like
+#. * "Play a sound"
+#: ../calendar/gui/e-alarm-list.c:488
 #, fuzzy, c-format
 msgid "%s at the start of the appointment"
 msgstr "%sku Gutangira Bya"
 
-#: calendar/gui/e-alarm-list.c:491
+#: ../calendar/gui/e-alarm-list.c:497
 #, fuzzy, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "%s%sMbere Impera Bya"
 
-#: calendar/gui/e-alarm-list.c:494
+#: ../calendar/gui/e-alarm-list.c:500
 #, fuzzy, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "%s%sNyuma Impera Bya"
 
-#: calendar/gui/e-alarm-list.c:499
+#: ../calendar/gui/e-alarm-list.c:505
 #, fuzzy, c-format
 msgid "%s at the end of the appointment"
 msgstr "%sku Impera Bya"
 
-#: calendar/gui/e-alarm-list.c:521
+#: ../calendar/gui/e-alarm-list.c:527
 #, fuzzy, c-format
 msgid "%s at %s"
 msgstr "%sku"
 
-#: calendar/gui/e-alarm-list.c:527
+#: ../calendar/gui/e-alarm-list.c:533
 #, fuzzy, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%skugirango Kitazwi Imbarutso Ubwoko"
 
-#: calendar/gui/e-cal-component-preview.c:70 mail/em-folder-view.c:2609
+#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2693
 #, fuzzy, c-format
 msgid "Click to open %s"
 msgstr "Kuri Gufungura"
 
 # filter/source\xsltdialog\xmlfilterdialogstrings.src:STR_DEFAULT_UI_NAME.text
-#: calendar/gui/e-cal-component-preview.c:155 filter/filter-rule.c:795
+#: ../calendar/gui/e-cal-component-preview.c:155 ../filter/filter-rule.c:796
 msgid "Untitled"
 msgstr "Nta mutwe"
 
 # wizards/source\importwizard\importwi.src:sSummaryHeader.text
-#: calendar/gui/e-cal-component-preview.c:186
-#: calendar/gui/e-itip-control.c:1108 calendar/gui/e-itip-control.glade.h:11
+#: ../calendar/gui/e-cal-component-preview.c:186
+#: ../calendar/gui/e-itip-control.c:1108
+#: ../calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Incamake:"
 
@@ -7391,13 +7567,13 @@ msgstr "Incamake:"
 # scaddins/source\datefunc\datefunc.src:RID_DATE_FUNCTION_DESCRIPTIONS.DATE_FUNCDESC_DiffMonths.2.text
 # #-#-#-#-#  scaddins.pot (Gnome 2.12)  #-#-#-#-#
 # scaddins/source\datefunc\datefunc.src:RID_DATE_FUNCTION_DESCRIPTIONS.DATE_FUNCDESC_DiffYears.2.text
-#: calendar/gui/e-cal-component-preview.c:193
-#: calendar/gui/e-cal-component-preview.c:204
+#: ../calendar/gui/e-cal-component-preview.c:193
+#: ../calendar/gui/e-cal-component-preview.c:204
 #, fuzzy
 msgid "Start Date:"
 msgstr "Itariki y'itangira"
 
-#: calendar/gui/e-cal-component-preview.c:215
+#: ../calendar/gui/e-cal-component-preview.c:215
 msgid "Due Date:"
 msgstr ""
 
@@ -7405,19 +7581,19 @@ msgstr ""
 #. write status
 #. translators: exchange out of office status header
 #. Status
-#: calendar/gui/e-cal-component-preview.c:222
-#: calendar/gui/e-itip-control.c:1132
-#: plugins/exchange-account-setup/exchange-account-setup.c:209
-#: plugins/itip-formatter/itip-view.c:884
+#: ../calendar/gui/e-cal-component-preview.c:222
+#: ../calendar/gui/e-itip-control.c:1132
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:227
+#: ../plugins/itip-formatter/itip-view.c:888
 msgid "Status:"
 msgstr "Imimerere:"
 
 # sfx2/source\dialog\mailwindow.src:RID_MAIL_WINDOW.FT_MAILWIN_PRIO.text
-#: calendar/gui/e-cal-component-preview.c:246
+#: ../calendar/gui/e-cal-component-preview.c:246
 msgid "Priority:"
 msgstr "By'ibanze"
 
-#: calendar/gui/e-cal-component-preview.c:299
+#: ../calendar/gui/e-cal-component-preview.c:299
 msgid "Web Page:"
 msgstr "Ipaji rya webu:"
 
@@ -7431,7 +7607,7 @@ msgstr "Ipaji rya webu:"
 # scaddins/source\datefunc\datefunc.src:RID_DATE_FUNCTION_DESCRIPTIONS.DATE_FUNCDESC_DiffMonths.4.text
 # #-#-#-#-#  scaddins.pot (Gnome 2.12)  #-#-#-#-#
 # scaddins/source\datefunc\datefunc.src:RID_DATE_FUNCTION_DESCRIPTIONS.DATE_FUNCDESC_DiffYears.4.text
-#: calendar/gui/e-cal-list-view.etspec.h:2
+#: ../calendar/gui/e-cal-list-view.etspec.h:2
 #, fuzzy
 msgid "End Date"
 msgstr "Itariki y'irangiza"
@@ -7452,64 +7628,31 @@ msgstr "Itariki y'irangiza"
 # scaddins/source\datefunc\datefunc.src:RID_DATE_FUNCTION_DESCRIPTIONS.DATE_FUNCDESC_DiffMonths.2.text
 # #-#-#-#-#  scaddins.pot (Gnome 2.12)  #-#-#-#-#
 # scaddins/source\datefunc\datefunc.src:RID_DATE_FUNCTION_DESCRIPTIONS.DATE_FUNCDESC_DiffYears.2.text
-#: calendar/gui/e-cal-list-view.etspec.h:4
+#: ../calendar/gui/e-cal-list-view.etspec.h:4
 #, fuzzy
 msgid "Start Date"
 msgstr "Itariki y'itangira"
 
-#: calendar/gui/e-cal-list-view.etspec.h:5
-#: calendar/gui/e-calendar-table.etspec.h:11 mail/mail-dialogs.glade.h:17
+#: ../calendar/gui/e-cal-list-view.etspec.h:5
+#: ../calendar/gui/e-calendar-table.etspec.h:11
+#: ../mail/mail-dialogs.glade.h:17 ../plugins/save-calendar/csv-format.c:386
 msgid "Summary"
 msgstr "Inshamake"
 
 # svx/source\dialog\labdlg.src:RID_SVXPAGE_CAPTION.LB_WINKEL.1.text
-#: calendar/gui/e-cal-model-calendar.c:179 calendar/gui/e-calendar-table.c:434
+#: ../calendar/gui/e-cal-model-calendar.c:179
+#: ../calendar/gui/e-calendar-table.c:434
 msgid "Free"
 msgstr "Kigenga"
 
 # svtools/source\dialogs\prnsetup.src:STR_SVT_PRNDLG_BUSY.text
-#: calendar/gui/e-cal-model-calendar.c:182 calendar/gui/e-calendar-table.c:435
-#: calendar/gui/e-meeting-time-sel.c:412
+#: ../calendar/gui/e-cal-model-calendar.c:182
+#: ../calendar/gui/e-calendar-table.c:435
+#: ../calendar/gui/e-meeting-time-sel.c:412
 msgid "Busy"
 msgstr "Irahuze"
 
-# #-#-#-#-#  scaddins.pot (Gnome 2.12)  #-#-#-#-#
-# scaddins/source\analysis\analysis.src:RID_ANALYSIS_FUNCTION_DESCRIPTIONS.ANALYSIS_Seriessum.4.text
-# #-#-#-#-#  scaddins.pot (Gnome 2.12)  #-#-#-#-#
-# scaddins/source\analysis\analysis.src:RID_ANALYSIS_FUNCTION_DESCRIPTIONS.ANALYSIS_Besseli.4.text
-# #-#-#-#-#  scaddins.pot (Gnome 2.12)  #-#-#-#-#
-# scaddins/source\analysis\analysis.src:RID_ANALYSIS_FUNCTION_DESCRIPTIONS.ANALYSIS_Besselj.4.text
-# #-#-#-#-#  scaddins.pot (Gnome 2.12)  #-#-#-#-#
-# scaddins/source\analysis\analysis.src:RID_ANALYSIS_FUNCTION_DESCRIPTIONS.ANALYSIS_Besselk.4.text
-# #-#-#-#-#  scaddins.pot (Gnome 2.12)  #-#-#-#-#
-# scaddins/source\analysis\analysis.src:RID_ANALYSIS_FUNCTION_DESCRIPTIONS.ANALYSIS_Bessely.4.text
-#: calendar/gui/e-cal-model-tasks.c:297
-msgid "N"
-msgstr "N"
-
-# #-#-#-#-#  sc.pot (Gnome 2.12)  #-#-#-#-#
-# sc/source\ui\src\scfuncs.src:RID_SC_FUNCTION_DESCRIPTIONS1.SC_OPCODE_KUM_KAP_Z.8.text
-# #-#-#-#-#  sc.pot (Gnome 2.12)  #-#-#-#-#
-# sc/source\ui\src\scfuncs.src:RID_SC_FUNCTION_DESCRIPTIONS1.SC_OPCODE_KUM_ZINS_Z.8.text
-# #-#-#-#-#  sc.pot (Gnome 2.12)  #-#-#-#-#
-# sc/source\ui\src\scfuncs.src:RID_SC_FUNCTION_DESCRIPTIONS1.SC_OPCODE_VBD.8.text
-#: calendar/gui/e-cal-model-tasks.c:297
-msgid "S"
-msgstr "S"
-
-# #-#-#-#-#  sc.pot (Gnome 2.12)  #-#-#-#-#
-# sc/source\ui\src\scfuncs.src:RID_SC_FUNCTION_DESCRIPTIONS1.SC_OPCODE_KUM_KAP_Z.10.text
-# #-#-#-#-#  sc.pot (Gnome 2.12)  #-#-#-#-#
-# sc/source\ui\src\scfuncs.src:RID_SC_FUNCTION_DESCRIPTIONS1.SC_OPCODE_KUM_ZINS_Z.10.text
-#: calendar/gui/e-cal-model-tasks.c:299 smime/lib/e-cert.c:681
-msgid "E"
-msgstr "E"
-
-#: calendar/gui/e-cal-model-tasks.c:299
-msgid "W"
-msgstr "W"
-
-#: calendar/gui/e-cal-model-tasks.c:606
+#: ../calendar/gui/e-cal-model-tasks.c:606
 #, fuzzy
 msgid ""
 "The geographical position must be entered in the format: \n"
@@ -7517,104 +7660,112 @@ msgid ""
 "45.436845,125.862501"
 msgstr "Ibirindiro in Imiterere"
 
-#: calendar/gui/e-cal-model-tasks.c:1017 calendar/gui/e-cal-model.c:905
-#: calendar/gui/e-meeting-list-view.c:163 calendar/gui/e-meeting-store.c:168
-#: calendar/gui/e-meeting-store.c:178 calendar/gui/e-meeting-store.c:808
+#: ../calendar/gui/e-cal-model-tasks.c:1017 ../calendar/gui/e-cal-model.c:905
+#: ../calendar/gui/e-meeting-list-view.c:192
+#: ../calendar/gui/e-meeting-store.c:168 ../calendar/gui/e-meeting-store.c:178
+#: ../calendar/gui/e-meeting-store.c:808
+#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "Yego"
 
-#: calendar/gui/e-cal-model-tasks.c:1017 calendar/gui/e-cal-model.c:905
-#: calendar/gui/e-meeting-list-view.c:164 calendar/gui/e-meeting-store.c:180
+#: ../calendar/gui/e-cal-model-tasks.c:1017 ../calendar/gui/e-cal-model.c:905
+#: ../calendar/gui/e-meeting-list-view.c:193
+#: ../calendar/gui/e-meeting-store.c:180
+#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "Oya"
 
 # filter/source\xsltdialog\xmlfilterdialogstrings.src:STR_UNKNOWN_APPLICATION.text
 #. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:307 calendar/gui/e-cal-model.c:310
-#: calendar/gui/e-itip-control.c:1149 calendar/gui/e-itip-control.c:1290
-#: calendar/gui/e-meeting-list-view.c:139
-#: calendar/gui/e-meeting-list-view.c:153 calendar/gui/e-meeting-store.c:124
-#: calendar/gui/e-meeting-store.c:159 calendar/gui/e-meeting-store.c:224
-#: mail/em-utils.c:1175 plugins/itip-formatter/itip-formatter.c:251
-#: plugins/itip-formatter/itip-formatter.c:1412
-#: plugins/plugin-manager/plugin-manager.c:72 shell/e-component-registry.c:201
-#: shell/e-component-registry.c:205 widgets/misc/e-charset-picker.c:62
+#: ../calendar/gui/e-cal-model.c:307 ../calendar/gui/e-cal-model.c:310
+#: ../calendar/gui/e-itip-control.c:1149 ../calendar/gui/e-itip-control.c:1290
+#: ../calendar/gui/e-meeting-list-view.c:168
+#: ../calendar/gui/e-meeting-list-view.c:182
+#: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:159
+#: ../calendar/gui/e-meeting-store.c:224 ../mail/em-utils.c:1175
+#: ../plugins/itip-formatter/itip-formatter.c:235
+#: ../plugins/itip-formatter/itip-formatter.c:1564
+#: ../plugins/plugin-manager/plugin-manager.c:72
+#: ../shell/e-component-registry.c:205 ../shell/e-component-registry.c:211
+#: ../widgets/misc/e-charset-picker.c:62
 msgid "Unknown"
 msgstr "Kitazwi"
 
-#: calendar/gui/e-cal-model.c:901
+#: ../calendar/gui/e-cal-model.c:901
 msgid "Recurring"
 msgstr ""
 
-#: calendar/gui/e-cal-model.c:903
+#: ../calendar/gui/e-cal-model.c:903
 msgid "Assigned"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:404
+#: ../calendar/gui/e-calendar-table.c:404
 #, fuzzy
 msgid "0%"
 msgstr "0"
 
 # officecfg/registry\data\org\openoffice\Office\Common.xcu:..Common.View.Localisation.DialogScale.text
-#: calendar/gui/e-calendar-table.c:405
+#: ../calendar/gui/e-calendar-table.c:405
 #, fuzzy
 msgid "10%"
 msgstr "10"
 
-#: calendar/gui/e-calendar-table.c:406
+#: ../calendar/gui/e-calendar-table.c:406
 #, fuzzy
 msgid "20%"
 msgstr "20"
 
-#: calendar/gui/e-calendar-table.c:407
+#: ../calendar/gui/e-calendar-table.c:407
 msgid "30%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:408
+#: ../calendar/gui/e-calendar-table.c:408
 msgid "40%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:409
+#: ../calendar/gui/e-calendar-table.c:409
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:410
+#: ../calendar/gui/e-calendar-table.c:410
 msgid "60%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:411
+#: ../calendar/gui/e-calendar-table.c:411
 msgid "70%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:412
+#: ../calendar/gui/e-calendar-table.c:412
 msgid "80%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:413
+#: ../calendar/gui/e-calendar-table.c:413
 msgid "90%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:414
+#: ../calendar/gui/e-calendar-table.c:414
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:516
+#: ../calendar/gui/e-calendar-table.c:516
 msgid "Task Table"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:694 calendar/gui/e-calendar-view.c:652
+#: ../calendar/gui/e-calendar-table.c:694
+#: ../calendar/gui/e-calendar-view.c:653
 #, fuzzy
 msgid "Deleting selected objects"
 msgstr "Byahiswemo Ibintu"
 
-#: calendar/gui/e-calendar-table.c:873 calendar/gui/e-calendar-view.c:756
+#: ../calendar/gui/e-calendar-table.c:873
+#: ../calendar/gui/e-calendar-view.c:780
 #, fuzzy
 msgid "Updating objects"
 msgstr "Ibintu"
 
 # sfx2/source\doc\doc.src:STR_SAVEASDOC.text
-#: calendar/gui/e-calendar-table.c:1014 calendar/gui/e-calendar-view.c:1066
-#: composer/e-msg-composer.c:1241
+#: ../calendar/gui/e-calendar-table.c:1014
+#: ../calendar/gui/e-calendar-view.c:1083 ../composer/e-msg-composer.c:1241
 #, fuzzy
 msgid "Save as..."
 msgstr "Gushyingura muri..."
@@ -7625,65 +7776,67 @@ msgstr "Gushyingura muri..."
 # sfx2/source\dialog\cfg.src:STR_OPEN.text
 # #-#-#-#-#  sfx2.pot (Gnome 2.12)  #-#-#-#-#
 # sfx2/source\dialog\versdlg.src:DLG_VERSIONS.PB_OPEN.text
-#: calendar/gui/e-calendar-table.c:1156 calendar/gui/e-calendar-view.c:1399
-#: ui/evolution-addressbook.xml.h:37
+#: ../calendar/gui/e-calendar-table.c:1156
+#: ../calendar/gui/e-calendar-view.c:1506 ../ui/evolution-addressbook.xml.h:37
 #, fuzzy
 msgid "_Open"
 msgstr "Gufungura"
 
-#: calendar/gui/e-calendar-table.c:1157
+#: ../calendar/gui/e-calendar-table.c:1157
 msgid "Open _Web Page"
 msgstr ""
 
 # sfx2/source\doc\doc.src:STR_SAVEASDOC.text
-#: calendar/gui/e-calendar-table.c:1158 calendar/gui/e-calendar-view.c:1400
-#: mail/em-folder-view.c:990 mail/em-popup.c:494
-#: ui/evolution-mail-message.xml.h:124
+#: ../calendar/gui/e-calendar-table.c:1158
+#: ../calendar/gui/e-calendar-view.c:1507 ../mail/em-folder-view.c:1043
+#: ../mail/em-popup.c:494
 #, fuzzy
 msgid "_Save As..."
 msgstr "Gushyingura muri..."
 
 # sfx2/source\appl\newhelp.src:STR_HELP_BUTTON_PRINT.text
-#: calendar/gui/e-calendar-table.c:1159 calendar/gui/e-calendar-view.c:1380
-#: calendar/gui/e-calendar-view.c:1401 ui/evolution-addressbook.xml.h:40
-#: ui/evolution-calendar.xml.h:44 ui/evolution-mail-message.xml.h:121
-#: ui/evolution-tasks.xml.h:25
+#: ../calendar/gui/e-calendar-table.c:1159
+#: ../calendar/gui/e-calendar-view.c:1487
+#: ../calendar/gui/e-calendar-view.c:1508 ../mail/em-folder-view.c:1044
+#: ../ui/evolution-addressbook.xml.h:40 ../ui/evolution-calendar.xml.h:44
+#: ../ui/evolution-mail-message.xml.h:117 ../ui/evolution-tasks.xml.h:25
 #, fuzzy
 msgid "_Print..."
 msgstr "Gucapa..."
 
 # dbaccess/source/ui/inc/toolbox.hrc:MID_SBA_QRY_CUT.text
-#: calendar/gui/e-calendar-table.c:1163 calendar/gui/e-calendar-view.c:1405
-#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
-#: ui/evolution-tasks.xml.h:1
+#: ../calendar/gui/e-calendar-table.c:1163
+#: ../calendar/gui/e-calendar-view.c:1512 ../ui/evolution-addressbook.xml.h:1
+#: ../ui/evolution-calendar.xml.h:1 ../ui/evolution-tasks.xml.h:1
 #, fuzzy
 msgid "C_ut"
 msgstr "Gukata"
 
 # dbaccess/source/ui/inc/toolbox.hrc:MID_SBA_QRY_PASTE.text
-#: calendar/gui/e-calendar-table.c:1165 calendar/gui/e-calendar-view.c:1383
-#: calendar/gui/e-calendar-view.c:1407 ui/evolution-addressbook.xml.h:38
-#: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-message.xml.h:119 ui/evolution-tasks.xml.h:24
+#: ../calendar/gui/e-calendar-table.c:1165
+#: ../calendar/gui/e-calendar-view.c:1490
+#: ../calendar/gui/e-calendar-view.c:1514 ../ui/evolution-addressbook.xml.h:38
+#: ../ui/evolution-calendar.xml.h:43 ../ui/evolution-composer-entries.xml.h:9
+#: ../ui/evolution-tasks.xml.h:24
 #, fuzzy
 msgid "_Paste"
 msgstr "Komeka"
 
-#: calendar/gui/e-calendar-table.c:1169
+#: ../calendar/gui/e-calendar-table.c:1169
 msgid "_Assign Task"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1170
+#: ../calendar/gui/e-calendar-table.c:1170
 #, fuzzy
 msgid "_Forward as iCalendar"
 msgstr "Nka"
 
-#: calendar/gui/e-calendar-table.c:1171
+#: ../calendar/gui/e-calendar-table.c:1171
 #, fuzzy
 msgid "_Mark as Complete"
 msgstr "Nka"
 
-#: calendar/gui/e-calendar-table.c:1172
+#: ../calendar/gui/e-calendar-table.c:1172
 #, fuzzy
 msgid "_Mark Selected Tasks as Complete"
 msgstr "Nka"
@@ -7693,46 +7846,48 @@ msgstr "Nka"
 # #-#-#-#-#  basctl.pot (Gnome 2.12)  #-#-#-#-#
 # basctl/source\basicide\brkdlg.src:RID_BASICIDE_BREAKPOINTDLG.RID_PB_DEL.text
 #. FIXME: need to disable for undeletable folders
-#: calendar/gui/e-calendar-table.c:1176 calendar/gui/e-calendar-view.c:1418
-#: mail/em-folder-tree.c:2815 mail/em-folder-view.c:994
-#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
-#: ui/evolution-mail-message.xml.h:108 ui/evolution-tasks.xml.h:21
+#: ../calendar/gui/e-calendar-table.c:1176
+#: ../calendar/gui/e-calendar-view.c:1526 ../mail/em-folder-tree.c:2119
+#: ../mail/em-folder-view.c:1047 ../ui/evolution-addressbook.xml.h:33
+#: ../ui/evolution-calendar.xml.h:40 ../ui/evolution-mail-list.xml.h:26
+#: ../ui/evolution-tasks.xml.h:21
 #, fuzzy
 msgid "_Delete"
 msgstr "Gusiba"
 
-#: calendar/gui/e-calendar-table.c:1177
+#: ../calendar/gui/e-calendar-table.c:1177
 msgid "_Delete Selected Tasks"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1328
-#: calendar/gui/e-calendar-table.etspec.h:4
+#: ../calendar/gui/e-calendar-table.c:1328
+#: ../calendar/gui/e-calendar-table.etspec.h:4
 #, fuzzy
 msgid "Click to add a task"
 msgstr "Kuri Kongeramo a Igikorwa"
 
-#: calendar/gui/e-calendar-table.etspec.h:2
+#: ../calendar/gui/e-calendar-table.etspec.h:2
 #, no-c-format
 msgid "% Complete"
 msgstr ""
 
 # officecfg/registry\schema\org\openoffice\Office\DataAccess.xcs:....FormSearchOptions.SearchPosition..complete-field.text
-#: calendar/gui/e-calendar-table.etspec.h:5 mail/mail-send-recv.c:617
+#: ../calendar/gui/e-calendar-table.etspec.h:5 ../mail/mail-send-recv.c:617
 msgid "Complete"
 msgstr "Byuzuye"
 
-#: calendar/gui/e-calendar-table.etspec.h:6
+#: ../calendar/gui/e-calendar-table.etspec.h:6
 #, fuzzy
 msgid "Completion date"
 msgstr "Itariki"
 
-#: calendar/gui/e-calendar-table.etspec.h:7
+#: ../calendar/gui/e-calendar-table.etspec.h:7
 #, fuzzy
 msgid "Due date"
 msgstr "Itariki"
 
 # sw/source\ui\wizard\wizmmdlg.src:DLG_WIZARD_MM.DLG_MM2_Edit_Elem1.text
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: ../calendar/gui/e-calendar-table.etspec.h:8
+#: ../plugins/save-calendar/csv-format.c:397
 msgid "Priority"
 msgstr "Icyihutirwa"
 
@@ -7752,85 +7907,89 @@ msgstr "Icyihutirwa"
 # scaddins/source\datefunc\datefunc.src:RID_DATE_FUNCTION_DESCRIPTIONS.DATE_FUNCDESC_DiffMonths.2.text
 # #-#-#-#-#  scaddins.pot (Gnome 2.12)  #-#-#-#-#
 # scaddins/source\datefunc\datefunc.src:RID_DATE_FUNCTION_DESCRIPTIONS.DATE_FUNCDESC_DiffYears.2.text
-#: calendar/gui/e-calendar-table.etspec.h:9
+#: ../calendar/gui/e-calendar-table.etspec.h:9
 msgid "Start date"
 msgstr "Itariki y'itangira"
 
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: ../calendar/gui/e-calendar-table.etspec.h:12
 #, fuzzy
 msgid "Task sort"
 msgstr "Ishungura"
 
-#: calendar/gui/e-calendar-view.c:1187
+#: ../calendar/gui/e-calendar-view.c:1204
 msgid "Moving items"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1189
+#: ../calendar/gui/e-calendar-view.c:1206
 msgid "Copying items"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1374
+#: ../calendar/gui/e-calendar-view.c:1481
 msgid "New _Appointment..."
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1375
+#: ../calendar/gui/e-calendar-view.c:1482
 msgid "New All Day _Event"
 msgstr ""
 
 # sfx2/source\appl\sfx.src:RID_STR_NEW_TASK.text
-#: calendar/gui/e-calendar-view.c:1377
+#: ../calendar/gui/e-calendar-view.c:1484
 #, fuzzy
 msgid "New Task"
 msgstr "Igikorwa gishya"
 
 #. FIXME: hook in this somehow
-#: calendar/gui/e-calendar-view.c:1387
+#: ../calendar/gui/e-calendar-view.c:1494
 msgid "Current View"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1389 ui/evolution-calendar.xml.h:26
+#: ../calendar/gui/e-calendar-view.c:1496 ../ui/evolution-calendar.xml.h:26
 msgid "Select _Today"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1390
+#: ../calendar/gui/e-calendar-view.c:1497
 msgid "_Select Date..."
 msgstr ""
 
 #. TODO: Why is this in a context menu when it applies globally?
-#: calendar/gui/e-calendar-view.c:1395 ui/evolution-calendar.xml.h:45
+#: ../calendar/gui/e-calendar-view.c:1502 ../ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1411
+#: ../calendar/gui/e-calendar-view.c:1518
 #, fuzzy
 msgid "Cop_y to Calendar..."
 msgstr "Kuri"
 
-#: calendar/gui/e-calendar-view.c:1412
+#: ../calendar/gui/e-calendar-view.c:1519
 #, fuzzy
 msgid "Mo_ve to Calendar..."
 msgstr "Kuri"
 
-#: calendar/gui/e-calendar-view.c:1413
+#: ../calendar/gui/e-calendar-view.c:1520
+msgid "_Delegate Meeting..."
+msgstr ""
+
+#: ../calendar/gui/e-calendar-view.c:1521
 msgid "_Schedule Meeting..."
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1414
+#: ../calendar/gui/e-calendar-view.c:1522
 #, fuzzy
 msgid "_Forward as iCalendar..."
 msgstr "Nka"
 
-#: calendar/gui/e-calendar-view.c:1419
+#: ../calendar/gui/e-calendar-view.c:1527
 #, fuzzy
 msgid "Make this Occurrence _Movable"
 msgstr "iyi"
 
-#: calendar/gui/e-calendar-view.c:1420
+#: ../calendar/gui/e-calendar-view.c:1528
 #, fuzzy
 msgid "Delete this _Occurrence"
 msgstr "iyi"
 
-#: calendar/gui/e-calendar-view.c:1421
+#: ../calendar/gui/e-calendar-view.c:1529
 msgid "Delete _All Occurrences"
 msgstr ""
 
@@ -7839,8 +7998,8 @@ msgstr ""
 #. in 24-hour format.
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: calendar/gui/e-cell-date-edit-text.c:115 e-util/e-time-utils.c:180
-#: e-util/e-time-utils.c:393
+#: ../calendar/gui/e-cell-date-edit-text.c:115 ../e-util/e-time-utils.c:180
+#: ../e-util/e-time-utils.c:393
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr ""
 
@@ -7849,12 +8008,12 @@ msgstr ""
 #. in 12-hour format.
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:175
-#: e-util/e-time-utils.c:402
+#: ../calendar/gui/e-cell-date-edit-text.c:118 ../e-util/e-time-utils.c:175
+#: ../e-util/e-time-utils.c:402
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr ""
 
-#: calendar/gui/e-cell-date-edit-text.c:123
+#: ../calendar/gui/e-cell-date-edit-text.c:123
 #, fuzzy, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -7862,7 +8021,7 @@ msgid ""
 "%s"
 msgstr "Itariki in Imiterere"
 
-#: calendar/gui/e-day-view-time-item.c:527
+#: ../calendar/gui/e-day-view-time-item.c:553
 #, fuzzy, c-format
 msgid "%02i minute divisions"
 msgstr "%02iUMUNOTA"
@@ -7874,118 +8033,119 @@ msgstr "%02iUMUNOTA"
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: calendar/gui/e-day-view-top-item.c:715 calendar/gui/e-day-view.c:1494
-#: calendar/gui/e-week-view-main-item.c:312 calendar/gui/print.c:1517
+#: ../calendar/gui/e-day-view-top-item.c:715 ../calendar/gui/e-day-view.c:1499
+#: ../calendar/gui/e-week-view-main-item.c:312 ../calendar/gui/print.c:1517
 #, fuzzy
 msgid "%A %d %B"
 msgstr "%A%d%B"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:748 calendar/gui/e-week-view.c:512
-#: calendar/gui/print.c:841
+#: ../calendar/gui/e-day-view.c:752 ../calendar/gui/e-week-view.c:512
+#: ../calendar/gui/print.c:841
 msgid "am"
 msgstr ""
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:751 calendar/gui/e-week-view.c:515
-#: calendar/gui/print.c:843
+#: ../calendar/gui/e-day-view.c:755 ../calendar/gui/e-week-view.c:515
+#: ../calendar/gui/print.c:843
 msgid "pm"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:761
+#: ../calendar/gui/e-itip-control.c:761
 msgid "Yes. (Complex Recurrence)"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:772
+#: ../calendar/gui/e-itip-control.c:772
 #, fuzzy, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "Buri munsi"
 msgstr[1] "Buri munsi"
 
-#: calendar/gui/e-itip-control.c:777
+#: ../calendar/gui/e-itip-control.c:777
 #, fuzzy, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] "Icyumweru"
 
-#: calendar/gui/e-itip-control.c:779
+#: ../calendar/gui/e-itip-control.c:779
 #, fuzzy, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
 msgstr[0] "Icyumweru ku"
 
-#: calendar/gui/e-itip-control.c:787
+#: ../calendar/gui/e-itip-control.c:787
 #, fuzzy
 msgid " and "
 msgstr "Na"
 
-#: calendar/gui/e-itip-control.c:794
+#: ../calendar/gui/e-itip-control.c:794
 #, fuzzy, c-format
 msgid "The %s day of "
 msgstr "UMUNSI Bya"
 
-#: calendar/gui/e-itip-control.c:807
+#: ../calendar/gui/e-itip-control.c:807
 #, fuzzy, c-format
 msgid "The %s %s of "
 msgstr "Bya"
 
-#: calendar/gui/e-itip-control.c:814
+#: ../calendar/gui/e-itip-control.c:814
 #, fuzzy, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "buri Ukwezi"
 
-#: calendar/gui/e-itip-control.c:818
+#: ../calendar/gui/e-itip-control.c:818
 #, fuzzy, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "Umwaka"
 
-#: calendar/gui/e-itip-control.c:829
+#: ../calendar/gui/e-itip-control.c:829
 #, fuzzy, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
 msgstr[0] "a Igiteranyo Bya Igihe"
 
-#: calendar/gui/e-itip-control.c:838
+#: ../calendar/gui/e-itip-control.c:838
 #, fuzzy
 msgid ", ending on "
 msgstr ",ku"
 
-#: calendar/gui/e-itip-control.c:862
+#: ../calendar/gui/e-itip-control.c:862
 msgid "Starts"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:875
+#: ../calendar/gui/e-itip-control.c:875
 msgid "Ends"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:909
+#: ../calendar/gui/e-itip-control.c:909
+#: ../plugins/save-calendar/csv-format.c:395
 msgid "Due"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:949 calendar/gui/e-itip-control.c:1006
+#: ../calendar/gui/e-itip-control.c:949 ../calendar/gui/e-itip-control.c:1006
 msgid "iCalendar Information"
 msgstr ""
 
 #. Title
-#: calendar/gui/e-itip-control.c:966
+#: ../calendar/gui/e-itip-control.c:966
 msgid "iCalendar Error"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1038 calendar/gui/e-itip-control.c:1054
-#: calendar/gui/e-itip-control.c:1065 calendar/gui/e-itip-control.c:1082
-#: plugins/itip-formatter/itip-view.c:329
-#: plugins/itip-formatter/itip-view.c:330
-#: plugins/itip-formatter/itip-view.c:397
-#: plugins/itip-formatter/itip-view.c:398
+#: ../calendar/gui/e-itip-control.c:1038 ../calendar/gui/e-itip-control.c:1054
+#: ../calendar/gui/e-itip-control.c:1065 ../calendar/gui/e-itip-control.c:1082
+#: ../plugins/itip-formatter/itip-view.c:333
+#: ../plugins/itip-formatter/itip-view.c:334
+#: ../plugins/itip-formatter/itip-view.c:401
+#: ../plugins/itip-formatter/itip-view.c:402
 #, fuzzy
 msgid "An unknown person"
 msgstr "Kitazwi"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:1089
+#: ../calendar/gui/e-itip-control.c:1089
 #, fuzzy
 msgid ""
 "<br> Please review the following information, and then select an action from "
@@ -7994,369 +8154,373 @@ msgstr ""
 "<Isubiramo Ibisobanuro Na Hanyuma Guhitamo Igikorwa Bivuye Ibikubiyemo munsi"
 
 # sc/source\ui\miscdlgs\acredlin.src:RID_SCDLG_CHANGES.STR_ACCEPTED.text
-#: calendar/gui/e-itip-control.c:1137 calendar/gui/e-meeting-list-view.c:175
-#: calendar/gui/e-meeting-store.c:188 calendar/gui/e-meeting-store.c:211
-#: calendar/gui/itip-utils.c:421 plugins/itip-formatter/itip-formatter.c:1403
+#: ../calendar/gui/e-itip-control.c:1137
+#: ../calendar/gui/e-meeting-list-view.c:204
+#: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
+#: ../calendar/gui/itip-utils.c:547
+#: ../plugins/itip-formatter/itip-formatter.c:1552
 msgid "Accepted"
 msgstr "Byemewe"
 
-#: calendar/gui/e-itip-control.c:1141 calendar/gui/itip-utils.c:424
-#: plugins/itip-formatter/itip-formatter.c:1406
+#: ../calendar/gui/e-itip-control.c:1141 ../calendar/gui/itip-utils.c:550
+#: ../plugins/itip-formatter/itip-formatter.c:1555
 msgid "Tentatively Accepted"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1145 calendar/gui/e-meeting-list-view.c:176
-#: calendar/gui/e-meeting-store.c:190 calendar/gui/e-meeting-store.c:213
-#: calendar/gui/itip-utils.c:427 calendar/gui/itip-utils.c:453
-#: plugins/itip-formatter/itip-formatter.c:1409
+#: ../calendar/gui/e-itip-control.c:1145
+#: ../calendar/gui/e-meeting-list-view.c:205
+#: ../calendar/gui/e-meeting-store.c:190 ../calendar/gui/e-meeting-store.c:213
+#: ../calendar/gui/itip-utils.c:553 ../calendar/gui/itip-utils.c:582
+#: ../plugins/itip-formatter/itip-formatter.c:1558
 msgid "Declined"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1229
+#: ../calendar/gui/e-itip-control.c:1229
 #, fuzzy
 msgid ""
 "The meeting has been cancelled, however it could not be found in your "
 "calendars"
 msgstr "Kureka OYA Byabonetse in"
 
-#: calendar/gui/e-itip-control.c:1231
+#: ../calendar/gui/e-itip-control.c:1231
 #, fuzzy
 msgid ""
 "The task has been cancelled, however it could not be found in your task lists"
 msgstr "Igikorwa Kureka OYA Byabonetse in Igikorwa Intonde"
 
-#: calendar/gui/e-itip-control.c:1310
+#: ../calendar/gui/e-itip-control.c:1310
 #, fuzzy, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<B B Ibisobanuro"
 
-#: calendar/gui/e-itip-control.c:1311
+#: ../calendar/gui/e-itip-control.c:1311
 msgid "Meeting Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1317
+#: ../calendar/gui/e-itip-control.c:1317
 #, fuzzy, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<B B Bya ku a"
 
-#: calendar/gui/e-itip-control.c:1319
+#: ../calendar/gui/e-itip-control.c:1319
 #, fuzzy, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<B B ku a"
 
-#: calendar/gui/e-itip-control.c:1320
+#: ../calendar/gui/e-itip-control.c:1320
 msgid "Meeting Proposal"
 msgstr ""
 
 #. FIXME Whats going on here?
-#: calendar/gui/e-itip-control.c:1326
+#: ../calendar/gui/e-itip-control.c:1326
 #, fuzzy, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<B B Kuri Kongeramo Kuri"
 
-#: calendar/gui/e-itip-control.c:1327
+#: ../calendar/gui/e-itip-control.c:1327
 msgid "Meeting Update"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1331
+#: ../calendar/gui/e-itip-control.c:1331
 #, fuzzy, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<B B Kuri Akira Ibisobanuro"
 
-#: calendar/gui/e-itip-control.c:1332
+#: ../calendar/gui/e-itip-control.c:1332
 msgid "Meeting Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1339
+#: ../calendar/gui/e-itip-control.c:1339
 #, fuzzy, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<B B Kuri a Kubaza..."
 
-#: calendar/gui/e-itip-control.c:1340
+#: ../calendar/gui/e-itip-control.c:1340
 msgid "Meeting Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1347
+#: ../calendar/gui/e-itip-control.c:1347
 #, fuzzy, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<B B Kureka a"
 
-#: calendar/gui/e-itip-control.c:1348
+#: ../calendar/gui/e-itip-control.c:1348
 msgid "Meeting Cancellation"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1358 calendar/gui/e-itip-control.c:1435
-#: calendar/gui/e-itip-control.c:1475
+#: ../calendar/gui/e-itip-control.c:1358 ../calendar/gui/e-itip-control.c:1435
+#: ../calendar/gui/e-itip-control.c:1475
 #, fuzzy, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<B B Yoherejwe: Ubutumwa"
 
-#: calendar/gui/e-itip-control.c:1359
+#: ../calendar/gui/e-itip-control.c:1359
 msgid "Bad Meeting Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1386
+#: ../calendar/gui/e-itip-control.c:1386
 #, fuzzy, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<B B Igikorwa Ibisobanuro"
 
-#: calendar/gui/e-itip-control.c:1387
+#: ../calendar/gui/e-itip-control.c:1387
 msgid "Task Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1394
+#: ../calendar/gui/e-itip-control.c:1394
 #, fuzzy, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<B B Kuri a Igikorwa"
 
-#: calendar/gui/e-itip-control.c:1396
+#: ../calendar/gui/e-itip-control.c:1396
 #, fuzzy, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<B B a Igikorwa"
 
-#: calendar/gui/e-itip-control.c:1397
+#: ../calendar/gui/e-itip-control.c:1397
 msgid "Task Proposal"
 msgstr ""
 
 #. FIXME Whats going on here?
-#: calendar/gui/e-itip-control.c:1403
+#: ../calendar/gui/e-itip-control.c:1403
 #, fuzzy, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<B B Kuri Kongeramo Kuri Igikorwa"
 
-#: calendar/gui/e-itip-control.c:1404
+#: ../calendar/gui/e-itip-control.c:1404
 msgid "Task Update"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1408
+#: ../calendar/gui/e-itip-control.c:1408
 #, fuzzy, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<B B Kuri Akira Igikorwa Ibisobanuro"
 
-#: calendar/gui/e-itip-control.c:1409
+#: ../calendar/gui/e-itip-control.c:1409
 msgid "Task Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1416
+#: ../calendar/gui/e-itip-control.c:1416
 #, fuzzy, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<B B Kuri a Igikorwa Igenera"
 
-#: calendar/gui/e-itip-control.c:1417
+#: ../calendar/gui/e-itip-control.c:1417
 msgid "Task Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1424
+#: ../calendar/gui/e-itip-control.c:1424
 #, fuzzy, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<B B Kureka a Igikorwa"
 
-#: calendar/gui/e-itip-control.c:1425
+#: ../calendar/gui/e-itip-control.c:1425
 msgid "Task Cancellation"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1436
+#: ../calendar/gui/e-itip-control.c:1436
 msgid "Bad Task Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1460
+#: ../calendar/gui/e-itip-control.c:1460
 #, fuzzy, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<B B Kigenga Irahuze Ibisobanuro"
 
-#: calendar/gui/e-itip-control.c:1461
+#: ../calendar/gui/e-itip-control.c:1461
 msgid "Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1465
+#: ../calendar/gui/e-itip-control.c:1465
 #, fuzzy, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<B B Kigenga Irahuze Ibisobanuro"
 
-#: calendar/gui/e-itip-control.c:1466
+#: ../calendar/gui/e-itip-control.c:1466
 msgid "Free/Busy Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1470
+#: ../calendar/gui/e-itip-control.c:1470
 #, fuzzy, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<B B Kuri a Kigenga Irahuze Kubaza..."
 
-#: calendar/gui/e-itip-control.c:1471
+#: ../calendar/gui/e-itip-control.c:1471
 msgid "Free/Busy Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1476
+#: ../calendar/gui/e-itip-control.c:1476
 msgid "Bad Free/Busy Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1551
+#: ../calendar/gui/e-itip-control.c:1551
 #, fuzzy
 msgid "The message does not appear to be properly formed"
 msgstr "Ubutumwa OYA Kugaragara Kuri"
 
-#: calendar/gui/e-itip-control.c:1610
+#: ../calendar/gui/e-itip-control.c:1610
 #, fuzzy
 msgid "The message contains only unsupported requests."
 msgstr "Ubutumwa Kirimo"
 
-#: calendar/gui/e-itip-control.c:1643
+#: ../calendar/gui/e-itip-control.c:1643
 #, fuzzy
 msgid "The attachment does not contain a valid calendar message"
 msgstr "umugereka OYA a Byemewe Kalindari Ubutumwa"
 
-#: calendar/gui/e-itip-control.c:1675
+#: ../calendar/gui/e-itip-control.c:1675
 #, fuzzy
 msgid "The attachment has no viewable calendar items"
 msgstr "umugereka Oya Kalindari"
 
-#: calendar/gui/e-itip-control.c:1909
+#: ../calendar/gui/e-itip-control.c:1909
 msgid "Update complete\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1937
+#: ../calendar/gui/e-itip-control.c:1937
 #, fuzzy
 msgid "Object is invalid and cannot be updated\n"
 msgstr "ni Sibyo Na"
 
-#: calendar/gui/e-itip-control.c:1947
+#: ../calendar/gui/e-itip-control.c:1947
 #, fuzzy
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "ni OYA Bivuye a KIGEZWEHO Nka"
 
-#: calendar/gui/e-itip-control.c:1959
+#: ../calendar/gui/e-itip-control.c:1959
 #, fuzzy
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "Imimerere OYA Bya Sibyo Imimerere"
 
-#: calendar/gui/e-itip-control.c:1976
+#: ../calendar/gui/e-itip-control.c:1976
 #, fuzzy
 msgid "Attendee status updated\n"
 msgstr "Imimerere"
 
-#: calendar/gui/e-itip-control.c:1979
-#: plugins/itip-formatter/itip-formatter.c:852
+#: ../calendar/gui/e-itip-control.c:1979
+#: ../plugins/itip-formatter/itip-formatter.c:974
 #, fuzzy
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "Imimerere OYA Ikintu Oya"
 
-#: calendar/gui/e-itip-control.c:2006
+#: ../calendar/gui/e-itip-control.c:2006
 msgid "Removal Complete"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:2029 calendar/gui/e-itip-control.c:2077
+#: ../calendar/gui/e-itip-control.c:2029 ../calendar/gui/e-itip-control.c:2077
 #, fuzzy
 msgid "Item sent!\n"
 msgstr "Yoherejwe:"
 
-#: calendar/gui/e-itip-control.c:2031 calendar/gui/e-itip-control.c:2081
+#: ../calendar/gui/e-itip-control.c:2031 ../calendar/gui/e-itip-control.c:2081
 #, fuzzy
 msgid "The item could not be sent!\n"
 msgstr "Ikintu OYA Yoherejwe:"
 
-#: calendar/gui/e-itip-control.c:2161
+#: ../calendar/gui/e-itip-control.c:2161
 #, fuzzy
 msgid "Choose an action:"
 msgstr "Igikorwa"
 
-#: calendar/gui/e-itip-control.c:2232
+#: ../calendar/gui/e-itip-control.c:2232
 msgid "Update"
 msgstr "Kuvugurura"
 
-#: calendar/gui/e-itip-control.c:2260
+#: ../calendar/gui/e-itip-control.c:2260
 msgid "Accept"
 msgstr "Kwemera"
 
-#: calendar/gui/e-itip-control.c:2261
+#: ../calendar/gui/e-itip-control.c:2261
 #, fuzzy
 msgid "Tentatively accept"
 msgstr "Kwemera"
 
-#: calendar/gui/e-itip-control.c:2262
+#: ../calendar/gui/e-itip-control.c:2262
 msgid "Decline"
 msgstr "Kwanga"
 
-#: calendar/gui/e-itip-control.c:2291
+#: ../calendar/gui/e-itip-control.c:2291
 msgid "Send Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:2319
+#: ../calendar/gui/e-itip-control.c:2319
 #, fuzzy
 msgid "Update respondent status"
 msgstr "Imimerere"
 
-#: calendar/gui/e-itip-control.c:2347
+#: ../calendar/gui/e-itip-control.c:2347
 msgid "Send Latest Information"
 msgstr ""
 
 # crashrep/source\all\crashrep.lng:%CANCEL_BUTTON%.text
-#: calendar/gui/e-itip-control.c:2375 calendar/gui/itip-utils.c:441
-#: mail/mail-send-recv.c:414 mail/mail-send-recv.c:466
-#: ui/evolution-mail-global.xml.h:1
+#: ../calendar/gui/e-itip-control.c:2375 ../calendar/gui/itip-utils.c:570
+#: ../mail/mail-send-recv.c:414 ../mail/mail-send-recv.c:466
+#: ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Kureka"
 
 # desktop/source\app\ssodlg.src:DLG_SSOLOGIN.text
-#: calendar/gui/e-itip-control.glade.h:2
+#: ../calendar/gui/e-itip-control.glade.h:2
 #, fuzzy, no-c-format
 msgid "%P %%"
 msgstr "%P%%"
 
-#: calendar/gui/e-itip-control.glade.h:3
+#: ../calendar/gui/e-itip-control.glade.h:3
 #, fuzzy
 msgid "--to--"
 msgstr "--Kuri"
 
-#: calendar/gui/e-itip-control.glade.h:4
+#: ../calendar/gui/e-itip-control.glade.h:4
 msgid "Calendar Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.glade.h:5
+#: ../calendar/gui/e-itip-control.glade.h:5
 msgid "Date:"
 msgstr "Itariki:"
 
-#: calendar/gui/e-itip-control.glade.h:7
+#: ../calendar/gui/e-itip-control.glade.h:7
 msgid "Loading Calendar"
 msgstr ""
 
-#: calendar/gui/e-itip-control.glade.h:8
+#: ../calendar/gui/e-itip-control.glade.h:8
 #, fuzzy
 msgid "Loading calendar..."
 msgstr "Kalindari"
 
-#: calendar/gui/e-itip-control.glade.h:10
+#: ../calendar/gui/e-itip-control.glade.h:10
 msgid "Server Message:"
 msgstr ""
 
-#: calendar/gui/e-itip-control.glade.h:12
+#: ../calendar/gui/e-itip-control.glade.h:12
 #, fuzzy
 msgid "date-end"
 msgstr "Itariki Impera"
 
-#: calendar/gui/e-itip-control.glade.h:13
+#: ../calendar/gui/e-itip-control.glade.h:13
 #, fuzzy
 msgid "date-start"
 msgstr "Itariki Gutangira"
 
-#: calendar/gui/e-meeting-list-view.c:59
+#: ../calendar/gui/e-meeting-list-view.c:69
 msgid "Chair Persons"
 msgstr ""
 
-#: calendar/gui/e-meeting-list-view.c:60
-#: calendar/gui/e-meeting-list-view.c:124
+#: ../calendar/gui/e-meeting-list-view.c:70
+#: ../calendar/gui/e-meeting-list-view.c:153
 msgid "Required Participants"
 msgstr ""
 
-#: calendar/gui/e-meeting-list-view.c:61
+#: ../calendar/gui/e-meeting-list-view.c:71
 msgid "Optional Participants"
 msgstr ""
 
-#: calendar/gui/e-meeting-list-view.c:62
+#: ../calendar/gui/e-meeting-list-view.c:72
 msgid "Resources"
 msgstr ""
 
-#: calendar/gui/e-meeting-list-view.c:135 calendar/gui/e-meeting-store.c:99
-#: calendar/gui/e-meeting-store.c:116 calendar/gui/e-meeting-store.c:802
+#: ../calendar/gui/e-meeting-list-view.c:164
+#: ../calendar/gui/e-meeting-store.c:99 ../calendar/gui/e-meeting-store.c:116
+#: ../calendar/gui/e-meeting-store.c:802
 msgid "Individual"
 msgstr ""
 
@@ -8364,64 +8528,69 @@ msgstr ""
 # sc/source\ui\src\globstr.src:RID_GLOBSTR.STR_UNDO_MAKEOUTLINE.text
 # #-#-#-#-#  sc.pot (Gnome 2.12)  #-#-#-#-#
 # sc/source\ui\src\miscdlgs.src:RID_SCDLG_GROUP.text
-#: calendar/gui/e-meeting-list-view.c:136 calendar/gui/e-meeting-store.c:101
-#: calendar/gui/e-meeting-store.c:118
+#: ../calendar/gui/e-meeting-list-view.c:165
+#: ../calendar/gui/e-meeting-store.c:101 ../calendar/gui/e-meeting-store.c:118
 msgid "Group"
 msgstr "Itsinda"
 
-#: calendar/gui/e-meeting-list-view.c:137 calendar/gui/e-meeting-store.c:103
-#: calendar/gui/e-meeting-store.c:120
+#: ../calendar/gui/e-meeting-list-view.c:166
+#: ../calendar/gui/e-meeting-store.c:103 ../calendar/gui/e-meeting-store.c:120
 msgid "Resource"
 msgstr ""
 
-#: calendar/gui/e-meeting-list-view.c:138 calendar/gui/e-meeting-store.c:105
-#: calendar/gui/e-meeting-store.c:122
+#: ../calendar/gui/e-meeting-list-view.c:167
+#: ../calendar/gui/e-meeting-store.c:105 ../calendar/gui/e-meeting-store.c:122
 msgid "Room"
 msgstr ""
 
-#: calendar/gui/e-meeting-list-view.c:149 calendar/gui/e-meeting-store.c:134
-#: calendar/gui/e-meeting-store.c:151
+#: ../calendar/gui/e-meeting-list-view.c:178
+#: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:151
 msgid "Chair"
 msgstr ""
 
-#: calendar/gui/e-meeting-list-view.c:150 calendar/gui/e-meeting-store.c:136
-#: calendar/gui/e-meeting-store.c:153 calendar/gui/e-meeting-store.c:805
+#: ../calendar/gui/e-meeting-list-view.c:179
+#: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:153
+#: ../calendar/gui/e-meeting-store.c:805
 msgid "Required Participant"
 msgstr ""
 
-#: calendar/gui/e-meeting-list-view.c:151 calendar/gui/e-meeting-store.c:138
-#: calendar/gui/e-meeting-store.c:155
+#: ../calendar/gui/e-meeting-list-view.c:180
+#: ../calendar/gui/e-meeting-store.c:138 ../calendar/gui/e-meeting-store.c:155
 msgid "Optional Participant"
 msgstr ""
 
-#: calendar/gui/e-meeting-list-view.c:152 calendar/gui/e-meeting-store.c:140
-#: calendar/gui/e-meeting-store.c:157
+#: ../calendar/gui/e-meeting-list-view.c:181
+#: ../calendar/gui/e-meeting-store.c:140 ../calendar/gui/e-meeting-store.c:157
 msgid "Non-Participant"
 msgstr ""
 
-#: calendar/gui/e-meeting-list-view.c:174 calendar/gui/e-meeting-store.c:186
-#: calendar/gui/e-meeting-store.c:209 calendar/gui/e-meeting-store.c:815
+#: ../calendar/gui/e-meeting-list-view.c:203
+#: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:209
+#: ../calendar/gui/e-meeting-store.c:815
 msgid "Needs Action"
 msgstr ""
 
-#: calendar/gui/e-meeting-list-view.c:177 calendar/gui/e-meeting-store.c:192
-#: calendar/gui/e-meeting-store.c:215 calendar/gui/e-meeting-time-sel.c:411
+#: ../calendar/gui/e-meeting-list-view.c:206
+#: ../calendar/gui/e-meeting-store.c:192 ../calendar/gui/e-meeting-store.c:215
+#: ../calendar/gui/e-meeting-time-sel.c:411
 msgid "Tentative"
 msgstr ""
 
-#: calendar/gui/e-meeting-list-view.c:178 calendar/gui/e-meeting-store.c:194
-#: calendar/gui/e-meeting-store.c:217
+#: ../calendar/gui/e-meeting-list-view.c:207
+#: ../calendar/gui/e-meeting-store.c:194 ../calendar/gui/e-meeting-store.c:217
+#: ../calendar/gui/itip-utils.c:556
+#: ../plugins/itip-formatter/itip-formatter.c:1561
 msgid "Delegated"
 msgstr ""
 
-#: calendar/gui/e-meeting-store.c:198 calendar/gui/e-meeting-store.c:221
+#: ../calendar/gui/e-meeting-store.c:198 ../calendar/gui/e-meeting-store.c:221
 msgid "In Process"
 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-item.c:444
-#: calendar/gui/e-meeting-time-sel.c:2104
+#: ../calendar/gui/e-meeting-time-sel-item.c:444
+#: ../calendar/gui/e-meeting-time-sel.c:2104
 msgid "%A, %B %d, %Y"
 msgstr ""
 
@@ -8431,9 +8600,9 @@ msgstr ""
 #. %m = month number, %d = month day, %Y = full year.
 #. strptime format of a weekday and a date.
 #. strftime format of a weekday and a date.
-#: calendar/gui/e-meeting-time-sel-item.c:448
-#: calendar/gui/e-meeting-time-sel.c:2137 e-util/e-time-utils.c:203
-#: e-util/e-time-utils.c:296 e-util/e-time-utils.c:384
+#: ../calendar/gui/e-meeting-time-sel-item.c:448
+#: ../calendar/gui/e-meeting-time-sel.c:2137 ../e-util/e-time-utils.c:203
+#: ../e-util/e-time-utils.c:296 ../e-util/e-time-utils.c:384
 msgid "%a %m/%d/%Y"
 msgstr ""
 
@@ -8443,115 +8612,115 @@ msgstr ""
 #. This is the preferred date format for the locale.
 #. This is a strftime() format for a short date. %m = month,
 #. %d = day of month, %Y = year (all digits).
-#: calendar/gui/e-meeting-time-sel-item.c:452 e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1660
+#: ../calendar/gui/e-meeting-time-sel-item.c:452 ../e-util/e-time-utils.c:238
+#: ../e-util/e-time-utils.c:299 ../widgets/misc/e-dateedit.c:1682
 #, fuzzy
 msgid "%m/%d/%Y"
 msgstr "%m/%d/%YCYOSE"
 
-#: calendar/gui/e-meeting-time-sel.c:413 designs/OOA/ooa.glade.h:11
+#: ../calendar/gui/e-meeting-time-sel.c:413 ../designs/OOA/ooa.glade.h:11
 #, fuzzy
 msgid "Out of Office"
 msgstr "Bya"
 
-#: calendar/gui/e-meeting-time-sel.c:414
+#: ../calendar/gui/e-meeting-time-sel.c:414
 msgid "No Information"
 msgstr ""
 
 # basctl/source\basicide\moduldlg.src:RID_DLG_LIBS.RID_FL_OPTIONS.text
-#: calendar/gui/e-meeting-time-sel.c:445
+#: ../calendar/gui/e-meeting-time-sel.c:445
 #, fuzzy
 msgid "O_ptions"
 msgstr "Amahitamo"
 
-#: calendar/gui/e-meeting-time-sel.c:462
+#: ../calendar/gui/e-meeting-time-sel.c:462
 #, fuzzy
 msgid "Show _only working hours"
 msgstr "amasaha"
 
-#: calendar/gui/e-meeting-time-sel.c:472
+#: ../calendar/gui/e-meeting-time-sel.c:472
 #, fuzzy
 msgid "Show _zoomed out"
 msgstr "Inyuma"
 
-#: calendar/gui/e-meeting-time-sel.c:487
+#: ../calendar/gui/e-meeting-time-sel.c:487
 #, fuzzy
 msgid "_Update free/busy"
 msgstr "Kigenga Irahuze"
 
 # desktop/source\app\ssodlg.src:DLG_SSOLOGIN.text
-#: calendar/gui/e-meeting-time-sel.c:502
+#: ../calendar/gui/e-meeting-time-sel.c:502
 #, fuzzy
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:520
+#: ../calendar/gui/e-meeting-time-sel.c:520
 msgid "_Autopick"
 msgstr ""
 
 # desktop/source\app\ssodlg.src:DLG_SSOLOGIN.text
-#: calendar/gui/e-meeting-time-sel.c:535
+#: ../calendar/gui/e-meeting-time-sel.c:535
 #, fuzzy
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:552
+#: ../calendar/gui/e-meeting-time-sel.c:552
 #, fuzzy
 msgid "_All people and resources"
 msgstr "Abantu Na"
 
-#: calendar/gui/e-meeting-time-sel.c:561
+#: ../calendar/gui/e-meeting-time-sel.c:561
 #, fuzzy
 msgid "All _people and one resource"
 msgstr "Abantu Na"
 
-#: calendar/gui/e-meeting-time-sel.c:570
+#: ../calendar/gui/e-meeting-time-sel.c:570
 #, fuzzy
 msgid "_Required people"
 msgstr "Abantu"
 
-#: calendar/gui/e-meeting-time-sel.c:579
+#: ../calendar/gui/e-meeting-time-sel.c:579
 #, fuzzy
 msgid "Required people and _one resource"
 msgstr "Abantu Na"
 
-#: calendar/gui/e-pub-utils.c:300
+#: ../calendar/gui/e-pub-utils.c:300
 #, fuzzy, c-format
 msgid "Enter the password for %s"
 msgstr "Ijambobanga... kugirango"
 
-#: calendar/gui/e-tasks.c:763 calendar/gui/gnome-cal.c:2382
+#: ../calendar/gui/e-tasks.c:763 ../calendar/gui/gnome-cal.c:2412
 #, fuzzy, c-format
 msgid ""
 "Error on %s:\n"
 " %s"
 msgstr "ku"
 
-#: calendar/gui/e-tasks.c:811
+#: ../calendar/gui/e-tasks.c:811
 #, fuzzy
 msgid "Loading tasks"
 msgstr "Ibikorwa"
 
-#: calendar/gui/e-tasks.c:895
+#: ../calendar/gui/e-tasks.c:895
 #, fuzzy, c-format
 msgid "Opening tasks at %s"
 msgstr "Ibikorwa ku"
 
-#: calendar/gui/e-tasks.c:1091
+#: ../calendar/gui/e-tasks.c:1091
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "Ibikorwa"
 
-#: calendar/gui/e-tasks.c:1114
+#: ../calendar/gui/e-tasks.c:1114
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "Byahiswemo Ibintu"
 
-#: calendar/gui/e-tasks.c:1141
+#: ../calendar/gui/e-tasks.c:1141
 msgid "Expunging"
 msgstr ""
 
-#: calendar/gui/e-timezone-entry.c:133
+#: ../calendar/gui/e-timezone-entry.c:133
 msgid "Timezone Button"
 msgstr ""
 
@@ -8561,183 +8730,183 @@ msgstr ""
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/e-week-view-main-item.c:329 calendar/gui/print.c:1501
+#: ../calendar/gui/e-week-view-main-item.c:329 ../calendar/gui/print.c:1501
 #, fuzzy
 msgid "%d %B"
 msgstr "%d%B"
 
-#: calendar/gui/gnome-cal.c:722
+#: ../calendar/gui/gnome-cal.c:723
 #, fuzzy
 msgid "Updating query"
 msgstr "Ikibazo#"
 
 #. bonobo displays this string so it must be in locale
-#: calendar/gui/gnome-cal.c:2065 widgets/menus/gal-view-menus.c:350
+#: ../calendar/gui/gnome-cal.c:2089 ../widgets/menus/gal-view-menus.c:350
 #, fuzzy
 msgid "Custom View"
 msgstr "Kugena"
 
-#: calendar/gui/gnome-cal.c:2066
+#: ../calendar/gui/gnome-cal.c:2090
 #, fuzzy
 msgid "Save Custom View"
 msgstr "Kubika Kugena"
 
-#: calendar/gui/gnome-cal.c:2071 widgets/menus/gal-view-menus.c:372
+#: ../calendar/gui/gnome-cal.c:2095 ../widgets/menus/gal-view-menus.c:372
 msgid "Define Views..."
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:2231
+#: ../calendar/gui/gnome-cal.c:2258
 #, fuzzy, c-format
 msgid "Loading appointments at %s"
 msgstr "ku"
 
-#: calendar/gui/gnome-cal.c:2250
+#: ../calendar/gui/gnome-cal.c:2277
 #, fuzzy, c-format
 msgid "Loading tasks at %s"
 msgstr "Ibikorwa ku"
 
-#: calendar/gui/gnome-cal.c:2348
+#: ../calendar/gui/gnome-cal.c:2378
 #, fuzzy, c-format
 msgid "Opening %s"
 msgstr "Gufungura %s%S"
 
-#: calendar/gui/gnome-cal.c:3238
+#: ../calendar/gui/gnome-cal.c:3268
 msgid "Purging"
 msgstr ""
 
 # wizards/source\schedule\schedule.src:dlgMonth+3.text
-#: calendar/gui/goto-dialog.glade.h:1
+#: ../calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "Mata"
 
 # wizards/source\schedule\schedule.src:dlgMonth+7.text
-#: calendar/gui/goto-dialog.glade.h:2
+#: ../calendar/gui/goto-dialog.glade.h:2
 msgid "August"
 msgstr "Kanama"
 
 # wizards/source\schedule\schedule.src:dlgMonth+11.text
-#: calendar/gui/goto-dialog.glade.h:3
+#: ../calendar/gui/goto-dialog.glade.h:3
 msgid "December"
 msgstr "Ukuboza"
 
 # wizards/source\schedule\schedule.src:dlgMonth+1.text
-#: calendar/gui/goto-dialog.glade.h:4
+#: ../calendar/gui/goto-dialog.glade.h:4
 msgid "February"
 msgstr "Gashyantare"
 
 # wizards/source\schedule\schedule.src:dlgMonth.text
-#: calendar/gui/goto-dialog.glade.h:5
+#: ../calendar/gui/goto-dialog.glade.h:5
 msgid "January"
 msgstr "Mutarama"
 
 # wizards/source\schedule\schedule.src:dlgMonth+6.text
-#: calendar/gui/goto-dialog.glade.h:6
+#: ../calendar/gui/goto-dialog.glade.h:6
 msgid "July"
 msgstr "Nyakanga"
 
 # wizards/source\schedule\schedule.src:dlgMonth+5.text
-#: calendar/gui/goto-dialog.glade.h:7
+#: ../calendar/gui/goto-dialog.glade.h:7
 msgid "June"
 msgstr "Kamena"
 
 # wizards/source\schedule\schedule.src:dlgMonth+2.text
-#: calendar/gui/goto-dialog.glade.h:8
+#: ../calendar/gui/goto-dialog.glade.h:8
 msgid "March"
 msgstr "Werurwe"
 
 # wizards/source\schedule\schedule.src:dlgMonth+4.text
-#: calendar/gui/goto-dialog.glade.h:9
+#: ../calendar/gui/goto-dialog.glade.h:9
 msgid "May"
 msgstr "Gicurasi"
 
 # wizards/source\schedule\schedule.src:dlgMonth+10.text
-#: calendar/gui/goto-dialog.glade.h:10
+#: ../calendar/gui/goto-dialog.glade.h:10
 msgid "November"
 msgstr "Ugushyingo"
 
 # wizards/source\schedule\schedule.src:dlgMonth+9.text
-#: calendar/gui/goto-dialog.glade.h:11
+#: ../calendar/gui/goto-dialog.glade.h:11
 msgid "October"
 msgstr "Ukwakira"
 
-#: calendar/gui/goto-dialog.glade.h:12
+#: ../calendar/gui/goto-dialog.glade.h:12
 msgid "Select Date"
 msgstr ""
 
 # wizards/source\schedule\schedule.src:dlgMonth+8.text
-#: calendar/gui/goto-dialog.glade.h:13
+#: ../calendar/gui/goto-dialog.glade.h:13
 msgid "September"
 msgstr "Nzeri"
 
-#: calendar/gui/goto-dialog.glade.h:14
+#: ../calendar/gui/goto-dialog.glade.h:14
 msgid "_Select Today"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:270 calendar/gui/itip-utils.c:318
-#: calendar/gui/itip-utils.c:350
+#: ../calendar/gui/itip-utils.c:352 ../calendar/gui/itip-utils.c:401
+#: ../calendar/gui/itip-utils.c:441
 #, fuzzy
 msgid "An organizer must be set."
 msgstr "Igitunganya... Gushyiraho"
 
-#: calendar/gui/itip-utils.c:305
+#: ../calendar/gui/itip-utils.c:388
 #, fuzzy
 msgid "At least one attendee is necessary"
 msgstr "ni"
 
-#: calendar/gui/itip-utils.c:393 calendar/gui/itip-utils.c:502
+#: ../calendar/gui/itip-utils.c:509 ../calendar/gui/itip-utils.c:631
 #, fuzzy
 msgid "Event information"
 msgstr "Ibisobanuro"
 
-#: calendar/gui/itip-utils.c:395 calendar/gui/itip-utils.c:504
+#: ../calendar/gui/itip-utils.c:511 ../calendar/gui/itip-utils.c:633
 #, fuzzy
 msgid "Task information"
 msgstr "Ibisobanuro"
 
-#: calendar/gui/itip-utils.c:397 calendar/gui/itip-utils.c:506
+#: ../calendar/gui/itip-utils.c:513 ../calendar/gui/itip-utils.c:635
 #, fuzzy
 msgid "Journal information"
 msgstr "Ibisobanuro"
 
-#: calendar/gui/itip-utils.c:399 calendar/gui/itip-utils.c:524
+#: ../calendar/gui/itip-utils.c:515 ../calendar/gui/itip-utils.c:653
 #, fuzzy
 msgid "Free/Busy information"
 msgstr "Ibisobanuro"
 
-#: calendar/gui/itip-utils.c:401
+#: ../calendar/gui/itip-utils.c:517
 #, fuzzy
 msgid "Calendar information"
 msgstr "Ibisobanuro"
 
-#: calendar/gui/itip-utils.c:437
+#: ../calendar/gui/itip-utils.c:566
 msgid "Updated"
 msgstr ""
 
 # dbaccess/source/ui/inc/toolbox.hrc:MID_SBA_QRY_REFRESH.text
-#: calendar/gui/itip-utils.c:445
+#: ../calendar/gui/itip-utils.c:574
 msgid "Refresh"
 msgstr "Kugira gishya"
 
-#: calendar/gui/itip-utils.c:449
+#: ../calendar/gui/itip-utils.c:578
 msgid "Counter-proposal"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:520
+#: ../calendar/gui/itip-utils.c:649
 #, fuzzy, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Ibisobanuro Kuri"
 
-#: calendar/gui/itip-utils.c:530
+#: ../calendar/gui/itip-utils.c:659
 #, fuzzy
 msgid "iCalendar information"
 msgstr "Ibisobanuro"
 
-#: calendar/gui/itip-utils.c:672
+#: ../calendar/gui/itip-utils.c:814
 #, fuzzy
 msgid "You must be an attendee of the event."
 msgstr "Bya Icyabaye"
 
-#: calendar/gui/migration.c:151
+#: ../calendar/gui/migration.c:151
 #, fuzzy
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
@@ -8746,7 +8915,7 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr "X."
 
-#: calendar/gui/migration.c:155
+#: ../calendar/gui/migration.c:155
 #, fuzzy
 msgid ""
 "The location and hierarchy of the Evolution calendar folders has changed "
@@ -8756,218 +8925,218 @@ msgid ""
 msgstr "X."
 
 #. FIXME: set proper domain/code
-#: calendar/gui/migration.c:745 calendar/gui/migration.c:912
+#: ../calendar/gui/migration.c:748 ../calendar/gui/migration.c:915
 #, fuzzy
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr "Kuri ki/ bishaje Amagenamiterere Bivuye Impinduka"
 
 #. FIXME: domain/code
-#: calendar/gui/migration.c:774
+#: ../calendar/gui/migration.c:777
 #, fuzzy, c-format
 msgid "Unable to migrate calendar `%s'"
 msgstr "Kuri Kalindari"
 
 #. FIXME: domain/code
-#: calendar/gui/migration.c:941
+#: ../calendar/gui/migration.c:944
 #, fuzzy, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "Kuri Ibikorwa"
 
-#: calendar/gui/print.c:492
+#: ../calendar/gui/print.c:492
 msgid "1st"
 msgstr ""
 
-#: calendar/gui/print.c:492
+#: ../calendar/gui/print.c:492
 msgid "2nd"
 msgstr ""
 
-#: calendar/gui/print.c:492
+#: ../calendar/gui/print.c:492
 msgid "3rd"
 msgstr ""
 
-#: calendar/gui/print.c:492
+#: ../calendar/gui/print.c:492
 msgid "4th"
 msgstr ""
 
-#: calendar/gui/print.c:492
+#: ../calendar/gui/print.c:492
 msgid "5th"
 msgstr ""
 
-#: calendar/gui/print.c:493
+#: ../calendar/gui/print.c:493
 msgid "6th"
 msgstr ""
 
-#: calendar/gui/print.c:493
+#: ../calendar/gui/print.c:493
 msgid "7th"
 msgstr ""
 
-#: calendar/gui/print.c:493
+#: ../calendar/gui/print.c:493
 msgid "8th"
 msgstr ""
 
-#: calendar/gui/print.c:493
+#: ../calendar/gui/print.c:493
 msgid "9th"
 msgstr ""
 
-#: calendar/gui/print.c:493
+#: ../calendar/gui/print.c:493
 msgid "10th"
 msgstr ""
 
-#: calendar/gui/print.c:494
+#: ../calendar/gui/print.c:494
 msgid "11th"
 msgstr ""
 
-#: calendar/gui/print.c:494
+#: ../calendar/gui/print.c:494
 msgid "12th"
 msgstr ""
 
-#: calendar/gui/print.c:494
+#: ../calendar/gui/print.c:494
 msgid "13th"
 msgstr ""
 
-#: calendar/gui/print.c:494
+#: ../calendar/gui/print.c:494
 msgid "14th"
 msgstr ""
 
-#: calendar/gui/print.c:494
+#: ../calendar/gui/print.c:494
 msgid "15th"
 msgstr ""
 
-#: calendar/gui/print.c:495
+#: ../calendar/gui/print.c:495
 msgid "16th"
 msgstr ""
 
-#: calendar/gui/print.c:495
+#: ../calendar/gui/print.c:495
 msgid "17th"
 msgstr ""
 
-#: calendar/gui/print.c:495
+#: ../calendar/gui/print.c:495
 msgid "18th"
 msgstr ""
 
-#: calendar/gui/print.c:495
+#: ../calendar/gui/print.c:495
 msgid "19th"
 msgstr ""
 
-#: calendar/gui/print.c:495
+#: ../calendar/gui/print.c:495
 msgid "20th"
 msgstr ""
 
-#: calendar/gui/print.c:496
+#: ../calendar/gui/print.c:496
 msgid "21st"
 msgstr ""
 
-#: calendar/gui/print.c:496
+#: ../calendar/gui/print.c:496
 msgid "22nd"
 msgstr ""
 
-#: calendar/gui/print.c:496
+#: ../calendar/gui/print.c:496
 msgid "23rd"
 msgstr ""
 
-#: calendar/gui/print.c:496
+#: ../calendar/gui/print.c:496
 msgid "24th"
 msgstr ""
 
-#: calendar/gui/print.c:496
+#: ../calendar/gui/print.c:496
 msgid "25th"
 msgstr ""
 
-#: calendar/gui/print.c:497
+#: ../calendar/gui/print.c:497
 msgid "26th"
 msgstr ""
 
-#: calendar/gui/print.c:497
+#: ../calendar/gui/print.c:497
 msgid "27th"
 msgstr ""
 
-#: calendar/gui/print.c:497
+#: ../calendar/gui/print.c:497
 msgid "28th"
 msgstr ""
 
-#: calendar/gui/print.c:497
+#: ../calendar/gui/print.c:497
 msgid "29th"
 msgstr ""
 
-#: calendar/gui/print.c:497
+#: ../calendar/gui/print.c:497
 msgid "30th"
 msgstr ""
 
-#: calendar/gui/print.c:498
+#: ../calendar/gui/print.c:498
 msgid "31st"
 msgstr ""
 
-#: calendar/gui/print.c:573
+#: ../calendar/gui/print.c:573
 msgid "Su"
 msgstr ""
 
-#: calendar/gui/print.c:573
+#: ../calendar/gui/print.c:573
 #, fuzzy
 msgid "Mo"
 msgstr "ukwezi"
 
-#: calendar/gui/print.c:573
+#: ../calendar/gui/print.c:573
 msgid "Tu"
 msgstr ""
 
 # 6511
-#: calendar/gui/print.c:573
+#: ../calendar/gui/print.c:573
 msgid "We"
 msgstr "Twebwe"
 
-#: calendar/gui/print.c:574
+#: ../calendar/gui/print.c:574
 msgid "Th"
 msgstr ""
 
-#: calendar/gui/print.c:574
+#: ../calendar/gui/print.c:574
 msgid "Fr"
 msgstr ""
 
-#: calendar/gui/print.c:574
+#: ../calendar/gui/print.c:574
 msgid "Sa"
 msgstr ""
 
 #. Day
-#: calendar/gui/print.c:1917
+#: ../calendar/gui/print.c:1917
 #, fuzzy
 msgid "Selected day (%a %b %d %Y)"
 msgstr "UMUNSI"
 
 # desktop/source\app\ssodlg.src:DLG_SSOLOGIN.text
-#: calendar/gui/print.c:1942 calendar/gui/print.c:1946
+#: ../calendar/gui/print.c:1942 ../calendar/gui/print.c:1946
 #, fuzzy
 msgid "%a %b %d"
 msgstr "%a%b%d"
 
 # desktop/source\app\ssodlg.src:DLG_SSOLOGIN.text
-#: calendar/gui/print.c:1943
+#: ../calendar/gui/print.c:1943
 #, fuzzy
 msgid "%a %d %Y"
 msgstr "%a%d%Y"
 
-#: calendar/gui/print.c:1947 calendar/gui/print.c:1949
-#: calendar/gui/print.c:1950
+#: ../calendar/gui/print.c:1947 ../calendar/gui/print.c:1949
+#: ../calendar/gui/print.c:1950
 msgid "%a %b %d %Y"
 msgstr ""
 
-#: calendar/gui/print.c:1954
+#: ../calendar/gui/print.c:1954
 #, fuzzy, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Icyumweru"
 
 #. Month
-#: calendar/gui/print.c:1962
+#: ../calendar/gui/print.c:1962
 #, fuzzy
 msgid "Selected month (%b %Y)"
 msgstr "Ukwezi"
 
 #. Year
-#: calendar/gui/print.c:1969
+#: ../calendar/gui/print.c:1969
 #, fuzzy
 msgid "Selected year (%Y)"
 msgstr "Umwaka"
 
-#: calendar/gui/print.c:2320
+#: ../calendar/gui/print.c:2320
 #, fuzzy, c-format
 msgid "Summary: %s"
 msgstr "Inshamake"
@@ -8978,30 +9147,30 @@ msgstr "Inshamake"
 # officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....Wizard.Fax.Save.AutoPath.text
 # #-#-#-#-#  officecfg.pot (Gnome 2.12)  #-#-#-#-#
 # officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....Wizard.Memo.Save.AutoDocName.text
-#: calendar/gui/print.c:2328
+#: ../calendar/gui/print.c:2328
 #, fuzzy, c-format
 msgid "Location: %s"
 msgstr "Ahantu"
 
-#: calendar/gui/print.c:2371
+#: ../calendar/gui/print.c:2371
 #, fuzzy, c-format
 msgid "Status: %s"
 msgstr "Imimerere"
 
 # sfx2/source\dialog\mailwindow.src:RID_MAIL_WINDOW.FT_MAILWIN_PRIO.text
-#: calendar/gui/print.c:2388
+#: ../calendar/gui/print.c:2388
 #, fuzzy, c-format
 msgid "Priority: %s"
 msgstr "By'ibanze"
 
-#: calendar/gui/print.c:2400
+#: ../calendar/gui/print.c:2400
 #, c-format
 msgid "Percent Complete: %i"
 msgstr ""
 
 # #-#-#-#-#  dbaccess.pot (Gnome 2.12)  #-#-#-#-#
 # #-#-#-#-#  dbaccess.pot (Gnome 2.12)  #-#-#-#-#
-#: calendar/gui/print.c:2412
+#: ../calendar/gui/print.c:2412
 #, fuzzy, c-format
 msgid "URL: %s"
 msgstr "URL"
@@ -9010,32 +9179,32 @@ msgstr "URL"
 # sfx2/source\doc\doctdlg.src:DLG_DOC_TEMPLATE.FT_SECTION.text
 # #-#-#-#-#  sfx2.pot (Gnome 2.12)  #-#-#-#-#
 # sfx2/source\doc\new.src:DLG_NEW_FILE.FT_REGION.text
-#: calendar/gui/print.c:2426
+#: ../calendar/gui/print.c:2426
 #, fuzzy, c-format
 msgid "Categories: %s"
 msgstr "Ibyiciro"
 
-#: calendar/gui/print.c:2437
+#: ../calendar/gui/print.c:2437
 #, fuzzy
 msgid "Contacts: "
 msgstr "Aho kubariza"
 
 # sc/source\ui\src\scstring.src:SCSTR_PREVIEWSHELL.text
-#: calendar/gui/print.c:2577 calendar/gui/print.c:2665
-#: calendar/gui/print.c:2791 mail/em-format-html-print.c:178
+#: ../calendar/gui/print.c:2577 ../calendar/gui/print.c:2665
+#: ../calendar/gui/print.c:2791 ../mail/em-format-html-print.c:178
 msgid "Print Preview"
 msgstr "Igaragazambere ryo Gucapa"
 
-#: calendar/gui/print.c:2612
+#: ../calendar/gui/print.c:2612
 msgid "Print Item"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:439
+#: ../calendar/gui/tasks-component.c:439
 msgid "New Task List"
 msgstr ""
 
 # svtools/source\misc\mediatyp.src:STR_SVT_MIMETYPE_SCHEDULE_FTASK.text
-#: calendar/gui/tasks-component.c:515
+#: ../calendar/gui/tasks-component.c:515
 #, fuzzy, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
@@ -9043,78 +9212,78 @@ msgstr[0] "%dUmurimo wa"
 msgstr[1] "%dUmurimo wa"
 
 # sch/source\ui\app\strings.src:STR_MARKED.text
-#: calendar/gui/tasks-component.c:517 mail/mail-component.c:544
+#: ../calendar/gui/tasks-component.c:517 ../mail/mail-component.c:545
 #, fuzzy, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
 msgstr[0] ",%dbyatoranyijwe"
 msgstr[1] ",%dbyatoranyijwe"
 
-#: calendar/gui/tasks-component.c:564
+#: ../calendar/gui/tasks-component.c:564
 #, fuzzy
 msgid "Failed upgrading tasks."
 msgstr "Ibikorwa"
 
-#: calendar/gui/tasks-component.c:858
+#: ../calendar/gui/tasks-component.c:860
 #, fuzzy, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr "Kuri Gufungura Igikorwa Urutonde kugirango Ibyabaye Na"
 
-#: calendar/gui/tasks-component.c:873
+#: ../calendar/gui/tasks-component.c:875
 #, fuzzy
 msgid "There is no calendar available for creating tasks"
 msgstr "ni Oya Kalindari Bihari kugirango Ibikorwa"
 
-#: calendar/gui/tasks-component.c:967
+#: ../calendar/gui/tasks-component.c:969
 msgid "Task Source Selector"
 msgstr ""
 
 # sfx2/source\appl\sfx.src:RID_STR_NEW_TASK.text
-#: calendar/gui/tasks-component.c:1150
+#: ../calendar/gui/tasks-component.c:1152
 msgid "New task"
 msgstr "Igikorwa gishya"
 
 # officecfg/registry\schema\org\openoffice\Office\Common.xcs:....View.Window.Flag..10.text
-#: calendar/gui/tasks-component.c:1151
+#: ../calendar/gui/tasks-component.c:1153
 #, fuzzy
 msgid "_Task"
 msgstr "Igikorwa"
 
-#: calendar/gui/tasks-component.c:1152
+#: ../calendar/gui/tasks-component.c:1154
 #, fuzzy
 msgid "Create a new task"
 msgstr "a Gishya Igikorwa"
 
-#: calendar/gui/tasks-component.c:1158
+#: ../calendar/gui/tasks-component.c:1160
 #, fuzzy
 msgid "New assigned task"
 msgstr "Igikorwa"
 
-#: calendar/gui/tasks-component.c:1159
+#: ../calendar/gui/tasks-component.c:1161
 msgid "Assigne_d Task"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:1160
+#: ../calendar/gui/tasks-component.c:1162
 #, fuzzy
 msgid "Create a new assigned task"
 msgstr "a Gishya Igikorwa"
 
-#: calendar/gui/tasks-component.c:1166
+#: ../calendar/gui/tasks-component.c:1168
 #, fuzzy
 msgid "New task list"
 msgstr "Igikorwa Urutonde"
 
-#: calendar/gui/tasks-component.c:1167
+#: ../calendar/gui/tasks-component.c:1169
 #, fuzzy
 msgid "Task l_ist"
 msgstr "Urutonde"
 
-#: calendar/gui/tasks-component.c:1168
+#: ../calendar/gui/tasks-component.c:1170
 #, fuzzy
 msgid "Create a new task list"
 msgstr "a Gishya Igikorwa Urutonde"
 
-#: calendar/gui/tasks-control.c:370
+#: ../calendar/gui/tasks-control.c:370
 #, fuzzy
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
@@ -9124,58 +9293,58 @@ msgid ""
 msgstr ""
 "Byose Ibikorwa cy/ byagarajwe Nka urifuzagukomeza OYA Kuri Ibikorwa Ibikorwa"
 
-#: calendar/gui/tasks-control.c:373
+#: ../calendar/gui/tasks-control.c:373
 #, fuzzy
 msgid "Do not ask me again."
 msgstr "OYA"
 
-#: calendar/gui/tasks-control.c:408
+#: ../calendar/gui/tasks-control.c:408
 msgid "Print Tasks"
 msgstr ""
 
 #. The first letter of each day of the week starting with Sunday
-#: calendar/gui/weekday-picker.c:319
+#: ../calendar/gui/weekday-picker.c:319
 msgid "SMTWTFS"
 msgstr ""
 
-#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:1
+#: ../calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:1
 msgid "Evolution Calendar intelligent importer"
 msgstr ""
 
-#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:2
+#: ../calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:2
 msgid "Evolution iCalendar importer"
 msgstr ""
 
-#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:3
+#: ../calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:3
 msgid "Evolution vCalendar importer"
 msgstr ""
 
-#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:4
+#: ../calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:4
 #, fuzzy
 msgid "iCalendar files (.ics)"
 msgstr "Idosiye"
 
-#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:5
+#: ../calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:5
 #, fuzzy
 msgid "vCalendar files (.vcf)"
 msgstr "Idosiye"
 
-#: calendar/importers/icalendar-importer.c:82
+#: ../calendar/importers/icalendar-importer.c:82
 #, fuzzy
 msgid "Appointments and Meetings"
 msgstr "Na"
 
 # sw/source\ui\ribbar\workctrl.src:RID_SCROLL_NAVIGATION_WIN.ST_MARK.text
-#: calendar/importers/icalendar-importer.c:486
+#: ../calendar/importers/icalendar-importer.c:486
 #, fuzzy
 msgid "Reminder!!"
 msgstr "Mwibutsa"
 
-#: calendar/importers/icalendar-importer.c:694
+#: ../calendar/importers/icalendar-importer.c:694
 msgid "Calendar Events"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:719
+#: ../calendar/importers/icalendar-importer.c:719
 #, fuzzy
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
@@ -9187,1541 +9356,1542 @@ msgstr "Byabonetse Idosiye nka Kuri Kuzana"
 #. * We only place them here so gettext picks them up for translation.
 #. * Don't include in any C files.
 #.
-#: calendar/zones.h:7
+#: ../calendar/zones.h:7
 msgid "Africa/Abidjan"
 msgstr ""
 
-#: calendar/zones.h:8
+#: ../calendar/zones.h:8
 msgid "Africa/Accra"
 msgstr ""
 
-#: calendar/zones.h:9
+#: ../calendar/zones.h:9
 msgid "Africa/Addis_Ababa"
 msgstr ""
 
-#: calendar/zones.h:10
+#: ../calendar/zones.h:10
 msgid "Africa/Algiers"
 msgstr ""
 
-#: calendar/zones.h:11
+#: ../calendar/zones.h:11
 msgid "Africa/Asmera"
 msgstr ""
 
-#: calendar/zones.h:12
+#: ../calendar/zones.h:12
 msgid "Africa/Bamako"
 msgstr ""
 
-#: calendar/zones.h:13
+#: ../calendar/zones.h:13
 msgid "Africa/Bangui"
 msgstr ""
 
-#: calendar/zones.h:14
+#: ../calendar/zones.h:14
 msgid "Africa/Banjul"
 msgstr ""
 
-#: calendar/zones.h:15
+#: ../calendar/zones.h:15
 msgid "Africa/Bissau"
 msgstr ""
 
-#: calendar/zones.h:16
+#: ../calendar/zones.h:16
 msgid "Africa/Blantyre"
 msgstr ""
 
-#: calendar/zones.h:17
+#: ../calendar/zones.h:17
 msgid "Africa/Brazzaville"
 msgstr ""
 
-#: calendar/zones.h:18
+#: ../calendar/zones.h:18
 msgid "Africa/Bujumbura"
 msgstr ""
 
-#: calendar/zones.h:19
+#: ../calendar/zones.h:19
 msgid "Africa/Cairo"
 msgstr ""
 
-#: calendar/zones.h:20
+#: ../calendar/zones.h:20
 msgid "Africa/Casablanca"
 msgstr ""
 
-#: calendar/zones.h:21
+#: ../calendar/zones.h:21
 msgid "Africa/Ceuta"
 msgstr ""
 
-#: calendar/zones.h:22
+#: ../calendar/zones.h:22
 msgid "Africa/Conakry"
 msgstr ""
 
-#: calendar/zones.h:23
+#: ../calendar/zones.h:23
 msgid "Africa/Dakar"
 msgstr ""
 
-#: calendar/zones.h:24
+#: ../calendar/zones.h:24
 msgid "Africa/Dar_es_Salaam"
 msgstr ""
 
-#: calendar/zones.h:25
+#: ../calendar/zones.h:25
 msgid "Africa/Djibouti"
 msgstr ""
 
-#: calendar/zones.h:26
+#: ../calendar/zones.h:26
 msgid "Africa/Douala"
 msgstr ""
 
-#: calendar/zones.h:27
+#: ../calendar/zones.h:27
 msgid "Africa/El_Aaiun"
 msgstr ""
 
-#: calendar/zones.h:28
+#: ../calendar/zones.h:28
 msgid "Africa/Freetown"
 msgstr ""
 
-#: calendar/zones.h:29
+#: ../calendar/zones.h:29
 msgid "Africa/Gaborone"
 msgstr ""
 
-#: calendar/zones.h:30
+#: ../calendar/zones.h:30
 msgid "Africa/Harare"
 msgstr ""
 
-#: calendar/zones.h:31
+#: ../calendar/zones.h:31
 msgid "Africa/Johannesburg"
 msgstr ""
 
-#: calendar/zones.h:32
+#: ../calendar/zones.h:32
 msgid "Africa/Kampala"
 msgstr ""
 
-#: calendar/zones.h:33
+#: ../calendar/zones.h:33
 msgid "Africa/Khartoum"
 msgstr ""
 
-#: calendar/zones.h:34
+#: ../calendar/zones.h:34
 msgid "Africa/Kigali"
 msgstr ""
 
-#: calendar/zones.h:35
+#: ../calendar/zones.h:35
 msgid "Africa/Kinshasa"
 msgstr ""
 
-#: calendar/zones.h:36
+#: ../calendar/zones.h:36
 msgid "Africa/Lagos"
 msgstr ""
 
-#: calendar/zones.h:37
+#: ../calendar/zones.h:37
 msgid "Africa/Libreville"
 msgstr ""
 
-#: calendar/zones.h:38
+#: ../calendar/zones.h:38
 msgid "Africa/Lome"
 msgstr ""
 
-#: calendar/zones.h:39
+#: ../calendar/zones.h:39
 msgid "Africa/Luanda"
 msgstr ""
 
-#: calendar/zones.h:40
+#: ../calendar/zones.h:40
 msgid "Africa/Lubumbashi"
 msgstr ""
 
-#: calendar/zones.h:41
+#: ../calendar/zones.h:41
 msgid "Africa/Lusaka"
 msgstr ""
 
-#: calendar/zones.h:42
+#: ../calendar/zones.h:42
 msgid "Africa/Malabo"
 msgstr ""
 
-#: calendar/zones.h:43
+#: ../calendar/zones.h:43
 msgid "Africa/Maputo"
 msgstr ""
 
-#: calendar/zones.h:44
+#: ../calendar/zones.h:44
 msgid "Africa/Maseru"
 msgstr ""
 
-#: calendar/zones.h:45
+#: ../calendar/zones.h:45
 msgid "Africa/Mbabane"
 msgstr ""
 
-#: calendar/zones.h:46
+#: ../calendar/zones.h:46
 msgid "Africa/Mogadishu"
 msgstr ""
 
-#: calendar/zones.h:47
+#: ../calendar/zones.h:47
 msgid "Africa/Monrovia"
 msgstr ""
 
-#: calendar/zones.h:48
+#: ../calendar/zones.h:48
 msgid "Africa/Nairobi"
 msgstr ""
 
-#: calendar/zones.h:49
+#: ../calendar/zones.h:49
 msgid "Africa/Ndjamena"
 msgstr ""
 
-#: calendar/zones.h:50
+#: ../calendar/zones.h:50
 msgid "Africa/Niamey"
 msgstr ""
 
-#: calendar/zones.h:51
+#: ../calendar/zones.h:51
 msgid "Africa/Nouakchott"
 msgstr ""
 
-#: calendar/zones.h:52
+#: ../calendar/zones.h:52
 msgid "Africa/Ouagadougou"
 msgstr ""
 
-#: calendar/zones.h:53
+#: ../calendar/zones.h:53
 msgid "Africa/Porto-Novo"
 msgstr ""
 
-#: calendar/zones.h:54
+#: ../calendar/zones.h:54
 msgid "Africa/Sao_Tome"
 msgstr ""
 
-#: calendar/zones.h:55
+#: ../calendar/zones.h:55
 msgid "Africa/Timbuktu"
 msgstr ""
 
-#: calendar/zones.h:56
+#: ../calendar/zones.h:56
 msgid "Africa/Tripoli"
 msgstr ""
 
-#: calendar/zones.h:57
+#: ../calendar/zones.h:57
 msgid "Africa/Tunis"
 msgstr ""
 
-#: calendar/zones.h:58
+#: ../calendar/zones.h:58
 msgid "Africa/Windhoek"
 msgstr ""
 
-#: calendar/zones.h:59
+#: ../calendar/zones.h:59
 msgid "America/Adak"
 msgstr ""
 
-#: calendar/zones.h:60
+#: ../calendar/zones.h:60
 msgid "America/Anchorage"
 msgstr ""
 
-#: calendar/zones.h:61
+#: ../calendar/zones.h:61
 msgid "America/Anguilla"
 msgstr ""
 
-#: calendar/zones.h:62
+#: ../calendar/zones.h:62
 msgid "America/Antigua"
 msgstr ""
 
-#: calendar/zones.h:63
+#: ../calendar/zones.h:63
 msgid "America/Araguaina"
 msgstr ""
 
-#: calendar/zones.h:64
+#: ../calendar/zones.h:64
 msgid "America/Aruba"
 msgstr ""
 
-#: calendar/zones.h:65
+#: ../calendar/zones.h:65
 msgid "America/Asuncion"
 msgstr ""
 
-#: calendar/zones.h:66
+#: ../calendar/zones.h:66
 msgid "America/Barbados"
 msgstr ""
 
-#: calendar/zones.h:67
+#: ../calendar/zones.h:67
 msgid "America/Belem"
 msgstr ""
 
-#: calendar/zones.h:68
+#: ../calendar/zones.h:68
 msgid "America/Belize"
 msgstr ""
 
-#: calendar/zones.h:69
+#: ../calendar/zones.h:69
 msgid "America/Boa_Vista"
 msgstr ""
 
-#: calendar/zones.h:70
+#: ../calendar/zones.h:70
 msgid "America/Bogota"
 msgstr ""
 
-#: calendar/zones.h:71
+#: ../calendar/zones.h:71
 msgid "America/Boise"
 msgstr ""
 
-#: calendar/zones.h:72
+#: ../calendar/zones.h:72
 msgid "America/Buenos_Aires"
 msgstr ""
 
-#: calendar/zones.h:73
+#: ../calendar/zones.h:73
 msgid "America/Cambridge_Bay"
 msgstr ""
 
-#: calendar/zones.h:74
+#: ../calendar/zones.h:74
 msgid "America/Cancun"
 msgstr ""
 
-#: calendar/zones.h:75
+#: ../calendar/zones.h:75
 msgid "America/Caracas"
 msgstr ""
 
-#: calendar/zones.h:76
+#: ../calendar/zones.h:76
 msgid "America/Catamarca"
 msgstr ""
 
-#: calendar/zones.h:77
+#: ../calendar/zones.h:77
 msgid "America/Cayenne"
 msgstr ""
 
-#: calendar/zones.h:78
+#: ../calendar/zones.h:78
 msgid "America/Cayman"
 msgstr ""
 
-#: calendar/zones.h:79
+#: ../calendar/zones.h:79
 msgid "America/Chicago"
 msgstr ""
 
-#: calendar/zones.h:80
+#: ../calendar/zones.h:80
 msgid "America/Chihuahua"
 msgstr ""
 
-#: calendar/zones.h:81
+#: ../calendar/zones.h:81
 msgid "America/Cordoba"
 msgstr ""
 
-#: calendar/zones.h:82
+#: ../calendar/zones.h:82
 msgid "America/Costa_Rica"
 msgstr ""
 
-#: calendar/zones.h:83
+#: ../calendar/zones.h:83
 msgid "America/Cuiaba"
 msgstr ""
 
-#: calendar/zones.h:84
+#: ../calendar/zones.h:84
 msgid "America/Curacao"
 msgstr ""
 
-#: calendar/zones.h:85
+#: ../calendar/zones.h:85
 msgid "America/Danmarkshavn"
 msgstr ""
 
-#: calendar/zones.h:86
+#: ../calendar/zones.h:86
 msgid "America/Dawson"
 msgstr ""
 
-#: calendar/zones.h:87
+#: ../calendar/zones.h:87
 msgid "America/Dawson_Creek"
 msgstr ""
 
-#: calendar/zones.h:88
+#: ../calendar/zones.h:88
 msgid "America/Denver"
 msgstr ""
 
-#: calendar/zones.h:89
+#: ../calendar/zones.h:89
 msgid "America/Detroit"
 msgstr ""
 
-#: calendar/zones.h:90
+#: ../calendar/zones.h:90
 msgid "America/Dominica"
 msgstr ""
 
-#: calendar/zones.h:91
+#: ../calendar/zones.h:91
 msgid "America/Edmonton"
 msgstr ""
 
-#: calendar/zones.h:92
+#: ../calendar/zones.h:92
 msgid "America/Eirunepe"
 msgstr ""
 
-#: calendar/zones.h:93
+#: ../calendar/zones.h:93
 msgid "America/El_Salvador"
 msgstr ""
 
-#: calendar/zones.h:94
+#: ../calendar/zones.h:94
 msgid "America/Fortaleza"
 msgstr ""
 
-#: calendar/zones.h:95
+#: ../calendar/zones.h:95
 msgid "America/Glace_Bay"
 msgstr ""
 
-#: calendar/zones.h:96
+#: ../calendar/zones.h:96
 msgid "America/Godthab"
 msgstr ""
 
-#: calendar/zones.h:97
+#: ../calendar/zones.h:97
 msgid "America/Goose_Bay"
 msgstr ""
 
-#: calendar/zones.h:98
+#: ../calendar/zones.h:98
 msgid "America/Grand_Turk"
 msgstr ""
 
-#: calendar/zones.h:99
+#: ../calendar/zones.h:99
 msgid "America/Grenada"
 msgstr ""
 
-#: calendar/zones.h:100
+#: ../calendar/zones.h:100
 msgid "America/Guadeloupe"
 msgstr ""
 
-#: calendar/zones.h:101
+#: ../calendar/zones.h:101
 msgid "America/Guatemala"
 msgstr ""
 
-#: calendar/zones.h:102
+#: ../calendar/zones.h:102
 msgid "America/Guayaquil"
 msgstr ""
 
-#: calendar/zones.h:103
+#: ../calendar/zones.h:103
 msgid "America/Guyana"
 msgstr ""
 
-#: calendar/zones.h:104
+#: ../calendar/zones.h:104
 msgid "America/Halifax"
 msgstr ""
 
-#: calendar/zones.h:105
+#: ../calendar/zones.h:105
 msgid "America/Havana"
 msgstr ""
 
-#: calendar/zones.h:106
+#: ../calendar/zones.h:106
 msgid "America/Hermosillo"
 msgstr ""
 
-#: calendar/zones.h:107
+#: ../calendar/zones.h:107
 msgid "America/Indiana/Indianapolis"
 msgstr ""
 
-#: calendar/zones.h:108
+#: ../calendar/zones.h:108
 msgid "America/Indiana/Knox"
 msgstr ""
 
-#: calendar/zones.h:109
+#: ../calendar/zones.h:109
 msgid "America/Indiana/Marengo"
 msgstr ""
 
-#: calendar/zones.h:110
+#: ../calendar/zones.h:110
 msgid "America/Indiana/Vevay"
 msgstr ""
 
-#: calendar/zones.h:111
+#: ../calendar/zones.h:111
 msgid "America/Indianapolis"
 msgstr ""
 
-#: calendar/zones.h:112
+#: ../calendar/zones.h:112
 msgid "America/Inuvik"
 msgstr ""
 
-#: calendar/zones.h:113
+#: ../calendar/zones.h:113
 msgid "America/Iqaluit"
 msgstr ""
 
-#: calendar/zones.h:114
+#: ../calendar/zones.h:114
 msgid "America/Jamaica"
 msgstr ""
 
-#: calendar/zones.h:115
+#: ../calendar/zones.h:115
 msgid "America/Jujuy"
 msgstr ""
 
-#: calendar/zones.h:116
+#: ../calendar/zones.h:116
 msgid "America/Juneau"
 msgstr ""
 
-#: calendar/zones.h:117
+#: ../calendar/zones.h:117
 msgid "America/Kentucky/Louisville"
 msgstr ""
 
-#: calendar/zones.h:118
+#: ../calendar/zones.h:118
 msgid "America/Kentucky/Monticello"
 msgstr ""
 
-#: calendar/zones.h:119
+#: ../calendar/zones.h:119
 msgid "America/La_Paz"
 msgstr ""
 
-#: calendar/zones.h:120
+#: ../calendar/zones.h:120
 msgid "America/Lima"
 msgstr ""
 
-#: calendar/zones.h:121
+#: ../calendar/zones.h:121
 msgid "America/Los_Angeles"
 msgstr ""
 
-#: calendar/zones.h:122
+#: ../calendar/zones.h:122
 msgid "America/Louisville"
 msgstr ""
 
-#: calendar/zones.h:123
+#: ../calendar/zones.h:123
 msgid "America/Maceio"
 msgstr ""
 
-#: calendar/zones.h:124
+#: ../calendar/zones.h:124
 msgid "America/Managua"
 msgstr ""
 
-#: calendar/zones.h:125
+#: ../calendar/zones.h:125
 msgid "America/Manaus"
 msgstr ""
 
-#: calendar/zones.h:126
+#: ../calendar/zones.h:126
 msgid "America/Martinique"
 msgstr ""
 
-#: calendar/zones.h:127
+#: ../calendar/zones.h:127
 msgid "America/Mazatlan"
 msgstr ""
 
-#: calendar/zones.h:128
+#: ../calendar/zones.h:128
 msgid "America/Mendoza"
 msgstr ""
 
-#: calendar/zones.h:129
+#: ../calendar/zones.h:129
 msgid "America/Menominee"
 msgstr ""
 
-#: calendar/zones.h:130
+#: ../calendar/zones.h:130
 msgid "America/Merida"
 msgstr ""
 
-#: calendar/zones.h:131
+#: ../calendar/zones.h:131
 msgid "America/Mexico_City"
 msgstr ""
 
-#: calendar/zones.h:132
+#: ../calendar/zones.h:132
 msgid "America/Miquelon"
 msgstr ""
 
-#: calendar/zones.h:133
+#: ../calendar/zones.h:133
 msgid "America/Monterrey"
 msgstr ""
 
-#: calendar/zones.h:134
+#: ../calendar/zones.h:134
 msgid "America/Montevideo"
 msgstr ""
 
-#: calendar/zones.h:135
+#: ../calendar/zones.h:135
 msgid "America/Montreal"
 msgstr ""
 
-#: calendar/zones.h:136
+#: ../calendar/zones.h:136
 msgid "America/Montserrat"
 msgstr ""
 
-#: calendar/zones.h:137
+#: ../calendar/zones.h:137
 msgid "America/Nassau"
 msgstr ""
 
-#: calendar/zones.h:138 widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
+#: ../calendar/zones.h:138
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
 msgid "America/New_York"
 msgstr ""
 
-#: calendar/zones.h:139
+#: ../calendar/zones.h:139
 msgid "America/Nipigon"
 msgstr ""
 
-#: calendar/zones.h:140
+#: ../calendar/zones.h:140
 msgid "America/Nome"
 msgstr ""
 
-#: calendar/zones.h:141
+#: ../calendar/zones.h:141
 msgid "America/Noronha"
 msgstr ""
 
-#: calendar/zones.h:142
+#: ../calendar/zones.h:142
 msgid "America/North_Dakota/Center"
 msgstr ""
 
-#: calendar/zones.h:143
+#: ../calendar/zones.h:143
 msgid "America/Panama"
 msgstr ""
 
-#: calendar/zones.h:144
+#: ../calendar/zones.h:144
 msgid "America/Pangnirtung"
 msgstr ""
 
-#: calendar/zones.h:145
+#: ../calendar/zones.h:145
 msgid "America/Paramaribo"
 msgstr ""
 
-#: calendar/zones.h:146
+#: ../calendar/zones.h:146
 msgid "America/Phoenix"
 msgstr ""
 
-#: calendar/zones.h:147
+#: ../calendar/zones.h:147
 msgid "America/Port-au-Prince"
 msgstr ""
 
-#: calendar/zones.h:148
+#: ../calendar/zones.h:148
 msgid "America/Port_of_Spain"
 msgstr ""
 
-#: calendar/zones.h:149
+#: ../calendar/zones.h:149
 msgid "America/Porto_Velho"
 msgstr ""
 
-#: calendar/zones.h:150
+#: ../calendar/zones.h:150
 msgid "America/Puerto_Rico"
 msgstr ""
 
-#: calendar/zones.h:151
+#: ../calendar/zones.h:151
 msgid "America/Rainy_River"
 msgstr ""
 
-#: calendar/zones.h:152
+#: ../calendar/zones.h:152
 msgid "America/Rankin_Inlet"
 msgstr ""
 
-#: calendar/zones.h:153
+#: ../calendar/zones.h:153
 msgid "America/Recife"
 msgstr ""
 
-#: calendar/zones.h:154
+#: ../calendar/zones.h:154
 msgid "America/Regina"
 msgstr ""
 
-#: calendar/zones.h:155
+#: ../calendar/zones.h:155
 msgid "America/Rio_Branco"
 msgstr ""
 
-#: calendar/zones.h:156
+#: ../calendar/zones.h:156
 msgid "America/Rosario"
 msgstr ""
 
-#: calendar/zones.h:157
+#: ../calendar/zones.h:157
 msgid "America/Santiago"
 msgstr ""
 
-#: calendar/zones.h:158
+#: ../calendar/zones.h:158
 msgid "America/Santo_Domingo"
 msgstr ""
 
-#: calendar/zones.h:159
+#: ../calendar/zones.h:159
 msgid "America/Sao_Paulo"
 msgstr ""
 
-#: calendar/zones.h:160
+#: ../calendar/zones.h:160
 msgid "America/Scoresbysund"
 msgstr ""
 
-#: calendar/zones.h:161
+#: ../calendar/zones.h:161
 msgid "America/Shiprock"
 msgstr ""
 
-#: calendar/zones.h:162
+#: ../calendar/zones.h:162
 msgid "America/St_Johns"
 msgstr ""
 
-#: calendar/zones.h:163
+#: ../calendar/zones.h:163
 msgid "America/St_Kitts"
 msgstr ""
 
-#: calendar/zones.h:164
+#: ../calendar/zones.h:164
 msgid "America/St_Lucia"
 msgstr ""
 
-#: calendar/zones.h:165
+#: ../calendar/zones.h:165
 msgid "America/St_Thomas"
 msgstr ""
 
-#: calendar/zones.h:166
+#: ../calendar/zones.h:166
 msgid "America/St_Vincent"
 msgstr ""
 
-#: calendar/zones.h:167
+#: ../calendar/zones.h:167
 msgid "America/Swift_Current"
 msgstr ""
 
-#: calendar/zones.h:168
+#: ../calendar/zones.h:168
 msgid "America/Tegucigalpa"
 msgstr ""
 
-#: calendar/zones.h:169
+#: ../calendar/zones.h:169
 msgid "America/Thule"
 msgstr ""
 
-#: calendar/zones.h:170
+#: ../calendar/zones.h:170
 msgid "America/Thunder_Bay"
 msgstr ""
 
-#: calendar/zones.h:171
+#: ../calendar/zones.h:171
 msgid "America/Tijuana"
 msgstr ""
 
-#: calendar/zones.h:172
+#: ../calendar/zones.h:172
 msgid "America/Tortola"
 msgstr ""
 
-#: calendar/zones.h:173
+#: ../calendar/zones.h:173
 msgid "America/Vancouver"
 msgstr ""
 
-#: calendar/zones.h:174
+#: ../calendar/zones.h:174
 msgid "America/Whitehorse"
 msgstr ""
 
-#: calendar/zones.h:175
+#: ../calendar/zones.h:175
 msgid "America/Winnipeg"
 msgstr ""
 
-#: calendar/zones.h:176
+#: ../calendar/zones.h:176
 msgid "America/Yakutat"
 msgstr ""
 
-#: calendar/zones.h:177
+#: ../calendar/zones.h:177
 msgid "America/Yellowknife"
 msgstr ""
 
-#: calendar/zones.h:178
+#: ../calendar/zones.h:178
 msgid "Antarctica/Casey"
 msgstr ""
 
-#: calendar/zones.h:179
+#: ../calendar/zones.h:179
 msgid "Antarctica/Davis"
 msgstr ""
 
-#: calendar/zones.h:180
+#: ../calendar/zones.h:180
 msgid "Antarctica/DumontDUrville"
 msgstr ""
 
-#: calendar/zones.h:181
+#: ../calendar/zones.h:181
 msgid "Antarctica/Mawson"
 msgstr ""
 
-#: calendar/zones.h:182
+#: ../calendar/zones.h:182
 msgid "Antarctica/McMurdo"
 msgstr ""
 
-#: calendar/zones.h:183
+#: ../calendar/zones.h:183
 msgid "Antarctica/Palmer"
 msgstr ""
 
-#: calendar/zones.h:184
+#: ../calendar/zones.h:184
 msgid "Antarctica/South_Pole"
 msgstr ""
 
-#: calendar/zones.h:185
+#: ../calendar/zones.h:185
 msgid "Antarctica/Syowa"
 msgstr ""
 
-#: calendar/zones.h:186
+#: ../calendar/zones.h:186
 msgid "Antarctica/Vostok"
 msgstr ""
 
-#: calendar/zones.h:187
+#: ../calendar/zones.h:187
 msgid "Arctic/Longyearbyen"
 msgstr ""
 
-#: calendar/zones.h:188
+#: ../calendar/zones.h:188
 msgid "Asia/Aden"
 msgstr ""
 
-#: calendar/zones.h:189
+#: ../calendar/zones.h:189
 msgid "Asia/Almaty"
 msgstr ""
 
-#: calendar/zones.h:190
+#: ../calendar/zones.h:190
 msgid "Asia/Amman"
 msgstr ""
 
-#: calendar/zones.h:191
+#: ../calendar/zones.h:191
 msgid "Asia/Anadyr"
 msgstr ""
 
-#: calendar/zones.h:192
+#: ../calendar/zones.h:192
 msgid "Asia/Aqtau"
 msgstr ""
 
-#: calendar/zones.h:193
+#: ../calendar/zones.h:193
 msgid "Asia/Aqtobe"
 msgstr ""
 
-#: calendar/zones.h:194
+#: ../calendar/zones.h:194
 msgid "Asia/Ashgabat"
 msgstr ""
 
-#: calendar/zones.h:195
+#: ../calendar/zones.h:195
 msgid "Asia/Baghdad"
 msgstr ""
 
-#: calendar/zones.h:196
+#: ../calendar/zones.h:196
 msgid "Asia/Bahrain"
 msgstr ""
 
-#: calendar/zones.h:197
+#: ../calendar/zones.h:197
 msgid "Asia/Baku"
 msgstr ""
 
-#: calendar/zones.h:198
+#: ../calendar/zones.h:198
 msgid "Asia/Bangkok"
 msgstr ""
 
-#: calendar/zones.h:199
+#: ../calendar/zones.h:199
 msgid "Asia/Beirut"
 msgstr ""
 
-#: calendar/zones.h:200
+#: ../calendar/zones.h:200
 msgid "Asia/Bishkek"
 msgstr ""
 
-#: calendar/zones.h:201
+#: ../calendar/zones.h:201
 msgid "Asia/Brunei"
 msgstr ""
 
-#: calendar/zones.h:202
+#: ../calendar/zones.h:202
 msgid "Asia/Calcutta"
 msgstr ""
 
-#: calendar/zones.h:203
+#: ../calendar/zones.h:203
 msgid "Asia/Choibalsan"
 msgstr ""
 
-#: calendar/zones.h:204
+#: ../calendar/zones.h:204
 msgid "Asia/Chongqing"
 msgstr ""
 
-#: calendar/zones.h:205
+#: ../calendar/zones.h:205
 msgid "Asia/Colombo"
 msgstr ""
 
-#: calendar/zones.h:206
+#: ../calendar/zones.h:206
 msgid "Asia/Damascus"
 msgstr ""
 
-#: calendar/zones.h:207
+#: ../calendar/zones.h:207
 msgid "Asia/Dhaka"
 msgstr ""
 
-#: calendar/zones.h:208
+#: ../calendar/zones.h:208
 msgid "Asia/Dili"
 msgstr ""
 
-#: calendar/zones.h:209
+#: ../calendar/zones.h:209
 msgid "Asia/Dubai"
 msgstr ""
 
-#: calendar/zones.h:210
+#: ../calendar/zones.h:210
 msgid "Asia/Dushanbe"
 msgstr ""
 
-#: calendar/zones.h:211
+#: ../calendar/zones.h:211
 msgid "Asia/Gaza"
 msgstr ""
 
-#: calendar/zones.h:212
+#: ../calendar/zones.h:212
 msgid "Asia/Harbin"
 msgstr ""
 
-#: calendar/zones.h:213
+#: ../calendar/zones.h:213
 msgid "Asia/Hong_Kong"
 msgstr ""
 
-#: calendar/zones.h:214
+#: ../calendar/zones.h:214
 msgid "Asia/Hovd"
 msgstr ""
 
-#: calendar/zones.h:215
+#: ../calendar/zones.h:215
 msgid "Asia/Irkutsk"
 msgstr ""
 
-#: calendar/zones.h:216
+#: ../calendar/zones.h:216
 msgid "Asia/Istanbul"
 msgstr ""
 
-#: calendar/zones.h:217
+#: ../calendar/zones.h:217
 msgid "Asia/Jakarta"
 msgstr ""
 
-#: calendar/zones.h:218
+#: ../calendar/zones.h:218
 msgid "Asia/Jayapura"
 msgstr ""
 
-#: calendar/zones.h:219
+#: ../calendar/zones.h:219
 msgid "Asia/Jerusalem"
 msgstr ""
 
-#: calendar/zones.h:220
+#: ../calendar/zones.h:220
 msgid "Asia/Kabul"
 msgstr ""
 
-#: calendar/zones.h:221
+#: ../calendar/zones.h:221
 msgid "Asia/Kamchatka"
 msgstr ""
 
-#: calendar/zones.h:222
+#: ../calendar/zones.h:222
 msgid "Asia/Karachi"
 msgstr ""
 
-#: calendar/zones.h:223
+#: ../calendar/zones.h:223
 msgid "Asia/Kashgar"
 msgstr ""
 
-#: calendar/zones.h:224
+#: ../calendar/zones.h:224
 msgid "Asia/Katmandu"
 msgstr ""
 
-#: calendar/zones.h:225
+#: ../calendar/zones.h:225
 msgid "Asia/Krasnoyarsk"
 msgstr ""
 
-#: calendar/zones.h:226
+#: ../calendar/zones.h:226
 msgid "Asia/Kuala_Lumpur"
 msgstr ""
 
-#: calendar/zones.h:227
+#: ../calendar/zones.h:227
 msgid "Asia/Kuching"
 msgstr ""
 
-#: calendar/zones.h:228
+#: ../calendar/zones.h:228
 msgid "Asia/Kuwait"
 msgstr ""
 
-#: calendar/zones.h:229
+#: ../calendar/zones.h:229
 msgid "Asia/Macao"
 msgstr ""
 
-#: calendar/zones.h:230
+#: ../calendar/zones.h:230
 msgid "Asia/Macau"
 msgstr ""
 
-#: calendar/zones.h:231
+#: ../calendar/zones.h:231
 msgid "Asia/Magadan"
 msgstr ""
 
-#: calendar/zones.h:232
+#: ../calendar/zones.h:232
 msgid "Asia/Makassar"
 msgstr ""
 
-#: calendar/zones.h:233
+#: ../calendar/zones.h:233
 msgid "Asia/Manila"
 msgstr ""
 
-#: calendar/zones.h:234
+#: ../calendar/zones.h:234
 msgid "Asia/Muscat"
 msgstr ""
 
-#: calendar/zones.h:235
+#: ../calendar/zones.h:235
 msgid "Asia/Nicosia"
 msgstr ""
 
-#: calendar/zones.h:236
+#: ../calendar/zones.h:236
 msgid "Asia/Novosibirsk"
 msgstr ""
 
-#: calendar/zones.h:237
+#: ../calendar/zones.h:237
 msgid "Asia/Omsk"
 msgstr ""
 
-#: calendar/zones.h:238
+#: ../calendar/zones.h:238
 msgid "Asia/Oral"
 msgstr ""
 
-#: calendar/zones.h:239
+#: ../calendar/zones.h:239
 msgid "Asia/Phnom_Penh"
 msgstr ""
 
-#: calendar/zones.h:240
+#: ../calendar/zones.h:240
 msgid "Asia/Pontianak"
 msgstr ""
 
-#: calendar/zones.h:241
+#: ../calendar/zones.h:241
 msgid "Asia/Pyongyang"
 msgstr ""
 
-#: calendar/zones.h:242
+#: ../calendar/zones.h:242
 msgid "Asia/Qatar"
 msgstr ""
 
-#: calendar/zones.h:243
+#: ../calendar/zones.h:243
 msgid "Asia/Qyzylorda"
 msgstr ""
 
-#: calendar/zones.h:244
+#: ../calendar/zones.h:244
 msgid "Asia/Rangoon"
 msgstr ""
 
-#: calendar/zones.h:245
+#: ../calendar/zones.h:245
 msgid "Asia/Riyadh"
 msgstr ""
 
-#: calendar/zones.h:246
+#: ../calendar/zones.h:246
 msgid "Asia/Saigon"
 msgstr ""
 
-#: calendar/zones.h:247
+#: ../calendar/zones.h:247
 msgid "Asia/Sakhalin"
 msgstr ""
 
-#: calendar/zones.h:248
+#: ../calendar/zones.h:248
 msgid "Asia/Samarkand"
 msgstr ""
 
-#: calendar/zones.h:249
+#: ../calendar/zones.h:249
 msgid "Asia/Seoul"
 msgstr ""
 
-#: calendar/zones.h:250
+#: ../calendar/zones.h:250
 msgid "Asia/Shanghai"
 msgstr ""
 
-#: calendar/zones.h:251
+#: ../calendar/zones.h:251
 msgid "Asia/Singapore"
 msgstr ""
 
-#: calendar/zones.h:252
+#: ../calendar/zones.h:252
 msgid "Asia/Taipei"
 msgstr ""
 
-#: calendar/zones.h:253
+#: ../calendar/zones.h:253
 msgid "Asia/Tashkent"
 msgstr ""
 
-#: calendar/zones.h:254
+#: ../calendar/zones.h:254
 msgid "Asia/Tbilisi"
 msgstr ""
 
-#: calendar/zones.h:255
+#: ../calendar/zones.h:255
 msgid "Asia/Tehran"
 msgstr ""
 
-#: calendar/zones.h:256
+#: ../calendar/zones.h:256
 msgid "Asia/Thimphu"
 msgstr ""
 
-#: calendar/zones.h:257
+#: ../calendar/zones.h:257
 msgid "Asia/Tokyo"
 msgstr ""
 
-#: calendar/zones.h:258
+#: ../calendar/zones.h:258
 msgid "Asia/Ujung_Pandang"
 msgstr ""
 
-#: calendar/zones.h:259
+#: ../calendar/zones.h:259
 msgid "Asia/Ulaanbaatar"
 msgstr ""
 
-#: calendar/zones.h:260
+#: ../calendar/zones.h:260
 msgid "Asia/Urumqi"
 msgstr ""
 
-#: calendar/zones.h:261
+#: ../calendar/zones.h:261
 msgid "Asia/Vientiane"
 msgstr ""
 
-#: calendar/zones.h:262
+#: ../calendar/zones.h:262
 msgid "Asia/Vladivostok"
 msgstr ""
 
-#: calendar/zones.h:263
+#: ../calendar/zones.h:263
 msgid "Asia/Yakutsk"
 msgstr ""
 
-#: calendar/zones.h:264
+#: ../calendar/zones.h:264
 msgid "Asia/Yekaterinburg"
 msgstr ""
 
-#: calendar/zones.h:265
+#: ../calendar/zones.h:265
 msgid "Asia/Yerevan"
 msgstr ""
 
-#: calendar/zones.h:266
+#: ../calendar/zones.h:266
 msgid "Atlantic/Azores"
 msgstr ""
 
-#: calendar/zones.h:267
+#: ../calendar/zones.h:267
 msgid "Atlantic/Bermuda"
 msgstr ""
 
-#: calendar/zones.h:268
+#: ../calendar/zones.h:268
 msgid "Atlantic/Canary"
 msgstr ""
 
-#: calendar/zones.h:269
+#: ../calendar/zones.h:269
 msgid "Atlantic/Cape_Verde"
 msgstr ""
 
-#: calendar/zones.h:270
+#: ../calendar/zones.h:270
 msgid "Atlantic/Faeroe"
 msgstr ""
 
-#: calendar/zones.h:271
+#: ../calendar/zones.h:271
 msgid "Atlantic/Jan_Mayen"
 msgstr ""
 
-#: calendar/zones.h:272
+#: ../calendar/zones.h:272
 msgid "Atlantic/Madeira"
 msgstr ""
 
-#: calendar/zones.h:273
+#: ../calendar/zones.h:273
 msgid "Atlantic/Reykjavik"
 msgstr ""
 
-#: calendar/zones.h:274
+#: ../calendar/zones.h:274
 msgid "Atlantic/South_Georgia"
 msgstr ""
 
-#: calendar/zones.h:275
+#: ../calendar/zones.h:275
 msgid "Atlantic/St_Helena"
 msgstr ""
 
-#: calendar/zones.h:276
+#: ../calendar/zones.h:276
 msgid "Atlantic/Stanley"
 msgstr ""
 
-#: calendar/zones.h:277
+#: ../calendar/zones.h:277
 msgid "Australia/Adelaide"
 msgstr ""
 
-#: calendar/zones.h:278
+#: ../calendar/zones.h:278
 msgid "Australia/Brisbane"
 msgstr ""
 
-#: calendar/zones.h:279
+#: ../calendar/zones.h:279
 msgid "Australia/Broken_Hill"
 msgstr ""
 
-#: calendar/zones.h:280
+#: ../calendar/zones.h:280
 msgid "Australia/Darwin"
 msgstr ""
 
-#: calendar/zones.h:281
+#: ../calendar/zones.h:281
 msgid "Australia/Hobart"
 msgstr ""
 
-#: calendar/zones.h:282
+#: ../calendar/zones.h:282
 msgid "Australia/Lindeman"
 msgstr ""
 
-#: calendar/zones.h:283
+#: ../calendar/zones.h:283
 msgid "Australia/Lord_Howe"
 msgstr ""
 
-#: calendar/zones.h:284
+#: ../calendar/zones.h:284
 msgid "Australia/Melbourne"
 msgstr ""
 
-#: calendar/zones.h:285
+#: ../calendar/zones.h:285
 msgid "Australia/Perth"
 msgstr ""
 
-#: calendar/zones.h:286
+#: ../calendar/zones.h:286
 msgid "Australia/Sydney"
 msgstr ""
 
-#: calendar/zones.h:287
+#: ../calendar/zones.h:287
 msgid "Europe/Amsterdam"
 msgstr ""
 
-#: calendar/zones.h:288
+#: ../calendar/zones.h:288
 msgid "Europe/Andorra"
 msgstr ""
 
-#: calendar/zones.h:289
+#: ../calendar/zones.h:289
 msgid "Europe/Athens"
 msgstr ""
 
-#: calendar/zones.h:290
+#: ../calendar/zones.h:290
 msgid "Europe/Belfast"
 msgstr ""
 
-#: calendar/zones.h:291
+#: ../calendar/zones.h:291
 msgid "Europe/Belgrade"
 msgstr ""
 
-#: calendar/zones.h:292
+#: ../calendar/zones.h:292
 msgid "Europe/Berlin"
 msgstr ""
 
-#: calendar/zones.h:293
+#: ../calendar/zones.h:293
 msgid "Europe/Bratislava"
 msgstr ""
 
-#: calendar/zones.h:294
+#: ../calendar/zones.h:294
 msgid "Europe/Brussels"
 msgstr ""
 
-#: calendar/zones.h:295
+#: ../calendar/zones.h:295
 msgid "Europe/Bucharest"
 msgstr ""
 
-#: calendar/zones.h:296
+#: ../calendar/zones.h:296
 msgid "Europe/Budapest"
 msgstr ""
 
-#: calendar/zones.h:297
+#: ../calendar/zones.h:297
 msgid "Europe/Chisinau"
 msgstr ""
 
-#: calendar/zones.h:298
+#: ../calendar/zones.h:298
 msgid "Europe/Copenhagen"
 msgstr ""
 
-#: calendar/zones.h:299
+#: ../calendar/zones.h:299
 msgid "Europe/Dublin"
 msgstr ""
 
-#: calendar/zones.h:300
+#: ../calendar/zones.h:300
 msgid "Europe/Gibraltar"
 msgstr ""
 
-#: calendar/zones.h:301
+#: ../calendar/zones.h:301
 msgid "Europe/Helsinki"
 msgstr ""
 
-#: calendar/zones.h:302
+#: ../calendar/zones.h:302
 msgid "Europe/Istanbul"
 msgstr ""
 
-#: calendar/zones.h:303
+#: ../calendar/zones.h:303
 msgid "Europe/Kaliningrad"
 msgstr ""
 
-#: calendar/zones.h:304
+#: ../calendar/zones.h:304
 msgid "Europe/Kiev"
 msgstr ""
 
-#: calendar/zones.h:305
+#: ../calendar/zones.h:305
 msgid "Europe/Lisbon"
 msgstr ""
 
-#: calendar/zones.h:306
+#: ../calendar/zones.h:306
 msgid "Europe/Ljubljana"
 msgstr ""
 
-#: calendar/zones.h:307
+#: ../calendar/zones.h:307
 msgid "Europe/London"
 msgstr ""
 
-#: calendar/zones.h:308
+#: ../calendar/zones.h:308
 msgid "Europe/Luxembourg"
 msgstr ""
 
-#: calendar/zones.h:309
+#: ../calendar/zones.h:309
 msgid "Europe/Madrid"
 msgstr ""
 
-#: calendar/zones.h:310
+#: ../calendar/zones.h:310
 msgid "Europe/Malta"
 msgstr ""
 
-#: calendar/zones.h:311
+#: ../calendar/zones.h:311
 msgid "Europe/Minsk"
 msgstr ""
 
-#: calendar/zones.h:312
+#: ../calendar/zones.h:312
 msgid "Europe/Monaco"
 msgstr ""
 
-#: calendar/zones.h:313
+#: ../calendar/zones.h:313
 msgid "Europe/Moscow"
 msgstr ""
 
-#: calendar/zones.h:314
+#: ../calendar/zones.h:314
 msgid "Europe/Nicosia"
 msgstr ""
 
-#: calendar/zones.h:315
+#: ../calendar/zones.h:315
 msgid "Europe/Oslo"
 msgstr ""
 
-#: calendar/zones.h:316
+#: ../calendar/zones.h:316
 msgid "Europe/Paris"
 msgstr ""
 
-#: calendar/zones.h:317
+#: ../calendar/zones.h:317
 msgid "Europe/Prague"
 msgstr ""
 
-#: calendar/zones.h:318
+#: ../calendar/zones.h:318
 msgid "Europe/Riga"
 msgstr ""
 
-#: calendar/zones.h:319
+#: ../calendar/zones.h:319
 msgid "Europe/Rome"
 msgstr ""
 
-#: calendar/zones.h:320
+#: ../calendar/zones.h:320
 msgid "Europe/Samara"
 msgstr ""
 
-#: calendar/zones.h:321
+#: ../calendar/zones.h:321
 msgid "Europe/San_Marino"
 msgstr ""
 
-#: calendar/zones.h:322
+#: ../calendar/zones.h:322
 msgid "Europe/Sarajevo"
 msgstr ""
 
-#: calendar/zones.h:323
+#: ../calendar/zones.h:323
 msgid "Europe/Simferopol"
 msgstr ""
 
-#: calendar/zones.h:324
+#: ../calendar/zones.h:324
 msgid "Europe/Skopje"
 msgstr ""
 
-#: calendar/zones.h:325
+#: ../calendar/zones.h:325
 msgid "Europe/Sofia"
 msgstr ""
 
-#: calendar/zones.h:326
+#: ../calendar/zones.h:326
 msgid "Europe/Stockholm"
 msgstr ""
 
-#: calendar/zones.h:327
+#: ../calendar/zones.h:327
 msgid "Europe/Tallinn"
 msgstr ""
 
-#: calendar/zones.h:328
+#: ../calendar/zones.h:328
 msgid "Europe/Tirane"
 msgstr ""
 
-#: calendar/zones.h:329
+#: ../calendar/zones.h:329
 msgid "Europe/Uzhgorod"
 msgstr ""
 
-#: calendar/zones.h:330
+#: ../calendar/zones.h:330
 msgid "Europe/Vaduz"
 msgstr ""
 
-#: calendar/zones.h:331
+#: ../calendar/zones.h:331
 msgid "Europe/Vatican"
 msgstr ""
 
-#: calendar/zones.h:332
+#: ../calendar/zones.h:332
 msgid "Europe/Vienna"
 msgstr ""
 
-#: calendar/zones.h:333
+#: ../calendar/zones.h:333
 msgid "Europe/Vilnius"
 msgstr ""
 
-#: calendar/zones.h:334
+#: ../calendar/zones.h:334
 msgid "Europe/Warsaw"
 msgstr ""
 
-#: calendar/zones.h:335
+#: ../calendar/zones.h:335
 msgid "Europe/Zagreb"
 msgstr ""
 
-#: calendar/zones.h:336
+#: ../calendar/zones.h:336
 msgid "Europe/Zaporozhye"
 msgstr ""
 
-#: calendar/zones.h:337
+#: ../calendar/zones.h:337
 msgid "Europe/Zurich"
 msgstr ""
 
-#: calendar/zones.h:338
+#: ../calendar/zones.h:338
 msgid "Indian/Antananarivo"
 msgstr ""
 
-#: calendar/zones.h:339
+#: ../calendar/zones.h:339
 msgid "Indian/Chagos"
 msgstr ""
 
-#: calendar/zones.h:340
+#: ../calendar/zones.h:340
 msgid "Indian/Christmas"
 msgstr ""
 
-#: calendar/zones.h:341
+#: ../calendar/zones.h:341
 msgid "Indian/Cocos"
 msgstr ""
 
-#: calendar/zones.h:342
+#: ../calendar/zones.h:342
 msgid "Indian/Comoro"
 msgstr ""
 
-#: calendar/zones.h:343
+#: ../calendar/zones.h:343
 msgid "Indian/Kerguelen"
 msgstr ""
 
-#: calendar/zones.h:344
+#: ../calendar/zones.h:344
 msgid "Indian/Mahe"
 msgstr ""
 
-#: calendar/zones.h:345
+#: ../calendar/zones.h:345
 msgid "Indian/Maldives"
 msgstr ""
 
-#: calendar/zones.h:346
+#: ../calendar/zones.h:346
 msgid "Indian/Mauritius"
 msgstr ""
 
-#: calendar/zones.h:347
+#: ../calendar/zones.h:347
 msgid "Indian/Mayotte"
 msgstr ""
 
-#: calendar/zones.h:348
+#: ../calendar/zones.h:348
 msgid "Indian/Reunion"
 msgstr ""
 
-#: calendar/zones.h:349
+#: ../calendar/zones.h:349
 msgid "Pacific/Apia"
 msgstr ""
 
-#: calendar/zones.h:350
+#: ../calendar/zones.h:350
 msgid "Pacific/Auckland"
 msgstr ""
 
-#: calendar/zones.h:351
+#: ../calendar/zones.h:351
 msgid "Pacific/Chatham"
 msgstr ""
 
-#: calendar/zones.h:352
+#: ../calendar/zones.h:352
 msgid "Pacific/Easter"
 msgstr ""
 
-#: calendar/zones.h:353
+#: ../calendar/zones.h:353
 msgid "Pacific/Efate"
 msgstr ""
 
-#: calendar/zones.h:354
+#: ../calendar/zones.h:354
 msgid "Pacific/Enderbury"
 msgstr ""
 
-#: calendar/zones.h:355
+#: ../calendar/zones.h:355
 msgid "Pacific/Fakaofo"
 msgstr ""
 
-#: calendar/zones.h:356
+#: ../calendar/zones.h:356
 msgid "Pacific/Fiji"
 msgstr ""
 
-#: calendar/zones.h:357
+#: ../calendar/zones.h:357
 msgid "Pacific/Funafuti"
 msgstr ""
 
-#: calendar/zones.h:358
+#: ../calendar/zones.h:358
 msgid "Pacific/Galapagos"
 msgstr ""
 
-#: calendar/zones.h:359
+#: ../calendar/zones.h:359
 msgid "Pacific/Gambier"
 msgstr ""
 
-#: calendar/zones.h:360
+#: ../calendar/zones.h:360
 msgid "Pacific/Guadalcanal"
 msgstr ""
 
-#: calendar/zones.h:361
+#: ../calendar/zones.h:361
 msgid "Pacific/Guam"
 msgstr ""
 
-#: calendar/zones.h:362
+#: ../calendar/zones.h:362
 msgid "Pacific/Honolulu"
 msgstr ""
 
-#: calendar/zones.h:363
+#: ../calendar/zones.h:363
 msgid "Pacific/Johnston"
 msgstr ""
 
-#: calendar/zones.h:364
+#: ../calendar/zones.h:364
 msgid "Pacific/Kiritimati"
 msgstr ""
 
-#: calendar/zones.h:365
+#: ../calendar/zones.h:365
 msgid "Pacific/Kosrae"
 msgstr ""
 
-#: calendar/zones.h:366
+#: ../calendar/zones.h:366
 msgid "Pacific/Kwajalein"
 msgstr ""
 
-#: calendar/zones.h:367
+#: ../calendar/zones.h:367
 msgid "Pacific/Majuro"
 msgstr ""
 
-#: calendar/zones.h:368
+#: ../calendar/zones.h:368
 msgid "Pacific/Marquesas"
 msgstr ""
 
-#: calendar/zones.h:369
+#: ../calendar/zones.h:369
 msgid "Pacific/Midway"
 msgstr ""
 
-#: calendar/zones.h:370
+#: ../calendar/zones.h:370
 msgid "Pacific/Nauru"
 msgstr ""
 
-#: calendar/zones.h:371
+#: ../calendar/zones.h:371
 msgid "Pacific/Niue"
 msgstr ""
 
-#: calendar/zones.h:372
+#: ../calendar/zones.h:372
 msgid "Pacific/Norfolk"
 msgstr ""
 
-#: calendar/zones.h:373
+#: ../calendar/zones.h:373
 msgid "Pacific/Noumea"
 msgstr ""
 
-#: calendar/zones.h:374
+#: ../calendar/zones.h:374
 msgid "Pacific/Pago_Pago"
 msgstr ""
 
-#: calendar/zones.h:375
+#: ../calendar/zones.h:375
 msgid "Pacific/Palau"
 msgstr ""
 
-#: calendar/zones.h:376
+#: ../calendar/zones.h:376
 msgid "Pacific/Pitcairn"
 msgstr ""
 
-#: calendar/zones.h:377
+#: ../calendar/zones.h:377
 msgid "Pacific/Ponape"
 msgstr ""
 
-#: calendar/zones.h:378
+#: ../calendar/zones.h:378
 msgid "Pacific/Port_Moresby"
 msgstr ""
 
-#: calendar/zones.h:379
+#: ../calendar/zones.h:379
 msgid "Pacific/Rarotonga"
 msgstr ""
 
-#: calendar/zones.h:380
+#: ../calendar/zones.h:380
 msgid "Pacific/Saipan"
 msgstr ""
 
-#: calendar/zones.h:381
+#: ../calendar/zones.h:381
 msgid "Pacific/Tahiti"
 msgstr ""
 
-#: calendar/zones.h:382
+#: ../calendar/zones.h:382
 msgid "Pacific/Tarawa"
 msgstr ""
 
-#: calendar/zones.h:383
+#: ../calendar/zones.h:383
 msgid "Pacific/Tongatapu"
 msgstr ""
 
-#: calendar/zones.h:384
+#: ../calendar/zones.h:384
 msgid "Pacific/Truk"
 msgstr ""
 
-#: calendar/zones.h:385
+#: ../calendar/zones.h:385
 msgid "Pacific/Wake"
 msgstr ""
 
-#: calendar/zones.h:386
+#: ../calendar/zones.h:386
 msgid "Pacific/Wallis"
 msgstr ""
 
-#: calendar/zones.h:387
+#: ../calendar/zones.h:387
 msgid "Pacific/Yap"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:520
+#: ../composer/e-msg-composer-hdrs.c:525
 #, fuzzy
 msgid "Posting destination"
 msgstr "Ishyika"
 
-#: composer/e-msg-composer-hdrs.c:521
+#: ../composer/e-msg-composer-hdrs.c:526
 #, fuzzy
 msgid "Choose folders to post the message to."
 msgstr "Kuri Iposita Ubutumwa Kuri"
 
-#: composer/e-msg-composer-hdrs.c:555
+#: ../composer/e-msg-composer-hdrs.c:560
 #, fuzzy
 msgid "Click here for the address book"
 msgstr "kugirango Aderesi Igitabo"
@@ -10733,7 +10903,7 @@ msgstr "kugirango Aderesi Igitabo"
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: composer/e-msg-composer-hdrs.c:585
+#: ../composer/e-msg-composer-hdrs.c:590
 #, fuzzy
 msgid "_Reply-To:"
 msgstr "Subiza- Kuri:"
@@ -10741,7 +10911,7 @@ msgstr "Subiza- Kuri:"
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:592
+#: ../composer/e-msg-composer-hdrs.c:597
 #, fuzzy
 msgid "Fr_om:"
 msgstr "Kuva:"
@@ -10750,38 +10920,38 @@ msgstr "Kuva:"
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:599
+#: ../composer/e-msg-composer-hdrs.c:604
 #, fuzzy
 msgid "S_ubject:"
 msgstr "Ikivugwaho"
 
 # sw/source\ui\envelp\mailmrge.src:DLG_MAILMERGE.FT_BIS.text
-#: composer/e-msg-composer-hdrs.c:609
+#: ../composer/e-msg-composer-hdrs.c:614
 #, fuzzy
 msgid "_To:"
 msgstr "Kuri:"
 
-#: composer/e-msg-composer-hdrs.c:610
+#: ../composer/e-msg-composer-hdrs.c:615
 #, fuzzy
 msgid "Enter the recipients of the message"
 msgstr "Abandikiwe... Bya Ubutumwa"
 
-#: composer/e-msg-composer-hdrs.c:613
+#: ../composer/e-msg-composer-hdrs.c:618
 #, fuzzy
 msgid "_Cc:"
 msgstr "KopiKubandi"
 
-#: composer/e-msg-composer-hdrs.c:614
+#: ../composer/e-msg-composer-hdrs.c:619
 #, fuzzy
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Amaderesi Akira a Gukoporora Bya Ubutumwa"
 
-#: composer/e-msg-composer-hdrs.c:617
+#: ../composer/e-msg-composer-hdrs.c:622
 #, fuzzy
 msgid "_Bcc:"
 msgstr "KopikubandiBihishiwe:"
 
-#: composer/e-msg-composer-hdrs.c:618
+#: ../composer/e-msg-composer-hdrs.c:623
 #, fuzzy
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
@@ -10792,20 +10962,26 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:625
+#: ../composer/e-msg-composer-hdrs.c:630
 msgid "_Post To:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:630
+#: ../composer/e-msg-composer-hdrs.c:635
 #, fuzzy
 msgid "Click here to select folders to post to"
 msgstr "Kuri Guhitamo Kuri Iposita Kuri"
 
-#: composer/e-msg-composer-hdrs.c:636
+#: ../composer/e-msg-composer-hdrs.c:641
 msgid "Post To:"
 msgstr ""
 
-#: composer/e-msg-composer.c:730
+# 357
+#: ../composer/e-msg-composer-select-file.c:81
+#, fuzzy
+msgid "A_ttach"
+msgstr "gereka"
+
+#: ../composer/e-msg-composer.c:737
 #, fuzzy
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
@@ -10813,7 +10989,7 @@ msgstr ""
 "IKIMENYETSO Ubutumwa Ishirwaho umukono Impamyabushobozi Gushyiraho kugirango "
 "iyi Aderesi"
 
-#: composer/e-msg-composer.c:737
+#: ../composer/e-msg-composer.c:744
 #, fuzzy
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
@@ -10822,253 +10998,238 @@ msgstr ""
 "Shyiraho Umutekano Ubutumwa Bishunzwe: Impamyabushobozi Gushyiraho kugirango "
 "iyi Aderesi"
 
-#: composer/e-msg-composer.c:1222 composer/e-msg-composer.c:1255
+#: ../composer/e-msg-composer.c:1222 ../composer/e-msg-composer.c:1255
 msgid "Unknown reason"
 msgstr ""
 
-#: composer/e-msg-composer.c:1292
+#: ../composer/e-msg-composer.c:1292
 #, fuzzy
 msgid "Could not open file"
 msgstr "OYA Gufungura IDOSIYE"
 
-#: composer/e-msg-composer.c:1300
+#: ../composer/e-msg-composer.c:1300
 #, fuzzy
 msgid "Unable to retrieve message from editor"
 msgstr "Kuri Ubutumwa Bivuye Muhinduzi"
 
-#: composer/e-msg-composer.c:1570
+#: ../composer/e-msg-composer.c:1570
 msgid "Untitled Message"
 msgstr ""
 
 # sfx2/sdi\sfxslots.src:SID_OPENDOC.text
 #. NB: This function is never used anymore
-#: composer/e-msg-composer.c:1604
+#: ../composer/e-msg-composer.c:1604
 msgid "Open File"
 msgstr "Gufungura Dosiye"
 
-#: composer/e-msg-composer.c:2001 mail/em-account-editor.c:588
-#: mail/em-account-editor.c:633 mail/em-account-editor.c:698
+#: ../composer/e-msg-composer.c:1996 ../mail/em-account-editor.c:588
+#: ../mail/em-account-editor.c:633 ../mail/em-account-editor.c:698
 msgid "Autogenerated"
 msgstr ""
 
-#: composer/e-msg-composer.c:2100
+#: ../composer/e-msg-composer.c:2095
 #, fuzzy
 msgid "Si_gnature:"
 msgstr "Umukono:"
 
-#: composer/e-msg-composer.c:2359 composer/e-msg-composer.c:3376
-#: composer/e-msg-composer.c:3377
+#: ../composer/e-msg-composer.c:2337 ../composer/e-msg-composer.c:3373
+#: ../composer/e-msg-composer.c:3374
 #, fuzzy
 msgid "Compose a message"
 msgstr "a Ubutumwa"
 
-#: composer/e-msg-composer.c:4570
+# 361
+#: ../composer/e-msg-composer.c:3484
+#, fuzzy
+msgid "_Attachment Bar"
+msgstr "umugereka"
+
+#: ../composer/e-msg-composer.c:4557
 #, fuzzy
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
 msgstr "<B Uhimba Kirimo a Umwandiko Ubutumwa B"
 
-#. mail-composer:no-attach primary
-#: composer/mail-composer-errors.xml.h:2
+#: ../composer/mail-composer.error.xml.h:1
+msgid ""
+" There are few attachments getting downloaded. Sending the mail will cause "
+"the mail to be sent without those pending attachments "
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:2
 #, fuzzy
-msgid "You cannot attach the file `{0}' to this message."
-msgstr "gereka IDOSIYE 0 Kuri iyi Ubutumwa"
+msgid "All accounts have been removed."
+msgstr "Konti Cyavanyweho"
 
-#. mail-composer:attach-notfile primary
-#: composer/mail-composer-errors.xml.h:6
+#: ../composer/mail-composer.error.xml.h:3
 #, fuzzy
-msgid "The file `{0}' is not a regular file and cannot be sent in a message."
-msgstr "IDOSIYE 0 ni OYA a Ibisanzwe IDOSIYE Na Yoherejwe: in a Ubutumwa"
+msgid ""
+"Are you sure you want to discard the message, titled '{0}', you are "
+"composing?"
+msgstr "Kuri Kwanga Ubutumwa 0"
 
-#. mail-composer:attach-directory primary
-#: composer/mail-composer-errors.xml.h:8
+#: ../composer/mail-composer.error.xml.h:4
 #, fuzzy
-msgid "Directories can not be attached to Messages."
-msgstr "OYA Kuri"
+msgid "Because &quot;{0}&quot;, you may need to select different mail options."
+msgstr "0 Gicurasi Kuri Guhitamo Ubutumwa Amahitamo"
 
-#. mail-composer:attach-directory secondary
-#: composer/mail-composer-errors.xml.h:10
+#: ../composer/mail-composer.error.xml.h:5 ../e-util/e-system.error.xml.h:1
+#: ../mail/mail.error.xml.h:16
+#, fuzzy
+msgid "Because &quot;{1}&quot;."
+msgstr "1."
+
+#: ../composer/mail-composer.error.xml.h:6
 #, fuzzy
 msgid ""
-"To attach the contents of this directory, either attach the files in this "
-"directory individually, or create an archive of the directory and attach it."
+"Closing this composer window will discard the message permanently, unless "
+"you choose to save the message in your Drafts folder. This will allow you to "
+"continue the message at a later date."
 msgstr ""
-"gereka Ibigize Bya iyi bushyinguro gereka Idosiye in iyi bushyinguro Cyangwa "
-"Kurema Bya bushyinguro Na gereka"
+"iyi Uhimba Idirishya Kwanga Ubutumwa Guhitamo Kuri Kubika Ubutumwa in "
+"Ububiko Kwemerera Kuri urifuzagukomeza Ubutumwa ku a Itariki"
 
-#. mail-composer:attach-nomessages primary
-#: composer/mail-composer-errors.xml.h:12
+#: ../composer/mail-composer.error.xml.h:7
+#, fuzzy
+msgid "Could not create composer window."
+msgstr "OYA Kurema Uhimba Idirishya"
+
+#: ../composer/mail-composer.error.xml.h:8
+#, fuzzy
+msgid "Could not create message."
+msgstr "OYA Kurema Ubutumwa"
+
+#: ../composer/mail-composer.error.xml.h:9
+#, fuzzy
+msgid "Could not read signature file &quot;{0}&quot;."
+msgstr "OYA Gusoma Isinya IDOSIYE 0"
+
+#: ../composer/mail-composer.error.xml.h:10
 #, fuzzy
 msgid "Could not retrieve messages to attach from {0}."
 msgstr "OYA Ubutumwa Kuri gereka Bivuye 0"
 
-#. mail-composer:attach-nomessages secondary
-#. mail-composer:no-sig-file secondary
-#. mail:no-create-tmp-path secondary
-#. mail:no-delete-folder secondary
-#. system:no-save-file secondary
-#. system:no-load-file secondary
-#: composer/mail-composer-errors.xml.h:14
-#: composer/mail-composer-errors.xml.h:42 mail/mail-errors.xml.h:105
-#: mail/mail-errors.xml.h:117 widgets/misc/e-system-errors.xml.h:11
-#: widgets/misc/e-system-errors.xml.h:15
-#, fuzzy
-msgid "Because \"{1}\"."
-msgstr "1."
+#: ../composer/mail-composer.error.xml.h:11
+#, fuzzy
+msgid "Could not save to autosave file &quot;{0}&quot;."
+msgstr "OYA Kubika Kuri NyaMwishyingura IDOSIYE 0"
 
-#. mail-composer:recover-autosave title
-#: composer/mail-composer-errors.xml.h:16
+#: ../composer/mail-composer.error.xml.h:12
 #, fuzzy
-msgid "Unfinished messages found"
-msgstr "Ubutumwa Byabonetse"
+msgid "Directories can not be attached to Messages."
+msgstr "OYA Kuri"
 
-#. mail-composer:recover-autosave primary
-#: composer/mail-composer-errors.xml.h:18
+#: ../composer/mail-composer.error.xml.h:13
 #, fuzzy
 msgid "Do you want to recover unfinished messages?"
 msgstr "Kuri Ubutumwa"
 
-#. mail-composer:recover-autosave secondary
-#: composer/mail-composer-errors.xml.h:20
-#, fuzzy
-msgid ""
-"Evolution quit unexpectedly while you were composing a new message. "
-"Recovering the message will allow you to continue where you left off."
-msgstr ""
-"Kuvamo a Gishya Ubutumwa Ubutumwa Kwemerera Kuri urifuzagukomeza Ibumoso: "
-"Bidakora"
-
-#: composer/mail-composer-errors.xml.h:21
+#: ../composer/mail-composer.error.xml.h:14
 msgid "Don't Recover"
 msgstr ""
 
-#: composer/mail-composer-errors.xml.h:22
-msgid "Recover"
+#: ../composer/mail-composer.error.xml.h:15
+msgid "Download in progress. Do you want to send the mail?"
 msgstr ""
 
-#. mail-composer:no-autosave primary
-#: composer/mail-composer-errors.xml.h:24
+#: ../composer/mail-composer.error.xml.h:16
 #, fuzzy
-msgid "Could not save to autosave file \"{0}\"."
-msgstr "OYA Kubika Kuri NyaMwishyingura IDOSIYE 0"
+msgid "Error saving to autosave because &quot;{1}&quot;."
+msgstr "Mu kubika Kuri NyaMwishyingura 1."
 
-#. mail-composer:no-autosave secondary
-#: composer/mail-composer-errors.xml.h:26
+#: ../composer/mail-composer.error.xml.h:17
 #, fuzzy
-msgid "Error saving to autosave because \"{1}\"."
-msgstr "Mu kubika Kuri NyaMwishyingura 1."
+msgid ""
+"Evolution quit unexpectedly while you were composing a new message. "
+"Recovering the message will allow you to continue where you left off."
+msgstr ""
+"Kuvamo a Gishya Ubutumwa Ubutumwa Kwemerera Kuri urifuzagukomeza Ibumoso: "
+"Bidakora"
 
-#. mail-composer:exit-unsaved title
-#: composer/mail-composer-errors.xml.h:28
-msgid "Warning: Modified Message"
+#: ../composer/mail-composer.error.xml.h:18
+msgid "Recover"
 msgstr ""
 
-#. mail-composer:exit-unsaved primary
-#: composer/mail-composer-errors.xml.h:30
+#: ../composer/mail-composer.error.xml.h:19
 #, fuzzy
-msgid ""
-"Are you sure you want to discard the message, titled '{0}', you are "
-"composing?"
-msgstr "Kuri Kwanga Ubutumwa 0"
+msgid "The file `{0}' is not a regular file and cannot be sent in a message."
+msgstr "IDOSIYE 0 ni OYA a Ibisanzwe IDOSIYE Na Yoherejwe: in a Ubutumwa"
 
-#. mail-composer:exit-unsaved secondary
-#: composer/mail-composer-errors.xml.h:32
+#: ../composer/mail-composer.error.xml.h:20
 #, fuzzy
 msgid ""
-"Closing this composer window will discard the message permanently, unless "
-"you choose to save the message in your Drafts folder. This will allow you to "
-"continue the message at a later date."
+"To attach the contents of this directory, either attach the files in this "
+"directory individually, or create an archive of the directory and attach it."
 msgstr ""
-"iyi Uhimba Idirishya Kwanga Ubutumwa Guhitamo Kuri Kubika Ubutumwa in "
-"Ububiko Kwemerera Kuri urifuzagukomeza Ubutumwa ku a Itariki"
-
-# framework/source\services\documentlist.src:RID_DOCUMENTS_POPUP.ID_DISCARD.text
-#: composer/mail-composer-errors.xml.h:33
-#, fuzzy
-msgid "_Discard Changes"
-msgstr "Kureka impinduka"
+"gereka Ibigize Bya iyi bushyinguro gereka Idosiye in iyi bushyinguro Cyangwa "
+"Kurema Bya bushyinguro Na gereka"
 
-# # Strings use for the save message dialog shown when the user close a message compose window
-# # Strings used by Save as Draft/Template dialog
-#: composer/mail-composer-errors.xml.h:34
+#: ../composer/mail-composer.error.xml.h:21
 #, fuzzy
-msgid "_Save Message"
-msgstr "Bika ubutumwa"
+msgid ""
+"Unable to activate the HTML editor control.\n"
+"\n"
+"Please make sure that you have the correct version of gtkhtml and libgtkhtml "
+"installed."
+msgstr "Kuri Kureka bigakora Muhinduzi Igenzura Ubwoko Verisiyo Bya Na"
 
-#. mail-composer:no-build-message primary
-#: composer/mail-composer-errors.xml.h:36
+#: ../composer/mail-composer.error.xml.h:24
 #, fuzzy
-msgid "Could not create message."
-msgstr "OYA Kurema Ubutumwa"
+msgid "Unable to activate the address selector control."
+msgstr "Kuri Kureka bigakora Aderesi Igenzura"
 
-#. mail-composer:no-build-message secondary
-#: composer/mail-composer-errors.xml.h:38
+#: ../composer/mail-composer.error.xml.h:25
 #, fuzzy
-msgid "Because \"{0}\", you may need to select different mail options."
-msgstr "0 Gicurasi Kuri Guhitamo Ubutumwa Amahitamo"
+msgid "Unfinished messages found"
+msgstr "Ubutumwa Byabonetse"
 
-#. mail-composer:no-sig-file primary
-#: composer/mail-composer-errors.xml.h:40
-#, fuzzy
-msgid "Could not read signature file \"{0}\"."
-msgstr "OYA Gusoma Isinya IDOSIYE 0"
+#: ../composer/mail-composer.error.xml.h:26
+msgid "Warning: Modified Message"
+msgstr ""
 
-#. mail-composer:all-accounts-deleted primary
-#: composer/mail-composer-errors.xml.h:44
+#: ../composer/mail-composer.error.xml.h:27
 #, fuzzy
-msgid "All accounts have been removed."
-msgstr "Konti Cyavanyweho"
+msgid "You cannot attach the file `{0}' to this message."
+msgstr "gereka IDOSIYE 0 Kuri iyi Ubutumwa"
 
-#. mail-composer:all-accounts-deleted secondary
-#: composer/mail-composer-errors.xml.h:46
+#: ../composer/mail-composer.error.xml.h:28
 #, fuzzy
 msgid "You need to configure an account before you can compose mail."
 msgstr "Kuri Kugena Imiterere Aderesi Mbere Himba: Ubutumwa"
 
-#. mail-composer:no-address-control primary
-#. mail-composer:no-editor-control primary
-#: composer/mail-composer-errors.xml.h:48
-#: composer/mail-composer-errors.xml.h:52
-#, fuzzy
-msgid "Could not create composer window."
-msgstr "OYA Kurema Uhimba Idirishya"
-
-#. mail-composer:no-address-control secondary
-#: composer/mail-composer-errors.xml.h:50
+# framework/source\services\documentlist.src:RID_DOCUMENTS_POPUP.ID_DISCARD.text
+#: ../composer/mail-composer.error.xml.h:29
 #, fuzzy
-msgid "Unable to activate the address selector control."
-msgstr "Kuri Kureka bigakora Aderesi Igenzura"
+msgid "_Discard Changes"
+msgstr "Kureka impinduka"
 
-#. mail-composer:no-editor-control secondary
-#: composer/mail-composer-errors.xml.h:54
+# # Strings use for the save message dialog shown when the user close a message compose window
+# # Strings used by Save as Draft/Template dialog
+#: ../composer/mail-composer.error.xml.h:30
 #, fuzzy
-msgid ""
-"Unable to activate the HTML editor control.\n"
-"\n"
-"Please make sure that you have the correct version of gtkhtml and libgtkhtml "
-"installed."
-msgstr "Kuri Kureka bigakora Muhinduzi Igenzura Ubwoko Verisiyo Bya Na"
+msgid "_Save Message"
+msgstr "Bika ubutumwa"
 
-#: data/evolution.desktop.in.in.h:1 shell/main.c:517
+#: ../data/evolution.desktop.in.in.h:1 ../shell/main.c:509
 msgid "Evolution"
 msgstr "Impinduka"
 
-#: data/evolution.desktop.in.in.h:2
+#: ../data/evolution.desktop.in.in.h:2
 msgid "The Evolution Groupware Suite"
 msgstr ""
 
-#: data/evolution.keys.in.in.h:1
+#: ../data/evolution.keys.in.in.h:1
 #, fuzzy
 msgid "address card"
 msgstr "Aderesi"
 
-#: data/evolution.keys.in.in.h:2
+#: ../data/evolution.keys.in.in.h:2
 #, fuzzy
 msgid "calendar information"
 msgstr "Kalindari Ibisobanuro"
 
-#: designs/OOA/ooa.glade.h:1
+#: ../designs/OOA/ooa.glade.h:1
 #, fuzzy
 msgid ""
 "<b>Currently, your status is \"Out of the Office\". </b>\n"
@@ -11076,17 +11237,17 @@ msgid ""
 "Would you like to change your status to \"In the Office\"? "
 msgstr "<B Imimerere ni Bya B nka Kuri Guhindura>> Imimerere Kuri"
 
-#: designs/OOA/ooa.glade.h:4
+#: ../designs/OOA/ooa.glade.h:4
 #, fuzzy
 msgid "<b>Out of Office Message:</b>"
 msgstr "<B Bya B"
 
-#: designs/OOA/ooa.glade.h:5
+#: ../designs/OOA/ooa.glade.h:5
 #, fuzzy
 msgid "<b>Status:</b>"
 msgstr "<B B"
 
-#: designs/OOA/ooa.glade.h:6
+#: ../designs/OOA/ooa.glade.h:6
 #, fuzzy
 msgid ""
 "<small>The message specified below will be automatically sent to each person "
@@ -11096,44 +11257,44 @@ msgstr ""
 "<Gitoya Ubutumwa munsi ku buryo bwikora Yoherejwe: Kuri Kuri Inyuma Bya "
 "Ofise Gitoya"
 
-#: designs/OOA/ooa.glade.h:8
+#: ../designs/OOA/ooa.glade.h:8
 #, fuzzy
 msgid "I am currently in the office"
 msgstr "in Ofise"
 
-#: designs/OOA/ooa.glade.h:9
+#: ../designs/OOA/ooa.glade.h:9
 #, fuzzy
 msgid "I am currently out of the office"
 msgstr "Inyuma Bya Ofise"
 
-#: designs/OOA/ooa.glade.h:10
+#: ../designs/OOA/ooa.glade.h:10
 msgid "No, Don't Change Status"
 msgstr ""
 
-#: designs/OOA/ooa.glade.h:12
+#: ../designs/OOA/ooa.glade.h:12
 #, fuzzy
 msgid "Out of Office Assistant"
 msgstr "Bya"
 
-#: designs/OOA/ooa.glade.h:13
+#: ../designs/OOA/ooa.glade.h:13
 msgid "Yes, Change Status"
 msgstr ""
 
-#: designs/read_receipts/read.glade.h:1
+#: ../designs/read_receipts/read.glade.h:1
 msgid "      "
 msgstr ""
 
-#: designs/read_receipts/read.glade.h:2
+#: ../designs/read_receipts/read.glade.h:2
 #, fuzzy
 msgid "<b>Receiving Email</b>"
 msgstr "<B B"
 
-#: designs/read_receipts/read.glade.h:3
+#: ../designs/read_receipts/read.glade.h:3
 #, fuzzy
 msgid "<b>Sending Email:</b>"
 msgstr "<B B"
 
-#: designs/read_receipts/read.glade.h:4
+#: ../designs/read_receipts/read.glade.h:4
 #, fuzzy
 msgid ""
 "<small>This page allows you to choose if you want to be notified via a read "
@@ -11144,60 +11305,108 @@ msgstr ""
 "<Gitoya Ipaji Kuri Guhitamo NIBA Kuri Biturutse a Gusoma Ryari: a Ubutumwa "
 "ni Gusoma Na Kuri Ryari: a Bivuye Gitoya"
 
-#: designs/read_receipts/read.glade.h:6
+#: ../designs/read_receipts/read.glade.h:6
 #, fuzzy
-msgid "Always send back a read reciept"
+msgid "Always send back a read receipt"
 msgstr "Kohereza Inyuma a Gusoma"
 
-#: designs/read_receipts/read.glade.h:7
+#: ../designs/read_receipts/read.glade.h:7
 #, fuzzy
 msgid "Ask me if I want to send back a read receipt"
 msgstr "NIBA Kuri Kohereza Inyuma a Gusoma"
 
-#: designs/read_receipts/read.glade.h:8
+#: ../designs/read_receipts/read.glade.h:8
 #, fuzzy
 msgid "Never send back a read receipt"
 msgstr "Kohereza Inyuma a Gusoma"
 
-#: designs/read_receipts/read.glade.h:9
+#: ../designs/read_receipts/read.glade.h:9
 msgid "Read Receipts"
 msgstr ""
 
-#: designs/read_receipts/read.glade.h:10
+#: ../designs/read_receipts/read.glade.h:10
 #, fuzzy
 msgid "Request a read receipt for all messages I send"
 msgstr "a Gusoma kugirango Byose Ubutumwa Kohereza"
 
-#: designs/read_receipts/read.glade.h:11
+#: ../designs/read_receipts/read.glade.h:11
 #, fuzzy
 msgid "Unless the message is sent to a mailing list, and not to me personally"
 msgstr "Ubutumwa ni Yoherejwe: Kuri a Urutonde Na OYA Kuri"
 
-#: designs/read_receipts/read.glade.h:12
+#: ../designs/read_receipts/read.glade.h:12
 #, fuzzy
 msgid ""
 "When you receive an email with a read receipt request, what should Evolution "
 "do?"
 msgstr "Akira imeli Na: a Gusoma Kubaza..."
 
-#: e-util/e-dialog-utils.c:267
+#: ../e-util/e-dialog-utils.c:267
 #, fuzzy
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
 msgstr "A IDOSIYE ku Izina: Gusimbuza"
 
-#. system:ask-save-file-exists-overwrite title
-#: e-util/e-dialog-utils.c:269 widgets/misc/e-system-errors.xml.h:2
+#: ../e-util/e-dialog-utils.c:269 ../e-util/e-system.error.xml.h:6
 #, fuzzy
 msgid "Overwrite file?"
 msgstr "Gusimbuza IDOSIYE"
 
+#: ../e-util/e-error.c:84 ../e-util/e-error.c:85 ../e-util/e-error.c:127
+msgid "Evolution Error"
+msgstr ""
+
+#: ../e-util/e-error.c:86 ../e-util/e-error.c:87 ../e-util/e-error.c:125
+msgid "Evolution Warning"
+msgstr ""
+
+#: ../e-util/e-error.c:124
+msgid "Evolution Information"
+msgstr ""
+
+#: ../e-util/e-error.c:126
+msgid "Evolution Query"
+msgstr ""
+
+#. setup a dummy error
+#: ../e-util/e-error.c:438
+#, fuzzy, c-format
+msgid ""
+"<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
+msgstr "<Uburemere UTSINDAGIYE Ikosa Kitazwi Ikosa"
+
+#: ../e-util/e-system.error.xml.h:2
+#, fuzzy
+msgid "Cannot open file &quot;{0}&quot;."
+msgstr "Gufungura IDOSIYE 0"
+
+#: ../e-util/e-system.error.xml.h:3
+#, fuzzy
+msgid "Cannot save file &quot;{0}&quot;."
+msgstr "Kubika IDOSIYE 0"
+
+#: ../e-util/e-system.error.xml.h:4
+#, fuzzy
+msgid "Do you wish to overwrite it?"
+msgstr "Kuri Guhindura"
+
+#: ../e-util/e-system.error.xml.h:5
+#, fuzzy
+msgid "File exists &quot;{0}&quot;."
+msgstr "Idosiye 0"
+
+# sfx2/source\doc\new.src:DLG_NEW_FILE.CB_MERGE_STYLE.text
+#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:117
+#, fuzzy
+msgid "_Overwrite"
+msgstr "Guhindura"
+
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without seconds.
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:185 e-util/e-time-utils.c:398
+#: ../e-util/e-time-utils.c:185 ../e-util/e-time-utils.c:398
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr ""
 
@@ -11205,67 +11414,67 @@ msgstr ""
 #. in 24-hour format, without seconds.
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:190 e-util/e-time-utils.c:389
+#: ../e-util/e-time-utils.c:190 ../e-util/e-time-utils.c:389
 msgid "%a %m/%d/%Y %H:%M"
 msgstr ""
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without minutes or seconds.
-#: e-util/e-time-utils.c:195
+#: ../e-util/e-time-utils.c:195
 #, fuzzy
 msgid "%a %m/%d/%Y %I %p"
 msgstr "%a%m/%d/%Y%I%p"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without minutes or seconds.
-#: e-util/e-time-utils.c:200
+#: ../e-util/e-time-utils.c:200
 msgid "%a %m/%d/%Y %H"
 msgstr ""
 
 #. strptime format of a date and a time, in 12-hour format.
-#: e-util/e-time-utils.c:211
+#: ../e-util/e-time-utils.c:211
 msgid "%m/%d/%Y %I:%M:%S %p"
 msgstr ""
 
 #. strptime format of a date and a time, in 24-hour format.
-#: e-util/e-time-utils.c:215
+#: ../e-util/e-time-utils.c:215
 msgid "%m/%d/%Y %H:%M:%S"
 msgstr ""
 
 #. strptime format of a date and a time, in 12-hour format,
 #. without seconds.
-#: e-util/e-time-utils.c:220
+#: ../e-util/e-time-utils.c:220
 msgid "%m/%d/%Y %I:%M %p"
 msgstr ""
 
 #. strptime format of a date and a time, in 24-hour format,
 #. without seconds.
-#: e-util/e-time-utils.c:225
+#: ../e-util/e-time-utils.c:225
 #, fuzzy
 msgid "%m/%d/%Y %H:%M"
 msgstr "%m/%d/%Y%H:%M"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. without minutes or seconds.
-#: e-util/e-time-utils.c:230
+#: ../e-util/e-time-utils.c:230
 msgid "%m/%d/%Y %I %p"
 msgstr ""
 
 #. strptime format of a date and a time, in 24-hour format,
 #. without minutes or seconds.
-#: e-util/e-time-utils.c:235
+#: ../e-util/e-time-utils.c:235
 msgid "%m/%d/%Y %H"
 msgstr ""
 
 #. strptime format for a time of day, in 12-hour format.
 #. strftime format of a time in 12-hour format.
-#: e-util/e-time-utils.c:339 e-util/e-time-utils.c:438
+#: ../e-util/e-time-utils.c:339 ../e-util/e-time-utils.c:438
 msgid "%I:%M:%S %p"
 msgstr ""
 
 #. strptime format for a time of day, in 24-hour format.
 #. strftime format of a time in 24-hour format.
-#: e-util/e-time-utils.c:343 e-util/e-time-utils.c:430
+#: ../e-util/e-time-utils.c:343 ../e-util/e-time-utils.c:430
 #, fuzzy
 msgid "%H:%M:%S"
 msgstr "%H:%M:%SCYOSE"
@@ -11275,8 +11484,8 @@ msgstr "%H:%M:%SCYOSE"
 #. strftime format of a time in 12-hour format,
 #. without seconds.
 #. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
-#: widgets/misc/e-dateedit.c:1431 widgets/misc/e-dateedit.c:1697
+#: ../e-util/e-time-utils.c:348 ../e-util/e-time-utils.c:435
+#: ../widgets/misc/e-dateedit.c:1438 ../widgets/misc/e-dateedit.c:1720
 msgid "%I:%M %p"
 msgstr ""
 
@@ -11285,8 +11494,8 @@ msgstr ""
 #. strftime format of a time in 24-hour format,
 #. without seconds.
 #. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
-#: widgets/misc/e-dateedit.c:1428 widgets/misc/e-dateedit.c:1694
+#: ../e-util/e-time-utils.c:352 ../e-util/e-time-utils.c:427
+#: ../widgets/misc/e-dateedit.c:1435 ../widgets/misc/e-dateedit.c:1717
 #, fuzzy
 msgid "%H:%M"
 msgstr "%H:%M"
@@ -11295,267 +11504,255 @@ msgstr "%H:%M"
 # #-#-#-#-#  dbaccess.pot (Gnome 2.12)  #-#-#-#-#
 # #-#-#-#-#  dbaccess.pot (Gnome 2.12)  #-#-#-#-#
 #. strptime format for hour and AM/PM, 12-hour format.
-#: e-util/e-time-utils.c:356
+#: ../e-util/e-time-utils.c:356
 #, fuzzy
 msgid "%I %p"
 msgstr "%I%p"
 
-#: e-util/eggtrayicon.c:119
+#: ../e-util/eggtrayicon.c:119
 #, fuzzy
 msgid "The orientation of the tray."
 msgstr "Icyerekezo Bya"
 
-#: filter/filter-datespec.c:73
+#: ../filter/filter-datespec.c:73
 #, fuzzy, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "1. ISEGONDA"
 
-#: filter/filter-datespec.c:74
+#: ../filter/filter-datespec.c:74
 #, fuzzy, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "1. UMUNOTA"
 
-#: filter/filter-datespec.c:75
+#: ../filter/filter-datespec.c:75
 #, fuzzy, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "1. ISAHA"
 
-#: filter/filter-datespec.c:76
+#: ../filter/filter-datespec.c:76
 #, fuzzy, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
 msgstr[0] "1. UMUNSI"
 
-#: filter/filter-datespec.c:77
+#: ../filter/filter-datespec.c:77
 #, fuzzy, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "1. Icyumweru"
 
-#: filter/filter-datespec.c:78
+#: ../filter/filter-datespec.c:78
 #, fuzzy, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
 msgstr[0] "1. Ukwezi"
 
-#: filter/filter-datespec.c:79
+#: ../filter/filter-datespec.c:79
 #, fuzzy, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
 msgstr[0] "1. Umwaka"
 
-#: filter/filter-datespec.c:280
+#: ../filter/filter-datespec.c:280
 #, fuzzy
 msgid "<click here to select a date>"
 msgstr "<Kanda Kuri Guhitamo a Itariki"
 
 # sc/source\core\src\compiler.src:RID_SC_FUNCTION_NAMES.SC_OPCODE_GET_ACT_TIME.text
-#: filter/filter-datespec.c:283 filter/filter-datespec.c:294
+#: ../filter/filter-datespec.c:283 ../filter/filter-datespec.c:294
 #, fuzzy
 msgid "now"
 msgstr "NONEAHA"
 
 # desktop/source\app\ssodlg.src:DLG_SSOLOGIN.text
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: filter/filter-datespec.c:290
+#: ../filter/filter-datespec.c:290
 #, fuzzy
 msgid "%d-%b-%Y"
 msgstr "%d-%b-%Y"
 
-#: filter/filter-datespec.c:406
+#: ../filter/filter-datespec.c:406
 #, fuzzy
 msgid "Select a time to compare against"
 msgstr "a Igihe Kuri Kugereranya#"
 
-#. filter:no-date primary
-#: filter/filter-errors.xml.h:2
-#, fuzzy
-msgid "Missing date."
-msgstr "Itariki"
-
-#. filter:no-date secondary
-#: filter/filter-errors.xml.h:4
-#, fuzzy
-msgid "You must choose a date."
-msgstr "Guhitamo a Itariki"
-
-#. filter:no-file primary
-#: filter/filter-errors.xml.h:6
-#, fuzzy
-msgid "Missing file name."
-msgstr "IDOSIYE Izina:"
-
-#. filter:no-file secondary
-#. filter:bad-file secondary
-#: filter/filter-errors.xml.h:8 filter/filter-errors.xml.h:12
-#, fuzzy
-msgid "You must specify a file name."
-msgstr "a IDOSIYE Izina:"
-
-#. filter:bad-file primary
-#: filter/filter-errors.xml.h:10
-#, fuzzy
-msgid "File \"{0}\" does not exist or is not a regular file."
-msgstr "Idosiye 0 OYA Cyangwa ni OYA a Ibisanzwe IDOSIYE"
-
-#. filter:bad-regexp primary
-#: filter/filter-errors.xml.h:14
-#, fuzzy
-msgid "Bad regular expression \"{0}\"."
-msgstr "Ibisanzwe imvugo 0"
-
-#. filter:bad-regexp secondary
-#: filter/filter-errors.xml.h:16
-#, fuzzy
-msgid "Could not compile regular expression \"{1}\"."
-msgstr "OYA Gukusanya Ibisanzwe imvugo 1."
-
-#. filter:no-name primary
-#. mail:no-name-vfolder primary
-#: filter/filter-errors.xml.h:18 mail/mail-errors.xml.h:219
-#, fuzzy
-msgid "Missing name."
-msgstr "Izina:"
-
-#. filter:no-name secondary
-#: filter/filter-errors.xml.h:20
-#, fuzzy
-msgid "You must name this filter."
-msgstr "Izina: iyi Muyunguruzi..."
-
-#. filter:bad-name-notunique primary
-#: filter/filter-errors.xml.h:22
-#, fuzzy
-msgid "Name \"{0}\" already used."
-msgstr "0"
-
-#. filter:bad-name-notunique secondary
-#: filter/filter-errors.xml.h:24
-#, fuzzy
-msgid "Please choose another name."
-msgstr "Guhitamo Izina:"
-
-#: filter/filter-file.c:288
+#: ../filter/filter-file.c:288
 msgid "Choose a file"
 msgstr "Hitamo idosiye"
 
 # sfx2/source\dialog\mailwindow.src:RID_MAIL_WINDOW.LB_MAILWIN_PRIO.2.text
-#: filter/filter-label.c:121 mail/em-filter-i18n.h:26 mail/em-migrate.c:1041
-#: mail/mail-config.c:76 mail/mail-config.glade.h:90
+#: ../filter/filter-label.c:121 ../mail/em-filter-i18n.h:26
+#: ../mail/em-migrate.c:1041 ../mail/mail-config.c:76
+#: ../mail/mail-config.glade.h:91
 msgid "Important"
 msgstr "By'ingirakamaro"
 
 # sw/source\ui\wizard\wizfxdlg.src:DLG_WIZARD_FX.DLG_FX5_Edit_Elem2.text
 #. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:1044 mail/mail-config.c:79
-#: mail/mail-config.glade.h:143
+#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1044
+#: ../mail/mail-config.c:79 ../mail/mail-config.glade.h:145
 msgid "To Do"
 msgstr "Gukora"
 
 #. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:1045 mail/mail-config.c:80
-#: mail/mail-config.glade.h:94
+#: ../filter/filter-label.c:125 ../mail/em-migrate.c:1045
+#: ../mail/mail-config.c:80 ../mail/mail-config.glade.h:95
 msgid "Later"
 msgstr ""
 
 # sc/source\ui\src\scfuncs.src:RID_SC_FUNCTION_DESCRIPTIONS1.SC_OPCODE_IF.2.text
-#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
+#: ../filter/filter-part.c:532 ../shell/GNOME_Evolution_Test.server.in.in.h:3
 msgid "Test"
 msgstr "Igerageza"
 
-#: filter/filter-rule.c:790
+#: ../filter/filter-rule.c:791
 #, fuzzy
 msgid "_Rule name:"
 msgstr "Izina:"
 
-#: filter/filter-rule.c:818
+#: ../filter/filter-rule.c:819
 #, fuzzy
-msgid "<b>If</b>"
-msgstr "<B B"
+msgid "If"
+msgstr "I"
 
-#: filter/filter-rule.c:855
+#: ../filter/filter-rule.c:858
 #, fuzzy
 msgid "if all criteria are met"
 msgstr "NIBA Byose Ibigenderwaho"
 
-#: filter/filter-rule.c:855
+#: ../filter/filter-rule.c:858
 #, fuzzy
 msgid "if any criteria are met"
 msgstr "NIBA Ibigenderwaho"
 
-#: filter/filter-rule.c:857
+#: ../filter/filter-rule.c:860
 msgid "Execute actions"
 msgstr ""
 
-#: filter/filter-rule.c:878
+#: ../filter/filter-rule.c:881
 msgid "All related"
 msgstr ""
 
-#: filter/filter-rule.c:878
+#: ../filter/filter-rule.c:881
 msgid "Replies"
 msgstr ""
 
-#: filter/filter-rule.c:878
+#: ../filter/filter-rule.c:881
 #, fuzzy
 msgid "Replies and parents"
 msgstr "Na"
 
-#: filter/filter-rule.c:880
+#: ../filter/filter-rule.c:883
 msgid "Include threads"
 msgstr ""
 
-#: filter/filter-rule.c:975 filter/filter.glade.h:3
+#: ../filter/filter-rule.c:978 ../filter/filter.glade.h:3
 msgid "Incoming"
 msgstr ""
 
-#: filter/filter-rule.c:975
+#: ../filter/filter-rule.c:978
 msgid "Outgoing"
 msgstr ""
 
-#: filter/filter.glade.h:1
+#: ../filter/filter.error.xml.h:1
+#, fuzzy
+msgid "Bad regular expression &quot;{0}&quot;."
+msgstr "Ibisanzwe imvugo 0"
+
+#: ../filter/filter.error.xml.h:2
+#, fuzzy
+msgid "Could not compile regular expression &quot;{1}&quot;."
+msgstr "OYA Gukusanya Ibisanzwe imvugo 1."
+
+#: ../filter/filter.error.xml.h:3
+#, fuzzy
+msgid "File &quot;{0}&quot; does not exist or is not a regular file."
+msgstr "Idosiye 0 OYA Cyangwa ni OYA a Ibisanzwe IDOSIYE"
+
+#: ../filter/filter.error.xml.h:4
+#, fuzzy
+msgid "Missing date."
+msgstr "Itariki"
+
+#: ../filter/filter.error.xml.h:5
+#, fuzzy
+msgid "Missing file name."
+msgstr "IDOSIYE Izina:"
+
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:62
+#, fuzzy
+msgid "Missing name."
+msgstr "Izina:"
+
+#: ../filter/filter.error.xml.h:7
+#, fuzzy
+msgid "Name &quot;{0}&quot; already used."
+msgstr "0"
+
+#: ../filter/filter.error.xml.h:8
+#, fuzzy
+msgid "Please choose another name."
+msgstr "Guhitamo Izina:"
+
+#: ../filter/filter.error.xml.h:9
+#, fuzzy
+msgid "You must choose a date."
+msgstr "Guhitamo a Itariki"
+
+#: ../filter/filter.error.xml.h:10
+#, fuzzy
+msgid "You must name this filter."
+msgstr "Izina: iyi Muyunguruzi..."
+
+#: ../filter/filter.error.xml.h:11
+#, fuzzy
+msgid "You must specify a file name."
+msgstr "a IDOSIYE Izina:"
+
+#: ../filter/filter.glade.h:1
 #, fuzzy
 msgid "<b>_Filter Rules</b>"
 msgstr "<B B"
 
-#: filter/filter.glade.h:2
+#: ../filter/filter.glade.h:2
 msgid "Compare against"
 msgstr ""
 
-#: filter/filter.glade.h:4
+#: ../filter/filter.glade.h:4
 #, fuzzy
 msgid "Show filters for mail:"
 msgstr "Muyunguruzi kugirango Ubutumwa"
 
-#: filter/filter.glade.h:5
+#: ../filter/filter.glade.h:5
 #, fuzzy
 msgid ""
 "The message's date will be compared against\n"
 "12:00am of the date specified."
 msgstr "Itariki Bya Itariki"
 
-#: filter/filter.glade.h:7
+#: ../filter/filter.glade.h:7
 #, fuzzy
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when filtering occurs."
 msgstr "Itariki Igihe Bifitanye isano Kuri Ryari: Iyungurura"
 
-#: filter/filter.glade.h:9
+#: ../filter/filter.glade.h:9
 #, fuzzy
 msgid ""
 "The message's date will be compared against\n"
 "the current time when filtering occurs."
 msgstr "Itariki KIGEZWEHO Igihe Ryari: Iyungurura"
 
-#: filter/filter.glade.h:12
+#: ../filter/filter.glade.h:12
 #, fuzzy
 msgid "a time relative to the current time"
 msgstr "a Igihe Bifitanye isano Kuri KIGEZWEHO Igihe"
 
-#: filter/filter.glade.h:13
+#: ../filter/filter.glade.h:13
 msgid "ago"
 msgstr ""
 
@@ -11563,121 +11760,123 @@ msgstr ""
 # scaddins/source\analysis\analysis.src:RID_ANALYSIS_FUNCTION_DESCRIPTIONS.ANALYSIS_Edate.4.text
 # #-#-#-#-#  scaddins.pot (Gnome 2.12)  #-#-#-#-#
 # scaddins/source\analysis\analysis.src:RID_ANALYSIS_FUNCTION_DESCRIPTIONS.ANALYSIS_Eomonth.4.text
-#: filter/filter.glade.h:17
+#: ../filter/filter.glade.h:17
 #, fuzzy
 msgid "months"
 msgstr "Amezi"
 
 # offmgr/source\offapp\dialog\optgdlg.src:OFA_TP_MISC.FT_HELPAGENT_TIME_UNIT.text
-#: filter/filter.glade.h:18 mail/mail-config.glade.h:175
+#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:177
 msgid "seconds"
 msgstr "amasogonda"
 
-#: filter/filter.glade.h:19
+#: ../filter/filter.glade.h:19
 #, fuzzy
 msgid "the current time"
 msgstr "KIGEZWEHO Igihe"
 
-#: filter/filter.glade.h:20
+#: ../filter/filter.glade.h:20
 #, fuzzy
 msgid "the time you specify"
 msgstr "Igihe"
 
 # scaddins/source\datefunc\datefunc.src:RID_DATE_FUNCTION_NAMES.DATE_FUNCNAME_DiffYears.text
-#: filter/filter.glade.h:22
+#: ../filter/filter.glade.h:22
 #, fuzzy
 msgid "years"
 msgstr "IMYAKA"
 
-#: filter/rule-editor.c:285
+#: ../filter/rule-editor.c:285
 msgid "Add Rule"
 msgstr ""
 
-#: filter/rule-editor.c:361
+#: ../filter/rule-editor.c:361
 msgid "Edit Rule"
 msgstr ""
 
-#: filter/rule-editor.c:693
+#: ../filter/rule-editor.c:693
 #, fuzzy
 msgid "Rule name"
 msgstr "Izina:"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:1
 msgid "Composer Preferences"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:2
 #, fuzzy
 msgid ""
 "Configure mail preferences, including security and message display, here"
 msgstr "Ubutumwa Ibyahiswemo Umutekano Na Ubutumwa Kugaragaza"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:3
 #, fuzzy
 msgid "Configure spell-checking, signatures, and the message composer here"
 msgstr "Genzuranyuguti Na Ubutumwa Uhimba"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:4
 #, fuzzy
 msgid "Configure your email accounts here"
 msgstr "imeli Konti"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:5
 msgid "Evolution Mail"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:6
 #, fuzzy
 msgid "Evolution Mail accounts configuration control"
 msgstr "Konti Iboneza Igenzura"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:7
 msgid "Evolution Mail component"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:8
 #, fuzzy
 msgid "Evolution Mail composer"
 msgstr "Uhimba"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:9
 #, fuzzy
 msgid "Evolution Mail composer configuration control"
 msgstr "Uhimba Iboneza Igenzura"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:10
 #, fuzzy
 msgid "Evolution Mail preferences control"
 msgstr "Ibyahiswemo Igenzura"
 
 # sfx2/source\appl\app.src:STR_MAIL.text
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11 mail/em-folder-view.c:480
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:557
-#: mail/mail-component.c:608
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:493
+#: ../mail/importers/elm-importer.c:418
+#: ../mail/importers/netscape-importer.c:1902
+#: ../mail/importers/pine-importer.c:474 ../mail/mail-component.c:558
+#: ../mail/mail-component.c:645
 msgid "Mail"
 msgstr "Ubutumwa"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
 msgid "Mail Accounts"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13 mail/mail-config.glade.h:97
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13
+#: ../mail/mail-config.glade.h:98
 msgid "Mail Preferences"
 msgstr ""
 
 # sfx2/source\appl\app.src:STR_MAIL.text
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
 #, fuzzy
 msgid "_Mail"
 msgstr "Ubutumwa"
 
-#: mail/em-account-editor.c:387
+#: ../mail/em-account-editor.c:387
 #, c-format
 msgid "%s License Agreement"
 msgstr ""
 
-#: mail/em-account-editor.c:394
+#: ../mail/em-account-editor.c:394
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -11686,11 +11885,17 @@ msgid ""
 "and tick the check box for accepting it\n"
 msgstr "Gusoma Kugenzura... Agasanduku kugirango"
 
-#: mail/em-account-editor.c:464 mail/em-filter-folder-element.c:237
-#: mail/em-vfolder-rule.c:494
+#: ../mail/em-account-editor.c:464 ../mail/em-filter-folder-element.c:237
+#: ../mail/em-vfolder-rule.c:494
 msgid "Select Folder"
 msgstr ""
 
+# # String used for attachment pretty name, when attachment is a message
+#: ../mail/em-account-editor.c:758
+#, fuzzy
+msgid "Ask for each message"
+msgstr "Ubutumwa bwageretsweho"
+
 # #-#-#-#-#  svx.pot (PACKAGE VERSION)  #-#-#-#-#
 # svx/source\dialog\fontwork.src:RID_SVXDLG_FONTWORK.MTR_FLD_TEXTSTART.quickhelptext
 # #-#-#-#-#  svx.pot (PACKAGE VERSION)  #-#-#-#-#
@@ -11705,95 +11910,95 @@ msgstr ""
 # svx/source\items\svxitems.src:RID_ATTR_LRSPACE.text
 # #-#-#-#-#  svx.pot (PACKAGE VERSION)  #-#-#-#-#
 # svx/source\outliner\outliner.src:RID_OUTLUNDO_DEPTH.text
-#: mail/em-account-editor.c:1661 mail/mail-config.glade.h:89
+#: ../mail/em-account-editor.c:1719 ../mail/mail-config.glade.h:90
 msgid "Identity"
 msgstr "Ikiranga"
 
-#: mail/em-account-editor.c:1697 mail/mail-config.glade.h:116
+#: ../mail/em-account-editor.c:1755 ../mail/mail-config.glade.h:117
 msgid "Receiving Email"
 msgstr ""
 
-#: mail/em-account-editor.c:1874
+#: ../mail/em-account-editor.c:1932
 #, fuzzy
 msgid "Automatically check for _new mail every"
 msgstr "Kugenzura... kugirango Gishya Ubutumwa buri"
 
-#: mail/em-account-editor.c:2042 mail/mail-config.glade.h:126
+#: ../mail/em-account-editor.c:2100 ../mail/mail-config.glade.h:128
 msgid "Sending Email"
 msgstr ""
 
-#: mail/em-account-editor.c:2086 mail/mail-config.glade.h:67
+#: ../mail/em-account-editor.c:2148 ../mail/mail-config.glade.h:68
 msgid "Defaults"
 msgstr ""
 
 # offmgr/source\offapp\dialog\treeopt.src:RID_OFADLG_OPTIONS_TREE_PAGES.SID_GENERAL_OPTIONS.11.text
-#: mail/em-account-editor.c:2145 mail/mail-config.glade.h:121
+#: ../mail/em-account-editor.c:2207 ../mail/mail-config.glade.h:122
 msgid "Security"
 msgstr "Umutekano"
 
 #. Most sections for this is auto-generated fromt the camel config
-#: mail/em-account-editor.c:2182 mail/em-account-editor.c:2256
+#: ../mail/em-account-editor.c:2244 ../mail/em-account-editor.c:2318
 msgid "Receiving Options"
 msgstr ""
 
-#: mail/em-account-editor.c:2183 mail/em-account-editor.c:2257
+#: ../mail/em-account-editor.c:2245 ../mail/em-account-editor.c:2319
 #, fuzzy
 msgid "Checking for New Mail"
 msgstr "kugirango"
 
-#: mail/em-account-editor.c:2581 mail/mail-config.glade.h:33
+#: ../mail/em-account-editor.c:2643 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr ""
 
-#: mail/em-account-editor.c:2581 mail/mail-config.glade.h:79
+#: ../mail/em-account-editor.c:2643 ../mail/mail-config.glade.h:80
 msgid "Evolution Account Assistant"
 msgstr ""
 
 #. translators: default account indicator
-#: mail/em-account-prefs.c:428
+#: ../mail/em-account-prefs.c:428
 #, fuzzy
 msgid "[Default]"
 msgstr "[Ibisanzwemo>"
 
 # 20
-#: mail/em-account-prefs.c:482
+#: ../mail/em-account-prefs.c:482
 msgid "Account name"
 msgstr "izina rya konti"
 
 # offmgr/source\offapp\dialog\inetdlg.src:RID_OFADLG_INTERNET.1.RID_SVXPAGE_INET_OTHER.text
-#: mail/em-account-prefs.c:484
+#: ../mail/em-account-prefs.c:484
 msgid "Protocol"
 msgstr "Porotokole"
 
-#: mail/em-account-prefs.c:489
+#: ../mail/em-account-prefs.c:489
 msgid "Mail Accounts Table"
 msgstr ""
 
-#: mail/em-composer-prefs.c:306 mail/em-composer-prefs.c:429
-#: mail/mail-config.c:935
+#: ../mail/em-composer-prefs.c:306 ../mail/em-composer-prefs.c:429
+#: ../mail/mail-config.c:935
 msgid "Unnamed"
 msgstr "Ntazina"
 
-#: mail/em-composer-prefs.c:894
+#: ../mail/em-composer-prefs.c:894
 #, fuzzy
 msgid "Language(s)"
 msgstr "S"
 
-#: mail/em-composer-prefs.c:937
+#: ../mail/em-composer-prefs.c:937
 #, fuzzy
 msgid "Add signature script"
 msgstr "Isinya IYANDIKA"
 
-#: mail/em-composer-prefs.c:957
+#: ../mail/em-composer-prefs.c:957
 #, fuzzy
 msgid "Signature(s)"
 msgstr "S"
 
-#: mail/em-composer-utils.c:849
+#: ../mail/em-composer-utils.c:852
 msgid "-------- Forwarded Message --------"
 msgstr ""
 
-#: mail/em-composer-utils.c:1459
+#: ../mail/em-composer-utils.c:1644
 #, fuzzy
 msgid "an unknown sender"
 msgstr "Kitazwi Uwohereza"
@@ -11801,174 +12006,174 @@ msgstr "Kitazwi Uwohereza"
 #. Note to translators: this is the attribution string used when quoting messages.
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see em-composer-utils.c:1514
-#: mail/em-composer-utils.c:1506
+#: ../mail/em-composer-utils.c:1691
 #, fuzzy
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
 msgstr "ku"
 
-#: mail/em-filter-editor.c:147
+#: ../mail/em-filter-editor.c:147
 #, fuzzy
 msgid "_Filter Rules"
 msgstr "Amategeko y'umuyunguruzi"
 
 #. Automatically generated. Do not edit.
-#: mail/em-filter-i18n.h:2
+#: ../mail/em-filter-i18n.h:2
 msgid "Adjust Score"
 msgstr ""
 
-#: mail/em-filter-i18n.h:3
+#: ../mail/em-filter-i18n.h:3
 msgid "Assign Color"
 msgstr ""
 
-#: mail/em-filter-i18n.h:4
+#: ../mail/em-filter-i18n.h:4
 msgid "Assign Score"
 msgstr ""
 
 # sw/source\ui\envelp\mailmrge.src:DLG_MAILMERGE.FT_ATTACH.text
-#: mail/em-filter-i18n.h:5
+#: ../mail/em-filter-i18n.h:5
 msgid "Attachments"
 msgstr "Imigereka"
 
-#: mail/em-filter-i18n.h:6
+#: ../mail/em-filter-i18n.h:6
 msgid "Beep"
 msgstr ""
 
-#: mail/em-filter-i18n.h:7
+#: ../mail/em-filter-i18n.h:7
 msgid "contains"
 msgstr "ifite"
 
 # 1191
-#: mail/em-filter-i18n.h:8
+#: ../mail/em-filter-i18n.h:8
 #, fuzzy
 msgid "Copy to Folder"
 msgstr "kopororera ku nyandiko"
 
-#: mail/em-filter-i18n.h:9
+#: ../mail/em-filter-i18n.h:9
 #, fuzzy
 msgid "Date received"
 msgstr "BYAKIRIWE"
 
-#: mail/em-filter-i18n.h:10
+#: ../mail/em-filter-i18n.h:10
 #, fuzzy
 msgid "Date sent"
 msgstr "Yoherejwe:"
 
 # sw/source\ui\docvw\docvw.src:STR_REDLINE_DELETE.text
-#: mail/em-filter-i18n.h:12
+#: ../mail/em-filter-i18n.h:12
 msgid "Deleted"
 msgstr "Byasibwe"
 
-#: mail/em-filter-i18n.h:13
+#: ../mail/em-filter-i18n.h:13
 #, fuzzy
 msgid "does not contain"
 msgstr "OYA"
 
-#: mail/em-filter-i18n.h:14
+#: ../mail/em-filter-i18n.h:14
 #, fuzzy
 msgid "does not end with"
 msgstr "OYA Impera Na:"
 
-#: mail/em-filter-i18n.h:15
+#: ../mail/em-filter-i18n.h:15
 #, fuzzy
 msgid "does not exist"
 msgstr "OYA"
 
-#: mail/em-filter-i18n.h:16
+#: ../mail/em-filter-i18n.h:16
 #, fuzzy
 msgid "does not return"
 msgstr "OYA Garuka"
 
-#: mail/em-filter-i18n.h:17
+#: ../mail/em-filter-i18n.h:17
 #, fuzzy
 msgid "does not sound like"
 msgstr "OYA Ijwi nka"
 
-#: mail/em-filter-i18n.h:18
+#: ../mail/em-filter-i18n.h:18
 #, fuzzy
 msgid "does not start with"
 msgstr "OYA Gutangira Na:"
 
-#: mail/em-filter-i18n.h:19
+#: ../mail/em-filter-i18n.h:19
 msgid "Do Not Exist"
 msgstr ""
 
-#: mail/em-filter-i18n.h:20
+#: ../mail/em-filter-i18n.h:20
 #, fuzzy
 msgid "Draft"
 msgstr "Inyandiko y'agateganyo"
 
-#: mail/em-filter-i18n.h:21
+#: ../mail/em-filter-i18n.h:21
 msgid "ends with"
 msgstr "Irangira na"
 
-#: mail/em-filter-i18n.h:22
+#: ../mail/em-filter-i18n.h:22
 msgid "Exist"
 msgstr ""
 
-#: mail/em-filter-i18n.h:23
+#: ../mail/em-filter-i18n.h:23
 msgid "exists"
 msgstr ""
 
 # 2170
-#: mail/em-filter-i18n.h:24
+#: ../mail/em-filter-i18n.h:24
 msgid "Expression"
 msgstr "imvugo"
 
 # officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....Wizard.Agenda.Elements.Postprocessing.text
-#: mail/em-filter-i18n.h:25
+#: ../mail/em-filter-i18n.h:25
 #, fuzzy
 msgid "Follow Up"
 msgstr "Ikurikirana- mirimo"
 
-#: mail/em-filter-i18n.h:27
+#: ../mail/em-filter-i18n.h:27
 msgid "is"
 msgstr "ni"
 
-#: mail/em-filter-i18n.h:28
+#: ../mail/em-filter-i18n.h:28
 msgid "is after"
 msgstr "iri nyuma"
 
-#: mail/em-filter-i18n.h:29
+#: ../mail/em-filter-i18n.h:29
 msgid "is before"
 msgstr "iri mbere"
 
-#: mail/em-filter-i18n.h:30
+#: ../mail/em-filter-i18n.h:30
 #, fuzzy
 msgid "is Flagged"
 msgstr "ni"
 
 # starmath/source\smres.src:RID_TOOLBOXWINDOW.2.RID_XGTY.text
-#: mail/em-filter-i18n.h:31
+#: ../mail/em-filter-i18n.h:31
 msgid "is greater than"
 msgstr "binini ku"
 
 # starmath/source\smres.src:RID_TOOLBOXWINDOW.2.RID_XLTY.text
-#: mail/em-filter-i18n.h:32
+#: ../mail/em-filter-i18n.h:32
 msgid "is less than"
 msgstr "irutwa Na"
 
-#: mail/em-filter-i18n.h:33
+#: ../mail/em-filter-i18n.h:33
 msgid "is not"
 msgstr "siyo"
 
-#: mail/em-filter-i18n.h:34
+#: ../mail/em-filter-i18n.h:34
 #, fuzzy
 msgid "is not Flagged"
 msgstr "ni OYA"
 
-#: mail/em-filter-i18n.h:35 mail/mail-config.glade.h:92
-#: ui/evolution-mail-message.xml.h:48
+#: ../mail/em-filter-i18n.h:35 ../mail/mail-config.glade.h:93
+#: ../ui/evolution-mail-message.xml.h:47
 msgid "Junk"
 msgstr "Ibipfuye"
 
-#: mail/em-filter-i18n.h:36
+#: ../mail/em-filter-i18n.h:36
 msgid "Junk Test"
 msgstr ""
 
-#: mail/em-filter-i18n.h:37 mail/em-folder-view.c:1006
-#: widgets/misc/e-expander.c:189
+#: ../mail/em-filter-i18n.h:37 ../mail/em-folder-view.c:1061
+#: ../widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Akarango"
 
@@ -12010,86 +12215,86 @@ msgstr "Akarango"
 #
 # ***** END LICENSE BLOCK *****
 # Title
-#: mail/em-filter-i18n.h:38
+#: ../mail/em-filter-i18n.h:38
 #, fuzzy
 msgid "Mailing list"
 msgstr "Ilisiti y'amabaruwa"
 
-#: mail/em-filter-i18n.h:39
+#: ../mail/em-filter-i18n.h:39
 msgid "Match All"
 msgstr ""
 
-#: mail/em-filter-i18n.h:40
+#: ../mail/em-filter-i18n.h:40
 msgid "Message Body"
 msgstr ""
 
-#: mail/em-filter-i18n.h:41
+#: ../mail/em-filter-i18n.h:41
 msgid "Message Header"
 msgstr ""
 
-#: mail/em-filter-i18n.h:42
+#: ../mail/em-filter-i18n.h:42
 #, fuzzy
 msgid "Message is Junk"
 msgstr "ni"
 
-#: mail/em-filter-i18n.h:43
+#: ../mail/em-filter-i18n.h:43
 #, fuzzy
 msgid "Message is not Junk"
 msgstr "ni OYA"
 
-#: mail/em-filter-i18n.h:44
+#: ../mail/em-filter-i18n.h:44
 #, fuzzy
 msgid "Move to Folder"
 msgstr "Kuri"
 
-#: mail/em-filter-i18n.h:45
+#: ../mail/em-filter-i18n.h:45
 #, fuzzy
 msgid "Pipe to Program"
 msgstr "Kuri"
 
-#: mail/em-filter-i18n.h:46
+#: ../mail/em-filter-i18n.h:46
 #, fuzzy
 msgid "Play Sound"
 msgstr "Gukina ijwi"
 
-#: mail/em-filter-i18n.h:47 mail/message-tag-followup.c:80
+#: ../mail/em-filter-i18n.h:47 ../mail/message-tag-followup.c:80
 msgid "Read"
 msgstr "Soma"
 
-#: mail/em-filter-i18n.h:48
+#: ../mail/em-filter-i18n.h:48
 #, fuzzy
 msgid "Recipients"
 msgstr "Abandikiwe..."
 
-#: mail/em-filter-i18n.h:49
+#: ../mail/em-filter-i18n.h:49
 msgid "Regex Match"
 msgstr ""
 
-#: mail/em-filter-i18n.h:50
+#: ../mail/em-filter-i18n.h:50
 #, fuzzy
 msgid "Replied to"
 msgstr "Kuri"
 
-#: mail/em-filter-i18n.h:51
+#: ../mail/em-filter-i18n.h:51
 msgid "returns"
 msgstr ""
 
-#: mail/em-filter-i18n.h:52
+#: ../mail/em-filter-i18n.h:52
 #, fuzzy
 msgid "returns greater than"
 msgstr "Biruta"
 
-#: mail/em-filter-i18n.h:53
+#: ../mail/em-filter-i18n.h:53
 #, fuzzy
 msgid "returns less than"
 msgstr "Birutwa"
 
-#: mail/em-filter-i18n.h:54
+#: ../mail/em-filter-i18n.h:54
 #, fuzzy
 msgid "Run Program"
 msgstr "Gutangiza porogaramu"
 
-#: mail/em-filter-i18n.h:55 mail/message-list.etspec.h:10
+#: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:10
 msgid "Score"
 msgstr ""
 
@@ -12097,37 +12302,37 @@ msgstr ""
 # officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....Envelope.Inscription.Sender.text
 # #-#-#-#-#  officecfg.pot (Gnome 2.12)  #-#-#-#-#
 # officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....Wizard.Letter.Print.Sender.text
-#: mail/em-filter-i18n.h:56
+#: ../mail/em-filter-i18n.h:56
 msgid "Sender"
 msgstr "Uwohereza"
 
-#: mail/em-filter-i18n.h:57
+#: ../mail/em-filter-i18n.h:57
 msgid "Set Status"
 msgstr ""
 
-#: mail/em-filter-i18n.h:58
+#: ../mail/em-filter-i18n.h:58
 #, fuzzy
 msgid "Size (kB)"
 msgstr "Ingano( KB)"
 
-#: mail/em-filter-i18n.h:59
+#: ../mail/em-filter-i18n.h:59
 msgid "sounds like"
 msgstr "yumvikana nka"
 
-#: mail/em-filter-i18n.h:60
+#: ../mail/em-filter-i18n.h:60
 msgid "Source Account"
 msgstr ""
 
-#: mail/em-filter-i18n.h:61
+#: ../mail/em-filter-i18n.h:61
 #, fuzzy
 msgid "Specific header"
 msgstr "Umutwempangano"
 
-#: mail/em-filter-i18n.h:62
+#: ../mail/em-filter-i18n.h:62
 msgid "starts with"
 msgstr "Itangira na"
 
-#: mail/em-filter-i18n.h:64
+#: ../mail/em-filter-i18n.h:64
 msgid "Stop Processing"
 msgstr ""
 
@@ -12141,81 +12346,73 @@ msgstr ""
 # officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....Wizard.Fax.Save.DocInfoSubject.text
 # #-#-#-#-#  officecfg.pot (Gnome 2.12)  #-#-#-#-#
 # officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....Wizard.Memo.Save.DocInfoSubject.text
-#: mail/em-filter-i18n.h:65 mail/em-format-html.c:1532
-#: mail/em-format-quote.c:306 mail/em-format.c:853 mail/em-mailer-prefs.c:88
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:330
-#: plugins/shared-folder/properties.glade.h:7 smime/lib/e-cert.c:1131
+#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1541
+#: ../mail/em-format-quote.c:310 ../mail/em-format.c:848
+#: ../mail/em-mailer-prefs.c:88 ../mail/message-list.etspec.h:13
+#: ../mail/message-tag-followup.c:330
+#: ../plugins/groupwise-features/properties.glade.h:7
+#: ../smime/lib/e-cert.c:1131
 msgid "Subject"
 msgstr "Ikivugwaho"
 
-#: mail/em-filter-i18n.h:66
+#: ../mail/em-filter-i18n.h:66
 msgid "Unset Status"
 msgstr ""
 
 #. and now for the action area
-#: mail/em-filter-rule.c:488
+#: ../mail/em-filter-rule.c:488
 #, fuzzy
 msgid "<b>Then</b>"
 msgstr "<B B"
 
-#: mail/em-folder-browser.c:133
+#: ../mail/em-folder-browser.c:134
 msgid "Create _vFolder From Search..."
 msgstr ""
 
 #. TODO: can this be done in a loop?
-#: mail/em-folder-properties.c:144
+#: ../mail/em-folder-properties.c:144
 #, fuzzy
 msgid "Total message:"
 msgid_plural "Total messages:"
 msgstr[0] "Ubutumwa"
 
-#: mail/em-folder-properties.c:156
+#: ../mail/em-folder-properties.c:156
 #, fuzzy
 msgid "Unread message:"
 msgid_plural "Unread messages:"
 msgstr[0] "Ubutumwa"
 
-#: mail/em-folder-properties.c:278 plugins/shared-folder/properties.glade.h:3
+#: ../mail/em-folder-properties.c:278
+#: ../plugins/groupwise-features/properties.glade.h:3
 msgid "Folder Properties"
 msgstr ""
 
-#: mail/em-folder-selection-button.c:123
+#: ../mail/em-folder-selection-button.c:123
 #, fuzzy
 msgid "<click here to select a folder>"
 msgstr "<Kanda Kuri Guhitamo a Ububiko"
 
-#: mail/em-folder-selector.c:166
-msgid "Create New Folder"
-msgstr "Rema idosiye nshya"
-
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2528
-#: mail/mail-component.c:770 plugins/shared-folder/install-shared.c:144
-#: plugins/shared-folder/share-folder-common.c:353
-#, fuzzy
-msgid "Specify where to create the folder:"
-msgstr "Kuri Kurema Ububiko"
-
 # sch/source\ui\dlg\dlggraut.src:DLG_CHART_WIZ.PB_EXECUTE.text
-#: mail/em-folder-selector.c:304
+#: ../mail/em-folder-selector.c:261
 msgid "Create"
 msgstr "Kurema"
 
-#: mail/em-folder-selector.c:308
+#: ../mail/em-folder-selector.c:265
 #, fuzzy
 msgid "Folder _name:"
 msgstr "Izina ry'ububiko"
 
-#: mail/em-folder-tree-model.c:201 mail/em-folder-tree-model.c:203
-#: mail/mail-vfolder.c:899 mail/mail-vfolder.c:969
+#: ../mail/em-folder-tree-model.c:201 ../mail/em-folder-tree-model.c:203
+#: ../mail/mail-vfolder.c:900 ../mail/mail-vfolder.c:970
 msgid "vFolders"
 msgstr ""
 
 #. UNMATCHED is always last
-#: mail/em-folder-tree-model.c:207 mail/em-folder-tree-model.c:209
+#: ../mail/em-folder-tree-model.c:207 ../mail/em-folder-tree-model.c:209
 msgid "UNMATCHED"
 msgstr ""
 
-#: mail/em-folder-tree-model.c:468 mail/mail-component.c:142
+#: ../mail/em-folder-tree-model.c:468 ../mail/mail-component.c:143
 msgid "Drafts"
 msgstr ""
 
@@ -12224,381 +12421,393 @@ msgstr ""
 # #-#-#-#-#  sfx2.pot (Gnome 2.12)  #-#-#-#-#
 # sfx2/source\explorer\explorer.src:STR_SFX_MAILSRV_INBOX.text
 #. translators: standard local mailbox names
-#: mail/em-folder-tree-model.c:471 mail/mail-component.c:141
+#: ../mail/em-folder-tree-model.c:471 ../mail/mail-component.c:142
 msgid "Inbox"
 msgstr "Ibyinjiye"
 
 # svtools/source\misc\mediatyp.src:STR_SVT_MIMETYPE_CNT_OUTBOX.text
-#: mail/em-folder-tree-model.c:474 mail/mail-component.c:143
+#: ../mail/em-folder-tree-model.c:474 ../mail/mail-component.c:144
 msgid "Outbox"
 msgstr "Ibyasohotse"
 
 # 5477
-#: mail/em-folder-tree-model.c:476 mail/mail-component.c:144
+#: ../mail/em-folder-tree-model.c:476 ../mail/mail-component.c:145
 msgid "Sent"
 msgstr "Byoherejwe"
 
-#: mail/em-folder-tree-model.c:495 mail/em-folder-tree-model.c:799
+#: ../mail/em-folder-tree-model.c:495 ../mail/em-folder-tree-model.c:799
 msgid "Loading..."
 msgstr "Itangira..."
 
-#: mail/em-folder-tree.c:689
+#: ../mail/em-folder-tree.c:689
 msgid "Mail Folder Tree"
 msgstr ""
 
-#: mail/em-folder-tree.c:922
+#: ../mail/em-folder-tree.c:922
 #, fuzzy, c-format
 msgid "Moving folder %s"
 msgstr "Ububiko"
 
-#: mail/em-folder-tree.c:924
+#: ../mail/em-folder-tree.c:924
 #, fuzzy, c-format
 msgid "Copying folder %s"
 msgstr "Ububiko"
 
-#: mail/em-folder-tree.c:931 mail/message-list.c:1612
+#: ../mail/em-folder-tree.c:931 ../mail/message-list.c:1613
 #, fuzzy, c-format
 msgid "Moving messages into folder %s"
 msgstr "Ubutumwa Ububiko"
 
-#: mail/em-folder-tree.c:933 mail/message-list.c:1614
+#: ../mail/em-folder-tree.c:933 ../mail/message-list.c:1615
 #, fuzzy, c-format
 msgid "Copying messages into folder %s"
 msgstr "Ubutumwa Ububiko"
 
-#: mail/em-folder-tree.c:949
+#: ../mail/em-folder-tree.c:949
 #, fuzzy
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Ubutumwa S"
 
 # 1191
-#: mail/em-folder-tree.c:1045 ui/evolution-mail-message.xml.h:106
+#: ../mail/em-folder-tree.c:1045 ../ui/evolution-mail-message.xml.h:101
 #, fuzzy
 msgid "_Copy to Folder"
 msgstr "kopororera ku nyandiko"
 
-#: mail/em-folder-tree.c:1046 ui/evolution-mail-message.xml.h:115
+#: ../mail/em-folder-tree.c:1046 ../ui/evolution-mail-message.xml.h:111
 #, fuzzy
 msgid "_Move to Folder"
 msgstr "Kuri"
 
-#: mail/em-folder-tree.c:1751 mail/mail-ops.c:1051
+#: ../mail/em-folder-tree.c:1751 ../mail/mail-ops.c:1055
 #, fuzzy, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "in"
 
-#: mail/em-folder-tree.c:2024
-#, fuzzy, c-format
-msgid "Copying `%s' to `%s'"
-msgstr "Kuri"
-
-#: mail/em-folder-tree.c:2298 mail/em-folder-tree.c:2312
-#: mail/em-folder-view.c:876 mail/em-folder-view.c:891
-#: mail/importers/evolution-mbox-importer.c:120
-#: mail/importers/evolution-outlook-importer.c:134
-#, fuzzy
-msgid "Select folder"
-msgstr "Ububiko"
-
-# dbaccess/source/ui/inc/toolbox.hrc:MID_SBA_QRY_COPY.text
-#: mail/em-folder-tree.c:2298 mail/em-folder-view.c:891
-#, fuzzy
-msgid "C_opy"
-msgstr "Gukoporora"
-
-#: mail/em-folder-tree.c:2339 plugins/shared-folder/share-folder-common.c:140
-#, fuzzy, c-format
-msgid "Creating folder `%s'"
-msgstr "Ububiko"
-
-#: mail/em-folder-tree.c:2528 mail/mail-component.c:770
-#: plugins/shared-folder/install-shared.c:144
-#: plugins/shared-folder/share-folder-common.c:353
-#, fuzzy
-msgid "Create folder"
-msgstr "Guhimba idosiye:%s"
-
-#: mail/em-folder-tree.c:2721
-#, fuzzy, c-format
-msgid "Rename the \"%s\" folder to:"
-msgstr "Ububiko Kuri"
-
-#: mail/em-folder-tree.c:2723
-msgid "Rename Folder"
-msgstr "Hindura izina ry'ububiko"
-
-#: mail/em-folder-tree.c:2729
-#, fuzzy
-msgid "Folder names cannot contain '/'"
-msgstr "Amazina"
-
 # #-#-#-#-#  basctl.pot (Gnome 2.12)  #-#-#-#-#
 # basctl/source\basicide\basidesh.src:RID_BASICMENU.MN_VIEW.text
 # #-#-#-#-#  basctl.pot (Gnome 2.12)  #-#-#-#-#
 # basctl/source\basicide\basidesh.src:RID_BASICPLUGINMENU.MN_PLVIEW.text
-#: mail/em-folder-tree.c:2803 ui/evolution-addressbook.xml.h:44
-#: ui/evolution-mail-global.xml.h:17 ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:49
+#: ../mail/em-folder-tree.c:2107 ../ui/evolution-addressbook.xml.h:44
+#: ../ui/evolution-mail-global.xml.h:23
+#: ../ui/evolution-mail-messagedisplay.xml.h:8
+#: ../ui/evolution-message-composer.xml.h:52 ../ui/evolution.xml.h:46
 #, fuzzy
 msgid "_View"
 msgstr "Kureba"
 
 # svtools/source\uno\unoifac2.src:RID_CONTEXTMENU.RID_OPEN_LINK_NEW.text
-#: mail/em-folder-tree.c:2804
+#: ../mail/em-folder-tree.c:2108
 #, fuzzy
 msgid "Open in _New Window"
 msgstr "Gufungurira muri New Window"
 
 # svx/source\svdraw\svdstr.src:STR_UndoCopyObj.text
-#: mail/em-folder-tree.c:2808
+#: ../mail/em-folder-tree.c:2112
 #, fuzzy
 msgid "_Copy..."
 msgstr "Gukoporora"
 
 # sch/source\ui\app\strings.src:STR_UNDO_MOVE.text
-#: mail/em-folder-tree.c:2809
+#: ../mail/em-folder-tree.c:2113
 #, fuzzy
 msgid "_Move..."
 msgstr "Kwimura"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2813
+#: ../mail/em-folder-tree.c:2117
 #, fuzzy
 msgid "_New Folder..."
 msgstr "Idosiye nshya..."
 
 # padmin/source\padialog.src:RID_PADIALOG.RID_PA_BTN_RENAME.text
-#: mail/em-folder-tree.c:2816
+#: ../mail/em-folder-tree.c:2120 ../ui/evolution-mail-list.xml.h:29
 #, fuzzy
 msgid "_Rename..."
 msgstr "Guhindura izina..."
 
+#: ../mail/em-folder-utils.c:104
+#, fuzzy, c-format
+msgid "Copying `%s' to `%s'"
+msgstr "Kuri"
+
+#: ../mail/em-folder-utils.c:367 ../mail/em-folder-utils.c:383
+#: ../mail/em-folder-view.c:929 ../mail/em-folder-view.c:944
+#: ../mail/importers/evolution-mbox-importer.c:120
+#: ../mail/importers/evolution-outlook-importer.c:134
+#, fuzzy
+msgid "Select folder"
+msgstr "Ububiko"
+
+# dbaccess/source/ui/inc/toolbox.hrc:MID_SBA_QRY_COPY.text
+#: ../mail/em-folder-utils.c:367 ../mail/em-folder-view.c:944
+#, fuzzy
+msgid "C_opy"
+msgstr "Gukoporora"
+
+#: ../mail/em-folder-utils.c:521
+#, fuzzy, c-format
+msgid "Rename the \"%s\" folder to:"
+msgstr "Ububiko Kuri"
+
+#: ../mail/em-folder-utils.c:523
+msgid "Rename Folder"
+msgstr "Hindura izina ry'ububiko"
+
+#: ../mail/em-folder-utils.c:529
+#, fuzzy
+msgid "Folder names cannot contain '/'"
+msgstr "Amazina"
+
+#: ../mail/em-folder-utils.c:599
+#: ../plugins/groupwise-features/share-folder-common.c:140
+#, fuzzy, c-format
+msgid "Creating folder `%s'"
+msgstr "Ububiko"
+
+#: ../mail/em-folder-utils.c:748
+#: ../plugins/groupwise-features/install-shared.c:156
+#: ../plugins/groupwise-features/share-folder-common.c:382
+#, fuzzy
+msgid "Create folder"
+msgstr "Guhimba idosiye:%s"
+
+#: ../mail/em-folder-utils.c:748
+#: ../plugins/groupwise-features/install-shared.c:156
+#: ../plugins/groupwise-features/share-folder-common.c:382
+#, fuzzy
+msgid "Specify where to create the folder:"
+msgstr "Kuri Kurema Ububiko"
+
 # offmgr/sdi\ofaslots.src:SID_MAIL_GROUPREPLY.text
-#: mail/em-folder-view.c:984 mail/em-popup.c:499
-#: ui/evolution-mail-message.xml.h:87
+#: ../mail/em-folder-view.c:1037 ../mail/em-popup.c:499
 #, fuzzy
 msgid "Reply to _All"
 msgstr "Gusubiza Bose"
 
 # 5118
-#: mail/em-folder-view.c:985 ui/evolution-mail-message.xml.h:123
+#: ../mail/em-folder-view.c:1038 ../ui/evolution-mail-message.xml.h:119
 #, fuzzy
 msgid "_Reply to Sender"
 msgstr "Subiza Uwohereje"
 
 # sch/sdi\schslots.src:SID_ROW_MOREFRONT.text
-#: mail/em-folder-view.c:986 mail/em-popup.c:501
-#: ui/evolution-mail-message.xml.h:110
+#: ../mail/em-folder-view.c:1039 ../mail/em-popup.c:501
+#: ../ui/evolution-mail-message.xml.h:105
 #, fuzzy
 msgid "_Forward"
 msgstr "Imbere"
 
-#: mail/em-folder-view.c:989 ui/evolution-mail-message.xml.h:109
+#: ../mail/em-folder-view.c:1042 ../ui/evolution-mail-message.xml.h:103
 #, fuzzy
 msgid "_Edit as New Message..."
 msgstr "Nka"
 
-# #-#-#-#-#  dbaccess.pot (Gnome 2.12)  #-#-#-#-#
-# #-#-#-#-#  dbaccess.pot (Gnome 2.12)  #-#-#-#-#
-#: mail/em-folder-view.c:991
-#, fuzzy
-msgid "_Print"
-msgstr "Gucapa"
-
-#: mail/em-folder-view.c:995
+#: ../mail/em-folder-view.c:1048
 msgid "U_ndelete"
 msgstr ""
 
-#: mail/em-folder-view.c:996
+#: ../mail/em-folder-view.c:1049
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "Kuri"
 
 # 1191
-#: mail/em-folder-view.c:997 ui/evolution-addressbook.xml.h:32
+#: ../mail/em-folder-view.c:1050 ../ui/evolution-addressbook.xml.h:32
 #, fuzzy
 msgid "_Copy to Folder..."
 msgstr "kopororera ku nyandiko"
 
-#: mail/em-folder-view.c:1000
+#: ../mail/em-folder-view.c:1053
+#, fuzzy
+msgid "Mar_k as Read"
+msgstr "Nka"
+
+#: ../mail/em-folder-view.c:1054
+#, fuzzy
+msgid "Mark as U_nread"
+msgstr "Nka"
+
+#: ../mail/em-folder-view.c:1055
 #, fuzzy
 msgid "Mark as _Important"
 msgstr "Nka"
 
-#: mail/em-folder-view.c:1001
+#: ../mail/em-folder-view.c:1056
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "Nka"
 
-#: mail/em-folder-view.c:1002 ui/evolution-mail-message.xml.h:54
+#: ../mail/em-folder-view.c:1057
 #, fuzzy
 msgid "Mark as _Junk"
 msgstr "Nka"
 
-#: mail/em-folder-view.c:1003 ui/evolution-mail-message.xml.h:55
+#: ../mail/em-folder-view.c:1058
 #, fuzzy
 msgid "Mark as _Not Junk"
 msgstr "Nka"
 
-#: mail/em-folder-view.c:1004
+#: ../mail/em-folder-view.c:1059
 #, fuzzy
 msgid "Mark for Follo_w Up..."
 msgstr "kugirango"
 
-#: mail/em-folder-view.c:1012
+#: ../mail/em-folder-view.c:1067
 msgid "Fla_g Completed"
 msgstr ""
 
-#: mail/em-folder-view.c:1013
+#: ../mail/em-folder-view.c:1068
 msgid "Cl_ear Flag"
 msgstr ""
 
-#: mail/em-folder-view.c:1016
+#: ../mail/em-folder-view.c:1071
 msgid "Crea_te Rule From Message"
 msgstr ""
 
-#: mail/em-folder-view.c:1017
+#: ../mail/em-folder-view.c:1072
 #, fuzzy
 msgid "vFolder on _Subject"
 msgstr "ku"
 
-#: mail/em-folder-view.c:1018
+#: ../mail/em-folder-view.c:1073
 #, fuzzy
 msgid "vFolder on Se_nder"
 msgstr "ku"
 
-#: mail/em-folder-view.c:1019
+#: ../mail/em-folder-view.c:1074
 #, fuzzy
 msgid "vFolder on _Recipients"
 msgstr "ku"
 
-#: mail/em-folder-view.c:1020
+#: ../mail/em-folder-view.c:1075
 #, fuzzy
 msgid "vFolder on Mailing _List"
 msgstr "ku"
 
-#: mail/em-folder-view.c:1024
+#: ../mail/em-folder-view.c:1079
 #, fuzzy
 msgid "Filter on Sub_ject"
 msgstr "ku"
 
-#: mail/em-folder-view.c:1025
+#: ../mail/em-folder-view.c:1080
 #, fuzzy
 msgid "Filter on Sen_der"
 msgstr "ku"
 
-#: mail/em-folder-view.c:1026
+#: ../mail/em-folder-view.c:1081
 #, fuzzy
 msgid "Filter on Re_cipients"
 msgstr "ku"
 
-#: mail/em-folder-view.c:1027
+#: ../mail/em-folder-view.c:1082
 #, fuzzy
 msgid "Filter on _Mailing List"
 msgstr "ku"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1858 mail/em-folder-view.c:1902
+#: ../mail/em-folder-view.c:1922 ../mail/em-folder-view.c:1966
 msgid "Default"
 msgstr "Mburabuzi"
 
-#: mail/em-folder-view.c:2001
+#: ../mail/em-folder-view.c:2065
+#: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:2
 msgid "Print Message"
 msgstr ""
 
-#: mail/em-folder-view.c:2331
+#: ../mail/em-folder-view.c:2403
 #, fuzzy
 msgid "_Copy Link Location"
 msgstr "Koporora inturo ry'Ihuza"
 
-#: mail/em-folder-view.c:2333
+#: ../mail/em-folder-view.c:2405
 msgid "Create _vFolder"
 msgstr ""
 
-#: mail/em-folder-view.c:2334
+#: ../mail/em-folder-view.c:2406
 #, fuzzy
 msgid "_From this Address"
 msgstr "iyi"
 
-#: mail/em-folder-view.c:2335
+#: ../mail/em-folder-view.c:2407
 #, fuzzy
 msgid "_To this Address"
 msgstr "iyi"
 
-#: mail/em-folder-view.c:2604
+#: ../mail/em-folder-view.c:2688
 #, fuzzy, c-format
 msgid "Click to mail %s"
 msgstr "Kuri Ubutumwa"
 
 #. message-search popup match count string
-#: mail/em-format-html-display.c:412
+#: ../mail/em-format-html-display.c:406
 #, c-format
 msgid "Matches: %d"
 msgstr ""
 
-#: mail/em-format-html-display.c:680 mail/em-format-html.c:579
+#: ../mail/em-format-html-display.c:653 ../mail/em-format-html.c:578
 msgid "Unsigned"
 msgstr "Bitashizweho umukono"
 
-#: mail/em-format-html-display.c:680
+#: ../mail/em-format-html-display.c:653
 #, fuzzy
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr "Ubutumwa ni OYA ni Oya iyi Ubutumwa ni"
 
-#: mail/em-format-html-display.c:681 mail/em-format-html.c:580
+#: ../mail/em-format-html-display.c:654 ../mail/em-format-html.c:579
 #, fuzzy
 msgid "Valid signature"
 msgstr "Isinya"
 
-#: mail/em-format-html-display.c:681
+#: ../mail/em-format-html-display.c:654
 #, fuzzy
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
 msgstr "Ubutumwa ni Na ni Byemewe Igisobanuro ni iyi Ubutumwa ni"
 
-#: mail/em-format-html-display.c:682 mail/em-format-html.c:581
+#: ../mail/em-format-html-display.c:655 ../mail/em-format-html.c:580
 #, fuzzy
 msgid "Invalid signature"
 msgstr "Isinya"
 
-#: mail/em-format-html-display.c:682
+#: ../mail/em-format-html-display.c:655
 #, fuzzy
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr "Isinya Bya iyi Ubutumwa Byagenzuwe Gicurasi in"
 
-#: mail/em-format-html-display.c:683
+#: ../mail/em-format-html-display.c:656
 #, fuzzy
 msgid "Valid signature, cannot verify sender"
 msgstr "Isinya Uwohereza"
 
-#: mail/em-format-html-display.c:683
+#: ../mail/em-format-html-display.c:656
 #, fuzzy
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
 msgstr "Ubutumwa ni Na: a Byemewe Isinya Uwohereza Bya Ubutumwa Byagenzuwe"
 
-#: mail/em-format-html-display.c:689 mail/em-format-html.c:588
+#: ../mail/em-format-html-display.c:662 ../mail/em-format-html.c:587
 msgid "Unencrypted"
 msgstr ""
 
-#: mail/em-format-html-display.c:689
+#: ../mail/em-format-html-display.c:662
 #, fuzzy
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "the Internet."
 msgstr "Ubutumwa ni OYA Bishunzwe: Ibikubiyemo Gicurasi in Kwambukiranya"
 
-#: mail/em-format-html-display.c:690 mail/em-format-html.c:589
+#: ../mail/em-format-html-display.c:663 ../mail/em-format-html.c:588
 msgid "Encrypted, weak"
 msgstr ""
 
-#: mail/em-format-html-display.c:690
+#: ../mail/em-format-html-display.c:663
 #, fuzzy
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm.  It would "
@@ -12608,12 +12817,12 @@ msgstr ""
 "Ubutumwa ni Bishunzwe: Na: a Bishunzwe: OYA kugirango Kuri Kureba "
 "Ibikubiyemo Bya iyi Ubutumwa in a Igiteranyo Bya Igihe"
 
-#: mail/em-format-html-display.c:691 mail/em-format-html.c:590
+#: ../mail/em-format-html-display.c:664 ../mail/em-format-html.c:589
 #, fuzzy
 msgid "Encrypted"
 msgstr "Bishunzwe:"
 
-#: mail/em-format-html-display.c:691
+#: ../mail/em-format-html-display.c:664
 #, fuzzy
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
@@ -12621,11 +12830,11 @@ msgid ""
 msgstr ""
 "Ubutumwa ni Bishunzwe: kugirango Kuri Kureba Ibikubiyemo Bya iyi Ubutumwa"
 
-#: mail/em-format-html-display.c:692 mail/em-format-html.c:591
+#: ../mail/em-format-html-display.c:665 ../mail/em-format-html.c:590
 msgid "Encrypted, strong"
 msgstr ""
 
-#: mail/em-format-html-display.c:692
+#: ../mail/em-format-html-display.c:665
 #, fuzzy
 msgid ""
 "This message is encrypted, with a strong encryption algorithm.  It would be "
@@ -12635,121 +12844,122 @@ msgstr ""
 "Ubutumwa ni Bishunzwe: Na: a Bishunzwe: kugirango Kuri Kureba Ibikubiyemo "
 "Bya iyi Ubutumwa in a Igiteranyo Bya Igihe"
 
-#: mail/em-format-html-display.c:793 smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:766 ../smime/gui/smime-ui.glade.h:48
 #, fuzzy
 msgid "_View Certificate"
 msgstr "Reba impamyabushobozi"
 
-#: mail/em-format-html-display.c:808
+#: ../mail/em-format-html-display.c:781
 #, fuzzy
 msgid "This certificate is not viewable"
 msgstr "Impamyabushobozi ni OYA"
 
-#: mail/em-format-html-display.c:1037
+#: ../mail/em-format-html-display.c:1011
 #, fuzzy
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "ku"
 
-#: mail/em-format-html-display.c:1045
+#: ../mail/em-format-html-display.c:1019
 msgid "Overdue:"
 msgstr ""
 
 # sc/source\ui\src\globstr.src:RID_GLOBSTR.STR_BY.text
-#: mail/em-format-html-display.c:1048
+#: ../mail/em-format-html-display.c:1022
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "ku"
 
-#: mail/em-format-html-display.c:1095
+#: ../mail/em-format-html-display.c:1064
 msgid "_View Inline"
 msgstr ""
 
 # basctl/source\basicide\basidesh.src:RID_POPUP_TABBAR.SID_BASICIDE_HIDECURPAGE.text
-#: mail/em-format-html-display.c:1096
+#: ../mail/em-format-html-display.c:1065
 #, fuzzy
 msgid "_Hide"
 msgstr "Gushisha"
 
-#: mail/em-format-html-display.c:1340
+#: ../mail/em-format-html-display.c:1309
 msgid "Attachment Button"
 msgstr ""
 
-#: mail/em-format-html-print.c:130
+#: ../mail/em-format-html-print.c:130
 #, fuzzy, c-format
 msgid "Page %d of %d"
 msgstr "Ipaji# ya#"
 
-#: mail/em-format-html.c:472 mail/em-format-html.c:474
+#: ../mail/em-format-html.c:471 ../mail/em-format-html.c:473
 #, c-format
 msgid "Retrieving `%s'"
 msgstr ""
 
-#: mail/em-format-html.c:582
+#: ../mail/em-format-html.c:581
 #, fuzzy
 msgid "Valid signature but cannot verify sender"
 msgstr "Isinya Uwohereza"
 
-#: mail/em-format-html.c:840
+#: ../mail/em-format-html.c:839
 #, fuzzy
 msgid "Malformed external-body part."
 msgstr "external"
 
-#: mail/em-format-html.c:870
+#: ../mail/em-format-html.c:869
 #, fuzzy, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Kuri Ipaji"
 
-#: mail/em-format-html.c:881
+#: ../mail/em-format-html.c:880
 #, fuzzy, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Kuri IDOSIYE Byemewe ku Ipaji"
 
-#: mail/em-format-html.c:883
+#: ../mail/em-format-html.c:882
 #, fuzzy, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Kuri IDOSIYE"
 
-#: mail/em-format-html.c:904
+#: ../mail/em-format-html.c:903
 #, fuzzy, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Kuri Ibyatanzwe"
 
-#: mail/em-format-html.c:915
+#: ../mail/em-format-html.c:914
 #, fuzzy, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Kuri Kitazwi external Ibyatanzwe Ubwoko"
 
-#: mail/em-format-html.c:1137
+#: ../mail/em-format-html.c:1140
 #, fuzzy
 msgid "Formatting message"
 msgstr "Ubutumwa"
 
 # officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....Wizard.Memo.Elements.From.text
-#: mail/em-format-html.c:1424 mail/em-format-quote.c:193 mail/em-format.c:848
-#: mail/em-mailer-prefs.c:83 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:326
+#: ../mail/em-format-html.c:1433 ../mail/em-format-quote.c:197
+#: ../mail/em-format.c:843 ../mail/em-mailer-prefs.c:83
+#: ../mail/message-list.etspec.h:7 ../mail/message-tag-followup.c:326
 msgid "From"
 msgstr "Bivuye"
 
-#: mail/em-format-html.c:1424 mail/em-format-quote.c:193 mail/em-format.c:849
-#: mail/em-mailer-prefs.c:84
+#: ../mail/em-format-html.c:1433 ../mail/em-format-quote.c:197
+#: ../mail/em-format.c:844 ../mail/em-mailer-prefs.c:84
 #, fuzzy
 msgid "Reply-To"
 msgstr "Subiza- Kuri:"
 
 # officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....Wizard.Memo.Elements.To.text
-#: mail/em-format-html.c:1424 mail/em-format-quote.c:193 mail/em-format.c:850
-#: mail/em-mailer-prefs.c:85 mail/message-list.etspec.h:14
+#: ../mail/em-format-html.c:1433 ../mail/em-format-quote.c:197
+#: ../mail/em-format.c:845 ../mail/em-mailer-prefs.c:85
+#: ../mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Kuri"
 
-#: mail/em-format-html.c:1424 mail/em-format-quote.c:193 mail/em-format.c:851
-#: mail/em-mailer-prefs.c:86
+#: ../mail/em-format-html.c:1433 ../mail/em-format-quote.c:197
+#: ../mail/em-format.c:846 ../mail/em-mailer-prefs.c:86
 msgid "Cc"
 msgstr "Kopi kuri"
 
-#: mail/em-format-html.c:1424 mail/em-format-quote.c:193 mail/em-format.c:852
-#: mail/em-mailer-prefs.c:87
+#: ../mail/em-format-html.c:1433 ../mail/em-format-quote.c:197
+#: ../mail/em-format.c:847 ../mail/em-mailer-prefs.c:87
 msgid "Bcc"
 msgstr "Ikopi ku bataboneka"
 
@@ -12757,92 +12967,94 @@ msgstr "Ikopi ku bataboneka"
 # # @name VCARD_LDAP_MAILER
 # # @loc None
 #. pseudo-header
-#: mail/em-format-html.c:1536 mail/em-format-quote.c:315
-#: mail/em-mailer-prefs.c:986
+#: ../mail/em-format-html.c:1545 ../mail/em-format-quote.c:319
+#: ../mail/em-mailer-prefs.c:986
 msgid "Mailer"
 msgstr "Uwanditse"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1563
+#: ../mail/em-format-html.c:1572
 msgid "<I> (%a, %R %Z)</I>"
 msgstr ""
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1566
+#: ../mail/em-format-html.c:1575
 msgid "<I> (%R %Z)</I>"
 msgstr ""
 
-#: mail/em-format-html.c:1576 mail/em-format-quote.c:322 mail/em-format.c:854
-#: mail/em-mailer-prefs.c:89 mail/message-list.etspec.h:2
+#: ../mail/em-format-html.c:1585 ../mail/em-format-quote.c:326
+#: ../mail/em-format.c:849 ../mail/em-mailer-prefs.c:89
+#: ../mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Itariki"
 
 # svtools/source\misc\mediatyp.src:STR_SVT_MIMETYPE_CNT_BBBOX.text
-#: mail/em-format-html.c:1599 mail/em-format.c:855 mail/em-mailer-prefs.c:90
+#: ../mail/em-format-html.c:1608 ../mail/em-format.c:850
+#: ../mail/em-mailer-prefs.c:90
 msgid "Newsgroups"
 msgstr "Imbuga z'amakuru"
 
-#: mail/em-format.c:1104
+#: ../mail/em-format.c:1099
 #, fuzzy, c-format
 msgid "%s attachment"
 msgstr "%sumugereka"
 
-#: mail/em-format.c:1143 mail/em-format.c:1276
+#: ../mail/em-format.c:1138 ../mail/em-format.c:1271
 #, fuzzy
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "OYA Ubutumwa Ikosa"
 
-#: mail/em-format.c:1266
+#: ../mail/em-format.c:1261
 #, fuzzy
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Bishunzwe: Ubwoko kugirango Bishunzwe:"
 
-#: mail/em-format.c:1414
+#: ../mail/em-format.c:1409
 #, fuzzy
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "OYA Ubutumwa Nka Inkomoko"
 
-#: mail/em-format.c:1433
+#: ../mail/em-format.c:1428
 #, fuzzy
 msgid "Unsupported signature format"
 msgstr "Isinya Imiterere"
 
-#: mail/em-format.c:1441
+#: ../mail/em-format.c:1436
 #, fuzzy
 msgid "Error verifying signature"
 msgstr "Isinya"
 
-#: mail/em-format.c:1441
+#: ../mail/em-format.c:1436
 #, fuzzy
 msgid "Unknown error verifying signature"
 msgstr "Ikosa Isinya"
 
-#: mail/em-junk-filter.c:111
+#: ../mail/em-junk-filter.c:111
 #, fuzzy
 msgid "Spamassassin (built-in)"
 msgstr "in"
 
-#: mail/em-mailer-prefs.c:101
+#: ../mail/em-mailer-prefs.c:101
 #, fuzzy
 msgid "Every time"
 msgstr "Igihe"
 
-#: mail/em-mailer-prefs.c:102
+#: ../mail/em-mailer-prefs.c:102
 #, fuzzy
 msgid "Once per day"
 msgstr "UMUNSI"
 
-#: mail/em-mailer-prefs.c:103
+#: ../mail/em-mailer-prefs.c:103
 #, fuzzy
 msgid "Once per week"
 msgstr "Icyumweru"
 
-#: mail/em-mailer-prefs.c:104
+#: ../mail/em-mailer-prefs.c:104
 #, fuzzy
 msgid "Once per month"
 msgstr "Ukwezi"
 
-#: mail/em-migrate.c:1198
+#: ../mail/em-migrate.c:1198
 #, fuzzy
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
@@ -12851,47 +13063,47 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr "X."
 
-#: mail/em-migrate.c:1632
+#: ../mail/em-migrate.c:1632
 #, fuzzy, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "Kuri Kurema Gishya Ububiko"
 
-#: mail/em-migrate.c:1658
+#: ../mail/em-migrate.c:1658
 #, fuzzy, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "Kuri Gukoporora Ububiko Kuri"
 
-#: mail/em-migrate.c:1843
+#: ../mail/em-migrate.c:1843
 #, fuzzy, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "Kuri Gusikana kugirango ku"
 
-#: mail/em-migrate.c:2047
+#: ../mail/em-migrate.c:2047
 #, fuzzy, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "Kuri Gufungura ki/ bishaje ku Seriveri Ibyatanzwe"
 
-#: mail/em-migrate.c:2061
+#: ../mail/em-migrate.c:2061
 #, fuzzy, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "Kuri Kurema ku Seriveri Ibyatanzwe bushyinguro"
 
-#: mail/em-migrate.c:2090
+#: ../mail/em-migrate.c:2090
 #, fuzzy, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr "Kuri Gukoporora ku Seriveri Ibyatanzwe"
 
-#: mail/em-migrate.c:2561 mail/em-migrate.c:2573
+#: ../mail/em-migrate.c:2561 ../mail/em-migrate.c:2573
 #, fuzzy, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "Kuri Kurema Ubutumwa"
 
-#: mail/em-migrate.c:2693
+#: ../mail/em-migrate.c:2693
 #, fuzzy, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "Kuri Kurema Ubutumwa ku"
 
-#: mail/em-migrate.c:2711
+#: ../mail/em-migrate.c:2711
 #, fuzzy
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
@@ -12900,249 +13112,249 @@ msgstr ""
 "Kuri Gusoma Amagenamiterere Bivuye Ibanjirije Kwinjiza porogaramu Impinduka "
 "OYA Cyangwa ni"
 
-#: mail/em-popup.c:382
+#: ../mail/em-popup.c:382
 msgid "Save As..."
 msgstr "Bika nka..."
 
-#: mail/em-popup.c:401
+#: ../mail/em-popup.c:401
 #, c-format
 msgid "untitled_image.%s"
 msgstr ""
 
-#: mail/em-popup.c:495
+#: ../mail/em-popup.c:495
 #, fuzzy
 msgid "Set as _Background"
 msgstr "Nka"
 
 # 5118
-#: mail/em-popup.c:497
+#: ../mail/em-popup.c:497
 #, fuzzy
 msgid "_Reply to sender"
 msgstr "Subiza Uwohereje"
 
-#: mail/em-popup.c:498 ui/evolution-mail-message.xml.h:88
+#: ../mail/em-popup.c:498 ../ui/evolution-mail-message.xml.h:81
 #, fuzzy
 msgid "Reply to _List"
 msgstr "Kuri"
 
-#: mail/em-popup.c:549
+#: ../mail/em-popup.c:549
 #, fuzzy
 msgid "_Open Link in Browser"
 msgstr "in"
 
-#: mail/em-popup.c:550
+#: ../mail/em-popup.c:550
 msgid "_Send New Message To..."
 msgstr ""
 
-#: mail/em-popup.c:551
+#: ../mail/em-popup.c:551
 #, fuzzy
 msgid "_Add to Addressbook"
 msgstr "Kuri"
 
-#: mail/em-popup.c:666
+#: ../mail/em-popup.c:666
 #, fuzzy, c-format
 msgid "Open in %s..."
 msgstr "fungura muri:"
 
-#: mail/em-subscribe-editor.c:611
+#: ../mail/em-subscribe-editor.c:611
 #, fuzzy
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "OYA Gushigikira Kwiyandikisha Cyangwa OYA Bikora"
 
 # 6008
-#: mail/em-subscribe-editor.c:640
+#: ../mail/em-subscribe-editor.c:640
 msgid "Subscribed"
 msgstr "yanditswe/byemewe"
 
 # sfx2/source\explorer\explorer.src:STR_SFX_FOLDER.text
-#: mail/em-subscribe-editor.c:644
+#: ../mail/em-subscribe-editor.c:644
 msgid "Folder"
 msgstr "Ububiko"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:859
+#: ../mail/em-subscribe-editor.c:859
 #, fuzzy
 msgid "Please select a server."
 msgstr "Guhitamo a Seriveri"
 
-#: mail/em-subscribe-editor.c:880
+#: ../mail/em-subscribe-editor.c:880
 #, fuzzy
 msgid "No server has been selected"
 msgstr "Seriveri Byahiswemo"
 
-#: mail/em-utils.c:105
+#: ../mail/em-utils.c:105
 #, fuzzy
 msgid "Don't show this message again."
 msgstr "Garagaza iyi Ubutumwa"
 
 # framework/source\classes\fltdlg.src:DLG_FILTER_SELECT.FL_FILTER.text
-#: mail/em-utils.c:294
+#: ../mail/em-utils.c:294
 msgid "Filters"
 msgstr "Muyunguruzi"
 
 # sfx2/source\doc\doc.src:STR_DOCTYPENAME_MESSAGE.text
-#: mail/em-utils.c:436
+#: ../mail/em-utils.c:436
 #, fuzzy
 msgid "message"
 msgstr "Ubutumwa"
 
 # # Strings use for the save message dialog shown when the user close a message compose window
 # # Strings used by Save as Draft/Template dialog
-#: mail/em-utils.c:545
+#: ../mail/em-utils.c:545
 #, fuzzy
 msgid "Save Message..."
 msgstr "Bika ubutumwa"
 
-#: mail/em-utils.c:594
+#: ../mail/em-utils.c:594
 #, fuzzy
 msgid "Add address"
 msgstr "Aderesi"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:1073
+#: ../mail/em-utils.c:1073
 #, fuzzy, c-format
 msgid "Messages from %s"
 msgstr "Bivuye"
 
-#: mail/em-vfolder-editor.c:104
+#: ../mail/em-vfolder-editor.c:104
 msgid "v_Folders"
 msgstr ""
 
-#: mail/em-vfolder-rule.c:574
+#: ../mail/em-vfolder-rule.c:574
 #, fuzzy
 msgid "vFolder source"
 msgstr "Inkomoko"
 
-#: mail/evolution-mail.schemas.in.in.h:1
+#: ../mail/evolution-mail.schemas.in.in.h:1
 #, fuzzy
 msgid "Automatic link recognition"
 msgstr "Ihuza"
 
-#: mail/evolution-mail.schemas.in.in.h:2
+#: ../mail/evolution-mail.schemas.in.in.h:2
 msgid "Automatic smiley recognition"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:3
+#: ../mail/evolution-mail.schemas.in.in.h:3
 #, fuzzy
 msgid "Check incoming mail being junk"
 msgstr "Ubutumwa"
 
-#: mail/evolution-mail.schemas.in.in.h:4
+#: ../mail/evolution-mail.schemas.in.in.h:4
 #, fuzzy
 msgid "Citation highlight color"
 msgstr "garagaza cyane Ibara"
 
-#: mail/evolution-mail.schemas.in.in.h:5
+#: ../mail/evolution-mail.schemas.in.in.h:5
 #, fuzzy
 msgid "Citation highlight color."
 msgstr "garagaza cyane Ibara"
 
-#: mail/evolution-mail.schemas.in.in.h:6
+#: ../mail/evolution-mail.schemas.in.in.h:6
 #, fuzzy
 msgid "Composer Window default height"
 msgstr "Mburabuzi Ubuhagarike"
 
-#: mail/evolution-mail.schemas.in.in.h:7
+#: ../mail/evolution-mail.schemas.in.in.h:7
 #, fuzzy
 msgid "Composer Window default width"
 msgstr "Mburabuzi Ubugari"
 
-#: mail/evolution-mail.schemas.in.in.h:8
+#: ../mail/evolution-mail.schemas.in.in.h:8
 #, fuzzy
 msgid "Default charset in which to compose messages"
 msgstr "in Kuri Himba: Ubutumwa"
 
-#: mail/evolution-mail.schemas.in.in.h:9
+#: ../mail/evolution-mail.schemas.in.in.h:9
 #, fuzzy
 msgid "Default charset in which to compose messages."
 msgstr "in Kuri Himba: Ubutumwa"
 
-#: mail/evolution-mail.schemas.in.in.h:10
+#: ../mail/evolution-mail.schemas.in.in.h:10
 #, fuzzy
 msgid "Default charset in which to display messages"
 msgstr "in Kuri Kugaragaza Ubutumwa"
 
-#: mail/evolution-mail.schemas.in.in.h:11
+#: ../mail/evolution-mail.schemas.in.in.h:11
 #, fuzzy
 msgid "Default charset in which to display messages."
 msgstr "in Kuri Kugaragaza Ubutumwa"
 
-#: mail/evolution-mail.schemas.in.in.h:12
+#: ../mail/evolution-mail.schemas.in.in.h:12
 #, fuzzy
 msgid "Default forward style"
 msgstr "Imbere IMISUSIRE"
 
-#: mail/evolution-mail.schemas.in.in.h:13
+#: ../mail/evolution-mail.schemas.in.in.h:13
 #, fuzzy
 msgid "Default height of the Composer Window"
 msgstr "Ubuhagarike Bya"
 
-#: mail/evolution-mail.schemas.in.in.h:14
+#: ../mail/evolution-mail.schemas.in.in.h:14
 #, fuzzy
 msgid "Default height of the Message Window"
 msgstr "Ubuhagarike Bya"
 
-#: mail/evolution-mail.schemas.in.in.h:15
+#: ../mail/evolution-mail.schemas.in.in.h:15
 #, fuzzy
 msgid "Default height of the Subscribe dialog"
 msgstr "Ubuhagarike Bya Ikiganiro"
 
-#: mail/evolution-mail.schemas.in.in.h:16
+#: ../mail/evolution-mail.schemas.in.in.h:16
 #, fuzzy
 msgid "Default reply style"
 msgstr "Subiza IMISUSIRE"
 
-#: mail/evolution-mail.schemas.in.in.h:17
+#: ../mail/evolution-mail.schemas.in.in.h:17
 #, fuzzy
 msgid "Default width of the Composer Window"
 msgstr "Ubugari Bya"
 
-#: mail/evolution-mail.schemas.in.in.h:18
+#: ../mail/evolution-mail.schemas.in.in.h:18
 #, fuzzy
 msgid "Default width of the Message Window"
 msgstr "Ubugari Bya"
 
-#: mail/evolution-mail.schemas.in.in.h:19
+#: ../mail/evolution-mail.schemas.in.in.h:19
 #, fuzzy
 msgid "Default width of the Subscribe dialog"
 msgstr "Ubugari Bya Ikiganiro"
 
-#: mail/evolution-mail.schemas.in.in.h:20
+#: ../mail/evolution-mail.schemas.in.in.h:20
 #, fuzzy
 msgid "Draw spelling error indicators on words as you type."
 msgstr "Ivuganyuguti Ikosa ku Amagambo Nka Ubwoko"
 
-#: mail/evolution-mail.schemas.in.in.h:21
+#: ../mail/evolution-mail.schemas.in.in.h:21
 #, fuzzy
 msgid "Empty Trash folders on exit"
 msgstr "ku Gusohoka"
 
-#: mail/evolution-mail.schemas.in.in.h:22
+#: ../mail/evolution-mail.schemas.in.in.h:22
 #, fuzzy
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Byose Ryari:"
 
-#: mail/evolution-mail.schemas.in.in.h:23
+#: ../mail/evolution-mail.schemas.in.in.h:23
 #, fuzzy
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "Ubwoko a indanga Ryari: Ubutumwa"
 
-#: mail/evolution-mail.schemas.in.in.h:24
+#: ../mail/evolution-mail.schemas.in.in.h:24
 #, fuzzy
 msgid "Enable/disable caret mode"
 msgstr "Ubwoko"
 
-#: mail/evolution-mail.schemas.in.in.h:25
+#: ../mail/evolution-mail.schemas.in.in.h:25
 #, fuzzy
 msgid "Height of the message-list pane"
 msgstr "Bya Ubutumwa Urutonde"
 
-#: mail/evolution-mail.schemas.in.in.h:26
+#: ../mail/evolution-mail.schemas.in.in.h:26
 #, fuzzy
 msgid "Height of the message-list pane."
 msgstr "Bya Ubutumwa Urutonde"
 
-#: mail/evolution-mail.schemas.in.in.h:27
+#: ../mail/evolution-mail.schemas.in.in.h:27
 #, fuzzy
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
@@ -13151,7 +13363,7 @@ msgstr ""
 "a Ukoresha: Kuri Gufungura 10 Cyangwa Birenzeho Ubutumwa ku Igihe Ukoresha: "
 "NIBA Kuri"
 
-#: mail/evolution-mail.schemas.in.in.h:28
+#: ../mail/evolution-mail.schemas.in.in.h:28
 #, fuzzy
 msgid ""
 "If there isn't a builtin viewer for a particular mime-type inside Evolution, "
@@ -13161,27 +13373,27 @@ msgstr ""
 "a kugirango a Ubwoko Mo Imbere in iyi Urutonde Kuri a in Ubwoko "
 "Ububikoshingiro Gicurasi kugirango Ibikubiyemo"
 
-#: mail/evolution-mail.schemas.in.in.h:29
+#: ../mail/evolution-mail.schemas.in.in.h:29
 #, fuzzy
 msgid "Last time empty trash was run"
 msgstr "Igihe ubusa Gukoresha"
 
-#: mail/evolution-mail.schemas.in.in.h:30
+#: ../mail/evolution-mail.schemas.in.in.h:30
 #, fuzzy
 msgid "List of Labels and their associated colors"
 msgstr "Bya Na Amabara"
 
-#: mail/evolution-mail.schemas.in.in.h:31
+#: ../mail/evolution-mail.schemas.in.in.h:31
 #, fuzzy
 msgid "List of accepted licenses"
 msgstr "Bya Byemewe"
 
-#: mail/evolution-mail.schemas.in.in.h:32
+#: ../mail/evolution-mail.schemas.in.in.h:32
 #, fuzzy
 msgid "List of accounts"
 msgstr "Bya Konti"
 
-#: mail/evolution-mail.schemas.in.in.h:33
+#: ../mail/evolution-mail.schemas.in.in.h:33
 #, fuzzy
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
@@ -13190,12 +13402,12 @@ msgstr ""
 "Bya Konti Kuri Ubutumwa Bya Urutonde Kirimo Ikurikiranyanyuguti Ububiko "
 "bwungirije Bifitanye isano Kuri Impinduka Ubutumwa Konti"
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: ../mail/evolution-mail.schemas.in.in.h:34
 #, fuzzy
 msgid "List of custom headers and whether they are enabled."
 msgstr "Bya Kunoza Imitwe Na Bikora"
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: ../mail/evolution-mail.schemas.in.in.h:35
 #, fuzzy
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
@@ -13204,138 +13416,138 @@ msgstr ""
 "Bya Uturango... Kuri Ubutumwa Bya Urutonde Kirimo Ikurikiranyanyuguti Izina: "
 "Ibara Ibara Imisobekere:"
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: ../mail/evolution-mail.schemas.in.in.h:36
 #, fuzzy
 msgid "List of mime types to check for bonobo component viewers"
 msgstr "Bya Kuri Kugenzura... kugirango"
 
-#: mail/evolution-mail.schemas.in.in.h:37
+#: ../mail/evolution-mail.schemas.in.in.h:37
 #, fuzzy
 msgid "List of protocol names whose license has been accepted."
 msgstr "Bya Porotokole Amazina bya Byemewe"
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: ../mail/evolution-mail.schemas.in.in.h:38
 #, fuzzy
 msgid "Load images for HTML messages over http"
 msgstr "Ishusho kugirango Ubutumwa KURI HTTP"
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: ../mail/evolution-mail.schemas.in.in.h:39
 #, fuzzy
 msgid ""
 "Load images for HTML messages over http(s). Possible values are: 0 - Never "
-"load images off the net 1 - Load images if sender is in the addressbook 2 - "
-"Always load images off the net"
+"load images off the net 1 - Load images in mail from contacts 2 - Always "
+"load images off the net"
 msgstr ""
 "Ishusho kugirango Ubutumwa KURI HTTP S Uduciro 0 Ibirimo Ishusho Bidakora "
 "Cyuzuye 1. Ishusho NIBA Uwohereza ni in 2. Ibirimo Ishusho Bidakora Cyuzuye"
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: ../mail/evolution-mail.schemas.in.in.h:40
 #, fuzzy
 msgid "Log filter actions"
 msgstr "Muyunguruzi..."
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: ../mail/evolution-mail.schemas.in.in.h:41
 #, fuzzy
 msgid "Log filter actions to the specified log file."
 msgstr "Muyunguruzi... Kuri LOG IDOSIYE"
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: ../mail/evolution-mail.schemas.in.in.h:42
 #, fuzzy
 msgid "Logfile to log filter actions"
 msgstr "Kuri LOG Muyunguruzi..."
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: ../mail/evolution-mail.schemas.in.in.h:43
 #, fuzzy
 msgid "Logfile to log filter actions."
 msgstr "Kuri LOG Muyunguruzi..."
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: ../mail/evolution-mail.schemas.in.in.h:44
 #, fuzzy
 msgid "Mark as Seen after specified timeout"
 msgstr "Nka Nyuma Igihe cyarenze:"
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: ../mail/evolution-mail.schemas.in.in.h:45
 #, fuzzy
 msgid "Mark as Seen after specified timeout."
 msgstr "Nka Nyuma Igihe cyarenze:"
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: ../mail/evolution-mail.schemas.in.in.h:46
 #, fuzzy
 msgid "Mark citations in the message \"Preview\""
 msgstr "in Ubutumwa"
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: ../mail/evolution-mail.schemas.in.in.h:47
 #, fuzzy
 msgid "Mark citations in the message \"Preview\"."
 msgstr "in Ubutumwa"
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: ../mail/evolution-mail.schemas.in.in.h:48
 #, fuzzy
 msgid "Message Window default height"
 msgstr "Mburabuzi Ubuhagarike"
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: ../mail/evolution-mail.schemas.in.in.h:49
 #, fuzzy
 msgid "Message Window default width"
 msgstr "Mburabuzi Ubugari"
 
-#: mail/evolution-mail.schemas.in.in.h:50
+#: ../mail/evolution-mail.schemas.in.in.h:50
 #, fuzzy
 msgid "Message-display style (normal, full headers, source)"
 msgstr "Kugaragaza IMISUSIRE Bisanzwe Imitwe Inkomoko"
 
-#: mail/evolution-mail.schemas.in.in.h:51
+#: ../mail/evolution-mail.schemas.in.in.h:51
 #, fuzzy
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Iminsi hagati ku Gusohoka"
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: ../mail/evolution-mail.schemas.in.in.h:52
 #, fuzzy
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "Igihe hagati ku Gusohoka in Iminsi"
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: ../mail/evolution-mail.schemas.in.in.h:53
 #, fuzzy
 msgid "New Mail Notify sound file"
 msgstr "Ijwi IDOSIYE"
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: ../mail/evolution-mail.schemas.in.in.h:54
 #, fuzzy
 msgid "New Mail Notify type"
 msgstr "Ubwoko"
 
-#: mail/evolution-mail.schemas.in.in.h:55
+#: ../mail/evolution-mail.schemas.in.in.h:55
 #, fuzzy
 msgid "Prompt on empty subject"
 msgstr "ku ubusa Ikivugwaho"
 
-#: mail/evolution-mail.schemas.in.in.h:56
+#: ../mail/evolution-mail.schemas.in.in.h:56
 #, fuzzy
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Ukoresha: Ryari: Cyangwa Kuri a Ububiko"
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: ../mail/evolution-mail.schemas.in.in.h:57
 #, fuzzy
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "Ukoresha: Ryari: Cyangwa Kuri Kohereza a Ubutumwa a"
 
-#: mail/evolution-mail.schemas.in.in.h:58
+#: ../mail/evolution-mail.schemas.in.in.h:58
 #, fuzzy
 msgid "Prompt when user expunges"
 msgstr "Ryari: Ukoresha:"
 
-#: mail/evolution-mail.schemas.in.in.h:59
+#: ../mail/evolution-mail.schemas.in.in.h:59
 #, fuzzy
 msgid "Prompt when user only fills Bcc"
 msgstr "Ryari: Ukoresha:"
 
-#: mail/evolution-mail.schemas.in.in.h:60
+#: ../mail/evolution-mail.schemas.in.in.h:60
 #, fuzzy
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "Ryari: Ukoresha: Kuri Gufungura 10 Cyangwa Birenzeho Ubutumwa ku Rimwe"
 
-#: mail/evolution-mail.schemas.in.in.h:61
+#: ../mail/evolution-mail.schemas.in.in.h:61
 #, fuzzy
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
@@ -13344,117 +13556,117 @@ msgstr ""
 "Ryari: Ukoresha: Kuri Kohereza Ubutumwa Kuri Abandikiwe... Gicurasi OYA Kuri "
 "Akira Ubutumwa"
 
-#: mail/evolution-mail.schemas.in.in.h:62
+#: ../mail/evolution-mail.schemas.in.in.h:62
 #, fuzzy
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 "Ryari: Ukoresha: Kuri Kohereza a Ubutumwa Na: Oya Cyangwa Abandikiwe..."
 
-#: mail/evolution-mail.schemas.in.in.h:63
+#: ../mail/evolution-mail.schemas.in.in.h:63
 #, fuzzy
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Ryari: Ukoresha: Kuri Kohereza"
 
-#: mail/evolution-mail.schemas.in.in.h:64
+#: ../mail/evolution-mail.schemas.in.in.h:64
 #, fuzzy
 msgid "Recognize links in text and replace them."
 msgstr "amahuza in Umwandiko Na Gusimbura"
 
-#: mail/evolution-mail.schemas.in.in.h:65
+#: ../mail/evolution-mail.schemas.in.in.h:65
 #, fuzzy
 msgid "Recognize smileys in text and replace them with images."
 msgstr "in Umwandiko Na Gusimbura Na: Ishusho"
 
-#: mail/evolution-mail.schemas.in.in.h:66
+#: ../mail/evolution-mail.schemas.in.in.h:66
 #, fuzzy
 msgid "Run junk test on incoming mail"
 msgstr "Igerageza ku Ubutumwa"
 
-#: mail/evolution-mail.schemas.in.in.h:67
+#: ../mail/evolution-mail.schemas.in.in.h:67
 #, fuzzy
 msgid "Send HTML mail by default"
 msgstr "Ubutumwa ku Mburabuzi"
 
-#: mail/evolution-mail.schemas.in.in.h:68
+#: ../mail/evolution-mail.schemas.in.in.h:68
 #, fuzzy
 msgid "Send HTML mail by default."
 msgstr "Ubutumwa ku Mburabuzi"
 
-#: mail/evolution-mail.schemas.in.in.h:69
+#: ../mail/evolution-mail.schemas.in.in.h:69
 msgid "Show Animations"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:70
+#: ../mail/evolution-mail.schemas.in.in.h:70
 #, fuzzy
 msgid "Show animated images as animations."
 msgstr "Ishusho Nka Amayega"
 
-#: mail/evolution-mail.schemas.in.in.h:71
+#: ../mail/evolution-mail.schemas.in.in.h:71
 #, fuzzy
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Cyasibwe Ubutumwa Na: a Gihinguranya in Ubutumwa Urutonde"
 
-#: mail/evolution-mail.schemas.in.in.h:72
+#: ../mail/evolution-mail.schemas.in.in.h:72
 #, fuzzy
 msgid "Show deleted messages in the message-list"
 msgstr "Cyasibwe Ubutumwa in Ubutumwa Urutonde"
 
-#: mail/evolution-mail.schemas.in.in.h:73
+#: ../mail/evolution-mail.schemas.in.in.h:73
 #, fuzzy
 msgid "Show the \"Preview\" pane"
 msgstr "i"
 
-#: mail/evolution-mail.schemas.in.in.h:74
+#: ../mail/evolution-mail.schemas.in.in.h:74
 #, fuzzy
 msgid "Show the \"Preview\" pane."
 msgstr "i"
 
-#: mail/evolution-mail.schemas.in.in.h:75
+#: ../mail/evolution-mail.schemas.in.in.h:75
 #, fuzzy
 msgid "Sound file to play when new mail arrives."
 msgstr "IDOSIYE Kuri Gukina Ryari: Gishya Ubutumwa"
 
-#: mail/evolution-mail.schemas.in.in.h:76
+#: ../mail/evolution-mail.schemas.in.in.h:76
 #, fuzzy
 msgid "Specifies the type of New Mail Notification the user wishes to use."
 msgstr "Ubwoko Bya Ukoresha: Kuri Gukoresha"
 
-#: mail/evolution-mail.schemas.in.in.h:77
+#: ../mail/evolution-mail.schemas.in.in.h:77
 #, fuzzy
 msgid "Spell check inline"
 msgstr "Kugenzura... Mumurongo"
 
-#: mail/evolution-mail.schemas.in.in.h:78
+#: ../mail/evolution-mail.schemas.in.in.h:78
 #, fuzzy
 msgid "Subscribe dialog default height"
 msgstr "Ikiganiro Mburabuzi Ubuhagarike"
 
-#: mail/evolution-mail.schemas.in.in.h:79
+#: ../mail/evolution-mail.schemas.in.in.h:79
 #, fuzzy
 msgid "Subscribe dialog default width"
 msgstr "Ikiganiro Mburabuzi Ubugari"
 
-#: mail/evolution-mail.schemas.in.in.h:80
+#: ../mail/evolution-mail.schemas.in.in.h:80
 #, fuzzy
 msgid "Terminal font"
 msgstr "Intego- nyuguti"
 
-#: mail/evolution-mail.schemas.in.in.h:81
+#: ../mail/evolution-mail.schemas.in.in.h:81
 #, fuzzy
 msgid "The last time empty trash was run, in days since the epoch."
 msgstr "Iheruka Igihe ubusa Gukoresha in Iminsi guhera"
 
-#: mail/evolution-mail.schemas.in.in.h:82
+#: ../mail/evolution-mail.schemas.in.in.h:82
 #, fuzzy
 msgid "The terminal font for mail display"
 msgstr "Intego- nyuguti kugirango Ubutumwa Kugaragaza"
 
-#: mail/evolution-mail.schemas.in.in.h:83
+#: ../mail/evolution-mail.schemas.in.in.h:83
 #, fuzzy
 msgid "The variable width font for mail display"
 msgstr "IMPINDURAGACIRO Ubugari Intego- nyuguti kugirango Ubutumwa Kugaragaza"
 
-#: mail/evolution-mail.schemas.in.in.h:84
+#: ../mail/evolution-mail.schemas.in.in.h:84
 #, fuzzy
 msgid ""
 "This key should contain a list of XML structures specifying custom headers, "
@@ -13466,241 +13678,233 @@ msgstr ""
 "Umutwempangano Gushyiraho Bikora NIBA Umutwempangano ni Kuri in Ubutumwa "
 "Kureba"
 
-#: mail/evolution-mail.schemas.in.in.h:85
+#: ../mail/evolution-mail.schemas.in.in.h:85
 #, fuzzy
 msgid "Thread the message list."
 msgstr "Ubutumwa Urutonde"
 
-#: mail/evolution-mail.schemas.in.in.h:86
+#: ../mail/evolution-mail.schemas.in.in.h:86
 #, fuzzy
 msgid "Thread the message-list"
 msgstr "Ubutumwa Urutonde"
 
-#: mail/evolution-mail.schemas.in.in.h:87
+#: ../mail/evolution-mail.schemas.in.in.h:87
 #, fuzzy
 msgid "Thread the message-list based on Subject"
 msgstr "Ubutumwa Urutonde ku"
 
-#: mail/evolution-mail.schemas.in.in.h:88
+#: ../mail/evolution-mail.schemas.in.in.h:88
 #, fuzzy
 msgid "Timeout for marking message as Seen"
 msgstr "kugirango Ubutumwa Nka"
 
-#: mail/evolution-mail.schemas.in.in.h:89
+#: ../mail/evolution-mail.schemas.in.in.h:89
 #, fuzzy
 msgid "Timeout for marking message as Seen."
 msgstr "kugirango Ubutumwa Nka"
 
-#: mail/evolution-mail.schemas.in.in.h:90
+#: ../mail/evolution-mail.schemas.in.in.h:90
 #, fuzzy
 msgid "UID string of the default account."
 msgstr "Ikurikiranyanyuguti Bya Mburabuzi Aderesi"
 
-#: mail/evolution-mail.schemas.in.in.h:91
+#: ../mail/evolution-mail.schemas.in.in.h:91
 #, fuzzy
 msgid "Use Spamassassin daemon and client"
 msgstr "Na Umukiriya"
 
-#: mail/evolution-mail.schemas.in.in.h:92
+#: ../mail/evolution-mail.schemas.in.in.h:92
 #, fuzzy
 msgid "Use Spamassassin daemon and client (spamc/spamd)"
 msgstr "Na Umukiriya"
 
-#: mail/evolution-mail.schemas.in.in.h:93
+#: ../mail/evolution-mail.schemas.in.in.h:93
 #, fuzzy
 msgid "Use custom fonts"
 msgstr "Kunoza Imyandikire"
 
-#: mail/evolution-mail.schemas.in.in.h:94
+#: ../mail/evolution-mail.schemas.in.in.h:94
 #, fuzzy
 msgid "Use custom fonts for displaying mail"
 msgstr "Kunoza Imyandikire kugirango Ubutumwa"
 
-#: mail/evolution-mail.schemas.in.in.h:95
+#: ../mail/evolution-mail.schemas.in.in.h:95
 msgid "Use only local spam tests."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:96
+#: ../mail/evolution-mail.schemas.in.in.h:96
 #, fuzzy
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Oya"
 
-#: mail/evolution-mail.schemas.in.in.h:97
+#: ../mail/evolution-mail.schemas.in.in.h:97
 #, fuzzy
 msgid "Variable width font"
 msgstr "Ubugari Intego- nyuguti"
 
-#: mail/evolution-mail.schemas.in.in.h:98
+#: ../mail/evolution-mail.schemas.in.in.h:98
 #, fuzzy
 msgid "View/Bcc menu item is checked"
 msgstr "Ibikubiyemo Ikintu ni Ivivuwe"
 
-#: mail/evolution-mail.schemas.in.in.h:99
+#: ../mail/evolution-mail.schemas.in.in.h:99
 #, fuzzy
 msgid "View/Bcc menu item is checked."
 msgstr "Ibikubiyemo Ikintu ni Ivivuwe"
 
-#: mail/evolution-mail.schemas.in.in.h:100
+#: ../mail/evolution-mail.schemas.in.in.h:100
 #, fuzzy
 msgid "View/Cc menu item is checked"
 msgstr "Ibikubiyemo Ikintu ni Ivivuwe"
 
-#: mail/evolution-mail.schemas.in.in.h:101
+#: ../mail/evolution-mail.schemas.in.in.h:101
 #, fuzzy
 msgid "View/Cc menu item is checked."
 msgstr "Ibikubiyemo Ikintu ni Ivivuwe"
 
-#: mail/evolution-mail.schemas.in.in.h:102
+#: ../mail/evolution-mail.schemas.in.in.h:102
 #, fuzzy
 msgid "View/From menu item is checked"
 msgstr "Ibikubiyemo Ikintu ni Ivivuwe"
 
-#: mail/evolution-mail.schemas.in.in.h:103
+#: ../mail/evolution-mail.schemas.in.in.h:103
 #, fuzzy
 msgid "View/From menu item is checked."
 msgstr "Ibikubiyemo Ikintu ni Ivivuwe"
 
-#: mail/evolution-mail.schemas.in.in.h:104
+#: ../mail/evolution-mail.schemas.in.in.h:104
 #, fuzzy
 msgid "View/PostTo menu item is checked"
 msgstr "Ibikubiyemo Ikintu ni Ivivuwe"
 
-#: mail/evolution-mail.schemas.in.in.h:105
+#: ../mail/evolution-mail.schemas.in.in.h:105
 #, fuzzy
 msgid "View/PostTo menu item is checked."
 msgstr "Ibikubiyemo Ikintu ni Ivivuwe"
 
-#: mail/evolution-mail.schemas.in.in.h:106
+#: ../mail/evolution-mail.schemas.in.in.h:106
 #, fuzzy
 msgid "View/ReplyTo menu item is checked"
 msgstr "Ibikubiyemo Ikintu ni Ivivuwe"
 
-#: mail/evolution-mail.schemas.in.in.h:107
+#: ../mail/evolution-mail.schemas.in.in.h:107
 #, fuzzy
 msgid "View/ReplyTo menu item is checked."
 msgstr "Ibikubiyemo Ikintu ni Ivivuwe"
 
-#: mail/evolution-mail.schemas.in.in.h:108
+#: ../mail/evolution-mail.schemas.in.in.h:108
 #, fuzzy
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
 msgstr "Cyangwa OYA Kuri Inyuma ku ku Ryari: Ubutumwa OYA Cyangwa Imitwe"
 
-#: mail/evolution-mail.schemas.in.in.h:109
-#, fuzzy
-msgid "port for starting user runned spamd"
-msgstr "Umuyoboro kugirango Ukoresha:"
-
-#: mail/evolution-mail.schemas.in.in.h:110
-#, fuzzy
-msgid "spamd port"
-msgstr "Umuyoboro"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
+#: ../mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
 msgid "Evolution Elm importer"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
+#: ../mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
 #, fuzzy
 msgid "Evolution Netscape Mail importer"
 msgstr "Netscape"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+#: ../mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
 #, fuzzy
 msgid "Evolution Outlook Express 4 importer"
 msgstr "4."
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+#: ../mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
 msgid "Evolution Pine importer"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+#: ../mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
 msgid "Evolution mbox importer"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
+#: ../mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
 msgid "MBox (mbox)"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
+#: ../mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
 #, fuzzy
 msgid "Outlook Express 4 (.mbx)"
 msgstr "4."
 
-#: mail/importers/elm-importer.c:88
+#: ../mail/importers/elm-importer.c:88
 #, fuzzy
 msgid "Evolution is importing your old Elm mail"
 msgstr "ni Kuzaza ki/ bishaje Ubutumwa"
 
 # sc/source\ui\src\globstr.src:RID_GLOBSTR.STR_UNDO_IMPORTDATA.text
-#: mail/importers/elm-importer.c:89
-#: mail/importers/evolution-mbox-importer.c:225
-#: mail/importers/evolution-outlook-importer.c:259
-#: mail/importers/netscape-importer.c:1251 mail/importers/pine-importer.c:117
+#: ../mail/importers/elm-importer.c:89
+#: ../mail/importers/evolution-mbox-importer.c:225
+#: ../mail/importers/evolution-outlook-importer.c:259
+#: ../mail/importers/netscape-importer.c:1251
+#: ../mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr "Kuvana hanze..."
 
 # padmin/source\padialog.src:RID_PROGRESS_DLG.text
-#: mail/importers/elm-importer.c:91
-#: mail/importers/evolution-mbox-importer.c:227
-#: mail/importers/evolution-outlook-importer.c:261
-#: mail/importers/netscape-importer.c:1253 mail/importers/pine-importer.c:119
+#: ../mail/importers/elm-importer.c:91
+#: ../mail/importers/evolution-mbox-importer.c:227
+#: ../mail/importers/evolution-outlook-importer.c:261
+#: ../mail/importers/netscape-importer.c:1253
+#: ../mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Ba wihanganye"
 
-#: mail/importers/elm-importer.c:244
+#: ../mail/importers/elm-importer.c:244
 #, fuzzy
 msgid "Importing Elm data"
 msgstr "Ibyatanzwe"
 
-#: mail/importers/elm-importer.c:436
+#: ../mail/importers/elm-importer.c:436
 #, fuzzy
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
 msgstr "Byabonetse Ubutumwa nka Kuri Kuzana"
 
-#: mail/importers/elm-importer.c:444
+#: ../mail/importers/elm-importer.c:444
 msgid "Elm"
 msgstr ""
 
-#: mail/importers/evolution-mbox-importer.c:117
-#: mail/importers/evolution-outlook-importer.c:131
+#: ../mail/importers/evolution-mbox-importer.c:117
+#: ../mail/importers/evolution-outlook-importer.c:131
 #, fuzzy
 msgid "Destination folder:"
 msgstr "Ububiko"
 
-#: mail/importers/evolution-mbox-importer.c:120
-#: mail/importers/evolution-outlook-importer.c:134
+#: ../mail/importers/evolution-mbox-importer.c:120
+#: ../mail/importers/evolution-outlook-importer.c:134
 #, fuzzy
 msgid "Select folder to import into"
 msgstr "Ububiko Kuri Kuzana"
 
 # sc/source\ui\src\globstr.src:RID_GLOBSTR.STR_UNDO_IMPORTDATA.text
-#: mail/importers/evolution-mbox-importer.c:223
-#: mail/importers/evolution-outlook-importer.c:257
-#: mail/importers/mail-importer.c:226
+#: ../mail/importers/evolution-mbox-importer.c:223
+#: ../mail/importers/evolution-outlook-importer.c:257
+#: ../mail/importers/mail-importer.c:226
 #, fuzzy, c-format
 msgid "Importing `%s'"
 msgstr "Kuzaza"
 
-#: mail/importers/evolution-outlook-importer.c:305
-#: mail/importers/mail-importer.c:140
+#: ../mail/importers/evolution-outlook-importer.c:305
+#: ../mail/importers/mail-importer.c:140
 msgid "Importing mailbox"
 msgstr ""
 
-#: mail/importers/mail-importer.c:363
+#: ../mail/importers/mail-importer.c:363
 #, c-format
 msgid "Scanning %s"
 msgstr ""
 
-#: mail/importers/netscape-importer.c:73
+#: ../mail/importers/netscape-importer.c:73
 #, c-format
 msgid "Priority Filter \"%s\""
 msgstr ""
 
-#: mail/importers/netscape-importer.c:662
+#: ../mail/importers/netscape-importer.c:662
 #, fuzzy
 msgid ""
 "Some of your Netscape email filters are based on\n"
@@ -13719,7 +13923,7 @@ msgstr ""
 "Gushyiraho Bya Muyunguruzi Kyongewe imeli Na Muyunguruzi Gukoresha cyavuye "
 "ahandi/ cyatumijwe Muyunguruzi Kuri Ubwoko Nka"
 
-#: mail/importers/netscape-importer.c:686
+#: ../mail/importers/netscape-importer.c:686
 #, fuzzy
 msgid ""
 "Some of your Netscape email filters use\n"
@@ -13728,7 +13932,7 @@ msgid ""
 "These filters will be dropped."
 msgstr "Bya Netscape imeli Muyunguruzi Cyangwa ni OYA in Muyunguruzi"
 
-#: mail/importers/netscape-importer.c:703
+#: ../mail/importers/netscape-importer.c:703
 #, fuzzy
 msgid ""
 "Some of your Netscape email filters test the\n"
@@ -13741,25 +13945,25 @@ msgstr ""
 "Ikurikiranyanyuguti ni OYA in Byahinduwe Kuri Igerageza Ikurikiranyanyuguti "
 "ni Cyangwa ni in Ubutumwa"
 
-#: mail/importers/netscape-importer.c:1250
+#: ../mail/importers/netscape-importer.c:1250
 #, fuzzy
 msgid "Evolution is importing your old Netscape data"
 msgstr "ni Kuzaza ki/ bishaje Netscape Ibyatanzwe"
 
-#: mail/importers/netscape-importer.c:1707
+#: ../mail/importers/netscape-importer.c:1707
 #, fuzzy
 msgid "Importing Netscape data"
 msgstr "Netscape Ibyatanzwe"
 
-#: mail/importers/netscape-importer.c:1907
+#: ../mail/importers/netscape-importer.c:1907
 msgid "Settings"
 msgstr "Amagenamiterere"
 
-#: mail/importers/netscape-importer.c:1912
+#: ../mail/importers/netscape-importer.c:1912
 msgid "Mail Filters"
 msgstr ""
 
-#: mail/importers/netscape-importer.c:1933
+#: ../mail/importers/netscape-importer.c:1933
 #, fuzzy
 msgid ""
 "Evolution has found Netscape mail files.\n"
@@ -13767,346 +13971,352 @@ msgid ""
 msgstr ""
 "Byabonetse Netscape Ubutumwa Idosiye nka Kuri cyavuye ahandi/ cyatumijwe"
 
-#: mail/importers/pine-importer.c:116
+#: ../mail/importers/pine-importer.c:116
 #, fuzzy
 msgid "Evolution is importing your old Pine data"
 msgstr "ni Kuzaza ki/ bishaje Ibyatanzwe"
 
-#: mail/importers/pine-importer.c:314
+#: ../mail/importers/pine-importer.c:314
 #, fuzzy
 msgid "Importing Pine data"
 msgstr "Ibyatanzwe"
 
-#: mail/importers/pine-importer.c:498
+#: ../mail/importers/pine-importer.c:498
 #, fuzzy
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
 msgstr "Byabonetse Ubutumwa Idosiye nka Kuri Kuzana"
 
-#: mail/importers/pine-importer.c:506
+#: ../mail/importers/pine-importer.c:506
 msgid "Pine"
 msgstr ""
 
-#: mail/mail-autofilter.c:75
+#: ../mail/mail-autofilter.c:78
 #, fuzzy, c-format
 msgid "Mail to %s"
 msgstr "Kuri"
 
-#: mail/mail-autofilter.c:239 mail/mail-autofilter.c:278
+#: ../mail/mail-autofilter.c:242 ../mail/mail-autofilter.c:281
 #, fuzzy, c-format
 msgid "Mail from %s"
 msgstr "Bivuye"
 
-#: mail/mail-autofilter.c:262
+#: ../mail/mail-autofilter.c:265
 #, fuzzy, c-format
 msgid "Subject is %s"
 msgstr "ni"
 
-#: mail/mail-autofilter.c:297
+#: ../mail/mail-autofilter.c:300
 #, fuzzy, c-format
 msgid "%s mailing list"
 msgstr "%sUrutonde"
 
-#: mail/mail-autofilter.c:366
+#: ../mail/mail-autofilter.c:369
 msgid "Add Filter Rule"
 msgstr ""
 
-#: mail/mail-component.c:505
+#: ../mail/mail-component.c:506
 #, fuzzy, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%dCyasibwe"
 
-#: mail/mail-component.c:507
+#: ../mail/mail-component.c:508
 #, fuzzy, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%dUmwanda"
 
-#: mail/mail-component.c:530
+#: ../mail/mail-component.c:531
 #, fuzzy, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%dInyandiko y'agateganyo"
 
-#: mail/mail-component.c:532
+#: ../mail/mail-component.c:533
 #, fuzzy, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%dYoherejwe:"
 
-#: mail/mail-component.c:534
+#: ../mail/mail-component.c:535
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] ""
 msgstr[1] ""
 
-#: mail/mail-component.c:538
+#: ../mail/mail-component.c:539
 #, fuzzy, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%dIgiteranyo"
 
-#: mail/mail-component.c:540
+#: ../mail/mail-component.c:541
 #, fuzzy, c-format
 msgid ", %d unread"
 msgid_plural ", %d unread"
 msgstr[0] ",%dBidasomye"
 
-#: mail/mail-component.c:722
+#: ../mail/mail-component.c:761
 msgid "New Mail Message"
 msgstr ""
 
-#: mail/mail-component.c:723
+#: ../mail/mail-component.c:762
 msgid "_Mail Message"
 msgstr ""
 
-#: mail/mail-component.c:724
+#: ../mail/mail-component.c:763
 #, fuzzy
 msgid "Compose a new mail message"
 msgstr "a Gishya Ubutumwa Ubutumwa"
 
-#: mail/mail-component.c:730
+#: ../mail/mail-component.c:769
 msgid "New Mail Folder"
 msgstr ""
 
-#: mail/mail-component.c:731
+#: ../mail/mail-component.c:770
 msgid "Mail _Folder"
 msgstr ""
 
-#: mail/mail-component.c:732
+#: ../mail/mail-component.c:771
 #, fuzzy
 msgid "Create a new mail folder"
 msgstr "a Gishya Ubutumwa Ububiko"
 
-#: mail/mail-component.c:879
+#: ../mail/mail-component.c:893
 #, fuzzy
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Amagenamiterere Cyangwa"
 
-#: mail/mail-config.glade.h:1 mail/mail-dialogs.glade.h:1
+#: ../mail/mail-config.glade.h:1 ../mail/mail-dialogs.glade.h:1
 msgid "    "
 msgstr ""
 
-#: mail/mail-config.glade.h:2
+#: ../mail/mail-config.glade.h:2
 #, fuzzy
 msgid " Ch_eck for Supported Types "
 msgstr "kugirango"
 
-#: mail/mail-config.glade.h:4
+#: ../mail/mail-config.glade.h:4
 #, fuzzy
 msgid "<b>SSL is not supported in this build of Evolution</b>"
 msgstr "<B ni OYA in iyi Bya B"
 
-#: mail/mail-config.glade.h:5
+#: ../mail/mail-config.glade.h:5
 #, fuzzy
 msgid "<b>S_ignatures</b>"
 msgstr "<B B"
 
-#: mail/mail-config.glade.h:6
+#: ../mail/mail-config.glade.h:6
 #, fuzzy
 msgid "<b>_Languages</b>"
 msgstr "<B B"
 
-#: mail/mail-config.glade.h:7
+#: ../mail/mail-config.glade.h:7
 #, fuzzy
 msgid "<small>This will make the the filter more reliable, but slower</small>"
 msgstr "<Gitoya Ubwoko Muyunguruzi... Birenzeho Gitoya"
 
-#: mail/mail-config.glade.h:8
+#: ../mail/mail-config.glade.h:8
 #, fuzzy
 msgid "<span weight=\"bold\">Account Information</span>"
 msgstr "<Uburemere UTSINDAGIYE"
 
-#: mail/mail-config.glade.h:9
+#: ../mail/mail-config.glade.h:9
 #, fuzzy
 msgid "<span weight=\"bold\">Alerts</span>"
 msgstr "<Uburemere UTSINDAGIYE"
 
-#: mail/mail-config.glade.h:10
+#: ../mail/mail-config.glade.h:10
 #, fuzzy
 msgid "<span weight=\"bold\">Authentication Type</span>"
 msgstr "<Uburemere UTSINDAGIYE"
 
-#: mail/mail-config.glade.h:11
+#: ../mail/mail-config.glade.h:11
 #, fuzzy
 msgid "<span weight=\"bold\">Authentication</span>"
 msgstr "<Uburemere UTSINDAGIYE"
 
-#: mail/mail-config.glade.h:12
+#: ../mail/mail-config.glade.h:12
 #, fuzzy
 msgid "<span weight=\"bold\">Composing Messages</span>"
 msgstr "<Uburemere UTSINDAGIYE"
 
-#: mail/mail-config.glade.h:13
+#: ../mail/mail-config.glade.h:13
 #, fuzzy
 msgid "<span weight=\"bold\">Configuration</span>"
 msgstr "<Uburemere UTSINDAGIYE"
 
-#: mail/mail-config.glade.h:14
+#: ../mail/mail-config.glade.h:14
 #, fuzzy
 msgid "<span weight=\"bold\">Default Behavior</span>"
 msgstr "<Uburemere UTSINDAGIYE"
 
-#: mail/mail-config.glade.h:15
+#: ../mail/mail-config.glade.h:15
 #, fuzzy
 msgid "<span weight=\"bold\">Delete Mail</span>"
 msgstr "<Uburemere UTSINDAGIYE"
 
-#: mail/mail-config.glade.h:16
+#: ../mail/mail-config.glade.h:16
 #, fuzzy
 msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
 msgstr "<Uburemere UTSINDAGIYE"
 
-#: mail/mail-config.glade.h:17
+#: ../mail/mail-config.glade.h:17
 #, fuzzy
 msgid "<span weight=\"bold\">Filter Options</span>"
 msgstr "<Uburemere UTSINDAGIYE"
 
-#: mail/mail-config.glade.h:18 plugins/itip-formatter/itip-formatter.c:1681
+#: ../mail/mail-config.glade.h:18
+#: ../plugins/itip-formatter/itip-formatter.c:1833
 #, fuzzy
 msgid "<span weight=\"bold\">General</span>"
 msgstr "<Uburemere UTSINDAGIYE"
 
-#: mail/mail-config.glade.h:19
+#: ../mail/mail-config.glade.h:19
 #, fuzzy
 msgid "<span weight=\"bold\">Labels and Colors</span>"
 msgstr "<Uburemere UTSINDAGIYE Na"
 
-#: mail/mail-config.glade.h:20
+#: ../mail/mail-config.glade.h:20
 #, fuzzy
 msgid "<span weight=\"bold\">Loading Images</span>"
 msgstr "<Uburemere UTSINDAGIYE"
 
-#: mail/mail-config.glade.h:21
+#: ../mail/mail-config.glade.h:21
 #, fuzzy
 msgid "<span weight=\"bold\">Message Display</span>"
 msgstr "<Uburemere UTSINDAGIYE"
 
-#: mail/mail-config.glade.h:22
+#: ../mail/mail-config.glade.h:22
 #, fuzzy
 msgid "<span weight=\"bold\">Message Fonts</span>"
 msgstr "<Uburemere UTSINDAGIYE"
 
-#: mail/mail-config.glade.h:23
+#: ../mail/mail-config.glade.h:23
+#, fuzzy
+msgid "<span weight=\"bold\">Message Receipts</span>"
+msgstr "<Uburemere UTSINDAGIYE"
+
+#: ../mail/mail-config.glade.h:24
 #, fuzzy
 msgid "<span weight=\"bold\">New Mail Notification</span>"
 msgstr "<Uburemere UTSINDAGIYE"
 
-#: mail/mail-config.glade.h:24
+#: ../mail/mail-config.glade.h:25
 #, fuzzy
 msgid "<span weight=\"bold\">Optional Information</span>"
 msgstr "<Uburemere UTSINDAGIYE"
 
-#: mail/mail-config.glade.h:25
+#: ../mail/mail-config.glade.h:26
 #, fuzzy
 msgid "<span weight=\"bold\">Options</span>"
 msgstr "<Uburemere UTSINDAGIYE"
 
-#: mail/mail-config.glade.h:26
+#: ../mail/mail-config.glade.h:27
 #, fuzzy
 msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
 msgstr "<Uburemere UTSINDAGIYE"
 
-#: mail/mail-config.glade.h:27
+#: ../mail/mail-config.glade.h:28
 #, fuzzy
 msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr "<Uburemere UTSINDAGIYE"
 
-#: mail/mail-config.glade.h:28
+#: ../mail/mail-config.glade.h:29
 #, fuzzy
 msgid "<span weight=\"bold\">Required Information</span>"
 msgstr "<Uburemere UTSINDAGIYE"
 
-#: mail/mail-config.glade.h:29
+#: ../mail/mail-config.glade.h:30
 #, fuzzy
 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 msgstr "<Uburemere UTSINDAGIYE"
 
-#: mail/mail-config.glade.h:30
+#: ../mail/mail-config.glade.h:31
 #, fuzzy
 msgid "<span weight=\"bold\">Security</span>"
 msgstr "<Uburemere UTSINDAGIYE"
 
-#: mail/mail-config.glade.h:31
+#: ../mail/mail-config.glade.h:32
 #, fuzzy
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
 msgstr "<Uburemere UTSINDAGIYE Na"
 
-#: mail/mail-config.glade.h:32
+#: ../mail/mail-config.glade.h:33
 #, fuzzy
 msgid "<span weight=\"bold\">Server Configuration</span>"
 msgstr "<Uburemere UTSINDAGIYE"
 
-#: mail/mail-config.glade.h:34
+#: ../mail/mail-config.glade.h:35
 msgid "Account Management"
 msgstr ""
 
-#: mail/mail-config.glade.h:35
+#: ../mail/mail-config.glade.h:36
 msgid "Add Ne_w Signature..."
 msgstr ""
 
-#: mail/mail-config.glade.h:36
+#: ../mail/mail-config.glade.h:37
 msgid "Add _Script"
 msgstr ""
 
-#: mail/mail-config.glade.h:37
+#: ../mail/mail-config.glade.h:38
 #, fuzzy
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr "IKIMENYETSO Ubutumwa Ryari: ikoresha iyi Aderesi"
 
-#: mail/mail-config.glade.h:38
+#: ../mail/mail-config.glade.h:39
 #, fuzzy
 msgid "Also encrypt to sel_f when sending encrypted mail"
 msgstr "Shyiraho Umutekano Kuri Ryari: Bishunzwe: Ubutumwa"
 
-#: mail/mail-config.glade.h:39
+#: ../mail/mail-config.glade.h:40
 #, fuzzy
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "Gukoporora KopiKubandi Kuri"
 
-#: mail/mail-config.glade.h:40
+#: ../mail/mail-config.glade.h:41
 #, fuzzy
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Gukoporora BCC Kuri"
 
-#: mail/mail-config.glade.h:41
+#: ../mail/mail-config.glade.h:42
 #, fuzzy
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Utubuto in Ryari:"
 
-#: mail/mail-config.glade.h:42
+#: ../mail/mail-config.glade.h:43
 #, fuzzy
 msgid "Always encrypt to _myself when sending encrypted mail"
 msgstr "Shyiraho Umutekano Kuri Ryari: Bishunzwe: Ubutumwa"
 
-#: mail/mail-config.glade.h:43
+#: ../mail/mail-config.glade.h:44
 #, fuzzy
 msgid "Attach original message"
 msgstr "Umwimerere Ubutumwa"
 
 # 361
-#: mail/mail-config.glade.h:44 mail/message-list.etspec.h:1
+#: ../mail/mail-config.glade.h:45 ../mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "umugereka"
 
-#: mail/mail-config.glade.h:45
+#: ../mail/mail-config.glade.h:46
 #, fuzzy
 msgid "Automatically _insert smiley images"
 msgstr "Kongeramo Ishusho"
 
-#: mail/mail-config.glade.h:46
+#: ../mail/mail-config.glade.h:47
 msgid "Baltic (ISO-8859-13)"
 msgstr "Balitiki (ISO-8859-13)"
 
 # svx/source\dialog\txenctab.src:RID_SVXSTR_TEXTENCODING_TABLE.13.text
-#: mail/mail-config.glade.h:47
+#: ../mail/mail-config.glade.h:48
 msgid "Baltic (ISO-8859-4)"
 msgstr "Nyabaritiki (ISO-8859-4)"
 
-#: mail/mail-config.glade.h:48
+#: ../mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Beep w_hen new mail arrives"
 msgstr "Ryari: Gishya Ubutumwa"
@@ -14116,57 +14326,57 @@ msgstr "Ryari: Gishya Ubutumwa"
 # #-#-#-#-#  dbaccess.pot (Gnome 2.12)  #-#-#-#-#
 # #-#-#-#-#  dbaccess.pot (Gnome 2.12)  #-#-#-#-#
 # #-#-#-#-#  dbaccess.pot (Gnome 2.12)  #-#-#-#-#
-#: mail/mail-config.glade.h:49
+#: ../mail/mail-config.glade.h:50
 #, fuzzy
 msgid "C_haracter set:"
 msgstr "Ishyirahamwe ry'Inyuguti"
 
-#: mail/mail-config.glade.h:50
+#: ../mail/mail-config.glade.h:51
 #, fuzzy
 msgid "Ch_eck for Supported Types "
 msgstr "kugirango"
 
-#: mail/mail-config.glade.h:51
+#: ../mail/mail-config.glade.h:52
 #, fuzzy
 msgid "Check _incoming mail for junk"
 msgstr "Ubutumwa kugirango"
 
-#: mail/mail-config.glade.h:52
+#: ../mail/mail-config.glade.h:53
 #, fuzzy
 msgid "Check spelling while I _type"
 msgstr "Ivuganyuguti Ubwoko"
 
-#: mail/mail-config.glade.h:53
+#: ../mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Checks incoming mail messages to be Junk"
 msgstr "Ubutumwa Ubutumwa Kuri"
 
-#: mail/mail-config.glade.h:54
+#: ../mail/mail-config.glade.h:55
 #, fuzzy
 msgid "Cle_ar"
 msgstr "Gusiba"
 
-#: mail/mail-config.glade.h:55
+#: ../mail/mail-config.glade.h:56
 #, fuzzy
 msgid "Clea_r"
 msgstr "Gusiba"
 
-#: mail/mail-config.glade.h:56
+#: ../mail/mail-config.glade.h:57
 #, fuzzy
 msgid "Color for _misspelled words:"
 msgstr "kugirango Amagambo"
 
 # offmgr/source\offapp\dialog\treeopt.src:RID_OFADLG_OPTIONS_TREE_PAGES.SID_GENERAL_OPTIONS.9.text
-#: mail/mail-config.glade.h:57
+#: ../mail/mail-config.glade.h:58
 msgid "Colors"
 msgstr "Amabara"
 
-#: mail/mail-config.glade.h:58
+#: ../mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Confirm _when expunging a folder"
 msgstr "Ryari: a Ububiko"
 
-#: mail/mail-config.glade.h:59
+#: ../mail/mail-config.glade.h:60
 #, fuzzy
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
@@ -14179,74 +14389,74 @@ msgstr ""
 "Nibyiza Ubutumwa Iboneza ni Byuzuye NONEAHA Cyiteguye Kuri Kohereza Na Akira "
 "imeli ikoresha Kuri Kubika Amagenamiterere"
 
-#: mail/mail-config.glade.h:65
+#: ../mail/mail-config.glade.h:66
 #, fuzzy
 msgid "De_fault"
 msgstr "Mburabuzi"
 
-#: mail/mail-config.glade.h:66
+#: ../mail/mail-config.glade.h:67
 #, fuzzy
 msgid "Default character e_ncoding:"
 msgstr "Imisobekere y'Inyuguti Mburabuzi:"
 
-#: mail/mail-config.glade.h:69
+#: ../mail/mail-config.glade.h:70
 #, fuzzy
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr "IKIMENYETSO Ubutumwa ku Mburabuzi"
 
-#: mail/mail-config.glade.h:70
+#: ../mail/mail-config.glade.h:71
 #, fuzzy
 msgid "Do not quote original message"
 msgstr "OYA Gushyiraho akugarizo Umwimerere Ubutumwa"
 
 # Statusbar
-#: mail/mail-config.glade.h:71 shell/evolution-startup-wizard.glade.h:1
+#: ../mail/mail-config.glade.h:72
 msgid "Done"
 msgstr "Byakozwe"
 
-#: mail/mail-config.glade.h:72
+#: ../mail/mail-config.glade.h:73
 msgid "Drafts _Folder:"
 msgstr ""
 
-#: mail/mail-config.glade.h:74
+#: ../mail/mail-config.glade.h:75
 msgid "Email Accounts"
 msgstr ""
 
-#: mail/mail-config.glade.h:75
+#: ../mail/mail-config.glade.h:76
 #, fuzzy
 msgid "Email _Address:"
 msgstr "Aderesi ya imeli:"
 
-#: mail/mail-config.glade.h:76
+#: ../mail/mail-config.glade.h:77
 #, fuzzy
 msgid "Empty trash folders on e_xit"
 msgstr "ku Gusohoka"
 
-#: mail/mail-config.glade.h:77
+#: ../mail/mail-config.glade.h:78
 #, fuzzy
 msgid "Encry_ption certificate:"
 msgstr "Impamyabushobozi"
 
-#: mail/mail-config.glade.h:78
+#: ../mail/mail-config.glade.h:79
 #, fuzzy
 msgid "Encrypt out_going messages (by default)"
 msgstr "Ubutumwa ku Mburabuzi"
 
-#: mail/mail-config.glade.h:80
+#: ../mail/mail-config.glade.h:81
 msgid "Execute Command..."
 msgstr ""
 
 # sc/source\ui\dbgui\asciiopt.src:RID_SCDLG_ASCII.RB_FIXED.text
-#: mail/mail-config.glade.h:81
+#: ../mail/mail-config.glade.h:82
 #, fuzzy
 msgid "Fi_xed-width:"
 msgstr "Ubugari budahinduka"
 
-#: mail/mail-config.glade.h:82
+#: ../mail/mail-config.glade.h:83
 msgid "Font Properties"
 msgstr ""
 
-#: mail/mail-config.glade.h:83
+#: ../mail/mail-config.glade.h:84
 #, fuzzy
 msgid "Format messages in _HTML"
 msgstr "Ubutumwa in"
@@ -14254,72 +14464,72 @@ msgstr "Ubutumwa in"
 # VCARD_LDAP_USEHTML
 # # @name VCARD_LDAP_USEHTML
 # # @loc None
-#: mail/mail-config.glade.h:85
+#: ../mail/mail-config.glade.h:86
 msgid "HTML Mail"
 msgstr "Ibaruwa ya HTML"
 
 # sc/source\ui\pagedlg\hfedtdlg.src:RID_SCDLG_HFED_HEADER.text
-#: mail/mail-config.glade.h:86
+#: ../mail/mail-config.glade.h:87
 msgid "Headers"
 msgstr "Imitwe"
 
-#: mail/mail-config.glade.h:87
+#: ../mail/mail-config.glade.h:88
 #, fuzzy
 msgid "Highlight _quotations with"
 msgstr "Isubiramo ry'ibyavuzwe Na:"
 
-#: mail/mail-config.glade.h:88
+#: ../mail/mail-config.glade.h:89
 msgid "I_nclude remote tests"
 msgstr ""
 
-#: mail/mail-config.glade.h:91
+#: ../mail/mail-config.glade.h:92
 #, fuzzy
 msgid "Inline"
 msgstr "Mumurongo"
 
-#: mail/mail-config.glade.h:93
+#: ../mail/mail-config.glade.h:94
 msgid "Languages Table"
 msgstr ""
 
-#: mail/mail-config.glade.h:95
+#: ../mail/mail-config.glade.h:96
 msgid "Mail Configuration"
 msgstr ""
 
-#: mail/mail-config.glade.h:96
+#: ../mail/mail-config.glade.h:97
 msgid "Mail Headers Table"
 msgstr ""
 
-#: mail/mail-config.glade.h:98
+#: ../mail/mail-config.glade.h:99
 #, fuzzy
 msgid "Mailbox location"
 msgstr "Ahantu"
 
-#: mail/mail-config.glade.h:99
+#: ../mail/mail-config.glade.h:100
 msgid "Message Composer"
 msgstr ""
 
-#: mail/mail-config.glade.h:100
+#: ../mail/mail-config.glade.h:101
 #, fuzzy
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr "OYA kugirango a Ijambobanga... Kwihuza kugirango Itangira Igihe"
 
-#: mail/mail-config.glade.h:101
+#: ../mail/mail-config.glade.h:102
 #, fuzzy
 msgid "Or_ganization:"
 msgstr "Ikigo:"
 
-#: mail/mail-config.glade.h:102
+#: ../mail/mail-config.glade.h:103
 msgid "PGP/GPG _Key ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:105
+#: ../mail/mail-config.glade.h:106
 #, fuzzy
 msgid "Play sound file when new mail arri_ves"
 msgstr "Ijwi IDOSIYE Ryari: Gishya Ubutumwa"
 
-#: mail/mail-config.glade.h:106
+#: ../mail/mail-config.glade.h:107
 #, fuzzy
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
@@ -14328,7 +14538,7 @@ msgstr ""
 "Injiza a Izina: kugirango iyi Aderesi in Umwanya munsi Izina: kugirango "
 "Kugaragaza Impamvu"
 
-#: mail/mail-config.glade.h:108
+#: ../mail/mail-config.glade.h:109
 #, fuzzy
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
@@ -14337,7 +14547,7 @@ msgstr ""
 "Injiza Ibisobanuro Ibyerekeye Kohereza Ubutumwa OYA Sisitemu umuyobozi/ "
 "uyobora Cyangwa"
 
-#: mail/mail-config.glade.h:109
+#: ../mail/mail-config.glade.h:110
 #, fuzzy
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
@@ -14347,36 +14557,36 @@ msgstr ""
 "Injiza Izina: Na imeli Aderesi munsi Bitari ngombwa Imyanya munsi OYA Kuri "
 "Byuzuye in Kuri Gushyiramo iyi Ibisobanuro in imeli Kohereza"
 
-#: mail/mail-config.glade.h:110
+#: ../mail/mail-config.glade.h:111
 #, fuzzy
 msgid "Please select among the following options"
 msgstr "Guhitamo Amahitamo"
 
-#: mail/mail-config.glade.h:111
+#: ../mail/mail-config.glade.h:112
 #, fuzzy
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Ryari: Ubutumwa Na: Abandikiwe..."
 
-#: mail/mail-config.glade.h:112
+#: ../mail/mail-config.glade.h:113
 #, fuzzy
 msgid "Quote original message"
 msgstr "Umwimerere Ubutumwa"
 
-#: mail/mail-config.glade.h:113
+#: ../mail/mail-config.glade.h:114
 msgid "Quoted"
 msgstr ""
 
-#: mail/mail-config.glade.h:114
+#: ../mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Re_member password"
 msgstr "Kwibuka ijambobanga"
 
-#: mail/mail-config.glade.h:115
+#: ../mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Re_ply-To:"
 msgstr "Subiza- Kuri:"
 
-#: mail/mail-config.glade.h:117
+#: ../mail/mail-config.glade.h:118
 #, fuzzy
 msgid "Remember _password"
 msgstr "Kwibuka ijambobanga"
@@ -14385,12 +14595,12 @@ msgstr "Kwibuka ijambobanga"
 # sc/source\ui\src\menue.src:SCCFG_PLUGINMENU.SUBMENU_EDIT.SUBMENU_EDIT_TABLE.SID_SELECT_TABLES.text
 # #-#-#-#-#  sc.pot (Gnome 2.12)  #-#-#-#-#
 # sc/source\ui\src\menue.src:SCCFG_MENUBAR.SUBMENU_EDIT.SUBMENU_EDIT_TABLE.SID_SELECT_TABLES.text
-#: mail/mail-config.glade.h:118
+#: ../mail/mail-config.glade.h:119
 #, fuzzy
 msgid "S_elect..."
 msgstr "Guhitamo..."
 
-#: mail/mail-config.glade.h:119
+#: ../mail/mail-config.glade.h:120
 msgid "S_tandard Font:"
 msgstr ""
 
@@ -14398,93 +14608,99 @@ msgstr ""
 # sc/source\ui\src\menue.src:SCCFG_PLUGINMENU.SUBMENU_EDIT.SUBMENU_EDIT_TABLE.SID_SELECT_TABLES.text
 # #-#-#-#-#  sc.pot (Gnome 2.12)  #-#-#-#-#
 # sc/source\ui\src\menue.src:SCCFG_MENUBAR.SUBMENU_EDIT.SUBMENU_EDIT_TABLE.SID_SELECT_TABLES.text
-#: mail/mail-config.glade.h:120
+#: ../mail/mail-config.glade.h:121
 #, fuzzy
 msgid "Se_lect..."
 msgstr "Guhitamo..."
 
-#: mail/mail-config.glade.h:122
+#: ../mail/mail-config.glade.h:123
 #, fuzzy
 msgid "Select HTML fixed width font"
 msgstr "BIHAMYE Ubugari Intego- nyuguti"
 
-#: mail/mail-config.glade.h:123
+#: ../mail/mail-config.glade.h:124
 #, fuzzy
 msgid "Select HTML fixed width font for printing"
 msgstr "BIHAMYE Ubugari Intego- nyuguti kugirango Icapa..."
 
-#: mail/mail-config.glade.h:124
+#: ../mail/mail-config.glade.h:125
 #, fuzzy
 msgid "Select HTML variable width font"
 msgstr "IMPINDURAGACIRO Ubugari Intego- nyuguti"
 
-#: mail/mail-config.glade.h:125
+#: ../mail/mail-config.glade.h:126
 #, fuzzy
 msgid "Select HTML variable width font for printing"
 msgstr "IMPINDURAGACIRO Ubugari Intego- nyuguti kugirango Icapa..."
 
-#: mail/mail-config.glade.h:127
+# offmgr/sdi\ofaslots.src:SID_MAIL_SEND.text
+#: ../mail/mail-config.glade.h:127
+#, fuzzy
+msgid "Send message receipts:"
+msgstr "Kohereza Ubutumwa"
+
+#: ../mail/mail-config.glade.h:129
 msgid "Sending Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:128
+#: ../mail/mail-config.glade.h:130
 msgid "Sent _Messages Folder:"
 msgstr ""
 
-#: mail/mail-config.glade.h:129
+#: ../mail/mail-config.glade.h:131
 msgid "Ser_ver requires authentication"
 msgstr ""
 
-#: mail/mail-config.glade.h:130
+#: ../mail/mail-config.glade.h:132
 #, fuzzy
 msgid "Server _Type: "
 msgstr "Ubwoko bwa seriveri:"
 
-#: mail/mail-config.glade.h:131
+#: ../mail/mail-config.glade.h:133
 #, fuzzy
 msgid "Sig_ning certificate:"
 msgstr "Gushiraho umukono kuri impamyabushobozi"
 
-#: mail/mail-config.glade.h:132
+#: ../mail/mail-config.glade.h:134
 #, fuzzy
 msgid "Signat_ure:"
 msgstr "Umukono:"
 
-#: mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:135
 msgid "Signatures"
 msgstr ""
 
-#: mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:136
 msgid "Signatures Table"
 msgstr ""
 
-#: mail/mail-config.glade.h:135
+#: ../mail/mail-config.glade.h:137
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "Izina ry'idosiye:"
 
-#: mail/mail-config.glade.h:136
+#: ../mail/mail-config.glade.h:138
 msgid "Spell Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:139
 msgid "T_erminal Font:"
 msgstr ""
 
 # sfx2/source\dialog\dinfdlg.src:TP_DOCINFODOC.FT_FILE_TYP.text
-#: mail/mail-config.glade.h:138
+#: ../mail/mail-config.glade.h:140
 #, fuzzy
 msgid "T_ype: "
 msgstr "Ubwoko"
 
-#: mail/mail-config.glade.h:139
+#: ../mail/mail-config.glade.h:141
 #, fuzzy
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr "Urutonde Bya Indimi Indimi kugirango a Inkoranyamagambo"
 
-#: mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:142
 #, fuzzy
 msgid ""
 "The output of this script will be used as your\n"
@@ -14492,24 +14708,24 @@ msgid ""
 "for display purposes only. "
 msgstr "Ibisohoka Bya iyi IYANDIKA Nka Izina: Kugaragaza Impamvu"
 
-#: mail/mail-config.glade.h:144
+#: ../mail/mail-config.glade.h:146
 #, fuzzy
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 msgstr "Izina: ku nka Kuri Kuri iyi Aderesi Urugero Cyangwa"
 
-#: mail/mail-config.glade.h:146
+#: ../mail/mail-config.glade.h:148
 #, fuzzy
 msgid "User_name:"
 msgstr "Izina ry'ukoresha"
 
-#: mail/mail-config.glade.h:147
+#: ../mail/mail-config.glade.h:149
 #, fuzzy
 msgid "V_ariable-width:"
 msgstr "Ubugari k'Impinduragaciro"
 
-#: mail/mail-config.glade.h:148
+#: ../mail/mail-config.glade.h:150
 #, fuzzy
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
@@ -14517,177 +14733,176 @@ msgid ""
 "Click \"Forward\" to begin. "
 msgstr "Kuri Kuri"
 
-#: mail/mail-config.glade.h:152
+#: ../mail/mail-config.glade.h:154
 msgid "_Add Signature"
 msgstr ""
 
-#: mail/mail-config.glade.h:153
+#: ../mail/mail-config.glade.h:155
 #, fuzzy
 msgid "_Always load images from the Internet"
 msgstr "Ibirimo Ishusho Bivuye"
 
-#: mail/mail-config.glade.h:154
+#: ../mail/mail-config.glade.h:156
 #, fuzzy
 msgid "_Do not notify me when new mail arrives"
 msgstr "OYA Ryari: Gishya Ubutumwa"
 
-#: mail/mail-config.glade.h:155
+#: ../mail/mail-config.glade.h:157
 #, fuzzy
 msgid "_Don't sign meeting requests (for Outlook compatibility)"
 msgstr "IKIMENYETSO kugirango Bihuye neza"
 
-#: mail/mail-config.glade.h:157
+#: ../mail/mail-config.glade.h:159
 #, fuzzy
 msgid "_Forward style:"
 msgstr "IMISUSIRE"
 
-#: mail/mail-config.glade.h:158
+#: ../mail/mail-config.glade.h:160
 msgid "_Full Name:"
 msgstr ""
 
-#: mail/mail-config.glade.h:159
+#: ../mail/mail-config.glade.h:161
 #, fuzzy
 msgid "_Host:"
 msgstr "Inturo:"
 
-#: mail/mail-config.glade.h:160
-#, fuzzy
-msgid "_Load images if sender is in address book"
-msgstr "Ishusho NIBA Uwohereza ni in Aderesi Igitabo"
+#: ../mail/mail-config.glade.h:162
+msgid "_Load images in mail from contacts"
+msgstr ""
 
-#: mail/mail-config.glade.h:161
+#: ../mail/mail-config.glade.h:163
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "iyi Mburabuzi Aderesi"
 
-#: mail/mail-config.glade.h:162
+#: ../mail/mail-config.glade.h:164
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "Ubutumwa Nka Gusoma Nyuma"
 
-#: mail/mail-config.glade.h:164
+#: ../mail/mail-config.glade.h:166
 #, fuzzy
 msgid "_Never load images from the Internet"
 msgstr "Ibirimo Ishusho Bivuye"
 
 # svtools/source\filepicker\iodlg.src:DLG_SVT_EXPLORERFILE.STR_PATHNAME.text
-#: mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:167
 #, fuzzy
 msgid "_Path:"
 msgstr "Inzira:"
 
-#: mail/mail-config.glade.h:166
+#: ../mail/mail-config.glade.h:168
 #, fuzzy
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "Ryari: Ubutumwa Kuri Aho kubariza"
 
-#: mail/mail-config.glade.h:167
+#: ../mail/mail-config.glade.h:169
 #, fuzzy
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Ryari: Ubutumwa Na: ubusa Ikivugwaho Umurongo"
 
-#: mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:170
 #, fuzzy
 msgid "_Reply style:"
 msgstr "IMISUSIRE"
 
 # sw/source\ui\inc\swmn.hrc:_MN_INS.FN_JAVAEDIT.text
-#: mail/mail-config.glade.h:169
+#: ../mail/mail-config.glade.h:171
 #, fuzzy
 msgid "_Script:"
 msgstr "Inyandikoporogaramu..."
 
-#: mail/mail-config.glade.h:170
+#: ../mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Show animated images"
 msgstr "Ishusho"
 
-#: mail/mail-config.glade.h:171
+#: ../mail/mail-config.glade.h:173
 #, fuzzy
 msgid "_Use Secure Connection:"
 msgstr "Gukoresha ukwihuza kwizewe"
 
-#: mail/mail-config.glade.h:172
+#: ../mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Use the same fonts as other applications"
 msgstr "Imyandikire Nka Ikindi Porogaramu"
 
 # goodies/source\filter.vcl\eps\dlgeps.src:DLG_EXPORT_EPS.RB_COLOR.text
-#: mail/mail-config.glade.h:173
+#: ../mail/mail-config.glade.h:175
 #, fuzzy
 msgid "color"
 msgstr "Ibara"
 
-#: mail/mail-config.glade.h:174
+#: ../mail/mail-config.glade.h:176
 msgid "description"
 msgstr "Isobanuramiterere"
 
-#: mail/mail-dialogs.glade.h:3
+#: ../mail/mail-dialogs.glade.h:3
 #, fuzzy
 msgid "<b>vFolder Sources</b>"
 msgstr "<B B"
 
-#: mail/mail-dialogs.glade.h:4
+#: ../mail/mail-dialogs.glade.h:4
 #, fuzzy
 msgid "<span weight=\"bold\">Digital Signature</span>"
 msgstr "<Uburemere UTSINDAGIYE"
 
-#: mail/mail-dialogs.glade.h:5
+#: ../mail/mail-dialogs.glade.h:5
 #, fuzzy
 msgid "<span weight=\"bold\">Encryption</span>"
 msgstr "<Uburemere UTSINDAGIYE"
 
 # officecfg/registry\schema\org\openoffice\Office\Calc.xcs:....Calculate.Other.CaseSensitive.text
-#: mail/mail-dialogs.glade.h:6
+#: ../mail/mail-dialogs.glade.h:6
 #, fuzzy
 msgid "Case _Sensitive"
 msgstr "Imyandikire y'inyuguti nkuru/ nto"
 
-#: mail/mail-dialogs.glade.h:7 mail/message-tags.glade.h:2
+#: ../mail/mail-dialogs.glade.h:7 ../mail/message-tags.glade.h:2
 msgid "Co_mpleted"
 msgstr ""
 
 # sfx2/source\appl\newhelp.src:STR_HELP_BUTTON_SEARCHDIALOG.text
-#: mail/mail-dialogs.glade.h:9
+#: ../mail/mail-dialogs.glade.h:9
 #, fuzzy
 msgid "F_ind:"
 msgstr "Gushaka..."
 
-#: mail/mail-dialogs.glade.h:10
+#: ../mail/mail-dialogs.glade.h:10
 #, fuzzy
 msgid "Find in Message"
 msgstr "in"
 
-#: mail/mail-dialogs.glade.h:11 mail/message-tag-followup.c:295
-#: mail/message-tags.glade.h:3
+#: ../mail/mail-dialogs.glade.h:11 ../mail/message-tag-followup.c:295
+#: ../mail/message-tags.glade.h:3
 #, fuzzy
 msgid "Flag to Follow Up"
 msgstr "Kuri"
 
-#: mail/mail-dialogs.glade.h:12
+#: ../mail/mail-dialogs.glade.h:12
 msgid "Folder Subscriptions"
 msgstr ""
 
-#: mail/mail-dialogs.glade.h:13
+#: ../mail/mail-dialogs.glade.h:13
 msgid "License Agreement"
 msgstr "Amasezerano y'Iyemererakoresha"
 
 # sw/source\ui\wizard\wizbmp.src:STR_Lgo_NoSelect.text
-#: mail/mail-dialogs.glade.h:14
+#: ../mail/mail-dialogs.glade.h:14
 #, fuzzy
 msgid "None Selected"
 msgstr "Nta nakimwe cyatoranyijwe"
 
-#: mail/mail-dialogs.glade.h:15
+#: ../mail/mail-dialogs.glade.h:15
 #, fuzzy
 msgid "S_erver:"
 msgstr "Seriveri"
 
-#: mail/mail-dialogs.glade.h:16
+#: ../mail/mail-dialogs.glade.h:16
 msgid "Security Information"
 msgstr ""
 
-#: mail/mail-dialogs.glade.h:18 mail/message-tags.glade.h:4
+#: ../mail/mail-dialogs.glade.h:18 ../mail/message-tags.glade.h:4
 #, fuzzy
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
@@ -14696,1034 +14911,945 @@ msgstr ""
 "Ubutumwa Byahiswemo kugirango Hejuru munsi Guhitamo a Hejuru Igikorwa Bivuye "
 "Ibikubiyemo"
 
-#: mail/mail-dialogs.glade.h:20
+#: ../mail/mail-dialogs.glade.h:20
 msgid "_Accept License"
 msgstr ""
 
-#: mail/mail-dialogs.glade.h:21 mail/message-tags.glade.h:6
+#: ../mail/mail-dialogs.glade.h:21 ../mail/message-tags.glade.h:6
 msgid "_Due By:"
 msgstr ""
 
-#: mail/mail-dialogs.glade.h:22 mail/message-tags.glade.h:7
+#: ../mail/mail-dialogs.glade.h:22 ../mail/message-tags.glade.h:7
 #, fuzzy
 msgid "_Flag:"
 msgstr "Ibendera"
 
-#: mail/mail-dialogs.glade.h:23
+#: ../mail/mail-dialogs.glade.h:23
 #, fuzzy
 msgid "_Subscribe"
 msgstr "Kwiyandikisha"
 
-#: mail/mail-dialogs.glade.h:24
+#: ../mail/mail-dialogs.glade.h:24
 #, fuzzy
 msgid "_Tick this to accept the license agreement"
 msgstr "iyi Kuri Kwemera"
 
-#: mail/mail-dialogs.glade.h:25
+#: ../mail/mail-dialogs.glade.h:25
+#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:3
 #, fuzzy
 msgid "_Unsubscribe"
 msgstr "Kwivana aho wiyandikishe"
 
-#: mail/mail-dialogs.glade.h:26
+#: ../mail/mail-dialogs.glade.h:26
 msgid "specific folders only"
 msgstr ""
 
-#: mail/mail-dialogs.glade.h:27
+#: ../mail/mail-dialogs.glade.h:27
 #, fuzzy
 msgid "with all active remote folders"
 msgstr "Na: Byose Gikora"
 
-#: mail/mail-dialogs.glade.h:28
+#: ../mail/mail-dialogs.glade.h:28
 #, fuzzy
 msgid "with all local and active remote folders"
 msgstr "Na: Byose Na Gikora"
 
-#: mail/mail-dialogs.glade.h:29
+#: ../mail/mail-dialogs.glade.h:29
 #, fuzzy
 msgid "with all local folders"
 msgstr "Na: Byose"
 
-#. mail:camel-service-auth-invalid primary
-#: mail/mail-errors.xml.h:2
-msgid "Invalid authentication"
+#: ../mail/mail-folder-cache.c:813
+#, c-format
+msgid "Pinging %s"
 msgstr ""
 
-#. mail:camel-service-auth-invalid secondary
-#: mail/mail-errors.xml.h:4
-#, fuzzy
-msgid ""
-"This server does not support this type of authentication and may not support "
-"authentication at all."
+#: ../mail/mail-ops.c:101
+msgid "Filtering Folder"
 msgstr ""
-"Seriveri OYA Gushigikira iyi Ubwoko Bya Na Gicurasi OYA Gushigikira ku Byose"
 
-#. mail:camel-service-auth-failed primary
-#: mail/mail-errors.xml.h:6
-#, fuzzy
-msgid "Your login to your server \"{0}\" as \"{0}\" failed."
-msgstr "Ifashayinjira Kuri Seriveri 0 Nka 0 Byanze"
+#: ../mail/mail-ops.c:262
+msgid "Fetching Mail"
+msgstr ""
 
-#. mail:camel-service-auth-failed secondary
-#: mail/mail-errors.xml.h:8
-#, fuzzy
+#. sending mail, filtering failed
+#: ../mail/mail-ops.c:562
+#, fuzzy, c-format
+msgid "Failed to apply outgoing filters: %s"
+msgstr "Kuri Gukurikiza Muyunguruzi"
+
+#: ../mail/mail-ops.c:573 ../mail/mail-ops.c:602
+#, fuzzy, c-format
 msgid ""
-"Check to make sure your password is spelled correctly.  Remember that many "
-"passwords are case sensitive; your caps lock might be on."
-msgstr "Kuri Ubwoko Ijambobanga... ni Amagambo banga Inyuguti nkuru ku"
+"Failed to append to %s: %s\n"
+"Appending to local `Sent' folder instead."
+msgstr "Kuri Kongeraho... Kuri Kuri Ububiko"
 
-#. mail:ask-send-html primary
-#: mail/mail-errors.xml.h:10
-#, fuzzy
-msgid "Are you sure you want to send a message in HTML format?"
-msgstr "Kuri Kohereza a Ubutumwa in Imiterere"
+#: ../mail/mail-ops.c:619
+#, fuzzy, c-format
+msgid "Failed to append to local `Sent' folder: %s"
+msgstr "Kuri Kongeraho... Kuri Ububiko"
 
-#. mail:ask-send-html secondary
-#: mail/mail-errors.xml.h:12
-#, fuzzy
-msgid ""
-"Please make sure the following recipients are willing and able to receive "
-"HTML email:\n"
-"{0}\n"
-"Send anyway?"
-msgstr "Ubwoko Abandikiwe... Na Kuri Akira imeli 0"
+#: ../mail/mail-ops.c:731
+#, fuzzy, c-format
+msgid "Sending message %d of %d"
+msgstr "Ubutumwa Bya"
 
-#. mail:ask-send-no-subject primary
-#: mail/mail-errors.xml.h:17
+#: ../mail/mail-ops.c:756
+#, fuzzy, c-format
+msgid "Failed to send %d of %d messages"
+msgstr "Kuri Kohereza Bya Ubutumwa"
+
+#: ../mail/mail-ops.c:758 ../mail/mail-send-recv.c:613
 #, fuzzy
-msgid "Are you sure you want to send a message without a subject?"
-msgstr "Kuri Kohereza a Ubutumwa a Ikivugwaho"
+msgid "Cancelled."
+msgstr "Kureka"
 
-#. mail:ask-send-no-subject secondary
-#: mail/mail-errors.xml.h:19
+# officecfg/registry\schema\org\openoffice\Office\DataAccess.xcs:....FormSearchOptions.SearchPosition..complete-field.text
+#: ../mail/mail-ops.c:760
 #, fuzzy
-msgid ""
-"Adding a meaningful Subject line to your messages will give your recipients "
-"an idea of what your mail is about."
-msgstr "a Umurongo Kuri Ubutumwa Abandikiwe... Bya Ubutumwa ni Ibyerekeye"
+msgid "Complete."
+msgstr "Byuzuye"
 
-#. mail:ask-send-only-bcc-contact primary
-#. mail:ask-send-only-bcc primary
-#: mail/mail-errors.xml.h:22 mail/mail-errors.xml.h:29
+#: ../mail/mail-ops.c:857
 #, fuzzy
-msgid "Are you sure you want to send a message with only BCC recipients?"
-msgstr "Kuri Kohereza a Ubutumwa Na: Abandikiwe..."
+msgid "Saving message to folder"
+msgstr "Ubutumwa Kuri Ububiko"
+
+#: ../mail/mail-ops.c:942
+#, fuzzy, c-format
+msgid "Moving messages to %s"
+msgstr "Ubutumwa Kuri"
+
+#: ../mail/mail-ops.c:942
+#, fuzzy, c-format
+msgid "Copying messages to %s"
+msgstr "Ubutumwa Kuri"
 
-#. mail:ask-send-only-bcc-contact secondary
-#: mail/mail-errors.xml.h:24
+#: ../mail/mail-ops.c:1168
 #, fuzzy
-msgid ""
-"The contact list you are sending to is configured to hide list recipients.\n"
-"\n"
-"Many email systems add an Apparently-To header to messages that only have "
-"BCC recipients. This header, if added, will list all of your recipients in "
-"your message. To avoid this, you should add at least one To: or CC: "
-"recipient. "
+msgid "Forwarded messages"
+msgstr "Ubutumwa"
+
+# 4429
+#: ../mail/mail-ops.c:1211
+#, fuzzy, c-format
+msgid "Opening folder %s"
+msgstr "gufungura dosiye"
+
+#: ../mail/mail-ops.c:1283
+#, c-format
+msgid "Opening store %s"
 msgstr ""
-"Umuntu Urutonde Kuri ni Kuri Gushisha Urutonde Abandikiwe... imeli Kongeramo "
-"Umutwempangano Kuri Ubutumwa Abandikiwe... Umutwempangano NIBA Kyongewe "
-"Urutonde Byose Bya Abandikiwe... in Ubutumwa iyi Kongeramo ku Cyangwa "
-"Umukoresha"
 
-#. mail:ask-send-only-bcc secondary
-#: mail/mail-errors.xml.h:31
+#: ../mail/mail-ops.c:1361
+#, fuzzy, c-format
+msgid "Removing folder %s"
+msgstr "Ububiko"
+
+#: ../mail/mail-ops.c:1455
+#, fuzzy, c-format
+msgid "Storing folder '%s'"
+msgstr "Ububiko"
+
+#: ../mail/mail-ops.c:1520
+#, fuzzy, c-format
+msgid "Expunging and storing account '%s'"
+msgstr "Na Aderesi"
+
+#: ../mail/mail-ops.c:1521
+#, fuzzy, c-format
+msgid "Storing account '%s'"
+msgstr "Aderesi"
+
+#: ../mail/mail-ops.c:1576
 #, fuzzy
-msgid ""
-"Many email systems add an Apparently-To header to messages that only have "
-"BCC recipients. This header, if added, will list all of your recipients to "
-"your message anyway. To avoid this, you should add at least one To: or CC: "
-"recipient."
-msgstr ""
-"imeli Kongeramo Umutwempangano Kuri Ubutumwa Abandikiwe... Umutwempangano "
-"NIBA Kyongewe Urutonde Byose Bya Abandikiwe... Kuri Ubutumwa iyi Kongeramo "
-"ku Cyangwa Umukoresha"
+msgid "Refreshing folder"
+msgstr "Ububiko"
 
-#. mail:send-no-recipients primary
-#: mail/mail-errors.xml.h:34
+#: ../mail/mail-ops.c:1612 ../mail/mail-ops.c:1663
 #, fuzzy
+msgid "Expunging folder"
+msgstr "Ububiko"
+
+#: ../mail/mail-ops.c:1660
+#, fuzzy, c-format
+msgid "Emptying trash in '%s'"
+msgstr "in"
+
+#: ../mail/mail-ops.c:1661
+msgid "Local Folders"
+msgstr ""
+
+#: ../mail/mail-ops.c:1744
+#, fuzzy, c-format
+msgid "Retrieving message %s"
+msgstr "Ubutumwa"
+
+#: ../mail/mail-ops.c:1816
+#, fuzzy, c-format
+msgid "Retrieving %d message"
+msgid_plural "Retrieving %d messages"
+msgstr[0] "Ubutumwa"
+
+#: ../mail/mail-ops.c:1902
+#, fuzzy, c-format
+msgid "Saving %d message"
+msgid_plural "Saving %d messsages"
+msgstr[0] "Ubutumwa"
+
+#: ../mail/mail-ops.c:1952
+#, fuzzy, c-format
 msgid ""
-"This message cannot be sent because you have not specified any Recipients"
-msgstr "Ubutumwa Yoherejwe: OYA"
+"Unable to create output file: %s\n"
+" %s"
+msgstr "Kuri Kurema Ibisohoka IDOSIYE"
 
-#. mail:send-no-recipients secondary
-#: mail/mail-errors.xml.h:36
-#, fuzzy
+#: ../mail/mail-ops.c:1980
+#, fuzzy, c-format
 msgid ""
-"Please enter a valid email address in the To: field. You can search for "
-"email addresses by clicking on the To: button next to the entry box."
-msgstr ""
-"Injiza a Byemewe imeli Aderesi in Umwanya Gushaka kugirango imeli Amaderesi "
-"ku ku Akabuto Komeza>> Kuri Icyinjijwe Agasanduku"
+"Error saving messages to: %s:\n"
+" %s"
+msgstr "Mu kubika Ubutumwa Kuri"
 
-#. mail:ask-default-drafts primary
-#: mail/mail-errors.xml.h:38
+#: ../mail/mail-ops.c:2051
 #, fuzzy
-msgid "Use default drafts folder?"
-msgstr "Mburabuzi Ububiko"
+msgid "Saving attachment"
+msgstr "umugereka"
 
-#. mail:ask-default-drafts secondary
-#: mail/mail-errors.xml.h:40
-#, fuzzy
+#: ../mail/mail-ops.c:2063
+#, fuzzy, c-format
 msgid ""
-"Unable to open the drafts folder for this account.  Use the system drafts "
-"folder instead?"
-msgstr "Kuri Gufungura Ububiko kugirango iyi Aderesi Sisitemu Ububiko"
+"Cannot create output file: %s:\n"
+" %s"
+msgstr "Kurema Ibisohoka IDOSIYE"
 
-#: mail/mail-errors.xml.h:41
-msgid "Use _Default"
+#: ../mail/mail-ops.c:2073
+#, fuzzy, c-format
+msgid "Could not write data: %s"
+msgstr "OYA Ibyatanzwe"
+
+#: ../mail/mail-ops.c:2223
+#, fuzzy, c-format
+msgid "Disconnecting from %s"
+msgstr "Bivuye"
+
+#: ../mail/mail-ops.c:2223
+#, fuzzy, c-format
+msgid "Reconnecting to %s"
+msgstr "Kuri"
+
+#: ../mail/mail-ops.c:2339
+msgid "Checking Service"
 msgstr ""
 
-#. mail:ask-expunge primary
-#: mail/mail-errors.xml.h:43
-#, fuzzy
-msgid ""
-"Are you sure you want to permanently remove all the deleted message in "
-"folder \"{0}\"?"
-msgstr "Kuri Gukuraho... Byose Cyasibwe Ubutumwa in Ububiko 0"
+# # @name NS_MSG_CANCELLING
+#: ../mail/mail-send-recv.c:158
+msgid "Cancelling..."
+msgstr "Kureka..."
 
-#. mail:ask-expunge secondary
-#. mail:ask-empty-trash secondary
-#: mail/mail-errors.xml.h:45 mail/mail-errors.xml.h:50
-#, fuzzy
-msgid "If you continue, you will not be able to recover these messages."
-msgstr "urifuzagukomeza OYA Kuri Ubutumwa"
+#: ../mail/mail-send-recv.c:265
+#, fuzzy, c-format
+msgid "Server: %s, Type: %s"
+msgstr "Ubwoko bwa seriveri:"
 
-#: mail/mail-errors.xml.h:46
-msgid "_Expunge"
+#: ../mail/mail-send-recv.c:267
+#, c-format
+msgid "Path: %s, Type: %s"
 msgstr ""
 
-#. mail:ask-empty-trash primary
-#: mail/mail-errors.xml.h:48
-#, fuzzy
-msgid ""
-"Are you sure you want to permanently remove all the deleted messages in all "
-"folders?"
-msgstr "Kuri Gukuraho... Byose Cyasibwe Ubutumwa in Byose"
+# #-#-#-#-#  dbaccess.pot (Gnome 2.12)  #-#-#-#-#
+# #-#-#-#-#  dbaccess.pot (Gnome 2.12)  #-#-#-#-#
+#: ../mail/mail-send-recv.c:269
+#, fuzzy, c-format
+msgid "Type: %s"
+msgstr "Ubwoko"
 
-#: mail/mail-errors.xml.h:51
-msgid "_Empty Trash"
+#: ../mail/mail-send-recv.c:320
+msgid "Send & Receive Mail"
 msgstr ""
 
-#. mail:ask-open-many primary
-#: mail/mail-errors.xml.h:53
+#: ../mail/mail-send-recv.c:327
+msgid "Cancel _All"
+msgstr ""
+
+# sc/source\ui\src\optdlg.src:RID_SCPAGE_LAYOUT.GB_LINK.text
+#: ../mail/mail-send-recv.c:416
 #, fuzzy
-msgid "Are you sure you want to open {0} messages at once?"
-msgstr "Kuri Gufungura 0 Ubutumwa ku Rimwe"
+msgid "Updating..."
+msgstr "Ivugurura"
 
-#. mail:ask-open-many secondary
-#: mail/mail-errors.xml.h:55
+# so3/src\svuidlg.src:MD_UPDATE_BASELINKS.STR_WAITINGLINK.text
+#: ../mail/mail-send-recv.c:416 ../mail/mail-send-recv.c:468
 #, fuzzy
-msgid "Opening too many messages at once may take a long time."
-msgstr "Ubutumwa ku Rimwe Gicurasi a Igihe"
+msgid "Waiting..."
+msgstr "Tegereza"
 
-#: mail/mail-errors.xml.h:56
-msgid "_Open Messages"
+#: ../mail/mail-session.c:208
+#, fuzzy, c-format
+msgid "Enter Password for %s"
+msgstr "kugirango"
+
+# sfx2/source\dialog\passwd.src:DLG_PASSWD.text
+#: ../mail/mail-session.c:210
+msgid "Enter Password"
+msgstr "Kwandika Ijambobanga"
+
+#: ../mail/mail-session.c:239
+msgid "User canceled operation."
 msgstr ""
 
-#. mail:exit-unsaved primary
-#: mail/mail-errors.xml.h:58
+#: ../mail/mail-signature-editor.c:372
 #, fuzzy
-msgid "You have unsent messages, do you wish to quit anyway?"
-msgstr "Ubutumwa Kuri Kuvamo"
+msgid "Edit signature"
+msgstr "Isinya"
 
-#. mail:exit-unsaved secondary
-#: mail/mail-errors.xml.h:60
+#: ../mail/mail-signature-editor.c:412
 #, fuzzy
-msgid ""
-"If you quit, these messages will not be sent until Evolution is started "
-"again."
-msgstr "Kuvamo Ubutumwa OYA Yoherejwe: ni"
+msgid "Enter a name for this signature."
+msgstr "a Izina: kugirango iyi Isinya"
 
-#. mail:camel-exception primary
-#: mail/mail-errors.xml.h:62
-#, fuzzy
-msgid "Your message with the subject \"{0}\" was not delivered."
-msgstr "Ubutumwa Na: Ikivugwaho 0 OYA"
+# sc/source\ui\dbgui\pvfundlg.src:RID_SCDLG_PIVOTSUBT.FT_NAMELABEL.text
+#: ../mail/mail-signature-editor.c:415
+#: ../plugins/groupwise-features/properties.glade.h:5
+msgid "Name:"
+msgstr "Izina:"
 
-#. mail:camel-exception secondary
-#: mail/mail-errors.xml.h:64
+#: ../mail/mail-tools.c:116
+#, fuzzy, c-format
+msgid "Could not create spool directory `%s': %s"
+msgstr "OYA Kurema bushyinguro"
+
+#: ../mail/mail-tools.c:143
+#, fuzzy, c-format
+msgid "Trying to movemail a non-mbox source `%s'"
+msgstr "Kuri a Inkomoko"
+
+#: ../mail/mail-tools.c:242
+#, fuzzy, c-format
+msgid "Forwarded message - %s"
+msgstr "Ubutumwa"
+
+#: ../mail/mail-tools.c:244
 #, fuzzy
-msgid ""
-"The message was sent via the \"sendmail\" external application.  Sendmail "
-"reports the following error: status 67: mail not sent.\n"
-"The message is stored in the Outbox folder.  Check the message for errors "
-"and resend."
+msgid "Forwarded message"
+msgstr "Ubutumwa"
+
+#: ../mail/mail-tools.c:284
+#, fuzzy, c-format
+msgid "Invalid folder: `%s'"
+msgstr "Ububiko"
+
+#: ../mail/mail-vfolder.c:91
+#, fuzzy, c-format
+msgid "Setting up vFolder: %s"
+msgstr "Hejuru"
+
+#: ../mail/mail-vfolder.c:240
+#, fuzzy, c-format
+msgid "Updating vFolders for '%s:%s'"
+msgstr "kugirango"
+
+#: ../mail/mail-vfolder.c:247
+#, fuzzy, c-format
+msgid "Updating vFolders for '%s'"
+msgstr "kugirango"
+
+#: ../mail/mail-vfolder.c:1009
+msgid "Edit vFolder"
+msgstr ""
+
+#: ../mail/mail-vfolder.c:1093
+msgid "New vFolder"
 msgstr ""
-"Ubutumwa Yoherejwe: Biturutse external Porogaramu Raporo Ikosa Imimerere "
-"Ubutumwa OYA Yoherejwe: Ubutumwa ni in Ububiko Ubutumwa kugirango Amakosa Na "
-"Ongera wohereze"
 
-#. mail:async-error primary
-#: mail/mail-errors.xml.h:67
+#: ../mail/mail.error.xml.h:1
 #, fuzzy
-msgid "Error while {0}."
-msgstr "0"
+msgid ""
+"A folder named &quot;{1}&quot; already exists. Please use a different name."
+msgstr "A Ububiko 1. Gukoresha a Izina:"
 
-#. mail:async-error secondary
-#: mail/mail-errors.xml.h:69
+#: ../mail/mail.error.xml.h:2
 #, fuzzy
-msgid "{1}."
-msgstr "{1."
+msgid ""
+"A non-empty folder at &quot;{1}&quot; already exists.\n"
+"\n"
+"You can choose to ignore this folder, overwrite or append its contents, or "
+"quit.\n"
+msgstr ""
+"A ubusa Ububiko ku 1. Guhitamo Kuri Kwirengagiza iyi Ububiko Guhindura "
+"Cyangwa Kongeraho... Ibigize Cyangwa Kuvamo"
 
-#. mail:async-error-nodescribe primary
-#: mail/mail-errors.xml.h:71
-msgid "Error while performing operation."
+#: ../mail/mail.error.xml.h:6
+msgid ""
+"A read receipt notification has been requested for &quot;{1}&quot;.  Send "
+"the reciept notification to {0}?"
 msgstr ""
 
-#. mail:async-error-nodescribe secondary
-#: mail/mail-errors.xml.h:73
+#: ../mail/mail.error.xml.h:7
 #, fuzzy
-msgid "{0}."
-msgstr "{0"
+msgid ""
+"Adding a meaningful Subject line to your messages will give your recipients "
+"an idea of what your mail is about."
+msgstr "a Umurongo Kuri Ubutumwa Abandikiwe... Bya Ubutumwa ni Ibyerekeye"
 
-# sfx2/source\dialog\passwd.src:DLG_PASSWD.text
-#. mail:ask-session-password primary
-#: mail/mail-errors.xml.h:87
+#: ../mail/mail.error.xml.h:8
 #, fuzzy
-msgid "Enter password."
-msgstr "Kwandika Ijambobanga"
+msgid "Are you sure you want to delete this account?"
+msgstr "Kuri Gusiba iyi Aderesi"
 
-#. mail:filter-load-error primary
-#: mail/mail-errors.xml.h:91
+#: ../mail/mail.error.xml.h:9
 #, fuzzy
-msgid "Error loading filter definitions."
-msgstr "Itangira... Muyunguruzi..."
+msgid "Are you sure you want to open {0} messages at once?"
+msgstr "Kuri Gufungura 0 Ubutumwa ku Rimwe"
 
-#. mail:no-save-path primary
-#: mail/mail-errors.xml.h:95
+#: ../mail/mail.error.xml.h:10
 #, fuzzy
-msgid "Cannot save to directory \"{0}\"."
-msgstr "Kubika Kuri bushyinguro 0"
+msgid ""
+"Are you sure you want to permanently remove all the deleted messages in all "
+"folders?"
+msgstr "Kuri Gukuraho... Byose Cyasibwe Ubutumwa in Byose"
 
-#. mail:no-create-path primary
-#. mail:no-write-path-exists primary
-#. mail:no-write-path-notfile primary
-#: mail/mail-errors.xml.h:99 mail/mail-errors.xml.h:107
-#: mail/mail-errors.xml.h:111
+#: ../mail/mail.error.xml.h:11
 #, fuzzy
-msgid "Cannot save to file \"{0}\"."
-msgstr "Kubika Kuri IDOSIYE 0"
+msgid ""
+"Are you sure you want to permanently remove all the deleted messages in "
+"folder &quot;{0}&quot;?"
+msgstr "Kuri Gukuraho... Byose Cyasibwe Ubutumwa in Ububiko 0"
 
-#. mail:no-create-path secondary
-#: mail/mail-errors.xml.h:101
+#: ../mail/mail.error.xml.h:12
 #, fuzzy
-msgid "Cannot create the save directory, because \"{1}\""
-msgstr "Kurema Kubika bushyinguro 1."
+msgid "Are you sure you want to send a message in HTML format?"
+msgstr "Kuri Kohereza a Ubutumwa in Imiterere"
 
-#. mail:no-create-tmp-path primary
-#: mail/mail-errors.xml.h:103
+#: ../mail/mail.error.xml.h:13
 #, fuzzy
-msgid "Cannot create temporary save directory."
-msgstr "Kurema By'igihe gito Kubika bushyinguro"
+msgid "Are you sure you want to send a message with only BCC recipients?"
+msgstr "Kuri Kohereza a Ubutumwa Na: Abandikiwe..."
 
-#. mail:no-write-path-exists secondary
-#: mail/mail-errors.xml.h:109
+#: ../mail/mail.error.xml.h:14
 #, fuzzy
-msgid "File exists but cannot overwrite it."
-msgstr "Idosiye Guhindura"
+msgid "Are you sure you want to send a message without a subject?"
+msgstr "Kuri Kohereza a Ubutumwa a Ikivugwaho"
 
-#. mail:no-write-path-notfile secondary
-#: mail/mail-errors.xml.h:113
+#: ../mail/mail.error.xml.h:15
 #, fuzzy
-msgid "File exists but is not a regular file."
-msgstr "Idosiye ni OYA a Ibisanzwe IDOSIYE"
+msgid "Because &quot;{0}&quot;."
+msgstr "0"
 
-#. mail:no-delete-folder primary
-#: mail/mail-errors.xml.h:115
+#: ../mail/mail.error.xml.h:17
 #, fuzzy
-msgid "Cannot delete folder \"{0}\"."
-msgstr "Gusiba Ububiko 0"
+msgid "Because &quot;{2}&quot;."
+msgstr "2."
 
-#. mail:no-delete-special-folder primary
-#: mail/mail-errors.xml.h:119
+#: ../mail/mail.error.xml.h:18
 #, fuzzy
-msgid "Cannot delete system folder \"{0}\"."
-msgstr "Gusiba Sisitemu Ububiko 0"
+msgid "Cannot add vFolder &quot;{0}&quot;."
+msgstr "Kongeramo 0"
 
-#. mail:no-delete-special-folder secondary
-#. mail:no-rename-special-folder secondary
-#: mail/mail-errors.xml.h:121 mail/mail-errors.xml.h:125
+#: ../mail/mail.error.xml.h:19
 #, fuzzy
-msgid ""
-"System folders are required for Ximian Evolution to function correctly and "
-"cannot be renamed, moved, or deleted."
-msgstr "Bya ngombwa kugirango Kuri Umumaro Na Cyangwa Cyasibwe"
+msgid "Cannot copy folder &quot;{0}&quot; to &quot;{1}&quot;."
+msgstr "Gukoporora Ububiko 0 Kuri 1."
 
-#. mail:no-rename-special-folder primary
-#: mail/mail-errors.xml.h:123
+#: ../mail/mail.error.xml.h:20
 #, fuzzy
-msgid "Cannot rename or move system folder \"{0}\"."
-msgstr "Guhindura izina Cyangwa Kwimura Sisitemu Ububiko 0"
+msgid "Cannot create folder &quot;{0}&quot;."
+msgstr "Kurema Ububiko 0"
 
-#. mail:ask-delete-folder title
-#: mail/mail-errors.xml.h:127
+#: ../mail/mail.error.xml.h:21
 #, fuzzy
-msgid "Delete \"{0}\"?"
-msgstr "0"
+msgid "Cannot create temporary save directory."
+msgstr "Kurema By'igihe gito Kubika bushyinguro"
 
-#. mail:ask-delete-folder primary
-#: mail/mail-errors.xml.h:129
+#: ../mail/mail.error.xml.h:22
 #, fuzzy
-msgid "Really delete folder \"{0}\" and all of its subfolders?"
-msgstr "Gusiba Ububiko 0 Na Byose Bya"
+msgid "Cannot create the save directory, because &quot;{1}&quot;"
+msgstr "Kurema Kubika bushyinguro 1."
 
-#. mail:ask-delete-folder secondary
-#: mail/mail-errors.xml.h:131
+#: ../mail/mail.error.xml.h:23
 #, fuzzy
-msgid ""
-"If you delete the folder, all of its contents and its subfolders contents "
-"will be deleted permanently."
-msgstr "Gusiba Ububiko Byose Bya Ibigize Na Ibigize Cyasibwe"
+msgid "Cannot delete folder &quot;{0}&quot;."
+msgstr "Gusiba Ububiko 0"
 
-#. mail:no-rename-folder-exists primary
-#. mail:no-rename-folder primary
-#: mail/mail-errors.xml.h:133 mail/mail-errors.xml.h:137
+#: ../mail/mail.error.xml.h:24
 #, fuzzy
-msgid "Cannot rename \"{0}\" to \"{1}\"."
-msgstr "Guhindura izina 0 Kuri 1."
+msgid "Cannot delete system folder &quot;{0}&quot;."
+msgstr "Gusiba Sisitemu Ububiko 0"
 
-#. mail:no-rename-folder-exists secondary
-#. mail:vfolder-notunique secondary
-#: mail/mail-errors.xml.h:135 mail/mail-errors.xml.h:197
+#: ../mail/mail.error.xml.h:25
 #, fuzzy
-msgid "A folder named \"{1}\" already exists. Please use a different name."
-msgstr "A Ububiko 1. Gukoresha a Izina:"
+msgid "Cannot edit vFolder &quot;{0}&quot; as it does not exist."
+msgstr "Guhindura 0 Nka OYA"
 
-#. mail:no-rename-folder secondary
-#: mail/mail-errors.xml.h:139
+#: ../mail/mail.error.xml.h:26
 #, fuzzy
-msgid "Because \"{2}\"."
-msgstr "2."
+msgid "Cannot move folder &quot;{0}&quot; to &quot;{1}&quot;."
+msgstr "Kwimura Ububiko 0 Kuri 1."
 
-#. mail:no-move-folder-nostore primary
-#. mail:no-move-folder-to-nostore primary
-#: mail/mail-errors.xml.h:141 mail/mail-errors.xml.h:145
+#: ../mail/mail.error.xml.h:27
 #, fuzzy
-msgid "Cannot move folder \"{0}\" to \"{1}\"."
-msgstr "Kwimura Ububiko 0 Kuri 1."
+msgid "Cannot open source &quot;{1}&quot;"
+msgstr "Gufungura Inkomoko 1."
 
-#. mail:no-move-folder-nostore secondary
-#. mail:no-copy-folder-nostore secondary
-#: mail/mail-errors.xml.h:143 mail/mail-errors.xml.h:151
+#: ../mail/mail.error.xml.h:28
 #, fuzzy
-msgid "Cannot open source \"{2}\"."
+msgid "Cannot open source &quot;{2}&quot;."
 msgstr "Gufungura Inkomoko 2."
 
-#. mail:no-move-folder-to-nostore secondary
-#. mail:no-copy-folder-to-nostore secondary
-#: mail/mail-errors.xml.h:147 mail/mail-errors.xml.h:155
+#: ../mail/mail.error.xml.h:29
 #, fuzzy
-msgid "Cannot open target \"{2}\"."
+msgid "Cannot open target &quot;{2}&quot;."
 msgstr "Gufungura Intego 2."
 
-#. mail:no-copy-folder-nostore primary
-#. mail:no-copy-folder-to-nostore primary
-#: mail/mail-errors.xml.h:149 mail/mail-errors.xml.h:153
+#: ../mail/mail.error.xml.h:30
 #, fuzzy
-msgid "Cannot copy folder \"{0}\" to \"{1}\"."
-msgstr "Gukoporora Ububiko 0 Kuri 1."
+msgid ""
+"Cannot read the license file &quot;{0}&quot;, due to an installation "
+"problem.  You will not be able to use this provider until you can accept its "
+"license."
+msgstr ""
+"Gusoma IDOSIYE 0 Kuri iyinjizaporogaramu OYA Kuri Gukoresha iyi Kwemera"
 
-#. mail:no-create-folder-nostore primary
-#: mail/mail-errors.xml.h:157
+#: ../mail/mail.error.xml.h:31
 #, fuzzy
-msgid "Cannot create folder \"{0}\"."
-msgstr "Kurema Ububiko 0"
+msgid "Cannot rename &quot;{0}&quot; to &quot;{1}&quot;."
+msgstr "Guhindura izina 0 Kuri 1."
 
-#. mail:no-create-folder-nostore secondary
-#: mail/mail-errors.xml.h:159
+#: ../mail/mail.error.xml.h:32
 #, fuzzy
-msgid "Cannot open source \"{1}\""
-msgstr "Gufungura Inkomoko 1."
+msgid "Cannot rename or move system folder &quot;{0}&quot;."
+msgstr "Guhindura izina Cyangwa Kwimura Sisitemu Ububiko 0"
 
-#. mail:account-incomplete primary
-#. mail:account-notunique primary
-#: mail/mail-errors.xml.h:161 mail/mail-errors.xml.h:165
+#: ../mail/mail.error.xml.h:33
 #, fuzzy
 msgid "Cannot save changes to account."
 msgstr "Kubika Amahinduka Kuri Aderesi"
 
-#. mail:account-incomplete secondary
-#: mail/mail-errors.xml.h:163
-#, fuzzy
-msgid "You have not filled in all of the required information."
-msgstr "OYA Byuzuye in Byose Bya Bya ngombwa Ibisobanuro"
-
-#. mail:account-notunique secondary
-#: mail/mail-errors.xml.h:167
+#: ../mail/mail.error.xml.h:34
 #, fuzzy
-msgid "You may not create two accounts with the same name."
-msgstr "Gicurasi OYA Kurema Konti Na: Izina:"
-
-#. mail:ask-delete-account title
-#: mail/mail-errors.xml.h:169
-#, fuzzy
-msgid "Delete account?"
-msgstr "Aderesi"
+msgid "Cannot save to directory &quot;{0}&quot;."
+msgstr "Kubika Kuri bushyinguro 0"
 
-#. mail:ask-delete-account primary
-#: mail/mail-errors.xml.h:171
+#: ../mail/mail.error.xml.h:35
 #, fuzzy
-msgid "Are you sure you want to delete this account?"
-msgstr "Kuri Gusiba iyi Aderesi"
+msgid "Cannot save to file &quot;{0}&quot;."
+msgstr "Kubika Kuri IDOSIYE 0"
 
-#. mail:ask-delete-account secondary
-#: mail/mail-errors.xml.h:173
+#: ../mail/mail.error.xml.h:36
 #, fuzzy
-msgid "If you proceed, the account information will be deleted permanently."
-msgstr "Aderesi Ibisobanuro Cyasibwe"
+msgid "Cannot set signature script &quot;{0}&quot;."
+msgstr "Gushyiraho Isinya IYANDIKA 0"
 
-#: mail/mail-errors.xml.h:174
+#: ../mail/mail.error.xml.h:37
 #, fuzzy
-msgid "Don't delete"
-msgstr "Gusiba"
+msgid ""
+"Check to make sure your password is spelled correctly.  Remember that many "
+"passwords are case sensitive; your caps lock might be on."
+msgstr "Kuri Ubwoko Ijambobanga... ni Amagambo banga Inyuguti nkuru ku"
 
-#. mail:no-save-signature primary
-#: mail/mail-errors.xml.h:176
+#: ../mail/mail.error.xml.h:38
 #, fuzzy
 msgid "Could not save signature file."
 msgstr "OYA Kubika Isinya IDOSIYE"
 
-#. mail:no-save-signature secondary
-#: mail/mail-errors.xml.h:178
+#: ../mail/mail.error.xml.h:39
 #, fuzzy
-msgid "Because \"{0}\"."
+msgid "Delete &quot;{0}&quot;?"
 msgstr "0"
 
-#. mail:signature-notscript primary
-#: mail/mail-errors.xml.h:180
+#: ../mail/mail.error.xml.h:40
 #, fuzzy
-msgid "Cannot set signature script \"{0}\"."
-msgstr "Gushyiraho Isinya IYANDIKA 0"
-
-#. mail:signature-notscript secondary
-#: mail/mail-errors.xml.h:182
-#, fuzzy
-msgid "The script file must exist and be executable."
-msgstr "IYANDIKA IDOSIYE Na"
+msgid "Delete account?"
+msgstr "Aderesi"
 
-#. mail:ask-signature-changed title
-#: mail/mail-errors.xml.h:184
+#: ../mail/mail.error.xml.h:41
 #, fuzzy
 msgid "Discard changed?"
 msgstr "Byahinduwe"
 
-#. mail:ask-signature-changed primary
-#: mail/mail-errors.xml.h:186
+#: ../mail/mail.error.xml.h:42
+msgid "Do you want the operation to be performed in the subfolders?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:43
 #, fuzzy
 msgid "Do you wish to save your changes?"
 msgstr "Kuri Kubika Amahinduka"
 
-#. mail:ask-signature-changed secondary
-#: mail/mail-errors.xml.h:188
+#: ../mail/mail.error.xml.h:44
 #, fuzzy
-msgid "This signature has been changed, but has not been saved."
-msgstr "Isinya Byahinduwe OYA"
+msgid "Don't delete"
+msgstr "Gusiba"
 
-# framework/source\services\documentlist.src:RID_DOCUMENTS_POPUP.ID_DISCARD.text
-#: mail/mail-errors.xml.h:189
+# sfx2/source\dialog\passwd.src:DLG_PASSWD.text
+#: ../mail/mail.error.xml.h:45
 #, fuzzy
-msgid "_Discard changes"
-msgstr "Kureka impinduka"
+msgid "Enter password."
+msgstr "Kwandika Ijambobanga"
 
-#. mail:vfolder-notexist primary
-#: mail/mail-errors.xml.h:191
+#: ../mail/mail.error.xml.h:46
 #, fuzzy
-msgid "Cannot edit vFolder \"{0}\" as it does not exist."
-msgstr "Guhindura 0 Nka OYA"
+msgid "Error loading filter definitions."
+msgstr "Itangira... Muyunguruzi..."
 
-#. mail:vfolder-notexist secondary
-#: mail/mail-errors.xml.h:193
-#, fuzzy
-msgid ""
-"This folder may have been added implicitly, go to the vFolder editor to add "
-"it explicitly, if required."
+#: ../mail/mail.error.xml.h:47
+msgid "Error while performing operation."
 msgstr ""
-"Ububiko Gicurasi Kyongewe Gyayo Kuri Muhinduzi Kuri Kongeramo NIBA Bya "
-"ngombwa"
 
-#. mail:vfolder-notunique primary
-#: mail/mail-errors.xml.h:195
+#: ../mail/mail.error.xml.h:48
 #, fuzzy
-msgid "Cannot add vFolder \"{0}\"."
-msgstr "Kongeramo 0"
+msgid "Error while {0}."
+msgstr "0"
 
-#. mail:vfolder-updated primary
-#: mail/mail-errors.xml.h:199
+#: ../mail/mail.error.xml.h:49
 #, fuzzy
-msgid "vFolders automatically updated."
-msgstr "ku buryo bwikora"
+msgid "File exists but cannot overwrite it."
+msgstr "Idosiye Guhindura"
 
-#. mail:vfolder-updated secondary
-#: mail/mail-errors.xml.h:201
+#: ../mail/mail.error.xml.h:50
 #, fuzzy
-msgid ""
-"The following vFolder(s):\n"
-"{0}\n"
-"Used the now removed folder:\n"
-"    \"{1}\"\n"
-"And have been updated."
-msgstr "S 0 NONEAHA Cyavanyweho Ububiko 1."
+msgid "File exists but is not a regular file."
+msgstr "Idosiye ni OYA a Ibisanzwe IDOSIYE"
 
-#. mail:filter-updated primary
-#: mail/mail-errors.xml.h:207
+#: ../mail/mail.error.xml.h:51
 #, fuzzy
-msgid "Mail filters automatically updated."
-msgstr "Muyunguruzi ku buryo bwikora"
+msgid "If you continue, you will not be able to recover these messages."
+msgstr "urifuzagukomeza OYA Kuri Ubutumwa"
 
-#. mail:filter-updated secondary
-#: mail/mail-errors.xml.h:209
+#: ../mail/mail.error.xml.h:52
 #, fuzzy
 msgid ""
-"The following filter rule(s):\n"
-"{0}\n"
-"Used the now removed folder:\n"
-"    \"{1}\"\n"
-"And have been updated."
-msgstr "Muyunguruzi... S 0 NONEAHA Cyavanyweho Ububiko 1."
+"If you delete the folder, all of its contents and its subfolders contents "
+"will be deleted permanently."
+msgstr "Gusiba Ububiko Byose Bya Ibigize Na Ibigize Cyasibwe"
 
-#. mail:no-folder primary
-#: mail/mail-errors.xml.h:215
+#: ../mail/mail.error.xml.h:53
 #, fuzzy
-msgid "Missing folder."
-msgstr "Ububiko"
+msgid "If you proceed, the account information will be deleted permanently."
+msgstr "Aderesi Ibisobanuro Cyasibwe"
 
-#. mail:no-folder secondary
-#: mail/mail-errors.xml.h:217
+#: ../mail/mail.error.xml.h:54
 #, fuzzy
-msgid "You must specify a folder."
-msgstr "a Ububiko"
+msgid ""
+"If you quit, these messages will not be sent until Evolution is started "
+"again."
+msgstr "Kuvamo Ubutumwa OYA Yoherejwe: ni"
 
-#. mail:no-name-vfolder secondary
-#: mail/mail-errors.xml.h:221
-#, fuzzy
-msgid "You must name this vFolder."
-msgstr "Izina: iyi"
+# svx/source\options\optjsearch.src:RID_SVXPAGE_JSEARCH_OPTIONS.FL_IGNORE.text
+#: ../mail/mail.error.xml.h:55
+msgid "Ignore"
+msgstr "Kureka"
 
-#. mail:vfolder-no-source primary
-#: mail/mail-errors.xml.h:223
+#: ../mail/mail.error.xml.h:56
+msgid "Invalid authentication"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:57
 #, fuzzy
-msgid "No sources selected."
-msgstr "Byahiswemo"
+msgid "Mail filters automatically updated."
+msgstr "Muyunguruzi ku buryo bwikora"
 
-#. mail:vfolder-no-source secondary
-#: mail/mail-errors.xml.h:225
+#: ../mail/mail.error.xml.h:58
 #, fuzzy
 msgid ""
-"You must specify at least one folder as a source.\n"
-"Either by selecting the folders individually, and/or by selecting\n"
-"all local folders, all remote folders, or both."
-msgstr "ku Ububiko Nka a Inkomoko ku Na Cyangwa ku Byose Cyangwa Byombi"
+"Many email systems add an Apparently-To header to messages that only have "
+"BCC recipients. This header, if added, will list all of your recipients to "
+"your message anyway. To avoid this, you should add at least one To: or CC: "
+"recipient."
+msgstr ""
+"imeli Kongeramo Umutwempangano Kuri Ubutumwa Abandikiwe... Umutwempangano "
+"NIBA Kyongewe Urutonde Byose Bya Abandikiwe... Kuri Ubutumwa iyi Kongeramo "
+"ku Cyangwa Umukoresha"
 
-#. mail:ask-migrate-existing primary
-#: mail/mail-errors.xml.h:229
+#: ../mail/mail.error.xml.h:59
 #, fuzzy
-msgid "Problem migrating old mail folder \"{0}\"."
-msgstr "ki/ bishaje Ubutumwa Ububiko 0"
+msgid "Mark all messages as read"
+msgstr "Byose Kigaragara Ubutumwa Nka Gusoma"
 
-#. mail:ask-migrate-existing secondary
-#: mail/mail-errors.xml.h:231
+#: ../mail/mail.error.xml.h:60
 #, fuzzy
-msgid ""
-"A non-empty folder at \"{1}\" already exists.\n"
-"\n"
-"You can choose to ignore this folder, overwrite or append its contents, or "
-"quit.\n"
-msgstr ""
-"A ubusa Ububiko ku 1. Guhitamo Kuri Kwirengagiza iyi Ububiko Guhindura "
-"Cyangwa Kongeraho... Ibigize Cyangwa Kuvamo"
+msgid "Mark all messages as read in the selected folder"
+msgstr "Ubutumwa Nka Gusoma Nyuma"
 
-# svx/source\options\optjsearch.src:RID_SVXPAGE_JSEARCH_OPTIONS.FL_IGNORE.text
-#: mail/mail-errors.xml.h:235
-msgid "Ignore"
-msgstr "Kureka"
+#: ../mail/mail.error.xml.h:61
+#, fuzzy
+msgid "Missing folder."
+msgstr "Ububiko"
 
-# sfx2/source\doc\new.src:DLG_NEW_FILE.CB_MERGE_STYLE.text
-#: mail/mail-errors.xml.h:236 widgets/misc/e-system-errors.xml.h:7
+#: ../mail/mail.error.xml.h:63
 #, fuzzy
-msgid "_Overwrite"
-msgstr "Guhindura"
+msgid "No sources selected."
+msgstr "Byahiswemo"
 
-# 214
-#: mail/mail-errors.xml.h:237
+#: ../mail/mail.error.xml.h:64
 #, fuzzy
-msgid "_Append"
-msgstr "kugereka"
+msgid "Opening too many messages at once may take a long time."
+msgstr "Ubutumwa ku Rimwe Gicurasi a Igihe"
 
-#. mail:no-load-license primary
-#: mail/mail-errors.xml.h:239
+#: ../mail/mail.error.xml.h:65
 #, fuzzy
-msgid "Unable to read license file."
-msgstr "Kuri Gusoma IDOSIYE"
+msgid "Please check your account settings and try again."
+msgstr "Kugenzura... Aderesi Amagenamiterere Na"
 
-#. mail:no-load-license secondary
-#: mail/mail-errors.xml.h:241
+#: ../mail/mail.error.xml.h:66
 #, fuzzy
 msgid ""
-"Cannot read the license file \"{0}\", due to an\n"
-"      installation problem.  You will not be able to use this provider "
-"until\n"
-"      you can accept its license."
+"Please enter a valid email address in the To: field. You can search for "
+"email addresses by clicking on the To: button next to the entry box."
 msgstr ""
-"Gusoma IDOSIYE 0 Kuri iyinjizaporogaramu OYA Kuri Gukoresha iyi Kwemera"
+"Injiza a Byemewe imeli Aderesi in Umwanya Gushaka kugirango imeli Amaderesi "
+"ku ku Akabuto Komeza>> Kuri Icyinjijwe Agasanduku"
 
-#. mail:checking-service title
-#: mail/mail-errors.xml.h:245
+#: ../mail/mail.error.xml.h:67
 #, fuzzy
-msgid "Querying server"
-msgstr "Seriveri"
+msgid ""
+"Please make sure the following recipients are willing and able to receive "
+"HTML email:\n"
+"{0}\n"
+"Send anyway?"
+msgstr "Ubwoko Abandikiwe... Na Kuri Akira imeli 0"
 
-#. mail:checking-service primary
-#: mail/mail-errors.xml.h:247
+#: ../mail/mail.error.xml.h:70
 #, fuzzy
 msgid "Please wait."
 msgstr "Ba wihanganye..."
 
-#. mail:checking-service secondary
-#: mail/mail-errors.xml.h:249
+#: ../mail/mail.error.xml.h:71
 #, fuzzy
-msgid "Querying server for a list of supported authentication mechanisms."
-msgstr "Seriveri kugirango a Urutonde Bya"
+msgid "Problem migrating old mail folder &quot;{0}&quot;."
+msgstr "ki/ bishaje Ubutumwa Ububiko 0"
 
-#. mail:gw-accountsetup-error primary
-#: mail/mail-errors.xml.h:251
+#: ../mail/mail.error.xml.h:72
 #, fuzzy
-msgid ""
-"Unable to connect to the GroupWise\n"
-"server."
-msgstr "Kuri Kwihuza Kuri"
+msgid "Querying server"
+msgstr "Seriveri"
 
-#. mail:gw-accountsetup-error secondary
-#: mail/mail-errors.xml.h:254
+#: ../mail/mail.error.xml.h:73
 #, fuzzy
-msgid ""
-"\n"
-"Please check your account settings and try again.\n"
-msgstr "Kugenzura... Aderesi Amagenamiterere Na"
+msgid "Querying server for a list of supported authentication mechanisms."
+msgstr "Seriveri kugirango a Urutonde Bya"
 
-#: mail/mail-folder-cache.c:813
-#, c-format
-msgid "Pinging %s"
+#: ../mail/mail.error.xml.h:74
+msgid "Read receipt requested."
 msgstr ""
 
-#: mail/mail-ops.c:101
-msgid "Filtering Folder"
-msgstr ""
+#: ../mail/mail.error.xml.h:75
+#, fuzzy
+msgid "Really delete folder &quot;{0}&quot; and all of its subfolders?"
+msgstr "Gusiba Ububiko 0 Na Byose Bya"
 
-#: mail/mail-ops.c:262
-msgid "Fetching Mail"
+#: ../mail/mail.error.xml.h:76
+msgid "Send Receipt"
 msgstr ""
 
-#: mail/mail-ops.c:556 mail/mail-ops.c:598
-#, fuzzy, c-format
+#: ../mail/mail.error.xml.h:77
+#, fuzzy
 msgid ""
-"Failed to append to %s: %s\n"
-"Appending to local `Sent' folder instead."
-msgstr "Kuri Kongeraho... Kuri Kuri Ububiko"
-
-#. sending mail, filtering failed
-#: mail/mail-ops.c:577
-#, fuzzy, c-format
-msgid "Failed to apply outgoing filters: %s"
-msgstr "Kuri Gukurikiza Muyunguruzi"
-
-#: mail/mail-ops.c:615
-#, fuzzy, c-format
-msgid "Failed to append to local `Sent' folder: %s"
-msgstr "Kuri Kongeraho... Kuri Ububiko"
-
-#: mail/mail-ops.c:727
-#, fuzzy, c-format
-msgid "Sending message %d of %d"
-msgstr "Ubutumwa Bya"
-
-#: mail/mail-ops.c:752
-#, fuzzy, c-format
-msgid "Failed to send %d of %d messages"
-msgstr "Kuri Kohereza Bya Ubutumwa"
+"System folders are required for Ximian Evolution to function correctly and "
+"cannot be renamed, moved, or deleted."
+msgstr "Bya ngombwa kugirango Kuri Umumaro Na Cyangwa Cyasibwe"
 
-#: mail/mail-ops.c:754 mail/mail-send-recv.c:613
+#: ../mail/mail.error.xml.h:78
 #, fuzzy
-msgid "Cancelled."
-msgstr "Kureka"
+msgid ""
+"The contact list you are sending to is configured to hide list recipients.\n"
+"\n"
+"Many email systems add an Apparently-To header to messages that only have "
+"BCC recipients. This header, if added, will list all of your recipients in "
+"your message. To avoid this, you should add at least one To: or CC: "
+"recipient. "
+msgstr ""
+"Umuntu Urutonde Kuri ni Kuri Gushisha Urutonde Abandikiwe... imeli Kongeramo "
+"Umutwempangano Kuri Ubutumwa Abandikiwe... Umutwempangano NIBA Kyongewe "
+"Urutonde Byose Bya Abandikiwe... in Ubutumwa iyi Kongeramo ku Cyangwa "
+"Umukoresha"
 
-# officecfg/registry\schema\org\openoffice\Office\DataAccess.xcs:....FormSearchOptions.SearchPosition..complete-field.text
-#: mail/mail-ops.c:756
+#: ../mail/mail.error.xml.h:81
 #, fuzzy
-msgid "Complete."
-msgstr "Byuzuye"
+msgid ""
+"The following filter rule(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    &quot;{1}&quot;\n"
+"And have been updated."
+msgstr "Muyunguruzi... S 0 NONEAHA Cyavanyweho Ububiko 1."
 
-#: mail/mail-ops.c:853
+#: ../mail/mail.error.xml.h:86
 #, fuzzy
-msgid "Saving message to folder"
-msgstr "Ubutumwa Kuri Ububiko"
-
-#: mail/mail-ops.c:938
-#, fuzzy, c-format
-msgid "Moving messages to %s"
-msgstr "Ubutumwa Kuri"
-
-#: mail/mail-ops.c:938
-#, fuzzy, c-format
-msgid "Copying messages to %s"
-msgstr "Ubutumwa Kuri"
+msgid ""
+"The following vFolder(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    &quot;{1}&quot;\n"
+"And have been updated."
+msgstr "S 0 NONEAHA Cyavanyweho Ububiko 1."
 
-#: mail/mail-ops.c:1164
+#: ../mail/mail.error.xml.h:91
 #, fuzzy
-msgid "Forwarded messages"
-msgstr "Ubutumwa"
-
-# 4429
-#: mail/mail-ops.c:1207
-#, fuzzy, c-format
-msgid "Opening folder %s"
-msgstr "gufungura dosiye"
-
-#: mail/mail-ops.c:1279
-#, c-format
-msgid "Opening store %s"
+msgid ""
+"The message was sent via the &quot;sendmail&quot; external application.  "
+"Sendmail reports the following error: status 67: mail not sent.\n"
+"The message is stored in the Outbox folder.  Check the message for errors "
+"and resend."
 msgstr ""
+"Ubutumwa Yoherejwe: Biturutse external Porogaramu Raporo Ikosa Imimerere "
+"Ubutumwa OYA Yoherejwe: Ubutumwa ni in Ububiko Ubutumwa kugirango Amakosa Na "
+"Ongera wohereze"
 
-#: mail/mail-ops.c:1357
-#, fuzzy, c-format
-msgid "Removing folder %s"
-msgstr "Ububiko"
-
-#: mail/mail-ops.c:1451
-#, fuzzy, c-format
-msgid "Storing folder '%s'"
-msgstr "Ububiko"
-
-#: mail/mail-ops.c:1516
-#, fuzzy, c-format
-msgid "Expunging and storing account '%s'"
-msgstr "Na Aderesi"
-
-#: mail/mail-ops.c:1517
-#, fuzzy, c-format
-msgid "Storing account '%s'"
-msgstr "Aderesi"
-
-#: mail/mail-ops.c:1572
+#: ../mail/mail.error.xml.h:93
 #, fuzzy
-msgid "Refreshing folder"
-msgstr "Ububiko"
+msgid "The script file must exist and be executable."
+msgstr "IYANDIKA IDOSIYE Na"
 
-#: mail/mail-ops.c:1608 mail/mail-ops.c:1659
+#: ../mail/mail.error.xml.h:94
 #, fuzzy
-msgid "Expunging folder"
-msgstr "Ububiko"
-
-#: mail/mail-ops.c:1656
-#, fuzzy, c-format
-msgid "Emptying trash in '%s'"
-msgstr "in"
-
-#: mail/mail-ops.c:1657
-msgid "Local Folders"
-msgstr ""
-
-#: mail/mail-ops.c:1740
-#, fuzzy, c-format
-msgid "Retrieving message %s"
-msgstr "Ubutumwa"
-
-#: mail/mail-ops.c:1812
-#, fuzzy, c-format
-msgid "Retrieving %d message"
-msgid_plural "Retrieving %d messages"
-msgstr[0] "Ubutumwa"
-
-#: mail/mail-ops.c:1898
-#, fuzzy, c-format
-msgid "Saving %d message"
-msgid_plural "Saving %d messsages"
-msgstr[0] "Ubutumwa"
-
-#: mail/mail-ops.c:1948
-#, fuzzy, c-format
 msgid ""
-"Unable to create output file: %s\n"
-" %s"
-msgstr "Kuri Kurema Ibisohoka IDOSIYE"
+"This folder may have been added implicitly, go to the vFolder editor to add "
+"it explicitly, if required."
+msgstr ""
+"Ububiko Gicurasi Kyongewe Gyayo Kuri Muhinduzi Kuri Kongeramo NIBA Bya "
+"ngombwa"
 
-#: mail/mail-ops.c:1976
-#, fuzzy, c-format
+#: ../mail/mail.error.xml.h:95
+#, fuzzy
 msgid ""
-"Error saving messages to: %s:\n"
-" %s"
-msgstr "Mu kubika Ubutumwa Kuri"
+"This message cannot be sent because you have not specified any Recipients"
+msgstr "Ubutumwa Yoherejwe: OYA"
 
-#: mail/mail-ops.c:2047
+#: ../mail/mail.error.xml.h:96
 #, fuzzy
-msgid "Saving attachment"
-msgstr "umugereka"
-
-#: mail/mail-ops.c:2059
-#, fuzzy, c-format
 msgid ""
-"Cannot create output file: %s:\n"
-" %s"
-msgstr "Kurema Ibisohoka IDOSIYE"
-
-#: mail/mail-ops.c:2069
-#, fuzzy, c-format
-msgid "Could not write data: %s"
-msgstr "OYA Ibyatanzwe"
-
-#: mail/mail-ops.c:2219
-#, fuzzy, c-format
-msgid "Disconnecting from %s"
-msgstr "Bivuye"
-
-#: mail/mail-ops.c:2219
-#, fuzzy, c-format
-msgid "Reconnecting to %s"
-msgstr "Kuri"
-
-#: mail/mail-ops.c:2335
-msgid "Checking Service"
+"This server does not support this type of authentication and may not support "
+"authentication at all."
 msgstr ""
+"Seriveri OYA Gushigikira iyi Ubwoko Bya Na Gicurasi OYA Gushigikira ku Byose"
 
-# # @name NS_MSG_CANCELLING
-#: mail/mail-send-recv.c:158
-msgid "Cancelling..."
-msgstr "Kureka..."
-
-#: mail/mail-send-recv.c:265
-#, fuzzy, c-format
-msgid "Server: %s, Type: %s"
-msgstr "Ubwoko bwa seriveri:"
+#: ../mail/mail.error.xml.h:97
+#, fuzzy
+msgid "This signature has been changed, but has not been saved."
+msgstr "Isinya Byahinduwe OYA"
 
-#: mail/mail-send-recv.c:267
-#, c-format
-msgid "Path: %s, Type: %s"
-msgstr ""
+#: ../mail/mail.error.xml.h:98
+#, fuzzy
+msgid "Unable to connect to the GroupWise server."
+msgstr "Kuri Kwihuza Kuri"
 
-# #-#-#-#-#  dbaccess.pot (Gnome 2.12)  #-#-#-#-#
-# #-#-#-#-#  dbaccess.pot (Gnome 2.12)  #-#-#-#-#
-#: mail/mail-send-recv.c:269
-#, fuzzy, c-format
-msgid "Type: %s"
-msgstr "Ubwoko"
+#: ../mail/mail.error.xml.h:99
+#, fuzzy
+msgid ""
+"Unable to open the drafts folder for this account.  Use the system drafts "
+"folder instead?"
+msgstr "Kuri Gufungura Ububiko kugirango iyi Aderesi Sisitemu Ububiko"
 
-#: mail/mail-send-recv.c:320
-msgid "Send & Receive Mail"
-msgstr ""
+#: ../mail/mail.error.xml.h:100
+#, fuzzy
+msgid "Unable to read license file."
+msgstr "Kuri Gusoma IDOSIYE"
 
-#: mail/mail-send-recv.c:327
-msgid "Cancel _All"
+#: ../mail/mail.error.xml.h:101
+msgid "Use _Default"
 msgstr ""
 
-# sc/source\ui\src\optdlg.src:RID_SCPAGE_LAYOUT.GB_LINK.text
-#: mail/mail-send-recv.c:416
+#: ../mail/mail.error.xml.h:102
 #, fuzzy
-msgid "Updating..."
-msgstr "Ivugurura"
+msgid "Use default drafts folder?"
+msgstr "Mburabuzi Ububiko"
 
-# so3/src\svuidlg.src:MD_UPDATE_BASELINKS.STR_WAITINGLINK.text
-#: mail/mail-send-recv.c:416 mail/mail-send-recv.c:468
+#: ../mail/mail.error.xml.h:103
 #, fuzzy
-msgid "Waiting..."
-msgstr "Tegereza"
-
-#: mail/mail-session.c:208
-#, fuzzy, c-format
-msgid "Enter Password for %s"
-msgstr "kugirango"
-
-# sfx2/source\dialog\passwd.src:DLG_PASSWD.text
-#: mail/mail-session.c:210
-msgid "Enter Password"
-msgstr "Kwandika Ijambobanga"
-
-#: mail/mail-session.c:239
-msgid "User canceled operation."
-msgstr ""
+msgid "You have not filled in all of the required information."
+msgstr "OYA Byuzuye in Byose Bya Bya ngombwa Ibisobanuro"
 
-#: mail/mail-signature-editor.c:372
+#: ../mail/mail.error.xml.h:104
 #, fuzzy
-msgid "Edit signature"
-msgstr "Isinya"
+msgid "You have unsent messages, do you wish to quit anyway?"
+msgstr "Ubutumwa Kuri Kuvamo"
 
-#: mail/mail-signature-editor.c:412
+#: ../mail/mail.error.xml.h:105
 #, fuzzy
-msgid "Enter a name for this signature."
-msgstr "a Izina: kugirango iyi Isinya"
-
-# sc/source\ui\dbgui\pvfundlg.src:RID_SCDLG_PIVOTSUBT.FT_NAMELABEL.text
-#: mail/mail-signature-editor.c:415 plugins/shared-folder/properties.glade.h:5
-msgid "Name:"
-msgstr "Izina:"
+msgid "You may not create two accounts with the same name."
+msgstr "Gicurasi OYA Kurema Konti Na: Izina:"
 
-#: mail/mail-tools.c:115
-#, fuzzy, c-format
-msgid "Could not create spool directory `%s': %s"
-msgstr "OYA Kurema bushyinguro"
+#: ../mail/mail.error.xml.h:106
+#, fuzzy
+msgid "You must name this vFolder."
+msgstr "Izina: iyi"
 
-#: mail/mail-tools.c:142
-#, fuzzy, c-format
-msgid "Trying to movemail a non-mbox source `%s'"
-msgstr "Kuri a Inkomoko"
+#: ../mail/mail.error.xml.h:107
+#, fuzzy
+msgid "You must specify a folder."
+msgstr "a Ububiko"
 
-#: mail/mail-tools.c:241
-#, fuzzy, c-format
-msgid "Forwarded message - %s"
-msgstr "Ubutumwa"
+#: ../mail/mail.error.xml.h:108
+#, fuzzy
+msgid ""
+"You must specify at least one folder as a source.\n"
+"Either by selecting the folders individually, and/or by selecting all local "
+"folders, all remote folders, or both."
+msgstr "ku Ububiko Nka a Inkomoko ku Na Cyangwa ku Byose Cyangwa Byombi"
 
-#: mail/mail-tools.c:243
+#: ../mail/mail.error.xml.h:110
 #, fuzzy
-msgid "Forwarded message"
-msgstr "Ubutumwa"
+msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
+msgstr "Ifashayinjira Kuri Seriveri 0 Nka 0 Byanze"
 
-#: mail/mail-tools.c:283
-#, fuzzy, c-format
-msgid "Invalid folder: `%s'"
-msgstr "Ububiko"
+#: ../mail/mail.error.xml.h:111
+#, fuzzy
+msgid "Your message with the subject &quot;{0}&quot; was not delivered."
+msgstr "Ubutumwa Na: Ikivugwaho 0 OYA"
 
-#: mail/mail-vfolder.c:90
-#, fuzzy, c-format
-msgid "Setting up vFolder: %s"
-msgstr "Hejuru"
+# 214
+#: ../mail/mail.error.xml.h:112
+#, fuzzy
+msgid "_Append"
+msgstr "kugereka"
 
-#: mail/mail-vfolder.c:239
-#, fuzzy, c-format
-msgid "Updating vFolders for '%s:%s'"
-msgstr "kugirango"
+# framework/source\services\documentlist.src:RID_DOCUMENTS_POPUP.ID_DISCARD.text
+#: ../mail/mail.error.xml.h:113
+#, fuzzy
+msgid "_Discard changes"
+msgstr "Kureka impinduka"
 
-#: mail/mail-vfolder.c:246
-#, fuzzy, c-format
-msgid "Updating vFolders for '%s'"
-msgstr "kugirango"
+#: ../mail/mail.error.xml.h:114
+msgid "_Empty Trash"
+msgstr ""
 
-#: mail/mail-vfolder.c:1008
-msgid "Edit vFolder"
+#: ../mail/mail.error.xml.h:115
+msgid "_Expunge"
 msgstr ""
 
-#: mail/mail-vfolder.c:1092
-msgid "New vFolder"
+#: ../mail/mail.error.xml.h:116
+msgid "_Open Messages"
 msgstr ""
 
-#: mail/message-list.c:995
+#: ../mail/mail.error.xml.h:119
+#, fuzzy
+msgid "vFolders automatically updated."
+msgstr "ku buryo bwikora"
+
+#: ../mail/message-list.c:996
 msgid "Unseen"
 msgstr ""
 
-#: mail/message-list.c:996
+#: ../mail/message-list.c:997
 msgid "Seen"
 msgstr ""
 
-#: mail/message-list.c:997
+#: ../mail/message-list.c:998
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:998
+#: ../mail/message-list.c:999
 msgid "Multiple Unseen Messages"
 msgstr ""
 
-#: mail/message-list.c:999
+#: ../mail/message-list.c:1000
 msgid "Multiple Messages"
 msgstr ""
 
 # sfx2/source\dialog\mailwindow.src:RID_MAIL_WINDOW.LB_MAILWIN_PRIO.5.text
-#: mail/message-list.c:1003
+#: ../mail/message-list.c:1004
 msgid "Lowest"
 msgstr "Byo hasi cyane"
 
@@ -15733,84 +15859,85 @@ msgstr "Byo hasi cyane"
 # officecfg/registry\schema\org\openoffice\Inet.xcs:....SearchEngine.Or.ooInetCaseMatch..2.text
 # #-#-#-#-#  officecfg.pot (Gnome 2.12)  #-#-#-#-#
 # officecfg/registry\schema\org\openoffice\Inet.xcs:....SearchEngine.Exact.ooInetCaseMatch..2.text
-#: mail/message-list.c:1004
+#: ../mail/message-list.c:1005
 msgid "Lower"
 msgstr "Ntoya"
 
-#: mail/message-list.c:1008
+#: ../mail/message-list.c:1009
 msgid "Higher"
 msgstr ""
 
 # 2807
-#: mail/message-list.c:1009
+#: ../mail/message-list.c:1010
 msgid "Highest"
 msgstr "kirekire kurusha ibindi"
 
 # sw/source\ui\misc\glossary.src:STR_QUERY_DELETE_GROUP2.text
-#: mail/message-list.c:1337
+#: ../mail/message-list.c:1338 ../widgets/table/e-cell-date.c:57
 msgid "?"
 msgstr "?"
 
 # sc/source\core\src\compiler.src:RID_SC_FUNCTION_NAMES.SC_OPCODE_GET_ACT_DATE.text
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: mail/message-list.c:1344 plugins/itip-formatter/itip-view.c:189
+#: ../mail/message-list.c:1345 ../plugins/itip-formatter/itip-view.c:193
+#: ../widgets/table/e-cell-date.c:72
 #, fuzzy
 msgid "Today %l:%M %p"
 msgstr "UYUMUNSI"
 
-#: mail/message-list.c:1353
+#: ../mail/message-list.c:1354 ../widgets/table/e-cell-date.c:82
 #, fuzzy
 msgid "Yesterday %l:%M %p"
 msgstr "Ejo"
 
-#: mail/message-list.c:1365
+#: ../mail/message-list.c:1366 ../widgets/table/e-cell-date.c:94
 #, fuzzy
 msgid "%a %l:%M %p"
 msgstr "%a%l:%M%pCYOSE"
 
-#: mail/message-list.c:1373
+#: ../mail/message-list.c:1374 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %l:%M %p"
 msgstr ""
 
 # desktop/source\app\ssodlg.src:DLG_SSOLOGIN.text
-#: mail/message-list.c:1375
+#: ../mail/message-list.c:1376 ../widgets/table/e-cell-date.c:104
 #, fuzzy
 msgid "%b %d %Y"
 msgstr "%b%d%Y"
 
-#: mail/message-list.c:2041
+#: ../mail/message-list.c:2042
 msgid "Message List"
 msgstr ""
 
-#: mail/message-list.c:3386
+#: ../mail/message-list.c:3387
 #, fuzzy
 msgid "Generating message list"
 msgstr "Ubutumwa Urutonde"
 
-#: mail/message-list.etspec.h:3
+#: ../mail/message-list.etspec.h:3
 msgid "Due By"
 msgstr ""
 
-#: mail/message-list.etspec.h:4
+#: ../mail/message-list.etspec.h:4
 msgid "Flag Status"
 msgstr ""
 
-#: mail/message-list.etspec.h:5
+#: ../mail/message-list.etspec.h:5
 #, fuzzy
 msgid "Flagged"
 msgstr "iriho ibendera"
 
-#: mail/message-list.etspec.h:6
+#: ../mail/message-list.etspec.h:6
 msgid "Follow Up Flag"
 msgstr ""
 
-#: mail/message-list.etspec.h:8
+#: ../mail/message-list.etspec.h:8
 msgid "Original Location"
 msgstr ""
 
 # 4971
-#: mail/message-list.etspec.h:9
+#: ../mail/message-list.etspec.h:9
 msgid "Received"
 msgstr "Cyakiriwe"
 
@@ -15818,156 +15945,176 @@ msgstr "Cyakiriwe"
 # goodies/source\filter.vcl\eos2met\dlgeos2.src:DLG_EXPORT_EMET.GRP_SIZE.text
 # #-#-#-#-#  goodies.pot (Gnome 2.12)  #-#-#-#-#
 # goodies/source\filter.vcl\epict\dlgepct.src:DLG_EXPORT_EPCT.GRP_SIZE.text
-#: mail/message-list.etspec.h:11
+#: ../mail/message-list.etspec.h:11
 msgid "Size"
 msgstr "Ingano"
 
-#: mail/message-tag-followup.c:74
+#: ../mail/message-tag-followup.c:74
 msgid "Call"
 msgstr ""
 
-#: mail/message-tag-followup.c:75
+#: ../mail/message-tag-followup.c:75
 msgid "Do Not Forward"
 msgstr ""
 
 # officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....Wizard.Agenda.Elements.Postprocessing.text
-#: mail/message-tag-followup.c:76
+#: ../mail/message-tag-followup.c:76
 #, fuzzy
 msgid "Follow-Up"
 msgstr "Ikurikirana- mirimo"
 
 # sw/source\ui\wizard\wizfxdlg.src:DLG_WIZARD_FX.DLG_FX5_Edit_Elem1.text
-#: mail/message-tag-followup.c:77
+#: ../mail/message-tag-followup.c:77
 #, fuzzy
 msgid "For Your Information"
 msgstr "Kumenyesha"
 
 # sch/sdi\schslots.src:SID_ROW_MOREFRONT.text
-#: mail/message-tag-followup.c:78 ui/evolution-mail-message.xml.h:42
+#: ../mail/message-tag-followup.c:78 ../ui/evolution-mail-message.xml.h:41
 msgid "Forward"
 msgstr "Imbere"
 
-#: mail/message-tag-followup.c:79
+#: ../mail/message-tag-followup.c:79
 msgid "No Response Necessary"
 msgstr ""
 
 # 5111
-#: mail/message-tag-followup.c:81 ui/evolution-mail-message.xml.h:85
+#: ../mail/message-tag-followup.c:81 ../ui/evolution-mail-message.xml.h:79
 msgid "Reply"
 msgstr "Subiza"
 
 # offmgr/sdi\ofaslots.src:SID_MAIL_GROUPREPLY.text
-#: mail/message-tag-followup.c:82 ui/evolution-mail-message.xml.h:86
+#: ../mail/message-tag-followup.c:82 ../ui/evolution-mail-message.xml.h:80
 msgid "Reply to All"
 msgstr "Gusubiza Bose"
 
-#: mail/message-tag-followup.c:83
+#: ../mail/message-tag-followup.c:83
 msgid "Review"
 msgstr "Isubiramo"
 
-#: mail/searchtypes.xml.h:1
+#: ../mail/searchtypes.xml.h:1
 #, fuzzy
 msgid "Body contains"
 msgstr "Kirimo"
 
-#: mail/searchtypes.xml.h:2
+#: ../mail/searchtypes.xml.h:2
 #, fuzzy
 msgid "Message contains"
 msgstr "Kirimo"
 
-#: mail/searchtypes.xml.h:3
+#: ../mail/searchtypes.xml.h:3
 msgid "Recipients contain"
 msgstr ""
 
-#: mail/searchtypes.xml.h:4
+#: ../mail/searchtypes.xml.h:4
 #, fuzzy
 msgid "Sender contains"
 msgstr "Kirimo"
 
-#: mail/searchtypes.xml.h:5
+#: ../mail/searchtypes.xml.h:5
 #, fuzzy
 msgid "Subject contains"
 msgstr "Kirimo"
 
-#: mail/searchtypes.xml.h:6
+#: ../mail/searchtypes.xml.h:6
 #, fuzzy
 msgid "Subject or Sender contains"
 msgstr "Cyangwa Kirimo"
 
-#: plugins/backup-restore/backup-restore.c:51
+#: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
+msgid ""
+"A formatter plugin which displays audio attachments inline and allows you to "
+"play them directly from evolution."
+msgstr ""
+
+#: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:2
+msgid "Audio inline plugin"
+msgstr ""
+
+#: ../plugins/backup-restore/backup-restore.c:51
 #, fuzzy
 msgid "Select name of Evolution archive"
 msgstr "Izina: Bya"
 
-#: plugins/backup-restore/backup-restore.c:61
+#: ../plugins/backup-restore/backup-restore.c:61
 #, fuzzy
 msgid "_Restart Evolution after backup"
 msgstr "Nyuma Inyibutsa"
 
-#: plugins/backup-restore/backup-restore.c:89
+#: ../plugins/backup-restore/backup-restore.c:89
 #, fuzzy
 msgid "Select Evolution archive to restore"
 msgstr "Kuri Kugarura"
 
-#: plugins/backup-restore/backup-restore.c:97
+#: ../plugins/backup-restore/backup-restore.c:97
 #, fuzzy
 msgid "_Restart Evolution after restore"
 msgstr "Nyuma Kugarura"
 
-#: plugins/backup-restore/backup.c:109
+#: ../plugins/backup-restore/backup.c:109
 #, fuzzy
 msgid "Backup Evolution directory"
 msgstr "bushyinguro"
 
-#: plugins/backup-restore/backup.c:111
+#: ../plugins/backup-restore/backup.c:111
 #, fuzzy
 msgid "Restore Evolution directory"
 msgstr "bushyinguro"
 
-#: plugins/backup-restore/backup.c:113
+#: ../plugins/backup-restore/backup.c:113
 msgid "Check Evolution archive"
 msgstr ""
 
-#: plugins/backup-restore/backup.c:115
+#: ../plugins/backup-restore/backup.c:115
 msgid "Restart Evolution"
 msgstr ""
 
-#: plugins/backup-restore/org-gnome-backup-restore.xml.h:1
+#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:1
+#, fuzzy
+msgid "A plugin for backing up and restore Evolution data and settings."
+msgstr "Na Kugarura Ibyatanzwe Na Amagenamiterere"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:2
+#, fuzzy
+msgid "Backup and restore plugin"
+msgstr "Na Kugarura Ibyatanzwe Na Amagenamiterere"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:1
 msgid "Backup Settings..."
 msgstr ""
 
-#: plugins/backup-restore/org-gnome-backup-restore.xml.h:2
+#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:2
 #, fuzzy
 msgid "Backup and restore Evolution data and settings"
 msgstr "Na Kugarura Ibyatanzwe Na Amagenamiterere"
 
-#: plugins/backup-restore/org-gnome-backup-restore.xml.h:3
+#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:3
 msgid "Restore Settings..."
 msgstr ""
 
-#: plugins/bbdb/bbdb.c:388
+#: ../plugins/bbdb/bbdb.c:398
 msgid "Automatic Contacts"
 msgstr ""
 
-#: plugins/bbdb/bbdb.c:397
+#: ../plugins/bbdb/bbdb.c:407
 #, fuzzy
 msgid "<span weight=\"bold\">Automatic Contacts</span>"
 msgstr "<Uburemere UTSINDAGIYE"
 
 #. Enable BBDB checkbox
-#: plugins/bbdb/bbdb.c:410
+#: ../plugins/bbdb/bbdb.c:420
 #, fuzzy
 msgid ""
 "_Automatically create entries in the addressbook when responding to mail"
 msgstr "Kurema Ibyinjijwe in Ryari: Kuri Ubutumwa"
 
-#: plugins/bbdb/bbdb.c:428
+#: ../plugins/bbdb/bbdb.c:438
 #, fuzzy
 msgid "<span weight=\"bold\">Instant Messaging Contacts</span>"
 msgstr "<Uburemere UTSINDAGIYE"
 
 #. Enable Gaim Checkbox
-#: plugins/bbdb/bbdb.c:441
+#: ../plugins/bbdb/bbdb.c:451
 #, fuzzy
 msgid ""
 "Periodically synchronize contact information and images from my _instant "
@@ -15975,96 +16122,159 @@ msgid ""
 msgstr "Kuringaniza Umuntu Ibisobanuro Na Ishusho Bivuye By'ako kanya"
 
 #. Synchronize now button.
-#: plugins/bbdb/bbdb.c:448
+#: ../plugins/bbdb/bbdb.c:458
 #, fuzzy
 msgid "Synchronize with _buddy list now"
 msgstr "Na: Urutonde NONEAHA"
 
-#: plugins/calendar-weather/calendar-weather.c:54
-#: plugins/calendar-weather/calendar-weather.c:60
+#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
+#, fuzzy
+msgid "Automatic contacts"
+msgstr "Aho kubariza"
+
+#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:2
+msgid ""
+"Automatically fills your addressbook with names and email addresses as you "
+"reply to mails. Also fills in IM contact information from your buddy lists."
+msgstr ""
+
+#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3
+msgid "BBDB"
+msgstr ""
+
+# svtools/source\dialogs\addresstemplate.src:STR_FIELD_CALENDAR.text
+#: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:1
+#, fuzzy
+msgid "Local Calendars"
+msgstr "Kalindari"
+
+#: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:2
+msgid "Provides core functionality for local calendars."
+msgstr ""
+
+# svtools/source\dialogs\addresstemplate.src:STR_FIELD_CALENDAR.text
+#: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:1
+#, fuzzy
+msgid "HTTP Calendars"
+msgstr "Kalindari"
+
+#: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:2
+msgid "Provides core functionality for webcal and http calendars."
+msgstr ""
+
+#: ../plugins/calendar-weather/calendar-weather.c:54
+#: ../plugins/calendar-weather/calendar-weather.c:60
 msgid "Weather: Cloudy"
 msgstr ""
 
-#: plugins/calendar-weather/calendar-weather.c:61
+#: ../plugins/calendar-weather/calendar-weather.c:61
 msgid "Weather: Fog"
 msgstr ""
 
-#: plugins/calendar-weather/calendar-weather.c:62
+#: ../plugins/calendar-weather/calendar-weather.c:62
 msgid "Weather: Partly Cloudy"
 msgstr ""
 
-#: plugins/calendar-weather/calendar-weather.c:63
+#: ../plugins/calendar-weather/calendar-weather.c:63
 msgid "Weather: Rain"
 msgstr ""
 
-#: plugins/calendar-weather/calendar-weather.c:64
+#: ../plugins/calendar-weather/calendar-weather.c:64
 msgid "Weather: Snow"
 msgstr ""
 
-#: plugins/calendar-weather/calendar-weather.c:65
+#: ../plugins/calendar-weather/calendar-weather.c:65
 msgid "Weather: Sunny"
 msgstr ""
 
-#: plugins/calendar-weather/calendar-weather.c:66
+#: ../plugins/calendar-weather/calendar-weather.c:66
 msgid "Weather: Thunderstorms"
 msgstr ""
 
-#: plugins/calendar-weather/calendar-weather.c:268
+#: ../plugins/calendar-weather/calendar-weather.c:268
 #, fuzzy
 msgid "Select a location"
 msgstr "a Ahantu"
 
-#: plugins/calendar-weather/calendar-weather.c:655
+#: ../plugins/calendar-weather/calendar-weather.c:655
 msgid "_Units:"
 msgstr ""
 
-#: plugins/calendar-weather/calendar-weather.c:662
+#: ../plugins/calendar-weather/calendar-weather.c:662
 #, fuzzy
 msgid "Metric (Celsius, cm, etc)"
 msgstr "cm"
 
-#: plugins/calendar-weather/calendar-weather.c:663
+#: ../plugins/calendar-weather/calendar-weather.c:663
 #, fuzzy
 msgid "Imperial (Fahrenheit, inches, etc)"
 msgstr "inci"
 
-#: plugins/default-source/default-source.c:82
+#: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:1
+msgid "Provides core functionality for weather calendars."
+msgstr ""
+
+# setup2/source\ui\pages\paddr.src:RESID_PAGE_PAGEADDRESS.LB_COUNTRY.74.text
+#: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:2
 #, fuzzy
-msgid "Mark  as default folder"
-msgstr "Nka Mburabuzi Ububiko"
+msgid "Weather Calendars"
+msgstr "UBuhorandi"
+
+#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:1
+msgid ""
+"A test plugin which demonstrates a popup menu plugin which lets you copy "
+"things to the clipboard."
+msgstr ""
+
+#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
+#, fuzzy
+msgid "Copy _Email Address"
+msgstr "Aderesi ya imeli:"
+
+# 1191
+#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:3
+#, fuzzy
+msgid "Copy tool"
+msgstr "kopororera ku nyandiko"
 
-#: plugins/default-source/default-source.c:108
+#: ../plugins/default-source/default-source.c:82
+#: ../plugins/default-source/default-source.c:108
 #, fuzzy
 msgid "Mark as default folder"
 msgstr "Nka Mburabuzi Ububiko"
 
 #. i18n: "Secure Password Authentication" is an Outlookism
-#: plugins/exchange-account-setup/exchange-account-setup.c:59
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:68
 msgid "Secure Password"
 msgstr ""
 
 #. i18n: "NTLM" probably doesn't translate
-#: plugins/exchange-account-setup/exchange-account-setup.c:62
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:71
 #, fuzzy
 msgid ""
 "This option will connect to the Exchange server using secure password (NTLM) "
 "authentication."
 msgstr "Ihitamo Kwihuza Kuri Seriveri ikoresha Ijambobanga..."
 
-#: plugins/exchange-account-setup/exchange-account-setup.c:70
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:79
 #, fuzzy
 msgid "Plaintext Password"
 msgstr "Plaintext"
 
-#: plugins/exchange-account-setup/exchange-account-setup.c:72
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:81
 #, fuzzy
 msgid ""
 "This option will connect to the Exchange server using standard plaintext "
 "password authentication."
 msgstr "Ihitamo Kwihuza Kuri Seriveri ikoresha Bisanzwe Ijambobanga..."
 
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:194
+#, fuzzy
+msgid "Could not read out-of-office state"
+msgstr "OYA Kurema Ubutumwa"
+
 #. Description section
-#: plugins/exchange-account-setup/exchange-account-setup.c:193
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:211
 #, fuzzy
 msgid ""
 "The message specified below will be automatically sent to \n"
@@ -16073,132 +16283,234 @@ msgstr ""
 "Ubutumwa munsi ku buryo bwikora Yoherejwe: Kuri Ubutumwa Kuri Inyuma Bya "
 "Ofise"
 
-#: plugins/exchange-account-setup/exchange-account-setup.c:221
-#: plugins/exchange-account-setup/exchange-account-setup.c:231
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:239
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:249
 #, fuzzy
 msgid "I am out of the office"
 msgstr "Inyuma Bya Ofise"
 
-#: plugins/exchange-account-setup/exchange-account-setup.c:224
-#: plugins/exchange-account-setup/exchange-account-setup.c:228
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:242
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:246
 #, fuzzy
 msgid "I am in the office"
 msgstr "in Ofise"
 
-#: plugins/exchange-account-setup/exchange-account-setup.c:257
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:275
 #, fuzzy
 msgid "Out of office Message:"
 msgstr "Bya Ofise"
 
-#: plugins/exchange-account-setup/exchange-account-setup.c:302
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:319
 msgid "Exchange Settings"
 msgstr ""
 
-#: plugins/exchange-account-setup/exchange-account-setup.c:475
-#: plugins/exchange-account-setup/exchange-ask-password.c:200
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:507
+#: ../plugins/exchange-account-setup/exchange-ask-password.c:200
 msgid "_OWA Url:"
 msgstr ""
 
-#: plugins/exchange-account-setup/exchange-account-setup.c:500
-#: plugins/exchange-account-setup/exchange-ask-password.c:193
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:532
+#: ../plugins/exchange-account-setup/exchange-ask-password.c:193
 msgid "A_uthenticate"
 msgstr ""
 
-#: plugins/exchange-account-setup/exchange-account-setup.c:722
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:597
+#, fuzzy
+msgid "Could not update out-of-office state"
+msgstr "OYA Kuvugurura Igikoresho"
+
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:724
 msgid "Authentication Type"
 msgstr ""
 
-#: plugins/exchange-account-setup/exchange-account-setup.c:736
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:738
 #, fuzzy
 msgid "Ch_eck for Supported Types"
 msgstr "kugirango"
 
-#: plugins/folder-unsubscribe/folder-unsubscribe.c:57
+#: ../plugins/folder-unsubscribe/folder-unsubscribe.c:57
 #, fuzzy, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr "Bivuye Ububiko"
 
-#: plugins/groupwise-account-setup/camel-gw-listener.c:413
+#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:1
+msgid "Allows unsubscribing of mail folders in the folder tree context menu."
+msgstr ""
+
+#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:2
+#, fuzzy
+msgid "Unsubscribe Folders"
+msgstr "Kuri"
+
+#: ../plugins/groupwise-features/camel-gw-listener.c:413
 msgid "Checklist"
 msgstr ""
 
-#: plugins/groupwise-send-options/org-gnome-compose-send-options.xml.h:1
+#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:1
 #, fuzzy
 msgid "Add Send Options to groupwise messages"
 msgstr "Kuri Ubutumwa"
 
-#: plugins/groupwise-send-options/org-gnome-compose-send-options.xml.h:2
-#: widgets/misc/e-send-options.glade.h:20
+#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
+#: ../widgets/misc/e-send-options.glade.h:17
 msgid "Send Options"
 msgstr ""
 
-#: plugins/itip-formatter/itip-formatter.c:704
+#: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
+msgid "A plugin for the features in Groupwise accounts."
+msgstr ""
+
+#: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:2
+msgid "Groupwise Features"
+msgstr ""
+
+#: ../plugins/groupwise-features/properties.glade.h:2
+#, fuzzy
+msgid "<b>Users :</b>"
+msgstr "<B B"
+
+# sfx2/source\doc\doc.src:STR_DOCTYPENAME_MESSAGE.text
+#: ../plugins/groupwise-features/properties.glade.h:4
+#: ../widgets/table/e-table-click-to-add.c:510
+msgid "Message"
+msgstr "Ubutumwa"
+
+#: ../plugins/groupwise-features/properties.glade.h:6
+msgid "Shared Folder Notification"
+msgstr ""
+
+#: ../plugins/groupwise-features/properties.glade.h:8
+#, fuzzy
+msgid "The participants will receive the following notification.\n"
+msgstr "Abitabiriye Akira Ikimenyetso"
+
+#: ../plugins/groupwise-features/properties.glade.h:11
+#, fuzzy
+msgid "_Contacts..."
+msgstr "Aho kubariza"
+
+#: ../plugins/groupwise-features/properties.glade.h:12
+#, fuzzy
+msgid "_Cutomize notification message"
+msgstr "Ikimenyetso Ubutumwa"
+
+#: ../plugins/groupwise-features/properties.glade.h:13
+msgid "_Not Shared"
+msgstr ""
+
+#: ../plugins/groupwise-features/properties.glade.h:15
+msgid "_Shared With ..."
+msgstr ""
+
+#: ../plugins/groupwise-features/properties.glade.h:16
+#, fuzzy
+msgid "_Sharing"
+msgstr "Bisangiwe"
+
+#: ../plugins/groupwise-features/send-options.c:82
+#, fuzzy, c-format
+msgid "%sEnter password for %s (user %s)"
+msgstr "%sEnterIjambobanga... kugirango Ukoresha:"
+
+#: ../plugins/groupwise-features/share-folder-common.c:317
+msgid "Users"
+msgstr ""
+
+#: ../plugins/groupwise-features/share-folder-common.c:318
+#, fuzzy
+msgid "Enter the users and set permissions"
+msgstr "Na Gushyiraho Uruhushya"
+
+#: ../plugins/groupwise-features/share-folder-common.c:337
+#, fuzzy
+msgid "New _Shared Folder..."
+msgstr "Idosiye nshya..."
+
+#: ../plugins/groupwise-features/share-folder-common.c:440
+msgid "Sharing"
+msgstr "Bisangiwe"
+
+#: ../plugins/itip-formatter/itip-formatter.c:688
 #, fuzzy
 msgid "Unable to parse item"
 msgstr "Kuri Ikintu"
 
-#: plugins/itip-formatter/itip-formatter.c:757
+#: ../plugins/itip-formatter/itip-formatter.c:741
 #, fuzzy, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "Kuri Kohereza Ikintu Kuri Kalindari"
 
-#: plugins/itip-formatter/itip-formatter.c:768
+#: ../plugins/itip-formatter/itip-formatter.c:752
 #, fuzzy, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Kuri Kalindari Nka Byemewe"
 
-#: plugins/itip-formatter/itip-formatter.c:772
+#: ../plugins/itip-formatter/itip-formatter.c:756
 #, fuzzy, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Kuri Kalindari Nka"
 
-#: plugins/itip-formatter/itip-formatter.c:777
+#: ../plugins/itip-formatter/itip-formatter.c:761
 #, fuzzy, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Kuri Kalindari Nka"
 
-#: plugins/itip-formatter/itip-formatter.c:782
+#: ../plugins/itip-formatter/itip-formatter.c:766
 #, fuzzy, c-format
 msgid "Sent to calendar '%s' as cancelled"
 msgstr "Kuri Kalindari Nka Kureka"
 
-#: plugins/itip-formatter/itip-formatter.c:833
+#: ../plugins/itip-formatter/itip-formatter.c:859
+#, c-format
+msgid "Organizer has removed the delegate %s "
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:866
+msgid "Sent a cancellation notice to the delegate"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:868
+#, fuzzy
+msgid "Could not send the cancellation notice to the delegate"
+msgstr "nka Kuri Kohereza a kugirango iyi Ikinyamakuru Icyinjijwe"
+
+#: ../plugins/itip-formatter/itip-formatter.c:940
 #, fuzzy
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "Imimerere OYA Imimerere ni Sibyo"
 
-#: plugins/itip-formatter/itip-formatter.c:844
+#: ../plugins/itip-formatter/itip-formatter.c:966
 #, fuzzy, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Kuri Kuvugurura"
 
-#: plugins/itip-formatter/itip-formatter.c:848
+#: ../plugins/itip-formatter/itip-formatter.c:970
 #, fuzzy
 msgid "Attendee status updated"
 msgstr "Imimerere"
 
-#: plugins/itip-formatter/itip-formatter.c:973
+#: ../plugins/itip-formatter/itip-formatter.c:1097
 #, fuzzy
 msgid "The calendar attached is not valid"
 msgstr "Kalindari ni OYA Byemewe"
 
-#: plugins/itip-formatter/itip-formatter.c:974
+#: ../plugins/itip-formatter/itip-formatter.c:1098
 #, fuzzy
 msgid ""
 "The message claims to contain a calendar, but the calendar is not valid "
 "iCalendar."
 msgstr "Ubutumwa Kuri a Kalindari Kalindari ni OYA Byemewe"
 
-#: plugins/itip-formatter/itip-formatter.c:1008
-#: plugins/itip-formatter/itip-formatter.c:1023
-#: plugins/itip-formatter/itip-formatter.c:1078
+#: ../plugins/itip-formatter/itip-formatter.c:1132
+#: ../plugins/itip-formatter/itip-formatter.c:1147
+#: ../plugins/itip-formatter/itip-formatter.c:1223
 #, fuzzy
 msgid "The item in the calendar is not valid"
 msgstr "Ikintu in Kalindari ni OYA Byemewe"
 
-#: plugins/itip-formatter/itip-formatter.c:1009
-#: plugins/itip-formatter/itip-formatter.c:1024
-#: plugins/itip-formatter/itip-formatter.c:1079
+#: ../plugins/itip-formatter/itip-formatter.c:1133
+#: ../plugins/itip-formatter/itip-formatter.c:1148
+#: ../plugins/itip-formatter/itip-formatter.c:1224
 #, fuzzy
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
@@ -16207,56 +16519,56 @@ msgstr ""
 "Ubutumwa a Kalindari Kalindari Kirimo Oya Ibyabaye Ibikorwa Cyangwa Kigenga "
 "Irahuze Ibisobanuro"
 
-#: plugins/itip-formatter/itip-formatter.c:1034
+#: ../plugins/itip-formatter/itip-formatter.c:1158
 #, fuzzy
 msgid "The calendar attached contains multiple items"
 msgstr "Kalindari Kirimo Igikubo"
 
-#: plugins/itip-formatter/itip-formatter.c:1035
+#: ../plugins/itip-formatter/itip-formatter.c:1159
 #, fuzzy
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
 msgstr "Byose Bya IDOSIYE Na Kalindari cyavuye ahandi/ cyatumijwe"
 
-#: plugins/itip-formatter/itip-formatter.c:1672
+#: ../plugins/itip-formatter/itip-formatter.c:1824
 #, fuzzy
 msgid "Meetings and Tasks"
 msgstr "Na"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: plugins/itip-formatter/itip-formatter.c:1695
+#: ../plugins/itip-formatter/itip-formatter.c:1847
 #, fuzzy
 msgid "_Delete message after acting"
 msgstr "Ubutumwa Nyuma"
 
-#: plugins/itip-formatter/itip-formatter.c:1705
+#: ../plugins/itip-formatter/itip-formatter.c:1857
 #, fuzzy
 msgid "<span weight=\"bold\">Conflict Search</span>"
 msgstr "<Uburemere UTSINDAGIYE"
 
 #. Source selector
-#: plugins/itip-formatter/itip-formatter.c:1718
+#: ../plugins/itip-formatter/itip-formatter.c:1870
 #, fuzzy
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Kuri Gushaka kugirango"
 
-#: plugins/itip-formatter/itip-formatter.c:1735
+#: ../plugins/itip-formatter/itip-formatter.c:1887
 msgid "Conflict Search Table"
 msgstr ""
 
 # svtools/source\control\calendar.src:STR_SVT_CALENDAR_TODAY.text
 #. strftime format of a weekday and a date.
-#: plugins/itip-formatter/itip-view.c:175 ui/evolution-calendar.xml.h:34
-#: widgets/misc/e-cell-date-edit.c:240 widgets/misc/e-dateedit.c:450
+#: ../plugins/itip-formatter/itip-view.c:179 ../ui/evolution-calendar.xml.h:34
+#: ../widgets/misc/e-cell-date-edit.c:240 ../widgets/misc/e-dateedit.c:457
 msgid "Today"
 msgstr "Uyumunsi"
 
 # sc/source\core\src\compiler.src:RID_SC_FUNCTION_NAMES.SC_OPCODE_GET_ACT_DATE.text
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: plugins/itip-formatter/itip-view.c:180
+#: ../plugins/itip-formatter/itip-view.c:184
 #, fuzzy
 msgid "Today %H:%M"
 msgstr "UYUMUNSI"
@@ -16264,7 +16576,7 @@ msgstr "UYUMUNSI"
 # sc/source\core\src\compiler.src:RID_SC_FUNCTION_NAMES.SC_OPCODE_GET_ACT_DATE.text
 #. strftime format of a time,
 #. in 24-hour format.
-#: plugins/itip-formatter/itip-view.c:184
+#: ../plugins/itip-formatter/itip-view.c:188
 #, fuzzy
 msgid "Today %H:%M:%S"
 msgstr "UYUMUNSI"
@@ -16272,322 +16584,490 @@ msgstr "UYUMUNSI"
 # sc/source\core\src\compiler.src:RID_SC_FUNCTION_NAMES.SC_OPCODE_GET_ACT_DATE.text
 #. strftime format of a time,
 #. in 12-hour format.
-#: plugins/itip-formatter/itip-view.c:193
+#: ../plugins/itip-formatter/itip-view.c:197
 #, fuzzy
 msgid "Today %l:%M:%S %p"
 msgstr "UYUMUNSI"
 
 #. strftime format of a weekday and a date.
-#: plugins/itip-formatter/itip-view.c:203
+#: ../plugins/itip-formatter/itip-view.c:207
 msgid "Tomorrow"
 msgstr ""
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: plugins/itip-formatter/itip-view.c:208
+#: ../plugins/itip-formatter/itip-view.c:212
 msgid "Tomorrow %H:%M"
 msgstr ""
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: plugins/itip-formatter/itip-view.c:212
+#: ../plugins/itip-formatter/itip-view.c:216
 msgid "Tomorrow %H:%M:%S"
 msgstr ""
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: plugins/itip-formatter/itip-view.c:217
+#: ../plugins/itip-formatter/itip-view.c:221
 msgid "Tomorrow %l:%M %p"
 msgstr ""
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: plugins/itip-formatter/itip-view.c:221
+#: ../plugins/itip-formatter/itip-view.c:225
 msgid "Tomorrow %l:%M:%S %p"
 msgstr ""
 
 # basctl/source\basicide\basidesh.src:RID_IMGBTN_REMOVEWATCH.text
 #. strftime format of a weekday.
-#: plugins/itip-formatter/itip-view.c:240
+#: ../plugins/itip-formatter/itip-view.c:244
 #, fuzzy, c-format
 msgid "%A"
 msgstr "%A"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format, without seconds.
-#: plugins/itip-formatter/itip-view.c:245
+#: ../plugins/itip-formatter/itip-view.c:249
 msgid "%A %H:%M"
 msgstr ""
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format.
-#: plugins/itip-formatter/itip-view.c:249
+#: ../plugins/itip-formatter/itip-view.c:253
 msgid "%A %H:%M:%S"
 msgstr ""
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format, without seconds.
-#: plugins/itip-formatter/itip-view.c:254
+#: ../plugins/itip-formatter/itip-view.c:258
 #, fuzzy
 msgid "%A %l:%M %p"
 msgstr "%A%l:%M%pCYOSE"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format.
-#: plugins/itip-formatter/itip-view.c:258
+#: ../plugins/itip-formatter/itip-view.c:262
 msgid "%A %l:%M:%S %p"
 msgstr ""
 
 #. strftime format of a weekday and a date
 #. without a year.
-#: plugins/itip-formatter/itip-view.c:267
+#: ../plugins/itip-formatter/itip-view.c:271
 msgid "%A, %B %e"
 msgstr ""
 
 #. strftime format of a weekday, a date
 #. without a year and a time,
 #. in 24-hour format, without seconds.
-#: plugins/itip-formatter/itip-view.c:273
+#: ../plugins/itip-formatter/itip-view.c:277
 msgid "%A, %B %e %H:%M"
 msgstr ""
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 24-hour format.
-#: plugins/itip-formatter/itip-view.c:277
+#: ../plugins/itip-formatter/itip-view.c:281
 msgid "%A, %B %e %H:%M:%S"
 msgstr ""
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format, without seconds.
-#: plugins/itip-formatter/itip-view.c:282
+#: ../plugins/itip-formatter/itip-view.c:286
 #, fuzzy
 msgid "%A, %B %e %l:%M %p"
 msgstr "%A,%B%e%l:%M%p"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format.
-#: plugins/itip-formatter/itip-view.c:286
+#: ../plugins/itip-formatter/itip-view.c:290
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr ""
 
 #. strftime format of a weekday and a date.
-#: plugins/itip-formatter/itip-view.c:292
+#: ../plugins/itip-formatter/itip-view.c:296
 msgid "%A, %B %e, %Y"
 msgstr ""
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: plugins/itip-formatter/itip-view.c:297
+#: ../plugins/itip-formatter/itip-view.c:301
 msgid "%A, %B %e, %Y %H:%M"
 msgstr ""
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: plugins/itip-formatter/itip-view.c:301
+#: ../plugins/itip-formatter/itip-view.c:305
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr ""
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: plugins/itip-formatter/itip-view.c:306
+#: ../plugins/itip-formatter/itip-view.c:310
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr ""
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: plugins/itip-formatter/itip-view.c:310
+#: ../plugins/itip-formatter/itip-view.c:314
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr ""
 
-#: plugins/itip-formatter/itip-view.c:335
+#: ../plugins/itip-formatter/itip-view.c:339
 #, fuzzy, c-format
 msgid "<b>%s</b> through %s has published the following meeting information:"
 msgstr "<B B Gihinguranya Ibisobanuro"
 
-#: plugins/itip-formatter/itip-view.c:337
+#: ../plugins/itip-formatter/itip-view.c:341
 #, fuzzy, c-format
 msgid "<b>%s</b> has published the following meeting information:"
 msgstr "<B B Ibisobanuro"
 
-#: plugins/itip-formatter/itip-view.c:342
+#: ../plugins/itip-formatter/itip-view.c:346
 #, fuzzy, c-format
-msgid "<b>%s</b> requests the presence of %s at the following meeting:"
-msgstr "<B B Bya ku"
+msgid "<b>%s</b> has delegated the following meeting to you:"
+msgstr "<B B Kureka"
 
-#: plugins/itip-formatter/itip-view.c:345
+#: ../plugins/itip-formatter/itip-view.c:349
 #, fuzzy, c-format
 msgid "<b>%s</b> through %s requests your presence at the following meeting:"
 msgstr "<B B Gihinguranya ku"
 
-#: plugins/itip-formatter/itip-view.c:347
+#: ../plugins/itip-formatter/itip-view.c:351
 #, fuzzy, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
 msgstr "<B B ku"
 
-#: plugins/itip-formatter/itip-view.c:353
+#: ../plugins/itip-formatter/itip-view.c:357
 #, fuzzy, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
 msgstr "<B B Gihinguranya Kuri Kongeramo Kuri"
 
-#: plugins/itip-formatter/itip-view.c:355
+#: ../plugins/itip-formatter/itip-view.c:359
 #, fuzzy, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting:"
 msgstr "<B B Kuri Kongeramo Kuri"
 
-#: plugins/itip-formatter/itip-view.c:358
+#: ../plugins/itip-formatter/itip-view.c:362
 #, fuzzy, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following meeting:"
 msgstr "<B B Kuri Akira Ibisobanuro kugirango"
 
-#: plugins/itip-formatter/itip-view.c:361
+#: ../plugins/itip-formatter/itip-view.c:365
 #, fuzzy, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
 msgstr "<B B Yoherejwe: Inyuma"
 
-#: plugins/itip-formatter/itip-view.c:365
+#: ../plugins/itip-formatter/itip-view.c:369
 #, fuzzy, c-format
 msgid "<b>%s</b> through %s has cancelled the following meeting:"
 msgstr "<B B Gihinguranya Kureka"
 
-#: plugins/itip-formatter/itip-view.c:367
+#: ../plugins/itip-formatter/itip-view.c:371
 #, fuzzy, c-format
 msgid "<b>%s</b> has cancelled the following meeting."
 msgstr "<B B Kureka"
 
-#: plugins/itip-formatter/itip-view.c:370
+#: ../plugins/itip-formatter/itip-view.c:374
 #, fuzzy, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
 msgstr "<B B Amahinduka"
 
-#: plugins/itip-formatter/itip-view.c:374
+#: ../plugins/itip-formatter/itip-view.c:378
 #, fuzzy, c-format
 msgid "<b>%s</b> through %s has declined the following meeting changes:"
 msgstr "<B B Gihinguranya Amahinduka"
 
-#: plugins/itip-formatter/itip-view.c:376
+#: ../plugins/itip-formatter/itip-view.c:380
 #, fuzzy, c-format
 msgid "<b>%s</b> has declined the following meeting changes."
 msgstr "<B B Amahinduka"
 
-#: plugins/itip-formatter/itip-view.c:403
+#: ../plugins/itip-formatter/itip-view.c:407
 #, fuzzy, c-format
 msgid "<b>%s</b> through %s has published the following task:"
 msgstr "<B B Gihinguranya Igikorwa"
 
-#: plugins/itip-formatter/itip-view.c:405
+#: ../plugins/itip-formatter/itip-view.c:409
 #, fuzzy, c-format
 msgid "<b>%s</b> has published the following task:"
 msgstr "<B B Igikorwa"
 
-#: plugins/itip-formatter/itip-view.c:410
+#: ../plugins/itip-formatter/itip-view.c:414
 #, fuzzy, c-format
 msgid "<b>%s</b> requests the assignment of %s to the following task:"
 msgstr "<B B Igenera Bya Kuri Igikorwa"
 
-#: plugins/itip-formatter/itip-view.c:413
+#: ../plugins/itip-formatter/itip-view.c:417
 #, fuzzy, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
 msgstr "<B B Gihinguranya a Igikorwa"
 
-#: plugins/itip-formatter/itip-view.c:415
+#: ../plugins/itip-formatter/itip-view.c:419
 #, fuzzy, c-format
 msgid "<b>%s</b> has assigned you a task:"
 msgstr "<B B a Igikorwa"
 
-#: plugins/itip-formatter/itip-view.c:421
+#: ../plugins/itip-formatter/itip-view.c:425
 #, fuzzy, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing task:"
 msgstr "<B B Gihinguranya Kuri Kongeramo Kuri Igikorwa"
 
-#: plugins/itip-formatter/itip-view.c:423
+#: ../plugins/itip-formatter/itip-view.c:427
 #, fuzzy, c-format
 msgid "<b>%s</b> wishes to add to an existing task:"
 msgstr "<B B Kuri Kongeramo Kuri Igikorwa"
 
-#: plugins/itip-formatter/itip-view.c:426
+#: ../plugins/itip-formatter/itip-view.c:430
 #, fuzzy, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following "
 "assigned task:"
 msgstr "<B B Kuri Akira Ibisobanuro kugirango Igikorwa"
 
-#: plugins/itip-formatter/itip-view.c:429
+#: ../plugins/itip-formatter/itip-view.c:433
 #, fuzzy, c-format
 msgid "<b>%s</b> has sent back the following assigned task response:"
 msgstr "<B B Yoherejwe: Inyuma Igikorwa"
 
-#: plugins/itip-formatter/itip-view.c:433
+#: ../plugins/itip-formatter/itip-view.c:437
 #, fuzzy, c-format
 msgid "<b>%s</b> through %s has cancelled the following assigned task:"
 msgstr "<B B Gihinguranya Kureka Igikorwa"
 
-#: plugins/itip-formatter/itip-view.c:435
+#: ../plugins/itip-formatter/itip-view.c:439
 #, fuzzy, c-format
 msgid "<b>%s</b> has cancelled the following assigned task:"
 msgstr "<B B Kureka Igikorwa"
 
-#: plugins/itip-formatter/itip-view.c:438
+#: ../plugins/itip-formatter/itip-view.c:442
 #, fuzzy, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
 msgstr "<B B Igikorwa Igenera Amahinduka"
 
-#: plugins/itip-formatter/itip-view.c:442
+#: ../plugins/itip-formatter/itip-view.c:446
 #, fuzzy, c-format
 msgid "<b>%s</b> through %s has declined the following assigned task:"
 msgstr "<B B Gihinguranya Igikorwa"
 
-#: plugins/itip-formatter/itip-view.c:444
+#: ../plugins/itip-formatter/itip-view.c:448
 #, fuzzy, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
 msgstr "<B B Igikorwa"
 
+#. Start time
+#: ../plugins/itip-formatter/itip-view.c:871
+#, fuzzy
+msgid "Start time:"
+msgstr "Gutangira Igihe"
+
+#. End time
+#: ../plugins/itip-formatter/itip-view.c:880
+#, fuzzy
+msgid "End time:"
+msgstr "Impera Igihe"
+
 # padmin/source\padialog.src:RID_PADIALOG.RID_PA_TXT_COMMENT.text
 #. Comment
-#: plugins/itip-formatter/itip-view.c:892
-#: plugins/itip-formatter/itip-view.c:942
+#: ../plugins/itip-formatter/itip-view.c:896
+#: ../plugins/itip-formatter/itip-view.c:946
 msgid "Comment:"
 msgstr "Icyo wongeraho"
 
-#. org.gnome.mailing-list-actions:no-header primary
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:2
+#: ../plugins/itip-formatter/itip-view.c:960
 #, fuzzy
-msgid "Action not available"
-msgstr "OYA Bihari"
+msgid "Send u_pdates to attendees"
+msgstr "Kuri Kuvugurura"
 
-#. org.gnome.mailing-list-actions:no-header secondary
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:4
+#: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:1
 #, fuzzy
+msgid "Displays text/calendar parts in messages."
+msgstr "Komeza>> By'ingirakamaro Ubutumwa"
+
+#: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:2
+msgid "Itip Formatter"
+msgstr ""
+
+#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
 msgid ""
-"This message does not contain the header information required for this "
-"action."
+"&quot;{0}&quot; has delegated the meeting. Do you want to add the delegate "
+"&quot;{1}&quot; ?"
 msgstr ""
-"Ubutumwa OYA Umutwempangano Ibisobanuro Bya ngombwa kugirango iyi Igikorwa"
 
-#. org.gnome.mailing-list-actions:posting-not-allowed primary
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:6
+#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
 #, fuzzy
-msgid "Posting not allowed"
-msgstr "OYA"
+msgid "This meeting has been delegated"
+msgstr "Icyabaye Cyasibwe"
 
-#. org.gnome.mailing-list-actions:posting-not-allowed secondary
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:8
+#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:4
 #, fuzzy
 msgid ""
-"Posting to this mailing list is not allowed. Possibly, this is a read-only "
-"mailing list. Contact the list owner for details."
+"This response is not from a current attendee. Add the sender as an attendee?"
+msgstr "ni OYA Bivuye a KIGEZWEHO Nka"
+
+#: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:1
+msgid ""
+"A plugin which allows the creation of meetings from the contents of a mail "
+"message."
+msgstr ""
+
+#: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:2
+msgid "Con_vert to Meeting"
 msgstr ""
-"Kuri iyi Urutonde ni OYA iyi ni a Gusoma Urutonde Urutonde kugirango "
-"Birambuye"
 
-#. org.gnome.mailing-list-actions:ask-send-message primary
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:10
+#: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:3
 #, fuzzy
-msgid "Send e-mail message to mailing list?"
-msgstr "E Ubutumwa Ubutumwa Kuri Urutonde"
+msgid "Mail to meeting"
+msgstr "ni a"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:1
+msgid ""
+"A plugin which allows the creation of tasks from the contents of a mail "
+"message."
+msgstr ""
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:2
+msgid "Con_vert to Task"
+msgstr ""
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:3
+#, fuzzy
+msgid "Mail to task"
+msgstr "Kuri"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:1
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:1
+#, fuzzy
+msgid "Contact list _owner"
+msgstr "OYA Byabonetse"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:2
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:5
+msgid "Get list _archive"
+msgstr ""
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:3
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:6
+#, fuzzy
+msgid "Get list _usage information"
+msgstr "Ibisobanuro"
+
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is Mozilla Communicator client code, released
+# March 31, 1998.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 1998-1999
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+# James Green <jg@cyberstorm.demon.co.uk>
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either of the GNU General Public License Version 2 or later (the "GPL"),
+# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
+# Title
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:4
+#, fuzzy
+msgid "Mailing List Actions"
+msgstr "Ilisiti y'amabaruwa"
+
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is Mozilla Communicator client code, released
+# March 31, 1998.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 1998-1999
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+# James Green <jg@cyberstorm.demon.co.uk>
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either of the GNU General Public License Version 2 or later (the "GPL"),
+# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
+# Title
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:5
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:7
+#, fuzzy
+msgid "Mailing _List"
+msgstr "Ilisiti y'amabaruwa"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:6
+msgid ""
+"Provide actions for common mailing list commands (subscribe, "
+"unsubscribe, ...)."
+msgstr ""
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:7
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:11
+#, fuzzy
+msgid "_Post message to list"
+msgstr "Ubutumwa Kuri"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:8
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:12
+#, fuzzy
+msgid "_Subscribe to list"
+msgstr "Kwiyandikisha"
 
-#. org.gnome.mailing-list-actions:ask-send-message secondary
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:12
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:9
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:13
+#, fuzzy
+msgid "_Un-subscribe to list"
+msgstr "Kwivana aho wiyandikishe"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:1
+#, fuzzy
+msgid "Action not available"
+msgstr "OYA Bihari"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:2
 #, fuzzy
 msgid ""
 "An e-mail message will be sent to the URL \"{0}\". You can either send the "
@@ -16600,40 +17080,36 @@ msgstr ""
 "Cyangwa Na Guhindura>> Itangira Akira Bivuye Urutonde Nyuma Ubutumwa "
 "Yoherejwe:"
 
-# offmgr/sdi\ofaslots.src:SID_MAIL_SEND.text
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:15
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:5
 #, fuzzy
-msgid "_Send message"
-msgstr "Kohereza Ubutumwa"
+msgid "Malformed header"
+msgstr "Umutwempangano"
 
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:16
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:6
 #, fuzzy
-msgid "_Edit message"
-msgstr "Ubutumwa"
+msgid "No e-mail action"
+msgstr "E Ubutumwa Igikorwa"
 
-#. org.gnome.mailing-list-actions:malformed-header primary
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:18
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:7
 #, fuzzy
-msgid "Malformed header"
-msgstr "Umutwempangano"
+msgid "Posting not allowed"
+msgstr "OYA"
 
-#. org.gnome.mailing-list-actions:malformed-header secondary
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:20
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:8
 #, fuzzy
 msgid ""
-"The {0} header of this message is malformed and could not be processed.\n"
-"\n"
-"Header: {1}"
-msgstr "0 Umutwempangano Bya iyi Ubutumwa ni Na OYA 1."
+"Posting to this mailing list is not allowed. Possibly, this is a read-only "
+"mailing list. Contact the list owner for details."
+msgstr ""
+"Kuri iyi Urutonde ni OYA iyi ni a Gusoma Urutonde Urutonde kugirango "
+"Birambuye"
 
-#. org.gnome.mailing-list-actions:no-action primary
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:24
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:9
 #, fuzzy
-msgid "No e-mail action"
-msgstr "E Ubutumwa Igikorwa"
+msgid "Send e-mail message to mailing list?"
+msgstr "E Ubutumwa Ubutumwa Kuri Urutonde"
 
-#. org.gnome.mailing-list-actions:no-action secondary
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:26
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10
 #, fuzzy
 msgid ""
 "The action could not be performed. This means the header for this action did "
@@ -16643,32 +17119,123 @@ msgid ""
 msgstr ""
 "Igikorwa OYA Umutwempangano kugirango iyi Igikorwa OYA Igikorwa Twebwe 0"
 
-#. Create the checkbox we will display, complete with mnemonic that is unique in the dialog
-#: plugins/new-mail-notify/new-mail-notify.c:66
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:13
+#, fuzzy
+msgid ""
+"The {0} header of this message is malformed and could not be processed.\n"
+"\n"
+"Header: {1}"
+msgstr "0 Umutwempangano Bya iyi Ubutumwa ni Na OYA 1."
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:16
+#, fuzzy
+msgid ""
+"This message does not contain the header information required for this "
+"action."
+msgstr ""
+"Ubutumwa OYA Umutwempangano Ibisobanuro Bya ngombwa kugirango iyi Igikorwa"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:17
+#, fuzzy
+msgid "_Edit message"
+msgstr "Ubutumwa"
+
+# offmgr/sdi\ofaslots.src:SID_MAIL_SEND.text
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:18
+#, fuzzy
+msgid "_Send message"
+msgstr "Kohereza Ubutumwa"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:2
+msgid "Contact the owner of the mailing list this message belongs to"
+msgstr ""
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:3
+msgid "Get an archive of the list this message belongs to"
+msgstr ""
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:4
+msgid "Get information about the usage of the list this message belongs to"
+msgstr ""
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:8
+#, fuzzy
+msgid "Post a message to the mailing list this message belongs to"
+msgstr "a Subiza Kuri Urutonde Bya Byahiswemo Ubutumwa"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:9
+#, fuzzy
+msgid "Subscribe to the mailing list this message belongs to"
+msgstr "a Subiza Kuri Urutonde Bya Byahiswemo Ubutumwa"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:10
+#, fuzzy
+msgid "Unsubscribe to the mailing list this message belongs to"
+msgstr "a Subiza Kuri Urutonde Bya Byahiswemo Ubutumwa"
+
+#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:1
+msgid "Mark calendar offline"
+msgstr ""
+
+#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:2
 #, fuzzy
-msgid "_Generates a D-BUS message when new mail arrives"
+msgid "Marks the selected calendar for offline viewing."
+msgstr "Byahiswemo Ubutumwa kugirango Isibwa"
+
+#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:3
+msgid "_Do not make this available offline"
+msgstr ""
+
+#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:4
+#, fuzzy
+msgid "_Mark Calendar for offline use"
+msgstr ""
+"Kalindari ni OYA cy/ byagarajwe kugirango Ntibicometse kuri interineti "
+"Ikoresha:"
+
+#: ../plugins/new-mail-notify/org-gnome-new-mail-notify.eplug.xml.h:1
+#, fuzzy
+msgid "Generates a D-BUS message when new mail arrives."
 msgstr "a Ubutumwa Ryari: Gishya Ubutumwa"
 
-#: plugins/plugin-manager/org-gnome-plugin-manager.xml.h:1
+#: ../plugins/new-mail-notify/org-gnome-new-mail-notify.eplug.xml.h:2
+#, fuzzy
+msgid "New Mail Notification"
+msgstr "Ubwoko"
+
+#: ../plugins/new-mail-notify/org-gnome-new-mail-notify.eplug.xml.h:3
+#, fuzzy
+msgid "New mail notify"
+msgstr "Ubwoko"
+
+#: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:1
+msgid "A plugin for managing which plugins are enabled or disabled."
+msgstr ""
+
+#: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
+msgid "Plugin manager"
+msgstr ""
+
+#: ../plugins/plugin-manager/org-gnome-plugin-manager.xml.h:1
 #, fuzzy
 msgid "Enable and disable plugins"
 msgstr "Na"
 
-#: plugins/plugin-manager/org-gnome-plugin-manager.xml.h:2
-msgid "Manage Plugins..."
+#: ../plugins/plugin-manager/org-gnome-plugin-manager.xml.h:2
+msgid "Plugins"
 msgstr ""
 
-#: plugins/plugin-manager/plugin-manager.c:45
+#: ../plugins/plugin-manager/plugin-manager.c:45
 msgid "Author(s)"
 msgstr "Umwa(Aba)nditsi"
 
 # svtools/source\dialogs\addresstemplate.src:STR_FIELD_ID.text
-#: plugins/plugin-manager/plugin-manager.c:46
+#: ../plugins/plugin-manager/plugin-manager.c:46
 #, fuzzy
 msgid "Id"
 msgstr "ID"
 
-#: plugins/plugin-manager/plugin-manager.c:47
+#: ../plugins/plugin-manager/plugin-manager.c:47
 msgid "Path"
 msgstr "Inzira"
 
@@ -16676,237 +17243,282 @@ msgstr "Inzira"
 # basctl/source\basicide\moptions.src:RID_MACROOPTIONS.RID_FT_DESCR.text
 # #-#-#-#-#  basctl.pot (Gnome 2.12)  #-#-#-#-#
 # basctl/source\basicide\moptions.src:RID_MACROOPTIONS.text
-#: plugins/plugin-manager/plugin-manager.c:48
+#: ../plugins/plugin-manager/plugin-manager.c:48
 msgid "Description"
 msgstr "Isobanuramiterere"
 
 #. Setup the ui
-#: plugins/plugin-manager/plugin-manager.c:188
+#: ../plugins/plugin-manager/plugin-manager.c:188
 msgid "Plugin Manager"
 msgstr ""
 
-#: plugins/plugin-manager/plugin-manager.c:201
+#: ../plugins/plugin-manager/plugin-manager.c:201
 #, fuzzy
 msgid "Note: Some changes will not take effect until restart"
 msgstr "Amahinduka OYA INGARUKA Ongera utangire"
 
-#: plugins/plugin-manager/plugin-manager.c:210
+#: ../plugins/plugin-manager/plugin-manager.c:210
 msgid "Plugin"
 msgstr ""
 
-#: plugins/prefer-plain/prefer-plain.c:105
+#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:1
+msgid ""
+"A test plugin which demonstrates a formatter plugin which lets you choose to "
+"disable HTML mails.\n"
+"\n"
+"This plugin is unsupported demonstration code only.\n"
+msgstr ""
+
+#. but then we also need to create our own section frame
+#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:6
+#, fuzzy
+msgid "Plain Text Mode"
+msgstr "Plaintext"
+
+#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:7
+msgid "Prefer plain-text"
+msgstr ""
+
+#: ../plugins/prefer-plain/prefer-plain.c:105
 #, fuzzy
 msgid "Show HTML if present"
 msgstr "NIBA"
 
-#: plugins/prefer-plain/prefer-plain.c:106
+#: ../plugins/prefer-plain/prefer-plain.c:106
 msgid "Prefer PLAIN"
 msgstr ""
 
-#: plugins/prefer-plain/prefer-plain.c:107
+#: ../plugins/prefer-plain/prefer-plain.c:107
 #, fuzzy
 msgid "Only ever show PLAIN"
 msgstr "Garagaza"
 
-#: plugins/prefer-plain/prefer-plain.c:150
+#: ../plugins/prefer-plain/prefer-plain.c:150
 msgid "HTML Mode"
 msgstr ""
 
-#: plugins/save-attachments/org-gnome-save-attachments.xml.h:1
+#: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:1
+msgid "Gives an option to print mail from composer"
+msgstr ""
+
+#: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:1
+msgid "A plugin for saving all attachments or parts of a message at once."
+msgstr ""
+
+#: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:2
+#, fuzzy
+msgid "Save attachments"
+msgstr "Kubika Byose Imigereka"
+
+#: ../plugins/save-attachments/org-gnome-save-attachments.xml.h:1
 #, fuzzy
 msgid "Save Attachments ..."
 msgstr "Kubika"
 
-#: plugins/save-attachments/org-gnome-save-attachments.xml.h:2
+#: ../plugins/save-attachments/org-gnome-save-attachments.xml.h:2
 #, fuzzy
 msgid "Save all attachments"
 msgstr "Kubika Byose Imigereka"
 
-#: plugins/save-attachments/save-attachments.c:331
+#: ../plugins/save-attachments/save-attachments.c:331
 #, fuzzy
 msgid "Select save base name"
 msgstr "Kubika SHINGIRO Izina:"
 
-#: plugins/save-attachments/save-attachments.c:351
+#: ../plugins/save-attachments/save-attachments.c:351
 msgid "MIME Type"
 msgstr "Ubwoko bwa MIME"
 
 # basctl/source\basicide\basidesh.src:RID_STR_SAVE.text
-#: plugins/save-attachments/save-attachments.c:359
-#: ui/evolution-message-composer.xml.h:16
-#: ui/evolution-signature-editor.xml.h:6
+#: ../plugins/save-attachments/save-attachments.c:359
+#: ../ui/evolution-message-composer.xml.h:18
+#: ../ui/evolution-signature-editor.xml.h:6
 msgid "Save"
 msgstr "Kubika"
 
-#: plugins/save-calendar/csv-format.c:168
-#, c-format
-msgid "%s%d/%s%d/%s%d %s%d:%s%d:%s%d"
+#.
+#. * Translator: the %F %T is the thirth argument for a strftime function.
+#. * It lets you define the formatting of the date in the csv-file.
+#. *
+#: ../plugins/save-calendar/csv-format.c:171
+msgid "%F %T"
 msgstr ""
 
-#: plugins/save-calendar/csv-format.c:371
-#, c-format
-msgid ""
-"Uid%sSummary%sDescription List%sCategories List%sComment List%sCompleted%"
-"sCreated%sContact List%sStart%sEnd%sDue%sPercent Done%sPriority%sUrl%"
-"sAttendees List%sLocation%sModified%s"
+#: ../plugins/save-calendar/csv-format.c:385
+msgid "Uid"
 msgstr ""
 
-#: plugins/save-calendar/csv-format.c:520
+# #-#-#-#-#  basctl.pot (Gnome 2.12)  #-#-#-#-#
+# basctl/source\basicide\moptions.src:RID_MACROOPTIONS.RID_FT_DESCR.text
+# #-#-#-#-#  basctl.pot (Gnome 2.12)  #-#-#-#-#
+# basctl/source\basicide\moptions.src:RID_MACROOPTIONS.text
+#: ../plugins/save-calendar/csv-format.c:387
+#, fuzzy
+msgid "Description List"
+msgstr "Isobanuramiterere"
+
+# #-#-#-#-#  sfx2.pot (Gnome 2.12)  #-#-#-#-#
+# sfx2/source\doc\doctdlg.src:DLG_DOC_TEMPLATE.FT_SECTION.text
+# #-#-#-#-#  sfx2.pot (Gnome 2.12)  #-#-#-#-#
+# sfx2/source\doc\new.src:DLG_NEW_FILE.FT_REGION.text
+#: ../plugins/save-calendar/csv-format.c:388
+#, fuzzy
+msgid "Categories List"
+msgstr "Ibyiciro"
+
+#: ../plugins/save-calendar/csv-format.c:389
+#, fuzzy
+msgid "Comment List"
+msgstr "Kirimo"
+
+# sch/source\ui\dlg\dlggraut.src:DLG_CHART_WIZ.PB_EXECUTE.text
+#: ../plugins/save-calendar/csv-format.c:391
+#, fuzzy
+msgid "Created"
+msgstr "Kurema"
+
+#: ../plugins/save-calendar/csv-format.c:392
+#, fuzzy
+msgid "Contact List"
+msgstr "Aho kubariza"
+
+#: ../plugins/save-calendar/csv-format.c:393
+#, fuzzy
+msgid "Start"
+msgstr "Leta"
+
+#: ../plugins/save-calendar/csv-format.c:394
+msgid "End"
+msgstr ""
+
+#: ../plugins/save-calendar/csv-format.c:396
+msgid "percent Done"
+msgstr ""
+
+#: ../plugins/save-calendar/csv-format.c:398
+msgid "Url"
+msgstr ""
+
+#: ../plugins/save-calendar/csv-format.c:399
+#, fuzzy
+msgid "Attendees List"
+msgstr "Irangira na"
+
+# padmin/source\padialog.src:RID_TXT_TESTPAGE_MODEL.text
+#: ../plugins/save-calendar/csv-format.c:401
+#, fuzzy
+msgid "Modified"
+msgstr "Urugero"
+
+#: ../plugins/save-calendar/csv-format.c:552
 #, fuzzy
 msgid "Advanced options for the CSV format"
 msgstr "Amahitamo kugirango Imiterere"
 
-#: plugins/save-calendar/csv-format.c:527
+#: ../plugins/save-calendar/csv-format.c:559
 #, fuzzy
 msgid "Prepend a header"
 msgstr "a Umutwempangano"
 
-#: plugins/save-calendar/csv-format.c:536
+#: ../plugins/save-calendar/csv-format.c:568
 msgid "Value delimiter:"
 msgstr ""
 
-#: plugins/save-calendar/csv-format.c:542
+#: ../plugins/save-calendar/csv-format.c:574
 msgid "Record delimiter:"
 msgstr ""
 
-#: plugins/save-calendar/csv-format.c:548
+#: ../plugins/save-calendar/csv-format.c:580
 #, fuzzy
 msgid "Encapsulate values with:"
 msgstr "Uduciro Na:"
 
-#: plugins/save-calendar/csv-format.c:570
+#: ../plugins/save-calendar/csv-format.c:602
 #, fuzzy
 msgid "Comma separated value format (.csv)"
 msgstr "Agaciro Imiterere"
 
-#: plugins/save-calendar/ical-format.c:136
+#: ../plugins/save-calendar/ical-format.c:136
 #, fuzzy
 msgid "iCalendar format (.ics)"
 msgstr "Imiterere"
 
-#: plugins/save-calendar/rdf-format.c:391
+# sw/source\ui\wizard\wizbmp.src:STR_Lgo_NoSelect.text
+#: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:1
+#, fuzzy
+msgid "Save Selected"
+msgstr "Nta nakimwe cyatoranyijwe"
+
+#: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:2
+#, fuzzy
+msgid "Save to _Disk"
+msgstr "Kubika"
+
+#: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:3
+#, fuzzy
+msgid "Saves selected calendar or tasks list to disk."
+msgstr "Kubika Byahiswemo Aho kubariza Nka a"
+
+#.
+#. * Translator: the %FT%T is the thirth argument for a strftime function.
+#. * It lets you define the formatting of the date in the rdf-file.
+#. * Also check out http://www.w3.org/2002/12/cal/tzd
+#. *
+#: ../plugins/save-calendar/rdf-format.c:158
+msgid "%FT%T"
+msgstr ""
+
+#: ../plugins/save-calendar/rdf-format.c:396
 #, fuzzy
 msgid "RDF format (.rdf)"
 msgstr "Imiterere"
 
-#: plugins/save-calendar/save-calendar.c:171
-#: plugins/save-calendar/save-calendar.c:181
+#: ../plugins/save-calendar/save-calendar.c:171
+#: ../plugins/save-calendar/save-calendar.c:181
 #, fuzzy
 msgid "Select destination file"
 msgstr "Ishyika IDOSIYE"
 
-#: plugins/save-calendar/save-calendar.c:216
+#: ../plugins/save-calendar/save-calendar.c:216
 #, fuzzy, c-format
 msgid ""
 "The suggested filename extension of this filetype (%s) is unused in the "
 "chosen filename. Do you want to continue?"
 msgstr "Urifuzagukomeza."
 
-#: plugins/send-options/send-options.c:82
-#, fuzzy, c-format
-msgid "%sEnter password for %s (user %s)"
-msgstr "%sEnterIjambobanga... kugirango Ukoresha:"
-
-#. org.gnome.evolution.mail_shared_folder:invalid-user primary
-#: plugins/shared-folder/org-gnome-shared-folder-errors.xml.h:2
-#, fuzzy
-msgid "Invalid user"
-msgstr "Ukoresha:"
-
-#. org.gnome.evolution.mail_shared_folder:invalid-user secondary
-#: plugins/shared-folder/org-gnome-shared-folder-errors.xml.h:4
+# sc/sdi\scslots.src:SID_STATUS_SELMODE.text
+#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:1
 #, fuzzy
-msgid ""
-"\n"
-"You cannot share folder with specified user \"{0}\" \n"
-msgstr "Ububiko Na: Ukoresha: 0"
-
-#. org.gnome.evolution.mail_shared_folder:no-user primary
-#: plugins/shared-folder/org-gnome-shared-folder-errors.xml.h:8
-msgid "Specify User"
-msgstr ""
+msgid "Select one source"
+msgstr "Uburyo bw'Ihitamo"
 
-#. org.gnome.evolution.mail_shared_folder:no-user secondary
-#: plugins/shared-folder/org-gnome-shared-folder-errors.xml.h:10
+#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:2
 #, fuzzy
-msgid ""
-"\n"
-"\tYou have to specify a user name whom you want to add to the list \n"
-msgstr "Kuri a Ukoresha: Izina: Kuri Kongeramo Kuri Urutonde"
-
-#: plugins/shared-folder/properties.glade.h:2
-#, fuzzy
-msgid "<b>Users :</b>"
-msgstr "<B B"
-
-# sfx2/source\doc\doc.src:STR_DOCTYPENAME_MESSAGE.text
-#: plugins/shared-folder/properties.glade.h:4
-msgid "Message"
-msgstr "Ubutumwa"
-
-#: plugins/shared-folder/properties.glade.h:6
-msgid "Shared Folder Notification"
-msgstr ""
-
-#: plugins/shared-folder/properties.glade.h:8
-#, fuzzy
-msgid "The participants will receive the following notification.\n"
-msgstr "Abitabiriye Akira Ikimenyetso"
-
-#: plugins/shared-folder/properties.glade.h:11
-#, fuzzy
-msgid "_Contacts..."
-msgstr "Aho kubariza"
+msgid "Selects a single calendar or task source for viewing."
+msgstr "Kuri Gushaka kugirango"
 
-#: plugins/shared-folder/properties.glade.h:12
+#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:3
 #, fuzzy
-msgid "_Cutomize notification message"
-msgstr "Ikimenyetso Ubutumwa"
-
-#: plugins/shared-folder/properties.glade.h:13
-msgid "_Not Shared"
-msgstr ""
+msgid "_Show only this Calendar"
+msgstr "iyi Kalindari"
 
-#: plugins/shared-folder/properties.glade.h:15
-msgid "_Shared With ..."
+#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:4
+msgid "_Show only this Task List"
 msgstr ""
 
-#: plugins/shared-folder/properties.glade.h:16
-#, fuzzy
-msgid "_Sharing"
-msgstr "Bisangiwe"
-
-#. e_error_run (NULL,  _("Cannot create GroupWise folders in offline mode."), NULL, NULL);
-#: plugins/shared-folder/share-folder-common.c:220
-#, fuzzy
-msgid "Cannot Create shared folder in offline mode."
-msgstr "Ububiko in Ntibicometse kuri interineti Ubwoko"
-
-#: plugins/shared-folder/share-folder-common.c:323
-msgid "Users"
+#: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
+msgid "Startup wizard"
 msgstr ""
 
-#: plugins/shared-folder/share-folder-common.c:324
-#, fuzzy
-msgid "Enter the users and set permissions"
-msgstr "Na Gushyiraho Uruhushya"
-
-#: plugins/shared-folder/share-folder-common.c:411
-msgid "Sharing"
-msgstr "Bisangiwe"
-
-#: plugins/startup-wizard/startup-wizard.c:255
-#: shell/evolution-startup-wizard.glade.h:2
+#: ../plugins/startup-wizard/startup-wizard.c:255
 msgid "Evolution Setup Assistant"
 msgstr ""
 
-#: plugins/startup-wizard/startup-wizard.c:260
-#: shell/evolution-startup-wizard.glade.h:5
+#: ../plugins/startup-wizard/startup-wizard.c:260
 msgid "Welcome"
 msgstr "Urakaza neza"
 
-#: plugins/startup-wizard/startup-wizard.c:261
-#: shell/evolution-startup-wizard.glade.h:6
+#: ../plugins/startup-wizard/startup-wizard.c:261
 #, fuzzy
 msgid ""
 "Welcome to Evolution. The next few screens will allow Evolution to connect "
@@ -16917,73 +17529,91 @@ msgstr ""
 "Kuri Komeza>> Kwemerera Kuri Kwihuza Kuri imeli Konti Na Kuri Kuzana Idosiye "
 "Bivuye Ikindi Porogaramu Kanda Akabuto Kuri urifuzagukomeza"
 
-#: plugins/startup-wizard/startup-wizard.c:306 shell/e-shell-importer.c:159
-#: shell/e-shell-startup-wizard.c:750
+#: ../plugins/startup-wizard/startup-wizard.c:306
+#: ../shell/e-shell-importer.c:159
 #, fuzzy
 msgid "Please select the information that you would like to import:"
 msgstr "Guhitamo Ibisobanuro nka Kuri Kuzana"
 
 # officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....Wizard.Memo.Elements.From.text
-#: plugins/startup-wizard/startup-wizard.c:321 shell/e-shell-importer.c:899
-#: shell/e-shell-startup-wizard.c:700
+#: ../plugins/startup-wizard/startup-wizard.c:321
+#: ../shell/e-shell-importer.c:905
 #, fuzzy, c-format
 msgid "From %s:"
 msgstr "Bivuye"
 
+#: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:1
+msgid "Indicates if threading of messages should fall back to subject."
+msgstr ""
+
+#: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:2
+#, fuzzy
+msgid "Subject Threading"
+msgstr "Kirimo"
+
+#: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:3
+#, fuzzy
+msgid "Thread messages by subject"
+msgstr "Ubutumwa Urutonde ku"
+
 #. Create the checkbox we will display, complete with mnemonic that is unique in the dialog
-#: plugins/subject-thread/subject-thread.c:54
+#: ../plugins/subject-thread/subject-thread.c:54
 #, fuzzy
 msgid "Fall back to threading messages by sub_ject"
 msgstr "Inyuma Kuri Ubutumwa ku Ikivugwaho"
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+#: ../shell/GNOME_Evolution_Shell.server.in.in.h:1
 msgid "Evolution Shell"
 msgstr ""
 
-#: shell/GNOME_Evolution_Test.server.in.in.h:1
+#: ../shell/GNOME_Evolution_Shell.server.in.in.h:2
+msgid "Evolution Shell Config factory"
+msgstr ""
+
+#: ../shell/GNOME_Evolution_Test.server.in.in.h:1
 msgid "Evolution Test"
 msgstr ""
 
-#: shell/GNOME_Evolution_Test.server.in.in.h:2
+#: ../shell/GNOME_Evolution_Test.server.in.in.h:2
 msgid "Evolution Test component"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:1
+#: ../shell/apps_evolution_shell.schemas.in.in.h:1
 #, fuzzy
 msgid "A GNOME Print description of the current printer settings"
 msgstr "A Isobanuramiterere Bya KIGEZWEHO Mucapyi Amagenamiterere"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:2
+#: ../shell/apps_evolution_shell.schemas.in.in.h:2
 #, fuzzy
 msgid "Configuration version"
 msgstr "Verisiyo"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:3
+#: ../shell/apps_evolution_shell.schemas.in.in.h:3
 #, fuzzy
 msgid "Default sidebar width"
 msgstr "Umurongo wo ku mpande Ubugari"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:4
+#: ../shell/apps_evolution_shell.schemas.in.in.h:4
 #, fuzzy
 msgid "Default window height"
 msgstr "Idirishya Ubuhagarike"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:5
+#: ../shell/apps_evolution_shell.schemas.in.in.h:5
 #, fuzzy
 msgid "Default window width"
 msgstr "Idirishya Ubugari"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:6
+#: ../shell/apps_evolution_shell.schemas.in.in.h:6
 #, fuzzy
 msgid "ID or alias of the component to be shown by default at start-up."
 msgstr "Cyangwa Irihimbano Bya Kuri ku Mburabuzi ku Gutangira Hejuru"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:7
+#: ../shell/apps_evolution_shell.schemas.in.in.h:7
 #, fuzzy
 msgid "Last upgraded configuration version"
 msgstr "Iboneza Verisiyo"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:8
+#: ../shell/apps_evolution_shell.schemas.in.in.h:8
 #, fuzzy
 msgid ""
 "List of paths for the folders to be synchronized to disk for offline usage"
@@ -16992,50 +17622,50 @@ msgstr ""
 "Ikoresha:"
 
 # sfx2/sdi\sfxslots.src:SID_SETUPPRINTER.text
-#: shell/apps_evolution_shell.schemas.in.in.h:9
+#: ../shell/apps_evolution_shell.schemas.in.in.h:9
 #, fuzzy
 msgid "Printer settings"
 msgstr "Imikorereshereje Ya Mucapyi"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:10
+#: ../shell/apps_evolution_shell.schemas.in.in.h:10
 #, fuzzy
 msgid "Skip development warning dialog"
 msgstr "Iburira Ikiganiro"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:11 shell/main.c:472
+#: ../shell/apps_evolution_shell.schemas.in.in.h:11 ../shell/main.c:468
 #, fuzzy
 msgid "Start in offline mode"
 msgstr "Gutangira in Ntibicometse kuri interineti Ubwoko"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:12
+#: ../shell/apps_evolution_shell.schemas.in.in.h:12
 #, fuzzy
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level"
 msgstr "Iboneza Verisiyo Bya Na: Iboneza urwego"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:13
+#: ../shell/apps_evolution_shell.schemas.in.in.h:13
 #, fuzzy
 msgid "The default height for the main window, in pixels."
 msgstr "Mburabuzi Ubuhagarike kugirango Idirishya in Pigiseli"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:14
+#: ../shell/apps_evolution_shell.schemas.in.in.h:14
 #, fuzzy
 msgid "The default width for the main window, in pixels."
 msgstr "Mburabuzi Ubugari kugirango Idirishya in Pigiseli"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:15
+#: ../shell/apps_evolution_shell.schemas.in.in.h:15
 #, fuzzy
 msgid "The default width for the sidebar, in pixels."
 msgstr "Mburabuzi Ubugari kugirango Umurongo wo ku mpande in Pigiseli"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.in.h:16
 #, fuzzy
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
 "configuration level"
 msgstr "Iheruka Iboneza Verisiyo Bya Na: Iboneza urwego"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.in.h:17
 #, fuzzy
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
@@ -17046,68 +17676,69 @@ msgstr ""
 "Umwanyabikoresho Umwanyabikoresho ni Gushyiraho IMISUSIRE Bya Utubuto ni ku "
 "Umwanyabikoresho Igenamiterere"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.in.h:18
 #, fuzzy
 msgid "Toolbar is visible"
 msgstr "ni Kigaragara"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.in.h:19
 #, fuzzy
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr ""
 "Gutangira Hejuru in Ntibicometse kuri interineti Ubwoko Bya kiri kuri "
 "interineti Ubwoko"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.in.h:20
 #, fuzzy
 msgid "Whether the toolbar should be visible."
 msgstr "Umwanyabikoresho Kigaragara"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.in.h:21
 #, fuzzy
 msgid ""
 "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr "Iburira Ikiganiro in Uburyo Bya ni"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.in.h:22
 #, fuzzy
 msgid "Whether the window buttons should be visible."
 msgstr "Idirishya Utubuto Kigaragara"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.in.h:23
 #, fuzzy
 msgid "Window button style"
 msgstr "Akabuto IMISUSIRE"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.in.h:24
 #, fuzzy
 msgid "Window buttons are visible"
 msgstr "Utubuto Kigaragara"
 
-#: shell/e-active-connection-dialog.glade.h:1
+#: ../shell/e-active-connection-dialog.glade.h:1
 #, fuzzy
 msgid "<b>Active Connections</b>"
 msgstr "<B B"
 
-#: shell/e-active-connection-dialog.glade.h:2
+#: ../shell/e-active-connection-dialog.glade.h:2
 msgid "Active Connections"
 msgstr ""
 
-#: shell/e-active-connection-dialog.glade.h:3
+#: ../shell/e-active-connection-dialog.glade.h:3
 #, fuzzy
 msgid "Click OK to close these connections and go offline"
 msgstr "Kuri Gufunga Ukwihuza Na Gyayo Ntibicometse kuri interineti"
 
-#: shell/e-shell-folder-title-bar.c:586 shell/e-shell-folder-title-bar.c:587
+#: ../shell/e-shell-folder-title-bar.c:586
+#: ../shell/e-shell-folder-title-bar.c:587
 msgid "(Untitled)"
 msgstr "(Nta mutwe)"
 
-#: shell/e-shell-importer.c:147
+#: ../shell/e-shell-importer.c:147
 #, fuzzy
 msgid "Choose the type of importer to run:"
 msgstr "Ubwoko Bya Kuri Gukoresha"
 
-#: shell/e-shell-importer.c:150
+#: ../shell/e-shell-importer.c:150
 #, fuzzy
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
@@ -17119,55 +17750,55 @@ msgstr ""
 "IDOSIYE Kuri Kuzana Na Guhitamo Ubwoko Bya IDOSIYE ni Bivuye Urutonde "
 "Guhitamo NIBA OYA Na Kuri Akazi Inyuma"
 
-#: shell/e-shell-importer.c:156
+#: ../shell/e-shell-importer.c:156
 #, fuzzy
 msgid "Choose the destination for this import"
 msgstr "Ishyika kugirango iyi Kuzana"
 
-#: shell/e-shell-importer.c:162
+#: ../shell/e-shell-importer.c:162
 #, fuzzy
 msgid ""
 "Evolution checked for settings to import from the following\n"
-"applications: Pine, Netscape, Elm, iCalendar. No settings\n"
-"that could be imported where found. If you would like to\n"
+"applications: Pine, Netscape, Elm, iCalendar. No importable\n"
+"settings found. If you would like to\n"
 "try again, please click the \"Back\" button.\n"
 msgstr ""
 "Ivivuwe kugirango Amagenamiterere Kuri Kuzana Bivuye Netscape cyavuye "
 "ahandi/ cyatumijwe Byabonetse nka Kanda Akabuto"
 
-#: shell/e-shell-importer.c:233 shell/e-shell-importer.c:267
+#: ../shell/e-shell-importer.c:233 ../shell/e-shell-importer.c:267
 #, fuzzy, c-format
 msgid ""
 "Importing %s\n"
 "Importing item %d."
 msgstr "Ikintu"
 
-#: shell/e-shell-importer.c:341
+#: ../shell/e-shell-importer.c:347
 msgid "Select importer"
 msgstr ""
 
-#: shell/e-shell-importer.c:462 shell/e-shell-importer.c:1086
+#: ../shell/e-shell-importer.c:468 ../shell/e-shell-importer.c:1092
 #, fuzzy, c-format
 msgid "File %s does not exist"
 msgstr "Idosiye OYA"
 
 # sc/source\ui\src\globstr.src:RID_GLOBSTR.STR_UNDO_IMPORTDATA.text
-#: shell/e-shell-importer.c:470
+#: ../shell/e-shell-importer.c:476
 msgid "Importing"
 msgstr "Kuzaza"
 
 # sc/source\ui\src\globstr.src:RID_GLOBSTR.STR_UNDO_IMPORTDATA.text
-#: shell/e-shell-importer.c:478
+#: ../shell/e-shell-importer.c:484
 #, fuzzy, c-format
 msgid "Importing %s.\n"
 msgstr "Kuzaza"
 
-#: shell/e-shell-importer.c:488 shell/e-shell-importer.c:489
+#: ../shell/e-shell-importer.c:494 ../shell/e-shell-importer.c:495
 #, fuzzy, c-format
 msgid "Error loading %s"
 msgstr "Itangira..."
 
-#: shell/e-shell-importer.c:507
+#: ../shell/e-shell-importer.c:513
 #, fuzzy, c-format
 msgid ""
 "Importing %s\n"
@@ -17182,110 +17813,88 @@ msgstr "Ikintu 1."
 # officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....Wizard.Letter.Save.AutoDocName.text
 # #-#-#-#-#  officecfg.pot (Gnome 2.12)  #-#-#-#-#
 # officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....Wizard.Fax.Save.AutoDocName.text
-#: shell/e-shell-importer.c:583
+#: ../shell/e-shell-importer.c:589
 msgid "Automatic"
 msgstr "Kikoresha"
 
-#: shell/e-shell-importer.c:639
+#: ../shell/e-shell-importer.c:645
 #, fuzzy
 msgid "F_ilename:"
 msgstr "Izina ry'idosiye:"
 
-#: shell/e-shell-importer.c:644
+#: ../shell/e-shell-importer.c:650
 #, fuzzy
 msgid "Select a file"
 msgstr "a IDOSIYE"
 
 # svtools/source\filepicker\iodlg.src:DLG_SVT_EXPLORERFILE.FT_EXPLORERFILE_FILETYPE.text
-#: shell/e-shell-importer.c:656
+#: ../shell/e-shell-importer.c:662
 #, fuzzy
 msgid "File _type:"
 msgstr "Ubwoko bw'idosiye"
 
-#: shell/e-shell-importer.c:695
+#: ../shell/e-shell-importer.c:701
 #, fuzzy
 msgid "Import data and settings from _older programs"
 msgstr "Ibyatanzwe Na Amagenamiterere Bivuye Porogaramu"
 
-#: shell/e-shell-importer.c:698
+#: ../shell/e-shell-importer.c:704
 #, fuzzy
 msgid "Import a _single file"
 msgstr "a UMWE IDOSIYE"
 
-#: shell/e-shell-importer.c:766 shell/e-shell-startup-wizard.c:571
+#: ../shell/e-shell-importer.c:772
 #, fuzzy
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
 msgstr "Tegereza kugirango"
 
-#: shell/e-shell-importer.c:773
+#: ../shell/e-shell-importer.c:779
 msgid "Starting Intelligent Importers"
 msgstr ""
 
-#: shell/e-shell-importer.c:1105
+#: ../shell/e-shell-importer.c:1111
 #, fuzzy, c-format
 msgid "No importer available for file %s"
 msgstr "Bihari kugirango IDOSIYE"
 
-#: shell/e-shell-importer.c:1119
+#: ../shell/e-shell-importer.c:1125
 #, fuzzy
 msgid "Unable to execute importer"
 msgstr "Kuri Gukora"
 
 # filter/source\xsltdialog\xmlfiltertestdialog.src:DLG_XML_FILTER_TEST_DIALOG.FL_IMPORT.text
-#: shell/e-shell-importer.c:1235
+#: ../shell/e-shell-importer.c:1241
 #, fuzzy
 msgid "_Import"
 msgstr "Kuzana"
 
-#: shell/e-shell-offline-handler.c:589
-#, fuzzy
-msgid "Closing connections..."
-msgstr "Ukwihuza"
-
-#: shell/e-shell-settings-dialog.c:318
+#: ../shell/e-shell-settings-dialog.c:318
 msgid "Evolution Settings"
 msgstr ""
 
-#: shell/e-shell-startup-wizard.c:577
-#, fuzzy
-msgid "Starting import"
-msgstr "Kuzana"
-
-#: shell/e-shell-startup-wizard.c:797
-#, fuzzy
-msgid ""
-"If you quit the Evolution Setup Assistant now, all of the information that "
-"you have entered will be forgotten. You will need to run this assistant "
-"again before using Evolution.\n"
-"\n"
-"Do you want to quit using the Assistant now?"
-msgstr ""
-"Kuvamo NONEAHA Byose Bya Ibisobanuro Kuri Gukoresha iyi Mbere ikoresha Kuri "
-"Kuvamo ikoresha NONEAHA"
-
-#: shell/e-shell-utils.c:116
+#: ../shell/e-shell-utils.c:116
 #, fuzzy
 msgid "No folder name specified."
 msgstr "Ububiko Izina:"
 
-#: shell/e-shell-utils.c:123
+#: ../shell/e-shell-utils.c:123
 #, fuzzy
 msgid "Folder name cannot contain the Return character."
 msgstr "Izina: Inyuguti"
 
-#: shell/e-shell-utils.c:129
+#: ../shell/e-shell-utils.c:129
 #, fuzzy
 msgid "Folder name cannot contain the character \"/\"."
 msgstr "Izina: Inyuguti"
 
-#: shell/e-shell-utils.c:135
+#: ../shell/e-shell-utils.c:135
 #, fuzzy
 msgid "Folder name cannot contain the character \"#\"."
 msgstr "Izina: Inyuguti"
 
-#: shell/e-shell-utils.c:141
+#: ../shell/e-shell-utils.c:141
 #, fuzzy
 msgid "'.' and '..' are reserved folder names."
 msgstr ""
@@ -17305,22 +17914,22 @@ msgstr ""
 "X- Generator: KBabel 1. 0\n"
 "."
 
-#: shell/e-shell-window-commands.c:69
+#: ../shell/e-shell-window-commands.c:69
 #, fuzzy
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "Ibikoresho OYA Kugaragara Kuri ku iyi Sisitemu"
 
-#: shell/e-shell-window-commands.c:77
+#: ../shell/e-shell-window-commands.c:77
 #, fuzzy, c-format
 msgid "Error executing %s."
 msgstr "Gukora: %s%s"
 
-#: shell/e-shell-window-commands.c:126
+#: ../shell/e-shell-window-commands.c:126
 #, fuzzy
 msgid "Bug buddy is not installed."
 msgstr "ni OYA"
 
-#: shell/e-shell-window-commands.c:134
+#: ../shell/e-shell-window-commands.c:134
 #, fuzzy
 msgid "Bug buddy could not be run."
 msgstr "OYA Gukoresha"
@@ -17328,160 +17937,141 @@ msgstr "OYA Gukoresha"
 #. The translator-credits string is for translators to list
 #. * per language credits for translation, displayed in the
 #. * about box
-#: shell/e-shell-window-commands.c:501
+#: ../shell/e-shell-window-commands.c:508
 #, fuzzy
 msgid "translator-credits"
 msgstr "Umusemuzi"
 
-#: shell/e-shell-window-commands.c:515
+#: ../shell/e-shell-window-commands.c:522
 msgid "Groupware Suite"
 msgstr ""
 
-#: shell/e-shell-window-commands.c:742
+#: ../shell/e-shell-window-commands.c:749
 msgid "_Work Online"
 msgstr ""
 
 # these things need to move into utilityOverlay.xul
-#: shell/e-shell-window-commands.c:755 ui/evolution.xml.h:51
+#: ../shell/e-shell-window-commands.c:762 ../ui/evolution.xml.h:47
 #, fuzzy
 msgid "_Work Offline"
 msgstr "Korera hanze ya interneti"
 
 # these things need to move into utilityOverlay.xul
-#: shell/e-shell-window-commands.c:768 ui/evolution.xml.h:34
+#: ../shell/e-shell-window-commands.c:775
 msgid "Work Offline"
 msgstr "Korera hanze ya interneti"
 
-#: shell/e-shell-window.c:341
+#: ../shell/e-shell-window.c:341
 #, fuzzy
 msgid "Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "ni kiri kuri interineti ku iyi Akabuto Kuri Akazi Ntibicometse kuri "
 "interineti"
 
-#: shell/e-shell-window.c:349
+#: ../shell/e-shell-window.c:349
 #, fuzzy
 msgid "Evolution is in the process of going offline."
 msgstr "ni in Bya Ntibicometse kuri interineti"
 
-#: shell/e-shell-window.c:356
+#: ../shell/e-shell-window.c:356
 #, fuzzy
 msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "ni Ntibicometse kuri interineti ku iyi Akabuto Kuri Akazi kiri kuri "
 "interineti"
 
-#: shell/e-shell-window.c:713
+#: ../shell/e-shell-window.c:712
 #, fuzzy, c-format
 msgid "Switch to %s"
 msgstr "Kuri"
 
-#: shell/e-shell.c:598
+#: ../shell/e-shell.c:622
 #, fuzzy
 msgid "Uknown system error."
 msgstr "Sisitemu Ikosa"
 
-#: shell/e-shell.c:800 shell/e-shell.c:801
+#: ../shell/e-shell.c:824 ../shell/e-shell.c:825
 #, c-format
 msgid "%ld KB"
 msgstr ""
 
 # crashrep/source\all\crashrep.lng:%OK_BUTTON%.text
-#: shell/e-shell.c:1254 widgets/misc/e-cell-date-edit.c:256
+#: ../shell/e-shell.c:1278 ../widgets/misc/e-cell-date-edit.c:256
 msgid "OK"
 msgstr "YEGO"
 
-#: shell/e-shell.c:1256
+#: ../shell/e-shell.c:1280
 #, fuzzy
 msgid "Invalid arguments"
 msgstr "ingingo"
 
-#: shell/e-shell.c:1258
+#: ../shell/e-shell.c:1282
 #, fuzzy
 msgid "Cannot register on OAF"
 msgstr "Kwiyandikisha ku"
 
-#: shell/e-shell.c:1260
+#: ../shell/e-shell.c:1284
 #, fuzzy
 msgid "Configuration Database not found"
 msgstr "OYA Byabonetse"
 
-#: shell/e-shell.c:1262
+#: ../shell/e-shell.c:1286
 #, fuzzy
 msgid "Generic error"
 msgstr "Ikosa"
 
 # basctl/source\basicide\brkdlg.src:RID_BASICIDE_BREAKPOINTDLG.RID_PB_NEW.text
-#: shell/e-user-creatable-items-handler.c:685
+#: ../shell/e-user-creatable-items-handler.c:685
 msgid "New"
 msgstr "Gishya"
 
-#: shell/evolution-startup-wizard.glade.h:3
-msgid "Importing Files"
-msgstr ""
-
-#: shell/evolution-startup-wizard.glade.h:4
-msgid "Timezone "
-msgstr ""
-
-#: shell/evolution-startup-wizard.glade.h:9
-#, fuzzy
-msgid ""
-"You have successfully entered all of the information needed to set up "
-"Evolution. \n"
-"\n"
-"Click the \"Apply\" button to save your settings. "
-msgstr ""
-"Byose Bya Ibisobanuro Kuri Gushyiraho Hejuru Akabuto Kuri Kubika "
-"Amagenamiterere"
-
-#: shell/evolution-test-component.c:140
+#: ../shell/evolution-test-component.c:140
 msgid "New Test"
 msgstr ""
 
 # sc/source\ui\src\scfuncs.src:RID_SC_FUNCTION_DESCRIPTIONS1.SC_OPCODE_IF.2.text
-#: shell/evolution-test-component.c:141
+#: ../shell/evolution-test-component.c:141
 #, fuzzy
 msgid "_Test"
 msgstr "Igerageza"
 
-#: shell/evolution-test-component.c:142
+#: ../shell/evolution-test-component.c:142
 #, fuzzy
 msgid "Create a new test item"
 msgstr "a Gishya Igerageza Ikintu"
 
-#: shell/importer/import.glade.h:1
+#: ../shell/importer/import.glade.h:1
 #, fuzzy
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr "Kuri Kuzaza IDOSIYE"
 
-#: shell/importer/import.glade.h:2
+#: ../shell/importer/import.glade.h:2
 msgid "Evolution Import Assistant"
 msgstr ""
 
 # sc/source\ui\dbgui\imoptdlg.src:RID_SCDLG_IMPORTOPT.text
-#: shell/importer/import.glade.h:3
+#: ../shell/importer/import.glade.h:3
 msgid "Import File"
 msgstr "Kuzana Idosiye"
 
-#: shell/importer/import.glade.h:4
+#: ../shell/importer/import.glade.h:4
 msgid "Import Location"
 msgstr ""
 
-#: shell/importer/import.glade.h:5
+#: ../shell/importer/import.glade.h:5
 msgid "Importer Type"
 msgstr ""
 
-#: shell/importer/import.glade.h:6
+#: ../shell/importer/import.glade.h:6
 msgid "Select Importers"
 msgstr ""
 
-#: shell/importer/import.glade.h:7
+#: ../shell/importer/import.glade.h:7
 #, fuzzy
 msgid "Select a File"
 msgstr "a Idosiye"
 
-#: shell/importer/import.glade.h:8
+#: ../shell/importer/import.glade.h:8
 #, fuzzy
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
@@ -17489,32 +18079,32 @@ msgid ""
 "importing external files into Evolution."
 msgstr "Kuri iyi Gihinguranya external Idosiye"
 
-#: shell/importer/intelligent.c:193
+#: ../shell/importer/intelligent.c:193
 msgid "Importers"
 msgstr ""
 
 # filter/source\xsltdialog\xmlfiltertestdialog.src:DLG_XML_FILTER_TEST_DIALOG.FL_IMPORT.text
-#: shell/importer/intelligent.c:195 smime/gui/smime-ui.glade.h:29
+#: ../shell/importer/intelligent.c:195 ../smime/gui/smime-ui.glade.h:29
 msgid "Import"
 msgstr "Kuzana"
 
 # 1760
-#: shell/importer/intelligent.c:199
+#: ../shell/importer/intelligent.c:199
 msgid "Don't import"
 msgstr "Wibizana"
 
-#: shell/importer/intelligent.c:203
+#: ../shell/importer/intelligent.c:203
 #, fuzzy
 msgid "Don't ask me again"
 msgstr "Ntu kongere kumbaza."
 
-#: shell/importer/intelligent.c:211
+#: ../shell/importer/intelligent.c:211
 #, fuzzy
 msgid "Evolution can import data from the following files:"
 msgstr "Kuzana Ibyatanzwe Bivuye Idosiye"
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:234
+#: ../shell/main.c:230
 #, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -17534,52 +18124,47 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr "com."
 
-#: shell/main.c:258
+#: ../shell/main.c:254
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
 msgstr ""
 
-#: shell/main.c:265
+#: ../shell/main.c:261
 msgid "Don't tell me again"
 msgstr ""
 
-#: shell/main.c:470
+#: ../shell/main.c:466
 #, fuzzy
 msgid "Start Evolution activating the specified component"
 msgstr "Gutangira"
 
-#: shell/main.c:474
+#: ../shell/main.c:470
 #, fuzzy
 msgid "Start in online mode"
 msgstr "Gutangira in kiri kuri interineti Ubwoko"
 
-#: shell/main.c:477
+#: ../shell/main.c:473
 #, fuzzy
 msgid "Forcibly shut down all Evolution components"
 msgstr "Hasi Byose"
 
-#: shell/main.c:481
+#: ../shell/main.c:477
 #, fuzzy
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Bivuye 1. 4."
 
-#: shell/main.c:484
+#: ../shell/main.c:480
 #, fuzzy
 msgid "Send the debugging output of all components to a file."
 msgstr "Ibisohoka Bya Byose Kuri a IDOSIYE"
 
-#: shell/main.c:487
-#, fuzzy
-msgid "Disable the mono plugin environment."
-msgstr "i"
-
-#: shell/main.c:490
+#: ../shell/main.c:482
 #, fuzzy
 msgid "Disable loading of any plugins."
 msgstr "Itangira... Bya"
 
-#: shell/main.c:521
+#: ../shell/main.c:513
 #, fuzzy, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -17588,92 +18173,34 @@ msgstr ""
 "%s:--kiri kuri interineti Na Ntibicometse kuri interineti Ifashayobora "
 "kugirango Birenzeho Ibisobanuro"
 
-#. shell:upgrade-nospace primary
-#: shell/shell-errors.xml.h:2
-#, fuzzy
-msgid "Insufficient disk space for upgrade."
-msgstr "Umwanya kugirango"
-
-#. shell:upgrade-nospace secondary
-#: shell/shell-errors.xml.h:4
-#, fuzzy
-msgid ""
-"Upgrading your data and settings will require upto {0} of disk space, but "
-"you only have {1} available.\n"
-"\n"
-"You will need to make more space available in your home directory before you "
-"can continue."
-msgstr ""
-"Ibyatanzwe Na Amagenamiterere 0 Bya Umwanya 1. Bihari Kuri Ubwoko Birenzeho "
-"Umwanya Bihari in Ku Ntangiriro bushyinguro Mbere urifuzagukomeza"
-
-#. shell:upgrade-failed primary
-#: shell/shell-errors.xml.h:8
-#, fuzzy
-msgid ""
-"Upgrade from previous version failed:\n"
-"{0}"
-msgstr "Bivuye Ibanjirije Verisiyo Byanze 0"
-
-#. shell:upgrade-failed secondary
-#: shell/shell-errors.xml.h:11
-#, fuzzy
-msgid ""
-"{1}\n"
-"\n"
-"If you choose to continue, you may not have access to some of your old "
-"data.\n"
-msgstr ""
-"{1. Guhitamo Kuri urifuzagukomeza Gicurasi OYA Kuri Bya ki/ bishaje "
-"Ibyatanzwe"
-
-#: shell/shell-errors.xml.h:15
+#: ../shell/shell.error.xml.h:1
 msgid "Continue"
 msgstr "Gukomeza"
 
-#. shell:upgrade-remove-1-4 title
-#. shell:upgrade-remove-1-4 primary
-#: shell/shell-errors.xml.h:17 shell/shell-errors.xml.h:19
+#: ../shell/shell.error.xml.h:2
 #, fuzzy
 msgid "Delete old data from version {0}?"
 msgstr "ki/ bishaje Ibyatanzwe Bivuye Verisiyo 0"
 
-#. shell:upgrade-remove-1-4 secondary
-#: shell/shell-errors.xml.h:21
+#: ../shell/shell.error.xml.h:3
 #, fuzzy
-msgid ""
-"The previous version of evolution stored its data in a different location.\n"
-"\n"
-"If you choose to remove this data, the entire contents of the \"evolution\" "
-"directory will be removed permanently.  If you choose to keep this data, "
-"then you may manually remove the contents of \"evolution\" at your "
-"convenience.\n"
-msgstr ""
-"Ibanjirije Verisiyo Bya Impinduka Ibyatanzwe in a Ahantu Guhitamo Kuri "
-"Gukuraho... iyi Ibyatanzwe Ibigize Bya Impinduka bushyinguro Cyavanyweho "
-"Guhitamo Kuri iyi Ibyatanzwe Hanyuma Gicurasi Gukuraho... Ibigize Bya "
-"Impinduka ku"
-
-#: shell/shell-errors.xml.h:25
-msgid "_Remind Me Later"
-msgstr ""
+msgid "Evolution can not start."
+msgstr "OYA Gutangira"
 
-#: shell/shell-errors.xml.h:26
-msgid "_Keep Data"
-msgstr ""
+#: ../shell/shell.error.xml.h:4
+#, fuzzy
+msgid "Insufficient disk space for upgrade."
+msgstr "Umwanya kugirango"
 
-#. shell:upgrade-remove-1-4-confirm title
-#. shell:upgrade-remove-1-4-confirm primary
-#: shell/shell-errors.xml.h:28 shell/shell-errors.xml.h:30
+#: ../shell/shell.error.xml.h:5
 #, fuzzy
 msgid "Really delete old data?"
 msgstr "Gusiba ki/ bishaje Ibyatanzwe"
 
-#. shell:upgrade-remove-1-4-confirm secondary
-#: shell/shell-errors.xml.h:32
+#: ../shell/shell.error.xml.h:6
 #, fuzzy
 msgid ""
-"The entire contents of the \"evolution\" directory is about to be be "
+"The entire contents of the &quot;evolution&quot; directory is about to be be "
 "permanently removed.\n"
 "\n"
 "It is suggested you manually verify that all of your mail, contact, and "
@@ -17687,22 +18214,39 @@ msgstr ""
 "Bya Ubutumwa Umuntu Na Kalindari Ibyatanzwe ni Na iyi Verisiyo Bya Mbere iyi "
 "ki/ bishaje Ibyatanzwe Cyasibwe Kuri Ibanjirije Verisiyo Bya Bikorwa"
 
-#. shell:noshell title
-#. shell:noshell-reason title
-#: shell/shell-errors.xml.h:39 shell/shell-errors.xml.h:47
+#: ../shell/shell.error.xml.h:12
 #, fuzzy
-msgid "Cannot start Evolution"
-msgstr "Gutangira"
+msgid ""
+"The previous version of evolution stored its data in a different location.\n"
+"\n"
+"If you choose to remove this data, the entire contents of the &quot;"
+"evolution&quot; directory will be removed permanently.  If you choose to "
+"keep this data, then you may manually remove the contents of &quot;"
+"evolution&quot; at your convenience.\n"
+msgstr ""
+"Ibanjirije Verisiyo Bya Impinduka Ibyatanzwe in a Ahantu Guhitamo Kuri "
+"Gukuraho... iyi Ibyatanzwe Ibigize Bya Impinduka bushyinguro Cyavanyweho "
+"Guhitamo Kuri iyi Ibyatanzwe Hanyuma Gicurasi Gukuraho... Ibigize Bya "
+"Impinduka ku"
 
-#. shell:noshell primary
-#. shell:noshell-reason primary
-#: shell/shell-errors.xml.h:41 shell/shell-errors.xml.h:49
+#: ../shell/shell.error.xml.h:16
 #, fuzzy
-msgid "Evolution can not start."
-msgstr "OYA Gutangira"
+msgid "Upgrade from previous version failed: {0}"
+msgstr "Bivuye Ibanjirije Verisiyo Byanze 0"
+
+#: ../shell/shell.error.xml.h:17
+#, fuzzy
+msgid ""
+"Upgrading your data and settings will require upto {0} of disk space, but "
+"you only have {1} available.\n"
+"\n"
+"You will need to make more space available in your home directory before you "
+"can continue."
+msgstr ""
+"Ibyatanzwe Na Amagenamiterere 0 Bya Umwanya 1. Bihari Kuri Ubwoko Birenzeho "
+"Umwanya Bihari in Ku Ntangiriro bushyinguro Mbere urifuzagukomeza"
 
-#. shell:noshell secondary
-#: shell/shell-errors.xml.h:43
+#: ../shell/shell.error.xml.h:20
 #, fuzzy
 msgid ""
 "Your system configuration does not match your Evolution configuration.\n"
@@ -17710,8 +18254,7 @@ msgid ""
 "Click help for details"
 msgstr "Sisitemu Iboneza OYA BIHUYE Iboneza Ifashayobora kugirango Birambuye"
 
-#. shell:noshell-reason secondary
-#: shell/shell-errors.xml.h:51
+#: ../shell/shell.error.xml.h:23
 #, fuzzy
 msgid ""
 "Your system configuration does not match your Evolution configuration:\n"
@@ -17721,7 +18264,26 @@ msgid ""
 "Click help for details."
 msgstr "Sisitemu Iboneza OYA BIHUYE Iboneza 0 Ifashayobora kugirango Birambuye"
 
-#: smime/gui/ca-trust-dialog.c:96
+#: ../shell/shell.error.xml.h:28
+msgid "_Keep Data"
+msgstr ""
+
+#: ../shell/shell.error.xml.h:29
+msgid "_Remind Me Later"
+msgstr ""
+
+#: ../shell/shell.error.xml.h:30
+#, fuzzy
+msgid ""
+"{1}\n"
+"\n"
+"If you choose to continue, you may not have access to some of your old "
+"data.\n"
+msgstr ""
+"{1. Guhitamo Kuri urifuzagukomeza Gicurasi OYA Kuri Bya ki/ bishaje "
+"Ibyatanzwe"
+
+#: ../smime/gui/ca-trust-dialog.c:96
 #, fuzzy, c-format
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
@@ -17729,7 +18291,7 @@ msgid ""
 "Edit trust settings:"
 msgstr "ni a Impamyabushobozi Amagenamiterere"
 
-#: smime/gui/cert-trust-dialog.c:145
+#: ../smime/gui/cert-trust-dialog.c:145
 #, fuzzy
 msgid ""
 "Because you trust the certificate authority that issued this certificate, "
@@ -17739,7 +18301,7 @@ msgstr ""
 "Impamyabushobozi Byasohowe iyi Impamyabushobozi Hanyuma Bya iyi "
 "Impamyabushobozi"
 
-#: smime/gui/cert-trust-dialog.c:149
+#: ../smime/gui/cert-trust-dialog.c:149
 #, fuzzy
 msgid ""
 "Because you do not trust the certificate authority that issued this "
@@ -17749,66 +18311,71 @@ msgstr ""
 "OYA Impamyabushobozi Byasohowe iyi Impamyabushobozi Hanyuma OYA Bya iyi "
 "Impamyabushobozi"
 
-#: smime/gui/certificate-manager.c:134 smime/gui/certificate-manager.c:142
-#: smime/gui/certificate-manager.c:377 smime/gui/certificate-manager.c:385
-#: smime/gui/certificate-manager.c:597 smime/gui/certificate-manager.c:605
+#: ../smime/gui/certificate-manager.c:134
+#: ../smime/gui/certificate-manager.c:142
+#: ../smime/gui/certificate-manager.c:377
+#: ../smime/gui/certificate-manager.c:385
+#: ../smime/gui/certificate-manager.c:597
+#: ../smime/gui/certificate-manager.c:605
 #, fuzzy
-msgid "Select a cert to import..."
+msgid "Select a certificate to import..."
 msgstr "a Kuri Kuzana"
 
-#: smime/gui/certificate-manager.c:265 smime/gui/certificate-manager.c:474
-#: smime/gui/certificate-manager.c:692
+#: ../smime/gui/certificate-manager.c:265
+#: ../smime/gui/certificate-manager.c:474
+#: ../smime/gui/certificate-manager.c:692
 msgid "Certificate Name"
 msgstr "Izina ry'Impamyabushobozi:"
 
-#: smime/gui/certificate-manager.c:274 smime/gui/certificate-manager.c:492
+#: ../smime/gui/certificate-manager.c:274
+#: ../smime/gui/certificate-manager.c:492
 msgid "Purposes"
 msgstr "Impamvu"
 
-#: smime/gui/certificate-manager.c:283 smime/gui/smime-ui.glade.h:37
-#: smime/lib/e-cert.c:569
+#: ../smime/gui/certificate-manager.c:283 ../smime/gui/smime-ui.glade.h:37
+#: ../smime/lib/e-cert.c:569
 msgid "Serial Number"
 msgstr "Nimero iranga"
 
-#: smime/gui/certificate-manager.c:291
+#: ../smime/gui/certificate-manager.c:291
 msgid "Expires"
 msgstr "Brarenze igihe"
 
-#: smime/gui/certificate-manager.c:483
+#: ../smime/gui/certificate-manager.c:483
 msgid "E-Mail Address"
 msgstr "Aderesi ya Imeli"
 
 # Cert Viewer
-#: smime/gui/certificate-viewer.c:334
+#: ../smime/gui/certificate-viewer.c:334
 #, fuzzy, c-format
 msgid "Certificate Viewer: %s"
 msgstr "Ushinzwe kureba Impamyabushobozi"
 
-#: smime/gui/component.c:45
+#: ../smime/gui/component.c:45
 #, fuzzy, c-format
 msgid "Enter the password for `%s'"
 msgstr "Ijambobanga... kugirango"
 
 #. we're setting the password initially
-#: smime/gui/component.c:68
+#: ../smime/gui/component.c:68
 #, fuzzy
 msgid "Enter new password for certificate database"
 msgstr "Gishya Ijambobanga... kugirango Impamyabushobozi Ububikoshingiro"
 
-#: smime/gui/component.c:70
+#: ../smime/gui/component.c:70
 #, fuzzy
 msgid "Enter new password"
 msgstr "Gishya Ijambobanga..."
 
 #. FIXME: add serial no, validity date, uses
-#: smime/gui/e-cert-selector.c:119
+#: ../smime/gui/e-cert-selector.c:119
 #, fuzzy, c-format
 msgid ""
 "Issued to:\n"
 "  Subject: %s\n"
 msgstr "Kuri"
 
-#: smime/gui/e-cert-selector.c:120
+#: ../smime/gui/e-cert-selector.c:120
 #, fuzzy, c-format
 msgid ""
 "Issued by:\n"
@@ -17816,69 +18383,69 @@ msgid ""
 msgstr "ku"
 
 # Strings for the cert picker dialog
-#: smime/gui/e-cert-selector.c:167
+#: ../smime/gui/e-cert-selector.c:167
 #, fuzzy
 msgid "Select certificate"
 msgstr "Hitamo impamyabushobozi"
 
-#: smime/gui/smime-ui.glade.h:1
+#: ../smime/gui/smime-ui.glade.h:1
 #, fuzzy
 msgid "<Not Part of Certificate>"
 msgstr "<Ntabwo kiri mu bikora impamyabushobozi>"
 
-#: smime/gui/smime-ui.glade.h:2
+#: ../smime/gui/smime-ui.glade.h:2
 #, fuzzy
 msgid "<b>Certificate Fields</b>"
 msgstr "<B B"
 
-#: smime/gui/smime-ui.glade.h:3
+#: ../smime/gui/smime-ui.glade.h:3
 #, fuzzy
 msgid "<b>Certificate Hierarchy</b>"
 msgstr "<B B"
 
-#: smime/gui/smime-ui.glade.h:4
+#: ../smime/gui/smime-ui.glade.h:4
 #, fuzzy
 msgid "<b>Field Value</b>"
 msgstr "<B B"
 
-#: smime/gui/smime-ui.glade.h:5
+#: ../smime/gui/smime-ui.glade.h:5
 #, fuzzy
 msgid "<b>Fingerprints</b>"
 msgstr "<B B"
 
-#: smime/gui/smime-ui.glade.h:6
+#: ../smime/gui/smime-ui.glade.h:6
 #, fuzzy
 msgid "<b>Issued By</b>"
 msgstr "<B B"
 
-#: smime/gui/smime-ui.glade.h:7
+#: ../smime/gui/smime-ui.glade.h:7
 #, fuzzy
 msgid "<b>Issued To</b>"
 msgstr "<B B"
 
-#: smime/gui/smime-ui.glade.h:8
+#: ../smime/gui/smime-ui.glade.h:8
 #, fuzzy
 msgid "<b>This certificate has been verified for the following uses:</b>"
 msgstr "<B Impamyabushobozi Byagenzuwe kugirango B"
 
-#: smime/gui/smime-ui.glade.h:9
+#: ../smime/gui/smime-ui.glade.h:9
 #, fuzzy
 msgid "<b>Validity</b>"
 msgstr "<B B"
 
-#: smime/gui/smime-ui.glade.h:10
+#: ../smime/gui/smime-ui.glade.h:10
 msgid "Authorities"
 msgstr "Abayobozi"
 
-#: smime/gui/smime-ui.glade.h:11
+#: ../smime/gui/smime-ui.glade.h:11
 msgid "Backup"
 msgstr "Inyibutsa"
 
-#: smime/gui/smime-ui.glade.h:12
+#: ../smime/gui/smime-ui.glade.h:12
 msgid "Backup All"
 msgstr "Inyibutsa ya byose"
 
-#: smime/gui/smime-ui.glade.h:13
+#: ../smime/gui/smime-ui.glade.h:13
 msgid ""
 "Before trusting this CA for any purpose, you should examine its certificate "
 "and its policy and procedures (if available)."
@@ -17887,37 +18454,37 @@ msgstr ""
 "impamyabushobozi bwayo n'amategeko n'ibikorwa (niba bihari)."
 
 # These are the strings set for the ASN1 objects in a certificate.
-#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1076
+#: ../smime/gui/smime-ui.glade.h:14 ../smime/lib/e-cert.c:1076
 msgid "Certificate"
 msgstr "Impamyabushobozi"
 
-#: smime/gui/smime-ui.glade.h:15
+#: ../smime/gui/smime-ui.glade.h:15
 msgid "Certificate Authority Trust"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:16
+#: ../smime/gui/smime-ui.glade.h:16
 #, fuzzy
 msgid "Certificate details"
 msgstr "Birambuye"
 
-#: smime/gui/smime-ui.glade.h:17
+#: ../smime/gui/smime-ui.glade.h:17
 msgid "Certificates Table"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:18
+#: ../smime/gui/smime-ui.glade.h:18
 msgid "Common Name (CN)"
 msgstr "Izina risanzwe (CN)"
 
-#: smime/gui/smime-ui.glade.h:19
+#: ../smime/gui/smime-ui.glade.h:19
 msgid "Contact Certificates"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:21
+#: ../smime/gui/smime-ui.glade.h:21
 #, fuzzy
 msgid "Do not trust the authenticity of this certificate"
 msgstr "Ntukizere ukuri kw'iyi mpamyabushobozi."
 
-#: smime/gui/smime-ui.glade.h:22
+#: ../smime/gui/smime-ui.glade.h:22
 #, fuzzy
 msgid "Dummy window only"
 msgstr "Idirishya"
@@ -17926,69 +18493,69 @@ msgstr "Idirishya"
 # #-#-#-#-#  dbaccess.pot (Gnome 2.12)  #-#-#-#-#
 # #-#-#-#-#  dbaccess.pot (Gnome 2.12)  #-#-#-#-#
 # #-#-#-#-#  dbaccess.pot (Gnome 2.12)  #-#-#-#-#
-#: smime/gui/smime-ui.glade.h:23
+#: ../smime/gui/smime-ui.glade.h:23
 msgid "Edit"
 msgstr "Kwandika"
 
-#: smime/gui/smime-ui.glade.h:24
+#: ../smime/gui/smime-ui.glade.h:24
 msgid "Email Certificate Trust Settings"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:25
+#: ../smime/gui/smime-ui.glade.h:25
 msgid "Email Recipient Certificate"
 msgstr "Impamyabushobozi y'uwandikiwe imeli "
 
-#: smime/gui/smime-ui.glade.h:26
+#: ../smime/gui/smime-ui.glade.h:26
 msgid "Email Signer Certificate"
 msgstr "Impamyabushobozi y'ushyiraho umukono kuri imeli"
 
-#: smime/gui/smime-ui.glade.h:27
+#: ../smime/gui/smime-ui.glade.h:27
 msgid "Expires On"
 msgstr "Bizarenza igihe kwa:"
 
-#: smime/gui/smime-ui.glade.h:30
+#: ../smime/gui/smime-ui.glade.h:30
 msgid "Issued On"
 msgstr "Byasohowe kwa"
 
-#: smime/gui/smime-ui.glade.h:31
+#: ../smime/gui/smime-ui.glade.h:31
 msgid "MD5 Fingerprint"
 msgstr "Igikumwe kya MD5"
 
-#: smime/gui/smime-ui.glade.h:32
+#: ../smime/gui/smime-ui.glade.h:32
 msgid "Organization (O)"
 msgstr "Ikigo (O)"
 
-#: smime/gui/smime-ui.glade.h:33
+#: ../smime/gui/smime-ui.glade.h:33
 msgid "Organizational Unit (OU)"
 msgstr "Igice ky'ikigo (OU)"
 
-#: smime/gui/smime-ui.glade.h:34
+#: ../smime/gui/smime-ui.glade.h:34
 msgid "SHA1 Fingerprint"
 msgstr "Igikumwe kya SHA1"
 
 # End of size restriction.
-#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:818
+#: ../smime/gui/smime-ui.glade.h:35 ../smime/lib/e-cert.c:818
 msgid "SSL Client Certificate"
 msgstr "Impamyabushobozi y'umukiriya ukoresha SSL"
 
-#: smime/gui/smime-ui.glade.h:36 smime/lib/e-cert.c:822
+#: ../smime/gui/smime-ui.glade.h:36 ../smime/lib/e-cert.c:822
 msgid "SSL Server Certificate"
 msgstr "Impamyabushobozi ya serveri ikoresha SSL"
 
-#: smime/gui/smime-ui.glade.h:38
+#: ../smime/gui/smime-ui.glade.h:38
 #, fuzzy
 msgid "Trust the authenticity of this certificate"
 msgstr "Izera ukuri kw'iyi mpamyabushobozi."
 
-#: smime/gui/smime-ui.glade.h:39
+#: ../smime/gui/smime-ui.glade.h:39
 msgid "Trust this CA to identify email users."
 msgstr "Izera uyu CA arange abakoresha imeli."
 
-#: smime/gui/smime-ui.glade.h:40
+#: ../smime/gui/smime-ui.glade.h:40
 msgid "Trust this CA to identify software developers."
 msgstr "Izera uyu CA arange abandika za porogaramu."
 
-#: smime/gui/smime-ui.glade.h:41
+#: ../smime/gui/smime-ui.glade.h:41
 msgid "Trust this CA to identify web sites."
 msgstr "Izera uyu CA arange za webu."
 
@@ -18004,82 +18571,82 @@ msgstr "Izera uyu CA arange za webu."
 # offmgr/source\offapp\dialog\treeopt.src:RID_OFADLG_OPTIONS_TREE_PAGES.SID_SD_EDITOPTIONS.3.text
 # #-#-#-#-#  offmgr.pot (Gnome 2.12)  #-#-#-#-#
 # offmgr/source\offapp\dialog\treeopt.src:RID_OFADLG_OPTIONS_TREE_PAGES.SID_SD_GRAPHIC_OPTIONS.3.text
-#: smime/gui/smime-ui.glade.h:42
+#: ../smime/gui/smime-ui.glade.h:42
 msgid "View"
 msgstr "Igaragaza"
 
-#: smime/gui/smime-ui.glade.h:43
+#: ../smime/gui/smime-ui.glade.h:43
 msgid "You have certificates from these organizations that identify you:"
 msgstr "Ufite impamyabushobozi zivuye muri ibi bigo bikuranga:"
 
-#: smime/gui/smime-ui.glade.h:44
+#: ../smime/gui/smime-ui.glade.h:44
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr ""
 "Ufite impamyabushobozi muri dosiye ziranga aba bayobozi b'impamyabushobozi:"
 
-#: smime/gui/smime-ui.glade.h:45
+#: ../smime/gui/smime-ui.glade.h:45
 msgid "You have certificates on file that identify these people:"
 msgstr "Ufite impamyabushobozi muri dosiye ziranga aba bantu::"
 
-#: smime/gui/smime-ui.glade.h:46
+#: ../smime/gui/smime-ui.glade.h:46
 msgid "Your Certificates"
 msgstr "Impamyabushobozi zawe"
 
-#: smime/gui/smime-ui.glade.h:47
+#: ../smime/gui/smime-ui.glade.h:47
 #, fuzzy
 msgid "_Edit CA Trust"
 msgstr "Guhindura kwizera kwa CA"
 
-#: smime/gui/smime-ui.glade.h:49
+#: ../smime/gui/smime-ui.glade.h:49
 msgid "dialog1"
 msgstr ""
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:642
+#: ../smime/lib/e-cert-db.c:650
 msgid "Certificate already exists"
 msgstr ""
 
-#: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
+#: ../smime/lib/e-cert.c:238 ../smime/lib/e-cert.c:248
 #, fuzzy
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%YCYOSE"
 
 #. x509 certificate usage types
-#: smime/lib/e-cert.c:424
+#: ../smime/lib/e-cert.c:424
 msgid "Sign"
 msgstr "Shyiraho Umukono"
 
-#: smime/lib/e-cert.c:425
+#: ../smime/lib/e-cert.c:425
 msgid "Encrypt"
 msgstr "Shyiraho Umutekano"
 
 # goodies/source\filter.vcl\eps\dlgeps.src:DLG_EXPORT_EPS.GRP_VERSION.text
-#: smime/lib/e-cert.c:530
+#: ../smime/lib/e-cert.c:530
 msgid "Version"
 msgstr "Verisiyo"
 
-#: smime/lib/e-cert.c:545
+#: ../smime/lib/e-cert.c:545
 msgid "Version 1"
 msgstr "Ikiciro kya 1"
 
-#: smime/lib/e-cert.c:548
+#: ../smime/lib/e-cert.c:548
 msgid "Version 2"
 msgstr "Ikiciro kya 2"
 
-#: smime/lib/e-cert.c:551
+#: ../smime/lib/e-cert.c:551
 msgid "Version 3"
 msgstr "Ikiciro kya 3"
 
-#: smime/lib/e-cert.c:633
+#: ../smime/lib/e-cert.c:633
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr "PKCS #1 MD2 ifite umutekano w'ubwoko bwa RSA"
 
-#: smime/lib/e-cert.c:636
+#: ../smime/lib/e-cert.c:636
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr "PKCS #1 MD5 ifite umutekano w'ubwoko bwa RSA"
 
-#: smime/lib/e-cert.c:639
+#: ../smime/lib/e-cert.c:639
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "PKCS #1 SHA-1 ifite umutekano w'ubwoko bwa RSA"
 
@@ -18095,205 +18662,213 @@ msgstr "PKCS #1 SHA-1 ifite umutekano w'ubwoko bwa RSA"
 # sc/source\ui\src\scfuncs.src:RID_SC_FUNCTION_DESCRIPTIONS2.SC_OPCODE_GAMMA_DIST.8.text
 # #-#-#-#-#  sc.pot (Gnome 2.12)  #-#-#-#-#
 # sc/source\ui\src\scfuncs.src:RID_SC_FUNCTION_DESCRIPTIONS2.SC_OPCODE_WEIBULL.8.text
-#: smime/lib/e-cert.c:642
+#: ../smime/lib/e-cert.c:642
 msgid "C"
 msgstr "C"
 
-#: smime/lib/e-cert.c:645
+#: ../smime/lib/e-cert.c:645
 msgid "CN"
 msgstr "CN"
 
-#: smime/lib/e-cert.c:648
+#: ../smime/lib/e-cert.c:648
 msgid "OU"
 msgstr "OU"
 
-#: smime/lib/e-cert.c:651
+#: ../smime/lib/e-cert.c:651
 msgid "O"
 msgstr "O"
 
-#: smime/lib/e-cert.c:654
+#: ../smime/lib/e-cert.c:654
 msgid "L"
 msgstr "L"
 
-#: smime/lib/e-cert.c:657
+#: ../smime/lib/e-cert.c:657
 msgid "DN"
 msgstr "DN"
 
-#: smime/lib/e-cert.c:660
+#: ../smime/lib/e-cert.c:660
 msgid "DC"
 msgstr "DC"
 
-#: smime/lib/e-cert.c:663
+#: ../smime/lib/e-cert.c:663
 msgid "ST"
 msgstr "ST"
 
-#: smime/lib/e-cert.c:666
+#: ../smime/lib/e-cert.c:666
 msgid "PKCS #1 RSA Encryption"
 msgstr "PKCS #1 Umutekano w'ubwoko bwa RSA"
 
-#: smime/lib/e-cert.c:669
+#: ../smime/lib/e-cert.c:669
 msgid "Certificate Key Usage"
 msgstr "Ikoreshwa ry'ifunguzo ry'Impamyabushobozi"
 
-#: smime/lib/e-cert.c:672
+#: ../smime/lib/e-cert.c:672
 msgid "Netscape Certificate Type"
 msgstr "Ubwoko bw'impamyabushobozi bwa Netscape"
 
-#: smime/lib/e-cert.c:675
+#: ../smime/lib/e-cert.c:675
 msgid "Certificate Authority Key Identifier"
 msgstr "Iranga ifunguzo ry'ubuyobozi bw'impamyabushobozi"
 
-#: smime/lib/e-cert.c:678
+#: ../smime/lib/e-cert.c:678
 msgid "UID"
 msgstr "UID"
 
-#: smime/lib/e-cert.c:687
+# #-#-#-#-#  sc.pot (Gnome 2.12)  #-#-#-#-#
+# sc/source\ui\src\scfuncs.src:RID_SC_FUNCTION_DESCRIPTIONS1.SC_OPCODE_KUM_KAP_Z.10.text
+# #-#-#-#-#  sc.pot (Gnome 2.12)  #-#-#-#-#
+# sc/source\ui\src\scfuncs.src:RID_SC_FUNCTION_DESCRIPTIONS1.SC_OPCODE_KUM_ZINS_Z.10.text
+#: ../smime/lib/e-cert.c:681
+msgid "E"
+msgstr "E"
+
+#: ../smime/lib/e-cert.c:687
 #, fuzzy, c-format
 msgid "Object Identifier (%s)"
 msgstr "Ikiranga igikoresho( %s%S)"
 
-#: smime/lib/e-cert.c:738
+#: ../smime/lib/e-cert.c:738
 msgid "Algorithm Identifier"
 msgstr "Ikiranga Aligoritime"
 
-#: smime/lib/e-cert.c:746
+#: ../smime/lib/e-cert.c:746
 msgid "Algorithm Parameters"
 msgstr "Ibishingiweho kuri Aligoritime"
 
-#: smime/lib/e-cert.c:768
+#: ../smime/lib/e-cert.c:768
 msgid "Subject Public Key Info"
 msgstr "Ibigyanye n'urufunguzo rusange ry'ibivugwaho"
 
-#: smime/lib/e-cert.c:773
+#: ../smime/lib/e-cert.c:773
 msgid "Subject Public Key Algorithm"
 msgstr "Aligoritime y'urufunguzo rusange ry'ibivugwaho"
 
-#: smime/lib/e-cert.c:788
+#: ../smime/lib/e-cert.c:788
 msgid "Subject's Public Key"
 msgstr "Urufunguzo rusange rw'ibivugwaho"
 
-#: smime/lib/e-cert.c:809 smime/lib/e-cert.c:858
+#: ../smime/lib/e-cert.c:809 ../smime/lib/e-cert.c:858
 msgid "Error: Unable to process extension"
 msgstr "Ikosa: Ntibishobotse gukora iyongera"
 
-#: smime/lib/e-cert.c:830 smime/lib/e-cert.c:842
+#: ../smime/lib/e-cert.c:830 ../smime/lib/e-cert.c:842
 msgid "Object Signer"
 msgstr "Igikoresho ky'ushyiraho umukono"
 
-#: smime/lib/e-cert.c:834
+#: ../smime/lib/e-cert.c:834
 msgid "SSL Certificate Authority"
 msgstr "Ubuyobozi bw'impamyabushobozi bwa SSL"
 
-#: smime/lib/e-cert.c:838
+#: ../smime/lib/e-cert.c:838
 msgid "Email Certificate Authority"
 msgstr "Ubuyobozi bw'impamyabushobozi bwa imeli"
 
-#: smime/lib/e-cert.c:866
+#: ../smime/lib/e-cert.c:866
 msgid "Signing"
 msgstr "Ishirwaho umukono"
 
-#: smime/lib/e-cert.c:870
+#: ../smime/lib/e-cert.c:870
 msgid "Non-repudiation"
 msgstr "Kutirukana"
 
-#: smime/lib/e-cert.c:874
+#: ../smime/lib/e-cert.c:874
 msgid "Key Encipherment"
 msgstr ""
 
-#: smime/lib/e-cert.c:878
+#: ../smime/lib/e-cert.c:878
 msgid "Data Encipherment"
 msgstr ""
 
-#: smime/lib/e-cert.c:882
+#: ../smime/lib/e-cert.c:882
 msgid "Key Agreement"
 msgstr "ibyemejwe by'ifungunzo"
 
-#: smime/lib/e-cert.c:886
+#: ../smime/lib/e-cert.c:886
 msgid "Certificate Signer"
 msgstr "Uwashizeho umukono kw'impamyabushobozi"
 
-#: smime/lib/e-cert.c:890
+#: ../smime/lib/e-cert.c:890
 msgid "CRL Signer"
 msgstr "Uwashizeho umukono kuri CRL"
 
-#: smime/lib/e-cert.c:938
+#: ../smime/lib/e-cert.c:938
 msgid "Critical"
 msgstr "Ibyangombwa"
 
-#: smime/lib/e-cert.c:940 smime/lib/e-cert.c:943
+#: ../smime/lib/e-cert.c:940 ../smime/lib/e-cert.c:943
 msgid "Not Critical"
 msgstr "Ibitari byangombwa"
 
-#: smime/lib/e-cert.c:964
+#: ../smime/lib/e-cert.c:964
 msgid "Extensions"
 msgstr "Umigereka"
 
 # desktop/source\app\ssodlg.src:DLG_SSOLOGIN.text
-#: smime/lib/e-cert.c:1035
+#: ../smime/lib/e-cert.c:1035
 #, fuzzy, c-format
 msgid "%s = %s"
 msgstr "%s=%s"
 
-#: smime/lib/e-cert.c:1091 smime/lib/e-cert.c:1211
+#: ../smime/lib/e-cert.c:1091 ../smime/lib/e-cert.c:1211
 msgid "Certificate Signature Algorithm"
 msgstr "Aligoritime y'umukono w'impamyabushobozi"
 
-#: smime/lib/e-cert.c:1100
+#: ../smime/lib/e-cert.c:1100
 msgid "Issuer"
 msgstr "Wasohoye"
 
-#: smime/lib/e-cert.c:1154
+#: ../smime/lib/e-cert.c:1154
 msgid "Issuer Unique ID"
 msgstr "Ikiranga nyakamwe ky'usohora"
 
-#: smime/lib/e-cert.c:1173
+#: ../smime/lib/e-cert.c:1173
 msgid "Subject Unique ID"
 msgstr "Ikiranga nyakamwe y'ibivugwaho"
 
-#: smime/lib/e-cert.c:1216
+#: ../smime/lib/e-cert.c:1216
 msgid "Certificate Signature Value"
 msgstr "Agaciro k'umukono w'impamyabushobozi"
 
-#: smime/lib/e-pkcs12.c:264
+#: ../smime/lib/e-pkcs12.c:264
 #, fuzzy
 msgid "PKCS12 File Password"
 msgstr "Idosiye"
 
-#: smime/lib/e-pkcs12.c:264
+#: ../smime/lib/e-pkcs12.c:264
 #, fuzzy
 msgid "Enter password for PKCS12 file:"
 msgstr "Ijambobanga... kugirango IDOSIYE"
 
-#: smime/lib/e-pkcs12.c:363
+#: ../smime/lib/e-pkcs12.c:363
 msgid "Imported Certificate"
 msgstr "Iyimura y'impamya bushobozi"
 
-#: tools/evolution-launch-composer.c:324
+#: ../tools/evolution-launch-composer.c:324
 #, fuzzy
 msgid "An attachment to add."
 msgstr "umugereka Kuri Kongeramo"
 
-#: tools/evolution-launch-composer.c:325
+#: ../tools/evolution-launch-composer.c:325
 #, fuzzy
 msgid "Content type of the attachment."
 msgstr "Ubwoko Bya umugereka"
 
-#: tools/evolution-launch-composer.c:326
+#: ../tools/evolution-launch-composer.c:326
 #, fuzzy
 msgid "The filename to display in the mail."
 msgstr "Izina ry'idosiye: Kuri Kugaragaza in Ubutumwa"
 
-#: tools/evolution-launch-composer.c:327
+#: ../tools/evolution-launch-composer.c:327
 #, fuzzy
 msgid "Description of the attachment."
 msgstr "Bya umugereka"
 
-#: tools/evolution-launch-composer.c:328
+#: ../tools/evolution-launch-composer.c:328
 #, fuzzy
 msgid "Mark attachment to be shown inline by default."
 msgstr "umugereka Kuri Mumurongo ku Mburabuzi"
 
-#: tools/evolution-launch-composer.c:329
+#: ../tools/evolution-launch-composer.c:329
 #, fuzzy
 msgid "Default subject for the message."
 msgstr "Ikivugwaho kugirango Ubutumwa"
@@ -18301,146 +18876,143 @@ msgstr "Ikivugwaho kugirango Ubutumwa"
 #. This most likely means that KILL_PROCESS_CMD wasn't
 #. * found, so just bail completely.
 #.
-#: tools/killev.c:61
+#: ../tools/killev.c:61
 #, fuzzy, c-format
 msgid "Could not execute '%s': %s\n"
 msgstr "OYA Gukora"
 
-#: tools/killev.c:76
+#: ../tools/killev.c:76
 #, fuzzy, c-format
 msgid "Shutting down %s (%s)\n"
 msgstr "Hasi"
 
-#: ui/evolution-addressbook.xml.h:3
+#: ../ui/evolution-addressbook.xml.h:3
 #, fuzzy
 msgid "Copy Contact(s) to Another Folder..."
 msgstr "S Kuri"
 
-#: ui/evolution-addressbook.xml.h:4 ui/evolution-calendar.xml.h:2
+#: ../ui/evolution-addressbook.xml.h:4 ../ui/evolution-calendar.xml.h:2
 #, fuzzy
 msgid "Copy the selection"
 msgstr "Ihitamo"
 
 # 1191
-#: ui/evolution-addressbook.xml.h:5
+#: ../ui/evolution-addressbook.xml.h:5
 #, fuzzy
 msgid "Copy to Folder..."
 msgstr "kopororera ku nyandiko"
 
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:3
+#: ../ui/evolution-addressbook.xml.h:7 ../ui/evolution-calendar.xml.h:3
 #, fuzzy
 msgid "Cut the selection"
 msgstr "Ihitamo"
 
-#: ui/evolution-addressbook.xml.h:9
+#: ../ui/evolution-addressbook.xml.h:9
 #, fuzzy
 msgid "Delete selected contacts"
 msgstr "Byahiswemo Aho kubariza"
 
-#: ui/evolution-addressbook.xml.h:11
+#: ../ui/evolution-addressbook.xml.h:11
 #, fuzzy
 msgid "Move Contact(s) to Another Folder..."
 msgstr "S Kuri"
 
-#: ui/evolution-addressbook.xml.h:12
+#: ../ui/evolution-addressbook.xml.h:12
 #, fuzzy
 msgid "Move to Folder..."
 msgstr "Kuri"
 
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:16
+#: ../ui/evolution-addressbook.xml.h:14 ../ui/evolution-calendar.xml.h:16
 #, fuzzy
 msgid "Paste the clipboard"
 msgstr "Ububikokoporora"
 
-#: ui/evolution-addressbook.xml.h:15
+#: ../ui/evolution-addressbook.xml.h:15
 #, fuzzy
 msgid "Previews the contacts to be printed"
 msgstr "Aho kubariza Kuri Byacapwe"
 
 # sc/source\ui\src\scstring.src:SCSTR_PREVIEWSHELL.text
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:20
-#: ui/evolution-mail-message.xml.h:81 ui/evolution-tasks.xml.h:15
+#: ../ui/evolution-addressbook.xml.h:17 ../ui/evolution-calendar.xml.h:20
+#: ../ui/evolution-mail-message.xml.h:75 ../ui/evolution-tasks.xml.h:15
 #, fuzzy
 msgid "Print Pre_view"
 msgstr "Igaragazambere ryo Gucapa"
 
-#: ui/evolution-addressbook.xml.h:18
+#: ../ui/evolution-addressbook.xml.h:18
 #, fuzzy
 msgid "Print selected contacts"
 msgstr "Byahiswemo Aho kubariza"
 
-#: ui/evolution-addressbook.xml.h:20
+#: ../ui/evolution-addressbook.xml.h:20
 #, fuzzy
 msgid "Save selected contacts as a VCard."
 msgstr "Kubika Byahiswemo Aho kubariza Nka a"
 
 # sfx2/sdi\sfxslots.src:SID_SELECTALL.text
-#: ui/evolution-addressbook.xml.h:21
+#: ../ui/evolution-addressbook.xml.h:21 ../widgets/text/e-text.c:2684
 msgid "Select All"
 msgstr "Guhitamo Byose"
 
-#: ui/evolution-addressbook.xml.h:22
+#: ../ui/evolution-addressbook.xml.h:22
 #, fuzzy
 msgid "Select all contacts"
 msgstr "Byose Aho kubariza"
 
-#: ui/evolution-addressbook.xml.h:23
+#: ../ui/evolution-addressbook.xml.h:23
 #, fuzzy
 msgid "Send a message to the selected contacts."
 msgstr "a Ubutumwa Kuri Byahiswemo Aho kubariza"
 
-#: ui/evolution-addressbook.xml.h:24
+#: ../ui/evolution-addressbook.xml.h:24
 #, fuzzy
 msgid "Send message to contact"
 msgstr "Ubutumwa Kuri Umuntu"
 
-#: ui/evolution-addressbook.xml.h:25
+#: ../ui/evolution-addressbook.xml.h:25
 #, fuzzy
 msgid "Send selected contacts to another person."
 msgstr "Byahiswemo Aho kubariza Kuri"
 
-#: ui/evolution-addressbook.xml.h:26
+#: ../ui/evolution-addressbook.xml.h:26
 #, fuzzy
 msgid "Show contact preview window"
 msgstr "Umuntu Igaragazambere Idirishya"
 
 # basctl/source\basicide\basidesh.src:RID_BASICIDE_OBJECTBAR.SID_BASICSTOP.text
-#: ui/evolution-addressbook.xml.h:27
+#: ../ui/evolution-addressbook.xml.h:27
 msgid "Stop"
 msgstr "Guhagarara"
 
 # sfx2/sdi\sfxslots.src:SID_BROWSE_STOP.text
-#: ui/evolution-addressbook.xml.h:28
+#: ../ui/evolution-addressbook.xml.h:28
 msgid "Stop Loading"
 msgstr "Guhagarika Gutangiza"
 
-#: ui/evolution-addressbook.xml.h:29
+#: ../ui/evolution-addressbook.xml.h:29
 #, fuzzy
 msgid "View the current contact"
 msgstr "KIGEZWEHO Umuntu"
 
-#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:38
-#: ui/evolution-mail-global.xml.h:14 ui/evolution-mail-list.xml.h:23
-#: ui/evolution-mail-message.xml.h:103
-#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-tasks.xml.h:19
-#: ui/evolution.xml.h:36
+#: ../ui/evolution-addressbook.xml.h:30 ../ui/evolution-calendar.xml.h:38
+#: ../ui/evolution-mail-list.xml.h:24 ../ui/evolution-tasks.xml.h:19
 msgid "_Actions"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:35
+#: ../ui/evolution-addressbook.xml.h:35
 msgid "_Forward Contact..."
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:36
+#: ../ui/evolution-addressbook.xml.h:36
 #, fuzzy
 msgid "_Move to Folder..."
 msgstr "Kuri"
 
-#: ui/evolution-addressbook.xml.h:39 ui/evolution-mail-global.xml.h:16
+#: ../ui/evolution-addressbook.xml.h:39
 msgid "_Preview Pane"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:41
+#: ../ui/evolution-addressbook.xml.h:41
 #, fuzzy
 msgid "_Save as VCard..."
 msgstr "Kubika Nka"
@@ -18449,50 +19021,50 @@ msgstr "Kubika Nka"
 # padmin/source\padialog.src:RID_FONTIMPORT_DIALOG.RID_FIMP_BTN_SELECTALL.text
 # #-#-#-#-#  padmin.pot (Gnome 2.12)  #-#-#-#-#
 # padmin/source\padialog.src:RID_ADDP_PAGE_OLDPRINTERS.RID_ADDP_OLD_BTN_SELECTALL.text
-#: ui/evolution-addressbook.xml.h:42
+#: ../ui/evolution-addressbook.xml.h:42
 #, fuzzy
 msgid "_Select All"
 msgstr "Hitamo byose"
 
-#: ui/evolution-addressbook.xml.h:43
+#: ../ui/evolution-addressbook.xml.h:43
 #, fuzzy
 msgid "_Send Message to Contact..."
 msgstr "Kuri"
 
 # svtools/source\control\calendar.src:STR_SVT_CALENDAR_DAY.text
-#: ui/evolution-calendar.xml.h:4
+#: ../ui/evolution-calendar.xml.h:4
 msgid "Day"
 msgstr "Umunsi"
 
-#: ui/evolution-calendar.xml.h:6
+#: ../ui/evolution-calendar.xml.h:6
 msgid "Delete All Occurrences"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:7
+#: ../ui/evolution-calendar.xml.h:7
 #, fuzzy
 msgid "Delete the appointment"
 msgstr "i"
 
-#: ui/evolution-calendar.xml.h:8
+#: ../ui/evolution-calendar.xml.h:8
 #, fuzzy
 msgid "Delete this Occurrence"
 msgstr "iyi"
 
-#: ui/evolution-calendar.xml.h:9
+#: ../ui/evolution-calendar.xml.h:9
 #, fuzzy
 msgid "Delete this occurrence"
 msgstr "iyi ukugaragara"
 
-#: ui/evolution-calendar.xml.h:10
+#: ../ui/evolution-calendar.xml.h:10
 msgid "Go To"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:11
+#: ../ui/evolution-calendar.xml.h:11
 #, fuzzy
 msgid "Go back"
 msgstr "Inyuma"
 
-#: ui/evolution-calendar.xml.h:12
+#: ../ui/evolution-calendar.xml.h:12
 #, fuzzy
 msgid "Go forward"
 msgstr "Imbere"
@@ -18503,121 +19075,121 @@ msgstr "Imbere"
 # officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....DefaultFontCJK.List.text
 # #-#-#-#-#  officecfg.pot (Gnome 2.12)  #-#-#-#-#
 # officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....DefaultFontCTL.List.text
-#: ui/evolution-calendar.xml.h:13
+#: ../ui/evolution-calendar.xml.h:13
 msgid "List"
 msgstr "Urutonde"
 
 # sw/source\ui\utlui\initui.src:STR_AUTH_FIELD_MONTH.text
-#: ui/evolution-calendar.xml.h:14
+#: ../ui/evolution-calendar.xml.h:14
 msgid "Month"
 msgstr "Ukwezi"
 
-#: ui/evolution-calendar.xml.h:15 ui/evolution-mail-message.xml.h:65
+#: ../ui/evolution-calendar.xml.h:15 ../ui/evolution-mail-message.xml.h:59
 msgid "Next"
 msgstr "Ikurikira"
 
-#: ui/evolution-calendar.xml.h:17
+#: ../ui/evolution-calendar.xml.h:17
 #, fuzzy
 msgid "Previews the calendar to be printed"
 msgstr "Kalindari Kuri Byacapwe"
 
-#: ui/evolution-calendar.xml.h:18 ui/evolution-mail-message.xml.h:79
+#: ../ui/evolution-calendar.xml.h:18 ../ui/evolution-mail-message.xml.h:73
 msgid "Previous"
 msgstr "Ibanjirije"
 
-#: ui/evolution-calendar.xml.h:21
+#: ../ui/evolution-calendar.xml.h:21
 #, fuzzy
 msgid "Print this calendar"
 msgstr "iyi Kalindari"
 
-#: ui/evolution-calendar.xml.h:22
+#: ../ui/evolution-calendar.xml.h:22
 #, fuzzy
 msgid "Publish Free/Busy information for this calendar"
 msgstr "Ibisobanuro kugirango iyi Kalindari"
 
-#: ui/evolution-calendar.xml.h:23 ui/evolution-tasks.xml.h:17
+#: ../ui/evolution-calendar.xml.h:23 ../ui/evolution-tasks.xml.h:17
 msgid "Purg_e"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:24
+#: ../ui/evolution-calendar.xml.h:24
 #, fuzzy
 msgid "Purge old appointments and meetings"
 msgstr "ki/ bishaje Na"
 
-#: ui/evolution-calendar.xml.h:25
+#: ../ui/evolution-calendar.xml.h:25
 msgid "Select _Date"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:27
+#: ../ui/evolution-calendar.xml.h:27
 #, fuzzy
 msgid "Select a specific date"
 msgstr "a Itariki"
 
-#: ui/evolution-calendar.xml.h:28
+#: ../ui/evolution-calendar.xml.h:28
 #, fuzzy
 msgid "Select today"
 msgstr "UYUMUNSI"
 
-#: ui/evolution-calendar.xml.h:29
+#: ../ui/evolution-calendar.xml.h:29
 #, fuzzy
 msgid "Show as list"
 msgstr "Nka Urutonde"
 
-#: ui/evolution-calendar.xml.h:30
+#: ../ui/evolution-calendar.xml.h:30
 #, fuzzy
 msgid "Show one day"
 msgstr "UMUNSI"
 
-#: ui/evolution-calendar.xml.h:31
+#: ../ui/evolution-calendar.xml.h:31
 #, fuzzy
 msgid "Show one month"
 msgstr "Ukwezi"
 
-#: ui/evolution-calendar.xml.h:32
+#: ../ui/evolution-calendar.xml.h:32
 #, fuzzy
 msgid "Show one week"
 msgstr "Icyumweru"
 
-#: ui/evolution-calendar.xml.h:33
+#: ../ui/evolution-calendar.xml.h:33
 #, fuzzy
 msgid "Show the working week"
 msgstr "Icyumweru"
 
-#: ui/evolution-calendar.xml.h:35
+#: ../ui/evolution-calendar.xml.h:35
 #, fuzzy
 msgid "View the current appointment"
 msgstr "KIGEZWEHO"
 
 # svtools/source\control\calendar.src:STR_SVT_CALENDAR_WEEK.text
-#: ui/evolution-calendar.xml.h:36
+#: ../ui/evolution-calendar.xml.h:36
 msgid "Week"
 msgstr "Icyumweru"
 
-#: ui/evolution-calendar.xml.h:37
+#: ../ui/evolution-calendar.xml.h:37
 msgid "Work Week"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:42
+#: ../ui/evolution-calendar.xml.h:42
 msgid "_Open Appointment"
 msgstr ""
 
-#: ui/evolution-composer-entries.xml.h:1
+#: ../ui/evolution-composer-entries.xml.h:1
 #, fuzzy
 msgid "Copy selected text to the clipboard"
 msgstr "Byahiswemo Umwandiko Kuri Ububikokoporora"
 
 # dbaccess/source/ui/inc/toolbox.hrc:MID_SBA_QRY_CUT.text
-#: ui/evolution-composer-entries.xml.h:2 ui/evolution-mail-message.xml.h:21
+#: ../ui/evolution-composer-entries.xml.h:2
 #, fuzzy
 msgid "Cu_t"
 msgstr "Gukata"
 
-#: ui/evolution-composer-entries.xml.h:3
+#: ../ui/evolution-composer-entries.xml.h:3
 #, fuzzy
 msgid "Cut selected text to the clipboard"
 msgstr "Byahiswemo Umwandiko Kuri Ububikokoporora"
 
-#: ui/evolution-composer-entries.xml.h:4
+#: ../ui/evolution-composer-entries.xml.h:4
 #, fuzzy
 msgid "Paste text from the clipboard"
 msgstr "Umwandiko Bivuye Ububikokoporora"
@@ -18626,711 +19198,758 @@ msgstr "Umwandiko Bivuye Ububikokoporora"
 # padmin/source\padialog.src:RID_FONTIMPORT_DIALOG.RID_FIMP_BTN_SELECTALL.text
 # #-#-#-#-#  padmin.pot (Gnome 2.12)  #-#-#-#-#
 # padmin/source\padialog.src:RID_ADDP_PAGE_OLDPRINTERS.RID_ADDP_OLD_BTN_SELECTALL.text
-#: ui/evolution-composer-entries.xml.h:5 ui/evolution-mail-list.xml.h:13
-#: ui/evolution-subscribe.xml.h:6
+#: ../ui/evolution-composer-entries.xml.h:5 ../ui/evolution-subscribe.xml.h:6
 #, fuzzy
 msgid "Select _All"
 msgstr "Hitamo byose"
 
-#: ui/evolution-composer-entries.xml.h:6
+#: ../ui/evolution-composer-entries.xml.h:6
 #, fuzzy
 msgid "Select all text"
 msgstr "Byose Umwandiko"
 
-#: ui/evolution-executive-summary.xml.h:1
+#: ../ui/evolution-executive-summary.xml.h:1
 msgid "Customize My Evolution"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:2
+#: ../ui/evolution-mail-global.xml.h:2
 #, fuzzy
 msgid "Cancel the current mail operation"
 msgstr "KIGEZWEHO Ubutumwa"
 
-#: ui/evolution-mail-global.xml.h:3
-msgid "Compose _New Message"
-msgstr ""
+#: ../ui/evolution-mail-global.xml.h:3
+#, fuzzy
+msgid "Copy the selected folder into another folder"
+msgstr "Byahiswemo Ubutumwa Kuri Ububiko"
+
+#: ../ui/evolution-mail-global.xml.h:4
+#, fuzzy
+msgid "Create a new folder for storing mail"
+msgstr "a kugirango iyi Urutonde"
 
-#: ui/evolution-mail-global.xml.h:4
+#: ../ui/evolution-mail-global.xml.h:5
 #, fuzzy
 msgid "Create or edit rules for filtering new mail"
 msgstr "Cyangwa Guhindura kugirango Iyungurura Gishya Ubutumwa"
 
-#: ui/evolution-mail-global.xml.h:5
+#: ../ui/evolution-mail-global.xml.h:6
 #, fuzzy
 msgid "Create or edit vFolder definitions"
 msgstr "Cyangwa Guhindura"
 
-#: ui/evolution-mail-global.xml.h:6
+#: ../ui/evolution-mail-global.xml.h:7
 msgid "Empty _Trash"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:7
+# sfx2/source\explorer\explorer.src:STR_SFX_FOLDER.text
+#: ../ui/evolution-mail-global.xml.h:8 ../ui/evolution-mail-list.xml.h:6
+#: ../ui/evolution-subscribe.xml.h:2
+#, fuzzy
+msgid "F_older"
+msgstr "Ububiko"
+
+#: ../ui/evolution-mail-global.xml.h:9
 #, fuzzy
-msgid "Open a window for composing a mail message"
-msgstr "a Idirishya kugirango a Ubutumwa Ubutumwa"
+msgid "Message F_ilters"
+msgstr "ni"
+
+#: ../ui/evolution-mail-global.xml.h:10
+#, fuzzy
+msgid "Message _List As"
+msgstr "ni"
 
-#: ui/evolution-mail-global.xml.h:8
+# sfx2/source\doc\doc.src:STR_DOCTYPENAME_MESSAGE.text
+#: ../ui/evolution-mail-global.xml.h:11
+#, fuzzy
+msgid "Message _Preview"
+msgstr "Ubutumwa"
+
+#: ../ui/evolution-mail-global.xml.h:12
+#, fuzzy
+msgid "Move the selected folder into another folder"
+msgstr "Byahiswemo Ubutumwa S Kuri Ububiko"
+
+#: ../ui/evolution-mail-global.xml.h:13
 #, fuzzy
 msgid "Permanently remove all deleted messages from all folders"
 msgstr "Gukuraho... Byose Cyasibwe Ubutumwa Bivuye Byose"
 
-#: ui/evolution-mail-global.xml.h:9
-msgid "Post Ne_w Message"
-msgstr ""
-
-#: ui/evolution-mail-global.xml.h:10
+#: ../ui/evolution-mail-global.xml.h:14
 #, fuzzy
 msgid "Post a message to a Public folder"
 msgstr "a Ubutumwa Kuri a Ububiko"
 
-#: ui/evolution-mail-global.xml.h:11
+#: ../ui/evolution-mail-global.xml.h:15
 #, fuzzy
-msgid "S_ubscribe to Folders..."
-msgstr "Kuri"
+msgid "Search F_olders"
+msgstr "SHINGIRO"
 
-#: ui/evolution-mail-global.xml.h:12
+#: ../ui/evolution-mail-global.xml.h:16
 #, fuzzy
 msgid "Show message preview window"
 msgstr "Ubutumwa Igaragazambere Idirishya"
 
-#: ui/evolution-mail-global.xml.h:13
+#: ../ui/evolution-mail-global.xml.h:17
 #, fuzzy
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Cyangwa Kuri ku"
 
-# framework/source\classes\fltdlg.src:DLG_FILTER_SELECT.FL_FILTER.text
-#: ui/evolution-mail-global.xml.h:15
+# 1191
+#: ../ui/evolution-mail-global.xml.h:18
 #, fuzzy
-msgid "_Filters..."
-msgstr "Muyunguruzi"
+msgid "_Copy Folder To..."
+msgstr "kopororera ku nyandiko"
 
-#: ui/evolution-mail-global.xml.h:18
-msgid "vFolder _Editor..."
+#: ../ui/evolution-mail-global.xml.h:19
+#, fuzzy
+msgid "_Move Folder To..."
+msgstr "Kuri"
+
+#: ../ui/evolution-mail-global.xml.h:20
+msgid "_New Search _Folder (FIXME)"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:1
+# basctl/source\basicide\brkdlg.src:RID_BASICIDE_BREAKPOINTDLG.RID_PB_NEW.text
+#: ../ui/evolution-mail-global.xml.h:21
+#, fuzzy
+msgid "_New..."
+msgstr "Gishya"
+
+#: ../ui/evolution-mail-global.xml.h:22
+#, fuzzy
+msgid "_Subscriptions"
+msgstr "Umwirondoro:"
+
+#: ../ui/evolution-mail-list.xml.h:1
+#, fuzzy
+msgid "Change the name of this folder"
+msgstr "Indangakintu... Bya iyi Ububiko"
+
+#: ../ui/evolution-mail-list.xml.h:2
 #, fuzzy
 msgid "Change the properties of this folder"
 msgstr "Indangakintu... Bya iyi Ububiko"
 
-#: ui/evolution-mail-list.xml.h:2 ui/evolution-mail-message.xml.h:10
+#: ../ui/evolution-mail-list.xml.h:3 ../ui/evolution-mail-message.xml.h:12
 #, fuzzy
 msgid "Copy selected message(s) to the clipboard"
 msgstr "Byahiswemo Ubutumwa S Kuri Ububikokoporora"
 
-#: ui/evolution-mail-list.xml.h:3 ui/evolution-mail-message.xml.h:22
+#: ../ui/evolution-mail-list.xml.h:4 ../ui/evolution-mail-message.xml.h:23
 #, fuzzy
 msgid "Cut selected message(s) to the clipboard"
 msgstr "Byahiswemo Ubutumwa S Kuri Ububikokoporora"
 
-#: ui/evolution-mail-list.xml.h:4
+#: ../ui/evolution-mail-list.xml.h:5
 msgid "E_xpunge"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:5
-msgid "Hide S_elected Messages"
+#: ../ui/evolution-mail-list.xml.h:7
+msgid "Group By _Threads"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:6
+#: ../ui/evolution-mail-list.xml.h:8
 msgid "Hide _Deleted Messages"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:7
-msgid "Hide _Read Messages"
-msgstr ""
-
-#: ui/evolution-mail-list.xml.h:8
+#: ../ui/evolution-mail-list.xml.h:9
 #, fuzzy
 msgid ""
 "Hide deleted messages rather than displaying them with a line through them"
 msgstr "Cyasibwe Ubutumwa Na: a Umurongo Gihinguranya"
 
-#: ui/evolution-mail-list.xml.h:9
-#, fuzzy
-msgid "Mark All as _Read"
-msgstr "Nka"
-
-#: ui/evolution-mail-list.xml.h:10
+#: ../ui/evolution-mail-list.xml.h:10
 #, fuzzy
-msgid "Mark all visible messages as read"
-msgstr "Byose Kigaragara Ubutumwa Nka Gusoma"
+msgid "Mark Me_ssages as Read"
+msgstr "Ubutumwa Nka Gusoma Nyuma"
 
-#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:74
+#: ../ui/evolution-mail-list.xml.h:11 ../ui/evolution-mail-message.xml.h:68
 #, fuzzy
 msgid "Paste message(s) from the clipboard"
 msgstr "Ubutumwa S Bivuye Ububikokoporora"
 
-#: ui/evolution-mail-list.xml.h:12
+#: ../ui/evolution-mail-list.xml.h:12
 #, fuzzy
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "Gukuraho... Byose Cyasibwe Ubutumwa Bivuye iyi Ububiko"
 
-#: ui/evolution-mail-list.xml.h:14
-msgid "Select _Thread"
-msgstr ""
+#: ../ui/evolution-mail-list.xml.h:13
+#, fuzzy
+msgid "Permanently remove this folder"
+msgstr "Gukuraho... Byose Cyasibwe Ubutumwa Bivuye iyi Ububiko"
+
+#: ../ui/evolution-mail-list.xml.h:14
+#, fuzzy
+msgid "Select _All Messages"
+msgstr "Byose Kigaragara Ubutumwa"
 
-#: ui/evolution-mail-list.xml.h:15
+#: ../ui/evolution-mail-list.xml.h:15
 #, fuzzy
 msgid "Select all and only the messages that are not currently selected"
 msgstr "Byose Na Ubutumwa OYA Byahiswemo"
 
-#: ui/evolution-mail-list.xml.h:16
+#: ../ui/evolution-mail-list.xml.h:16
 #, fuzzy
 msgid "Select all messages in the same thread as the selected message"
 msgstr "Byose Ubutumwa in Urudodo Nka Byahiswemo Ubutumwa"
 
-#: ui/evolution-mail-list.xml.h:17
+#: ../ui/evolution-mail-list.xml.h:17
 #, fuzzy
 msgid "Select all visible messages"
 msgstr "Byose Kigaragara Ubutumwa"
 
-#: ui/evolution-mail-list.xml.h:18
-msgid "Sh_ow Hidden Messages"
-msgstr ""
+#: ../ui/evolution-mail-list.xml.h:18
+#, fuzzy
+msgid "Show _Messages"
+msgstr "Ubutumwa"
 
-#: ui/evolution-mail-list.xml.h:19
+#: ../ui/evolution-mail-list.xml.h:19
 #, fuzzy
 msgid "Show messages that have been temporarily hidden"
 msgstr "Ubutumwa gihishwe"
 
-#: ui/evolution-mail-list.xml.h:20
+#: ../ui/evolution-mail-list.xml.h:20
 #, fuzzy
 msgid "Temporarily hide all messages that have already been read"
 msgstr "Gushisha Byose Ubutumwa Gusoma"
 
-#: ui/evolution-mail-list.xml.h:21
+#: ../ui/evolution-mail-list.xml.h:21
 #, fuzzy
 msgid "Temporarily hide the selected messages"
 msgstr "Gushisha Byahiswemo Ubutumwa"
 
-#: ui/evolution-mail-list.xml.h:22
+#: ../ui/evolution-mail-list.xml.h:22
 #, fuzzy
 msgid "Threaded Message list"
 msgstr "Urutonde"
 
-# sfx2/source\explorer\explorer.src:STR_SFX_FOLDER.text
-#: ui/evolution-mail-list.xml.h:25
+#: ../ui/evolution-mail-list.xml.h:23
 #, fuzzy
-msgid "_Folder"
-msgstr "Ububiko"
+msgid "Un_read Messages"
+msgstr "Ubutumwa"
 
-#: ui/evolution-mail-list.xml.h:26 ui/evolution-subscribe.xml.h:12
-msgid "_Invert Selection"
+#: ../ui/evolution-mail-list.xml.h:25
+msgid "_All"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:28
-msgid "_Threaded Message List"
-msgstr ""
+#: ../ui/evolution-mail-list.xml.h:27 ../ui/evolution-mail-message.xml.h:110
+#: ../ui/evolution-mail-messagedisplay.xml.h:7
+#, fuzzy
+msgid "_Message"
+msgstr "Ubutumwa"
 
-#: ui/evolution-mail-message.xml.h:1
+# # Strings use for the save message dialog shown when the user close a message compose window
+# # Strings used by Save as Draft/Template dialog
+#: ../ui/evolution-mail-list.xml.h:30
+#, fuzzy
+msgid "_Selected Messages"
+msgstr "Bika ubutumwa"
+
+#: ../ui/evolution-mail-message.xml.h:1
 #, fuzzy
 msgid "A_dd Sender to Address Book"
 msgstr "Kuri"
 
-#: ui/evolution-mail-message.xml.h:2
+#: ../ui/evolution-mail-message.xml.h:2
 msgid "A_pply Filters"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:3
+#: ../ui/evolution-mail-message.xml.h:3
 #, fuzzy
 msgid "Add Sender to Address Book"
 msgstr "Kuri"
 
-#: ui/evolution-mail-message.xml.h:4
+#: ../ui/evolution-mail-message.xml.h:4
+msgid "All Message _Headers"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:5
 #, fuzzy
 msgid "Apply filter rules to the selected messages"
 msgstr "Muyunguruzi... Kuri Byahiswemo Ubutumwa"
 
-#: ui/evolution-mail-message.xml.h:5
-msgid "Caret _Mode"
+#: ../ui/evolution-mail-message.xml.h:6
+msgid "Check for _Junk"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:7
+msgid "Compose _New Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:6
+#: ../ui/evolution-mail-message.xml.h:8
 #, fuzzy
 msgid "Compose a reply to all of the recipients of the selected message"
 msgstr "a Subiza Kuri Byose Bya Abandikiwe... Bya Byahiswemo Ubutumwa"
 
-#: ui/evolution-mail-message.xml.h:7
+#: ../ui/evolution-mail-message.xml.h:9
 #, fuzzy
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "a Subiza Kuri Urutonde Bya Byahiswemo Ubutumwa"
 
-#: ui/evolution-mail-message.xml.h:8
+#: ../ui/evolution-mail-message.xml.h:10
 #, fuzzy
 msgid "Compose a reply to the sender of the selected message"
 msgstr "a Subiza Kuri Uwohereza Bya Byahiswemo Ubutumwa"
 
-#: ui/evolution-mail-message.xml.h:11
+#: ../ui/evolution-mail-message.xml.h:13
 #, fuzzy
 msgid "Copy selected messages to another folder"
 msgstr "Byahiswemo Ubutumwa Kuri Ububiko"
 
-#: ui/evolution-mail-message.xml.h:12
-msgid "Create _vFolder From Message"
-msgstr ""
+#: ../ui/evolution-mail-message.xml.h:14
+#, fuzzy
+msgid "Create R_ule"
+msgstr "Guhimba idosiye:%s"
 
-#: ui/evolution-mail-message.xml.h:13
+#: ../ui/evolution-mail-message.xml.h:15
 #, fuzzy
 msgid "Create a rule to filter messages from this sender"
 msgstr "a Kuri Muyunguruzi... Ubutumwa Bivuye iyi Uwohereza"
 
-#: ui/evolution-mail-message.xml.h:14
+#: ../ui/evolution-mail-message.xml.h:16
 #, fuzzy
 msgid "Create a rule to filter messages to these recipients"
 msgstr "a Kuri Muyunguruzi... Ubutumwa Kuri Abandikiwe..."
 
-#: ui/evolution-mail-message.xml.h:15
+#: ../ui/evolution-mail-message.xml.h:17
 #, fuzzy
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "a Kuri Muyunguruzi... Ubutumwa Kuri iyi Urutonde"
 
-#: ui/evolution-mail-message.xml.h:16
+#: ../ui/evolution-mail-message.xml.h:18
 #, fuzzy
 msgid "Create a rule to filter messages with this subject"
 msgstr "a Kuri Muyunguruzi... Ubutumwa Na: iyi Ikivugwaho"
 
-#: ui/evolution-mail-message.xml.h:17
+#: ../ui/evolution-mail-message.xml.h:19
 #, fuzzy
 msgid "Create a vFolder for these recipients"
 msgstr "a kugirango Abandikiwe..."
 
-#: ui/evolution-mail-message.xml.h:18
+#: ../ui/evolution-mail-message.xml.h:20
 #, fuzzy
 msgid "Create a vFolder for this mailing list"
 msgstr "a kugirango iyi Urutonde"
 
-#: ui/evolution-mail-message.xml.h:19
+#: ../ui/evolution-mail-message.xml.h:21
 #, fuzzy
 msgid "Create a vFolder for this sender"
 msgstr "a kugirango iyi Uwohereza"
 
-#: ui/evolution-mail-message.xml.h:20
+#: ../ui/evolution-mail-message.xml.h:22
 #, fuzzy
 msgid "Create a vFolder for this subject"
 msgstr "a kugirango iyi Ikivugwaho"
 
-#: ui/evolution-mail-message.xml.h:23
+#: ../ui/evolution-mail-message.xml.h:24
 #, fuzzy
 msgid "Decrease the text size"
 msgstr "Umwandiko Ingano"
 
-#: ui/evolution-mail-message.xml.h:25
+#: ../ui/evolution-mail-message.xml.h:26
 #, fuzzy
 msgid "Display the next important message"
 msgstr "Komeza>> By'ingirakamaro Ubutumwa"
 
-#: ui/evolution-mail-message.xml.h:26
+#: ../ui/evolution-mail-message.xml.h:27
 #, fuzzy
 msgid "Display the next message"
 msgstr "Komeza>> Ubutumwa"
 
-#: ui/evolution-mail-message.xml.h:27
+#: ../ui/evolution-mail-message.xml.h:28
 #, fuzzy
 msgid "Display the next unread message"
 msgstr "Komeza>> Bidasomye Ubutumwa"
 
-#: ui/evolution-mail-message.xml.h:28
+#: ../ui/evolution-mail-message.xml.h:29
 #, fuzzy
 msgid "Display the next unread thread"
 msgstr "Komeza>> Bidasomye Urudodo"
 
-#: ui/evolution-mail-message.xml.h:29
+#: ../ui/evolution-mail-message.xml.h:30
 #, fuzzy
 msgid "Display the previous important message"
 msgstr "Ibanjirije By'ingirakamaro Ubutumwa"
 
-#: ui/evolution-mail-message.xml.h:30
+#: ../ui/evolution-mail-message.xml.h:31
 #, fuzzy
 msgid "Display the previous message"
 msgstr "Ibanjirije Ubutumwa"
 
-#: ui/evolution-mail-message.xml.h:31
+#: ../ui/evolution-mail-message.xml.h:32
 #, fuzzy
 msgid "Display the previous unread message"
 msgstr "Ibanjirije Bidasomye Ubutumwa"
 
-#: ui/evolution-mail-message.xml.h:32
-msgid "F_orward As..."
-msgstr ""
-
-#: ui/evolution-mail-message.xml.h:33
-msgid "Filter _Junk"
-msgstr ""
-
-#: ui/evolution-mail-message.xml.h:34
+#: ../ui/evolution-mail-message.xml.h:33
 #, fuzzy
 msgid "Filter on Mailing _List..."
 msgstr "ku"
 
-#: ui/evolution-mail-message.xml.h:35
+#: ../ui/evolution-mail-message.xml.h:34
 #, fuzzy
 msgid "Filter on Se_nder..."
 msgstr "ku"
 
-#: ui/evolution-mail-message.xml.h:36
+#: ../ui/evolution-mail-message.xml.h:35
 #, fuzzy
 msgid "Filter on _Recipients..."
 msgstr "ku"
 
-#: ui/evolution-mail-message.xml.h:37
+#: ../ui/evolution-mail-message.xml.h:36
 #, fuzzy
 msgid "Filter on _Subject..."
 msgstr "ku"
 
-#: ui/evolution-mail-message.xml.h:38
+#: ../ui/evolution-mail-message.xml.h:37
 #, fuzzy
 msgid "Filter the selected messages for junk status"
 msgstr "Byahiswemo Ubutumwa kugirango Imimerere"
 
-#: ui/evolution-mail-message.xml.h:39
+#: ../ui/evolution-mail-message.xml.h:38
 #, fuzzy
 msgid "Flag selected message(s) for follow-up"
 msgstr "Byahiswemo Ubutumwa S kugirango Hejuru"
 
 # officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....Wizard.Agenda.Elements.Postprocessing.text
-#: ui/evolution-mail-message.xml.h:40
+#: ../ui/evolution-mail-message.xml.h:39
 #, fuzzy
 msgid "Follow _Up..."
 msgstr "Ikurikirana- mirimo"
 
-#: ui/evolution-mail-message.xml.h:41
+#: ../ui/evolution-mail-message.xml.h:40
 #, fuzzy
 msgid "Force images in HTML mail to be loaded"
 msgstr "Ishusho in Ubutumwa Kuri"
 
-#: ui/evolution-mail-message.xml.h:43
+#: ../ui/evolution-mail-message.xml.h:42
 #, fuzzy
 msgid "Forward the selected message in the body of a new message"
 msgstr "Byahiswemo Ubutumwa in Bya a Gishya Ubutumwa"
 
-#: ui/evolution-mail-message.xml.h:44
+#: ../ui/evolution-mail-message.xml.h:43
 #, fuzzy
 msgid "Forward the selected message quoted like a reply"
 msgstr "Byahiswemo Ubutumwa nka a Subiza"
 
-#: ui/evolution-mail-message.xml.h:45
+#: ../ui/evolution-mail-message.xml.h:44
 #, fuzzy
 msgid "Forward the selected message to someone"
 msgstr "Byahiswemo Ubutumwa Kuri"
 
-#: ui/evolution-mail-message.xml.h:46
+#: ../ui/evolution-mail-message.xml.h:45
 #, fuzzy
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Byahiswemo Ubutumwa Kuri Nka umugereka"
 
-#: ui/evolution-mail-message.xml.h:47
+#: ../ui/evolution-mail-message.xml.h:46
 #, fuzzy
 msgid "Increase the text size"
 msgstr "Umwandiko Ingano"
 
-#: ui/evolution-mail-message.xml.h:49
-msgid "Load _Images"
-msgstr ""
-
-#: ui/evolution-mail-message.xml.h:50
-#, fuzzy
-msgid "Mar_k as Read"
-msgstr "Nka"
-
-#: ui/evolution-mail-message.xml.h:51
-#, fuzzy
-msgid "Mark as I_mportant"
-msgstr "Nka"
-
-#: ui/evolution-mail-message.xml.h:52
-#, fuzzy
-msgid "Mark as U_nread"
-msgstr "Nka"
-
-#: ui/evolution-mail-message.xml.h:53
+#: ../ui/evolution-mail-message.xml.h:48
 #, fuzzy
-msgid "Mark as Unimp_ortant"
+msgid "Mar_k as"
 msgstr "Nka"
 
-#: ui/evolution-mail-message.xml.h:56
+#: ../ui/evolution-mail-message.xml.h:49
 #, fuzzy
 msgid "Mark the selected message(s) as having been read"
 msgstr "Byahiswemo Ubutumwa S Nka Gusoma"
 
-#: ui/evolution-mail-message.xml.h:57
+#: ../ui/evolution-mail-message.xml.h:50
 #, fuzzy
 msgid "Mark the selected message(s) as important"
 msgstr "Byahiswemo Ubutumwa S Nka By'ingirakamaro"
 
-#: ui/evolution-mail-message.xml.h:58
+#: ../ui/evolution-mail-message.xml.h:51
 #, fuzzy
 msgid "Mark the selected message(s) as junk"
 msgstr "Byahiswemo Ubutumwa S Nka"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ../ui/evolution-mail-message.xml.h:52
 #, fuzzy
 msgid "Mark the selected message(s) as not being junk"
 msgstr "Byahiswemo Ubutumwa S Nka OYA"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ../ui/evolution-mail-message.xml.h:53
 #, fuzzy
 msgid "Mark the selected message(s) as not having been read"
 msgstr "Byahiswemo Ubutumwa S Nka OYA Gusoma"
 
-#: ui/evolution-mail-message.xml.h:61
+#: ../ui/evolution-mail-message.xml.h:54
 #, fuzzy
 msgid "Mark the selected message(s) as unimportant"
 msgstr "Byahiswemo Ubutumwa S Nka"
 
-#: ui/evolution-mail-message.xml.h:62
+#: ../ui/evolution-mail-message.xml.h:55
 #, fuzzy
 msgid "Mark the selected messages for deletion"
 msgstr "Byahiswemo Ubutumwa kugirango Isibwa"
 
+# sfx2/source\doc\doc.src:STR_DOCTYPENAME_MESSAGE.text
+#: ../ui/evolution-mail-message.xml.h:56
+#, fuzzy
+msgid "Message Source"
+msgstr "Ubutumwa"
+
 # sc/source\ui\src\globstr.src:RID_GLOBSTR.STR_UNDO_MOVE.text
-#: ui/evolution-mail-message.xml.h:63
+#: ../ui/evolution-mail-message.xml.h:57
 msgid "Move"
 msgstr "Kwimura"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ../ui/evolution-mail-message.xml.h:58
 #, fuzzy
 msgid "Move selected message(s) to another folder"
 msgstr "Byahiswemo Ubutumwa S Kuri Ububiko"
 
-#: ui/evolution-mail-message.xml.h:66
+#: ../ui/evolution-mail-message.xml.h:60
 msgid "Next _Important Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:67
+#: ../ui/evolution-mail-message.xml.h:61
 msgid "Next _Thread"
 msgstr ""
 
 # offmgr/sdi\ofaslots.src:SID_MAIL_NEXTUNREAD.text
-#: ui/evolution-mail-message.xml.h:68
+#: ../ui/evolution-mail-message.xml.h:62
 #, fuzzy
 msgid "Next _Unread Message"
 msgstr "Ubutumwa Butasomwe Bukurikira"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ../ui/evolution-mail-message.xml.h:63
 msgid "Not Junk"
 msgstr "Bidapfuye"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ../ui/evolution-mail-message.xml.h:64
+#, fuzzy
+msgid "Open a window for composing a mail message"
+msgstr "a Idirishya kugirango a Ubutumwa Ubutumwa"
+
+#: ../ui/evolution-mail-message.xml.h:65
 #, fuzzy
 msgid "Open the selected message in a new window"
 msgstr "Byahiswemo Ubutumwa in a Gishya Idirishya"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ../ui/evolution-mail-message.xml.h:66
 #, fuzzy
 msgid "Open the selected message in the composer for editing"
 msgstr "Byahiswemo Ubutumwa in Uhimba kugirango"
 
-# #-#-#-#-#  officecfg.pot (Gnome 2.12)  #-#-#-#-#
-# officecfg/registry\schema\org\openoffice\Office\Common.xcs:....Filter.Graphic.Export.BMP.ExportMode..0.text
-# #-#-#-#-#  officecfg.pot (Gnome 2.12)  #-#-#-#-#
-# officecfg/registry\schema\org\openoffice\Office\Common.xcs:....Filter.Graphic.Export.MET.ExportMode..0.text
-# #-#-#-#-#  officecfg.pot (Gnome 2.12)  #-#-#-#-#
-# officecfg/registry\schema\org\openoffice\Office\Common.xcs:....Filter.Graphic.Export.PCT.ExportMode..0.text
-# #-#-#-#-#  officecfg.pot (Gnome 2.12)  #-#-#-#-#
-# officecfg/registry\schema\org\openoffice\Office\Common.xcs:....Filter.Graphic.Export.SVM.ExportMode..0.text
-# #-#-#-#-#  officecfg.pot (Gnome 2.12)  #-#-#-#-#
-# officecfg/registry\schema\org\openoffice\Office\Common.xcs:....Filter.Graphic.Export.WMF.ExportMode..0.text
-# #-#-#-#-#  officecfg.pot (Gnome 2.12)  #-#-#-#-#
-# officecfg/registry\schema\org\openoffice\Office\Common.xcs:....Filter.Graphic.Export.EMF.ExportMode..0.text
-# #-#-#-#-#  officecfg.pot (Gnome 2.12)  #-#-#-#-#
-# officecfg/registry\schema\org\openoffice\Office\Math.xcs:....Print.Size..0.text
-#: ui/evolution-mail-message.xml.h:72
-#, fuzzy
-msgid "Original Si_ze"
-msgstr "Ingano mwimerere"
-
 # offmgr/sdi\ofaslots.src:SID_MAIL_PREVUNREAD.text
-#: ui/evolution-mail-message.xml.h:73
+#: ../ui/evolution-mail-message.xml.h:67
 #, fuzzy
 msgid "P_revious Unread Message"
 msgstr "Ubutumwa Butasomwe Bubanza"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ../ui/evolution-mail-message.xml.h:69
 #, fuzzy
 msgid "Post a Repl_y"
 msgstr "a"
 
-#: ui/evolution-mail-message.xml.h:76
+#: ../ui/evolution-mail-message.xml.h:70
 #, fuzzy
 msgid "Post a reply to a message in a Public folder"
 msgstr "a Subiza Kuri a Ubutumwa in a Ububiko"
 
-#: ui/evolution-mail-message.xml.h:77
+#: ../ui/evolution-mail-message.xml.h:71
 msgid "Pr_evious Important Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:78
+#: ../ui/evolution-mail-message.xml.h:72
 #, fuzzy
 msgid "Preview the message to be printed"
 msgstr "Ubutumwa Kuri Byacapwe"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ../ui/evolution-mail-message.xml.h:76
 #, fuzzy
 msgid "Print this message"
 msgstr "iyi Ubutumwa"
 
-#: ui/evolution-mail-message.xml.h:83
+#: ../ui/evolution-mail-message.xml.h:77
 msgid "Re_direct"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:84
+#: ../ui/evolution-mail-message.xml.h:78
 #, fuzzy
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Kwidunda Byahiswemo Ubutumwa Kuri"
 
-#: ui/evolution-mail-message.xml.h:89
+#: ../ui/evolution-mail-message.xml.h:82
 #, fuzzy
 msgid "Reset the text to its original size"
 msgstr "Umwandiko Kuri Umwimerere Ingano"
 
-#: ui/evolution-mail-message.xml.h:90
-#, fuzzy
-msgid "S_earch in Message..."
-msgstr "in"
-
-#: ui/evolution-mail-message.xml.h:91
-#, fuzzy
-msgid "S_maller"
-msgstr "Gitoya"
-
-#: ui/evolution-mail-message.xml.h:92
+#: ../ui/evolution-mail-message.xml.h:83
 #, fuzzy
 msgid "Save the message as a text file"
 msgstr "Kubika Ubutumwa Nka a Umwandiko IDOSIYE"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ../ui/evolution-mail-message.xml.h:84
 #, fuzzy
 msgid "Search for text in the body of the displayed message"
 msgstr "kugirango Umwandiko in Bya Ubutumwa"
 
-#: ui/evolution-mail-message.xml.h:94
+#: ../ui/evolution-mail-message.xml.h:85
 #, fuzzy
-msgid "Set up the page settings for your current printer"
-msgstr "Hejuru Ipaji Amagenamiterere kugirango KIGEZWEHO Mucapyi"
+msgid "Select _All Text"
+msgstr "Byose Umwandiko"
 
-#: ui/evolution-mail-message.xml.h:95
-msgid "Show Email _Source"
-msgstr ""
+#: ../ui/evolution-mail-message.xml.h:86
+#, fuzzy
+msgid "Select all the text in a message"
+msgstr "Byose Kigaragara Ubutumwa"
 
-#: ui/evolution-mail-message.xml.h:96
-msgid "Show Full _Headers"
-msgstr ""
+#: ../ui/evolution-mail-message.xml.h:87
+#, fuzzy
+msgid "Set up the page settings for your current printer"
+msgstr "Hejuru Ipaji Amagenamiterere kugirango KIGEZWEHO Mucapyi"
 
-#: ui/evolution-mail-message.xml.h:97
+#: ../ui/evolution-mail-message.xml.h:88
 #, fuzzy
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "a Kinyoteera indanga in Bya Ubutumwa"
 
-#: ui/evolution-mail-message.xml.h:98
+#: ../ui/evolution-mail-message.xml.h:89
 #, fuzzy
 msgid "Show message in the normal style"
 msgstr "Ubutumwa in Bisanzwe IMISUSIRE"
 
-#: ui/evolution-mail-message.xml.h:99
+#: ../ui/evolution-mail-message.xml.h:90
 #, fuzzy
 msgid "Show message with all email headers"
 msgstr "Ubutumwa Na: Byose imeli Imitwe"
 
-#: ui/evolution-mail-message.xml.h:100
+#: ../ui/evolution-mail-message.xml.h:91
 #, fuzzy
 msgid "Show the raw email source of the message"
 msgstr "imeli Inkomoko Bya Ubutumwa"
 
-# officecfg/registry\schema\org\openoffice\Office\Math.xcs:....StandardFormat.TextSize.text
-#: ui/evolution-mail-message.xml.h:101
-#, fuzzy
-msgid "Text Si_ze"
-msgstr "Ingano y'umwandiko"
-
-#: ui/evolution-mail-message.xml.h:102
+#: ../ui/evolution-mail-message.xml.h:92
 #, fuzzy
 msgid "Un-delete the selected messages"
 msgstr "Gusiba Byahiswemo Ubutumwa"
 
-#: ui/evolution-mail-message.xml.h:104
-msgid "_Attached"
-msgstr ""
+# sfx2/source\dialog\mailwindow.src:RID_MAIL_WINDOW.LB_MAILWIN_PRIO.2.text
+#: ../ui/evolution-mail-message.xml.h:93
+#, fuzzy
+msgid "Uni_mportant"
+msgstr "By'ingirakamaro"
+
+#: ../ui/evolution-mail-message.xml.h:94
+#, fuzzy
+msgid "VFolder on Mailing _List..."
+msgstr "ku"
+
+#: ../ui/evolution-mail-message.xml.h:95
+#, fuzzy
+msgid "VFolder on Recipients..."
+msgstr "ku"
+
+#: ../ui/evolution-mail-message.xml.h:96
+#, fuzzy
+msgid "VFolder on S_ubject..."
+msgstr "ku"
 
-#: ui/evolution-mail-message.xml.h:107
-msgid "_Create Filter From Message"
+#: ../ui/evolution-mail-message.xml.h:97
+#, fuzzy
+msgid "VFolder on Sen_der..."
+msgstr "ku"
+
+#: ../ui/evolution-mail-message.xml.h:98
+msgid "Zoom _Out"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:111
+#: ../ui/evolution-mail-message.xml.h:99
+#, fuzzy
+msgid "_Caret Mode"
+msgstr "Guhimba idosiye:%s"
+
+# offmgr/sdi\ofaslots.src:SID_MAIL_NEXT.text
+#: ../ui/evolution-mail-message.xml.h:102
+#, fuzzy
+msgid "_Delete Message"
+msgstr "Ubutumwa Bukurikiraho"
+
+#: ../ui/evolution-mail-message.xml.h:104
+#, fuzzy
+msgid "_Find in Message..."
+msgstr "in"
+
+#: ../ui/evolution-mail-message.xml.h:106
 msgid "_Go To"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:112
+# sfx2/source\dialog\mailwindow.src:RID_MAIL_WINDOW.LB_MAILWIN_PRIO.2.text
+#: ../ui/evolution-mail-message.xml.h:107
 #, fuzzy
-msgid "_Inline"
-msgstr "Mumurongo"
+msgid "_Important"
+msgstr "By'ingirakamaro"
 
-#: ui/evolution-mail-message.xml.h:113
+#: ../ui/evolution-mail-message.xml.h:108
 #, fuzzy
-msgid "_Larger"
-msgstr "Kinini"
+msgid "_Junk"
+msgstr "Ibipfuye"
 
-#: ui/evolution-mail-message.xml.h:114
-msgid "_Message Display"
-msgstr ""
+#: ../ui/evolution-mail-message.xml.h:109
+#, fuzzy
+msgid "_Load Images"
+msgstr "Ishusho"
 
 # offmgr/sdi\ofaslots.src:SID_MAIL_NEXT.text
-#: ui/evolution-mail-message.xml.h:116
+#: ../ui/evolution-mail-message.xml.h:112
 #, fuzzy
 msgid "_Next Message"
 msgstr "Ubutumwa Bukurikiraho"
 
-#: ui/evolution-mail-message.xml.h:117
-msgid "_Normal Display"
-msgstr ""
+# officecfg/registry\schema\org\openoffice\Office\Common.xcs:....Save.Graphic.Format..0.text
+#: ../ui/evolution-mail-message.xml.h:113
+#, fuzzy
+msgid "_Normal Size"
+msgstr "Bisanzwe"
 
-# offmgr/sdi\ofaslots.src:SID_MAIL_OPEN.text
-#: ui/evolution-mail-message.xml.h:118
+#: ../ui/evolution-mail-message.xml.h:114
+#, fuzzy
+msgid "_Not Junk"
+msgstr "Bidapfuye"
+
+# svtools/source\uno\unoifac2.src:RID_CONTEXTMENU.RID_OPEN_LINK_NEW.text
+#: ../ui/evolution-mail-message.xml.h:115
 #, fuzzy
-msgid "_Open Message"
-msgstr "Gufungura Ubutumwa"
+msgid "_Open in New Window"
+msgstr "Gufungurira muri New Window"
 
 # offmgr/sdi\ofaslots.src:SID_MAIL_PREV.text
-#: ui/evolution-mail-message.xml.h:120
+#: ../ui/evolution-mail-message.xml.h:116
 #, fuzzy
 msgid "_Previous Message"
 msgstr "Ubutumwa Bubanza"
 
-#: ui/evolution-mail-message.xml.h:122
-msgid "_Quoted"
-msgstr ""
-
-# #-#-#-#-#  basctl.pot (Gnome 2.12)  #-#-#-#-#
-# basctl/source\basicide\basidesh.src:RID_BASICMENU.MN_EXTRA.text
-# #-#-#-#-#  basctl.pot (Gnome 2.12)  #-#-#-#-#
-# basctl/source\basicide\basidesh.src:RID_BASICPLUGINMENU.MN_PLEXTRA.text
-#: ui/evolution-mail-message.xml.h:125 ui/evolution.xml.h:48
+#: ../ui/evolution-mail-message.xml.h:118
 #, fuzzy
-msgid "_Tools"
-msgstr "Ibikoresho"
-
-#: ui/evolution-mail-message.xml.h:126
-msgid "_Undelete"
-msgstr ""
+msgid "_Read"
+msgstr "Soma"
 
-#: ui/evolution-mail-message.xml.h:127
+# # Strings use for the save message dialog shown when the user close a message compose window
+# # Strings used by Save as Draft/Template dialog
+#: ../ui/evolution-mail-message.xml.h:120
 #, fuzzy
-msgid "vFolder on Mailing _List..."
-msgstr "ku"
+msgid "_Save Message..."
+msgstr "Bika ubutumwa"
 
-#: ui/evolution-mail-message.xml.h:128
+# offmgr/sdi\ofaslots.src:SID_MAIL_NEXT.text
+#: ../ui/evolution-mail-message.xml.h:121
 #, fuzzy
-msgid "vFolder on Se_nder..."
-msgstr "ku"
+msgid "_Undelete Message"
+msgstr "Ubutumwa Bukurikiraho"
 
-#: ui/evolution-mail-message.xml.h:129
-#, fuzzy
-msgid "vFolder on _Recipients..."
-msgstr "ku"
+#: ../ui/evolution-mail-message.xml.h:122
+msgid "_Unread"
+msgstr ""
 
-#: ui/evolution-mail-message.xml.h:130
-#, fuzzy
-msgid "vFolder on _Subject..."
-msgstr "ku"
+#: ../ui/evolution-mail-message.xml.h:123
+msgid "_Zoom In"
+msgstr ""
 
 # #-#-#-#-#  basctl.pot (Gnome 2.12)  #-#-#-#-#
 # basctl/source\basicide\macrodlg.src:RID_MACROCHOOSER.RID_PB_CLOSE.text
@@ -19340,13 +19959,13 @@ msgstr "ku"
 # basctl/source\basicide\moduldlg.src:RID_TP_MODULS.RID_PB_CLOSE.text
 # #-#-#-#-#  basctl.pot (Gnome 2.12)  #-#-#-#-#
 # basctl/source\basicide\moduldlg.src:RID_TP_LIBS.RID_PB_CLOSE.text
-#: ui/evolution-mail-messagedisplay.xml.h:1
-#: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:2
-#: ui/evolution.xml.h:4
+#: ../ui/evolution-mail-messagedisplay.xml.h:1
+#: ../ui/evolution-message-composer.xml.h:4
+#: ../ui/evolution-signature-editor.xml.h:2
 msgid "Close"
 msgstr "Gufunga"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+#: ../ui/evolution-mail-messagedisplay.xml.h:2 ../ui/evolution.xml.h:4
 #, fuzzy
 msgid "Close this window"
 msgstr "Funga iyi Idirishya"
@@ -19355,7 +19974,7 @@ msgstr "Funga iyi Idirishya"
 # basctl/source\basicide\basidesh.src:RID_BASICMENU.MN_VIEW.S~ymbolleisten.SID_TOGGLETOOLBAR.text
 # #-#-#-#-#  basctl.pot (Gnome 2.12)  #-#-#-#-#
 # basctl/source\basicide\basidesh.src:RID_BASICPLUGINMENU.MN_PLVIEW.S~ymbolleisten.SID_TOGGLETOOLBAR.text
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:19
+#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:17
 #, fuzzy
 msgid "Main toolbar"
 msgstr "umwanya w'ibikoresho w'ibanze"
@@ -19368,53 +19987,58 @@ msgstr "umwanya w'ibikoresho w'ibanze"
 # basctl/source\basicide\moduldlg.src:RID_TP_MODULS.RID_PB_CLOSE.text
 # #-#-#-#-#  basctl.pot (Gnome 2.12)  #-#-#-#-#
 # basctl/source\basicide\moduldlg.src:RID_TP_LIBS.RID_PB_CLOSE.text
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:37
+#: ../ui/evolution-mail-messagedisplay.xml.h:4
+#: ../ui/evolution-message-composer.xml.h:40 ../ui/evolution-subscribe.xml.h:9
 #, fuzzy
 msgid "_Close"
 msgstr "Gufunga"
 
 # sc/source\ui\src\globstr.src:RID_GLOBSTR.STR_HFCMD_FILE.text
-#: ui/evolution-mail-messagedisplay.xml.h:7
-#: ui/evolution-message-composer.xml.h:44
-#: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:39
+#: ../ui/evolution-mail-messagedisplay.xml.h:6
+#: ../ui/evolution-message-composer.xml.h:43
+#: ../ui/evolution-signature-editor.xml.h:13
+#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:33
 #, fuzzy
 msgid "_File"
 msgstr "IDOSIYE"
 
 # 357
-#: ui/evolution-message-composer.xml.h:1
+#: ../ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "gereka"
 
-#: ui/evolution-message-composer.xml.h:2
+#: ../ui/evolution-message-composer.xml.h:2
 #, fuzzy
 msgid "Attach a file"
 msgstr "a IDOSIYE"
 
-#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:3
+#: ../ui/evolution-message-composer.xml.h:3
+msgid "Check to get delivery notification when your message is read"
+msgstr ""
+
+#: ../ui/evolution-message-composer.xml.h:5
+#: ../ui/evolution-signature-editor.xml.h:3
 #, fuzzy
 msgid "Close the current file"
 msgstr "Funga KIGEZWEHO IDOSIYE"
 
-#: ui/evolution-message-composer.xml.h:5
+#: ../ui/evolution-message-composer.xml.h:6
 #, fuzzy
 msgid "Delete all but signature"
 msgstr "Byose Isinya"
 
-#: ui/evolution-message-composer.xml.h:6
+#: ../ui/evolution-message-composer.xml.h:7
 #, fuzzy
 msgid "Encrypt this message with PGP"
 msgstr "iyi Ubutumwa Na:"
 
-#: ui/evolution-message-composer.xml.h:7
+#: ../ui/evolution-message-composer.xml.h:8
 #, fuzzy
-msgid "Encrypt this message with your S/MIME Encryption Cetificate"
+msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "iyi Ubutumwa Na:"
 
-#: ui/evolution-message-composer.xml.h:8 ui/evolution-signature-editor.xml.h:4
+#: ../ui/evolution-message-composer.xml.h:9
+#: ../ui/evolution-signature-editor.xml.h:4
 #, fuzzy
 msgid "For_mat"
 msgstr "Imiterere"
@@ -19423,196 +20047,179 @@ msgstr "Imiterere"
 # officecfg/registry\schema\org\openoffice\Office\Impress.xcs:....Filter.Export.LastUsed..HTML.text
 # #-#-#-#-#  officecfg.pot (Gnome 2.12)  #-#-#-#-#
 # officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....FormLetter.MailingOutput.Format..2.text
-#: ui/evolution-message-composer.xml.h:9
+#: ../ui/evolution-message-composer.xml.h:10
 #, fuzzy
 msgid "HT_ML"
 msgstr "HTML"
 
-#: ui/evolution-message-composer.xml.h:11
+#: ../ui/evolution-message-composer.xml.h:12
 #, fuzzy
 msgid "Open a file"
 msgstr "a IDOSIYE"
 
-#: ui/evolution-message-composer.xml.h:12
+#: ../ui/evolution-message-composer.xml.h:13
 msgid "PGP Encrypt"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:13
+#: ../ui/evolution-message-composer.xml.h:14
 msgid "PGP Sign"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:14
+#: ../ui/evolution-message-composer.xml.h:15
+#, fuzzy
+msgid "Request read receipt"
+msgstr "Kohereza Inyuma a Gusoma"
+
+#: ../ui/evolution-message-composer.xml.h:16
 msgid "S/MIME Encrypt"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:15
+#: ../ui/evolution-message-composer.xml.h:17
 msgid "S/MIME Sign"
 msgstr ""
 
 # #-#-#-#-#  dbaccess.pot (Gnome 2.12)  #-#-#-#-#
 # #-#-#-#-#  dbaccess.pot (Gnome 2.12)  #-#-#-#-#
-#: ui/evolution-message-composer.xml.h:17
+#: ../ui/evolution-message-composer.xml.h:19
 msgid "Save As"
 msgstr "Kubika nka"
 
 # sfx2/source\doc\doc.src:STR_SAVEASDOC.text
-#: ui/evolution-message-composer.xml.h:18
+#: ../ui/evolution-message-composer.xml.h:20
 #, fuzzy
 msgid "Save _As..."
 msgstr "Gushyingura muri..."
 
 # offmgr/sdi\ofaslots.src:SID_MAIL_FILE.text
-#: ui/evolution-message-composer.xml.h:19
+#: ../ui/evolution-message-composer.xml.h:21
 #, fuzzy
 msgid "Save _Draft"
 msgstr "Gushyingura Imbanzirizanyandiko"
 
-#: ui/evolution-message-composer.xml.h:20
+#: ../ui/evolution-message-composer.xml.h:22
 #, fuzzy
 msgid "Save in folder..."
 msgstr "Kubika in Ububiko"
 
-#: ui/evolution-message-composer.xml.h:21
-#: ui/evolution-signature-editor.xml.h:9
+#: ../ui/evolution-message-composer.xml.h:23
+#: ../ui/evolution-signature-editor.xml.h:9
 #, fuzzy
 msgid "Save the current file"
 msgstr "Kubika KIGEZWEHO IDOSIYE"
 
-#: ui/evolution-message-composer.xml.h:22
+#: ../ui/evolution-message-composer.xml.h:24
 #, fuzzy
 msgid "Save the current file with a different name"
 msgstr "Kubika KIGEZWEHO IDOSIYE Na: a Izina:"
 
-#: ui/evolution-message-composer.xml.h:23
+#: ../ui/evolution-message-composer.xml.h:25
 #, fuzzy
 msgid "Save the message in a specified folder"
 msgstr "Kubika Ubutumwa in a Ububiko"
 
-#: ui/evolution-message-composer.xml.h:25
-#: ui/evolution-signature-editor.xml.h:11
+#: ../ui/evolution-message-composer.xml.h:27
+#: ../ui/evolution-signature-editor.xml.h:11
 #, fuzzy
 msgid "Send the mail in HTML format"
 msgstr "Ubutumwa in Imiterere"
 
-#: ui/evolution-message-composer.xml.h:26
+#: ../ui/evolution-message-composer.xml.h:28
 #, fuzzy
 msgid "Send this message"
 msgstr "iyi Ubutumwa"
 
-#: ui/evolution-message-composer.xml.h:27
-#, fuzzy
-msgid "Show / hide attachments"
-msgstr "Gushisha Imigereka"
-
-#: ui/evolution-message-composer.xml.h:28
-#, fuzzy
-msgid "Show _attachments"
-msgstr "Imigereka"
-
-#: ui/evolution-message-composer.xml.h:29
-#, fuzzy
-msgid "Show attachments"
-msgstr "Imigereka"
-
-#: ui/evolution-message-composer.xml.h:30
+#: ../ui/evolution-message-composer.xml.h:29
 #, fuzzy
 msgid "Sign this message with your PGP key"
 msgstr "iyi Ubutumwa Na: Urufunguzo"
 
-#: ui/evolution-message-composer.xml.h:31
+#: ../ui/evolution-message-composer.xml.h:30
 #, fuzzy
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "iyi Ubutumwa Na:"
 
-#: ui/evolution-message-composer.xml.h:32
+#: ../ui/evolution-message-composer.xml.h:31
 #, fuzzy
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Umwanya ni"
 
-#: ui/evolution-message-composer.xml.h:33
+#: ../ui/evolution-message-composer.xml.h:32
 #, fuzzy
 msgid "Toggles whether the CC field is displayed"
 msgstr "Umwanya ni"
 
-#: ui/evolution-message-composer.xml.h:34
+#: ../ui/evolution-message-composer.xml.h:33
 #, fuzzy
 msgid "Toggles whether the From chooser is displayed"
 msgstr "ni"
 
-#: ui/evolution-message-composer.xml.h:35
+#: ../ui/evolution-message-composer.xml.h:34
 #, fuzzy
 msgid "Toggles whether the Post-To field is displayed"
 msgstr "Umwanya ni"
 
-#: ui/evolution-message-composer.xml.h:36
+#: ../ui/evolution-message-composer.xml.h:35
 #, fuzzy
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Umwanya ni"
 
-#: ui/evolution-message-composer.xml.h:37
+#: ../ui/evolution-message-composer.xml.h:36
 #, fuzzy
 msgid "Toggles whether the To field is displayed"
 msgstr "Umwanya ni"
 
 # 361
-#: ui/evolution-message-composer.xml.h:38
+#: ../ui/evolution-message-composer.xml.h:37
 #, fuzzy
 msgid "_Attachment..."
 msgstr "umugereka"
 
-#: ui/evolution-message-composer.xml.h:39
+#: ../ui/evolution-message-composer.xml.h:38
 msgid "_Bcc Field"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:40
+#: ../ui/evolution-message-composer.xml.h:39
 msgid "_Cc Field"
 msgstr ""
 
 # sc/source\ui\src\miscdlgs.src:RID_SCDLG_DELCONT.BTN_DELALL.text
-#: ui/evolution-message-composer.xml.h:42
+#: ../ui/evolution-message-composer.xml.h:41
 #, fuzzy
 msgid "_Delete all"
 msgstr "Guhanagura byose"
 
-#: ui/evolution-message-composer.xml.h:45
+#: ../ui/evolution-message-composer.xml.h:44
 msgid "_From Field"
 msgstr ""
 
 # basctl/source\basicide\basidesh.src:RID_POPUP_TABBAR.RID_INSERT.text
-#: ui/evolution-message-composer.xml.h:46
-#: ui/evolution-signature-editor.xml.h:14
+#: ../ui/evolution-message-composer.xml.h:45
+#: ../ui/evolution-signature-editor.xml.h:14
 #, fuzzy
 msgid "_Insert"
 msgstr "Kongeramo"
 
 # sfx2/source\appl\minbox.src:RID_MAIL_INBOX.BTN_MAILINBOX_OPEN.text
-#: ui/evolution-message-composer.xml.h:47
+#: ../ui/evolution-message-composer.xml.h:46
 #, fuzzy
 msgid "_Open..."
 msgstr "Gufungura..."
 
-#: ui/evolution-message-composer.xml.h:48
+#: ../ui/evolution-message-composer.xml.h:47
 msgid "_Post-To Field"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:49
+#: ../ui/evolution-message-composer.xml.h:48
 msgid "_Reply-To Field"
 msgstr ""
 
-# basctl/source\basicide\basidesh.src:RID_STR_SAVE.text
-#: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:15
-#, fuzzy
-msgid "_Save"
-msgstr "Kubika"
-
 # offmgr/source\offapp\dialog\treeopt.src:RID_OFADLG_OPTIONS_TREE_PAGES.SID_GENERAL_OPTIONS.11.text
-#: ui/evolution-message-composer.xml.h:51
+#: ../ui/evolution-message-composer.xml.h:50
 #, fuzzy
 msgid "_Security"
 msgstr "Umutekano"
 
-#: ui/evolution-message-composer.xml.h:52
+#: ../ui/evolution-message-composer.xml.h:51
 msgid "_To Field"
 msgstr ""
 
@@ -19624,7 +20231,7 @@ msgstr ""
 # basctl/source\basicide\moduldlg.src:RID_TP_MODULS.RID_PB_CLOSE.text
 # #-#-#-#-#  basctl.pot (Gnome 2.12)  #-#-#-#-#
 # basctl/source\basicide\moduldlg.src:RID_TP_LIBS.RID_PB_CLOSE.text
-#: ui/evolution-signature-editor.xml.h:1
+#: ../ui/evolution-signature-editor.xml.h:1
 #, fuzzy
 msgid "C_lose"
 msgstr "Gufunga"
@@ -19633,402 +20240,405 @@ msgstr "Gufunga"
 # officecfg/registry\schema\org\openoffice\Office\Impress.xcs:....Filter.Export.LastUsed..HTML.text
 # #-#-#-#-#  officecfg.pot (Gnome 2.12)  #-#-#-#-#
 # officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....FormLetter.MailingOutput.Format..2.text
-#: ui/evolution-signature-editor.xml.h:5
+#: ../ui/evolution-signature-editor.xml.h:5
 #, fuzzy
 msgid "H_TML"
 msgstr "HTML"
 
-#: ui/evolution-signature-editor.xml.h:7
+#: ../ui/evolution-signature-editor.xml.h:7
 #, fuzzy
 msgid "Save and Close"
 msgstr "Kubika Na Funga"
 
-#: ui/evolution-signature-editor.xml.h:8
+#: ../ui/evolution-signature-editor.xml.h:8
 #, fuzzy
 msgid "Save and _Close"
 msgstr "Kubika Na Funga"
 
-#: ui/evolution-signature-editor.xml.h:10
+#: ../ui/evolution-signature-editor.xml.h:10
 #, fuzzy
 msgid "Save the current file and close the window"
 msgstr "Kubika KIGEZWEHO IDOSIYE Na Gufunga Idirishya"
 
-#: ui/evolution-subscribe.xml.h:1
+#: ../ui/evolution-subscribe.xml.h:1
 #, fuzzy
 msgid "Add folder to your list of subscribed folders"
 msgstr "Ububiko Kuri Urutonde Bya yanditswe/ byemewe"
 
-# sfx2/source\explorer\explorer.src:STR_SFX_FOLDER.text
-#: ui/evolution-subscribe.xml.h:2
-#, fuzzy
-msgid "F_older"
-msgstr "Ububiko"
-
-#: ui/evolution-subscribe.xml.h:3
+#: ../ui/evolution-subscribe.xml.h:3
 msgid "Refresh List"
 msgstr ""
 
-#: ui/evolution-subscribe.xml.h:4
+#: ../ui/evolution-subscribe.xml.h:4
 #, fuzzy
 msgid "Refresh List of Folders"
 msgstr "Bya"
 
-#: ui/evolution-subscribe.xml.h:5
+#: ../ui/evolution-subscribe.xml.h:5
 #, fuzzy
 msgid "Remove folder from your list of subscribed folders"
 msgstr "Ububiko Bivuye Urutonde Bya yanditswe/ byemewe"
 
-#: ui/evolution-subscribe.xml.h:7
+#: ../ui/evolution-subscribe.xml.h:7
 msgid "Subscribe"
 msgstr "Kwiyandikisha"
 
-#: ui/evolution-subscribe.xml.h:8
+#: ../ui/evolution-subscribe.xml.h:8
 #, fuzzy
 msgid "Unsubscribe"
 msgstr "Kwivana aho wiyandikishe"
 
-#: ui/evolution-tasks.xml.h:3
+#: ../ui/evolution-subscribe.xml.h:12
+msgid "_Invert Selection"
+msgstr ""
+
+#: ../ui/evolution-tasks.xml.h:3
 #, fuzzy
 msgid "Copy selected task"
 msgstr "Byahiswemo Igikorwa"
 
-#: ui/evolution-tasks.xml.h:5
+#: ../ui/evolution-tasks.xml.h:5
 #, fuzzy
 msgid "Cut selected task"
 msgstr "Byahiswemo Igikorwa"
 
-#: ui/evolution-tasks.xml.h:7
+#: ../ui/evolution-tasks.xml.h:7
 #, fuzzy
 msgid "Delete completed tasks"
 msgstr "Ibikorwa"
 
-#: ui/evolution-tasks.xml.h:8
+#: ../ui/evolution-tasks.xml.h:8
 #, fuzzy
 msgid "Delete selected tasks"
 msgstr "Byahiswemo Ibikorwa"
 
-#: ui/evolution-tasks.xml.h:9
+#: ../ui/evolution-tasks.xml.h:9
 #, fuzzy
 msgid "Mar_k as Complete"
 msgstr "Nka"
 
-#: ui/evolution-tasks.xml.h:10
+#: ../ui/evolution-tasks.xml.h:10
 #, fuzzy
 msgid "Mark selected tasks as complete"
 msgstr "Byahiswemo Ibikorwa Nka Byuzuye"
 
-#: ui/evolution-tasks.xml.h:12
+#: ../ui/evolution-tasks.xml.h:12
 #, fuzzy
 msgid "Paste task from the clipboard"
 msgstr "Igikorwa Bivuye Ububikokoporora"
 
-#: ui/evolution-tasks.xml.h:13
+#: ../ui/evolution-tasks.xml.h:13
 #, fuzzy
 msgid "Previews the list of tasks to be printed"
 msgstr "Urutonde Bya Ibikorwa Kuri Byacapwe"
 
-#: ui/evolution-tasks.xml.h:16
+#: ../ui/evolution-tasks.xml.h:16
 #, fuzzy
 msgid "Print the list of tasks"
 msgstr "Urutonde Bya Ibikorwa"
 
-#: ui/evolution-tasks.xml.h:18
+#: ../ui/evolution-tasks.xml.h:18
 #, fuzzy
 msgid "View the selected task"
 msgstr "Byahiswemo Igikorwa"
 
-#: ui/evolution-tasks.xml.h:23
+#: ../ui/evolution-tasks.xml.h:23
 msgid "_Open Task"
 msgstr ""
 
-#: ui/evolution.xml.h:1
+#: ../ui/evolution.xml.h:1
 msgid "About Evolution..."
 msgstr ""
 
-#: ui/evolution.xml.h:2
+#: ../ui/evolution.xml.h:2
 #, fuzzy
 msgid "Change Evolution's settings"
 msgstr "Amagenamiterere"
 
-#: ui/evolution.xml.h:3
+#: ../ui/evolution.xml.h:3
 #, fuzzy
 msgid "Change the visibility of the toolbar"
 msgstr "Ukugaragara Bya Umwanyabikoresho"
 
-#: ui/evolution.xml.h:6
+#: ../ui/evolution.xml.h:5
 #, fuzzy
 msgid "Create a new window displaying this folder"
 msgstr "a Gishya Idirishya iyi Ububiko"
 
-#: ui/evolution.xml.h:7
+#: ../ui/evolution.xml.h:6
 #, fuzzy
 msgid "Display window buttons using the desktop toolbar setting"
 msgstr "Idirishya Utubuto ikoresha Ibiro Umwanyabikoresho Igenamiterere"
 
-#: ui/evolution.xml.h:8
+#: ../ui/evolution.xml.h:7
 #, fuzzy
 msgid "Display window buttons with icons and text"
 msgstr "Idirishya Utubuto Na: Udushushondanga Na Umwandiko"
 
-#: ui/evolution.xml.h:9
+#: ../ui/evolution.xml.h:8
 #, fuzzy
 msgid "Display window buttons with icons only"
 msgstr "Idirishya Utubuto Na: Udushushondanga"
 
-#: ui/evolution.xml.h:10
+#: ../ui/evolution.xml.h:9
 #, fuzzy
 msgid "Display window buttons with text only"
 msgstr "Idirishya Utubuto Na: Umwandiko"
 
-# #-#-#-#-#  setup2.pot (Gnome 2.12)  #-#-#-#-#
-# setup2/source\ui\app.src:STR_RESTART_BTN_NO.text
-# #-#-#-#-#  setup2.pot (Gnome 2.12)  #-#-#-#-#
-# setup2/source\ui\pages\phavefun.src:RESID_PAGE_PAGEHAVEFUN.STR_LOGOUT_BTN_NO.text
-#: ui/evolution.xml.h:11
-#, fuzzy
-msgid "E_xit"
-msgstr "Gusohoka"
-
-#: ui/evolution.xml.h:12
+#: ../ui/evolution.xml.h:10
 msgid "Evolution _FAQ"
 msgstr ""
 
-#: ui/evolution.xml.h:13
+#: ../ui/evolution.xml.h:11
 #, fuzzy
 msgid "Exit the program"
 msgstr "Porogaramu"
 
-#: ui/evolution.xml.h:14
+#: ../ui/evolution.xml.h:12
 msgid "Forget _Passwords"
 msgstr ""
 
-#: ui/evolution.xml.h:15
+#: ../ui/evolution.xml.h:13
 #, fuzzy
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr "Amagambo banga kugirango"
 
-#: ui/evolution.xml.h:16
+#: ../ui/evolution.xml.h:14
 #, fuzzy
 msgid "Hide window buttons"
 msgstr "Idirishya Utubuto"
 
-#: ui/evolution.xml.h:17
+#: ../ui/evolution.xml.h:15
 #, fuzzy
 msgid "Icons _and text"
 msgstr "Na Umwandiko"
 
-#: ui/evolution.xml.h:18
+#: ../ui/evolution.xml.h:16
 #, fuzzy
 msgid "Import data from other programs"
 msgstr "Ibyatanzwe Bivuye Ikindi Porogaramu"
 
 # sfx2/sdi\sfxslots.src:SID_NEWWINDOW.text
-#: ui/evolution.xml.h:20
+#: ../ui/evolution.xml.h:18
 #, fuzzy
 msgid "New _Window"
 msgstr "Irindi Dirishya"
 
-#: ui/evolution.xml.h:21
-msgid "Pi_lot Settings..."
-msgstr ""
-
-#: ui/evolution.xml.h:22
+#: ../ui/evolution.xml.h:19
 #, fuzzy
 msgid "Prefere_nces"
 msgstr "Ibyahiswemo"
 
-#: ui/evolution.xml.h:23
+#: ../ui/evolution.xml.h:20
 msgid "Send / Receive"
 msgstr ""
 
-#: ui/evolution.xml.h:24
+#: ../ui/evolution.xml.h:21
 #, fuzzy
 msgid "Send queued items and retrieve new items"
 msgstr "Yashizwe ku murongo Na Gishya"
 
-#: ui/evolution.xml.h:25
+#: ../ui/evolution.xml.h:22
 #, fuzzy
 msgid "Set up Pilot configuration"
 msgstr "Hejuru Iboneza"
 
-#: ui/evolution.xml.h:26
+#: ../ui/evolution.xml.h:23
 #, fuzzy
 msgid "Show information about Evolution"
 msgstr "Ibisobanuro Ibyerekeye"
 
-#: ui/evolution.xml.h:27
+#: ../ui/evolution.xml.h:24
 msgid "Submit Bug Report"
 msgstr ""
 
-#: ui/evolution.xml.h:28
+#: ../ui/evolution.xml.h:25
 msgid "Submit _Bug Report"
 msgstr ""
 
-#: ui/evolution.xml.h:29
+#: ../ui/evolution.xml.h:26
 #, fuzzy
 msgid "Submit a bug report using Bug Buddy"
 msgstr "a Icyegeranyo ikoresha"
 
-#: ui/evolution.xml.h:30
+#: ../ui/evolution.xml.h:27
 #, fuzzy
 msgid "Toggle whether we are working offline."
 msgstr "Twebwe Ntibicometse kuri interineti"
 
-#: ui/evolution.xml.h:31
+#: ../ui/evolution.xml.h:28
 #, fuzzy
 msgid "Tool_bar"
 msgstr "Umwanyabikoresho"
 
-#: ui/evolution.xml.h:32
+#: ../ui/evolution.xml.h:29
 #, fuzzy
 msgid "Tool_bar style"
 msgstr "IMISUSIRE"
 
-#: ui/evolution.xml.h:33
-msgid "Window B_uttons"
-msgstr ""
-
-#: ui/evolution.xml.h:35
+#: ../ui/evolution.xml.h:30
 msgid "_About Evolution..."
 msgstr ""
 
-#: ui/evolution.xml.h:40
+#: ../ui/evolution.xml.h:31
+#, fuzzy
+msgid "_Close Window"
+msgstr "Funga iyi Idirishya"
+
+#: ../ui/evolution.xml.h:34
 #, fuzzy
 msgid "_Help"
 msgstr "Ifashayobora"
 
-#: ui/evolution.xml.h:41
+#: ../ui/evolution.xml.h:35
 #, fuzzy
 msgid "_Hide buttons"
 msgstr "Utubuto"
 
-#: ui/evolution.xml.h:42
+#: ../ui/evolution.xml.h:36
 #, fuzzy
 msgid "_Icons only"
 msgstr "Udushushondanga Gusa"
 
 # padmin/source\padialog.src:RID_ADDP_PAGE_CHOOSEDRIVER.RID_ADDP_CHDRV_BTN_ADD.text
-#: ui/evolution.xml.h:43
+#: ../ui/evolution.xml.h:37
 #, fuzzy
 msgid "_Import..."
 msgstr "Kuzana"
 
 # basctl/source\basicide\brkdlg.src:RID_BASICIDE_BREAKPOINTDLG.RID_PB_NEW.text
-#: ui/evolution.xml.h:44
+#: ../ui/evolution.xml.h:38
 #, fuzzy
 msgid "_New"
 msgstr "Gishya"
 
-#: ui/evolution.xml.h:45
+#: ../ui/evolution.xml.h:39
 msgid "_Quick Reference"
 msgstr ""
 
-#: ui/evolution.xml.h:46
+# dbaccess/source/ui/inc/toolbox.hrc:MID_SBA_QRY_CUT.text
+#: ../ui/evolution.xml.h:40
+#, fuzzy
+msgid "_Quit"
+msgstr "Gukata"
+
+#: ../ui/evolution.xml.h:41
 msgid "_Send / Receive"
 msgstr ""
 
+#: ../ui/evolution.xml.h:42
+msgid "_Switcher Appearance"
+msgstr ""
+
+#: ../ui/evolution.xml.h:43
+msgid "_Synchronization Options..."
+msgstr ""
+
 # offmgr/source\offapp\dialog\autocdlg.src:RID_OFAPAGE_AUTOCORR_REPLACE.CB_TEXT_ONLY.text
-#: ui/evolution.xml.h:47
+#: ../ui/evolution.xml.h:44
 #, fuzzy
 msgid "_Text only"
 msgstr "Umwandiko gusa"
 
-# sc/source\ui\src\optdlg.src:RID_SCPAGE_CONTENT.GB_WINDOW.text
-#: ui/evolution.xml.h:50
+# #-#-#-#-#  basctl.pot (Gnome 2.12)  #-#-#-#-#
+# basctl/source\basicide\basidesh.src:RID_BASICMENU.MN_EXTRA.text
+# #-#-#-#-#  basctl.pot (Gnome 2.12)  #-#-#-#-#
+# basctl/source\basicide\basidesh.src:RID_BASICPLUGINMENU.MN_PLEXTRA.text
+#: ../ui/evolution.xml.h:45
 #, fuzzy
-msgid "_Window"
-msgstr "Idirishya"
+msgid "_Tools"
+msgstr "Ibikoresho"
 
-#: views/addressbook/galview.xml.h:1
+#: ../views/addressbook/galview.xml.h:1
 msgid "By _Company"
 msgstr ""
 
-#: views/addressbook/galview.xml.h:2
+#: ../views/addressbook/galview.xml.h:2
 msgid "_Address Cards"
 msgstr ""
 
-#: views/addressbook/galview.xml.h:3
+#: ../views/addressbook/galview.xml.h:3
 msgid "_Phone List"
 msgstr ""
 
-#: views/calendar/galview.xml.h:1
+#: ../views/calendar/galview.xml.h:1
 msgid "W_eek View"
 msgstr ""
 
-#: views/calendar/galview.xml.h:2
+#: ../views/calendar/galview.xml.h:2
 msgid "_Day View"
 msgstr ""
 
-#: views/calendar/galview.xml.h:3
+#: ../views/calendar/galview.xml.h:3
 msgid "_List View"
 msgstr ""
 
-#: views/calendar/galview.xml.h:4
+#: ../views/calendar/galview.xml.h:4
 msgid "_Month View"
 msgstr ""
 
-#: views/calendar/galview.xml.h:5
+#: ../views/calendar/galview.xml.h:5
 msgid "_Work Week View"
 msgstr ""
 
-#: views/mail/galview.xml.h:1
+#: ../views/mail/galview.xml.h:1
 msgid "As _Sent Folder"
 msgstr ""
 
-#: views/mail/galview.xml.h:2
+#: ../views/mail/galview.xml.h:2
 msgid "By S_tatus"
 msgstr ""
 
-#: views/mail/galview.xml.h:3
+#: ../views/mail/galview.xml.h:3
 msgid "By Se_nder"
 msgstr ""
 
-#: views/mail/galview.xml.h:4
+#: ../views/mail/galview.xml.h:4
 msgid "By Su_bject"
 msgstr ""
 
-#: views/mail/galview.xml.h:5
+#: ../views/mail/galview.xml.h:5
 msgid "By _Follow Up Flag"
 msgstr ""
 
-#: views/mail/galview.xml.h:6
+#: ../views/mail/galview.xml.h:6
 #, fuzzy
 msgid "_Messages"
 msgstr "Ubutumwa"
 
-#: views/tasks/galview.xml.h:1
+#: ../views/tasks/galview.xml.h:1
 msgid "With _Due Date"
 msgstr ""
 
-#: views/tasks/galview.xml.h:2
+#: ../views/tasks/galview.xml.h:2
 msgid "With _Status"
 msgstr ""
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:195
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:637
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:195
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:637
 msgid "UTC"
 msgstr ""
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
 #, fuzzy
 msgid "<b>Time Zones</b>"
 msgstr "<B B"
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
 #, fuzzy
 msgid "<b>_Selection</b>"
 msgstr "<B B"
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
 #, fuzzy
 msgid "Select a Time Zone"
 msgstr "a"
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
 msgid "TimeZone Combobox"
 msgstr ""
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:7
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:7
 #, fuzzy
 msgid ""
 "Use the left mouse button to zoom in on an area of the map and select a time "
@@ -20038,18 +20648,33 @@ msgstr ""
 "Ibumoso: Imbeba Akabuto Kuri Ihindurangano in ku Ubuso Bya Na Guhitamo a "
 "Igihe Iburyo: Imbeba Akabuto Kuri Ihindurangano Inyuma"
 
-#: widgets/menus/gal-view-menus.c:291
+#: ../widgets/menus/gal-view-factory-etable.c:39
+#: ../widgets/table/e-table-header-item.c:1845
+#: ../widgets/table/e-table-scrolled.c:224
+#: ../widgets/table/e-table-scrolled.c:225
+msgid "Table"
+msgstr "Imbonerahamwe"
+
+#: ../widgets/menus/gal-view-menus.c:291
 msgid "_Current View"
 msgstr ""
 
-#: widgets/menus/gal-view-menus.c:359
+#: ../widgets/menus/gal-view-menus.c:359
 #, fuzzy
 msgid "Save Custom View..."
 msgstr "Kubika Kugena"
 
+#: ../widgets/menus/gal-view-new-dialog.c:80
+msgid "Factory"
+msgstr ""
+
+#: ../widgets/menus/gal-view-new-dialog.c:115
+msgid "Define New View"
+msgstr ""
+
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:415
+#: ../widgets/misc/e-calendar-item.c:415
 msgid "MTWTFSS"
 msgstr ""
 
@@ -20057,126 +20682,203 @@ msgstr ""
 # #-#-#-#-#  dbaccess.pot (Gnome 2.12)  #-#-#-#-#
 # #-#-#-#-#  dbaccess.pot (Gnome 2.12)  #-#-#-#-#
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1123
+#: ../widgets/misc/e-calendar-item.c:1099
 #, fuzzy
 msgid "%B %Y"
 msgstr "%B%Y"
 
-#: widgets/misc/e-calendar.c:177 widgets/misc/e-calendar.c:201
+#: ../widgets/misc/e-calendar.c:177 ../widgets/misc/e-calendar.c:201
 msgid "Previous Button"
 msgstr ""
 
-#: widgets/misc/e-calendar.c:226
+#: ../widgets/misc/e-calendar.c:226
 msgid "Month Calendar"
 msgstr ""
 
+#: ../widgets/misc/e-canvas-background.c:456
+#: ../widgets/misc/e-canvas-background.c:457 ../widgets/text/e-entry.c:1284
+#: ../widgets/text/e-entry.c:1285 ../widgets/text/e-text.c:3540
+#: ../widgets/text/e-text.c:3541
+msgid "Fill color"
+msgstr "Ibara ryo kuzuza"
+
+#: ../widgets/misc/e-canvas-background.c:463
+#: ../widgets/misc/e-canvas-background.c:464
+#: ../widgets/misc/e-canvas-background.c:470
+#: ../widgets/misc/e-canvas-background.c:471 ../widgets/text/e-entry.c:1291
+#: ../widgets/text/e-entry.c:1292 ../widgets/text/e-entry.c:1298
+#: ../widgets/text/e-entry.c:1299 ../widgets/text/e-text.c:3547
+#: ../widgets/text/e-text.c:3548 ../widgets/text/e-text.c:3555
+#: ../widgets/text/e-text.c:3556
+#, fuzzy
+msgid "GDK fill color"
+msgstr "Kuzuza Ibara"
+
+#: ../widgets/misc/e-canvas-background.c:477 ../widgets/text/e-entry.c:1305
+#: ../widgets/text/e-text.c:3562 ../widgets/text/e-text.c:3563
+msgid "Fill stipple"
+msgstr ""
+
+#: ../widgets/misc/e-canvas-background.c:478 ../widgets/text/e-entry.c:1306
+msgid "FIll stipple"
+msgstr ""
+
+#: ../widgets/misc/e-canvas-background.c:484
+#: ../widgets/misc/e-canvas-background.c:485
+#, fuzzy
+msgid "X1"
+msgstr "1"
+
+#: ../widgets/misc/e-canvas-background.c:491
+#: ../widgets/misc/e-canvas-background.c:492
+msgid "X2"
+msgstr ""
+
+#: ../widgets/misc/e-canvas-background.c:498
+#: ../widgets/misc/e-canvas-background.c:499
+#, fuzzy
+msgid "Y1"
+msgstr "1"
+
+#: ../widgets/misc/e-canvas-background.c:505
+#: ../widgets/misc/e-canvas-background.c:506
+msgid "Y2"
+msgstr ""
+
+#: ../widgets/misc/e-canvas-vbox.c:102 ../widgets/misc/e-reflow.c:1430
+#: ../widgets/table/e-table-group-leaf.c:636
+#: ../widgets/table/e-table-item.c:3001
+#, fuzzy
+msgid "Minimum width"
+msgstr "Ubugari"
+
+#: ../widgets/misc/e-canvas-vbox.c:103 ../widgets/misc/e-reflow.c:1431
+#: ../widgets/table/e-table-group-leaf.c:637
+#: ../widgets/table/e-table-item.c:3002
+msgid "Minimum Width"
+msgstr ""
+
+# #-#-#-#-#  starmath.pot (Gnome 2.12)  #-#-#-#-#
+# starmath/sdi\smslots.src:SID_DISTANCE.text
+# #-#-#-#-#  starmath.pot (Gnome 2.12)  #-#-#-#-#
+# starmath/source\smres.src:RID_DISTANCEDIALOG.1.1.text
+# #-#-#-#-#  starmath.pot (Gnome 2.12)  #-#-#-#-#
+# starmath/source\smres.src:RID_DISTANCEDIALOG.text
+# #-#-#-#-#  starmath.pot (Gnome 2.12)  #-#-#-#-#
+# starmath/source\smres.src:RID_DISTANCEMENU.WORKARROUND_1.text
+#: ../widgets/misc/e-canvas-vbox.c:114 ../widgets/misc/e-canvas-vbox.c:115
+#: ../widgets/misc/e-expander.c:205
+msgid "Spacing"
+msgstr "Gutandukanya"
+
 # sc/source\core\src\compiler.src:RID_SC_FUNCTION_NAMES.SC_OPCODE_GET_ACT_TIME.text
-#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:444
+#: ../widgets/misc/e-cell-date-edit.c:232 ../widgets/misc/e-dateedit.c:451
 #, fuzzy
 msgid "Now"
 msgstr "NONEAHA"
 
-#: widgets/misc/e-cell-date-edit.c:801
+#: ../widgets/misc/e-cell-date-edit.c:801
 #, fuzzy, c-format
 msgid "The time must be in the format: %s"
 msgstr "Igihe in Imiterere"
 
-#: widgets/misc/e-cell-percent.c:76
+#: ../widgets/misc/e-cell-percent.c:76
 #, fuzzy
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Ku ijana Agaciro hagati 0 Na 100"
 
-#: widgets/misc/e-charset-picker.c:63
+#: ../widgets/misc/e-charset-picker.c:63
 msgid "Baltic"
 msgstr "Igibalitiki"
 
-#: widgets/misc/e-charset-picker.c:64
+#: ../widgets/misc/e-charset-picker.c:64
 msgid "Central European"
 msgstr "Uburayi bwo hagati"
 
 # svx/source\dialog\langtab.src:RID_SVXSTR_LANGUAGE_TABLE.32.text
-#: widgets/misc/e-charset-picker.c:65
+#: ../widgets/misc/e-charset-picker.c:65
 msgid "Chinese"
 msgstr "Igishinwa"
 
 # svx/source\dialog\charmap.src:RID_SUBSETMAP.RID_SUBSETSTR_CYRILLIC.text
-#: widgets/misc/e-charset-picker.c:66
+#: ../widgets/misc/e-charset-picker.c:66
 msgid "Cyrillic"
 msgstr "Nyasilike"
 
 # setup2/source\ui\pages\plang.src:RESID_PAGE_PAGELANGUAGE.STR_LANG_GREECE.text
-#: widgets/misc/e-charset-picker.c:67
+#: ../widgets/misc/e-charset-picker.c:67
 msgid "Greek"
 msgstr "Ikigereki"
 
 # svx/source\dialog\langtab.src:RID_SVXSTR_LANGUAGE_TABLE.73.text
-#: widgets/misc/e-charset-picker.c:68
+#: ../widgets/misc/e-charset-picker.c:68
 msgid "Hebrew"
 msgstr "Igiheburayo"
 
 # setup2/source\ui\pages\plang.src:RESID_PAGE_PAGELANGUAGE.STR_LANG_JAPAN.text
-#: widgets/misc/e-charset-picker.c:69
+#: ../widgets/misc/e-charset-picker.c:69
 msgid "Japanese"
 msgstr "Ikiyapani"
 
 # setup2/source\ui\pages\plang.src:RESID_PAGE_PAGELANGUAGE.STR_LANG_KOREA.text
-#: widgets/misc/e-charset-picker.c:70
+#: ../widgets/misc/e-charset-picker.c:70
 msgid "Korean"
 msgstr "Ikinyakoreya"
 
 # setup2/source\ui\pages\plang.src:RESID_PAGE_PAGELANGUAGE.STR_LANG_TURKISH.text
-#: widgets/misc/e-charset-picker.c:71
+#: ../widgets/misc/e-charset-picker.c:71
 msgid "Turkish"
 msgstr "Igituruki"
 
 # svtools/source\control\ctrlbox.src:STR_SVT_COLLATE_UNICODE.text
-#: widgets/misc/e-charset-picker.c:72
+#: ../widgets/misc/e-charset-picker.c:72
 msgid "Unicode"
 msgstr "Inikode"
 
-#: widgets/misc/e-charset-picker.c:73
+#: ../widgets/misc/e-charset-picker.c:73
 msgid "Western European"
 msgstr "By'Uburayi bw'Uburengerazuba"
 
-#: widgets/misc/e-charset-picker.c:74
+#: ../widgets/misc/e-charset-picker.c:74
 msgid "Western European, New"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:91 widgets/misc/e-charset-picker.c:92
-#: widgets/misc/e-charset-picker.c:93
+#: ../widgets/misc/e-charset-picker.c:91 ../widgets/misc/e-charset-picker.c:92
+#: ../widgets/misc/e-charset-picker.c:93
 msgid "Traditional"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:94 widgets/misc/e-charset-picker.c:95
-#: widgets/misc/e-charset-picker.c:96 widgets/misc/e-charset-picker.c:97
+#: ../widgets/misc/e-charset-picker.c:94 ../widgets/misc/e-charset-picker.c:95
+#: ../widgets/misc/e-charset-picker.c:96 ../widgets/misc/e-charset-picker.c:97
 msgid "Simplified"
 msgstr ""
 
 # svx/source\dialog\langtab.src:RID_SVXSTR_LANGUAGE_TABLE.145.text
-#: widgets/misc/e-charset-picker.c:100
+#: ../widgets/misc/e-charset-picker.c:100
 msgid "Ukrainian"
 msgstr "Nyaukerene"
 
-#: widgets/misc/e-charset-picker.c:103
+#: ../widgets/misc/e-charset-picker.c:103
 msgid "Visual"
 msgstr "Iboneka"
 
-#: widgets/misc/e-charset-picker.c:171
+#: ../widgets/misc/e-charset-picker.c:171
 #, fuzzy, c-format
 msgid "Unknown character set: %s"
 msgstr "Inyuguti Gushyiraho"
 
-#: widgets/misc/e-charset-picker.c:216 widgets/misc/e-charset-picker.c:479
+#: ../widgets/misc/e-charset-picker.c:216
+#: ../widgets/misc/e-charset-picker.c:479
 msgid "Character Encoding"
 msgstr "Imisobekere y'Inyuguti"
 
-#: widgets/misc/e-charset-picker.c:231
+#: ../widgets/misc/e-charset-picker.c:231
 #, fuzzy
 msgid "Enter the character set to use"
 msgstr "Inyuguti Gushyiraho Kuri Gukoresha"
 
 # sw/source\ui\ribbar\workctrl.src:RID_INSERT_FIELD_CTRL.FN_INSERT_FIELD.text
-#: widgets/misc/e-charset-picker.c:338
+#: ../widgets/misc/e-charset-picker.c:338
 msgid "Other..."
 msgstr "Ikindi..."
 
@@ -20186,88 +20888,63 @@ msgstr "Ikindi..."
 # svx/source\form\fmsearch.src:RID_SVXDLG_SEARCHFORM.PB_APPROXSETTINGS.text
 # #-#-#-#-#  svx.pot (Gnome 2.12)  #-#-#-#-#
 # svx/source\form\fmsearch.src:RID_SVXDLG_SEARCHFORM.PB_SOUNDSLIKESETTINGS.text
-#: widgets/misc/e-clipped-label.c:111
+#: ../widgets/misc/e-clipped-label.c:111
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-dateedit.c:313
+#: ../widgets/misc/e-dateedit.c:316
 #, fuzzy
 msgid "Date and Time Entry"
 msgstr "Na"
 
-#: widgets/misc/e-dateedit.c:332
+#: ../widgets/misc/e-dateedit.c:335
 #, fuzzy
 msgid "Text entry to input date"
 msgstr "Icyinjijwe Kuri Iyinjiza Itariki"
 
-#: widgets/misc/e-dateedit.c:333
+#: ../widgets/misc/e-dateedit.c:336
 msgid "Text Date Entry"
 msgstr ""
 
-#: widgets/misc/e-dateedit.c:350
+#: ../widgets/misc/e-dateedit.c:353
 #, fuzzy
 msgid "Click this button to show a calendar"
 msgstr "iyi Akabuto Kuri Garagaza a Kalindari"
 
-#: widgets/misc/e-dateedit.c:351
+#: ../widgets/misc/e-dateedit.c:354
 msgid "Date Button"
 msgstr ""
 
-#: widgets/misc/e-dateedit.c:371
+#: ../widgets/misc/e-dateedit.c:374
 #, fuzzy
 msgid "Combo box to select time"
 msgstr "Agasanduku Kuri Guhitamo Igihe"
 
-#: widgets/misc/e-dateedit.c:372
+#: ../widgets/misc/e-dateedit.c:375
 msgid "Time Combo Box"
 msgstr ""
 
-#: widgets/misc/e-error.c:84 widgets/misc/e-error.c:85
-#: widgets/misc/e-error.c:127
-msgid "Evolution Error"
-msgstr ""
-
-#: widgets/misc/e-error.c:86 widgets/misc/e-error.c:87
-#: widgets/misc/e-error.c:125
-msgid "Evolution Warning"
-msgstr ""
-
-#: widgets/misc/e-error.c:124
-msgid "Evolution Information"
-msgstr ""
-
-#: widgets/misc/e-error.c:126
-msgid "Evolution Query"
-msgstr ""
-
-#. setup a dummy error
-#: widgets/misc/e-error.c:438
-#, fuzzy, c-format
-msgid ""
-"<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
-msgstr "<Uburemere UTSINDAGIYE Ikosa Kitazwi Ikosa"
-
 # padmin/source\padialog.src:RID_TXT_FONT_EXPANDED.text
-#: widgets/misc/e-expander.c:181
+#: ../widgets/misc/e-expander.c:181
 msgid "Expanded"
 msgstr "Cyagutse"
 
-#: widgets/misc/e-expander.c:182
+#: ../widgets/misc/e-expander.c:182
 #, fuzzy
 msgid "Whether or not the expander is expanded"
 msgstr "Cyangwa OYA ni Cyagutse"
 
-#: widgets/misc/e-expander.c:190
+#: ../widgets/misc/e-expander.c:190
 #, fuzzy
 msgid "Text of the expander's label"
 msgstr "Bya Akarango"
 
-#: widgets/misc/e-expander.c:197
+#: ../widgets/misc/e-expander.c:197
 #, fuzzy
 msgid "Use underline"
 msgstr "Gucaho umurongo"
 
-#: widgets/misc/e-expander.c:198
+#: ../widgets/misc/e-expander.c:198
 #, fuzzy
 msgid ""
 "If set, an underline in the text indicates the next character should be used "
@@ -20276,55 +20953,43 @@ msgstr ""
 "Gushyiraho Gucaho umurongo in Umwandiko Komeza>> Inyuguti kugirango "
 "Urufunguzo"
 
-# #-#-#-#-#  starmath.pot (Gnome 2.12)  #-#-#-#-#
-# starmath/sdi\smslots.src:SID_DISTANCE.text
-# #-#-#-#-#  starmath.pot (Gnome 2.12)  #-#-#-#-#
-# starmath/source\smres.src:RID_DISTANCEDIALOG.1.1.text
-# #-#-#-#-#  starmath.pot (Gnome 2.12)  #-#-#-#-#
-# starmath/source\smres.src:RID_DISTANCEDIALOG.text
-# #-#-#-#-#  starmath.pot (Gnome 2.12)  #-#-#-#-#
-# starmath/source\smres.src:RID_DISTANCEMENU.WORKARROUND_1.text
-#: widgets/misc/e-expander.c:205
-msgid "Spacing"
-msgstr "Gutandukanya"
-
-#: widgets/misc/e-expander.c:206
+#: ../widgets/misc/e-expander.c:206
 #, fuzzy
 msgid "Space to put between the label and the child"
 msgstr "Kuri Gushyira hagati Akarango Na"
 
-#: widgets/misc/e-expander.c:215
+#: ../widgets/misc/e-expander.c:215
 msgid "Label widget"
 msgstr ""
 
-#: widgets/misc/e-expander.c:216
+#: ../widgets/misc/e-expander.c:216
 #, fuzzy
 msgid "A widget to display in place of the usual expander label"
 msgstr "A Kuri Kugaragaza in Bya Akarango"
 
-#: widgets/misc/e-expander.c:222
+#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3318
 msgid "Expander Size"
 msgstr ""
 
-#: widgets/misc/e-expander.c:223
+#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3319
 #, fuzzy
 msgid "Size of the expander arrow"
 msgstr "Bya Akambi"
 
-#: widgets/misc/e-expander.c:231
+#: ../widgets/misc/e-expander.c:231
 msgid "Indicator Spacing"
 msgstr ""
 
-#: widgets/misc/e-expander.c:232
+#: ../widgets/misc/e-expander.c:232
 #, fuzzy
 msgid "Spacing around expander arrow"
 msgstr "Akambi"
 
-#: widgets/misc/e-filter-bar.c:195
+#: ../widgets/misc/e-filter-bar.c:195
 msgid "_Searches"
 msgstr ""
 
-#: widgets/misc/e-filter-bar.c:197
+#: ../widgets/misc/e-filter-bar.c:197
 msgid "Search Editor"
 msgstr ""
 
@@ -20365,55 +21030,70 @@ msgstr ""
 # -
 # - ***** END LICENSE BLOCK *****
 #. FIXME: get the toplevel window...
-#: widgets/misc/e-filter-bar.c:220
+#: ../widgets/misc/e-filter-bar.c:220
 msgid "Save Search"
 msgstr "Bika ishakisha"
 
-#: widgets/misc/e-filter-bar.h:92 widgets/misc/e-filter-bar.h:99
+#: ../widgets/misc/e-filter-bar.h:92 ../widgets/misc/e-filter-bar.h:99
 #, fuzzy
 msgid "_Save Search..."
 msgstr "Kubika"
 
-#: widgets/misc/e-filter-bar.h:93 widgets/misc/e-filter-bar.h:100
+#: ../widgets/misc/e-filter-bar.h:93 ../widgets/misc/e-filter-bar.h:100
 msgid "_Edit Saved Searches..."
 msgstr ""
 
-#: widgets/misc/e-filter-bar.h:94 widgets/misc/e-filter-bar.h:101
+#: ../widgets/misc/e-filter-bar.h:94 ../widgets/misc/e-filter-bar.h:101
 #, fuzzy
-msgid "_Advanced..."
+msgid "_Advanced Search..."
 msgstr "Urwego rwo hejuru..."
 
-#: widgets/misc/e-image-chooser.c:172
+#: ../widgets/misc/e-image-chooser.c:172
 msgid "Choose Image"
 msgstr ""
 
-#: widgets/misc/e-map.c:647
+#: ../widgets/misc/e-map.c:647
 msgid "World Map"
 msgstr ""
 
-#: widgets/misc/e-map.c:649
+#: ../widgets/misc/e-map.c:649
 #, fuzzy
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should select the timezone from the below combo box instead."
 msgstr "Biganira kugirango Guhitamo Bivuye munsi Agasanduku"
 
-#: widgets/misc/e-pilot-settings.c:103
+#: ../widgets/misc/e-pilot-settings.c:103
 #, fuzzy
 msgid "Sync with:"
 msgstr "Na:"
 
-#: widgets/misc/e-pilot-settings.c:111
+#: ../widgets/misc/e-pilot-settings.c:111
 msgid "Sync Private Records:"
 msgstr ""
 
-#: widgets/misc/e-pilot-settings.c:120
+#: ../widgets/misc/e-pilot-settings.c:120
 msgid "Sync Categories:"
 msgstr ""
 
+#: ../widgets/misc/e-reflow.c:1452 ../widgets/misc/e-reflow.c:1453
+#, fuzzy
+msgid "Empty message"
+msgstr "Ubutumwa"
+
+#: ../widgets/misc/e-reflow.c:1459 ../widgets/misc/e-reflow.c:1460
+#, fuzzy
+msgid "Reflow model"
+msgstr "Urugero"
+
+#: ../widgets/misc/e-reflow.c:1466 ../widgets/misc/e-reflow.c:1467
+#, fuzzy
+msgid "Column width"
+msgstr "Ubugari bw'inkingi"
+
 #. To translators: This is the accessibility name of
 #. the search bar's text entry widget
-#: widgets/misc/e-search-bar.c:345
+#: ../widgets/misc/e-search-bar.c:345
 msgid "Search Text Entry"
 msgstr ""
 
@@ -20421,118 +21101,138 @@ msgstr ""
 # offmgr/source\offapp\dialog\inetdlg.src:RID_OFADLG_INTERNET.1.RID_SVXPAGE_INET_SEARCH.text
 # #-#-#-#-#  offmgr.pot (Gnome 2.12)  #-#-#-#-#
 # offmgr/source\offapp\dialog\treeopt.src:RID_OFADLG_OPTIONS_TREE_PAGES.SID_INET_DLG.3.text
-#: widgets/misc/e-search-bar.c:549
+#: ../widgets/misc/e-search-bar.c:549
 #, fuzzy
 msgid "_Search"
 msgstr "Gushaka"
 
-#: widgets/misc/e-search-bar.c:555
+#: ../widgets/misc/e-search-bar.c:555
 msgid "_Find Now"
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:556 widgets/misc/e-search-bar.c:943
+#: ../widgets/misc/e-search-bar.c:556 ../widgets/misc/e-search-bar.c:943
 #, fuzzy
 msgid "_Clear"
 msgstr "Gusiba"
 
-#: widgets/misc/e-search-bar.c:647
+#: ../widgets/misc/e-search-bar.c:647
 msgid "Search Type"
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:851
+#: ../widgets/misc/e-search-bar.c:851
 msgid "Item ID"
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:858
+#: ../widgets/misc/e-search-bar.c:858
 msgid "Subitem ID"
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:865
+#: ../widgets/misc/e-search-bar.c:865 ../widgets/text/e-entry.c:1249
+#: ../widgets/text/e-entry.c:1250 ../widgets/text/e-text.c:3462
+#: ../widgets/text/e-text.c:3463
 msgid "Text"
 msgstr "Umwandiko"
 
-#: widgets/misc/e-search-bar.c:945
+#: ../widgets/misc/e-search-bar.c:945
 msgid "Find _Now"
 msgstr ""
 
-#: widgets/misc/e-send-options.c:506
+#: ../widgets/misc/e-selection-model-array.c:546
+#: ../widgets/table/e-tree-selection-model.c:811
+msgid "Cursor Row"
+msgstr ""
+
+#: ../widgets/misc/e-selection-model-array.c:553
+#: ../widgets/table/e-tree-selection-model.c:818
+msgid "Cursor Column"
+msgstr ""
+
+#: ../widgets/misc/e-selection-model.c:214
+msgid "Sorter"
+msgstr ""
+
+# sc/sdi\scslots.src:SID_STATUS_SELMODE.text
+#: ../widgets/misc/e-selection-model.c:221
+msgid "Selection Mode"
+msgstr "Uburyo bw'Ihitamo"
+
+#: ../widgets/misc/e-selection-model.c:229
+msgid "Cursor Mode"
+msgstr ""
+
+#: ../widgets/misc/e-send-options.c:515
 #, fuzzy
 msgid "When de_leted:"
 msgstr "Cyasibwe"
 
-#: widgets/misc/e-send-options.glade.h:1
+#: ../widgets/misc/e-send-options.glade.h:1
 #, fuzzy
 msgid "<b>Delivery Options</b>"
 msgstr "<B B"
 
-#: widgets/misc/e-send-options.glade.h:2
+#: ../widgets/misc/e-send-options.glade.h:2
 #, fuzzy
 msgid "<b>Replies</b>"
 msgstr "<B B"
 
-#: widgets/misc/e-send-options.glade.h:3
+#: ../widgets/misc/e-send-options.glade.h:3
 #, fuzzy
 msgid "<b>Return Notification</b>"
 msgstr "<B B"
 
-#: widgets/misc/e-send-options.glade.h:4
+#: ../widgets/misc/e-send-options.glade.h:4
 #, fuzzy
 msgid "<b>Status Tracking</b>"
 msgstr "<B B"
 
-#: widgets/misc/e-send-options.glade.h:5
+#: ../widgets/misc/e-send-options.glade.h:5
 #, fuzzy
 msgid "A_uto-delete sent item"
 msgstr "Gusiba Yoherejwe: Ikintu"
 
-#: widgets/misc/e-send-options.glade.h:6
+#: ../widgets/misc/e-send-options.glade.h:6
 msgid "C_lassification"
 msgstr ""
 
-#: widgets/misc/e-send-options.glade.h:7
+#: ../widgets/misc/e-send-options.glade.h:7
 #, fuzzy
 msgid "Creat_e a sent item to track information"
 msgstr "a Yoherejwe: Ikintu Kuri Ibisobanuro"
 
-#: widgets/misc/e-send-options.glade.h:8
+#: ../widgets/misc/e-send-options.glade.h:8
 #, fuzzy
 msgid "Deli_vered and opened"
 msgstr "Na"
 
 # offmgr/sdi\ofaslots.src:SID_GENERAL_OPTIONS.text
-#: widgets/misc/e-send-options.glade.h:9
+#: ../widgets/misc/e-send-options.glade.h:9
 #, fuzzy
 msgid "Gene_ral Options"
 msgstr "Amahitamo Rusange"
 
-#: widgets/misc/e-send-options.glade.h:10
+#: ../widgets/misc/e-send-options.glade.h:10
 msgid ""
 "None\n"
 "Mail Receipt"
 msgstr ""
 
-#: widgets/misc/e-send-options.glade.h:12
-msgid ""
-"None\n"
-"Mail Receipt\n"
-msgstr ""
-
-#: widgets/misc/e-send-options.glade.h:15
+#: ../widgets/misc/e-send-options.glade.h:12
 msgid ""
 "Public\n"
 "Private\n"
 "Confidential\n"
 msgstr ""
 
-#: widgets/misc/e-send-options.glade.h:19
+#: ../widgets/misc/e-send-options.glade.h:16
 msgid "R_eply requested"
 msgstr ""
 
-#: widgets/misc/e-send-options.glade.h:21
-msgid "Sta_tus  Tracking"
-msgstr ""
+#: ../widgets/misc/e-send-options.glade.h:18
+#, fuzzy
+msgid "Sta_tus Tracking"
+msgstr "<B B"
 
-#: widgets/misc/e-send-options.glade.h:22
+#: ../widgets/misc/e-send-options.glade.h:19
 msgid ""
 "Undefined\n"
 "High\n"
@@ -20540,108 +21240,782 @@ msgid ""
 "Low"
 msgstr ""
 
-#: widgets/misc/e-send-options.glade.h:26
+#: ../widgets/misc/e-send-options.glade.h:23
 #, fuzzy
 msgid "W_ithin"
 msgstr "muri"
 
-#: widgets/misc/e-send-options.glade.h:27
+#: ../widgets/misc/e-send-options.glade.h:24
 #, fuzzy
-msgid "When acce_pted: "
+msgid "When acce_pted:"
 msgstr "Byemewe"
 
-#: widgets/misc/e-send-options.glade.h:28
+#: ../widgets/misc/e-send-options.glade.h:25
 msgid "When co_mpleted:"
 msgstr ""
 
-#: widgets/misc/e-send-options.glade.h:29
-msgid "When decli_ned:    "
-msgstr ""
+#: ../widgets/misc/e-send-options.glade.h:26
+#, fuzzy
+msgid "When decli_ned:"
+msgstr "Cyasibwe"
 
-#: widgets/misc/e-send-options.glade.h:30
+#: ../widgets/misc/e-send-options.glade.h:27
 #, fuzzy
 msgid "_After:"
 msgstr "Nyuma"
 
-#: widgets/misc/e-send-options.glade.h:31
+#: ../widgets/misc/e-send-options.glade.h:28
 #, fuzzy
 msgid "_All information"
 msgstr "Ibisobanuro"
 
-#: widgets/misc/e-send-options.glade.h:32
+#: ../widgets/misc/e-send-options.glade.h:29
 #, fuzzy
 msgid "_Delay message delivery"
 msgstr "Ubutumwa"
 
-#: widgets/misc/e-send-options.glade.h:33
+#: ../widgets/misc/e-send-options.glade.h:30
 msgid "_Delivered"
 msgstr ""
 
-#: widgets/misc/e-send-options.glade.h:35
+#: ../widgets/misc/e-send-options.glade.h:32
 #, fuzzy
-msgid "_Set expiration  date"
+msgid "_Set expiration date"
 msgstr "Itariki"
 
-#: widgets/misc/e-send-options.glade.h:36
+#: ../widgets/misc/e-send-options.glade.h:33
 msgid "_Until:"
 msgstr ""
 
-#: widgets/misc/e-send-options.glade.h:37
+#: ../widgets/misc/e-send-options.glade.h:34
 msgid "_When convenient"
 msgstr ""
 
-#: widgets/misc/e-send-options.glade.h:38
-msgid "_When opened:     "
+#: ../widgets/misc/e-send-options.glade.h:35
+#, fuzzy
+msgid "_When opened:"
+msgstr "Cyasibwe"
+
+#: ../widgets/misc/e-task-widget.c:208
+#, c-format
+msgid "%s (...)"
 msgstr ""
 
-#. system:ask-save-file-exists-overwrite primary
-#: widgets/misc/e-system-errors.xml.h:4
+#: ../widgets/misc/e-task-widget.c:213
+#, fuzzy, c-format
+msgid "%s (%d%% complete)"
+msgstr "%s(%d%%Byuzuye"
+
+#: ../widgets/misc/e-url-entry.c:107
 #, fuzzy
-msgid "File exists \"{0}\"."
-msgstr "Idosiye 0"
+msgid "click here to go to url"
+msgstr "Kanda Kuri Gyayo Kuri URL"
 
-#. system:ask-save-file-exists-overwrite secondary
-#: widgets/misc/e-system-errors.xml.h:6
+#: ../widgets/table/e-cell-combo.c:177
 #, fuzzy
-msgid "Do you wish to overwrite it?"
-msgstr "Kuri Guhindura"
+msgid "popup list"
+msgstr "Urutonde"
+
+#: ../widgets/table/e-cell-date.c:64
+msgid "%l:%M %p"
+msgstr ""
+
+#: ../widgets/table/e-cell-pixbuf.c:397
+msgid "Selected Column"
+msgstr ""
+
+#: ../widgets/table/e-cell-pixbuf.c:404
+msgid "Focused Column"
+msgstr ""
+
+#: ../widgets/table/e-cell-pixbuf.c:411
+msgid "Unselected Column"
+msgstr ""
+
+#: ../widgets/table/e-cell-text.c:1740
+msgid "Strikeout Column"
+msgstr ""
+
+#: ../widgets/table/e-cell-text.c:1747
+msgid "Underline Column"
+msgstr ""
+
+#: ../widgets/table/e-cell-text.c:1754
+msgid "Bold Column"
+msgstr ""
+
+#: ../widgets/table/e-cell-text.c:1761
+msgid "Color Column"
+msgstr ""
+
+#: ../widgets/table/e-cell-text.c:1775
+msgid "BG Color Column"
+msgstr ""
 
-#. system:no-save-file primary
-#: widgets/misc/e-system-errors.xml.h:9
+# sc/source\ui\src\sortdlg.src:RID_SCPAGE_SORT_FIELDS.FL_SORT2.text
+#: ../widgets/table/e-table-config-field.c:254
 #, fuzzy
-msgid "Cannot save file \"{0}\"."
-msgstr "Kubika IDOSIYE 0"
+msgid "Then By"
+msgstr "Noneho ku"
 
-#. system:no-load-file primary
-#: widgets/misc/e-system-errors.xml.h:13
+# sc/source\ui\src\subtdlg.src:RID_SUBTBASE.FT_GROUP.text
+#: ../widgets/table/e-table-config-field.c:254
 #, fuzzy
-msgid "Cannot open file \"{0}\"."
-msgstr "Gufungura IDOSIYE 0"
+msgid "Group By"
+msgstr "Gushyira mu itsina na"
 
-#: widgets/misc/e-task-widget.c:208
-#, c-format
-msgid "%s (...)"
+#: ../widgets/table/e-table-config-field.c:254
+#, fuzzy
+msgid "Sort By"
+msgstr "Ishungura"
+
+# #-#-#-#-#  dbaccess.pot (Gnome 2.12)  #-#-#-#-#
+# #-#-#-#-#  dbaccess.pot (Gnome 2.12)  #-#-#-#-#
+#: ../widgets/table/e-table-config-field.c:270
+msgid "Ascending"
+msgstr "Ubujyejuru"
+
+# #-#-#-#-#  dbaccess.pot (Gnome 2.12)  #-#-#-#-#
+# #-#-#-#-#  dbaccess.pot (Gnome 2.12)  #-#-#-#-#
+#: ../widgets/table/e-table-config-field.c:273
+msgid "Descending"
+msgstr "Ubujyesi"
+
+#: ../widgets/table/e-table-config.c:150
+msgid "State"
+msgstr "Leta"
+
+#: ../widgets/table/e-table-config.c:307 ../widgets/table/e-table-config.c:349
+msgid "(Ascending)"
 msgstr ""
 
-#: widgets/misc/e-task-widget.c:213
-#, fuzzy, c-format
-msgid "%s (%d%% complete)"
-msgstr "%s(%d%%Byuzuye"
+#: ../widgets/table/e-table-config.c:307 ../widgets/table/e-table-config.c:349
+msgid "(Descending)"
+msgstr ""
 
-#: widgets/misc/e-url-entry.c:107
+#: ../widgets/table/e-table-config.c:314
 #, fuzzy
-msgid "click here to go to url"
-msgstr "Kanda Kuri Gyayo Kuri URL"
+msgid "Not sorted"
+msgstr "bishunguwe"
 
-# sc/source\ui\src\scfuncs.src:RID_SC_FUNCTION_DESCRIPTIONS1.SC_OPCODE_GET_TIME.4.text
+#: ../widgets/table/e-table-config.c:355
+#, fuzzy
+msgid "No grouping"
+msgstr "Mu itsinda"
 
+#: ../widgets/table/e-table-field-chooser-dialog.c:77
+#: ../widgets/table/e-table-field-chooser-item.c:646
+#: ../widgets/table/e-table-field-chooser.c:79
+#: ../widgets/table/e-table-header-item.c:1810
+#, fuzzy
+msgid "DnD code"
+msgstr "ITEGEKONGENGA"
 
+#: ../widgets/table/e-table-field-chooser-dialog.c:84
+#: ../widgets/table/e-table-field-chooser-item.c:653
+#: ../widgets/table/e-table-field-chooser.c:86
+#: ../widgets/table/e-table-header-item.c:1824
+msgid "Full Header"
+msgstr ""
 
+#: ../widgets/table/e-table-field-chooser-dialog.c:126
+#, fuzzy
+msgid "Add a column..."
+msgstr "a Inkingi"
 
-# starmath/source\smres.src:RID_TOOLBOXWINDOW.2.RID_XLTY.text
+#: ../widgets/table/e-table-group-leaf.c:573
+#: ../widgets/table/e-table-group-leaf.c:574
+#: ../widgets/table/e-table-item.c:2959 ../widgets/table/e-table-item.c:2960
+msgid "Alternating Row Colors"
+msgstr ""
 
+#: ../widgets/table/e-table-group-leaf.c:580
+#: ../widgets/table/e-table-group-leaf.c:581
+#: ../widgets/table/e-table-item.c:2966 ../widgets/table/e-table-item.c:2967
+#: ../widgets/table/e-tree.c:3271 ../widgets/table/e-tree.c:3272
+msgid "Horizontal Draw Grid"
+msgstr ""
 
-# sc/source\ui\src\globstr.src:RID_GLOBSTR.STR_UNDO_IMPORTDATA.text
+#: ../widgets/table/e-table-group-leaf.c:587
+#: ../widgets/table/e-table-group-leaf.c:588
+#: ../widgets/table/e-table-item.c:2973 ../widgets/table/e-table-item.c:2974
+#: ../widgets/table/e-tree.c:3277 ../widgets/table/e-tree.c:3278
+msgid "Vertical Draw Grid"
+msgstr ""
 
-# these things need to move into utilityOverlay.xul
+#: ../widgets/table/e-table-group-leaf.c:594
+#: ../widgets/table/e-table-group-leaf.c:595
+#: ../widgets/table/e-table-item.c:2980 ../widgets/table/e-table-item.c:2981
+#: ../widgets/table/e-tree.c:3283 ../widgets/table/e-tree.c:3284
+msgid "Draw focus"
+msgstr ""
+
+#: ../widgets/table/e-table-group-leaf.c:601
+#: ../widgets/table/e-table-group-leaf.c:602
+#: ../widgets/table/e-table-item.c:2987 ../widgets/table/e-table-item.c:2988
+#, fuzzy
+msgid "Cursor mode"
+msgstr "Ubwoko"
+
+#: ../widgets/table/e-table-group-leaf.c:608
+#: ../widgets/table/e-table-group-leaf.c:609
+#: ../widgets/table/e-table-item.c:2994 ../widgets/table/e-table-item.c:2995
+#: ../widgets/table/e-table.c:3316 ../widgets/table/e-tree.c:3265
+#: ../widgets/table/e-tree.c:3266
+msgid "Length Threshold"
+msgstr ""
+
+#: ../widgets/table/e-table-group-leaf.c:615
+#: ../widgets/table/e-table-group-leaf.c:616
+#: ../widgets/table/e-table-item.c:2952 ../widgets/table/e-table-item.c:2953
+#, fuzzy
+msgid "Selection model"
+msgstr "Urugero"
+
+#: ../widgets/table/e-table-group-leaf.c:643
+#: ../widgets/table/e-table-group-leaf.c:644
+msgid "Frozen"
+msgstr ""
+
+#: ../widgets/table/e-table-group-leaf.c:650
+#: ../widgets/table/e-table-group-leaf.c:651
+#: ../widgets/table/e-table-item.c:3028 ../widgets/table/e-table-item.c:3029
+#: ../widgets/table/e-table.c:3323 ../widgets/table/e-tree.c:3297
+#: ../widgets/table/e-tree.c:3298
+#, fuzzy
+msgid "Uniform row height"
+msgstr "Urubariro Ubuhagarike"
+
+#: ../widgets/table/e-table-header-item.c:1472
+msgid "Customize Current View"
+msgstr ""
+
+# #-#-#-#-#  dbaccess.pot (Gnome 2.12)  #-#-#-#-#
+# #-#-#-#-#  dbaccess.pot (Gnome 2.12)  #-#-#-#-#
+# dbaccess/source/ui/inc/toolbox.hrc:MID_SBA_QRY_SORTUP.text
+#: ../widgets/table/e-table-header-item.c:1492
+msgid "Sort Ascending"
+msgstr "Gushungura ubujyejuru"
+
+# #-#-#-#-#  dbaccess.pot (Gnome 2.12)  #-#-#-#-#
+# #-#-#-#-#  dbaccess.pot (Gnome 2.12)  #-#-#-#-#
+# dbaccess/source/ui/inc/toolbox.hrc:MID_SBA_QRY_SORTDOWN.text
+#: ../widgets/table/e-table-header-item.c:1493
+msgid "Sort Descending"
+msgstr "Gushungura ubujyesi"
+
+#: ../widgets/table/e-table-header-item.c:1494
+msgid "Unsort"
+msgstr ""
+
+#: ../widgets/table/e-table-header-item.c:1496
+msgid "Group By This Field"
+msgstr ""
+
+#: ../widgets/table/e-table-header-item.c:1497
+msgid "Group By Box"
+msgstr ""
+
+#: ../widgets/table/e-table-header-item.c:1499
+msgid "Remove This Column"
+msgstr ""
+
+#: ../widgets/table/e-table-header-item.c:1500
+#, fuzzy
+msgid "Add a Column..."
+msgstr "a"
+
+#: ../widgets/table/e-table-header-item.c:1502
+msgid "Alignment"
+msgstr "Itunganya"
+
+#: ../widgets/table/e-table-header-item.c:1503
+msgid "Best Fit"
+msgstr ""
+
+#: ../widgets/table/e-table-header-item.c:1504
+msgid "Format Columns..."
+msgstr ""
+
+#: ../widgets/table/e-table-header-item.c:1506
+msgid "Customize Current View..."
+msgstr ""
+
+#: ../widgets/table/e-table-header-item.c:1817 ../widgets/text/e-entry.c:1263
+#: ../widgets/text/e-entry.c:1264
+msgid "Fontset"
+msgstr ""
+
+#: ../widgets/table/e-table-header-item.c:1838
+#: ../widgets/table/e-table-sorter.c:175
+msgid "Sort Info"
+msgstr ""
+
+#: ../widgets/table/e-table-header-item.c:1852
+#: ../widgets/table/e-tree-scrolled.c:223
+#: ../widgets/table/e-tree-scrolled.c:224
+msgid "Tree"
+msgstr ""
+
+#: ../widgets/table/e-table-item.c:2938 ../widgets/table/e-table-item.c:2939
+#, fuzzy
+msgid "Table header"
+msgstr "Umutwempangano"
+
+#: ../widgets/table/e-table-item.c:2945 ../widgets/table/e-table-item.c:2946
+#, fuzzy
+msgid "Table model"
+msgstr "Akadirishya k'Imbonerahamwe"
+
+#: ../widgets/table/e-table-item.c:3021 ../widgets/table/e-table-item.c:3022
+#, fuzzy
+msgid "Cursor row"
+msgstr "Ubwoko"
+
+#: ../widgets/table/e-table.c:3330
+msgid "Always Search"
+msgstr ""
+
+#: ../widgets/table/e-table.c:3337
+#, fuzzy
+msgid "Use click to add"
+msgstr "Kanda Kuri Kongeramo"
+
+#: ../widgets/table/e-tree.c:3290 ../widgets/table/e-tree.c:3291
+#, fuzzy
+msgid "ETree table adapter"
+msgstr "imbonerahamwe#"
+
+#: ../widgets/table/e-tree.c:3304 ../widgets/table/e-tree.c:3305
+#, fuzzy
+msgid "Always search"
+msgstr "Gushaka"
+
+#: ../widgets/table/e-tree.c:3311
+msgid "Retro Look"
+msgstr ""
+
+#: ../widgets/table/e-tree.c:3312
+#, fuzzy
+msgid "Draw lines and +/- expanders."
+msgstr "Imirongo Na"
+
+#: ../widgets/text/e-entry-test.c:49
+msgid "Minicard Test"
+msgstr ""
+
+#: ../widgets/text/e-entry-test.c:50
+#, fuzzy
+msgid "Copyright (C) 2000, Helix Code, Inc."
+msgstr "C"
+
+#: ../widgets/text/e-entry-test.c:52
+#, fuzzy
+msgid "This should test the minicard canvas item"
+msgstr "Igerageza Umuntu Gucapa ITEGEKONGENGA"
+
+#: ../widgets/text/e-entry.c:1242 ../widgets/text/e-entry.c:1243
+#: ../widgets/text/e-text.c:3455 ../widgets/text/e-text.c:3456
+msgid "Event Processor"
+msgstr ""
+
+# #-#-#-#-#  offmgr.pot (Gnome 2.12)  #-#-#-#-#
+# offmgr/source\offapp\dialog\fontsubs.src:RID_SVX_FONT_SUBSTITUTION.FT_FONTNAME.text
+# #-#-#-#-#  offmgr.pot (Gnome 2.12)  #-#-#-#-#
+# offmgr/source\offapp\dialog\treeopt.src:RID_OFADLG_OPTIONS_TREE_PAGES.SID_GENERAL_OPTIONS.10.text
+#: ../widgets/text/e-entry.c:1256 ../widgets/text/e-entry.c:1257
+#, fuzzy
+msgid "Font"
+msgstr "Imyandikire"
 
+# #-#-#-#-#  offmgr.pot (Gnome 2.12)  #-#-#-#-#
+# offmgr/source\offapp\dialog\fontsubs.src:RID_SVX_FONT_SUBSTITUTION.FT_FONTNAME.text
+# #-#-#-#-#  offmgr.pot (Gnome 2.12)  #-#-#-#-#
+# offmgr/source\offapp\dialog\treeopt.src:RID_OFADLG_OPTIONS_TREE_PAGES.SID_GENERAL_OPTIONS.10.text
+#: ../widgets/text/e-entry.c:1270 ../widgets/text/e-entry.c:1271
+#, fuzzy
+msgid "GDKFont"
+msgstr "Imyandikire"
+
+#: ../widgets/text/e-entry.c:1277 ../widgets/text/e-entry.c:1278
+#: ../widgets/text/e-text.c:3491 ../widgets/text/e-text.c:3492
+msgid "Justification"
+msgstr ""
+
+#: ../widgets/text/e-entry.c:1319 ../widgets/text/e-entry.c:1320
+#: ../widgets/text/e-text.c:3591 ../widgets/text/e-text.c:3592
+msgid "Use ellipsis"
+msgstr ""
+
+#: ../widgets/text/e-entry.c:1326 ../widgets/text/e-entry.c:1327
+#: ../widgets/text/e-text.c:3598 ../widgets/text/e-text.c:3599
+msgid "Ellipsis"
+msgstr ""
+
+#: ../widgets/text/e-entry.c:1333 ../widgets/text/e-entry.c:1334
+#: ../widgets/text/e-text.c:3605 ../widgets/text/e-text.c:3606
+#, fuzzy
+msgid "Line wrap"
+msgstr "Gufunika"
+
+#: ../widgets/text/e-entry.c:1340 ../widgets/text/e-entry.c:1341
+#: ../widgets/text/e-text.c:3612 ../widgets/text/e-text.c:3613
+#, fuzzy
+msgid "Break characters"
+msgstr "Inyuguti"
+
+#: ../widgets/text/e-entry.c:1347 ../widgets/text/e-entry.c:1348
+#: ../widgets/text/e-text.c:3619 ../widgets/text/e-text.c:3620
+#, fuzzy
+msgid "Max lines"
+msgstr "Imirongo"
+
+#: ../widgets/text/e-entry.c:1354 ../widgets/text/e-entry.c:1355
+#: ../widgets/text/e-text.c:3648 ../widgets/text/e-text.c:3649
+msgid "Allow newlines"
+msgstr ""
+
+#: ../widgets/text/e-entry.c:1361 ../widgets/text/e-entry.c:1362
+#: ../widgets/text/e-text.c:3641 ../widgets/text/e-text.c:3642
+#, fuzzy
+msgid "Draw borders"
+msgstr "Impera"
+
+#: ../widgets/text/e-entry.c:1368 ../widgets/text/e-entry.c:1369
+#: ../widgets/text/e-text.c:3655 ../widgets/text/e-text.c:3656
+#, fuzzy
+msgid "Draw background"
+msgstr "Mbuganyuma"
+
+#: ../widgets/text/e-entry.c:1375 ../widgets/text/e-entry.c:1376
+#: ../widgets/text/e-text.c:3662 ../widgets/text/e-text.c:3663
+#, fuzzy
+msgid "Draw button"
+msgstr "Akabuto"
+
+#: ../widgets/text/e-entry.c:1382 ../widgets/text/e-entry.c:1383
+#: ../widgets/text/e-text.c:3669 ../widgets/text/e-text.c:3670
+#, fuzzy
+msgid "Cursor position"
+msgstr "Ibirindiro"
+
+#: ../widgets/text/e-entry.c:1389 ../widgets/text/e-entry.c:1390
+msgid "Emulate label resize"
+msgstr ""
+
+#: ../widgets/text/e-text.c:2696
+msgid "Input Methods"
+msgstr ""
+
+# #-#-#-#-#  officecfg.pot (Gnome 2.12)  #-#-#-#-#
+# officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....Revision.TextDisplay.Insert.Attribute..1.text
+# #-#-#-#-#  officecfg.pot (Gnome 2.12)  #-#-#-#-#
+# officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....Revision.TextDisplay.Delete.Attribute..1.text
+# #-#-#-#-#  officecfg.pot (Gnome 2.12)  #-#-#-#-#
+# officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....Revision.TextDisplay.ChangedAttribute.Attribute..1.text
+#: ../widgets/text/e-text.c:3469 ../widgets/text/e-text.c:3470
+msgid "Bold"
+msgstr "Bitsindagiye"
+
+#: ../widgets/text/e-text.c:3476 ../widgets/text/e-text.c:3477
+#, fuzzy
+msgid "Strikeout"
+msgstr "gucishamo akarongo"
+
+# officecfg/registry\schema\org\openoffice\Office\Calc.xcs:....Content.Display.Anchor.text
+#: ../widgets/text/e-text.c:3483 ../widgets/text/e-text.c:3484
+msgid "Anchor"
+msgstr "Agafashi"
+
+#: ../widgets/text/e-text.c:3498 ../widgets/text/e-text.c:3499
+msgid "Clip Width"
+msgstr ""
+
+#: ../widgets/text/e-text.c:3505 ../widgets/text/e-text.c:3506
+msgid "Clip Height"
+msgstr ""
+
+#: ../widgets/text/e-text.c:3512 ../widgets/text/e-text.c:3513
+msgid "Clip"
+msgstr ""
+
+#: ../widgets/text/e-text.c:3519 ../widgets/text/e-text.c:3520
+#, fuzzy
+msgid "Fill clip rectangle"
+msgstr "Urukiramende"
+
+# 6580
+#: ../widgets/text/e-text.c:3526 ../widgets/text/e-text.c:3527
+msgid "X Offset"
+msgstr "X-Vanaho"
+
+# 6598
+#: ../widgets/text/e-text.c:3533 ../widgets/text/e-text.c:3534
+msgid "Y Offset"
+msgstr "Y-Vanaho"
+
+#: ../widgets/text/e-text.c:3569 ../widgets/text/e-text.c:3570
+#, fuzzy
+msgid "Text width"
+msgstr "Ubugari"
+
+#: ../widgets/text/e-text.c:3576 ../widgets/text/e-text.c:3577
+#, fuzzy
+msgid "Text height"
+msgstr "Ubuhagarike"
+
+#: ../widgets/text/e-text.c:3676 ../widgets/text/e-text.c:3677
+msgid "IM Context"
+msgstr ""
+
+#: ../widgets/text/e-text.c:3683 ../widgets/text/e-text.c:3684
+msgid "Handle Popup"
+msgstr ""
+
+#, fuzzy
+#~ msgid "Your server needs to be updated"
+#~ msgstr "Seriveri Kuri"
+
+#, fuzzy
+#~ msgid ""
+#~ "Are you sure you want\n"
+#~ "to delete this contact?"
+#~ msgstr "Gusiba iyi Umuntu"
+
+#, fuzzy
+#~ msgid ""
+#~ "Some features may not work correctly with your current server version "
+#~ msgstr "Ibiranga Gicurasi OYA Akazi Na: KIGEZWEHO Seriveri Verisiyo"
+
+#, fuzzy
+#~ msgid "end-time"
+#~ msgstr "Impera Igihe"
+
+#~ msgid "location"
+#~ msgstr "Inturo"
+
+#, fuzzy
+#~ msgid "start-time"
+#~ msgstr "Gutangira Igihe"
+
+#, fuzzy
+#~ msgid "Show _Attachment Bar (drop attachments here)"
+#~ msgstr "Imigereka"
+
+#, fuzzy
+#~ msgid "Attachment Button: Press space key to toggle attachment bar"
+#~ msgstr "Umwanya Urufunguzo Kuri Mukomatanya umugereka"
+
+#, fuzzy
+#~ msgid "Ad_vanced  send options"
+#~ msgstr "Kohereza Amahitamo"
+
+# #-#-#-#-#  scaddins.pot (Gnome 2.12)  #-#-#-#-#
+# scaddins/source\analysis\analysis.src:RID_ANALYSIS_FUNCTION_DESCRIPTIONS.ANALYSIS_Seriessum.4.text
+# #-#-#-#-#  scaddins.pot (Gnome 2.12)  #-#-#-#-#
+# scaddins/source\analysis\analysis.src:RID_ANALYSIS_FUNCTION_DESCRIPTIONS.ANALYSIS_Besseli.4.text
+# #-#-#-#-#  scaddins.pot (Gnome 2.12)  #-#-#-#-#
+# scaddins/source\analysis\analysis.src:RID_ANALYSIS_FUNCTION_DESCRIPTIONS.ANALYSIS_Besselj.4.text
+# #-#-#-#-#  scaddins.pot (Gnome 2.12)  #-#-#-#-#
+# scaddins/source\analysis\analysis.src:RID_ANALYSIS_FUNCTION_DESCRIPTIONS.ANALYSIS_Besselk.4.text
+# #-#-#-#-#  scaddins.pot (Gnome 2.12)  #-#-#-#-#
+# scaddins/source\analysis\analysis.src:RID_ANALYSIS_FUNCTION_DESCRIPTIONS.ANALYSIS_Bessely.4.text
+#~ msgid "N"
+#~ msgstr "N"
+
+# #-#-#-#-#  sc.pot (Gnome 2.12)  #-#-#-#-#
+# sc/source\ui\src\scfuncs.src:RID_SC_FUNCTION_DESCRIPTIONS1.SC_OPCODE_KUM_KAP_Z.8.text
+# #-#-#-#-#  sc.pot (Gnome 2.12)  #-#-#-#-#
+# sc/source\ui\src\scfuncs.src:RID_SC_FUNCTION_DESCRIPTIONS1.SC_OPCODE_KUM_ZINS_Z.8.text
+# #-#-#-#-#  sc.pot (Gnome 2.12)  #-#-#-#-#
+# sc/source\ui\src\scfuncs.src:RID_SC_FUNCTION_DESCRIPTIONS1.SC_OPCODE_VBD.8.text
+#~ msgid "S"
+#~ msgstr "S"
+
+#~ msgid "W"
+#~ msgstr "W"
+
+#, fuzzy
+#~ msgid "<b>If</b>"
+#~ msgstr "<B B"
+
+#~ msgid "Create New Folder"
+#~ msgstr "Rema idosiye nshya"
+
+# #-#-#-#-#  dbaccess.pot (Gnome 2.12)  #-#-#-#-#
+# #-#-#-#-#  dbaccess.pot (Gnome 2.12)  #-#-#-#-#
+#, fuzzy
+#~ msgid "_Print"
+#~ msgstr "Gucapa"
+
+#, fuzzy
+#~ msgid "port for starting user runned spamd"
+#~ msgstr "Umuyoboro kugirango Ukoresha:"
+
+#, fuzzy
+#~ msgid "spamd port"
+#~ msgstr "Umuyoboro"
+
+#, fuzzy
+#~ msgid "_Load images if sender is in address book"
+#~ msgstr "Ishusho NIBA Uwohereza ni in Aderesi Igitabo"
+
+#, fuzzy
+#~ msgid "{1}."
+#~ msgstr "{1."
+
+#, fuzzy
+#~ msgid "Mark  as default folder"
+#~ msgstr "Nka Mburabuzi Ububiko"
+
+#, fuzzy
+#~ msgid "<b>%s</b> requests the presence of %s at the following meeting:"
+#~ msgstr "<B B Bya ku"
+
+#, fuzzy
+#~ msgid "Invalid user"
+#~ msgstr "Ukoresha:"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "You cannot share folder with specified user \"{0}\" \n"
+#~ msgstr "Ububiko Na: Ukoresha: 0"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "\tYou have to specify a user name whom you want to add to the list \n"
+#~ msgstr "Kuri a Ukoresha: Izina: Kuri Kongeramo Kuri Urutonde"
+
+#, fuzzy
+#~ msgid "Cannot Create shared folder in offline mode."
+#~ msgstr "Ububiko in Ntibicometse kuri interineti Ubwoko"
+
+#, fuzzy
+#~ msgid "Closing connections..."
+#~ msgstr "Ukwihuza"
+
+#, fuzzy
+#~ msgid "Starting import"
+#~ msgstr "Kuzana"
+
+#, fuzzy
+#~ msgid ""
+#~ "If you quit the Evolution Setup Assistant now, all of the information "
+#~ "that you have entered will be forgotten. You will need to run this "
+#~ "assistant again before using Evolution.\n"
+#~ "\n"
+#~ "Do you want to quit using the Assistant now?"
+#~ msgstr ""
+#~ "Kuvamo NONEAHA Byose Bya Ibisobanuro Kuri Gukoresha iyi Mbere ikoresha "
+#~ "Kuri Kuvamo ikoresha NONEAHA"
+
+#, fuzzy
+#~ msgid ""
+#~ "You have successfully entered all of the information needed to set up "
+#~ "Evolution. \n"
+#~ "\n"
+#~ "Click the \"Apply\" button to save your settings. "
+#~ msgstr ""
+#~ "Byose Bya Ibisobanuro Kuri Gushyiraho Hejuru Akabuto Kuri Kubika "
+#~ "Amagenamiterere"
+
+#, fuzzy
+#~ msgid "Disable the mono plugin environment."
+#~ msgstr "i"
+
+#, fuzzy
+#~ msgid "Cannot start Evolution"
+#~ msgstr "Gutangira"
+
+# framework/source\classes\fltdlg.src:DLG_FILTER_SELECT.FL_FILTER.text
+#, fuzzy
+#~ msgid "_Filters..."
+#~ msgstr "Muyunguruzi"
+
+#, fuzzy
+#~ msgid "Mark All as _Read"
+#~ msgstr "Nka"
+
+# sfx2/source\explorer\explorer.src:STR_SFX_FOLDER.text
+#, fuzzy
+#~ msgid "_Folder"
+#~ msgstr "Ububiko"
+
+#, fuzzy
+#~ msgid "Mark as I_mportant"
+#~ msgstr "Nka"
+
+#, fuzzy
+#~ msgid "Mark as Unimp_ortant"
+#~ msgstr "Nka"
+
+# #-#-#-#-#  officecfg.pot (Gnome 2.12)  #-#-#-#-#
+# officecfg/registry\schema\org\openoffice\Office\Common.xcs:....Filter.Graphic.Export.BMP.ExportMode..0.text
+# #-#-#-#-#  officecfg.pot (Gnome 2.12)  #-#-#-#-#
+# officecfg/registry\schema\org\openoffice\Office\Common.xcs:....Filter.Graphic.Export.MET.ExportMode..0.text
+# #-#-#-#-#  officecfg.pot (Gnome 2.12)  #-#-#-#-#
+# officecfg/registry\schema\org\openoffice\Office\Common.xcs:....Filter.Graphic.Export.PCT.ExportMode..0.text
+# #-#-#-#-#  officecfg.pot (Gnome 2.12)  #-#-#-#-#
+# officecfg/registry\schema\org\openoffice\Office\Common.xcs:....Filter.Graphic.Export.SVM.ExportMode..0.text
+# #-#-#-#-#  officecfg.pot (Gnome 2.12)  #-#-#-#-#
+# officecfg/registry\schema\org\openoffice\Office\Common.xcs:....Filter.Graphic.Export.WMF.ExportMode..0.text
+# #-#-#-#-#  officecfg.pot (Gnome 2.12)  #-#-#-#-#
+# officecfg/registry\schema\org\openoffice\Office\Common.xcs:....Filter.Graphic.Export.EMF.ExportMode..0.text
+# #-#-#-#-#  officecfg.pot (Gnome 2.12)  #-#-#-#-#
+# officecfg/registry\schema\org\openoffice\Office\Math.xcs:....Print.Size..0.text
+#, fuzzy
+#~ msgid "Original Si_ze"
+#~ msgstr "Ingano mwimerere"
+
+#, fuzzy
+#~ msgid "S_earch in Message..."
+#~ msgstr "in"
+
+#, fuzzy
+#~ msgid "S_maller"
+#~ msgstr "Gitoya"
+
+# officecfg/registry\schema\org\openoffice\Office\Math.xcs:....StandardFormat.TextSize.text
+#, fuzzy
+#~ msgid "Text Si_ze"
+#~ msgstr "Ingano y'umwandiko"
+
+#, fuzzy
+#~ msgid "_Inline"
+#~ msgstr "Mumurongo"
+
+#, fuzzy
+#~ msgid "_Larger"
+#~ msgstr "Kinini"
+
+# offmgr/sdi\ofaslots.src:SID_MAIL_OPEN.text
+#, fuzzy
+#~ msgid "_Open Message"
+#~ msgstr "Gufungura Ubutumwa"
+
+#, fuzzy
+#~ msgid "Show / hide attachments"
+#~ msgstr "Gushisha Imigereka"
+
+#, fuzzy
+#~ msgid "Show _attachments"
+#~ msgstr "Imigereka"
+
+#, fuzzy
+#~ msgid "Show attachments"
+#~ msgstr "Imigereka"
+
+# #-#-#-#-#  setup2.pot (Gnome 2.12)  #-#-#-#-#
+# setup2/source\ui\app.src:STR_RESTART_BTN_NO.text
+# #-#-#-#-#  setup2.pot (Gnome 2.12)  #-#-#-#-#
+# setup2/source\ui\pages\phavefun.src:RESID_PAGE_PAGEHAVEFUN.STR_LOGOUT_BTN_NO.text
+#, fuzzy
+#~ msgid "E_xit"
+#~ msgstr "Gusohoka"
+
+# sc/source\ui\src\optdlg.src:RID_SCPAGE_CONTENT.GB_WINDOW.text
+#, fuzzy
+#~ msgid "_Window"
+#~ msgstr "Idirishya"
author	Not Zed <NotZed@Ximian.com>	2005-06-21 16:35:06 +0800
committer	Michael Zucci <zucchi@src.gnome.org>	2005-06-21 16:35:06 +0800
commit	9960d26ccfc41ddf4d73823932a52b4b89cb1fe9 (patch)
tree	4398d7f80572abc78954d7cbb3d57234fdfa2fa9 /po/rw.po
parent	0efd94d86fa3c5a70dbcf1bc79c5f017508639b0 (diff)
download	gsoc2013-evolution-9960d26ccfc41ddf4d73823932a52b4b89cb1fe9.tar.gz gsoc2013-evolution-9960d26ccfc41ddf4d73823932a52b4b89cb1fe9.tar.zst gsoc2013-evolution-9960d26ccfc41ddf4d73823932a52b4b89cb1fe9.zip