[evolution/gnome-2-28] Update Korean translation

From: Changwoo Ryu <cwryu src gnome org>
To: svn-commits-list gnome org
Cc:
Subject: [evolution/gnome-2-28] Update Korean translation
Date: Sat, 22 Aug 2009 18:56:40 +0000 (UTC)
commit a5fedb9bd9a4c939a0cbcd9d4cc76394a45365e1
Author: Changwoo Ryu <cwryu debian org>
Date:   Sun Aug 23 03:56:16 2009 +0900

    Update Korean translation

 po/ko.po |12002 ++++++++++++++++++++++++++++++++------------------------------
 1 files changed, 6223 insertions(+), 5779 deletions(-)
---
diff --git a/po/ko.po b/po/ko.po
index 5ef00ed..01f383f 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -8,21 +8,22 @@
 #
 # ì°¸ê³ :
 # - "Evolution"ì?? "ì??ë³¼ë£¨ì??"ì?¼ë¡? ì??ì?.
-# - "ì??ë¬´ê°? wrote:" í?¹ì?? "--- Original Message ---" ë?°ì??ì?? ë©?ì?¼ì?? ì?¼ë¶?ë¶?ì??
-#   ì°¨ì§?í??ë?? ë¬¸ì??ì?´ì?? ë²?ì?ì??, ì?¬ì?©ì??ì?? UI ë¬¸ì ?ê°? ì??ë??ë¯?ë¡? ì??ê°?í?´ ë³¼ ì?¼ì?´ë?¤.
-#   í??ì?¬ë?? ë²?ì?ë??ì§? ì??ì??ê±°ë?? ì??ê·¹ì ?ì?¼ë¡? ë²?ì?ë??ì?´ ì??ë?¤.
+# - "ì??ë¬´ê°? wrote:", "---Original Message---", "---Forwarded Message---"
+#   ì??ì?¼ë¡? ë©?ì?¼ì?? ë³¸ë¬¸ ì?¼ë¶?ë¶?ì?? ì°¨ì§?í??ë?? ë¬¸ì??ì?´ì?? ë²?ì?ì?? ì?¬ì?©ì??
+#   UIë§?ì?? ë¬¸ì ?ê°? ì??ë??ë¯?ë¡? ì??ê°?í?´ ë³¼ ì?¼ì?´ë?¤. í??ì?¬ë?? ë²?ì?ë??ì§? ì??ì??ê±°ë??
+#   ì??ê·¹ì ?ì?¼ë¡? ë²?ì?ë??ì?´ ì??ë?¤.
 #
 # - ì??ì?´ ë¬¸ì?¥ ì??ì??ë??ë¡? ì?°ê³  ë¬¸ì?¥ ì¤?ê°?ì¤?ê°?ì?? ì??ë ¥ì°½ì?´ë?? ì½¤ë³´ë°?ì?¤ ë?°ì??ë¥¼ ë?£ì??
 #   ì??ì?¼ë¡? ë²?ì?í??ê¸° ì?´ë ¤ì?´ ì¼?ì?´ì?¤ê°? ë§?ë?¤. UI XML í??ì?¼ì?´ë?? ì??ì?¤ ì½?ë??ì??ì?? ì§?ì ?
 #   í??ì?¸í??ë?? ì??ë°?ì?? ì??ê³ , ì?¥ê¸°ì ?ì?¼ë¡? ì??ë¬¸ì?? ë°?ë¡?ì?¡ì??ì?¼ í??ë?¤.
 #
-#: ../shell/main.c:603
+#: ../shell/main.c:631
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-18 07:23+0900\n"
-"PO-Revision-Date: 2009-02-18 07:27+0900\n"
+"POT-Creation-Date: 2009-08-23 01:45+0900\n"
+"PO-Revision-Date: 2009-08-23 03:54+0900\n"
 "Last-Translator: Changwoo Ryu <cwryu debian org>\n"
 "Language-Team: GNOME Korea <gnome-kr-hackers lists kldp net>\n"
 "MIME-Version: 1.0\n"
@@ -32,21 +33,21 @@ msgstr ""
 
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
-#: ../a11y/addressbook/ea-minicard-view.c:179
+#: ../a11y/addressbook/ea-minicard-view.c:178
 msgid "evolution address book"
 msgstr "ì??ë³¼ë£¨ì?? ì£¼ì??ë¡?"
 
 #: ../a11y/addressbook/ea-minicard-view.c:33
-#: ../addressbook/gui/component/addressbook-component.c:237
+#: ../addressbook/gui/component/addressbook-component.c:208
 msgid "New Contact"
 msgstr "ì?? ì?°ë?½ì²?"
 
 #: ../a11y/addressbook/ea-minicard-view.c:34
-#: ../addressbook/gui/component/addressbook-component.c:245
+#: ../addressbook/gui/component/addressbook-component.c:216
 msgid "New Contact List"
 msgstr "ì?? ì?°ë?½ì²? ëª©ë¡?"
 
-#: ../a11y/addressbook/ea-minicard-view.c:162
+#: ../a11y/addressbook/ea-minicard-view.c:161
 #, c-format
 msgid "current address book folder %s has %d card"
 msgid_plural "current address book folder %s has %d cards"
@@ -68,35 +69,35 @@ msgstr "ì?°ë?½ì²?: "
 msgid "evolution minicard"
 msgstr "ì??ë³¼ë£¨ì?? ë¯¸ë??ì¹´ë??"
 
-#: ../a11y/calendar/ea-cal-view-event.c:265
+#: ../a11y/calendar/ea-cal-view-event.c:263
 msgid "It has alarms."
 msgstr "ì??ë¦¼ ì??ì??."
 
-#: ../a11y/calendar/ea-cal-view-event.c:268
+#: ../a11y/calendar/ea-cal-view-event.c:266
 msgid "It has recurrences."
 msgstr "ë°?ë³µ ì??ì??."
 
-#: ../a11y/calendar/ea-cal-view-event.c:271
+#: ../a11y/calendar/ea-cal-view-event.c:269
 msgid "It is a meeting."
 msgstr "ëª¨ì??."
 
 # a11y ì?¤í?¸ë§?, eventë?? í??ì?¬ê°? ì??ë??ë?¼ UI ì?´ë²¤í?¸
-#: ../a11y/calendar/ea-cal-view-event.c:277
+#: ../a11y/calendar/ea-cal-view-event.c:275
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "ë?¬ë ¥ ì?´ë²¤í?¸: ì??ì?½ì?? %s."
 
 # a11y ì?¤í?¸ë§?, eventë?? í??ì?¬ê°? ì??ë??ë?¼ UI ì?´ë²¤í?¸
-#: ../a11y/calendar/ea-cal-view-event.c:279
+#: ../a11y/calendar/ea-cal-view-event.c:277
 msgid "Calendar Event: It has no summary."
 msgstr "ë?¬ë ¥ ì?´ë²¤í?¸: ì??ì?½ ì??ì??."
 
 # a11y ì?¤í?¸ë§?, eventë?? í??ì?¬ê°? ì??ë??ë?¼ UI ì?´ë²¤í?¸
-#: ../a11y/calendar/ea-cal-view-event.c:299
+#: ../a11y/calendar/ea-cal-view-event.c:297
 msgid "calendar view event"
 msgstr "ë?¬ë ¥ ë³´ê¸° ì?´ë²¤í?¸"
 
-#: ../a11y/calendar/ea-cal-view-event.c:527
+#: ../a11y/calendar/ea-cal-view-event.c:525
 msgid "Grab Focus"
 msgstr "í?¬ì»¤ì?¤ ë°?ì??"
 
@@ -121,8 +122,8 @@ msgstr "ì?¤ë??ë¡? ì?´ë??"
 msgid "Go to Date"
 msgstr "ë? ì§?ë¡? ì?´ë??"
 
-#: ../a11y/calendar/ea-day-view-main-item.c:301
-#: ../a11y/calendar/ea-week-view-main-item.c:298
+#: ../a11y/calendar/ea-day-view-main-item.c:300
+#: ../a11y/calendar/ea-week-view-main-item.c:297
 msgid "a table to view and select the current time range"
 msgstr "í??ì?¬ ì??ê°? êµ¬ê°?ì?? ë³´ê³  ì? í??í??ë?? í??"
 
@@ -167,7 +168,7 @@ msgid "calendar view for one or more days"
 msgstr "ë?¬ë ¥ ë³´ê¸°, ì?¼ ë?¨ì??"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:186
-#: ../calendar/gui/calendar-component.c:821
+#: ../calendar/gui/calendar-component.c:771
 msgid "%A %d %b %Y"
 msgstr "%Yë?? %b %eì?¼ %A"
 
@@ -178,18 +179,18 @@ msgstr "%Yë?? %b %eì?¼ %A"
 #. You can change the order but don't change the
 #. specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:189
-#: ../calendar/gui/calendar-component.c:824
-#: ../calendar/gui/e-day-view-top-item.c:855 ../calendar/gui/e-day-view.c:1599
-#: ../calendar/gui/e-week-view-main-item.c:335
+#: ../calendar/gui/calendar-component.c:774
+#: ../calendar/gui/e-day-view-top-item.c:844 ../calendar/gui/e-day-view.c:1593
+#: ../calendar/gui/e-week-view-main-item.c:368
 msgid "%a %d %b"
 msgstr "%b %eì?¼ (%a)"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:191
 #: ../a11y/calendar/ea-gnome-calendar.c:196
 #: ../a11y/calendar/ea-gnome-calendar.c:198
-#: ../calendar/gui/calendar-component.c:826
-#: ../calendar/gui/calendar-component.c:831
-#: ../calendar/gui/calendar-component.c:833
+#: ../calendar/gui/calendar-component.c:776
+#: ../calendar/gui/calendar-component.c:781
+#: ../calendar/gui/calendar-component.c:783
 msgid "%a %d %b %Y"
 msgstr "%Yë?? %b %eì?¼ (%a)"
 
@@ -197,10 +198,10 @@ msgstr "%Yë?? %b %eì?¼ (%a)"
 #: ../a11y/calendar/ea-gnome-calendar.c:221
 #: ../a11y/calendar/ea-gnome-calendar.c:227
 #: ../a11y/calendar/ea-gnome-calendar.c:229
-#: ../calendar/gui/calendar-component.c:845
-#: ../calendar/gui/calendar-component.c:852
-#: ../calendar/gui/calendar-component.c:858
-#: ../calendar/gui/calendar-component.c:860
+#: ../calendar/gui/calendar-component.c:795
+#: ../calendar/gui/calendar-component.c:802
+#: ../calendar/gui/calendar-component.c:808
+#: ../calendar/gui/calendar-component.c:810
 msgid "%d %b %Y"
 msgstr "%Yë?? %b %eì?¼"
 
@@ -210,32 +211,32 @@ msgstr "%Yë?? %b %eì?¼"
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:219
-#: ../calendar/gui/calendar-component.c:850
-#: ../calendar/gui/e-day-view-top-item.c:859 ../calendar/gui/e-day-view.c:1615
-#: ../calendar/gui/e-week-view-main-item.c:349
+#: ../calendar/gui/calendar-component.c:800
+#: ../calendar/gui/e-day-view-top-item.c:848 ../calendar/gui/e-day-view.c:1609
+#: ../calendar/gui/e-week-view-main-item.c:382
 msgid "%d %b"
 msgstr "%b %d"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:245
 #: ../a11y/calendar/ea-gnome-calendar.c:253
-#: ../calendar/importers/icalendar-importer.c:780
+#: ../calendar/importers/icalendar-importer.c:782
 msgid "Gnome Calendar"
 msgstr "ê·¸ë?? ë?¬ë ¥"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:288
 msgid "search bar"
-msgstr "ì°¾ê¸° ëª¨ì??"
+msgstr "ê²?ì?? ëª¨ì??"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:289
 msgid "evolution calendar search bar"
-msgstr "ì??ë³¼ë£¨ì?? ë?¬ë ¥ ì°¾ê¸° ëª¨ì??"
+msgstr "ì??ë³¼ë£¨ì?? ë?¬ë ¥ ê²?ì?? ëª¨ì??"
 
-#: ../a11y/calendar/ea-jump-button.c:147
+#: ../a11y/calendar/ea-jump-button.c:146
 msgid "Jump button"
 msgstr "ì?´ë?? ë?¨ì¶?"
 
 # a11y ì?¤í?¸ë§?, eventë?? í??ì?¬ê°? ì??ë??ë?¼ UI ì?´ë²¤í?¸
-#: ../a11y/calendar/ea-jump-button.c:156
+#: ../a11y/calendar/ea-jump-button.c:155
 msgid "Click here, you can find more events."
 msgstr "ì?¬ê¸°ë¥¼ ë??ë¥´ë©´ ë?? ë§?ì?? ì?´ë²¤í?¸ë¥¼ ì°¾ì?? ì?? ì??ì?µë??ë?¤."
 
@@ -266,50 +267,50 @@ msgstr "í??ì??"
 msgid "popup a child"
 msgstr "í??ì?? ì°½ í??ì??"
 
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:628
+#: ../a11y/e-table/gal-a11y-e-cell-text.c:616
 msgid "edit"
 msgstr "í?¸ì§?"
 
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:629
+#: ../a11y/e-table/gal-a11y-e-cell-text.c:617
 msgid "begin editing this cell"
 msgstr "ì?´ ì?? í?¸ì§? ì??ì??"
 
-#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:172
+#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:169
 msgid "toggle"
 msgstr "í? ê¸?"
 
 #. action name
-#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:173
+#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:170
 msgid "toggle the cell"
 msgstr "ì?? í? ê¸?"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:208
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:210
 msgid "expand"
-msgstr "ë??ì?´ê¸°"
+msgstr "ë??ë¦¬ê¸°"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:209
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:211
 msgid "expands the row in the ETree containing this cell"
-msgstr "ì?´ ì??ì?´ ë?¤ì?´ ì??ë?? ETreeì?? í?? ë??ì?´ê¸°"
+msgstr "ì?´ ì??ì?´ ë?¤ì?´ ì??ë?? ETreeì?? í?? ë??ë¦¬ê¸°"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:214
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:216
 msgid "collapse"
 msgstr "ì¤?ì?´ê¸°"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:215
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:217
 msgid "collapses the row in the ETree containing this cell"
 msgstr "ì?´ ì??ì?´ ë?¤ì?´ ì??ë?? ETreeì?? í?? ì¤?ì?´ê¸°"
 
-#: ../a11y/e-table/gal-a11y-e-cell.c:121
+#: ../a11y/e-table/gal-a11y-e-cell.c:120
 msgid "Table Cell"
 msgstr "í??ì?´ë¸? ì??"
 
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:59
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:134
-#: ../widgets/table/e-table-click-to-add.c:580
+#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:58
+#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:131
+#: ../widgets/table/e-table-click-to-add.c:578
 msgid "click to add"
 msgstr "ì¶?ê°?í??ë ¤ë©´ ë??ë¥´ì?ì??ì?¤"
 
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:68
+#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:67
 msgid "click"
 msgstr "ë??ë¥´ê¸°"
 
@@ -343,14 +344,6 @@ msgstr "ê¸°ë³¸ê°? í??ì?±í??"
 msgid "Popup Menu"
 msgstr "í??ì?? ë©?ë?´"
 
-#: ../a11y/widgets/ea-expander.c:40
-msgid "Toggle Attachment Bar"
-msgstr "ì²¨ë¶? ëª¨ì?? í? ê¸?"
-
-#: ../a11y/widgets/ea-expander.c:50
-msgid "activate"
-msgstr "í??ì?±í??"
-
 #. For Translators: {0} is the name of the address book source
 #: ../addressbook/addressbook.error.xml.h:2
 msgid ""
@@ -404,9 +397,9 @@ msgstr "ì£¼ì??ë¡?ì?? ì§?ì?¸ ì?? ì??ì?µë??ë?¤."
 
 #: ../addressbook/addressbook.error.xml.h:11
 msgid ""
-"Currently you can access only GroupWise System Address Book from Evolution. "
-"Please use some other GroupWise mail client once, to get your GroupWise "
-"Frequent Contacts and GroupWise Personal Contacts folders."
+"Currently you can only access the GroupWise System Address Book from "
+"Evolution. Please use some other GroupWise mail client once to get your "
+"GroupWise Frequent Contacts and Groupwise Personal Contacts folders."
 msgstr ""
 "í??ì?¬ ì??ë³¼ë£¨ì??ì??ì??ë?? ê·¸ë£¹ì??ì?´ì¦? ì??ì?¤í?? ì£¼ì??ë¡?ë§? ì ?ê·¼í?  ì?? ì??ì?µë??ë?¤. ì?¼ë?¨ ë?¤ë¥¸ "
 "ê·¸ë£¹ì??ì?´ì¦? ë©?ì?¼ í?´ë?¼ì?´ì?¸í?¸ë¥¼ ì?¬ì?©í?´ì?? ê·¸ë£¹ì??ì?´ì¦? ì??ì£¼ ì?°ë?? ì?°ë?½ì²? ë°? ê·¸ë£¹ì??ì?´"
@@ -430,7 +423,7 @@ msgstr "LDAP ì??ë²?ì??ì?? ì?¸ì¦?ì?´ ì?¤í?¨í??ì?µë??ë?¤."
 
 #. Unknown error
 #: ../addressbook/addressbook.error.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1746
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1752
 msgid "Failed to delete contact"
 msgstr "ì?°ë?½ì²?ë¥¼ ì?ì ?í??ë?? ë?° ì?¤í?¨í??ì?µë??ë?¤"
 
@@ -465,9 +458,7 @@ 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 ""
-"LDAP ì??ë²?ê°? ì?´ ê¸°ë?¥ì?? ì§?ì??í??ì§? ì??ë?? LDAP ê³¼ê±° ë²?ì ?ì?? ì?¬ì?©í?  ì??ë?? ì??ê³ , ì?¤ì ?"
-"ì?´ í??ë ¸ì?? ì??ë?? ì??ì?µë??ë?¤. ì§?ì??í??ë?? ì°¾ê¸° ê¸°ì¤?ì?? ë??í?´ ê´?ë¦¬ì??ì??ê²? ë¬¸ì??í??ì?ì??ì?¤."
+msgstr "LDAP ì??ë²?ê°? ì?´ ê¸°ë?¥ì?? ì§?ì??í??ì§? ì??ë?? LDAP ê³¼ê±° ë²?ì ?ì?? ì?¬ì?©í?  ì??ë?? ì??ê³ , ì?¤ì ?ì?´ í??ë ¸ì?? ì??ë?? ì??ì?µë??ë?¤. ì§?ì??í??ë?? ê²?ì?? ê¸°ì¤?ì?? ë??í?´ ê´?ë¦¬ì??ì??ê²? ë¬¸ì??í??ì?ì??ì?¤."
 
 #: ../addressbook/addressbook.error.xml.h:24
 msgid "This address book could not be opened."
@@ -475,7 +466,7 @@ msgstr "ì?´ ì£¼ì??ë¡?ì?? ì?´ ì?? ì??ì?µë??ë?¤."
 
 #: ../addressbook/addressbook.error.xml.h:25
 msgid "This address book server does not have any suggested search bases."
-msgstr "ì ?ì??í??ì?  ì°¾ê¸° ê¸°ì¤? ì¤?ì??ì?? ì£¼ì??ë¡? ì??ë²?ì?? ì??ë¬´ ê²?ë?? ì??ì?µë??ë?¤."
+msgstr "ì ?ì??í??ì?  ê²?ì?? ê¸°ì¤? ì¤?ì??ì?? ì£¼ì??ë¡? ì??ë²?ì?? ì??ë¬´ ê²?ë?? ì??ì?µë??ë?¤."
 
 #: ../addressbook/addressbook.error.xml.h:26
 msgid ""
@@ -499,7 +490,7 @@ msgstr "ì£¼ì??ë¡?ì?? ì?´ ì?? ì??ì?µë??ë?¤"
 
 #: ../addressbook/addressbook.error.xml.h:30
 msgid "Unable to perform search."
-msgstr "ì°¾ê¸°ë¥¼ ì??í??í?  ì?? ì??ì?µë??ë?¤."
+msgstr "ê²?ì??ì?? ì??í??í?  ì?? ì??ì?µë??ë?¤."
 
 #: ../addressbook/addressbook.error.xml.h:31
 msgid "Unable to save {0}."
@@ -577,104 +568,93 @@ msgstr "{0}"
 msgid "{1}"
 msgstr "{1}"
 
-#: ../addressbook/conduit/address-conduit.c:491
+#: ../addressbook/conduit/address-conduit.c:590
 msgid "Default Sync Address:"
 msgstr "ê¸°ë³¸ ë??ê¸°í?? ì£¼ì??:"
 
-#: ../addressbook/conduit/address-conduit.c:1521
-#: ../addressbook/conduit/address-conduit.c:1522
+#: ../addressbook/conduit/address-conduit.c:1613
+#: ../addressbook/conduit/address-conduit.c:1614
 msgid "Could not load address book"
 msgstr "ì£¼ì??ë¡?ì?? ì?½ì?´ë?¤ì?¼ ì?? ì??ì?µë??ë?¤"
 
-#: ../addressbook/conduit/address-conduit.c:1599
-#: ../addressbook/conduit/address-conduit.c:1602
+#: ../addressbook/conduit/address-conduit.c:1691
+#: ../addressbook/conduit/address-conduit.c:1694
 msgid "Could not read pilot's Address application block"
 msgstr "í??ì?¼ë¡¯ì?? Address í??ë¡?ê·¸ë?¨ ë¸?ë¡?ì?? ì?½ì?? ì?? ì??ì?µë??ë?¤"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-#: ../addressbook/gui/component/autocompletion-config.c:173
-msgid "Autocompletion"
-msgstr "ì??ë?? ì??ì?±"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
 msgid "C_ontacts"
 msgstr "ì?°ë?½ì²?(_O)"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
 msgid "Certificates"
 msgstr "ì?¸ì¦?ì??"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Configure autocomplete here"
-msgstr "ì?¬ê¸°ì?? ì??ë?? ì??ì?±ì?? ì?¤ì ?í?©ë??ë?¤"
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+msgid "Configure contacts and autocompletion here"
+msgstr "ì?¬ê¸°ì?? ì?°ë?½ì²? ë°? ì??ë?? ì??ì?±ì?? ì?¤ì ?í?©ë??ë?¤"
 
-#. ensure the group name is in current locale, not read from configuration
 #. Create the contacts group
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
 #: ../addressbook/gui/component/addressbook-view.c:1213
-#: ../calendar/gui/calendar-component.c:316
-#: ../calendar/gui/calendar-component.c:319 ../calendar/gui/migration.c:396
-#: ../plugins/exchange-operations/exchange-delegates-user.c:78
-#: ../plugins/exchange-operations/exchange-folder.c:582
+#: ../calendar/gui/calendar-component.c:193 ../calendar/gui/migration.c:395
+#: ../plugins/exchange-operations/exchange-delegates-user.c:75
+#: ../plugins/exchange-operations/exchange-folder.c:579
 msgid "Contacts"
 msgstr "ì?°ë?½ì²?"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
 msgid "Evolution Address Book"
 msgstr "ì??ë³¼ë£¨ì?? ì£¼ì??ë¡?"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
 msgid "Evolution Address Book address popup"
 msgstr "ì??ë³¼ë£¨ì?? ì£¼ì??ë¡? ì£¼ì?? í??ì??"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
 msgid "Evolution Address Book address viewer"
 msgstr "ì??ë³¼ë£¨ì?? ì£¼ì??ë¡? ì£¼ì?? ë³´ê¸°"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
 msgid "Evolution Address Book card viewer"
 msgstr "ì??ë³¼ë£¨ì?? ì£¼ì??ë¡? ì¹´ë?? ë³´ê¸°"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
 msgid "Evolution Address Book component"
 msgstr "ì??ë³¼ë£¨ì?? ì£¼ì??ë¡? ì»´í?¬ë??í?¸"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
 msgid "Evolution S/MIME Certificate Management Control"
 msgstr "ì??ë³¼ë£¨ì?? S/MIME ì?¸ì¦?ì?? ê´?ë¦¬ ì»¨í?¸ë¡¤"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
 msgid "Evolution folder settings configuration control"
 msgstr "ì??ë³¼ë£¨ì?? í?´ë?? ì?¤ì ? ì»¨í?¸ë¡¤"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
 msgid "Manage your S/MIME certificates here"
 msgstr "ì?¬ê¸°ì?? S/MIME ì?¸ì¦?ì??ë¥¼ ê´?ë¦¬í?©ë??ë?¤"
 
-#. ensure the group name is in current locale, not read from configuration
-#. create the local source group
-#. ensure the group name is in current locale, not read from configuration
-#. create the local source group
-#. ensure the group name is in current locale, not read from configuration
-#. create the local source group
-#. ensure the group name is in current locale, not read from configuration
 #. create the local source group
 #. On This Computer is always first and Search Folders is always last
-#: ../addressbook/gui/component/addressbook-component.c:142
-#: ../addressbook/gui/component/addressbook-component.c:146
-#: ../addressbook/gui/component/addressbook-migrate.c:500
-#: ../calendar/gui/calendar-component.c:243
-#: ../calendar/gui/calendar-component.c:247
-#: ../calendar/gui/memos-component.c:197 ../calendar/gui/memos-component.c:201
-#: ../calendar/gui/migration.c:475 ../calendar/gui/migration.c:577
-#: ../calendar/gui/migration.c:1091 ../calendar/gui/tasks-component.c:194
-#: ../calendar/gui/tasks-component.c:198 ../mail/em-folder-tree-model.c:200
-#: ../mail/em-folder-tree-model.c:202 ../mail/em-migrate.c:2990
-#: ../mail/mail-component.c:316 ../mail/mail-vfolder.c:223
-#: ../mail/message-list.c:1517
+#: ../addressbook/gui/component/addressbook-component.c:97
+#: ../addressbook/gui/component/addressbook-migrate.c:499
+#: ../calendar/gui/calendar-component.c:192
+#: ../calendar/gui/memos-component.c:151 ../calendar/gui/migration.c:474
+#: ../calendar/gui/migration.c:576 ../calendar/gui/migration.c:1090
+#: ../calendar/gui/tasks-component.c:148 ../mail/em-folder-tree-model.c:191
+#: ../mail/em-folder-tree-model.c:193 ../mail/em-migrate.c:2890
+#: ../mail/mail-component.c:320 ../mail/mail-vfolder.c:217
+#: ../mail/message-list.c:1515
 msgid "On This Computer"
 msgstr "ì?´ ì»´í?¨í?°"
 
+#. Create the LDAP source group
+#: ../addressbook/gui/component/addressbook-component.c:98
+#: ../addressbook/gui/component/addressbook-migrate.c:517
+msgid "On LDAP Servers"
+msgstr "LDAP ì??ë²?"
+
 #. ensure the source name is in current locale, not read from configuration
 #. Create the default Person addressbook
 #. ensure the source name is in current locale, not read from configuration
@@ -686,144 +666,188 @@ msgstr "ì?´ ì»´í?¨í?°"
 #. ensure the source name is in current locale, not read from configuration
 #. Create the default Person addressbook
 #. orange
-#: ../addressbook/gui/component/addressbook-component.c:154
-#: ../addressbook/gui/component/addressbook-component.c:157
-#: ../addressbook/gui/component/addressbook-migrate.c:508
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
-#: ../addressbook/gui/widgets/eab-contact-display.c:652
-#: ../calendar/gui/calendar-component.c:255
-#: ../calendar/gui/calendar-component.c:261
-#: ../calendar/gui/memos-component.c:209 ../calendar/gui/memos-component.c:213
-#: ../calendar/gui/migration.c:485 ../calendar/gui/migration.c:585
-#: ../calendar/gui/migration.c:1099 ../calendar/gui/tasks-component.c:206
-#: ../calendar/gui/tasks-component.c:210 ../mail/em-migrate.c:1058
-#: ../plugins/email-custom-header/email-custom-header.c:338
+#: ../addressbook/gui/component/addressbook-component.c:135
+#: ../addressbook/gui/component/addressbook-component.c:138
+#: ../addressbook/gui/component/addressbook-migrate.c:507
+#: ../addressbook/gui/widgets/eab-contact-display.c:650
+#: ../calendar/gui/calendar-component.c:232
+#: ../calendar/gui/calendar-component.c:238
+#: ../calendar/gui/memos-component.c:189 ../calendar/gui/memos-component.c:193
+#: ../calendar/gui/migration.c:484 ../calendar/gui/migration.c:584
+#: ../calendar/gui/migration.c:1098 ../calendar/gui/tasks-component.c:186
+#: ../calendar/gui/tasks-component.c:190 ../mail/em-migrate.c:960
+#: ../plugins/email-custom-header/email-custom-header.c:337
 msgid "Personal"
 msgstr "ê°?ì?¸"
 
-#. ensure the group name is in current locale, not read from configuration
-#. Create the LDAP source group
-#: ../addressbook/gui/component/addressbook-component.c:168
-#: ../addressbook/gui/component/addressbook-component.c:171
-#: ../addressbook/gui/component/addressbook-migrate.c:518
-msgid "On LDAP Servers"
-msgstr "LDAP ì??ë²?"
-
-#: ../addressbook/gui/component/addressbook-component.c:238
+#: ../addressbook/gui/component/addressbook-component.c:209
 msgctxt "New"
 msgid "_Contact"
 msgstr "ì?°ë?½ì²?(_C)"
 
-#: ../addressbook/gui/component/addressbook-component.c:239
+#: ../addressbook/gui/component/addressbook-component.c:210
 msgid "Create a new contact"
 msgstr "ì??ë¡?ì?´ ì?°ë?½ì²?ë¥¼ ë§?ë?ë??ë?¤"
 
-#: ../addressbook/gui/component/addressbook-component.c:246
+#: ../addressbook/gui/component/addressbook-component.c:217
 msgctxt "New"
 msgid "Contact _List"
 msgstr "ì?°ë?½ì²? ëª©ë¡?(_L)"
 
-#: ../addressbook/gui/component/addressbook-component.c:247
+#: ../addressbook/gui/component/addressbook-component.c:218
 msgid "Create a new contact list"
 msgstr "ì?? ì?°ë?½ì²? ëª©ë¡?ì?? ë§?ë?ë??ë?¤"
 
-#: ../addressbook/gui/component/addressbook-component.c:253
-#: ../addressbook/gui/component/addressbook-config.c:1223
+#: ../addressbook/gui/component/addressbook-component.c:224
+#: ../addressbook/gui/component/addressbook-config.c:1245
 msgid "New Address Book"
 msgstr "ì?? ì£¼ì??ë¡?"
 
-#: ../addressbook/gui/component/addressbook-component.c:254
+#: ../addressbook/gui/component/addressbook-component.c:225
 msgctxt "New"
 msgid "Address _Book"
 msgstr "ì£¼ì??ë¡?(_B)"
 
-#: ../addressbook/gui/component/addressbook-component.c:255
+#: ../addressbook/gui/component/addressbook-component.c:226
 msgid "Create a new address book"
 msgstr "ì?? ì£¼ì??ë¡?ì?? ë§?ë?ë??ë?¤"
 
-#: ../addressbook/gui/component/addressbook-component.c:418
+#: ../addressbook/gui/component/addressbook-component.c:389
 msgid "Failed upgrading Address Book settings or folders."
 msgstr "ì£¼ì??ë¡? ì?¤ì ? í?¹ì?? í?´ë??ë¥¼ ì??ê·¸ë ?ì?´ë??í??ë?? ë?° ì?¤í?¨í??ì?µë??ë?¤."
 
-#: ../addressbook/gui/component/addressbook-config.c:332
+#: ../addressbook/gui/component/addressbook-config.c:217
+msgid ""
+"Selecting this option means that Evolution will only connect to your LDAP "
+"server if your LDAP server supports SSL."
+msgstr ""
+"ì?´ ì?µì??ì?? ì¼?ë©´ LDAP ì??ë²?ê°? SSLì?? ì§?ì??í??ë?? ê²½ì?°ì??ë§? ì??ë³¼ë£¨ì??ì??ì?? ê·¸ LDAP ì??ë²?"
+"ì?? ì?°ê²°í?©ë??ë?¤."
+
+#: ../addressbook/gui/component/addressbook-config.c:219
+msgid ""
+"Selecting this option means that Evolution will only connect to your LDAP "
+"server if your LDAP server supports TLS."
+msgstr ""
+"ì?´ ì?µì??ì?? ì¼?ë©´ LDAP ì??ë²?ê°? SSLì?? ì§?ì??í??ë?? ê²½ì?°ì??ë§? ì??ë³¼ë£¨ì??ì??ì?? ê·¸ LDAP ì??ë²?"
+"ì?? ì?°ê²°í?©ë??ë?¤."
+
+#: ../addressbook/gui/component/addressbook-config.c:221
+msgid ""
+"Selecting this option means that your server does not support either SSL or "
+"TLS. This means that your connection will be insecure, and that you will be "
+"vulnerable to security exploits."
+msgstr ""
+"ì?´ ì?µì??ì?? ì? í??í??ë©´ ì??ë²?ì??ì?? SSLì?? ì§?ì??í??ì§? ì??ë??ë?¤ë?? ì??ë¯¸ì??ë??ë?¤.  ì?°ê²°ì?´ ì??ì ?"
+"í??ì§? ì??ì?? ì??ë?? ì??ê³ , ë³´ì??ì??ì?? ì¹¨í?¬ì?? ì·¨ì?½í?  ì?? ì??ì?µë??ë?¤."
+
+#: ../addressbook/gui/component/addressbook-config.c:346
 msgid "Base"
 msgstr "ë² ì?´ì?¤"
 
-#: ../addressbook/gui/component/addressbook-config.c:533
-#: ../calendar/gui/dialogs/calendar-setup.c:170
+#: ../addressbook/gui/component/addressbook-config.c:547
+#: ../calendar/gui/dialogs/calendar-setup.c:169
 msgid "_Type:"
 msgstr "ì¢?ë¥?(_T):"
 
-#: ../addressbook/gui/component/addressbook-config.c:635
+#: ../addressbook/gui/component/addressbook-config.c:648
 msgid "Copy _book content locally for offline operation"
 msgstr "ì?¤í??ë?¼ì?¸ ì??ì??ì?? ì??í?´ ì£¼ì??ë¡? ë?´ì?© ë¡?ì»¬ì?? ë³µì?¬(_B)"
 
-#: ../addressbook/gui/component/addressbook-config.c:998
-#: ../addressbook/gui/component/ldap-config.glade.h:22
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-#: ../calendar/gui/dialogs/calendar-setup.c:368
-#: ../calendar/gui/dialogs/calendar-setup.c:379
-#: ../calendar/gui/dialogs/calendar-setup.c:390
-#: ../mail/em-folder-properties.c:283 ../mail/mail-config.glade.h:90
-#: ../plugins/itip-formatter/itip-formatter.c:2532
+#: ../addressbook/gui/component/addressbook-config.c:759
+msgid ""
+"This is the port on the LDAP server that Evolution will try to connect to. A "
+"list of standard ports has been provided. Ask your system administrator what "
+"port you should specify."
+msgstr ""
+"ì??ë³¼ë£¨ì??ì??ì?? ì?°ê²°í?  LDAP ì??ë²?ì?? í?¬í?¸ ë²?í?¸ì??ë??ë?¤. í??ì¤? í?¬í?¸ ë²?í?¸ì?? ëª©ë¡?ì?´ ì?¬"
+"ê¸° ì??ì?µë??ë?¤. ì?´ë?¤ í?¬í?¸ë¥¼ ì§?ì ?í?´ì?¼ í?  ì§?ë?? ì??ì?¤í?? ê´?ë¦¬ì??ì??ê²? ë¬¼ì?´ë³´ì?ì??ì?¤."
+
+#: ../addressbook/gui/component/addressbook-config.c:837
+msgid ""
+"This is the method Evolution will use to authenticate you.  Note that "
+"setting this to \"Email Address\" requires anonymous access to your LDAP "
+"server."
+msgstr ""
+"ì??ë³¼ë£¨ì??ì??ì?? ì?¸ì¦?í??ë?? ë°©ë²?ì??ë??ë?¤. \"ì ?ì??ë©?ì?¼ ì£¼ì??\"ë¡? ì?¤ì ?í??ë©´ ë°?ë??ì?? LDAP ì??"
+"ë²?ì?? ì?µëª? ì ?ê·¼ì?´ ê°?ë?¥í?´ì?¼ í?©ë??ë?¤."
+
+#: ../addressbook/gui/component/addressbook-config.c:916
+msgid ""
+"The search scope defines how deep you would like the search to extend down "
+"the directory tree. A search scope of \"sub\" will include all entries below "
+"your search base. A search scope of \"one\" will only include the entries "
+"one level beneath your base."
+msgstr "ê²?ì?? ë²?ì??ë?? ë??ë ?í?°ë¦¬ í?¸ë¦¬ ì??ë??ë¡? ì?¼ë§?ë?? ê¹?ì?´ ì°¾ì?? ì§? ì ?ì??í?©ë??ë?¤. \"ì??ë??\"ì?? ê²?ì?? ë²?ì??ë?? ê²?ì?? ê¸°ì¤? ì??ë??ì?? ëª¨ë?  ì??í?¸ë¦¬ì?? ë??í?´ì?? ì°¾ê²? ë?©ë??ë?¤. ê²?ì?? ë²?ì??ê°? \"í?? ë?¨ê³?\"ì?´ë©´ ê²?ì?? ê¸°ì¤?ì??ì?? í?? ë?¨ê³? ì??ë??ì?? ì??í?¸ë¦¬ë§? í?¬í?¨í?©ë??ë?¤."
+
+#: ../addressbook/gui/component/addressbook-config.c:1020
+#: ../addressbook/gui/component/ldap-config.glade.h:17
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: ../calendar/gui/dialogs/calendar-setup.c:367
+#: ../calendar/gui/dialogs/calendar-setup.c:378
+#: ../calendar/gui/dialogs/calendar-setup.c:389
+#: ../mail/em-folder-properties.c:283 ../mail/mail-config.glade.h:95
+#: ../plugins/itip-formatter/itip-formatter.c:2558
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "ì?¼ë°?"
 
-#: ../addressbook/gui/component/addressbook-config.c:999
+#: ../addressbook/gui/component/addressbook-config.c:1021
 #: ../addressbook/gui/widgets/e-addressbook-view.c:554
 #: ../mail/importers/pine-importer.c:383
 msgid "Address Book"
 msgstr "ì£¼ì??ë¡?"
 
-#: ../addressbook/gui/component/addressbook-config.c:1003
+#: ../addressbook/gui/component/addressbook-config.c:1025
 msgid "Server Information"
 msgstr "ì??ë²? ì ?ë³´"
 
-#: ../addressbook/gui/component/addressbook-config.c:1005
+#: ../addressbook/gui/component/addressbook-config.c:1027
 msgid "Authentication"
 msgstr "ì?¸ì¦?"
 
-#: ../addressbook/gui/component/addressbook-config.c:1008
-#: ../addressbook/gui/component/ldap-config.glade.h:17
+#: ../addressbook/gui/component/addressbook-config.c:1030
+#: ../addressbook/gui/component/ldap-config.glade.h:15
 #: ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "ì??ì?¸í??"
 
-#: ../addressbook/gui/component/addressbook-config.c:1009
-#: ../mail/em-folder-browser.c:1000
+# ì§?í?? ì??í??ê°? ì??ë??ë?¼ ì?¤ì ? ì ?ëª©
+#: ../addressbook/gui/component/addressbook-config.c:1031
+#: ../mail/em-folder-browser.c:1021
 msgid "Searching"
-msgstr "ì°¾ë?? ì¤?"
+msgstr "ê²?ì??"
 
-#: ../addressbook/gui/component/addressbook-config.c:1011
+# ì§?í?? ì??í??ê°? ì??ë??ë?¼ ì?¤ì ? ì ?ëª©
+#: ../addressbook/gui/component/addressbook-config.c:1033
 msgid "Downloading"
-msgstr "ë?¤ì?´ë¡?ë??í??ë?? ì¤?"
+msgstr "ë?¤ì?´ë¡?ë??"
 
-#: ../addressbook/gui/component/addressbook-config.c:1221
-#: ../addressbook/gui/component/ldap-config.glade.h:11
+#: ../addressbook/gui/component/addressbook-config.c:1243
+#: ../addressbook/gui/component/ldap-config.glade.h:9
 msgid "Address Book Properties"
 msgstr "ì£¼ì??ë¡? ì??ì?±"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:74
-#: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1209
+#: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1109
 msgid "Migrating..."
 msgstr "ì?®ê¸°ë?? ì¤?..."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:126
-#: ../calendar/gui/migration.c:195 ../mail/em-migrate.c:1268
+#: ../calendar/gui/migration.c:195 ../mail/em-migrate.c:1168
 #, c-format
 msgid "Migrating '%s':"
 msgstr "'%s' ì?®ê¸°ë?? ì¤?:"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:646
+#: ../addressbook/gui/component/addressbook-migrate.c:645
 msgid "LDAP Servers"
 msgstr "LDAP ì??ë²?"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:761
+#: ../addressbook/gui/component/addressbook-migrate.c:760
 msgid "Autocompletion Settings"
 msgstr "ì??ë?? ì??ì?± ì?¤ì ?"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1137
+#: ../addressbook/gui/component/addressbook-migrate.c:1136
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -834,7 +858,7 @@ msgstr ""
 "\n"
 "í?´ë??ë¥¼ ì?®ê¸°ë?? ë??ì?? ì? ì?? ê¸°ë?¤ë¦¬ì?ì??ì?¤..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1151
+#: ../addressbook/gui/component/addressbook-migrate.c:1150
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
@@ -844,7 +868,7 @@ msgstr ""
 "\n"
 "í?´ë??ë¥¼ ì?¬ê¸°ì?? ë§?ê²? ë³?í??í??ë?? ë??ì?? ì? ì?? ê¸°ë?¤ë¦¬ì?ì??ì?¤..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1160
+#: ../addressbook/gui/component/addressbook-migrate.c:1159
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
@@ -854,7 +878,7 @@ msgstr ""
 "\n"
 "í?´ë??ë¥¼ ì?¬ê¸°ì?? ë§?ê²? ë³?í??í??ë?? ë??ì?? ì? ì?? ê¸°ë?¤ë¦¬ì?ì??ì?¤..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1170
+#: ../addressbook/gui/component/addressbook-migrate.c:1169
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
@@ -865,18 +889,18 @@ msgstr ""
 "í?´ë??ë¥¼ ì?¬ê¸°ì?? ë§?ê²? ë³?í??í??ë?? ë??ì?? ì? ì?? ê¸°ë?¤ë¦¬ì?ì??ì?¤..."
 
 #: ../addressbook/gui/component/addressbook-view.c:422
-#: ../mail/em-folder-utils.c:448
+#: ../mail/em-folder-utils.c:453
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "\"%s\" í?´ë?? ì?´ë¦? ë°?ê¾¸ê¸°:"
 
 #: ../addressbook/gui/component/addressbook-view.c:425
-#: ../mail/em-folder-utils.c:450
+#: ../mail/em-folder-utils.c:455
 msgid "Rename Folder"
 msgstr "í?´ë?? ì?´ë¦? ë°?ê¾¸ê¸°"
 
 #: ../addressbook/gui/component/addressbook-view.c:430
-#: ../mail/em-folder-utils.c:456
+#: ../mail/em-folder-utils.c:461
 msgid "Folder names cannot contain '/'"
 msgstr "í?´ë?? ì?´ë¦?ì?? '/'ê°? ë?¤ì?´ê°? ì?? ì??ì?µë??ë?¤"
 
@@ -889,19 +913,19 @@ msgid "Save As vCard..."
 msgstr "vCardë¡? ì ?ì?¥..."
 
 #: ../addressbook/gui/component/addressbook-view.c:951
-#: ../calendar/gui/calendar-component.c:678
-#: ../calendar/gui/memos-component.c:509 ../calendar/gui/tasks-component.c:501
-#: ../mail/em-folder-tree.c:2132 ../ui/evolution-mail-list.xml.h:39
+#: ../calendar/gui/calendar-component.c:628
+#: ../calendar/gui/memos-component.c:479 ../calendar/gui/tasks-component.c:472
+#: ../mail/em-folder-tree.c:2122 ../ui/evolution-mail-list.xml.h:39
 msgid "_Rename..."
 msgstr "ì?´ë¦? ë°?ê¾¸ê¸°(_R)..."
 
 #: ../addressbook/gui/component/addressbook-view.c:954
-#: ../addressbook/gui/widgets/e-addressbook-view.c:955
-#: ../calendar/gui/calendar-component.c:681
-#: ../calendar/gui/e-calendar-table.c:1620
-#: ../calendar/gui/e-calendar-view.c:1797 ../calendar/gui/e-memo-table.c:954
-#: ../calendar/gui/memos-component.c:512 ../calendar/gui/tasks-component.c:504
-#: ../mail/em-folder-tree.c:2129 ../mail/em-folder-view.c:1342
+#: ../addressbook/gui/widgets/e-addressbook-view.c:954
+#: ../calendar/gui/calendar-component.c:631
+#: ../calendar/gui/e-calendar-table.c:1613
+#: ../calendar/gui/e-calendar-view.c:1828 ../calendar/gui/e-memo-table.c:949
+#: ../calendar/gui/memos-component.c:482 ../calendar/gui/tasks-component.c:475
+#: ../mail/em-folder-tree.c:2119 ../mail/em-folder-view.c:1340
 #: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:42
 #: ../ui/evolution-mail-list.xml.h:35 ../ui/evolution-memos.xml.h:16
 #: ../ui/evolution-tasks.xml.h:24
@@ -909,11 +933,10 @@ msgid "_Delete"
 msgstr "ì?ì ?(_D)"
 
 #: ../addressbook/gui/component/addressbook-view.c:957
-#: ../calendar/gui/calendar-component.c:686
-#: ../calendar/gui/dialogs/comp-editor.c:2092
-#: ../calendar/gui/memos-component.c:517 ../calendar/gui/tasks-component.c:509
-#: ../composer/e-msg-composer.c:1040 ../mail/em-folder-tree.c:2138
-#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
+#: ../calendar/gui/calendar-component.c:636
+#: ../calendar/gui/memos-component.c:487 ../calendar/gui/tasks-component.c:480
+#: ../mail/em-folder-tree.c:2127 ../ui/evolution-addressbook.xml.h:59
+#: ../ui/evolution-mail-list.xml.h:38
 msgid "_Properties"
 msgstr "ì??ì?±(_P)"
 
@@ -926,20 +949,20 @@ msgid "Accessing LDAP Server anonymously"
 msgstr "ì?µëª?ì?¼ë¡? LDAP ì??ë²? ì?¬ì?©"
 
 #: ../addressbook/gui/component/addressbook.c:207
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:535
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:529
 msgid "Failed to authenticate.\n"
 msgstr "ì?¸ì¦?í??ë?? ë?° ì?¤í?¨í??ì?µë??ë?¤.\n"
 
 #: ../addressbook/gui/component/addressbook.c:214
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:515
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:509
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "%s(ì?¬ì?©ì?? %s)ì?? ì??í?¸ë¥¼ ì??ë ¥í??ì?ì??ì?¤"
 
 #: ../addressbook/gui/component/addressbook.c:222
 #: ../calendar/common/authentication.c:51
-#: ../plugins/google-account-setup/google-source.c:422
-#: ../plugins/publish-calendar/publish-calendar.c:191
+#: ../plugins/google-account-setup/google-source.c:500
+#: ../plugins/publish-calendar/publish-calendar.c:216
 #: ../smime/gui/component.c:49
 msgid "Enter password"
 msgstr "ì??í?¸ë¥¼ ì??ë ¥í??ì?ì??ì?¤"
@@ -985,7 +1008,7 @@ msgid "URI for the folder last used in the select names dialog."
 msgstr "ì?´ë¦? ì? í?? ë??í?? ì??ì??ì?? ë§?ì§?ë§?ì?¼ë¡? ì?¬ì?©ë??ì??ë?? í?´ë??ì?? URI."
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:10
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
 msgid "Vertical pane position"
 msgstr "ì?¸ë¡? ì°½ ì??ì¹?"
 
@@ -1000,10 +1023,23 @@ msgid "Whether to show the preview pane."
 msgstr "ë¯¸ë¦¬ ë³´ê¸° ì°½ì?? ë³¼ì§? ì?¬ë¶?."
 
 #: ../addressbook/gui/component/autocompletion-config.c:175
+msgid "Autocompletion"
+msgstr "ì??ë?? ì??ì?±"
+
+#: ../addressbook/gui/component/autocompletion-config.c:177
 msgid "Always _show address of the autocompleted contact"
 msgstr "í?ì?? ì£¼ì??ë¡?ì??ì?? ì??ë?? ì??ì?±í?? ë©?ì?¼ ì£¼ì??ë¥¼ í??ì??(_S)"
 
-#: ../addressbook/gui/component/autocompletion-config.c:180
+#: ../addressbook/gui/component/autocompletion-config.c:182
+msgid "Date/Time Format"
+msgstr "ë? ì§?/ì??ê°? í??ì??"
+
+#: ../addressbook/gui/component/autocompletion-config.c:185
+#: ../mail/em-mailer-prefs.c:1456
+msgid "Table column:"
+msgstr "í??ì?´ë¸? ì?´:"
+
+#: ../addressbook/gui/component/autocompletion-config.c:187
 msgid "Look up in address books"
 msgstr "ì£¼ì??ë¡?ì??ì?? ì°¾ì?? ë³´ê¸°"
 
@@ -1012,21 +1048,19 @@ msgid "1"
 msgstr "1"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:2
-msgid "3268"
-msgstr "3268"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:3
-msgid "389"
-msgstr "389"
+msgid ""
+"389\n"
+"636\n"
+"3268"
+msgstr ""
+"389\n"
+"636\n"
+"3268"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:4
+#: ../addressbook/gui/component/ldap-config.glade.h:5
 msgid "5"
 msgstr "5"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:5
-msgid "636"
-msgstr "636"
-
 #: ../addressbook/gui/component/ldap-config.glade.h:6
 msgid "<b>Authentication</b>"
 msgstr "<b>ì?¸ì¦?</b>"
@@ -1039,170 +1073,84 @@ msgstr "<b>ë?¤ì?´ë¡?ë??í??ë?? ì¤?</b>"
 msgid "<b>Searching</b>"
 msgstr "<b>ì°¾ë?? ì¤?</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:9
-msgid "<b>Type:</b>"
-msgstr "<b>ì¢?ë¥?:</b> "
-
 #: ../addressbook/gui/component/ldap-config.glade.h:10
-msgid "Add Address Book"
-msgstr "ì£¼ì??ë¡?ì?? ì¶?ê°?í?©ë??ë?¤"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:12
-#: ../mail/em-account-editor.c:760
-msgid "Always"
-msgstr "í?ì??"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:13
-msgid "Anonymously"
-msgstr "ì?µëª?ì?¼ë¡?"
+msgid ""
+"Anonymously\n"
+"Using email address\n"
+"Using distinguished name (DN)"
+msgstr ""
+"ì?µëª?ì?¼ë¡?\n"
+"ì ?ì??ë©?ì?¼ ì£¼ì?? ì?¬ì?©í?´ì??\n"
+"êµ¬ë³?ë??ë?? ì?´ë¦? (Distinguished Name, DN) ì?¬ì?©í?´ì??"
 
 #. To translators: If enabled, addressbook will only fetch contacts from the server until either set time limit or amount of contacts limit reached
-#: ../addressbook/gui/component/ldap-config.glade.h:15
+#: ../addressbook/gui/component/ldap-config.glade.h:14
 msgid "B_rowse this book until limit reached"
 msgstr "í??ê³?ì¹?ì?? ë??ë?¬í?  ë??ê¹?ì§? ì?´ ì£¼ì??ë¡? ë³´ê¸°(_R)"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:16
-msgid "Basic"
-msgstr "ê¸°ë³¸"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:18
-msgid "Distinguished name"
-msgstr "ê³ ì?  ì?´ë¦?"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:19
-msgid "Email address"
-msgstr "ì ?ì??ë©?ì?¼ ì£¼ì??"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:20
 msgid ""
 "Evolution will use this email address to authenticate you with the server."
 msgstr "ì??ë³¼ë£¨ì??ì?? ì?´ ì ?ì??ë©?ì?¼ ì£¼ì??ë¥¼ ì??ë²?ì?? ì?¸ì¦?í?  ë?? ì?¬ì?©í?©ë??ë?¤."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:21
-msgid "Find Possible Search Bases"
-msgstr "ê°?ë?¥í?? ì°¾ê¸° ê¸°ì¤?ì?? ì°¾ê¸°"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:23
+#: ../addressbook/gui/component/ldap-config.glade.h:18
 msgid "Lo_gin:"
 msgstr "ë¡?ê·¸ì?¸(_G):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:24
-#: ../mail/em-account-editor.c:759
-msgid "Never"
-msgstr "ì?¬ì?© ì?? í?¨"
-
-#. Translators: This string is a "Use secure connection" option for
-#. the Mailer. It will not use an encrypted connection.
-#: ../addressbook/gui/component/ldap-config.glade.h:25
-#: ../mail/em-account-editor.c:287
-msgid "No encryption"
-msgstr "ì??í?¸í?? ì??ì??"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:26
-msgid "One"
-msgstr "í?? ë?¨ê³?"
+#: ../addressbook/gui/component/ldap-config.glade.h:19
+msgid ""
+"One\n"
+"Sub"
+msgstr ""
+"í?? ë?¨ê³?\n"
+"ì??ë?? ë?¨ê³?"
 
-#. Translators: This string is a "Use secure connection" option for
-#. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
-#. abbreviation.
-#: ../addressbook/gui/component/ldap-config.glade.h:27
-#: ../mail/em-account-editor.c:295
-msgid "SSL encryption"
-msgstr "SSL ì??í?¸í??"
+#: ../addressbook/gui/component/ldap-config.glade.h:21
+msgid ""
+"SSL encryption\n"
+"TLS encryption\n"
+"No encryption"
+msgstr ""
+"SSL ì??í?¸í??\n"
+"TLS ì??í?¸í??\n"
+"ì??í?¸í?? ì??ì??"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:28
+#: ../addressbook/gui/component/ldap-config.glade.h:24
 msgid "Search Filter"
-msgstr "ì°¾ê¸° í??í?°"
+msgstr "ê²?ì?? í??í?°"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:29
+#: ../addressbook/gui/component/ldap-config.glade.h:25
 msgid "Search _base:"
-msgstr "ì°¾ê¸° ê¸°ì¤?(_B):"
+msgstr "ê²?ì?? ê¸°ì¤?(_B):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:30
+#: ../addressbook/gui/component/ldap-config.glade.h:26
 msgid "Search _filter:"
-msgstr "ì°¾ê¸° í??í?°(_F):"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:31
-msgid "Search filter"
-msgstr "ì°¾ê¸° í??í?°"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:32
-msgid ""
-"Search filter is the type of the objects searched for, while performing the "
-"search. If this is not modified, by  default search will be performed on "
-"objectclass of the type \"person\"."
-msgstr ""
-"ì°¾ê¸° í??í?°ë?? ì°¾ê¸°ë¥¼ ì??í??í?  ë?? ì°¾ì?¼ë ¤ë?? ì?¤ë¸?ì ?í?¸ì?? ì¢?ë¥?ë¥¼ ë§?í?©ë??ë?¤. ë?°ë¡? ë°?ê¾¸"
-"ì§? ì??ì?¼ë©´, ê¸°ë³¸ê°?ì?? \"person\"ì?? ì?¤ë¸?ì ?í?¸ì?? ë??í?´ ì°¾ê¸°ë¥¼ ì??í??í?©ë??ë?¤."
-
-#: ../addressbook/gui/component/ldap-config.glade.h:33
-msgid ""
-"Selecting this option means that Evolution will only connect to your LDAP "
-"server if your LDAP server supports SSL."
-msgstr ""
-"ì?´ ì?µì??ì?? ì¼?ë©´ LDAP ì??ë²?ê°? SSLì?? ì§?ì??í??ë?? ê²½ì?°ì??ë§? ì??ë³¼ë£¨ì??ì??ì?? ê·¸ LDAP ì??ë²?"
-"ì?? ì?°ê²°í?©ë??ë?¤."
-
-#: ../addressbook/gui/component/ldap-config.glade.h:34
-msgid ""
-"Selecting this option means that Evolution will only connect to your LDAP "
-"server if your LDAP server supports TLS."
-msgstr ""
-"ì?´ ì?µì??ì?? ì¼?ë©´ LDAP ì??ë²?ê°? SSLì?? ì§?ì??í??ë?? ê²½ì?°ì??ë§? ì??ë³¼ë£¨ì??ì??ì?? ê·¸ LDAP ì??ë²?"
-"ì?? ì?°ê²°í?©ë??ë?¤."
+msgstr "ê²?ì?? í??í?°(_F):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:35
+#: ../addressbook/gui/component/ldap-config.glade.h:27
 msgid ""
-"Selecting this option means that your server does not support either SSL or "
-"TLS. This means that your connection will be insecure, and that you will be "
-"vulnerable to security exploits."
-msgstr ""
-"ì?´ ì?µì??ì?? ì? í??í??ë©´ ì??ë²?ì??ì?? SSLì?? ì§?ì??í??ì§? ì??ë??ë?¤ë?? ì??ë¯¸ì??ë??ë?¤.  ì?°ê²°ì?´ ì??ì ?"
-"í??ì§? ì??ì?? ì??ë?? ì??ê³ , ë³´ì??ì??ì?? ì¹¨í?¬ì?? ì·¨ì?½í?  ì?? ì??ì?µë??ë?¤."
+"Search filter is the type of object to be searched for. If this is not "
+"modified, the default search will be performed on the type \"person\"."
+msgstr "ê²?ì?? í??í?°ë?? ê²?ì??í?  ì?¤ë¸?ì ?í?¸ì?? ì¢?ë¥?ë¥¼ ë§?í?©ë??ë?¤. ë?°ë¡? ë°?ê¾¸ì§? ì??ì?¼ë©´, ê¸°ë³¸ê°?ì?? \"person\"ì?? ì?¤ë¸?ì ?í?¸ì?? ë??í?´ ê²?ì??ì?? ì??í??í?©ë??ë?¤."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:36
-msgid "Sub"
-msgstr "ì??ë?? ë?¨ê³?"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:37
+#: ../addressbook/gui/component/ldap-config.glade.h:28
 msgid "Supported Search Bases"
-msgstr "ì§?ì??í??ë?? ì°¾ê¸° ê¸°ì¤?"
+msgstr "ì§?ì??í??ë?? ê²?ì?? ê¸°ì¤?"
 
-#. Translators: This string is a "Use secure connection" option for
-#. the Mailer. TLS (Transport Layer Security) is commonly known by
-#. this abbreviation.
-#: ../addressbook/gui/component/ldap-config.glade.h:38
-#: ../mail/em-account-editor.c:291
-msgid "TLS encryption"
-msgstr "TLS ì??í?¸í??"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:39
+#: ../addressbook/gui/component/ldap-config.glade.h:29
 msgid ""
 "The search base is the distinguished name (DN) of the entry where your "
 "searches will begin. If you leave this blank, the search will begin at the "
 "root of the directory tree."
-msgstr ""
-"ì°¾ê¸° ê¸°ì¤?ì?? ì°¾ê¸°ë¥¼ ì??ì??í?  í?ëª©ì?? ê³ ì?  ì?´ë¦?(distinguished name, DN)ì??ë??ë?¤. ì°¾"
-"ê¸° ê¸°ì¤?ì?? ë¹?ì??ë??ë©´, ë??ë ?í?°ë¦¬ í?¸ë¦¬ì?? ë§¨ ì??ë¶?í?° ì°¾ê¸° ì??ì??í?©ë??ë?¤."
+msgstr "ê²?ì?? ê¸°ì¤?ì?? ê²?ì??ì?? ì??ì??í?  í?ëª©ì?? ê³ ì?  ì?´ë¦?(distinguished name, DN)ì??ë??ë?¤. ê²?ì?? ê¸°ì¤?ì?? ë¹?ì?? ë??ë©´, ë??ë ?í?°ë¦¬ í?¸ë¦¬ì?? ë§¨ ì??ë¶?í?° ê²?ì??ì?? ì??ì??í?©ë??ë?¤."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:40
-msgid ""
-"The search scope defines how deep you would like the search to extend down "
-"the directory tree. A search scope of \"sub\" will include all entries below "
-"your search base. A search scope of \"one\" will only include the entries "
-"one level beneath your base."
-msgstr ""
-"ì°¾ê¸° ë²?ì??ë?? ë??ë ?í?°ë¦¬ í?¸ë¦¬ ì??ë??ë¡? ì?¼ë§?ë?? ê¹?ì?´ ì°¾ì?? ì§? ì ?ì??í?©ë??ë?¤. \"ì??ë??\"ì?? "
-"ì°¾ê¸° ë²?ì??ë?? ì°¾ê¸° ê¸°ì¤? ì??ë??ì?? ëª¨ë?  ì??í?¸ë¦¬ì?? ë??í?´ì?? ì°¾ê²? ë?©ë??ë?¤. ì°¾ê¸° ë²?ì??ê°? "
-"\"í?? ë?¨ê³?\"ì?´ë©´ ì°¾ê¸° ê¸°ì¤?ì??ì?? í?? ë?¨ê³? ì??ë??ì?? ì??í?¸ë¦¬ë§? í?¬í?¨í?©ë??ë?¤."
-
-#: ../addressbook/gui/component/ldap-config.glade.h:41
+#: ../addressbook/gui/component/ldap-config.glade.h:30
 msgid ""
 "This is the full name of your LDAP server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr "LDAP ì??ë²?ì?? ì??ì ?í?? ì?´ë¦?ì??ë??ë?¤. ì??ë¥¼ ë?¤ì?´ \"ldap.mycompany.com\"."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:42
+#: ../addressbook/gui/component/ldap-config.glade.h:31
 msgid ""
 "This is the maximum number of entries to download. Setting this number to be "
 "too large will slow down your address book."
@@ -1210,16 +1158,7 @@ msgstr ""
 "ë?¤ì?´ë¡?ë??í?  í?ëª©ì?? ìµ?ë?? ê°?ì??ì??ë??ë?¤. ì?´ ì?«ì??ë¥¼ ë??ë¬´ í?¬ê²? í??ë©´ ì£¼ì??ë¡? ë??ì??ì?´ ë??"
 "ë ¤ì§?ë??ë?¤."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:43
-msgid ""
-"This is the method Evolution will use to authenticate you.  Note that "
-"setting this to \"Email Address\" requires anonymous access to your LDAP "
-"server."
-msgstr ""
-"ì??ë³¼ë£¨ì??ì??ì?? ì?¸ì¦?í??ë?? ë°©ë²?ì??ë??ë?¤. \"ì ?ì??ë©?ì?¼ ì£¼ì??\"ë¡? ì?¤ì ?í??ë©´ ë°?ë??ì?? LDAP ì??"
-"ë²?ì?? ì?µëª? ì ?ê·¼ì?´ ê°?ë?¥í?´ì?¼ í?©ë??ë?¤."
-
-#: ../addressbook/gui/component/ldap-config.glade.h:44
+#: ../addressbook/gui/component/ldap-config.glade.h:32
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list. It is for display purposes only. "
@@ -1227,86 +1166,61 @@ msgstr ""
 "ì??ë³¼ë£¨ì?? í?´ë?? ëª©ë¡?ì?? ë??í??ë?  ì?´ ì??ë²?ì?? ì?´ë¦?ì??ë??ë?¤. í??ì??í??ë?? ëª©ì ?ì?¼ë¡?ë§? ì?°ì??ë??"
 "ë?¤. "
 
-#: ../addressbook/gui/component/ldap-config.glade.h:45
-msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. A "
-"list of standard ports has been provided. Ask your system administrator what "
-"port you should specify."
-msgstr ""
-"ì??ë³¼ë£¨ì??ì??ì?? ì?°ê²°í?  LDAP ì??ë²?ì?? í?¬í?¸ ë²?í?¸ì??ë??ë?¤. í??ì¤? í?¬í?¸ ë²?í?¸ì?? ëª©ë¡?ì?´ ì?¬"
-"ê¸° ì??ì?µë??ë?¤. ì?´ë?¤ í?¬í?¸ë¥¼ ì§?ì ?í?´ì?¼ í?  ì§?ë?? ì??ì?¤í?? ê´?ë¦¬ì??ì??ê²? ë¬¼ì?´ë³´ì?ì??ì?¤."
-
-#: ../addressbook/gui/component/ldap-config.glade.h:46
-msgid "Using distinguished name (DN)"
-msgstr "êµ¬ë³?ë??ë?? ì?´ë¦? (Distinguished Name, DN) ì?¬ì?©í?´ì??"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:47
-msgid "Using email address"
-msgstr "ì ?ì??ë©?ì?¼ ì£¼ì?? ì?¬ì?©í?´ì??"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:48
-msgid "Whenever Possible"
-msgstr "ê°?ë?¥í??ë©´ ì?¸ì ?ë??"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:49
-msgid "_Add Address Book"
-msgstr "ì£¼ì??ë¡? ì¶?ê°?(_A)"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:50
+#: ../addressbook/gui/component/ldap-config.glade.h:33
 msgid "_Download limit:"
 msgstr "ë?¤ì?´ë¡?ë?? ì ?í??(_D):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:51
+#: ../addressbook/gui/component/ldap-config.glade.h:34
 msgid "_Find Possible Search Bases"
-msgstr "ê°?ë?¥í?? ì°¾ê¸° ê¸°ì¤? ì°¾ê¸°(_F)"
+msgstr "ê°?ë?¥í?? ê²?ì?? ê¸°ì¤? ì°¾ê¸°(_F)"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:52
+#: ../addressbook/gui/component/ldap-config.glade.h:35
 msgid "_Login method:"
 msgstr "ë¡?ê·¸ì?¸ ë°©ë²?(_L):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:53
-#: ../calendar/gui/dialogs/calendar-setup.c:227
-#: ../mail/mail-config.glade.h:178
+#: ../addressbook/gui/component/ldap-config.glade.h:36
+#: ../calendar/gui/dialogs/calendar-setup.c:226
+#: ../mail/mail-config.glade.h:175
 #: ../plugins/groupwise-features/properties.glade.h:11
 #: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
 msgid "_Name:"
 msgstr "ì?´ë¦?(_N):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:54
+#: ../addressbook/gui/component/ldap-config.glade.h:37
 msgid "_Port:"
 msgstr "í?¬í?¸(_P):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:55
+#: ../addressbook/gui/component/ldap-config.glade.h:38
 msgid "_Search scope:"
-msgstr "ì°¾ê¸° ë²?ì??(_S):"
+msgstr "ê²?ì?? ë²?ì??(_S):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:56
-#: ../mail/mail-config.glade.h:187
-#: ../plugins/publish-calendar/publish-calendar.glade.h:26
+#: ../addressbook/gui/component/ldap-config.glade.h:39
+#: ../mail/mail-config.glade.h:184
+#: ../plugins/publish-calendar/publish-calendar.glade.h:27
 msgid "_Server:"
 msgstr "ì??ë²?(_S):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:57
+#: ../addressbook/gui/component/ldap-config.glade.h:40
 msgid "_Timeout:"
 msgstr "ì ?í??ì??ê°?(_T):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:58
+#: ../addressbook/gui/component/ldap-config.glade.h:41
 msgid "_Use secure connection:"
 msgstr "ë³´ì?? ì?°ê²° ì?¬ì?©(_U):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:59
+#: ../addressbook/gui/component/ldap-config.glade.h:42
 msgid "cards"
 msgstr "ì¹´ë??"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:60
+#: ../addressbook/gui/component/ldap-config.glade.h:43
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:10
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:27
-#: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:17
-#: ../plugins/caldav/caldav-source.c:430
-#: ../plugins/calendar-http/calendar-http.c:279
-#: ../plugins/calendar-weather/calendar-weather.c:524
-#: ../plugins/google-account-setup/google-source.c:652
-#: ../plugins/google-account-setup/google-contacts-source.c:366
+#: ../calendar/gui/dialogs/event-page.glade.h:24
+#: ../plugins/caldav/caldav-source.c:448
+#: ../plugins/calendar-file/calendar-file.c:286
+#: ../plugins/calendar-http/calendar-http.c:323
+#: ../plugins/calendar-weather/calendar-weather.c:523
+#: ../plugins/google-account-setup/google-source.c:720
+#: ../plugins/google-account-setup/google-contacts-source.c:330
 msgid "minutes"
 msgstr "ë¶?"
 
@@ -1331,44 +1245,42 @@ msgid "<b>Miscellaneous</b>"
 msgstr "<b>ê¸°í??</b>"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:6
+msgid "<b>Notes</b>"
+msgstr "<b>ë©?ëª¨</b>"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:7
 msgid "<b>Other</b>"
 msgstr "<b>ê¸°í??</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:7
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:8
 msgid "<b>Telephone</b>"
 msgstr "<b>ì ?í??</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "<b>Web Addresses</b>"
 msgstr "<b>ì?¹ ì£¼ì??</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:9
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
 msgid "<b>Work</b>"
 msgstr "<b>ì§?ì?¥</b> "
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
-#: ../addressbook/gui/widgets/eab-contact-display.c:605
-msgid "AIM"
-msgstr "AIM"
-
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: ../calendar/gui/dialogs/event-page.glade.h:6
+#: ../calendar/gui/dialogs/event-page.glade.h:7
 #: ../calendar/gui/dialogs/memo-page.glade.h:1
 msgid "Ca_tegories..."
 msgstr "ë¶?ë¥?(_T)..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:266
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:261
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1158
-#: ../addressbook/gui/widgets/e-minicard.c:199
+#: ../addressbook/gui/widgets/e-minicard.c:198
 msgid "Contact"
 msgstr "ì?°ë?½ì²?"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:543
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:558
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2423
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:541
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:556
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2442
 msgid "Contact Editor"
 msgstr "ì?°ë?½ì²? í?¸ì§?ê¸°"
 
@@ -1377,1281 +1289,260 @@ msgid "Full _Name..."
 msgstr "ì ?ì²´ ì?´ë¦?(_N)..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:15
-#: ../composer/e-msg-composer.c:2478
 msgid "Image"
 msgstr "ê·¸ë¦¼"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:58
-msgid "MSN Messenger"
-msgstr "MSN ë©?ì? ì ?"
-
-#: ../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:17
 msgid "Nic_kname:"
 msgstr "ë³?ëª?(_K):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:54
-msgid "Novell GroupWise"
-msgstr "ë?¸ë²¨ ê·¸ë£¹ì??ì?´ì¦?"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
-msgid "Novell Groupwise"
-msgstr "ë?¸ë²¨ ê·¸ë£¹ì??ì?´ì¦?"
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: ../calendar/gui/migration.c:1225
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:421
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:451
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:564
+msgid "Notes"
+msgstr "ìª½ì§?"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
 msgid "Personal Information"
 msgstr "ê°?ì?¸ ì ?ë³´"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
 msgid "Telephone"
 msgstr "ì ?í??"
 
-#. red
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:268
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:195
-#: ../addressbook/gui/widgets/eab-contact-display.c:57
-#: ../addressbook/gui/widgets/eab-contact-display.c:635
-#: ../mail/em-migrate.c:1057
-msgid "Work"
-msgstr "ì??ë¬´"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:5
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
 msgid "_Address:"
 msgstr "ì£¼ì??(_A):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "_Anniversary:"
 msgstr "ê¸°ë??ì?¼(_A):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "_Assistant:"
 msgstr "ë¹?ì??(_A):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "_Birthday:"
 msgstr "ì??ì?¼(_B):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
-#: ../calendar/gui/dialogs/event-page.c:792
-#: ../calendar/gui/dialogs/event-page.glade.h:14
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: ../calendar/gui/dialogs/event-page.c:820
+#: ../calendar/gui/dialogs/event-page.glade.h:15
 #: ../plugins/itip-formatter/itip-view.c:1910
 msgid "_Calendar:"
 msgstr "ë?¬ë ¥(_C):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_City:"
 msgstr "ë??ì??(_C):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Company:"
 msgstr "í??ì?¬(_C):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Country:"
 msgstr "êµê°?(_C):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Department:"
 msgstr "ë¶?ì??(_D):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_File under:"
 msgstr "í??ì?¼ ì?´ë¦?(_F):"
 
 # free/busy -> ì?½ì?? ì??ì??/ì??ì??, Microsoft Office XP ì°¸ê³ 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Free/Busy:"
 msgstr "ì?½ì?? ì??ì??/ì??ì??(_F):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Home Page:"
 msgstr "í??í??ì?´ì§?(_H):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Manager:"
 msgstr "ê´?ë¦¬ì??(_M):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
-msgid "_Notes:"
-msgstr "ë©?ëª¨(_N):"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_Office:"
 msgstr "ì?¬ë¬´ì?¤(_O):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:6
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_PO Box:"
 msgstr "ì?¬ì??í?¨(_P):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Profession:"
 msgstr "ì??ë¬´(_P):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
 msgid "_Spouse:"
 msgstr "ë°°ì?°ì??(_S):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:7
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "_State/Province:"
 msgstr "ì??/ë??(_S):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
-#: ../addressbook/gui/contact-editor/fullname.glade.h:17
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: ../addressbook/gui/contact-editor/fullname.glade.h:19
 msgid "_Title:"
 msgstr "ì§?ì??(_T):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:45
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
 msgid "_Video Chat:"
 msgstr "í??ì?? ë??í??(_V):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:46
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
 msgid "_Wants to receive HTML mail"
 msgstr "HTML ë©?ì?¼ ë°?ì??(_W)"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
 msgid "_Web Log:"
 msgstr "ì?¹ë¡?ê·¸(_W):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:48
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
 msgid "_Where:"
 msgstr "ì??ì¹?(_W):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:49
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
 msgid "_Zip/Postal Code:"
 msgstr "ì?°í?¸ ë²?í?¸(_Z):"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:91
-#: ../addressbook/gui/widgets/eab-contact-display.c:632
-#: ../addressbook/gui/widgets/eab-contact-display.c:647
-msgid "Address"
-msgstr "ì£¼ì??"
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:85
+#: ../mail/em-mailer-prefs.c:473
+#: ../plugins/exchange-operations/exchange-delegates.c:951
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:697
+#: ../plugins/plugin-manager/plugin-manager.c:57
+#: ../widgets/menus/gal-define-views-dialog.c:344
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
+#: ../widgets/menus/gal-view-new-dialog.c:61
+msgid "Name"
+msgstr "ì?´ë¦?"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:98
 #: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:91
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:173
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:294
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:289
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1178
-#: ../addressbook/gui/widgets/e-addressbook-model.c:325
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:419
-#: ../addressbook/gui/widgets/e-minicard-label.c:165
+#: ../addressbook/gui/widgets/e-addressbook-model.c:324
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:417
+#: ../addressbook/gui/widgets/e-minicard-label.c:164
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:131
-#: ../addressbook/gui/widgets/e-minicard-view.c:545
-#: ../addressbook/gui/widgets/e-minicard.c:192
+#: ../addressbook/gui/widgets/e-minicard-view.c:544
+#: ../addressbook/gui/widgets/e-minicard.c:191
 #: ../widgets/menus/gal-define-views-model.c:178
-#: ../widgets/table/e-cell-text.c:1822 ../widgets/text/e-text.c:3685
-#: ../widgets/text/e-text.c:3686
+#: ../widgets/table/e-cell-text.c:1816 ../widgets/text/e-text.c:3674
+#: ../widgets/text/e-text.c:3675
 msgid "Editable"
 msgstr "í?¸ì§? ê°?ë?¥"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:131
-msgid "United States"
-msgstr "ë¯¸êµ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:132
-msgid "Afghanistan"
-msgstr "ì??í??ê°?ë??ì?¤í??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:133
-msgid "Albania"
-msgstr "ì??ë°?ë??ì??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:134
-msgid "Algeria"
-msgstr "ì??ì ?ë¦¬"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:135
-msgid "American Samoa"
-msgstr "ë¯¸êµë ¹ ì?¬ëª¨ì??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:136
-msgid "Andorra"
-msgstr "ì??ë??ë?¼"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
-msgid "Angola"
-msgstr "ì??ê³¨ë?¼"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
-msgid "Anguilla"
-msgstr "ì??ê·?ë?¼"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
-msgid "Antarctica"
-msgstr "ë?¨ê·¹"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
-msgid "Antigua And Barbuda"
-msgstr "ì??í?°ê°? ë°?ë¶?ë?¤"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
-msgid "Argentina"
-msgstr "ì??ë¥´í?¨í?°ë??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
-msgid "Armenia"
-msgstr "ì??ë¥´ë©?ë??ì??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
-msgid "Aruba"
-msgstr "ì??ë£¨ë°?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
-msgid "Australia"
-msgstr "ì?¤ì?¤í?¸ë ?ì?¼ë¦¬ì??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
-msgid "Austria"
-msgstr "ì?¤ì?¤í?¸ë¦¬ì??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
-msgid "Azerbaijan"
-msgstr "ì??ì ?ë¥´ë°?ì?´ì??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
-msgid "Bahamas"
-msgstr "ë°?í??ë§?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
-msgid "Bahrain"
-msgstr "ë°?ë ?ì?¸"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
-msgid "Bangladesh"
-msgstr "ë°©ê¸?ë?¼ë?°ì??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
-msgid "Barbados"
-msgstr "ë°?ë¥´ë°?ë??ì?¤"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
-msgid "Belarus"
-msgstr "ë²¨ë?¼ë£¨ì?¤"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
-msgid "Belgium"
-msgstr "ë²¨ê¸°ì??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
-msgid "Belize"
-msgstr "ë²¨ë¦¬ì¦?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
-msgid "Benin"
-msgstr "ë² ë??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
-msgid "Bermuda"
-msgstr "ë²?ë®¤ë?¤"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
-msgid "Bhutan"
-msgstr "ë¶?í??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
-msgid "Bolivia"
-msgstr "ë³¼ë¦¬ë¹?ì??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
-msgid "Bosnia And Herzegowina"
-msgstr "ë³´ì?¤ë??ì?? í?¤ë¥´ì²´ì½?ë¹?ë??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
-msgid "Botswana"
-msgstr "ë³´ì¸ ì??ë??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
-msgid "Bouvet Island"
-msgstr "ë³´ì?°ë²³ ì?¬"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
-msgid "Brazil"
-msgstr "ë¸?ë?¼ì§?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
-msgid "British Indian Ocean Territory"
-msgstr "ì??êµë ¹ ì?¸ë??ì?? ì??ì¹?êµ¬ì?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
-msgid "Brunei Darussalam"
-msgstr "ë¸?ë£¨ë??ì?´ ë?¤ë£¨ì?´ë??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
-msgid "Bulgaria"
-msgstr "ë¶?ê°?ë¦¬ì??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
-msgid "Burkina Faso"
-msgstr "ë¶?ë¥´í?¤ë?? í??ì??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
-msgid "Burundi"
-msgstr "ë¶?ë£¬ë??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
-msgid "Cambodia"
-msgstr "ìº?ë³´ë??ì??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
-msgid "Cameroon"
-msgstr "ì¹´ë©?ë£¬"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
-msgid "Canada"
-msgstr "ìº?ë??ë?¤"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
-msgid "Cape Verde"
-msgstr "ì¼?ì?´í?? ë² ë¥´ë??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
-msgid "Cayman Islands"
-msgstr "ì¼?ì?´ë§? ì ?ë??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
-msgid "Central African Republic"
-msgstr "ì¤?ì?? ì??í??ë¦¬ì¹´ ê³µí??êµ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
-msgid "Chad"
-msgstr "ì± ë??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
-msgid "Chile"
-msgstr "ì¹ ë ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
-msgid "China"
-msgstr "ì¤?êµ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
-msgid "Christmas Island"
-msgstr "í?¬ë¦¬ì?¤ë§?ì?¤ ì?¬"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
-msgid "Cocos (Keeling) Islands"
-msgstr "ì½?ì½?ì?¤ (í?¬ë§?) ì ?ë??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
-msgid "Colombia"
-msgstr "ì½?ë¡¬ë¹?ì??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
-msgid "Comoros"
-msgstr "ì½?ëª¨ë¡?ì?¤"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
-msgid "Congo"
-msgstr "ì½©ê³ "
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
-msgid "Congo, The Democratic Republic Of The"
-msgstr "ì½©ê³  ë¯¼ì£¼ ê³µí??êµ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
-msgid "Cook Islands"
-msgstr "ì¿¡ ì ?ë??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
-msgid "Costa Rica"
-msgstr "ì½?ì?¤í??ë¦¬ì¹´"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
-msgid "Cote d'Ivoire"
-msgstr "ì½?í?¸ ë??ë¸?ì??ë¥´"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
-msgid "Croatia"
-msgstr "í?¬ë¡?ì??í?°ì??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
-msgid "Cuba"
-msgstr "ì¿ ë°?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
-msgid "Cyprus"
-msgstr "ì?¬ì?´í??ë?¬ì?¤"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
-msgid "Czech Republic"
-msgstr "ì²´ì½? ê³µí??êµ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
-msgid "Denmark"
-msgstr "ë?´ë§?í?¬"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
-msgid "Djibouti"
-msgstr "ì§?ë¶?í?°"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
-msgid "Dominica"
-msgstr "ë??ë¯¸ë??ì¹´"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
-msgid "Dominican Republic"
-msgstr "ë??ë¯¸ë??ì¹´ ê³µí??êµ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
-msgid "Ecuador"
-msgstr "ì??ì¿ ì??ë??ë¥´"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
-msgid "Egypt"
-msgstr "ì?´ì§?í?¸"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
-msgid "El Salvador"
-msgstr "ì?? ì?´ë°?ë??ë¥´"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
-msgid "Equatorial Guinea"
-msgstr "ì ?ë??ê¸°ë??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
-msgid "Eritrea"
-msgstr "ì??ë¦¬í?¸ë¦¬ì??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
-msgid "Estonia"
-msgstr "ì??ì?¤í? ë??ì??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
-msgid "Ethiopia"
-msgstr "ì??í?°ì?¤í?¼ì??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
-msgid "Falkland Islands"
-msgstr "í?¬í?´ë??ë?? ì ?ë??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
-msgid "Faroe Islands"
-msgstr "í?¨ë¡? ì ?ë??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
-msgid "Fiji"
-msgstr "í?¼ì§?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
-msgid "Finland"
-msgstr "í??ë??ë??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
-msgid "France"
-msgstr "í??ë??ì?¤"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
-msgid "French Guiana"
-msgstr "í??ë??ì?¤ë ¹ ê¸°ì??ë??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
-msgid "French Polynesia"
-msgstr "í??ë??ì?¤ë ¹ í?´ë¦¬ë?¤ì??ì??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
-msgid "French Southern Territories"
-msgstr "í??ë??ì?¤ë ¹ ë?¨ ì??ì¹?êµ¬ì?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
-msgid "Gabon"
-msgstr "ê°?ë´?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
-msgid "Gambia"
-msgstr "ê°?ë¹?ì??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
-msgid "Georgia"
-msgstr "ê·¸ë£¨ì§?ì??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
-msgid "Germany"
-msgstr "ë??ì?¼"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
-msgid "Ghana"
-msgstr "ê°?ë??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
-msgid "Gibraltar"
-msgstr "ì§?ë¸?ë¡¤í?°"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
-msgid "Greece"
-msgstr "ê·¸ë¦¬ì?¤"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
-msgid "Greenland"
-msgstr "ê·¸ë¦°ë??ë??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
-msgid "Grenada"
-msgstr "ê·¸ë ?ë??ë?¤"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
-msgid "Guadeloupe"
-msgstr "ê³¼ë?¬ë£¨í??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
-msgid "Guam"
-msgstr "ê´?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
-msgid "Guatemala"
-msgstr "ê³¼í??ë§?ë?¼"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
-msgid "Guernsey"
-msgstr "ê±´ì§?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
-msgid "Guinea"
-msgstr "ê¸°ë??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
-msgid "Guinea-Bissau"
-msgstr "ê¸°ë??ë¹?ì?¬ì?°"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
-msgid "Guyana"
-msgstr "ê°?ì?´ì??ë??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
-msgid "Haiti"
-msgstr "í??ì?´í?°"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
-msgid "Heard And McDonald Islands"
-msgstr "í??ë?? ë§¥ë??ë??ë?? ì ?ë??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
-msgid "Holy See"
-msgstr "ë°?í?°ì¹¸"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
-msgid "Honduras"
-msgstr "í?¼ë??ë?¼ì?¤"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
-msgid "Hong Kong"
-msgstr "í??ì½©"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
-msgid "Hungary"
-msgstr "í??ê°?ë¦¬"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
-msgid "Iceland"
-msgstr "ì??ì?´ì?¬ë??ë??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
-msgid "India"
-msgstr "ì?¸ë??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
-msgid "Indonesia"
-msgstr "ì?¸ë??ë?¤ì??ì??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
-msgid "Iran"
-msgstr "ì?´ë??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
-msgid "Iraq"
-msgstr "ì?´ë?¼í?¬"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
-msgid "Ireland"
-msgstr "ì??ì?´ë??ë??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
-msgid "Isle of Man"
-msgstr "ë§¨ ì?¬"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
-msgid "Israel"
-msgstr "ì?´ì?¤ë?¼ì??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
-msgid "Italy"
-msgstr "ì?´í??ë¦¬ì??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
-msgid "Jamaica"
-msgstr "ì??ë©?ì?´ì¹´"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
-msgid "Japan"
-msgstr "ì?¼ë³¸"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
-msgid "Jersey"
-msgstr "ì ?ì§?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
-msgid "Jordan"
-msgstr "ì??ë¥´ë?¨"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
-msgid "Kazakhstan"
-msgstr "ì¹´ì??í??ì?¤í??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
-msgid "Kenya"
-msgstr "ì¼?ë??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
-msgid "Kiribati"
-msgstr "í?¤ë¦¬ë°?í?°"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
-msgid "Korea, Democratic People's Republic Of"
-msgstr "ì¡°ì? ë¯¼ì£¼ì£¼ì??ì?¸ë¯¼ê³µí??êµ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
-msgid "Korea, Republic Of"
-msgstr "ë??í??ë¯¼êµ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
-msgid "Kuwait"
-msgstr "ì¿ ì?¨ì?´í?¸"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
-msgid "Kyrgyzstan"
-msgstr "í?¤ë¥´ê¸°ì¦?ì?¤í??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
-msgid "Laos"
-msgstr "ë?¼ì?¤ì?¤"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
-msgid "Latvia"
-msgstr "ë?¼í?¸ë¹?ì??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
-msgid "Lebanon"
-msgstr "ë ?ë°?ë?¼"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
-msgid "Lesotho"
-msgstr "ë ?ì??í? "
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
-msgid "Liberia"
-msgstr "ë?¼ì?´ë² ë¦¬ì??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
-msgid "Libya"
-msgstr "ë¦¬ë¹?ì??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
-msgid "Liechtenstein"
-msgstr "ë¦¬í??í??ì??í??ì?¸"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
-msgid "Lithuania"
-msgstr "ë¦¬í?¬ì??ë??ì??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
-msgid "Luxembourg"
-msgstr "ë£©ì??ë¶?ë¥´í?¬"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
-msgid "Macao"
-msgstr "ë§?ì¹´ì?¤"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
-msgid "Macedonia"
-msgstr "ë§?ì¼?ë??ë??ì??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
-msgid "Madagascar"
-msgstr "ë§?ë?¤ê°?ì?¤ì¹´ë¥´"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
-msgid "Malawi"
-msgstr "ë§?ë?¼ì??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
-msgid "Malaysia"
-msgstr "ë§?ë ?ì?´ì??ì??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
-msgid "Maldives"
-msgstr "ëª°ë??ë¸?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
-msgid "Mali"
-msgstr "ë§?ë¦¬"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
-msgid "Malta"
-msgstr "ëª°í??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
-msgid "Marshall Islands"
-msgstr "ë§?ì?¬ ì ?ë??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
-msgid "Martinique"
-msgstr "ë§?ë¥´ë? ë??í?¬"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
-msgid "Mauritania"
-msgstr "ëª¨ë¦¬í??ë??ì??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
-msgid "Mauritius"
-msgstr "ëª¨ë¦¬ì??ì?¤"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
-msgid "Mayotte"
-msgstr "ë§?ì??í?¸"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
-msgid "Mexico"
-msgstr "ë©?ì??ì½?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
-msgid "Micronesia"
-msgstr "ë¯¸í?¬ë¡?ë?¤ì??ì??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
-msgid "Moldova, Republic Of"
-msgstr "ëª°ë??ë°?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
-msgid "Monaco"
-msgstr "ëª¨ë??ì½?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
-msgid "Mongolia"
-msgstr "ëª½ê³¨"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
-msgid "Montserrat"
-msgstr "ëª½ì?¸ë?¼í?¸"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
-msgid "Morocco"
-msgstr "ëª¨ë¡?ì½?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
-msgid "Mozambique"
-msgstr "ëª¨ì? ë¹?í?¬"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
-msgid "Myanmar"
-msgstr "ë¯¸ì??ë§?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
-msgid "Namibia"
-msgstr "ë??ë¯¸ë¹?ì??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
-msgid "Nauru"
-msgstr "ë??ì?°ë£¨"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
-msgid "Nepal"
-msgstr "ë?¤í??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
-msgid "Netherlands"
-msgstr "ë?¤ë??ë??ë??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
-msgid "Netherlands Antilles"
-msgstr "ë?¤ë??ë??ë??ë ¹ ì?¤í?¸ë ?ì?¤ ì?´ë??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
-msgid "New Caledonia"
-msgstr "ë?´ ì¹¼ë ?ë??ë??ì??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
-msgid "New Zealand"
-msgstr "ë?´ì§?ë??ë??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
-msgid "Nicaragua"
-msgstr "ë??ì¹´ë?¼ê³¼"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
-msgid "Niger"
-msgstr "ë??ì ?ë¥´"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
-msgid "Nigeria"
-msgstr "ë??ì?´ì§?ë¦¬ì??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
-msgid "Niue"
-msgstr "ë??ì?°ì??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
-msgid "Norfolk Island"
-msgstr "ë?¸í?½ ì?¬"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
-msgid "Northern Mariana Islands"
-msgstr "ë¶? ë§?ë¦¬ì??ë?? ì ?ë??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
-msgid "Norway"
-msgstr "ë?¸ë¥´ì?¨ì?´"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
-msgid "Oman"
-msgstr "ì?¤ë§?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
-msgid "Pakistan"
-msgstr "í??í?¤ì?¤í??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
-msgid "Palau"
-msgstr "í??ë?¼ì?°"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
-msgid "Palestinian Territory"
-msgstr "í??ë ?ì?¤í??ì?¸ ì??ì¹?êµ¬ì?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
-msgid "Panama"
-msgstr "í??ë??ë§?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
-msgid "Papua New Guinea"
-msgstr "í??í?¸ì?? ë?´ê¸°ë??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
-msgid "Paraguay"
-msgstr "í??ë?¼ê³¼ì?´"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
-msgid "Peru"
-msgstr "í??ë£¨"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
-msgid "Philippines"
-msgstr "í??ë¦¬í??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
-msgid "Pitcairn"
-msgstr "í?¼í?¸ì¼?ì?¸"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
-msgid "Poland"
-msgstr "í?´ë??ë??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
-msgid "Portugal"
-msgstr "í?¬ë¥´í?¬ê°?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
-msgid "Puerto Rico"
-msgstr "í?¸ì??ë¥´í? ë¦¬ì½?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
-msgid "Qatar"
-msgstr "ì¹´í??ë¥´"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
-msgid "Reunion"
-msgstr "ë ?ì??ë??ì?¹"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
-msgid "Romania"
-msgstr "ë£¨ë§?ë??ì??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
-msgid "Russian Federation"
-msgstr "ë?¬ì??ì?? ì?°ë°©"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
-msgid "Rwanda"
-msgstr "ë¥´ì??ë?¤"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
-msgid "Saint Kitts And Nevis"
-msgstr "ì?¸ì?¸í?¸ í?¤ì¸  ë?¤ë¹?ì?¤"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
-msgid "Saint Lucia"
-msgstr "ì?¸ì?¸í?¸ ë£¨ì??ì??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
-msgid "Saint Vincent And The Grenadines"
-msgstr "ì?¸ì?¸í?¸ ë¹?ì?¼í?¸ ê·¸ë ?ë??ë?¤ì?¸ì¦?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
-msgid "Samoa"
-msgstr "ì?¬ëª¨ì??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
-msgid "San Marino"
-msgstr "ì?°ë§?ë¦¬ë?¸"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
-msgid "Sao Tome And Principe"
-msgstr "ì??í?¬ë©? í??ë¦°ì??í??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
-msgid "Saudi Arabia"
-msgstr "ì?¬ì?°ë??ì??ë?¼ë¹?ì??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
-msgid "Senegal"
-msgstr "ì?¸ë?¤ê°?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
-msgid "Serbia And Montenegro"
-msgstr "ì?¸ë¥´ë¹?ì?? ëª¬í??ë?¤ê·¸ë¡?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
-msgid "Seychelles"
-msgstr "ì?¸ì?´ì?¸"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
-msgid "Sierra Leone"
-msgstr "ì??ì??ë?¼ë¦¬ì?¨"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
-msgid "Singapore"
-msgstr "ì?±ê°?í?´"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
-msgid "Slovakia"
-msgstr "ì?¬ë¡?ë°?í?¤ì??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
-msgid "Slovenia"
-msgstr "ì?¬ë¡?ë² ë??ì??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
-msgid "Solomon Islands"
-msgstr "ì??ë¡?ëª¬ ì ?ë??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
-msgid "Somalia"
-msgstr "ì??ë§?ë¦¬ì??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
-msgid "South Africa"
-msgstr "ë?¨ ì??í??ë¦¬ì¹´ ê³µí??êµ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
-msgid "South Georgia And The South Sandwich Islands"
-msgstr "ë?¨ ì¡°ì§?ì?? ë?¨ ì??ë??ì??ì¹? ì ?ë??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
-msgid "Spain"
-msgstr "ì?¤í??ì?¸"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
-msgid "Sri Lanka"
-msgstr "ì?¤ë¦¬ë??ì¹´"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
-msgid "St. Helena"
-msgstr "ì?¸ì?¸í?¸ í?¬ë ?ë??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
-msgid "St. Pierre And Miquelon"
-msgstr "ì?© í?¼ì??ë¥´ ë¯¸ì¼?ë¡ "
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
-msgid "Sudan"
-msgstr "ì??ë?¨"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
-msgid "Suriname"
-msgstr "ì??ë¦¬ë?¨"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
-msgid "Svalbard And Jan Mayen Islands"
-msgstr "ì?¤ë°?ë°?ë¥´ë?? ì??ë§?ì?´ì?? ì ?ë??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
-msgid "Swaziland"
-msgstr "ì?¤ì??ì§?ë??ë??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
-msgid "Sweden"
-msgstr "ì?¤ì?¨ë?´"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
-msgid "Switzerland"
-msgstr "ì?¤ì??ì?¤"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
-msgid "Syria"
-msgstr "ì??ë¦¬ì??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
-msgid "Taiwan"
-msgstr "í??ì?´ì??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
-msgid "Tajikistan"
-msgstr "í??ì§?í?¤ì?¤í??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
-msgid "Tanzania, United Republic Of"
-msgstr "í??ì??ë??ì?? ì?°ë°© ê³µí??êµ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
-msgid "Thailand"
-msgstr "í??êµ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
-msgid "Timor-Leste"
-msgstr "ë??í?°ëª¨ë¥´"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
-msgid "Togo"
-msgstr "í? ê³ "
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
-msgid "Tokelau"
-msgstr "í? ì¼?ë¡?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
-msgid "Tonga"
-msgstr "í?µê°?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
-msgid "Trinidad And Tobago"
-msgstr "í?¸ë¦¬ë??ë?¤ë?? í? ë°?ê³ "
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
-msgid "Tunisia"
-msgstr "í??ë??ì§?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
-msgid "Turkey"
-msgstr "í?°í?¤"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
-msgid "Turkmenistan"
-msgstr "í?¬ë¥´í?¬ë©?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
-msgid "Turks And Caicos Islands"
-msgstr "í?°í?¬ ì?¤ì¼?ì?´ì»¤ì?¤ ì ?ë??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
-msgid "Tuvalu"
-msgstr "í?¬ë°?ë£¨"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
-msgid "Uganda"
-msgstr "ì?°ê°?ë?¤"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
-msgid "Ukraine"
-msgstr "ì?°í?¬ë?¼ì?´ë??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
-msgid "United Arab Emirates"
-msgstr "ì??ë??ì??ë¯¸ë¦¬í?¸ì?°í?©"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
-msgid "United Kingdom"
-msgstr "ì??êµ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
-msgid "United States Minor Outlying Islands"
-msgstr "ë¯¸êµë ¹ ì??êµ°ë??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
-msgid "Uruguay"
-msgstr "ì?°ë¥´ê³¼ì?´"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
-msgid "Uzbekistan"
-msgstr "ì?°ì¦?ë² í?¤ì?¤í??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
-msgid "Vanuatu"
-msgstr "ë°?ë??ì??í?¬"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
-msgid "Venezuela"
-msgstr "ë² ë?¤ì??ì??ë?¼"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
-msgid "Viet Nam"
-msgstr "ë² í?¸ë?¨"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
-msgid "Virgin Islands, British"
-msgstr "ë²?ì§? ì ?ë??, ì??êµë ¹"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
-msgid "Virgin Islands, U.S."
-msgstr "ë²?ì§? ì ?ë??, ë¯¸êµë ¹"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
-msgid "Wallis And Futuna Islands"
-msgstr "ì??ë¦¬ì?¤ í??í?¬ë?? ì ?ë??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
-msgid "Western Sahara"
-msgstr "ì??ë¶? ì?¬í??ë?¼"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
-msgid "Yemen"
-msgstr "ì??ë©?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
-msgid "Zambia"
-msgstr "ì? ë¹?ì??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
-msgid "Zimbabwe"
-msgstr "ì§?ë°?ë¸?ì?¨"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:85
-#: ../mail/em-mailer-prefs.c:467
-#: ../plugins/exchange-operations/exchange-delegates.c:954
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:711
-#: ../plugins/plugin-manager/plugin-manager.c:57
-#: ../plugins/save-attachments/save-attachments.c:351
-#: ../widgets/menus/gal-define-views-dialog.c:346
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
-#: ../widgets/menus/gal-view-new-dialog.c:63
-msgid "Name"
-msgstr "ì?´ë¦?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:53
-msgid "AOL Instant Messenger"
-msgstr "AOL ì?¸ì?¤í?´ì?¤ ë©?ì? ì ?"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
+#: ../addressbook/gui/widgets/eab-contact-display.c:603
+msgid "AIM"
+msgstr "AIM"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:55
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
-#: ../addressbook/gui/widgets/eab-contact-display.c:608
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
+#: ../addressbook/gui/widgets/eab-contact-display.c:606
 msgid "Jabber"
 msgstr "ì?¬ë²?"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:56
-msgid "Yahoo Messenger"
-msgstr "ì?¼í?? ë©?ì? ì ?"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
+#: ../addressbook/gui/widgets/eab-contact-display.c:608
+msgid "Yahoo"
+msgstr "ì?¼í??"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:57
-msgid "Gadu-Gadu Messenger"
-msgstr "ê°?ë??ê°?ë?? ë©?ì? ì ?"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
+#: ../addressbook/gui/widgets/eab-contact-display.c:609
+msgid "Gadu-Gadu"
+msgstr "ê°?ë??ê°?ë??"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:59
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:181
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
 #: ../addressbook/gui/widgets/eab-contact-display.c:607
+msgid "MSN"
+msgstr "MSN"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
+#: ../addressbook/gui/widgets/eab-contact-display.c:605
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:60
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:183
-#: ../addressbook/gui/widgets/eab-contact-display.c:612
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
+#: ../addressbook/gui/widgets/eab-contact-display.c:604
+msgid "GroupWise"
+msgstr "ê·¸ë£¹ì??ì?´ì¦?"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
+#: ../addressbook/gui/widgets/eab-contact-display.c:610
 msgid "Skype"
 msgstr "ì?¤ì¹´ì?´í??"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:150
-msgid "Service"
-msgstr "ì??ë¹?ì?¤"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:159
-#: ../calendar/gui/caltypes.xml.h:12
-#: ../calendar/gui/e-cal-list-view.etspec.h:3 ../mail/message-list.etspec.h:9
-#: ../plugins/publish-calendar/publish-calendar.c:694
-#: ../plugins/save-calendar/csv-format.c:376
-msgid "Location"
-msgstr "ì??ì¹?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:166
-msgid "Username"
-msgstr "ì?¬ì?©ì?? ì?´ë¦?"
+#. red
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
+#: ../addressbook/gui/widgets/eab-contact-display.c:57
+#: ../addressbook/gui/widgets/eab-contact-display.c:633
+#: ../mail/em-migrate.c:959
+msgid "Work"
+msgstr "ì??ë¬´"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:264
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:196
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:191
 #: ../addressbook/gui/widgets/eab-contact-display.c:58
 msgid "Home"
 msgstr "ì§?"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:272
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:197
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:192
 #: ../addressbook/gui/widgets/eab-contact-display.c:59
-#: ../addressbook/gui/widgets/eab-contact-display.c:519
-#: ../calendar/gui/e-calendar-view.c:2259
+#: ../addressbook/gui/widgets/eab-contact-display.c:516
+#: ../calendar/gui/e-calendar-view.c:2289
 msgid "Other"
 msgstr "ê¸°í??"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
-#: ../addressbook/gui/widgets/eab-contact-display.c:610
-msgid "Yahoo"
-msgstr "ì?¼í??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
-#: ../addressbook/gui/widgets/eab-contact-display.c:611
-msgid "Gadu-Gadu"
-msgstr "ê°?ë??ê°?ë??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
-#: ../addressbook/gui/widgets/eab-contact-display.c:609
-msgid "MSN"
-msgstr "MSN"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:182
-#: ../addressbook/gui/widgets/eab-contact-display.c:606
-msgid "GroupWise"
-msgstr "ê·¸ë£¹ì??ì?´ì¦?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:252
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:247
 msgid "Source Book"
 msgstr "ì??ë³¸ ì£¼ì??ë¡?"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:259
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:254
 msgid "Target Book"
 msgstr "ë??ì?? ì£¼ì??ë¡?"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:273
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:268
 msgid "Is New Contact"
 msgstr "ì?? ì?°ë?½ì²?"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:280
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:275
 msgid "Writable Fields"
 msgstr "ì?°ê¸° ê°?ë?¥í?? í?ëª©"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:287
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:282
 msgid "Required Fields"
 msgstr "í??ì?? í?ëª©"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:301
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:296
 msgid "Changed"
 msgstr "ë°?ë??"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:553
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2418
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:551
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2437
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "ì?°ë?½ì²? í?¸ì§? - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2814
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2832
 msgid "Please select an image for this contact"
 msgstr "ì?´ ì?°ë?½ì²?ì?? ì?¬ì?©í?  ê·¸ë¦¼ì?? ì? í??í??ì?ì??ì?¤"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2815
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2833
 msgid "_No image"
 msgstr "ê·¸ë¦¼ ì??ì??(_N)"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3089
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3104
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2659,43 +1550,43 @@ msgstr ""
 "ì?°ë?½ì²? ë?°ì?´í?°ê°? ì??ëª»ë??ì??ì?µë??ë?¤:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3093
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3108
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "'%s'ì?? ì??ëª»ë?? í??ì??ì?´ ë?¤ì?´ ì??ì?µë??ë?¤"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3100
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3115
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s'%s'ì?? ì??ëª»ë?? í??ì??ì?´ ë?¤ì?´ ì??ì?µë??ë?¤"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3115
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3126
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3130
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3141
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s'%s'ì?´(ê°?) ë¹?ì?´ ì??ì?µë??ë?¤"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3141
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3154
 msgid "Invalid contact."
 msgstr "ì?°ë?½ì²?ê°? ì??ëª»ë??ì??ì?µë??ë?¤."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:324
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:323
 msgid "Contact Quick-Add"
 msgstr "ì?°ë?½ì²? ë¹ ë¥¸ ì¶?ê°?"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:327
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:326
 msgid "_Edit Full"
 msgstr "ì ?ì?? ì?´ë¦? í?¸ì§?(_E)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:401
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:400
 msgid "_Full name"
 msgstr "ì ?ì²´ ì?´ë¦?(_F)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:412
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:411
 msgid "E_mail"
 msgstr "ì ?ì?? ë©?ì?¼(_M)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:423
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:422
 msgid "_Select Address Book"
 msgstr "ì£¼ì??ë¡? ì? í??(_S)"
 
@@ -2733,112 +1624,62 @@ msgstr ""
 "ì ?ë§?ë¡? ì?´ ê³?ì ?ì??\n"
 "ì?ì ?í??ì??ê² ì?µë??ê¹??"
 
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:1
-msgid "Address _2:"
-msgstr "ì£¼ì?? _2:"
-
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:2
-msgid "Ci_ty:"
-msgstr "ë??ì??(_T):"
-
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:3
-msgid "Countr_y:"
-msgstr "êµê°?(_Y):"
-
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:4
-msgid "Full Address"
-msgstr "ì ?ì?? ì£¼ì??"
-
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:8
-msgid "_ZIP Code:"
-msgstr "ì?°í?¸ ë²?í?¸(_Z):"
-
 #: ../addressbook/gui/contact-editor/fullname.glade.h:1
-msgid "Dr."
-msgstr "Dr."
+msgid ""
+"\n"
+"Mr.\n"
+"Mrs.\n"
+"Ms.\n"
+"Miss\n"
+"Dr."
+msgstr ""
+"\n"
+"Mr.\n"
+"Mrs.\n"
+"Ms.\n"
+"Miss\n"
+"Dr."
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:2
-msgid "Esq."
-msgstr "Esq."
+#: ../addressbook/gui/contact-editor/fullname.glade.h:7
+msgid ""
+"\n"
+"Sr.\n"
+"Jr.\n"
+"I\n"
+"II\n"
+"III\n"
+"Esq."
+msgstr ""
+"\n"
+"Sr.\n"
+"Jr.\n"
+"I\n"
+"II\n"
+"III\n"
+"Esq."
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:3
+#: ../addressbook/gui/contact-editor/fullname.glade.h:14
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:16
 msgid "Full Name"
 msgstr "ì ?ì²´ ì?´ë¦?"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:4
-msgid "I"
-msgstr "I"
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:5
-msgid "II"
-msgstr "II"
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:6
-msgid "III"
-msgstr "III"
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:7
-msgid "Jr."
-msgstr "Jr."
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:8
-msgid "Miss"
-msgstr "Miss"
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:9
-msgid "Mr."
-msgstr "Mr."
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:10
-msgid "Mrs."
-msgstr "Mrs."
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:11
-msgid "Ms."
-msgstr "Ms."
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:12
-msgid "Sr."
-msgstr "Sr."
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:13
+#: ../addressbook/gui/contact-editor/fullname.glade.h:15
 msgid "_First:"
 msgstr "ì?´ë¦?(_F):"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:14
+#: ../addressbook/gui/contact-editor/fullname.glade.h:16
 msgid "_Last:"
 msgstr "ì?±(_L):"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:15
+#: ../addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Middle:"
 msgstr "ê°?ì?´ë?°(_M):"
 
 # Suffix -> í?¸ì¹, Microsoft Office XP ì°¸ê³ 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:16
+#: ../addressbook/gui/contact-editor/fullname.glade.h:18
 msgid "_Suffix:"
 msgstr "í?¸ì¹(_S):"
 
-#: ../addressbook/gui/contact-editor/im.glade.h:1
-msgid "Add IM Account"
-msgstr "ë©?ì? ì ? ê³?ì ? ì¶?ê°?"
-
-#: ../addressbook/gui/contact-editor/im.glade.h:2
-msgid "_Account name:"
-msgstr "ê³?ì ? ì?´ë¦?(_A):"
-
-#: ../addressbook/gui/contact-editor/im.glade.h:3
-msgid "_IM Service:"
-msgstr "ë©?ì? ì ? ì??ë¹?ì?¤(_I):"
-
-#: ../addressbook/gui/contact-editor/im.glade.h:4
-#: ../calendar/gui/dialogs/event-page.glade.h:16
-#: ../plugins/calendar-weather/calendar-weather.c:372
-#: ../plugins/exchange-operations/exchange-calendar.c:247
-#: ../plugins/exchange-operations/exchange-contacts.c:239
-msgid "_Location:"
-msgstr "ì??ì¹?(_L):"
-
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
 msgid "<b>Members</b>"
 msgstr "<b>êµ¬ì?±ì??</b>"
@@ -2849,9 +1690,9 @@ msgid "Contact List Editor"
 msgstr "ì?°ë?½ì²? ëª©ë¡? í?¸ì§?ê¸°"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:220
-#: ../calendar/gui/e-day-view-time-item.c:815
-#: ../calendar/gui/e-timezone-entry.c:121
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:212
+#: ../calendar/gui/e-day-view-time-item.c:812
+#: ../calendar/gui/e-timezone-entry.c:118
 msgid "Select..."
 msgstr "ì? í??..."
 
@@ -2877,11 +1718,11 @@ msgid "_Members"
 msgstr "êµ¬ì?±ì??(_M)"
 
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1148
-#: ../addressbook/gui/widgets/e-addressbook-model.c:311
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:405
+#: ../addressbook/gui/widgets/e-addressbook-model.c:310
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:403
 #: ../addressbook/gui/widgets/e-addressbook-view.c:211
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:117
-#: ../addressbook/gui/widgets/e-minicard-view.c:531
+#: ../addressbook/gui/widgets/e-minicard-view.c:530
 msgid "Book"
 msgstr "ë¶?"
 
@@ -2927,27 +1768,27 @@ msgstr ""
 "ê·¸ë??ë?? ì?°ë?½ì²?ë¥¼ ì¶?ê°?í??ì??ê² ì?µë??ê¹??"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:6
-#: ../addressbook/gui/merging/eab-contact-merging.c:214
+#: ../addressbook/gui/merging/eab-contact-merging.c:213
 msgid "_Merge"
 msgstr "í?©ì¹?ê¸°(_M)"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:199
+#: ../addressbook/gui/merging/eab-contact-merging.c:198
 msgid "Merge Contact"
 msgstr "ì?°ë?½ì²? í?©ì¹?ê¸°"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:267
+#: ../addressbook/gui/merging/eab-contact-merging.c:266
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: ../addressbook/gui/widgets/eab-contact-display.c:583
-#: ../addressbook/gui/widgets/eab-contact-display.c:588
-#: ../addressbook/gui/widgets/eab-contact-display.c:591
-#: ../addressbook/gui/widgets/eab-contact-display.c:871
-#: ../plugins/groupwise-features/junk-settings.c:416 ../smime/lib/e-cert.c:810
+#: ../addressbook/gui/widgets/eab-contact-display.c:581
+#: ../addressbook/gui/widgets/eab-contact-display.c:586
+#: ../addressbook/gui/widgets/eab-contact-display.c:589
+#: ../addressbook/gui/widgets/eab-contact-display.c:868
+#: ../plugins/groupwise-features/junk-settings.c:420 ../smime/lib/e-cert.c:808
 msgid "Email"
 msgstr "ì ?ì??ë©?ì?¼"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
 #: ../addressbook/gui/widgets/e-addressbook-view.c:160
-#: ../calendar/gui/cal-search-bar.c:80 ../calendar/gui/caltypes.xml.h:2
+#: ../calendar/gui/cal-search-bar.c:79 ../calendar/gui/caltypes.xml.h:2
 #: ../calendar/gui/memotypes.xml.h:2 ../calendar/gui/tasktypes.xml.h:4
 msgid "Any field contains"
 msgstr "í??ë??ì?? í?¬í?¨"
@@ -2963,34 +1804,34 @@ msgstr "ë©?ì?¼ ì£¼ì?? ì??ì??"
 msgid "Name contains"
 msgstr "ì?´ë¦?ì?? í?¬í?¨"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:163
+#: ../addressbook/gui/widgets/e-addressbook-model.c:162
 msgid "No contacts"
 msgstr "ì?°ë?½ì²? ì??ì??"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:166
+#: ../addressbook/gui/widgets/e-addressbook-model.c:165
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
 msgstr[0] "ì?°ë?½ì²? %dê°?"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:318
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:412
+#: ../addressbook/gui/widgets/e-addressbook-model.c:317
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:410
 #: ../addressbook/gui/widgets/e-addressbook-view.c:225
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:124
-#: ../addressbook/gui/widgets/e-minicard-view.c:538
+#: ../addressbook/gui/widgets/e-minicard-view.c:537
 msgid "Query"
 msgstr "ì¿¼ë¦¬"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:461
+#: ../addressbook/gui/widgets/e-addressbook-model.c:460
 msgid "Error getting book view"
 msgstr "ì£¼ì??ë¡? ë³´ê¸°ë¥¼ ê°?ì ¸ì?¤ë?? ë?° ì?¤ë¥?ê°? ë°?ì??í??ì?µë??ë?¤"
 
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:426
-#: ../widgets/table/e-table-click-to-add.c:509
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:424
+#: ../widgets/table/e-table-click-to-add.c:507
 #: ../widgets/table/e-table-selection-model.c:302
-#: ../widgets/table/e-table.c:3352
-#: ../widgets/table/e-tree-selection-model.c:820 ../widgets/text/e-text.c:3549
-#: ../widgets/text/e-text.c:3550
+#: ../widgets/table/e-table.c:3344
+#: ../widgets/table/e-tree-selection-model.c:817 ../widgets/text/e-text.c:3541
+#: ../widgets/text/e-text.c:3542
 msgid "Model"
 msgstr "ëª¨ë?¸"
 
@@ -3009,105 +1850,103 @@ msgid "Source"
 msgstr "ì??ì?¤"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:232
-#: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-meeting-list-view.c:565
+#: ../calendar/gui/e-calendar-table.etspec.h:14
+#: ../calendar/gui/e-meeting-list-view.c:564
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
-#: ../calendar/gui/e-memo-table.etspec.h:5
+#: ../calendar/gui/e-memo-table.etspec.h:7
+#: ../widgets/misc/e-attachment-tree-view.c:554
 msgid "Type"
 msgstr "í??í??"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:812
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1965
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1971
 msgid "Save as vCard..."
 msgstr "vCardë¡? ì ?ì?¥..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:933
-#: ../calendar/gui/dialogs/comp-editor.c:2090
-#: ../calendar/gui/e-calendar-table.c:1598
-#: ../calendar/gui/e-calendar-view.c:1775 ../calendar/gui/e-memo-table.c:937
+#: ../addressbook/gui/widgets/e-addressbook-view.c:932
+#: ../calendar/gui/e-calendar-table.c:1591
+#: ../calendar/gui/e-calendar-view.c:1806 ../calendar/gui/e-memo-table.c:932
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "ì?´ê¸°(_O)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:935
+#: ../addressbook/gui/widgets/e-addressbook-view.c:934
 msgid "_New Contact..."
 msgstr "ì?? ì?°ë?½ì²?(_N)..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:936
+#: ../addressbook/gui/widgets/e-addressbook-view.c:935
 msgid "New Contact _List..."
 msgstr "ì?? ì?°ë?½ì²? ëª©ë¡?(_L)..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:939
+#: ../addressbook/gui/widgets/e-addressbook-view.c:938
 msgid "_Save as vCard..."
 msgstr "vCardë¡? ì ?ì?¥(_S)..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:940
+#: ../addressbook/gui/widgets/e-addressbook-view.c:939
 msgid "_Forward Contact"
 msgstr "ì?°ë?½ì²? ì ?ë?¬(_F)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:941
+#: ../addressbook/gui/widgets/e-addressbook-view.c:940
 msgid "_Forward Contacts"
 msgstr "ì?°ë?½ì²? ì ?ë?¬(_F)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:942
+#: ../addressbook/gui/widgets/e-addressbook-view.c:941
 msgid "Send _Message to Contact"
 msgstr "ì?°ë?½ì²?ë¡? ë©?ì??ì§? ë³´ë?´ê¸°(_M)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:943
+#: ../addressbook/gui/widgets/e-addressbook-view.c:942
 msgid "Send _Message to List"
 msgstr "ë¦¬ì?¤í?¸ë¡? ë©?ì??ì§? ë³´ë?´ê¸°(_M)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:944
+#: ../addressbook/gui/widgets/e-addressbook-view.c:943
 msgid "Send _Message to Contacts"
 msgstr "ì?°ë?½ì²?ë¡? ë©?ì??ì§? ë³´ë?´ê¸°(_M)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:945
+#: ../addressbook/gui/widgets/e-addressbook-view.c:944
 msgid "_Print"
 msgstr "ì?¸ì??(_P)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:948
+#: ../addressbook/gui/widgets/e-addressbook-view.c:947
 msgid "Cop_y to Address Book..."
 msgstr "ì£¼ì??ë¡?ì?¼ë¡? ë³µì?¬(_Y)..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:949
+#: ../addressbook/gui/widgets/e-addressbook-view.c:948
 msgid "Mo_ve to Address Book..."
 msgstr "ì£¼ì??ë¡?ì?¼ë¡? ì?´ë??(_V)..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:952
+#: ../addressbook/gui/widgets/e-addressbook-view.c:951
 msgid "Cu_t"
 msgstr "ì??ë?¼ë?´ê¸°(_T)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:953
-#: ../calendar/gui/dialogs/comp-editor.c:487
-#: ../calendar/gui/e-calendar-table.c:1606
-#: ../calendar/gui/e-calendar-view.c:1782 ../calendar/gui/e-memo-table.c:945
-#: ../composer/e-msg-composer.c:2056 ../mail/em-folder-tree.c:1005
-#: ../mail/em-folder-view.c:1327 ../mail/message-list.c:2105
-#: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:40
-#: ../ui/evolution-mail-message.xml.h:103 ../ui/evolution-memos.xml.h:15
-#: ../ui/evolution-tasks.xml.h:23
+#: ../addressbook/gui/widgets/e-addressbook-view.c:952
+#: ../calendar/gui/e-calendar-table.c:1599
+#: ../calendar/gui/e-calendar-view.c:1813 ../calendar/gui/e-memo-table.c:940
+#: ../mail/em-folder-tree.c:991 ../mail/em-folder-view.c:1325
+#: ../mail/message-list.c:2109 ../ui/evolution-addressbook.xml.h:46
+#: ../ui/evolution-calendar.xml.h:40 ../ui/evolution-mail-message.xml.h:99
+#: ../ui/evolution-memos.xml.h:15 ../ui/evolution-tasks.xml.h:23
 msgid "_Copy"
 msgstr "ë³µì?¬(_C)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:954
+#: ../addressbook/gui/widgets/e-addressbook-view.c:953
 msgid "P_aste"
 msgstr "ë¶?ì?¬ë?£ê¸°(_A)"
 
 #. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1528
-#: ../calendar/gui/cal-search-bar.c:628 ../calendar/gui/cal-search-bar.c:671
-#: ../calendar/gui/cal-search-bar.c:690
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1534
+#: ../calendar/gui/cal-search-bar.c:624 ../calendar/gui/cal-search-bar.c:667
+#: ../calendar/gui/cal-search-bar.c:686
 msgid "Any Category"
 msgstr "ëª¨ë?  ë¶?ë¥?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1531
-#: ../calendar/gui/cal-search-bar.c:632 ../calendar/gui/cal-search-bar.c:675
-#: ../calendar/gui/cal-search-bar.c:694
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1537
+#: ../calendar/gui/cal-search-bar.c:628 ../calendar/gui/cal-search-bar.c:671
+#: ../calendar/gui/cal-search-bar.c:690
 msgid "Unmatched"
 msgstr "ë§?ì§? ì??ì??"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:626
+#: ../addressbook/gui/widgets/eab-contact-display.c:624
 msgid "Assistant"
 msgstr "ë¹?ì??"
 
@@ -3136,8 +1975,8 @@ msgid "Car Phone"
 msgstr "ì¹´í?°"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: ../calendar/gui/dialogs/event-page.glade.h:7
-#: ../calendar/gui/e-cal-component-memo-preview.c:138
+#: ../calendar/gui/dialogs/event-page.glade.h:8
+#: ../calendar/gui/e-cal-component-memo-preview.c:135
 #: ../calendar/gui/e-cal-list-view.etspec.h:1
 #: ../calendar/gui/e-calendar-table.etspec.h:3
 #: ../calendar/gui/e-memo-table.etspec.h:1
@@ -3145,7 +1984,7 @@ msgid "Categories"
 msgstr "ë¶?ë¥?"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
-#: ../addressbook/gui/widgets/eab-contact-display.c:621
+#: ../addressbook/gui/widgets/eab-contact-display.c:619
 msgid "Company"
 msgstr "í??ì?¬"
 
@@ -3195,22 +2034,22 @@ msgid "Journal"
 msgstr "ì?¼ì§?"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:625
+#: ../addressbook/gui/widgets/eab-contact-display.c:623
 msgid "Manager"
 msgstr "ê´?ë¦¬ì??"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-#: ../addressbook/gui/widgets/eab-contact-display.c:646
+#: ../addressbook/gui/widgets/eab-contact-display.c:644
 msgid "Mobile Phone"
 msgstr "í?´ë?? ì ?í??"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:599
+#: ../addressbook/gui/widgets/eab-contact-display.c:597
 msgid "Nickname"
 msgstr "ë³?ëª?"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-#: ../addressbook/gui/widgets/eab-contact-display.c:659
+#: ../addressbook/gui/widgets/eab-contact-display.c:657
 msgid "Note"
 msgstr "ë©?ëª¨"
 
@@ -3239,14 +2078,14 @@ msgid "Radio"
 msgstr "ë¬´ì? "
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:577
+#: ../calendar/gui/e-meeting-list-view.c:576
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:715
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:701
 msgid "Role"
 msgstr "ì?í? "
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-display.c:650
+#: ../addressbook/gui/widgets/eab-contact-display.c:648
 msgid "Spouse"
 msgstr "ë°°ì?°ì??"
 
@@ -3266,7 +2105,7 @@ msgstr "í??ë ?ì?¤"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:43
 msgid "Title"
-msgstr "ì ?ëª©"
+msgstr "ì§?ì??"
 
 # FIXME - ì¡°ì§? ë?´ì?? êµ¬ì?±, ë¶?ì?? ë?°ì??ë¥¼ ë??í??ë?´ë?? ë§?ì?¸ ë?¯..  ì ?ë?¹í?? ë§?ì?? ì°¾ì??ë³´ì??.
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:44
@@ -3277,55 +2116,53 @@ msgstr "êµ¬ì?± ë?¨ì??"
 msgid "Web Site"
 msgstr "ì?¹ ì?¬ì?´í?¸"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:116
-#: ../addressbook/gui/widgets/e-minicard.c:155
-#: ../widgets/misc/e-canvas-vbox.c:85 ../widgets/misc/e-canvas-vbox.c:86
-#: ../widgets/misc/e-reflow.c:1424 ../widgets/misc/e-reflow.c:1425
-#: ../widgets/table/e-table-click-to-add.c:523
+#: ../addressbook/gui/widgets/e-minicard-label.c:115
+#: ../addressbook/gui/widgets/e-minicard.c:154
+#: ../widgets/misc/e-canvas-vbox.c:83 ../widgets/misc/e-canvas-vbox.c:84
+#: ../widgets/misc/e-reflow.c:1421 ../widgets/misc/e-reflow.c:1422
+#: ../widgets/table/e-table-click-to-add.c:521
 #: ../widgets/table/e-table-col.c:98
-#: ../widgets/table/e-table-field-chooser-item.c:654
-#: ../widgets/table/e-table-group-container.c:997
-#: ../widgets/table/e-table-group-container.c:998
+#: ../widgets/table/e-table-group-container.c:994
+#: ../widgets/table/e-table-group-container.c:995
 #: ../widgets/table/e-table-group-leaf.c:642
 #: ../widgets/table/e-table-group-leaf.c:643
-#: ../widgets/table/e-table-item.c:3077 ../widgets/table/e-table-item.c:3078
-#: ../widgets/text/e-text.c:3727 ../widgets/text/e-text.c:3728
+#: ../widgets/table/e-table-item.c:3069 ../widgets/table/e-table-item.c:3070
+#: ../widgets/text/e-text.c:3716 ../widgets/text/e-text.c:3717
 msgid "Width"
 msgstr "ë??ë¹?"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:123
-#: ../addressbook/gui/widgets/e-minicard.c:162
-#: ../widgets/misc/e-canvas-vbox.c:97 ../widgets/misc/e-canvas-vbox.c:98
-#: ../widgets/misc/e-reflow.c:1432 ../widgets/misc/e-reflow.c:1433
-#: ../widgets/table/e-table-click-to-add.c:530
-#: ../widgets/table/e-table-field-chooser-item.c:661
-#: ../widgets/table/e-table-group-container.c:990
-#: ../widgets/table/e-table-group-container.c:991
+#: ../addressbook/gui/widgets/e-minicard-label.c:122
+#: ../addressbook/gui/widgets/e-minicard.c:161
+#: ../widgets/misc/e-canvas-vbox.c:95 ../widgets/misc/e-canvas-vbox.c:96
+#: ../widgets/misc/e-reflow.c:1428 ../widgets/misc/e-reflow.c:1429
+#: ../widgets/table/e-table-click-to-add.c:528
+#: ../widgets/table/e-table-group-container.c:987
+#: ../widgets/table/e-table-group-container.c:988
 #: ../widgets/table/e-table-group-leaf.c:635
 #: ../widgets/table/e-table-group-leaf.c:636
-#: ../widgets/table/e-table-item.c:3083 ../widgets/table/e-table-item.c:3084
-#: ../widgets/text/e-text.c:3735 ../widgets/text/e-text.c:3736
+#: ../widgets/table/e-table-item.c:3075 ../widgets/table/e-table-item.c:3076
+#: ../widgets/text/e-text.c:3723 ../widgets/text/e-text.c:3724
 msgid "Height"
 msgstr "ë??ì?´"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:130
-#: ../addressbook/gui/widgets/e-minicard.c:170
+#: ../addressbook/gui/widgets/e-minicard-label.c:129
+#: ../addressbook/gui/widgets/e-minicard.c:169
 msgid "Has Focus"
-msgstr "ì´?ì ?ì?´ ì??ë?? ì§?"
+msgstr "í?¬ì»¤ì?¤ê°? ì??ë??ì§?"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:137
+#: ../addressbook/gui/widgets/e-minicard-label.c:136
 msgid "Field"
 msgstr "í?ëª©"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:144
+#: ../addressbook/gui/widgets/e-minicard-label.c:143
 msgid "Field Name"
 msgstr "í?ëª© ì?´ë¦?"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:151
+#: ../addressbook/gui/widgets/e-minicard-label.c:150
 msgid "Text Model"
 msgstr "í??ì?¤í?¸ ëª¨ë?¸"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:158
+#: ../addressbook/gui/widgets/e-minicard-label.c:157
 msgid "Max field name length"
 msgstr "ìµ?ë?? í??ë?? ì?´ë¦? ê¸¸ì?´"
 
@@ -3333,7 +2170,7 @@ msgstr "ìµ?ë?? í??ë?? ì?´ë¦? ê¸¸ì?´"
 msgid "Column Width"
 msgstr "ì?´ ë??ë¹?"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:178
+#: ../addressbook/gui/widgets/e-minicard-view.c:177
 msgid ""
 "\n"
 "\n"
@@ -3343,7 +2180,7 @@ msgstr ""
 "\n"
 "ì?°ë?½ì²?ë¥¼ ì°¾ë?? ì¤?ì??ë??ë?¤..."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:181
+#: ../addressbook/gui/widgets/e-minicard-view.c:180
 msgid ""
 "\n"
 "\n"
@@ -3353,11 +2190,11 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-"ì?°ë?½ì²? ì°¾ê¸°\n"
+"ì?°ë?½ì²? ê²?ì??\n"
 "\n"
-"ì?? ì?°ë?½ì²?ë¥¼ ë§?ë??ë ¤ë©´ ë§?ì?°ì?¤ë¥¼ ë??ë²? ë??ë¥´ì?ì??ì?¤."
+"ì?? ì?°ë?½ì²?ë¥¼ ë§?ë?¤ë ¤ë©´ ë§?ì?°ì?¤ë¥¼ ë??ë²? ë??ë¥´ì?ì??ì?¤."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:184
+#: ../addressbook/gui/widgets/e-minicard-view.c:183
 msgid ""
 "\n"
 "\n"
@@ -3369,19 +2206,16 @@ msgstr ""
 "\n"
 "ì?¬ê¸°ì??ì?? ë³¼ ì?? ì??ë?? í?ëª©ì?´ ì??ì?µë??ë?¤.\n"
 "\n"
-"ì?? ì?°ë?½ì²?ë¥¼ ë§?ë??ë ¤ë©´ ë§?ì?°ì?¤ë¥¼ ë??ë²? ë??ë¥´ì?ì??ì?¤."
+"ì?? ì?°ë?½ì²?ë¥¼ ë§?ë?¤ë ¤ë©´ ë§?ì?°ì?¤ë¥¼ ë??ë²? ë??ë¥´ì?ì??ì?¤."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:188
+#: ../addressbook/gui/widgets/e-minicard-view.c:187
 msgid ""
 "\n"
 "\n"
 "Search for the Contact."
-msgstr ""
-"\n"
-"\n"
-"ì?°ë?½ì²? ì°¾ê¸°."
+msgstr "\n\nì?°ë?½ì²? ê²?ì??."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:190
+#: ../addressbook/gui/widgets/e-minicard-view.c:189
 msgid ""
 "\n"
 "\n"
@@ -3392,41 +2226,41 @@ msgstr ""
 "ì?¬ê¸°ì??ì?? ë³¼ ì?? ì??ë?? í?ëª©ì?´ ì??ì?µë??ë?¤."
 
 # FIXME - ë¬´ì?¨ ë?»?
-#: ../addressbook/gui/widgets/e-minicard-view.c:524
+#: ../addressbook/gui/widgets/e-minicard-view.c:523
 msgid "Adapter"
 msgstr "ì?´ë??í?°"
 
-#: ../addressbook/gui/widgets/e-minicard.c:100
+#: ../addressbook/gui/widgets/e-minicard.c:99
 msgid "Work Email"
 msgstr "ì??ë¬´ ì ?ì??ë©?ì?¼"
 
-#: ../addressbook/gui/widgets/e-minicard.c:101
+#: ../addressbook/gui/widgets/e-minicard.c:100
 msgid "Home Email"
 msgstr "ì§? ì ?ì??ë©?ì?¼"
 
-#: ../addressbook/gui/widgets/e-minicard.c:102
-#: ../addressbook/gui/widgets/e-minicard.c:831
+#: ../addressbook/gui/widgets/e-minicard.c:101
+#: ../addressbook/gui/widgets/e-minicard.c:825
 msgid "Other Email"
 msgstr "ê¸°í?? ì ?ì??ë©?ì?¼"
 
-#: ../addressbook/gui/widgets/e-minicard.c:178
+#: ../addressbook/gui/widgets/e-minicard.c:177
 msgid "Selected"
 msgstr "ì? í??ë?¨"
 
-#: ../addressbook/gui/widgets/e-minicard.c:185
+#: ../addressbook/gui/widgets/e-minicard.c:184
 msgid "Has Cursor"
 msgstr "ì»¤ì??ê°? ì??ë?? ì§?"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:169 ../mail/em-popup.c:623
+#: ../addressbook/gui/widgets/eab-contact-display.c:169 ../mail/em-popup.c:545
 msgid "_Open Link in Browser"
 msgstr "ë¸?ë?¼ì?°ì ?ì??ì?? ë§?í?¬ ì?´ê¸°(_O)"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:170
-#: ../mail/em-folder-view.c:2757
+#: ../mail/em-folder-view.c:2694
 msgid "_Copy Link Location"
 msgstr "ë§?í?¬ ì??ì¹? ë³µì?¬(_C)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:171 ../mail/em-popup.c:624
+#: ../addressbook/gui/widgets/eab-contact-display.c:171 ../mail/em-popup.c:546
 msgid "_Send New Message To..."
 msgstr "ì?? ë©?ì??ì§? ë³´ë?´ê¸°(_S)..."
 
@@ -3435,98 +2269,103 @@ msgstr "ì?? ë©?ì??ì§? ë³´ë?´ê¸°(_S)..."
 msgid "Copy _Email Address"
 msgstr "ì ?ì??ë©?ì?¼ ì£¼ì?? ë³µì?¬(_E)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:287
-#: ../addressbook/gui/widgets/eab-contact-display.c:361
-#: ../addressbook/gui/widgets/eab-contact-display.c:363
+#: ../addressbook/gui/widgets/eab-contact-display.c:286
+#: ../addressbook/gui/widgets/eab-contact-display.c:360
+#: ../addressbook/gui/widgets/eab-contact-display.c:362
 msgid "(map)"
 msgstr "(ì§?ë??)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:297
-#: ../addressbook/gui/widgets/eab-contact-display.c:381
-#: ../addressbook/gui/widgets/eab-contact-display.c:393
+#: ../addressbook/gui/widgets/eab-contact-display.c:296
+#: ../addressbook/gui/widgets/eab-contact-display.c:380
+#: ../addressbook/gui/widgets/eab-contact-display.c:391
 msgid "map"
 msgstr "ì§?ë??"
 
 # Listë?? ì?¬ê¸°ì?? Mailing Listë¥¼ ë§?í??ë?¤
-#: ../addressbook/gui/widgets/eab-contact-display.c:478
-#: ../addressbook/gui/widgets/eab-contact-display.c:838
+#: ../addressbook/gui/widgets/eab-contact-display.c:475
+#: ../addressbook/gui/widgets/eab-contact-display.c:835
 msgid "List Members"
 msgstr "ë¦¬ì?¤í?¸ êµ¬ì?±ì??"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:622
+#: ../addressbook/gui/widgets/eab-contact-display.c:620
 msgid "Department"
 msgstr "ë¶?ì??"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:623
+#: ../addressbook/gui/widgets/eab-contact-display.c:621
 msgid "Profession"
 msgstr "ì??ë¬´"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:624
+#: ../addressbook/gui/widgets/eab-contact-display.c:622
 msgid "Position"
 msgstr "ì§?ì??"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:627
+#: ../addressbook/gui/widgets/eab-contact-display.c:625
 msgid "Video Chat"
 msgstr "í??ì?? ë??í??"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:628
-#: ../calendar/gui/calendar-commands.c:90
-#: ../calendar/gui/dialogs/calendar-setup.c:369
-#: ../calendar/gui/gnome-cal.c:2512
-#: ../plugins/exchange-operations/exchange-delegates-user.c:78
-#: ../plugins/exchange-operations/exchange-folder.c:576
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:424
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:455
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:568
-#: ../plugins/hula-account-setup/camel-hula-listener.c:377
-#: ../plugins/hula-account-setup/camel-hula-listener.c:406
+#: ../addressbook/gui/widgets/eab-contact-display.c:626
+#: ../calendar/gui/calendar-commands.c:89
+#: ../calendar/gui/dialogs/calendar-setup.c:368
+#: ../calendar/gui/gnome-cal.c:2548
+#: ../plugins/exchange-operations/exchange-delegates-user.c:75
+#: ../plugins/exchange-operations/exchange-folder.c:572
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:419
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:449
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:562
+#: ../plugins/hula-account-setup/camel-hula-listener.c:372
+#: ../plugins/hula-account-setup/camel-hula-listener.c:400
 #: ../plugins/publish-calendar/publish-calendar.glade.h:5
 msgid "Calendar"
 msgstr "ë?¬ë ¥"
 
 # free/busy -> ì?½ì?? ì??ì??/ì??ì??, Microsoft Office XP ì°¸ê³ 
-#: ../addressbook/gui/widgets/eab-contact-display.c:629
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: ../addressbook/gui/widgets/eab-contact-display.c:627
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 #: ../calendar/gui/dialogs/event-editor.c:116
 msgid "Free/Busy"
 msgstr "ì?½ì?? ì??ì??/ì??ì??"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:630
-#: ../addressbook/gui/widgets/eab-contact-display.c:645
+#: ../addressbook/gui/widgets/eab-contact-display.c:628
+#: ../addressbook/gui/widgets/eab-contact-display.c:643
 msgid "Phone"
 msgstr "ì ?í??"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:631
+#: ../addressbook/gui/widgets/eab-contact-display.c:629
 msgid "Fax"
 msgstr "í?©ì?¤"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:642
+#: ../addressbook/gui/widgets/eab-contact-display.c:630
+#: ../addressbook/gui/widgets/eab-contact-display.c:645
+msgid "Address"
+msgstr "ì£¼ì??"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:640
 msgid "Home Page"
 msgstr "í??í??ì?´ì§?"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:643
+#: ../addressbook/gui/widgets/eab-contact-display.c:641
 msgid "Web Log"
 msgstr "ì?¹ë¡?ê·¸"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:648
-#: ../calendar/gui/e-calendar-view.c:2538
+#: ../addressbook/gui/widgets/eab-contact-display.c:646
+#: ../calendar/gui/e-calendar-view.c:2580
 msgid "Birthday"
 msgstr "ì??ì?¼"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:649
-#: ../calendar/gui/e-calendar-view.c:2539
+#: ../addressbook/gui/widgets/eab-contact-display.c:647
+#: ../calendar/gui/e-calendar-view.c:2581
 msgid "Anniversary"
 msgstr "ê¸°ë??ì?¼"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:856
+#: ../addressbook/gui/widgets/eab-contact-display.c:853
 msgid "Job Title"
-msgstr "ì§?í?¨"
+msgstr "ì§?ì??"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:892
+#: ../addressbook/gui/widgets/eab-contact-display.c:889
 msgid "Home page"
 msgstr "í??í??ì?´ì§?"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:900
+#: ../addressbook/gui/widgets/eab-contact-display.c:897
 msgid "Blog"
 msgstr "ë¸?ë¡?ê·¸"
 
@@ -3539,7 +2378,7 @@ msgstr "ì?±ê³µí??ì?µë??ë?¤"
 #. E_BOOK_ERROR_BUSY
 #: ../addressbook/gui/widgets/eab-gui-util.c:60
 msgid "Backend busy"
-msgstr "ë°±ì??ë??ë¥¼ ì?¬ì?©ì¤?ì??ë??ë?¤"
+msgstr "ë°±ì??ë??ë¥¼ ì?¬ì?© ì¤?ì??ë??ë?¤"
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
 #: ../addressbook/gui/widgets/eab-gui-util.c:61
@@ -3581,12 +2420,11 @@ msgstr "í??ë¡?í? ì½?ì?´ ì§?ì??ë??ì§? ì??ì?µë??ë?¤"
 
 #. E_BOOK_ERROR_CANCELLED
 #: ../addressbook/gui/widgets/eab-gui-util.c:70
-#: ../calendar/gui/dialogs/task-details-page.glade.h:3
-#: ../calendar/gui/e-cal-component-preview.c:250
-#: ../calendar/gui/e-cal-model-tasks.c:364
-#: ../calendar/gui/e-cal-model-tasks.c:681
-#: ../calendar/gui/e-calendar-table.c:239
-#: ../calendar/gui/e-calendar-table.c:664 ../calendar/gui/print.c:2564
+#: ../calendar/gui/e-cal-component-preview.c:248
+#: ../calendar/gui/e-cal-model-tasks.c:363
+#: ../calendar/gui/e-cal-model-tasks.c:679
+#: ../calendar/gui/e-calendar-table.c:238
+#: ../calendar/gui/e-calendar-table.c:661 ../calendar/gui/print.c:2548
 msgid "Canceled"
 msgstr "ì·¨ì??í?¨"
 
@@ -3597,13 +2435,13 @@ msgstr "ì·¨ì??í?  ì?? ì??ì?µë??ë?¤"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
 #: ../addressbook/gui/widgets/eab-gui-util.c:72
-#: ../calendar/gui/comp-editor-factory.c:433
+#: ../calendar/gui/comp-editor-factory.c:432
 msgid "Authentication Failed"
 msgstr "ì?¸ì¦?ì?´ ì?¤í?¨í??ì?µë??ë?¤"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
 #: ../addressbook/gui/widgets/eab-gui-util.c:73
-#: ../calendar/gui/comp-editor-factory.c:427
+#: ../calendar/gui/comp-editor-factory.c:426
 msgid "Authentication Required"
 msgstr "ì?¸ì¦?ì?´ í??ì??í?©ë??ë?¤"
 
@@ -3717,7 +2555,7 @@ msgid "Error adding list"
 msgstr "ëª©ë¡?ì?? ì¶?ê°?í??ë?? ì¤? ì?¤ë¥?ê°? ë°?ì??í??ì?µë??ë?¤"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:211
-#: ../addressbook/gui/widgets/eab-gui-util.c:687
+#: ../addressbook/gui/widgets/eab-gui-util.c:685
 msgid "Error adding contact"
 msgstr "ì?°ë?½ì²?ë¥¼ ì¶?ê°?í??ë?? ì¤? ì?¤ë¥?ê°? ë°?ì??í??ì?µë??ë?¤"
 
@@ -3734,7 +2572,7 @@ msgid "Error removing list"
 msgstr "ëª©ë¡?ì?? ì ?ê±°í??ë?? ì¤? ì?¤ë¥?ê°? ë°?ì??í??ì?µë??ë?¤"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:234
-#: ../addressbook/gui/widgets/eab-gui-util.c:637
+#: ../addressbook/gui/widgets/eab-gui-util.c:635
 msgid "Error removing contact"
 msgstr "ì?°ë?½ì²?ë¥¼ ì ?ê±°í??ë?? ì¤? ì?¤ë¥?ê°? ë°?ì??í??ì?µë??ë?¤"
 
@@ -3759,7 +2597,7 @@ msgid "Display _All Contacts"
 msgstr "ëª¨ë?  ì?°ë?½ì²? í??ì??(_A)"
 
 #. For Translators only: "it" refers to the filename %s.
-#: ../addressbook/gui/widgets/eab-gui-util.c:351
+#: ../addressbook/gui/widgets/eab-gui-util.c:350
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3768,47 +2606,47 @@ msgstr ""
 "%sì?´(ê°?) ì?´ë¯¸ ì¡´ì?¬í?©ë??ë?¤\n"
 "ì?´ í??ì?¼ì?? ë?®ì?´ ì?°ì??ê² ì?µë??ê¹??"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:355
+#: ../addressbook/gui/widgets/eab-gui-util.c:354
 msgid "Overwrite"
 msgstr "ë?®ì?´ ì?°ê¸°"
 
 #. 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:396
-#: ../addressbook/gui/widgets/eab-gui-util.c:399
+#: ../addressbook/gui/widgets/eab-gui-util.c:394
+#: ../addressbook/gui/widgets/eab-gui-util.c:397
 msgid "contact"
 msgid_plural "contacts"
 msgstr[0] "ì?°ë?½ì²?"
 
 # í??ì?¼ ì?´ë¦?
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:445
+#: ../addressbook/gui/widgets/eab-gui-util.c:443
 msgid "card.vcf"
 msgstr "ì¹´ë??.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:482
+#: ../addressbook/gui/widgets/eab-gui-util.c:480
 msgid "Select Address Book"
 msgstr "ì£¼ì??ë¡? ì? í??"
 
 # í??ì?¼ ì?´ë¦?
-#: ../addressbook/gui/widgets/eab-gui-util.c:596
+#: ../addressbook/gui/widgets/eab-gui-util.c:594
 msgid "list"
 msgstr "ëª©ë¡?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:748
+#: ../addressbook/gui/widgets/eab-gui-util.c:746
 msgid "Move contact to"
 msgstr "ì?°ë?½ì²? ì?´ë??"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:750
+#: ../addressbook/gui/widgets/eab-gui-util.c:748
 msgid "Copy contact to"
 msgstr "ì?°ë?½ì²? ë³µì?¬"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:753
+#: ../addressbook/gui/widgets/eab-gui-util.c:751
 msgid "Move contacts to"
 msgstr "ì?°ë?½ì²? ì?´ë??"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:755
+#: ../addressbook/gui/widgets/eab-gui-util.c:753
 msgid "Copy contacts to"
 msgstr "ì?°ë?½ì²? ë³µì?¬"
 
@@ -3832,329 +2670,131 @@ msgstr "ì?°ë?½ì²? ì ?ë³´"
 msgid "Contact information for %s"
 msgstr "%sì?? ë??í?? ì?°ë?½ì²? ì ?ë³´"
 
-#: ../addressbook/gui/widgets/eab-popup-control.c:293
+#: ../addressbook/gui/widgets/eab-popup-control.c:291
 msgid "Querying Address Book..."
 msgstr "ì£¼ì??ë¡? ì§?ì??ì¤?ì??ë??ë?¤..."
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:141
-#, c-format
-msgid "There is one other contact."
-msgid_plural "There are %d other contacts."
-msgstr[0] "ê¸°í?? ì?°ë?½ì²? %dê°?."
-
-#: ../addressbook/gui/widgets/eab-vcard-control.c:226
-#: ../addressbook/gui/widgets/eab-vcard-control.c:277
-msgid "Show Full vCard"
-msgstr "vCard ì??ì?¸í?? ë³´ê¸°"
-
-#: ../addressbook/gui/widgets/eab-vcard-control.c:230
-msgid "Show Compact vCard"
-msgstr "vCard ê°?ë?¨í?? ë³´ê¸°"
-
-#: ../addressbook/gui/widgets/eab-vcard-control.c:282
-msgid "Save in address book"
-msgstr "ì£¼ì??ë¡?ì?? ì ?ì?¥"
-
 #: ../addressbook/gui/widgets/gal-view-factory-minicard.c:37
 msgid "Card View"
 msgstr "ì¹´ë??: "
 
-#: ../addressbook/importers/evolution-csv-importer.c:661
-#: ../addressbook/importers/evolution-ldif-importer.c:513
+#: ../addressbook/importers/evolution-csv-importer.c:660
+#: ../addressbook/importers/evolution-ldif-importer.c:512
 #: ../addressbook/importers/evolution-vcard-importer.c:252
-#: ../calendar/importers/icalendar-importer.c:308
-#: ../calendar/importers/icalendar-importer.c:685 ../shell/shell.error.xml.h:7
+#: ../calendar/importers/icalendar-importer.c:310
+#: ../calendar/importers/icalendar-importer.c:687 ../shell/shell.error.xml.h:7
 msgid "Importing..."
 msgstr "ê°?ì ¸ì?¤ë?? ì¤?..."
 
-#: ../addressbook/importers/evolution-csv-importer.c:863
+#: ../addressbook/importers/evolution-csv-importer.c:861
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "ì??ì??ë£© CSV í?¹ì?? TAB (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:864
+#: ../addressbook/importers/evolution-csv-importer.c:862
 msgid "Outlook CSV and Tab Importer"
 msgstr "ì??ì??ë£© CSV ë°? TAB ê°?ì ¸ì?¤ê¸°"
 
-#: ../addressbook/importers/evolution-csv-importer.c:872
+#: ../addressbook/importers/evolution-csv-importer.c:870
 msgid "Mozilla CSV or Tab (.csv, .tab)"
 msgstr "ëª¨ì§?ë?¼ CSV í?¹ì?? TAB (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:873
+#: ../addressbook/importers/evolution-csv-importer.c:871
 msgid "Mozilla CSV and Tab Importer"
 msgstr "ëª¨ì§?ë?¼ CSV ë°? TAB ê°?ì ¸ì?¤ê¸°"
 
-#: ../addressbook/importers/evolution-csv-importer.c:881
+#: ../addressbook/importers/evolution-csv-importer.c:879
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "ì??ë³¼ë£¨ì?? CSV í?¹ì?? TAB (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:882
+#: ../addressbook/importers/evolution-csv-importer.c:880
 msgid "Evolution CSV and Tab Importer"
 msgstr "ì??ë³¼ë£¨ì?? CSV ë°? TAB ê°?ì ¸ì?¤ê¸°"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:680
+#: ../addressbook/importers/evolution-ldif-importer.c:679
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP ë?°ì?´í?° êµ?í?? í??ì?? (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:681
+#: ../addressbook/importers/evolution-ldif-importer.c:680
 msgid "Evolution LDIF importer"
 msgstr "ì??ë³¼ë£¨ì?? LDIF ê°?ì ¸ì?¤ê¸°"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:549
+#: ../addressbook/importers/evolution-vcard-importer.c:548
 msgid "vCard (.vcf, .gcrd)"
 msgstr "vCard (.vcf, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:550
+#: ../addressbook/importers/evolution-vcard-importer.c:549
 msgid "Evolution vCard Importer"
 msgstr "ì??ë³¼ë£¨ì?? vCard ê°?ì ¸ì?¤ê¸°"
 
-#: ../addressbook/printing/e-contact-print.glade.h:1
-msgid "10 pt. Tahoma"
-msgstr "10 í?¬ì?¸í?¸ Tahoma"
-
-#: ../addressbook/printing/e-contact-print.glade.h:2
-msgid "8 pt. Tahoma"
-msgstr "8 í?¬ì?¸í?¸ Tahoma"
-
-#: ../addressbook/printing/e-contact-print.glade.h:3
-msgid "Blank forms at end:"
-msgstr "ë??ë?¨ ë¹?ì?°ê¸°:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:4
-msgid "Body"
-msgstr "ë³¸ë¬¸"
-
-#: ../addressbook/printing/e-contact-print.glade.h:5
-msgid "Bottom:"
-msgstr "ì??ë??:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:6
-msgid "Dimensions:"
-msgstr "í?¬ê¸°:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:7
-msgid "F_ont..."
-msgstr "ê¸?ê¼´(_O)..."
-
-#: ../addressbook/printing/e-contact-print.glade.h:8
-msgid "Fonts"
-msgstr "ê¸?ê¼´"
-
-#: ../addressbook/printing/e-contact-print.glade.h:9
-msgid "Footer:"
-msgstr "ê¼¬ë¦¬ë§?:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:10
-msgid "Format"
-msgstr "í??ì??"
-
-#: ../addressbook/printing/e-contact-print.glade.h:11
-#: ../mail/em-mailer-prefs.c:433 ../widgets/table/e-table-click-to-add.c:502
-#: ../widgets/table/e-table-field-chooser-dialog.c:81
-#: ../widgets/table/e-table-field-chooser-item.c:647
-#: ../widgets/table/e-table-field-chooser.c:80
-#: ../widgets/table/e-table-header-item.c:1907
-#: ../widgets/table/e-table-selection-model.c:309
-msgid "Header"
-msgstr "ë¨¸ë¦¬ë§?:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:12
-msgid "Header/Footer"
-msgstr "ë¨¸ë¦¬ë§?/ê¼¬ë¦¬ë§?"
-
-#: ../addressbook/printing/e-contact-print.glade.h:13
-msgid "Headings"
-msgstr "ë¨¸ë¦¿ë§?"
-
-#: ../addressbook/printing/e-contact-print.glade.h:14
-msgid "Headings for each letter"
-msgstr "ê°? ì?¥ë§?ë?¤ í??ì ?ë?¬ê¸°"
-
-#: ../addressbook/printing/e-contact-print.glade.h:15
-msgid "Height:"
-msgstr "ë??ì?´:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:16
-msgid "Immediately follow each other"
-msgstr "ê°?ê°?ì?? ì?´ì?´ì?? í??ì??"
-
-#: ../addressbook/printing/e-contact-print.glade.h:17
-msgid "Include:"
-msgstr "í?¬í?¨:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:18
-msgid "Landscape"
-msgstr "ê°?ë¡?"
-
-#: ../addressbook/printing/e-contact-print.glade.h:19
-msgid "Left:"
-msgstr "ì?¼ìª½:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:20
-msgid "Letter tabs on side"
-msgstr "ê°?ì?¥ì??ë¦¬ì?? ì²«ê¸?ì?? í?"
-
-#: ../addressbook/printing/e-contact-print.glade.h:21
-msgid "Margins"
-msgstr "ì?¬ë°±"
-
-#: ../addressbook/printing/e-contact-print.glade.h:22
-msgid "Number of columns:"
-msgstr "ì?´ ì??:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:23
-msgid "Options"
-msgstr "ì?µì??"
-
-#: ../addressbook/printing/e-contact-print.glade.h:24
-msgid "Orientation"
-msgstr "ë°©í?¥"
-
-#: ../addressbook/printing/e-contact-print.glade.h:25
-msgid "Page"
-msgstr "í??ì?´ì§?"
-
-#: ../addressbook/printing/e-contact-print.glade.h:26
-msgid "Page Setup:"
-msgstr "í??ì?´ì§? ì?¤ì ?:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:27
-msgid "Paper"
-msgstr "ì¢?ì?´"
-
-#: ../addressbook/printing/e-contact-print.glade.h:28
-msgid "Paper source:"
-msgstr "ê¸?ì§?ë°©ë²?:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:29
-msgid "Portrait"
-msgstr "ì?¸ë¡?"
-
-#: ../addressbook/printing/e-contact-print.glade.h:30
-msgid "Preview:"
-msgstr "ë¯¸ë¦¬ ë³´ê¸°:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:31
-msgid "Print using gray shading"
-msgstr "í??ì?? ëª?ì??ì?¼ë¡? ì?¸ì??"
-
-#: ../addressbook/printing/e-contact-print.glade.h:32
-msgid "Reverse on even pages"
-msgstr "ì§?ì?? í??ì?´ì§? ë?¤ì§?ê¸°"
-
-#: ../addressbook/printing/e-contact-print.glade.h:33
-msgid "Right:"
-msgstr "ì?¤ë¥¸ìª½:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:34
-msgid "Sections:"
-msgstr "ì?¹ì??:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:35
-msgid "Shading"
-msgstr "ëª?ì??"
-
-#. FIXME: Take care of i18n
-#: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:1141
-#: ../plugins/exchange-operations/exchange-calendar.c:236
-#: ../plugins/exchange-operations/exchange-contacts.c:222
-msgid "Size:"
-msgstr "í?¬ê¸°:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:37
-msgid "Start on a new page"
-msgstr "ì?? í??ì?´ì§?ë¥¼ ì??ì??í?©ë??ë?¤"
-
-#: ../addressbook/printing/e-contact-print.glade.h:38
-msgid "Style name:"
-msgstr "í??ì?? ì?´ë¦?:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:39
-msgid "Top:"
-msgstr "ì??:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:40
-#: ../calendar/gui/dialogs/calendar-setup.c:154
-msgid "Type:"
-msgstr "í??í??:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:41
-msgid "Width:"
-msgstr "ë??ë¹?:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:42
-msgid "_Font..."
-msgstr "ê¸?ê¼´(_F)..."
-
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:656
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:692
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:50
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:643
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:678
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:48
 msgid "Can not open file"
 msgstr "í??ì?¼ì?? ì?´ ì?? ì??ì?µë??ë?¤"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:44
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:42
 msgid "Couldn't get list of address books"
 msgstr "ì£¼ì??ë¡?ì?? ëª©ë¡?ì?? ê°?ì ¸ì?¬ ì?? ì??ì?µë??ë?¤"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:72
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:70
 msgid "failed to open book"
 msgstr "ì£¼ì??ë¡?ì?? ì?¬ë?? ë?° ì?¤í?¨í??ì?µë??ë?¤"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:48
+#: ../addressbook/tools/evolution-addressbook-export.c:45
 msgid "Specify the output file instead of standard output"
 msgstr "í??ì¤? ì¶?ë ¥ ë??ì? ì?? ì¶?ë ¥í?  í??ì?¼ì?? ì§?ì ?í?©ë??ë?¤"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:49
+#: ../addressbook/tools/evolution-addressbook-export.c:46
 msgid "OUTPUTFILE"
 msgstr "<ì¶?ë ¥í??ì?¼>"
 
 # command line help
-#: ../addressbook/tools/evolution-addressbook-export.c:52
+#: ../addressbook/tools/evolution-addressbook-export.c:49
 msgid "List local address book folders"
 msgstr "ë¡?ì»¬ ì£¼ì??ë¡? í?´ë?? ëª©ë¡?ì?? í??ì??í?©ë??ë?¤"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:55
+#: ../addressbook/tools/evolution-addressbook-export.c:52
 msgid "Show cards as vcard or csv file"
 msgstr "ì¹´ë??ë¥¼ vcard í?¹ì?? csv í??ì?¼ë¡? í??ì??í?©ë??ë?¤"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:56
+#: ../addressbook/tools/evolution-addressbook-export.c:53
 msgid "[vcard|csv]"
 msgstr "[vcard|csv]"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:59
+#: ../addressbook/tools/evolution-addressbook-export.c:56
 msgid "Export in asynchronous mode"
 msgstr "ë¹?ë??ê¸° ëª¨ë??ë¡? ë?´ë³´ë??ë??ë?¤"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:62
+#: ../addressbook/tools/evolution-addressbook-export.c:59
 msgid ""
 "The number of cards in one output file in asynchronous mode, default size "
 "100."
 msgstr "ë¹?ë??ê¸° ëª¨ë??ì??ì?? ì¶?ë ¥ í??ì?¼ í?? ê°?ì?? ë?¤ì?´ê°? ì¹´ë?? ê°?ì??, ê¸°ë³¸ í?¬ê¸° 100."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:64
+#: ../addressbook/tools/evolution-addressbook-export.c:61
 msgid "NUMBER"
 msgstr "<ê°?ì??>"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:101
+#: ../addressbook/tools/evolution-addressbook-export.c:99
 msgid ""
 "Command line arguments error, please use --help option to see the usage."
 msgstr ""
 "ëª?ë ¹í?? ì?¸ì??ì?? ì?¤ë¥?ê°? ë°?ì??í??ì?µë??ë?¤. --help ì?µì??ì?? ì?¬ì?©í?´ ì?¬ì?©ë²?ì?? í??ì?¸í??ì?ì??"
 "ì?¤."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:115
+#: ../addressbook/tools/evolution-addressbook-export.c:113
 msgid "Only support csv or vcard format."
 msgstr "csv í?¹ì?? vcard í??ì??ë§?ì?? ì§?ì??í?©ë??ë?¤."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:124
+#: ../addressbook/tools/evolution-addressbook-export.c:122
 msgid "In async mode, output must be file."
 msgstr "ë¹?ë??ê¸° ëª¨ë??ì??ì??ë??, í??ì?¼ë¡? ì¶?ë ¥í?´ì?¼ í?©ë??ë?¤."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:132
+#: ../addressbook/tools/evolution-addressbook-export.c:130
 msgid "In normal mode, there is no need for the size option."
 msgstr "ì?¼ë°? ëª¨ë??ì??ì??ë??, í?¬ê¸° ì?µì??ì?´ í??ì?? ì??ì?µë??ë?¤."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:163
+#: ../addressbook/tools/evolution-addressbook-export.c:161
 msgid "Unhandled error"
 msgstr "ì²?ë¦¬í??ì§? ëª»í?? ì?¤ë¥?"
 
@@ -4552,7 +3192,7 @@ msgstr "ì??ë³¼ë£¨ì??ì?? ë?¤ì?? ì??ì??í?  ë??ê¹?ì§?ë?? ì??ì??ì?? ì?¬ì?©í?  ì?? 
 msgid "_Discard Changes"
 msgstr "ë°?ë?? ë?´ì?© ë²?ë¦¬ê¸°(_D)"
 
-#: ../calendar/calendar.error.xml.h:86 ../composer/e-composer-actions.c:497
+#: ../calendar/calendar.error.xml.h:86 ../composer/e-composer-actions.c:343
 msgid "_Save"
 msgstr "ì ?ì?¥(_S)"
 
@@ -4575,56 +3215,56 @@ msgid "{0}."
 msgstr "{0}."
 
 # event -> í??ì?¬, Microsoft Office XP ì°¸ê³ 
-#: ../calendar/conduits/calendar/calendar-conduit.c:258
+#: ../calendar/conduits/calendar/calendar-conduit.c:248
 msgid "Split Multi-Day Events:"
 msgstr "ì?¬ë?¬ ë? ì?? ê±¸ì¹? í??ì?¬ ë¶?ë¦¬:"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1523
-#: ../calendar/conduits/calendar/calendar-conduit.c:1524
-#: ../calendar/conduits/memo/memo-conduit.c:821
-#: ../calendar/conduits/memo/memo-conduit.c:822
-#: ../calendar/conduits/todo/todo-conduit.c:1019
-#: ../calendar/conduits/todo/todo-conduit.c:1020
+#: ../calendar/conduits/calendar/calendar-conduit.c:1513
+#: ../calendar/conduits/calendar/calendar-conduit.c:1514
+#: ../calendar/conduits/memo/memo-conduit.c:807
+#: ../calendar/conduits/memo/memo-conduit.c:808
+#: ../calendar/conduits/todo/todo-conduit.c:1007
+#: ../calendar/conduits/todo/todo-conduit.c:1008
 msgid "Could not start evolution-data-server"
 msgstr "evolution-data-serverë¥¼ ì??ì??í?  ì?? ì??ì?µë??ë?¤"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1631
-#: ../calendar/conduits/calendar/calendar-conduit.c:1634
+#: ../calendar/conduits/calendar/calendar-conduit.c:1621
+#: ../calendar/conduits/calendar/calendar-conduit.c:1624
 msgid "Could not read pilot's Calendar application block"
 msgstr "í??ì?¼ë¡¯ì?? Calendar í??ë¡?ê·¸ë?¨ ë¸?ë¡?ì?? ì?½ì?? ì?? ì??ì?µë??ë?¤"
 
-#: ../calendar/conduits/memo/memo-conduit.c:915
-#: ../calendar/conduits/memo/memo-conduit.c:918
+#: ../calendar/conduits/memo/memo-conduit.c:901
+#: ../calendar/conduits/memo/memo-conduit.c:904
 msgid "Could not read pilot's Memo application block"
 msgstr "í??ì?¼ë¡¯ì?? Memo í??ë¡?ê·¸ë?¨ ë¸?ë¡?ì?? ì?½ì?? ì?? ì??ì?µë??ë?¤"
 
-#: ../calendar/conduits/memo/memo-conduit.c:962
-#: ../calendar/conduits/memo/memo-conduit.c:965
+#: ../calendar/conduits/memo/memo-conduit.c:948
+#: ../calendar/conduits/memo/memo-conduit.c:951
 msgid "Could not write pilot's Memo application block"
 msgstr "í??ì?¼ë¡¯ì?? Memo í??ë¡?ê·¸ë?¨ ë¸?ë¡?ì?? ì?¸ ì?? ì??ì?µë??ë?¤"
 
-#: ../calendar/conduits/todo/todo-conduit.c:241
+#: ../calendar/conduits/todo/todo-conduit.c:227
 msgid "Default Priority:"
 msgstr "ê¸°ë³¸ ì?°ì? ì??ì??:"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1103
-#: ../calendar/conduits/todo/todo-conduit.c:1106
+#: ../calendar/conduits/todo/todo-conduit.c:1091
+#: ../calendar/conduits/todo/todo-conduit.c:1094
 msgid "Could not read pilot's ToDo application block"
 msgstr "í??ì?¼ë¡¯ì?? ToDo í??ë¡?ê·¸ë?¨ ë¸?ë¡?ì?? ì?½ì?? ì?? ì??ì?µë??ë?¤"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1148
-#: ../calendar/conduits/todo/todo-conduit.c:1151
+#: ../calendar/conduits/todo/todo-conduit.c:1136
+#: ../calendar/conduits/todo/todo-conduit.c:1139
 msgid "Could not write pilot's ToDo application block"
 msgstr "í??ì?¼ë¡¯ì?? ToDo í??ë¡?ê·¸ë?¨ ë¸?ë¡?ì?? ì?¸ ì?? ì??ì?µë??ë?¤"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2523
+#: ../plugins/itip-formatter/itip-formatter.c:2549
 msgid "Calendar and Tasks"
 msgstr "ë?¬ë ¥ ë°? ì??ì??"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:869
-#: ../calendar/gui/calendar-component.c:1291
+#: ../calendar/gui/calendar-component.c:819
+#: ../calendar/gui/calendar-component.c:1238
 msgid "Calendars"
 msgstr "ë?¬ë ¥"
 
@@ -4665,24 +3305,24 @@ msgid "Memo_s"
 msgstr "ë©?ëª¨(_S)"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: ../calendar/gui/e-memo-table.c:293 ../calendar/gui/e-memos.c:1133
-#: ../calendar/gui/gnome-cal.c:1821 ../calendar/gui/memos-component.c:594
-#: ../calendar/gui/memos-component.c:912 ../calendar/gui/memos-control.c:350
-#: ../calendar/gui/memos-control.c:366
+#: ../calendar/gui/e-memo-table.c:293 ../calendar/gui/e-memos.c:1123
+#: ../calendar/gui/gnome-cal.c:1846 ../calendar/gui/memos-component.c:564
+#: ../calendar/gui/memos-component.c:882 ../calendar/gui/memos-control.c:386
+#: ../calendar/gui/memos-control.c:402
 msgid "Memos"
 msgstr "ë©?ëª¨"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:725 ../calendar/gui/e-tasks.c:1437
-#: ../calendar/gui/gnome-cal.c:1689 ../calendar/gui/print.c:1988
-#: ../calendar/gui/tasks-component.c:586 ../calendar/gui/tasks-component.c:908
-#: ../calendar/gui/tasks-control.c:482 ../calendar/gui/tasks-control.c:498
+#: ../calendar/gui/e-calendar-table.c:725 ../calendar/gui/e-tasks.c:1426
+#: ../calendar/gui/gnome-cal.c:1714 ../calendar/gui/print.c:1973
+#: ../calendar/gui/tasks-component.c:557 ../calendar/gui/tasks-component.c:879
+#: ../calendar/gui/tasks-control.c:524 ../calendar/gui/tasks-control.c:540
 #: ../calendar/importers/icalendar-importer.c:76
-#: ../calendar/importers/icalendar-importer.c:749
-#: ../plugins/exchange-operations/exchange-delegates-user.c:78
-#: ../plugins/exchange-operations/exchange-folder.c:588
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:425
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:569
+#: ../calendar/importers/icalendar-importer.c:751
+#: ../plugins/exchange-operations/exchange-delegates-user.c:75
+#: ../plugins/exchange-operations/exchange-folder.c:586
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:420
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:563
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
 msgid "Tasks"
 msgstr "ì??ì??"
@@ -4693,7 +3333,7 @@ msgstr "ë?¬ë ¥(_C)"
 
 #. Tasks
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:15
-#: ../plugins/pst-import/pst-importer.c:331 ../views/tasks/galview.xml.h:3
+#: ../plugins/pst-import/pst-importer.c:328 ../views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "ì??ì??(_T)"
 
@@ -4702,25 +3342,25 @@ msgstr "ì??ì??(_T)"
 msgid "Evolution Calendar alarm notification service"
 msgstr "ì??ë³¼ë£¨ì?? ë?¬ë ¥ ì??ë¦¼ ì??ë¹?ì?¤"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:105
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:100
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "ë¶?"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:120
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:115
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:25
-#: ../calendar/gui/dialogs/event-page.glade.h:19 ../filter/filter.glade.h:15
-#: ../plugins/caldav/caldav-source.c:431
-#: ../plugins/calendar-http/calendar-http.c:280
-#: ../plugins/calendar-weather/calendar-weather.c:525
-#: ../plugins/google-account-setup/google-source.c:653
-#: ../plugins/google-account-setup/google-contacts-source.c:367
+#: ../calendar/gui/dialogs/event-page.glade.h:23
+#: ../plugins/caldav/caldav-source.c:449
+#: ../plugins/calendar-file/calendar-file.c:287
+#: ../plugins/calendar-http/calendar-http.c:324
+#: ../plugins/calendar-weather/calendar-weather.c:524
+#: ../plugins/google-account-setup/google-source.c:721
+#: ../plugins/google-account-setup/google-contacts-source.c:331
 msgid "hours"
 msgid_plural "hours"
 msgstr[0] "ì??ê°?"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:298
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:293
 msgid "Start time"
 msgstr "ì??ì?? ì??ê°?"
 
@@ -4735,10 +3375,10 @@ msgstr "ëª¨ë?? í?´ì ?(_A)"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:3
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1608
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1614
-#: ../calendar/gui/e-itip-control.c:1167
-#: ../plugins/itip-formatter/itip-view.c:1021
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1592
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1598
+#: ../calendar/gui/e-itip-control.c:1164
+#: ../plugins/itip-formatter/itip-view.c:1023
 msgid "Location:"
 msgstr "ì??ì¹?:"
 
@@ -4751,11 +3391,11 @@ msgid "_Dismiss"
 msgstr "í?´ì ?(_D)"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
-#: ../calendar/gui/dialogs/comp-editor.c:1382
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:10
-#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:170
+#: ../calendar/gui/dialogs/comp-editor.c:1038
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:8
+#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:167
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:15
-#: ../plugins/publish-calendar/publish-calendar.glade.h:21
+#: ../plugins/publish-calendar/publish-calendar.glade.h:22
 #: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:43
 #: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
 #: ../ui/evolution-tasks.xml.h:25 ../ui/evolution.xml.h:42
@@ -4771,33 +3411,33 @@ msgstr "ì?°ê¸° ëª¨ë??(_S)"
 msgid "location of appointment"
 msgstr "ì?½ì?? ì?¥ì??"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1466
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1591
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1451
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1575
 msgid "No summary available."
 msgstr "ì??ì?½ì?´ ì??ì?µë??ë?¤."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1475
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1477
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1460
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1462
 msgid "No description available."
 msgstr "ì?¤ëª?ì?´ ì??ì?µë??ë?¤."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1485
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1470
 msgid "No location information available."
 msgstr "ì??ì¹? ì ?ë³´ê°? ì??ì?µë??ë?¤."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1530
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1515
 #, c-format
 msgid "You have %d alarms"
 msgstr "%dê°? ì??ë¦¼ì?´ ì??ì?µë??ë?¤"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1692
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1720
-#: ../e-util/e-non-intrusive-error-dialog.h:41
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1675
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1703
+#: ../e-util/e-non-intrusive-error-dialog.h:40
 msgid "Warning"
 msgstr "ê²½ê³ "
 
 # Reminder -> ë¯¸ë¦¬ ì??ë¦¼, Microsoft Office XP
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1696
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1679
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4810,7 +3450,7 @@ msgstr ""
 "ë³´ë?´ë?? ë??ì?  ì?¼ë°?ì ?ì?¸ ë¯¸ë¦¬ ì??ë¦¼ ë??í?? ì??ì??ë¥¼ í??ì??í?©ë??ë?¤."
 
 # Reminder -> ë¯¸ë¦¬ ì??ë¦¼, Microsoft Office XP
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1726
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1709
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4827,7 +3467,7 @@ msgstr ""
 "\n"
 "ì ?ë§?ë¡? ì?´ í??ë¡?ê·¸ë?¨ì?? ì?¤í??í??ì??ê² ì?µë??ê¹??"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1740
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1723
 msgid "Do not ask me about this program again."
 msgstr "ì?´ ë©?ì??ì§?ë¥¼ ë?¤ì?? ë³´ì§? ì??ì?µë??ë?¤."
 
@@ -4899,166 +3539,179 @@ msgid "Calendars to run alarms for"
 msgstr "ì??ë¦¼ì?? ì?¤í??í?  ë?¬ë ¥"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:7
+msgid "Check this to use system timezone in Evolution."
+msgstr "ì°¸ì?´ë©´ ì??ë³¼ë£¨ì??ì??ì?? ì??ì?¤í?? ì??ê°?ë??ë¥¼ ì?¬ì?©í?©ë??ë?¤."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:8
 msgid ""
 "Color to draw the Marcus Bains Line in the Time bar (empty for default)."
 msgstr "ì??ê°? ë§?ë??ì?? ë§?ì»¤ì?¤ ë² ì?¸ì?¤ ë?¼ì?¸ì?? ê·¸ë¦´ ì?? (ê¸°ë³¸ê°?ì?? ë¹?ì?´ ì??ì??)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:8
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
 msgid "Color to draw the Marcus Bains line in the Day View."
 msgstr "í??ë£¨ì?© ë³¼ ë?? ë§?ì»¤ì?¤ ë² ì?¸ì?¤ ë?¼ì?¸ì?? ê·¸ë¦´ ì??."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10
 msgid "Compress weekends in month view"
 msgstr "í?? ë?¬ì?© ë³¼ ë?? í? ì??ì?¼/ì?¼ì??ì?¼ì?? í?? ì¹¸ì?? í??ì??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
 msgid "Confirm expunge"
 msgstr "í?´ë?? ë¹?ì?¸ ë?? í??ì?¸ ì§?ë¬¸"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
+msgid "Count of default recurrence for a new event. -1 means forever."
+msgstr "ì?? í??ì?¬ì?? ê¸°ë³¸ ë°?ë³µ í??ì??. -1ì?? ê³?ì?? ë°?ë³µí??ë?¤ë?? ë?»ì??ë??ë?¤."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
 msgid "Days on which the start and end of work hours should be indicated."
 msgstr "ê·¼ë¬´ ì??ì??/ë?? ì??ê°?ì?? ì§?ì ?í?  ë? ."
 
 # Reminder -> ë¯¸ë¦¬ ì??ë¦¼, Microsoft Office XP
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
 msgid "Default appointment reminder"
 msgstr "ê¸°ë³¸ ì?½ì?? ë¯¸ë¦¬ ì??ë¦¼"
 
 # Reminder -> ë¯¸ë¦¬ ì??ë¦¼, Microsoft Office XP
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
+msgid "Default recurrence count"
+msgstr "ê¸°ë³¸ ë°?ë³µ í??ì??"
+
+# Reminder -> ë¯¸ë¦¬ ì??ë¦¼, Microsoft Office XP
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
 msgid "Default reminder units"
 msgstr "ê¸°ë³¸ ë¯¸ë¦¬ ì??ë¦¼ ë?¨ì??"
 
 # Reminder -> ë¯¸ë¦¬ ì??ë¦¼, Microsoft Office XP
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
 msgid "Default reminder value"
 msgstr "ê¸°ë³¸ ë¯¸ë¦¬ ì??ë¦¼ ê°?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
 msgid "Directory for saving alarm audio files"
 msgstr "ì??ë¦¼ ì?¤ë??ì?¤ í??ì?¼ì?? ì ?ì?¥í?  ë??ë ?í?°ë¦¬"
 
 # event -> í??ì?¬, Microsoft Office XP ì°¸ê³ 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
 msgid "Event Gradient"
 msgstr "í??ì?¬ ê·¸ë?¼ë??ì?¸í?¸"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
 msgid "Event Transparency"
 msgstr "í??ì?¬ í?¬ëª?ë??"
 
 # free/busy -> ì?½ì?? ì??ì??/ì??ì??, Microsoft Office XP ì°¸ê³ 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
 msgid "Free/busy server URLs"
 msgstr "ì?½ì?? ì??ì??/ì??ì?? ì??ë²? URL"
 
 # free/busy -> ì?½ì?? ì??ì??/ì??ì??, Microsoft Office XP ì°¸ê³ 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
 msgid "Free/busy template URL"
-msgstr "ì?½ì?? ì??ì??/ì??ì?? í??í??ë¦¬í?¸ URL"
+msgstr "ì?½ì?? ì??ì??/ì??ì?? ì??ì?? URL"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
 msgid "Gradient of the events in calendar views."
 msgstr "ë?¬ë ¥ ë³´ê¸°ì??ì?? í??ì?¬ì?? ê·¸ë?¼ë??ì?¸í?¸."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
 msgid "Hide completed tasks"
 msgstr "ë??ë§?ì¹? ì??ì?? ì?¨ê¸°ê¸°"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:25
 msgid "Hide task units"
 msgstr "ì??ì?? ë?¨ì?? ì?¨ê¸°ê¸°"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26
 msgid "Hide task value"
 msgstr "ì??ì?? ê°? ì?¨ê¸°ê¸°"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
 msgid "Horizontal pane position"
 msgstr "ê°?ë¡? ì°½ ì??ì¹?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:25
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
 msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
 msgstr "ê·¼ë¬´ì?¼ì?? ë??ë??ë?? ì??ê°?, 24ì??ê°? í??ì??ì?¼ë¡? 0ì??ì?? 23ê¹?ì§?."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29
 msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
 msgstr "ê·¼ë¬´ì?¼ì?? ì??ì??í??ë?? ì??ê°?, 24ì??ê°? í??ì??ì?¼ë¡? 0ì??ì?? 23ê¹?ì§?."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
 msgid "Intervals shown in Day and Work Week views, in minutes."
 msgstr "ì?¼ë³? ë³´ê¸° ë°? ê·¼ë¬´ì?¼ ì£¼ë³? ë³´ê¸°ì?? ë³´ì?¼ ì??ê°? ê°?ê²©, ë¶? ë?¨ì??."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
 msgid "Last alarm time"
 msgstr "ë§?ì§?ë§? ì??ë¦¼ ì??ê°?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
+#: ../mail/evolution-mail.schemas.in.h:73
 msgid "Level beyond which the message should be logged."
 msgstr "ì?´ë?¤ ë©?ì??ì§?ë¥¼ ê¸°ë¡?í?  ì§? ë?¨ê³?."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
 msgid "List of recently used second time zones in a Day View."
 msgstr "ì?¼ë³? ë³´ê¸°ì??ì?? ìµ?ê·¼ì?? ì?¬ì?©í?? ë³´ì¡° ì??ê°?ë??ì?? ëª©ë¡?."
 
 # free/busy -> ì?½ì?? ì??ì??/ì??ì??, Microsoft Office XP ì°¸ê³ 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
 msgid "List of server URLs for free/busy publishing."
 msgstr "ì?½ì?? ì??ì??/ì??ì?? ì ?ë³´ë¥¼ ê²?ì??í?  ì??ë²? URL ëª©ë¡?."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
 msgid "Marcus Bains Line"
 msgstr "ë§?ì»¤ì?¤ ë² ì?¸ ë?¼ì?¸"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
 msgid "Marcus Bains Line Color - Day View"
 msgstr "ë§?ì»¤ì?¤ ë² ì?¸ ë?¼ì?¸ ì?? - ë? ì§?ë³? ë³´ê¸°"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
 msgid "Marcus Bains Line Color - Time bar"
 msgstr "ë§?ì»¤ì?¤ ë² ì?¸ ë?¼ì?¸ ì?? - ì??ê°? ë§?ë??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
 msgid ""
 "Maximum number of recently used timezones to remember in a "
 "'day_second_zones' list."
 msgstr "'day_second_zones' ëª©ë¡?ì??ì?? ê¸°ì?µí?  ìµ?ê·¼ì?? ì?¬ì?©í?? ì??ê°?ë??ì?? ìµ?ë?? ì??."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
 msgid "Maximum number of recently used timezones to remember."
 msgstr "ìµ?ê·¼ì?? ì?¬ì?©í?? ì??ê°?ë??ë¥¼ ê¸°ì?µí?  ìµ?ë?? ì??."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
 msgid "Minute the workday ends on, 0 to 59."
 msgstr "ê·¼ë¬´ì?¼ì?? ë??ë??ë?? ë¶?, 0ì??ì?? 59ê¹?ì§?."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
 msgid "Minute the workday starts on, 0 to 59."
 msgstr "ê·¼ë¬´ì?¼ì?? ì??ì??í??ë?? ë¶?, 0ì??ì?? 59ê¹?ì§?."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
 msgid "Month view horizontal pane position"
 msgstr "í?? ë?¬ì?© ë³´ê¸° ê°?ë¡? ì°½ ì??ì¹?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
 msgid "Month view vertical pane position"
 msgstr "í?? ë?¬ì?© ë³´ê¸° ì?¸ë¡? ì°½ ì??ì¹?"
 
 # Reminder -> ë¯¸ë¦¬ ì??ë¦¼, Microsoft Office XP
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
 msgid "Number of units for determining a default reminder."
 msgstr "ê¸°ë³¸ ë¯¸ë¦¬ ì??ë¦¼ ì?¬ë¶?ë¥¼ ê²°ì ?í?  ë?¨ì??ì?? ì??."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
 msgid "Number of units for determining when to hide tasks."
 msgstr "ì?¸ì ? ì??ì??ì?? ê°?ì¶? ì§? ê²°ì ?í?  ë?¨ì??ì?? ì??."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
 msgid "Overdue tasks color"
 msgstr "ë§?ê°?ì?´ ì§?ë?? ì??ì?? ì??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
@@ -5066,7 +3719,7 @@ msgstr ""
 "ê°?ë¡? ì°½ì?? ì??ì¹?, í?? ë?¬ì?© ë³´ê¸°ê°? ì??ë?? ë?? ë? ì§? ì? í?? ë?¬ë ¥ê³¼ ì??ì?? ëª©ë¡? ì?¬ì?´, í?½ì?? "
 "ë?¨ì??."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -5074,19 +3727,19 @@ msgstr ""
 "ê°?ë¡? ì°½ì?? ì??ì¹?, í?? ë?¬ì?© ë³´ê¸°ì??ì?? ë·°ì?? ë? ì§? ì? í?? ë?¬ë ¥ê³¼ ì??ì?? ëª©ë¡? ì?¬ì?´, í?½ì?? "
 "ë?¨ì??."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
 msgid ""
 "Position of the vertical pane, between the calendar lists and the date "
 "navigator calendar."
 msgstr "ì?¸ë¡? ì°½ì?? ì??ì¹?, ì¹´ë?? ëª©ë¡?ê³¼ ë? ì§? ì°¾ì??ë³´ê¸° ë?¬ë ¥ ì?¬ì?´."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
 msgid ""
 "Position of the vertical pane, between the task list and the task preview "
 "pane, in pixels."
 msgstr "ì?¸ë¡? ì°½ì?? ì??ì¹?, ì??ì?? ëª©ë¡?ê³¼ ì??ì?? ë¯¸ë¦¬ ë³´ê¸° ì°½ ì?¬ì?´, í?½ì?? ë?¨ì??."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -5094,7 +3747,7 @@ msgstr ""
 "ì?¸ë¡? ì°½ì?? ì??ì¹?, í?? ë?¬ì?© ë³´ê¸°ì??ì?? ë·°ì?? ë? ì§? ì? í?? ë?¬ë ¥ê³¼ ì??ì?? ëª©ë¡? ì?¬ì?´, í?½ì?? "
 "ë?¨ì??."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list when not in the month view, in pixels."
@@ -5102,69 +3755,85 @@ msgstr ""
 "ì?¸ë¡? ì°½ì?? ì??ì¹?, í?? ë?¬ì?© ë³´ê¸°ê°? ì??ë?? ë?? ë·°ì?? ë? ì§? ì? í?? ë?¬ë ¥ê³¼ ì??ì?? ëª©ë¡? ì?¬ì?´, "
 "í?½ì?? ë?¨ì??."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
+msgid "Primary calendar"
+msgstr "ì£¼ì?? ë?¬ë ¥"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
+msgid "Primary memo list"
+msgstr "ì£¼ì?? ë©?ëª¨ ëª©ë¡?"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
+msgid "Primary task list"
+msgstr "ì£¼ì?? ì??ì?? ëª©ë¡?"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
 msgid "Programs that are allowed to be run by alarms."
 msgstr "ì??ë¦¼ì??ì?? ì?¤í??í?  í??ë¡?ê·¸ë?¨."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
 msgid "Recently used second time zones in a Day View"
 msgstr "ì?¼ë³? ë³´ê¸°ì??ì?? ìµ?ê·¼ì?? ì?¬ì?©í?? ë³´ì¡° ì??ê°?ë??."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
 msgid "Save directory for alarm audio"
 msgstr "ì??ë?? ì?¤ë??ì?¤ ì ?ì?¥ ë??ë ?í?°ë¦¬"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
+msgid "Scroll Month View by a week"
+msgstr "í?? ì£¼ ë?¨ì??ë¡? ë?¬ë³? ë³´ê¸°ë¥¼ ì?¤í?¬ë¡¤"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:60
 msgid "Show RSVP field in the event/task/meeting editor"
 msgstr "í??ì?¬/ì??ì??/ëª¨ì?? í?¸ì§?ì??ì?? ì??ë?µì??ì² í?ëª© í??ì??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
 msgid "Show Role field in the event/task/meeting editor"
 msgstr "í??ì?¬/ì??ì??/ëª¨ì?? í?¸ì§?ì??ì?? ì?í?  í?ëª© í??ì??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
 msgid "Show appointment end times in week and month views"
 msgstr "í?? ì£¼ì?© ë³´ê±°ë?? í?? ë?¬ì?© ë³¼ ë?? ì?½ì?? ë??ë??ë?? ì??ê°? í??ì??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
 msgid "Show categories field in the event/meeting/task editor"
 msgstr "í??ì?¬/ì??ì??/ëª¨ì?? í?¸ì§?ì??ì?? ë¶?ë¥? í?ëª© í??ì??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
 msgid "Show display alarms in notification tray"
 msgstr "ì??ë¦¼ ì??ì?ì??ì?? ì??ë¦¼ í??ì??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
 msgid "Show status field in the event/task/meeting editor"
 msgstr "í??ì?¬/ì??ì??/ëª¨ì?? í?¸ì§?ì??ì?? ì??í?? í?ëª© í??ì??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid "Show the \"Preview\" pane"
 msgstr "\"ë¯¸ë¦¬ ë³´ê¸°\" ì°½ í??ì??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:60
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:141
 msgid "Show the \"Preview\" pane."
 msgstr "\"ë¯¸ë¦¬ ë³´ê¸°\" ì°½ì?? í??ì??í?©ë??ë?¤."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
 msgid "Show timezone field in the event/meeting editor"
 msgstr "í??ì?¬/ëª¨ì?? í?¸ì§?ì??ì?? ì??ê°?ë?? í?ëª©ì?? í??ì??í?©ë??ë?¤"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
 msgid "Show type field in the event/task/meeting editor"
 msgstr "í??ì?¬/ì??ì??/ëª¨ì?? í?¸ì§?ì??ì?? ì¢?ë¥? í?ëª©ì?? í??ì??í?©ë??ë?¤"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
 msgid "Show week number in Day and Work Week View"
 msgstr "ì?¼ë³? ë³´ê¸° ë°? ê·¼ë¬´ì?¼ ì£¼ë³? ë³´ê¸°ì??ì?? ëª? ë²?ì§¸ ì£¼ì?¸ì§? í??ì??í?©ë??ë?¤"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
 msgid "Show week numbers in date navigator"
 msgstr "ë? ì§? ì? í??í?  ë?? ëª? ë²?ì§¸ ì£¼ì?¸ì§? í??ì??í?©ë??ë?¤"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
 msgid ""
 "Shows the second time zone in a Day View, if set. Value is similar to one "
 "used in a 'timezone' key."
@@ -5172,25 +3841,23 @@ msgstr ""
 "ë³´ì¡° ì??ê°?ë??ê°? ì??ì?¼ë©´, ì?¼ë³? ë³´ê¸°ì??ì?? ë³´ì¡° ì??ê°?ë??ë¥¼ í??ì??í?©ë??ë?¤. ê°?ì?? "
 "'timezone' í?¤ì??ì?? ì?¬ì?©í?? ê°?ê³¼ ë¹?ì?·í?©ë??ë?¤."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
 msgid "Tasks due today color"
 msgstr "ì?¤ë?? ë§?ê°?ì?¸ ì??ì??ì?? ì??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
 msgid "Tasks vertical pane position"
 msgstr "ì??ì?? ì?¸ë¡? ì°½ ì??ì¹?"
 
 # free/busy -> ì?½ì?? ì??ì??/ì??ì??, Microsoft Office XP ì°¸ê³ 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
 #, no-c-format
 msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
 "user part of the mail address and %d is replaced by the domain."
-msgstr ""
-"ì?½ì?? ì??ì??/ì??ì?? ë?°ì?´í?° ë??ì²´í??ì?¼ë¡? ì?¬ì?©í?  URL í??í??ë¦¬í?¸, %uì??(ë??) ì ?ì??ë©?ì?¼ ì£¼ì??"
-"ì?? ì?¬ì?©ì?? ë¶?ë¶?, %dì??(ë??) ë??ë©?ì?¸ì?¼ë¡? ë°?ë??ë??ë?¤."
+msgstr "ì?½ì?? ì??ì??/ì??ì?? ë?°ì?´í?° ë??ì²´í??ì?¼ë¡? ì?¬ì?©í?  URL ì??ì??, %uì??(ë??) ì ?ì??ë©?ì?¼ ì£¼ì??ì?? ì?¬ì?©ì?? ë¶?ë¶?, %dì??(ë??) ë??ë©?ì?¸ì?¼ë¡? ë°?ë??ë??ë?¤."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olsen timezone database location like \"America/New York\"."
@@ -5198,217 +3865,236 @@ msgstr ""
 "ë?¬ë ¥ì?? ë? ì§?ì?? ì??ê°?ì?? ì?¬ì?©í?  ê¸°ë³¸ ì??ê°?ë??, \"America/New York\"ì²?ë?¼ ë²?ì?í??ì§? ì??"
 "ì?? Olsen ì??ê°?ë?? ë?°ì?´í?°ë² ì?´ì?¤ì?? ë?°ë?¼ì??."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
 msgid "The second timezone for a Day View"
 msgstr "ì?¼ë³? ë³´ê¸°ì??ì?? ë³´ì¡° ì??ê°?ë??."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
 msgid ""
 "This can have three possible values. 0 for errors. 1 for warnings. 2 for "
 "debug messages."
 msgstr ""
 "ì?¸ ê°?ì§? ê°?ì?´ ê°?ë?¥í?©ë??ë?¤. \"0\"ì?? ì?¤ë¥?, \"1\"ì?? ê²½ê³ , \"2\"ë?? ë??ë²?ê¹? ë©?ì??ì§?."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
 msgid "Time divisions"
 msgstr "ì??ê°? ê°?ê²©"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
 msgid "Time the last alarm ran, in time_t."
 msgstr "ìµ?ê·¼ì?? ì??ë¦¼ì?´ ì??ë??í?? ì??ê°?, time_t."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
-#: ../plugins/startup-wizard/startup-wizard.c:109
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
 msgid "Timezone"
 msgstr "ì??ê°?ë?? "
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
 msgid ""
 "Transparency of the events in calendar views, a value between 0 "
 "(transparent) and 1 (opaque)."
 msgstr "ë?¬ë ¥ ë³´ê¸°ì??ì?? í??ì?¬ì?? í?¬ëª?ë??, 0(í?¬ëª?)ì??ì?? 1(ë¶?í?¬ëª?) ì?¬ì?´ì?? ê°?."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
 msgid "Twenty four hour time format"
 msgstr "24ì??ê°? í??ì??"
 
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
+msgid "URI of the highlighted (\"primary\") calendar"
+msgstr "ì? í??í?? (\"ì£¼ì??\") ë?¬ë ¥ì?? URI"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
+msgid "URI of the highlighted (\"primary\") memo list"
+msgstr "ì? í??í?? (\"ì£¼ì??\") ë©?ëª¨ ëª©ë¡?ì?? URI"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
+msgid "URI of the highlighted (\"primary\") task list"
+msgstr "ì? í??í?? (\"ì£¼ì??\") ì??ì?? ëª©ë¡?ì?? URI"
+
 # Reminder -> ë¯¸ë¦¬ ì??ë¦¼, Microsoft Office XP
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr "ê¸°ë³¸ ë¯¸ë¦¬ ì??ë¦¼ì?? ë?¨ì??, \"minutes\", \"hours\" í?¹ì?? \"days\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
 msgid ""
 "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
 "ì??ì??ì?? ì?¸ì ? ì?¨ê¸¸ì§? ê²°ì ?í??ë?? ë?¨ì??, \"minutes\", \"hours\" í?¹ì?? \"days\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
+msgid "Use system timezone"
+msgstr "ì??ì?¤í?? ì??ê°?ë?? ì?¬ì?©"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
+msgid "Use the system timezone instead of the timezone selected in Evolution."
+msgstr "ì??ë³¼ë£¨ì??ì??ì?? ì? í??í?? ì??ê°?ë??ê°? ì??ë??ë?¼ ì??ì?¤í?? ì??ê°?ë??ë¥¼ ì?¬ì?©í?©ë??ë?¤."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
 msgid "Week start"
 msgstr "ì??ì?? ì??ì?¼"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr "í?? ì£¼ê°? ì??ì??í??ë?? ì??ì?¼, ì?¼ì??ì?¼(0)ì??ì?? í? ì??ì?¼(6)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
 msgid "Whether or not to use the notification tray for display alarms."
 msgstr "ì??ë¦¼ì?? í??ì??í?  ë?? ì??ë¦¼ ì??ì?ì?? ì?¬ì?©í?  ì§? ì?¬ë¶?."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
 msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr "ì?½ì??ì?´ë?? ì??ì??ì?? ì§?ì?¸ ë?? í??ì?¸ ì§?ë¬¸ì?? í?  ì§? ì?¬ë¶?."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr "ì§?ì?´ ì?½ì??ì?´ë?? ì??ì??ì?? ë¹?ì?¸ ë?? í??ì?¸ ì§?ë¬¸ì?? í?  ì§? ì?¬ë¶?."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
 msgid ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday."
 msgstr "í?? ë?¬ì?© ë³¼ ë?? ì£¼ë§?ì?? ì??ì?½í?´ì?? í? ì??ì?¼/ì?¼ì??ì?¼ì?? í?? ì¹¸ì?? í??ì??í?  ì§? ì?¬ë¶?."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
 msgid "Whether to display the end time of events in the week and month views."
 msgstr "í?? ì£¼ì?© ë³´ê±°ë?? í?? ë?¬ì?© ë³¼ ë?? í??ì?¬ ë??ë??ë?? ì??ê°? í??ì??í?  ì§? ì?¬ë¶?."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
 msgid ""
 "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr "ë?¬ë ¥ì?? ë§?ì»¤ì?¤ ë² ì?¸ì?¤ ë?¼ì?¸ì?? (í?´ë?¹ ì??ê°?ë??ì?? ì§?ì? ) ê·¸ë¦´ ì§? ì?¬ë¶?."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr "ë??ë§?ì¹? ì??ì??ì?? ì??ì?? í??ì??í?  ë?? ê°?ì¶? ì§? ì?¬ë¶?."
 
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
+msgid "Whether to scroll a Month View by a week, not by a month."
+msgstr "í?? ë?¬ ë?¨ì??ê°? ì??ë??ë?¼ í?? ì£¼ ë?¨ì??ë¡? ë?¬ë³? ë³´ê¸°ë¥¼ ì?¤í?¬ë¡¤í?  ì§? ì?¬ë¶?."
+
 # Reminder -> ë¯¸ë¦¬ ì??ë¦¼, Microsoft Office XP
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
 msgid "Whether to set a default reminder for appointments."
 msgstr "ì?½ì??ì?? ë¯¸ë¦¬ ì??ë¦¼ ê¸°ë³¸ê°?ì?? ì?¤ì ?í?  ì§? ì?¬ë¶?."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
 msgid "Whether to show RSVP field in the event/task/meeting editor"
 msgstr "í??ì?¬/ì??ì??/ëª¨ì?? í?¸ì§?ì??ì?? ì??ë?µì??ì² í?ëª© í??ì??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
 msgid "Whether to show categories field in the event/meeting editor"
 msgstr "í??ì?¬/ëª¨ì?? í?¸ì§?ì??ì?? ë¶?ë¥? í?ëª© í??ì??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
 msgid "Whether to show role field in the event/task/meeting editor"
 msgstr "í??ì?¬/ì??ì??/ëª¨ì?? í?¸ì§?ì??ì?? ì?í?  í?ëª© í??ì??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:107
 msgid "Whether to show status field in the event/task/meeting editor"
 msgstr "í??ì?¬/ì??ì??/ëª¨ì?? í?¸ì§?ì??ì?? ì??í?? í?ëª© í??ì??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:108
 msgid ""
 "Whether to show times in twenty four hour format instead of using am/pm."
 msgstr "ì??ê°?ì?? ì?¤ì ?/ì?¤í??ê°? ì??ë?? 24ì??ê°? ëª¨ë??ë¡? í??ì??í?  ì§? ì?¬ë¶?."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:109
 msgid "Whether to show timezone field in the event/meeting editor"
 msgstr "í??ì?¬/ëª¨ì?? í?¸ì§?ì??ì?? ì??ê°?ë?? í?ëª© í??ì??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:110
 msgid "Whether to show type field in the event/task/meeting editor"
 msgstr "í??ì?¬/ì??ì??/ëª¨ì?? í?¸ì§?ì??ì?? ì¢?ë¥? í?ëª© í??ì??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:111
 msgid "Whether to show week number in the Day and Work Week View."
 msgstr "ì?¼ë³? ë³´ê¸° ë°? ê·¼ë¬´ì?¼ ì£¼ë³? ë³´ê¸°ì??ì?? ëª? ë²?ì§¸ ì£¼ì?¸ì§? í??ì??í?  ì§? ì?¬ë¶?."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:112
 msgid "Whether to show week numbers in the date navigator."
 msgstr "ë? ì§? ì? í??í?  ë?? ëª? ë²?ì§¸ ì£¼ì?¸ì§? í??ì??í?  ì§? ì?¬ë¶?."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
-msgid "Whether to use daylight savings time while displaying events."
-msgstr "í??ì?¬ë¥¼ í??ì??í?  ë?? ì?¼ê´? ì ?ì?½ì??ê°?ì?? ì?¬ì?©í?  ì§? ì?¬ë¶?."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:113
 msgid "Work days"
 msgstr "ê·¼ë¬´ ì??ì?¼"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:114
 msgid "Workday end hour"
 msgstr "ê·¼ë¬´ì?¼ì?? ë??ë??ë?? ì??ê°?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:115
 msgid "Workday end minute"
 msgstr "ê·¼ë¬´ì?¼ì?? ë??ë??ë?? ë¶?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:116
 msgid "Workday start hour"
 msgstr "ê·¼ë¬´ì?¼ì?? ì??ì??í??ë?? ì??ê°?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:117
 msgid "Workday start minute"
 msgstr "ê·¼ë¬´ì?¼ì?? ì??ì??í??ë?? ë¶?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
-msgid "daylight savings time"
-msgstr "ì?¼ê´? ì ?ì?½ ì??ê°?"
+#: ../calendar/gui/cal-editor-utils.c:100
+msgid "Invalid object"
+msgstr "ì?¬ë°?ë¥´ì§? ì??ì?? ì?¤ë¸?ì ?í?¸"
 
-#: ../calendar/gui/cal-search-bar.c:75
+#: ../calendar/gui/cal-search-bar.c:74
 msgid "Summary contains"
 msgstr "ì??ì?½ì?? í?¬í?¨"
 
-#: ../calendar/gui/cal-search-bar.c:76
+#: ../calendar/gui/cal-search-bar.c:75
 msgid "Description contains"
 msgstr "ì?¤ëª?ì?? í?¬í?¨"
 
-#: ../calendar/gui/cal-search-bar.c:77
+#: ../calendar/gui/cal-search-bar.c:76
 msgid "Category is"
 msgstr "ë¶?ë¥?ê°?"
 
-#: ../calendar/gui/cal-search-bar.c:78
+#: ../calendar/gui/cal-search-bar.c:77
 msgid "Comment contains"
 msgstr "ì£¼ì??ì?? í?¬í?¨"
 
-#: ../calendar/gui/cal-search-bar.c:79
+#: ../calendar/gui/cal-search-bar.c:78
 msgid "Location contains"
 msgstr "ì??ì¹?ì?? í?¬í?¨"
 
-#: ../calendar/gui/cal-search-bar.c:640
+#: ../calendar/gui/cal-search-bar.c:636
 msgid "Next 7 Days' Tasks"
 msgstr "ì??ì?¼ë¡? 7ì?¼ ê°?ì?? ì??ì??"
 
-#: ../calendar/gui/cal-search-bar.c:644
+#: ../calendar/gui/cal-search-bar.c:640
 msgid "Active Tasks"
 msgstr "í??ì?±í??í?? ì??ì??"
 
-#: ../calendar/gui/cal-search-bar.c:648
+#: ../calendar/gui/cal-search-bar.c:644
 msgid "Overdue Tasks"
 msgstr "ë§?ê°?ì?´ ì§?ë?? ì??ì??"
 
 # FIXME - hard to translate UI + string based on English grammar
-#: ../calendar/gui/cal-search-bar.c:652
+#: ../calendar/gui/cal-search-bar.c:648
 msgid "Completed Tasks"
 msgstr "ì??ë£?í?? ì??ì??"
 
-#: ../calendar/gui/cal-search-bar.c:656
+#: ../calendar/gui/cal-search-bar.c:652
 msgid "Tasks with Attachments"
 msgstr "ì²¨ë¶?ê°? ì??ë?? ì??ì??"
 
-#: ../calendar/gui/cal-search-bar.c:702
+#: ../calendar/gui/cal-search-bar.c:698
 msgid "Active Appointments"
 msgstr "í??ì?±í??í?? ì?½ì??"
 
-#: ../calendar/gui/cal-search-bar.c:706
+#: ../calendar/gui/cal-search-bar.c:702
 msgid "Next 7 Days' Appointments"
 msgstr "ì??ì?¼ë¡? 7ì?¼ ê°?ì?? ì?½ì??"
 
-#: ../calendar/gui/calendar-commands.c:90 ../ui/evolution-addressbook.xml.h:26
-#: ../ui/evolution-calendar.xml.h:20 ../ui/evolution-mail-message.xml.h:75
+#: ../calendar/gui/calendar-commands.c:89 ../ui/evolution-addressbook.xml.h:26
+#: ../ui/evolution-calendar.xml.h:20 ../ui/evolution-mail-message.xml.h:71
 #: ../ui/evolution-memos.xml.h:11 ../ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "ì?¸ì??"
 
 # event -> í??ì?¬, Microsoft Office XP ì°¸ê³ 
-#: ../calendar/gui/calendar-commands.c:315
+#: ../calendar/gui/calendar-commands.c:331
 msgid ""
 "This operation will permanently erase all events older than the selected "
 "amount of time. If you continue, you will not be able to recover these "
@@ -5419,140 +4105,129 @@ msgstr ""
 
 # FIXME - hard to translate UI + string based on English grammar
 # event -> í??ì?¬, Microsoft Office XP ì°¸ê³ 
-#: ../calendar/gui/calendar-commands.c:321
+#: ../calendar/gui/calendar-commands.c:337
 msgid "Purge events older than"
 msgstr "ë?¤ì??ë³´ë?¤ ì?¤ë??ë?? í??ì?¬ ì§?ì?°ê¸°:"
 
 # FIXME - hard to translate UI + string based on English grammar
-#: ../calendar/gui/calendar-commands.c:326
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:21 ../filter/filter.glade.h:14
-#: ../plugins/caldav/caldav-source.c:432
-#: ../plugins/calendar-http/calendar-http.c:281
-#: ../plugins/calendar-weather/calendar-weather.c:526
-#: ../plugins/google-account-setup/google-source.c:654
-#: ../plugins/google-account-setup/google-contacts-source.c:368
+#: ../calendar/gui/calendar-commands.c:342
+#: ../plugins/caldav/caldav-source.c:450
+#: ../plugins/calendar-file/calendar-file.c:288
+#: ../plugins/calendar-http/calendar-http.c:325
+#: ../plugins/calendar-weather/calendar-weather.c:525
+#: ../plugins/google-account-setup/google-source.c:722
+#: ../plugins/google-account-setup/google-contacts-source.c:332
 #: ../widgets/misc/e-send-options.glade.h:39
 msgid "days"
 msgstr "ì?¼"
 
-#. ensure the group name is in current locale, not read from configuration
-#. Create the On the web source group
-#. ensure the group name is in current locale, not read from configuration
-#. Create the source group
 #. Create the Webcal source group
-#. Create the LDAP source group
-#. ensure the group name is in current locale, not read from configuration
-#: ../calendar/gui/calendar-component.c:287
-#: ../calendar/gui/calendar-component.c:290
-#: ../calendar/gui/memos-component.c:240 ../calendar/gui/memos-component.c:243
-#: ../calendar/gui/migration.c:505 ../calendar/gui/migration.c:604
-#: ../calendar/gui/migration.c:1118 ../calendar/gui/tasks-component.c:237
-#: ../calendar/gui/tasks-component.c:243
+#: ../calendar/gui/calendar-component.c:194
+#: ../calendar/gui/memos-component.c:152 ../calendar/gui/migration.c:504
+#: ../calendar/gui/migration.c:603 ../calendar/gui/migration.c:1117
+#: ../calendar/gui/tasks-component.c:149
 msgid "On The Web"
 msgstr "ì?¹"
 
-#. ensure the source name is in current locale, not read from configuration
-#: ../calendar/gui/calendar-component.c:331
-#: ../calendar/gui/calendar-component.c:333 ../calendar/gui/migration.c:399
-msgid "Birthdays & Anniversaries"
-msgstr "ì??ì?¼ ë°? ê¸°ë??ì?¼"
-
-#. ensure the group name is in current locale, not read from configuration
-#. Create the weather group
-#: ../calendar/gui/calendar-component.c:346
-#: ../calendar/gui/calendar-component.c:349
+#: ../calendar/gui/calendar-component.c:195
 #: ../plugins/calendar-weather/calendar-weather.c:126
 msgid "Weather"
 msgstr "ë? ì?¨"
 
-#: ../calendar/gui/calendar-component.c:676
+#. ensure the source name is in current locale, not read from configuration
+#: ../calendar/gui/calendar-component.c:289
+#: ../calendar/gui/calendar-component.c:291 ../calendar/gui/migration.c:398
+msgid "Birthdays & Anniversaries"
+msgstr "ì??ì?¼ ë°? ê¸°ë??ì?¼"
+
+#: ../calendar/gui/calendar-component.c:626
 msgid "_New Calendar"
 msgstr "ì?? ë?¬ë ¥(_N)"
 
-#: ../calendar/gui/calendar-component.c:677
-#: ../calendar/gui/memos-component.c:508 ../calendar/gui/tasks-component.c:500
-#: ../mail/em-folder-tree.c:2124
+#: ../calendar/gui/calendar-component.c:627
+#: ../calendar/gui/memos-component.c:478 ../calendar/gui/tasks-component.c:471
+#: ../mail/em-folder-tree.c:2114
 msgid "_Copy..."
 msgstr "ë³µì?¬(_C)..."
 
-#: ../calendar/gui/calendar-component.c:682
-#: ../calendar/gui/memos-component.c:513 ../calendar/gui/tasks-component.c:505
+#: ../calendar/gui/calendar-component.c:632
+#: ../calendar/gui/memos-component.c:483 ../calendar/gui/tasks-component.c:476
 msgid "_Make available for offline use"
 msgstr "ì?¤í??ë?¼ì?¸ì??ì?? ì?¬ì?©í?  ì?? ì??ê²? í??ê¸°(_M)"
 
-#: ../calendar/gui/calendar-component.c:683
-#: ../calendar/gui/memos-component.c:514 ../calendar/gui/tasks-component.c:506
+#: ../calendar/gui/calendar-component.c:633
+#: ../calendar/gui/memos-component.c:484 ../calendar/gui/tasks-component.c:477
 msgid "_Do not make available for offline use"
 msgstr "ì?¤í??ë?¼ì?¸ì??ì?? ì?¬ì?©í?  ì?? ì??ê²? í??ê¸°(_D)"
 
-#: ../calendar/gui/calendar-component.c:1013
+#: ../calendar/gui/calendar-component.c:961
 msgid "Failed upgrading calendars."
 msgstr "ë?¬ë ¥ì?? ì??ê·¸ë ?ì?´ë??í??ë?? ë?° ì?¤í?¨í??ì?µë??ë?¤."
 
 # event -> í??ì?¬, Microsoft Office XP ì°¸ê³ 
-#: ../calendar/gui/calendar-component.c:1142
+#: ../calendar/gui/calendar-component.c:1089
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "í??ì?¬ì?? ëª¨ì??ì?? ë§?ë??ë?? ë?° '%s' ë?¬ë ¥ì?? ì?´ ì?? ì??ì?µë??ë?¤"
 
 # event -> í??ì?¬, Microsoft Office XP ì°¸ê³ 
-#: ../calendar/gui/calendar-component.c:1158
+#: ../calendar/gui/calendar-component.c:1105
 msgid "There is no calendar available for creating events and meetings"
 msgstr "í??ì?¬ì?? ëª¨ì??ì?? ë§?ë??ë?? ë?° ì?¸ ì?? ì??ë?? ë?¬ë ¥ì?´ ì??ì?µë??ë?¤"
 
-#: ../calendar/gui/calendar-component.c:1271
+#: ../calendar/gui/calendar-component.c:1218
 msgid "Calendar Source Selector"
 msgstr "ë?¬ë ¥ ì??ì?¤ ì? í??"
 
-#: ../calendar/gui/calendar-component.c:1487
+#: ../calendar/gui/calendar-component.c:1433
 msgid "New appointment"
 msgstr "ì?? ì?½ì??"
 
-#: ../calendar/gui/calendar-component.c:1488
+#: ../calendar/gui/calendar-component.c:1434
 msgctxt "New"
 msgid "_Appointment"
 msgstr "ì?½ì??(_A)"
 
-#: ../calendar/gui/calendar-component.c:1489
+#: ../calendar/gui/calendar-component.c:1435
 msgid "Create a new appointment"
 msgstr "ì?? ì?½ì??ì?? ë§?ë?ë??ë?¤"
 
-#: ../calendar/gui/calendar-component.c:1495
+#: ../calendar/gui/calendar-component.c:1441
 msgid "New meeting"
 msgstr "ì?? ëª¨ì??"
 
-#: ../calendar/gui/calendar-component.c:1496
+#: ../calendar/gui/calendar-component.c:1442
 msgctxt "New"
 msgid "M_eeting"
 msgstr "ëª¨ì??(_E)"
 
-#: ../calendar/gui/calendar-component.c:1497
+#: ../calendar/gui/calendar-component.c:1443
 msgid "Create a new meeting request"
 msgstr "ì?? ëª¨ì?? ì??ì²ì?? ë§?ë?ë??ë?¤"
 
-#: ../calendar/gui/calendar-component.c:1503
+#: ../calendar/gui/calendar-component.c:1449
 msgid "New all day appointment"
 msgstr "ì?? í??ë£¨ ì¢?ì?¼ ì?½ì??"
 
-#: ../calendar/gui/calendar-component.c:1504
+#: ../calendar/gui/calendar-component.c:1450
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "í??ë£¨ ì¢?ì?¼ ì?½ì??(_P)"
 
-#: ../calendar/gui/calendar-component.c:1505
+#: ../calendar/gui/calendar-component.c:1451
 msgid "Create a new all-day appointment"
 msgstr "ì?? í??ë£¨ ì¢?ì?¼ ì?½ì??ì?? ë§?ë?ë??ë?¤"
 
-#: ../calendar/gui/calendar-component.c:1511
+#: ../calendar/gui/calendar-component.c:1457
 msgid "New calendar"
 msgstr "ì?? ë?¬ë ¥"
 
-#: ../calendar/gui/calendar-component.c:1512
+#: ../calendar/gui/calendar-component.c:1458
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "ë?¬ë ¥(_N)"
 
-#: ../calendar/gui/calendar-component.c:1513
+#: ../calendar/gui/calendar-component.c:1459
 msgid "Create a new calendar"
 msgstr "ì?? ë?¬ë ¥ì?? ë§?ë?ë??ë?¤"
 
@@ -5594,20 +4269,20 @@ msgid "Category"
 msgstr "ë¶?ë¥?"
 
 #: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/memotypes.xml.h:5
-#: ../widgets/misc/e-send-options.glade.h:6
 msgid "Classification"
 msgstr "ë?±ê¸?"
 
 #: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:249
-#: ../calendar/gui/e-cal-model.c:352 ../calendar/gui/e-calendar-table.c:568
+#: ../calendar/gui/e-cal-model.c:370 ../calendar/gui/e-calendar-table.c:565
 #: ../calendar/gui/memotypes.xml.h:6
-#: ../plugins/email-custom-header/email-custom-header.c:341
+#: ../plugins/email-custom-header/email-custom-header.c:340
 msgid "Confidential"
 msgstr "ë¹?ë°?"
 
 #: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:7
 #: ../calendar/gui/tasktypes.xml.h:10
 #: ../plugins/plugin-manager/plugin-manager.c:59
+#: ../widgets/misc/e-attachment-tree-view.c:496
 #: ../widgets/table/e-table-config.glade.h:6
 msgid "Description"
 msgstr "ì?¤ëª?"
@@ -5627,21 +4302,27 @@ msgstr "ì¡´ì?¬í??ì§? ì??ì??"
 msgid "Exist"
 msgstr "ì¡´ì?¬í?¨"
 
-#: ../calendar/gui/caltypes.xml.h:13
-#: ../calendar/gui/dialogs/meeting-page.glade.h:6
-#: ../calendar/gui/memotypes.xml.h:11 ../calendar/gui/tasktypes.xml.h:19
+#: ../calendar/gui/caltypes.xml.h:12
+#: ../calendar/gui/e-cal-list-view.etspec.h:5 ../mail/message-list.etspec.h:9
+#: ../plugins/publish-calendar/publish-calendar.c:722
+#: ../plugins/save-calendar/csv-format.c:371
+msgid "Location"
+msgstr "ì??ì¹?"
+
+#: ../calendar/gui/caltypes.xml.h:13 ../calendar/gui/memotypes.xml.h:11
+#: ../calendar/gui/tasktypes.xml.h:19
 msgid "Organizer"
 msgstr "ì£¼ìµ?ì??"
 
 #: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:248
-#: ../calendar/gui/e-cal-model.c:350 ../calendar/gui/e-calendar-table.c:567
+#: ../calendar/gui/e-cal-model.c:368 ../calendar/gui/e-calendar-table.c:564
 #: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "ê°?ì?¸"
 
 #: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:247
-#: ../calendar/gui/e-cal-model.c:341 ../calendar/gui/e-cal-model.c:348
-#: ../calendar/gui/e-calendar-table.c:566 ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/e-cal-model.c:359 ../calendar/gui/e-cal-model.c:366
+#: ../calendar/gui/e-calendar-table.c:563 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "ê³µê°?"
 
@@ -5651,11 +4332,11 @@ msgid "Recurrence"
 msgstr "ë°?ë³µ"
 
 #: ../calendar/gui/caltypes.xml.h:17
-#: ../calendar/gui/e-cal-list-view.etspec.h:5
-#: ../calendar/gui/e-calendar-table.etspec.h:11
-#: ../calendar/gui/e-memo-table.etspec.h:4 ../calendar/gui/memotypes.xml.h:14
+#: ../calendar/gui/e-cal-list-view.etspec.h:7
+#: ../calendar/gui/e-calendar-table.etspec.h:13
+#: ../calendar/gui/e-memo-table.etspec.h:6 ../calendar/gui/memotypes.xml.h:14
 #: ../calendar/gui/tasktypes.xml.h:22
-#: ../plugins/save-calendar/csv-format.c:362
+#: ../plugins/save-calendar/csv-format.c:357
 msgid "Summary"
 msgstr "ì??ì?½"
 
@@ -5678,36 +4359,56 @@ msgstr "í?¬í?¨í??ì§? ì??ì??"
 
 # FIXME - hard to translate UI + string based on English grammar
 #: ../calendar/gui/caltypes.xml.h:21 ../calendar/gui/memotypes.xml.h:18
-#: ../calendar/gui/tasktypes.xml.h:27 ../mail/em-filter-i18n.h:30
+#: ../calendar/gui/tasktypes.xml.h:27 ../mail/em-filter-i18n.h:31
 msgid "is"
 msgstr "ê°?ì??"
 
 # FIXME - hard to translate UI + string based on English grammar
 #: ../calendar/gui/caltypes.xml.h:22 ../calendar/gui/memotypes.xml.h:19
-#: ../calendar/gui/tasktypes.xml.h:30 ../mail/em-filter-i18n.h:36
+#: ../calendar/gui/tasktypes.xml.h:30 ../mail/em-filter-i18n.h:37
 msgid "is not"
 msgstr "ë?¤ë¦?"
 
-#: ../calendar/gui/comp-editor-factory.c:409
+#: ../calendar/gui/comp-editor-factory.c:408
 msgid "Error while opening the calendar"
 msgstr "ë?¬ë ¥ì?? ì?¬ë?? ì¤?ì?? ì?¤ë¥?ê°? ë°?ì??í??ì?µë??ë?¤"
 
-#: ../calendar/gui/comp-editor-factory.c:415
+#: ../calendar/gui/comp-editor-factory.c:414
 msgid "Method not supported when opening the calendar"
 msgstr "ë?¬ë ¥ì?? ì?¬ë?? ë©?ì??ë??ë¥¼ ì§?ì??í??ì§? ì??ì?µë??ë?¤"
 
-#: ../calendar/gui/comp-editor-factory.c:421
+#: ../calendar/gui/comp-editor-factory.c:420
 msgid "Permission denied to open the calendar"
 msgstr "ë?¬ë ¥ì?? ì?´ í??ê°?ê°? ê±°ë¶?ë??ì??ì?µë??ë?¤"
 
-#: ../calendar/gui/comp-editor-factory.c:439 ../shell/e-shell.c:1271
+#: ../calendar/gui/comp-editor-factory.c:438 ../shell/e-shell.c:1261
 msgid "Unknown error"
 msgstr "ì?? ì?? ì??ë?? ì?¤ë¥?ê°? ë°?ì??í??ì?µë??ë?¤"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:601
+#: ../calendar/gui/dialogs/alarm-dialog.c:611
 msgid "Edit Alarm"
 msgstr "ì??ë¦¼ í?¸ì§?"
 
+#: ../calendar/gui/dialogs/alarm-dialog.c:796
+#: ../calendar/gui/e-alarm-list.c:448
+msgid "Pop up an alert"
+msgstr "ì??ë¦¼ í??ì?? ì°½ í??ì??"
+
+#: ../calendar/gui/dialogs/alarm-dialog.c:797
+#: ../calendar/gui/e-alarm-list.c:444
+msgid "Play a sound"
+msgstr "ì?¬ì?´ë?? ì?¬ì??"
+
+#: ../calendar/gui/dialogs/alarm-dialog.c:798
+#: ../calendar/gui/e-alarm-list.c:456
+msgid "Run a program"
+msgstr "í??ë¡?ê·¸ë?¨ ì?¤í??"
+
+#: ../calendar/gui/dialogs/alarm-dialog.c:799
+#: ../calendar/gui/e-alarm-list.c:452
+msgid "Send an email"
+msgstr "ì ?ì??ë©?ì?¼ ë³´ë?´ê¸°"
+
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:1
 msgid "<b>Alarm</b>"
 msgstr "<b>ì??ë¦¼</b>"
@@ -5737,85 +4438,69 @@ msgid "Mes_sage:"
 msgstr "ë©?ì??ì§?(_S):"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:8
-#: ../calendar/gui/e-alarm-list.c:444
-msgid "Play a sound"
-msgstr "ì?¬ì?´ë?? ì?¬ì??"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
-#: ../calendar/gui/e-alarm-list.c:448
-msgid "Pop up an alert"
-msgstr "ì??ë¦¼ í??ì?? ì°½ í??ì??"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:10
-#: ../calendar/gui/e-alarm-list.c:456
-msgid "Run a program"
-msgstr "í??ë¡?ê·¸ë?¨ ì?¤í??"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:11
 msgid "Select A File"
 msgstr "í??ì?¼ì?? ì? í??í?©ë??ë?¤"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:12
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
 msgid "Send To:"
 msgstr "ë³´ë?¼ ì?¬ë??:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
-#: ../calendar/gui/e-alarm-list.c:452
-msgid "Send an email"
-msgstr "ì ?ì??ë©?ì?¼ ë³´ë?´ê¸°"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:14
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:10
 msgid "_Arguments:"
 msgstr "ì?¸ì??(_A):"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:15
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:11
 msgid "_Program:"
 msgstr "í??ë¡?ê·¸ë?¨(_P):"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:16
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:12
 msgid "_Repeat the alarm"
 msgstr "ì??ë¦¼ ë°?ë³µ(_R):"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:17
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
 msgid "_Sound:"
 msgstr "ì??ë¦¬(_S):"
 
 # FIXME: bad msgid
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:18
-msgid "after"
-msgstr "ë?¤ì?? ë?¤ì??:"
-
-# FIXME: bad msgid
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:19
-msgid "before"
-msgstr "ë?¤ì?? ì??ì??:"
-
-#. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:20
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:13
-msgid "day(s)"
-msgstr "ì?¼"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:22
-msgid "end of appointment"
-msgstr "ì?½ì?? ë??"
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:14
+msgid ""
+"before\n"
+"after"
+msgstr ""
+"ë?¤ì?? ì??ì??\n"
+"ë?¤ì?? ë?¤ì??"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:23
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:16
 msgid "extra times every"
 msgstr "ë²?, ì£¼ê¸°:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:24
-msgid "hour(s)"
-msgstr "ì??ê°?"
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:17
+msgid ""
+"minute(s)\n"
+"hour(s)\n"
+"day(s)"
+msgstr ""
+"ë¶?\n"
+"ì??ê°?\n"
+"ì?¼"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
-msgid "minute(s)"
-msgstr "ë¶?"
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:20
+msgid ""
+"minutes\n"
+"hours\n"
+"days"
+msgstr ""
+"ë¶?\n"
+"ì??ê°?\n"
+"ì?¼"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:28
-msgid "start of appointment"
-msgstr "ì?½ì?? ì??ì??"
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:23
+msgid ""
+"start of appointment\n"
+"end of appointment"
+msgstr ""
+"ì?½ì?? ì??ì??\n"
+"ì?½ì?? ë??"
 
 # Trigger -> ì??ì?? ì?µì??, Microsoft Office XP ì°¸ê³ 
 #: ../calendar/gui/dialogs/alarm-list-dialog.c:244
@@ -5828,47 +4513,54 @@ msgstr "ì¶?ê°?(_D)"
 
 # Alarm -> ì??ë¦¼, Microsoft Office XP ì°¸ê³ 
 #: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: ../calendar/gui/dialogs/event-page.glade.h:4
 msgid "Alarms"
 msgstr "ì??ë¦¼"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:81
-#: ../composer/e-composer-actions.c:62
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:80
+#: ../widgets/misc/e-attachment-dialog.c:371
+#: ../widgets/misc/e-attachment-store.c:553
 msgid "_Suggest automatic display of attachment"
 msgstr "ì²¨ë¶? í??ì?¼ì?? ì??ë?? í??ì?? ì?°ì? (_S)"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:142
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:141
 msgid "Attach file(s)"
 msgstr "í??ì?¼ ì²¨ë¶?"
 
 #. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:144
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:193
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: ../calendar/gui/dialogs/event-page.c:2955
-#: ../calendar/gui/dialogs/meeting-page.glade.h:4
-#: ../calendar/gui/e-cal-model-tasks.c:673
-#: ../calendar/gui/e-day-view-time-item.c:788
-#: ../calendar/gui/e-itip-control.c:1153 ../filter/filter-rule.c:945
-#: ../mail/em-account-editor.c:684 ../mail/em-account-editor.c:1408
-#: ../mail/em-account-prefs.c:438 ../mail/em-junk-hook.c:93
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:136
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:185
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: ../calendar/gui/dialogs/event-page.c:2993
+#: ../calendar/gui/e-cal-model-tasks.c:671
+#: ../calendar/gui/e-day-view-time-item.c:785
+#: ../calendar/gui/e-itip-control.c:1150 ../filter/filter-rule.c:942
+#: ../mail/em-account-editor.c:717 ../mail/em-account-editor.c:1451
+#: ../mail/em-account-prefs.c:435 ../mail/em-junk-hook.c:93
 #: ../plugins/calendar-weather/calendar-weather.c:333
 #: ../plugins/calendar-weather/calendar-weather.c:387
-#: ../plugins/email-custom-header/email-custom-header.c:395
-#: ../plugins/exchange-operations/exchange-delegates-user.c:195
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:2179
-#: ../widgets/misc/e-cell-date-edit.c:305 ../widgets/misc/e-dateedit.c:1511
-#: ../widgets/misc/e-dateedit.c:1725
+#: ../plugins/email-custom-header/email-custom-header.c:394
+#: ../plugins/exchange-operations/exchange-delegates-user.c:179
+#: ../plugins/itip-formatter/itip-formatter.c:2208
+#: ../widgets/misc/e-cell-date-edit.c:312 ../widgets/misc/e-dateedit.c:1463
+#: ../widgets/misc/e-dateedit.c:1674
 #: ../widgets/misc/e-signature-combo-box.c:74
 msgid "None"
 msgstr "ì??ì??"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:621
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:648
 msgid "Selected Calendars for Alarms"
 msgstr "ì??ë¦¼ì?? ì? í??í?? ë?¬ë ¥"
 
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:865
+msgid "Time and date:"
+msgstr "ë? ì§? ë°? ì??ê°?:"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:866
+msgid "Date only:"
+msgstr "ë? ì§?ë§?:"
+
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
 msgid "(Shown in a Day View)"
 msgstr "(ì?¼ë³? ë³´ê¸°ì?? í??ì??)"
@@ -5894,51 +4586,60 @@ msgid ""
 msgstr "<i>%uì?? %d ê¸°í?¸ë?? ì ?ì??ë©?ì?¼ ì£¼ì??ì?? ì?¬ì?©ì??ì?? ë??ë©?ì?¸ì?¼ë¡? ë°?ë??ë??ë?¤.</i>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-#: ../mail/mail-config.glade.h:10
+msgid "<span weight=\"bold\">Alarms</span>"
+msgstr "<span weight=\"bold\">ì??ë¦¼</span>"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: ../mail/mail-config.glade.h:9
 msgid "<span weight=\"bold\">Alerts</span>"
 msgstr "<span weight=\"bold\">ê²½ê³ </span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: ../mail/mail-config.glade.h:13
+msgid "<span weight=\"bold\">Date/Time Format</span>"
+msgstr "<span weight=\"bold\">ë? ì§?/ì??ê°? í??ì??</span>"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "<span weight=\"bold\">Default Free/Busy Server</span>"
 msgstr "<span weight=\"bold\">ê¸°ë³¸ ì?½ì?? ì??ì??/ì??ì?? ì??ë²?</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 #: ../mail/mail-config.glade.h:17
 #: ../plugins/publish-calendar/publish-calendar.glade.h:1
 msgid "<span weight=\"bold\">General</span>"
 msgstr "<span weight=\"bold\">ì?¼ë°?</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "<span weight=\"bold\">Task List</span>"
 msgstr "<span weight=\"bold\">ì??ì?? ëª©ë¡?</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 msgid "<span weight=\"bold\">Time</span>"
 msgstr "<span weight=\"bold\">ì??ê°?</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 msgid "<span weight=\"bold\">Work Week</span>"
 msgstr "<span weight=\"bold\">ê·¼ë¬´ ì£¼</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Adjust for daylight sa_ving time"
-msgstr "ì?¼ê´? ì ?ì?½ ì??ê°? ì¡°ì ?(_V)"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 msgid "Day _ends:"
 msgstr "í??ë£¨ì?? ë??(_E):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "Display"
 msgstr "í??ì??"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: ../calendar/gui/dialogs/recurrence-page.c:1120
-#: ../calendar/gui/e-itip-control.c:733
+msgid "Display alarms in _notification area only"
+msgstr "ì??ë¦¼ ì??ì?ì??ì??ë§? ì??ë¦¼ í??ì??(_N)"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: ../calendar/gui/dialogs/recurrence-page.c:1116
+#: ../calendar/gui/e-itip-control.c:731
 msgid "Friday"
 msgstr "ê¸?ì??ì?¼"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 msgid ""
 "Minutes\n"
 "Hours\n"
@@ -5948,13 +4649,13 @@ msgstr ""
 "ì??ê°?\n"
 "ì?¼"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#: ../calendar/gui/dialogs/recurrence-page.c:1116
-#: ../calendar/gui/e-itip-control.c:729
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: ../calendar/gui/dialogs/recurrence-page.c:1112
+#: ../calendar/gui/e-itip-control.c:727
 msgid "Monday"
 msgstr "ì??ì??ì?¼"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 msgid ""
 "Monday\n"
 "Tuesday\n"
@@ -5972,221 +4673,237 @@ msgstr ""
 "í? ì??ì?¼\n"
 "ì?¼ì??ì?¼"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: ../mail/mail-config.glade.h:114
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: ../mail/mail-config.glade.h:118
 msgid "Pick a color"
 msgstr "ì??ì?? ê³ ë¥´ì?ì??ì?¤"
 
 #. Sunday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "S_un"
 msgstr "ì?¼(_U)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-#: ../calendar/gui/dialogs/recurrence-page.c:1121
-#: ../calendar/gui/e-itip-control.c:734
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: ../calendar/gui/dialogs/recurrence-page.c:1117
+#: ../calendar/gui/e-itip-control.c:732
 msgid "Saturday"
 msgstr "í? ì??ì?¼"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+msgid "Sc_roll Month View by a week"
+msgstr "í?? ì£¼ ë?¨ì??ë¡? ë?¬ë³? ë³´ê¸°ë¥¼ ì?¤í?¬ë¡¤(_R)"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "Se_cond zone:"
 msgstr "ë³´ì¡° ì??ê°?ë??(_C):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "Select the calendars for alarm notification"
 msgstr "ì??ë¦¼ì?? ì§?ì ?í?  ë?¬ë ¥ì?? ì? í??í??ì?ì??ì?¤"
 
 # "Sh_ow a reminder NN minute(s)/hour(s)/day(s) before every appointment"
 # Reminder -> ë¯¸ë¦¬ ì??ë¦¼, Microsoft Office XP
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#. This is the first half of a user preference.&#10;"Show a reminder [time-period] before every appointment"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "Sh_ow a reminder"
 msgstr "ì?½ì??(_O)"
 
 # "Sh_ow a reminder NN minute(s)/hour(s)/day(s) before every appointment"
 # Reminder -> ë¯¸ë¦¬ ì??ë¦¼, Microsoft Office XP
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#. This is the first half of a user preference.&#10;"Show a reminder [time-period] before every anniversary/birthday"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "Show a _reminder"
 msgstr "ë¯¸ë¦¬ ì??ë¦¼ í??ì??(_R)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "Show week _numbers in date navigator"
 msgstr "ë? ì§? ì? í??í?  ë?? ëª? ë²?ì§¸ ì£¼ì?¸ì§? í??ì??(_N)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "Show week n_umber in Day and Work Week View"
 msgstr "ì?¼ë³? ë³´ê¸° ë°? ê·¼ë¬´ì?¼ ì£¼ë³? ë³´ê¸°ì??ì?? ëª? ë²?ì§¸ ì£¼ì?¸ì§? í??ì??(_U)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: ../calendar/gui/dialogs/recurrence-page.c:1122
-#: ../calendar/gui/e-itip-control.c:728
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: ../calendar/gui/dialogs/recurrence-page.c:1118
+#: ../calendar/gui/e-itip-control.c:726
 msgid "Sunday"
 msgstr "ì?¼ì??ì?¼"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 msgid "T_asks due today:"
 msgstr "ì?¤ë?? ë§?ê°?ì?¸ ì??ì??(_A):"
 
 #. Thursday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "T_hu"
 msgstr "ëª©(_H)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "Template:"
 msgstr "ì??ì??:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
-#: ../calendar/gui/dialogs/recurrence-page.c:1119
-#: ../calendar/gui/e-itip-control.c:732
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: ../calendar/gui/dialogs/recurrence-page.c:1115
+#: ../calendar/gui/e-itip-control.c:730
 msgid "Thursday"
 msgstr "ëª©ì??ì?¼"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
-#: ../calendar/gui/dialogs/event-page.glade.h:12
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: ../calendar/gui/dialogs/event-page.glade.h:13
 msgid "Time _zone:"
 msgstr "ì??ê°?ë??(_Z):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
 msgid "Time format:"
 msgstr "ì??ê°? í??ì??:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: ../calendar/gui/dialogs/recurrence-page.c:1117
-#: ../calendar/gui/e-itip-control.c:730
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+#: ../calendar/gui/dialogs/recurrence-page.c:1113
+#: ../calendar/gui/e-itip-control.c:728
 msgid "Tuesday"
 msgstr "í??ì??ì?¼"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
-#: ../calendar/gui/dialogs/recurrence-page.c:1118
-#: ../calendar/gui/e-itip-control.c:731
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+msgid "Use s_ystem time zone"
+msgstr "ì??ì?¤í?? ì??ê°?ë?? ì?¬ì?©(_Y)"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#: ../calendar/gui/dialogs/recurrence-page.c:1114
+#: ../calendar/gui/e-itip-control.c:729
 msgid "Wednesday"
 msgstr "ì??ì??ì?¼"
 
 #. A weekday like "Monday" follows
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
 msgid "Wee_k starts on:"
 msgstr "ì??ì?? ì??ì?¼(_K):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
 msgid "Work days:"
 msgstr "ê·¼ë¬´ ì??ì?¼:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
 msgid "_12 hour (AM/PM)"
 msgstr "_12ì??ê°? (ì?¤ì ?/ì?¤í??)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
 msgid "_24 hour"
 msgstr "_24ì??ê°?"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
 msgid "_Ask for confirmation when deleting items"
 msgstr "í?ëª©ì?? ì§?ì?¸ ë?? í??ì?¸ ì§?ë¬¸í??ê¸°(_A)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
 msgid "_Compress weekends in month view"
 msgstr "í?? ë?¬ì?© ë³¼ ë?? ì£¼ë§?ì?? í?? ì¹¸ì?? í??ì??(_C)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:67
 msgid "_Day begins:"
 msgstr "í??ë£¨ì?? ì??ì??(_D):"
 
 #. Friday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:69
 msgid "_Fri"
 msgstr "ê¸?(_F)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
 msgid "_Hide completed tasks after"
 msgstr "ë??ë§?ì¹? ì??ì??ì?´ ë?¤ì?? ì??ê°?ì?´ ì§?ë??ë©´ ì?¨ê¸°ê¸°(_H):"
 
 #. Monday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:72
 msgid "_Mon"
 msgstr "ì??(_M)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:67
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:73
 msgid "_Overdue tasks:"
 msgstr "ë§?ê°?ì?´ ì§?ë?? ì??ì??(_O):"
 
 #. Saturday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:69
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:75
 msgid "_Sat"
 msgstr "í? (_S)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:76
 msgid "_Show appointment end times in week and month view"
 msgstr "í?? ì£¼ì?© ë³´ê±°ë?? í?? ë?¬ì?© ë³¼ ë?? ì?½ì?? ë??ë??ë?? ì??ê°? í??ì??(_S)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:71
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:77
 msgid "_Time divisions:"
 msgstr "ì??ê°? ê°?ê²©(_T):"
 
 #. Tuesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:73
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:79
 msgid "_Tue"
 msgstr "í??(_T)"
 
 #. Wednesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:75
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:81
 msgid "_Wed"
 msgstr "ì??(_W)"
 
 # FIXME: bad msgid
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:76
+#. This is the last half of a user preference.&#10;"Show a reminder [time-period] before every anniversary/birthday"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:83
 msgid "before every anniversary/birthday"
 msgstr ", ë§¤ ê¸°ë??ì?¼/ì??ì?¼ ì ?ì??"
 
 # FIXME: bad msgid
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:77
+#. This is the last half of a user preference.&#10;"Show a reminder [time-period] before every appointment"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:85
 msgid "before every appointment"
 msgstr ", ë§¤ ì?½ì?? ì ?ì??"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:271
+#: ../calendar/gui/dialogs/calendar-setup.c:153
+msgid "Type:"
+msgstr "í??í??:"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:270
 msgid "Cop_y calendar contents locally for offline operation"
 msgstr "ì?¤í??ë?¼ì?¸ ì??ì??ì?? ì??í?´ ë?¬ë ¥ ë?´ì?©ì?? ë¡?ì»¬ì?? ë³µì?¬(_Y)"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:273
+#: ../calendar/gui/dialogs/calendar-setup.c:272
 msgid "Cop_y task list contents locally for offline operation"
 msgstr "ì?¤í??ë?¼ì?¸ ì??ì??ì?? ì??í?´ ì??ì?? ëª©ë¡? ë?´ì?©ì?? ë¡?ì»¬ì?? ë³µì?¬(_Y)"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:275
+#: ../calendar/gui/dialogs/calendar-setup.c:274
 msgid "Cop_y memo list contents locally for offline operation"
 msgstr "ì?¤í??ë?¼ì?¸ ì??ì??ì?? ì??í?´ ë©?ëª¨ ëª©ë¡? ë?´ì?©ì?? ë¡?ì»¬ì?? ë³µì?¬(_Y)"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:345
+#: ../calendar/gui/dialogs/calendar-setup.c:344
 msgid "Colo_r:"
 msgstr "ì??(_R):"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:380
+#: ../calendar/gui/dialogs/calendar-setup.c:379
 msgid "Task List"
 msgstr "ì??ì?? ëª©ë¡?"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:391
+#: ../calendar/gui/dialogs/calendar-setup.c:390
 msgid "Memo List"
 msgstr "ë©?ëª¨ ëª©ë¡?"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:476
+#: ../calendar/gui/dialogs/calendar-setup.c:475
 msgid "Calendar Properties"
 msgstr "ë?¬ë ¥ ì??ì?±"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:476
+#: ../calendar/gui/dialogs/calendar-setup.c:475
 msgid "New Calendar"
 msgstr "ì?? ë?¬ë ¥"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:532
+#: ../calendar/gui/dialogs/calendar-setup.c:531
 msgid "Task List Properties"
 msgstr "ì??ì?? ëª©ë¡? ì??ì?±"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:532
+#: ../calendar/gui/dialogs/calendar-setup.c:531
 msgid "New Task List"
 msgstr "ì?? ì??ì?? ëª©ë¡?"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:588
+#: ../calendar/gui/dialogs/calendar-setup.c:587
 msgid "Memo List Properties"
 msgstr "ë©?ëª¨ ëª©ë¡? ì??ì?±"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:588
+#: ../calendar/gui/dialogs/calendar-setup.c:587
 msgid "New Memo List"
 msgstr "ì?? ë©?ëª¨ ëª©ë¡?"
 
@@ -6245,299 +4962,241 @@ msgid "Validation error: %s"
 msgstr "ì? í?¨ì?± ê²?ì?¬ ì?¤ë¥?: %s"
 
 # FIXME - hard to translate UI + string based on English grammar
-#: ../calendar/gui/dialogs/comp-editor-util.c:186 ../calendar/gui/print.c:2365
+#: ../calendar/gui/dialogs/comp-editor-util.c:189 ../calendar/gui/print.c:2349
 msgid " to "
 msgstr "ë¶?í?° "
 
 # FIXME - hard to translate UI + string based on English grammar
-#: ../calendar/gui/dialogs/comp-editor-util.c:190 ../calendar/gui/print.c:2369
+#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2353
 msgid " (Completed "
 msgstr " (ì??ë£?ë?¨ "
 
 # FIXME - hard to translate UI + string based on English grammar
-#: ../calendar/gui/dialogs/comp-editor-util.c:192 ../calendar/gui/print.c:2371
+#: ../calendar/gui/dialogs/comp-editor-util.c:195 ../calendar/gui/print.c:2355
 msgid "Completed "
 msgstr "ì??ë£?ë?¨ "
 
 # FIXME - hard to translate UI + string based on English grammar
-#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2376
+#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2360
 msgid " (Due "
 msgstr " (ê¸°í?? "
 
 # FIXME - hard to translate UI + string based on English grammar
-#: ../calendar/gui/dialogs/comp-editor-util.c:199 ../calendar/gui/print.c:2378
+#: ../calendar/gui/dialogs/comp-editor-util.c:202 ../calendar/gui/print.c:2362
 msgid "Due "
 msgstr "ê¸°í?? "
 
-#: ../calendar/gui/dialogs/comp-editor.c:239
-#, c-format
-msgid "Attached message - %s"
-msgstr "ì²¨ë¶?í?? ë©?ì??ì§? - %s"
-
-#. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:244
-#: ../calendar/gui/dialogs/comp-editor.c:417 ../composer/e-msg-composer.c:1770
-#: ../composer/e-msg-composer.c:1989
-#, c-format
-msgid "Attached message"
-msgid_plural "%d attached messages"
-msgstr[0] "ì²¨ë¶?í?? ë©?ì??ì§? %dê°?"
-
-#: ../calendar/gui/dialogs/comp-editor.c:488 ../composer/e-msg-composer.c:2057
-#: ../mail/em-folder-tree.c:1006 ../mail/em-folder-utils.c:364
-#: ../mail/em-folder-view.c:1188 ../mail/message-list.c:2106
-msgid "_Move"
-msgstr "ì?´ë??(_M)"
+#: ../calendar/gui/dialogs/comp-editor.c:224
+msgid "Could not save attachments"
+msgstr "ì²¨ë¶?ë¥¼ ì ?ì?¥í?  ì?? ì??ì?µë??ë?¤"
 
-#: ../calendar/gui/dialogs/comp-editor.c:490 ../composer/e-msg-composer.c:2059
-#: ../mail/em-folder-tree.c:1008 ../mail/message-list.c:2108
-msgid "Cancel _Drag"
-msgstr "ë??ë??ê·¸ ì·¨ì??(_D)"
-
-#: ../calendar/gui/dialogs/comp-editor.c:623
-#: ../calendar/gui/dialogs/comp-editor.c:3315 ../mail/em-utils.c:373
-#: ../plugins/prefer-plain/prefer-plain.c:91
-#: ../widgets/misc/e-attachment-bar.c:453
-msgid "attachment"
-msgstr "ì²¨ë¶?"
-
-#: ../calendar/gui/dialogs/comp-editor.c:849
+#: ../calendar/gui/dialogs/comp-editor.c:487
 msgid "Could not update object"
 msgstr "ì?¤ë¸?ì ?í?¸ë¥¼ ì??ë?°ì?´í?¸í?  ì?? ì??ì?µë??ë?¤"
 
-#: ../calendar/gui/dialogs/comp-editor.c:938
+#: ../calendar/gui/dialogs/comp-editor.c:582
 msgid "Edit Appointment"
 msgstr "ì?½ì?? í?¸ì§?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:945
+#: ../calendar/gui/dialogs/comp-editor.c:589
 #, c-format
 msgid "Meeting - %s"
 msgstr "ëª¨ì?? - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:947
+#: ../calendar/gui/dialogs/comp-editor.c:591
 #, c-format
 msgid "Appointment - %s"
 msgstr "ì?½ì?? - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:953
+#: ../calendar/gui/dialogs/comp-editor.c:597
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "í? ë?¹í?? ì??ì?? - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:955
+#: ../calendar/gui/dialogs/comp-editor.c:599
 #, c-format
 msgid "Task - %s"
 msgstr "ì??ì?? - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:960
+#: ../calendar/gui/dialogs/comp-editor.c:604
 #, c-format
 msgid "Memo - %s"
 msgstr "ë©?ëª¨ - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:976
+#: ../calendar/gui/dialogs/comp-editor.c:620
 msgid "No Summary"
 msgstr "ì??ì?½ ì??ì??"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1117
+#: ../calendar/gui/dialogs/comp-editor.c:762
 msgid "Keep original item?"
 msgstr "ë³¸ë?? í?ëª©ì?? ì? ì§?í??ì??ê² ì?µë??ê¹??"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1312
+#: ../calendar/gui/dialogs/comp-editor.c:968
 msgid "Click here to close the current window"
 msgstr "í??ì?¬ ì°½ì?? ë?«ì?¼ë ¤ë©´ ì?¬ê¸°ë¥¼ ë??ë¥´ì?ì??ì?¤"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1319
+#: ../calendar/gui/dialogs/comp-editor.c:975
 msgid "Copy selected text to the clipboard"
 msgstr "ì? í??í?? ë©?ì??ì§?ë¥¼ í?´ë¦½ë³´ë??ë¡? ë³µì?¬í?©ë??ë?¤"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1326
+#: ../calendar/gui/dialogs/comp-editor.c:982
 msgid "Cut selected text to the clipboard"
 msgstr "ì? í??í?? í??ì?¤í?¸ë¥¼ í?´ë¦½ë³´ë??ë¡? ì??ë?¼ë??ë??ë?¤"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1333
+#: ../calendar/gui/dialogs/comp-editor.c:989
 msgid "Click here to view help available"
 msgstr "í?´ë?¹ ë??ì??ë§?ì?? ë³´ë ¤ë©´ ì?¬ê¸°ë¥¼ ë??ë¥´ì?ì??ì?¤"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1340
+#: ../calendar/gui/dialogs/comp-editor.c:996
 msgid "Paste text from the clipboard"
 msgstr "í?´ë¦½ë³´ë??ì??ì?? í??ì?¤í?¸ë¥¼ ë¶?ì?¬ ë?£ì?µë??ë?¤"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1361
+#: ../calendar/gui/dialogs/comp-editor.c:1017
 msgid "Click here to save the current window"
 msgstr "í??ì?¬ ì°½ì?? ì ?ì?¥í??ë ¤ë©´ ì?¬ê¸°ë¥¼ ë??ë¥´ì?ì??ì?¤"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1368
+#: ../calendar/gui/dialogs/comp-editor.c:1024
 msgid "Select all text"
 msgstr "ëª¨ë?  í??ì?¤í?¸ ì? í??"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1375
+#: ../calendar/gui/dialogs/comp-editor.c:1031
 msgid "_Classification"
 msgstr "ë¶?ë¥?(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1389
-#: ../mail/mail-signature-editor.c:208
+#: ../calendar/gui/dialogs/comp-editor.c:1045
+#: ../mail/mail-signature-editor.c:209
 #: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:43
 msgid "_File"
 msgstr "í??ì?¼(_F)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1396
+#: ../calendar/gui/dialogs/comp-editor.c:1052
 #: ../ui/evolution-calendar.xml.h:44 ../ui/evolution-mail-global.xml.h:24
 #: ../ui/evolution.xml.h:46
 msgid "_Help"
 msgstr "ë??ì??ë§?(_H)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1403
+#: ../calendar/gui/dialogs/comp-editor.c:1059
 msgid "_Insert"
 msgstr "ë?£ê¸°(_I)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1410
+#: ../calendar/gui/dialogs/comp-editor.c:1066
 msgid "_Options"
 msgstr "ì?µì??(_O)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1417 ../mail/em-folder-tree.c:2116
+#: ../calendar/gui/dialogs/comp-editor.c:1073 ../mail/em-folder-tree.c:2106
 #: ../ui/evolution-addressbook.xml.h:64 ../ui/evolution-mail-global.xml.h:34
 #: ../ui/evolution-mail-messagedisplay.xml.h:8 ../ui/evolution-tasks.xml.h:30
 #: ../ui/evolution.xml.h:55
 msgid "_View"
 msgstr "ë³´ê¸°(_V)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1427
-#: ../composer/e-composer-actions.c:469
+#: ../calendar/gui/dialogs/comp-editor.c:1083
+#: ../composer/e-composer-actions.c:315
 msgid "_Attachment..."
 msgstr "ì²¨ë¶?(_A)..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1429
+#: ../calendar/gui/dialogs/comp-editor.c:1085
 msgid "Click here to attach a file"
 msgstr "í??ì?¼ì?? ì²¨ë¶?í??ë ¤ë©´ ì?¬ê¸°ë¥¼ ë??ë¥´ì?ì??ì?¤"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1437
+#: ../calendar/gui/dialogs/comp-editor.c:1093
 msgid "_Categories"
 msgstr "ë¶?ë¥?(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1439
+#: ../calendar/gui/dialogs/comp-editor.c:1095
 msgid "Toggles whether to display categories"
 msgstr "ë¶?ë¥?ë¥¼ í??ì??í?  ì§? í? ê¸?í?©ë??ë?¤"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1445
+#: ../calendar/gui/dialogs/comp-editor.c:1101
 msgid "Time _Zone"
 msgstr "ì??ê°?ë??(_Z)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1447
+#: ../calendar/gui/dialogs/comp-editor.c:1103
 msgid "Toggles whether the time zone is displayed"
 msgstr "ì??ê°?ë?? í?ëª©ì?? í??ì??í?  ì§? í? ê¸?í?©ë??ë?¤"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1456
+#: ../calendar/gui/dialogs/comp-editor.c:1112
 msgid "Pu_blic"
 msgstr "ê³µê°?(_B)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1458
+#: ../calendar/gui/dialogs/comp-editor.c:1114
 msgid "Classify as public"
 msgstr "ê³µê°?ë¡? ë¶?ë¥?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1463
+#: ../calendar/gui/dialogs/comp-editor.c:1119
 msgid "_Private"
 msgstr "ê°?ì?¸ ì ?ë³´(_P)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1465
+#: ../calendar/gui/dialogs/comp-editor.c:1121
 msgid "Classify as private"
 msgstr "ê°?ì?¸ ì ?ë³´ë¡? ë¶?ë¥?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1470
+#: ../calendar/gui/dialogs/comp-editor.c:1126
 msgid "_Confidential"
 msgstr "ë¹?ë°?(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1472
+#: ../calendar/gui/dialogs/comp-editor.c:1128
 msgid "Classify as confidential"
 msgstr "ë¹?ë°?ë¡? ë¶?ë¥?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1480
+#: ../calendar/gui/dialogs/comp-editor.c:1136
 msgid "R_ole Field"
 msgstr "ì?í?  í?ëª©(_O)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1482
+#: ../calendar/gui/dialogs/comp-editor.c:1138
 msgid "Toggles whether the Role field is displayed"
 msgstr "ì?í?  í?ëª©ì?? í??ì??í?  ì§? í? ê¸?í?©ë??ë?¤"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1488
+#: ../calendar/gui/dialogs/comp-editor.c:1144
 msgid "_RSVP"
 msgstr "ì??ë?µë°?ë??(_R)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1490
+#: ../calendar/gui/dialogs/comp-editor.c:1146
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "ì??ë?µì??ì² í?ëª©ì?? í??ì??í?  ì§? í? ê¸?í?©ë??ë?¤"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1496
+#: ../calendar/gui/dialogs/comp-editor.c:1152
 msgid "_Status Field"
 msgstr "ì??í?? í?ëª©(_S)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1498
+#: ../calendar/gui/dialogs/comp-editor.c:1154
 msgid "Toggles whether the Status field is displayed"
 msgstr "ì??í?? í?ëª©ì?? í??ì??í?  ì§? í? ê¸?í?©ë??ë?¤"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1504
+#: ../calendar/gui/dialogs/comp-editor.c:1160
 msgid "_Type Field"
 msgstr "ì¢?ë¥? í?ëª©(_T)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1506
+#: ../calendar/gui/dialogs/comp-editor.c:1162
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "ì°¸ì??ì?? ì¢?ë¥?ë¥¼ í??ì??í?  ì§? í? ê¸?í?©ë??ë?¤"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1828
-#: ../composer/e-composer-private.c:64 ../widgets/misc/e-attachment-bar.c:1376
+#: ../calendar/gui/dialogs/comp-editor.c:1186
+#: ../composer/e-composer-private.c:67
 msgid "Recent _Documents"
 msgstr "ìµ?ê·¼ ë¬¸ì??(_D)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1847
-#: ../composer/e-composer-actions.c:696
+#: ../calendar/gui/dialogs/comp-editor.c:1615
+#: ../composer/e-composer-actions.c:518
 msgid "Attach"
 msgstr "ì²¨ë¶?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1942
-#, c-format
-msgid "<b>%d</b> Attachment"
-msgid_plural "<b>%d</b> Attachments"
-msgstr[0] "<b>%d</b>ê°? ì²¨ë¶?"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1974
-msgid "Hide Attachment _Bar"
-msgstr "ì²¨ë¶? ëª¨ì?? ì?¨ê¸°ê¸°(_B)"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1977
-#: ../calendar/gui/dialogs/comp-editor.c:2280
-msgid "Show Attachment _Bar"
-msgstr "ì²¨ë¶? ëª¨ì?? ë³´ê¸°(_B)"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2091
-#: ../calendar/gui/dialogs/event-page.c:1877
-#: ../calendar/gui/dialogs/task-page.c:1201 ../composer/e-msg-composer.c:1039
-#: ../plugins/groupwise-features/junk-settings.glade.h:8
-#: ../plugins/groupwise-features/properties.glade.h:13
-#: ../widgets/table/e-table-config.glade.h:21
-msgid "_Remove"
-msgstr "ì ?ê±°(_R)"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2094
-#: ../composer/e-msg-composer.c:1042
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
-msgid "_Add attachment..."
-msgstr "ì²¨ë¶?í??ì?¼ ì¶?ê°?(_A)..."
-
-#: ../calendar/gui/dialogs/comp-editor.c:2302
-#: ../mail/em-format-html-display.c:2384
-msgid "Show Attachments"
-msgstr "ì²¨ë¶? ëª¨ì?? ë³´ê¸°"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2303
-msgid "Press space key to toggle attachment bar"
-msgstr "ì?¤í??ì?´ì?¤ë¥¼ ë??ë?¬ ì²¨ë¶? ëª¨ì??ì?? í? ê¸?í??ì?ì??ì?¤"
+#: ../calendar/gui/dialogs/comp-editor.c:1670
+msgid "Save"
+msgstr "ì ?ì?¥"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2448
-#: ../calendar/gui/dialogs/comp-editor.c:2496
-#: ../calendar/gui/dialogs/comp-editor.c:3348
+#: ../calendar/gui/dialogs/comp-editor.c:1924
+#: ../calendar/gui/dialogs/comp-editor.c:1973
+#: ../calendar/gui/dialogs/comp-editor.c:2833
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "ì??ë?°ì?´í?¸ê°? ë??ì°©í??ë©´ ì?´ í?ëª©ì?? ë??í?´ ë°?ë?? ì?¬í?ì?? ë²?ë¦½ë??ë?¤."
 
-#: ../calendar/gui/dialogs/comp-editor.c:3377
+#: ../calendar/gui/dialogs/comp-editor.c:2801 ../mail/em-utils.c:371
+#: ../plugins/prefer-plain/prefer-plain.c:91
+msgid "attachment"
+msgstr "ì²¨ë¶?"
+
+#: ../calendar/gui/dialogs/comp-editor.c:2862
 msgid "Unable to use current version!"
 msgstr "í??ì?¬ ë²?ì ?ì?? ì?¬ì?©í?  ì?? ì??ì?µë??ë?¤!"
 
@@ -6613,7 +5272,7 @@ msgid "Contacts..."
 msgstr "ì?°ë?½ì²?..."
 
 #: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:2
-#: ../plugins/exchange-operations/exchange-delegates.c:417
+#: ../plugins/exchange-operations/exchange-delegates.c:416
 msgid "Delegate To:"
 msgstr "ë??ë¦¬ì?¸:"
 
@@ -6641,7 +5300,7 @@ msgstr "ë°?ë³µ í??ì?¬ë¡? ë§?ë?ë??ë?¤"
 #: ../calendar/gui/dialogs/event-editor.c:216
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
 #: ../plugins/groupwise-features/send-options.c:212
-#: ../widgets/misc/e-send-options.glade.h:19
+#: ../widgets/misc/e-send-options.glade.h:18
 msgid "Send Options"
 msgstr "ë³´ë?´ê¸° ì?µì??"
 
@@ -6681,95 +5340,116 @@ msgstr "ì°¸ì??ì??ì?? ì?½ì?? ì??ì??/ì??ì?? ì ?ë³´ë¥¼ ì??ì??ë´?ë??ë?¤"
 msgid "Appoint_ment"
 msgstr "ì?½ì??(_M)"
 
-#: ../calendar/gui/dialogs/event-page.c:736
-#: ../calendar/gui/dialogs/event-page.c:2725
+#: ../calendar/gui/dialogs/event-page.c:748
+msgid "Event cannot be edited, because the selected calendar is read only"
+msgstr "í??ì?¬ë¥¼ í?¸ì§?í?  ì?? ì??ì?µë??ë?¤. ì? í??í?? ë?¬ë ¥ì?´ ì?½ê¸° ì ?ì?©ì??ë??ë?¤"
+
+#: ../calendar/gui/dialogs/event-page.c:752
+msgid "Event cannot be fully edited, because you are not the organizer"
+msgstr "í??ì?¬ ì ?ì²´ë¥¼ í?¸ì§?í?  ì?? ì??ì?µë??ë?¤. ì£¼ìµ?ì??ê°? ì??ë??ë??ë?¤"
+
+#: ../calendar/gui/dialogs/event-page.c:764
+#: ../calendar/gui/dialogs/event-page.c:2769
 msgid "This event has alarms"
 msgstr "í??ì?¬ì?? ì??ë¦¼ì?´ ì??ì?µë??ë?¤."
 
-#: ../calendar/gui/dialogs/event-page.c:799
-#: ../calendar/gui/dialogs/event-page.glade.h:10
-#: ../calendar/gui/dialogs/meeting-page.glade.h:5
+#: ../calendar/gui/dialogs/event-page.c:827
+#: ../calendar/gui/dialogs/event-page.glade.h:11
 #: ../calendar/gui/dialogs/memo-page.glade.h:2
 msgid "Or_ganizer:"
 msgstr "ì£¼ìµ?ì??(_G):"
 
-#: ../calendar/gui/dialogs/event-page.c:845
+#: ../calendar/gui/dialogs/event-page.c:874
 msgid "_Delegatees"
 msgstr "ë??ë¦¬ì?¸(_D)"
 
-#: ../calendar/gui/dialogs/event-page.c:847
+#: ../calendar/gui/dialogs/event-page.c:876
 msgid "Atte_ndees"
 msgstr "ì°¸ì??ì??(_N)"
 
-#: ../calendar/gui/dialogs/event-page.c:1031
+#: ../calendar/gui/dialogs/event-page.c:1062
 msgid "Event with no start date"
 msgstr "í??ì?¬ì?? ì??ì?? ë? ì§?ê°? ì??ì?µë??ë?¤"
 
-#: ../calendar/gui/dialogs/event-page.c:1034
+#: ../calendar/gui/dialogs/event-page.c:1065
 msgid "Event with no end date"
 msgstr "í??ì?¬ì?? ë?? ë? ì§?ê°? ì??ì?µë??ë?¤"
 
-#: ../calendar/gui/dialogs/event-page.c:1203
-#: ../calendar/gui/dialogs/memo-page.c:641
-#: ../calendar/gui/dialogs/task-page.c:813
+#: ../calendar/gui/dialogs/event-page.c:1236
+#: ../calendar/gui/dialogs/memo-page.c:654
+#: ../calendar/gui/dialogs/task-page.c:830
 msgid "Start date is wrong"
 msgstr "ì??ì?? ë? ì§?ê°? í??ë ¸ì?µë??ë?¤"
 
-#: ../calendar/gui/dialogs/event-page.c:1213
+#: ../calendar/gui/dialogs/event-page.c:1246
 msgid "End date is wrong"
 msgstr "ë?? ë? ì§?ê°? í??ë ¸ì?µë??ë?¤"
 
-#: ../calendar/gui/dialogs/event-page.c:1236
+#: ../calendar/gui/dialogs/event-page.c:1269
 msgid "Start time is wrong"
 msgstr "ì??ì?? ì??ê°?ì?´ í??ë ¸ì?µë??ë?¤"
 
-#: ../calendar/gui/dialogs/event-page.c:1243
+#: ../calendar/gui/dialogs/event-page.c:1276
 msgid "End time is wrong"
 msgstr "ë?? ì??ê°?ì?´ í??ë ¸ì?µë??ë?¤"
 
-#: ../calendar/gui/dialogs/event-page.c:1406
-#: ../calendar/gui/dialogs/memo-page.c:682
-#: ../calendar/gui/dialogs/task-page.c:873
+#: ../calendar/gui/dialogs/event-page.c:1438
+#: ../calendar/gui/dialogs/memo-page.c:695
+#: ../calendar/gui/dialogs/task-page.c:890
 msgid "The organizer selected no longer has an account."
 msgstr "ì? í??í??ì?  ì£¼ìµ?ì??ê°? ì?´ì ? ê³?ì ?ì?´ ì??ì?µë??ë?¤."
 
-#: ../calendar/gui/dialogs/event-page.c:1412
-#: ../calendar/gui/dialogs/memo-page.c:688
-#: ../calendar/gui/dialogs/task-page.c:879
+#: ../calendar/gui/dialogs/event-page.c:1444
+#: ../calendar/gui/dialogs/memo-page.c:701
+#: ../calendar/gui/dialogs/task-page.c:896
 msgid "An organizer is required."
 msgstr "ì£¼ìµ?ì??ê°? í??ì??í?©ë??ë?¤."
 
-#: ../calendar/gui/dialogs/event-page.c:1437
-#: ../calendar/gui/dialogs/task-page.c:903
+#: ../calendar/gui/dialogs/event-page.c:1469
+#: ../calendar/gui/dialogs/task-page.c:920
 msgid "At least one attendee is required."
 msgstr "ìµ?ì??í?? ì°¸ì??ì??ê°? í?? ì?¬ë??ì?? í??ì??í?©ë??ë?¤."
 
-#: ../calendar/gui/dialogs/event-page.c:1878
-#: ../calendar/gui/dialogs/task-page.c:1202
+#: ../calendar/gui/dialogs/event-page.c:1912
+#: ../calendar/gui/dialogs/task-page.c:1219
+#: ../plugins/groupwise-features/junk-settings.glade.h:8
+#: ../plugins/groupwise-features/properties.glade.h:13
+#: ../widgets/table/e-table-config.glade.h:21
+msgid "_Remove"
+msgstr "ì ?ê±°(_R)"
+
+#: ../calendar/gui/dialogs/event-page.c:1913
+#: ../calendar/gui/dialogs/task-page.c:1220
 msgid "_Add "
 msgstr "ì¶?ê°?(_A) "
 
-#: ../calendar/gui/dialogs/event-page.c:2601
+#: ../calendar/gui/dialogs/event-page.c:2639
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "'%s' ë?¬ë ¥ì?? ì?´ ì?? ì??ì?µë??ë?¤."
 
-#: ../calendar/gui/dialogs/event-page.c:2645
-#: ../calendar/gui/dialogs/memo-page.c:896
-#: ../calendar/gui/dialogs/task-page.c:1806
+#. Translators: This string is used when we are creating an Event
+#. (meeting or appointment)  on behalf of some other user
+#. Translators: This string is used when we are creating a Memo
+#. on behalf of some other user
+#. Translators: This string is used when we are creating a Task
+#. on behalf of some other user
+#: ../calendar/gui/dialogs/event-page.c:2683
+#: ../calendar/gui/dialogs/memo-page.c:910
+#: ../calendar/gui/dialogs/task-page.c:1825
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "%s ì??ê²©ì?¼ë¡? ì??ì??í?©ë??ë?¤"
 
 # "Sh_ow a reminder" <NN> <minute(s)/hour(s)/day(s)> "before every appointment"
 # Reminder -> ë¯¸ë¦¬ ì??ë¦¼, Microsoft Office XP
-#: ../calendar/gui/dialogs/event-page.c:2925
+#: ../calendar/gui/dialogs/event-page.c:2967
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "ì?½ì?? %dì?¼ ì ?ì??"
 
-#: ../calendar/gui/dialogs/event-page.c:2931
+#: ../calendar/gui/dialogs/event-page.c:2973
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
@@ -6777,114 +5457,115 @@ msgstr[0] "ì?½ì?? %dì??ê°? ì ?ì??"
 
 # "Sh_ow a reminder" <NN> <minute(s)/hour(s)/day(s)> "before every appointment"
 # Reminder -> ë¯¸ë¦¬ ì??ë¦¼, Microsoft Office XP
-#: ../calendar/gui/dialogs/event-page.c:2937
+#: ../calendar/gui/dialogs/event-page.c:2979
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "ì?½ì?? %dë¶? ì ?ì??"
 
-#: ../calendar/gui/dialogs/event-page.c:2950
+#: ../calendar/gui/dialogs/event-page.c:2992
 msgid "Customize"
 msgstr "ì?¬ì?©ì?? ì§?ì ?"
 
-# "Sh_ow a reminder" <NN> <minute(s)/hour(s)/day(s)> "before every appointment"
-# Reminder -> ë¯¸ë¦¬ ì??ë¦¼, Microsoft Office XP
 #: ../calendar/gui/dialogs/event-page.glade.h:1
-msgid "1 day before appointment"
-msgstr "ì?½ì?? í??ë£¨ ì ?ì??"
-
-# "Sh_ow a reminder" <NN> <minute(s)/hour(s)/day(s)> "before every appointment"
-# Reminder -> ë¯¸ë¦¬ ì??ë¦¼, Microsoft Office XP
-#: ../calendar/gui/dialogs/event-page.glade.h:2
-msgid "1 hour before appointment"
-msgstr "ì?½ì?? í?? ì??ê°? ì ?ì??"
-
-# "Sh_ow a reminder" <NN> <minute(s)/hour(s)/day(s)> "before every appointment"
-# Reminder -> ë¯¸ë¦¬ ì??ë¦¼, Microsoft Office XP
-#: ../calendar/gui/dialogs/event-page.glade.h:3
-msgid "15 minutes before appointment"
-msgstr "ì?½ì?? 15ë¶? ì ?ì??"
+msgid ""
+"15 minutes before appointment\n"
+"1 hour before appointment\n"
+"1 day before appointment"
+msgstr ""
+"ì?½ì?? 15ë¶? ì ?\n"
+"ì?½ì?? 1ì??ê°? ì ?\n"
+"ì?½ì?? 1ì?¼ ì ?"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:5
 msgid "Attendee_s..."
 msgstr "ì°¸ì??ì??(_S)..."
 
-#: ../calendar/gui/dialogs/event-page.glade.h:8
+#: ../calendar/gui/dialogs/event-page.glade.h:6
+#: ../calendar/gui/e-meeting-list-view.c:151
+msgid "Attendees"
+msgstr "ì°¸ì??ì??"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:9
 msgid "Custom Alarm:"
 msgstr "ì?¬ì?©ì?? ì?¤ì ? ì??ë¦¼:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:9
+#: ../calendar/gui/dialogs/event-page.glade.h:10
 msgid "Event Description"
 msgstr "í??ì?¬ ì?¤ëª?"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:11
+#: ../calendar/gui/dialogs/event-page.glade.h:12
 #: ../calendar/gui/dialogs/memo-page.glade.h:4
 #: ../calendar/gui/dialogs/task-page.glade.h:6
 msgid "Su_mmary:"
 msgstr "ê°?ì??(_M):"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:13
+#: ../calendar/gui/dialogs/event-page.glade.h:14
 msgid "_Alarm"
 msgstr "ì??ë¦¼(_A)"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:15
+#: ../calendar/gui/dialogs/event-page.glade.h:16
 #: ../calendar/gui/dialogs/memo-page.glade.h:6
 #: ../calendar/gui/dialogs/task-page.glade.h:8
+#: ../widgets/misc/e-attachment-dialog.c:345
 msgid "_Description:"
 msgstr "ì?¤ëª?(_D):"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:17
+#: ../plugins/calendar-weather/calendar-weather.c:372
+#: ../plugins/exchange-operations/exchange-calendar.c:247
+#: ../plugins/exchange-operations/exchange-contacts.c:239
+msgid "_Location:"
+msgstr "ì??ì¹?(_L):"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:18
 msgid "_Time:"
 msgstr "ì??ê°?(_T):"
 
-# FIXME - hard to translate UI + string based on English grammar
-# "for ... occurrences"
-#. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/event-page.glade.h:18
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:16
-msgid "for"
-msgstr "ì§?ì??:"
+#: ../calendar/gui/dialogs/event-page.glade.h:19
+#: ../calendar/gui/dialogs/memo-page.glade.h:8
+#: ../calendar/gui/dialogs/task-page.glade.h:10
+#: ../mail/mail-config.glade.h:192 ../mail/mail-dialogs.glade.h:21
+#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:5
+#: ../smime/gui/smime-ui.glade.h:49
+msgid ""
+"a\n"
+"b"
+msgstr ""
+"a\n"
+"b"
 
 # FIXME - hard to translate UI + string based on English grammar
 # "for ... occurrences"
-#. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][day(s)][until][2006/01/01]' (dropdown menu options are in [square brackets])
 #: ../calendar/gui/dialogs/event-page.glade.h:21
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:25
-msgid "until"
-msgstr "ë??ë?  ë??:"
-
-#: ../calendar/gui/dialogs/meeting-page.glade.h:1
-msgid "<b>Att_endees</b>"
-msgstr "<b>ì°¸ì??ì??(_E)</b> "
-
-#: ../calendar/gui/dialogs/meeting-page.glade.h:2
-msgid "C_hange Organizer"
-msgstr "ì£¼ìµ?ì?? ë°?ê¾¸ê¸°(_H)"
-
-#: ../calendar/gui/dialogs/meeting-page.glade.h:3
-msgid "Co_ntacts..."
-msgstr "ì?°ë?½ì²?(_N)..."
-
-#: ../calendar/gui/dialogs/meeting-page.glade.h:7
-#: ../calendar/gui/e-itip-control.glade.h:7
-msgid "Organizer:"
-msgstr "ì£¼ìµ?ì??:"
+msgid ""
+"for\n"
+"until"
+msgstr ""
+"ë?¤ì?? ë??ì??\n"
+"ë?¤ì?? ê¹?ì§?"
 
-#: ../calendar/gui/dialogs/memo-editor.c:111 ../calendar/gui/print.c:2485
+#: ../calendar/gui/dialogs/memo-editor.c:111 ../calendar/gui/print.c:2469
 msgid "Memo"
 msgstr "ë©?ëª¨"
 
-#: ../calendar/gui/dialogs/memo-page.c:857
+#: ../calendar/gui/dialogs/memo-page.c:347
+msgid "Memo cannot be edited, because the selected memo list is read only"
+msgstr "ë©?ëª¨ë¥¼ í?¸ì§?í?  ì?? ì??ì?µë??ë?¤. ì? í??í?? ë©?ëª¨ ëª©ë¡?ì?´ ì?½ê¸° ì ?ì?©ì??ë??ë?¤"
+
+#: ../calendar/gui/dialogs/memo-page.c:351
+msgid "Memo cannot be fully edited, because you are not the organizer"
+msgstr "ë©?ëª¨ ì ?ì²´ë¥¼ í?¸ì§?í?  ì?? ì??ì?µë??ë?¤. ì£¼ìµ?ì??ê°? ì??ë??ë??ë?¤"
+
+#: ../calendar/gui/dialogs/memo-page.c:871
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "'%s'ì?? ë©?ëª¨ë¥¼ ì?´ ì?? ì??ì?µë??ë?¤."
 
-#: ../calendar/gui/dialogs/memo-page.c:1012 ../mail/em-format-html.c:1567
-#: ../mail/em-format-html.c:1625 ../mail/em-format-html.c:1651
-#: ../mail/em-format-quote.c:210 ../mail/em-format.c:887
-#: ../mail/em-mailer-prefs.c:77 ../mail/message-list.etspec.h:20
+#: ../calendar/gui/dialogs/memo-page.c:1031 ../mail/em-format-html.c:1566
+#: ../mail/em-format-html.c:1624 ../mail/em-format-html.c:1649
+#: ../mail/em-format-quote.c:209 ../mail/em-format.c:925
+#: ../mail/em-mailer-prefs.c:78 ../mail/message-list.etspec.h:20
 msgid "To"
 msgstr "ë°?ë?? ì?¬ë??"
 
@@ -6898,7 +5579,7 @@ msgid "T_o:"
 msgstr "ë°?ë?? ì?¬ë??(_O):"
 
 #: ../calendar/gui/dialogs/memo-page.glade.h:7
-#: ../calendar/gui/dialogs/task-page.c:365
+#: ../calendar/gui/dialogs/task-page.c:380
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Group:"
 msgstr "ê·¸ë£¹(_G):"
@@ -6925,23 +5606,23 @@ msgstr "ë°?ë³µ ì??ì??ì?? ì??ì ?í??ë ¤ê³  í?©ë??ë?¤. ë¬´ì??ì?? ì??ì ?í??ì??ê² ì?µ
 msgid "You are modifying a recurring memo. What would you like to modify?"
 msgstr "ë°?ë³µ ë©?ëª¨ë¥¼ ì??ì ?í??ë ¤ê³  í?©ë??ë?¤. ë¬´ì??ì?? ì??ì ?í??ì??ê² ì?µë??ê¹??"
 
-#: ../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
 msgid "This and Prior Instances"
 msgstr "ì?´ ê²½ì?° ë°? ì§?ë??ê°? ê²½ì?°"
 
-#: ../calendar/gui/dialogs/recur-comp.c:98
+#: ../calendar/gui/dialogs/recur-comp.c:97
 msgid "This and Future Instances"
 msgstr "ì?´ ê²½ì?° ë°? ì??ì?¼ë¡?ì?? ê²½ì?°"
 
-#: ../calendar/gui/dialogs/recur-comp.c:103
+#: ../calendar/gui/dialogs/recur-comp.c:102
 msgid "All Instances"
 msgstr "ëª¨ë?  ê²½ì?°"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:562
+#: ../calendar/gui/dialogs/recurrence-page.c:563
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "ì?´ ì?½ì??ì??ë?? ì??ë³¼ë£¨ì??ì??ì?? í?¸ì§?í?  ì?? ì??ë?? ë°?ë³µì?´ ë?¤ì?´ ì??ì?µë??ë?¤."
 
@@ -6963,7 +5644,7 @@ msgstr "ì??ì?¼"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1025
+#: ../calendar/gui/dialogs/recurrence-page.c:1018
 msgid "first"
 msgstr "ì²«ë²?ì§¸"
 
@@ -6972,7 +5653,7 @@ msgstr "ì²«ë²?ì§¸"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1031
+#: ../calendar/gui/dialogs/recurrence-page.c:1024
 msgid "second"
 msgstr "ë??ë²?ì§¸"
 
@@ -6980,7 +5661,7 @@ msgstr "ë??ë²?ì§¸"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1036
+#: ../calendar/gui/dialogs/recurrence-page.c:1029
 msgid "third"
 msgstr "ì?¸ë²?ì§¸"
 
@@ -6988,21 +5669,29 @@ msgstr "ì?¸ë²?ì§¸"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1041
+#: ../calendar/gui/dialogs/recurrence-page.c:1034
 msgid "fourth"
 msgstr "ë?¤ë²?ì§¸"
 
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [fifth] [Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'fifth', either the string 'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1039
+msgid "fifth"
+msgstr "ë?¤ì?¯ë²?ì§¸"
+
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [last] [Monday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1046
+#: ../calendar/gui/dialogs/recurrence-page.c:1044
 msgid "last"
 msgstr "ë§?ì§?ë§?"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1072
+#: ../calendar/gui/dialogs/recurrence-page.c:1068
 msgid "Other Date"
 msgstr "ê¸°í?? ë? ì§?"
 
@@ -7010,7 +5699,7 @@ msgstr "ê¸°í?? ë? ì§?"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1080
+#: ../calendar/gui/dialogs/recurrence-page.c:1074
 msgid "1st to 10th"
 msgstr "1ì?¼ë¶?í?° 10ì?¼"
 
@@ -7018,7 +5707,7 @@ msgstr "1ì?¼ë¶?í?° 10ì?¼"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1086
+#: ../calendar/gui/dialogs/recurrence-page.c:1080
 msgid "11th to 20th"
 msgstr "11ì?¼ë¶?í?° 20ì?¼"
 
@@ -7026,14 +5715,14 @@ msgstr "11ì?¼ë¶?í?° 20ì?¼"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1092
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
 msgid "21st to 31st"
 msgstr "21ì?¼ë¶?í?° 31ì?¼"
 
 #. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
 #. (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/gui/dialogs/recurrence-page.c:1115
+#: ../calendar/gui/dialogs/recurrence-page.c:1111
 msgid "day"
 msgstr "ì?¼"
 
@@ -7042,33 +5731,33 @@ msgstr "ì?¼"
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1241
+#: ../calendar/gui/dialogs/recurrence-page.c:1240
 msgid "on the"
 msgstr "ê¸°ê°?:"
 
 # FIXME - hard to translate UI + string based on English grammar
 # "for ... occurrences"
-#: ../calendar/gui/dialogs/recurrence-page.c:1417
+#: ../calendar/gui/dialogs/recurrence-page.c:1410
 msgid "occurrences"
 msgstr "ë²?"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2120
+#: ../calendar/gui/dialogs/recurrence-page.c:2105
 msgid "Add exception"
 msgstr "ì??ì?¸ ì¶?ê°?"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2161
+#: ../calendar/gui/dialogs/recurrence-page.c:2146
 msgid "Could not get a selection to modify."
 msgstr "ê³ ì¹  ì? í?? ì?¬í?ì?? ì?»ì?´ ì?¬ ì?? ì??ì?µë??ë?¤."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2167
+#: ../calendar/gui/dialogs/recurrence-page.c:2152
 msgid "Modify exception"
 msgstr "ì??ì?¸ ì??ì ?"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2211
+#: ../calendar/gui/dialogs/recurrence-page.c:2196
 msgid "Could not get a selection to delete."
 msgstr "ì§?ì?¸ ì? í?? ì?¬í?ì?? ì?»ì?´ ì?¬ ì?? ì??ì?µë??ë?¤."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2335
+#: ../calendar/gui/dialogs/recurrence-page.c:2320
 msgid "Date/Time"
 msgstr "ë? ì§?/ì??ê°?"
 
@@ -7077,7 +5766,7 @@ msgid "<b>Exceptions</b>"
 msgstr "<b>ì??ì?¸</b>"
 
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:2
-#: ../mail/mail-config.glade.h:3
+#: ../mail/mail-config.glade.h:2
 msgid "<b>Preview</b>"
 msgstr "<b>ë¯¸ë¦¬ ë³´ê¸°</b>"
 
@@ -7087,60 +5776,58 @@ msgstr "<b>ë°?ë³µ</b>"
 
 # FIXME - hard to translate UI + string based on English grammar
 # "for ... occurrences"
-#. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:6
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:5
 msgid "Every"
 msgstr "ë§¤"
 
 # FIXME - hard to translate UI + string based on English grammar
 # "for ... occurrences"
-#. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:9
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "This appointment rec_urs"
 msgstr "ì?´ ì?½ì?? ë°?ë³µ(_U)"
 
-# FIXME - hard to translate UI + string based on English grammar
-# "for ... occurrences"
-#. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][day(s)][forever]' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:19
-msgid "forever"
-msgstr "ì??ì??í??"
-
-# FIXME - hard to translate UI + string based on English grammar
-# "for ... occurrences"
 #. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][month(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:22
-msgid "month(s)"
-msgstr "ë?¬"
+#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:11
+msgid ""
+"day(s)\n"
+"week(s)\n"
+"month(s)\n"
+"year(s)"
+msgstr ""
+"ì?¼\n"
+"ì£¼\n"
+"ë?¬\n"
+"ë??"
 
-# FIXME - hard to translate UI + string based on English grammar
-# "for ... occurrences"
 #. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][week(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:28
-msgid "week(s)"
-msgstr "ì£¼"
-
-# FIXME - hard to translate UI + string based on English grammar
-# "for ... occurrences"
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:29
-msgid "year(s)"
-msgstr "ë??"
+#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:17
+msgid ""
+"for\n"
+"until\n"
+"forever"
+msgstr ""
+"ë?¤ì?? ë??ì??\n"
+"ë?¤ì?? ê¹?ì§?\n"
+"ì??ì??í??"
 
-#: ../calendar/gui/dialogs/send-comp.c:116
+#: ../calendar/gui/dialogs/send-comp.c:160
 msgid "Send my alarms with this event"
-msgstr "ì?´ ì?´ë²¤í?¸ì?? ë?´ ì??ë¦¼ ë³´ë?´ê¸°"
+msgstr "ì?´ í??ì?¬ì?? ë?´ ì??ë¦¼ ë³´ë?´ê¸°"
 
-#: ../calendar/gui/dialogs/task-details-page.c:377
-#: ../calendar/gui/dialogs/task-details-page.c:397
+#: ../calendar/gui/dialogs/send-comp.c:162
+msgid "Notify new attendees _only"
+msgstr "ì?? ì°¸ì??ì??ì??ê²?ë§? ì??ë¦¼(_O)"
+
+#: ../calendar/gui/dialogs/task-details-page.c:376
+#: ../calendar/gui/dialogs/task-details-page.c:396
 msgid "Completed date is wrong"
 msgstr "ì??ë£? ë? ì§?ê°? ì??ëª»ë??ì??ì?µë??ë?¤"
 
-#: ../calendar/gui/dialogs/task-details-page.c:482
+#: ../calendar/gui/dialogs/task-details-page.c:481
 msgid "Web Page"
 msgstr "ì?¹ í??ì?´ì§?"
 
@@ -7152,74 +5839,38 @@ msgstr "<span weight=\"bold\">ê¸°í??</span>"
 msgid "<span weight=\"bold\">Status</span>"
 msgstr "<span weight=\"bold\">ì??í??</span>"
 
-#. 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:247
-#: ../calendar/gui/e-cal-model-tasks.c:362
-#: ../calendar/gui/e-cal-model-tasks.c:679
-#: ../calendar/gui/e-calendar-table.c:237
-#: ../calendar/gui/e-calendar-table.c:663 ../calendar/gui/e-itip-control.c:941
-#: ../calendar/gui/e-meeting-store.c:180 ../calendar/gui/e-meeting-store.c:203
-#: ../calendar/gui/print.c:2561 ../calendar/gui/tasktypes.xml.h:9
-#: ../plugins/save-calendar/csv-format.c:366
-msgid "Completed"
-msgstr "ì??ë£?ë?¨"
-
-#: ../calendar/gui/dialogs/task-details-page.glade.h:5
-#: ../calendar/gui/e-cal-component-preview.c:266
-#: ../calendar/gui/e-calendar-table.c:588 ../calendar/gui/tasktypes.xml.h:14
-#: ../mail/message-list.c:1065
-msgid "High"
-msgstr "ë??ì??"
-
-#: ../calendar/gui/dialogs/task-details-page.glade.h:6
-#: ../calendar/gui/e-cal-component-preview.c:244
-#: ../calendar/gui/e-cal-model-tasks.c:360
-#: ../calendar/gui/e-cal-model-tasks.c:677
-#: ../calendar/gui/e-cal-model-tasks.c:754
-#: ../calendar/gui/e-calendar-table.c:235
-#: ../calendar/gui/e-calendar-table.c:662 ../calendar/gui/print.c:2558
-msgid "In Progress"
-msgstr "ì§?í??ì¤?"
+#: ../calendar/gui/dialogs/task-details-page.glade.h:3
+msgid ""
+"High\n"
+"Normal\n"
+"Low\n"
+"Undefined"
+msgstr ""
+"ë??ì??\n"
+"ë³´í?µ\n"
+"ë?®ì??\n"
+"ì§?ì ?í??ì§? ì??ì??"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
-#: ../calendar/gui/e-cal-component-preview.c:270
-#: ../calendar/gui/e-calendar-table.c:590 ../calendar/gui/tasktypes.xml.h:16
-#: ../mail/message-list.c:1063
-msgid "Low"
-msgstr "ë?®ì??"
-
-#: ../calendar/gui/dialogs/task-details-page.glade.h:8
-#: ../calendar/gui/e-cal-component-preview.c:268
-#: ../calendar/gui/e-cal-model.c:1006 ../calendar/gui/e-calendar-table.c:589
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1064
-msgid "Normal"
-msgstr "ë³´í?µ"
-
-#: ../calendar/gui/dialogs/task-details-page.glade.h:9
-#: ../calendar/gui/e-cal-component-preview.c:254
-#: ../calendar/gui/e-cal-model-tasks.c:358
-#: ../calendar/gui/e-cal-model-tasks.c:675
-#: ../calendar/gui/e-calendar-table.c:233
-#: ../calendar/gui/e-calendar-table.c:661 ../calendar/gui/print.c:2555
-#: ../calendar/gui/tasktypes.xml.h:18
-msgid "Not Started"
-msgstr "ì??ì?? ì??í?¨"
+msgid ""
+"Not Started\n"
+"In Progress\n"
+"Completed\n"
+"Canceled"
+msgstr ""
+"ì??ì??í??ì§? ì??ì??\n"
+"ì§?í?? ì¤?\n"
+"ë§?ì¹¨\n"
+"ì·¨ì??"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:10
+#: ../calendar/gui/dialogs/task-details-page.glade.h:11
 msgid "P_ercent complete:"
 msgstr "í?¼ì?¼í?¸ ì??ë£?(_E):"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:11
+#: ../calendar/gui/dialogs/task-details-page.glade.h:12
 msgid "Stat_us:"
 msgstr "ì??í??(_U):"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:591 ../calendar/gui/tasktypes.xml.h:24
-msgid "Undefined"
-msgstr "ì ?ì??ì??ë?¨"
-
 #: ../calendar/gui/dialogs/task-details-page.glade.h:13
 msgid "_Date completed:"
 msgstr "ì??ë£?í?? ë? ì§?(_D):"
@@ -7242,7 +5893,7 @@ msgid "Click to change or view the status details of the task"
 msgstr "ë??ë¥´ë©´ ì??ì??ì?? ì??ì?¸í?? ì??í?? ì ?ë³´ë¥¼ ë°?ê¾¸ê±°ë?? ë´?ë??ë?¤"
 
 #: ../calendar/gui/dialogs/task-editor.c:123
-#: ../composer/e-composer-actions.c:525
+#: ../composer/e-composer-actions.c:371
 msgid "_Send Options"
 msgstr "ë³´ë?´ê¸° ì?µì??(_S)"
 
@@ -7254,16 +5905,24 @@ msgstr "ì??ì??(_T)"
 msgid "Task Details"
 msgstr "ì??ì?? ì??ì?¸í??"
 
-#: ../calendar/gui/dialogs/task-page.c:373
+#: ../calendar/gui/dialogs/task-page.c:336
+msgid "Task cannot be edited, because the selected task list is read only"
+msgstr "ì??ì??ì?? í?¸ì§?í?  ì?? ì??ì?µë??ë?¤. ì? í??í?? ì??ì?? ëª©ë¡?ì?´ ì?½ê¸° ì ?ì?©ì??ë??ë?¤"
+
+#: ../calendar/gui/dialogs/task-page.c:340
+msgid "Task cannot be fully edited, because you are not the organizer"
+msgstr "ì??ì?? ì ?ì²´ë¥¼ í?¸ì§?í?  ì?? ì??ì?µë??ë?¤. ì£¼ìµ?ì??ê°? ì??ë??ë??ë?¤"
+
+#: ../calendar/gui/dialogs/task-page.c:388
 #: ../calendar/gui/dialogs/task-page.glade.h:4
 msgid "Organi_zer:"
 msgstr "ì£¼ìµ?ì??(_Z):"
 
-#: ../calendar/gui/dialogs/task-page.c:786
+#: ../calendar/gui/dialogs/task-page.c:803
 msgid "Due date is wrong"
 msgstr "ë§?ê°? ë? ì§?ê°? ì??ëª»ë??ì??ì?µë??ë?¤"
 
-#: ../calendar/gui/dialogs/task-page.c:1763
+#: ../calendar/gui/dialogs/task-page.c:1782
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "'%s'ì?? ì??ì??ì?? ì?´ ì?? ì??ì?µë??ë?¤."
@@ -7342,7 +6001,7 @@ msgstr "%s %s ì?½ì?? ë??ë?? í??"
 #: ../calendar/gui/e-alarm-list.c:511
 #, c-format
 msgid "%s at the end of the appointment"
-msgstr "ì?½ì?? ë??ë? ë?? %s"
+msgstr "ì?½ì?? ë??ë?  ë?? %s"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s is an absolute time, e.g. "10:00AM"
@@ -7359,80 +6018,161 @@ msgstr "%s (%s)"
 msgid "%s for an unknown trigger type"
 msgstr "ì?? ì?? ì??ë?? ì??ì?? ì?µì??ì?? ë??í?? %s"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:69
-#: ../calendar/gui/e-cal-component-preview.c:67 ../mail/em-folder-view.c:3273
+#: ../calendar/gui/e-attachment-handler-calendar.c:258
+msgid "I_mport"
+msgstr "ê°?ì ¸ì?¤ê¸°(_M)"
+
+#: ../calendar/gui/e-attachment-handler-calendar.c:340
+msgid "Select a Calendar"
+msgstr "ë?¬ë ¥ ì? í??"
+
+#: ../calendar/gui/e-attachment-handler-calendar.c:367
+msgid "Select a Task List"
+msgstr "ì??ì?? ëª©ë¡? ì? í??"
+
+#: ../calendar/gui/e-attachment-handler-calendar.c:377
+msgid "I_mport to Calendar"
+msgstr "ë?¬ë ¥ì?¼ë¡? ê°?ì ¸ì?¤ê¸°(_M)"
+
+#: ../calendar/gui/e-attachment-handler-calendar.c:384
+msgid "I_mport to Tasks"
+msgstr "ì??ì??ì?¼ë¡? ê°?ì ¸ì?¤ê¸°(_M)"
+
+#: ../calendar/gui/e-cal-component-memo-preview.c:68
+#: ../calendar/gui/e-cal-component-preview.c:67 ../mail/em-folder-view.c:3210
 #, c-format
 msgid "Click to open %s"
 msgstr "%s URLì?? ì?´ë ¤ë©´ ë??ë¥´ì?ì??ì?¤"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:129
-#: ../calendar/gui/e-cal-component-preview.c:171 ../filter/filter-rule.c:858
+#: ../calendar/gui/e-cal-component-memo-preview.c:127
+#: ../calendar/gui/e-cal-component-preview.c:170 ../filter/filter-rule.c:859
 msgid "Untitled"
 msgstr "ì ?ëª© ì??ì??"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:181
-#: ../calendar/gui/e-cal-component-preview.c:211
-#: ../calendar/gui/e-cal-component-preview.c:222
+#: ../calendar/gui/e-cal-component-memo-preview.c:178
+#: ../calendar/gui/e-cal-component-preview.c:209
+#: ../calendar/gui/e-cal-component-preview.c:220
 msgid "Start Date:"
 msgstr "ì??ì?? ë? ì§?:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:194
+#: ../calendar/gui/e-cal-component-memo-preview.c:191
 #: ../calendar/gui/e-cal-component-preview.c:285
-#: ../calendar/gui/e-itip-control.c:1213
-#: ../calendar/gui/e-itip-control.glade.h:4 ../mail/mail-config.glade.h:69
-#: ../widgets/misc/e-attachment.glade.h:2
+#: ../calendar/gui/e-itip-control.c:1210
+#: ../calendar/gui/e-itip-control.glade.h:4 ../mail/mail-config.glade.h:75
 msgid "Description:"
 msgstr "ì?¤ëª?:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:218
+#: ../calendar/gui/e-cal-component-memo-preview.c:215
 #: ../calendar/gui/e-cal-component-preview.c:309
 msgid "Web Page:"
 msgstr "ì?¹ í??ì?´ì§?:"
 
-#: ../calendar/gui/e-cal-component-preview.c:204
-#: ../calendar/gui/e-itip-control.c:1157
+#: ../calendar/gui/e-cal-component-preview.c:202
+#: ../calendar/gui/e-itip-control.c:1154
 #: ../calendar/gui/e-itip-control.glade.h:9
 msgid "Summary:"
 msgstr "ì??ì?½:"
 
-#: ../calendar/gui/e-cal-component-preview.c:233
+#: ../calendar/gui/e-cal-component-preview.c:231
 msgid "Due Date:"
 msgstr "ë§?ê°? ë? ì§?:"
 
 #. write status
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:240
-#: ../calendar/gui/e-itip-control.c:1181
-#: ../plugins/exchange-operations/exchange-account-setup.c:284
-#: ../plugins/itip-formatter/itip-view.c:1052
+#: ../calendar/gui/e-cal-component-preview.c:238
+#: ../calendar/gui/e-itip-control.c:1178
+#: ../plugins/exchange-operations/exchange-account-setup.c:283
+#: ../plugins/itip-formatter/itip-view.c:1054
 msgid "Status:"
 msgstr "ì??í??:"
 
-#: ../calendar/gui/e-cal-component-preview.c:264
+#: ../calendar/gui/e-cal-component-preview.c:242
+#: ../calendar/gui/e-cal-model-tasks.c:359
+#: ../calendar/gui/e-cal-model-tasks.c:675
+#: ../calendar/gui/e-cal-model-tasks.c:752
+#: ../calendar/gui/e-calendar-table.c:234
+#: ../calendar/gui/e-calendar-table.c:659 ../calendar/gui/print.c:2542
+msgid "In Progress"
+msgstr "ì§?í??ì¤?"
+
+#. Pass TRUE as is_utc, so it gets converted to the current
+#. timezone.
+#: ../calendar/gui/e-cal-component-preview.c:245
+#: ../calendar/gui/e-cal-model-tasks.c:361
+#: ../calendar/gui/e-cal-model-tasks.c:677
+#: ../calendar/gui/e-calendar-table.c:236
+#: ../calendar/gui/e-calendar-table.c:660 ../calendar/gui/e-itip-control.c:939
+#: ../calendar/gui/e-meeting-store.c:179 ../calendar/gui/e-meeting-store.c:202
+#: ../calendar/gui/print.c:2545 ../calendar/gui/tasktypes.xml.h:9
+#: ../plugins/save-calendar/csv-format.c:361
+msgid "Completed"
+msgstr "ì??ë£?ë?¨"
+
+#: ../calendar/gui/e-cal-component-preview.c:252
+#: ../calendar/gui/e-cal-model-tasks.c:357
+#: ../calendar/gui/e-cal-model-tasks.c:673
+#: ../calendar/gui/e-calendar-table.c:232
+#: ../calendar/gui/e-calendar-table.c:658 ../calendar/gui/print.c:2539
+#: ../calendar/gui/tasktypes.xml.h:18
+msgid "Not Started"
+msgstr "ì??ì?? ì??í?¨"
+
+#: ../calendar/gui/e-cal-component-preview.c:262
 msgid "Priority:"
 msgstr "ì?°ì?  ì??ì??:"
 
+#: ../calendar/gui/e-cal-component-preview.c:264
+#: ../calendar/gui/e-calendar-table.c:585 ../calendar/gui/tasktypes.xml.h:14
+#: ../mail/message-list.c:1064
+msgid "High"
+msgstr "ë??ì??"
+
+#: ../calendar/gui/e-cal-component-preview.c:266
+#: ../calendar/gui/e-cal-model.c:1076 ../calendar/gui/e-calendar-table.c:586
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1063
+msgid "Normal"
+msgstr "ë³´í?µ"
+
+#: ../calendar/gui/e-cal-component-preview.c:268
+#: ../calendar/gui/e-calendar-table.c:587 ../calendar/gui/tasktypes.xml.h:16
+#: ../mail/message-list.c:1062
+msgid "Low"
+msgstr "ë?®ì??"
+
 #: ../calendar/gui/e-cal-list-view.etspec.h:2
+#: ../calendar/gui/e-calendar-table.etspec.h:7
+#: ../calendar/gui/e-memo-table.etspec.h:3
+#: ../plugins/save-calendar/csv-format.c:362
+msgid "Created"
+msgstr "ë§?ë?¦"
+
+#: ../calendar/gui/e-cal-list-view.etspec.h:3
 msgid "End Date"
 msgstr "ë?? ë? ì§?"
 
 #: ../calendar/gui/e-cal-list-view.etspec.h:4
-#: ../calendar/gui/e-memo-table.etspec.h:3
+#: ../calendar/gui/e-calendar-table.etspec.h:9
+#: ../calendar/gui/e-memo-table.etspec.h:4
+msgid "Last modified"
+msgstr "ìµ?ê·¼ ë°?ë??"
+
+#: ../calendar/gui/e-cal-list-view.etspec.h:6
+#: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Start Date"
 msgstr "ì??ì?? ë? ì§?"
 
 #: ../calendar/gui/e-cal-model-calendar.c:187
-#: ../calendar/gui/e-calendar-table.c:640
+#: ../calendar/gui/e-calendar-table.c:637
 msgid "Free"
 msgstr "ì?½ì?? ì??ì??"
 
 #: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-calendar-table.c:641
-#: ../calendar/gui/e-meeting-time-sel.c:399
+#: ../calendar/gui/e-calendar-table.c:638
+#: ../calendar/gui/e-meeting-time-sel.c:391
 msgid "Busy"
 msgstr "ì?½ì?? ì??ì??"
 
-#: ../calendar/gui/e-cal-model-tasks.c:627
+#: ../calendar/gui/e-cal-model-tasks.c:625
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -7442,225 +6182,200 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1029 ../calendar/gui/e-cal-model.c:1012
+#: ../calendar/gui/e-cal-model-tasks.c:1027 ../calendar/gui/e-cal-model.c:1082
 #: ../calendar/gui/e-meeting-list-view.c:190
-#: ../calendar/gui/e-meeting-store.c:152 ../calendar/gui/e-meeting-store.c:162
-#: ../calendar/gui/e-meeting-store.c:745
+#: ../calendar/gui/e-meeting-store.c:151 ../calendar/gui/e-meeting-store.c:161
+#: ../calendar/gui/e-meeting-store.c:742
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "ì??"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1029 ../calendar/gui/e-cal-model.c:1012
+#: ../calendar/gui/e-cal-model-tasks.c:1027 ../calendar/gui/e-cal-model.c:1082
 #: ../calendar/gui/e-meeting-list-view.c:191
-#: ../calendar/gui/e-meeting-store.c:164
+#: ../calendar/gui/e-meeting-store.c:163
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "ì??ë??ì?¤"
 
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:354 ../calendar/gui/e-cal-popup.c:106
-#: ../calendar/gui/e-cal-popup.c:123 ../calendar/gui/e-cal-popup.c:178
-#: ../calendar/gui/e-itip-control.c:1198 ../calendar/gui/e-itip-control.c:1338
+#: ../calendar/gui/e-cal-model.c:372 ../calendar/gui/e-itip-control.c:1195
+#: ../calendar/gui/e-itip-control.c:1333
 #: ../calendar/gui/e-meeting-list-view.c:166
 #: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:110 ../calendar/gui/e-meeting-store.c:145
-#: ../calendar/gui/e-meeting-store.c:208 ../calendar/gui/print.c:984
-#: ../calendar/gui/print.c:1001 ../mail/em-utils.c:1342
-#: ../plugins/itip-formatter/itip-formatter.c:447
-#: ../plugins/itip-formatter/itip-formatter.c:2204
+#: ../calendar/gui/e-meeting-store.c:109 ../calendar/gui/e-meeting-store.c:144
+#: ../calendar/gui/e-meeting-store.c:207 ../calendar/gui/print.c:978
+#: ../calendar/gui/print.c:995 ../mail/em-utils.c:1339
+#: ../plugins/itip-formatter/itip-formatter.c:449
+#: ../plugins/itip-formatter/itip-formatter.c:2233
 #: ../plugins/plugin-manager/plugin-manager.c:89
-#: ../widgets/misc/e-attachment-bar.c:821
 #: ../widgets/misc/e-charset-picker.c:56
 msgid "Unknown"
 msgstr "ì?? ì?? ì??ì??"
 
-#: ../calendar/gui/e-cal-model.c:1008
+#: ../calendar/gui/e-cal-model.c:1078
 msgid "Recurring"
 msgstr "ë°?ë³µë?¨"
 
-#: ../calendar/gui/e-cal-model.c:1010
+#: ../calendar/gui/e-cal-model.c:1080
 msgid "Assigned"
 msgstr "ì??ì?½ë?¨"
 
-#: ../calendar/gui/e-cal-popup.c:184 ../mail/em-popup.c:414
-msgid "Save As..."
-msgstr "ë?¤ë¥¸ ì?´ë¦?ì?¼ë¡? ì ?ì?¥..."
-
-#: ../calendar/gui/e-cal-popup.c:200 ../mail/em-format-html-display.c:2217
-msgid "Select folder to save selected attachments..."
-msgstr "ì? í??í?? ì²¨ë¶?ë¥¼ ì ?ì?¥í?  í?´ë?? ì? í??..."
-
-#: ../calendar/gui/e-cal-popup.c:232 ../mail/em-popup.c:442
-#, c-format
-msgid "untitled_image.%s"
-msgstr "ì?´ë¦?ì??ë??_ê·¸ë¦¼.%s"
-
-#: ../calendar/gui/e-cal-popup.c:286 ../calendar/gui/e-calendar-table.c:1600
-#: ../calendar/gui/e-calendar-view.c:1776 ../calendar/gui/e-memo-table.c:939
-#: ../mail/em-folder-view.c:1338 ../mail/em-popup.c:559 ../mail/em-popup.c:570
-msgid "_Save As..."
-msgstr "ë?¤ë¥¸ ì?´ë¦?ì?¼ë¡? ì ?ì?¥(_S)..."
-
-#: ../calendar/gui/e-cal-popup.c:287 ../mail/em-popup.c:560
-#: ../mail/em-popup.c:571
-msgid "Set as _Background"
-msgstr "ë°°ê²½ í??ë©´ì?¼ë¡? ì?¤ì ?(_B)"
-
-#: ../calendar/gui/e-cal-popup.c:288
-msgid "_Save Selected"
-msgstr "ì? í??í?? ì?¬í? ì ?ì?¥(_S)"
-
-#: ../calendar/gui/e-cal-popup.c:430 ../mail/em-popup.c:828
-#, c-format
-msgid "Open in %s..."
-msgstr "%sì??ì?? ì?´ê¸°..."
-
-#: ../calendar/gui/e-calendar-table.c:336
+#: ../calendar/gui/e-calendar-table.c:335
 msgid "* No Summary *"
 msgstr "* ì??ì?½ ì??ì?? *"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email ofuser com>"
-#: ../calendar/gui/e-calendar-table.c:372
-#: ../calendar/gui/e-calendar-view.c:2399
+#: ../calendar/gui/e-calendar-table.c:371
+#: ../calendar/gui/e-calendar-view.c:2429
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "ì£¼ìµ?ì??: %s <%s>"
 
 #. With SunOne accounts, there may be no ':' in organiser.value
 #. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-table.c:375
-#: ../calendar/gui/e-calendar-view.c:2403
+#: ../calendar/gui/e-calendar-table.c:374
+#: ../calendar/gui/e-calendar-view.c:2433
 #, c-format
 msgid "Organizer: %s"
 msgstr "ì£¼ìµ?ì??: %s"
 
-#: ../calendar/gui/e-calendar-table.c:406
+#: ../calendar/gui/e-calendar-table.c:405
 msgid "Start: "
 msgstr "ì??ì??: "
 
-#: ../calendar/gui/e-calendar-table.c:418
+#: ../calendar/gui/e-calendar-table.c:417
 msgid "Due: "
 msgstr "ê¸°í??: "
 
-#: ../calendar/gui/e-calendar-table.c:610
+#: ../calendar/gui/e-calendar-table.c:588 ../calendar/gui/tasktypes.xml.h:24
+msgid "Undefined"
+msgstr "ì ?ì??ì??ë?¨"
+
+#: ../calendar/gui/e-calendar-table.c:607
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:611
+#: ../calendar/gui/e-calendar-table.c:608
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:612
+#: ../calendar/gui/e-calendar-table.c:609
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:613
+#: ../calendar/gui/e-calendar-table.c:610
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:614
+#: ../calendar/gui/e-calendar-table.c:611
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:615
+#: ../calendar/gui/e-calendar-table.c:612
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:616
+#: ../calendar/gui/e-calendar-table.c:613
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:617
+#: ../calendar/gui/e-calendar-table.c:614
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:618
+#: ../calendar/gui/e-calendar-table.c:615
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:619
+#: ../calendar/gui/e-calendar-table.c:616
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:620
+#: ../calendar/gui/e-calendar-table.c:617
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:900
-#: ../calendar/gui/e-calendar-view.c:672 ../calendar/gui/e-memo-table.c:452
+#: ../calendar/gui/e-calendar-table.c:897
+#: ../calendar/gui/e-calendar-view.c:659 ../calendar/gui/e-memo-table.c:449
 msgid "Deleting selected objects"
 msgstr "ì? í??í?? ì?¤ë¸?ì ?í?¸ë¥¼ ì?ì ?í??ë?? ì¤?ì??ë??ë?¤"
 
-#: ../calendar/gui/e-calendar-table.c:1183
-#: ../calendar/gui/e-calendar-view.c:837 ../calendar/gui/e-memo-table.c:657
+#: ../calendar/gui/e-calendar-table.c:1176
+#: ../calendar/gui/e-calendar-view.c:873 ../calendar/gui/e-memo-table.c:654
 msgid "Updating objects"
 msgstr "ì?¤ë¸?ì ?í?¸ë¥¼ ì??ë?°ì?´í?¸í??ë?? ì¤?ì??ë??ë?¤"
 
-#: ../calendar/gui/e-calendar-table.c:1371
-#: ../calendar/gui/e-calendar-view.c:1298 ../calendar/gui/e-memo-table.c:833
-#: ../composer/e-composer-actions.c:275
+#: ../calendar/gui/e-calendar-table.c:1364
+#: ../calendar/gui/e-calendar-view.c:1333 ../calendar/gui/e-memo-table.c:828
+#: ../composer/e-composer-actions.c:219
 msgid "Save as..."
 msgstr "ë?¤ë¥¸ ì?´ë¦?ì?¼ë¡? ì ?ì?¥..."
 
-#: ../calendar/gui/e-calendar-table.c:1595
-#: ../calendar/gui/e-calendar-view.c:1758
+#: ../calendar/gui/e-calendar-table.c:1588
+#: ../calendar/gui/e-calendar-view.c:1789
 msgid "New _Task"
 msgstr "ì?? ì??ì??(_T)"
 
-#: ../calendar/gui/e-calendar-table.c:1599 ../calendar/gui/e-memo-table.c:938
+#: ../calendar/gui/e-calendar-table.c:1592 ../calendar/gui/e-memo-table.c:933
 msgid "Open _Web Page"
 msgstr "ì?¹ í??ì?´ì§? ì?´ê¸°(_W)"
 
-#: ../calendar/gui/e-calendar-table.c:1601
-#: ../calendar/gui/e-calendar-view.c:1761 ../calendar/gui/e-memo-table.c:940
+#: ../calendar/gui/e-calendar-table.c:1593
+#: ../calendar/gui/e-calendar-view.c:1807 ../calendar/gui/e-memo-table.c:934
+#: ../mail/em-folder-view.c:1336 ../mail/em-popup.c:494
+msgid "_Save As..."
+msgstr "ë?¤ë¥¸ ì?´ë¦?ì?¼ë¡? ì ?ì?¥(_S)..."
+
+#: ../calendar/gui/e-calendar-table.c:1594
+#: ../calendar/gui/e-calendar-view.c:1792 ../calendar/gui/e-memo-table.c:935
 msgid "P_rint..."
 msgstr "ì?¸ì??(_R)..."
 
-#: ../calendar/gui/e-calendar-table.c:1605
-#: ../calendar/gui/e-calendar-view.c:1781 ../calendar/gui/e-memo-table.c:944
+#: ../calendar/gui/e-calendar-table.c:1598
+#: ../calendar/gui/e-calendar-view.c:1812 ../calendar/gui/e-memo-table.c:939
 #: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
 #: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "ì??ë?¼ë?´ê¸°(_U)"
 
-#: ../calendar/gui/e-calendar-table.c:1607
-#: ../calendar/gui/e-calendar-view.c:1764
-#: ../calendar/gui/e-calendar-view.c:1783 ../calendar/gui/e-memo-table.c:946
+#: ../calendar/gui/e-calendar-table.c:1600
+#: ../calendar/gui/e-calendar-view.c:1795
+#: ../calendar/gui/e-calendar-view.c:1814 ../calendar/gui/e-memo-table.c:941
 #: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:46
 #: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
 msgid "_Paste"
 msgstr "ë¶?ì?¬ë?£ê¸°(_P)"
 
-#: ../calendar/gui/e-calendar-table.c:1611 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1604 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "ì??ì?? í? ë?¹(_A)"
 
-#: ../calendar/gui/e-calendar-table.c:1612 ../calendar/gui/e-memo-table.c:950
+#: ../calendar/gui/e-calendar-table.c:1605 ../calendar/gui/e-memo-table.c:945
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "iCalendarë¡? ì ?ë?¬(_F)"
 
-#: ../calendar/gui/e-calendar-table.c:1613
+#: ../calendar/gui/e-calendar-table.c:1606
 msgid "_Mark as Complete"
 msgstr "ì??ì?? ì??ë£? í??ì??(_M)"
 
-#: ../calendar/gui/e-calendar-table.c:1614
+#: ../calendar/gui/e-calendar-table.c:1607
 msgid "_Mark Selected Tasks as Complete"
 msgstr "ì? í??í?? ì??ì??ì?? ë§?ì¹? ì??ì??ì?¼ë¡? í??ì??(_M)"
 
-#: ../calendar/gui/e-calendar-table.c:1615
+#: ../calendar/gui/e-calendar-table.c:1608
 msgid "_Mark as Incomplete"
 msgstr "ì??ì?? ë¯¸ì??ë£? í??ì??(_M)"
 
-#: ../calendar/gui/e-calendar-table.c:1616
+#: ../calendar/gui/e-calendar-table.c:1609
 msgid "_Mark Selected Tasks as Incomplete"
 msgstr "ì? í??í?? ì??ì??ì?? ë§?ì¹?ì§? ëª»í?? ì??ì??ì?¼ë¡? í??ì??(_M)"
 
-#: ../calendar/gui/e-calendar-table.c:1621
+#: ../calendar/gui/e-calendar-table.c:1614
 msgid "_Delete Selected Tasks"
 msgstr "ì? í??í?? ì??ì?? ì?ì ?(_D)"
 
-#: ../calendar/gui/e-calendar-table.c:1858
+#: ../calendar/gui/e-calendar-table.c:1849
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "ì??ì??ì?? ì¶?ê°?í??ë ¤ë©´ ë??ë¥´ì?ì??ì?¤"
@@ -7678,168 +6393,168 @@ msgstr "ì??ë£?"
 msgid "Completion date"
 msgstr "ì??ë£? ë? ì§?"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:7
+#: ../calendar/gui/e-calendar-table.etspec.h:8
 msgid "Due date"
 msgstr "ë§?ê°? ë? ì§?"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:8
+#: ../calendar/gui/e-calendar-table.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:20
-#: ../plugins/save-calendar/csv-format.c:373
+#: ../plugins/save-calendar/csv-format.c:368
 msgid "Priority"
 msgstr "ì?°ì? ì??ì??"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:9
+#: ../calendar/gui/e-calendar-table.etspec.h:11
 msgid "Start date"
 msgstr "ì??ì?? ë? ì§?"
 
 #. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
 #. Status: Accepted: X   Declined: Y   ...
-#: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-calendar-view.c:2307
-#: ../calendar/gui/e-meeting-list-view.c:602
+#: ../calendar/gui/e-calendar-table.etspec.h:12
+#: ../calendar/gui/e-calendar-view.c:2337
+#: ../calendar/gui/e-meeting-list-view.c:601
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10
-#: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:70
+#: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:72
 #: ../mail/message-list.etspec.h:17
 msgid "Status"
 msgstr "ì??í??"
 
-#: ../calendar/gui/e-calendar-view.c:1444
+#: ../calendar/gui/e-calendar-view.c:1478
 msgid "Moving items"
 msgstr "í?ëª©ì?? ì?®ê¸°ë?? ì¤?ì??ë??ë?¤"
 
-#: ../calendar/gui/e-calendar-view.c:1446
+#: ../calendar/gui/e-calendar-view.c:1480
 msgid "Copying items"
 msgstr "í?ëª©ì?? ë³µì?¬í??ë?? ì¤?ì??ë??ë?¤"
 
-#: ../calendar/gui/e-calendar-view.c:1755
+#: ../calendar/gui/e-calendar-view.c:1786
 msgid "New _Appointment..."
 msgstr "ì?? ì?½ì??(_A)..."
 
 # event -> í??ì?¬, Microsoft Office XP ì°¸ê³ 
-#: ../calendar/gui/e-calendar-view.c:1756
+#: ../calendar/gui/e-calendar-view.c:1787
 msgid "New All Day _Event"
 msgstr "ì?? í??ë£¨ ì¢?ì?¼ í??ì?¬(_E)"
 
-#: ../calendar/gui/e-calendar-view.c:1757
+#: ../calendar/gui/e-calendar-view.c:1788
 msgid "New _Meeting"
 msgstr "ì?? ëª¨ì??(_M)"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1768
+#: ../calendar/gui/e-calendar-view.c:1799
 msgid "_Current View"
 msgstr "í??ì?¬ ë·°(_C)"
 
-#: ../calendar/gui/e-calendar-view.c:1770
+#: ../calendar/gui/e-calendar-view.c:1801
 msgid "Select T_oday"
 msgstr "ì?¤ë?? ì? í??(_O)"
 
-#: ../calendar/gui/e-calendar-view.c:1771
+#: ../calendar/gui/e-calendar-view.c:1802
 msgid "_Select Date..."
 msgstr "ë? ì§? ì? í??(_S)..."
 
-#: ../calendar/gui/e-calendar-view.c:1777
+#: ../calendar/gui/e-calendar-view.c:1808
 msgid "Pri_nt..."
 msgstr "ì?¸ì??(_N)..."
 
-#: ../calendar/gui/e-calendar-view.c:1787
+#: ../calendar/gui/e-calendar-view.c:1818
 msgid "Cop_y to Calendar..."
 msgstr "ë?¬ë ¥ì?¼ë¡? ë³µì?¬(_Y)..."
 
-#: ../calendar/gui/e-calendar-view.c:1788
+#: ../calendar/gui/e-calendar-view.c:1819
 msgid "Mo_ve to Calendar..."
 msgstr "ë?¬ë ¥ì?¼ë¡? ì?´ë??(_V)..."
 
-#: ../calendar/gui/e-calendar-view.c:1789
+#: ../calendar/gui/e-calendar-view.c:1820
 msgid "_Delegate Meeting..."
 msgstr "ëª¨ì?? ë??ë¦¬(_D)..."
 
-#: ../calendar/gui/e-calendar-view.c:1790
+#: ../calendar/gui/e-calendar-view.c:1821
 msgid "_Schedule Meeting..."
 msgstr "ëª¨ì?? ì?¼ì ?(_S)..."
 
-#: ../calendar/gui/e-calendar-view.c:1791
+#: ../calendar/gui/e-calendar-view.c:1822
 msgid "_Forward as iCalendar..."
 msgstr "iCalendarë¡? ì ?ë?¬(_F)..."
 
-#: ../calendar/gui/e-calendar-view.c:1792
+#: ../calendar/gui/e-calendar-view.c:1823
 msgid "_Reply"
 msgstr "í??ì? (_R)"
 
-#: ../calendar/gui/e-calendar-view.c:1793 ../mail/em-folder-view.c:1332
-#: ../mail/em-popup.c:564 ../mail/em-popup.c:575
-#: ../ui/evolution-mail-message.xml.h:82
+#: ../calendar/gui/e-calendar-view.c:1824
+#: ../mail/e-attachment-handler-mail.c:140 ../mail/em-folder-view.c:1330
+#: ../mail/em-popup.c:499 ../ui/evolution-mail-message.xml.h:78
 msgid "Reply to _All"
 msgstr "ì ?ì²´ì?? í??ì? (_A)"
 
-#: ../calendar/gui/e-calendar-view.c:1798
+#: ../calendar/gui/e-calendar-view.c:1829
 msgid "Make this Occurrence _Movable"
 msgstr "ì?´ ê²½ì?° ì?®ê¸¸ ì?? ì??ê²? ë§?ë?¤ê¸°(_M)"
 
-#: ../calendar/gui/e-calendar-view.c:1799 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1830 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "ì?´ ê²½ì?° ì?ì ?(_O)"
 
-#: ../calendar/gui/e-calendar-view.c:1800
+#: ../calendar/gui/e-calendar-view.c:1831
 msgid "Delete _All Occurrences"
 msgstr "ëª¨ë?  ê²½ì?° ì?ì ?(_A)"
 
-#: ../calendar/gui/e-calendar-view.c:2254
-#: ../calendar/gui/e-itip-control.c:1186
+#: ../calendar/gui/e-calendar-view.c:2284
+#: ../calendar/gui/e-itip-control.c:1183
 #: ../calendar/gui/e-meeting-list-view.c:202
-#: ../calendar/gui/e-meeting-store.c:172 ../calendar/gui/e-meeting-store.c:195
-#: ../plugins/itip-formatter/itip-formatter.c:2192
+#: ../calendar/gui/e-meeting-store.c:171 ../calendar/gui/e-meeting-store.c:194
+#: ../plugins/itip-formatter/itip-formatter.c:2221
 msgid "Accepted"
 msgstr "ì??ë?½"
 
-#: ../calendar/gui/e-calendar-view.c:2255
-#: ../calendar/gui/e-itip-control.c:1194
+#: ../calendar/gui/e-calendar-view.c:2285
+#: ../calendar/gui/e-itip-control.c:1191
 #: ../calendar/gui/e-meeting-list-view.c:203
-#: ../calendar/gui/e-meeting-store.c:174 ../calendar/gui/e-meeting-store.c:197
-#: ../plugins/itip-formatter/itip-formatter.c:2198
+#: ../calendar/gui/e-meeting-store.c:173 ../calendar/gui/e-meeting-store.c:196
+#: ../plugins/itip-formatter/itip-formatter.c:2227
 msgid "Declined"
 msgstr "ê±°ë¶?"
 
-#: ../calendar/gui/e-calendar-view.c:2256
+#: ../calendar/gui/e-calendar-view.c:2286
 #: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:176 ../calendar/gui/e-meeting-store.c:199
-#: ../calendar/gui/e-meeting-time-sel.c:398
+#: ../calendar/gui/e-meeting-store.c:175 ../calendar/gui/e-meeting-store.c:198
+#: ../calendar/gui/e-meeting-time-sel.c:390
 msgid "Tentative"
 msgstr "ì? ì ?ì ?"
 
-#: ../calendar/gui/e-calendar-view.c:2257
+#: ../calendar/gui/e-calendar-view.c:2287
 #: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:178 ../calendar/gui/e-meeting-store.c:201
-#: ../plugins/itip-formatter/itip-formatter.c:2201
+#: ../calendar/gui/e-meeting-store.c:177 ../calendar/gui/e-meeting-store.c:200
+#: ../plugins/itip-formatter/itip-formatter.c:2230
 msgid "Delegated"
 msgstr "ë??ë¦¬"
 
-#: ../calendar/gui/e-calendar-view.c:2258
+#: ../calendar/gui/e-calendar-view.c:2288
 msgid "Needs action"
 msgstr "ë??ì?? í??ì??"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2419 ../calendar/gui/print.c:2517
+#: ../calendar/gui/e-calendar-view.c:2449 ../calendar/gui/print.c:2501
 #, c-format
 msgid "Location: %s"
 msgstr "ì??ì¹?: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2453
+#: ../calendar/gui/e-calendar-view.c:2480
 #, c-format
 msgid "Time: %s %s"
 msgstr "ì??ê°?: %s %s"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:109
+#: ../calendar/gui/e-cell-date-edit-text.c:102
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%Y/%m/%d (%a) %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:112
+#: ../calendar/gui/e-cell-date-edit-text.c:105
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%Y/%m/%d (%a) %p %I:%M:%S"
 
-#: ../calendar/gui/e-cell-date-edit-text.c:120
+#: ../calendar/gui/e-cell-date-edit-text.c:113
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -7852,12 +6567,12 @@ msgstr ""
 #. * to change the length of the time division in the calendar day view, e.g.
 #. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions"
 #.
-#: ../calendar/gui/e-day-view-time-item.c:750
+#: ../calendar/gui/e-day-view-time-item.c:747
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02ië¶? ë?¨ì??"
 
-#: ../calendar/gui/e-day-view-time-item.c:771
+#: ../calendar/gui/e-day-view-time-item.c:768
 msgid "Show the second time zone"
 msgstr "ë³´ì¡° ì??ê°?ë?? í??ì??"
 
@@ -7867,47 +6582,47 @@ msgstr "ë³´ì¡° ì??ê°?ë?? í??ì??"
 #. 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:851 ../calendar/gui/e-day-view.c:1582
-#: ../calendar/gui/e-week-view-main-item.c:326 ../calendar/gui/print.c:1678
+#: ../calendar/gui/e-day-view-top-item.c:840 ../calendar/gui/e-day-view.c:1576
+#: ../calendar/gui/e-week-view-main-item.c:359 ../calendar/gui/print.c:1666
 msgid "%A %d %B"
 msgstr "%B %eì?¼ %A"
 
 #. String to use in 12-hour time format for times in the morning.
 #: ../calendar/gui/e-day-view.c:805 ../calendar/gui/e-week-view.c:541
-#: ../calendar/gui/print.c:828
+#: ../calendar/gui/print.c:825
 msgid "am"
 msgstr "ì?¤ì ?"
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: ../calendar/gui/e-day-view.c:808 ../calendar/gui/e-week-view.c:544
-#: ../calendar/gui/print.c:830
+#: ../calendar/gui/print.c:827
 msgid "pm"
 msgstr "ì?¤í??"
 
 #. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../calendar/gui/e-day-view.c:2320
+#: ../calendar/gui/e-day-view.c:2309
 #, c-format
 msgid "Week %d"
 msgstr "%dì£¼"
 
-#: ../calendar/gui/e-itip-control.c:760
+#: ../calendar/gui/e-itip-control.c:758
 msgid "Yes. (Complex Recurrence)"
 msgstr "ì??. (ë³µì?¡í?? ë°?ë³µ)"
 
-#: ../calendar/gui/e-itip-control.c:777
+#: ../calendar/gui/e-itip-control.c:775
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "%dì?¼ë§?ë?¤"
 
-#: ../calendar/gui/e-itip-control.c:790
+#: ../calendar/gui/e-itip-control.c:788
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] "%dì£¼ë§?ë?¤"
 
 # FIXME - hard to translate UI + string based on English grammar
-#: ../calendar/gui/e-itip-control.c:797
+#: ../calendar/gui/e-itip-control.c:795
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
@@ -7915,35 +6630,35 @@ msgstr[0] "%dì£¼ë§?ë?¤ "
 
 # FIXME - hard to translate UI + string based on English grammar
 #. For Translators : 'and' is part of the sentence 'event recurring every week on (dayname) and (dayname)'
-#: ../calendar/gui/e-itip-control.c:808
+#: ../calendar/gui/e-itip-control.c:806
 msgid " and "
 msgstr " ê·¸ë¦¬ê³  "
 
 # FIXME - hard to translate UI + string based on English grammar
-#: ../calendar/gui/e-itip-control.c:817
+#: ../calendar/gui/e-itip-control.c:815
 #, c-format
 msgid "The %s day of "
 msgstr "%s "
 
 # FIXME - hard to translate UI + string based on English grammar
-#: ../calendar/gui/e-itip-control.c:833
+#: ../calendar/gui/e-itip-control.c:831
 #, c-format
 msgid "The %s %s of "
 msgstr "%s %s, "
 
-#: ../calendar/gui/e-itip-control.c:844
+#: ../calendar/gui/e-itip-control.c:842
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "%dë?¬ë§?ë?¤"
 
-#: ../calendar/gui/e-itip-control.c:856
+#: ../calendar/gui/e-itip-control.c:854
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "%dë??ë§?ë?¤"
 
-#: ../calendar/gui/e-itip-control.c:869
+#: ../calendar/gui/e-itip-control.c:867
 #, c-format
 msgid "a total of %d time"
 msgid_plural "a total of %d times"
@@ -7951,37 +6666,37 @@ msgstr[0] " ì ?ì²´ %dë²?"
 
 # FIXME - hard to translate UI + string based on English grammar
 #. For Translators : ', ending on' is part of the sentence of the form 'event recurring every day, ending on (date).'
-#: ../calendar/gui/e-itip-control.c:880
+#: ../calendar/gui/e-itip-control.c:878
 msgid ", ending on "
 msgstr ", ë??: "
 
-#. For Translators : 'starts' is starts:date implying a task starts on what date
-#: ../calendar/gui/e-itip-control.c:902
+#. For Translators : 'Starts' is part of "Starts: date", showing when the event starts
+#: ../calendar/gui/e-itip-control.c:900
 msgid "Starts"
 msgstr "ì??ì??"
 
-#. For Translators : 'ends' is ends:date implying a task ends on what date
-#: ../calendar/gui/e-itip-control.c:916
+#. For Translators : 'Ends' is part of "Ends: date", showing when the event ends
+#: ../calendar/gui/e-itip-control.c:914
 msgid "Ends"
 msgstr "ë??"
 
 # FIXME - hard to translate UI + string based on English grammar
-#: ../calendar/gui/e-itip-control.c:956
-#: ../plugins/save-calendar/csv-format.c:371
+#: ../calendar/gui/e-itip-control.c:954
+#: ../plugins/save-calendar/csv-format.c:366
 msgid "Due"
 msgstr "ê¸°í??"
 
-#: ../calendar/gui/e-itip-control.c:998 ../calendar/gui/e-itip-control.c:1055
+#: ../calendar/gui/e-itip-control.c:995 ../calendar/gui/e-itip-control.c:1052
 msgid "iCalendar Information"
 msgstr "iCalendar ì ?ë³´"
 
 #. Title
-#: ../calendar/gui/e-itip-control.c:1015
+#: ../calendar/gui/e-itip-control.c:1012
 msgid "iCalendar Error"
 msgstr "iCalendar ì?¤ë¥?"
 
-#: ../calendar/gui/e-itip-control.c:1087 ../calendar/gui/e-itip-control.c:1103
-#: ../calendar/gui/e-itip-control.c:1114 ../calendar/gui/e-itip-control.c:1131
+#: ../calendar/gui/e-itip-control.c:1084 ../calendar/gui/e-itip-control.c:1100
+#: ../calendar/gui/e-itip-control.c:1111 ../calendar/gui/e-itip-control.c:1128
 #: ../plugins/itip-formatter/itip-view.c:346
 #: ../plugins/itip-formatter/itip-view.c:347
 #: ../plugins/itip-formatter/itip-view.c:434
@@ -7992,7 +6707,7 @@ msgid "An unknown person"
 msgstr "ëª¨ë¥´ë?? ì?¬ë??"
 
 #. Describe what the user can do
-#: ../calendar/gui/e-itip-control.c:1138
+#: ../calendar/gui/e-itip-control.c:1135
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -8000,287 +6715,287 @@ msgstr ""
 "<br> ë?¤ì?? ì ?ë³´ë¥¼ ë?¤ì?? í??ì?¸í??ì??ê³ , ì??ë??ì?? ë©?ë?´ì??ì?? ì?´ë?¤ ë??ì??ì?? í?  ì§? ì? í??í??ì?"
 "ì??ì?¤."
 
-#: ../calendar/gui/e-itip-control.c:1190
-#: ../plugins/itip-formatter/itip-formatter.c:2195
+#: ../calendar/gui/e-itip-control.c:1187
+#: ../plugins/itip-formatter/itip-formatter.c:2224
 msgid "Tentatively Accepted"
 msgstr "ì? ì ?ì ?ì?¼ë¡? ì??ë?½"
 
-#: ../calendar/gui/e-itip-control.c:1278
+#: ../calendar/gui/e-itip-control.c:1274
 msgid ""
 "The meeting has been canceled, however it could not be found in your "
 "calendars"
 msgstr "ëª¨ì??ì?´ ì·¨ì??ë??ì??ì§?ë§?, ì?´ ëª¨ì??ì?´ ë?¬ë ¥ì?? ë?¤ì?´ ì??ì§? ì??ì?µë??ë?¤."
 
-#: ../calendar/gui/e-itip-control.c:1280
+#: ../calendar/gui/e-itip-control.c:1276
 msgid ""
 "The task has been canceled, however it could not be found in your task lists"
 msgstr "ì??ì??ì?´ ì·¨ì??ë??ì??ì§?ë§?, ì?´ ì??ì??ì?´ ì??ì?? ëª©ë¡?ì?? ë?¤ì?´ ì??ì§? ì??ì?µë??ë?¤."
 
-#: ../calendar/gui/e-itip-control.c:1358
+#: ../calendar/gui/e-itip-control.c:1353
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b>ë??ì?´ ëª¨ì?? ì ?ë³´ë¥¼ ê²?ì??í??ì?µë??ë?¤."
 
-#: ../calendar/gui/e-itip-control.c:1359
+#: ../calendar/gui/e-itip-control.c:1354
 msgid "Meeting Information"
 msgstr "ëª¨ì?? ì ?ë³´"
 
-#: ../calendar/gui/e-itip-control.c:1365
+#: ../calendar/gui/e-itip-control.c:1360
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b>ë??ì?´ ëª¨ì??ì?? %së??ì?? ì°¸ì??ì?? ì??ì²í??ì?µë??ë?¤."
 
-#: ../calendar/gui/e-itip-control.c:1367
+#: ../calendar/gui/e-itip-control.c:1362
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b>ë??ì?´ ëª¨ì??ì?? ì°¸ì??í??ì??ê¸°ë¥¼ ì??ì²í??ì?µë??ë?¤."
 
-#: ../calendar/gui/e-itip-control.c:1368
+#: ../calendar/gui/e-itip-control.c:1363
 msgid "Meeting Proposal"
 msgstr "ëª¨ì?? ì ?ì??"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1374
+#: ../calendar/gui/e-itip-control.c:1369
 #, c-format
 msgid "<b>%s</b> wishes to be added to an existing meeting."
 msgstr "<b>%s</b>ë??ì?´ ê¸°ì¡´ ëª¨ì??ì?? ë?¤ì?´ê°?ê³  ì?¶ì?´í?©ë??ë?¤."
 
-#: ../calendar/gui/e-itip-control.c:1375
+#: ../calendar/gui/e-itip-control.c:1370
 msgid "Meeting Update"
 msgstr "ëª¨ì?? ì??ë?°ì?´í?¸"
 
-#: ../calendar/gui/e-itip-control.c:1379
+#: ../calendar/gui/e-itip-control.c:1374
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b>ë??ì?´ ê°?ì?¥ ìµ?ê·¼ì?? ëª¨ì?? ì ?ë³´ë¥¼ ë°?ê³  ì?¶ì?´í?©ë??ë?¤."
 
-#: ../calendar/gui/e-itip-control.c:1380
+#: ../calendar/gui/e-itip-control.c:1375
 msgid "Meeting Update Request"
 msgstr "ëª¨ì?? ì??ë?°ì?´í?¸ ì??ì²"
 
-#: ../calendar/gui/e-itip-control.c:1387
+#: ../calendar/gui/e-itip-control.c:1382
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b>ë??ì?´ ëª¨ì?? ì??ì²ì?? í??ì? í??ì?µë??ë?¤."
 
-#: ../calendar/gui/e-itip-control.c:1388
+#: ../calendar/gui/e-itip-control.c:1383
 msgid "Meeting Reply"
 msgstr "ëª¨ì?? í??ì? "
 
-#: ../calendar/gui/e-itip-control.c:1395
+#: ../calendar/gui/e-itip-control.c:1390
 #, c-format
 msgid "<b>%s</b> has canceled a meeting."
 msgstr "<b>%s</b>ë??ì?´ ëª¨ì??ì?? ì·¨ì??í??ì?µë??ë?¤."
 
-#: ../calendar/gui/e-itip-control.c:1396
+#: ../calendar/gui/e-itip-control.c:1391
 msgid "Meeting Cancelation"
 msgstr "ëª¨ì?? ì·¨ì??"
 
-#: ../calendar/gui/e-itip-control.c:1406 ../calendar/gui/e-itip-control.c:1483
-#: ../calendar/gui/e-itip-control.c:1523
+#: ../calendar/gui/e-itip-control.c:1401 ../calendar/gui/e-itip-control.c:1478
+#: ../calendar/gui/e-itip-control.c:1518
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b>ë??ì?´ ì?´í?´í??ê¸° ì?´ë ¤ì?´ ë©?ì??ì§?ë¥¼ ë³´ë??ì?µë??ë?¤."
 
-#: ../calendar/gui/e-itip-control.c:1407
+#: ../calendar/gui/e-itip-control.c:1402
 msgid "Bad Meeting Message"
 msgstr "ì??ëª»ë?? ëª¨ì?? ë©?ì??ì§?"
 
-#: ../calendar/gui/e-itip-control.c:1434
+#: ../calendar/gui/e-itip-control.c:1429
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b>ë??ì?´ ì??ì?? ì ?ë³´ë¥¼ ê²?ì??í??ì?µë??ë?¤."
 
-#: ../calendar/gui/e-itip-control.c:1435
+#: ../calendar/gui/e-itip-control.c:1430
 msgid "Task Information"
 msgstr "ì??ì?? ì ?ë³´"
 
-#: ../calendar/gui/e-itip-control.c:1442
+#: ../calendar/gui/e-itip-control.c:1437
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b>ë??ì?´ %së??ì??ê²? ì??ì??ì?? ì??í??í??ê¸¸ ì??ì²í??ì?¨ì?µë??ë?¤."
 
-#: ../calendar/gui/e-itip-control.c:1444
+#: ../calendar/gui/e-itip-control.c:1439
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b>ë??ì?´ ì??ì??ì?? ì??í??í??ê¸¸ ì??ì²í??ì?¨ì?µë??ë?¤."
 
-#: ../calendar/gui/e-itip-control.c:1445
+#: ../calendar/gui/e-itip-control.c:1440
 msgid "Task Proposal"
 msgstr "ì??ì?? ì ?ì??"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1451
+#: ../calendar/gui/e-itip-control.c:1446
 #, c-format
 msgid "<b>%s</b> wishes to be added to an existing task."
 msgstr "<b>%s</b>ë??ì?´ ê¸°ì¡´ ì??ì??ì?? ë?¤ì?´ê°?ê³  ì?¶ì?´í?©ë??ë?¤."
 
-#: ../calendar/gui/e-itip-control.c:1452
+#: ../calendar/gui/e-itip-control.c:1447
 msgid "Task Update"
 msgstr "ì??ì?? ì??ë?°ì?´í?¸"
 
-#: ../calendar/gui/e-itip-control.c:1456
+#: ../calendar/gui/e-itip-control.c:1451
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b>ë??ì?´ ê°?ì?¥ ìµ?ê·¼ì?? ì??ì?? ì ?ë³´ë¥¼ ë°?ê³  ì?¶ì?´í?©ë??ë?¤."
 
-#: ../calendar/gui/e-itip-control.c:1457
+#: ../calendar/gui/e-itip-control.c:1452
 msgid "Task Update Request"
 msgstr "ì??ì?? ì??ë?°ì?´í?¸ ì??ì²"
 
-#: ../calendar/gui/e-itip-control.c:1464
+#: ../calendar/gui/e-itip-control.c:1459
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b>ë??ì?´ ì??ì?? í? ë?¹ì?? í??ì? í??ì?µë??ë?¤."
 
-#: ../calendar/gui/e-itip-control.c:1465
+#: ../calendar/gui/e-itip-control.c:1460
 msgid "Task Reply"
 msgstr "ì??ì?? í??ì? "
 
-#: ../calendar/gui/e-itip-control.c:1472
+#: ../calendar/gui/e-itip-control.c:1467
 #, c-format
 msgid "<b>%s</b> has canceled a task."
 msgstr "<b>%s</b>ë??ì?´ ì??ì??ì?? ì·¨ì??í??ì?µë??ë?¤."
 
-#: ../calendar/gui/e-itip-control.c:1473
+#: ../calendar/gui/e-itip-control.c:1468
 msgid "Task Cancelation"
 msgstr "ì??ì?? ì·¨ì??"
 
-#: ../calendar/gui/e-itip-control.c:1484
+#: ../calendar/gui/e-itip-control.c:1479
 msgid "Bad Task Message"
 msgstr "ì??ëª»ë?? ì??ì?? ë©?ì??ì§?"
 
 # free/busy -> ì?½ì?? ì??ì??/ì??ì??, Microsoft Office XP ì°¸ê³ 
-#: ../calendar/gui/e-itip-control.c:1508
+#: ../calendar/gui/e-itip-control.c:1503
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b>ì?´(ê°?) ì?½ì?? ì??ì??/ì??ì?? ì ?ë³´ë¥¼ ê²?ì??í??ì?µë??ë?¤."
 
 # free/busy -> ì?½ì?? ì??ì??/ì??ì??, Microsoft Office XP ì°¸ê³ 
-#: ../calendar/gui/e-itip-control.c:1509
+#: ../calendar/gui/e-itip-control.c:1504
 msgid "Free/Busy Information"
 msgstr "ì?½ì?? ì??ì??/ì??ì?? ì ?ë³´"
 
 # free/busy -> ì?½ì?? ì??ì??/ì??ì??, Microsoft Office XP ì°¸ê³ 
-#: ../calendar/gui/e-itip-control.c:1513
+#: ../calendar/gui/e-itip-control.c:1508
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b>ì?´(ê°?) ì?½ì?? ì??ì??/ì??ì?? ì ?ë³´ë¥¼ ì??ì²í??ì?µë??ë?¤."
 
 # free/busy -> ì?½ì?? ì??ì??/ì??ì??, Microsoft Office XP ì°¸ê³ 
-#: ../calendar/gui/e-itip-control.c:1514
+#: ../calendar/gui/e-itip-control.c:1509
 msgid "Free/Busy Request"
 msgstr "ì?½ì?? ì??ì??/ì??ì?? ì??ì²"
 
 # free/busy -> ì?½ì?? ì??ì??/ì??ì??, Microsoft Office XP ì°¸ê³ 
-#: ../calendar/gui/e-itip-control.c:1518
+#: ../calendar/gui/e-itip-control.c:1513
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b>ì?´(ê°?) ì?½ì?? ì??ì??/ì??ì?? ì??ì²ì?? í??ì? í??ì?µë??ë?¤."
 
 # free/busy -> ì?½ì?? ì??ì??/ì??ì??, Microsoft Office XP ì°¸ê³ 
-#: ../calendar/gui/e-itip-control.c:1519
+#: ../calendar/gui/e-itip-control.c:1514
 msgid "Free/Busy Reply"
 msgstr "ì?½ì?? ì??ì??/ì??ì?? í??ì? "
 
 # free/busy -> ì?½ì?? ì??ì??/ì??ì??, Microsoft Office XP ì°¸ê³ 
-#: ../calendar/gui/e-itip-control.c:1524
+#: ../calendar/gui/e-itip-control.c:1519
 msgid "Bad Free/Busy Message"
 msgstr "í??ë¦° ì?½ì?? ì??ì??/ì??ì?? ë©?ì??ì§?"
 
-#: ../calendar/gui/e-itip-control.c:1600
+#: ../calendar/gui/e-itip-control.c:1595
 msgid "The message does not appear to be properly formed"
 msgstr "ë©?ì??ì§?ì?? í??ì??ì?´ ì?¬ë°?ë¥´ì§? ì??ì?? ê²?ì?¼ë¡? ë³´ì??ë??ë?¤"
 
-#: ../calendar/gui/e-itip-control.c:1659
+#: ../calendar/gui/e-itip-control.c:1654
 msgid "The message contains only unsupported requests."
 msgstr "ì?´ ë©?ì??ì§?ì??ë?? ì§?ì??í??ì§? ì??ë?? ì??ì²ë§? ë?¤ì?´ ì??ì?µë??ë?¤."
 
-#: ../calendar/gui/e-itip-control.c:1692
+#: ../calendar/gui/e-itip-control.c:1687
 msgid "The attachment does not contain a valid calendar message"
 msgstr "ì²¨ë¶?ì?? ì?¬ë°?ë¥¸ ë?¬ë ¥ ë©?ì??ì§?ê°? ì??ì?µë??ë?¤"
 
-#: ../calendar/gui/e-itip-control.c:1730
+#: ../calendar/gui/e-itip-control.c:1725
 msgid "The attachment has no viewable calendar items"
 msgstr "ì?´ ì²¨ë¶?ë¥¼ ë³¼ ì?? ì??ë?? ë?¬ë ¥ ì??ì?´í??ì?´ ì??ì?µë??ë?¤"
 
-#: ../calendar/gui/e-itip-control.c:1975
+#: ../calendar/gui/e-itip-control.c:1967
 msgid "Update complete\n"
 msgstr "ì??ë?°ì?´í?¸ ë§?ì¹¨\n"
 
-#: ../calendar/gui/e-itip-control.c:2009
+#: ../calendar/gui/e-itip-control.c:2001
 msgid "Object is invalid and cannot be updated\n"
 msgstr "ì?¤ë¸?ì ?í?¸ê°? ì??ëª»ë??ì??ê³  ì??ë?°ì?´í?¸í?  ì?? ì??ì?µë??ë?¤\n"
 
-#: ../calendar/gui/e-itip-control.c:2026
+#: ../calendar/gui/e-itip-control.c:2018
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 "í??ì?¬ ì°¸ì??ì??ê°? ì??ë?? ì?¬ë??ì?´ ì?´ í??ì? ì?? í??ì?µë??ë?¤. ì°¸ì??ì??ë¡? ì¶?ê°?í??ì??ê² ì?µë??ê¹??"
 
-#: ../calendar/gui/e-itip-control.c:2044
+#: ../calendar/gui/e-itip-control.c:2036
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "ì??ëª»ë?? ì??í??ë??ë¬¸ì?? ì°¸ì??ì?? ì??í??ë¥¼ ì??ë?°ì?´í?¸í?  ì?? ì??ì?µë??ë?¤!\n"
 
-#: ../calendar/gui/e-itip-control.c:2068
+#: ../calendar/gui/e-itip-control.c:2060
 msgid "Attendee status updated\n"
 msgstr "ì°¸ì??ì??ì?? ì??í?? ì??ë?°ì?´í?¸ë??ì??ì?µë??ë?¤\n"
 
-#: ../calendar/gui/e-itip-control.c:2075
-#: ../plugins/itip-formatter/itip-formatter.c:1379
+#: ../calendar/gui/e-itip-control.c:2067
+#: ../plugins/itip-formatter/itip-formatter.c:1385
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "ì?´ í?ëª©ì?´ ë?? ì?´ì?? ì??ê¸° ë??ë¬¸ì?? ì°¸ì??ì?? ì??í??ë¥¼ ì??ë?°ì?´í?¸í?  ì?? ì??ì?µë??ë?¤"
 
-#: ../calendar/gui/e-itip-control.c:2106 ../calendar/gui/e-itip-control.c:2163
+#: ../calendar/gui/e-itip-control.c:2098 ../calendar/gui/e-itip-control.c:2155
 msgid "Item sent!\n"
 msgstr "í?ëª©ì?? ë³´ë??ì?µë??ë?¤!\n"
 
-#: ../calendar/gui/e-itip-control.c:2112 ../calendar/gui/e-itip-control.c:2171
+#: ../calendar/gui/e-itip-control.c:2104 ../calendar/gui/e-itip-control.c:2163
 msgid "The item could not be sent!\n"
 msgstr "í?ëª©ì?? ë³´ë?¼ ì?? ì??ì?µë??ë?¤!\n"
 
-#: ../calendar/gui/e-itip-control.c:2251
+#: ../calendar/gui/e-itip-control.c:2281
 msgid "Choose an action:"
 msgstr "ë??ì??ì?? ê³ ë¥´ì?ì??ì?¤:"
 
 #. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-itip-control.c:2280
-#: ../calendar/gui/e-meeting-list-view.c:590
+#: ../calendar/gui/e-itip-control.c:2310
+#: ../calendar/gui/e-meeting-list-view.c:589
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "ì??ë?µë°?ë??"
 
-#: ../calendar/gui/e-itip-control.c:2322
+#: ../calendar/gui/e-itip-control.c:2350
 msgid "Update"
 msgstr "ì??ë?°ì?´í?¸"
 
-#: ../calendar/gui/e-itip-control.c:2350
-#: ../plugins/groupwise-features/process-meeting.c:51
+#: ../calendar/gui/e-itip-control.c:2374
+#: ../plugins/groupwise-features/process-meeting.c:52
 msgid "Accept"
 msgstr "ì??ë?½"
 
-#: ../calendar/gui/e-itip-control.c:2351
+#: ../calendar/gui/e-itip-control.c:2375
 msgid "Tentatively accept"
 msgstr "ì? ì ?ì ?ì?¼ë¡? ì??ë?½"
 
-#: ../calendar/gui/e-itip-control.c:2352
-#: ../plugins/groupwise-features/process-meeting.c:53
+#: ../calendar/gui/e-itip-control.c:2376
+#: ../plugins/groupwise-features/process-meeting.c:54
 msgid "Decline"
 msgstr "ê±°ë¶?"
 
 # free/busy -> ì?½ì?? ì??ì??/ì??ì??, Microsoft Office XP ì°¸ê³ 
-#: ../calendar/gui/e-itip-control.c:2381
+#: ../calendar/gui/e-itip-control.c:2401
 msgid "Send Free/Busy Information"
 msgstr "ì?½ì?? ì??ì??/ì??ì?? ì ?ë³´ ë³´ë?´ê¸°"
 
-#: ../calendar/gui/e-itip-control.c:2409
+#: ../calendar/gui/e-itip-control.c:2425
 msgid "Update respondent status"
 msgstr "ì??ë?°ì?´í?¸ ì??ë?µ ì??í??"
 
-#: ../calendar/gui/e-itip-control.c:2437
+#: ../calendar/gui/e-itip-control.c:2449
 msgid "Send Latest Information"
 msgstr "ê°?ì?¥ ìµ?ê·¼ ì ?ë³´ ë³´ë?´ê¸°"
 
-#: ../calendar/gui/e-itip-control.c:2465 ../ui/evolution-mail-global.xml.h:1
+#: ../calendar/gui/e-itip-control.c:2473 ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "ì·¨ì??"
 
@@ -8306,6 +7021,10 @@ msgstr "ë?¬ë ¥ ë¶?ë?¬ë?¤ì?´ê¸°"
 msgid "Loading calendar..."
 msgstr "ë?¬ë ¥ ë¶?ë?¬ì?¤ê¸°..."
 
+#: ../calendar/gui/e-itip-control.glade.h:7
+msgid "Organizer:"
+msgstr "ì£¼ìµ?ì??:"
+
 #: ../calendar/gui/e-itip-control.glade.h:8
 msgid "Server Message:"
 msgstr "ì??ë²? ë©?ì??ì§?:"
@@ -8326,77 +7045,73 @@ msgstr "ì? í?? ì°¸ì??ì??"
 msgid "Resources"
 msgstr "ì??ì??"
 
-#: ../calendar/gui/e-meeting-list-view.c:151
-msgid "Attendees"
-msgstr "ì°¸ì??ì??"
-
 #: ../calendar/gui/e-meeting-list-view.c:162
-#: ../calendar/gui/e-meeting-store.c:85 ../calendar/gui/e-meeting-store.c:102
-#: ../calendar/gui/e-meeting-store.c:739 ../calendar/gui/print.c:980
+#: ../calendar/gui/e-meeting-store.c:84 ../calendar/gui/e-meeting-store.c:101
+#: ../calendar/gui/e-meeting-store.c:736 ../calendar/gui/print.c:974
 msgid "Individual"
 msgstr "ê°?ì?¸"
 
 #: ../calendar/gui/e-meeting-list-view.c:163
-#: ../calendar/gui/e-meeting-store.c:87 ../calendar/gui/e-meeting-store.c:104
-#: ../calendar/gui/print.c:981 ../widgets/table/e-table-config.glade.h:7
+#: ../calendar/gui/e-meeting-store.c:86 ../calendar/gui/e-meeting-store.c:103
+#: ../calendar/gui/print.c:975 ../widgets/table/e-table-config.glade.h:7
 msgid "Group"
 msgstr "ê·¸ë£¹"
 
 #: ../calendar/gui/e-meeting-list-view.c:164
-#: ../calendar/gui/e-meeting-store.c:89 ../calendar/gui/e-meeting-store.c:106
-#: ../calendar/gui/print.c:982
+#: ../calendar/gui/e-meeting-store.c:88 ../calendar/gui/e-meeting-store.c:105
+#: ../calendar/gui/print.c:976
 msgid "Resource"
 msgstr "ì??ì??"
 
 #: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:91 ../calendar/gui/e-meeting-store.c:108
-#: ../calendar/gui/print.c:983
+#: ../calendar/gui/e-meeting-store.c:90 ../calendar/gui/e-meeting-store.c:107
+#: ../calendar/gui/print.c:977
 msgid "Room"
 msgstr "ë°©"
 
 #: ../calendar/gui/e-meeting-list-view.c:176
-#: ../calendar/gui/e-meeting-store.c:120 ../calendar/gui/e-meeting-store.c:137
-#: ../calendar/gui/print.c:997
+#: ../calendar/gui/e-meeting-store.c:119 ../calendar/gui/e-meeting-store.c:136
+#: ../calendar/gui/print.c:991
 msgid "Chair"
 msgstr "ì??ì?¥"
 
 #: ../calendar/gui/e-meeting-list-view.c:177
-#: ../calendar/gui/e-meeting-store.c:122 ../calendar/gui/e-meeting-store.c:139
-#: ../calendar/gui/e-meeting-store.c:742 ../calendar/gui/print.c:998
+#: ../calendar/gui/e-meeting-store.c:121 ../calendar/gui/e-meeting-store.c:138
+#: ../calendar/gui/e-meeting-store.c:739 ../calendar/gui/print.c:992
 msgid "Required Participant"
 msgstr "í??ì?? ì°¸ì??ì??"
 
 #: ../calendar/gui/e-meeting-list-view.c:178
-#: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:141
-#: ../calendar/gui/print.c:999
+#: ../calendar/gui/e-meeting-store.c:123 ../calendar/gui/e-meeting-store.c:140
+#: ../calendar/gui/print.c:993
 msgid "Optional Participant"
 msgstr "ì? í?? ì°¸ì??ì??"
 
 #: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:126 ../calendar/gui/e-meeting-store.c:143
-#: ../calendar/gui/print.c:1000
+#: ../calendar/gui/e-meeting-store.c:125 ../calendar/gui/e-meeting-store.c:142
+#: ../calendar/gui/print.c:994
 msgid "Non-Participant"
 msgstr "ë¶?ì°¸ì??"
 
 #: ../calendar/gui/e-meeting-list-view.c:201
-#: ../calendar/gui/e-meeting-store.c:170 ../calendar/gui/e-meeting-store.c:193
-#: ../calendar/gui/e-meeting-store.c:752
+#: ../calendar/gui/e-meeting-store.c:169 ../calendar/gui/e-meeting-store.c:192
+#: ../calendar/gui/e-meeting-store.c:749
 msgid "Needs Action"
 msgstr "ë??ì?? í??ì??"
 
 #. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:546
+#: ../calendar/gui/e-meeting-list-view.c:544
 msgid "Attendee                          "
 msgstr "ì°¸ì??ì??"
 
-#: ../calendar/gui/e-meeting-store.c:182 ../calendar/gui/e-meeting-store.c:205
+#: ../calendar/gui/e-meeting-store.c:181 ../calendar/gui/e-meeting-store.c:204
 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:467
-#: ../calendar/gui/e-meeting-time-sel.c:2124
+#: ../calendar/gui/e-meeting-time-sel-item.c:458
+#: ../calendar/gui/e-meeting-time-sel.c:2083
 msgid "%A, %B %d, %Y"
 msgstr "%Yë?? %B %eì?¼ %A"
 
@@ -8404,80 +7119,80 @@ msgstr "%Yë?? %B %eì?¼ %A"
 #. name, %m = month number, %d = month day, %Y = full year.
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:471
-#: ../calendar/gui/e-meeting-time-sel.c:2155
+#: ../calendar/gui/e-meeting-time-sel-item.c:462
+#: ../calendar/gui/e-meeting-time-sel.c:2114
 msgid "%a %m/%d/%Y"
 msgstr "%Y/%m/%d (%a)"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:475
+#: ../calendar/gui/e-meeting-time-sel-item.c:466
 msgid "%m/%d/%Y"
 msgstr "%Y/%m/%d"
 
-#: ../calendar/gui/e-meeting-time-sel.c:400
+#: ../calendar/gui/e-meeting-time-sel.c:392
 msgid "Out of Office"
 msgstr "ë¶?ì?¬ ì¤?"
 
-#: ../calendar/gui/e-meeting-time-sel.c:401
+#: ../calendar/gui/e-meeting-time-sel.c:393
 msgid "No Information"
 msgstr "ì ?ë³´ ì??ì??"
 
-#: ../calendar/gui/e-meeting-time-sel.c:416
+#: ../calendar/gui/e-meeting-time-sel.c:408
 msgid "A_ttendees..."
 msgstr "ì°¸ì??ì??(_T)..."
 
-#: ../calendar/gui/e-meeting-time-sel.c:437
+#: ../calendar/gui/e-meeting-time-sel.c:429
 msgid "O_ptions"
 msgstr "ì?µì??(_P)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:454
+#: ../calendar/gui/e-meeting-time-sel.c:446
 msgid "Show _only working hours"
 msgstr "ê·¼ë¬´ ì??ê°?ë§? ë³´ê¸°(_O)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:464
+#: ../calendar/gui/e-meeting-time-sel.c:456
 msgid "Show _zoomed out"
 msgstr "ì¶?ì??í?´ì?? ë³´ê¸°(_Z)"
 
 # free/busy -> ì?½ì?? ì??ì??/ì??ì??, Microsoft Office XP ì°¸ê³ 
-#: ../calendar/gui/e-meeting-time-sel.c:479
+#: ../calendar/gui/e-meeting-time-sel.c:471
 msgid "_Update free/busy"
 msgstr "ì?½ì?? ì??ì??/ì??ì?? ì??ë?°ì?´í?¸(_U)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:494
+#: ../calendar/gui/e-meeting-time-sel.c:486
 msgid "_<<"
 msgstr "_<<"
 
 # Autopick -> ë¹? ì??ê°? ì°¾ê¸°, Microsoft Office XP ì°¸ê³ 
-#: ../calendar/gui/e-meeting-time-sel.c:512
+#: ../calendar/gui/e-meeting-time-sel.c:504
 msgid "_Autopick"
 msgstr "ë¹? ì??ê°? ì°¾ê¸°(_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:527
+#: ../calendar/gui/e-meeting-time-sel.c:519
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:544
+#: ../calendar/gui/e-meeting-time-sel.c:536
 msgid "_All people and resources"
 msgstr "ëª¨ë?  ì?¬ë??ê³¼ ì??ì??(_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:553
+#: ../calendar/gui/e-meeting-time-sel.c:545
 msgid "All _people and one resource"
 msgstr "ëª¨ë?  ì?¬ë??ê³¼ ì??ì?? í?? ê°?(_P)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:562
+#: ../calendar/gui/e-meeting-time-sel.c:554
 msgid "_Required people"
 msgstr "í??ì??í?? ì?¬ë??(_R)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:571
+#: ../calendar/gui/e-meeting-time-sel.c:563
 msgid "Required people and _one resource"
 msgstr "í??ì??í?? ì?¬ë??ê³¼ ì??ì?? í?? ê°?(_O)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:607
+#: ../calendar/gui/e-meeting-time-sel.c:599
 msgid "_Start time:"
 msgstr "ì??ì?? ì??ê°?(_S):"
 
-#: ../calendar/gui/e-meeting-time-sel.c:634
+#: ../calendar/gui/e-meeting-time-sel.c:626
 msgid "_End time:"
 msgstr "ë§?ì¹¨ ì??ê°?(_E):"
 
@@ -8505,15 +7220,15 @@ msgstr "ì?¸ì?´"
 msgid "Member"
 msgstr "êµ¬ì?±ì??"
 
-#: ../calendar/gui/e-memo-table.c:955
+#: ../calendar/gui/e-memo-table.c:950
 msgid "_Delete Selected Memos"
 msgstr "ì? í??í?? ë©?ëª¨ ì?ì ?(_D)"
 
-#: ../calendar/gui/e-memo-table.c:1106 ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-memo-table.c:1099 ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
 msgstr "ë©?ëª¨ë¥¼ ì¶?ê°?í??ë ¤ë©´ ë??ë¥´ì?ì??ì?¤"
 
-#: ../calendar/gui/e-memos.c:760 ../calendar/gui/e-tasks.c:910
+#: ../calendar/gui/e-memos.c:754 ../calendar/gui/e-tasks.c:902
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -8522,167 +7237,147 @@ msgstr ""
 "%sì??ì?? ì?¤ë¥? ë°?ì??:\n"
 " %s"
 
-#: ../calendar/gui/e-memos.c:812
+#: ../calendar/gui/e-memos.c:806
 msgid "Loading memos"
 msgstr "ë©?ëª¨ë¥¼ ì?½ì?´ë?¤ì?´ë?? ì¤?ì??ë??ë?¤"
 
-#: ../calendar/gui/e-memos.c:903
+#: ../calendar/gui/e-memos.c:897
 #, c-format
 msgid "Opening memos at %s"
 msgstr "%sì?? ì??ë?? ë©?ëª¨ë¥¼ ì?¬ë?? ì¤?ì??ë??ë?¤"
 
-#: ../calendar/gui/e-memos.c:1075 ../calendar/gui/e-tasks.c:1329
+#: ../calendar/gui/e-memos.c:1066 ../calendar/gui/e-tasks.c:1318
 msgid "Deleting selected objects..."
 msgstr "ì? í??í?? ì?¤ë¸?ì ?í?¸ë¥¼ ì?ì ?í?©ë??ë?¤..."
 
-#: ../calendar/gui/e-tasks.c:963
+#: ../calendar/gui/e-tasks.c:955
 msgid "Loading tasks"
 msgstr "ì??ì??ì?? ì?½ì?´ë?¤ì?´ë?? ì¤?ì??ë??ë?¤"
 
-#: ../calendar/gui/e-tasks.c:1061
+#: ../calendar/gui/e-tasks.c:1052
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "%sì?? ì??ë?? ì??ì??ì?? ì?¬ë?? ì¤?ì??ë??ë?¤"
 
-#: ../calendar/gui/e-tasks.c:1306
+#: ../calendar/gui/e-tasks.c:1295
 msgid "Completing tasks..."
 msgstr "ì??ì??ì?? ì??ë£?í??ë?? ì¤?ì??ë??ë?¤..."
 
-#: ../calendar/gui/e-tasks.c:1356
+#: ../calendar/gui/e-tasks.c:1345
 msgid "Expunging"
 msgstr "ì§?ì?´ ë©?ì??ì§? ë¹?ì?°ë?? ì¤?"
 
-#: ../calendar/gui/e-timezone-entry.c:127
+#: ../calendar/gui/e-timezone-entry.c:124
 msgid "Select Timezone"
 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:343 ../calendar/gui/print.c:1659
+#: ../calendar/gui/e-week-view-main-item.c:376 ../calendar/gui/print.c:1647
 msgid "%d %B"
 msgstr "%B %eì?¼"
 
-#: ../calendar/gui/gnome-cal.c:2637
+#: ../calendar/gui/gnome-cal.c:2673
 msgid "_Custom View"
 msgstr "ì?¬ì?©ì?? ì?¤ì ? ë³´ê¸°(_C)"
 
-#: ../calendar/gui/gnome-cal.c:2638
+#: ../calendar/gui/gnome-cal.c:2674
 msgid "_Save Custom View"
 msgstr "ì?¬ì?©ì?? ì?¤ì ? ë³´ê¸° ì ?ì?¥(_S)"
 
-#: ../calendar/gui/gnome-cal.c:2643
+#: ../calendar/gui/gnome-cal.c:2679
 msgid "_Define Views..."
 msgstr "ë³´ê¸° ì§?ì ?(_D)..."
 
-#: ../calendar/gui/gnome-cal.c:2880
+#: ../calendar/gui/gnome-cal.c:2916
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "%sì?? ì?½ì??ì?? ì?½ì?´ë?¤ì?´ë?? ì¤?ì??ë??ë?¤"
 
-#: ../calendar/gui/gnome-cal.c:2895
+#: ../calendar/gui/gnome-cal.c:2931
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "%sì?? ì??ì??ì?? ì?½ì?´ë?¤ì?´ë?? ì¤?ì??ë??ë?¤"
 
-#: ../calendar/gui/gnome-cal.c:2904
+#: ../calendar/gui/gnome-cal.c:2940
 #, c-format
 msgid "Loading memos at %s"
 msgstr "%sì??ì?? ë©?ëª¨ë¥¼ ì?½ì?´ë?¤ì?´ë?? ì¤?ì??ë??ë?¤"
 
-#: ../calendar/gui/gnome-cal.c:3016
+#: ../calendar/gui/gnome-cal.c:3052
 #, c-format
 msgid "Opening %s"
 msgstr "%s ì?¬ë?? ì¤?ì??ë??ë?¤"
 
-#: ../calendar/gui/gnome-cal.c:3984
+#: ../calendar/gui/gnome-cal.c:4012
 msgid "Purging"
 msgstr "ë¹?ì?°ë?? ì¤?"
 
 #: ../calendar/gui/goto-dialog.glade.h:1
-msgid "April"
-msgstr "4ì??"
-
-#: ../calendar/gui/goto-dialog.glade.h:2
-msgid "August"
-msgstr "8ì??"
-
-#: ../calendar/gui/goto-dialog.glade.h:3
-msgid "December"
-msgstr "12ì??"
-
-#: ../calendar/gui/goto-dialog.glade.h:4
-msgid "February"
-msgstr "2ì??"
-
-#: ../calendar/gui/goto-dialog.glade.h:5
-msgid "January"
-msgstr "1ì??"
-
-#: ../calendar/gui/goto-dialog.glade.h:6
-msgid "July"
-msgstr "7ì??"
-
-#: ../calendar/gui/goto-dialog.glade.h:7
-msgid "June"
-msgstr "6ì??"
-
-#: ../calendar/gui/goto-dialog.glade.h:8
-msgid "March"
-msgstr "3ì??"
-
-#: ../calendar/gui/goto-dialog.glade.h:9
-msgid "May"
-msgstr "5ì??"
-
-#: ../calendar/gui/goto-dialog.glade.h:10
-msgid "November"
-msgstr "11ì??"
-
-#: ../calendar/gui/goto-dialog.glade.h:11
-msgid "October"
-msgstr "10ì??"
+msgid ""
+"January\n"
+"February\n"
+"March\n"
+"April\n"
+"May\n"
+"June\n"
+"July\n"
+"August\n"
+"September\n"
+"October\n"
+"November\n"
+"December"
+msgstr ""
+"1ì??\n"
+"2ì??\n"
+"3ì??\n"
+"4ì??\n"
+"5ì??\n"
+"6ì??\n"
+"7ì??\n"
+"8ì??\n"
+"9ì??\n"
+"10ì??\n"
+"11ì??\n"
+"12ì??"
 
-#: ../calendar/gui/goto-dialog.glade.h:12
+#: ../calendar/gui/goto-dialog.glade.h:13
 msgid "Select Date"
 msgstr "ë? ì§? ì? í??"
 
-#: ../calendar/gui/goto-dialog.glade.h:13
-msgid "September"
-msgstr "9ì??"
-
 #: ../calendar/gui/goto-dialog.glade.h:14
 msgid "_Select Today"
 msgstr "ì?¤ë?? ì? í??(_S)"
 
-#: ../calendar/gui/itip-utils.c:410 ../calendar/gui/itip-utils.c:462
-#: ../calendar/gui/itip-utils.c:550
+#: ../calendar/gui/itip-utils.c:410 ../calendar/gui/itip-utils.c:461
+#: ../calendar/gui/itip-utils.c:553
 msgid "An organizer must be set."
 msgstr "ì£¼ìµ?ì??ë¥¼ ê²°ì ?í?´ì?¼ í?©ë??ë?¤."
 
-#: ../calendar/gui/itip-utils.c:454
+#: ../calendar/gui/itip-utils.c:453
 msgid "At least one attendee is necessary"
 msgstr "ì°¸ì??ì??ê°? ìµ?ì??í?? í?? ì?¬ë??ì?? í??ì??í?©ë??ë?¤"
 
 # event -> í??ì?¬, Microsoft Office XP ì°¸ê³ 
-#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:778
+#: ../calendar/gui/itip-utils.c:635 ../calendar/gui/itip-utils.c:781
 msgid "Event information"
 msgstr "í??ì?¬ ì ?ë³´"
 
-#: ../calendar/gui/itip-utils.c:634 ../calendar/gui/itip-utils.c:781
+#: ../calendar/gui/itip-utils.c:637 ../calendar/gui/itip-utils.c:784
 msgid "Task information"
 msgstr "ì??ì?? ì ?ë³´"
 
-#: ../calendar/gui/itip-utils.c:636 ../calendar/gui/itip-utils.c:784
+#: ../calendar/gui/itip-utils.c:639 ../calendar/gui/itip-utils.c:787
 msgid "Memo information"
 msgstr "ë©?ëª¨ ì ?ë³´"
 
 # free/busy -> ì?½ì?? ì??ì??/ì??ì??, Microsoft Office XP ì°¸ê³ 
-#: ../calendar/gui/itip-utils.c:638 ../calendar/gui/itip-utils.c:802
+#: ../calendar/gui/itip-utils.c:641 ../calendar/gui/itip-utils.c:805
 msgid "Free/Busy information"
 msgstr "ì?½ì?? ì??ì??/ì??ì?? ì ?ë³´"
 
-#: ../calendar/gui/itip-utils.c:640
+#: ../calendar/gui/itip-utils.c:643
 msgid "Calendar information"
 msgstr "ë?¬ë ¥ ì ?ë³´"
 
@@ -8690,7 +7385,7 @@ msgstr "ë?¬ë ¥ ì ?ë³´"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:674
+#: ../calendar/gui/itip-utils.c:677
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "ì??ë?½"
@@ -8699,7 +7394,7 @@ msgstr "ì??ë?½"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Tentatively Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:681
+#: ../calendar/gui/itip-utils.c:684
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "ì? ì ?ì ?ì?¼ë¡? ì??ë?½"
@@ -8711,7 +7406,7 @@ msgstr "ì? ì ?ì ?ì?¼ë¡? ì??ë?½"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Declined: Meeting Name".
-#: ../calendar/gui/itip-utils.c:688 ../calendar/gui/itip-utils.c:736
+#: ../calendar/gui/itip-utils.c:691 ../calendar/gui/itip-utils.c:739
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "ê±°ì ?"
@@ -8720,7 +7415,7 @@ msgstr "ê±°ì ?"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:695
+#: ../calendar/gui/itip-utils.c:698
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "ë??ë¦¬"
@@ -8728,7 +7423,7 @@ msgstr "ë??ë¦¬"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Updated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:708
+#: ../calendar/gui/itip-utils.c:711
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "ì??ë?°ì?´í?¸ë?¨"
@@ -8736,7 +7431,7 @@ msgstr "ì??ë?°ì?´í?¸ë?¨"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Cancel: Meeting Name".
-#: ../calendar/gui/itip-utils.c:715
+#: ../calendar/gui/itip-utils.c:718
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "ì·¨ì??"
@@ -8744,7 +7439,7 @@ msgstr "ì·¨ì??"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Refresh: Meeting Name".
-#: ../calendar/gui/itip-utils.c:722
+#: ../calendar/gui/itip-utils.c:725
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "ì??ë¡?ì?´ ì?¬í?"
@@ -8752,100 +7447,100 @@ msgstr "ì??ë¡?ì?´ ì?¬í?"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Counter-proposal: Meeting Name".
-#: ../calendar/gui/itip-utils.c:729
+#: ../calendar/gui/itip-utils.c:732
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "ë°?ë??ì ?ì??"
 
 # free/busy -> ì?½ì?? ì??ì??/ì??ì??, Microsoft Office XP ì°¸ê³ 
-#: ../calendar/gui/itip-utils.c:799
+#: ../calendar/gui/itip-utils.c:802
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "ì?½ì?? ì??ì??/ì??ì?? ì ?ë³´ (%së¶?í?° %sê¹?ì§?)"
 
-#: ../calendar/gui/itip-utils.c:807
+#: ../calendar/gui/itip-utils.c:810
 msgid "iCalendar information"
 msgstr "iCalendar ì ?ë³´"
 
 # event -> í??ì?¬, Microsoft Office XP ì°¸ê³ 
-#: ../calendar/gui/itip-utils.c:978
+#: ../calendar/gui/itip-utils.c:981
 msgid "You must be an attendee of the event."
 msgstr "ì?´ í??ì?¬ì?? ì°¸ì??ì??ì?¬ì?¼ í?©ë??ë?¤."
 
-#: ../calendar/gui/memos-component.c:507
+#: ../calendar/gui/memos-component.c:477
 msgid "_New Memo List"
 msgstr "ì?? ë©?ëª¨ ëª©ë¡?(_N)"
 
-#: ../calendar/gui/memos-component.c:590
+#: ../calendar/gui/memos-component.c:560
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%dê°? ë©?ëª¨"
 
-#: ../calendar/gui/memos-component.c:592 ../calendar/gui/tasks-component.c:584
+#: ../calendar/gui/memos-component.c:562 ../calendar/gui/tasks-component.c:555
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
 msgstr[0] ", %dê°? ì? í??"
 
-#: ../calendar/gui/memos-component.c:639
+#: ../calendar/gui/memos-component.c:609
 msgid "Failed upgrading memos."
 msgstr "ë©?ëª¨ë¥¼ ì??ê·¸ë ?ì?´ë??í??ë?? ë?° ì?¤í?¨í??ì?µë??ë?¤."
 
 # event -> í??ì?¬, Microsoft Office XP ì°¸ê³ 
-#: ../calendar/gui/memos-component.c:769
+#: ../calendar/gui/memos-component.c:739
 #, c-format
 msgid "Unable to open the memo list '%s' for creating events and meetings"
 msgstr "í??ì?¬ì?? ëª¨ì??ì?? ë§?ë??ë?? ë?° ì?¸ '%s' ë©?ëª¨ ëª©ë¡?ì?? ì?´ ì?? ì??ì?µë??ë?¤"
 
-#: ../calendar/gui/memos-component.c:782
+#: ../calendar/gui/memos-component.c:752
 msgid "There is no calendar available for creating memos"
 msgstr "ë©?ëª¨ë¥¼ ë§?ë?¤ ë?? ì?¸ ì?? ì??ë?? ë?¬ë ¥ì?´ ì??ì?µë??ë?¤"
 
-#: ../calendar/gui/memos-component.c:892
+#: ../calendar/gui/memos-component.c:862
 msgid "Memo Source Selector"
 msgstr "ë©?ëª¨ ì??ì?¤ ì? í??"
 
-#: ../calendar/gui/memos-component.c:1071
+#: ../calendar/gui/memos-component.c:1041
 msgid "New memo"
 msgstr "ì?? ë©?ëª¨"
 
-#: ../calendar/gui/memos-component.c:1072
+#: ../calendar/gui/memos-component.c:1042
 msgctxt "New"
 msgid "Mem_o"
 msgstr "ë©?ëª¨(_O)"
 
-#: ../calendar/gui/memos-component.c:1073
+#: ../calendar/gui/memos-component.c:1043
 msgid "Create a new memo"
 msgstr "ì?? ë©?ëª¨ë¥¼ ë§?ë?ë??ë?¤"
 
-#: ../calendar/gui/memos-component.c:1079
+#: ../calendar/gui/memos-component.c:1049
 msgid "New shared memo"
 msgstr "ì?? ê³µì?  ë©?ëª¨"
 
-#: ../calendar/gui/memos-component.c:1080
+#: ../calendar/gui/memos-component.c:1050
 msgctxt "New"
 msgid "_Shared memo"
 msgstr "ê³µì?  ë©?ëª¨(_S)"
 
-#: ../calendar/gui/memos-component.c:1081
+#: ../calendar/gui/memos-component.c:1051
 msgid "Create a shared new memo"
 msgstr "ì?? ê³µì?  ë©?ëª¨ë¥¼ ë§?ë?ë??ë?¤"
 
-#: ../calendar/gui/memos-component.c:1087
+#: ../calendar/gui/memos-component.c:1057
 msgid "New memo list"
 msgstr "ì?? ë©?ëª¨ ëª©ë¡?"
 
-#: ../calendar/gui/memos-component.c:1088
+#: ../calendar/gui/memos-component.c:1058
 msgctxt "New"
 msgid "Memo li_st"
 msgstr "ë©?ëª¨ ëª©ë¡?(_S)"
 
-#: ../calendar/gui/memos-component.c:1089
+#: ../calendar/gui/memos-component.c:1059
 msgid "Create a new memo list"
 msgstr "ì?? ë©?ëª¨ ëª©ë¡?ì?? ë§?ë?ë??ë?¤"
 
-#: ../calendar/gui/memos-control.c:350 ../calendar/gui/memos-control.c:366
+#: ../calendar/gui/memos-control.c:386 ../calendar/gui/memos-control.c:402
 msgid "Print Memos"
 msgstr "ë©?ëª¨ ì?¸ì??"
 
@@ -8872,297 +7567,289 @@ msgstr ""
 "í?´ë??ë¥¼ ì?®ê¸°ë?? ë??ì?? ì? ì?? ê¸°ë?¤ë¦¬ì?ì??ì?¤..."
 
 #. FIXME: set proper domain/code
-#: ../calendar/gui/migration.c:775 ../calendar/gui/migration.c:943
+#: ../calendar/gui/migration.c:774 ../calendar/gui/migration.c:942
 #, c-format
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr "evolution/config.xmldbì?? ê³¼ê±° ì?¤ì ?ì?? ì?®ê²¨ ì?¬ ì?? ì??ì?µë??ë?¤"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:804
+#: ../calendar/gui/migration.c:803
 #, c-format
 msgid "Unable to migrate calendar `%s'"
 msgstr "`%s' ë?¬ë ¥ì?? ì?®ê²¨ ì?¬ ì?? ì??ì?µë??ë?¤"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:972
+#: ../calendar/gui/migration.c:971
 #, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "`%s' ì??ì??ì?? ì?®ê²¨ ì?¬ ì?? ì??ì?µë??ë?¤"
 
-#: ../calendar/gui/migration.c:1227
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:426
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:457
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:570
-msgid "Notes"
-msgstr "ìª½ì§?"
-
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:511
 msgid "1st"
 msgstr "1ì?¼"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:511
 msgid "2nd"
 msgstr "2ì?¼"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:511
 msgid "3rd"
 msgstr "3ì?¼"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:511
 msgid "4th"
 msgstr "4ì?¼"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:511
 msgid "5th"
 msgstr "5ì?¼"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:512
 msgid "6th"
 msgstr "6ì?¼"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:512
 msgid "7th"
 msgstr "7ì?¼"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:512
 msgid "8th"
 msgstr "8ì?¼"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:512
 msgid "9th"
 msgstr "9ì?¼"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:512
 msgid "10th"
 msgstr "10ì?¼"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:513
 msgid "11th"
 msgstr "11ì?¼"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:513
 msgid "12th"
 msgstr "12ì?¼"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:513
 msgid "13th"
 msgstr "13ì?¼"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:513
 msgid "14th"
 msgstr "14ì?¼"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:513
 msgid "15th"
 msgstr "15ì?¼"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:514
 msgid "16th"
 msgstr "16ì?¼"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:514
 msgid "17th"
 msgstr "17ì?¼"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:514
 msgid "18th"
 msgstr "18ì?¼"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:514
 msgid "19th"
 msgstr "19ì?¼"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:514
 msgid "20th"
 msgstr "20ì?¼"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:515
 msgid "21st"
 msgstr "21ì?¼"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:515
 msgid "22nd"
 msgstr "22ì?¼"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:515
 msgid "23rd"
 msgstr "23ì?¼"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:515
 msgid "24th"
 msgstr "24ì?¼"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:515
 msgid "25th"
 msgstr "25ì?¼"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:516
 msgid "26th"
 msgstr "26ì?¼"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:516
 msgid "27th"
 msgstr "27ì?¼"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:516
 msgid "28th"
 msgstr "28ì?¼"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:516
 msgid "29th"
 msgstr "29ì?¼"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:516
 msgid "30th"
 msgstr "30ì?¼"
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:517
 msgid "31st"
 msgstr "31ì?¼"
 
-#. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=thursday
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:593
 msgid "Su"
 msgstr "ì?¼"
 
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:593
 msgid "Mo"
 msgstr "ì??"
 
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:593
 msgid "Tu"
 msgstr "í??"
 
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:593
 msgid "We"
 msgstr "ì??"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:594
 msgid "Th"
 msgstr "ëª©"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:594
 msgid "Fr"
 msgstr "ê¸?"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:594
 msgid "Sa"
 msgstr "í? "
 
-#: ../calendar/gui/print.c:2481
+#: ../calendar/gui/print.c:2465
 msgid "Appointment"
 msgstr "ì?½ì??"
 
-#: ../calendar/gui/print.c:2483
+#: ../calendar/gui/print.c:2467
 msgid "Task"
 msgstr "ì??ì??"
 
-#: ../calendar/gui/print.c:2508
+#: ../calendar/gui/print.c:2492
 #, c-format
 msgid "Summary: %s"
 msgstr "ì??ì?½: %s"
 
-#: ../calendar/gui/print.c:2531
+#: ../calendar/gui/print.c:2515
 msgid "Attendees: "
 msgstr "ì°¸ì??ì??: "
 
-#: ../calendar/gui/print.c:2571
+#: ../calendar/gui/print.c:2555
 #, c-format
 msgid "Status: %s"
 msgstr "ì??í??: %s"
 
-#: ../calendar/gui/print.c:2588
+#: ../calendar/gui/print.c:2569
 #, c-format
 msgid "Priority: %s"
 msgstr "ì?°ì? ì??ì??: %s"
 
-#: ../calendar/gui/print.c:2600
+#: ../calendar/gui/print.c:2584
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "í?¼ì?¼í?¸ ì??ë£?: %i"
 
-#: ../calendar/gui/print.c:2612
+#: ../calendar/gui/print.c:2595
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2625
+#: ../calendar/gui/print.c:2608
 #, c-format
 msgid "Categories: %s"
 msgstr "ë¶?ë¥?: %s"
 
-#: ../calendar/gui/print.c:2636
+#: ../calendar/gui/print.c:2619
 msgid "Contacts: "
 msgstr "ì?°ë?½ì²?:"
 
-#: ../calendar/gui/tasks-component.c:499
+#: ../calendar/gui/tasks-component.c:470
 msgid "_New Task List"
 msgstr "ì?? ì??ì?? ëª©ë¡?(_N)"
 
-#: ../calendar/gui/tasks-component.c:582
+#: ../calendar/gui/tasks-component.c:553
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "ì?°ë?½ì²? %dê°?"
 
-#: ../calendar/gui/tasks-component.c:631
+#: ../calendar/gui/tasks-component.c:602
 msgid "Failed upgrading tasks."
 msgstr "ì??ì??ì?? ì??ê·¸ë ?ì?´ë??í??ë?? ë?° ì?¤í?¨í??ì?µë??ë?¤."
 
 # event -> í??ì?¬, Microsoft Office XP ì°¸ê³ 
-#: ../calendar/gui/tasks-component.c:764
+#: ../calendar/gui/tasks-component.c:735
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr "í??ì?¬ì?? ëª¨ì??ì?? ë§?ë??ë?? ë?° ì?¸ '%s' ì??ì?? ëª©ë¡?ì?? ì?´ ì?? ì??ì?µë??ë?¤"
 
-#: ../calendar/gui/tasks-component.c:777
+#: ../calendar/gui/tasks-component.c:748
 msgid "There is no calendar available for creating tasks"
 msgstr "ì??ì??ì?? ë§?ë?¤ ë?? ì?¸ ì?? ì??ë?? ë?¬ë ¥ì?´ ì??ì?µë??ë?¤"
 
-#: ../calendar/gui/tasks-component.c:888
+#: ../calendar/gui/tasks-component.c:859
 msgid "Task Source Selector"
 msgstr "ì??ì?? ì??ì?¤ ì? í??"
 
-#: ../calendar/gui/tasks-component.c:1142
+#: ../calendar/gui/tasks-component.c:1113
 msgid "New task"
 msgstr "ì?? ì??ì??"
 
-#: ../calendar/gui/tasks-component.c:1143
+#: ../calendar/gui/tasks-component.c:1114
 msgctxt "New"
 msgid "_Task"
 msgstr "ì??ì??(_T)"
 
-#: ../calendar/gui/tasks-component.c:1144
+#: ../calendar/gui/tasks-component.c:1115
 msgid "Create a new task"
 msgstr "ì?? ì??ì??ì?? ë§?ë?ë??ë?¤"
 
-#: ../calendar/gui/tasks-component.c:1150
+#: ../calendar/gui/tasks-component.c:1121
 msgid "New assigned task"
 msgstr "ì??ë¡? í? ë?¹í?? ì??ì??"
 
-#: ../calendar/gui/tasks-component.c:1151
+#: ../calendar/gui/tasks-component.c:1122
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "í? ë?¹í?? ì??ì??(_D)"
 
-#: ../calendar/gui/tasks-component.c:1152
+#: ../calendar/gui/tasks-component.c:1123
 msgid "Create a new assigned task"
 msgstr "ì??ë¡? í? ë?¹í?? ì??ì??ì?? ë§?ë?ë??ë?¤"
 
-#: ../calendar/gui/tasks-component.c:1158
+#: ../calendar/gui/tasks-component.c:1129
 msgid "New task list"
 msgstr "ì?? ì??ì?? ëª©ë¡?"
 
-#: ../calendar/gui/tasks-component.c:1159
+#: ../calendar/gui/tasks-component.c:1130
 msgctxt "New"
 msgid "Tas_k list"
 msgstr "ì??ì?? ëª©ë¡?(_K)"
 
-#: ../calendar/gui/tasks-component.c:1160
+#: ../calendar/gui/tasks-component.c:1131
 msgid "Create a new task list"
 msgstr "ì?? ì??ì?? ëª©ë¡?ì?? ë§?ë?ë??ë?¤"
 
-#: ../calendar/gui/tasks-control.c:442
+#: ../calendar/gui/tasks-control.c:484
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -9174,11 +7861,11 @@ msgstr ""
 "\n"
 "ì ?ë§?ë¡? ì?´ ì??ì??ë?¤ì?? ì§?ì?°ì??ê² ì?µë??ê¹??"
 
-#: ../calendar/gui/tasks-control.c:445 ../mail/em-folder-view.c:1128
+#: ../calendar/gui/tasks-control.c:487 ../mail/em-folder-view.c:1126
 msgid "Do not ask me again."
 msgstr "ë?¤ì?? ë¬»ì§? ì??ì?µë??ë?¤."
 
-#: ../calendar/gui/tasks-control.c:482 ../calendar/gui/tasks-control.c:498
+#: ../calendar/gui/tasks-control.c:524 ../calendar/gui/tasks-control.c:540
 msgid "Print Tasks"
 msgstr "ì??ì?? ì?¸ì??"
 
@@ -9196,12 +7883,12 @@ msgid "In progress"
 msgstr "ì§?í?? ì¤?"
 
 # FIXME - hard to translate UI + string based on English grammar
-#: ../calendar/gui/tasktypes.xml.h:28 ../mail/em-filter-i18n.h:34
+#: ../calendar/gui/tasktypes.xml.h:28 ../mail/em-filter-i18n.h:35
 msgid "is greater than"
 msgstr "ë³´ë?¤ í?¼"
 
 # FIXME - hard to translate UI + string based on English grammar
-#: ../calendar/gui/tasktypes.xml.h:29 ../mail/em-filter-i18n.h:35
+#: ../calendar/gui/tasktypes.xml.h:29 ../mail/em-filter-i18n.h:36
 msgid "is less than"
 msgstr "ë³´ë?¤ ì ?ì??"
 
@@ -9209,39 +7896,39 @@ msgstr "ë³´ë?¤ ì ?ì??"
 msgid "Appointments and Meetings"
 msgstr "ì?½ì?? ë°? ëª¨ì??"
 
-#: ../calendar/importers/icalendar-importer.c:333
-#: ../calendar/importers/icalendar-importer.c:628
-#: ../plugins/itip-formatter/itip-formatter.c:1723
+#: ../calendar/importers/icalendar-importer.c:335
+#: ../calendar/importers/icalendar-importer.c:630
+#: ../plugins/itip-formatter/itip-formatter.c:1728
 msgid "Opening calendar"
 msgstr "ë?¬ë ¥ì?? ì?¬ë?? ì¤?ì??ë??ë?¤"
 
-#: ../calendar/importers/icalendar-importer.c:440
+#: ../calendar/importers/icalendar-importer.c:442
 msgid "iCalendar files (.ics)"
 msgstr "iCalendar í??ì?¼ (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:441
+#: ../calendar/importers/icalendar-importer.c:443
 msgid "Evolution iCalendar importer"
 msgstr "ì??ë³¼ë£¨ì?? iCalendar ê°?ì ¸ì?¤ê¸°"
 
 # Reminder -> ë¯¸ë¦¬ ì??ë¦¼, Microsoft Office XP
-#: ../calendar/importers/icalendar-importer.c:529
+#: ../calendar/importers/icalendar-importer.c:531
 msgid "Reminder!"
 msgstr "ë¯¸ë¦¬ ì??ë¦¼!"
 
-#: ../calendar/importers/icalendar-importer.c:581
+#: ../calendar/importers/icalendar-importer.c:583
 msgid "vCalendar files (.vcf)"
 msgstr "vCalendar í??ì?¼ (.vcf)"
 
-#: ../calendar/importers/icalendar-importer.c:582
+#: ../calendar/importers/icalendar-importer.c:584
 msgid "Evolution vCalendar importer"
 msgstr "ì??ë³¼ë£¨ì?? vCalendar ê°?ì ¸ì?¤ê¸°"
 
 # event -> í??ì?¬, Microsoft Office XP ì°¸ê³ 
-#: ../calendar/importers/icalendar-importer.c:744
+#: ../calendar/importers/icalendar-importer.c:746
 msgid "Calendar Events"
 msgstr "ë?¬ë ¥ í??ì?¬"
 
-#: ../calendar/importers/icalendar-importer.c:781
+#: ../calendar/importers/icalendar-importer.c:783
 msgid "Evolution Calendar intelligent importer"
 msgstr "ì??ë³¼ë£¨ì?? ë?¬ë ¥ ë??ë??í?? ê°?ì ¸ì?¤ê¸°"
 
@@ -10250,7 +8937,7 @@ msgstr "ì??ì??ì??/ì??í??ì?´"
 
 #: ../calendar/zones.h:270
 msgid "Asia/Singapore"
-msgstr "ì??ì??ì??/ì?±ê°?í?´"
+msgstr "ì??ì??ì??/ì?±ê°?í?¬ë¥´"
 
 #: ../calendar/zones.h:271
 msgid "Asia/Taipei"
@@ -10796,218 +9483,191 @@ msgstr "í??í??ì??/ì??ë¦¬ì?¤"
 msgid "Pacific/Yap"
 msgstr "í??í??ì??/ì??"
 
-#: ../composer/e-composer-autosave.c:273
-msgid "Could not open autosave file"
-msgstr "ì??ë?? ì ?ì?¥ í??ì?¼ì?? ì?´ ì?? ì??ì?µë??ë?¤"
-
-#: ../composer/e-composer-autosave.c:280
+#: ../composer/e-composer-autosave.c:445
 msgid "Unable to retrieve message from editor"
 msgstr "í?¸ì§?ê¸°ì??ì?? ë©?ì??ì§?ë¥¼ ê°?ì ¸ì?¬ ì?? ì??ì?µë??ë?¤"
 
-#: ../composer/e-composer-actions.c:45
-msgid "Insert Attachment"
-msgstr "ì²¨ë¶? ë?£ê¸°"
-
-#: ../composer/e-composer-actions.c:49
-msgid "A_ttach"
-msgstr "ì²¨ë¶?(_T)"
-
-#: ../composer/e-composer-actions.c:140
+#: ../composer/e-composer-actions.c:84
 msgid "Untitled Message"
 msgstr "ì ?ëª© ì??ë?? ë©?ì??ì§?"
 
-#: ../composer/e-composer-actions.c:471
+#: ../composer/e-composer-actions.c:317
+#: ../widgets/misc/e-attachment-view.c:328
 msgid "Attach a file"
 msgstr "í??ì?¼ì?? ì²¨ë¶?í?©ë??ë?¤"
 
-#: ../composer/e-composer-actions.c:476 ../mail/mail-signature-editor.c:194
+#: ../composer/e-composer-actions.c:322 ../mail/mail-signature-editor.c:195
 #: ../ui/evolution-mail-messagedisplay.xml.h:4
 msgid "_Close"
 msgstr "ë?«ê¸°(_C)"
 
-#: ../composer/e-composer-actions.c:478
+#: ../composer/e-composer-actions.c:324
 msgid "Close the current file"
 msgstr "í??ì?¬ í??ì?¼ì?? ë?«ì?µë??ë?¤"
 
-#: ../composer/e-composer-actions.c:483 ../mail/em-folder-view.c:1339
+#: ../composer/e-composer-actions.c:329 ../mail/em-folder-view.c:1337
 #: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:47
-#: ../ui/evolution-mail-message.xml.h:123 ../ui/evolution-memos.xml.h:20
+#: ../ui/evolution-mail-message.xml.h:119 ../ui/evolution-memos.xml.h:20
 #: ../ui/evolution-tasks.xml.h:29
 msgid "_Print..."
 msgstr "ì?¸ì??(_P)..."
 
-#: ../composer/e-composer-actions.c:490 ../ui/evolution-addressbook.xml.h:27
-#: ../ui/evolution-calendar.xml.h:21 ../ui/evolution-mail-message.xml.h:76
+#: ../composer/e-composer-actions.c:336 ../ui/evolution-addressbook.xml.h:27
+#: ../ui/evolution-calendar.xml.h:21 ../ui/evolution-mail-message.xml.h:72
 #: ../ui/evolution-memos.xml.h:12 ../ui/evolution-tasks.xml.h:15
 msgid "Print Pre_view"
 msgstr "ì?¸ì?? ë¯¸ë¦¬ ë³´ê¸°(_V)"
 
-#: ../composer/e-composer-actions.c:499
+#: ../composer/e-composer-actions.c:345
 msgid "Save the current file"
 msgstr "í??ì?¬ í??ì?¼ì?? ì ?ì?¥í?©ë??ë?¤"
 
-#: ../composer/e-composer-actions.c:504
+#: ../composer/e-composer-actions.c:350
 msgid "Save _As..."
 msgstr "ë?¤ë¥¸ ì?´ë¦?ì?¼ë¡? ì ?ì?¥(_A)..."
 
-#: ../composer/e-composer-actions.c:506
+#: ../composer/e-composer-actions.c:352
 msgid "Save the current file with a different name"
 msgstr "í??ì?¬ í??ì?¼ì?? ë?¤ë¥¸ ì?´ë¦?ì?¼ë¡? ì ?ì?¥í?©ë??ë?¤"
 
-#: ../composer/e-composer-actions.c:511
+#: ../composer/e-composer-actions.c:357
 msgid "Save as _Draft"
 msgstr "ì??ì?? ë³´ê´?í?¨ì?? ì ?ì?¥(_D)"
 
-#: ../composer/e-composer-actions.c:513
+#: ../composer/e-composer-actions.c:359
 msgid "Save as draft"
 msgstr "ì??ì?? ë³´ê´?í?¨ì?? ì ?ì?¥"
 
-#: ../composer/e-composer-actions.c:518
+#: ../composer/e-composer-actions.c:364 ../composer/e-composer-private.c:191
 msgid "S_end"
 msgstr "ë³´ë?´ê¸°(_E)"
 
-#: ../composer/e-composer-actions.c:520
+#: ../composer/e-composer-actions.c:366
 msgid "Send this message"
 msgstr "ì?´ ë©?ì??ì§?ë¥¼ ì§?ê¸? ë³´ë??ë??ë?¤"
 
-#: ../composer/e-composer-actions.c:527
+#: ../composer/e-composer-actions.c:373
 msgid "Insert Send options"
 msgstr "ë³´ë?´ê¸° ì?µì?? ë?£ê¸°"
 
-#: ../composer/e-composer-actions.c:532
+#: ../composer/e-composer-actions.c:378
 msgid "New _Message"
 msgstr "ì?? ë©?ì??ì§?(_M)"
 
-#: ../composer/e-composer-actions.c:534
+#: ../composer/e-composer-actions.c:380
 msgid "Open New Message window"
 msgstr "ì?? ë©?ì??ì§? ì°½ì?? ì?½ë??ë?¤"
 
-#: ../composer/e-composer-actions.c:541
+#: ../composer/e-composer-actions.c:387
 msgid "Character _Encoding"
 msgstr "ë¬¸ì?? ì?¸ì½?ë?©(_E)"
 
-#: ../composer/e-composer-actions.c:548
+#: ../composer/e-composer-actions.c:394
 msgid "_Security"
 msgstr "ë³´ì??(_S)"
 
-#: ../composer/e-composer-actions.c:558
+#: ../composer/e-composer-actions.c:404
 msgid "PGP _Encrypt"
 msgstr "PGP ì??í?¸í??(_E)"
 
-#: ../composer/e-composer-actions.c:560
+#: ../composer/e-composer-actions.c:406
 msgid "Encrypt this message with PGP"
 msgstr "ì?´ ë©?ì??ì§?ë¥¼ PGPë¡? ì??í?¸í??í?©ë??ë?¤"
 
-#: ../composer/e-composer-actions.c:566
+#: ../composer/e-composer-actions.c:412
 msgid "PGP _Sign"
 msgstr "PGP ì??ëª?(_S)"
 
-#: ../composer/e-composer-actions.c:568
+#: ../composer/e-composer-actions.c:414
 msgid "Sign this message with your PGP key"
 msgstr "ì?´ ë©?ì??ì§?ë¥¼ PGPí?¤ë¡? ì??ëª?í?©ë??ë?¤"
 
-#: ../composer/e-composer-actions.c:574
+#: ../composer/e-composer-actions.c:420
 msgid "_Prioritize Message"
 msgstr "ë©?ì??ì§? ì?°ì? ì??ì?? ë??ì?´ê¸°(_P)"
 
-#: ../composer/e-composer-actions.c:576
+#: ../composer/e-composer-actions.c:422
 msgid "Set the message priority to high"
 msgstr "ë©?ì??ì§? ì?°ì? ì??ì??ë¥¼ ë??ì??ë??ë?¤"
 
 # read receipt -> ë?´ì?© ì?½ì?? í??ì?¸, Microsoft Office XP ì°¸ê³ 
-#: ../composer/e-composer-actions.c:582
+#: ../composer/e-composer-actions.c:428
 msgid "Re_quest Read Receipt"
 msgstr "ë?´ì?© ì?½ì?? í??ì?¸ ì??ì²(_Q)"
 
-#: ../composer/e-composer-actions.c:584
+#: ../composer/e-composer-actions.c:430
 msgid "Get delivery notification when your message is read"
 msgstr "ë©?ì??ì§?ë¥¼ ì?½ì?¼ë©´ ë°°ë?¬ í??ì?¸ ë°?ê¸°"
 
-#: ../composer/e-composer-actions.c:590
+#: ../composer/e-composer-actions.c:436
 msgid "S/MIME En_crypt"
 msgstr "S/MIME ì??í?¸í??(_C)"
 
-#: ../composer/e-composer-actions.c:592
+#: ../composer/e-composer-actions.c:438
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "ì?´ ë©?ì??ì§?ë¥¼ S/MIME ì??í?¸í?? ì?¸ì¦?ì??ë¡? ì??í?¸í??í?©ë??ë?¤"
 
-#: ../composer/e-composer-actions.c:598
+#: ../composer/e-composer-actions.c:444
 msgid "S/MIME Sig_n"
 msgstr "S/MIME ì??ëª?(_N)"
 
-#: ../composer/e-composer-actions.c:600
+#: ../composer/e-composer-actions.c:446
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "ì?´ ë©?ì??ì§?ë¥¼ S/MIME ì??ëª? ì¦?ëª?ì?¼ë¡? ì??ëª?í?©ë??ë?¤"
 
-#: ../composer/e-composer-actions.c:606
+#: ../composer/e-composer-actions.c:452
 msgid "_Bcc Field"
 msgstr "ì?¨ì?? ì°¸ì¡° í?ëª©(_B)"
 
-#: ../composer/e-composer-actions.c:608
+#: ../composer/e-composer-actions.c:454
 msgid "Toggles whether the BCC field is displayed"
 msgstr "ì?¨ì?? ì°¸ì¡° í?ëª©ì?? í??ì??í?  ì§? í? ê¸?í?©ë??ë?¤"
 
-#: ../composer/e-composer-actions.c:614
+#: ../composer/e-composer-actions.c:460
 msgid "_Cc Field"
 msgstr "ì°¸ì¡° í?ëª©(_C)"
 
-#: ../composer/e-composer-actions.c:616
+#: ../composer/e-composer-actions.c:462
 msgid "Toggles whether the CC field is displayed"
 msgstr "ì°¸ì¡° í?ëª©ì?? í??ì??í?  ì§? í? ê¸?í?©ë??ë?¤"
 
-#: ../composer/e-composer-actions.c:622
+#: ../composer/e-composer-actions.c:468
 msgid "_From Field"
 msgstr "ë°?ì?  í?ëª©(_F)"
 
-#: ../composer/e-composer-actions.c:624
+#: ../composer/e-composer-actions.c:470
 msgid "Toggles whether the From chooser is displayed"
 msgstr "ë°?ì?  í?ëª©ì?? í??ì??í?  ì§? í? ê¸?í?©ë??ë?¤"
 
-#: ../composer/e-composer-actions.c:630
-msgid "_Post-To Field"
-msgstr "ì?¬ë¦¬ë?? ê³³ í?ëª©(_P)"
-
-#: ../composer/e-composer-actions.c:632
-msgid "Toggles whether the Post-To field is displayed"
-msgstr "ì?¬ë¦¬ë?? ê³³ í?ëª©ì?? í??ì??í?  ì§? í? ê¸?í?©ë??ë?¤"
-
-#: ../composer/e-composer-actions.c:638
+#: ../composer/e-composer-actions.c:476
 msgid "_Reply-To Field"
 msgstr "í??ì?  ì£¼ì?? í?ëª©(_R)"
 
-#: ../composer/e-composer-actions.c:640
+#: ../composer/e-composer-actions.c:478
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "í??ì?  ì£¼ì?? í?ëª©ì?? í??ì??í?  ì§? í? ê¸?í?©ë??ë?¤"
 
-#: ../composer/e-composer-actions.c:646
-msgid "_Subject Field"
-msgstr "ì ?ëª© í?ëª©(_S)"
-
-#: ../composer/e-composer-actions.c:648
-msgid "Toggles whether the Subject field is displayed"
-msgstr "ì ?ëª© í?ëª©ì?? í??ì??í?  ì§? í? ê¸?í?©ë??ë?¤"
-
-#: ../composer/e-composer-actions.c:654
-msgid "_To Field"
-msgstr "ë°?ë?? ì?¬ë?? í?ëª©(_T)"
-
-#: ../composer/e-composer-actions.c:656
-msgid "Toggles whether the To field is displayed"
-msgstr "ë°?ë?? ì?¬ë?? í?ëª©ì?? í??ì??í?  ì§? í? ê¸?í?©ë??ë?¤"
-
-#: ../composer/e-composer-actions.c:699
+#: ../composer/e-composer-actions.c:521
 msgid "Save Draft"
 msgstr "ì??ì?? ì ?ì?¥"
 
-#: ../composer/e-composer-header-table.c:64
+#: ../composer/e-composer-header.c:120
+msgid "Show"
+msgstr "ë³´ì?´ê¸°"
+
+#: ../composer/e-composer-header.c:123
+msgid "Hide"
+msgstr "ì?¨ê¸°ê¸°"
+
+#: ../composer/e-composer-header-table.c:41
 msgid "Enter the recipients of the message"
 msgstr "ë©?ì??ì§?ë¥¼ ë°?ì?? ì?¬ë??ì?? ì??ë ¥í??ì?ì??ì?¤"
 
-#: ../composer/e-composer-header-table.c:66
+#: ../composer/e-composer-header-table.c:43
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "ë©?ì??ì§?ì?? ì?¬ë³¸ì?? ë°?ì?? ì?¬ë??ì?? ì£¼ì??ë¥¼ ì??ë ¥í??ì?ì??ì?¤"
 
-#: ../composer/e-composer-header-table.c:69
+#: ../composer/e-composer-header-table.c:46
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message"
@@ -11015,40 +9675,54 @@ msgstr ""
 "ë©?ì??ì§?ì?? ë°?ë?? ì?¬ë?? ëª©ë¡?ì?? ë??í??ë??ì§? ì??ê³  ì°¸ì¡° ë©?ì??ì§?ë¥¼ ë°?ì?? ì£¼ì??ë¥¼ ì??ë ¥í??ì?ì??"
 "ì?¤."
 
-#: ../composer/e-composer-header-table.c:643
+#: ../composer/e-composer-header-table.c:945
 msgid "Fr_om:"
 msgstr "ë³´ë?¸ ì?¬ë??(_O):"
 
-#: ../composer/e-composer-header-table.c:652
+#: ../composer/e-composer-header-table.c:945 ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:923 ../mail/em-mailer-prefs.c:76
+#: ../mail/message-list.etspec.h:7 ../mail/message-tag-followup.c:296
+msgid "From"
+msgstr "ë³´ë?¸ ì?¬ë??"
+
+#: ../composer/e-composer-header-table.c:954
 msgid "_Reply-To:"
 msgstr "í??ì?  ì£¼ì??(_R):"
 
-#: ../composer/e-composer-header-table.c:656
+#: ../composer/e-composer-header-table.c:959
 msgid "_To:"
 msgstr "ë°?ë?? ì?¬ë??(_T):"
 
-#: ../composer/e-composer-header-table.c:661
+#: ../composer/e-composer-header-table.c:965
 msgid "_Cc:"
 msgstr "ì°¸ì¡°(_C):"
 
-#: ../composer/e-composer-header-table.c:666
+#: ../composer/e-composer-header-table.c:965 ../mail/em-filter-i18n.h:8
+msgid "CC"
+msgstr "ì°¸ì¡°"
+
+#: ../composer/e-composer-header-table.c:971
 msgid "_Bcc:"
 msgstr "ì?¨ì?? ì°¸ì¡°(_B):"
 
+#: ../composer/e-composer-header-table.c:971 ../mail/em-filter-i18n.h:6
+msgid "BCC"
+msgstr "ì?¨ê¸´ ì°¸ì¡°"
+
 # post -> ê²?ì??, Microsoft Office XP ì°¸ê³ 
-#: ../composer/e-composer-header-table.c:671
+#: ../composer/e-composer-header-table.c:976
 msgid "_Post To:"
 msgstr "ê²?ì?? ì??ì¹?(_P):"
 
-#: ../composer/e-composer-header-table.c:675
+#: ../composer/e-composer-header-table.c:980
 msgid "S_ubject:"
 msgstr "ì ?ëª©(_U):"
 
-#: ../composer/e-composer-header-table.c:684
+#: ../composer/e-composer-header-table.c:989
 msgid "Si_gnature:"
 msgstr "ì??ëª?(_G):"
 
-#: ../composer/e-composer-name-header.c:115
+#: ../composer/e-composer-name-header.c:116
 msgid "Click here for the address book"
 msgstr "ì£¼ì??ë¡?ì?? ë³´ë ¤ë©´ ë??ë¥´ì?ì??ì?¤"
 
@@ -11066,18 +9740,18 @@ msgstr "ë©?ì??ì§?ë¥¼ ì?¬ë¦´ í?´ë??ë¥¼ ì? í??í??ì?ì??ì?¤."
 msgid "Click here to select folders to post to"
 msgstr "ê²?ì??í?  í?´ë??ë¥¼ ê³ ë¥¼ë ¤ë©´ ì?¬ê¸°ë¥¼ ë??ë¥´ì?ì??ì?¤"
 
-#: ../composer/e-composer-private.c:179 ../composer/e-msg-composer.c:1557
-msgid "Show _Attachment Bar"
-msgstr "ì²¨ë¶? ëª¨ì?? ë³´ê¸°(_A)"
+#: ../composer/e-composer-private.c:208
+msgid "Save draft"
+msgstr "ì??ì?? ì ?ì?¥"
 
-#: ../composer/e-msg-composer.c:866
+#: ../composer/e-msg-composer.c:807
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "ë³´ë?´ë?? ë©?ì??ì§?ì?? ì??ëª?í?  ì?? ì??ì?µë??ë?¤: ê³?ì ?ì?? ì?¬ì?¸í?  ë?? ì?¸ ì?¸ì¦?ì??ë¥¼ ì?¤ì ?í??ì§? ì??"
 "ì??ì?µë??ë?¤"
 
-#: ../composer/e-msg-composer.c:873
+#: ../composer/e-msg-composer.c:814
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
@@ -11085,22 +9759,11 @@ msgstr ""
 "ë³´ë?´ë?? ë©?ì??ì§?ë¥¼ ì??í?¸í??í?  ì?? ì??ì?µë??ë?¤: ê³?ì ?ì??ì?? ì??í?¸í?? ì?¸ì¦?ì??ë¥¼ ì?¤ì ?í??ì§? ì??ì??"
 "ì?µë??ë?¤"
 
-#: ../composer/e-msg-composer.c:1499 ../mail/em-format-html-display.c:1952
-#: ../mail/em-format-html-display.c:2600 ../mail/mail-config.glade.h:45
-#: ../mail/message-list.etspec.h:1
-msgid "Attachment"
-msgid_plural "Attachments"
-msgstr[0] "ì²¨ë¶?"
-
-#: ../composer/e-msg-composer.c:1555
-msgid "Hide _Attachment Bar"
-msgstr "ì²¨ë¶? ëª¨ì?? ì?¨ê¸°ê¸°(_A)"
-
-#: ../composer/e-msg-composer.c:1572 ../composer/e-msg-composer.c:2797
+#: ../composer/e-msg-composer.c:1350 ../composer/e-msg-composer.c:2189
 msgid "Compose Message"
 msgstr "ë©?ì??ì§?ë¥¼ ì??ì?±í?©ë??ë?¤"
 
-#: ../composer/e-msg-composer.c:4098
+#: ../composer/e-msg-composer.c:3347
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)</"
 "b>"
@@ -11264,7 +9927,7 @@ msgstr "ì??ì?? ì ?ì?¥(_S)"
 msgid "Evolution Mail and Calendar"
 msgstr "ì??ë³¼ë£¨ì?? ë©?ì?¼ ë°? ë?¬ë ¥"
 
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:951
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:947
 msgid "Groupware Suite"
 msgstr "ê·¸ë£¹ì?¨ì?´ ëª¨ì??"
 
@@ -11280,6 +9943,40 @@ msgstr "ì£¼ì?? ì¹´ë??"
 msgid "calendar information"
 msgstr "ë?¬ë ¥ ì ?ë³´"
 
+#. strftime format of a weekday and a date.
+#: ../e-util/e-datetime-format.c:188 ../plugins/itip-formatter/itip-view.c:191
+#: ../ui/evolution-calendar.xml.h:34 ../widgets/misc/e-cell-date-edit.c:304
+msgid "Today"
+msgstr "ì?¤ë??"
+
+#. strftime format of a weekday and a date.
+#: ../e-util/e-datetime-format.c:200 ../plugins/itip-formatter/itip-view.c:219
+msgid "Tomorrow"
+msgstr "ë?´ì?¼"
+
+#: ../e-util/e-datetime-format.c:202
+msgid "Yesterday"
+msgstr "ì?´ì ?"
+
+#: ../e-util/e-datetime-format.c:205
+#, c-format
+msgid "%d days from now"
+msgstr "%dì?¼ í??"
+
+#: ../e-util/e-datetime-format.c:207
+#, c-format
+msgid "%d days ago"
+msgstr "%dì?¼ ì ?"
+
+#: ../e-util/e-datetime-format.c:281 ../e-util/e-datetime-format.c:291
+#: ../e-util/e-datetime-format.c:300
+msgid "Use locale default"
+msgstr "ë¡?ìº? ê¸°ë³¸ê°? ì?¬ì?©"
+
+#: ../e-util/e-datetime-format.c:494
+msgid "Format:"
+msgstr "í??ì??:"
+
 #: ../e-util/e-error.c:78 ../e-util/e-error.c:79 ../e-util/e-error.c:121
 msgid "Evolution Error"
 msgstr "ì??ë³¼ë£¨ì?? ì?¤ë¥?"
@@ -11297,7 +9994,7 @@ msgid "Evolution Query"
 msgstr "ì??ë³¼ë£¨ì?? ë¬¼ì??"
 
 #. setup a dummy error
-#: ../e-util/e-error.c:444
+#: ../e-util/e-error.c:448
 #, c-format
 msgid "Internal error, unknown error '%s' requested"
 msgstr "ë?´ë¶? ì?¤ë¥?, ì?? ì?? ì??ë?? '%s' ì?¤ë¥?ê°? ë°?ì??í??ì?µë??ë?¤"
@@ -11310,67 +10007,67 @@ msgstr "ì»´í?¬ë??í?¸"
 msgid "Name of the component being logged"
 msgstr "ê¸°ë¡? ì¤?ì?¸ ì»´í?¬ë??í?¸ì?? ì?´ë¦?"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:190
+#: ../e-util/e-non-intrusive-error-dialog.c:191
 msgid "Debug Logs"
 msgstr "ë??ë²?ê¹? ê¸°ë¡?"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:204
+#: ../e-util/e-non-intrusive-error-dialog.c:205
 msgid "Show _errors in the status bar for"
 msgstr "ì??í?? í??ì??ì¤?ì??ì?? ì?¤ë¥? í??ì?? ì??ê°?(_E):"
 
 #. Translators: This is the second part of the sentence
 #. * "Show _errors in the status bar for" - XXX - "second(s)."
-#: ../e-util/e-non-intrusive-error-dialog.c:222
+#: ../e-util/e-non-intrusive-error-dialog.c:223
 msgid "second(s)."
 msgstr "ì´?."
 
-#: ../e-util/e-non-intrusive-error-dialog.c:228
+#: ../e-util/e-non-intrusive-error-dialog.c:229
 msgid "Log Messages:"
 msgstr "ê¸°ë¡? ë©?ì??ì§?:"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:273
+#: ../e-util/e-non-intrusive-error-dialog.c:274
 msgid "Log Level"
 msgstr "ê¸°ë¡? ë?¨ê³?"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:281
-#: ../widgets/misc/e-dateedit.c:389
+#: ../e-util/e-non-intrusive-error-dialog.c:282
+#: ../widgets/misc/e-dateedit.c:380
 msgid "Time"
 msgstr "ì??ê°?"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:291 ../mail/message-list.c:2523
+#: ../e-util/e-non-intrusive-error-dialog.c:292 ../mail/message-list.c:2527
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "ë©?ì??ì§?"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:300
+#: ../e-util/e-non-intrusive-error-dialog.c:301
 #: ../ui/evolution-mail-messagedisplay.xml.h:2 ../ui/evolution.xml.h:4
 msgid "Close this window"
 msgstr "ì?´ ì°½ì?? ë?«ì?µë??ë?¤"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:40
+#: ../e-util/e-non-intrusive-error-dialog.h:39
 msgid "Error"
 msgstr "ì?¤ë¥?"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:40
+#: ../e-util/e-non-intrusive-error-dialog.h:39
 msgid "Errors"
 msgstr "ì?¤ë¥?"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:41
+#: ../e-util/e-non-intrusive-error-dialog.h:40
 msgid "Warnings and Errors"
 msgstr "ê²½ê³  ë°? ì?¤ë¥?"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:42
+#: ../e-util/e-non-intrusive-error-dialog.h:41
 msgid "Debug"
 msgstr "ë??ë²?ê¹?"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:42
+#: ../e-util/e-non-intrusive-error-dialog.h:41
 msgid "Error, Warnings and Debug messages"
 msgstr "ì?¤ë¥?, ê²½ê³  ë°? ë??ë²?ê¹? ë©?ì??ì§?"
 
-#: ../e-util/e-plugin.c:308 ../filter/rule-editor.c:799
-#: ../mail/em-account-prefs.c:482 ../mail/em-composer-prefs.c:966
+#: ../e-util/e-plugin.c:308 ../filter/rule-editor.c:798
+#: ../mail/em-account-prefs.c:477 ../mail/em-composer-prefs.c:957
 #: ../plugins/plugin-manager/plugin-manager.c:355
-#: ../plugins/publish-calendar/publish-calendar.c:690
+#: ../plugins/publish-calendar/publish-calendar.c:718
 msgid "Enabled"
 msgstr "ì?¬ì?©"
 
@@ -11391,6 +10088,10 @@ msgid ""
 "The printing system did not report any additional details about the error."
 msgstr "ì?¸ì?? ì??ì?¤í??ì??ì?? ì¶?ê°? ì?¤ë¥? ë?´ì?©ì?? ì??ì?¸í?? ë³´ê³ í??ì§? ì??ì??ì?µë??ë?¤."
 
+#: ../e-util/e-signature.c:690
+msgid "Autogenerated"
+msgstr "ì??ë??ì?¼ë¡? ë§?ë?¤ê¸°"
+
 #: ../e-util/e-system.error.xml.h:1 ../mail/mail.error.xml.h:19
 msgid "Because \"{1}\"."
 msgstr "\"{1}\" ë??ë¬¸ì??ë??ë?¤."
@@ -11419,230 +10120,230 @@ msgstr "í??ì?¼ì?? ë?®ì?´ì?°ì??ê² ì?µë??ê¹??"
 msgid "_Overwrite"
 msgstr "ë?®ì?´ ì?°ê¸°(_O)"
 
-#: ../e-util/e-util.c:127
+#: ../e-util/e-util.c:133
 msgid "Could not open the link."
 msgstr "ë§?í?¬ë¥¼ ì?´ ì?? ì??ì?µë??ë?¤."
 
-#: ../e-util/e-util.c:174
+#: ../e-util/e-util.c:183
 msgid "Could not display help for Evolution."
 msgstr "ì??ë³¼ë£¨ì?? ë??ì??ë§?ì?? í??ì??í?  ì?? ì??ì?µë??ë?¤."
 
-#: ../e-util/e-util-labels.c:39
+#: ../e-util/e-util-labels.c:45
 msgid "I_mportant"
 msgstr "ì¤?ì??(_M)"
 
 #. red
-#: ../e-util/e-util-labels.c:40
+#: ../e-util/e-util-labels.c:46
 msgid "_Work"
 msgstr "ì??ë¬´(_W)"
 
 #. orange
-#: ../e-util/e-util-labels.c:41
+#: ../e-util/e-util-labels.c:47
 msgid "_Personal"
 msgstr "ê°?ì?¸(_P)"
 
 #. green
-#: ../e-util/e-util-labels.c:42
+#: ../e-util/e-util-labels.c:48
 msgid "_To Do"
 msgstr "í?  ì?¼(_T)"
 
 #. blue
-#: ../e-util/e-util-labels.c:43
+#: ../e-util/e-util-labels.c:49
 msgid "_Later"
 msgstr "ë??ì¤?ì??(_L)"
 
-#: ../e-util/e-util-labels.c:315
+#: ../e-util/e-util-labels.c:320
 msgid "Label _Name:"
 msgstr "ë ?ì?´ë¸? ì?´ë¦?(_N):"
 
-#: ../e-util/e-util-labels.c:338
+#: ../e-util/e-util-labels.c:343
 msgid "Edit Label"
 msgstr "ë ?ì?´ë¸? í?¸ì§?"
 
-#: ../e-util/e-util-labels.c:338
+#: ../e-util/e-util-labels.c:343
 msgid "Add Label"
 msgstr "ë ?ì?´ë¸? ì¶?ê°?"
 
-#: ../e-util/e-util-labels.c:357
+#: ../e-util/e-util-labels.c:362
 msgid "Label name cannot be empty."
 msgstr "ë ?ì?´ë¸? ì?´ë¦?ì?´ ë¹? ë¬¸ì??ì?´ì?´ë©´ ì?? ë?©ë??ë?¤."
 
-#: ../e-util/e-util-labels.c:362
+#: ../e-util/e-util-labels.c:367
 msgid ""
 "A label having the same tag already exists on the server. Please rename your "
 "label."
 msgstr "ê°?ì?? í??ê·¸ì?? ë ?ì?´ë¸?ì?´ ì?´ë¯¸ ì??ë²?ì?? ì??ì?µë??ë?¤. ë ?ì?´ë¸? ì?´ë¦?ì?? ë°?ê¾¸ì?ì??ì?¤."
 
-#: ../e-util/gconf-bridge.c:1221
+#: ../e-util/gconf-bridge.c:1222
 #, c-format
 msgid "GConf error: %s"
 msgstr "GConf ì?¤ë¥?: %s"
 
-#: ../e-util/gconf-bridge.c:1231
+#: ../e-util/gconf-bridge.c:1233
 msgid "All further errors shown only on terminal."
 msgstr "ë??ë¨¸ì§? ì?¤ë¥? ë©?ì??ì§?ë?? í?°ë¯¸ë??ì??ì??ë§? í??ì??í?©ë??ë?¤."
 
-#: ../filter/filter-datespec.c:81
+#: ../filter/filter-datespec.c:73
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "%dì´? ì ?"
 
-#: ../filter/filter-datespec.c:81
+#: ../filter/filter-datespec.c:74
 #, c-format
 msgid "1 second in the future"
 msgid_plural "%d seconds in the future"
 msgstr[0] "ì??ì?¼ë¡? %dì´?"
 
-#: ../filter/filter-datespec.c:82
+#: ../filter/filter-datespec.c:75
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%dë¶? ì ?"
 
-#: ../filter/filter-datespec.c:82
+#: ../filter/filter-datespec.c:76
 #, c-format
 msgid "1 minute in the future"
 msgid_plural "%d minutes in the future"
 msgstr[0] "ì??ì?¼ë¡? %dë¶?"
 
-#: ../filter/filter-datespec.c:83
+#: ../filter/filter-datespec.c:77
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%dì??ê°? ì ?"
 
-#: ../filter/filter-datespec.c:83
+#: ../filter/filter-datespec.c:78
 #, c-format
 msgid "1 hour in the future"
 msgid_plural "%d hours in the future"
 msgstr[0] "ì??ì?¼ë¡? %dì??ê°?"
 
-#: ../filter/filter-datespec.c:84
+#: ../filter/filter-datespec.c:79
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%dì?¼ ì ?"
 
-#: ../filter/filter-datespec.c:84
+#: ../filter/filter-datespec.c:80
 #, c-format
 msgid "1 day in the future"
 msgid_plural "%d days in the future"
 msgstr[0] "ì??ì?¼ë¡? %dì?¼"
 
-#: ../filter/filter-datespec.c:85
+#: ../filter/filter-datespec.c:81
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "%dì£¼ ì ?"
 
-#: ../filter/filter-datespec.c:85
+#: ../filter/filter-datespec.c:82
 #, c-format
 msgid "1 week in the future"
 msgid_plural "%d weeks in the future"
 msgstr[0] "ì??ì?¼ë¡? %dì£¼"
 
-#: ../filter/filter-datespec.c:86
+#: ../filter/filter-datespec.c:83
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%dë?¬ ì ?"
 
-#: ../filter/filter-datespec.c:86
+#: ../filter/filter-datespec.c:84
 #, c-format
 msgid "1 month in the future"
 msgid_plural "%d months in the future"
 msgstr[0] "ì??ì?¼ë¡? %dë?¬"
 
-#: ../filter/filter-datespec.c:87
+#: ../filter/filter-datespec.c:85
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
 msgstr[0] "%dë?? ì ?"
 
-#: ../filter/filter-datespec.c:87
+#: ../filter/filter-datespec.c:86
 #, c-format
 msgid "1 year in the future"
 msgid_plural "%d years in the future"
 msgstr[0] "ì??ì?¼ë¡? %dë??"
 
-#: ../filter/filter-datespec.c:288
+#: ../filter/filter-datespec.c:294
 msgid "<click here to select a date>"
 msgstr "<ë? ì§?ë¥¼ ì? í??í??ë ¤ë©´ ì?¬ê¸°ë¥¼ ë??ë¥´ì?ì??ì?¤>"
 
-#: ../filter/filter-datespec.c:291 ../filter/filter-datespec.c:302
-#: ../filter/filter-datespec.c:313
+#: ../filter/filter-datespec.c:297 ../filter/filter-datespec.c:308
+#: ../filter/filter-datespec.c:319
 msgid "now"
 msgstr "í??ì?¬"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/filter-datespec.c:298
+#: ../filter/filter-datespec.c:304
 msgid "%d-%b-%Y"
 msgstr "%Y-%m-%d"
 
-#: ../filter/filter-datespec.c:452
+#: ../filter/filter-datespec.c:447
 msgid "Select a time to compare against"
 msgstr "ë¹?êµ?í?  ì??ê°?ì?? ì? í??í??ì?ì??ì?¤"
 
-#: ../filter/filter-file.c:284
+#: ../filter/filter-file.c:281
 msgid "Choose a file"
 msgstr "í??ì?¼ì?? ì? í??í??ì?ì??ì?¤"
 
-#: ../filter/filter-part.c:532
+#: ../filter/filter-part.c:528
 #: ../shell/test/GNOME_Evolution_Test.server.in.in.h:3
 msgid "Test"
 msgstr "í??ì?¤í?¸"
 
-#: ../filter/filter-rule.c:853
+#: ../filter/filter-rule.c:854
 msgid "R_ule name:"
 msgstr "ê·?ì¹? ì?´ë¦?(_U):"
 
-#: ../filter/filter-rule.c:881
+#: ../filter/filter-rule.c:882
 msgid "Find items that meet the following conditions"
 msgstr "ë?¤ì?? ì¡°ê±´ì?´ ë§?ì¡±í??ë?? í?ëª©ì?? ì°¾ì?µë??ë?¤"
 
-#: ../filter/filter-rule.c:915
+#: ../filter/filter-rule.c:916
 msgid "A_dd Condition"
 msgstr "ì¡°ê±´ ì¶?ê°?(_D)"
 
-#: ../filter/filter-rule.c:921
+#: ../filter/filter-rule.c:922
 msgid "If all conditions are met"
 msgstr "ëª¨ë?  ì¡°ê±´ì?´ ë?¤ ì¶©ì¡±ë??ë©´"
 
-#: ../filter/filter-rule.c:921
+#: ../filter/filter-rule.c:922
 msgid "If any conditions are met"
 msgstr "ì?´ë?¤ ì¡°ê±´ì?´ë?¼ë?? ì¶©ì¡±ë??ë©´"
 
-#: ../filter/filter-rule.c:923
+#: ../filter/filter-rule.c:924
 msgid "_Find items:"
 msgstr "í?ëª© ì°¾ê¸°(_F):"
 
-#: ../filter/filter-rule.c:945
+#: ../filter/filter-rule.c:942
 msgid "All related"
 msgstr "ê´?ê³?ë?? ëª¨ë??"
 
-#: ../filter/filter-rule.c:945
+#: ../filter/filter-rule.c:942
 msgid "Replies"
 msgstr "ë?µì?¥"
 
-#: ../filter/filter-rule.c:945
+#: ../filter/filter-rule.c:942
 msgid "Replies and parents"
 msgstr "ë?µì?¥ ë°? ê·¸ ì??ì?? ë©?ì?¼"
 
-#: ../filter/filter-rule.c:945
+#: ../filter/filter-rule.c:942
 msgid "No reply or parent"
 msgstr "ë?µì?¥ ì??ê±°ë?? ì??ì?? ë©?ì?¼ ì??ì??"
 
-#: ../filter/filter-rule.c:947
+#: ../filter/filter-rule.c:944
 msgid "I_nclude threads"
 msgstr "ê¸?í??ë?? í?¬í?¨(_N)"
 
-#: ../filter/filter-rule.c:1045 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:310
+#: ../filter/filter-rule.c:1038 ../filter/filter.glade.h:3
+#: ../mail/em-utils.c:309
 msgid "Incoming"
 msgstr "ë°?ë?? ë©?ì?¼"
 
-#: ../filter/filter-rule.c:1045 ../mail/em-utils.c:311
+#: ../filter/filter-rule.c:1038 ../mail/em-utils.c:310
 msgid "Outgoing"
 msgstr "ë³´ë?´ë?? ë©?ì?¼"
 
@@ -11727,54 +10428,50 @@ msgstr ""
 "ë©?ì??ì§? ì??ê°?ì?? ë¹?êµ?í?©ë??ë?¤."
 
 #: ../filter/filter.glade.h:12
-msgid "a time relative to the current time"
-msgstr "í??ì?¬ ì??ê°?ê¹?ì§?ì?? ì??ë??ì ?ì?¸ ì??ê°?"
-
-#: ../filter/filter.glade.h:13
-msgid "ago"
-msgstr "ì ?ì??"
-
-#: ../filter/filter.glade.h:16
-msgid "in the future"
-msgstr "ì??ì?¼ë¡?"
-
-#: ../filter/filter.glade.h:18
-msgid "months"
-msgstr "ë?¬"
-
-#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:198
-msgid "seconds"
-msgstr "ì´?"
+msgid ""
+"ago\n"
+"in the future"
+msgstr ""
+"ì ?ì??\n"
+"ì??ì?¼ë¡?"
 
-#: ../filter/filter.glade.h:20
-msgid "the current time"
-msgstr "í??ì?¬ ì??ê°?"
+#: ../filter/filter.glade.h:14
+msgid ""
+"seconds\n"
+"minutes\n"
+"hours\n"
+"days\n"
+"weeks\n"
+"months\n"
+"years"
+msgstr ""
+"ì´?\n"
+"ë¶?\n"
+"ì??ê°?\n"
+"ì?¼\n"
+"ì£¼\n"
+"ë?¬\n"
+"ë??"
 
 #: ../filter/filter.glade.h:21
-msgid "the time you specify"
-msgstr "ì§?ì ?í??ë?? ì??ê°?"
-
-#: ../filter/filter.glade.h:22 ../plugins/caldav/caldav-source.c:433
-#: ../plugins/calendar-http/calendar-http.c:282
-#: ../plugins/calendar-weather/calendar-weather.c:527
-#: ../plugins/google-account-setup/google-source.c:655
-#: ../plugins/google-account-setup/google-contacts-source.c:369
-msgid "weeks"
-msgstr "ì£¼"
-
-#: ../filter/filter.glade.h:23
-msgid "years"
-msgstr "ì?°ë??"
+msgid ""
+"the current time\n"
+"the time you specify\n"
+"a time relative to the current time"
+msgstr ""
+"í??ì?¬ ì??ê°?\n"
+"ì§?ì ?í?? ì??ê°?\n"
+"í??ì?¬ ì??ê°?ê¹?ì§?ì?? ì??ë??ì ?ì?¸ ì??ê°?"
 
-#: ../filter/rule-editor.c:382
+#: ../filter/rule-editor.c:381
 msgid "Add Rule"
 msgstr "ê·?ì¹? ì¶?ê°?"
 
-#: ../filter/rule-editor.c:463
+#: ../filter/rule-editor.c:462
 msgid "Edit Rule"
 msgstr "ê·?ì¹? í?¸ì§?"
 
-#: ../filter/rule-editor.c:809
+#: ../filter/rule-editor.c:808
 msgid "Rule name"
 msgstr "ê·?ì¹? ì?´ë¦?"
 
@@ -11827,21 +10524,21 @@ msgstr "ì??ë³¼ë£¨ì?? ë©?ì?¼ ê¸°ë³¸ ì?¤ì ? ì»¨í?¸ë¡¤"
 msgid "Evolution Network configuration control"
 msgstr "ì??ë³¼ë£¨ì?? ë?¤í?¸ì??í?¬ ì?¤ì ? ì»¨í?¸ë¡¤"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:604
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:602
 #: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:378
-#: ../mail/mail-component.c:597 ../mail/mail-component.c:598
-#: ../mail/mail-component.c:767
+#: ../mail/mail-component.c:620 ../mail/mail-component.c:621
+#: ../mail/mail-component.c:793
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
 msgstr "ë©?ì?¼"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
-#: ../mail/em-account-prefs.c:495
+#: ../mail/em-account-prefs.c:490
 msgid "Mail Accounts"
 msgstr "ë©?ì?¼ ê³?ì ?"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:15
-#: ../mail/mail-config.glade.h:104
+#: ../mail/mail-config.glade.h:108
 msgid "Mail Preferences"
 msgstr "ë©?ì?¼ ê¸°ë³¸ ì?¤ì ?"
 
@@ -11850,16 +10547,113 @@ msgid "Network Preferences"
 msgstr "ë?¤í?¸ì??í?¬ ê¸°ë³¸ ì?¤ì ?"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:17
-#: ../plugins/pst-import/pst-importer.c:300
+#: ../plugins/pst-import/pst-importer.c:297
 msgid "_Mail"
 msgstr "ë©?ì?¼(_M)"
 
-#: ../mail/em-account-editor.c:386
+#: ../mail/e-attachment-handler-mail.c:133 ../mail/em-folder-view.c:1331
+#: ../mail/em-popup.c:501 ../ui/evolution-mail-message.xml.h:105
+msgid "_Forward"
+msgstr "ì ?ë?¬(_F)"
+
+#: ../mail/e-attachment-handler-mail.c:147 ../mail/em-folder-view.c:1329
+#: ../ui/evolution-mail-message.xml.h:123
+msgid "_Reply to Sender"
+msgstr "ë³´ë?¸ ì?¬ë??ì??ê²? í??ì? (_R)"
+
+#. Translators: This is only for multiple messages.
+#: ../mail/e-attachment-handler-mail.c:334
+#, c-format
+msgid "%d attached messages"
+msgstr "ì²¨ë¶?í?? ë©?ì??ì§? %dê°?"
+
+#: ../mail/e-mail-attachment-bar.c:122 ../mail/em-format-html-display.c:1642
+#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:147
+msgid "Attachment"
+msgid_plural "Attachments"
+msgstr[0] "ì²¨ë¶?"
+
+#: ../mail/e-mail-attachment-bar.c:615
+#: ../widgets/misc/e-attachment-paned.c:607
+msgid "Icon View"
+msgstr "ì??ì?´ì½? ë³´ê¸°"
+
+#: ../mail/e-mail-attachment-bar.c:616
+#: ../widgets/misc/e-attachment-paned.c:608
+msgid "List View"
+msgstr "ëª©ë¡? ë³´ê¸°"
+
+#: ../mail/e-mail-search-bar.c:76
+#, c-format
+msgid "Matches: %d"
+msgstr "ì?¼ì¹?: %d"
+
+#: ../mail/e-mail-search-bar.c:520
+msgid "Close the find bar"
+msgstr "ì?´ ì°¾ê¸° ëª¨ì??ì?? ë?«ì?µë??ë?¤"
+
+#: ../mail/e-mail-search-bar.c:528
+msgid "Fin_d:"
+msgstr "ì°¾ê¸°(_D):"
+
+#: ../mail/e-mail-search-bar.c:540
+msgid "Clear the search"
+msgstr "ê²?ì?? ê²°ê³¼ ì§?ì?°ê¸°"
+
+#: ../mail/e-mail-search-bar.c:559
+msgid "_Previous"
+msgstr "ì?´ì ?(_P)"
+
+#: ../mail/e-mail-search-bar.c:565
+msgid "Find the previous occurrence of the phrase"
+msgstr "ì?´ì ?ì?? ì??ë?? í?´ë?¹ ë¬¸êµ¬ë¥¼ ì°¾ì?µë??ë?¤"
+
+#: ../mail/e-mail-search-bar.c:573
+msgid "_Next"
+msgstr "ë?¤ì??(_N)"
+
+#: ../mail/e-mail-search-bar.c:579
+msgid "Find the next occurrence of the phrase"
+msgstr "ë?¤ì??ì?? ì??ë?? í?´ë?¹ ë¬¸êµ¬ë¥¼ ì°¾ì?µë??ë?¤"
+
+#: ../mail/e-mail-search-bar.c:587
+msgid "Mat_ch case"
+msgstr "ë??ì??ë¬¸ì?? êµ¬ë³?(_C)"
+
+#: ../mail/e-mail-search-bar.c:615
+msgid "Reached bottom of page, continued from top"
+msgstr "í??ì?´ì§? ë§¨ ì??ë??ì?? ë??ì°©í??ì?µë??ë?¤. ë§¨ ì??ë¶?í?° ê³?ì??í?©ë??ë?¤"
+
+#: ../mail/e-mail-search-bar.c:637
+msgid "Reached top of page, continued from bottom"
+msgstr "í??ì?´ì§? ë§¨ ì??ì?? ë??ì°©í??ì?µë??ë?¤. ë§¨ ì??ë??ë¶?í?° ê³?ì??í?©ë??ë?¤"
+
+#. Translators: This string is a "Use secure connection" option for
+#. the Mailer. It will not use an encrypted connection.
+#: ../mail/em-account-editor.c:309
+msgid "No encryption"
+msgstr "ì??í?¸í?? ì??ì??"
+
+#. Translators: This string is a "Use secure connection" option for
+#. the Mailer. TLS (Transport Layer Security) is commonly known by
+#. this abbreviation.
+#: ../mail/em-account-editor.c:313
+msgid "TLS encryption"
+msgstr "TLS ì??í?¸í??"
+
+#. Translators: This string is a "Use secure connection" option for
+#. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
+#. abbreviation.
+#: ../mail/em-account-editor.c:317
+msgid "SSL encryption"
+msgstr "SSL ì??í?¸í??"
+
+#: ../mail/em-account-editor.c:408
 #, c-format
 msgid "%s License Agreement"
 msgstr "%s ì?¬ì?© ì?½ê´?"
 
-#: ../mail/em-account-editor.c:393
+#: ../mail/em-account-editor.c:415
 #, c-format
 msgid ""
 "\n"
@@ -11871,109 +10665,113 @@ msgstr ""
 "ì??ë??ì?? ì??ë?? %sì?? ì?¬ì?© ì?½ê´?ì?? ì?? ì?½ì?´ ë³´ì??ê³ \n"
 "ë??ì??í??ì?¤ ê²½ì?° ì²´í?¬ ë?¨ì¶?ì?? ì²´í?¬í??ì?ì??ì?¤.\n"
 
-#: ../mail/em-account-editor.c:465 ../mail/em-filter-folder-element.c:258
+#: ../mail/em-account-editor.c:487 ../mail/em-filter-folder-element.c:258
 #: ../mail/em-vfolder-rule.c:513
 msgid "Select Folder"
 msgstr "í?´ë?? ì? í??"
 
-#: ../mail/em-account-editor.c:589 ../mail/em-account-editor.c:634
-#: ../mail/em-account-editor.c:701 ../widgets/misc/e-signature-combo-box.c:102
-msgid "Autogenerated"
-msgstr "ì??ë??ì?¼ë¡? ë§?ë?¤ê¸°"
+#: ../mail/em-account-editor.c:797
+msgid "Never"
+msgstr "ì?¬ì?© ì?? í?¨"
+
+#: ../mail/em-account-editor.c:798
+msgid "Always"
+msgstr "í?ì??"
 
-#: ../mail/em-account-editor.c:761
+#: ../mail/em-account-editor.c:799
 msgid "Ask for each message"
 msgstr "ë©?ì??ì§?ë§?ë?¤ ë¬¼ì?´ë³´ê¸°"
 
-#: ../mail/em-account-editor.c:1809 ../mail/mail-config.glade.h:95
+#: ../mail/em-account-editor.c:1877 ../mail/mail-config.glade.h:100
 msgid "Identity"
 msgstr "ì? ì?? ì ?ë³´"
 
-#: ../mail/em-account-editor.c:1858 ../mail/mail-config.glade.h:125
+#: ../mail/em-account-editor.c:1928 ../mail/mail-config.glade.h:127
 msgid "Receiving Email"
 msgstr "ë©?ì?¼ ë°?ê¸°"
 
 # FIXME - hard to translate UI + string based on English grammar
-#: ../mail/em-account-editor.c:2130
+#: ../mail/em-account-editor.c:2200
 msgid "Check for _new messages every"
 msgstr "ì?? ë©?ì?¼ í??ì?¸(_N), ë§¤"
 
-#: ../mail/em-account-editor.c:2138
+#: ../mail/em-account-editor.c:2208
 msgid "minu_tes"
 msgstr "ë¶?(_T)"
 
-#: ../mail/em-account-editor.c:2326 ../mail/mail-config.glade.h:139
+#: ../mail/em-account-editor.c:2398 ../mail/mail-config.glade.h:138
 msgid "Sending Email"
 msgstr "ë©?ì?¼ ë³´ë?´ê¸°"
 
-#: ../mail/em-account-editor.c:2385 ../mail/mail-config.glade.h:67
+#: ../mail/em-account-editor.c:2457 ../mail/mail-config.glade.h:73
 msgid "Defaults"
 msgstr "ê¸°ë³¸ê°?"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2451 ../mail/mail-config.glade.h:132
-#: ../plugins/exchange-operations/exchange-account-setup.c:332
+#: ../mail/em-account-editor.c:2523 ../mail/mail-config.glade.h:133
+#: ../plugins/exchange-operations/exchange-account-setup.c:329
 msgid "Security"
 msgstr "ë³´ì??"
 
+#. Most sections for this is auto-generated from the camel config
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2488 ../mail/em-account-editor.c:2579
+#: ../mail/em-account-editor.c:2560 ../mail/em-account-editor.c:2655
 msgid "Receiving Options"
 msgstr "ë°?ê¸° ì?µì??"
 
-#: ../mail/em-account-editor.c:2489 ../mail/em-account-editor.c:2580
+#: ../mail/em-account-editor.c:2561 ../mail/em-account-editor.c:2656
 msgid "Checking for New Messages"
 msgstr "ì?? ë©?ì?¼ í??ì?¸"
 
-#: ../mail/em-account-editor.c:2931 ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:3123 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "ê³?ì ? í?¸ì§?ê¸°"
 
-#: ../mail/em-account-editor.c:2931 ../mail/mail-config.glade.h:84
+#: ../mail/em-account-editor.c:3123 ../mail/mail-config.glade.h:89
 msgid "Evolution Account Assistant"
 msgstr "ì??ë³¼ë£¨ì?? ê³?ì ? ë??ì?°ë¯¸"
 
 #. translators: default account indicator
-#: ../mail/em-account-prefs.c:429
+#: ../mail/em-account-prefs.c:426
 msgid "[Default]"
 msgstr "[ê¸°ë³¸ê°?]"
 
-#: ../mail/em-account-prefs.c:488
+#: ../mail/em-account-prefs.c:483
 msgid "Account name"
 msgstr "ê³?ì ? ì?´ë¦?"
 
-#: ../mail/em-account-prefs.c:490
+#: ../mail/em-account-prefs.c:485
 msgid "Protocol"
 msgstr "í??ë¡?í? ì½?"
 
-#: ../mail/em-composer-prefs.c:303 ../mail/em-composer-prefs.c:438
-#: ../mail/mail-config.c:1190 ../mail/mail-signature-editor.c:478
+#: ../mail/em-composer-prefs.c:318 ../mail/em-composer-prefs.c:452
+#: ../mail/mail-config.c:1160 ../mail/mail-signature-editor.c:481
 msgid "Unnamed"
 msgstr "ì?´ë¦?ì??ì??"
 
-#: ../mail/em-composer-prefs.c:970
+#: ../mail/em-composer-prefs.c:961
 msgid "Language(s)"
 msgstr "ì?¸ì?´"
 
-#: ../mail/em-composer-prefs.c:1019
+#: ../mail/em-composer-prefs.c:994
 msgid "Add signature script"
 msgstr "ì??ëª? ì?¤í?¬ë¦½í?¸ ì¶?ê°?"
 
-#: ../mail/em-composer-prefs.c:1061
+#: ../mail/em-composer-prefs.c:1036
 msgid "Signature(s)"
 msgstr "ì??ëª?"
 
 # ë²?ì?ì?? ì ?í?©í??ì§? ì??ë?¤.
-#: ../mail/em-composer-utils.c:1150 ../mail/em-format-quote.c:416
+#: ../mail/em-composer-utils.c:1132 ../mail/em-format-quote.c:415
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Forwarded Message --------"
 
-#: ../mail/em-composer-utils.c:1602
+#: ../mail/em-composer-utils.c:1585
 msgid ""
 "No destination address provided, forward of the message has been cancelled."
 msgstr "ë??ì?? ì£¼ì??ë¥¼ ì??ë ¥í??ì§? ì??ì??ì?¼ë¯?ë¡? ë©?ì??ì§? ì ?ë?¬ì?? ì·¨ì??í?©ë??ë?¤."
 
-#: ../mail/em-composer-utils.c:1608
+#: ../mail/em-composer-utils.c:1591
 msgid "No account found to use, forward of the message has been cancelled."
 msgstr "ì?¬ì?©í?  ê³?ì ?ì?´ ì??ì?¼ë¯?ë¡? ë©?ì??ì§? ì ?ë?¬ì?? ì·¨ì??í?©ë??ë?¤."
 
@@ -11997,7 +10795,7 @@ msgstr ""
 msgid "-----Original Message-----"
 msgstr "-----Original Message-----"
 
-#: ../mail/em-filter-editor.c:156
+#: ../mail/em-filter-editor.c:172
 msgid "_Filter Rules"
 msgstr "í??í?° ê·?ì¹?(_F)"
 
@@ -12014,18 +10812,10 @@ msgstr "ì?? ì§?ì ?"
 msgid "Assign Score"
 msgstr "ì ?ì?? ì§?ì ?"
 
-#: ../mail/em-filter-i18n.h:6
-msgid "BCC"
-msgstr "ì?¨ê¸´ ì°¸ì¡°"
-
 #: ../mail/em-filter-i18n.h:7
 msgid "Beep"
 msgstr "ì?? ì??ë¦¬"
 
-#: ../mail/em-filter-i18n.h:8
-msgid "CC"
-msgstr "ì°¸ì¡°"
-
 # FIXME - hard to translate UI + string based on English grammar
 #: ../mail/em-filter-i18n.h:9
 msgid "Completed On"
@@ -12044,7 +10834,7 @@ msgid "Date sent"
 msgstr "ë³´ë?¸ ë? ì§?"
 
 #: ../mail/em-filter-i18n.h:14
-#: ../plugins/groupwise-features/share-folder.c:768
+#: ../plugins/groupwise-features/share-folder.c:765
 #: ../ui/evolution-addressbook.xml.h:15 ../ui/evolution-calendar.xml.h:5
 #: ../ui/evolution-mail-message.xml.h:25 ../ui/evolution-memos.xml.h:6
 #: ../ui/evolution-tasks.xml.h:6
@@ -12102,239 +10892,247 @@ msgstr "í??í??"
 msgid "Follow Up"
 msgstr "ì¶?ê°? ì??ì??"
 
-#: ../mail/em-filter-i18n.h:29 ../mail/em-migrate.c:1056
+#: ../mail/em-filter-i18n.h:29
+msgid "Forward to"
+msgstr "ì ?ë?¬"
+
+#: ../mail/em-filter-i18n.h:30 ../mail/em-migrate.c:958
 msgid "Important"
 msgstr "ì¤?ì??"
 
 # FIXME - hard to translate UI + string based on English grammar
-#: ../mail/em-filter-i18n.h:31
+#: ../mail/em-filter-i18n.h:32
 msgid "is after"
 msgstr "ë?¤ ë? ì§?"
 
 # FIXME - hard to translate UI + string based on English grammar
-#: ../mail/em-filter-i18n.h:32
+#: ../mail/em-filter-i18n.h:33
 msgid "is before"
 msgstr "ì?? ë? ì§?"
 
 # FIXME - hard to translate UI + string based on English grammar
-#: ../mail/em-filter-i18n.h:33
+#: ../mail/em-filter-i18n.h:34
 msgid "is Flagged"
 msgstr "í??ë??ê·¸ ì§?ì ?"
 
 # FIXME - hard to translate UI + string based on English grammar
-#: ../mail/em-filter-i18n.h:37
+#: ../mail/em-filter-i18n.h:38
 msgid "is not Flagged"
 msgstr "í??ë??ê·¸ ì§?ì ? ì??ë??"
 
 # FIXME - hard to translate UI + string based on English grammar
-#: ../mail/em-filter-i18n.h:38
+#: ../mail/em-filter-i18n.h:39
 msgid "is not set"
 msgstr "ì?¤ì ? ì??ë??"
 
 # FIXME - hard to translate UI + string based on English grammar
-#: ../mail/em-filter-i18n.h:39
+#: ../mail/em-filter-i18n.h:40
 msgid "is set"
 msgstr "ì?¤ì ?"
 
-#: ../mail/em-filter-i18n.h:40 ../mail/mail-config.glade.h:98
+#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.glade.h:102
 #: ../ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "ì ?í?¬ë©?ì?¼"
 
-#: ../mail/em-filter-i18n.h:41
+#: ../mail/em-filter-i18n.h:42
 msgid "Junk Test"
 msgstr "ì ?í?¬ë©?ì?¼ í??ì?¤í?¸"
 
-#: ../mail/em-filter-i18n.h:42 ../widgets/misc/e-expander.c:190
+#: ../mail/em-filter-i18n.h:43
 msgid "Label"
 msgstr "ë ?ì?´ë¸?"
 
-#: ../mail/em-filter-i18n.h:43
+#: ../mail/em-filter-i18n.h:44
 msgid "Mailing list"
 msgstr "ë©?ì?¼ë§? ë¦¬ì?¤í?¸"
 
-#: ../mail/em-filter-i18n.h:44
+#: ../mail/em-filter-i18n.h:45
 msgid "Match All"
 msgstr "ëª¨ë??"
 
-#: ../mail/em-filter-i18n.h:45
+#: ../mail/em-filter-i18n.h:46
 msgid "Message Body"
 msgstr "ë©?ì??ì§? ë³¸ë¬¸"
 
-#: ../mail/em-filter-i18n.h:46
+#: ../mail/em-filter-i18n.h:47
 msgid "Message Header"
 msgstr "ë©?ì??ì§? ë¨¸ë¦¬ë§?"
 
-#: ../mail/em-filter-i18n.h:47
+#: ../mail/em-filter-i18n.h:48
 msgid "Message is Junk"
 msgstr "ë©?ì??ì§?ê°? ì ?í?¬ë©?ì?¼"
 
-#: ../mail/em-filter-i18n.h:48
+#: ../mail/em-filter-i18n.h:49
 msgid "Message is not Junk"
 msgstr "ë©?ì??ì§?ê°? ì ?í?¬ë©?ì?¼ ì??ë??"
 
-#: ../mail/em-filter-i18n.h:49
+#: ../mail/em-filter-i18n.h:50
+msgid "Message Location"
+msgstr "ë©?ì??ì§? ì??ì¹?"
+
+#: ../mail/em-filter-i18n.h:51
 msgid "Move to Folder"
 msgstr "í?´ë??ë¡? ì?´ë??"
 
-#: ../mail/em-filter-i18n.h:50
+#: ../mail/em-filter-i18n.h:52
 msgid "Pipe to Program"
 msgstr "í??ë¡?ê·¸ë?¨ì?? í??ì?´í?? ì??ë ¥"
 
-#: ../mail/em-filter-i18n.h:51
+#: ../mail/em-filter-i18n.h:53
 msgid "Play Sound"
 msgstr "ì?¬ì?´ë?? ì?¬ì??"
 
 #. Translators: "Read" as in "has been read" (message-tag-followup.c)
-#: ../mail/em-filter-i18n.h:52 ../mail/message-tag-followup.c:62
+#: ../mail/em-filter-i18n.h:54 ../mail/message-tag-followup.c:61
 msgid "Read"
 msgstr "ì?½ì??"
 
-#: ../mail/em-filter-i18n.h:53 ../mail/message-list.etspec.h:12
+#: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:12
 msgid "Recipients"
 msgstr "ë°?ë?? ì?¬ë??"
 
-#: ../mail/em-filter-i18n.h:54
+#: ../mail/em-filter-i18n.h:56
 msgid "Regex Match"
 msgstr "ì ?ê·?ì??"
 
-#: ../mail/em-filter-i18n.h:55
+#: ../mail/em-filter-i18n.h:57
 msgid "Replied to"
 msgstr "í??ì? "
 
 # FIXME - hard to translate UI + string based on English grammar
-#: ../mail/em-filter-i18n.h:56
+#: ../mail/em-filter-i18n.h:58
 msgid "returns"
 msgstr "ë¦¬í?´"
 
 # FIXME - hard to translate UI + string based on English grammar
-#: ../mail/em-filter-i18n.h:57
+#: ../mail/em-filter-i18n.h:59
 msgid "returns greater than"
 msgstr "ë?? í?° ê°? ë¦¬í?´"
 
 # FIXME - hard to translate UI + string based on English grammar
-#: ../mail/em-filter-i18n.h:58
+#: ../mail/em-filter-i18n.h:60
 msgid "returns less than"
 msgstr "ë?? ì??ì?? ê°? ë¦¬í?´"
 
-#: ../mail/em-filter-i18n.h:59
+#: ../mail/em-filter-i18n.h:61
 msgid "Run Program"
 msgstr "í??ë¡?ê·¸ë?¨ ì?¤í??"
 
-#: ../mail/em-filter-i18n.h:60 ../mail/message-list.etspec.h:13
+#: ../mail/em-filter-i18n.h:62 ../mail/message-list.etspec.h:13
 msgid "Score"
 msgstr "ì ?ì??"
 
-#: ../mail/em-filter-i18n.h:61 ../mail/message-list.etspec.h:14
+#: ../mail/em-filter-i18n.h:63 ../mail/message-list.etspec.h:14
 msgid "Sender"
 msgstr "ë³´ë?¸ ì?¬ë??"
 
-#: ../mail/em-filter-i18n.h:62
+#: ../mail/em-filter-i18n.h:64
 msgid "Sender or Recipients"
 msgstr "ë³´ë?¸ ì?¬ë?? í?¹ì?? ë°?ë?? ì?¬ë??"
 
-#: ../mail/em-filter-i18n.h:63
+#: ../mail/em-filter-i18n.h:65
 msgid "Set Label"
 msgstr "ë ?ì?´ë¸? ì?¤ì ?"
 
-#: ../mail/em-filter-i18n.h:64
+#: ../mail/em-filter-i18n.h:66
 msgid "Set Status"
 msgstr "ì??í?? ì?¤ì ?"
 
-#: ../mail/em-filter-i18n.h:65
+#: ../mail/em-filter-i18n.h:67
 msgid "Size (kB)"
 msgstr "í?¬ê¸° (kB)"
 
 # FIXME - hard to translate UI + string based on English grammar
-#: ../mail/em-filter-i18n.h:66
+#: ../mail/em-filter-i18n.h:68
 msgid "sounds like"
 msgstr "ë¹?ì?·í?? ì??ë¦¬"
 
-#: ../mail/em-filter-i18n.h:67
+#: ../mail/em-filter-i18n.h:69
 msgid "Source Account"
 msgstr "ë©?ì?¼ ì?¨ ê³?ì ?"
 
-#: ../mail/em-filter-i18n.h:68
+#: ../mail/em-filter-i18n.h:70
 msgid "Specific header"
 msgstr "í?¹ì ? í?¤ë??"
 
 # FIXME - hard to translate UI + string based on English grammar
-#: ../mail/em-filter-i18n.h:69
+#: ../mail/em-filter-i18n.h:71
 msgid "starts with"
 msgstr "ì??ì??í?¨"
 
-#: ../mail/em-filter-i18n.h:71
+#: ../mail/em-filter-i18n.h:73
 msgid "Stop Processing"
 msgstr "ì²?ë¦¬ ì¤?ì§?"
 
-#: ../mail/em-filter-i18n.h:72 ../mail/em-format-quote.c:342
-#: ../mail/em-format.c:890 ../mail/em-mailer-prefs.c:80
-#: ../mail/message-list.etspec.h:18 ../mail/message-tag-followup.c:311
+#: ../mail/em-filter-i18n.h:74 ../mail/em-format-quote.c:341
+#: ../mail/em-format.c:928 ../mail/em-mailer-prefs.c:81
+#: ../mail/message-list.etspec.h:18 ../mail/message-tag-followup.c:300
 #: ../plugins/groupwise-features/properties.glade.h:7
-#: ../smime/lib/e-cert.c:1115
+#: ../smime/lib/e-cert.c:1112
 msgid "Subject"
 msgstr "ì ?ëª©"
 
-#: ../mail/em-filter-i18n.h:73
+#: ../mail/em-filter-i18n.h:75
 msgid "Unset Status"
 msgstr "ì??í?? ì?¤ì ? ì??ì? ê¸°"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:522
+#: ../mail/em-filter-rule.c:521
 msgid "Then"
 msgstr "ê·¸ë?¬ë©´"
 
-#: ../mail/em-filter-rule.c:550
+#: ../mail/em-filter-rule.c:549
 msgid "Add Ac_tion"
 msgstr "ë??ì?? ì¶?ê°?(_T)"
 
-#: ../mail/em-folder-browser.c:193
+#: ../mail/em-folder-browser.c:194
 msgid "C_reate Search Folder From Search..."
-msgstr "ì°¾ì?? ê²°ê³¼ë¡? ì°¾ê¸° í?´ë?? ë§?ë?¤ê¸°(_R)..."
+msgstr "ê²?ì??í?? ê²°ê³¼ë¡? ê²?ì?? í?´ë?? ë§?ë?¤ê¸°(_R)..."
 
-#: ../mail/em-folder-browser.c:218
+#: ../mail/em-folder-browser.c:219
 msgid "All Messages"
 msgstr "ëª¨ë?  ë©?ì??ì§?"
 
-#: ../mail/em-folder-browser.c:219
+#: ../mail/em-folder-browser.c:220
 msgid "Unread Messages"
 msgstr "ì?½ì§? ì??ì?? ë©?ì??ì§?"
 
-#: ../mail/em-folder-browser.c:221
+#: ../mail/em-folder-browser.c:222
 msgid "No Label"
 msgstr "ë ?ì?´ë¸? ì??ì??"
 
-#: ../mail/em-folder-browser.c:228
+#: ../mail/em-folder-browser.c:229
 msgid "Read Messages"
 msgstr "ì?½ì?? ë©?ì??ì§?"
 
-#: ../mail/em-folder-browser.c:229
+#: ../mail/em-folder-browser.c:230
 msgid "Recent Messages"
 msgstr "ìµ?ê·¼ ë©?ì??ì§?"
 
-#: ../mail/em-folder-browser.c:230
+#: ../mail/em-folder-browser.c:231
 msgid "Last 5 Days' Messages"
 msgstr "ìµ?ê·¼ 5ì?¼ê°? ë©?ì??ì§?"
 
-#: ../mail/em-folder-browser.c:231
+#: ../mail/em-folder-browser.c:232
 msgid "Messages with Attachments"
 msgstr "ì²¨ë¶?ê°? ì??ë?? ë©?ì??ì§?"
 
-#: ../mail/em-folder-browser.c:232
+#: ../mail/em-folder-browser.c:233
 msgid "Important Messages"
 msgstr "ì¤?ì??í?? ë©?ì??ì§?"
 
-#: ../mail/em-folder-browser.c:233
+#: ../mail/em-folder-browser.c:234
 msgid "Messages Not Junk"
 msgstr "ì ?í?¬ë©?ì?¼ ì??ë?? ë©?ì??ì§?"
 
-#: ../mail/em-folder-browser.c:1188
+#: ../mail/em-folder-browser.c:1194
 msgid "Account Search"
-msgstr "ê³?ì ? ì°¾ê¸°"
+msgstr "ê³?ì ? ê²?ì??"
 
-#: ../mail/em-folder-browser.c:1241
+#: ../mail/em-folder-browser.c:1256
 msgid "All Account Search"
-msgstr "ëª¨ë?  ê³?ì ? ì°¾ê¸°"
+msgstr "ëª¨ë?  ê³?ì ? ê²?ì??"
 
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
 #: ../mail/em-folder-properties.c:174
@@ -12360,11 +11158,11 @@ msgid "Quota usage"
 msgstr "ì?©ë?? ì ?í?? ì?¬ì?©ë??"
 
 #. translators: standard local mailbox names
-#: ../mail/em-folder-properties.c:359 ../mail/em-folder-tree-model.c:509
-#: ../mail/em-folder-tree.c:2597 ../mail/mail-component.c:164
-#: ../mail/mail-component.c:585
-#: ../plugins/exchange-operations/exchange-delegates-user.c:78
-#: ../plugins/exchange-operations/exchange-folder.c:594
+#: ../mail/em-folder-properties.c:359 ../mail/em-folder-tree-model.c:517
+#: ../mail/em-folder-tree.c:2602 ../mail/mail-component.c:168
+#: ../mail/mail-component.c:608
+#: ../plugins/exchange-operations/exchange-delegates-user.c:75
+#: ../plugins/exchange-operations/exchange-folder.c:593
 msgid "Inbox"
 msgstr "ë°?ì?? í?¸ì§?í?¨"
 
@@ -12377,370 +11175,339 @@ msgstr "í?´ë?? ì??ì?±"
 msgid "<click here to select a folder>"
 msgstr "<í?´ë??ë¥¼ ê³ ë¥¼ë ¤ë©´ ì?¬ê¸°ë¥¼ ë??ë¥´ì?ì??ì?¤>"
 
-#: ../mail/em-folder-selector.c:254
+#: ../mail/em-folder-selector.c:249
 msgid "C_reate"
 msgstr "ë§?ë?¤ê¸°(_R)"
 
-#: ../mail/em-folder-selector.c:258
+#: ../mail/em-folder-selector.c:253
 msgid "Folder _name:"
 msgstr "í?´ë?? ì?´ë¦?(_N):"
 
 #. load store to mail component
-#: ../mail/em-folder-tree-model.c:204 ../mail/em-folder-tree-model.c:206
-#: ../mail/mail-vfolder.c:980 ../mail/mail-vfolder.c:1047
+#: ../mail/em-folder-tree-model.c:195 ../mail/em-folder-tree-model.c:197
+#: ../mail/mail-vfolder.c:960 ../mail/mail-vfolder.c:1028
 msgid "Search Folders"
-msgstr "ì°¾ê¸° í?´ë??"
+msgstr "ê²?ì?? í?´ë??"
 
 # VFolderì??ì?? ë§?ë?? ê²? ì??ë¬´ê²?ë?? ì??ì?? ê²½ì?° ë§?ì§?ë§? fallback
 #. UNMATCHED is always last
-#: ../mail/em-folder-tree-model.c:210 ../mail/em-folder-tree-model.c:212
+#: ../mail/em-folder-tree-model.c:201 ../mail/em-folder-tree-model.c:203
 msgid "UNMATCHED"
 msgstr "í?´ë?¹ ì??ì??"
 
-#: ../mail/em-folder-tree-model.c:504 ../mail/mail-component.c:165
+#: ../mail/em-folder-tree-model.c:510 ../mail/mail-component.c:169
 msgid "Drafts"
 msgstr "ì??ì?? ë³´ê´?í?¨"
 
-#: ../mail/em-folder-tree-model.c:506 ../mail/mail-component.c:168
+#: ../mail/em-folder-tree-model.c:513 ../mail/mail-component.c:172
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
 msgid "Templates"
 msgstr "ì??ì??"
 
-#: ../mail/em-folder-tree-model.c:512 ../mail/mail-component.c:166
+#: ../mail/em-folder-tree-model.c:520 ../mail/mail-component.c:170
 msgid "Outbox"
 msgstr "ë³´ë?¼ í?¸ì§?í?¨"
 
-#: ../mail/em-folder-tree-model.c:514 ../mail/mail-component.c:167
+#: ../mail/em-folder-tree-model.c:522 ../mail/mail-component.c:171
 msgid "Sent"
 msgstr "ë³´ë?¸ í?¸ì§?í?¨"
 
-#: ../mail/em-folder-tree-model.c:536 ../mail/em-folder-tree-model.c:843
+#: ../mail/em-folder-tree-model.c:580 ../mail/em-folder-tree-model.c:889
 msgid "Loading..."
 msgstr "ì?½ì?´ë?¤ì?´ë?? ì¤?..."
 
 #. Translators: This is the string used for displaying the
-#. * folder names in folder trees. "%s" will be replaced by
-#. * the folder's name and "%u" will be replaced with the
-#. * number of unread messages in the folder.
+#. * folder names in folder trees. The first "%s" will be
+#. * replaced by the folder's name and "%u" will be replaced
+#. * with the number of unread messages in the folder. The
+#. * second %s will be replaced with a "+" letter for collapsed
+#. * folders with unread messages in some subfolder too,
+#. * or with an empty string for other cases.
 #. *
-#. * Most languages should translate this as "%s (%u)". The
+#. * Most languages should translate this as "%s (%u%s)". The
 #. * languages that use localized digits (like Persian) may
 #. * need to replace "%u" with "%Iu". Right-to-left languages
 #. * (like Arabic and Hebrew) may need to add bidirectional
 #. * formatting codes to take care of the cases the folder
 #. * name appears in either direction.
-#. *
-#. * Do not translate the "folder-display|" part. Remove it
-#. * from your translation.
 #.
-#: ../mail/em-folder-tree.c:380
+#: ../mail/em-folder-tree.c:318
 #, c-format
 msgctxt "folder-display"
-msgid "%s (%u)"
-msgstr "%s (%u)"
+msgid "%s (%u%s)"
+msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:741
+#: ../mail/em-folder-tree.c:727
 msgid "Mail Folder Tree"
 msgstr "ë©?ì?¼ í?´ë?? í?¸ë¦¬"
 
-#: ../mail/em-folder-tree.c:900
+#: ../mail/em-folder-tree.c:886
 #, c-format
 msgid "Moving folder %s"
 msgstr "%s í?´ë??ë¥¼ ì?®ê¸°ë?? ì¤?"
 
-#: ../mail/em-folder-tree.c:902
+#: ../mail/em-folder-tree.c:888
 #, c-format
 msgid "Copying folder %s"
 msgstr "%s í?´ë??ë¥¼ ë³µì?¬í??ë?? ì¤?"
 
-#: ../mail/em-folder-tree.c:909 ../mail/message-list.c:2014
+#: ../mail/em-folder-tree.c:895 ../mail/message-list.c:2018
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "ë©?ì??ì§?ë¥¼ %s í?´ë??ë¡? ì?®ê¸°ë?? ì¤?ì??ë??ë?¤"
 
-#: ../mail/em-folder-tree.c:911 ../mail/message-list.c:2016
+#: ../mail/em-folder-tree.c:897 ../mail/message-list.c:2020
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "ë©?ì??ì§?ë¥¼ %s í?´ë??ë¡? ë³µì?¬í??ë?? ì¤?ì??ë??ë?¤"
 
-#: ../mail/em-folder-tree.c:926
+#: ../mail/em-folder-tree.c:912
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "ë©?ì??ì§?ë¥¼ ë§¨ ì??ì?? ì ?ì?¥ê³ ì?? ë?£ì?? ì?? ì??ì?µë??ë?¤"
 
-#: ../mail/em-folder-tree.c:1003 ../ui/evolution-mail-message.xml.h:104
+#: ../mail/em-folder-tree.c:989 ../ui/evolution-mail-message.xml.h:100
 msgid "_Copy to Folder"
 msgstr "í?´ë??ë¡? ë³µì?¬(_C)"
 
-#: ../mail/em-folder-tree.c:1004 ../ui/evolution-mail-message.xml.h:117
+#: ../mail/em-folder-tree.c:990 ../ui/evolution-mail-message.xml.h:113
 msgid "_Move to Folder"
 msgstr "í?´ë??ë¡? ì?´ë??(_M)"
 
-#: ../mail/em-folder-tree.c:1718 ../mail/mail-ops.c:1059
+#: ../mail/em-folder-tree.c:992 ../mail/em-folder-utils.c:362
+#: ../mail/em-folder-view.c:1186 ../mail/message-list.c:2110
+msgid "_Move"
+msgstr "ì?´ë??(_M)"
+
+#: ../mail/em-folder-tree.c:994 ../mail/message-list.c:2112
+msgid "Cancel _Drag"
+msgstr "ë??ë??ê·¸ ì·¨ì??(_D)"
+
+#: ../mail/em-folder-tree.c:1702 ../mail/mail-ops.c:1063
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "\"%s\"ì?? í?´ë??ë¥¼ ì°¾ë?? ì¤?"
 
-#: ../mail/em-folder-tree.c:2117
+#: ../mail/em-folder-tree.c:2107
 msgid "Open in _New Window"
 msgstr "ì?? ì°½ì??ì?? ì?´ê¸°(_N)"
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2122
+#: ../mail/em-folder-tree.c:2112
 msgid "_New Folder..."
 msgstr "ì?? í?´ë??(_N)..."
 
-#: ../mail/em-folder-tree.c:2125
+#: ../mail/em-folder-tree.c:2115
 msgid "_Move..."
 msgstr "ì?´ë??(_M)..."
 
-#: ../mail/em-folder-tree.c:2133 ../ui/evolution-mail-list.xml.h:21
+#: ../mail/em-folder-tree.c:2123 ../ui/evolution-mail-list.xml.h:21
 msgid "Re_fresh"
 msgstr "ì??ë¡? ê³ ì¹¨(_F)"
 
-#: ../mail/em-folder-tree.c:2134
+#: ../mail/em-folder-tree.c:2124
 msgid "Fl_ush Outbox"
 msgstr "ë³´ë?¼ í?¸ì§?í?¨ ë¹?ì?°ê¸°(_U)"
 
-#: ../mail/em-folder-tree.c:2140 ../mail/mail.error.xml.h:138
+#: ../mail/em-folder-tree.c:2129 ../mail/mail.error.xml.h:138
 msgid "_Empty Trash"
 msgstr "í?´ì§?í?µ ë¹?ì?°ê¸°(_E)"
 
-#: ../mail/em-folder-tree.c:2243
+#: ../mail/em-folder-tree.c:2232
 msgid "_Unread Search Folder"
-msgstr "ì?½ì§? ì??ì?? ì°¾ê¸° í?´ë??(_U)"
+msgstr "ì?½ì§? ì??ì?? ê²?ì?? í?´ë??(_U)"
 
-#: ../mail/em-folder-utils.c:101
+#: ../mail/em-folder-utils.c:99
 #, c-format
 msgid "Copying `%s' to `%s'"
 msgstr "`%s'ì??ì?? `%s' í?´ë??ë¡? ë³µì?¬í??ë?? ì¤?"
 
-#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1188
-#: ../mail/em-folder-view.c:1203
+#: ../mail/em-folder-utils.c:362 ../mail/em-folder-view.c:1186
+#: ../mail/em-folder-view.c:1201
 #: ../mail/importers/evolution-mbox-importer.c:82
-#: ../plugins/pst-import/pst-importer.c:305
+#: ../plugins/pst-import/pst-importer.c:302
 msgid "Select folder"
 msgstr "í?´ë?? ì? í??"
 
-#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1203
+#: ../mail/em-folder-utils.c:362 ../mail/em-folder-view.c:1201
 msgid "C_opy"
 msgstr "ë³µì?¬(_O)"
 
-#: ../mail/em-folder-utils.c:532
-#: ../plugins/groupwise-features/share-folder-common.c:145
+#: ../mail/em-folder-utils.c:537
+#: ../plugins/groupwise-features/share-folder-common.c:144
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "`%s' í?´ë??ë¥¼ ë§?ë??ë?? ì¤?ì??ë??ë?¤"
 
-#: ../mail/em-folder-utils.c:690
-#: ../plugins/groupwise-features/install-shared.c:169
-#: ../plugins/groupwise-features/share-folder-common.c:387
+#: ../mail/em-folder-utils.c:695
+#: ../plugins/groupwise-features/install-shared.c:168
+#: ../plugins/groupwise-features/share-folder-common.c:385
 msgid "Create folder"
 msgstr "í?´ë??ë¥¼ ë§?ë?ë??ë?¤"
 
-#: ../mail/em-folder-utils.c:690
-#: ../plugins/groupwise-features/install-shared.c:169
-#: ../plugins/groupwise-features/share-folder-common.c:387
+#: ../mail/em-folder-utils.c:695
+#: ../plugins/groupwise-features/install-shared.c:168
+#: ../plugins/groupwise-features/share-folder-common.c:385
 msgid "Specify where to create the folder:"
 msgstr "í?´ë?? ë§?ë?¤ ê³³ì?? ì§?ì ?í??ì?ì??ì?¤:"
 
-#: ../mail/em-folder-view.c:1091 ../mail/mail.error.xml.h:70
+#: ../mail/em-folder-view.c:1089 ../mail/mail.error.xml.h:70
 msgid "Mail Deletion Failed"
 msgstr "ë©?ì?¼ ì?ì ?ê°? ì?¤í?¨í??ì?µë??ë?¤"
 
-#: ../mail/em-folder-view.c:1092 ../mail/mail.error.xml.h:126
+#: ../mail/em-folder-view.c:1090 ../mail/mail.error.xml.h:126
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "ì?´ ë©?ì?¼ì?? ì§?ì?¸ ê¶?í??ì?´ ì??ì?µë??ë?¤."
 
-#: ../mail/em-folder-view.c:1331 ../ui/evolution-mail-message.xml.h:127
-msgid "_Reply to Sender"
-msgstr "ë³´ë?¸ ì?¬ë??ì??ê²? í??ì? (_R)"
-
-#: ../mail/em-folder-view.c:1333 ../mail/em-popup.c:566 ../mail/em-popup.c:577
-#: ../ui/evolution-mail-message.xml.h:109
-msgid "_Forward"
-msgstr "ì ?ë?¬(_F)"
-
 #. EM_POPUP_EDIT was used here. This is changed to EM_POPUP_SELECT_ONE as Edit-as-new-messaeg need not be restricted to Sent-Items folder alone
-#: ../mail/em-folder-view.c:1337 ../ui/evolution-mail-message.xml.h:106
+#: ../mail/em-folder-view.c:1335 ../ui/evolution-mail-message.xml.h:102
 msgid "_Edit as New Message..."
 msgstr "ì?? ë©?ì??ì§?ë¡? í?¸ì§?(_E)..."
 
-#: ../mail/em-folder-view.c:1343
+#: ../mail/em-folder-view.c:1341
 msgid "U_ndelete"
 msgstr "ë??ì?´ë¦¬ê¸°(_N)"
 
-#: ../mail/em-folder-view.c:1344
+#: ../mail/em-folder-view.c:1342
 msgid "_Move to Folder..."
 msgstr "í?´ë??ë¡? ì?´ë??(_M)..."
 
-#: ../mail/em-folder-view.c:1345
+#: ../mail/em-folder-view.c:1343
 msgid "_Copy to Folder..."
 msgstr "í?´ë??ë¡? ë³µì?¬(_C)..."
 
-#: ../mail/em-folder-view.c:1348
+#: ../mail/em-folder-view.c:1346
 msgid "Mar_k as Read"
 msgstr "ì?½ì?? ê²?ì?¼ë¡? í??ì??(_K)"
 
-#: ../mail/em-folder-view.c:1349
+#: ../mail/em-folder-view.c:1347
 msgid "Mark as _Unread"
 msgstr "ì?½ì§? ì??ì?? ê²?ì?¼ë¡? í??ì??(_U)"
 
-#: ../mail/em-folder-view.c:1350
+#: ../mail/em-folder-view.c:1348
 msgid "Mark as _Important"
 msgstr "ì¤?ì??í?? ê²?ì?¼ë¡? í??ì??(_I)"
 
-#: ../mail/em-folder-view.c:1351
+#: ../mail/em-folder-view.c:1349
 msgid "Mark as Un_important"
 msgstr "ì¤?ì??í??ì§? ì??ì?? ê²?ì?¼ë¡? í??ì??(_I)"
 
-#: ../mail/em-folder-view.c:1352
+#: ../mail/em-folder-view.c:1350
 msgid "Mark as _Junk"
 msgstr "ì ?í?¬ë©?ì?¼ë¡? í??ì??(_J)"
 
-#: ../mail/em-folder-view.c:1353
+#: ../mail/em-folder-view.c:1351
 msgid "Mark as _Not Junk"
 msgstr "ì ?í?¬ë©?ì?¼ì?´ ì??ë?? ê²?ì?¼ë¡? í??ì??(_N)"
 
-#: ../mail/em-folder-view.c:1354
+#: ../mail/em-folder-view.c:1352
 msgid "Mark for Follo_w Up..."
 msgstr "ì¶?ê°? ì??ì??ì?¼ë¡? í??ì??(_W)..."
 
-#: ../mail/em-folder-view.c:1356
+#: ../mail/em-folder-view.c:1354
 msgid "_Label"
 msgstr "ë ?ì?´ë¸?(_L)"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../mail/em-folder-view.c:1357 ../widgets/misc/e-dateedit.c:478
+#: ../mail/em-folder-view.c:1355 ../widgets/misc/e-dateedit.c:469
 msgid "_None"
 msgstr "ì??ì??(_N)"
 
-#: ../mail/em-folder-view.c:1360
+#: ../mail/em-folder-view.c:1358
 msgid "_New Label"
 msgstr "ì?? ë ?ì?´ë¸?(_N)"
 
-#: ../mail/em-folder-view.c:1364
+#: ../mail/em-folder-view.c:1362
 msgid "Fla_g Completed"
 msgstr "í??ì?? ì??ë£?(_G)"
 
-#: ../mail/em-folder-view.c:1365
+#: ../mail/em-folder-view.c:1363
 msgid "Cl_ear Flag"
 msgstr "í??ì?? ì§?ì?°ê¸°(_E)"
 
-#: ../mail/em-folder-view.c:1368
+#: ../mail/em-folder-view.c:1366
 msgid "Crea_te Rule From Message"
 msgstr "ë©?ì??ì§?ë¡?ë¶?í?° ê·?ì¹? ë§?ë?¤ê¸°(_T)"
 
 #. Translators: The following strings are used while creating a new search folder, to specify what parameter the search folder would be based on.
-#: ../mail/em-folder-view.c:1370
+#: ../mail/em-folder-view.c:1368
 msgid "Search Folder based on _Subject"
-msgstr "ì ?ëª©ì?? ë?°ë¥¸ ì°¾ê¸° í?´ë??(_S)"
+msgstr "ì ?ëª©ì?? ë?°ë¥¸ ê²?ì?? í?´ë??(_S)"
 
-#: ../mail/em-folder-view.c:1371
+#: ../mail/em-folder-view.c:1369
 msgid "Search Folder based on Se_nder"
-msgstr "ë³´ë?¸ ì?¬ë??ì?? ë?°ë¥¸ ì°¾ê¸° í?´ë??(_N)"
+msgstr "ë³´ë?¸ ì?¬ë??ì?? ë?°ë¥¸ ê²?ì?? í?´ë??(_N)"
 
-#: ../mail/em-folder-view.c:1372
+#: ../mail/em-folder-view.c:1370
 msgid "Search Folder based on _Recipients"
-msgstr "ë°?ë?? ì?¬ë??ì?? ë?°ë¥¸ ì°¾ê¸° í?´ë??(_R)"
+msgstr "ë°?ë?? ì?¬ë??ì?? ë?°ë¥¸ ê²?ì?? í?´ë??(_R)"
 
-#: ../mail/em-folder-view.c:1373
+#: ../mail/em-folder-view.c:1371
 msgid "Search Folder based on Mailing _List"
-msgstr "ë©?ì?¼ë§? ë¦¬ì?¤í?¸ì?? ë??í?? ì°¾ê¸° í?´ë??(_L)"
+msgstr "ë©?ì?¼ë§? ë¦¬ì?¤í?¸ì?? ë??í?? ê²?ì?? í?´ë??(_L)"
 
 #. Translators: The following strings are used while creating a new message filter, to specify what parameter the filter would be based on.
-#: ../mail/em-folder-view.c:1378
+#: ../mail/em-folder-view.c:1376
 msgid "Filter based on Sub_ject"
 msgstr "ì ?ëª©ì?? ë??í?? í??í?°(_J)"
 
-#: ../mail/em-folder-view.c:1379
+#: ../mail/em-folder-view.c:1377
 msgid "Filter based on Sen_der"
 msgstr "ë³´ë?¸ ì?¬ë??ì?? ë??í?? í??í?°(_D)"
 
-#: ../mail/em-folder-view.c:1380
+#: ../mail/em-folder-view.c:1378
 msgid "Filter based on Re_cipients"
 msgstr "ë°?ë?? ì?¬ë??ì?? ë??í?? í??í?°(_C)"
 
-#: ../mail/em-folder-view.c:1381
+#: ../mail/em-folder-view.c:1379
 msgid "Filter based on _Mailing List"
 msgstr "ë©?ì?¼ë§? ë¦¬ì?¤í?¸ì?? ë??í?? í??í?°(_M)"
 
 #. default charset used in mail view
 #. we changed user, thus reset the chosen calendar combo too, because
 #. other user means other calendars subscribed
-#: ../mail/em-folder-view.c:2257 ../mail/em-folder-view.c:2300
-#: ../plugins/google-account-setup/google-source.c:232
-#: ../plugins/google-account-setup/google-source.c:510
-#: ../plugins/google-account-setup/google-source.c:708
+#: ../mail/em-folder-view.c:2232 ../mail/em-folder-view.c:2275
+#: ../plugins/google-account-setup/google-source.c:303
+#: ../plugins/google-account-setup/google-source.c:593
+#: ../plugins/google-account-setup/google-source.c:764
 msgid "Default"
 msgstr "ê¸°ë³¸ê°?"
 
-#: ../mail/em-folder-view.c:2518
+#: ../mail/em-folder-view.c:2493
 msgid "Unable to retrieve message"
 msgstr "ë©?ì??ì§?ë¥¼ ê°?ì ¸ì?¬ ì?? ì??ì?µë??ë?¤"
 
-#: ../mail/em-folder-view.c:2537
-msgid "Retrieving Message..."
-msgstr "ë©?ì??ì§?ë¥¼ ê°?ì ¸ì?¤ë?? ì¤?..."
-
-#: ../mail/em-folder-view.c:2756
-msgid "C_all To..."
-msgstr "í?¸ì¶?í??ê¸°(_A)..."
-
-#: ../mail/em-folder-view.c:2759
+#: ../mail/em-folder-view.c:2696
 msgid "Create _Search Folder"
-msgstr "ì°¾ê¸° í?´ë?? ë§?ë?¤ê¸°(_S)"
+msgstr "ê²?ì?? í?´ë?? ë§?ë?¤ê¸°(_S)"
 
-#: ../mail/em-folder-view.c:2760
+#: ../mail/em-folder-view.c:2697
 msgid "_From this Address"
 msgstr "ì?´ ì£¼ì??ì??ì??(_F)"
 
-#: ../mail/em-folder-view.c:2761
+#: ../mail/em-folder-view.c:2698
 msgid "_To this Address"
 msgstr "ì?´ ì£¼ì??ë¡?(_T)"
 
-#: ../mail/em-folder-view.c:3254
+#: ../mail/em-folder-view.c:3191
 #, c-format
 msgid "Click to mail %s"
 msgstr "ë©?ì?¼ì?? %s ì£¼ì??ë¡? ë³´ë?´ë ¤ë©´ ë??ë¥´ì?ì??ì?¤"
 
-#: ../mail/em-folder-view.c:3266
+#: ../mail/em-folder-view.c:3203
 #, c-format
 msgid "Click to call %s"
 msgstr "%sì??ê²? í?¸ì¶?í??ë ¤ë©´ ë??ë¥´ì?ì??ì?¤"
 
-#: ../mail/em-folder-view.c:3271
+#: ../mail/em-folder-view.c:3208
 msgid "Click to hide/unhide addresses"
 msgstr "ì£¼ì??ë¥¼ ê°?ì¶?ë ¤ë©´/ë³´ì?´ë ¤ë©´ ë??ë¥´ì?ì??ì?¤"
 
-#. message-search popup match count string
-#: ../mail/em-format-html-display.c:474
-#, c-format
-msgid "Matches: %d"
-msgstr "ì?¼ì¹?: %d"
-
-#: ../mail/em-format-html-display.c:618
-msgid "Fin_d:"
-msgstr "ì°¾ê¸°(_D):"
-
-#. gtk_box_pack_start ((GtkBox *)(hbox2), p->search_entry_box, TRUE, TRUE, 5);
-#: ../mail/em-format-html-display.c:642
-msgid "_Previous"
-msgstr "ì?´ì ?(_P)"
-
-#: ../mail/em-format-html-display.c:647
-msgid "_Next"
-msgstr "ë?¤ì??(_N)"
-
-#: ../mail/em-format-html-display.c:652
-msgid "M_atch case"
-msgstr "ë??ì??ë¬¸ì?? êµ¬ë³?(_A)"
-
-#: ../mail/em-format-html-display.c:951 ../mail/em-format-html.c:655
+#: ../mail/em-format-html-display.c:560 ../mail/em-format-html.c:654
 msgid "Unsigned"
 msgstr "ì??ëª? ì??ì??"
 
-#: ../mail/em-format-html-display.c:951
+#: ../mail/em-format-html-display.c:560
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -12748,11 +11515,11 @@ msgstr ""
 "ì?´ ë©?ì??ì§?ì??ë?? ì??ëª?ì?´ ì??ì?µë??ë?¤.  ë©?ì??ì§?ë¥¼ ë³´ë?¸ ì?¬ë??ì?´ í??ì?¤í?? ì§? ë³´ì?¥í?  ì?? ì??ì?µ"
 "ë??ë?¤."
 
-#: ../mail/em-format-html-display.c:952 ../mail/em-format-html.c:656
+#: ../mail/em-format-html-display.c:561 ../mail/em-format-html.c:655
 msgid "Valid signature"
 msgstr "ì?¬ë°?ë¥¸ ì??ëª?"
 
-#: ../mail/em-format-html-display.c:952
+#: ../mail/em-format-html-display.c:561
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -12760,11 +11527,11 @@ msgstr ""
 "ì?´ ë©?ì??ì§?ë?? ì??ëª?ë??ì??ê³  ì??ëª?ì?´ ì?¬ë°?ë¦?ë??ë?¤.  ë©?ì??ì§?ë¥¼ ë³´ë?¸ ì?¬ë??ì?? ê·¸ ì?¬ë??ì?´ ê±°"
 "ì?? í??ì?¤í?©ë??ë?¤."
 
-#: ../mail/em-format-html-display.c:953 ../mail/em-format-html.c:657
+#: ../mail/em-format-html-display.c:562 ../mail/em-format-html.c:656
 msgid "Invalid signature"
 msgstr "ì??ëª»ë?? ì??ëª?"
 
-#: ../mail/em-format-html-display.c:953
+#: ../mail/em-format-html-display.c:562
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -12772,11 +11539,11 @@ msgstr ""
 "ì?´ ë©?ì??ì§?ì?? ì??ëª?ì?? í??ì?¸í?  ì?? ì??ì?µë??ë?¤. ë©?ì?¼ì?´ ì ?ì?¡ì¤?ì?? ë³?ê²½ë??ì??ì?? ì?? ì??ì?µë??"
 "ë?¤."
 
-#: ../mail/em-format-html-display.c:954 ../mail/em-format-html.c:658
+#: ../mail/em-format-html-display.c:563 ../mail/em-format-html.c:657
 msgid "Valid signature, but cannot verify sender"
 msgstr "ì?¬ë°?ë¥¸ ì??ëª?ì?´ì§?ë§?, ë³´ë?¸ ì?¬ë??ì?? í??ì?¸í?  ì?? ì??ì?µë??ë?¤"
 
-#: ../mail/em-format-html-display.c:954
+#: ../mail/em-format-html-display.c:563
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -12784,21 +11551,21 @@ msgstr ""
 "ì?´ ë©?ì??ì§?ë?? ì?¬ë°?ë¥¸ ì??ëª?ì?¼ë¡? ì?¬ì?¸ë??ì??ì?µë??ë?¤. í??ì§?ë§? ë©?ì??ì§?ë¥¼ ë³´ë?¸ ì?¬ë??ì?? í??ì?¸"
 "í?  ì?? ì??ì?µë??ë?¤."
 
-#: ../mail/em-format-html-display.c:955 ../mail/em-format-html.c:659
+#: ../mail/em-format-html-display.c:564 ../mail/em-format-html.c:658
 msgid "Signature exists, but need public key"
 msgstr "ì??ëª?ì?´ ì??ì§?ë§?, ê³µê°?í?¤ê°? í??ì??í?©ë??ë?¤"
 
-#: ../mail/em-format-html-display.c:955
+#: ../mail/em-format-html-display.c:564
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
 msgstr "ì?´ ë©?ì??ì§?ë?? ì??ëª?ë??ì?´ ì??ì§?ë§?, ì??ëª?ì?? í?´ë?¹í??ë?? ê³µê°? í?¤ê°? ì??ì?µë??ë?¤."
 
-#: ../mail/em-format-html-display.c:962 ../mail/em-format-html.c:665
+#: ../mail/em-format-html-display.c:571 ../mail/em-format-html.c:664
 msgid "Unencrypted"
 msgstr "ì??í?¸í?? ì?? ë?¨"
 
-#: ../mail/em-format-html-display.c:962
+#: ../mail/em-format-html-display.c:571
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -12806,11 +11573,11 @@ msgstr ""
 "ì?´ ë©?ì??ì§?ë?? ì??í?¸í??í??ì§? ì??ì??ì?µë??ë?¤.  ì?¸í?°ë?·ì?? í?µí?´ ì ?ë?¬ë??ë?? ë??ì?? ë?¤ë¥¸ ì?¬ë??ì?´ "
 "ì?´ ë©?ì??ì§?ë¥¼ ë´¤ì?? ì?? ì??ì?µë??ë?¤."
 
-#: ../mail/em-format-html-display.c:963 ../mail/em-format-html.c:666
+#: ../mail/em-format-html-display.c:572 ../mail/em-format-html.c:665
 msgid "Encrypted, weak"
 msgstr "ì??í?¸í??ë?¨, ì?½í?¨"
 
-#: ../mail/em-format-html-display.c:963
+#: ../mail/em-format-html-display.c:572
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm. It would be "
 "difficult, but not impossible for an outsider to view the content of this "
@@ -12820,11 +11587,11 @@ msgstr ""
 "ì?¬ë??ì?´ ì?´ ë©?ì??ì§?ì?? ë?´ì?©ì?? ì??ì?? ë?´ë?? ê²? ì?´ë µê¸´ í??ì§?ë§?, í??ì?¤ì ?ì?¸ ì??ê°? ë?´ì?? ë¶?ê°?"
 "ë?¥í??ì§?ë?? ì??ì?µë??ë?¤."
 
-#: ../mail/em-format-html-display.c:964 ../mail/em-format-html.c:667
+#: ../mail/em-format-html-display.c:573 ../mail/em-format-html.c:666
 msgid "Encrypted"
 msgstr "ì??í?¸í??ë?¨"
 
-#: ../mail/em-format-html-display.c:964
+#: ../mail/em-format-html-display.c:573
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -12832,11 +11599,11 @@ msgstr ""
 "ë©?ì??ì§?ê°? ì??í?¸í??ë??ì?´ ì??ì?µë??ë?¤.  ë?¤ë¥¸ ì?¬ë??ì?´ ì?´ ë©?ì??ì§?ì?? ë?´ì?©ì?? ì??ì?? ë?´ê¸°ë?? ì?´"
 "ë µì?µë??ë?¤."
 
-#: ../mail/em-format-html-display.c:965 ../mail/em-format-html.c:668
+#: ../mail/em-format-html-display.c:574 ../mail/em-format-html.c:667
 msgid "Encrypted, strong"
 msgstr "ì??í?¸í??ë?¨, ê°?ë ¥"
 
-#: ../mail/em-format-html-display.c:965
+#: ../mail/em-format-html-display.c:574
 msgid ""
 "This message is encrypted, with a strong encryption algorithm. It would be "
 "very difficult for an outsider to view the content of this message in a "
@@ -12845,87 +11612,60 @@ msgstr ""
 "ë©?ì??ì§?ê°? ì??í?¸í??ë??ì?´ ì??ì§?ë§?, ì?½í?? ì??í?¸í?? ì??ê³ ë¦¬ì¦?ì?¼ë¡? ì??í?¸í??ë??ì??ì?µë??ë?¤.  í??ì?¤"
 "ì ?ì?¸ ì??ê°? ë?´ì?? ë?¤ë¥¸ ì?¬ë??ì?´ ì?´ ë©?ì??ì§?ì?? ë?´ì?©ì?? ì??ì?? ë?´ë?? ê±´ ë§¤ì?° ì?´ë µì?µë??ë?¤."
 
-#: ../mail/em-format-html-display.c:1066 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:675 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "ì?¸ì¦?ì?? ë³´ê¸°(_V)"
 
-#: ../mail/em-format-html-display.c:1081
+#: ../mail/em-format-html-display.c:690
 msgid "This certificate is not viewable"
 msgstr "ì?´ ì?¸ì¦?ì??ë?? ë³¼ ì?? ì??ì?µë??ë?¤"
 
-#: ../mail/em-format-html-display.c:1410
-msgid "Completed on %B %d, %Y, %l:%M %p"
-msgstr "ë§?ì¹¨: %Yë?? %B %eì?¼, %p %l:%M"
+# FIXME - hard to translate UI + string based on English grammar
+#: ../mail/em-format-html-display.c:980
+msgid "Completed on"
+msgstr "ì??ë£? ë? ì§?"
 
-#: ../mail/em-format-html-display.c:1418
+#: ../mail/em-format-html-display.c:988
 msgid "Overdue:"
 msgstr "ë§?ê°? ì§?ë?¨:"
 
-#: ../mail/em-format-html-display.c:1421
-msgid "by %B %d, %Y, %l:%M %p"
-msgstr "%Yë?? %B %eì?¼, %p %l:%Mê¹?ì§?"
+#. To Translators: the "by" is part of the string, like "Follow-up by Tuesday, January 13, 2009"
+#: ../mail/em-format-html-display.c:992
+msgid "by"
+msgstr "ë? ì§?:"
 
 # FIXME - inlineì?? ë??ì?? ë²?ì?ì?? ì°¾ì??ë³´ì??
-#: ../mail/em-format-html-display.c:1499
+#: ../mail/em-format-html-display.c:1071
+#: ../widgets/misc/e-attachment-view.c:357
 msgid "_View Inline"
 msgstr "ì?¸ë?¼ì?¸ì?¼ë¡? ë³´ê¸°(_V)"
 
-#: ../mail/em-format-html-display.c:1500
+#: ../mail/em-format-html-display.c:1072
+#: ../widgets/misc/e-attachment-view.c:350
 msgid "_Hide"
 msgstr "ì?¨ê¸°ê¸°(_H)"
 
-#: ../mail/em-format-html-display.c:1501
+#: ../mail/em-format-html-display.c:1073
 msgid "_Fit to Width"
 msgstr "ë??ë¹?ì?? ë§?ì¶?ê¸°(_F)"
 
-#: ../mail/em-format-html-display.c:1502
+#: ../mail/em-format-html-display.c:1074
 msgid "Show _Original Size"
 msgstr "ì??ë?? í?¬ê¸°ë¡? í??ì??(_O)"
 
-#: ../mail/em-format-html-display.c:2171
-msgid "Save attachment as"
-msgstr "ë?¤ë¥¸ ì?´ë¦?ì?¼ë¡? ì²¨ë¶? ë¬¸ì?? ì ?ì?¥"
-
-#: ../mail/em-format-html-display.c:2175
-msgid "Select folder to save all attachments"
-msgstr "ëª¨ë?  ì²¨ë¶?ë¥¼ ì ?ì?¥í?  í?´ë?? ì? í??..."
-
-#: ../mail/em-format-html-display.c:2226
-msgid "_Save Selected..."
-msgstr "ì? í??í?? ì?¬í? ì ?ì?¥(_S)..."
-
-#. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2293
-#, c-format
-msgid "%d at_tachment"
-msgid_plural "%d at_tachments"
-msgstr[0] "%dê°? ì²¨ë¶?(_T)"
-
-#: ../mail/em-format-html-display.c:2300 ../mail/em-format-html-display.c:2390
-msgid "S_ave"
-msgstr "ì ?ì?¥(_A)"
-
-#: ../mail/em-format-html-display.c:2311
-msgid "S_ave All"
-msgstr "ëª¨ë?? ì ?ì?¥(_A)"
-
-#: ../mail/em-format-html-display.c:2386
-msgid "No Attachment"
-msgstr "ì²¨ë¶? ì??ì??"
-
-#: ../mail/em-format-html-display.c:2533 ../mail/em-format-html-display.c:2572
+#: ../mail/em-format-html-display.c:1575 ../mail/em-format-html-display.c:1614
 msgid "View _Unformatted"
 msgstr "ì??ë³¸ ë³´ê¸°(_U)"
 
-#: ../mail/em-format-html-display.c:2535
+#: ../mail/em-format-html-display.c:1577
 msgid "Hide _Unformatted"
 msgstr "ì??ë³¸ ê°?ì¶?ê¸°(_U)"
 
-#: ../mail/em-format-html-display.c:2592
+#: ../mail/em-format-html-display.c:1634
 msgid "O_pen With"
 msgstr "ë?¤ë¥¸ í??ë¡?ê·¸ë?¨ì?¼ë¡? ì?´ê¸°(_P)"
 
-#: ../mail/em-format-html-display.c:2668
+#: ../mail/em-format-html-display.c:1711
 msgid ""
 "Evolution cannot render this email as it is too large to process. You can "
 "view it unformatted or with an external text editor."
@@ -12938,246 +11678,239 @@ msgstr ""
 msgid "Page %d of %d"
 msgstr "%2$dí??ì?´ì§? ì¤? %1$dí??ì?´ì§?"
 
-#: ../mail/em-format-html.c:506 ../mail/em-format-html.c:515
+#: ../mail/em-format-html.c:505 ../mail/em-format-html.c:514
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "`%s' ê°?ì ¸ì?¤ë?? ì¤?"
 
-#: ../mail/em-format-html.c:930
+#: ../mail/em-format-html.c:929
 msgid "Unknown external-body part."
 msgstr "ì?¸ë¶? ë³¸ë¬¸ ë¶?ë¶?ì?´ ì??ì?µë??ë?¤."
 
-#: ../mail/em-format-html.c:938
+#: ../mail/em-format-html.c:937
 msgid "Malformed external-body part."
 msgstr "ì?¸ë¶? ë³¸ë¬¸ ë¶?ë¶?ì?? í??ì??ì?´ ì??ëª»ë??ì??ì?µë??ë?¤."
 
-#: ../mail/em-format-html.c:968
+#: ../mail/em-format-html.c:967
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "FTP ì?¬ì?´í?¸(%s)ë¥¼ ê°?ë¦¬í?µë??ë?¤"
 
-#: ../mail/em-format-html.c:979
+#: ../mail/em-format-html.c:978
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "ì?¬ì?´í?¸ \"%2$s\"ì?? ë¡?ì»¬ í??ì?¼(%1$s)ì?? ê°?ë¦¬í?µë??ë?¤"
 
-#: ../mail/em-format-html.c:981
+#: ../mail/em-format-html.c:980
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "ë¡?ì»¬ í??ì?¼(%s)ì?? ê°?ë¦¬í?µë??ë?¤"
 
-#: ../mail/em-format-html.c:1002
+#: ../mail/em-format-html.c:1001
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "ì??ê²© ë?°ì?´í?°(%s)ì?? ê°?ë¦¬í?µë??ë?¤"
 
-#: ../mail/em-format-html.c:1013
+#: ../mail/em-format-html.c:1012
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "ì?? ì?? ì??ë?? ì?¸ë¶? ë?°ì?´í?°(\"%s\" í??ì??)ì?? ê°?ë¦¬í?µë??ë?¤"
 
-#: ../mail/em-format-html.c:1241
+#: ../mail/em-format-html.c:1240
 msgid "Formatting message"
 msgstr "ë©?ì??ì§? ë?´ì?©ì?? í??ì??í??ë?? ì¤?ì??ë??ë?¤"
 
-#: ../mail/em-format-html.c:1415
+#: ../mail/em-format-html.c:1414
 msgid "Formatting Message..."
 msgstr "ë©?ì??ì§? ë?´ì?©ì?? í??ì??í??ë?? ì¤?ì??ë??ë?¤..."
 
-#: ../mail/em-format-html.c:1568 ../mail/em-format-html.c:1632
-#: ../mail/em-format-html.c:1654 ../mail/em-format-quote.c:210
-#: ../mail/em-format.c:888 ../mail/em-mailer-prefs.c:78
+#: ../mail/em-format-html.c:1567 ../mail/em-format-html.c:1631
+#: ../mail/em-format-html.c:1652 ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:926 ../mail/em-mailer-prefs.c:79
 msgid "Cc"
 msgstr "ì°¸ì¡°"
 
-#: ../mail/em-format-html.c:1569 ../mail/em-format-html.c:1638
-#: ../mail/em-format-html.c:1657 ../mail/em-format-quote.c:210
-#: ../mail/em-format.c:889 ../mail/em-mailer-prefs.c:79
+#: ../mail/em-format-html.c:1568 ../mail/em-format-html.c:1637
+#: ../mail/em-format-html.c:1655 ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:927 ../mail/em-mailer-prefs.c:80
 msgid "Bcc"
 msgstr "ì?¨ì?? ì°¸ì¡°"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1749 ../mail/em-format-quote.c:353
-#: ../mail/em-mailer-prefs.c:1451
+#: ../mail/em-format-html.c:1747 ../mail/em-format-quote.c:352
+#: ../mail/em-mailer-prefs.c:1435
 msgid "Mailer"
 msgstr "ë©?ì?¼ í??ë¡?ê·¸ë?¨"
 
-#. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1776
-msgid " (%a, %R %Z)"
-msgstr " (%a, %R %Z)"
-
-#. translators: strftime format for local time equivalent in Date header display, without day
-#: ../mail/em-format-html.c:1781
-msgid " (%R %Z)"
-msgstr " (%R %Z)"
-
 #. To translators: This message suggests to the receipients that the sender of the mail is
 #. different from the one listed in From field.
 #.
-#: ../mail/em-format-html.c:1917
+#: ../mail/em-format-html.c:1910
 #, c-format
 msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
 msgstr "ì?´ ë©?ì??ì§?ë?? <b>%s</b>ì?´(ê°?) <b>%s</b> ì??ê²©ì?¼ë¡? ë³´ë??ì?µë??ë?¤."
 
-#: ../mail/em-format-quote.c:210 ../mail/em-format.c:885
-#: ../mail/em-mailer-prefs.c:75 ../mail/message-list.etspec.h:7
-#: ../mail/message-tag-followup.c:307
-msgid "From"
-msgstr "ë³´ë?¸ ì?¬ë??"
-
-#: ../mail/em-format-quote.c:210 ../mail/em-format.c:886
-#: ../mail/em-mailer-prefs.c:76
+#: ../mail/em-format-quote.c:209 ../mail/em-format.c:924
+#: ../mail/em-mailer-prefs.c:77
 msgid "Reply-To"
 msgstr "í??ì?  ì£¼ì??"
 
-#: ../mail/em-format.c:891 ../mail/em-mailer-prefs.c:81
-#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:325
-#: ../widgets/misc/e-dateedit.c:347
+#: ../mail/em-format.c:929 ../mail/em-mailer-prefs.c:82
+#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:316
+#: ../widgets/misc/e-dateedit.c:338
 msgid "Date"
 msgstr "ë? ì§?"
 
-#: ../mail/em-format.c:892 ../mail/em-mailer-prefs.c:82
+#: ../mail/em-format.c:930 ../mail/em-mailer-prefs.c:83
 msgid "Newsgroups"
 msgstr "ë?´ì?¤ê·¸ë£¹"
 
-#: ../mail/em-format.c:893 ../mail/em-mailer-prefs.c:83
-#: ../plugins/face/org-gnome-face.eplug.xml.h:2
+#: ../mail/em-format.c:931 ../mail/em-mailer-prefs.c:84
+#: ../plugins/face/org-gnome-face.eplug.xml.h:4
 msgid "Face"
 msgstr "ì?¼êµ´"
 
-#: ../mail/em-format.c:1160
+#: ../mail/em-format.c:1201
 #, c-format
 msgid "%s attachment"
 msgstr "%s ì²¨ë¶?"
 
-#: ../mail/em-format.c:1199
+#: ../mail/em-format.c:1239
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "S/MIME ë©?ì??ì§?ë¥¼ ë¶?ì??í?  ì?? ì??ì?µë??ë?¤: ì?? ì?? ì??ë?? ì?¤ë¥?ê°? ë°?ì??í??ì?µë??ë?¤"
 
-#: ../mail/em-format.c:1336 ../mail/em-format.c:1492
+#: ../mail/em-format.c:1376 ../mail/em-format.c:1533
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "MIME ë©?ì??ì§?ë¥¼ ë¶?ì??í?  ì?? ì??ì?µë??ë?¤. ì??ì?¤ë¡? ë³´ì?¬ì¤?ë??ë?¤."
 
-#: ../mail/em-format.c:1344
+#: ../mail/em-format.c:1384
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "multipart/encryptedì?? ì§?ì??í??ì§? ì??ë?? ì??í?¸í?? ë°©ì??ì?? ì?¬ì?©í??ì?µë??ë?¤"
 
-#: ../mail/em-format.c:1354
+#: ../mail/em-format.c:1394
 msgid "Could not parse PGP/MIME message"
 msgstr "PGP/MIME ë©?ì??ì§?ë¥¼ ë¶?ì??í?  ì?? ì??ì?µë??ë?¤"
 
-#: ../mail/em-format.c:1354
+#: ../mail/em-format.c:1394
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "PGP/MIME ë©?ì??ì§?ë¥¼ ë¶?ì??í?  ì?? ì??ì?µë??ë?¤: ì?? ì?? ì??ë?? ì?¤ë¥?ê°? ë°?ì??í??ì?µë??ë?¤"
 
-#: ../mail/em-format.c:1511
+#: ../mail/em-format.c:1552
 msgid "Unsupported signature format"
 msgstr "ì§?ì??í??ì§? ì??ë?? ì??ëª? í??ì??ì??ë??ë?¤"
 
-#: ../mail/em-format.c:1519 ../mail/em-format.c:1590
+#: ../mail/em-format.c:1560 ../mail/em-format.c:1698
 msgid "Error verifying signature"
 msgstr "ì??ëª?ì?? í??ì?¸í??ë?? ì¤? ì?¤ë¥?ê°? ë°?ì??í??ì?µë??ë?¤"
 
-#: ../mail/em-format.c:1519 ../mail/em-format.c:1581 ../mail/em-format.c:1590
+#: ../mail/em-format.c:1560 ../mail/em-format.c:1689 ../mail/em-format.c:1698
 msgid "Unknown error verifying signature"
 msgstr "ì??ëª?ì?? í??ì?¸í??ë?? ì¤? ì?? ì?? ì??ë?? ì?¤ë¥?ê°? ë°?ì??í??ì?µë??ë?¤"
 
-#: ../mail/em-format.c:1664
+#: ../mail/em-format.c:1772
 msgid "Could not parse PGP message"
 msgstr "PGP ë©?ì??ì§?ë¥¼ ë¶?ì??í?  ì?? ì??ì?µë??ë?¤."
 
-#: ../mail/em-format.c:1664
+#: ../mail/em-format.c:1772
 msgid "Could not parse PGP message: Unknown error"
 msgstr "PGP ë©?ì??ì§?ë¥¼ ë¶?ì??í?  ì?? ì??ì?µë??ë?¤: ì?? ì?? ì??ë?? ì?¤ë¥?ê°? ë°?ì??í??ì?µë??ë?¤"
 
-#: ../mail/em-mailer-prefs.c:94
+#: ../mail/em-mailer-prefs.c:95
 msgid "Every time"
 msgstr "í?ì??"
 
-#: ../mail/em-mailer-prefs.c:95
+#: ../mail/em-mailer-prefs.c:96
 msgid "Once per day"
 msgstr "ë§¤ì?¼"
 
-#: ../mail/em-mailer-prefs.c:96
+#: ../mail/em-mailer-prefs.c:97
 msgid "Once per week"
 msgstr "ë§¤ì£¼"
 
-#: ../mail/em-mailer-prefs.c:97
+#: ../mail/em-mailer-prefs.c:98
 msgid "Once per month"
 msgstr "ë§¤ë?¬"
 
-#: ../mail/em-mailer-prefs.c:327
+#: ../mail/em-mailer-prefs.c:332
 msgid "Add Custom Junk Header"
 msgstr "ì?¬ì?©ì?? ì ?ì?? ì ?í?¬ ë©?ì?¼ í?¤ë?? ì¶?ê°?"
 
-#: ../mail/em-mailer-prefs.c:331
+#: ../mail/em-mailer-prefs.c:336
 msgid "Header Name:"
 msgstr "í?¤ë?? ì?´ë¦?:"
 
-#: ../mail/em-mailer-prefs.c:332
+#: ../mail/em-mailer-prefs.c:337
 msgid "Header Value Contains:"
 msgstr "í?¤ë?? ê°?ì?? í?¬í?¨:"
 
-#: ../mail/em-mailer-prefs.c:437
+#: ../mail/em-mailer-prefs.c:438 ../widgets/table/e-table-click-to-add.c:500
+#: ../widgets/table/e-table-selection-model.c:309
+msgid "Header"
+msgstr "ë¨¸ë¦¬ë§?:"
+
+#: ../mail/em-mailer-prefs.c:442
 msgid "Contains Value"
 msgstr "ê°? í?¬í?¨"
 
-#: ../mail/em-mailer-prefs.c:459
+#: ../mail/em-mailer-prefs.c:465
 msgid "Color"
 msgstr "ì??"
 
-#: ../mail/em-mailer-prefs.c:462
+#: ../mail/em-mailer-prefs.c:468
 msgid "Tag"
 msgstr "í??ê·¸"
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1079 ../mail/em-mailer-prefs.c:1133
+#: ../mail/em-mailer-prefs.c:1063 ../mail/em-mailer-prefs.c:1117
 #, c-format
 msgid "%s plugin is available and the binary is installed."
 msgstr "%s í??ë?¬ê·¸ì?¸ì?? ì?¬ì?©í?  ì?? ì??ê³  í??ë¡?ê·¸ë?¨ ë°?ì?´ë??ë¦¬ê°? ì?¤ì¹?ë??ì?´ ì??ì?µë??ë?¤."
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1087 ../mail/em-mailer-prefs.c:1142
+#: ../mail/em-mailer-prefs.c:1071 ../mail/em-mailer-prefs.c:1126
 #, c-format
 msgid ""
 "%s plugin is not available. Please check whether the package is installed."
 msgstr "%s í??ë?¬ê·¸ì?¸ì?? ì?¬ì?©í?  ì?? ì??ì?µë??ë?¤. í?¨í?¤ì§?ë¥¼ ì?¤ì¹?í??ë??ì§? í??ì?¸í??ì?ì??ì?¤."
 
-#: ../mail/em-mailer-prefs.c:1108
+#: ../mail/em-mailer-prefs.c:1092
 msgid "No Junk plugin available"
 msgstr "ì ?í?¬ ë©?ì?¼ í??ë?¬ê·¸ì?¸ì?? ì?¬ì?©í?  ì?? ì??ì?µë??ë?¤"
 
+#: ../mail/em-mailer-prefs.c:1455
+msgid "Date header:"
+msgstr "ë? ì§? í?¤ë??:"
+
 #. green
-#: ../mail/em-migrate.c:1059
+#: ../mail/em-migrate.c:961
 msgid "To Do"
 msgstr "í?  ì?¼"
 
 #. blue
-#: ../mail/em-migrate.c:1060
+#: ../mail/em-migrate.c:962
 msgid "Later"
 msgstr "ë??ì¤?ì??"
 
-#: ../mail/em-migrate.c:1228
+#: ../mail/em-migrate.c:1128
 msgid "Migration"
 msgstr "ì?®ê¸°ê¸°"
 
-#: ../mail/em-migrate.c:1673
+#: ../mail/em-migrate.c:1573
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "`%s' í?´ë??ë¥¼ ì??ë¡? ë§?ë?¤ ì?? ì??ì?µë??ë?¤: %s"
 
-#: ../mail/em-migrate.c:1699
+#: ../mail/em-migrate.c:1599
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "`%s' í?´ë??ë¥¼ `%s' í?´ë??ë¡? ë³µì?¬í?  ì?? ì??ì?µë??ë?¤: %s"
 
-#: ../mail/em-migrate.c:1884
+#: ../mail/em-migrate.c:1784
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "`%s'ì?? ì??ë?? ë©?ì?¼í?¨ì?? ì?½ì?? ì?? ì??ì?µë??ë?¤: %s"
 
-#: ../mail/em-migrate.c:1889
+#: ../mail/em-migrate.c:1789
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -13188,32 +11921,32 @@ msgstr ""
 "\n"
 "í?´ë??ë¥¼ ì?®ê¸°ë?? ë??ì?? ì? ì?? ê¸°ë?¤ë¦¬ì?ì??ì?¤..."
 
-#: ../mail/em-migrate.c:2090
+#: ../mail/em-migrate.c:1990
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "ê³¼ê±°ì?? POP keep-on-server ë?°ì?´í?° `%s'ì??(ë¥¼) ì?´ ì?? ì??ì?µë??ë?¤: %s"
 
-#: ../mail/em-migrate.c:2104
+#: ../mail/em-migrate.c:2004
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr ""
 "POP keep-on-server ë?°ì?´í?° ë??ë ?í?°ë¦¬ `%s' ë??ë ?í?°ë¦¬ë¥¼ ë§?ë?¤ ì?? ì??ì?µë??ë?¤: %s"
 
-#: ../mail/em-migrate.c:2133
+#: ../mail/em-migrate.c:2033
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr "POP3 keep-on-server ë?°ì?´í?° `%s'ì??(ë¥¼) ë³µì?¬í?  ì?? ì??ì?µë??ë?¤: %s"
 
-#: ../mail/em-migrate.c:2604 ../mail/em-migrate.c:2616
+#: ../mail/em-migrate.c:2504 ../mail/em-migrate.c:2516
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "`%s' ë¡?ì»¬ ë©?ì?¼ ì ?ì?¥ê³ ë¥¼ ë§?ë?¤ ì?? ì??ì?µë??ë?¤: %s"
 
-#: ../mail/em-migrate.c:2974
+#: ../mail/em-migrate.c:2874
 msgid "Migrating Folders"
 msgstr "í?´ë??ë¥¼ ì?®ê¸°ë?? ì¤?ì??ë??ë?¤"
 
-#: ../mail/em-migrate.c:2974
+#: ../mail/em-migrate.c:2874
 msgid ""
 "The summary format of the Evolution mailbox folders has been moved to SQLite "
 "since Evolution 2.24.\n"
@@ -13225,12 +11958,12 @@ msgstr ""
 "\n"
 "í?´ë??ë¥¼ ì?®ê¸°ë?? ë??ì?? ì? ì?? ê¸°ë?¤ë¦¬ì?ì??ì?¤..."
 
-#: ../mail/em-migrate.c:3056
+#: ../mail/em-migrate.c:2955
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "`%s'ì?? ë¡?ì»¬ ë©?ì?¼ í?´ë??ë¥¼ ë§?ë?¤ ì?? ì??ì?µë??ë?¤: %s"
 
-#: ../mail/em-migrate.c:3075
+#: ../mail/em-migrate.c:2974
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
@@ -13238,78 +11971,95 @@ msgstr ""
 "ì?´ì ?ì?? ì?¤ì¹?í?? ì??ë³¼ë£¨ì??ì??ì?? ì?¤ì ?ì?? ì??ì?´ë?¤ì?¼ ì?? ì??ì?µë??ë?¤. `evolution/config."
 "xmldb'ê°? ì??ê±°ë?? ë§?ê°?ì¡?ì?µë??ë?¤."
 
-#: ../mail/em-popup.c:562 ../mail/em-popup.c:573
+#: ../mail/em-popup.c:364
+msgid "Save As..."
+msgstr "ë?¤ë¥¸ ì?´ë¦?ì?¼ë¡? ì ?ì?¥..."
+
+#: ../mail/em-popup.c:389
+#, c-format
+msgid "untitled_image.%s"
+msgstr "ì?´ë¦?ì??ë??_ê·¸ë¦¼.%s"
+
+#: ../mail/em-popup.c:495 ../widgets/misc/e-attachment-handler-image.c:147
+msgid "Set as _Background"
+msgstr "ë°°ê²½ í??ë©´ì?¼ë¡? ì?¤ì ?(_B)"
+
+#: ../mail/em-popup.c:497
 msgid "_Reply to sender"
 msgstr "ë³´ë?¸ ì?´ì??ê²? í??ì? (_R)"
 
 # Listë?? ë©?ì?¼ë§? ë¦¬ì?¤í?¸ë¥¼ ë§?í?¨.
-#: ../mail/em-popup.c:563 ../mail/em-popup.c:574
-#: ../ui/evolution-mail-message.xml.h:83
+#: ../mail/em-popup.c:498 ../ui/evolution-mail-message.xml.h:79
 msgid "Reply to _List"
 msgstr "ë¦¬ì?¤í?¸ì?? í??ì? (_L)"
 
 #. make it first item
-#: ../mail/em-popup.c:625 ../mail/em-popup.c:849
+#: ../mail/em-popup.c:547 ../mail/em-popup.c:746
 msgid "_Add to Address Book"
 msgstr "ì£¼ì??ë¡?ì?? ì¶?ê°?(_A)"
 
-#: ../mail/em-subscribe-editor.c:600
+#: ../mail/em-popup.c:725
+#, c-format
+msgid "Open in %s..."
+msgstr "%sì??ì?? ì?´ê¸°..."
+
+#: ../mail/em-subscribe-editor.c:606
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr ""
 "ì?´ ì ?ì?¥ê³ ë?? ê°?ì??ì?? ì§?ì??í??ì§? ì??ê±°ë??, ê°?ì??í?  ì?? ì??ë??ë¡? ì?¤ì ?í??ì§? ì??ì??ì?µë??ë?¤."
 
-#: ../mail/em-subscribe-editor.c:633
+#: ../mail/em-subscribe-editor.c:639
 msgid "Subscribed"
 msgstr "êµ¬ë??"
 
-#: ../mail/em-subscribe-editor.c:637
+#: ../mail/em-subscribe-editor.c:643
 msgid "Folder"
 msgstr "í?´ë??"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:839
+#: ../mail/em-subscribe-editor.c:858
 msgid "Please select a server."
 msgstr "ì??ë²?ë¥¼ ì? í??í??ì?ì??ì?¤."
 
-#: ../mail/em-subscribe-editor.c:860
+#: ../mail/em-subscribe-editor.c:894
 msgid "No server has been selected"
 msgstr "ì??ë²?ë¥¼ ì? í??í??ì§? ì??ì??ì?µë??ë?¤"
 
 #. Check buttons
-#: ../mail/em-utils.c:122
-#: ../plugins/attachment-reminder/attachment-reminder.c:128
+#: ../mail/em-utils.c:121
+#: ../plugins/attachment-reminder/attachment-reminder.c:129
 msgid "_Do not show this message again."
 msgstr "ì?´ ë©?ì??ì§?ë¥¼ ë?¤ì?? ë³´ì§? ì??ê¸°(_D)."
 
-#: ../mail/em-utils.c:318
+#: ../mail/em-utils.c:317
 msgid "Message Filters"
 msgstr "ë©?ì??ì§? í??í?°"
 
-#: ../mail/em-utils.c:371
+#: ../mail/em-utils.c:369
 msgid "message"
 msgstr "ë©?ì??ì§?"
 
-#: ../mail/em-utils.c:655
+#: ../mail/em-utils.c:652
 msgid "Save Message..."
 msgstr "ë©?ì??ì§? ì ?ì?¥..."
 
-#: ../mail/em-utils.c:705
+#: ../mail/em-utils.c:702
 msgid "Add address"
 msgstr "ì£¼ì?? ì¶?ê°?"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1226
+#: ../mail/em-utils.c:1223
 #, c-format
 msgid "Messages from %s"
 msgstr "%sì??ì?? ì?¨ ë©?ì?¼"
 
-#: ../mail/em-vfolder-editor.c:115
+#: ../mail/em-vfolder-editor.c:114
 msgid "Search _Folders"
-msgstr "í?´ë?? ì°¾ê¸°(_F)"
+msgstr "í?´ë?? ê²?ì??(_F)"
 
-#: ../mail/em-vfolder-rule.c:593
+#: ../mail/em-vfolder-rule.c:592
 msgid "Search Folder source"
-msgstr "í?´ë?? ì??ì?¤ ì°¾ê¸°"
+msgstr "í?´ë?? ì??ì?¤ ê²?ì??"
 
 #: ../mail/evolution-mail.schemas.in.h:1
 msgid "\"Send and Receive Mail\" window height"
@@ -13523,36 +12273,42 @@ msgid "Empty all Trash folders when exiting Evolution."
 msgstr "ì??ë³¼ë£¨ì??ì?´ ë??ë?  ë?? ëª¨ë?  í?´ì§?í?µ í?´ë??ë¥¼ ë¹?ì??ë??ë?¤."
 
 #: ../mail/evolution-mail.schemas.in.h:47
+msgid ""
+"Enable animated images in HTML mail. Many users find animated images "
+"annoying and prefer to see a static image instead."
+msgstr "HTML ë©?ì?¼ì??ì?? ì? ë??ë©?ì?´ì??ì?? í??ì?©í?©ë??ë?¤. ë§?ì?? ì?¬ì?©ì??ë?¤ì?? ì? ë??ë©?ì?´ì?? ê·¸ë¦¼ì?? ì¢?ì??í??ì§? ì??ê³  ì ?ì§?ë?? ê·¸ë¦¼ì?? ë³´ê³  ì?¶ì?´í?©ë??ë?¤."
+
+#: ../mail/evolution-mail.schemas.in.h:48
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "ìº?ë¦¿ ëª¨ë??ë¥¼ ì¼ë??ë?¤, ì?´ ëª¨ë??ì??ì??ë?? ë©?ì?¼ì?? ì?½ì?? ë?? ì»¤ì??ê°? ë³´ì??ë??ë?¤."
 
-#: ../mail/evolution-mail.schemas.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:49
 msgid "Enable or disable magic space bar"
 msgstr "ë§?ë?¥ ì?¤í??ì?´ì?¤ë°? ì?¬ì?© ì?¬ë¶?"
 
-#: ../mail/evolution-mail.schemas.in.h:49
+#: ../mail/evolution-mail.schemas.in.h:50
+msgid "Enable or disable the prompt whilst marking multiple messages."
+msgstr "ì?¬ë?¬ ê°?ì?? ë©?ì??ì§?ì?? í??ì??í?  ë?? í??ì?¸ ì§?ë¬¸ì?? í?  ì§? ì?¬ë¶?."
+
+#: ../mail/evolution-mail.schemas.in.h:51
 msgid "Enable or disable type ahead search feature"
-msgstr "í??ì?¤í?¸ ì??ë ¥ ë¯¸ë¦¬ ì°¾ê¸° ê¸°ë?¥ ì?¬ì?©"
+msgstr "í??ì?¤í?¸ ì??ë ¥ ë¯¸ë¦¬ ê²?ì?? ê¸°ë?¥ ì?¬ì?©"
 
-#: ../mail/evolution-mail.schemas.in.h:50
+#: ../mail/evolution-mail.schemas.in.h:52
 msgid "Enable search folders"
-msgstr "ì°¾ê¸° í?´ë?? ì?¬ì?©"
+msgstr "ê²?ì?? í?´ë?? ì?¬ì?©"
 
-#: ../mail/evolution-mail.schemas.in.h:51
+#: ../mail/evolution-mail.schemas.in.h:53
 msgid "Enable search folders on startup."
-msgstr "ì??ì??í?  ë?? ì°¾ê¸° í?´ë?? ì?¬ì?©."
+msgstr "ì??ì??í?  ë?? ê²?ì?? í?´ë?? ì?¬ì?©."
 
-#: ../mail/evolution-mail.schemas.in.h:52
+#: ../mail/evolution-mail.schemas.in.h:54
 msgid ""
-"Enable side bar search feature so that you can start interactive searching "
-"by typing in the text. Use is that you can easily find a folder in that side "
-"bar by just typing the folder name and the selection jumps automatically to "
-"that folder."
-msgstr ""
-"ë³´ì¡° ëª¨ì??ì?? ì°¾ê¸° ê¸°ë?¥ì?? ì?¬ì?©í?´ í??ì?¤í?¸ë¥¼ ì??ë ¥í?´ì?? ì°¾ê¸°ë¥¼ ì??ì??í?  ì?? ì??ì?µë??ë?¤. "
-"í?´ë??ì?? ì?´ë¦?ì?? ì??ë ¥í??ë©´ ë³´ì¡° ëª¨ì??ì?? ì??ë?? í?´ë?¹ í?´ë??ë¡? ë°?ë¡? ì?´ë??í?©ë??ë?¤."
+"Enable the side bar search feature to allow interactive searching of folder "
+"names."
+msgstr "ê°?ì?¥ì??ë¦¬ ì°½ì??ì?? í?´ë?? ì?´ë¦?ì?? ê²?ì??í?  ì?? ì??ê²? í?©ë??ë?¤."
 
-#: ../mail/evolution-mail.schemas.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:55
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
@@ -13560,48 +12316,45 @@ msgstr ""
 "ì?´ ê¸°ë?¥ì?? ì?¬ì?©í??ë©´ ì?¤í??ì?´ì?¤ë°? í?¤ë¥¼ ì?´ì?©í?´ ë©?ì??ì§? ë¯¸ë¦¬ ë³´ê¸°, ë©?ì??ì§? ëª©ë¡?, í?´ë??"
 "ë¥¼ ì?¤í?¬ë¡¤í?©ë??ë?¤."
 
-#: ../mail/evolution-mail.schemas.in.h:54
+#: ../mail/evolution-mail.schemas.in.h:56
 msgid "Enable to render message text part of limited size."
 msgstr "ì ?í??ë?? í?¬ê¸°ë§?í?¼ì?? ì?¼ë¶? í??ì?¤í?¸ë¥¼ í??ì??í??ë??ë¡? í?©ë??ë?¤."
 
-#: ../mail/evolution-mail.schemas.in.h:55
+#: ../mail/evolution-mail.schemas.in.h:57
 msgid "Enable/disable caret mode"
 msgstr "ìº?ë¦¿ ëª¨ë?? ì¼?ê¸°/ë??ê¸°"
 
-#: ../mail/evolution-mail.schemas.in.h:56 ../mail/mail-config.glade.h:81
+#: ../mail/evolution-mail.schemas.in.h:58 ../mail/mail-config.glade.h:86
 msgid "Encode file names in an Outlook/GMail way"
 msgstr "í??ì?¼ ì?´ë¦?ì?? ì??ì??ë£©/êµ¬ê¸? ë©?ì?¼ ë°©ì??ì?¼ë¡? ì?¸ì½?ë?©"
 
-#: ../mail/evolution-mail.schemas.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:59
 msgid ""
-"Encode file names in the mail headers same as Outlook or GMail does, to let "
-"them understand localized file names sent by Evolution, because they do not "
-"follow the RFC 2231, but uses incorrect RFC 2047 standard."
-msgstr ""
-"ë©?ì?¼ í?¤ë??ì?? í??ì?¼ ì?´ë¦?ì?? ì??ì??ë£©ì?´ë?? êµ¬ê¸? ë©?ì?¼ê³¼ ê°?ì?? ë°©ì??ì?¼ë¡? ì?¸ì½?ë?©í?©ë??ë?¤. ê·¸"
-"ë??ì?¼ ì??ë³¼ë£¨ì??ì??ì?? ë³´ë?¸ ë?¤êµì?´ í??ì?¼ ì?´ë¦?ì?? ì??ì??ë£©ì?´ë?? êµ¬ê¸? ë©?ì?¼ì??ì?? ì?¸ì??í?  ì?? "
-"ì??ì?µë??ë?¤. ì??ì??ë£©ì?´ë?? êµ¬ê¸? ë©?ì?¼ì?? RFC 2231ì?? ë?°ë¥´ì§? ì??ê³  ì?¬ë°?ë¥´ì§? ì??ì?? ë°©ë²?ì?¼"
-"ë¡? RFC 2047 í??ì¤?ì?? ë?°ë¥´ê³  ì??ì?µë??ë?¤."
+"Encode file names in the mail headers same as Outlook or GMail do, to let "
+"them display correctly file names with UTF-8 letters sent by Evolution, "
+"because they do not follow the RFC 2231, but use the incorrect RFC 2047 "
+"standard."
+msgstr "ë©?ì?¼ í?¤ë??ì?? í??ì?¼ ì?´ë¦?ì?? ì??ì??ë£©ì?´ë?? ì§?ë©?ì?¼ê³¼ ê°?ì?? ë°©ì??ì?¼ë¡? ì?¸ì½?ë?©í?©ë??ë?¤. ê·¸ë??ì?¼ ì??ë³¼ë£¨ì??ì??ì?? ë³´ë?¸ ë?¤êµì?´ í??ì?¼ ì?´ë¦?ì?? ì??ì??ë£©ì?´ë?? êµ¬ê¸? ë©?ì?¼ì??ì?? ì?¸ì??í?  ì?? ì??ì?µë??ë?¤. ì??ì??ë£©ì?´ë?? ì§?ë©?ì?¼ì?? RFC 2231ì?? ë?°ë¥´ì§? ì??ê³  ì?¬ë°?ë¥´ì§? ì??ì?? ë°©ë²?ì?¼ë¡? RFC 2047 í??ì¤?ì?? ì?¬ì?©í??ê³  ì??ì?µë??ë?¤."
 
-#: ../mail/evolution-mail.schemas.in.h:58
+#: ../mail/evolution-mail.schemas.in.h:60
 msgid "Height of the message-list pane"
 msgstr "ë©?ì??ì§? ëª©ë¡? ì°½ì?? ë??ì?´"
 
-#: ../mail/evolution-mail.schemas.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:61
 msgid "Height of the message-list pane."
 msgstr "ë©?ì??ì§? ëª©ë¡? ì°½ì?? ë??ì?´."
 
-#: ../mail/evolution-mail.schemas.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:62
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "í?´ë??ë³? ë¯¸ë¦¬ ë³´ê¸°ë¥¼ ê°?ì¶?ê³  ì? í??ì?? ì??ì?±ë??ë?¤"
 
-#: ../mail/evolution-mail.schemas.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:63
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
 msgstr "ì?¬ì?©ì??ê°? 10ê°? ì?´ì??ì?? ë©?ì??ì§?ë¥¼ í??ë²?ì?? ì?´ë©´, ì ?ë§?ë¡? ì?´ ì§? ë¬¼ì?´ë´?ë??ë?¤."
 
-#: ../mail/evolution-mail.schemas.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:64
 msgid ""
 "If the \"Preview\" pane is on, then show it side-by-side rather than "
 "vertically."
@@ -13609,7 +12362,7 @@ msgstr ""
 "\"ë¯¸ë¦¬ ë³´ê¸°\" ì°½ì?´ ì¼?ì ¸ ì??ë?? ê²½ì?°, ì°½ì?? ì??ì??ë??ê°? ì??ë??ë?¼ ì??ì?¼ë¡? ë??ë??í?? í??ì??í?©"
 "ë??ë?¤."
 
-#: ../mail/evolution-mail.schemas.in.h:63
+#: ../mail/evolution-mail.schemas.in.h:65
 msgid ""
 "If there isn't a builtin viewer for a particular MIME type inside Evolution, "
 "any MIME types appearing in this list which map to a Bonobo component viewer "
@@ -13619,7 +12372,7 @@ msgstr ""
 "ì?? ë³´ë?¸ë³´ ì»´í?¬ë??í?¸ ë·°ì?´ë¡? ë§¤í??ë??ë?? (ê·¸ë??ì?? MIME í??ì?? ë?°ì?´í?°ë² ì?´ì?¤ì??ì??) ë·°ì?´"
 "ê°? ë?´ì?©ì?? í??ì??í??ë?? ë?° ì?¬ì?©ë?©ë??ë?¤."
 
-#: ../mail/evolution-mail.schemas.in.h:64
+#: ../mail/evolution-mail.schemas.in.h:66
 msgid ""
 "Initial height of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window vertically."
@@ -13627,7 +12380,7 @@ msgstr ""
 "\"ë©?ì?¼ ë³´ë?´ê³  ë°?ê¸°\" ì°½ì?? ìµ?ì´? ë??ì?´. ì?¬ì?©ì??ê°? ì?¸ë¡? ë°©í?¥ì?¼ë¡? ì°½ í?¬ê¸°ë¥¼ ë°?ê¾¸ë©´ "
 "ì?´ ê°?ì?´ ë°?ë??ë??ë?¤."
 
-#: ../mail/evolution-mail.schemas.in.h:65
+#: ../mail/evolution-mail.schemas.in.h:67
 msgid ""
 "Initial maximize state of the \"Send and Receive Mail\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
@@ -13639,7 +12392,7 @@ msgstr ""
 "ì??í?  ë??ë§?ë?¤ ì?´ ê°?ì?´ ë°?ë??ë??ë?¤. \"ë©?ì?¼ ë³´ë?´ê³  ë°?ê¸°\" ì°½ì?? ìµ?ë??í??í?  ì?? ì??ê¸° ë??ë¬¸"
 "ì?? ì?´ ê°?ì?? ì?¤ì ?ë¡?ë?? ì?¬ì?©í??ì§? ì??ì?µë??ë?¤. ì?´ í?¤ë?? ë?´ë¶?ì ? ì?©ë??ë¡?ë§? ì?¬ì?©í?©ë??ë?¤."
 
-#: ../mail/evolution-mail.schemas.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:68
 msgid ""
 "Initial width of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window horizontally."
@@ -13647,11 +12400,7 @@ msgstr ""
 "\"ë©?ì?¼ ë³´ë?´ê³  ë°?ê¸°\" ì°½ì?? ìµ?ì´? ë??ë¹?. ì?¬ì?©ì??ê°? ê°?ë¡? ë°©í?¥ì?¼ë¡? ì°½ í?¬ê¸°ë¥¼ ë°?ê¾¸ë©´ "
 "ì?´ ê°?ì?´ ë°?ë??ë??ë?¤."
 
-#: ../mail/evolution-mail.schemas.in.h:67
-msgid "It disables/enables the prompt while marking multiple messages."
-msgstr "ì?¬ë?¬ ê°?ì?? ë©?ì??ì§?ì?? í??ì??í?  ë?? í??ì?¸ ì§?ë¬¸ì?? í?  ì§? ì?¬ë¶?ë¥¼ ê²°ì ?í?©ë??ë?¤."
-
-#: ../mail/evolution-mail.schemas.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:69
 msgid ""
 "It disables/enables the repeated prompts to ask if offline sync is required "
 "before going into offline mode."
@@ -13659,40 +12408,38 @@ msgstr ""
 "ì?¤í??ë?¼ì?¸ ëª¨ë??ë¡? ë?¤ì?´ê°? ë?? ì?¤í??ë?¼ì?¸ ë??ê¸°í??ê°? í??ì??í?? ì§? ì?¬ë¶?ë¥¼ ë°?ë³µí?´ì?? ë¬»ë?? ì§?"
 "ë¬¸ ê¸°ë?¥ì?? ë??ê³  ì¼ë??ë?¤."
 
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:70
 msgid ""
 "It disables/enables the repeated prompts to warn that deleting messages from "
 "a search folder permanently deletes the message, not simply removing it from "
 "the search results."
-msgstr ""
-"ì°¾ê¸° ê²°ê³¼ì??ì?? ì?ì ?í??ë?? ê²? ì??ë??ë?¼, ì°¾ê¸° í?´ë??ì??ì?? ë©?ì??ì§?ë¥¼ ì§?ì?¸ ê²½ì?° ë©?ì??ì§?ë¥¼ "
-"ì??êµ¬í?? ì?ì ?í??ë?¤ê³  ë°?ë³µí?´ì?? ê²½ê³ í??ë?? ê¸°ë?¥ì?? ë??ê³  ì¼ë??ë?¤."
+msgstr "ê²?ì?? ê²°ê³¼ì??ì?? ì ?ê±°í??ë?? ê²? ì??ë??ë?¼, ì°¾ê¸° í?´ë??ì??ì?? ë©?ì??ì§?ë¥¼ ì§?ì?¸ ê²½ì?° ë©?ì??ì§?ë¥¼ ì??êµ¬í?? ì?ì ?í??ë?¤ê³  ë°?ë³µí?´ì?? ê²½ê³ í??ë?? ê¸°ë?¥ì?? ë??ê³  ì¼ë??ë?¤."
 
-#: ../mail/evolution-mail.schemas.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:71
 msgid "Last time empty junk was run"
 msgstr "ë§?ì§?ë§?ì?¼ë¡? ì ?í?¬ ë©?ì?¼ì?? ë¹?ì?´ ì??ê°?"
 
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:72
 msgid "Last time empty trash was run"
 msgstr "ë§?ì§?ë§?ì?¼ë¡? í?´ì§?í?µì?? ë¹?ì?´ ì??ê°?"
 
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:74
 msgid "List of Labels and their associated colors"
 msgstr "ë ?ì?´ë¸? ë°? ë ?ì?´ë¸? ì??ì?? ëª©ë¡?"
 
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:75
 msgid "List of MIME types to check for Bonobo component viewers"
 msgstr "ë³´ë?¸ë³´ ì»´í?¬ë??í?¸ ë·°ì?´ê°? ì??ë?? ì§? ê²?ì?¬í?  MIME í??ì?? ëª©ë¡?"
 
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:76
 msgid "List of accepted licenses"
 msgstr "ì?¹ì?¸í?? ì?½ê´?ì?? ëª©ë¡?"
 
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:77
 msgid "List of accounts"
 msgstr "ê³?ì ? ëª©ë¡?"
 
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:78
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -13700,15 +12447,15 @@ msgstr ""
 "ì??ë³¼ë£¨ì??ì?? ë©?ì?¼ ì»´í?¬ë??í?¸ì?? ì?¬ì?©í?  ê³?ì ? ëª©ë¡?ì??ë??ë?¤. ì?´ ëª©ë¡?ì??ë?? /apps/"
 "evolution/mail/accountsì?? ì??ë??ì ?ì?¸ ì??ë¸?ë??ë ?í?°ë¦¬ì?? ì?´ë¦?ì?´ ë?¤ì?´ ì??ì?µë??ë?¤."
 
-#: ../mail/evolution-mail.schemas.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:79
 msgid "List of custom headers and whether they are enabled."
 msgstr "ì?¬ì?©ì?? ì§?ì ? í?¤ë??ì?? ê·¸ í?¤ë??ë¥¼ ì?¬ì?©í?  ì§? ì?¬ë¶?ì?? ëª©ë¡?."
 
-#: ../mail/evolution-mail.schemas.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:80
 msgid "List of dictionary language codes used for spell checking."
 msgstr "ë§?ì¶¤ë²? ê²?ì?¬ì?? ì?¬ì?©í?  ì?¬ì ?ì?? ì?¸ì?´ ì½?ë?? ëª©ë¡?."
 
-#: ../mail/evolution-mail.schemas.in.h:80
+#: ../mail/evolution-mail.schemas.in.h:81
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:color where color uses the HTML hex encoding."
@@ -13716,15 +12463,15 @@ msgstr ""
 "ì??ë³¼ë£¨ì??ì?? ë©?ì?¼ ì»´í?¬ë??í?¸ì?? ì?¬ì?©í?  ë ?ì?´ë¸? ëª©ë¡?ì??ë??ë?¤. ì?´ ëª©ë¡?ì??ë?? <ì?´ë¦?>:<ì??> "
 "í??ì??ì?? ë¬¸ì??ì?´ì?´ ë?¤ì?´ ì??ì?µë??ë?¤. ì??ì?? HTML ë°©ì?? 16ì§?ì?? ì?¸ì½?ë?©ì?? ì?¬ì?©í?©ë??ë?¤."
 
-#: ../mail/evolution-mail.schemas.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:82
 msgid "List of protocol names whose license has been accepted."
 msgstr "ì?½ê´?ì?? ë??ì??í?? í??ë¡?í? ì½? ì?´ë¦?ì?? ëª©ë¡?."
 
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:83
 msgid "Load images for HTML messages over HTTP"
 msgstr "HTTPë¥¼ í?µí?´ HTML ë©?ì??ì§?ì?? ê·¸ë¦¼ì?? ì?½ì?´ë?¤ì??ë??ë?¤"
 
-#: ../mail/evolution-mail.schemas.in.h:83
+#: ../mail/evolution-mail.schemas.in.h:84
 msgid ""
 "Load images for HTML messages over HTTP(S). Possible values are: \"0\" - "
 "Never load images off the net. \"1\" - Load images in messages from "
@@ -13734,244 +12481,316 @@ msgstr ""
 "ë?¤í?¸ì??í?¬ì??ì?? ê·¸ë¦¼ì?? ì?½ì?´ë?¤ì?´ì§? ì??ì?µë??ë?¤. \"1\" - ì£¼ì??ë¡?ì?? ì??ë?? ì?¬ë??ì?? ë©?ì?¸ì§? "
 "ê·¸ë¦¼ì?? ì?½ì?´ë?¤ì??ë??ë?¤. \"2\" - í?ì?? ë?¤í?¸ì??í?¬ì??ì?? ê·¸ë¦¼ì?? ì?½ì?´ë?¤ì??ë??ë?¤."
 
-#: ../mail/evolution-mail.schemas.in.h:84
+#: ../mail/evolution-mail.schemas.in.h:85
 msgid "Log filter actions"
 msgstr "í??í?° ë??ì?? ê¸°ë¡?"
 
-#: ../mail/evolution-mail.schemas.in.h:85
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid "Log filter actions to the specified log file."
 msgstr "ì§?ì ?í?? ë¡?ê·¸ í??ì?¼ì?? ë??í?? í??í?° ë??ì??ì?? ê¸°ë¡?í?©ë??ë?¤."
 
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:87
 msgid "Logfile to log filter actions"
 msgstr "í??í?° ë??ì??ì?? ê¸°ë¡?í?  ë¡?ê·¸ í??ì?¼"
 
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:88
 msgid "Logfile to log filter actions."
 msgstr "í??í?° ë??ì??ì?? ê¸°ë¡?í?  ë¡?ê·¸ í??ì?¼ì??ë??ë?¤."
 
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:89
 msgid "Mark as Seen after specified timeout"
 msgstr "ì?¼ì ? ì??ê°?ì?´ ì§?ë??ë©´ ì?½ì?? ê²?ì?¼ë¡? í??ì??í??ê¸°"
 
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:90
 msgid "Mark as Seen after specified timeout."
 msgstr "ì?¼ì ? ì??ê°?ì?´ ì§?ë??ë©´ ì?½ì?? ê²?ì?¼ë¡? í??ì??í?©ë??ë?¤."
 
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:91
 msgid "Mark citations in the message \"Preview\""
 msgstr "ë©?ì??ì§? \"ë¯¸ë¦¬ ë³´ê¸°\"ì??ì?? ì?¸ì?©í?? ë¶?ë¶?ì?? í??ì??í??ê¸°"
 
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:92
 msgid "Mark citations in the message \"Preview\"."
 msgstr "ë©?ì??ì§? \"ë¯¸ë¦¬ ë³´ê¸°\"ì??ì?? ì?¸ì?©í?? ë¶?ë¶?ì?? í??ì??í?©ë??ë?¤."
 
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:93
 msgid "Message Window default height"
 msgstr "ë©?ì??ì§? ì°½ ê¸°ë³¸ ë??ì?´"
 
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:94
 msgid "Message Window default width"
 msgstr "ë©?ì??ì§? ì°½ ê¸°ë³¸ ë??ë¹?"
 
-#: ../mail/evolution-mail.schemas.in.h:94
+#: ../mail/evolution-mail.schemas.in.h:95
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr "ë©?ì??ì§?-í??ì?? ëª¨ì??ì?? (\"normal\", \"full headers\", \"source\")"
 
-#: ../mail/evolution-mail.schemas.in.h:95
+#: ../mail/evolution-mail.schemas.in.h:96
 msgid "Minimum days between emptying the junk on exit"
 msgstr "ë??ë?  ë?? ì ?í?¬ ë©?ì?¼ì?? ë¹?ì?¸ ìµ?ì?? ë? ì§? ê°?ê²©"
 
-#: ../mail/evolution-mail.schemas.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:97
 msgid "Minimum days between emptying the trash on exit"
 msgstr "ë??ë?  ë?? í?´ì§?í?µì?? ë¹?ì?¸ ìµ?ì?? ë? ì§? ê°?ê²©"
 
-#: ../mail/evolution-mail.schemas.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:98
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr "ë??ë?  ë?? í?´ì§?í?µì?? ë¹?ì?¸ ìµ?ì?? ì??ê°? ê°?ê²©."
 
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:99
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "ë??ë?  ë?? í?´ì§?í?µì?? ë¹?ì?¸ ìµ?ì?? ì??ê°? ê°?ê²©."
 
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:100
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "ë°?ë?? ì?¬ë??/ì°¸ì¡°/ì?¨ì?? ì°¸ì¡°ì?? í??ì??í?  ì£¼ì??ì?? ê¸¸ì?´"
 
-#: ../mail/evolution-mail.schemas.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:101
 msgid "Prompt on empty subject"
 msgstr "ì ?ëª©ì?´ ì??ì?¼ë©´ ë¬¼ì?´ë³´ê¸°"
 
-#: ../mail/evolution-mail.schemas.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:102
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "ì?¬ì?©ì??ê°? í?´ë??ì?? ì§?ì?´ ë©?ì??ì§?ë¥¼ ë¹?ì?°ë ¤ í?  ë?? ë¬¼ì?´ë´?ë??ë?¤."
 
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:103
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "ì ?ëª© ì??ë?? ë©?ì??ì§?ë¥¼ ë³´ë?´ë ¤ í?  ë?? ë¬¼ì?´ë´?ë??ë?¤."
 
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:104
 msgid "Prompt to check if the user wants to go offline immediately"
 msgstr "ì?¬ì?©ì??ì??ê²? ì¦?ì?? ì?¤í??ë?¼ì?¸ì?¼ë¡? í?  ì§?ë¥¼ ë¬¼ì?´ë´?ë??ë?¤."
 
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:105
 msgid "Prompt when deleting messages in search folder"
-msgstr "ì°¾ê¸° í?´ë??ì??ì?? ë©?ì??ì§?ë¥¼ ì§?ì?¸ ë?? ë¬¼ì?´ë´?ë??ë?¤"
+msgstr "ê²?ì?? í?´ë??ì??ì?? ë©?ì??ì§?ë¥¼ ì§?ì?¸ ë?? ë¬¼ì?´ë´?ë??ë?¤"
 
-#: ../mail/evolution-mail.schemas.in.h:105
+#: ../mail/evolution-mail.schemas.in.h:106
 msgid "Prompt when user expunges"
 msgstr "ì?¬ì?©ì??ê°? ì§?ì?´ ë©?ì??ì§?ë¥¼ ë¹?ì?°ë ¤ í?  ë?? ë¬¼ì?´ë´?ë??ë?¤"
 
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:107
 msgid "Prompt when user only fills Bcc"
 msgstr "Bccë§? ì?¬ì?©í??ì?? ë?? ë¬¼ì?´ë´?ë??ë?¤"
 
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "10ê°? ì?´ì??ì?? ë©?ì??ì§?ë¥¼ ì?´ë ¤ê³  í?  ë?? ë¬¼ì?´ë´?ë??ë?¤"
 
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
 msgstr ""
 "HTML ë©?ì??ì§?ë¥¼ ì??í??ì§? ì??ë?? ì?¬ë??í??í?? HTML ë©?ì?¼ì?? ë³´ë?´ë ¤ í?  ë?? ë¬¼ì?´ë´?ë??ë?¤."
 
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "Toë?? Ccë¡? ë°?ë?? ì?¬ë??ì?´ ì??ë?? ì??í??ë¡? ë©?ì??ì§?ë¥¼ ë³´ë?´ë ¤ í?  ë?? ë¬¼ì?´ë´?ë??ë?¤."
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "ì??í??ì§? ì??ë?? HTMLì?? ë³´ë?´ë ¤ í?  ë?? ë¬¼ì?´ë´?ë??ë?¤"
 
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "Prompt while marking multiple messages"
 msgstr "ì?¬ë?¬ ê°? ë©?ì??ì§?ì?? í??ì??í??ë ¤ í?  ë?? ë¬¼ì?´ë´?ë??ë?¤"
 
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:113
+msgid "Put personalized signatures at the top of replies"
+msgstr "ë?µì?¥ ë§¨ ì??ì?? ê°?ì?¸ ì??ëª?ì?? ë?£ì?µë??ë?¤"
+
+#: ../mail/evolution-mail.schemas.in.h:114
+msgid "Put the cursor at the bottom of replies"
+msgstr "ì»¤ì??ë¥¼ ë?µì?¥ ë§¨ ì??ë??ì?? ë??ì?µë??ë?¤"
+
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "Recognize emoticons in text and replace them with images."
 msgstr "í??ì?¤í?¸ ì?¤ë§?ì?¼ë¦¬ë¥¼ ì?¸ì??í??ê³  ê·¸ë¦¼ì?¼ë¡? ë°?ê¿?ë??ë?¤."
 
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Recognize links in text and replace them."
 msgstr "í??ì?¤í?¸ì?? ë?¤ì?´ ì??ë?? ë§?í?¬ë¥¼ ì?¸ì??í??ê³  ë°?ê¿?ë??ë?¤."
 
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid "Run junk test on incoming mail."
 msgstr "ë°?ì?? ë©?ì?¼ì?? ë??í?´ ì ?í?¬ë©?ì?¼ ê²?ì?¬ë¥¼ ì?¤í??í?©ë??ë?¤."
 
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:118
 msgid "Save directory"
 msgstr "ì ?ì?¥ ë??ë ?í?°ë¦¬"
 
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Search for the sender photo in local address books"
-msgstr "ë¡?ì»¬ ì£¼ì??ë¡?ì??ì?? ë³´ë?¸ ì?¬ë?? ì?¬ì§? ì°¾ê¸°"
+msgstr "ë¡?ì»¬ ì£¼ì??ë¡?ì??ì?? ë³´ë?¸ ì?¬ë?? ì?¬ì§? ê²?ì??"
 
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Send HTML mail by default"
 msgstr "ê¸°ë³¸ì?¼ë¡? HTML ë©?ì?¼ ë³´ë?´ê¸°"
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Send HTML mail by default."
 msgstr "ê¸°ë³¸ì?¼ë¡? HTML ë©?ì?¼ì?? ë³´ë??ë??ë?¤."
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Sender email-address column in the message list"
 msgstr "ë©?ì??ì§? ëª©ë¡?ì?? ë³´ë?¸ ì?¬ë?? ì ?ì??ë©?ì?¼ ì£¼ì?? ì?´"
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid "Server synchronization interval"
 msgstr "ì??ë²? ë??ê¸°í?? ì£¼ê¸°"
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:124
+msgid "Show \"Bcc\" field when sending a mail message"
+msgstr "ë©?ì?¼ ë©?ì??ì§?ë¥¼ ë³´ë?¼ ë?? \"ì?¨ì?? ì°¸ì¡°\" í??ë?? í??ì??"
+
+#: ../mail/evolution-mail.schemas.in.h:125
+msgid "Show \"Cc\" field when sending a mail message"
+msgstr "ë©?ì?¼ ë©?ì??ì§?ë¥¼ ë³´ë?¼ ë?? \"ì°¸ì¡°\" í??ë?? í??ì??"
+
+#: ../mail/evolution-mail.schemas.in.h:126
+msgid "Show \"From\" field when posting to a newsgroup"
+msgstr "ë?´ì?¤ê·¸ë£¹ì?? ê¸?ì?? ì?¸ ë?? \"ë³´ë?¸ ì?¬ë??\" í??ë?? í??ì??"
+
+#: ../mail/evolution-mail.schemas.in.h:127
+msgid "Show \"From\" field when sending a mail message"
+msgstr "ë©?ì?¼ ë©?ì??ì§?ë¥¼ ë³´ë?¼ ë?? \"ë³´ë?¸ ì?¬ë??\" í??ë?? í??ì??"
+
+#: ../mail/evolution-mail.schemas.in.h:128
+msgid "Show \"Reply To\" field when posting to a newsgroup"
+msgstr "ë?´ì?¤ê·¸ë£¹ì?? ê¸?ì?? ì?¸ ë?? \"í??ì?  ì£¼ì??\" í??ë?? í??ì??"
+
+#: ../mail/evolution-mail.schemas.in.h:129
+msgid "Show \"Reply To\" field when sending a mail message"
+msgstr "ë©?ì?¼ ë©?ì??ì§?ë¥¼ ë³´ë?¼ ë?? \"í??ì?  ì£¼ì??\" í??ë?? í??ì??"
+
+#: ../mail/evolution-mail.schemas.in.h:130
 msgid "Show Animations"
 msgstr "ì? ë??ë©?ì?´ì?? ë³´ê¸°"
 
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Show animated images as animations."
 msgstr "ì? ë??ë©?ì?´ì??ì?´ ë?¤ì?´ ì??ë?? ê·¸ë¦¼ì?? ì? ë??ë©?ì?´ì??ì?¼ë¡? ë´?ë??ë?¤."
 
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "ë©?ì??ì§? ëª©ë¡?ì?? ì?ì ?í?? ë©?ì??ì§?ë¥¼ í??ì??í?©ë??ë?¤ (ì·¨ì??ì? ì?? ê¸?ì?µë??ë?¤)."
 
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Show deleted messages in the message-list"
 msgstr "ë©?ì??ì§? ëª©ë¡?ì?? ì?ì ?í?? ë©?ì??ì§?ë¥¼ í??ì??í?©ë??ë?¤"
 
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:134
+msgid "Show image animations"
+msgstr "ê·¸ë¦¼ ì? ë??ë©?ì?´ì?? ë³´ê¸°"
+
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "Show photo of the sender"
 msgstr "ë³´ë?¸ ì?¬ë??ì?? ì?¬ì§?ì?? ë³´ì?¬ì¤?ë??ë?¤"
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:136
+msgid ""
+"Show the \"Bcc\" field when sending a mail message. This is controlled from "
+"the View menu when a mail account is chosen."
+msgstr "ë©?ì?¼ ë©?ì??ì§?ë¥¼ ë³´ë?¼ ë?? \"ì?¨ì?? ì°¸ì¡°\" í??ë??ë¥¼ í??ì??í?©ë??ë?¤. ì?´ ì?µì??ì?? ë©?ì?¼ ê³?ì ?ì?´ ì??ì?? ë?? ë³´ê¸° ë©?ë?´ì??ì?? ì? í??í?©ë??ë?¤."
+
+#: ../mail/evolution-mail.schemas.in.h:137
+msgid ""
+"Show the \"Cc\" field when sending a mail message. This is controlled from "
+"the View menu when a mail account is chosen."
+msgstr "ë©?ì?¼ ë©?ì??ì§?ë¥¼ ë³´ë?¼ ë?? \"ì°¸ì¡°\" í??ë??ë¥¼ í??ì??í?©ë??ë?¤. ì?´ ì?µì??ì?? ë©?ì?¼ ê³?ì ?ì?´ ì??ì?? ë?? ë³´ê¸° ë©?ë?´ì??ì?? ì? í??í?©ë??ë?¤."
+
+#: ../mail/evolution-mail.schemas.in.h:138
+msgid ""
+"Show the \"From\" field when posting to a newsgroup. This is controlled from "
+"the View menu when a news account is chosen."
+msgstr "ë?´ì?¤ê·¸ë£¹ì?? ê¸?ì?? ì?¸ ë?? \"ë³´ë?¸ ì?¬ë??\" í??ë??ë¥¼ í??ì??í?©ë??ë?¤. ì?´ ì?µì??ì?? ë?´ì?¤ ê³?ì ?ì?´ ì??ì?? ë?? ë³´ê¸° ë©?ë?´ì??ì?? ì? í??í?©ë??ë?¤."
+
+#: ../mail/evolution-mail.schemas.in.h:139
+msgid ""
+"Show the \"From\" field when sending a mail message. This is controlled from "
+"the View menu when a mail account is chosen."
+msgstr "ë©?ì?¼ ë©?ì??ì§?ë¥¼ ë³´ë?¼ ë?? \"ë³´ë?¸ ì?¬ë??\" í??ë??ë¥¼ í??ì??í?©ë??ë?¤. ì?´ ì?µì??ì?? ë©?ì?¼ ê³?ì ?ì?´ ì??ì?? ë?? ë³´ê¸° ë©?ë?´ì??ì?? ì? í??í?©ë??ë?¤."
+
+#: ../mail/evolution-mail.schemas.in.h:142
+msgid ""
+"Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
+"from the View menu when a news account is chosen."
+msgstr "ë?´ì?¤ê·¸ë£¹ì?? ê¸?ì?? ì?¸ ë?? \"í??ì?  ì£¼ì??\" í??ë??ë¥¼ í??ì??í?©ë??ë?¤. ì?´ ì?µì??ì?? ë?´ì?¤ ê³?ì ?ì?´ ì??ì?? ë?? ë³´ê¸° ë©?ë?´ì??ì?? ì? í??í?©ë??ë?¤."
+
+#: ../mail/evolution-mail.schemas.in.h:143
+msgid ""
+"Show the \"Reply To\" field when sending a mail message. This is controlled "
+"from the View menu when a mail account is chosen."
+msgstr "ë©?ì?¼ ë©?ì??ì§?ë¥¼ ë³´ë?¼ ë?? \"í??ì?  ì£¼ì??\" í??ë??ë¥¼ í??ì??í?©ë??ë?¤. ì?´ ì?µì??ì?? ë©?ì?¼ ê³?ì ?ì?´ ì??ì?? ë?? ë³´ê¸° ë©?ë?´ì??ì?? ì? í??í?©ë??ë?¤."
+
+#: ../mail/evolution-mail.schemas.in.h:144
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
 msgstr "ë©?ì??ì§? ëª©ë¡?ì?? ë³?ë?? ì?´ì?? ë³´ë?¸ ì?¬ë??ì?? ì ?ì??ë©?ì?¼ì?? í??ì??í?©ë??ë?¤."
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:145
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "ë©?ì??ì§? ì?½ê¸° ì°½ì??ì?? ë³´ë?¸ ì?¬ë??ì?? ì?¬ì§?ì?? í??ì??í?©ë??ë?¤."
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:146
 msgid "Spell check inline"
 msgstr "ì?¸ë?¼ì?¸ ë§?ì¶¤ë²? ê²?ì?¬"
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:147
 msgid "Spell checking color"
 msgstr "ë§?ì¶¤ë²? ê²?ì?¬ ì??"
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:148
 msgid "Spell checking languages"
 msgstr "ë§?ì¶¤ë²? ê²?ì?¬ ì?¸ì?´"
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:149
 msgid "Subscribe dialog default height"
 msgstr "êµ¬ë?? ë??í?? ì??ì?? ê¸°ë³¸ ë??ì?´"
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid "Subscribe dialog default width"
 msgstr "êµ¬ë?? ë??í?? ì??ì?? ê¸°ë³¸ ë??ë¹?"
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid "Terminal font"
 msgstr "í?°ë¯¸ë?? ê¸?ê¼´"
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Text message part limit"
 msgstr "í??ì?¤í?¸ ë©?ì??ì§? ìµ?ë?? í?¬ê¸°"
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid "The default plugin for Junk hook"
 msgstr "ì ?í?¬ ë©?ì?¼ í??í?¬ì?? ë??í?? ê¸°ë³¸ í??ë?¬ê·¸ì?¸"
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:154
 msgid "The last time empty junk was run, in days since the epoch."
 msgstr "ë§?ì§?ë§?ì?¼ë¡? ì ?í?¬ ë©?ì?¼ì?? ë¹?ì?´ ì??ê°?, 1970ë?? 1ì?? 1ì?¼ë¶?í?° ì§?ë?? ë?  ì??."
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid "The last time empty trash was run, in days since the epoch."
 msgstr "ë§?ì§?ë§?ì?¼ë¡? í?´ì§?í?µì?? ë¹?ì?´ ì??ê°?, 1970ë?? 1ì?? 1ì?¼ë¶?í?° ì§?ë?? ë?  ì??."
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:156
 msgid "The terminal font for mail display."
 msgstr "ë©?ì?¼ì?? í??ì??í?  ë?? ì?¬ì?©í?  í?°ë¯¸ë?? ê¸?ê¼´."
 
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../mail/evolution-mail.schemas.in.h:157
 msgid "The variable width font for mail display."
 msgstr "ë©?ì?¼ì?? í??ì??í?  ë?? ì?¬ì?©í?  ê°?ë³?í? ê¸?ê¼´."
 
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../mail/evolution-mail.schemas.in.h:158
 msgid ""
 "This can have three possible values. \"0\" for errors. \"1\" for warnings. "
 "\"2\" for debug messages."
 msgstr ""
 "ì?¸ ê°?ì§? ê°?ì?´ ê°?ë?¥í?©ë??ë?¤. \"0\"ì?? ì?¤ë¥?, \"1\"ì?? ê²½ê³ , \"2\"ë?? ë??ë²?ê¹? ë©?ì??ì§?."
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:159
 msgid ""
 "This decides the max size of the text part that can be formatted under "
 "Evolution. The default is 4MB / 4096 KB and is specified in terms of KB."
@@ -13979,7 +12798,7 @@ msgstr ""
 "ì??ë³¼ë£¨ì??ì??ì?? í??ì??í?  ì?? ì??ë?? í??ì?¤í?¸ì?? ìµ?ë?? í?¬ê¸°ë¥¼ ì§?ì ?í?©ë??ë?¤. ê¸°ë³¸ê°?ì?? 4MB / "
 "4096 KBì?´ê³  KB ë?¨ì??ë¡? ì§?ì ?í?©ë??ë?¤."
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:160
 msgid ""
 "This is the default junk plugin, even though there are multiple plugins "
 "enabled. If the default listed plugin is disabled, then it won't fall back "
@@ -13989,7 +12808,7 @@ msgstr ""
 "ë?¤. ê¸°ë³¸ ëª©ë¡? í??ë?¬ê·¸ì?¸ì?? ì?¬ì?©í??ì§? ì??ë?? ê²½ì?°, ì?¬ì?© ê°?ë?¥í?? ë?¤ë¥¸ í??ë?¬ê·¸ì?¸ì?? ë??"
 "ì?  ì?¬ì?©í??ì§? ì??ì?µë??ë?¤."
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:161
 msgid ""
 "This key is read only once and reset to \"false\" after read. This unselects "
 "the mail in the list and removes the preview for that folder."
@@ -13997,7 +12816,7 @@ msgstr ""
 "ì?´ í?¤ë?? í?? ë²?ë§? ì?½ê³  ì?½ì?? ë?¤ì??ì?? ê±°ì§?ì?¼ë¡? ë?¤ì?? ì?¤ì ?ë?©ë??ë?¤. ëª©ë¡?ì??ì?? ë©?ì?¼ ì? í??"
 "ì?? ì ?ê±°í??ê³  ê·¸ í?´ë??ì?? ë??í?? ë¯¸ë¦¬ ë³´ê¸°ë¥¼ ì??ì?±ë??ë?¤."
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid ""
 "This key should contain a list of XML structures specifying custom headers, "
 "and whether they are to be displayed. The format of the XML structure is &lt;"
@@ -14008,7 +12827,7 @@ msgstr ""
 "ë¦¬ì?¤í?¸ê°? ë?¤ì?´ ì??ì?µë??ë?¤. XML êµ¬ì¡°ì?? í??ì??ì?? &lt;header enabled&gt;ì??ë??ë?¤ - í?¤ë??"
 "ë¥¼ ë©?ì?¼ ë³´ê¸°ì??ì?? í??ì??í??ë©´ enabledë¡? ì?¤ì ?í?©ë??ë?¤."
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid ""
 "This option is related to the key lookup_addressbook and is used to "
 "determine whether to look up addresses in local address book only to exclude "
@@ -14018,11 +12837,11 @@ msgstr ""
 "ì??ë ¤ì§? ì?¬ë??ì?´ ë³´ë?¸ ë©?ì?¼ì?? ì ?ì?¸í?  ë??, ë¡?ì»¬ ì£¼ì??ë¡?ì??ì??ë§? ì£¼ì??ë¥¼ ì°¾ì?? ë³¼ ì§? ì?¬ë¶?"
 "ë¥¼ ê²°ì ?í?©ë??ë?¤."
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "This option would help in improving the speed of fetching."
 msgstr "ì?´ ì?µì??ì?¼ë¡? ê°?ì ¸ì?¤ê¸° ì??ë??ë¥¼ ë??ì?¼ ì?? ì??ì?µë??ë?¤."
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
@@ -14030,7 +12849,7 @@ msgstr ""
 "ê¸°ë³¸ ë©?ì??ì§? ëª©ë¡? ë³´ê¸°ì??ì?? í??ì??í?  ì£¼ì??ì?? ê¸¸ì?´ë¥¼ ì§?ì ?í?©ë??ë?¤. ê¸¸ì?´ë¥¼ ë??ì?´ê°?ë©´ "
 "'...'ì?¼ë¡? í??ì??í?©ë??ë?¤."
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart."
@@ -14038,7 +12857,7 @@ msgstr ""
 "ì?´ ì?¤ì ?ì?? ê¸°ë³¸ê°?ì?¼ë¡? ê¸?í??ë??ë¥¼ í??ì?¥ ì??í??ë¡? í?  ì§? ì¶?ì?? ì??í??ë¡? í?  ì§? ì§?ì ?í?©ë??"
 "ë?¤. ì??ë³¼ë£¨ì??ì?? ë?¤ì?? ì??ì??í?´ì?¼ í?©ë??ë?¤."
 
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid ""
 "This setting specifies whether the threads should be sorted based on latest "
 "message in each thread, rather than by message's date. Evolution requires a "
@@ -14047,115 +12866,89 @@ msgstr ""
 "ì?´ ì?¤ì ?ì?? í?´ë?¹ ê¸?í??ë??ì?? ìµ?ê·¼ ë©?ì??ì§?ë¥¼ ê¸°ì¤?ì?¼ë¡? ê¸?í??ë??ë¥¼ ì ?ë ¬í?  ì§? ì?¬ë¶?ë¥¼ ì§?ì ?"
 "í?©ë??ë?¤. ì??ë³¼ë£¨ì??ì?? ë?¤ì?? ì??ì??í?´ì?¼ í?©ë??ë?¤."
 
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "Thread the message list."
 msgstr "ì?°ê´?ë?? ë©?ì??ì§?ë¥¼ ê¸?í??ë??ë¡? ë§?ë?ë??ë?¤."
 
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:169
 msgid "Thread the message-list"
 msgstr "ì?°ê´?ë?? ë©?ì??ì§?ë¥¼ ê¸?í??ë??ë¡?"
 
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:170
 msgid "Thread the message-list based on Subject"
 msgstr "ì ?ëª©ì?? ë?°ë?¼ ë©?ì??ì§? ëª©ë¡?ì?? ê¸?í??ë?? í??ì??í?©ë??ë?¤"
 
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:171
 msgid "Timeout for marking message as seen"
 msgstr "ë©?ì??ì§?ë¥¼ ì?½ì?? ê²?ì?¼ë¡? í??ì??í??ë?? ê²½ê³¼ ì??ê°?"
 
-#: ../mail/evolution-mail.schemas.in.h:156
+#: ../mail/evolution-mail.schemas.in.h:172
 msgid "Timeout for marking message as seen."
 msgstr "ë©?ì??ì§?ë¥¼ ì?½ì?? ê²?ì?¼ë¡? í??ì??í??ë?? ê²½ê³¼ ì??ê°?."
 
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:173
 msgid "UID string of the default account."
 msgstr "ê¸°ë³¸ ê³?ì ?ì?? UID ë¬¸ì??ì?´."
 
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:174
 msgid "Underline color for misspelled words when using inline spelling."
 msgstr "ì?¸ë?¼ì?¸ ë§?ì¶¤ë²? ê²?ì?¬ë¥¼ ì?¬ì?©í?  ë?? ë§?ì¶¤ë²?ì?´ í??ë¦° ë?¨ì?´ì?? ë°?ì¤? ê·¸ì?? ì??."
 
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:175
 msgid "Use SpamAssassin daemon and client"
 msgstr "ì?¤í?¸ì?´ì??ì?  ë?°ëª¬ ë°? í?´ë?¼ì?´ì?¸í?¸ ì?¬ì?©"
 
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:176
 msgid "Use SpamAssassin daemon and client (spamc/spamd)."
 msgstr "ì?¤í?¸ì?´ì??ì?  ë?°ëª¬ ë°? í?´ë?¼ì?´ì?¸í?¸ë¥¼ (spamc/spamd) ì?¬ì?©í?©ë??ë?¤."
 
-#: ../mail/evolution-mail.schemas.in.h:161
+#: ../mail/evolution-mail.schemas.in.h:177
 msgid "Use custom fonts"
 msgstr "ì?¬ì?©ì?? ì?¤ì ? ê¸?ê¼´ ì?¬ì?©"
 
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:178
 msgid "Use custom fonts for displaying mail."
 msgstr "ë©?ì?¼ì?? í??ì??í?  ë?? ì?¬ì?©ì?? ì§?ì ? ê¸?ê¼´ì?? ì?¬ì?©í?©ë??ë?¤."
 
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:179
 msgid "Use only local spam tests."
 msgstr "ë¡?ì»¬ ì?¤í?¸ í??ì?¤í?¸ë§? ì?¬ì?©í?©ë??ë?¤."
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:180
 msgid "Use only the local spam tests (no DNS)."
 msgstr "ë¡?ì»¬ ì?¤í?¸ í??ì?¤í?¸ë§? ì?¬ì?©í?©ë??ë?¤ (DNSë?? ì?¬ì?©í??ì§? ì??ì?µë??ë?¤)."
 
-#: ../mail/evolution-mail.schemas.in.h:165
+#: ../mail/evolution-mail.schemas.in.h:181
 msgid "Use side-by-side or wide layout"
 msgstr "ë??ë??í?? í?¹ì?? ì??ì?¼ë¡? ê¸¸ê²? ë°°ì¹?"
 
-#: ../mail/evolution-mail.schemas.in.h:166
-msgid "Variable width font"
-msgstr "ê°?ë³?í? ê¸?ê¼´"
-
-#: ../mail/evolution-mail.schemas.in.h:167
-msgid "View/Bcc menu item is checked"
-msgstr "ë³´ê¸°/ì?¨ì?? ì°¸ì¡° ë©?ë?´ í?ëª©ì?´ ì²´í?¬"
-
-#: ../mail/evolution-mail.schemas.in.h:168
-msgid "View/Bcc menu item is checked."
-msgstr "ë³´ê¸°/ì?¨ì??_ì°¸ì¡° ë©?ë?´ í?ëª©ì?´ ì²´í?¬."
-
-#: ../mail/evolution-mail.schemas.in.h:169
-msgid "View/Cc menu item is checked"
-msgstr "ë³´ê¸°/ì°¸ì¡° ë©?ë?´ í?ëª©ì?´ ì²´í?¬"
-
-#: ../mail/evolution-mail.schemas.in.h:170
-msgid "View/Cc menu item is checked."
-msgstr "ë³´ê¸°/ì°¸ì¡° ë©?ë?´ í?ëª©ì?´ ì²´í?¬."
-
-#: ../mail/evolution-mail.schemas.in.h:171
-msgid "View/From menu item is checked"
-msgstr "ë³´ê¸°/ë³´ë?¸ ì?¬ë?? ë©?ë?´ í?ëª©ì?´ ì²´í?¬"
-
-#: ../mail/evolution-mail.schemas.in.h:172
-msgid "View/From menu item is checked."
-msgstr "ë³´ê¸°/ë³´ë?¸ ì?¬ë?? ë©?ë?´ í?ëª©ì?´ ì²´í?¬."
-
-#: ../mail/evolution-mail.schemas.in.h:173
-msgid "View/PostTo menu item is checked"
-msgstr "ë³´ê¸°/ê²?ì??_ì??ì¹? ë©?ë?´ í?ëª©ì?´ ì²´í?¬"
-
-#: ../mail/evolution-mail.schemas.in.h:174
-msgid "View/PostTo menu item is checked."
-msgstr "ë³´ê¸°/ê²?ì??_ì??ì¹? ë©?ë?´ í?ëª©ì?´ ì²´í?¬."
+#: ../mail/evolution-mail.schemas.in.h:182
+msgid ""
+"Users get all up in arms over where the cursor should go when replying to a "
+"message. This determines whether the cursor is placed at the top of the "
+"message or the bottom."
+msgstr "ë©?ì?¸ì§?ì?? ë?µì?¥ì?? í?  ë?? ì»¤ì??ê°? ê°? ì??ì¹?. ì?´ ê°?ì?? ì»¤ì??ë¥¼ ë©?ì??ì§?ì?? ë§¨ ì??ì?? ë??ì??ì§? ë§¨ ì??ë??ì?? ë??ì??ì§? ê²°ì ?í?©ë??ë?¤."
 
-#: ../mail/evolution-mail.schemas.in.h:175
-msgid "View/ReplyTo menu item is checked"
-msgstr "ë³´ê¸°/í??ì? _ì£¼ì?? ë©?ë?´ í?ëª©ì?´ ì²´í?¬"
+#: ../mail/evolution-mail.schemas.in.h:183
+msgid ""
+"Users get all up in arms over where their signature should go when replying "
+"to a message. This determines whether the signature is placed at the top of "
+"the message or the bottom."
+msgstr "ë©?ì?¸ì§?ì?? ë?µì?¥ì?? í?  ë?? ì??ëª?ì?´ ê°? ì??ì¹?. ì?´ ê°?ì?? ì??ëª?ì?? ë©?ì??ì§?ì?? ë§¨ ì??ì?? ë??ì??ì§? ë§¨ ì??ë??ì?? ë??ì??ì§? ê²°ì ?í?©ë??ë?¤."
 
-#: ../mail/evolution-mail.schemas.in.h:176
-msgid "View/ReplyTo menu item is checked."
-msgstr "ë³´ê¸°/í??ì? _ì£¼ì?? ë©?ë?´ í?ëª©ì?´ ì²´í?¬."
+#: ../mail/evolution-mail.schemas.in.h:184
+msgid "Variable width font"
+msgstr "ê°?ë³?í? ê¸?ê¼´"
 
-#: ../mail/evolution-mail.schemas.in.h:177
+#: ../mail/evolution-mail.schemas.in.h:185
 msgid "Whether a read receipt request gets added to every message by default."
 msgstr "ê¸°ë³¸ê°?ì?¼ë¡? ë?´ì?© ì?½ì?? í??ì?¸ ì??ì²ì?? ëª¨ë?  ë©?ì??ì§?ì?? ì¶?ê°?í?  ì§? ì?¬ë¶?."
 
-#: ../mail/evolution-mail.schemas.in.h:178
+#: ../mail/evolution-mail.schemas.in.h:186
 msgid "Whether disable ellipsizing feature of folder names in side bar."
 msgstr "ê°?ì?¥ì??ë¦¬ ì°½ì?? í?´ë?? ì?´ë¦?ì?? ë??í?´ ì¤?ì?¬ ì?°ê¸° ì?¬ì?©ì?? ë§?ì?? ì§? ì?¬ë¶?."
 
-#: ../mail/evolution-mail.schemas.in.h:179
+#: ../mail/evolution-mail.schemas.in.h:187
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -14163,15 +12956,15 @@ msgstr ""
 "ë©?ì??ì§?ì?? In-Reply-To í?¹ì?? References í?¤ë??ê°? ì??ì?? ê²½ì?°ì?? ë??ì? ì?? ì ?ëª©ì?¼ë¡? ê¸?í??"
 "ë?? í??ì??ë¥¼ í?  ê²?ì?¸ì§? ì?¬ë¶?."
 
-#: ../mail/evolution-mail.schemas.in.h:180
+#: ../mail/evolution-mail.schemas.in.h:188
 msgid "Whether sort threads based on latest message in that thread"
 msgstr "í?´ë?¹ ê¸?í??ë??ì?? ìµ?ê·¼ ë©?ì??ì§?ë¥¼ ê¸°ì¤?ì?¼ë¡? ê¸?í??ë??ë¥¼ ì ?ë ¬í?  ì§? ì?¬ë¶?"
 
-#: ../mail/evolution-mail.schemas.in.h:181
+#: ../mail/evolution-mail.schemas.in.h:189
 msgid "Width of the message-list pane"
 msgstr "ë©?ì??ì§? ëª©ë¡? ì°½ì?? ë??ë¹?"
 
-#: ../mail/evolution-mail.schemas.in.h:182
+#: ../mail/evolution-mail.schemas.in.h:190
 msgid "Width of the message-list pane."
 msgstr "ë©?ì??ì§? ëª©ë¡? ì°½ì?? ë??ë¹?."
 
@@ -14188,12 +12981,12 @@ msgid "Import mail from Elm."
 msgstr "ELMì??ì?? ë©?ì?¼ì?? ê°?ì ¸ì?µë??ë?¤."
 
 #: ../mail/importers/evolution-mbox-importer.c:79
-#: ../plugins/pst-import/pst-importer.c:312
+#: ../plugins/pst-import/pst-importer.c:309
 msgid "Destination folder:"
 msgstr "ë??ì?? í?´ë??:"
 
 #: ../mail/importers/evolution-mbox-importer.c:82
-#: ../plugins/pst-import/pst-importer.c:305
+#: ../plugins/pst-import/pst-importer.c:302
 msgid "Select folder to import into"
 msgstr "ì?´ë?? í?´ë??ë¡? ê°?ì ¸ì?¬ ì§? ì? í??í??ì?ì??ì?¤"
 
@@ -14211,8 +13004,8 @@ msgstr "ë©?ì?¼í?¨ ê°?ì ¸ì?¤ê¸°"
 
 #. Destination folder, was set in our widget
 #: ../mail/importers/mail-importer.c:231
-#: ../plugins/pst-import/pst-importer.c:457
-#: ../plugins/pst-import/pst-importer.c:563 ../shell/e-shell-importer.c:512
+#: ../plugins/pst-import/pst-importer.c:454
+#: ../plugins/pst-import/pst-importer.c:560 ../shell/e-shell-importer.c:555
 #, c-format
 msgid "Importing `%s'"
 msgstr "%s ê°?ì ¸ì?¤ë?? ì¤?ì??ë??ë?¤"
@@ -14239,144 +13032,140 @@ msgstr "PINEì??ì?? ë©?ì?¼ì?? ê°?ì ¸ì?µë??ë?¤."
 msgid "Mail to %s"
 msgstr "%sì?? ë³´ë?´ë?? ë©?ì?¼"
 
-#: ../mail/mail-autofilter.c:236 ../mail/mail-autofilter.c:275
+#: ../mail/mail-autofilter.c:235 ../mail/mail-autofilter.c:274
 #, c-format
 msgid "Mail from %s"
 msgstr "%sì??ì?? ì?¨ ë©?ì?¼"
 
-#: ../mail/mail-autofilter.c:259
+#: ../mail/mail-autofilter.c:258
 #, c-format
 msgid "Subject is %s"
 msgstr "ì ?ëª©ì?´ %s"
 
-#: ../mail/mail-autofilter.c:294
+#: ../mail/mail-autofilter.c:293
 #, c-format
 msgid "%s mailing list"
 msgstr "%s ë©?ì?¼ë§? ë¦¬ì?¤í?¸"
 
-#: ../mail/mail-autofilter.c:365
+#: ../mail/mail-autofilter.c:364
 msgid "Add Filter Rule"
 msgstr "í??í?° ê·?ì¹? ì¶?ê°?"
 
-#: ../mail/mail-component.c:550
+#: ../mail/mail-component.c:573
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "%dê°? ì? í??, "
 
-#: ../mail/mail-component.c:554
+#: ../mail/mail-component.c:577
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%dê°? ì?ì ?"
 
-#: ../mail/mail-component.c:561
+#: ../mail/mail-component.c:584
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%dê°? ì ?í?¬"
 
-#: ../mail/mail-component.c:564
+#: ../mail/mail-component.c:587
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%dê°? ì??ì??"
 
-#: ../mail/mail-component.c:566
+#: ../mail/mail-component.c:589
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%dê°? ë³´ë??"
 
-#: ../mail/mail-component.c:568
+#: ../mail/mail-component.c:591
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%dê°? ì?? ë³´ë??"
 
-#: ../mail/mail-component.c:574
+#: ../mail/mail-component.c:597
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%dê°? ì?? ì?½ì??, "
 
-#: ../mail/mail-component.c:575
+#: ../mail/mail-component.c:598
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "ì ?ì²´ %dê°?"
 
-#: ../mail/mail-component.c:927
+#: ../mail/mail-component.c:952
 msgid "New Mail Message"
 msgstr "ì?? ë©?ì?¼ ë©?ì??ì§?"
 
-#: ../mail/mail-component.c:928
+#: ../mail/mail-component.c:953
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "ë©?ì?¼ ë©?ì??ì§?(_M)"
 
-#: ../mail/mail-component.c:929
+#: ../mail/mail-component.c:954
 msgid "Compose a new mail message"
 msgstr "ë©?ì?¼ ë©?ì??ì§?ë¥¼ ì??ë¡? ì??ì?±í?©ë??ë?¤"
 
-#: ../mail/mail-component.c:935
+#: ../mail/mail-component.c:960
 msgid "New Mail Folder"
 msgstr "ì?? ë©?ì?¼ í?´ë??"
 
-#: ../mail/mail-component.c:936
+#: ../mail/mail-component.c:961
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "ë©?ì?¼ í?´ë??(_F)"
 
-#: ../mail/mail-component.c:937
+#: ../mail/mail-component.c:962
 msgid "Create a new mail folder"
 msgstr "ì?? ë©?ì?¼ í?´ë??ë¥¼ ë§?ë?ë??ë?¤"
 
-#: ../mail/mail-component.c:1084
+#: ../mail/mail-component.c:1109
 msgid "Failed upgrading Mail settings or folders."
 msgstr "ë©?ì?¼ ì?¤ì ? í?¹ì?? í?´ë??ë¥¼ ì??ê·¸ë ?ì?´ë??í??ë?? ë?° ì?¤í?¨í??ì?µë??ë?¤."
 
 #: ../mail/mail-config.glade.h:1
-msgid " Ch_eck for Supported Types "
-msgstr "ì§?ì??í??ë?? ë°©ì?? í??ì?¸(_E)"
-
-#: ../mail/mail-config.glade.h:2
 msgid "(Note: Requires restart of the application)"
 msgstr "(ì£¼ì??: í??ë¡?ê·¸ë?¨ì?? ë?¤ì?? ì??ì??í?´ì?¼ í?©ë??ë?¤)"
 
-#: ../mail/mail-config.glade.h:4
+#: ../mail/mail-config.glade.h:3
 msgid "<b>SSL is not supported in this build of Evolution</b>"
 msgstr "<b>ì?´ ì??ë³¼ë£¨ì?? ë¹?ë??ë?? SSLì?? ì§?ì??í??ì§? ì??ì?µë??ë?¤</b>"
 
-#: ../mail/mail-config.glade.h:5
+#: ../mail/mail-config.glade.h:4
 msgid "<b>Sender Photograph</b>"
 msgstr "<b>ë³´ë?´ë?? ì?¬ë?? ì?¬ì§?</b>"
 
-#: ../mail/mail-config.glade.h:6
+#: ../mail/mail-config.glade.h:5
 msgid "<b>Sig_natures</b>"
 msgstr "<b>ì??ëª?(_N)</b>"
 
-#: ../mail/mail-config.glade.h:7
+#: ../mail/mail-config.glade.h:6
 msgid "<b>Top Posting Option</b> (Not Recommended)"
 msgstr "<b>ì??ì?? ì?°ê¸° ì?µì??</b> (ì¶?ì²?í??ì§? ì??ì??)"
 
-#: ../mail/mail-config.glade.h:8
+#: ../mail/mail-config.glade.h:7
 msgid "<b>_Languages</b>"
 msgstr "<b>ì?¸ì?´(_L)</b>"
 
-#: ../mail/mail-config.glade.h:9
+#: ../mail/mail-config.glade.h:8
 msgid "<span weight=\"bold\">Account Information</span>"
 msgstr "<span weight=\"bold\">ê³?ì ? ì ?ë³´</span>"
 
-#: ../mail/mail-config.glade.h:11
+#: ../mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Authentication</span>"
 msgstr "<span weight=\"bold\">ì?¸ì¦?</span>"
 
-#: ../mail/mail-config.glade.h:12
+#: ../mail/mail-config.glade.h:11
 msgid "<span weight=\"bold\">Composing Messages</span>"
 msgstr "<span weight=\"bold\">ë©?ì??ì§? ì??ì?±</span>"
 
-#: ../mail/mail-config.glade.h:13
+#: ../mail/mail-config.glade.h:12
 msgid "<span weight=\"bold\">Configuration</span>"
 msgstr "<span weight=\"bold\">ì?¤ì ?</span>"
 
@@ -14498,59 +13287,82 @@ msgstr "ì??í?¸í??í?? ë©?ì?¼ì?? ë³´ë?¼ ë?? ì??ì? ì?? ë??í?´ì?? ì?¸ì ?ë?? ì??í?¸
 msgid "Always request rea_d receipt"
 msgstr "í?ì?? ë?´ì?© ì?½ì?? í??ì?¸ ì??ì²(_D)"
 
-#: ../mail/mail-config.glade.h:46
+#: ../mail/mail-config.glade.h:45
+msgid ""
+"Attachment\n"
+"Inline\n"
+"Quoted"
+msgstr ""
+"ì²¨ë¶?\n"
+"ì?¸ë?¼ì?¸\n"
+"ì?¸ì?©"
+
+#: ../mail/mail-config.glade.h:48
+msgid ""
+"Attachment\n"
+"Inline (Outlook style)\n"
+"Quoted\n"
+"Do not quote"
+msgstr ""
+"ì²¨ë¶?\n"
+"ì?¸ë?¼ì?¸ (ì??ì??ë£© ë°©ì??)\n"
+"ì?¸ì?©\n"
+"ì?¸ì?©í??ì§? ì??ì??"
+
+#: ../mail/mail-config.glade.h:52
 msgid "Automatically insert _emoticon images"
 msgstr "ì??ë??ì?¼ë¡? ì?´ëª¨í?°ì½? ê·¸ë¦¼ ë?£ê¸°(_E)"
 
-#: ../mail/mail-config.glade.h:47
+#: ../mail/mail-config.glade.h:53
 msgid "Baltic (ISO-8859-13)"
 msgstr "ë°?í?¸ì?´ (ISO-8859-13)"
 
-#: ../mail/mail-config.glade.h:48
+#: ../mail/mail-config.glade.h:54
 msgid "Baltic (ISO-8859-4)"
 msgstr "ë°?í?¸ì?´ (ISO-8859-4)"
 
-#: ../mail/mail-config.glade.h:49
+#: ../mail/mail-config.glade.h:55
 msgid "C_haracter set:"
 msgstr "ë¬¸ì??ì??(_H):"
 
-#: ../mail/mail-config.glade.h:50
-msgid "Ch_eck for Supported Types "
+#: ../mail/mail-config.glade.h:56
+#: ../plugins/exchange-operations/exchange-account-setup.c:1015
+msgid "Ch_eck for Supported Types"
 msgstr "ì§?ì??í??ë?? ë°©ì?? í??ì?¸(_E)"
 
-#: ../mail/mail-config.glade.h:51
+#: ../mail/mail-config.glade.h:57
 msgid "Check cu_stom headers for junk"
 msgstr "ì ?í?¬ ë©?ì?¼ ê²?ì?¬ì?? ì?¬ì?©ì?? ì§?ì ? í?¤ë?? ê²?ì?¬(_S)"
 
-#: ../mail/mail-config.glade.h:52
+#: ../mail/mail-config.glade.h:58
 msgid "Check incoming _messages for junk"
 msgstr "ë°?ì?? ë©?ì?¼ì?´ ì ?í?¬ ë©?ì?¼ì?¸ì§? ê²?ì?¬(_M)"
 
-#: ../mail/mail-config.glade.h:53
+#: ../mail/mail-config.glade.h:59
 msgid "Check spelling while I _type"
 msgstr "ì??ë ¥í?  ë?? ë§?ì¶¤ë²? ê²?ì?¬(_T)"
 
-#: ../mail/mail-config.glade.h:54
+#: ../mail/mail-config.glade.h:60
 msgid "Checks incoming mail messages to be Junk"
 msgstr "ë°?ë?? ë©?ì?¼ì?´ ì ?í?¬ë©?ì?¼ì?¸ ì§? ê²?ì?¬í?©ë??ë?¤"
 
-#: ../mail/mail-config.glade.h:55
+#: ../mail/mail-config.glade.h:61
 msgid "Cle_ar"
 msgstr "ì§?ì?°ê¸°(_A)"
 
-#: ../mail/mail-config.glade.h:56
+#: ../mail/mail-config.glade.h:62
 msgid "Clea_r"
 msgstr "ì§?ì?°ê¸°(_R)"
 
-#: ../mail/mail-config.glade.h:57
+#: ../mail/mail-config.glade.h:63
 msgid "Color for _misspelled words:"
 msgstr "ë§?ì¶¤ë²?ì?´ í??ë¦° ê¸?ì??ì?? ì??(_M):"
 
-#: ../mail/mail-config.glade.h:58
+#: ../mail/mail-config.glade.h:64
 msgid "Confirm _when expunging a folder"
 msgstr "í?´ë??ë¥¼ ë¹?ì?¸ ë?? í??ì?¸ ì§?ë¬¸(_W)"
 
-#: ../mail/mail-config.glade.h:59
+#: ../mail/mail-config.glade.h:65
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -14566,184 +13378,180 @@ msgstr ""
 "\n"
 "ì?¤ì ?ì?? ì ?ì?¥í??ë ¤ë©´ \"ì ?ì?©\"ì?? ë??ë¥´ì?ì??ì?¤."
 
-#: ../mail/mail-config.glade.h:65
+#: ../mail/mail-config.glade.h:71
 msgid "De_fault"
 msgstr "ê¸°ë³¸ê°?(_F)"
 
-#: ../mail/mail-config.glade.h:66
+#: ../mail/mail-config.glade.h:72
 msgid "Default character e_ncoding:"
 msgstr "ê¸°ë³¸ ë¬¸ì?? ì?¸ì½?ë?©(_N):"
 
-#: ../mail/mail-config.glade.h:68
+#: ../mail/mail-config.glade.h:74
 msgid "Delete junk messages on e_xit"
 msgstr "ë??ë?  ë?? ì ?í?¬ ë©?ì?¼ ì?ì ?(_X)"
 
-#: ../mail/mail-config.glade.h:70
+#: ../mail/mail-config.glade.h:76
 msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "ë³´ë?´ë?? ë©?ì??ì§?ì?? (ê¸°ë³¸ê°?ì?¼ë¡?) ë??ì§?í?¸ ì??ëª?(_U)"
 
 # FIXME - hard to translate UI + string based on English grammar
 # "Do not format messages when text size exceeds" ____ "KB"
-#: ../mail/mail-config.glade.h:71
+#: ../mail/mail-config.glade.h:77
 msgid "Do not format messages when text si_ze exceeds"
 msgstr "ë©?ì??ì§?ì?? í?¬ê¸°ê°? ë?¤ì??ì?? ë??ì?´ê°?ë©´ ë?´ì?© í??ì??í??ì§? ì??ê¸°(_Z): "
 
-#: ../mail/mail-config.glade.h:72
+#: ../mail/mail-config.glade.h:78
 msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr "ë³´ë?¸ ì?¬ë??ì?´ ì£¼ì??ë¡?ì?? ë?¤ì?´ ì??ì?¼ë©´ ì ?í?¬ë©?ì?¼ë¡? í??ì??í??ì§? ì??ê¸°(_K)"
 
-#: ../mail/mail-config.glade.h:73
-msgid "Do not quote"
-msgstr "ì?¸ì?©í??ì§? ì??ê¸°"
-
-#: ../mail/mail-config.glade.h:74
+#: ../mail/mail-config.glade.h:79
 msgid "Done"
 msgstr "ì??ë£?"
 
-#: ../mail/mail-config.glade.h:75
+#: ../mail/mail-config.glade.h:80
 msgid "Drafts _Folder:"
 msgstr "ì??ì?? ë³´ê´?í?¨ í?´ë??(_F):"
 
-#: ../mail/mail-config.glade.h:76
+#: ../mail/mail-config.glade.h:81
 msgid "Email Accounts"
 msgstr "ë©?ì?¼ ê³?ì ?"
 
-#: ../mail/mail-config.glade.h:77
+#: ../mail/mail-config.glade.h:82
 msgid "Email _Address:"
 msgstr "ì ?ì??ë©?ì?¼ ì£¼ì??(_A):"
 
-#: ../mail/mail-config.glade.h:78
+#: ../mail/mail-config.glade.h:83
 msgid "Empty trash folders on e_xit"
 msgstr "ë??ë?  ë?? í?´ì§?í?µ í?´ë?? ë¹?ì?°ê¸°(_X): "
 
-#: ../mail/mail-config.glade.h:79
+#: ../mail/mail-config.glade.h:84
 msgid "Enable Magic S_pacebar"
 msgstr "ë§?ë?¥ ì?¤í??ì?´ì?¤ë°? ì?¬ì?©(_P)"
 
-#: ../mail/mail-config.glade.h:80
+#: ../mail/mail-config.glade.h:85
 msgid "Enable Sea_rch Folders"
-msgstr "ì°¾ê¸° í?´ë?? ì?¬ì?©(_R)"
+msgstr "ê²?ì?? í?´ë?? ì?¬ì?©(_R)"
 
-#: ../mail/mail-config.glade.h:82
+#: ../mail/mail-config.glade.h:87
 msgid "Encry_ption certificate:"
 msgstr "ì??í?¸í?? ì?¸ì¦?ì??(_P):"
 
-#: ../mail/mail-config.glade.h:83
+#: ../mail/mail-config.glade.h:88
 msgid "Encrypt out_going messages (by default)"
 msgstr "ë³´ë?´ë?? ë©?ì??ì§? ì??í?¸í?? (ê¸°ë³¸ê°?ì?¼ë¡?)(_G)"
 
-#: ../mail/mail-config.glade.h:85
+#: ../mail/mail-config.glade.h:90
 msgid "Fi_xed-width:"
 msgstr "ê³ ì ?í?(_X):"
 
-#: ../mail/mail-config.glade.h:86
+#: ../mail/mail-config.glade.h:91
 msgid "Fix_ed width Font:"
 msgstr "ê³ ì ?í? ê¸?ê¼´(_E):"
 
-#: ../mail/mail-config.glade.h:87
+#: ../mail/mail-config.glade.h:92
 msgid "Font Properties"
 msgstr "ê¸?ê¼´ ì??ì?±"
 
-#: ../mail/mail-config.glade.h:88
+#: ../mail/mail-config.glade.h:93
 msgid "Format messages in _HTML"
 msgstr "HTML í??ì?? ë©?ì??ì§?(_H)"
 
-#: ../mail/mail-config.glade.h:89
+#: ../mail/mail-config.glade.h:94
 msgid "Full Nam_e:"
 msgstr "ì ?ì²´ ì?´ë¦?(_E):"
 
-#: ../mail/mail-config.glade.h:91
+#: ../mail/mail-config.glade.h:96
 msgid "HTML Messages"
 msgstr "HTML ë©?ì??ì§?"
 
-#: ../mail/mail-config.glade.h:92
+#: ../mail/mail-config.glade.h:97
 msgid "H_TTP Proxy:"
 msgstr "HTTP í??ë¡?ì??(_T):"
 
-#: ../mail/mail-config.glade.h:93
+#: ../mail/mail-config.glade.h:98
 msgid "Headers"
 msgstr "í?¤ë??"
 
-#: ../mail/mail-config.glade.h:94
+#: ../mail/mail-config.glade.h:99
 msgid "Highlight _quotations with"
 msgstr "ì?¸ì?©ë¬¸ì?? ë?¤ì?? ì??ê¹?ë¡? í??ì??(_Q):"
 
-#: ../mail/mail-config.glade.h:96
-msgid "Inline"
-msgstr "ì?¸ë?¼ì?¸"
-
-#: ../mail/mail-config.glade.h:97
-msgid "Inline (Outlook style)"
-msgstr "ì?¸ë?¼ì?¸ (Outlook ë°©ì??)"
+#: ../mail/mail-config.glade.h:101
+msgid ""
+"If the server uses a non-standard port then specify the server address as "
+"\"server-name:port-number\""
+msgstr "ì??ë²?ê°? í??ì¤?ì?´ ì??ë?? í?¬í?¸ë¥¼ ì?¬ì?©í??ë?? ê²½ì?° ì??ë²? ì£¼ì??ë¥¼ \"ì??ë²?ì?´ë¦?:í?¬í?¸ë²?í?¸\" í??ì??ì?¼ë¡? ì§?ì ?í??ì?ì??ì?¤"
 
-#: ../mail/mail-config.glade.h:99
+#: ../mail/mail-config.glade.h:103
 msgid "KB"
 msgstr "KB"
 
-#: ../mail/mail-config.glade.h:100 ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.glade.h:104 ../mail/message-list.etspec.h:8
 msgid "Labels"
 msgstr "ë ?ì?´ë¸?"
 
-#: ../mail/mail-config.glade.h:101
+#: ../mail/mail-config.glade.h:105
 msgid "Languages Table"
 msgstr "ì?¸ì?´ í??"
 
-#: ../mail/mail-config.glade.h:102
+#: ../mail/mail-config.glade.h:106
 msgid "Mail Configuration"
 msgstr "ë©?ì?¼ ì?¤ì ?"
 
-#: ../mail/mail-config.glade.h:103
+#: ../mail/mail-config.glade.h:107
 msgid "Mail Headers Table"
 msgstr "ë©?ì?¼ í?¤ë?? í??"
 
-#: ../mail/mail-config.glade.h:105
+#: ../mail/mail-config.glade.h:109
 msgid "Mailbox location"
 msgstr "ë©?ì?¼í?¨ ì??ì¹?"
 
-#: ../mail/mail-config.glade.h:106
+#: ../mail/mail-config.glade.h:110
 msgid "Message Composer"
 msgstr "ë©?ì??ì§? ì??ì?±"
 
-#: ../mail/mail-config.glade.h:107
+#: ../mail/mail-config.glade.h:111
 msgid "No _Proxy for:"
 msgstr "í??ë¡?ì?? ì??ë?? í?¸ì?¤í?¸(_P):"
 
-#: ../mail/mail-config.glade.h:108
+#: ../mail/mail-config.glade.h:112
 msgid ""
 "Note: Underscore in the label name is used as mnemonic identifier in menu."
 msgstr "ì£¼ì??: ë ?ì?´ë¸?ì?? ë°?ì¤?ì?? ë©?ë?´ì?? ë?¨ì¶?í?¤ë¥¼ ì§?ì ?í??ë?? ë?° ì?¬ì?©í?©ë??ë?¤."
 
-#: ../mail/mail-config.glade.h:109
+#: ../mail/mail-config.glade.h:113
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr "ì??ë¦¼: ì²?ì?? ì?°ê²°í??ë©´ ì??í?¸ë¥¼ ë¬¼ì?´ë³´ë?? ì°½ì?´ ë?° ê²?ì??ë??ë?¤"
 
-#: ../mail/mail-config.glade.h:110
+#: ../mail/mail-config.glade.h:114
 msgid "Option is ignored if a match for custom junk headers is found."
 msgstr "ì?¬ì?©ì?? ì§?ì ? ì ?í?¬ ë©?ì?¼ í?¤ë??ê°? ì??ì?¼ë©´ ì?´ ì?µì??ì?? ë¬´ì??í?©ë??ë?¤."
 
-#: ../mail/mail-config.glade.h:111
+#: ../mail/mail-config.glade.h:115
 msgid "Or_ganization:"
 msgstr "ì¡°ì§?(_G):"
 
-#: ../mail/mail-config.glade.h:112
+#: ../mail/mail-config.glade.h:116
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG í?¤ ID(_K):"
 
-#: ../mail/mail-config.glade.h:113
+#: ../mail/mail-config.glade.h:117
 msgid "Pass_word:"
 msgstr "ì??í?¸(_W):"
 
-#: ../mail/mail-config.glade.h:115
+#: ../mail/mail-config.glade.h:119
+msgid "Please configure the following account settings."
+msgstr "ë?¤ì?? ê³?ì ? ì?¤ì ?ì?? í??ì?ì??ì?¤."
+
+#: ../mail/mail-config.glade.h:120
 msgid ""
-"Please enter a descriptive name for this account in the space below.\n"
-"This name will be used for display purposes only."
-msgstr ""
-"ì??ë?? ê³µë°±ì?? ì?´ ê³?ì ?ì?? ë??í?´ ì?¤ëª?í??ë?? ì?´ë¦?ì?? ì??ë ¥í??ì?ì??ì?¤.\n"
-"ì?´ ì?´ë¦?ì?? í??ì??í??ë?? ëª©ì ?ì?¼ë¡?ë§? ì?¬ì?©í?©ë??ë?¤."
+"Please enter a descriptive name for this account in the space below. This "
+"name will be used for display purposes only."
+msgstr "ì??ë?? ê³µë°±ì?? ì?´ ê³?ì ?ì?? ë??í?´ ì?¤ëª?í??ë?? ì?´ë¦?ì?? ì??ë ¥í??ì?ì??ì?¤. ì?´ ì?´ë¦?ì?? í??ì??í??ë?? ëª©ì ?ì?¼ë¡?ë§? ì?¬ì?©í?©ë??ë?¤."
 
-#: ../mail/mail-config.glade.h:117
+#: ../mail/mail-config.glade.h:121
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -14751,7 +13559,7 @@ msgstr ""
 "ë©?ì?¼ì?? ë³´ë?¼ ë°©ë²?ì?? ë??í?´ ì ?ë³´ë¥¼ ì??ë ¥í??ì?ì??ì?¤. ì?? ëª¨ë¥´ê² ì?¼ë©´, ì??ì?¤í?? ê´?ë¦¬ì??ë?? "
 "ì?¸í?°ë?· ì??ë¹?ì?¤ ì ?ê³µì??ì??ê²? ë¬¼ì?´ ë³´ì?ì??ì?¤."
 
-#: ../mail/mail-config.glade.h:118
+#: ../mail/mail-config.glade.h:122
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
@@ -14760,58 +13568,42 @@ msgstr ""
 "ì??ë??ì?? ì?´ë¦?ê³¼ ë©?ì?¼ ì£¼ì??ë¥¼ ì??ë ¥í??ì?ì??ì?¤. ê·¸ ì??ë??ì?? ì??ë?? \"ì¶?ê°?\" í??ë??ë?? ë©?ì?¼"
 "ì?? ë³´ë?¼ ë?? ì ?ë³´ë¥¼ ì¶?ê°?í??ì§? ì??ê³  ì?¶ì?¼ë©´ ì±?ì?°ì§? ì??ì??ë?? ë?©ë??ë?¤."
 
-#: ../mail/mail-config.glade.h:119
-msgid "Please select among the following options"
-msgstr "ë?¤ì?? ì?µì?? ì¤?ì?? í??ë??ë¥¼ ì? í??í??ì?ì??ì?¤"
-
-#: ../mail/mail-config.glade.h:120
+#: ../mail/mail-config.glade.h:123
 msgid "Port:"
 msgstr "í?¬í?¸:"
 
-#: ../mail/mail-config.glade.h:121
+#: ../mail/mail-config.glade.h:124
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "ì?¨ì?? ì°¸ì¡°ë¡?ë§? ë©?ì??ì§?ë¥¼ ë³´ë?¼ ë?? í??ì?¸ ì§?ë¬¸(_O)"
 
-#: ../mail/mail-config.glade.h:122
-msgid "Quoted"
-msgstr "ì?¸ì?©"
-
-#: ../mail/mail-config.glade.h:123
+#: ../mail/mail-config.glade.h:125
 msgid "Re_member password"
 msgstr "ì??í?¸ ê¸°ì?µ(_M)"
 
-#: ../mail/mail-config.glade.h:124
+#: ../mail/mail-config.glade.h:126
 msgid "Re_ply-To:"
 msgstr "í??ì?  ì£¼ì??(_P):"
 
-#: ../mail/mail-config.glade.h:126
+#: ../mail/mail-config.glade.h:128
 msgid "Remember _password"
 msgstr "ì??í?¸ ê¸°ì?µ(_P)"
 
-#: ../mail/mail-config.glade.h:127
-msgid "S_OCKS Host:"
-msgstr "SOCKS í?¸ì?¤í?¸(_O):"
-
-#: ../mail/mail-config.glade.h:128
+#: ../mail/mail-config.glade.h:129
 msgid "S_earch for sender photograph only in local address books"
-msgstr "ë¡?ì»¬ ì£¼ì??ë¡?ì??ì??ë§? ë³´ë?¸ ì?¬ë??ì?? ì?¬ì§? ì°¾ê¸°(_E)"
+msgstr "ë¡?ì»¬ ì£¼ì??ë¡?ì??ì??ë§? ë³´ë?¸ ì?¬ë??ì?? ì?¬ì§? ê²?ì??(_E)"
 
-#: ../mail/mail-config.glade.h:129
+#: ../mail/mail-config.glade.h:130
 msgid "S_elect..."
 msgstr "ì? í??(_E)..."
 
-#: ../mail/mail-config.glade.h:130
+#: ../mail/mail-config.glade.h:131
 msgid "S_end message receipts:"
 msgstr "ë©?ì??ì§? ì??ì?  í??ì?¸ ë³´ë?´ê¸°(_E):"
 
-#: ../mail/mail-config.glade.h:131
+#: ../mail/mail-config.glade.h:132
 msgid "S_tandard Font:"
 msgstr "ì?¼ë°? ê¸?ê¼´(_T):"
 
-#: ../mail/mail-config.glade.h:133
-msgid "Select Drafts Folder"
-msgstr "ê¸°ë³¸ í?´ë?? ì? í??"
-
 #: ../mail/mail-config.glade.h:134
 msgid "Select HTML fixed width font"
 msgstr "HTML ê³ ì ?í? ê¸?ê¼´ì?? ì? í??í??ì?ì??ì?¤"
@@ -14828,70 +13620,63 @@ msgstr "HTML ê°?ë³?í? ê¸?ê¼´ì?? ì? í??í??ì?ì??ì?¤"
 msgid "Select HTML variable width font for printing"
 msgstr "ì?¸ì??ì?? ì?¬ì?©í?  HTML ê°?ë³?í? ê¸?ê¼´ì?? ì? í??í??ì?ì??ì?¤"
 
-#: ../mail/mail-config.glade.h:138
-msgid "Select Sent Folder"
-msgstr "ë³´ë?¸ í?¸ì§?í?¨ í?´ë?? ì? í??"
-
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:139
 msgid "Sending Mail"
 msgstr "ë©?ì?¼ ë³´ë?´ê¸°"
 
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.glade.h:140
 msgid "Sent _Messages Folder:"
 msgstr "ë³´ë?¸ í?¸ì§?í?¨ í?´ë??(_M):"
 
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.glade.h:141
 msgid "Ser_ver requires authentication"
 msgstr "ì??ë²?ì?? ì?¸ì¦?ì?´ í??ì??(_V)"
 
-#: ../mail/mail-config.glade.h:143
-msgid "Server _Type: "
-msgstr "ì??ë²? ì¢?ë¥?(_T): "
+#: ../mail/mail-config.glade.h:142
+msgid "Server _Type:"
+msgstr "ì??ë²? ì¢?ë¥?(_T):"
 
-#: ../mail/mail-config.glade.h:144
+#: ../mail/mail-config.glade.h:143
 msgid "Sig_ning certificate:"
 msgstr "ì??ëª? ì?¸ì¦?ì??(_N):"
 
-#: ../mail/mail-config.glade.h:145
+#: ../mail/mail-config.glade.h:144
 msgid "Signat_ure:"
 msgstr "ì??ëª?(_U):"
 
-#: ../mail/mail-config.glade.h:146
+#: ../mail/mail-config.glade.h:145
 msgid "Signatures"
 msgstr "ì??ëª?"
 
-#: ../mail/mail-config.glade.h:147
+#: ../mail/mail-config.glade.h:146
 msgid "Signatures Table"
 msgstr "ì??ëª? í??"
 
-#: ../mail/mail-config.glade.h:148
+#: ../mail/mail-config.glade.h:147
 msgid "Spell Checking"
 msgstr "ë§?ì¶¤ë²? ê²?ì?¬"
 
-#: ../mail/mail-config.glade.h:149
+#: ../mail/mail-config.glade.h:148
 msgid "Start _typing at the bottom on replying"
 msgstr "ë?µì?¥í?  ë?? ë§¨ ì??ë??ë¶?í?° ì??ë ¥ ì??ì??(_T)"
 
-#: ../mail/mail-config.glade.h:150
-msgid "T_ype: "
-msgstr "ë°©ì??(_Y): "
+#: ../mail/mail-config.glade.h:149
+msgid "T_ype:"
+msgstr "ì¢?ë¥?(_Y):"
 
-#: ../mail/mail-config.glade.h:151
+#: ../mail/mail-config.glade.h:150
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr "ì?´ ì?¸ì?´ ëª©ë¡?ì?? ì?¬ì ?ì?? ì?¤ì¹?í?? ì?¸ì?´ë§? ë?¤ì?´ ì??ì?µë??ë?¤."
 
-#: ../mail/mail-config.glade.h:152
+#: ../mail/mail-config.glade.h:151
 msgid ""
 "The output of this script will be used as your\n"
-"signature. The name you specify will be used\n"
-"for display purposes only. "
-msgstr ""
-"ë?¤ì?? ì?¤í?¬ë¦½í?¸ì?? ì¶?ë ¥ì?? ì??ëª?ì?¼ë¡? ì?¬ì?©í?©ë??ë?¤. \"ì?´ë¦?\"ì?? í??ì?? ëª©ì ?ì?¼ë¡?ë§? ì?´ì?©í?©"
-"ë??ë?¤."
+"signature. The name you specify will be used for display purposes only."
+msgstr "ë?¤ì?? ì?¤í?¬ë¦½í?¸ì?? ì¶?ë ¥ì?? ì??ëª?ì?¼ë¡? ì?¬ì?©í?©ë??ë?¤. ì§?ì ?í??ë?? ì?´ë¦?ì?? í??ì?? ëª©ì ?ì?¼ë¡?ë§? ì?´ì?©í?©ë??ë?¤."
 
-#: ../mail/mail-config.glade.h:155
+#: ../mail/mail-config.glade.h:153
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -14899,168 +13684,168 @@ msgstr ""
 "ì?´ ê³?ì ?ì?? ì?¸ ì?´ë¦?ì?? ì??ë ¥í??ì?ì??ì?¤.\n"
 "ì??: \"ì??ì??ì?©\" ë??ë?? \"ê°?ì?¸ì?©\""
 
-#: ../mail/mail-config.glade.h:157
+#: ../mail/mail-config.glade.h:155
 msgid "Us_ername:"
 msgstr "ì?¬ì?©ì??ì?´ë¦?(_E):"
 
-#: ../mail/mail-config.glade.h:158
+#: ../mail/mail-config.glade.h:156
 msgid "Use Authe_ntication"
 msgstr "ì?¸ì¦? ì?¬ì?©(_N)"
 
-#: ../mail/mail-config.glade.h:159 ../plugins/caldav/caldav-source.c:387
-#: ../plugins/google-account-setup/google-source.c:615
-#: ../plugins/google-account-setup/google-contacts-source.c:316
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:348
+#: ../mail/mail-config.glade.h:157 ../plugins/caldav/caldav-source.c:405
+#: ../plugins/google-account-setup/google-source.c:681
+#: ../plugins/google-account-setup/google-contacts-source.c:280
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:307
 msgid "User_name:"
 msgstr "ì?¬ì?©ì??ì?´ë¦?(_N):"
 
-#: ../mail/mail-config.glade.h:160
+#: ../mail/mail-config.glade.h:158
 msgid "V_ariable-width:"
 msgstr "ê°?ë³?í?(_A):"
 
-#: ../mail/mail-config.glade.h:161
+#: ../mail/mail-config.glade.h:159
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
-"Click \"Forward\" to begin. "
+"Click \"Forward\" to begin."
 msgstr ""
 "ì??ë³¼ë£¨ì?? ë©?ì?¼ ì?¤ì ? ë??ì?°ë¯¸ì?? ì?¤ì?  ê²?ì?? í??ì??í?©ë??ë?¤.\n"
 "\n"
-"ì??ì??í??ë ¤ë©´ \"ì??ì?¼ë¡?\"ë¥¼ ë??ë¥´ì?ì??ì?¤. "
+"ì??ì??í??ë ¤ë©´ \"ì??ì?¼ë¡?\"ë¥¼ ë??ë¥´ì?ì??ì?¤."
 
-#: ../mail/mail-config.glade.h:164
+#: ../mail/mail-config.glade.h:162
 msgid "_Add Signature"
 msgstr "ì??ëª? ì¶?ê°?(_A)"
 
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:163
 msgid "_Always load images from the Internet"
 msgstr "í?ì?? ì?¸í?°ë?·ì??ì?? ê·¸ë¦¼ ì?½ì?´ë?¤ì?´ê¸°(_A)"
 
-#: ../mail/mail-config.glade.h:166
-msgid "_Automatic proxy configuration URL:"
-msgstr "ì??ë?? í??ë¡?ì?? ì?¤ì ? URL(_A):"
-
-#: ../mail/mail-config.glade.h:167
+#: ../mail/mail-config.glade.h:164
 msgid "_Default junk plugin:"
 msgstr "ê¸°ë³¸ ì ?í?¬ ë©?ì?¼ í??ë?¬ê·¸ì?¸(_D):"
 
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:165
 msgid "_Direct connection to the Internet"
 msgstr "ì?¸í?°ë?·ì?? ì§?ì ? ì?°ê²°(_D)"
 
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.glade.h:166
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "ëª¨ì?? ì??ì²ì?? ì??ëª?í??ì§? ì??ê¸° (Outlook í?¸í??)(_D)"
 
-#: ../mail/mail-config.glade.h:171
+#: ../mail/mail-config.glade.h:168
 msgid "_Forward style:"
 msgstr "ì ?ë?¬ ëª¨ì??(_F):"
 
-#: ../mail/mail-config.glade.h:172
+#: ../mail/mail-config.glade.h:169
 msgid "_Keep Signature above the original message on replying"
 msgstr "ë?µì?¥ì?? ì?¸ ë?? ì??ë¬¸ ì??ì?? ì??ëª? ë??ê¸°(_K)"
 
-#: ../mail/mail-config.glade.h:173
+#: ../mail/mail-config.glade.h:170
 msgid "_Load images in messages from contacts"
 msgstr "ì£¼ì??ë¡?ì?? ì??ë?? ì?¬ë??ì?´ ë³´ë?¸ ë©?ì?¼ì?? ê·¸ë¦¼ ì?½ì?´ë?¤ì?´ê¸°(_L)"
 
-#: ../mail/mail-config.glade.h:174
+#: ../mail/mail-config.glade.h:171
 msgid "_Lookup in local address book only"
 msgstr "ë¡?ì»¬ ì£¼ì??ë¡?ë§? ì°¾ì?? ë³´ê¸°(_L)"
 
-#: ../mail/mail-config.glade.h:175
+#: ../mail/mail-config.glade.h:172
 msgid "_Make this my default account"
 msgstr "ë?´ ê¸°ë³¸ ê³?ì ?ì?¼ë¡? í??ê¸°(_M)"
 
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.glade.h:173
 msgid "_Manual proxy configuration:"
 msgstr "ì??ë?? í??ë¡?ì?? ì?¤ì ?(_M):"
 
 # FIXME - hard to translate UI + string based on English grammar
 # "Mark messages as read after <seconds> seconds"
-#: ../mail/mail-config.glade.h:177
+#: ../mail/mail-config.glade.h:174
 msgid "_Mark messages as read after"
 msgstr "ë?¤ì?? ì??ê°?ì?´ ì§?ë??ë©´ ì?½ì?? ê²?ì?¼ë¡? í??ì??(_M):"
 
-#: ../mail/mail-config.glade.h:179
+#: ../mail/mail-config.glade.h:176
 msgid "_Never load images from the Internet"
 msgstr "ê·¸ë¦¼ì?? ì?¸í?°ë?·ì??ì?? ì?½ì?´ë?¤ì?´ì§? ì??ê¸°(_N)"
 
-#: ../mail/mail-config.glade.h:180
+#: ../mail/mail-config.glade.h:177
 msgid "_Path:"
 msgstr "ê²½ë¡?(_P):"
 
-#: ../mail/mail-config.glade.h:181
+#: ../mail/mail-config.glade.h:178
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "HTML ë©?ì?¼ì?? ë°?ê³  ì?¶ì§? ì??ì?? ì?¬ë??í??í?? ë³´ë?¼ ë?? í??ì?¸ ì§?ë¬¸(_P)"
 
-#: ../mail/mail-config.glade.h:182
+#: ../mail/mail-config.glade.h:179
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "ì ?ëª©ì?´ ì??ì?´ ë©?ì??ì§?ë¥¼ ë³´ë?¼ ë?? í??ì?¸ ì§?ë¬¸(_P)"
 
-#: ../mail/mail-config.glade.h:183
+#: ../mail/mail-config.glade.h:180
 msgid "_Reply style:"
 msgstr "í??ì?  ëª¨ì??(_R):"
 
-#: ../mail/mail-config.glade.h:184
+#: ../mail/mail-config.glade.h:181
 msgid "_Script:"
 msgstr "ì?¤í?¬ë¦½í?¸(_S):"
 
-#: ../mail/mail-config.glade.h:185
+#: ../mail/mail-config.glade.h:182
 msgid "_Secure HTTP Proxy:"
 msgstr "ë³´ì?? HTTP í??ë¡?ì??(_S):"
 
-#: ../mail/mail-config.glade.h:186
+#: ../mail/mail-config.glade.h:183
 msgid "_Select..."
 msgstr "ì? í??(_S)..."
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.glade.h:189
+#: ../mail/mail-config.glade.h:186
 msgid "_Show image animations"
 msgstr "ê·¸ë¦¼ ì? ë??ë©?ì?´ì?? ë³´ê¸°(_S)"
 
-#: ../mail/mail-config.glade.h:190
+#: ../mail/mail-config.glade.h:187
 msgid "_Show the photograph of sender in the message preview"
 msgstr "ë©?ì?¼ ë¯¸ë¦¬ ë³´ê¸°ì??ì?? ë³´ë?¸ ì?¬ë??ì?? ì?¬ì§? ë³´ê¸°(_S)"
 
 # FIXME - hard to translate UI + string based on English grammar
 # "Shrink To / Cc / Bcc headers to ____ addresses"
-#: ../mail/mail-config.glade.h:191
+#: ../mail/mail-config.glade.h:188
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "ë°?ë?? ì?¬ë?? / ì°¸ì¡° / ì?¨ì?? ì°¸ì¡° í?¤ë?? ì¤?ì?´ê¸°(_S): "
 
-#: ../mail/mail-config.glade.h:192
+#: ../mail/mail-config.glade.h:189
 msgid "_Use Secure Connection:"
 msgstr "ë³´ì?? ì?°ê²° ì?¬ì?©(_U):"
 
-#: ../mail/mail-config.glade.h:193
+#: ../mail/mail-config.glade.h:190
 msgid "_Use system defaults"
 msgstr "ì??ì?¤í?? ê¸°ë³¸ê°? ì?¬ì?©(_U)"
 
-#: ../mail/mail-config.glade.h:194
+#: ../mail/mail-config.glade.h:191
 msgid "_Use the same fonts as other applications"
 msgstr "ë?¤ë¥¸ í??ë¡?ê·¸ë?¨ê³¼ ê°?ì?? ê¸?ê¼´ ì?¬ì?©(_U)"
 
 # FIXME - hard to translate UI + string based on English grammar
-#: ../mail/mail-config.glade.h:195
+#: ../mail/mail-config.glade.h:194
 msgid "addresses"
 msgstr "ê°? ì£¼ì??"
 
-#: ../mail/mail-config.glade.h:196
+#: ../mail/mail-config.glade.h:195
 msgid "color"
 msgstr "ì??ì??"
 
-#: ../mail/mail-config.glade.h:197
+#: ../mail/mail-config.glade.h:196
 msgid "description"
 msgstr "ì?¤ëª?"
 
+#: ../mail/mail-config.glade.h:197
+msgid "seconds"
+msgstr "ì´?"
+
 #: ../mail/mail-dialogs.glade.h:1
 msgid "    "
 msgstr "    "
 
 #: ../mail/mail-dialogs.glade.h:2
 msgid "<b>Search Folder Sources</b>"
-msgstr "<b>ì°¾ê¸° í?´ë?? ì??ì?¤</b>"
+msgstr "<b>ê²?ì?? í?´ë?? ì??ì?¤</b>"
 
 #: ../mail/mail-dialogs.glade.h:3
 msgid "<span weight=\"bold\">Digital Signature</span>"
@@ -15083,50 +13868,34 @@ msgid "All local folders"
 msgstr "ëª¨ë?  ë¡?ì»¬ í?´ë??"
 
 #: ../mail/mail-dialogs.glade.h:8
-msgid "Case _sensitive"
-msgstr "ë??ì??ë¬¸ì?? êµ¬ë³?(_S)"
-
-#: ../mail/mail-dialogs.glade.h:9
 msgid "Co_mpleted"
 msgstr "ì??ë£?ë?¨(_M)"
 
-#: ../mail/mail-dialogs.glade.h:10
-msgid "F_ind:"
-msgstr "ì°¾ê¸°(_I):"
-
-#: ../mail/mail-dialogs.glade.h:11
-msgid "Find in Message"
-msgstr "ë©?ì??ì§?ì??ì?? ì°¾ì??"
-
-#: ../mail/mail-dialogs.glade.h:12 ../mail/message-tag-followup.c:276
+#: ../mail/mail-dialogs.glade.h:9 ../mail/message-tag-followup.c:270
 msgid "Flag to Follow Up"
 msgstr "ì¶?ê°? ì??ì?? ë©?ì??ì§? í??ë??ê·¸"
 
-#: ../mail/mail-dialogs.glade.h:13
+#: ../mail/mail-dialogs.glade.h:10
 msgid "Folder Subscriptions"
 msgstr "í?´ë?? êµ¬ë??"
 
-#: ../mail/mail-dialogs.glade.h:14
+#: ../mail/mail-dialogs.glade.h:11
 msgid "License Agreement"
 msgstr "ì?¬ì?©ê¶? ì?½ê´?"
 
-#: ../mail/mail-dialogs.glade.h:15
-msgid "None Selected"
-msgstr "ì? í??í??ì§? ì??ì??ì?µë??ë?¤"
-
-#: ../mail/mail-dialogs.glade.h:16
+#: ../mail/mail-dialogs.glade.h:12
 msgid "S_erver:"
 msgstr "ì??ë²?(_E):"
 
-#: ../mail/mail-dialogs.glade.h:17
+#: ../mail/mail-dialogs.glade.h:13
 msgid "Security Information"
 msgstr "ë³´ì?? ì ?ë³´"
 
-#: ../mail/mail-dialogs.glade.h:18
+#: ../mail/mail-dialogs.glade.h:14
 msgid "Specific folders"
 msgstr "ì§?ì ?í?? í?´ë??"
 
-#: ../mail/mail-dialogs.glade.h:19
+#: ../mail/mail-dialogs.glade.h:15
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -15134,19 +13903,19 @@ msgstr ""
 "ë?¤ì??ì?? ì¶?ê°? ì??ì?? í??ë??ê·¸ë¥¼ í??ì??í??ë ¤ê³  ì? í??í?? ë©?ì??ì§?ì??ë??ë?¤.\n"
 "\"í??ë??ê·¸\" ë©?ë?´ì??ì?? ì¶?ê°? ì??ì?? ë??ì??ì?? ì? í??í??ì?ì??ì?¤."
 
-#: ../mail/mail-dialogs.glade.h:21
+#: ../mail/mail-dialogs.glade.h:17
 msgid "_Accept License"
 msgstr "ì?¬ì?©ê¶? ë??ì??(_A)"
 
-#: ../mail/mail-dialogs.glade.h:22
+#: ../mail/mail-dialogs.glade.h:18
 msgid "_Due By:"
 msgstr "ë§?ê°?(_D):"
 
-#: ../mail/mail-dialogs.glade.h:23
+#: ../mail/mail-dialogs.glade.h:19
 msgid "_Flag:"
 msgstr "í??ì??(_F):"
 
-#: ../mail/mail-dialogs.glade.h:24
+#: ../mail/mail-dialogs.glade.h:20
 msgid "_Tick this to accept the license agreement"
 msgstr "ì?¬ì?©ê¶? ì?½ê´?ì?? ë??ì??í??ì??ë©´ ì?¬ê¸°ì?? ì²´í?¬í??ì?ì??ì?¤(_T)"
 
@@ -15157,22 +13926,22 @@ msgid "Pinging %s"
 msgstr "\"%s\" ì?°ê²°ì?? í??ì?¸í??ë?? ì¤?"
 
 # ì£¼ì??: ë?¤ë¥¸ ë©?ì??ì§?ì?? ì?¼ë¶?ë¡? ì?°ì?¸ë?¤. ë¬¸ì?¥ì?¼ë¡? ë²?ì?í??ì§? ë§? ê²?.
-#: ../mail/mail-ops.c:106
+#: ../mail/mail-ops.c:107
 msgid "Filtering Selected Messages"
 msgstr "ì? í??í?? ë©?ì??ì§? í??í?°ë§?í??ë?? ì¤?"
 
 # ì£¼ì??: ë?¤ë¥¸ ë©?ì??ì§?ì?? ì?¼ë¶?ë¡? ì?°ì?¸ë?¤. ë¬¸ì?¥ì?¼ë¡? ë²?ì?í??ì§? ë§? ê²?.
-#: ../mail/mail-ops.c:265
+#: ../mail/mail-ops.c:266
 msgid "Fetching Mail"
 msgstr "ë©?ì?¼ ê°?ì ¸ì?¤ë?? ì¤?"
 
 #. sending mail, filtering failed
-#: ../mail/mail-ops.c:561
+#: ../mail/mail-ops.c:562
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "ë??ê°?ë?? í??í?°ë¥¼ ì ?ì?©í??ë?? ë?° ì?¤í?¨í??ì?µë??ë?¤: %s"
 
-#: ../mail/mail-ops.c:573 ../mail/mail-ops.c:602
+#: ../mail/mail-ops.c:574 ../mail/mail-ops.c:601
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -15181,139 +13950,139 @@ msgstr ""
 "%sì?? ì¶?ê°?í??ë?? ë?° ì?¤í?¨í??ì?µë??ë?¤: %s\n"
 "ë??ì? ì?? ë¡?ì»¬ì?? `ë³´ë?¸ í?¸ì§?í?¨'ì?? ì¶?ê°?í?©ë??ë?¤."
 
-#: ../mail/mail-ops.c:619
+#: ../mail/mail-ops.c:618
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "ë¡?ì»¬ì?? 'ë³´ë?¸ í?¸ì§?í?¨' í?´ë??ì?? ì¶?ê°?í??ë?? ë?° ì?¤í?¨í??ì?µë??ë?¤: %s"
 
 # ì£¼ì??: ë?¤ë¥¸ ë©?ì??ì§?ì?? ì?¼ë¶?ë¡? ì?°ì?¸ë?¤. ë¬¸ì?¥ì?¼ë¡? ë²?ì?í??ì§? ë§? ê²?.
-#: ../mail/mail-ops.c:725
+#: ../mail/mail-ops.c:724 ../mail/mail-ops.c:805
 msgid "Sending message"
 msgstr "ë©?ì??ì§? ë³´ë?´ë?? ì¤?ì??ë??ë?¤"
 
 # ì£¼ì??: ë?¤ë¥¸ ë©?ì??ì§?ì?? ì?¼ë¶?ë¡? ì?°ì?¸ë?¤. ë¬¸ì?¥ì?¼ë¡? ë²?ì?í??ì§? ë§? ê²?.
-#: ../mail/mail-ops.c:735
+#: ../mail/mail-ops.c:734
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "%2$dê°? ì¤?ì??ì?? %1$dë²?ì§¸ ë©?ì??ì§?ë¥¼ ë³´ë?´ë?? ì¤?"
 
-#: ../mail/mail-ops.c:762
+#: ../mail/mail-ops.c:761
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "%2$dê°? ë©?ì??ì§? ì¤?ì??ì?? %1$dë²?ì§¸ë¥¼ ë³´ë?´ë?? ë?° ì?¤í?¨í??ì?µë??ë?¤"
 
-#: ../mail/mail-ops.c:764 ../mail/mail-send-recv.c:700
+#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:701
 msgid "Canceled."
 msgstr "ì·¨ì??í?¨."
 
-#: ../mail/mail-ops.c:766 ../mail/mail-send-recv.c:702
+#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:703
 msgid "Complete."
 msgstr "ì??ë£?."
 
 # ì£¼ì??: ë?¤ë¥¸ ë©?ì??ì§?ì?? ì?¼ë¶?ë¡? ì?°ì?¸ë?¤. ë¬¸ì?¥ì?¼ë¡? ë²?ì?í??ì§? ë§? ê²?.
-#: ../mail/mail-ops.c:872
+#: ../mail/mail-ops.c:877
 msgid "Saving message to folder"
 msgstr "ë©?ì??ì§?ë¥¼ í?´ë??ë¡? ì ?ì?¥í??ë?? ì¤?"
 
 # ì£¼ì??: ë?¤ë¥¸ ë©?ì??ì§?ì?? ì?¼ë¶?ë¡? ì?°ì?¸ë?¤. ë¬¸ì?¥ì?¼ë¡? ë²?ì?í??ì§? ë§? ê²?.
-#: ../mail/mail-ops.c:950
+#: ../mail/mail-ops.c:954
 #, c-format
 msgid "Moving messages to %s"
 msgstr "ë©?ì??ì§?ë?¤ì?? %s(ì?¼)ë¡? ì?®ê¸°ë?? ì¤?"
 
 # ì£¼ì??: ë?¤ë¥¸ ë©?ì??ì§?ì?? ì?¼ë¶?ë¡? ì?°ì?¸ë?¤. ë¬¸ì?¥ì?¼ë¡? ë²?ì?í??ì§? ë§? ê²?.
-#: ../mail/mail-ops.c:950
+#: ../mail/mail-ops.c:954
 #, c-format
 msgid "Copying messages to %s"
 msgstr "ë©?ì??ì§?ë?¤ì?? %s(ì?¼)ë¡? ë³µì?¬í??ë?? ì¤?"
 
-#: ../mail/mail-ops.c:1167
+#: ../mail/mail-ops.c:1171
 msgid "Forwarded messages"
 msgstr "ì ?ë?¬í?? ë©?ì??ì§?"
 
 # ì£¼ì??: ë?¤ë¥¸ ë©?ì??ì§?ì?? ì?¼ë¶?ë¡? ì?°ì?¸ë?¤. ë¬¸ì?¥ì?¼ë¡? ë²?ì?í??ì§? ë§? ê²?.
-#: ../mail/mail-ops.c:1208
+#: ../mail/mail-ops.c:1212
 #, c-format
 msgid "Opening folder %s"
 msgstr "%s í?´ë??ë¥¼ ì?¬ë?? ì¤?"
 
 # ì£¼ì??: ë?¤ë¥¸ ë©?ì??ì§?ì?? ì?¼ë¶?ë¡? ì?°ì?¸ë?¤. ë¬¸ì?¥ì?¼ë¡? ë²?ì?í??ì§? ë§? ê²?.
-#: ../mail/mail-ops.c:1273
+#: ../mail/mail-ops.c:1277
 #, c-format
 msgid "Retrieving quota information for folder %s"
 msgstr "%s í?´ë??ì?? ì?©ë?? ì ?í?? ì ?ë³´ë¥¼ ê°?ì ¸ì?¤ë?? ì¤?"
 
 # ì£¼ì??: ë?¤ë¥¸ ë©?ì??ì§?ì?? ì?¼ë¶?ë¡? ì?°ì?¸ë?¤. ë¬¸ì?¥ì?¼ë¡? ë²?ì?í??ì§? ë§? ê²?.
-#: ../mail/mail-ops.c:1342
+#: ../mail/mail-ops.c:1346
 #, c-format
 msgid "Opening store %s"
 msgstr "ì ?ì?¥ê³  %sì??(ë¥¼) ì?¬ë?? ì¤?"
 
 # ì£¼ì??: ë?¤ë¥¸ ë©?ì??ì§?ì?? ì?¼ë¶?ë¡? ì?°ì?¸ë?¤. ë¬¸ì?¥ì?¼ë¡? ë²?ì?í??ì§? ë§? ê²?.
-#: ../mail/mail-ops.c:1413
+#: ../mail/mail-ops.c:1417
 #, c-format
 msgid "Removing folder %s"
 msgstr "%s í?´ë??ë¥¼ ì ?ê±°í??ë?? ì¤?"
 
 # ì£¼ì??: ë?¤ë¥¸ ë©?ì??ì§?ì?? ì?¼ë¶?ë¡? ì?°ì?¸ë?¤. ë¬¸ì?¥ì?¼ë¡? ë²?ì?í??ì§? ë§? ê²?.
-#: ../mail/mail-ops.c:1531
+#: ../mail/mail-ops.c:1535
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "%s í?´ë??ë¥¼ ì ?ì?¥í??ë?? ì¤?"
 
 # ì£¼ì??: ë?¤ë¥¸ ë©?ì??ì§?ì?? ì?¼ë¶?ë¡? ì?°ì?¸ë?¤. ë¬¸ì?¥ì?¼ë¡? ë²?ì?í??ì§? ë§? ê²?.
-#: ../mail/mail-ops.c:1594
+#: ../mail/mail-ops.c:1598
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "ê³?ì ? '%s'ì?? ì§?ì?´ ë©?ì??ì§?ë¥¼ ë¹?ì?°ê³  ë?´ì?©ì?? ì ?ì?¥í??ë?? ì¤?"
 
 # ì£¼ì??: ë?¤ë¥¸ ë©?ì??ì§?ì?? ì?¼ë¶?ë¡? ì?°ì?¸ë?¤. ë¬¸ì?¥ì?¼ë¡? ë²?ì?í??ì§? ë§? ê²?.
-#: ../mail/mail-ops.c:1595
+#: ../mail/mail-ops.c:1599
 #, c-format
 msgid "Storing account '%s'"
 msgstr "%s ê³?ì ?ì?? ì ?ì?¥í??ë?? ì¤?"
 
 # ì£¼ì??: ë?¤ë¥¸ ë©?ì??ì§?ì?? ì?¼ë¶?ë¡? ì?°ì?¸ë?¤. ë¬¸ì?¥ì?¼ë¡? ë²?ì?í??ì§? ë§? ê²?.
-#: ../mail/mail-ops.c:1649
+#: ../mail/mail-ops.c:1653
 msgid "Refreshing folder"
 msgstr "í?´ë?? ë?¤ì?? ì?½ë?? ì¤?"
 
 # ì£¼ì??: ë?¤ë¥¸ ë©?ì??ì§?ì?? ì?¼ë¶?ë¡? ì?°ì?¸ë?¤. ë¬¸ì?¥ì?¼ë¡? ë²?ì?í??ì§? ë§? ê²?.
-#: ../mail/mail-ops.c:1689 ../mail/mail-ops.c:1739
+#: ../mail/mail-ops.c:1693 ../mail/mail-ops.c:1743
 msgid "Expunging folder"
 msgstr "ì§?ì?´ ë©?ì??ì§?ë¥¼ ë¹?ì?°ë?? ì¤?"
 
 # ì£¼ì??: ë?¤ë¥¸ ë©?ì??ì§?ì?? ì?¼ë¶?ë¡? ì?°ì?¸ë?¤. ë¬¸ì?¥ì?¼ë¡? ë²?ì?í??ì§? ë§? ê²?.
-#: ../mail/mail-ops.c:1736
+#: ../mail/mail-ops.c:1740
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "'%s' ì??ì?? í?´ì§?í?µì?? ë¹?ì?°ë?? ì¤?"
 
-#: ../mail/mail-ops.c:1737
+#: ../mail/mail-ops.c:1741
 msgid "Local Folders"
 msgstr "ë¡?ì»¬ í?´ë??"
 
 # ì£¼ì??: ë?¤ë¥¸ ë©?ì??ì§?ì?? ì?¼ë¶?ë¡? ì?°ì?¸ë?¤. ë¬¸ì?¥ì?¼ë¡? ë²?ì?í??ì§? ë§? ê²?.
-#: ../mail/mail-ops.c:1818
+#: ../mail/mail-ops.c:1822
 #, c-format
 msgid "Retrieving message %s"
 msgstr "ë©?ì??ì§? %sì??(ë¥¼) ê°?ì ¸ì?¤ë?? ì¤?"
 
 # ì£¼ì??: ë?¤ë¥¸ ë©?ì??ì§?ì?? ì?¼ë¶?ë¡? ì?°ì?¸ë?¤. ë¬¸ì?¥ì?¼ë¡? ë²?ì?í??ì§? ë§? ê²?.
-#: ../mail/mail-ops.c:1925
+#: ../mail/mail-ops.c:1931
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "ë©?ì??ì§? %dê°?ë¥¼ ê°?ì ¸ì?¤ë?? ì¤?"
 
 # ì£¼ì??: ë?¤ë¥¸ ë©?ì??ì§?ì?? ì?¼ë¶?ë¡? ì?°ì?¸ë?¤. ë¬¸ì?¥ì?¼ë¡? ë²?ì?í??ì§? ë§? ê²?.
-#: ../mail/mail-ops.c:2010
+#: ../mail/mail-ops.c:2016
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "ë©?ì??ì§? %dê°?ë¥¼ ì ?ì?¥í??ë?? ì¤?"
 
-#: ../mail/mail-ops.c:2088
+#: ../mail/mail-ops.c:2096
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -15323,11 +14092,11 @@ msgstr ""
 " %s"
 
 # ì£¼ì??: ë?¤ë¥¸ ë©?ì??ì§?ì?? ì?¼ë¶?ë¡? ì?°ì?¸ë?¤. ë¬¸ì?¥ì?¼ë¡? ë²?ì?í??ì§? ë§? ê²?.
-#: ../mail/mail-ops.c:2160
+#: ../mail/mail-ops.c:2168
 msgid "Saving attachment"
 msgstr "ì²¨ë¶? ì ?ì?¥"
 
-#: ../mail/mail-ops.c:2178 ../mail/mail-ops.c:2186
+#: ../mail/mail-ops.c:2186 ../mail/mail-ops.c:2194
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15336,31 +14105,31 @@ msgstr ""
 "ì¶?ë ¥ í??ì?¼ì?? ë§?ë?¤ ì?? ì??ì??: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2201
+#: ../mail/mail-ops.c:2209
 #, c-format
 msgid "Could not write data: %s"
 msgstr "ë?°ì?´í?°ë¥¼ ì?¸ ì?? ì??ì?µë??ë?¤: %s"
 
 # ì£¼ì??: ë?¤ë¥¸ ë©?ì??ì§?ì?? ì?¼ë¶?ë¡? ì?°ì?¸ë?¤. ë¬¸ì?¥ì?¼ë¡? ë²?ì?í??ì§? ë§? ê²?.
-#: ../mail/mail-ops.c:2347
+#: ../mail/mail-ops.c:2354
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "%sì??ì?? ì?°ê²° ë??ë?? ì¤?"
 
 # ì£¼ì??: ë?¤ë¥¸ ë©?ì??ì§?ì?? ì?¼ë¶?ë¡? ì?°ì?¸ë?¤. ë¬¸ì?¥ì?¼ë¡? ë²?ì?í??ì§? ë§? ê²?.
-#: ../mail/mail-ops.c:2347
+#: ../mail/mail-ops.c:2354
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "%s(ì?¼)ë¡? ë?¤ì?? ì?°ê²°ì¤?"
 
 # ì£¼ì??: ë?¤ë¥¸ ë©?ì??ì§?ì?? ì?¼ë¶?ë¡? ì?°ì?¸ë?¤. ë¬¸ì?¥ì?¼ë¡? ë²?ì?í??ì§? ë§? ê²?.
-#: ../mail/mail-ops.c:2443
+#: ../mail/mail-ops.c:2450
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "'%s' ì?¤í??ë?¼ì?¸ ê³?ì ?ì?? ì¤?ë¹? ì¤?"
 
 # ì£¼ì??: ë?¤ë¥¸ ë©?ì??ì§?ì?? ì?¼ë¶?ë¡? ì?°ì?¸ë?¤. ë¬¸ì?¥ì?¼ë¡? ë²?ì?í??ì§? ë§? ê²?.
-#: ../mail/mail-ops.c:2529
+#: ../mail/mail-ops.c:2536
 msgid "Checking Service"
 msgstr "ì??ë¹?ì?¤ í??ì?¸ì¤?"
 
@@ -15384,43 +14153,43 @@ msgstr "ì??ë?°ì?´í?¸ ì¤?..."
 msgid "Waiting..."
 msgstr "ê¸°ë?¤ë¦¬ë?? ì¤?..."
 
-#: ../mail/mail-send-recv.c:806
+#: ../mail/mail-send-recv.c:814
 #, c-format
 msgid "Checking for new mail"
 msgstr "ì?? ë©?ì?¼ í??ì?¸"
 
-#: ../mail/mail-session.c:212
+#: ../mail/mail-session.c:210
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "%sì?? ì??í?¸ë¥¼ ì??ë ¥í??ì?ì??ì?¤"
 
-#: ../mail/mail-session.c:214
+#: ../mail/mail-session.c:212
 msgid "Enter Passphrase"
 msgstr "ì??í?¸ ì??ë ¥"
 
-#: ../mail/mail-session.c:217
-#: ../plugins/exchange-operations/exchange-config-listener.c:708
+#: ../mail/mail-session.c:215
+#: ../plugins/exchange-operations/exchange-config-listener.c:705
 #, c-format
 msgid "Enter Password for %s"
 msgstr "%sì?? ì??í?¸ë¥¼ ì??ë ¥í??ì?ì??ì?¤"
 
-#: ../mail/mail-session.c:219
+#: ../mail/mail-session.c:217
 msgid "Enter Password"
 msgstr "ì??í?¸ ì??ë ¥"
 
-#: ../mail/mail-session.c:261
+#: ../mail/mail-session.c:259
 msgid "User canceled operation."
 msgstr "ì?¬ì?©ì??ê°? ì·¨ì??í?? ë??ì??."
 
-#: ../mail/mail-signature-editor.c:201
+#: ../mail/mail-signature-editor.c:202
 msgid "_Save and Close"
 msgstr "ì ?ì?¥ í?? ë?«ê¸°(_S)"
 
-#: ../mail/mail-signature-editor.c:355
+#: ../mail/mail-signature-editor.c:356
 msgid "Edit Signature"
 msgstr "ì??ëª? í?¸ì§?"
 
-#: ../mail/mail-signature-editor.c:370
+#: ../mail/mail-signature-editor.c:371
 msgid "_Signature Name:"
 msgstr "ì??ëª? ì?´ë¦?(_S):"
 
@@ -15451,25 +14220,25 @@ msgstr "ì??ëª»ë?? í?´ë??: `%s'"
 #: ../mail/mail-vfolder.c:89
 #, c-format
 msgid "Setting up Search Folder: %s"
-msgstr "ì°¾ê¸° í?´ë?? ì?¤ì ?: %s"
+msgstr "ê²?ì?? í?´ë?? ì?¤ì ?: %s"
 
-#: ../mail/mail-vfolder.c:240
+#: ../mail/mail-vfolder.c:234
 #, c-format
 msgid "Updating Search Folders for '%s:%s'"
-msgstr "'%s:%s'ì?? ë??í?? ì°¾ê¸° í?´ë??ë¥¼ ì??ë?°ì?´í?¸í??ë?? ì¤?ì??ë??ë?¤"
+msgstr "'%s:%s'ì?? ë??í?? ê²?ì?? í?´ë??ë¥¼ ì??ë?°ì?´í?¸í??ë?? ì¤?ì??ë??ë?¤"
 
-#: ../mail/mail-vfolder.c:247
+#: ../mail/mail-vfolder.c:241
 #, c-format
 msgid "Updating Search Folders for '%s'"
-msgstr "'%sì?? ë??í?? ì°¾ê¸° í?´ë??ë¥¼ ì??ë?°ì?´í?¸í??ë?? ì¤?ì??ë??ë?¤"
+msgstr "'%sì?? ë??í?? ê²?ì?? í?´ë??ë¥¼ ì??ë?°ì?´í?¸í??ë?? ì¤?ì??ë??ë?¤"
 
-#: ../mail/mail-vfolder.c:1086
+#: ../mail/mail-vfolder.c:1067
 msgid "Edit Search Folder"
-msgstr "ì°¾ê¸° í?´ë?? í?¸ì§?"
+msgstr "ê²?ì?? í?´ë?? í?¸ì§?"
 
-#: ../mail/mail-vfolder.c:1175
+#: ../mail/mail-vfolder.c:1155
 msgid "New Search Folder"
-msgstr "ì?? ì°¾ê¸° í?´ë??"
+msgstr "ì?? ê²?ì?? í?´ë??"
 
 #: ../mail/mail.error.xml.h:1
 msgid "A folder named \"{0}\" already exists. Please use a different name."
@@ -15568,7 +14337,7 @@ msgstr "ì??ëª? ì??ì??"
 
 #: ../mail/mail.error.xml.h:22
 msgid "Cannot add Search Folder \"{0}\"."
-msgstr "\"{0}\" ì°¾ê¸° í?´ë??ë¥¼ ì¶?ê°?í?  ì?? ì??ì?µë??ë?¤."
+msgstr "\"{0}\" ê²?ì?? í?´ë??ë¥¼ ì¶?ê°?í?  ì?? ì??ì?µë??ë?¤."
 
 #: ../mail/mail.error.xml.h:23
 msgid "Cannot copy folder \"{0}\" to \"{1}\"."
@@ -15596,7 +14365,7 @@ msgstr "\"{0}\" ì??ì?¤í?? í?´ë??ë¥¼ ì§?ì?¸ ì?? ì??ì?µë??ë?¤."
 
 #: ../mail/mail.error.xml.h:29
 msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
-msgstr "\"{0}\" ì°¾ê¸° í?´ë??ë¥¼ í?¸ì§?í?  ì?? ì??ì?µë??ë?¤: í?´ë??ê°? ì??ì?µë??ë?¤."
+msgstr "\"{0}\" ê²?ì?? í?´ë??ë¥¼ í?¸ì§?í?  ì?? ì??ì?µë??ë?¤: í?´ë??ê°? ì??ì?µë??ë?¤."
 
 #: ../mail/mail.error.xml.h:30
 msgid "Cannot move folder \"{0}\" to \"{1}\"."
@@ -15672,11 +14441,11 @@ msgstr "ê³?ì ?ì?? ì?ì ?í??ì??ê² ì?µë??ê¹??"
 
 #: ../mail/mail.error.xml.h:46
 msgid "Delete messages in Search Folder \"{0}\"?"
-msgstr "\"{0}\" ì°¾ê¸° í?´ë?? ì??ì?? ë©?ì??ì§?ë¥¼ ì?ì ?í??ì??ê² ì?µë??ê¹??"
+msgstr "\"{0}\" ê²?ì?? í?´ë?? ì??ì?? ë©?ì??ì§?ë¥¼ ì?ì ?í??ì??ê² ì?µë??ê¹??"
 
 #: ../mail/mail.error.xml.h:47
 msgid "Delete messages in Search Folder?"
-msgstr "ì°¾ê¸° í?´ë?? ì??ì?? ë©?ì??ì§?ë¥¼ ì?ì ?í??ì??ê² ì?µë??ê¹??"
+msgstr "ê²?ì?? í?´ë?? ì??ì?? ë©?ì??ì§?ë¥¼ ì?ì ?í??ì??ê² ì?µë??ê¹??"
 
 #: ../mail/mail.error.xml.h:48
 msgid "Discard changes?"
@@ -15869,7 +14638,7 @@ msgstr "ì ?í?¬ë©?ì?¼ ì??ë?? ì??ë¦¼ ì?¤í?¨"
 
 #: ../mail/mail.error.xml.h:92
 msgid "Search Folders automatically updated."
-msgstr "ì°¾ê¸° í?´ë??ë¥¼ ì??ë??ì?¼ë¡? ì??ë?°ì?´í?¸í??ì?µë??ë?¤."
+msgstr "ê²?ì?? í?´ë??ë¥¼ ì??ë??ì?¼ë¡? ì??ë?°ì?´í?¸í??ì?µë??ë?¤."
 
 # read receipt -> ë?´ì?© ì?½ì?? í??ì?¸, Microsoft Office XP ì°¸ê³ 
 #: ../mail/mail.error.xml.h:93
@@ -15923,7 +14692,7 @@ msgid ""
 msgstr ""
 "ë?¤ì??:\n"
 "{0}\n"
-"ì°¾ê¸° í?´ë??ë?? ë?¤ì?? ì ?ê±°í?? í?´ë??ë¥¼ ì?¬ì?©í?©ë??ë?¤:\n"
+"ê²?ì?? í?´ë??ë?? ë?¤ì?? ì ?ê±°í?? í?´ë??ë¥¼ ì?¬ì?©í?©ë??ë?¤:\n"
 "    \"{1}\"\n"
 "ì??ë?°ì?´í?¸í??ì?µë??ë?¤."
 
@@ -15951,7 +14720,7 @@ msgid ""
 "go to the Search Folder editor to add it explicitly, if required."
 msgstr ""
 "ì?´ í?´ë??ë?? ë¬µì??ì ?ì?¼ë¡? ì¶?ê°?í?? í?´ë??ì?¼ ì??ë?? ì??ì?µë??ë?¤.\n"
-"í??ì??í??ë?¤ë©´, ì°¾ê¸° í?´ë?? í?¸ì§? ì°½ì?¼ë¡? ê°?ì?? ì§?ì ? ì¶?ê°?í??ì?ì??ì?¤."
+"í??ì??í??ë?¤ë©´ ê²?ì?? í?´ë?? í?¸ì§? ì°½ì?¼ë¡? ê°?ì?? ì§?ì ? ì¶?ê°?í??ì?ì??ì?¤."
 
 #: ../mail/mail.error.xml.h:114
 msgid ""
@@ -16011,8 +14780,7 @@ msgid ""
 "message from one of your local or remote folders.\n"
 "Do you really want to do this?"
 msgstr ""
-"ê²½ê³ : ì°¾ê¸° í?´ë??ì??ì?? ë©?ì??ì§?ë¥¼ ì?ì ?í??ë©´, ë¡?ì»¬ í?¹ì?? ì??ê²© í?´ë??ì??ì?? ë©?ì??ì§?ë¥¼ ì?¤ì ?"
-"ë¡? ì?ì ?í?©ë??ë?¤.\n"
+"ê²½ê³ : ê²?ì?? í?´ë??ì??ì?? ë©?ì??ì§?ë¥¼ ì?ì ?í??ë©´, ë¡?ì»¬ í?¹ì?? ì??ê²© í?´ë??ì??ì?? ë©?ì??ì§?ë¥¼ ì?¤ì ?ë¡? ì?ì ?í?©ë??ë?¤.\n"
 "ì ?ë§?ë¡? ë©?ì??ì§?ë¥¼ ì?ì ?í??ì??ê² ì?µë??ê¹??"
 
 #: ../mail/mail.error.xml.h:127
@@ -16029,7 +14797,7 @@ msgstr "ê°?ì?? ì?´ë¦?ì?¼ë¡? ë?? ê°?ì?? ê³?ì ?ì?? ë§?ë?¤ ì?? ì??ì?µë??ë?¤."
 
 #: ../mail/mail.error.xml.h:130
 msgid "You must name this Search Folder."
-msgstr "ì?´ ì°¾ê¸° í?´ë??ì?? ì?´ë¦?ì?? ì ?í?´ì?¼ í?©ë??ë?¤."
+msgstr "ì?´ ê²?ì?? í?´ë??ì?? ì?´ë¦?ì?? ì ?í?´ì?¼ í?©ë??ë?¤."
 
 #: ../mail/mail.error.xml.h:131
 msgid "You must specify a folder."
@@ -16069,88 +14837,91 @@ msgstr "ì??ì ?í?? ì?ì ?(_E)"
 msgid "_Open Messages"
 msgstr "ë©?ì??ì§? ì?´ê¸°(_O)"
 
-#: ../mail/message-list.c:1052
+#: ../mail/message-list.c:1051
 msgid "Unseen"
 msgstr "ë³´ì§?ì??ì??ì??"
 
-#: ../mail/message-list.c:1053
+#: ../mail/message-list.c:1052
 msgid "Seen"
 msgstr "ë´¤ì??"
 
-#: ../mail/message-list.c:1054
+#: ../mail/message-list.c:1053
 msgid "Answered"
 msgstr "ì??ë?µí?¨"
 
-#: ../mail/message-list.c:1055
+#: ../mail/message-list.c:1054
 msgid "Forwarded"
 msgstr "ì ?ë?¬í?¨"
 
-#: ../mail/message-list.c:1056
+#: ../mail/message-list.c:1055
 msgid "Multiple Unseen Messages"
 msgstr "ì?¬ë?¬ê°?ì?? ë³´ì§?ì??ì?? ë©?ì??ì§?"
 
-#: ../mail/message-list.c:1057
+#: ../mail/message-list.c:1056
 msgid "Multiple Messages"
 msgstr "ì?¬ë?¬ ë©?ì??ì§?"
 
-#: ../mail/message-list.c:1061
+#: ../mail/message-list.c:1060
 msgid "Lowest"
 msgstr "ê°?ì?¥ ë?®ì??"
 
-#: ../mail/message-list.c:1062
+#: ../mail/message-list.c:1061
 msgid "Lower"
 msgstr "ë?®ì??"
 
-#: ../mail/message-list.c:1066
+#: ../mail/message-list.c:1065
 msgid "Higher"
 msgstr "ë??ì??"
 
-#: ../mail/message-list.c:1067
+#: ../mail/message-list.c:1066
 msgid "Highest"
 msgstr "ê°?ì?¥ ë??ì??"
 
 # ???
-#: ../mail/message-list.c:1656 ../widgets/table/e-cell-date.c:55
+#: ../mail/message-list.c:1654 ../widgets/table/e-cell-date.c:46
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1663 ../plugins/itip-formatter/itip-view.c:205
-#: ../widgets/table/e-cell-date.c:70
+#: ../mail/message-list.c:1661 ../plugins/itip-formatter/itip-view.c:205
 msgid "Today %l:%M %p"
 msgstr "ì?¤ë?? %p %l:%M"
 
-#: ../mail/message-list.c:1672 ../widgets/table/e-cell-date.c:80
+#: ../mail/message-list.c:1670
 msgid "Yesterday %l:%M %p"
 msgstr "ì?´ì ? %p %l:%M "
 
-#: ../mail/message-list.c:1684 ../widgets/table/e-cell-date.c:92
+#: ../mail/message-list.c:1682
 msgid "%a %l:%M %p"
 msgstr "(%a) %p %l:%M"
 
-#: ../mail/message-list.c:1692 ../widgets/table/e-cell-date.c:100
+#: ../mail/message-list.c:1690
 msgid "%b %d %l:%M %p"
 msgstr "%b %eì?¼ %p %l:%M"
 
-#: ../mail/message-list.c:1694 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1692
 msgid "%b %d %Y"
 msgstr "%Yë?? %b %eì?¼"
 
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:3985 ../mail/message-list.c:4450
+#: ../mail/message-list.c:3987 ../mail/message-list.c:4462
 msgid "Generating message list"
 msgstr "ë©?ì??ì§? ëª©ë¡? ì??ì?±ì¤?"
 
-#: ../mail/message-list.c:4289
+#: ../mail/message-list.c:4299
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
-msgstr ""
-"ì°¾ê¸° ê¸°ì¤?ì?? í?´ë?¹í??ë?? ë©?ì??ì§?ê°? ì??ì?µë??ë?¤. ì°¾ê¸°->ì§?ì?°ê¸° ë©?ë?´ í?ëª©ì?¼ë¡? ì°¾ê¸°ë¥¼ ì§?"
-"ì?°ê±°ë?? ì°¾ê¸° ê¸°ì¤?ì?? ë°?ê¾¸ì?ì??ì?¤."
+msgstr "ê²?ì?? ê¸°ì¤?ì?? í?´ë?¹í??ë?? ë©?ì??ì§?ê°? ì??ì?µë??ë?¤. ê²?ì??->ì§?ì?°ê¸° ë©?ë?´ í?ëª©ì?¼ë¡? ì°¾ê¸°ë¥¼ ì§?ì?°ê±°ë?? ê²?ì?? ê¸°ì¤?ì?? ë°?ê¾¸ì?ì??ì?¤."
 
-#: ../mail/message-list.c:4291
+#: ../mail/message-list.c:4301
+msgid ""
+"There are only hidden messages in this folder. Use View->Show Hidden "
+"Messages to show them."
+msgstr "ì?´ í?´ë??ì??ë?? ì?¨ê¸´ ë©?ì??ì§?ê°? ì??ì?µë??ë?¤. ì?´ ë©?ì??ì§?ë¥¼ í??ì??í??ë ¤ë©´ ë³´ê¸°->ì?¨ê¸´ ë©?ì??ì§? í??ì?? ì?µì??ì?? ì?¬ì?©í??ì?ì??ì?¤."
+
+#: ../mail/message-list.c:4303
 msgid "There are no messages in this folder."
 msgstr "ì?´ í?´ë??ì??ë?? ë©?ì??ì§?ê°? ì??ì?µë??ë?¤."
 
@@ -16180,6 +14951,7 @@ msgstr "ë³´ë?¸ ë©?ì??ì§?"
 
 #: ../mail/message-list.etspec.h:16
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:4
+#: ../widgets/misc/e-attachment-tree-view.c:542
 msgid "Size"
 msgstr "í?¬ê¸°"
 
@@ -16187,39 +14959,39 @@ msgstr "í?¬ê¸°"
 msgid "Subject - Trimmed"
 msgstr "ì ?ëª© - ì??ë¦?"
 
-#: ../mail/message-tag-followup.c:55
+#: ../mail/message-tag-followup.c:54
 msgid "Call"
 msgstr "í?¸ì¶?"
 
-#: ../mail/message-tag-followup.c:56
+#: ../mail/message-tag-followup.c:55
 msgid "Do Not Forward"
 msgstr "ì ?ë?¬í??ì§? ì??ì??"
 
-#: ../mail/message-tag-followup.c:57
+#: ../mail/message-tag-followup.c:56
 msgid "Follow-Up"
 msgstr "ì¶?ê°? ì??ì??"
 
-#: ../mail/message-tag-followup.c:58
+#: ../mail/message-tag-followup.c:57
 msgid "For Your Information"
 msgstr "ì? ì?©í?? ì ?ë³´"
 
-#: ../mail/message-tag-followup.c:59 ../ui/evolution-mail-message.xml.h:42
+#: ../mail/message-tag-followup.c:58 ../ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "ì ?ë?¬"
 
-#: ../mail/message-tag-followup.c:60
+#: ../mail/message-tag-followup.c:59
 msgid "No Response Necessary"
 msgstr "í??ì? ì?´ í??ì?? ì??ì??"
 
-#: ../mail/message-tag-followup.c:63 ../ui/evolution-mail-message.xml.h:80
+#: ../mail/message-tag-followup.c:62 ../ui/evolution-mail-message.xml.h:76
 msgid "Reply"
 msgstr "í??ì? "
 
-#: ../mail/message-tag-followup.c:64 ../ui/evolution-mail-message.xml.h:81
+#: ../mail/message-tag-followup.c:63 ../ui/evolution-mail-message.xml.h:77
 msgid "Reply to All"
 msgstr "ì ?ì²´ í??ì? "
 
-#: ../mail/message-tag-followup.c:65
+#: ../mail/message-tag-followup.c:64
 msgid "Review"
 msgstr "ë?¤ì?? ë³´ê¸°"
 
@@ -16245,20 +15017,25 @@ msgid "Subject contains"
 msgstr "ì ?ëª©ì?? í?¬í?¨"
 
 #: ../mail/searchtypes.xml.h:6
+msgid "Subject or Addresses contains"
+msgstr "ì ?ëª©ì?´ë?? ì£¼ì??ì?? í?¬í?¨"
+
+#: ../mail/searchtypes.xml.h:7
 msgid "Subject or Recipients contains"
 msgstr "ì ?ëª©ì?´ë?? ë°?ë?? ì?¬ë??ì?? í?¬í?¨"
 
-#: ../mail/searchtypes.xml.h:7
+#: ../mail/searchtypes.xml.h:8
 msgid "Subject or Sender contains"
 msgstr "ì ?ëª©ì?´ë?? ë³´ë?¸ ì?¬ë??ì?? í?¬í?¨"
 
+# command line help
 #: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:1
-msgid "Local Address Books"
-msgstr "ë¡?ì»¬ ì£¼ì??ë¡?"
+msgid "Add local address books to Evolution."
+msgstr "ë¡?ì»¬ ì£¼ì??ë¡?ì?? ì??ë³¼ë£¨ì??ì?? ì¶?ê°?í?©ë??ë?¤."
 
 #: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:2
-msgid "Provides core functionality for local address books."
-msgstr "ë¡?ì»¬ ì£¼ì??ë¡?ì?? ì£¼ì?? ê¸°ë?¥ì?? ì ?ê³µí?©ë??ë?¤."
+msgid "Local Address Books"
+msgstr "ë¡?ì»¬ ì£¼ì??ë¡?"
 
 #: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:1
 msgid ""
@@ -16272,8 +15049,8 @@ msgid ""
 "body."
 msgstr "ì²¨ë¶? ì??ë¦¼ í??ë?¬ê·¸ì?¸ì?´ ë©?ì??ì§? ë³¸ë¬¸ì??ì?? ì°¾ì??ë³¼ ê·¼ê±° ëª©ë¡?."
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:475
-#: ../plugins/templates/templates.c:390
+#: ../plugins/attachment-reminder/attachment-reminder.c:476
+#: ../plugins/templates/templates.c:389
 msgid "Keywords"
 msgstr "í?¤ì??ë??"
 
@@ -16283,12 +15060,8 @@ msgid "Attachment Reminder"
 msgstr "ì²¨ë¶? ì??ë¦¼"
 
 #: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:2
-msgid ""
-"Looks for clues in a message for mention of attachments and warns if the "
-"attachment is missing"
-msgstr ""
-"ë©?ì??ì§?ì??ì?? ì²¨ë¶? í??ì?¼ì?? ë??í?´ ì?¸ê¸?í?? ê·¼ê±°ë¥¼ ì°¾ì??ë³´ê³  ì²¨ë¶?ê°? ì??ë?¤ë©´ ê²½ê³ ë¥¼ í??ì??"
-"í?©ë??ë?¤."
+msgid "Reminds you when you forgot to add an attachment to a mail message."
+msgstr "ë©?ì?¼ ë©?ì??ì§?ì?? ì²¨ë¶? ì¶?ê°?ë¥¼ ì??ì??ì?? ë?? ì??ë¦½ë??ë?¤."
 
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:2
 msgid ""
@@ -16302,23 +15075,23 @@ msgstr ""
 msgid "Message has no attachments"
 msgstr "ë©?ì??ì§?ì?? ì²¨ë¶?ê°? ì??ì?µë??ë?¤"
 
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
+msgid "_Add attachment..."
+msgstr "ì²¨ë¶?í??ì?¼ ì¶?ê°?(_A)..."
+
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Edit Message"
 msgstr "ë©?ì??ì§? í?¸ì§?(_E)"
 
 #: ../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 ""
-"ì?¤ë??ì?¤ ì?¸ë?¼ì?¸ ì²¨ë¶?ë¥¼ í??ì??í??ê³  ì??ë³¼ë£¨ì??ì??ì?? ì§?ì ? í??ë ?ì?´í?  ì?? ì??ë?? í?¬ë§¤í?° í??ë?¬"
-"ê·¸ì?¸."
+msgid "Audio Inline"
+msgstr "ì?¤ë??ì?¤ ì?¸ë?¼ì?¸"
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:2
-msgid "Audio inline plugin"
-msgstr "ì?¤ë??ì?¤ ì?¸ë?¼ì?¸ í??ë?¬ê·¸ì?¸"
+msgid "Play audio attachments directly from Evolution."
+msgstr "ì?¤ë??ì?¤ ì²¨ë¶?ë¥¼ ì??ë³¼ë£¨ì??ì??ì?? ì§?ì ? ì?¬ì??í?©ë??ë?¤."
 
-#: ../plugins/backup-restore/backup-restore.c:138
+#: ../plugins/backup-restore/backup-restore.c:139
 msgid "Select name of the Evolution backup file"
 msgstr "ì??ë³¼ë£¨ì?? ë°±ì?? í??ì?¼ ì?´ë¦? ì? í??"
 
@@ -16341,134 +15114,132 @@ msgstr "ë°±ì??ì??ì?? ë³µêµ¬"
 #: ../plugins/backup-restore/backup-restore.c:289
 msgid ""
 "You can restore Evolution from your backup. It can restore all the Mails, "
-"Calendars, Tasks, Memos, Contacts. \n"
-"It also restores all your personal settings, mail filters etc."
-msgstr ""
-"ë°±ì??ì??ì?? ì??ë³¼ë£¨ì??ì?? ë³µêµ¬í??ì?¤ ì?? ì??ì?µë??ë?¤. ë©?ì?¼, ë?¬ë ¥, ì??ì??, ë©?ëª¨, ì£¼ì??ë¡? ëª¨ë??"
-"ë¥¼ ë³µêµ¬í??ì?¤ ì?? ì??ì?µë??ë?¤. \n"
-"ëª¨ë?  ê°?ì?¸ ì?¤ì ? ì?¬í?, ë©?ì?¼ í??í?° ê¸°ë?¥ ë?±ë?? ë³µêµ¬í?©ë??ë?¤."
+"Calendars, Tasks, Memos, Contacts. It also restores all your personal "
+"settings, mail filters etc."
+msgstr "ë°±ì??ì??ì?? ì??ë³¼ë£¨ì??ì?? ë³µêµ¬í?  ì?? ì??ì?µë??ë?¤. ë©?ì?¼, ë?¬ë ¥, ì??ì??, ë©?ëª¨, ì?°ë?½ì²? ëª¨ë??ë¥¼ ë³µêµ¬í?  ì?? ì??ì?µë??ë?¤. ëª¨ë?  ê°?ì?¸ ì?¤ì ?, ë©?ì?¼ í??í?° ê¸°ë?¥ ë?±ë?? ë³µêµ¬í?©ë??ë?¤."
 
-#: ../plugins/backup-restore/backup-restore.c:295
+#: ../plugins/backup-restore/backup-restore.c:297
 msgid "_Restore Evolution from the backup file"
 msgstr "ë°±ì?? ë°±ì?? í??ì?¼ì??ì?? ì??ë³¼ë£¨ì?? ë³µêµ¬(_R)"
 
-#: ../plugins/backup-restore/backup-restore.c:302
+#: ../plugins/backup-restore/backup-restore.c:304
 msgid "Please select an Evolution Archive to restore:"
 msgstr "ë³µêµ¬í?  ì??ë³¼ë£¨ì?? ì??ì¹´ì?´ë¸?ë¥¼ ì? í??í?´ ì£¼ì?ì??ì?¤:"
 
-#: ../plugins/backup-restore/backup-restore.c:305
+#: ../plugins/backup-restore/backup-restore.c:307
 msgid "Choose a file to restore"
 msgstr "ë³µêµ¬í?  í??ì?¼ì?? ì? í??í??ì?ì??ì?¤"
 
-#: ../plugins/backup-restore/backup.c:65
+#: ../plugins/backup-restore/backup.c:62
 msgid "Backup Evolution directory"
 msgstr "ì??ë³¼ë£¨ì?? ë??ë ?í?°ë¦¬ ë°±ì??"
 
-#: ../plugins/backup-restore/backup.c:67
+#: ../plugins/backup-restore/backup.c:64
 msgid "Restore Evolution directory"
 msgstr "ì??ë³¼ë£¨ì?? ë??ë ?í?°ë¦¬ ë³µêµ¬"
 
-#: ../plugins/backup-restore/backup.c:69
+#: ../plugins/backup-restore/backup.c:66
 msgid "Check Evolution Backup"
 msgstr "ì??ë³¼ë£¨ì?? ë°±ì?? ê²?ì?¬"
 
-#: ../plugins/backup-restore/backup.c:71
+#: ../plugins/backup-restore/backup.c:68
 msgid "Restart Evolution"
 msgstr "ì??ë³¼ë£¨ì?? ë?¤ì?? ì??ì??"
 
-#: ../plugins/backup-restore/backup.c:73
+#: ../plugins/backup-restore/backup.c:70
 msgid "With Graphical User Interface"
 msgstr "ê·¸ë??í?½ ì?¬ì?©ì?? ì?¸í?°í??ì?´ì?¤ ì?¬ì?©"
 
-#: ../plugins/backup-restore/backup.c:124
-#: ../plugins/backup-restore/backup.c:257
+#: ../plugins/backup-restore/backup.c:188
+#: ../plugins/backup-restore/backup.c:250
 msgid "Shutting down Evolution"
 msgstr "ì??ë³¼ë£¨ì??ì?? ì¢?ë£?í??ë?? ì¤?ì??ë??ë?¤"
 
-#: ../plugins/backup-restore/backup.c:131
+#: ../plugins/backup-restore/backup.c:195
 msgid "Backing Evolution accounts and settings"
 msgstr "ì??ë³¼ë£¨ì?? ê³?ì ? ë°? ì?¤ì ?ì?? ë°±ì??í??ë?? ì¤?"
 
-#: ../plugins/backup-restore/backup.c:135
+#: ../plugins/backup-restore/backup.c:201
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr "ì??ë³¼ë£¨ì?? ë?°ì?´í?°ë¥¼ ë°±ì??í??ë?? ì¤? (ë©?ì?¼, ì?°ë?½ì²?, ë?¬ë ¥, ì??ì??, ë©?ëª¨)"
 
-#: ../plugins/backup-restore/backup.c:146
+#: ../plugins/backup-restore/backup.c:212
 msgid "Backup complete"
 msgstr "ë°±ì?? ì??ë£?"
 
-#: ../plugins/backup-restore/backup.c:151
-#: ../plugins/backup-restore/backup.c:338
+#: ../plugins/backup-restore/backup.c:217
+#: ../plugins/backup-restore/backup.c:238
+#: ../plugins/backup-restore/backup.c:284
 msgid "Restarting Evolution"
 msgstr "ì??ë³¼ë£¨ì?? ë?¤ì?? ì??ì??í??ë?? ì¤?"
 
-#: ../plugins/backup-restore/backup.c:261
+#: ../plugins/backup-restore/backup.c:254
 msgid "Backup current Evolution data"
 msgstr "í??ì?¬ ì??ë³¼ë£¨ì?? ë?°ì?´í?°ë¥¼ ë°±ì??"
 
-#: ../plugins/backup-restore/backup.c:266
+#: ../plugins/backup-restore/backup.c:259
 msgid "Extracting files from backup"
 msgstr "ë°±ì??ì??ì?? í??ì?¼ì?? ì¶?ì¶?í??ë?? ì¤?"
 
-#: ../plugins/backup-restore/backup.c:273
+#: ../plugins/backup-restore/backup.c:266
 msgid "Loading Evolution settings"
 msgstr "ì??ë³¼ë£¨ì?? ì?¤ì ?ì?? ì?½ì?´ì?¤ë?? ì¤?"
 
-#: ../plugins/backup-restore/backup.c:277
+#: ../plugins/backup-restore/backup.c:273
 msgid "Removing temporary backup files"
 msgstr "ì??ì?? ë°±ì?? í??ì?¼ì?? ì?ì ?í??ë?? ì¤?"
 
-#: ../plugins/backup-restore/backup.c:284
+#: ../plugins/backup-restore/backup.c:280
 msgid "Ensuring local sources"
 msgstr "ë¡?ì»¬ ì??ì?¤ í??ì?¸í??ë?? ì¤?"
 
-#: ../plugins/backup-restore/backup.c:454
+#: ../plugins/backup-restore/backup.c:429
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "%s í?´ë??ì?? ë°±ì??í??ë?? ì¤?"
 
-#: ../plugins/backup-restore/backup.c:459
+#: ../plugins/backup-restore/backup.c:434
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "%s í?´ë??ì??ì?? ë³µêµ¬í??ë?? ì¤?"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:478
+#: ../plugins/backup-restore/backup.c:454
 msgid "Evolution Backup"
 msgstr "ì??ë³¼ë£¨ì?? ë°±ì??"
 
-#: ../plugins/backup-restore/backup.c:478
+#: ../plugins/backup-restore/backup.c:454
 msgid "Evolution Restore"
 msgstr "ì??ë³¼ë£¨ì?? ë³µêµ¬"
 
-#: ../plugins/backup-restore/backup.c:513
+#: ../plugins/backup-restore/backup.c:489
 msgid "Backing up Evolution Data"
 msgstr "ì??ë³¼ë£¨ì?? ë?°ì?´í?°ë¥¼ ë°±ì??í??ë?? ì¤?ì??ë??ë?¤"
 
-#: ../plugins/backup-restore/backup.c:514
+#: ../plugins/backup-restore/backup.c:490
 msgid "Please wait while Evolution is backing up your data."
 msgstr "ì??ë³¼ë£¨ì??ì??ì?? ë?°ì?´í?°ë¥¼ ë°±ì??í??ë?? ë??ì?? ì? ì?? ê¸°ë?¤ë¦¬ì?ì??ì?¤."
 
-#: ../plugins/backup-restore/backup.c:516
+#: ../plugins/backup-restore/backup.c:492
 msgid "Restoring Evolution Data"
 msgstr "ì??ë³¼ë£¨ì?? ë?°ì?´í?°ë¥¼ ë³µêµ¬í??ë?? ì¤?ì??ë??ë?¤"
 
-#: ../plugins/backup-restore/backup.c:517
+#: ../plugins/backup-restore/backup.c:493
 msgid "Please wait while Evolution is restoring your data."
 msgstr "ì??ë³¼ë£¨ì??ì??ì?? ë?°ì?´í?°ë¥¼ ë³µêµ¬í??ë?? ë??ì?? ì? ì?? ê¸°ë?¤ë¦¬ì?ì??ì?¤."
 
-#: ../plugins/backup-restore/backup.c:535
+#: ../plugins/backup-restore/backup.c:511
 msgid "This may take a while depending on the amount of data in your account."
 msgstr "ì?´ ì??ì??ì?? ê³?ì ?ì?? ë?°ì?´í?° í?¬ê¸°ì?? ë?°ë?¼ ì??ê°?ì?´ ê±¸ë¦´ ì??ë?? ì??ì?µë??ë?¤."
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:1
-msgid "A plugin for backing up and restore Evolution data and settings."
-msgstr "ì??ë³¼ë£¨ì?? ë?°ì?´í?° ë°? ì?¤ì ?ì?? ë°±ì??í??ê³  ë³µêµ¬í??ë?? í??ë?¬ê·¸ì?¸."
-
 #. the path to the shared library
+#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:2
+msgid "Backup and Restore"
+msgstr "ë°±ì?? ë°? ë³µêµ¬"
+
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:3
-msgid "Backup and restore plugin"
-msgstr "ë°±ì?? ë°? ë³µêµ¬ í??ë?¬ê·¸ì?¸"
+msgid "Backup and restore your Evolution data and settings."
+msgstr "ì??ë³¼ë£¨ì?? ë?°ì?´í?° ë°? ì?¤ì ?ì?? ë°±ì??í??ê³  ë³µêµ¬í?©ë??ë?¤."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:1
 msgid "Are you sure you want to close Evolution?"
@@ -16531,73 +15302,76 @@ msgstr "ì?¤ì ? ë³µêµ¬(_E)..."
 msgid "_Backup Settings..."
 msgstr "ì?¤ì ? ë°±ì??(_B)..."
 
-#: ../plugins/bbdb/bbdb.c:615 ../plugins/bbdb/bbdb.c:624
+#: ../plugins/bbdb/bbdb.c:622 ../plugins/bbdb/bbdb.c:631
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "ì??ë?? ì?°ë?½ì²?"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:639
-msgid "_Auto-create address book entries when replying to messages"
-msgstr "ë©?ì??ì§?ì?? ë?µì?¥í??ë©´ ì??ë??ì?¼ë¡? ì£¼ì??ë¡?ì?? í?ëª© ë§?ë?¤ê¸°(_A)"
+#: ../plugins/bbdb/bbdb.c:646
+msgid "Create _address book entries when sending mails"
+msgstr "ë©?ì?¼ì?? ë³´ë?¼ ë?? ì£¼ì??ë¡?ì?? í?ëª© ë§?ë?¤ê¸°(_A)"
 
-#: ../plugins/bbdb/bbdb.c:645
+#: ../plugins/bbdb/bbdb.c:652
 msgid "Select Address book for Automatic Contacts"
 msgstr "ì??ë?? ì?°ë?½ì²?ë¥¼ ì?¬ì?©í?  ì£¼ì??ë¡?ì?? ì? í??í??ì?ì??ì?¤"
 
-#: ../plugins/bbdb/bbdb.c:660
+#: ../plugins/bbdb/bbdb.c:667
 msgid "Instant Messaging Contacts"
 msgstr "ì?¸ì?¤í?´ì?¤ ë©?ì??ì§? ì?°ë?½ì²?"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:675
+#: ../plugins/bbdb/bbdb.c:682
 msgid "Synchronize contact info and images from Pidgin buddy list"
 msgstr "í?¼ì§? ì¹?êµ¬ ëª©ë¡?ì?? ì ?ë³´ ë°? ê·¸ë¦¼ì?? ë??ê¸°í??"
 
-#: ../plugins/bbdb/bbdb.c:681
+#: ../plugins/bbdb/bbdb.c:688
 msgid "Select Address book for Pidgin buddy list"
 msgstr "í?¼ì§? ì¹?êµ¬ ëª©ë¡?ì?? ì?¬ì?©í?  ì£¼ì??ë¡?ì?? ì? í??í??ì?ì??ì?¤"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:692
+#: ../plugins/bbdb/bbdb.c:699
 msgid "Synchronize with _buddy list now"
 msgstr "ì§?ê¸? ì¹?êµ¬ ëª©ë¡?ê³¼ ë??ê¸°í??(_B)"
 
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:2
+msgid "BBDB"
+msgstr "BBDB"
+
+#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3
 msgid ""
+"Takes the gruntwork out of managing your address book.\n"
+"\n"
 "Automatically fills your address book with names and email addresses as you "
-"reply to messages. Also fills in IM contact information from your buddy "
+"reply to messages.  Also fills in IM contact information from your buddy "
 "lists."
 msgstr ""
-"ë©?ì??ì§?ì?? ë?µì?¥í?  ë??ë§?ë?¤ ì??ë??ì?¼ë¡? ì?´ë¦?ê³¼ ì ?ì??ë©?ì?¼ ì£¼ì??ë¥¼ ì£¼ì??ë¡?ì?? ë?£ì?µë??ë?¤. ë?? "
-"ì¹?êµ¬ ëª©ë¡?ì??ì?? ì?¸ì?¤í?´ì?¤ ë©?ì??ì§? ì?°ë?½ì²? ì ?ë³´ë¥¼ ì±?ì?? ë?£ì?µë??ë?¤."
-
-#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3
-msgid "BBDB"
-msgstr "BBDB"
+"ì£¼ì??ë¡? ê´?ë¦¬ ë?¨ì?? ì??ì??ì?? ì??í??í?©ë??ë?¤.\n"
+"\n"
+"ë©?ì??ì§?ì?? ë?µì?¥í?  ë??ë§?ë?¤ ì??ë??ì?¼ë¡? ì?´ë¦?ê³¼ ì ?ì??ë©?ì?¼ ì£¼ì??ë¥¼ ì£¼ì??ë¡?ì?? ë?£ì?µë??ë?¤. ë?? ì¹?êµ¬ ëª©ë¡?ì??ì?? ì?¸ì?¤í?´ì?¤ ë©?ì??ì§? ì?°ë?½ì²? ì ?ë³´ë¥¼ ì±?ì?? ë?£ì?µë??ë?¤."
 
 #. For Translators: The first %s stands for the executable full path with a file name, the second is the error message itself.
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:161
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:158
 #, c-format
 msgid "Error occurred while spawning %s: %s."
 msgstr "%s ì?¤í?? ì¤?ì?? ì?¤ë¥?ê°? ë°?ì??í??ì?µë??ë?¤: %s."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:186
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:183
 #, c-format
 msgid "Bogofilter child process does not respond, killing..."
 msgstr "ë³´ê³ í??í?° í??ì?? í??ë¡?ì?¸ì?¤ê°? ì??ë?µí??ì§? ì??ì?µë??ë?¤. ê°?ì ?ë¡? ë??ë??ë??ë?¤..."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:188
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:185
 #, c-format
 msgid "Wait for Bogofilter child process interrupted, terminating..."
 msgstr "ë³´ê³ í??í?° í??ì?? í??ë¡?ì?¸ì?¤ ë??ê¸°ê°? ì¤?ì§?ë??ì??ì?µë??ë?¤. ê°?ì ?ë¡? ë??ë??ë??ë?¤..."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:211
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:208
 #, c-format
 msgid "Pipe to Bogofilter failed, error code: %d."
 msgstr "ë³´ê³ í??í?°ì?? ë??í?? í??ì?´í??ê°? ì?¤í?¨í??ì?µë??ë?¤. ì?¤ë¥? ì½?ë??: %d."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:374
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:371
 msgid "Convert message text to _Unicode"
 msgstr "ë©?ì??ì§? í??ì?¤í?¸ë¥¼ ì? ë??ì½?ë??ë¡? ë³?í??(_U)"
 
@@ -16614,73 +15388,109 @@ msgstr ""
 "ì?? í?µì?¼í?©ë??ë?¤."
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:1
-msgid "Bogofilter Options"
-msgstr "ë³´ê³ í??í?° ì?µì??"
+msgid "Bogofilter Junk Filter"
+msgstr "ë³´ê³ í??í?° ì ?í?¬ë©?ì?¼ í??í?°"
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:2
-msgid "Bogofilter junk plugin"
-msgstr "ë³´ê³ í??í?° ì ?í?¬ë©?ì?¼ í??ë?¬ê·¸ì?¸"
+msgid "Bogofilter Options"
+msgstr "ë³´ê³ í??í?° ì?µì??"
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:3
-msgid "Filters junk messages using Bogofilter."
+msgid "Filter junk messages using Bogofilter."
 msgstr "ë³´ê³ í??í?°ë¥¼ ì?¬ì?©í?´ ì ?í?¬ ë©?ì??ì§?ë¥¼ í??í?°ë§?í?©ë??ë?¤."
 
-#. we found the group, change the name based on the actual language
-#: ../plugins/caldav/caldav-source.c:80 ../plugins/caldav/caldav-source.c:92
+#: ../plugins/caldav/caldav-source.c:64
 msgid "CalDAV"
 msgstr "CalDAV"
 
-#: ../plugins/caldav/caldav-source.c:348
-#: ../plugins/calendar-http/calendar-http.c:126
+#: ../plugins/caldav/caldav-source.c:366
+#: ../plugins/calendar-http/calendar-http.c:171
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../plugins/caldav/caldav-source.c:372
-#: ../plugins/google-account-setup/google-source.c:608
-#: ../plugins/google-account-setup/google-contacts-source.c:339
+#: ../plugins/caldav/caldav-source.c:390
+#: ../plugins/google-account-setup/google-contacts-source.c:303
 msgid "Use _SSL"
 msgstr "SSL ì?¬ì?©(_S)"
 
 #. add refresh option
-#: ../plugins/caldav/caldav-source.c:415
-#: ../plugins/calendar-http/calendar-http.c:264
-#: ../plugins/calendar-weather/calendar-weather.c:509
-#: ../plugins/google-account-setup/google-source.c:632
-#: ../plugins/google-account-setup/google-contacts-source.c:358
+#: ../plugins/caldav/caldav-source.c:433
+#: ../plugins/calendar-file/calendar-file.c:267
+#: ../plugins/calendar-http/calendar-http.c:308
+#: ../plugins/calendar-weather/calendar-weather.c:508
+#: ../plugins/google-account-setup/google-source.c:698
+#: ../plugins/google-account-setup/google-contacts-source.c:322
 msgid "Re_fresh:"
 msgstr "ì??ë¡? ê³ ì¹¨(_F):"
 
+#: ../plugins/caldav/caldav-source.c:451
+#: ../plugins/calendar-file/calendar-file.c:289
+#: ../plugins/calendar-http/calendar-http.c:326
+#: ../plugins/calendar-weather/calendar-weather.c:526
+#: ../plugins/google-account-setup/google-source.c:723
+#: ../plugins/google-account-setup/google-contacts-source.c:333
+msgid "weeks"
+msgstr "ì£¼"
+
 #: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:1
-msgid "CalDAV Calendar sources"
-msgstr "CalDAV ë?¬ë ¥ ì??ì?¤"
+msgid "Add CalDAV support to Evolution."
+msgstr "CalDAV ê¸°ë?¥ì?? ì??ë³¼ë£¨ì??ì?? ì¶?ê°?í?©ë??ë?¤."
 
 #: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:2
-msgid "CalDAV sources"
-msgstr "CalDAV ì??ì?¤"
+msgid "CalDAV Support"
+msgstr "CalDAV ê¸°ë?¥"
+
+#: ../plugins/calendar-file/calendar-file.c:204
+msgid "_Customize options"
+msgstr "ì?¬ì?©ì?? ì§?ì ? ì?µì??(_C)"
+
+#: ../plugins/calendar-file/calendar-file.c:224
+msgid "File _name:"
+msgstr "í??ì?¼ ì?´ë¦?(_N):"
+
+#: ../plugins/calendar-file/calendar-file.c:228
+msgid "Choose calendar file"
+msgstr "ë?¬ë ¥ í??ì?¼ì?? ì? í??í??ì?ì??ì?¤"
+
+#: ../plugins/calendar-file/calendar-file.c:272
+msgid "On open"
+msgstr "ì?´ ë??"
+
+#: ../plugins/calendar-file/calendar-file.c:273
+msgid "On file change"
+msgstr "í??ì?¼ ë³?ê²½ë?  ë??"
+
+#: ../plugins/calendar-file/calendar-file.c:274
+msgid "Periodically"
+msgstr "ì£¼ê¸°ì ?ì?¼ë¡?"
+
+#: ../plugins/calendar-file/calendar-file.c:301
+msgid "Force read _only"
+msgstr "ì?½ê¸° ì ?ì?© ê°?ì ?(_O)"
 
 #: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:1
-msgid "Local Calendars"
-msgstr "ë¡?ì»¬ ë?¬ë ¥"
+msgid "Add local calendars to Evolution."
+msgstr "ë¡?ì»¬ ë?¬ë ¥ì?? ì??ë³¼ë£¨ì??ì?? ì¶?ê°?í?©ë??ë?¤."
 
 #: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:2
-msgid "Provides core functionality for local calendars."
-msgstr "ë¡?ì»¬ ë?¬ë ¥ì?? ì£¼ì?? ê¸°ë?¥ì?? ì ?ê³µí?©ë??ë?¤."
+msgid "Local Calendars"
+msgstr "ë¡?ì»¬ ë?¬ë ¥"
 
-#: ../plugins/calendar-http/calendar-http.c:332
+#: ../plugins/calendar-http/calendar-http.c:369
 msgid "_Secure connection"
 msgstr "ë³´ì?? ì?°ê²°(_S):"
 
-#: ../plugins/calendar-http/calendar-http.c:397
+#: ../plugins/calendar-http/calendar-http.c:455
 msgid "Userna_me:"
 msgstr "ì?¬ì?©ì??ì?´ë¦?(_M):"
 
 #: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:1
-msgid "HTTP Calendars"
-msgstr "HTTP ë?¬ë ¥"
+msgid "Add web calendars to Evolution."
+msgstr "ì?¹ ë?¬ë ¥ì?? ì??ë³¼ë£¨ì??ì?? ì¶?ê°?í?©ë??ë?¤."
 
 #: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:2
-msgid "Provides core functionality for webcal and http calendars."
-msgstr "webcal ë°? HTTP ë?¬ë ¥ì?? ì£¼ì?? ê¸°ë?¥ì?? ì ?ê³µí?©ë??ë?¤."
+msgid "Web Calendars"
+msgstr "ì?¹ ë?¬ë ¥"
 
 #: ../plugins/calendar-weather/calendar-weather.c:61
 msgid "Weather: Fog"
@@ -16722,35 +15532,33 @@ msgstr "ë? ì?¨: í??í??"
 msgid "Select a location"
 msgstr "ì??ì¹? ì? í??"
 
-#: ../plugins/calendar-weather/calendar-weather.c:615
+#: ../plugins/calendar-weather/calendar-weather.c:606
 msgid "_Units:"
 msgstr "ë?¨ì??(_U):"
 
-#: ../plugins/calendar-weather/calendar-weather.c:622
+#: ../plugins/calendar-weather/calendar-weather.c:613
 msgid "Metric (Celsius, cm, etc)"
 msgstr "ë¯¸í?°ë²? (ì?ì?¨, ì?¼í?°ë¯¸í?° ë?±)"
 
-#: ../plugins/calendar-weather/calendar-weather.c:623
+#: ../plugins/calendar-weather/calendar-weather.c:614
 msgid "Imperial (Fahrenheit, inches, etc)"
 msgstr "ì??í??ë¦¬ì?¼ ë?¨ì?? (í??ì?¨, ì?¸ì¹? ë?±)"
 
 #: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:1
-msgid "Provides core functionality for weather calendars."
-msgstr "ë? ì?¨ ë?¬ë ¥ì?? ì£¼ì?? ê¸°ë?¥ì?? ì ?ê³µí?©ë??ë?¤."
+msgid "Add weather calendars to Evolution."
+msgstr "ë? ì?¨ ë?¬ë ¥ì?? ì??ë³¼ë£¨ì??ì?? ì¶?ê°?í?©ë??ë?¤."
 
 #: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:2
 msgid "Weather Calendars"
 msgstr "ë? ì?¨ ë?¬ë ¥"
 
 #: ../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 "í??ì?? ë©?ë?´ í??ë?¬ê·¸ì?¸ ë?°ëª¨ í??ì?¤í?¸ í??ë?¬ê·¸ì?¸. í?´ë¦½ë³´ë??ë¡? ë³µì?¬í?©ë??ë?¤."
+msgid "Copy Tool"
+msgstr "ë³µì?¬ ë??êµ¬"
 
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:3
-msgid "Copy tool"
-msgstr "ë³µì?¬ ë??êµ¬"
+msgid "Copy things to the clipboard."
+msgstr "ì? í??í?? ì?¬í?ì?? í?´ë¦½ë³´ë??ë¡? ë³µì?¬í?©ë??ë?¤."
 
 #: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:1
 msgid "Check whether Evolution is the default mailer"
@@ -16762,11 +15570,11 @@ msgid ""
 msgstr "ì??ë³¼ë£¨ì??ì?´ ì??ì??í?  ë??ë§?ë?¤, ê¸°ë³¸ ë©?ì?¼ í??ë¡?ê·¸ë?¨ì?¸ì§? ì?¬ë¶?ë¥¼ ê²?ì?¬í?©ë??ë?¤."
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:1
-msgid "Checks whether Evolution is the default mail client on startup."
+msgid "Check whether Evolution is the default mail client on startup."
 msgstr "ì??ì??í?  ë?? ì??ë³¼ë£¨ì??ì?´ ê¸°ë³¸ ë©?ì?¼ í??ë¡?ê·¸ë?¨ì?¸ì§? í??ì?¸í?©ë??ë?¤."
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:2
-msgid "Default Mail Client "
+msgid "Default Mail Client"
 msgstr "ê¸°ë³¸ ë©?ì?¼ í??ë¡?ê·¸ë?¨"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:1
@@ -16774,23 +15582,23 @@ msgid "Do you want to make Evolution your default e-mail client?"
 msgstr "ì??ë³¼ë£¨ì??ì?? ê¸°ë³¸ ì ?ì??ë©?ì?¼ í??ë¡?ê·¸ë?¨ì?¼ë¡? í??ì??ê² ì?µë??ê¹??"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:599
+#: ../shell/main.c:627
 msgid "Evolution"
 msgstr "ì??ë³¼ë£¨ì??"
 
-#: ../plugins/default-source/default-source.c:82
+#: ../plugins/default-source/default-source.c:80
 msgid "Mark as _default address book"
 msgstr "ê¸°ë³¸ ì£¼ì??ë¡?ì?¼ë¡? í??ì??(_D)"
 
-#: ../plugins/default-source/default-source.c:103
+#: ../plugins/default-source/default-source.c:101
 msgid "Mark as _default calendar"
 msgstr "ê¸°ë³¸ ë?¬ë ¥ì?¼ë¡? í??ì??(_D)"
 
-#: ../plugins/default-source/default-source.c:104
+#: ../plugins/default-source/default-source.c:102
 msgid "Mark as _default task list"
 msgstr "ê¸°ë³¸ ì??ì?? ëª©ë¡?ì?¼ë¡? í??ì??(_D)"
 
-#: ../plugins/default-source/default-source.c:105
+#: ../plugins/default-source/default-source.c:103
 msgid "Mark as _default memo list"
 msgstr "ê¸°ë³¸ ë©?ëª¨ ëª©ë¡?ì?¼ë¡? í??ì??(_D)"
 
@@ -16799,36 +15607,34 @@ msgid "Default Sources"
 msgstr "ê¸°ë³¸ ì??ì?¤"
 
 #: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:2
-msgid ""
-"Provides functionality for marking a calendar or an address book as the "
-"default one."
-msgstr "ë?¬ë ¥ì?´ë?? ì£¼ì??ë¡?ì?? ê¸°ë³¸ê°?ì?¼ë¡? ì§?ì ?í??ë?? ê¸°ë?¥ì?? ì ?ê³µí?©ë??ë?¤."
+msgid "Mark your preferred address book and calendar as default."
+msgstr "ì??í??ë?? ì£¼ì??ë¡? ë°? ë?¬ë ¥ì?? ê¸°ë³¸ì?¼ë¡? í??ì??í?©ë??ë?¤."
 
-#: ../plugins/email-custom-header/email-custom-header.c:334
+#: ../plugins/email-custom-header/email-custom-header.c:333
 msgid "Security:"
 msgstr "ë³´ì??:"
 
 # FIXME: ì?´ê±° ë²?ì?í?´ì?¼ ë?¼? ì»¤ì?¤í?? í?¤ë??ì?? ì?°ë?? ê°?ì?? ì??ì ?.
-#: ../plugins/email-custom-header/email-custom-header.c:339
+#: ../plugins/email-custom-header/email-custom-header.c:338
 msgid "Unclassified"
 msgstr "ë¹?ë°?ì??ë??"
 
 # FIXME: ì?´ê±° ë²?ì?í?´ì?¼ ë?¼? ì»¤ì?¤í?? í?¤ë??ì?? ì?°ë?? ê°?ì?? ì??ì ?.
-#: ../plugins/email-custom-header/email-custom-header.c:340
+#: ../plugins/email-custom-header/email-custom-header.c:339
 msgid "Protected"
 msgstr "ë³´í?¸"
 
 # FIXME: ì?´ê±° ë²?ì?í?´ì?¼ ë?¼? ì»¤ì?¤í?? í?¤ë??ì?? ì?°ë?? ê°?ì?? ì??ì ?.
-#: ../plugins/email-custom-header/email-custom-header.c:342
+#: ../plugins/email-custom-header/email-custom-header.c:341
 msgid "Secret"
 msgstr "ë¹?ë°?"
 
 # FIXME: ì?´ê±° ë²?ì?í?´ì?¼ ë?¼? ì»¤ì?¤í?? í?¤ë??ì?? ì?°ë?? ê°?ì?? ì??ì ?.
-#: ../plugins/email-custom-header/email-custom-header.c:343
+#: ../plugins/email-custom-header/email-custom-header.c:342
 msgid "Top secret"
 msgstr "ì?¼ê¸?ë¹?ë°?"
 
-#: ../plugins/email-custom-header/email-custom-header.c:585
+#: ../plugins/email-custom-header/email-custom-header.c:584
 msgid "_Custom Header"
 msgstr "ì?¬ì?©ì?? ì?¤ì ? í?¤ë??(_C)"
 
@@ -16837,7 +15643,7 @@ msgid "Key"
 msgstr "í?¤"
 
 #: ../plugins/email-custom-header/email-custom-header.c:917
-#: ../plugins/templates/templates.c:396
+#: ../plugins/templates/templates.c:395
 msgid "Values"
 msgstr "ê°?"
 
@@ -16856,7 +15662,7 @@ msgstr "ì ?ì??ë©?ì?¼ ì?¬ì?©ì?? ì?¤ì ? í?¤ë??"
 
 #. For Translators: 'custom header' string is used while adding a new message header to outgoing message, to specify what value for the message header would be added
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:2
-msgid "Adds custom header to outgoing messages."
+msgid "Add custom headers to outgoing mail messages."
 msgstr "ë³´ë?´ë?? ë©?ì??ì§?ì?? ì?¬ì?©ì?? ì?¤ì ? í?¤ë??ë¥¼ ì¶?ê°?í?©ë??ë?¤."
 
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:3
@@ -16917,11 +15723,11 @@ msgid ""
 msgstr ""
 "ì?´ ì?µì??ì?? ì¼?ë©´ ì?¼ë°? í??ì?¤í?¸ ì??í?¸ ì?¸ì¦?ì?? ì?¬ì?©í?´ ì?µì?¤ì²´ì?¸ì§? ì??ë²?ì?? ì?°ê²°í?©ë??ë?¤."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:272
+#: ../plugins/exchange-operations/exchange-account-setup.c:271
 msgid "Out Of Office"
 msgstr "ë¶?ì?¬ ì¤?"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:279
+#: ../plugins/exchange-operations/exchange-account-setup.c:278
 msgid ""
 "The message specified below will be automatically sent to \n"
 "each person who sends mail to you while you are out of the office."
@@ -16929,90 +15735,93 @@ msgstr ""
 "ì??ë??ì?? ì§?ì ?í?? ë©?ì??ì§?ë?? ë¶?ì?¬ ì¤?ì?? ë©?ì?¼ì?? ë³´ë?¸ ê°? ì?¬ë??ë?¤ì??ê²?\n"
 "ì??ë??ì?¼ë¡? ì ?ë?¬í?©ë??ë?¤."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:291
-#: ../plugins/exchange-operations/exchange-account-setup.c:296
+#: ../plugins/exchange-operations/exchange-account-setup.c:290
+#: ../plugins/exchange-operations/exchange-account-setup.c:295
 msgid "I am out of the office"
 msgstr "í??ì?¬ ì?¸ë¶?ì?? ì??ì??"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:292
-#: ../plugins/exchange-operations/exchange-account-setup.c:295
+#: ../plugins/exchange-operations/exchange-account-setup.c:291
+#: ../plugins/exchange-operations/exchange-account-setup.c:294
 msgid "I am in the office"
 msgstr "í??ì?¬ ë?´ë¶?ì?? ì??ì??"
 
 #. Change Password
-#: ../plugins/exchange-operations/exchange-account-setup.c:343
+#: ../plugins/exchange-operations/exchange-account-setup.c:340
 msgid "Change the password for Exchange account"
 msgstr "ì?µì?¤ì²´ì?¸ì§? ê³?ì ?ì?? ì??í?¸ ë°?ê¾¸ê¸°"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:345
+#: ../plugins/exchange-operations/exchange-account-setup.c:342
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:1
 msgid "Change Password"
 msgstr "ì??í?¸ ë°?ê¾¸ê¸°"
 
 #. Delegation Assistant
-#: ../plugins/exchange-operations/exchange-account-setup.c:350
+#: ../plugins/exchange-operations/exchange-account-setup.c:347
 msgid "Manage the delegate settings for Exchange account"
 msgstr "ì?µì?¤ì²´ì?¸ì§? ê³?ì ?ì?? ë??ë¦¬ì?¸ ì?¤ì ?ì?? ê´?ë¦¬í?©ë??ë?¤"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:352
+#: ../plugins/exchange-operations/exchange-account-setup.c:349
 msgid "Delegation Assistant"
 msgstr "ë??ë¦¬ì?¸ ë??ì?°ë¯¸"
 
 #. Miscelleneous settings
-#: ../plugins/exchange-operations/exchange-account-setup.c:364
+#: ../plugins/exchange-operations/exchange-account-setup.c:361
 msgid "Miscelleneous"
 msgstr "ê¸°í??"
 
 #. Folder Size
-#: ../plugins/exchange-operations/exchange-account-setup.c:374
+#: ../plugins/exchange-operations/exchange-account-setup.c:371
 msgid "View the size of all Exchange folders"
 msgstr "ëª¨ë?  ì?µì?¤ì²´ì?¸ì§? í?´ë??ì?? í?¬ê¸° ë³´ê¸°"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:376
+#: ../plugins/exchange-operations/exchange-account-setup.c:373
 msgid "Folders Size"
 msgstr "í?´ë?? í?¬ê¸°"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:383
+#: ../plugins/exchange-operations/exchange-account-setup.c:380
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:3
 msgid "Exchange Settings"
 msgstr "ì?µì?¤ì²´ì?¸ì§? ì?¤ì ?"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:730
+#: ../plugins/exchange-operations/exchange-account-setup.c:726
 msgid "_OWA URL:"
 msgstr "_OWA URL:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:756
+#: ../plugins/exchange-operations/exchange-account-setup.c:752
 msgid "A_uthenticate"
 msgstr "ì?¸ì¦?(_U)"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:777
-msgid "S_pecify the mailbox name"
-msgstr "ë©?ì?¼í?¨ ì?´ë¦? ì§?ì ?(_P)"
+#: ../plugins/exchange-operations/exchange-account-setup.c:774
+msgid "Mailbox name is _different than user name"
+msgstr "ë©?ì?¼í?¨ ì?´ë¦?ì?´ ì?¬ì?©ì?? ì?´ë¦?ê³¼ ë?¤ë¦?(_D)"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:790
+#: ../plugins/exchange-operations/exchange-account-setup.c:787
 msgid "_Mailbox:"
 msgstr "ë©?ì?¼í?¨(_M):"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:1005
+#: ../plugins/exchange-operations/exchange-account-setup.c:1001
 msgid "_Authentication Type"
 msgstr "ì?¸ì¦? ë°©ë²?(_A)"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:1019
-msgid "Ch_eck for Supported Types"
-msgstr "ì§?ì??í??ë?? ë°©ì?? í??ì?¸(_E)"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:1134
+#: ../plugins/exchange-operations/exchange-account-setup.c:1130
 #: ../plugins/exchange-operations/exchange-contacts.c:217
 #, c-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:1136
+#: ../plugins/exchange-operations/exchange-account-setup.c:1132
 #: ../plugins/exchange-operations/exchange-contacts.c:219
 #, c-format
 msgid "0 KB"
 msgstr "0 KB"
 
+#. FIXME: Take care of i18n
+#: ../plugins/exchange-operations/exchange-account-setup.c:1137
+#: ../plugins/exchange-operations/exchange-calendar.c:236
+#: ../plugins/exchange-operations/exchange-contacts.c:222
+msgid "Size:"
+msgstr "í?¬ê¸°:"
+
 #: ../plugins/exchange-operations/exchange-calendar.c:196
 #: ../plugins/exchange-operations/exchange-contacts.c:170
 msgid ""
@@ -17051,38 +15860,35 @@ msgstr "ì?? ì??í?¸:"
 msgid "Your current password has expired. Please change your password now."
 msgstr "í??ì?¬ì?? ì??í?¸ê°? ì?¬ì?© ë§?ë£?ë??ì??ì?µë??ë?¤. ì§?ê¸? ì??í?¸ë¥¼ ë°?ê¾¸ì?ì??ì?¤."
 
-#: ../plugins/exchange-operations/exchange-config-listener.c:660
+#: ../plugins/exchange-operations/exchange-config-listener.c:657
 #, c-format
 msgid "Your password will expire in the next %d days"
 msgstr "ì??í?¸ê°? ì??ì?¼ë¡? %dì?¼ ì??ì?? ë§?ë£?ë?©ë??ë?¤."
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:154
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:570
+#: ../plugins/exchange-operations/exchange-delegates-user.c:142
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:560
 msgid "Custom"
 msgstr "ì?¬ì?©ì?? ì?¤ì ?"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:184
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:8
+#: ../plugins/exchange-operations/exchange-delegates-user.c:168
 msgid "Editor (read, create, edit)"
 msgstr "í?¸ì§?ì?? (ì?½ê¸°, ë§?ë?¤ê¸°, í?¸ì§?)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:188
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:1
+#: ../plugins/exchange-operations/exchange-delegates-user.c:172
 msgid "Author (read, create)"
 msgstr "ì ?ì?? (ì?½ê¸°, ë§?ë?¤ê¸°)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:192
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:11
+#: ../plugins/exchange-operations/exchange-delegates-user.c:176
 msgid "Reviewer (read-only)"
 msgstr "ê²?í? ì?? (ì?½ê¸°ì ?ì?©)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:242
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:6
+#: ../plugins/exchange-operations/exchange-delegates-user.c:225
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:5
 msgid "Delegate Permissions"
 msgstr "ë??ë¦¬ ê¶?í??"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:253
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:178
+#: ../plugins/exchange-operations/exchange-delegates-user.c:236
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:176
 #, c-format
 msgid "Permissions for %s"
 msgstr "%sì?? ë??í?? ê¶?í??"
@@ -17090,7 +15896,7 @@ msgstr "%sì?? ë??í?? ê¶?í??"
 #. To translators: This is a part of the message to be sent to the delegatee
 #. summarizing the permissions assigned to him.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:343
+#: ../plugins/exchange-operations/exchange-delegates-user.c:326
 msgid ""
 "This message was sent automatically by Evolution to inform you that you have "
 "been designated as a delegate. You can now send messages on my behalf."
@@ -17100,84 +15906,96 @@ msgstr ""
 
 #. To translators: Another chunk of the same message.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:348
+#: ../plugins/exchange-operations/exchange-delegates-user.c:331
 msgid "You have been given the following permissions on my folders:"
 msgstr "ë?´ í?´ë??ì?? ë?¤ì??ê³¼ ê°?ì?? ê¶?í??ì?? ë¶?ì?¬ ë°?ì??ì?µë??ë?¤:"
 
 #. To translators: This message is included if the delegatee has been given access
 #. to the private items.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:366
+#: ../plugins/exchange-operations/exchange-delegates-user.c:351
 msgid "You are also permitted to see my private items."
 msgstr "ë?´ ê°?ì?¸ í?ëª©ì?? ë³¼ ì?? ì??ì?µë??ë?¤."
 
 #. To translators: This message is included if the delegatee has not been given access
 #. to the private items.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:373
+#: ../plugins/exchange-operations/exchange-delegates-user.c:358
 msgid "However you are not permitted to see my private items."
 msgstr "í??ì§?ë§? ë?´ ê°?ì?¸ í?ëª©ì?? ë³¼ ì?? ì??ì?µë??ë?¤."
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:405
+#: ../plugins/exchange-operations/exchange-delegates-user.c:390
 #, c-format
 msgid "You have been designated as a delegate for %s"
 msgstr "ê·?í??ë?? %sì?? ë??ë¦¬ì?¸ì?¼ë¡? ì§?ì ?ë??ì??ì?µë??ë?¤"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:417
+#: ../plugins/exchange-operations/exchange-delegates.c:416
 msgid "Delegate To"
 msgstr "ë??ë¦¬"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:582
+#: ../plugins/exchange-operations/exchange-delegates.c:581
 #, c-format
 msgid "Remove the delegate %s?"
 msgstr "ë??ë¦¬ì?¸ %sì??(ë¥¼) ì ?ê±°í??ì??ê² ì?µë??ê¹??"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:700
+#: ../plugins/exchange-operations/exchange-delegates.c:698
 msgid "Could not access Active Directory"
 msgstr "ì?¡í?°ë¸? ë??ë ?í?°ë¦¬ì?? ì ?ê·¼í?  ì?? ì??ì?µë??ë?¤"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:712
+#: ../plugins/exchange-operations/exchange-delegates.c:710
 msgid "Could not find self in Active Directory"
 msgstr "ì?¡í?°ë¸? ë??ë ?í?°ë¦¬ì??ì?? ì??ì? ì?? ì°¾ì?? ì?? ì??ì?µë??ë?¤"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:725
+#: ../plugins/exchange-operations/exchange-delegates.c:723
 #, c-format
 msgid "Could not find delegate %s in Active Directory"
 msgstr "ì?¡í?°ë¸? ë??ë ?í?°ë¦¬ì??ì?? %s ë??ë¦¬ë¥¼ ì°¾ì?? ì?? ì??ì?µë??ë?¤"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:737
+#: ../plugins/exchange-operations/exchange-delegates.c:735
 #, c-format
 msgid "Could not remove delegate %s"
 msgstr "%s ë??ë¦¬ë¥¼ ì§?ì?¸ ì?? ì??ì?µë??ë?¤"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:797
+#: ../plugins/exchange-operations/exchange-delegates.c:795
 msgid "Could not update list of delegates."
 msgstr "ë??ë¦¬ ëª©ë¡?ì?? ì??ë?°ì?´í?¸í?  ì?? ì??ì?µë??ë?¤."
 
-#: ../plugins/exchange-operations/exchange-delegates.c:815
+#: ../plugins/exchange-operations/exchange-delegates.c:813
 #, c-format
 msgid "Could not add delegate %s"
 msgstr "%s ë??ë¦¬ë¥¼ ì¶?ê°?í?  ì?? ì??ì?µë??ë?¤"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:983
+#: ../plugins/exchange-operations/exchange-delegates.c:980
 msgid "Error reading delegates list."
 msgstr "ë??ë¦¬ ëª©ë¡?ì?? ì?½ì?´ë?¤ì?´ë?? ë?° ì?¤ë¥?."
 
 #. Translators: This is used for permissions for <user> for the folder Calendar.
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:3
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:2
 msgid "C_alendar:"
 msgstr "ë?¬ë ¥(_A):"
 
 #. Translators: This is used for permissions for <user> for the folder Contacts.
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:5
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:4
 msgid "Co_ntacts:"
 msgstr "ì?°ë?½ì²?(_N):"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:7
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:6
 msgid "Delegates"
-msgstr "ë??ë¦¬"
+msgstr "ë??ë¦¬ì?¸"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:10
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:7
+msgid ""
+"None\n"
+"Reviewer (read-only)\n"
+"Author (read, create)\n"
+"Editor (read, create, edit)"
+msgstr ""
+"ì??ì??\n"
+"ê²?í? ì?? (ì?½ê¸° ì ?ì?©)\n"
+"ì ?ì?? (ì?½ê¸°, ë§?ë?¤ê¸°)\n"
+"í?¸ì§?ì?? (ì?½ê¸°, ë§?ë?¤ê¸°, í?¸ì§?)"
+
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:11
 msgid "Permissions for"
 msgstr "ë?¤ì??ì?? ë??í?? ê¶?í??:"
 
@@ -17204,6 +16022,7 @@ msgstr "ê¶?í?? ì??ì?½(_S)"
 
 #. Translators: This is used for permissions for <user> for the folder Tasks.
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:20
+#: ../plugins/itip-formatter/itip-view.c:1912
 msgid "_Tasks:"
 msgstr "ì??ì??(_T):"
 
@@ -17221,11 +16040,11 @@ msgid "Folder Size"
 msgstr "í?´ë?? í?¬ê¸°"
 
 #. FIXME Limit to one user
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:78
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:76
 msgid "User"
 msgstr "ì?¬ì?©ì??"
 
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:321
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:309
 #: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
 msgid "Subscribe to Other User's Folder"
 msgstr "ë?¤ë¥¸ ì?¬ì?©ì??ì?? í?´ë??ì?? êµ¬ë??"
@@ -17234,20 +16053,20 @@ msgstr "ë?¤ë¥¸ ì?¬ì?©ì??ì?? í?´ë??ì?? êµ¬ë??"
 msgid "Exchange Folder Tree"
 msgstr "ì?µì?¤ì²´ì?¸ì§? í?´ë?? í?¸ë¦¬"
 
-#: ../plugins/exchange-operations/exchange-folder.c:67
-#: ../plugins/exchange-operations/exchange-folder.c:236
-#: ../plugins/exchange-operations/exchange-folder.c:246
+#: ../plugins/exchange-operations/exchange-folder.c:65
+#: ../plugins/exchange-operations/exchange-folder.c:233
+#: ../plugins/exchange-operations/exchange-folder.c:243
 msgid "Unsubscribe Folder..."
 msgstr "í?´ë?? êµ¬ë?? í?´ì ?..."
 
-#: ../plugins/exchange-operations/exchange-folder.c:466
-#: ../plugins/exchange-operations/exchange-folder.c:521
+#: ../plugins/exchange-operations/exchange-folder.c:463
+#: ../plugins/exchange-operations/exchange-folder.c:518
 #, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
 msgstr "ì ?ë§?ë¡? \"%s\" í?´ë??ë¥¼ êµ¬ë?? í?´ì ?í??ì??ê² ì?µë??ê¹??"
 
-#: ../plugins/exchange-operations/exchange-folder.c:478
-#: ../plugins/exchange-operations/exchange-folder.c:533
+#: ../plugins/exchange-operations/exchange-folder.c:475
+#: ../plugins/exchange-operations/exchange-folder.c:530
 #, c-format
 msgid "Unsubscribe from \"%s\""
 msgstr "\"%s\"ì??ì?? êµ¬ë?? í?´ì ?"
@@ -17311,18 +16130,18 @@ msgstr "ì??í?¸ê°? 7ì?¼ ì??ì?? ë§?ë£?ë?©ë??ë?¤..."
 msgid "_Change Password"
 msgstr "ì??í?¸ ë°?ê¾¸ê¸°(_C)"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:295
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:293
 msgid "(Permission denied.)"
 msgstr "(ê¶?í??ì?´ ê±°ë¶?ë??ì??ì?µë??ë?¤.)"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:403
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:399
 msgid "Add User:"
 msgstr "ì?¬ì?©ì?? ì¶?ê°?:"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:403
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:399
 #: ../plugins/exchange-operations/exchange-send-options.c:410
-#: ../plugins/groupwise-features/proxy.c:937
-#: ../plugins/groupwise-features/share-folder.c:716
+#: ../plugins/groupwise-features/proxy.c:932
+#: ../plugins/groupwise-features/share-folder.c:713
 msgid "Add User"
 msgstr "ì?¬ì?©ì?? ì¶?ê°?"
 
@@ -17442,11 +16261,11 @@ msgstr "ë¯¼ê°? ì ?ë??(_S): "
 msgid "_User"
 msgstr "ì?¬ì?©ì??(_U)"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:136
+#: ../plugins/exchange-operations/exchange-user-dialog.c:134
 msgid "Select User"
 msgstr "ì?¬ì?©ì?? ì? í??"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:174
+#: ../plugins/exchange-operations/exchange-user-dialog.c:172
 msgid "Address Book..."
 msgstr "ì£¼ì??ë¡?..."
 
@@ -17459,10 +16278,8 @@ msgid "Subscribe to Other User's Calendar"
 msgstr "ë?¤ë¥¸ ì?¬ì?©ì??ì?? ë?¬ë ¥ êµ¬ë??"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:1
-msgid ""
-"A plugin that manages a collection of Exchange account specific operations "
-"and features."
-msgstr "ì?µì?¤ì²´ì?¸ì§? ê³?ì ? ê´?ë ¨ ë??ì??ì?´ë?? ê¸°ë?¥ë?¤ì?? ê´?ë¦¬í??ë?? í??ë?¬ê·¸ì?¸."
+msgid "Activates the Evolution-Exchange extension package."
+msgstr "ì??ë³¼ë£¨ì?? ì?µì?¤ì²´ì?¸ì§? í??ì?¥ í?¨í?¤ì§?ë¥¼ í??ì?±í??í?©ë??ë?¤."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:2
 msgid "Exchange Operations"
@@ -17607,7 +16424,7 @@ msgid "Folder offline"
 msgstr "í?´ë?? ì?¤í??ë?¼ì?¸"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
-#: ../shell/e-shell.c:1269
+#: ../shell/e-shell.c:1259
 msgid "Generic error"
 msgstr "ì?¼ë°? ì?¤ë¥?"
 
@@ -17727,7 +16544,9 @@ msgid "Unknown error looking up {0}"
 msgstr "{0}ì??(ë¥¼) ì°¾ì??ë³´ë?? ë?° ì?? ì?? ì??ë?? ì?¤ë¥?"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
-#: ../plugins/google-account-setup/google-source.c:521
+#: ../plugins/google-account-setup/google-source.c:604
+#: ../plugins/mail-to-task/mail-to-task.c:599
+#: ../plugins/mail-to-task/mail-to-task.c:821
 msgid "Unknown error."
 msgstr "ì?? ì?? ì??ë?? ì?¤ë¥?."
 
@@ -17806,41 +16625,55 @@ msgid "Check folder permissions"
 msgstr "í?´ë?? ê¶?í?? ê²?ì?¬"
 
 #: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:1
+msgid "Automatically launch editor when key is pressed in the mail composer"
+msgstr "ë©?ì?¼ ì??ì?± ì°½ì??ì?? í?¤ë¥¼ ë??ë¥´ë©´ ì??ë??ì?¼ë¡? í?¸ì§?ê¸° ì?¤í??"
+
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
+#: ../plugins/external-editor/external-editor.c:120
+msgid "Automatically launch when a new mail is edited"
+msgstr "ì?? ë©?ì?¼ì?? í?¸ì§?í?  ë?? ì??ë??ì?¼ë¡? ì?¤í??"
+
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:3
 msgid "Default External Editor"
 msgstr "ê¸°ë³¸ ì?¸ë¶? í?¸ì§?ê¸°"
 
-#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:4
 msgid "The default command that must be used as the editor."
 msgstr "í?¸ì§?ê¸°ë¡? ì?¬ì?©í?  ê¸°ë³¸ ëª?ë ¹ì?´."
 
 #: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:1
-msgid ""
-"A plugin for using an external editor as the composer. You can send only "
-"plain-text messages."
-msgstr ""
-"ì?¸ë¶? í?¸ì§?ê¸°ë¥¼ í?¸ì§? ì??ì?± ì?©ì?¼ë¡? ì?¬ì?©í??ë?? í??ë?¬ê·¸ì?¸. ì?´ í??ë?¬ê·¸ì?¸ì?? ì?¬ì?©í??ë©´ ì?¼"
-"ë°? í??ì?¤í?¸ ë©?ì?¼ë§? ë³´ë?¼ ì?? ì??ì?µë??ë?¤."
-
-#. the path to the shared library
-#: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:3
 msgid "External Editor"
 msgstr "ì?¸ë¶? í?¸ì§?ê¸°"
 
-#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:1
+#: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:2
+msgid "Use an external editor to compose plain-text mail messages."
+msgstr "ì?¼ë°? í??ì?¤í?¸ ë©?ì?¼ ë©?ì??ì§?ë¥¼ ì??ì?±í?  ë?? ì?¸ë¶? í?¸ì§?ê¸°ë¥¼ ì?¬ì?©í?©ë??ë?¤."
+
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:1
 msgid "Cannot create Temporary File"
 msgstr "ì??ì?? í??ì?¼ì?? ë§?ë?¤ ì?? ì??ì?µë??ë?¤"
 
-#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:2
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:2
 msgid "Editor not launchable"
 msgstr "í?¸ì§?ê¸°ë¥¼ ì??ì??í?  ì?? ì??ì?µë??ë?¤"
 
-#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:3
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:3
 msgid ""
 "Evolution is unable to create a temporary file to save your mail. Retry "
 "later."
 msgstr "ë©?ì?¼ì?? ì ?ì?¥í?  ì??ì?? í??ì?¼ì?? ë§?ë?¤ ì?? ì??ì?µë??ë?¤. ë??ì¤?ì?? ë?¤ì?? ì??ë??í??ì?ì??ì?¤."
 
-#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:4
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:4
+msgid "External editor still running"
+msgstr "ì?¸ë¶? í?¸ì§?ê¸°ê°? ì??ì§? ì?¤í?? ì¤?ì??ë??ë?¤"
+
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:5
+msgid ""
+"The external editor is still running. The mail composer window cannot be "
+"closed as long as the editor is active."
+msgstr "ì?¸ë¶? í?¸ì§?ê¸°ê°? ì??ì§? ì?¤í?? ì¤?ì??ë??ë?¤. ì?´ í?¸ì§?ê¸°ê°? ì?¤í?? ì¤?ì?¸ ë??ì??ì??ë?? ë©?ì?¼ í?¸ì§? ì°½ì?? ë?«ì?? ì?? ì??ì?µë??ë?¤."
+
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:6
 msgid ""
 "The external editor set in your plugin preferences cannot be launched. Try "
 "setting a different editor."
@@ -17848,25 +16681,22 @@ msgstr ""
 "í??ë?¬ê·¸ì?¸ ê¸°ë³¸ ì?¤ì ?ì??ì?? ì§?ì ?í?? ì?¸ë¶? í?¸ì§?ê¸°ë¥¼ ì?¤í??í?  ì?? ì??ì?µë??ë?¤. ë?¤ë¥¸ í?¸ì§?ê¸°"
 "ë¥¼ ì?¤ì ?í?´ ë³´ì?ì??ì?¤."
 
-#: ../plugins/external-editor/org-gnome-external-editor.xml.h:1
-msgid "Compose in _External Editor"
-msgstr "ì?¸ë¶? í?¸ì§?ê¸°ì??ì?? ì??ì?±(_E)"
-
-#: ../plugins/external-editor/org-gnome-external-editor.xml.h:2
-msgid "Compose messages using an external editor"
-msgstr "ì?¸ë¶? í?¸ì§?ê¸°ë¥¼ ì?¬ì?©í?´ ë©?ì??ì§? ì??ì?±"
-
-#: ../plugins/external-editor/external-editor.c:114
+#: ../plugins/external-editor/external-editor.c:109
 msgid "Command to be executed to launch the editor: "
 msgstr "í?¸ì§?ê¸°ë¥¼ ì?¤í??í?  ëª?ë ¹ì?´: "
 
-#: ../plugins/external-editor/external-editor.c:115
+#: ../plugins/external-editor/external-editor.c:110
 msgid ""
 "For Emacs use \"xemacs\"\n"
-"For VI use \"gvim\""
+"For VI use \"gvim -f\""
 msgstr ""
 "ì?´ë§¥ì?¤ì?? ê²½ì?° \"xemacs\"ë¥¼ ì?¬ì?©í??ê³ \n"
-"VIë?? \"gvim\"ì?? ì?¬ì?©í??ì?ì??ì?¤"
+"VIë?? \"gvim -f\"ë¥¼ ì?¬ì?©í??ì?ì??ì?¤"
+
+#: ../plugins/external-editor/external-editor.c:354
+#: ../plugins/external-editor/external-editor.c:356
+msgid "Compose in External Editor"
+msgstr "ì?¸ë¶? í?¸ì§?ê¸°ì??ì?? ì??ì?±"
 
 #: ../plugins/face/face.c:59
 msgid "Select a (48*48) png of size < 700bytes"
@@ -17882,38 +16712,45 @@ msgstr "ì?¼êµ´(_F)"
 
 #: ../plugins/face/org-gnome-face.eplug.xml.h:1
 msgid ""
-"Attach Face header to outgoing messages. First time the user needs to "
-"configure a 48*48 png image. It is base64 encoded and stored in ~/.evolution/"
-"faces This will be used in messages that are sent further."
+"Attach a small picture of your face to outgoing messages.\n"
+"\n"
+"First time the user needs to configure a 48x48 PNG image. It is Base-64 "
+"encoded and stored in ~/.evolution/faces. This will be used in subsequent "
+"sent messages."
 msgstr ""
-"ë³´ë?´ë?? ë©?ì??ì§?ì?? Face í?¤ë??ë¥¼ ë¶?ì??ë??ë?¤. ë§¨ ì²?ì??ì?? 48*48 PNG ê·¸ë¦¼ì?? ì?¤ì ?í?´ì?¼ í?©"
-"ë??ë?¤. ì?´ ê·¸ë¦¼ì?? base64ë¡? ì?¸ì½?ë?©í?´ì?? ~/.evolution/faces í??ì?¼ì?? ì ?ì?¥í?©ë??ë?¤. ê·¸"
-"ë?¬ë©´ ê·¸ í??ì?? ë³´ë?´ë?? ë©?ì??ì§?ì?? ì?´ ê·¸ë¦¼ì?? ì?¬ì?©í?©ë??ë?¤."
+"ë³´ë?´ë?? ë©?ì??ì§?ì?? ì??ì?? ì??ê¸° ì?¼êµ´ ì?¬ì§?ì?? ë¶?ì??ë??ë?¤.\n"
+"\n"
+"ë§¨ ì²?ì??ì?? 48*48 PNG ê·¸ë¦¼ì?? ì?¤ì ?í?´ì?¼ í?©ë??ë?¤. ì?´ ê·¸ë¦¼ì?? base64ë¡? ì?¸ì½?ë?©í?´ì?? ~/.evolution/faces í??ì?¼ì?? ì ?ì?¥í?©ë??ë?¤. ê·¸ë?¬ë©´ ê·¸ í??ì?? ë³´ë?´ë?? ë©?ì??ì§?ì?? ì?´ ê·¸ë¦¼ì?? ì?¬ì?©í?©ë??ë?¤."
 
-#: ../plugins/folder-unsubscribe/folder-unsubscribe.c:56
+#: ../plugins/folder-unsubscribe/folder-unsubscribe.c:53
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr "\"%s\" í?´ë??ë¥¼ êµ¬ë?? í?´ì ?í??ë?? ì¤?"
 
 #: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:1
-msgid "Allows unsubscribing of mail folders in the side bar context menu."
-msgstr ""
-"ê°?ì?¥ì??ë¦¬ ì°½ì?? ì»¨í??ì?¤í?¸ ë©?ë?´ì??ì?? ë©?ì?¼ í?´ë??ë¥¼ êµ¬ë?? í?´ì ?í?  ì?? ì??ê²? í?©ë??ë?¤."
-
-#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:2
 msgid "Unsubscribe Folders"
 msgstr "í?´ë?? êµ¬ë?? í?´ì ?"
 
+#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:2
+msgid ""
+"Unsubscribe from an IMAP folder by right-clicking on it in the folder tree."
+msgstr "IMAP í?´ë?? í?¸ë¦¬ì??ì?? ì?¤ë¥¸ìª½ í?´ë¦ì?¼ë¡? IMAP í?´ë?? êµ¬ë??ì?? í?´ì ?í?©ë??ë?¤."
+
 #: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:3
 msgid "_Unsubscribe"
 msgstr "êµ¬ë?? ì¤?ì§?(_U)"
 
-#: ../plugins/google-account-setup/google-source.c:421
+#: ../plugins/google-account-setup/google-source.c:81
+#: ../plugins/google-account-setup/google-contacts-source.c:51
+msgid "Google"
+msgstr "êµ¬ê¸?"
+
+#: ../plugins/google-account-setup/google-source.c:499
 #, c-format
 msgid "Enter password for user %s to access list of subscribed calendars."
 msgstr "êµ¬ë??í??ê³  ì??ë?? ë?¬ë ¥ ëª©ë¡?ì?? ì?½ì?¼ë ¤ë©´ %s ì?¬ì?©ì??ì?? ì??í?¸ë¥¼ ì??ë ¥í??ì?ì??ì?¤."
 
-#: ../plugins/google-account-setup/google-source.c:521
+#: ../plugins/google-account-setup/google-source.c:604
 #, c-format
 msgid ""
 "Cannot read data from Google server.\n"
@@ -17922,45 +16759,40 @@ msgstr ""
 "êµ¬ê¸? ì??ë²?ì??ì?? ë?°ì?´í?°ë¥¼ ì?½ì?? ì?? ì??ì?µë??ë?¤.\n"
 "%s"
 
-#: ../plugins/google-account-setup/google-source.c:683
+#: ../plugins/google-account-setup/google-source.c:739
 msgid "Cal_endar:"
 msgstr "ë?¬ë ¥(_E):"
 
-#: ../plugins/google-account-setup/google-source.c:718
+#: ../plugins/google-account-setup/google-source.c:774
 msgid "Retrieve _list"
 msgstr "ëª©ë¡? ê°?ì ¸ì?¤ê¸°(_L)"
 
-#: ../plugins/google-account-setup/google-contacts-source.c:69
-#: ../plugins/google-account-setup/google-contacts-source.c:71
-msgid "Google"
-msgstr "êµ¬ê¸?"
-
-#: ../plugins/google-account-setup/google-contacts-source.c:306
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:325
+#: ../plugins/google-account-setup/google-contacts-source.c:270
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:285
 msgid "<b>Server</b>"
 msgstr "<b>ì??ë²?</b>"
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
-msgid "A plugin to setup Google Calendar and Contacts."
-msgstr "êµ¬ê¸? ìº?ë¦°í?° ë°? ì£¼ì??ë¡?ì?? ì?¤ì ?í??ë?? í??ë?¬ê·¸ì?¸."
+msgid "Add Google Calendars to Evolution."
+msgstr "êµ¬ê¸? ë?¬ë ¥ì?? ì??ë³¼ë£¨ì??ì?? ì¶?ê°?í?©ë??ë?¤."
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
-msgid "Google sources"
-msgstr "êµ¬ê¸? ì??ì?¤"
+msgid "Google Calendars"
+msgstr "êµ¬ê¸? ë?¬ë ¥"
 
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:456
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:450
 msgid "Checklist"
 msgstr "í??ì?¸ëª©ë¡?"
 
 #: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:1
-msgid "A plugin to setup GroupWise calendar and contacts sources."
-msgstr "ê·¸ë£¹ì??ì?´ì¦? ë?¬ë ¥ ë°? ì?°ë?½ì²? ì??ì?¤ë¥¼ ì?¤ì ?í??ë?? í??ë?¬ê·¸ì?¸."
+msgid "Add Novell GroupWise support to Evolution."
+msgstr "ë?¸ë²¨ ê·¸ë£¹ì??ì?´ì¦? ê¸°ë?¥ì?? ì??ë³¼ë£¨ì??ì?? ì¶?ê°?í?©ë??ë?¤."
 
 #: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:2
 msgid "GroupWise Account Setup"
 msgstr "ê·¸ë£¹ì??ì?´ì¦? ê³?ì ? ì?¤ì ?"
 
-#: ../plugins/groupwise-features/install-shared.c:220
+#: ../plugins/groupwise-features/install-shared.c:219
 #, c-format
 msgid ""
 "The user '%s' has shared a folder with you\n"
@@ -17985,11 +16817,11 @@ msgstr ""
 "ê³µì?  í?´ë??ë¥¼ ì?¤ì¹?í??ë ¤ë©´ 'ì??ì?¼ë¡?'ë¥¼ ë??ë¥´ì?ì??ì?¤\n"
 "\n"
 
-#: ../plugins/groupwise-features/install-shared.c:225
+#: ../plugins/groupwise-features/install-shared.c:224
 msgid "Install the shared folder"
 msgstr "ê³µì?  í?´ë?? ì?¤ì¹?"
 
-#: ../plugins/groupwise-features/install-shared.c:227
+#: ../plugins/groupwise-features/install-shared.c:226
 msgid "Shared Folder Installation"
 msgstr "ê³µì?  í?´ë?? ì?¤ì¹?"
 
@@ -18027,11 +16859,11 @@ msgstr "ì?¬ì?©(_E)"
 msgid "_Junk List"
 msgstr "ì ?í?¬ë©?ì?¼ ëª©ë¡?(_J)"
 
-#: ../plugins/groupwise-features/mail-retract.c:53
+#: ../plugins/groupwise-features/mail-retract.c:52
 msgid "Message Retract"
 msgstr "ë©?ì??ì§? ì² í??"
 
-#: ../plugins/groupwise-features/mail-retract.c:58
+#: ../plugins/groupwise-features/mail-retract.c:57
 msgid ""
 "Retracting a message may remove it from the recipient's mailbox. Are you "
 "sure you want to do this ?"
@@ -18039,11 +16871,11 @@ msgstr ""
 "ë©?ì??ì§?ë¥¼ ì² í??í??ë©´ ë°?ë?? ì?¬ë??ì?? ë©?ì?¼í?¨ì??ì?? ì ?ê±°ë?  ì??ë?? ì??ì?µë??ë?¤. ì ?ë§?ë¡? ì² í??í??"
 "ì??ê² ì?µë??ê¹??"
 
-#: ../plugins/groupwise-features/mail-retract.c:77
+#: ../plugins/groupwise-features/mail-retract.c:76
 msgid "Message retracted successfully"
 msgstr "ë©?ì??ì§?ë¥¼ ì?±ê³µì ?ì?¼ë¡? ì² í??í??ì?µë??ë?¤"
 
-#: ../plugins/groupwise-features/mail-retract.c:87
+#: ../plugins/groupwise-features/mail-retract.c:86
 msgid "Retract Mail"
 msgstr "ë©?ì?¼ ì² í??"
 
@@ -18052,89 +16884,119 @@ msgid "Add Send Options to GroupWise messages"
 msgstr "ê·¸ë£¹ì??ì?´ì¦? ë©?ì??ì§?ì?? ë³´ë?´ê¸° ì?µì?? ì¶?ê°?"
 
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
-msgid "A plugin for the features in GroupWise accounts."
-msgstr "ê·¸ë£¹ì??ì?´ì¦? ê³?ì ? ê¸°ë?¥ì?? ë??í?? í??ë?¬ê·¸ì?¸."
+msgid "Fine-tune your GroupWise accounts."
+msgstr "ê·¸ë£¹ì??ì?´ì¦? ê³?ì ?ì?? ì?¸ë¶? ì?¬í?ì?? ì?¤ì ?í?©ë??ë?¤."
 
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:2
 msgid "GroupWise Features"
 msgstr "ê·¸ë£¹ì??ì?´ì¦? ê¸°ë?¥"
 
-#: ../plugins/groupwise-features/org-gnome-mail-retract-errors.xml.h:1
+#: ../plugins/groupwise-features/org-gnome-mail-retract.error.xml.h:1
 msgid "Message retract failed"
 msgstr "ë©?ì??ì§? ì² í??ê°? ì?¤í?¨í??ì?µë??ë?¤"
 
-#: ../plugins/groupwise-features/org-gnome-mail-retract-errors.xml.h:2
+#: ../plugins/groupwise-features/org-gnome-mail-retract.error.xml.h:2
 msgid "The server did not allow the selected message to be retracted."
 msgstr "ì? í??í?? ë©?ì??ì§?ì?? ì² í??ë¥¼ ì??ë²?ì??ì?? í??ì?©í??ì§? ì??ì??ì?µë??ë?¤."
 
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:1
-#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:3
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:1
+#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:1
+msgid "Account &quot;{0}&quot; already exists. Please check your folder tree."
+msgstr "&quot;{0}&quot; ê³?ì ?ì?´ ì?´ë¯¸ ì??ì?µë??ë?¤. í?´ë?? í?¸ë¦¬ë¥¼ í??ì?¸í??ì?ì??ì?¤."
+
+#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:2
+msgid "Account Already Exists"
+msgstr "ê³?ì ?ì?´ ì?´ë¯¸ ì??ì?µë??ë?¤"
+
+#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:3
+#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:1
+#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:1
 msgid "Invalid user"
 msgstr "ì??ëª»ë?? ì?¬ì?©ì??"
 
+#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:4
+msgid ""
+"Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email "
+"address and try again."
+msgstr ""
+"&quot;{0}&quot; ì?¬ì?©ì??ì?? í??ë¡?ì?? ë¡?ê·¸ì?¸ì?´ ì?¤í?¨í??ì?µë??ë?¤. ì ?ì??ë©?ì?¼ ì£¼ì??ë¥¼ í??ì?¸í??"
+"ê³  ë?¤ì?? ì??ë??í??ì?ì??ì?¤."
+
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:3
+#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:3
 msgid "Proxy access cannot be given to user &quot;{0}&quot;"
 msgstr "í??ë¡?ì?? ê¶?í??ì?? &quot;{0}&quot; ì?¬ì?©ì??ì??ê²? ë¶?ì?¬í?  ì?? ì??ì?µë??ë?¤"
 
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:4
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:2
+#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:4
+#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:2
 msgid "Specify User"
 msgstr "ì?¬ì?©ì?? ì§?ì ?"
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:6
+#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:6
 msgid "You have already given proxy permissions to this user."
 msgstr "ì?´ ì?¬ì?©ì??ì??ê²? ì?´ë¯¸ í??ë¡?ì?? ê¶?í??ì?? ë¶?ì?¬í??ì?µë??ë?¤."
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:8
+#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:8
 msgid "You have to specify a valid user name to give proxy rights."
 msgstr "í??ë¡?ì?? ê¶?í??ì?? ë¶?ì?¬í??ë ¤ë©´ ì?¬ë°?ë¥¸ ì?¬ì?©ì?? ì?´ë¦?ì?? ì§?ì ?í?´ì?¼ í?©ë??ë?¤."
 
-#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:1
-msgid "Account &quot;{0}&quot; already exists. Please check your folder tree."
-msgstr "&quot;{0}&quot; ê³?ì ?ì?´ ì?´ë¯¸ ì??ì?µë??ë?¤. í?´ë?? í?¸ë¦¬ë¥¼ í??ì?¸í??ì?ì??ì?¤."
+#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:3
+msgid "You cannot share this folder with the specified user &quot;{0}&quot;"
+msgstr "ì?´ í?´ë??ë¥¼ ì§?ì ?í?? &quot;{0}&quot; ì?¬ì?©ì??ì?? ê³µì? í?  ì?? ì??ì?µë??ë?¤"
 
-#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:2
-msgid "Account Already Exists"
-msgstr "ê³?ì ?ì?´ ì?´ë¯¸ ì??ì?µë??ë?¤"
+#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:4
+msgid "You have to specify a user name which you want to add to the list"
+msgstr "ëª©ë¡?ì?? ì¶?ê°?í?  ì?¬ì?©ì?? ì?´ë¦?ì?? ì§?ì ?í?´ì?¼ í?©ë??ë?¤"
 
-#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:4
-msgid ""
-"Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email "
-"address and try again."
-msgstr ""
-"&quot;{0}&quot; ì?¬ì?©ì??ì?? í??ë¡?ì?? ë¡?ê·¸ì?¸ì?´ ì?¤í?¨í??ì?µë??ë?¤. ì ?ì??ë©?ì?¼ ì£¼ì??ë¥¼ í??ì?¸í??"
-"ê³  ë?¤ì?? ì??ë??í??ì?ì??ì?¤."
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:1
+msgid "Do you want to resend the meeting ?"
+msgstr "ì?´ ëª¨ì??ì?? ë?¤ì?? ë³´ë?´ì??ê² ì?µë??ê¹??"
+
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:2
+msgid "Do you want to resend the recurring meeting ?"
+msgstr "ì?´ ë°?ë³µ ëª¨ì??ì?? ë?¤ì?? ë³´ë?´ì??ê² ì?µë??ê¹??"
+
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:3
+msgid "Do you want to retract the original item ?"
+msgstr "ì??ë?? í?ëª©ì?? ë³µêµ¬í??ì??ê² ì?µë??ê¹??"
+
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:4
+msgid "The original will be removed from the recipient's mailbox."
+msgstr "ì??ë?? í?ëª©ì?? ì??ì? ì??ì?? ë©?ì?¼í?¨ì??ì?? ì§?ì??ë??ë?¤."
 
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:3
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:5
 msgid "This is a recurring meeting"
 msgstr "ë°?ë³µ ëª¨ì??ì??ë??ë?¤"
 
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:6
+msgid "This will create a new meeting using the existing meeting details."
+msgstr "ê¸°ì¡´ì?? ëª¨ì?? ì?¤ì ?ì?? ì?´ì?©í?´ ì?? ëª¨ì??ì?? ë§?ë?ë??ë?¤."
+
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:7
+msgid ""
+"This will create a new meeting with the existing meeting details. The "
+"recurrence rule needs to be re-entered."
+msgstr "ê¸°ì¡´ì?? ëª¨ì?? ì?¤ì ?ì?? ì?´ì?©í?´ ì?? ëª¨ì??ì?? ë§?ë?ë??ë?¤. ë°?ë³µ ê·?ì¹?ì?? ë?¤ì?? ì??ë ¥í?´ì?¼ í?©ë??ë?¤."
+
 #. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:5
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:9
 msgid "Would you like to accept it?"
 msgstr "ë°?ì??ë?¤ì?´ì??ê² ì?µë??ê¹??"
 
 #. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:7
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:11
 msgid "Would you like to decline it?"
 msgstr "ê±°ë¶?í??ì??ê² ì?µë??ê¹??"
 
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:8
-msgid "You cannot share this folder with the specified user &quot;{0}&quot;"
-msgstr "ì?´ í?´ë??ë¥¼ ì§?ì ?í?? &quot;{0}&quot; ì?¬ì?©ì??ì?? ê³µì? í?  ì?? ì??ì?µë??ë?¤"
-
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:9
-msgid "You have to specify a user name which you want to add to the list"
-msgstr "ëª©ë¡?ì?? ì¶?ê°?í?  ì?¬ì?©ì?? ì?´ë¦?ì?? ì§?ì ?í?´ì?¼ í?©ë??ë?¤"
-
-#: ../plugins/groupwise-features/process-meeting.c:52
+#: ../plugins/groupwise-features/process-meeting.c:53
 msgid "Accept Tentatively"
 msgstr "ì??í?? ì?¼ì?? í??ì?©"
 
+#: ../plugins/groupwise-features/process-meeting.c:319
+msgid "Rese_nd Meeting..."
+msgstr "ëª¨ì?? ë?¤ì?? ë³´ë?´ê¸°(_N)..."
+
 #: ../plugins/groupwise-features/properties.glade.h:1
 msgid "<b>Users:</b>"
 msgstr "<b>ì?¬ì?©ì??:</b>"
@@ -18148,7 +17010,7 @@ msgid "Con_tacts..."
 msgstr "ì?°ë?½ì²?(_T)..."
 
 #: ../plugins/groupwise-features/properties.glade.h:5
-#: ../widgets/table/e-table-click-to-add.c:516
+#: ../widgets/table/e-table-click-to-add.c:514
 msgid "Message"
 msgstr "ë©?ì??ì§?"
 
@@ -18232,10 +17094,10 @@ msgstr "<b>ê³?ì ? ì?´ë¦?</b>"
 msgid "Proxy Login"
 msgstr "í??ë¡?ì?? ë¡?ê·¸ì?¸"
 
-#: ../plugins/groupwise-features/proxy-login.c:206
-#: ../plugins/groupwise-features/proxy-login.c:248
-#: ../plugins/groupwise-features/proxy.c:491
-#: ../plugins/groupwise-features/send-options.c:85
+#: ../plugins/groupwise-features/proxy-login.c:207
+#: ../plugins/groupwise-features/proxy-login.c:250
+#: ../plugins/groupwise-features/proxy.c:488
+#: ../plugins/groupwise-features/send-options.c:86
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%s%s(ì?¬ì?©ì?? %s)ì?? ì??í?¸ë¥¼ ì??ë ¥í??ì?ì??ì?¤"
@@ -18243,17 +17105,17 @@ msgstr "%s%s(ì?¬ì?©ì?? %s)ì?? ì??í?¸ë¥¼ ì??ë ¥í??ì?ì??ì?¤"
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a groupwise
 #. * feature by which one person can send/read mails/appointments using another person's identity
 #. * without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy-login.c:510
+#: ../plugins/groupwise-features/proxy-login.c:512
 msgid "_Proxy Login..."
 msgstr "í??ë¡?ì?? ë¡?ê·¸ì?¸(_P)..."
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:692
+#: ../plugins/groupwise-features/proxy.c:689
 msgid "The Proxy tab will be available only when the account is online."
 msgstr "í?´ë?¹ ê³?ì ?ì?´ ì?¨ë?¼ì?¸ ì??í??ì?¼ ê²½ì?°ì??ë§? í??ë¡?ì?? í?ì?? ì?¬ì?©í?  ì?? ì??ì?µë??ë?¤."
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:698
+#: ../plugins/groupwise-features/proxy.c:695
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr "í?´ë?¹ ê³?ì ?ì?? ì?¬ì?©í?  ê²½ì?°ì??ë§? í??ë¡?ì?? í?ì?? ì?¬ì?©í?  ì?? ì??ì?µë??ë?¤."
 
@@ -18261,101 +17123,101 @@ msgstr "í?´ë?¹ ê³?ì ?ì?? ì?¬ì?©í?  ê²½ì?°ì??ë§? í??ë¡?ì?? í?ì?? ì?¬ì?©í?  ì?? 
 msgid "Advanced send options"
 msgstr "ê³ ê¸? ë³´ë?´ê¸° ì?µì??"
 
-#: ../plugins/groupwise-features/share-folder-common.c:321
-#: ../plugins/groupwise-features/share-folder.c:751
+#: ../plugins/groupwise-features/share-folder-common.c:320
+#: ../plugins/groupwise-features/share-folder.c:748
 msgid "Users"
 msgstr "ì?¬ì?©ì??"
 
-#: ../plugins/groupwise-features/share-folder-common.c:322
+#: ../plugins/groupwise-features/share-folder-common.c:321
 msgid "Enter the users and set permissions"
 msgstr "ì?¬ì?©ì??ë¥¼ ì??ë ¥í??ì??ê³  ê¶?í??ì?? ì?¤ì ?í??ì?ì??ì?¤"
 
-#: ../plugins/groupwise-features/share-folder-common.c:341
+#: ../plugins/groupwise-features/share-folder-common.c:340
 msgid "New _Shared Folder..."
 msgstr "ì?? ê³µì?  í?´ë??(_S)..."
 
-#: ../plugins/groupwise-features/share-folder-common.c:449
+#: ../plugins/groupwise-features/share-folder-common.c:447
 msgid "Sharing"
 msgstr "ê³µì? "
 
-#: ../plugins/groupwise-features/share-folder.c:534
+#: ../plugins/groupwise-features/share-folder.c:531
 msgid "Custom Notification"
 msgstr "ì?¬ì?©ì?? ì§?ì ? ì??ë¦¼"
 
-#: ../plugins/groupwise-features/share-folder.c:756
+#: ../plugins/groupwise-features/share-folder.c:753
 msgid "Add   "
 msgstr "ì¶?ê°?   "
 
-#: ../plugins/groupwise-features/share-folder.c:762
+#: ../plugins/groupwise-features/share-folder.c:759
 msgid "Modify"
 msgstr "ì??ì ?"
 
-#: ../plugins/groupwise-features/status-track.c:97
+#: ../plugins/groupwise-features/status-track.c:94
 msgid "Message Status"
 msgstr "ë©?ì??ì§? ì??í??"
 
 #. Subject
-#: ../plugins/groupwise-features/status-track.c:111
+#: ../plugins/groupwise-features/status-track.c:108
 msgid "Subject:"
 msgstr "ì ?ëª©:"
 
-#: ../plugins/groupwise-features/status-track.c:125
+#: ../plugins/groupwise-features/status-track.c:122
 msgid "From:"
 msgstr "ë³´ë?¸ ì?¬ë??:"
 
-#: ../plugins/groupwise-features/status-track.c:140
+#: ../plugins/groupwise-features/status-track.c:137
 msgid "Creation date:"
 msgstr "ë§?ë?  ë? ì§?:"
 
-#: ../plugins/groupwise-features/status-track.c:179
+#: ../plugins/groupwise-features/status-track.c:176
 msgid "Recipient: "
 msgstr "ë°?ë?? ì?¬ë??: "
 
-#: ../plugins/groupwise-features/status-track.c:186
+#: ../plugins/groupwise-features/status-track.c:183
 msgid "Delivered: "
 msgstr "ì ?ë?¬: "
 
-#: ../plugins/groupwise-features/status-track.c:192
+#: ../plugins/groupwise-features/status-track.c:189
 msgid "Opened: "
 msgstr "ì?´ê¸°: "
 
-#: ../plugins/groupwise-features/status-track.c:197
+#: ../plugins/groupwise-features/status-track.c:194
 msgid "Accepted: "
 msgstr "ì??ë?½: "
 
-#: ../plugins/groupwise-features/status-track.c:202
+#: ../plugins/groupwise-features/status-track.c:199
 msgid "Deleted: "
 msgstr "ì§?ì??: "
 
-#: ../plugins/groupwise-features/status-track.c:207
+#: ../plugins/groupwise-features/status-track.c:204
 msgid "Declined: "
 msgstr "ê±°ë¶?: "
 
-#: ../plugins/groupwise-features/status-track.c:212
+#: ../plugins/groupwise-features/status-track.c:209
 msgid "Completed: "
 msgstr "ì??ë£?: "
 
-#: ../plugins/groupwise-features/status-track.c:217
+#: ../plugins/groupwise-features/status-track.c:214
 msgid "Undelivered: "
 msgstr "ì ?ë?¬ë??ì§? ì??ì??: "
 
-#: ../plugins/groupwise-features/status-track.c:241
+#: ../plugins/groupwise-features/status-track.c:238
 msgid "Track Message Status..."
 msgstr "ë©?ì??ì§? ì??í?? ì¶?ì ?..."
 
 #: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:1
-msgid "A plugin to setup hula calendar sources."
-msgstr "hula ë?¬ë ¥ ì??ì?¤ë¥¼ ì?¤ì ?í??ë?? í??ë?¬ê·¸ì?¸."
+msgid "Add Hula support to Evolution."
+msgstr "Hula ê¸°ë?¥ì?? ì??ë³¼ë£¨ì??ì?? ì¶?ê°?í?©ë??ë?¤."
 
 #: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:2
-msgid "Hula Account Setup"
-msgstr "Hula ê³?ì ? ì?¤ì ?"
+msgid "Hula Support"
+msgstr "Hula ê¸°ë?¥"
 
-#: ../plugins/imap-features/imap-headers.c:320
+#: ../plugins/imap-features/imap-headers.c:332
 msgid "Custom Headers"
 msgstr "ì?¬ì?©ì?? ì?¤ì ? í?¤ë??"
 
-#: ../plugins/imap-features/imap-headers.c:333
+#: ../plugins/imap-features/imap-headers.c:345
 msgid "IMAP Headers"
 msgstr "IMAP í?¤ë??"
 
@@ -18372,10 +17234,6 @@ msgid "Basic and _Mailing List Headers (Default)"
 msgstr "ê¸°ë³¸ ë°? ë©?ì?¼ë§? ë¦¬ì?¤í?¸ í?¤ë?? (ê¸°ë³¸ê°?)(_M)"
 
 #: ../plugins/imap-features/imap-headers.glade.h:4
-msgid "Fetch A_ll Headers"
-msgstr "í?¤ë?? ëª¨ë?? ê°?ì ¸ì?¤ê¸°(_L)"
-
-#: ../plugins/imap-features/imap-headers.glade.h:5
 msgid ""
 "Give the extra headers that you need to fetch in addition to the above "
 "standard headers. \n"
@@ -18384,7 +17242,7 @@ msgstr ""
 "ì??ì?? í??ì¤? í?¤ë??ì?? ê°?ì?´ ì¶?ê°?ë¡? ë°?ì?? ì?¬ í?¤ë??ë¥¼ ì??ë ¥í??ì?ì??ì?¤.\n"
 "\"ëª¨ë?  í?¤ë??\"ë¥¼ ì? í??í??ë©´ ì?´ ì?¬í?ì?? ë¬´ì??í??ì?ì??ì?¤."
 
-#: ../plugins/imap-features/imap-headers.glade.h:7
+#: ../plugins/imap-features/imap-headers.glade.h:6
 msgid ""
 "Select your IMAP Header Preferences. \n"
 "The more headers you have the more time it will take to download."
@@ -18392,7 +17250,7 @@ msgstr ""
 "IMAP í?¤ë?? ì?¤ì ?ì?? ì? í??í??ì?ì??ì?¤.\n"
 "í?¤ë??ë¥¼ ë§?ì?´ ì? í??í?  ì??ë¡? ë?¤ì?´ë¡?ë??í??ë?? ë?° ë?? ì?¤ë?? ê±¸ë¦½ë??ë?¤."
 
-#: ../plugins/imap-features/imap-headers.glade.h:9
+#: ../plugins/imap-features/imap-headers.glade.h:8
 msgid ""
 "_Basic Headers - (Fastest) \n"
 "Use this if you do not have filters based on mailing lists"
@@ -18400,53 +17258,23 @@ msgstr ""
 "ê¸°ë³¸ í?¤ë??(_B) - (ê°?ì?¥ ë¹ ë¦?) \n"
 "ë©?ì?¼ë§? ë¦¬ì?¤í?¸ ê´?ë ¨ í??í?°ê°? ì??ì?¼ë©´ ì?´ ì?µì??ì?? ì?¬ì?©í??ì?ì??ì?¤"
 
+#: ../plugins/imap-features/imap-headers.glade.h:10
+msgid "_Fetch All Headers"
+msgstr "í?¤ë?? ëª¨ë?? ê°?ì ¸ì?¤ê¸°(_F)"
+
 #: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:1
-msgid "A plugin for the features in the IMAP accounts."
-msgstr "IMAP ê³?ì ? ê¸°ë?¥ì?? ë??í?? í??ë?¬ê·¸ì?¸."
+msgid "Fine-tune your IMAP accounts."
+msgstr "IMAP ê³?ì ?ì?? ì?¸ë¶? ì?¬í?ì?? ì?¤ì ?í?©ë??ë?¤."
 
 #: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:2
 msgid "IMAP Features"
 msgstr "IMAP ê¸°ë?¥"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:78
-msgid "_Import to Calendar"
-msgstr "ë?¬ë ¥ì?¼ë¡? ê°?ì ¸ì?¤ê¸°(_I)"
-
-#: ../plugins/import-ics-attachments/icsimporter.c:83
-msgid "_Import to Tasks"
-msgstr "ì??ì??ì?¼ë¡? ê°?ì ¸ì?¤ê¸°(_I)"
-
-#: ../plugins/import-ics-attachments/icsimporter.c:201
-msgid "Import ICS"
-msgstr "ICS ê°?ì ¸ì?¤ê¸°"
-
-#: ../plugins/import-ics-attachments/icsimporter.c:224
-msgid "Select Task List"
-msgstr "ì??ì?? ëª©ë¡? ì? í??"
-
-#: ../plugins/import-ics-attachments/icsimporter.c:228
-msgid "Select Calendar"
-msgstr "ë?¬ë ¥ ì? í??"
-
-#: ../plugins/import-ics-attachments/icsimporter.c:260
-#: ../shell/e-shell-importer.c:696
-msgid "_Import"
-msgstr "ê°?ì ¸ì?¤ê¸°(_I)"
-
-#. the path to the shared library
-#: ../plugins/import-ics-attachments/org-gnome-evolution-mail-attachments-import-ics.eplug.xml.h:2
-msgid "Import to Calendar"
-msgstr "ë?¬ë ¥ì?¼ë¡? ê°?ì ¸ì?¤ê¸°"
-
-#: ../plugins/import-ics-attachments/org-gnome-evolution-mail-attachments-import-ics.eplug.xml.h:3
-msgid "Imports ICS attachments to calendar."
-msgstr "ICS ì²¨ë¶? í??ì?¼ì?? ë?¬ë ¥ì?¼ë¡? ê°?ì ¸ì?µë??ë?¤."
-
 #: ../plugins/ipod-sync/evolution-ipod-sync.c:49
 msgid "Hardware Abstraction Layer not loaded"
 msgstr "í??ë??ì?¨ì?´ ì¶?ì??í?? ë ?ì?´ì?´ë¥¼ ì?½ì?´ë?¤ì?´ì§? ëª»í??ì?µë??ë?¤"
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:50
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:52
 msgid ""
 "The \"hald\" service is required but not currently running. Please enable "
 "the service and rerun this program, or contact your system administrator."
@@ -18455,9 +17283,9 @@ msgstr ""
 "ì?¤ë¥¼ ì??ì??í??ê³  í??ë¡?ê·¸ë?¨ì?? ë?¤ì?? ì??ì??í??ì?ì??ì?¤. ì??ë??ë©´ ì??ì?¤í?? ê´?ë¦¬ì??ì??ê²? ì?°ë?½í??ì?"
 "ì??ì?¤."
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:83
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:81
 msgid "Search for an iPod failed"
-msgstr "ì??ì?´í?? ì°¾ê¸°ê°? ì?¤í?¨í??ì?µë??ë?¤"
+msgstr "ì??ì?´í?? ê²?ì??ì?´ ì?¤í?¨í??ì?µë??ë?¤"
 
 #: ../plugins/ipod-sync/evolution-ipod-sync.c:84
 msgid ""
@@ -18473,141 +17301,144 @@ msgid "iCalendar format (.ics)"
 msgstr "iCalendar í??ì?? (.ics)"
 
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:1
-msgid ""
-"Synchronize the selected task/memo/calendar/address book with Apple iPod"
-msgstr "ì? í??í?? ì??ì??/ë©?ëª¨/ë?¬ë ¥/ì£¼ì??ë¡?ì?? ì? í?? ì??ì?´í??ê³¼ ë??ê¸°í??"
-
-#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:2
 msgid "Synchronize to iPod"
 msgstr "ì??ì?´í??ê³¼ ë??ê¸°í??"
 
+#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:2
+msgid "Synchronize your data with your Apple iPod."
+msgstr "ë?°ì?´í?°ë¥¼ ì? í?? ì??ì?´í??ê³¼ ë??ê¸°í??í?©ë??ë?¤."
+
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:3
 msgid "iPod Synchronization"
 msgstr "ì??ì?´í?? ë??ê¸°í??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:481
-#: ../plugins/itip-formatter/itip-formatter.c:606
+#: ../plugins/itip-formatter/itip-formatter.c:482
+#: ../plugins/itip-formatter/itip-formatter.c:607
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "'%s' ë?¬ë ¥ì?? ì?½ì?´ë?¤ì?´ë?? ë?° ì?¤í?¨í??ì?µë??ë?¤"
 
 # event -> í??ì?¬, Microsoft Office XP ì°¸ê³ 
-#: ../plugins/itip-formatter/itip-formatter.c:626
+#: ../plugins/itip-formatter/itip-formatter.c:627
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "'%s' ë?¬ë ¥ì?? ë?¤ì?´ ì??ë?? ì?½ì??ì?´ ì?´ ëª¨ì??ê³¼ ì¶©ë??í?©ë??ë?¤"
 
-#: ../plugins/itip-formatter/itip-formatter.c:662
+#: ../plugins/itip-formatter/itip-formatter.c:663
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "'%s' ë?¬ë ¥ì?? ì?½ì??ì?? ë°?ê²¬í??ì?µë??ë?¤"
 
-#: ../plugins/itip-formatter/itip-formatter.c:752
+#: ../plugins/itip-formatter/itip-formatter.c:753
 msgid "Unable to find any calendars"
 msgstr "ë?¬ë ¥ì?? í??ë??ë?? ì°¾ì?? ì?? ì??ì?µë??ë?¤"
 
-#: ../plugins/itip-formatter/itip-formatter.c:759
+#: ../plugins/itip-formatter/itip-formatter.c:760
 msgid "Unable to find this meeting in any calendar"
 msgstr "ì?´ë?? ë?¬ë ¥ì??ì??ë?? ì?´ ëª¨ì??ì?? ì°¾ì?? ì?? ì??ì?µë??ë?¤"
 
-#: ../plugins/itip-formatter/itip-formatter.c:763
+#: ../plugins/itip-formatter/itip-formatter.c:764
 msgid "Unable to find this task in any task list"
 msgstr "ì?´ë?? ì??ì?? ëª©ë¡?ì??ì??ë?? ì?´ ì??ì??ì?? ì°¾ì?? ì?? ì??ì?µë??ë?¤"
 
-#: ../plugins/itip-formatter/itip-formatter.c:767
+#: ../plugins/itip-formatter/itip-formatter.c:768
 msgid "Unable to find this memo in any memo list"
 msgstr "ì?´ë?? ë©?ëª¨ ëª©ë¡?ì??ì??ë?? ì?´ ë©?ëª¨ë¥¼ ì°¾ì?? ì?? ì??ì?µë??ë?¤"
 
-#: ../plugins/itip-formatter/itip-formatter.c:838
+#: ../plugins/itip-formatter/itip-formatter.c:839
+msgid "Opening the calendar. Please wait.."
+msgstr "ë?¬ë ¥ì?? ì?¬ë?? ì¤?ì??ë??ë?¤. ì? ì?? ê¸°ë?¤ë¦¬ì?ì??ì?¤.."
+
+#: ../plugins/itip-formatter/itip-formatter.c:842
 msgid "Searching for an existing version of this appointment"
 msgstr "ì?´ ì?½ì??ì?? í??ì?¬ ë²?ì ?ì?? ì°¾ë?? ì¤?ì??ë??ë?¤"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1020
+#: ../plugins/itip-formatter/itip-formatter.c:1024
 msgid "Unable to parse item"
 msgstr "í?ëª©ì?? í??ì?±í?  ì?? ì??ì?µë??ë?¤"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1107
+#: ../plugins/itip-formatter/itip-formatter.c:1111
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "í?ëª©ì?? '%s' ë?¬ë ¥ì?? ë³´ë?¼ ì?? ì??ì?µë??ë?¤.  %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1119
+#: ../plugins/itip-formatter/itip-formatter.c:1123
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "'%s' ë?¬ë ¥ì?? ì??ë?½ì?´ë?¼ê³  ë³´ë??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1123
+#: ../plugins/itip-formatter/itip-formatter.c:1127
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "'%s' ë?¬ë ¥ì?? ë¯¸ì ?ì?´ë?¼ê³  ë³´ë??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1128
+#: ../plugins/itip-formatter/itip-formatter.c:1132
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "'%s' ë?¬ë ¥ì?? ê±°ì ?ì?´ë?¼ê³  ë³´ë??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1133
+#: ../plugins/itip-formatter/itip-formatter.c:1137
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "'%s' ë?¬ë ¥ì?? ì·¨ì??ë?¼ê³  ë³´ë??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1227
+#: ../plugins/itip-formatter/itip-formatter.c:1231
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "ì£¼ìµ?ì??ê°? ë??ë¦¬ì?¸ %sì??(ë¥¼) ì§?ì? ì?µë??ë?¤"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1234
+#: ../plugins/itip-formatter/itip-formatter.c:1238
 msgid "Sent a cancelation notice to the delegate"
 msgstr "ë??ë¦¬ì?¸ì??ê²? ì·¨ì?? ê³µì§?ë¥¼ ë³´ë??ì?µë??ë?¤"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1236
+#: ../plugins/itip-formatter/itip-formatter.c:1240
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "ë??ë¦¬ì?¸ì??ê²? ì·¨ì?? ê³µì§?ë¥¼ ë³´ë?¼ ì?? ì??ì?µë??ë?¤"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1342
+#: ../plugins/itip-formatter/itip-formatter.c:1348
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "ì??ëª»ë?? ì??í??ë??ë¬¸ì?? ì°¸ì??ì?? ì??í??ë¥¼ ì??ë?°ì?´í?¸í?  ì?? ì??ì?µë??ë?¤"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1371
+#: ../plugins/itip-formatter/itip-formatter.c:1377
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "ì°¸ì??ì??ë¥¼ ì??ë?°ì?´í?¸í?  ì?? ì??ì?µë??ë?¤. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1375
+#: ../plugins/itip-formatter/itip-formatter.c:1381
 msgid "Attendee status updated"
 msgstr "ì°¸ì??ì?? ì??í??ë¥¼ ì??ë?°ì?´í?¸í??ì?µë??ë?¤"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1401
+#: ../plugins/itip-formatter/itip-formatter.c:1407
 msgid "Meeting information sent"
 msgstr "ëª¨ì?? ì ?ë³´ë¥¼ ë³´ë??ì?µë??ë?¤"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1404
+#: ../plugins/itip-formatter/itip-formatter.c:1410
 msgid "Task information sent"
 msgstr "ì??ì?? ì ?ë³´ë¥¼ ë³´ë??ì?µë??ë?¤"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1407
+#: ../plugins/itip-formatter/itip-formatter.c:1413
 msgid "Memo information sent"
 msgstr "ë©?ëª¨ ì ?ë³´ë¥¼ ë³´ë??ì?µë??ë?¤"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1416
+#: ../plugins/itip-formatter/itip-formatter.c:1422
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "ëª¨ì?? ì ?ë³´ë¥¼ ë³´ë?¼ ì?? ì??ì?µë??ë?¤. í?´ë?¹ ëª¨ì??ì?´ ì??ì?µë??ë?¤"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1419
+#: ../plugins/itip-formatter/itip-formatter.c:1425
 msgid "Unable to send task information, the task does not exist"
 msgstr "ì??ì?? ì ?ë³´ë¥¼ ë³´ë?¼ ì?? ì??ì?µë??ë?¤. í?´ë?¹ ì??ì??ì?´ ì??ì?µë??ë?¤"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1422
+#: ../plugins/itip-formatter/itip-formatter.c:1428
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "ë©?ëª¨ ì ?ë³´ë¥¼ ë³´ë?¼ ì?? ì??ì?µë??ë?¤. í?´ë?¹ ë©?ëª¨ê°? ì??ì?µë??ë?¤"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1491
-#: ../plugins/itip-formatter/itip-formatter.c:1502
+#: ../plugins/itip-formatter/itip-formatter.c:1496
+#: ../plugins/itip-formatter/itip-formatter.c:1507
 msgid "The calendar attached is not valid"
 msgstr "ì²¨ë¶?í?? ë?¬ë ¥ì?´ ì??ëª»ë??ì??ì?µë??ë?¤"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1492
-#: ../plugins/itip-formatter/itip-formatter.c:1503
+#: ../plugins/itip-formatter/itip-formatter.c:1497
+#: ../plugins/itip-formatter/itip-formatter.c:1508
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -18615,16 +17446,16 @@ msgstr ""
 "ë©?ì??ì§?ì?? ë?¬ë ¥ì?´ ë?¤ì?´ ì??ë?¤ê³  ë??ì?´ ì??ì?¼ë??, ê·¸ ë?¬ë ¥ì?´ ì?¬ë°?ë¥¸ iCalendarê°? ì??ë??ë??"
 "ë?¤."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1543
-#: ../plugins/itip-formatter/itip-formatter.c:1571
-#: ../plugins/itip-formatter/itip-formatter.c:1663
+#: ../plugins/itip-formatter/itip-formatter.c:1548
+#: ../plugins/itip-formatter/itip-formatter.c:1576
+#: ../plugins/itip-formatter/itip-formatter.c:1668
 msgid "The item in the calendar is not valid"
 msgstr "ë?¬ë ¥ ì??ì?´ í?ëª©ì?´ ì?¬ë°?ë¥´ì§? ì??ì?µë??ë?¤"
 
 # free/busy -> ì?½ì?? ì??ì??/ì??ì??, Microsoft Office XP ì°¸ê³ 
-#: ../plugins/itip-formatter/itip-formatter.c:1544
-#: ../plugins/itip-formatter/itip-formatter.c:1572
-#: ../plugins/itip-formatter/itip-formatter.c:1664
+#: ../plugins/itip-formatter/itip-formatter.c:1549
+#: ../plugins/itip-formatter/itip-formatter.c:1577
+#: ../plugins/itip-formatter/itip-formatter.c:1669
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -18632,50 +17463,44 @@ msgstr ""
 "ë©?ì??ì§?ì?? ë?¬ë ¥ì?´ ë?¤ì?´ ì??ì?¼ë??, ë?¬ë ¥ì?? í??ì?¬, ì??ì??, ì?½ì?? ì??ì??/ì??ì?? ì ?ë³´ê°? í??ë??ë?? "
 "ë?¤ì?´ ì??ì§? ì??ì?µë??ë?¤."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1583
+#: ../plugins/itip-formatter/itip-formatter.c:1588
 msgid "The calendar attached contains multiple items"
 msgstr "ì²¨ë¶?í?? ë?¬ë ¥ì?? ì?¬ë?¬ ê°?ì?? í?ëª©ì?´ ë?¤ì?´ ì??ì?µë??ë?¤"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1584
+#: ../plugins/itip-formatter/itip-formatter.c:1589
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
 msgstr "ì?´ í?ëª©ì?? ëª¨ë?? ì²?ë¦¬í??ë ¤ë©´, í??ì?¼ì?? ì ?ì?¥í?´ì?? ê·¸ ë?¬ë ¥ì?? ê°?ì ¸ì??ì?¼ í?©ë??ë?¤."
 
-#: ../plugins/itip-formatter/itip-formatter.c:2306
+#: ../plugins/itip-formatter/itip-formatter.c:2335
 msgid "This meeting recurs"
 msgstr "ì?´ ì?½ì?? ë°?ë³µ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2309
+#: ../plugins/itip-formatter/itip-formatter.c:2338
 msgid "This task recurs"
 msgstr "ì?´ ì??ì?? ë°?ë³µ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2312
+#: ../plugins/itip-formatter/itip-formatter.c:2341
 msgid "This memo recurs"
 msgstr "ì?´ ë©?ëª¨ ë°?ë³µ"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2548
+#: ../plugins/itip-formatter/itip-formatter.c:2574
 msgid "_Delete message after acting"
 msgstr "ì ?ì?©í?? ë?¤ì??ì?? ë©?ì??ì§? ì?ì ?(_D)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2558
-#: ../plugins/itip-formatter/itip-formatter.c:2590
+#: ../plugins/itip-formatter/itip-formatter.c:2584
+#: ../plugins/itip-formatter/itip-formatter.c:2617
 msgid "Conflict Search"
-msgstr "ì¶©ë?? ì°¾ê¸°"
+msgstr "ì¶©ë?? ê²?ì??"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2573
+#: ../plugins/itip-formatter/itip-formatter.c:2599
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "ì¶©ë??í??ë?? ëª¨ì??ì?? ì°¾ì?? ë?¬ë ¥ì?? ì? í??í??ì?ì??ì?¤"
 
-#. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:191 ../ui/evolution-calendar.xml.h:34
-#: ../widgets/misc/e-cell-date-edit.c:297
-msgid "Today"
-msgstr "ì?¤ë??"
-
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:196
@@ -18694,11 +17519,6 @@ msgstr "ì?¤ë?? %H:%M:%S"
 msgid "Today %l:%M:%S %p"
 msgstr "ì?¤ë?? %p %l:%M:%S"
 
-#. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:219
-msgid "Tomorrow"
-msgstr "ë?´ì?¼"
-
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:224
@@ -19039,111 +17859,107 @@ msgid "<b>%s</b> has canceled the following shared memo:"
 msgstr "<b>%s</b>ë??ì?´ ë?¤ì?? ê³µì?  ë©?ëª¨ë¥¼ ì·¨ì??í??ì?µë??ë?¤:"
 
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:821
+#: ../plugins/itip-formatter/itip-view.c:823
 msgid "_Open Calendar"
 msgstr "ë?¬ë ¥ ì?´ê¸°(_O)"
 
-#: ../plugins/itip-formatter/itip-view.c:827
-#: ../plugins/itip-formatter/itip-view.c:831
-#: ../plugins/itip-formatter/itip-view.c:837
-#: ../plugins/itip-formatter/itip-view.c:854
-#: ../plugins/itip-formatter/itip-view.c:859
-msgid "_Decline"
-msgstr "ê±°ë¶?(_D)"
-
-#: ../plugins/itip-formatter/itip-view.c:828
+#: ../plugins/itip-formatter/itip-view.c:829
 #: ../plugins/itip-formatter/itip-view.c:833
-#: ../plugins/itip-formatter/itip-view.c:840
+#: ../plugins/itip-formatter/itip-view.c:839
 #: ../plugins/itip-formatter/itip-view.c:856
 #: ../plugins/itip-formatter/itip-view.c:861
+msgid "_Decline"
+msgstr "ê±°ë¶?(_D)"
+
+#: ../plugins/itip-formatter/itip-view.c:830
+#: ../plugins/itip-formatter/itip-view.c:835
+#: ../plugins/itip-formatter/itip-view.c:842
+#: ../plugins/itip-formatter/itip-view.c:858
+#: ../plugins/itip-formatter/itip-view.c:863
 msgid "_Accept"
 msgstr "í??ì?©(_A)"
 
-#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:833
 msgid "_Decline all"
 msgstr "ëª¨ë?? ê±°ë¶?(_D)"
 
-#: ../plugins/itip-formatter/itip-view.c:832
+#: ../plugins/itip-formatter/itip-view.c:834
 msgid "_Tentative all"
 msgstr "ëª¨ë?? ì? ì ?ì ?(_T)"
 
-#: ../plugins/itip-formatter/itip-view.c:832
-#: ../plugins/itip-formatter/itip-view.c:838
-#: ../plugins/itip-formatter/itip-view.c:855
-#: ../plugins/itip-formatter/itip-view.c:860
+#: ../plugins/itip-formatter/itip-view.c:834
+#: ../plugins/itip-formatter/itip-view.c:840
+#: ../plugins/itip-formatter/itip-view.c:857
+#: ../plugins/itip-formatter/itip-view.c:862
 msgid "_Tentative"
 msgstr "ì? ì ?ì ?(_T)"
 
-#: ../plugins/itip-formatter/itip-view.c:833
+#: ../plugins/itip-formatter/itip-view.c:835
 msgid "_Accept all"
 msgstr "ëª¨ë?? í??ì?©(_A)"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:844
+#: ../plugins/itip-formatter/itip-view.c:846
 msgid "_Send Information"
 msgstr "ì ?ë³´ ë³´ë?´ê¸°(_S)"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:848
+#: ../plugins/itip-formatter/itip-view.c:850
 msgid "_Update Attendee Status"
 msgstr "ì°¸ì??ì?? ì??í?? ì??ë?°ì?´í?¸(_U)"
 
-#: ../plugins/itip-formatter/itip-view.c:851
+#: ../plugins/itip-formatter/itip-view.c:853
 msgid "_Update"
 msgstr "ì??ë?°ì?´í?¸(_U)"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:1031
+#: ../plugins/itip-formatter/itip-view.c:1033
 msgid "Start time:"
 msgstr "ì??ì?? ì??ê°?:"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:1042
+#: ../plugins/itip-formatter/itip-view.c:1044
 msgid "End time:"
 msgstr "ë§?ì¹¨ ì??ê°?:"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:1062
-#: ../plugins/itip-formatter/itip-view.c:1116
+#: ../plugins/itip-formatter/itip-view.c:1064
+#: ../plugins/itip-formatter/itip-view.c:1118
 msgid "Comment:"
 msgstr "ì?¤ëª?:"
 
-#: ../plugins/itip-formatter/itip-view.c:1101
+#: ../plugins/itip-formatter/itip-view.c:1103
 msgid "Send _reply to sender"
 msgstr "ë³´ë?¸ ì?´ì??ê²? í??ì? (_R)"
 
-#: ../plugins/itip-formatter/itip-view.c:1131
+#: ../plugins/itip-formatter/itip-view.c:1133
 msgid "Send _updates to attendees"
 msgstr "ì°¸ì??ì??ì??ê²? ì??ë?°ì?´í?¸ ë³´ë?´ê¸°(_U)"
 
-#: ../plugins/itip-formatter/itip-view.c:1140
+#: ../plugins/itip-formatter/itip-view.c:1142
 msgid "_Apply to all instances"
 msgstr "ëª¨ë?  ê²½ì?°ì?? ì ?ì?©(_A)"
 
-#: ../plugins/itip-formatter/itip-view.c:1149
+#: ../plugins/itip-formatter/itip-view.c:1151
 msgid "Show time as _free"
 msgstr "ì??ê°?ì?? ì?½ì?? ì??ì??ì?¼ë¡? í??ì??(_F)"
 
-#: ../plugins/itip-formatter/itip-view.c:1152
+#: ../plugins/itip-formatter/itip-view.c:1154
 msgid "_Preserve my reminder"
 msgstr "ë?´ ë¯¸ë¦¬ ì??ë¦¼ ì? ì§?(_P)"
 
 #. To Translators: This is a check box to inherit a reminder.
-#: ../plugins/itip-formatter/itip-view.c:1158
+#: ../plugins/itip-formatter/itip-view.c:1160
 msgid "_Inherit reminder"
 msgstr "ë¯¸ë¦¬ ì??ë¦¼ ì??ì??(_I)"
 
-#: ../plugins/itip-formatter/itip-view.c:1912
-msgid "_Tasks :"
-msgstr "ì??ì??(_T):"
-
 #: ../plugins/itip-formatter/itip-view.c:1914
-msgid "Memos :"
-msgstr "ë©?ëª¨:"
+msgid "_Memos:"
+msgstr "ë©?ëª¨(_M):"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:1
-msgid "Displays text/calendar parts in messages."
-msgstr "ë©?ì??ì§?ì?? í??ì?¤í?¸/ë?¬ë ¥ ë¶?ë¶?ì?? í??ì??í?©ë??ë?¤."
+msgid "Display \"text/calendar\" MIME parts in mail messages."
+msgstr "ë©?ì?¼ ë©?ì??ì§?ì?? \"text/calendar\" MIME ë¶?ë¶?ì?? í??ì??í?©ë??ë?¤."
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:2
 msgid "Itip Formatter"
@@ -19171,13 +17987,13 @@ msgid "Proxy _Logout"
 msgstr "í??ë¡?ì?? ë¡?ê·¸ì??ì??(_L)"
 
 #: ../plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml.h:1
-msgid "Allows disabling of accounts."
-msgstr "ê³?ì ?ì?? ì?¬ì?©í??ì§? ì??ì?? ì?? ì??ì?µë??ë?¤."
-
-#: ../plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml.h:2
 msgid "Disable Account"
 msgstr "ê³?ì ? ì?¬ì?© ì??ì??"
 
+#: ../plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml.h:2
+msgid "Disable an account by right-clicking on it in the folder tree."
+msgstr "í?´ë?? í?¸ë¦¬ì??ì?? ì?¤ë¥¸ìª½ í?´ë¦ì?¼ë¡? ê³?ì ? ì?¬ì?©ì?? ì¤?ì§?í?©ë??ë?¤."
+
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:1
 msgid "Beep or play sound file."
 msgstr "ì?? ì??ë¦¬ë¥¼ ë?´ê±°ë?? ì?¬ì?´ë?? í??ì?¼ ì?¬ì??."
@@ -19246,20 +18062,20 @@ msgstr "ì??ì?´ì½?ì?? ê¹?ë°?ì?¼ ì§? ì?¬ë¶?."
 msgid "Whether to notify new messages in Inbox folder only."
 msgstr "ë°?ì?? í?¸ì§?í?¨ í?´ë??ì??ë§? ì?? ë©?ì??ì§?ë¥¼ ì??ë¦´ ì§? ì?¬ë¶?."
 
-#: ../plugins/mail-notification/mail-notification.c:256
+#: ../plugins/mail-notification/mail-notification.c:245
 msgid "Generate a _D-Bus message"
 msgstr "D-Bus ë©?ì??ì§? ë³´ë?´ê¸°(_D)"
 
-#: ../plugins/mail-notification/mail-notification.c:379
+#: ../plugins/mail-notification/mail-notification.c:368
 msgid "Evolution's Mail Notification"
 msgstr "ì??ë³¼ë£¨ì?? ë©?ì?¼ ì??ë¦¼"
 
-#: ../plugins/mail-notification/mail-notification.c:400
+#: ../plugins/mail-notification/mail-notification.c:389
 msgid "Mail Notification Properties"
 msgstr "ë©?ì?¼ ì??ë¦¼ ì??ì?±"
 
 #. To translators: '%d' is the number of mails recieved and '%s' is the name of the folder
-#: ../plugins/mail-notification/mail-notification.c:479
+#: ../plugins/mail-notification/mail-notification.c:498
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -19271,89 +18087,156 @@ msgstr[0] ""
 "ì??ë¡? %dê°?ì?? ë©?ì??ì§?ë¥¼ ë°?ì??ì?µë??ë?¤.\n"
 "(%s í?´ë??)"
 
-#: ../plugins/mail-notification/mail-notification.c:484
+#: ../plugins/mail-notification/mail-notification.c:503
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
 msgstr[0] "ì??ë¡? %dê°?ì?? ë©?ì??ì§?ë¥¼ ë°?ì??ì?µë??ë?¤."
 
-#: ../plugins/mail-notification/mail-notification.c:501
-#: ../plugins/mail-notification/mail-notification.c:506
+#: ../plugins/mail-notification/mail-notification.c:520
+#: ../plugins/mail-notification/mail-notification.c:525
 msgid "New email"
 msgstr "ì?? ë©?ì?¼"
 
-#: ../plugins/mail-notification/mail-notification.c:566
+#: ../plugins/mail-notification/mail-notification.c:588
 msgid "Show icon in _notification area"
 msgstr "ì??ë¦¼ ì??ì?ì??ì?? ì??ì?´ì½? í??ì??(_N)"
 
-#: ../plugins/mail-notification/mail-notification.c:569
+#: ../plugins/mail-notification/mail-notification.c:591
 msgid "B_link icon in notification area"
 msgstr "ì??ë¦¼ ì??ì?ì??ì?? ì??ì?´ì½? ê¹?ë°?ì?´ê¸°(_L)"
 
-#: ../plugins/mail-notification/mail-notification.c:571
+#: ../plugins/mail-notification/mail-notification.c:593
 msgid "Popup _message together with the icon"
 msgstr "ì??ì?´ì½?ê³¼ ê°?ì?´ ë©?ì??ì§? í??ì?? í??ì??(_M)"
 
-#: ../plugins/mail-notification/mail-notification.c:752
+#: ../plugins/mail-notification/mail-notification.c:774
 msgid "_Play sound when new messages arrive"
 msgstr "ì?? ë©?ì??ì§?ê°? ë??ì°©í??ë©´ ì?¬ì?´ë?? ì?¬ì??(_P)"
 
-#: ../plugins/mail-notification/mail-notification.c:758
+#: ../plugins/mail-notification/mail-notification.c:780
 msgid "_Beep"
 msgstr "ì?? ì??ë¦¬(_B)"
 
-#: ../plugins/mail-notification/mail-notification.c:759
+#: ../plugins/mail-notification/mail-notification.c:781
 msgid "Play _sound file"
 msgstr "ì?¬ì?´ë?? í??ì?¼ ì?¬ì??(_S)"
 
-#: ../plugins/mail-notification/mail-notification.c:770
+#: ../plugins/mail-notification/mail-notification.c:792
 msgid "Specify _filename:"
 msgstr "í??ì?¼ ì?´ë¦? ì§?ì ?(_F):"
 
-#: ../plugins/mail-notification/mail-notification.c:771
+#: ../plugins/mail-notification/mail-notification.c:793
 msgid "Select sound file"
 msgstr "ì?¬ì?´ë?? í??ì?¼ì?? ê³ ë¥´ì?ì??ì?¤"
 
-#: ../plugins/mail-notification/mail-notification.c:772
+#: ../plugins/mail-notification/mail-notification.c:794
 msgid "Pl_ay"
 msgstr "ì?¬ì??(_A)"
 
-#: ../plugins/mail-notification/mail-notification.c:829
+#: ../plugins/mail-notification/mail-notification.c:851
 msgid "Notify new messages for _Inbox only"
 msgstr "ë°?ì?? í?¸ì§?í?¨ì?? ê²½ì?°ì??ë§? ì?? ë©?ì??ì§? ì??ë¦¼(_I)"
 
 #: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:1
-msgid ""
-"Generates a D-Bus message or notifies the user with an icon in notification "
-"area and a notification message whenever a new message has arrived."
-msgstr ""
-"ì??ë¡?ì?´ ë©?ì??ì§?ê°? ë??ì°©í?  ë??ë§?ë?¤ D-Bus ë©?ì??ì§?ë¥¼ ë³´ë?´ê±°ë?? ì??ë¦¼ ì??ì?ì?? ì??ì?´ì½?ê³¼ ì??"
-"ë¦¼ ë©?ì??ì§?ë¡? ì?¬ì?©ì??ì??ê²? ì??ë¦½ë??ë?¤."
-
-#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:2
 msgid "Mail Notification"
 msgstr "ì?? ë©?ì?¼ ì??ë¦¼"
 
-#: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:1
+#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:2
+msgid "Notifies you when new mail messages arrive."
+msgstr "ì?? ë©?ì??ì§?ê°? ë??ì°©í??ë©´ ì??ë¦½ë??ë?¤."
+
+#: ../plugins/mail-to-task/mail-to-task.c:376
+#, c-format
 msgid ""
-"A plugin which allows the creation of meetings from the contents of a mail "
-"message."
-msgstr "ë©?ì?¼ ë©?ì??ì§? ë?´ì?©ì??ì?? ëª¨ì??ì?? ë§?ë??ë?? í??ë?¬ê·¸ì?¸."
+"Selected calendar contains event '%s' already. Would you like to edit the "
+"old event?"
+msgstr "ì? í??í?? ë?¬ë ¥ì?? ì?´ë¯¸ '%s' í??ì?¬ê°? ë?¤ì?´ ì??ì?µë??ë?¤. ì??ì ? í??ì?¬ë¥¼ í?¸ì§?í??ì??ê² ì?µë??ê¹??"
 
-#: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:2
-msgid "Con_vert to Meeting"
-msgstr "ëª¨ì??ì?¼ë¡? ë³?í??(_V)"
+#: ../plugins/mail-to-task/mail-to-task.c:379
+#, c-format
+msgid ""
+"Selected task list contains task '%s' already. Would you like to edit the "
+"old task?"
+msgstr "ì? í??í?? ë?¬ë ¥ì?? ì?´ë¯¸ '%s' ì??ì??ì?´ ë?¤ì?´ ì??ì?µë??ë?¤. ì??ì ? ì??ì??ì?? í?¸ì§?í??ì??ê² ì?µë??ê¹??"
 
-#: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:3
-msgid "Mail to meeting"
-msgstr "ë©?ì?¼ì??ì?? ëª¨ì??ì?¼ë¡?"
+#: ../plugins/mail-to-task/mail-to-task.c:382
+#, c-format
+msgid ""
+"Selected memo list contains memo '%s' already. Would you like to edit the "
+"old memo?"
+msgstr "ì? í??í?? ë?¬ë ¥ì?? ì?´ë¯¸ '%s' ë©?ëª¨ê°? ë?¤ì?´ ì??ì?µë??ë?¤. ì??ì ? ë©?ëª¨ë¥¼ í?¸ì§?í??ì??ê² ì?µë??ê¹??"
+
+#: ../plugins/mail-to-task/mail-to-task.c:399
+msgid ""
+"Selected calendar contains some events for the given mails already. Would "
+"you like to create new events anyway?"
+msgstr "ì? í??í?? ë?¬ë ¥ì?? í?´ë?¹ ë©?ì?¼ì?? ë??í?? í??ì?¬ê°? ì?´ë¯¸ ë?¤ì?´ ì??ì?µë??ë?¤. ê·¸ë??ë?? ì?? í??ì?¬ë¥¼ ë§?ë??ì??ê² ì?µë??ê¹??"
+
+#: ../plugins/mail-to-task/mail-to-task.c:402
+msgid ""
+"Selected task list contains some tasks for the given mails already. Would "
+"you like to create new tasks anyway?"
+msgstr "ì? í??í?? ë?¬ë ¥ì?? í?´ë?¹ ë©?ì?¼ì?? ë??í?? ì??ì??ì?´ ì?´ë¯¸ ë?¤ì?´ ì??ì?µë??ë?¤. ê·¸ë??ë?? ì?? ì??ì??ì?? ë§?ë??ì??ê² ì?µë??ê¹??"
+
+#: ../plugins/mail-to-task/mail-to-task.c:405
+msgid ""
+"Selected memo list contains some memos for the given mails already. Would "
+"you like to create new memos anyway?"
+msgstr "ì? í??í?? ë?¬ë ¥ì?? í?´ë?¹ ë©?ëª¨ì?? ë??í?? ë©?ëª¨ê°? ì?´ë¯¸ ë?¤ì?´ ì??ì?µë??ë?¤. ê·¸ë??ë?? ì?? ë©?ëª¨ë¥¼ ë§?ë??ì??ê² ì?µë??ê¹??"
 
-#: ../plugins/mail-to-task/mail-to-task.c:287
+#: ../plugins/mail-to-task/mail-to-task.c:423
+msgid ""
+"Selected calendar contains an event for the given mail already. Would you "
+"like to create new event anyway?"
+msgid_plural ""
+"Selected calendar contains events for the given mails already. Would you "
+"like to create new events anyway?"
+msgstr[0] "ì? í??í?? ë?¬ë ¥ì?? í?´ë?¹ ë©?ëª¨ì?? ë??í?? í??ì?¬ê°? ì?´ë¯¸ ë?¤ì?´ ì??ì?µë??ë?¤. ê·¸ë??ë?? ì?? í??ì?¬ë¥¼ ë§?ë??ì??ê² ì?µë??ê¹??"
+
+#: ../plugins/mail-to-task/mail-to-task.c:429
+msgid ""
+"Selected task list contains a task for the given mail already. Would you "
+"like to create new task anyway?"
+msgid_plural ""
+"Selected task list contains tasks for the given mails already. Would you "
+"like to create new tasks anyway?"
+msgstr[0] "ì? í??í?? ë?¬ë ¥ì?? í?´ë?¹ ë©?ì?¼ì?? ë??í?? ì??ì??ì?´ ì?´ë¯¸ ë?¤ì?´ ì??ì?µë??ë?¤. ê·¸ë??ë?? ì?? ì??ì??ì?? ë§?ë??ì??ê² ì?µë??ê¹??"
+
+#: ../plugins/mail-to-task/mail-to-task.c:435
+msgid ""
+"Selected memo list contains a memo for the given mail already. Would you "
+"like to create new memo anyway?"
+msgid_plural ""
+"Selected memo list contains memos for the given mails already. Would you "
+"like to create new memos anyway?"
+msgstr[0] "ì? í??í?? ë?¬ë ¥ì?? í?´ë?¹ ë©?ëª¨ì?? ë??í?? ë©?ëª¨ê°? ì?´ë¯¸ ë?¤ì?´ ì??ì?µë??ë?¤. ê·¸ë??ë?? ì?? ë©?ëª¨ë¥¼ ë§?ë??ì??ê² ì?µë??ê¹??"
+
+#: ../plugins/mail-to-task/mail-to-task.c:494
+msgid "[No Summary]"
+msgstr "[ì??ì?½ ì??ì??]"
+
+#: ../plugins/mail-to-task/mail-to-task.c:505
+msgid "Invalid object returned from a server"
+msgstr "ì??ë²?ì??ì?? ì?¬ë°?ë¥´ì§? ì??ì?? ì?¤ë¸?ì ?í?¸ë¥¼ ë°?ì??ì?µë??ë?¤"
+
+#: ../plugins/mail-to-task/mail-to-task.c:570
+#, c-format
+msgid "An error occurred during processing: %s"
+msgstr "ì²?ë¦¬ ì¤? ì?¤ë¥?ê°? ë°?ì??í??ì?µë??ë?¤: %s"
+
+#: ../plugins/mail-to-task/mail-to-task.c:599
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "ë?¬ë ¥ì?? ì?´ ì?? ì??ì?µë??ë?¤. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:292
+#: ../plugins/mail-to-task/mail-to-task.c:606
+msgid ""
+"Selected source is read only, thus cannot create event there. Select other "
+"source, please."
+msgstr "ì? í??í?? ì??ì?¤ê°? ì?½ê¸° ì ?ì?©ì?´ë?¼ì?? ì?¬ê¸°ì?? í??ì?¬ë¥¼ ë§?ë?¤ ì?? ì??ì?µë??ë?¤. ë?¤ë¥¸ ì??ì?¤ë¥¼ ì? í??í??ì?ì??ì?¤."
+
+#: ../plugins/mail-to-task/mail-to-task.c:609
 msgid ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
@@ -19361,24 +18244,60 @@ msgstr ""
 "ì? í??í?? ì??ì?¤ê°? ì?½ê¸° ì ?ì?©ì?´ë?¼ì?? ì?¬ê¸°ì?? ì??ì??ì?? ë§?ë?¤ ì?? ì??ì?µë??ë?¤. ë?¤ë¥¸ ì??ì?¤ë¥¼ ì? "
 "í??í??ì?ì??ì?¤."
 
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:1
+#: ../plugins/mail-to-task/mail-to-task.c:612
 msgid ""
-"A plugin which allows the creation of tasks from the contents of a mail "
-"message."
-msgstr "ë©?ì?¼ ë©?ì??ì§? ë?´ì?©ì??ì?? ì??ì??ì?? ë§?ë??ë?? í??ë?¬ê·¸ì?¸."
+"Selected source is read only, thus cannot create memo there. Select other "
+"source, please."
+msgstr "ì? í??í?? ì??ì?¤ê°? ì?½ê¸° ì ?ì?©ì?´ë?¼ì?? ì?¬ê¸°ì?? ë©?ëª¨ë¥¼ ë§?ë?¤ ì?? ì??ì?µë??ë?¤. ë?¤ë¥¸ ì??ì?¤ë¥¼ ì? í??í??ì?ì??ì?¤."
+
+#: ../plugins/mail-to-task/mail-to-task.c:821
+#, c-format
+msgid "Cannot get source list. %s"
+msgstr "ì??ì?¤ ëª©ë¡?ì?? ë°?ì?? ì?? ì??ì?µë??ë?¤. %s"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:1
+msgid "Convert a mail message to a task."
+msgstr "ë©?ì?¼ ë©?ì??ì§?ë¥¼ ì??ì??ì?¼ë¡? ë°?ê¿?ë??ë?¤."
 
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:2
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:1
-msgid "Con_vert to Task"
-msgstr "ì??ì??ì?¼ë¡? ë³?í??(_V)"
+msgid "Create a Mem_o"
+msgstr "ë©?ëª¨ ë§?ë?¤ê¸°(_O)"
 
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:3
-msgid "Mail to task"
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:2
+msgid "Create a _Meeting"
+msgstr "ëª¨ì?? ë§?ë?¤ê¸°(_M)"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:4
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:3
+msgid "Create a _Task"
+msgstr "ì??ì?? ë§?ë?¤ê¸°(_T)"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:5
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:8
+msgid "Create an _Event"
+msgstr "í??ì?¬ ë§?ë?¤ê¸°(_E)"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:6
+msgid "Mail-to-Task"
 msgstr "ë©?ì?¼ì??ì?? ì??ì??ì?¼ë¡?"
 
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:2
-msgid "Convert the selected message to a new task"
-msgstr "ì? í??í?? ë©?ì??ì§?ë¥¼ ì?? ì??ì??ì?¼ë¡? ë°?ê¿?ë??ë?¤"
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:4
+msgid "Create a new event from the selected message"
+msgstr "ì? í??í?? ë©?ì??ì§?ì??ì?? ì?? í??ì?¬ë¥¼ ë§?ë?ë??ë?¤"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:5
+msgid "Create a new meeting from the selected message"
+msgstr "ì? í??í?? ë©?ì??ì§?ì??ì?? ì?? ëª¨ì??ì?? ë§?ë?ë??ë?¤"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:6
+msgid "Create a new memo from the selected message"
+msgstr "ì? í??í?? ë©?ì??ì§?ì??ì?? ì?? ë©?ëª¨ë¥¼ ë§?ë?ë??ë?¤"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:7
+msgid "Create a new task from the selected message"
+msgstr "ì? í??í?? ë©?ì??ì§?ì??ì?? ì?? ì??ì??ì?? ë§?ë?ë??ë?¤"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:1
 msgid "Contact list _owner"
@@ -19402,9 +18321,8 @@ msgid "Mailing _List"
 msgstr "ë©?ì?¼ë§? ë¦¬ì?¤í?¸(_L)"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:6
-msgid ""
-"Provide actions for common mailing list commands (subscribe, unsubscribe...)."
-msgstr "ì?¼ë°?ì ?ì?¸ ë©?ì?¼ë§? ë¦¬ì?¤í?¸ ëª?ë ¹ì?? ì ?ê³µí?©ë??ë?¤ (ê°?ì??, í??í?´...)."
+msgid "Perform common mailing list actions (subscribe, unsubscribe, etc.)."
+msgstr "ì??ì£¼ ì?¬ì?©í??ë?? ë©?ì?¼ë§? ë¦¬ì?¤í?¸ ëª?ë ¹ì?? ì ?ê³µí?©ë??ë?¤. (ê°?ì??, í??í?´ ë?±)"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:7
 msgid "_Post message to list"
@@ -19555,13 +18473,13 @@ msgstr ""
 "í??ì?¬ í?´ë??ë§? ì?½ì?? ë©?ì??ì§?ë¡? í??ì??í??ì??ê² ì?µë??ê¹?? ì??ë??ë©´ í??ì?¬ í?´ë??ì?? ê·¸ ì??ë?? í?´ë??"
 "ì?? ëª¨ë?  ë©?ì??ì§?ë¥¼ ëª¨ë?? ì?½ì?? ë©?ì??ì§?ë¡? í??ì??í??ì??ê² ì?µë??ê¹??"
 
-#: ../plugins/mark-all-read/mark-all-read.c:164
-msgid "Current Folder and _Subfolders"
-msgstr "í??ì?¬ í?´ë??ì?? í??ì?? í?´ë??(_S)"
+#: ../plugins/mark-all-read/mark-all-read.c:166
+msgid "In Current Folder and _Subfolders"
+msgstr "í??ì?¬ í?´ë?? ë°? í??ì?? í?´ë??ì??ì??(_S)"
 
-#: ../plugins/mark-all-read/mark-all-read.c:176
-msgid "Current _Folder Only"
-msgstr "í??ì?¬ í?´ë??ë§?(_F)"
+#: ../plugins/mark-all-read/mark-all-read.c:180
+msgid "In Current _Folder Only"
+msgstr "í??ì?¬ í?´ë??ì??ì??ë§?(_F)"
 
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
 msgid "Mark All Read"
@@ -19572,20 +18490,20 @@ msgid "Mark Me_ssages as Read"
 msgstr "ë©?ì??ì§?ë¥¼ ì?½ì?? ê²?ì?¼ë¡? í??ì??(_S)"
 
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:3
-msgid "Used for marking all the messages under a folder as read"
-msgstr "í?´ë??ì?? ë?¤ì?´ ì??ë?? ëª¨ë?  ë©?ì??ì§?ë¥¼ ì?½ì?? ê²?ì?¼ë¡? í??ì??í?  ë?? ì?¬ì?©í?©ë??ë?¤"
+msgid "Mark all messages in a folder as read."
+msgstr "í?´ë??ì?? ëª¨ë?  ë©?ì??ì§?ë¥¼ ì?½ì?? ê²?ì?¼ë¡? í??ì??í?©ë??ë?¤."
 
 #: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:1
-msgid "A plugin which implements mono plugins."
-msgstr "ëª¨ë?¸ í??ë?¬ê·¸ì?¸ì?? êµ¬í??í??ë?? í??ë?¬ê·¸ì?¸."
-
-#: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:2
 msgid "Mono Loader"
 msgstr "ëª¨ë?¸ ë¡?ë??"
 
+#: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:2
+msgid "Support plugins written in Mono."
+msgstr "ëª¨ë?¸ë¡? ì??ì?±í?? í??ë?¬ê·¸ì?¸ì?? ì§?ì??í?©ë??ë?¤."
+
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:1
-msgid "A plugin for managing which plugins are enabled or disabled."
-msgstr "ì?´ë?? í??ë?¬ê·¸ì?¸ì?? ì?¬ì?©í??ê³  ì?¬ì?©í??ì§? ì??ì?? ì§? ê´?ë¦¬í??ë?? í??ë?¬ê·¸ì?¸."
+msgid "Manage your Evolution plugins."
+msgstr "ì??ë³¼ë£¨ì?? í??ë?¬ê·¸ì?¸ì?? ê´?ë¦¬í?©ë??ë?¤."
 
 #. Setup the ui
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
@@ -19623,26 +18541,19 @@ msgstr "ê°?ì??"
 msgid "Plugin"
 msgstr "í??ë?¬ê·¸ì?¸"
 
-#: ../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 messages.\n"
-"\n"
-"This plugin is unsupported demonstration code only.\n"
-msgstr ""
-"HTML ë©?ì?¼ì?? ì?¬ì?©í??ì§? ì??ë??ë¡? í??ë?? í?¬ë§¤í?° í??ë?¬ê·¸ì?¸ ë?°ëª¨ í??ì?¤í?¸ í??ë?¬ê·¸ì?¸.\n"
-"\n"
-"ì?´ í??ë?¬ê·¸ì?¸ì?? ë?°ëª¨ ì½?ë?? ì ?ì?©ì?´ê³  ì§?ì??í??ì§? ì??ì?µë??ë?¤.\n"
-
 #. but then we also need to create our own section frame
-#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:6
+#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:2
 msgid "Plain Text Mode"
 msgstr "ì?¼ë°? í??ì?¤í?¸ ëª¨ë??"
 
-#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:7
-msgid "Prefer plain-text"
+#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:3
+msgid "Prefer Plain Text"
 msgstr "ì?¼ë°? í??ì?¤í?¸ ì? í?¸"
 
+#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:4
+msgid "View mail messages as plain text, even if they contain HTML content."
+msgstr "ë©?ì?¼ ë©?ì??ì§?ê°? HTMLì?´ ì?¨ë??ë?¼ë?? ì?¼ë°? í??ì?¤í?¸ë¡? ë´?ë??ë?¤."
+
 #: ../plugins/prefer-plain/prefer-plain.c:189
 msgid "Show HTML if present"
 msgstr "HTMLì?´ ì??ì?¼ë©´ í??ì??"
@@ -19664,8 +18575,8 @@ msgid "Evolution Profiler"
 msgstr "ì??ë³¼ë£¨ì?? í??ë¡?í??ì?¼ë?¬"
 
 #: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:2
-msgid "Writes a log of profiling data events."
-msgstr "í??ë¡?í??ì?¼ ë?°ì?´í?° ì?´ë²¤í?¸ë¥¼ ê¸°ë¡?í?©ë??ë?¤."
+msgid "Profile data events in Evolution (for developers only)."
+msgstr "ì??ë³¼ë£¨ì?? ë?°ì?´í?° ì?´ë²¤í?¸ í??ë¡?í??ì?¼ë§?. (ê°?ë°?ì?? ì ?ì?©)"
 
 #: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:1
 msgid "Import Outlook messages from PST file"
@@ -19680,45 +18591,75 @@ msgid "Outlook personal folders (.pst)"
 msgstr "ì??ì??ë£© ê°?ì?¸ í?´ë?? (.pst)"
 
 #. Address book
-#: ../plugins/pst-import/pst-importer.c:318
+#: ../plugins/pst-import/pst-importer.c:315
 msgid "_Address Book"
 msgstr "ì£¼ì??ë¡?(_A)"
 
 #. Appointments
-#: ../plugins/pst-import/pst-importer.c:325
+#: ../plugins/pst-import/pst-importer.c:322
 msgid "A_ppointments"
 msgstr "ì?½ì??(_P)"
 
 # journal -> ì?¼ì§?, Microsoft Office XP ì°¸ê³ 
 #. Journal
-#: ../plugins/pst-import/pst-importer.c:337
+#: ../plugins/pst-import/pst-importer.c:334
 msgid "_Journal entries"
 msgstr "ì?¼ì§? í?ëª©(_J)"
 
-#: ../plugins/pst-import/pst-importer.c:352
+#: ../plugins/pst-import/pst-importer.c:349
 msgid "Importing Outlook data"
 msgstr "ì??ì??ë£© ë?°ì?´í?° ê°?ì ¸ì?¤ê¸°"
 
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
-msgid "Allows calendars to be published to the web"
-msgstr "ë?¬ë ¥ì?? ì?¹ì?? ê²?ì??í?  ì?? ì??ê²? í?©ë??ë?¤"
-
-#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:2
 msgid "Calendar Publishing"
 msgstr "ë?¬ë ¥ ê²?ì??"
 
-#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:3
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:2
 msgid "Locations"
 msgstr "ì??ì¹?"
 
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:3
+msgid "Publish calendars to the web."
+msgstr "ë?¬ë ¥ì?? ì?¹ì?? ê²?ì??í?©ë??ë?¤."
+
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.xml.h:1
 msgid "_Publish Calendar Information"
 msgstr "ë?¬ë ¥ ì ?ë³´ ê²?ì??(_P)"
 
-#: ../plugins/publish-calendar/publish-calendar.c:596
+#: ../plugins/publish-calendar/publish-calendar.c:95
+#: ../plugins/publish-calendar/publish-calendar.c:337
+#, c-format
+msgid "Could not open %s:"
+msgstr "'%s'ì??(ë¥¼) ì?´ ì?? ì??ì?µë??ë?¤:"
+
+#: ../plugins/publish-calendar/publish-calendar.c:97
+#, c-format
+msgid "Could not open %s: Unknown error"
+msgstr "'%s'ì??(ë¥¼) ì?´ ì?? ì??ì?µë??ë?¤: ì?? ì?? ì??ë?? ì?¤ë¥?ê°? ë°?ì??í??ì?µë??ë?¤"
+
+#: ../plugins/publish-calendar/publish-calendar.c:117
+#, c-format
+msgid "There was an error while publishing to %s:"
+msgstr "'%s'ì?? ê²?ì??í??ë?? ë?° ì?¤ë¥?ê°? ë°?ì??í??ì?µë??ë?¤:"
+
+#: ../plugins/publish-calendar/publish-calendar.c:119
+#, c-format
+msgid "Publishing to %s finished successfully"
+msgstr "'%s'ì?? ì?±ê³µì ?ì?¼ë¡? ê²?ì??ë¥¼ ë§?ì³¤ì?µë??ë?¤"
+
+#: ../plugins/publish-calendar/publish-calendar.c:164
+#, c-format
+msgid "Mount of %s failed:"
+msgstr "'%s'ì?? ë§?ì?´í?¸ê°? ì?¤í?¨í??ì?µë??ë?¤:"
+
+#: ../plugins/publish-calendar/publish-calendar.c:624
 msgid "Are you sure you want to remove this location?"
 msgstr "ì ?ë§?ë¡? ì?´ ì??ì¹?ë¥¼ ì ?ê±°í??ì??ê² ì?µë??ê¹??"
 
+#: ../plugins/publish-calendar/publish-calendar.c:788
+msgid "Could not create publish thread."
+msgstr "ê¸?í??ë??ë¥¼ ê²?ì??í?  ì?? ì??ì?µë??ë?¤."
+
 #: ../plugins/publish-calendar/publish-calendar.glade.h:2
 msgid "<span weight=\"bold\">Location</span>"
 msgstr "<span weight=\"bold\">ì??ì¹?</span>"
@@ -19776,28 +18717,42 @@ msgstr ""
 msgid "Service _type:"
 msgstr "ì??ë¹?ì?¤ ì¢?ë¥?(_T):"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:22
+#: ../plugins/publish-calendar/publish-calendar.glade.h:21
+msgid "Time _duration:"
+msgstr "ê¸°ê°?(_D):"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:23
 msgid "_File:"
 msgstr "í??ì?¼(_F):"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:23
+#: ../plugins/publish-calendar/publish-calendar.glade.h:24
 msgid "_Password:"
 msgstr "ì??í?¸(_P):"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:24
+#: ../plugins/publish-calendar/publish-calendar.glade.h:25
 msgid "_Publish as:"
 msgstr "ê²?ì?? ì??ì¹?(_P):"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:25
+#: ../plugins/publish-calendar/publish-calendar.glade.h:26
 msgid "_Remember password"
 msgstr "ì??í?¸ ê¸°ì?µ(_R)"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:27
+#: ../plugins/publish-calendar/publish-calendar.glade.h:28
 msgid "_Username:"
 msgstr "ì?¬ì?©ì??ì?´ë¦?(_U):"
 
+#: ../plugins/publish-calendar/publish-calendar.glade.h:29
+msgid ""
+"days\n"
+"weeks\n"
+"months"
+msgstr ""
+"ì?¼\n"
+"ì£¼\n"
+"ë?¬"
+
 # free/busy -> ì?½ì?? ì??ì??/ì??ì??, Microsoft Office XP ì°¸ê³ 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:28
+#: ../plugins/publish-calendar/publish-calendar.glade.h:32
 msgid ""
 "iCal\n"
 "Free/Busy"
@@ -19805,11 +18760,17 @@ msgstr ""
 "iCal\n"
 "ì?½ì?? ì??ì??/ì??ì??"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:461
+#: ../plugins/publish-calendar/publish-format-fb.c:69
+#: ../plugins/publish-calendar/publish-format-ical.c:82
+#, c-format
+msgid "Could not publish calendar: Calendar backend no longer exists"
+msgstr "ë?¬ë ¥ì?? ê²?ì??í?  ì?? ì??ì?µë??ë?¤: ë?¬ë ¥ ë°±ì??ë??ê°? ì??ì?µë??ë?¤"
+
+#: ../plugins/publish-calendar/url-editor-dialog.c:481
 msgid "New Location"
 msgstr "ì?? ì??ì¹?"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:463
+#: ../plugins/publish-calendar/url-editor-dialog.c:483
 msgid "Edit Location"
 msgstr "ì??ì¹? í?¸ì§?"
 
@@ -19837,177 +18798,135 @@ msgstr "í??ì?´ì?¬ì?¼ë¡? ì??ì?±í?? ë?¤ë¥¸ í??ë?¬ê·¸ì?¸ì?? ì?½ì?´ë?¤ì?´ë?? í??ë?¬
 msgid "Python Loader"
 msgstr "í??ì?´ì?¬ ë¡?ë??"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:107
-msgid "SpamAssassin (built-in)"
-msgstr "ì?¤í?¸ì?´ì??ì?  (ë?´ë¶?ì?? í?¬í?¨)"
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:133
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:126
 #, c-format
 msgid "SpamAssassin not found, code: %d"
 msgstr "ì?¤í?¸ì?´ì??ì? ì?´ ì??ì?µë??ë?¤. ì½?ë??: %d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:141
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:149
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:134
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:142
 #, c-format
 msgid "Failed to create pipe: %s"
 msgstr "í??ì?´í??ë¥¼ ë§?ë??ë?? ë?° ì?¤í?¨í??ì?µë??ë?¤: %s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:188
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:181
 #, c-format
 msgid "Error after fork: %s"
 msgstr "í??ë¡?ì?¸ì?¤ ë§?ë?  ë?¤ì?? ì?¤ë¥?: %s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:243
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:236
 #, c-format
 msgid "SpamAssassin child process does not respond, killing..."
 msgstr "ì?¤í?¸ì?´ì??ì?  í??ì?? í??ë¡?ì?¸ì?¤ê°? ì??ë?µí??ì§? ì??ì?µë??ë?¤. ê°?ì ?ë¡? ë??ë??ë??ë?¤..."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:245
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:238
 #, c-format
 msgid "Wait for SpamAssassin child process interrupted, terminating..."
 msgstr "ì?¤í?¸ì?´ì??ì?  í??ì?? í??ë¡?ì?¸ì?¤ ë??ê¸°ê°? ì¤?ì§?ë??ì??ì?µë??ë?¤. ê°?ì ?ë¡? ë??ë??ë??ë?¤..."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:254
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:247
 #, c-format
 msgid "Pipe to SpamAssassin failed, error code: %d"
 msgstr "ì?¤í?¸ì?´ì??ì? ì?? ë??í?? í??ì?´í??ê°? ì?¤í?¨í??ì?µë??ë?¤. ì?¤ë¥? ì½?ë??: %d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:497
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:509
 #, c-format
 msgid "SpamAssassin is not available."
 msgstr "ì?¤í?¸ì?´ì??ì? ì?? ì?¬ì?©í?  ì?? ì??ì?µë??ë?¤."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:864
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:906
 msgid "This will make SpamAssassin more reliable, but slower"
 msgstr "ì?´ë ?ê²? í??ë©´ ì?¤í?¸ì?´ì??ì? ì?´ ë?? ì??ì ?ì ?ì?¼ë¡? ì??ë??í??ì§?ë§?, ë?? ë??ë¦½ë??ë?¤"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:870
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:912
 msgid "I_nclude remote tests"
 msgstr "ì??ê²© í??ì?¤í?¸ í?¬í?¨(_N)"
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:1
-msgid ""
-"Filters junk messages using SpamAssassin. This plugin requires SpamAssassin "
-"to be installed."
-msgstr ""
-"ì?¤í?¸ì?´ì??ì? ì?? ì?´ì?©í?´ ì ?í?¬ë©?ì?¼ì?? ê±¸ë?¬ë??ë??ë?¤. ì?´ í??ë?¬ê·¸ì?¸ì?? ì?¬ì?©í??ë ¤ë©´ ì?¤í?¸ì?´ì??"
-"ì? ì?? ì?¤ì¹?í?´ì?¼ í?©ë??ë?¤."
+msgid "Filter junk messages using SpamAssassin."
+msgstr "ì?¤í?¸ì?´ì??ì? ì?? ì?¬ì?©í?´ ì ?í?¬ ë©?ì??ì§?ë¥¼ í??í?°ë§?í?©ë??ë?¤."
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
-msgid "SpamAssassin Options"
-msgstr "ì?¤í?¸ì?´ì??ì?  ì?µì??"
+msgid "SpamAssassin Junk Filter"
+msgstr "ì?¤í?¸ì?´ì??ì?  ì ?í?¬ë©?ì?¼ í??í?°"
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:3
-msgid "SpamAssassin junk plugin"
-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 "ë©?ì??ì§?ì?? ëª¨ë?  ì²¨ë¶?ë¬¼ì?´ë?? ê·¸ ì?¼ë¶?ë¥¼ í?? ë²?ì?? ì ?ì?¥í??ë?? í??ë?¬ê·¸ì?¸."
-
-#. the path to the shared library
-#: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:3
-#: ../plugins/save-attachments/save-attachments.c:315
-msgid "Save attachments"
-msgstr "ì²¨ë¶? ì ?ì?¥"
-
-#: ../plugins/save-attachments/org-gnome-save-attachments.xml.h:1
-msgid "Save Attachments..."
-msgstr "ì²¨ë¶? ì ?ì?¥..."
-
-#: ../plugins/save-attachments/org-gnome-save-attachments.xml.h:2
-msgid "Save all attachments"
-msgstr "ëª¨ë?  ì²¨ë¶? ì ?ì?¥"
-
-#: ../plugins/save-attachments/save-attachments.c:321
-msgid "Select save base name"
-msgstr "ì ?ì?¥í?  ì??ì¹? ì? í??"
-
-#: ../plugins/save-attachments/save-attachments.c:340
-msgid "MIME Type"
-msgstr "MIME í??ì??"
-
-#: ../plugins/save-attachments/save-attachments.c:348
-msgid "Save"
-msgstr "ì ?ì?¥"
+msgid "SpamAssassin Options"
+msgstr "ì?¤í?¸ì?´ì??ì?  ì?µì??"
 
 #.
 #. * 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:163
+#: ../plugins/save-calendar/csv-format.c:160
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:361
+#: ../plugins/save-calendar/csv-format.c:356
 msgid "UID"
 msgstr "UID"
 
-#: ../plugins/save-calendar/csv-format.c:363
+#: ../plugins/save-calendar/csv-format.c:358
 msgid "Description List"
 msgstr "ì?¤ëª? ëª©ë¡?"
 
-#: ../plugins/save-calendar/csv-format.c:364
+#: ../plugins/save-calendar/csv-format.c:359
 msgid "Categories List"
 msgstr "ë¶?ë¥? ëª©ë¡?"
 
-#: ../plugins/save-calendar/csv-format.c:365
+#: ../plugins/save-calendar/csv-format.c:360
 msgid "Comment List"
 msgstr "ë©?ëª¨ ëª©ë¡?"
 
-#: ../plugins/save-calendar/csv-format.c:367
-msgid "Created"
-msgstr "ë§?ë?¦"
-
-#: ../plugins/save-calendar/csv-format.c:368
+#: ../plugins/save-calendar/csv-format.c:363
 msgid "Contact List"
 msgstr "ì?°ë?½ì²? ëª©ë¡?"
 
-#: ../plugins/save-calendar/csv-format.c:369
+#: ../plugins/save-calendar/csv-format.c:364
 msgid "Start"
 msgstr "ì??ì??"
 
-#: ../plugins/save-calendar/csv-format.c:370
+#: ../plugins/save-calendar/csv-format.c:365
 msgid "End"
 msgstr "ë??"
 
-#: ../plugins/save-calendar/csv-format.c:372
+#: ../plugins/save-calendar/csv-format.c:367
 msgid "percent Done"
 msgstr "í?¼ì?¼í?¸ ì??ë£?"
 
-#: ../plugins/save-calendar/csv-format.c:374
+#: ../plugins/save-calendar/csv-format.c:369
 msgid "URL"
 msgstr "URL"
 
-#: ../plugins/save-calendar/csv-format.c:375
+#: ../plugins/save-calendar/csv-format.c:370
 msgid "Attendees List"
 msgstr "ì°¸ì??ì?? ëª©ë¡?"
 
-#: ../plugins/save-calendar/csv-format.c:377
+#: ../plugins/save-calendar/csv-format.c:372
 msgid "Modified"
 msgstr "ë°?ë??"
 
-#: ../plugins/save-calendar/csv-format.c:532
-msgid "Advanced options for the CSV format"
-msgstr "CSV í??ì??ì?? ê³ ê¸? ì?µì??"
+#: ../plugins/save-calendar/csv-format.c:523
+msgid "A_dvanced options for the CSV format"
+msgstr "CSV í??ì??ì?? ê³ ê¸? ì?µì??(_D)"
 
-#: ../plugins/save-calendar/csv-format.c:539
-msgid "Prepend a header"
-msgstr "ì??ì?? í?¤ë?? ë¶?ì??"
+#: ../plugins/save-calendar/csv-format.c:530
+msgid "Prepend a _header"
+msgstr "ì??ì?? í?¤ë?? ë¶?ì??(_H)"
 
-#: ../plugins/save-calendar/csv-format.c:548
-msgid "Value delimiter:"
-msgstr "ê°? êµ¬ë¶?:"
+#: ../plugins/save-calendar/csv-format.c:539
+msgid "_Value delimiter:"
+msgstr "ê°? êµ¬ë¶?(_V):"
 
-#: ../plugins/save-calendar/csv-format.c:554
-msgid "Record delimiter:"
-msgstr "ë ?ì½?ë?? êµ¬ë¶?:"
+#: ../plugins/save-calendar/csv-format.c:546
+msgid "_Record delimiter:"
+msgstr "ë ?ì½?ë?? êµ¬ë¶?(_R):"
 
-#: ../plugins/save-calendar/csv-format.c:560
-msgid "Encapsulate values with:"
-msgstr "ê°?ì?? ë??ë?¬ì?¸ë?? ë¬¸ì??:"
+#: ../plugins/save-calendar/csv-format.c:553
+msgid "_Encapsulate values with:"
+msgstr "ê°?ì?? ë??ë?¬ì?¸ë?? ë¬¸ì??(_E):"
 
-#: ../plugins/save-calendar/csv-format.c:582
+#: ../plugins/save-calendar/csv-format.c:575
 msgid "Comma separated value format (.csv)"
 msgstr "ì½¤ë§?ë¡? êµ¬ë¶?í?? ê°? í??ì?? (.csv)"
 
@@ -20016,8 +18935,8 @@ msgid "Save Selected"
 msgstr "ì? í??í?? ì?¬í? ì ?ì?¥"
 
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:2
-msgid "Saves selected calendar or tasks list to disk."
-msgstr "ì? í??í?? ë?¬ë ¥ì?´ë?? ì??ì?? ëª©ë¡?ì?? ë??ì?¤í?¬ì?? ì ?ì?¥í?©ë??ë?¤."
+msgid "Save a calendar or task list to disk."
+msgstr "ë?¬ë ¥ì?´ë?? ì??ì?? ëª©ë¡?ì?? ë??ì?¤í?¬ì?? ì ?ì?¥í?©ë??ë?¤."
 
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:3
 msgid "_Save to Disk"
@@ -20032,21 +18951,25 @@ msgstr "ë??ì?¤í?¬ì?? ì ?ì?¥(_S)"
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:377
+#: ../plugins/save-calendar/rdf-format.c:372
 msgid "RDF format (.rdf)"
 msgstr "RDF í??ì?? (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:161
+#: ../plugins/save-calendar/save-calendar.c:104
+msgid "_Format:"
+msgstr "í??ì??(_F):"
+
+#: ../plugins/save-calendar/save-calendar.c:165
 msgid "Select destination file"
 msgstr "ë??ì?? í??ì?¼ ì? í??"
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:1
-msgid "Select one source"
-msgstr "í?? ì??ì?¤ë¥¼ ì? í??"
+msgid "Quickly select a single calendar or task list for viewing."
+msgstr "í?? ê°?ì?? ë?¬ë ¥ì?´ë?? ì??ì?? ì??ì?¤ë¥¼ ë³¸ë?¤ê³  ë¹ ë¥´ê²? ì? í??í?©ë??ë?¤."
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:2
-msgid "Selects a single calendar or task source for viewing."
-msgstr "í?? ê°?ì?? ë?¬ë ¥ì?´ë?? ì??ì?? ì??ì?¤ë¥¼ ë³¸ë?¤ê³  ì? í??í?©ë??ë?¤."
+msgid "Select One Source"
+msgstr "í?? ì??ì?¤ë¥¼ ì? í??"
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:3
 msgid "Show _only this Calendar"
@@ -20068,15 +18991,15 @@ msgstr "ìµ?ì´?ì?? ê³?ì ? ì?¤ì ?ì?? í?  ë?? ì??ë?´í?©ë??ë?¤."
 msgid "Setup Assistant"
 msgstr "ì?¤ì ? ë??ì?°ë¯¸"
 
-#: ../plugins/startup-wizard/startup-wizard.c:85
+#: ../plugins/startup-wizard/startup-wizard.c:84
 msgid "Evolution Setup Assistant"
 msgstr "ì??ë³¼ë£¨ì?? ì?¤ì ? ë??ì?°ë¯¸"
 
-#: ../plugins/startup-wizard/startup-wizard.c:88
+#: ../plugins/startup-wizard/startup-wizard.c:87
 msgid "Welcome"
 msgstr "í??ì??í?©ë??ë?¤"
 
-#: ../plugins/startup-wizard/startup-wizard.c:89
+#: ../plugins/startup-wizard/startup-wizard.c:88
 msgid ""
 "Welcome to Evolution. The next few screens will allow Evolution to connect "
 "to your email accounts, and to import files from other applications. \n"
@@ -20089,37 +19012,35 @@ msgstr ""
 "\n"
 "ê³?ì??í??ì??ë ¤ë©´ \"ì??ì?¼ë¡?\" ë?¨ì¶?ë¥¼ ë??ë¥´ì?ì??ì?¤. "
 
-#: ../plugins/startup-wizard/startup-wizard.c:135
+#: ../plugins/startup-wizard/startup-wizard.c:115
 msgid "Importing files"
 msgstr "í??ì?¼ ê°?ì ¸ì?¤ê¸°"
 
-#: ../plugins/startup-wizard/startup-wizard.c:137
-#: ../shell/e-shell-importer.c:141
+#: ../plugins/startup-wizard/startup-wizard.c:117
+#: ../shell/e-shell-importer.c:138
 msgid "Please select the information that you would like to import:"
 msgstr "ë?¤ì??ì??ì?? ê°?ì ¸ì?¤ê³  ì?¶ì?? ì ?ë³´ë¥¼ ì? í??í??ì?ì??ì?¤:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:152
-#: ../shell/e-shell-importer.c:394
+#: ../plugins/startup-wizard/startup-wizard.c:132
+#: ../shell/e-shell-importer.c:419
 #, c-format
 msgid "From %s:"
 msgstr "%sì??ì??:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:232
-#: ../shell/e-shell-importer.c:505
+#: ../plugins/startup-wizard/startup-wizard.c:203
+#: ../shell/e-shell-importer.c:548
 #, c-format
 msgid "Importing data."
 msgstr "ë?°ì?´í?°ë¥¼ ê°?ì ¸ì?¤ë?? ì¤?ì??ë??ë?¤."
 
-#: ../plugins/startup-wizard/startup-wizard.c:234
-#: ../shell/e-shell-importer.c:519
+#: ../plugins/startup-wizard/startup-wizard.c:205
+#: ../shell/e-shell-importer.c:562
 msgid "Please wait"
 msgstr "ì? ì?? ê¸°ë?¤ë¦¬ì?ì??ì?¤"
 
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:1
-msgid "Indicates if threading of messages should fall back to subject."
-msgstr ""
-"ë©?ì??ì§? ê¸?í??ë??ë¡? ë§?ë?¤ ë?? ê¸?í??ë??ê°? ì??ì?¼ë©´ ì ?ëª©ì?? ë?°ë?¼ì?? ê¸?í??ë??ë¥¼ ë§?ë?¤ ì§? ë??í??ë??"
-"ë??ë?¤."
+msgid "Sort mail message threads by subject."
+msgstr "ë©?ì?¼ ë©?ì??ì§? ê¸?í??ë??ë¥¼ ì ?ëª© ì??ì??ë¡? ì ?ë ¬í?©ë??ë?¤."
 
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:2
 msgid "Subject Threading"
@@ -20140,15 +19061,15 @@ msgid ""
 "message body."
 msgstr "ì??ì?? í??ë?¬ê·¸ì?¸ì??ì?? ë©?ì??ì§? ë³¸ë¬¸ ë??ì?  ì?¬ì?©í?  í?¤/ê°? ì??ì?? ëª©ë¡?."
 
-#: ../plugins/templates/templates.c:603
+#: ../plugins/templates/templates.c:601
 msgid "No title"
 msgstr "ì ?ëª© ì??ì??"
 
-#: ../plugins/templates/templates.c:711
+#: ../plugins/templates/templates.c:709
 msgid "Save as _Template"
 msgstr "ì??ì??ì?¼ë¡? ì ?ì?¥(_T)"
 
-#: ../plugins/templates/templates.c:713
+#: ../plugins/templates/templates.c:711
 msgid "Save as Template"
 msgstr "ì??ì??ì?¼ë¡? ì ?ì?¥"
 
@@ -20157,31 +19078,61 @@ msgid "Drafts based template plugin"
 msgstr "ë©?ì?¼ ì´?ì?? ê¸°ì¤? ì??ì?? í??ë?¬ê·¸ì?¸"
 
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:1
-msgid "A simple plugin which uses yTNEF to decode TNEF attachments."
-msgstr "YTNEFë¥¼ ì?¬ì?©í?´ TNEF ì²¨ë¶?ë¥¼ ë??ì½?ë?©í??ë?? ê°?ë?¨í?? í??ë?¬ê·¸ì?¸."
+msgid "Decode TNEF (winmail.dat) attachments from Microsoft Outlook."
+msgstr "ë§?ì?´í?¬ë¡?ì??í??í?¸ ì??ì??ë£©ì??ì?? ë³´ë?¸ TNEF ì²¨ë¶?ë¥¼ (winmail.dat) ë??ì½?ë?©í?©ë??ë?¤."
 
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:2
-msgid "TNEF Attachment decoder"
-msgstr "TNEF ì²¨ë¶? ë??ì½?ë??"
+msgid "TNEF Decoder"
+msgstr "TNEF ë??ì½?ë??"
+
+#: ../plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml.h:1
+msgid "Inline vCards"
+msgstr "ì?¸ë?¼ì?¸ vCard"
+
+#: ../plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml.h:2
+msgid "Show vCards directly in mail messages."
+msgstr "vCardë¥¼ ë©?ì?¼ ë©?ì??ì§?ì??ì?? ì§?ì ? í??ì??í?©ë??ë?¤."
+
+#: ../plugins/vcard-inline/vcard-inline.c:159
+#: ../plugins/vcard-inline/vcard-inline.c:243
+msgid "Show Full vCard"
+msgstr "vCard ì??ì?¸í?? ë³´ê¸°"
+
+#: ../plugins/vcard-inline/vcard-inline.c:162
+msgid "Show Compact vCard"
+msgstr "vCard ê°?ë?¨í?? ë³´ê¸°"
+
+#: ../plugins/vcard-inline/vcard-inline.c:222
+msgid "There is one other contact."
+msgstr "ê¸°í?? ì?°ë?½ì²?ê°? í?? ê°? ì??ì?µë??ë?¤."
+
+#: ../plugins/vcard-inline/vcard-inline.c:231
+#, c-format
+msgid "There is %d other contact."
+msgid_plural "There are %d other contacts."
+msgstr[0] "ê¸°í?? ì?°ë?½ì²?ê°? %dê°? ì??ì?µë??ë?¤."
+
+#: ../plugins/vcard-inline/vcard-inline.c:252
+msgid "Save in Address Book"
+msgstr "ì£¼ì??ë¡?ì?? ì ?ì?¥"
 
 #: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:1
-msgid "A plugin to setup WebDAV contacts."
-msgstr "WebDAV ì?°ë?½ì²?ë¥¼ ì?¤ì ?í??ë?? í??ë?¬ê·¸ì?¸."
+msgid "Add WebDAV contacts to Evolution."
+msgstr "WebDAV ì?°ë?½ì²?ë¥¼ ì??ë³¼ë£¨ì??ì?? ì¶?ê°?í?©ë??ë?¤."
 
 #: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:2
 msgid "WebDAV contacts"
 msgstr "WebDAV ì?°ë?½ì²?"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:96
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:107
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:68
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:336
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:295
 msgid "URL:"
 msgstr "URL:"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:363
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:321
 msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "IfMatch í?¼í??ê¸°(_A) (ì??í??ì¹? 2.2.8 ë¯¸ë§? ë²?ì ?ì??ì?? í??ì??)"
 
@@ -20267,43 +19218,61 @@ msgstr ""
 "ë?¤."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:15
+msgid "Initial attachment view"
+msgstr "ìµ?ì´? ì²¨ë¶? ë³´ê¸°"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:16
+msgid "Initial file chooser folder"
+msgstr "ìµ?ì´? í??ì?¼ ì? í?? í?´ë??"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:17
+msgid "Initial folder for GtkFileChooser dialogs."
+msgstr "GtkFileChooser ë??í?? ì??ì??ì?? ìµ?ì´? í?´ë??."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:18
+msgid ""
+"Initial view for attachment bar widgets. \"0\" is Icon View, \"1\" is List "
+"View."
+msgstr "ì²¨ë¶? ëª¨ì?? ì??ì ¯ì?? ìµ?ì´? ë³´ê¸° ëª¨ë??. \"0\"ì?? ì??ì?´ì½? ë³´ê¸°, \"1\"ì?? ëª©ë¡? ë³´ê¸°."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:19
 msgid "Last upgraded configuration version"
 msgstr "ìµ?ê·¼ ì??ê·¸ë ?ì?´ë??í?? ì?¤ì ? ë²?ì ?"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.h:20
 msgid ""
 "List of paths for the folders to be synchronized to disk for offline usage"
 msgstr "ì?¤í??ë?¼ì?¸ì??ì?? ì?¬ì?©í?  ë?? ë??ê¸°í??í?  í?´ë??ì?? ê²½ë¡? ëª©ë¡?"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.h:21
 msgid "Non-proxy hosts"
 msgstr "í??ë¡?ì?? ì??ì?? í?¸ì?¤í?¸"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.h:22
 msgid "Password to pass as authentication when doing HTTP proxying."
 msgstr "HTTP í??ë¡?ì??ì?? ì?¸ì¦?í?  ë?? ë??ê¸¸ ì??í?¸."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.h:23
 msgid "Proxy configuration mode"
 msgstr "í??ë¡?ì?? ì?¤ì ? ëª¨ë??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.h:24
 msgid "SOCKS proxy host name"
 msgstr "SOCKS í??ë¡?ì?? í?¸ì?¤í?¸ ì?´ë¦?"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.h:25
 msgid "SOCKS proxy port"
 msgstr "SOCKS í??ë¡?ì?? í?¬í?¸"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.h:26
 msgid "Secure HTTP proxy host name"
 msgstr "ë³´ì?? HTTP í??ë¡?ì?? í?¸ì?¤í?¸ ì?´ë¦?"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.h:27
 msgid "Secure HTTP proxy port"
 msgstr "ë³´ì?? HTTP í??ë¡?ì?? í?¬í?¸"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.h:28
 msgid ""
 "Select the proxy configuration mode. Supported values are 0, 1, 2, and 3 "
 "representing \"use system settings\", \"no proxy\", \"use manual proxy "
@@ -20314,42 +19283,42 @@ msgstr ""
 "\"ì??ì?¤í?? ì?¤ì ? ì?¬ì?©\", \"í??ë¡?ì?? ì??ì??\", \"ì??ë?? í??ë¡?ì?? ì?¤ì ? ì?¬ì?©\", \"ì??ë?? ì?¤"
 "ì ? URLì?? ë?¤ì?´ ì??ë?? í??ë¡?ì?? ì?¤ì ? ì?¬ì?©\"ì??ë??ë?¤."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:25
+#: ../shell/apps_evolution_shell.schemas.in.h:29
 msgid "Sidebar is visible"
 msgstr "ë³´ì¡° ëª¨ì??ì?? í??ì??í?©ë??ë?¤"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.h:30
 msgid "Skip development warning dialog"
 msgstr "ê°?ë°? ë²?ì ? ê²½ê³  ê±´ë?? ë?°ê¸°"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:27 ../shell/main.c:483
+#: ../shell/apps_evolution_shell.schemas.in.h:31 ../shell/main.c:489
 msgid "Start in offline mode"
 msgstr "ì?¤í??ë?¼ì?¸ ëª¨ë??ì??ì?? ì??ì??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.h:32
 msgid "Statusbar is visible"
 msgstr "ì??í?? í??ì??ì¤?ì?? í??ì??í?©ë??ë?¤"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:29
+#: ../shell/apps_evolution_shell.schemas.in.h:33
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
 msgstr ""
 "ì??ë³¼ë£¨ì??ì?? ì?¤ì ? ë²?ì ?, major/minor/configuration ë?¨ê³?. (ì??ë¥¼ ë?¤ì?´ \"2.6.0\")"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:30
+#: ../shell/apps_evolution_shell.schemas.in.h:34
 msgid "The default height for the main window, in pixels."
 msgstr "ë©?ì?¸ ì°½ì?? ê¸°ë³¸ ë??ì?´, í?½ì?? ë?¨ì??."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:31
+#: ../shell/apps_evolution_shell.schemas.in.h:35
 msgid "The default width for the main window, in pixels."
 msgstr "ë©?ì?¸ ì°½ì?? ê¸°ë³¸ ë??ë¹?, í?½ì?? ë?¨ì??."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:32
+#: ../shell/apps_evolution_shell.schemas.in.h:36
 msgid "The default width for the sidebar, in pixels."
 msgstr "ë³´ì¡° ëª¨ì??ì?? ê¸°ë³¸ ë??ë¹?, í?½ì?? ë?¨ì??."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:33
+#: ../shell/apps_evolution_shell.schemas.in.h:37
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
 "configuration level (for example \"2.6.0\")."
@@ -20357,19 +19326,19 @@ msgstr ""
 "ìµ?ê·¼ ì??ê·¸ë ?ì?´ë??í?? ì??ë³¼ë£¨ì??ì?? ì?¤ì ? ë²?ì ?, major/minor/configuration ë?¨ê³?. (ì??"
 "ë¥¼ ë?¤ì?´ \"2.6.0\")"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:34
+#: ../shell/apps_evolution_shell.schemas.in.h:38
 msgid "The machine name to proxy HTTP through."
 msgstr "HTTP í??ë¡?ì??ë¡? ì?¬ì?©í?  ì»´í?¨í?° ì?´ë¦?."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:35
+#: ../shell/apps_evolution_shell.schemas.in.h:39
 msgid "The machine name to proxy secure HTTP through."
 msgstr "ë³´ì?? HTTP í??ë¡?ì??ë¡? ì?¬ì?©í?  ì»´í?¨í?° ì?´ë¦?."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:36
+#: ../shell/apps_evolution_shell.schemas.in.h:40
 msgid "The machine name to proxy socks through."
 msgstr "SOCKS í??ë¡?ì??ë¡? ì?¬ì?©í?  ì»´í?¨í?° ì?´ë¦?."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:37
+#: ../shell/apps_evolution_shell.schemas.in.h:41
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "http_host\" that you proxy through."
@@ -20377,7 +19346,7 @@ msgstr ""
 "í??ë¡?ì??ë¡? ì?´ì?©í?  \"/apps/evolution/shell/network_config/http_host\"ì??ì?? ì§?ì ?"
 "í?? ì»´í?¨í?°ì?? í?¬í?¸."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:38
+#: ../shell/apps_evolution_shell.schemas.in.h:42
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "secure_host\" that you proxy through."
@@ -20385,7 +19354,7 @@ msgstr ""
 "í??ë¡?ì??ë¡? ì?´ì?©í?  \"/apps/evolution/shell/network_config/secure_host\"ì??ì?? ì§?ì ?"
 "í?? ì»´í?¨í?°ì?? í?¬í?¸."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:39
+#: ../shell/apps_evolution_shell.schemas.in.h:43
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "socks_host\" that you proxy through."
@@ -20393,7 +19362,7 @@ msgstr ""
 "í??ë¡?ì??ë¡? ì?´ì?©í?  \"/apps/evolution/shell/network_config/socks_host\"ì??ì?? ì§?ì ?"
 "í?? ì»´í?¨í?°ì?? í?¬í?¸."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:40
+#: ../shell/apps_evolution_shell.schemas.in.h:44
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
@@ -20402,7 +19371,7 @@ msgstr ""
 "ì°½ ë?¨ì¶?ì?? ëª¨ì??ì??. \"text\", \"icons\", \"both\", \"toolbar\" ì?¬ì?© ê°?ë?¥. "
 "\"toolbar\"ì?¼ ê²½ì?° ê·¸ë?? ë??êµ¬ ëª¨ì?? ì?¤ì ?ì?? ë?°ë?¼ì?? ë?¨ì¶?ì?? ëª¨ì??ì??ê°? ê²°ì ?ë?©ë??ë?¤."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:41
+#: ../shell/apps_evolution_shell.schemas.in.h:45
 msgid ""
 "This key contains a list of hosts which are connected to directly, rather "
 "than via the proxy (if it is active). The values can be hostnames, domains "
@@ -20414,56 +19383,56 @@ msgstr ""
 "ë??ì¹´ë?? ì?¬ì?©), IP ì£¼ì??(IPv4ì?? IPv6 ëª¨ë?? ê°?ë?¥), ë?¤í?¸ë§?ì?¤í?¬ë¥¼ ì?¬ì?©í?? ë?¤í?¸ì??í?¬ ì£¼"
 "ì??(192.168.0.0/24ì?? ê°?ì?´) ëª¨ë?? ì?¬ì?©í?  ì?? ì??ì?µë??ë?¤."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:42
+#: ../shell/apps_evolution_shell.schemas.in.h:46
 msgid "Toolbar is visible"
 msgstr "ë??êµ¬ ëª¨ì??ì?? í??ì??í?©ë??ë?¤"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:43
+#: ../shell/apps_evolution_shell.schemas.in.h:47
 msgid "URL that provides proxy configuration values."
 msgstr "í??ë¡?ì?? ì?¤ì ? ê°?ì?´ ë?¤ì?´ ì??ë?? URL."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:44
+#: ../shell/apps_evolution_shell.schemas.in.h:48
 msgid "Use HTTP proxy"
 msgstr "HTTP í??ë¡?ì?? ì?¬ì?©"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:45
+#: ../shell/apps_evolution_shell.schemas.in.h:49
 msgid "User name to pass as authentication when doing HTTP proxying."
 msgstr "HTTP í??ë¡?ì??ì?? ì?¸ì¦?í?  ë?? ë??ê¸¸ ì?¬ì?©ì?? ì?´ë¦?."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:46
+#: ../shell/apps_evolution_shell.schemas.in.h:50
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr "ì??ë³¼ë£¨ì??ì?´ ì²?ì??ì?? ì?¨ë?¼ì?¸ì?´ ì??ë??ë?¼ ì?¤í??ë?¼ì?¸ ëª¨ë??ë¡? ì??ì??í??ë?? ì§? ì?¬ë¶?."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:47
+#: ../shell/apps_evolution_shell.schemas.in.h:51
 msgid "Whether or not the window should be maximized."
 msgstr "ì°½ì?? ìµ?ë??í??í?  ì§? ì?¬ë¶?."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:48
+#: ../shell/apps_evolution_shell.schemas.in.h:52
 msgid "Whether the sidebar should be visible."
 msgstr "ë³´ì¡° ëª¨ì??ì?? í??ì??í?  ì§? ì?¬ë¶?."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:49
+#: ../shell/apps_evolution_shell.schemas.in.h:53
 msgid "Whether the status bar should be visible."
 msgstr "ì??í?? í??ì??ì¤?ì?? í??ì??í?  ì§? ì?¬ë¶?."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:50
+#: ../shell/apps_evolution_shell.schemas.in.h:54
 msgid "Whether the toolbar should be visible."
 msgstr "ë??êµ¬ ëª¨ì??ì?? í??ì??í?  ì§? ì?¬ë¶?."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:51
+#: ../shell/apps_evolution_shell.schemas.in.h:55
 msgid ""
 "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr "ì??ë³¼ë£¨ì?? ê°?ë°? ë²?ì ?ì?? ê²½ê³  ë??í?? ì??ì??ë¥¼ ê±´ë?? ë?¸ì§? ì?¬ë¶?."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:52
+#: ../shell/apps_evolution_shell.schemas.in.h:56
 msgid "Whether the window buttons should be visible."
 msgstr "ì°½ ë?¨ì¶?ë¥¼ í??ì??í?´ì?¼ í??ë?? ì§? ì?¬ë¶?."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:53
+#: ../shell/apps_evolution_shell.schemas.in.h:57
 msgid "Window button style"
 msgstr "ì°½ ë?¨ì¶? ëª¨ì??ì??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:54
+#: ../shell/apps_evolution_shell.schemas.in.h:58
 msgid "Window buttons are visible"
 msgstr "ì°½ ë?¨ì¶? í??ì??í?  ì§? ì?¬ë¶?"
 
@@ -20479,22 +19448,22 @@ msgstr "ì?¬ì?©í??ê³  ì??ë?? ì?°ê²°"
 msgid "Click OK to close these connections and go offline"
 msgstr "ì?°ê²°ì?? ë??ê³  ì?¤í??ë?¼ì?¸ì?¼ë¡? ê°?ë ¤ë©´ í??ì?¸ì?? ë??ë¥´ì?ì??ì?¤"
 
-#: ../shell/e-shell-importer.c:131
+#: ../shell/e-shell-importer.c:128
 msgid "Choose the type of importer to run:"
 msgstr "ì?¤í??í?  ê°?ì ¸ì?¤ê¸° ì¢?ë¥?ë¥¼ ì? í??í??ì?ì??ì?¤:"
 
-#: ../shell/e-shell-importer.c:134
+#: ../shell/e-shell-importer.c:131
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list."
 msgstr ""
 "ì??ë³¼ë£¨ì??ì?¼ë¡? ê°?ì ¸ ì?¬ í??ì?¼ì?? ì? í??í??ì??ê³ , ê·¸ í??ì?¼ì?? ì¢?ë¥?ë¥¼ ëª©ë¡?ì??ì?? ê³ ë¥´ì?ì??ì?¤."
 
-#: ../shell/e-shell-importer.c:138
+#: ../shell/e-shell-importer.c:135
 msgid "Choose the destination for this import"
 msgstr "ì?´ë??ë¡? ê°?ì ¸ì?¬ ì§?ë¥¼ ê³ ë¥´ì?ì??ì?¤"
 
-#: ../shell/e-shell-importer.c:144
+#: ../shell/e-shell-importer.c:141
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No importable\n"
@@ -20505,78 +19474,82 @@ msgstr ""
 "PINE, ë?·ì?¤ì¼?ì?´í??, ELM, iCalendar. ê°?ì ¸ì?¬ ì?? ì??ë?? ì?¤ì ?ì?? ì°¾ì?? ì??\n"
 "ì??ì??ì?µë??ë?¤. ë?¤ì?? ì??ë??í??ë ¤ë©´ \"ë?¤ë¡?\" ë?¨ì¶?ë¥¼ ë??ë¥´ì?ì??ì?¤.\n"
 
-#: ../shell/e-shell-importer.c:282
+#: ../shell/e-shell-importer.c:295
 msgid "F_ilename:"
 msgstr "í??ì?¼ ì?´ë¦?(_I):"
 
-#: ../shell/e-shell-importer.c:287
+#: ../shell/e-shell-importer.c:300
 msgid "Select a file"
 msgstr "í??ì?¼ì?? ê³ ë¥´ì?ì??ì?¤"
 
-#: ../shell/e-shell-importer.c:296
+#: ../shell/e-shell-importer.c:309
 msgid "File _type:"
 msgstr "í??ì?¼ ì¢?ë¥?(_T):"
 
-#: ../shell/e-shell-importer.c:332
+#: ../shell/e-shell-importer.c:357
 msgid "Import data and settings from _older programs"
 msgstr "ê³¼ê±°ì?? ì?°ë?? í??ë¡?ê·¸ë?¨ì??ì?? ë?°ì?´í?° ë°? ì?¤ì ? ì?¬í? ê°?ì ¸ì?¤ê¸°(_O)"
 
-#: ../shell/e-shell-importer.c:335
+#: ../shell/e-shell-importer.c:360
 msgid "Import a _single file"
 msgstr "í??ì?¼ í?? ê°? ê°?ì ¸ì?¤ê¸°(_S)"
 
-#: ../shell/e-shell-settings-dialog.c:313
+#: ../shell/e-shell-importer.c:743
+msgid "_Import"
+msgstr "ê°?ì ¸ì?¤ê¸°(_I)"
+
+#: ../shell/e-shell-settings-dialog.c:312
 msgid "Evolution Preferences"
 msgstr "ì??ë³¼ë£¨ì?? ê¸°ë³¸ ì?¤ì ?"
 
 #. To translators: This is the window title and %s is the
 #. component name. Most translators will want to keep it as is.
-#: ../shell/e-shell-view.c:47 ../shell/e-shell-window.c:328
+#: ../shell/e-shell-view.c:47 ../shell/e-shell-window.c:324
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - ì??ë³¼ë£¨ì??"
 
-#: ../shell/e-shell-window-commands.c:75
+#: ../shell/e-shell-window-commands.c:69
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "ì?´ ì??ì?¤í??ì?? ê·¸ë?? í??ì?¼ë?¿ í?´ì?´ ì?¤ì¹?ë??ì§? ì??ì??ì?µë??ë?¤."
 
-#: ../shell/e-shell-window-commands.c:83
+#: ../shell/e-shell-window-commands.c:78
 #, c-format
-msgid "Error executing %s."
-msgstr "%s ì?¤í?? ì¤? ì?¤ë¥?ê°? ë°?ì??í??ì?µë??ë?¤."
+msgid "Error executing %s. (%s)"
+msgstr "%s ì?¤í?? ì¤? ì?¤ë¥?ê°? ë°?ì??í??ì?µë??ë?¤. (%s)"
 
-#: ../shell/e-shell-window-commands.c:139
+#: ../shell/e-shell-window-commands.c:135
 msgid "Bug buddy is not installed."
 msgstr "Bug buddyê°? ì?¤ì¹?ë??ì§? ì??ì??ì?µë??ë?¤."
 
-#: ../shell/e-shell-window-commands.c:142
+#: ../shell/e-shell-window-commands.c:138
 msgid "Bug buddy could not be run."
 msgstr "Bug buddyë¥¼ ì?¤í??í?  ì?? ì??ì?µë??ë?¤."
 
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-commands.c:942
+#: ../shell/e-shell-window-commands.c:938
 msgid "translator-credits"
 msgstr "GNOME Korea <gnome-kr-hackers lists kldp net>"
 
-#: ../shell/e-shell-window-commands.c:953
+#: ../shell/e-shell-window-commands.c:949
 msgid "Evolution Website"
 msgstr "ì??ë³¼ë£¨ì?? ì?¹ì?¬ì?´í?¸"
 
-#: ../shell/e-shell-window-commands.c:1170
+#: ../shell/e-shell-window-commands.c:1163
 msgid "_Work Online"
 msgstr "ì?¨ë?¼ì?¸ ì??ì??(_W)"
 
-#: ../shell/e-shell-window-commands.c:1183 ../ui/evolution.xml.h:57
+#: ../shell/e-shell-window-commands.c:1176 ../ui/evolution.xml.h:57
 msgid "_Work Offline"
 msgstr "ì?¤í??ë?¼ì?¸ ì??ì??(_W)"
 
-#: ../shell/e-shell-window-commands.c:1196
+#: ../shell/e-shell-window-commands.c:1189
 msgid "Work Offline"
 msgstr "ì?¤í??ë?¼ì?¸ì??ì?? ì??ì??"
 
-#: ../shell/e-shell-window.c:377
+#: ../shell/e-shell-window.c:372
 msgid ""
 "Evolution is currently online.\n"
 "Click on this button to work offline."
@@ -20584,11 +19557,11 @@ msgstr ""
 "ì??ë³¼ë£¨ì??ì?? í??ì?¬ ì?¨ë?¼ì?¸ ì??í??ì??ë??ë?¤.\n"
 "ì?¤í??ë?¼ì?¸ ì??í??ë¡? ì??ì??í??ë ¤ë©´ ì?´ ë?¨ì¶?ë¥¼ ë??ë¥´ì?ì??ì?¤."
 
-#: ../shell/e-shell-window.c:384
+#: ../shell/e-shell-window.c:379
 msgid "Evolution is in the process of going offline."
 msgstr "ì??ë³¼ë£¨ì??ì?? ì?¤í??ë?¼ì?¸ ì??í??ë¡? ê°?ë?? ì¤?ì??ë??ë?¤."
 
-#: ../shell/e-shell-window.c:391
+#: ../shell/e-shell-window.c:386
 msgid ""
 "Evolution is currently offline.\n"
 "Click on this button to work online."
@@ -20596,52 +19569,52 @@ msgstr ""
 "ì??ë³¼ë£¨ì??ì?? í??ì?¬ ì?¤í??ë?¼ì?¸ ì??í??ì??ë??ë?¤.\n"
 "ì?¨ë?¼ì?¸ ì??í??ë¡? ì??ì??í??ë ¤ë©´ ì?´ ë?¨ì¶?ë¥¼ ë??ë¥´ì?ì??ì?¤."
 
-#: ../shell/e-shell-window.c:787
+#: ../shell/e-shell-window.c:778
 #, c-format
 msgid "Switch to %s"
 msgstr "%s ì°½ì?¼ë¡? ë°?ê¾¸ê¸°"
 
-#: ../shell/e-shell.c:640
+#: ../shell/e-shell.c:634
 msgid "Unknown system error."
 msgstr "ì?? ì?? ì??ë?? ì??ì?¤í?? ì?¤ë¥?."
 
-#: ../shell/e-shell.c:838 ../shell/e-shell.c:839
+#: ../shell/e-shell.c:832 ../shell/e-shell.c:833
 #, c-format
 msgid "%ld KB"
 msgstr "%ld KB"
 
-#: ../shell/e-shell.c:1261 ../widgets/misc/e-cell-date-edit.c:313
+#: ../shell/e-shell.c:1251 ../widgets/misc/e-cell-date-edit.c:320
 msgid "OK"
 msgstr "í??ì?¸"
 
-#: ../shell/e-shell.c:1263
+#: ../shell/e-shell.c:1253
 msgid "Invalid arguments"
 msgstr "ì?¸ì??ê°? ì??ëª»ë??ì??ì?µë??ë?¤"
 
-#: ../shell/e-shell.c:1265
+#: ../shell/e-shell.c:1255
 msgid "Cannot register on OAF"
 msgstr "OAFì?? ë?±ë¡?í?  ì?? ì??ì?µë??ë?¤"
 
-#: ../shell/e-shell.c:1267
+#: ../shell/e-shell.c:1257
 msgid "Configuration Database not found"
 msgstr "ì?¤ì ? ë?°ì?´í?°ë² ì?´ì?¤ë¥¼ ì°¾ì?? ì?? ì??ì?µë??ë?¤"
 
-#: ../shell/e-user-creatable-items-handler.c:678
-#: ../shell/e-user-creatable-items-handler.c:688
-#: ../shell/e-user-creatable-items-handler.c:693
+#: ../shell/e-user-creatable-items-handler.c:674
+#: ../shell/e-user-creatable-items-handler.c:684
+#: ../shell/e-user-creatable-items-handler.c:689
 msgid "New"
 msgstr "ì??ë¡? ë§?ë?¤ê¸°"
 
-#: ../shell/test/evolution-test-component.c:105
+#: ../shell/test/evolution-test-component.c:103
 msgid "New Test"
 msgstr "ì?? í??ì?¤í?¸"
 
-#: ../shell/test/evolution-test-component.c:106
+#: ../shell/test/evolution-test-component.c:104
 msgctxt "New"
 msgid "_Test"
 msgstr "í??ì?¤í?¸(_T)"
 
-#: ../shell/test/evolution-test-component.c:107
+#: ../shell/test/evolution-test-component.c:105
 msgid "Create a new test item"
 msgstr "ì?? í??ì?¤í?¸ í?ëª©ì?? ë§?ë?ë??ë?¤"
 
@@ -20684,7 +19657,7 @@ msgstr ""
 "ë¥´ì?ì??ì?¤."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:221
+#: ../shell/main.c:226
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -20718,7 +19691,7 @@ msgstr ""
 "ì?°ë¦¬ê°? ì?´ì?¬í?? ì?¼í?? ê²°ê³¼ë¬¼ì?? ì?? ì?¨ ì£¼ì??ê¸¸ ë°?ë??ë??ë?¤. ê·¸ë¦¬ê³  ê°?ë°?ì??\n"
 "ê¸°ì?¬í?´ ì£¼ì??ê¸°ë¥¼ ëª©ì?´ ë¹ ì§?ê²? ê¸°ë?¤ë¦¬ê² ì?µë??ë?¤!\n"
 
-#: ../shell/main.c:245
+#: ../shell/main.c:250
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -20726,43 +19699,43 @@ msgstr ""
 "ê³ ë§?ì?µë??ë?¤\n"
 "ì??ë³¼ë£¨ì?? í??\n"
 
-#: ../shell/main.c:252
+#: ../shell/main.c:257
 msgid "Do not tell me again"
 msgstr "ë?¤ì?? ì??ë¦¬ì§? ì??ê¸°"
 
-#: ../shell/main.c:481
+#: ../shell/main.c:487
 msgid "Start Evolution activating the specified component"
 msgstr "ì??ë³¼ë£¨ì?? ì??ì??í?  ë?? í?¹ì ? ì»´í?¬ë??í?¸ë¥¼ í??ì?±í??í?©ë??ë?¤"
 
-#: ../shell/main.c:485
+#: ../shell/main.c:491
 msgid "Start in online mode"
 msgstr "ì?¨ë?¼ì?¸ ëª¨ë??ì??ì?? ì??ì??"
 
-#: ../shell/main.c:488
+#: ../shell/main.c:494
 msgid "Forcibly shut down all Evolution components"
 msgstr "ê°?ì ?ë¡? ëª¨ë?  ì??ë³¼ë£¨ì?? ì»´í?¬ë??í?¸ë¥¼ ë??ë??ë??ë?¤"
 
-#: ../shell/main.c:492
+#: ../shell/main.c:498
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "ê°?ì ?ë¡? ì??ë³¼ë£¨ì?? 1.4ì??ì?? ë?¤ì?? ì?®ê²¨ ì?µë??ë?¤"
 
-#: ../shell/main.c:495
+#: ../shell/main.c:501
 msgid "Send the debugging output of all components to a file."
 msgstr "ëª¨ë?  ì»´í?¬ë??í?¸ì?? ë??ë²?ê¹? ì¶?ë ¥ì?? í??ì?¼ë¡? ë³´ë??ë??ë?¤."
 
-#: ../shell/main.c:497
+#: ../shell/main.c:503
 msgid "Disable loading of any plugins."
 msgstr "í??ë?¬ê·¸ì?¸ì?? ì??ë¬´ê²?ë?? ì?½ì?´ë?¤ì?´ì§? ì??ì?µë??ë?¤."
 
-#: ../shell/main.c:499
+#: ../shell/main.c:505
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "ì ?ì??ë©?ì?¼, ì?°ë?½ì²?, ì??ì??ì?? ë¯¸ë¦¬ ë³´ê¸° ì°½ì?? ì?¬ì?©í??ì§? ì??ì?µë??ë?¤."
 
-#: ../shell/main.c:586
+#: ../shell/main.c:614
 msgid "- The Evolution PIM and Email Client"
 msgstr "- ì??ë³¼ë£¨ì?? ê°?ì?¸ì ?ë³´ ê´?ë¦¬ ë°? ë©?ì?¼ í?´ë?¼ì?´ì?¸í?¸"
 
-#: ../shell/main.c:614
+#: ../shell/main.c:642
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -20819,14 +19792,11 @@ msgid ""
 "Once deleted, you cannot downgrade to the previous version of Evolution "
 "without manual intervention.\n"
 msgstr ""
-"&quot;evolution&quot; ë??ë ?í?°ë¦¬ì?? ì ?ì²´ ë?´ì?©ì?? ì§?ì?°ê²? ë?©ë??ë?¤.\n"
+"&quot;evolution&quot; ë??ë ?í?°ë¦¬ì?? ì ?ì²´ ë?´ì?©ì?? ì??ì ?í?? ì ?ê±°í??ê²? ë?©ë??ë?¤.\n"
 "\n"
-"ê³¼ê±° ë?°ì?´í?°ë¥¼ ì§?ì?°ê¸° ì ?ì?? ì??ë??ì?¼ë¡? ëª¨ë?  ë©?ì?¼, ì?°ë?½ì²?, ë?¬ë ¥ ë?°ì?´í?°ê°? ì?¨ì ?í??ê²? "
-"ë?¨ì?? ì??ë?? ì§?, ê·¸ë¦¬ê³  ì?´ ë²?ì ?ì?? ì??ë³¼ë£¨ì??ì?´ ì?¬ë°?ë¥´ê²? ë??ì??í??ë?? ì§? í??ì?¸í??ë?? ê²? ì¢?"
-"ì?µë??ë?¤.\n"
+"ê³¼ê±° ë?°ì?´í?°ë¥¼ ì§?ì?°ê¸° ì ?ì?? ì??ë??ì?¼ë¡? ëª¨ë?  ë©?ì?¼, ì?°ë?½ì²?, ë?¬ë ¥ ë?°ì?´í?°ê°? ì?¨ì ?í??ê²? ë?¨ì?? ì??ë?? ì§?, ê·¸ë¦¬ê³  ì?´ ë²?ì ?ì?? ì??ë³¼ë£¨ì??ì?´ ì?¬ë°?ë¥´ê²? ë??ì??í??ë?? ì§? í??ì?¸í??ë?? ê²? ì¢?ì?µë??ë?¤.\n"
 "\n"
-"ì?¼ë?¨ ë?°ì?´í?°ë¥¼ ì§?ì?°ë©´ ì??ë??ì?¼ë¡? ì¡°ì??í??ì§? ì??ê³ ì??ë?? ê³¼ê±° ë²?ì ? ì??ë³¼ë£¨ì??ì?¼ë¡? ë?¤ì?´ê·¸"
-"ë ?ì?´ë??í?  ì?? ì??ì?µë??ë?¤.\n"
+"ì?¼ë?¨ ë?°ì?´í?°ë¥¼ ì§?ì?°ë©´ ì??ë??ì?¼ë¡? ì¡°ì??í??ì§? ì??ê³ ì??ë?? ê³¼ê±° ë²?ì ? ì??ë³¼ë£¨ì??ì?¼ë¡? ë?¤ì?´ê·¸ë ?ì?´ë??í?  ì?? ì??ì?µë??ë?¤.\n"
 
 #: ../shell/shell.error.xml.h:16
 msgid ""
@@ -20919,7 +19889,7 @@ msgstr ""
 "\n"
 "ì? ë¢° ì??ì¤?ì?? í?¸ì§?í??ì?ì??ì?¤:"
 
-#: ../smime/gui/cert-trust-dialog.c:151
+#: ../smime/gui/cert-trust-dialog.c:150
 msgid ""
 "Because you trust the certificate authority that issued this certificate, "
 "then you trust the authenticity of this certificate unless otherwise "
@@ -20928,7 +19898,7 @@ msgstr ""
 "ì?´ ì?¸ì¦?ì??ë¥¼ ë°?ê¸?í?? ì?¸ì¦? ê¸°ê´?ì?? ì? ë¢°í??ë?¤ê³  í??ì?¨ì?¼ë¯?ë¡?, ë?°ë¡? ì§?ì ?í??ì§? ì??ë?? í?? "
 "ì?´ ì?¸ì¦?ì??ë¥¼ ë¯¿ì??ë§? í??ë?¤ê³  ì? ë¢°í?©ë??ë?¤."
 
-#: ../smime/gui/cert-trust-dialog.c:155
+#: ../smime/gui/cert-trust-dialog.c:154
 msgid ""
 "Because you do not trust the certificate authority that issued this "
 "certificate, then you do not trust the authenticity of this certificate "
@@ -20937,51 +19907,51 @@ msgstr ""
 "ì?´ ì?¸ì¦?ì??ë¥¼ ë°?ê¸?í?? ì?¸ì¦? ê¸°ê´?ì?? ì? ë¢°í??ì§? ì??ë??ë?¤ê³  í??ì?¨ì?¼ë¯?ë¡?, ë?°ë¡? ì§?ì ?í??ì§? ì??"
 "ë?? í?? ì?´ ì?¸ì¦?ì??ë¥¼ ë¯¿ì??ë§? í??ë?¤ê³  ì? ë¢°í??ì§? ì??ì?µë??ë?¤."
 
-#: ../smime/gui/certificate-manager.c:137
-#: ../smime/gui/certificate-manager.c:380
-#: ../smime/gui/certificate-manager.c:604
+#: ../smime/gui/certificate-manager.c:136
+#: ../smime/gui/certificate-manager.c:383
+#: ../smime/gui/certificate-manager.c:611
 msgid "Select a certificate to import..."
 msgstr "ê°?ì ¸ì?¬ ì?¸ì¦?ì??ë¥¼ ì? í??í??ì?ì??ì?¤..."
 
-#: ../smime/gui/certificate-manager.c:146
+#: ../smime/gui/certificate-manager.c:145
 msgid "All PKCS12 files"
 msgstr "ëª¨ë?  PKCS12 í??ì?¼"
 
 #: ../smime/gui/certificate-manager.c:151
-#: ../smime/gui/certificate-manager.c:394
-#: ../smime/gui/certificate-manager.c:618
+#: ../smime/gui/certificate-manager.c:398
+#: ../smime/gui/certificate-manager.c:625
 msgid "All files"
 msgstr "ëª¨ë?  í??ì?¼"
 
-#: ../smime/gui/certificate-manager.c:271
-#: ../smime/gui/certificate-manager.c:480
-#: ../smime/gui/certificate-manager.c:702
+#: ../smime/gui/certificate-manager.c:275
+#: ../smime/gui/certificate-manager.c:488
+#: ../smime/gui/certificate-manager.c:713
 msgid "Certificate Name"
 msgstr "ì?¸ì¦?ì?? ì?´ë¦?"
 
-#: ../smime/gui/certificate-manager.c:280
-#: ../smime/gui/certificate-manager.c:498
+#: ../smime/gui/certificate-manager.c:284
+#: ../smime/gui/certificate-manager.c:506
 msgid "Purposes"
 msgstr "ëª©ì ?"
 
-#: ../smime/gui/certificate-manager.c:289 ../smime/gui/smime-ui.glade.h:37
-#: ../smime/lib/e-cert.c:553
+#: ../smime/gui/certificate-manager.c:293 ../smime/gui/smime-ui.glade.h:37
+#: ../smime/lib/e-cert.c:552
 msgid "Serial Number"
 msgstr "ì?¼ë ¨ ë²?í?¸"
 
-#: ../smime/gui/certificate-manager.c:297
+#: ../smime/gui/certificate-manager.c:301
 msgid "Expires"
 msgstr "ë§?ë£?"
 
-#: ../smime/gui/certificate-manager.c:389
+#: ../smime/gui/certificate-manager.c:392
 msgid "All email certificate files"
 msgstr "ëª¨ë?  ì ?ì??ë©?ì?¼ ì?¸ì¦? í??ì?¼"
 
-#: ../smime/gui/certificate-manager.c:489
+#: ../smime/gui/certificate-manager.c:497
 msgid "E-Mail Address"
 msgstr "ì ?ì??ë©?ì?¼ ì£¼ì??"
 
-#: ../smime/gui/certificate-manager.c:613
+#: ../smime/gui/certificate-manager.c:620
 msgid "All CA certificate files"
 msgstr "ëª¨ë?  CA ì?¸ì¦?ì?? í??ì?¼"
 
@@ -21083,7 +20053,7 @@ msgstr ""
 "ì?´ë?¤ ëª©ì ?ì?´ë?  ì?´ ì?¸ì¦?ê¸°ê´?ì?? ì? ë¢°í??ê¸° ì ?ì??, ê·¸ ì?¸ì¦?ì??ì?? ì ?ì±?ê³¼ (ì??ë?¤ë©´) í??ë¡?ì??"
 "ì ?ë¥¼ í??ì?¸í?´ì?¼ í?©ë??ë?¤."
 
-#: ../smime/gui/smime-ui.glade.h:14 ../smime/lib/e-cert.c:1060
+#: ../smime/gui/smime-ui.glade.h:14 ../smime/lib/e-cert.c:1058
 msgid "Certificate"
 msgstr "ì?¸ì¦?ì??"
 
@@ -21160,11 +20130,11 @@ msgstr "ì??ì?? êµ¬ë¶? (Organizational Unit, OU)"
 msgid "SHA1 Fingerprint"
 msgstr "SHA1 í??ê±°í??ë¦°í?¸"
 
-#: ../smime/gui/smime-ui.glade.h:35 ../smime/lib/e-cert.c:802
+#: ../smime/gui/smime-ui.glade.h:35 ../smime/lib/e-cert.c:800
 msgid "SSL Client Certificate"
 msgstr "SSL í?´ë?¼ì?´ì?¸í?¸ ì?¸ì¦?ì??"
 
-#: ../smime/gui/smime-ui.glade.h:36 ../smime/lib/e-cert.c:806
+#: ../smime/gui/smime-ui.glade.h:36 ../smime/lib/e-cert.c:804
 msgid "SSL Server Certificate"
 msgstr "SSL ì??ë²? ì?¸ì¦?ì??"
 
@@ -21210,7 +20180,7 @@ msgid "_Edit CA Trust"
 msgstr "ì?¸ì¦? ê¸°ê´? ì? ë¢°ì??ì¤? í?¸ì§?(_E)"
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:656
+#: ../smime/lib/e-cert-db.c:652
 msgid "Certificate already exists"
 msgstr "ì?¸ì¦?ì??ê°? ì?´ë¯¸ ì??ì?µë??ë?¤"
 
@@ -21219,161 +20189,161 @@ msgid "%d/%m/%Y"
 msgstr "%Y/%m/%d"
 
 #. x509 certificate usage types
-#: ../smime/lib/e-cert.c:408
+#: ../smime/lib/e-cert.c:407
 msgid "Sign"
 msgstr "ì??ëª?"
 
-#: ../smime/lib/e-cert.c:409
+#: ../smime/lib/e-cert.c:408
 msgid "Encrypt"
 msgstr "ì??í?¸í??"
 
-#: ../smime/lib/e-cert.c:514
+#: ../smime/lib/e-cert.c:513
 msgid "Version"
 msgstr "ë²?ì ?"
 
-#: ../smime/lib/e-cert.c:529
+#: ../smime/lib/e-cert.c:528
 msgid "Version 1"
 msgstr "ë²?ì ? 1"
 
-#: ../smime/lib/e-cert.c:532
+#: ../smime/lib/e-cert.c:531
 msgid "Version 2"
 msgstr "ë²?ì ? 2"
 
-#: ../smime/lib/e-cert.c:535
+#: ../smime/lib/e-cert.c:534
 msgid "Version 3"
 msgstr "ë²?ì ? 3"
 
-#: ../smime/lib/e-cert.c:617
+#: ../smime/lib/e-cert.c:616
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr "PKCS #1 MD2, RSA ì??í?¸í??"
 
-#: ../smime/lib/e-cert.c:620
+#: ../smime/lib/e-cert.c:619
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr "PKCS #1 MD5, RSA ì??í?¸í??"
 
-#: ../smime/lib/e-cert.c:623
+#: ../smime/lib/e-cert.c:622
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "PKCS #1 SHA-1, RSA ì??í?¸í??"
 
-#: ../smime/lib/e-cert.c:650
+#: ../smime/lib/e-cert.c:649
 msgid "PKCS #1 RSA Encryption"
 msgstr "PKCS #1 RSA ì??í?¸í??"
 
-#: ../smime/lib/e-cert.c:653
+#: ../smime/lib/e-cert.c:652
 msgid "Certificate Key Usage"
 msgstr "ì?¸ì¦?ì?? í?¤ ì?©ë??"
 
-#: ../smime/lib/e-cert.c:656
+#: ../smime/lib/e-cert.c:655
 msgid "Netscape Certificate Type"
 msgstr "ë?·ì?¤ì¼?ì?´í?? ì?¸ì¦?ì?? í??ì??"
 
-#: ../smime/lib/e-cert.c:659
+#: ../smime/lib/e-cert.c:658
 msgid "Certificate Authority Key Identifier"
 msgstr "ì?¸ì¦? ê¸°ê´? í?¤ ID"
 
-#: ../smime/lib/e-cert.c:671
+#: ../smime/lib/e-cert.c:670
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "ì?¤ë¸?ì ?í?¸ ID (%s)"
 
-#: ../smime/lib/e-cert.c:722
+#: ../smime/lib/e-cert.c:720
 msgid "Algorithm Identifier"
 msgstr "ì??ê³ ë¦¬ì¦? ID"
 
-#: ../smime/lib/e-cert.c:730
+#: ../smime/lib/e-cert.c:728
 msgid "Algorithm Parameters"
 msgstr "ì??ê³ ë¦¬ì¦? ì?¸ì??"
 
-#: ../smime/lib/e-cert.c:752
+#: ../smime/lib/e-cert.c:750
 msgid "Subject Public Key Info"
 msgstr "ì??ì? ì?? ê³µê°? í?¤ ì ?ë³´"
 
-#: ../smime/lib/e-cert.c:757
+#: ../smime/lib/e-cert.c:755
 msgid "Subject Public Key Algorithm"
 msgstr "ì??ì? ì?? ê³µê°? í?¤ ì??ê³ ë¦¬ì¦?"
 
-#: ../smime/lib/e-cert.c:772
+#: ../smime/lib/e-cert.c:770
 msgid "Subject's Public Key"
 msgstr "ì??ì? ì??ì?? ê³µê°? í?¤"
 
-#: ../smime/lib/e-cert.c:793 ../smime/lib/e-cert.c:842
+#: ../smime/lib/e-cert.c:791 ../smime/lib/e-cert.c:840
 msgid "Error: Unable to process extension"
 msgstr "ì?¤ë¥?: ì¶?ê°? í?ëª©ì?? ì²?ë¦¬í?  ì?? ì??ì?µë??ë?¤"
 
-#: ../smime/lib/e-cert.c:814 ../smime/lib/e-cert.c:826
+#: ../smime/lib/e-cert.c:812 ../smime/lib/e-cert.c:824
 msgid "Object Signer"
 msgstr "ì?¤ë¸?ì ?í?¸ ì??ëª?ì??"
 
-#: ../smime/lib/e-cert.c:818
+#: ../smime/lib/e-cert.c:816
 msgid "SSL Certificate Authority"
 msgstr "SSL ì?¸ì¦? ê¸°ê´?"
 
-#: ../smime/lib/e-cert.c:822
+#: ../smime/lib/e-cert.c:820
 msgid "Email Certificate Authority"
 msgstr "ì ?ì??ë©?ì?¼ ì?¸ì¦? ê¸°ê´?"
 
-#: ../smime/lib/e-cert.c:850
+#: ../smime/lib/e-cert.c:848
 msgid "Signing"
 msgstr "ì??ëª?"
 
-#: ../smime/lib/e-cert.c:854
+#: ../smime/lib/e-cert.c:852
 msgid "Non-repudiation"
 msgstr "ê±°ë¶?í?  ì?? ì??ì??"
 
-#: ../smime/lib/e-cert.c:858
+#: ../smime/lib/e-cert.c:856
 msgid "Key Encipherment"
 msgstr "í?¤ ì??í?¸í??"
 
-#: ../smime/lib/e-cert.c:862
+#: ../smime/lib/e-cert.c:860
 msgid "Data Encipherment"
 msgstr "ë?°ì?´í?° ì??í?¸í??"
 
-#: ../smime/lib/e-cert.c:866
+#: ../smime/lib/e-cert.c:864
 msgid "Key Agreement"
 msgstr "í?¤ ê³?ì?½"
 
-#: ../smime/lib/e-cert.c:870
+#: ../smime/lib/e-cert.c:868
 msgid "Certificate Signer"
 msgstr "ì?¸ì¦?ì?? ì??ëª?ì??"
 
-#: ../smime/lib/e-cert.c:874
+#: ../smime/lib/e-cert.c:872
 msgid "CRL Signer"
 msgstr "CRL ì??ëª?ì??"
 
-#: ../smime/lib/e-cert.c:922
+#: ../smime/lib/e-cert.c:920
 msgid "Critical"
 msgstr "ì¤?ì??í?¨"
 
-#: ../smime/lib/e-cert.c:924 ../smime/lib/e-cert.c:927
+#: ../smime/lib/e-cert.c:922 ../smime/lib/e-cert.c:925
 msgid "Not Critical"
 msgstr "ì¤?ì??í??ì§? ì??ì??"
 
-#: ../smime/lib/e-cert.c:948
+#: ../smime/lib/e-cert.c:946
 msgid "Extensions"
 msgstr "í??ì?¥ ê¸°ë?¥"
 
-#: ../smime/lib/e-cert.c:1019
+#: ../smime/lib/e-cert.c:1017
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: ../smime/lib/e-cert.c:1075 ../smime/lib/e-cert.c:1195
+#: ../smime/lib/e-cert.c:1072 ../smime/lib/e-cert.c:1192
 msgid "Certificate Signature Algorithm"
 msgstr "ì?¸ì¦?ì?? ì??ëª? ì??ê³ ë¦¬ì¦?"
 
-#: ../smime/lib/e-cert.c:1084
+#: ../smime/lib/e-cert.c:1081
 msgid "Issuer"
 msgstr "ë°?ê¸?ì??"
 
-#: ../smime/lib/e-cert.c:1138
+#: ../smime/lib/e-cert.c:1135
 msgid "Issuer Unique ID"
 msgstr "ë°?ê¸?ì?? ê³ ì?  ID"
 
-#: ../smime/lib/e-cert.c:1157
+#: ../smime/lib/e-cert.c:1154
 msgid "Subject Unique ID"
 msgstr "ì??ì? ì?? ê³ ì?  ID"
 
-#: ../smime/lib/e-cert.c:1200
+#: ../smime/lib/e-cert.c:1197
 msgid "Certificate Signature Value"
 msgstr "ì?¸ì¦?ì?? ì??ëª? ê°?"
 
@@ -21537,7 +20507,7 @@ msgstr "ì? í??í?? ì?°ë?½ì²?ë¥¼ VCardë¡? ì ?ì?¥í?©ë??ë?¤"
 msgid "Save the contacts of the selected folder as VCard"
 msgstr "ì? í??í?? í?´ë??ì?? ì?°ë?½ì²?ë¥¼ VCardë¡? ì ?ì?¥í?©ë??ë?¤"
 
-#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2721
+#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2719
 msgid "Select All"
 msgstr "ëª¨ë?? ì? í??"
 
@@ -21677,7 +20647,7 @@ msgid "Month"
 msgstr "í?? ë?¬"
 
 #: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:58
-#: ../widgets/misc/e-calendar.c:195
+#: ../widgets/misc/e-calendar.c:193
 msgid "Next"
 msgstr "ë?¤ì??"
 
@@ -21685,8 +20655,8 @@ msgstr "ë?¤ì??"
 msgid "Previews the calendar to be printed"
 msgstr "ì?¸ì??í?  ë?¬ë ¥ì?? ë¯¸ë¦¬ ë´?ë??ë?¤"
 
-#: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:74
-#: ../widgets/misc/e-calendar.c:171
+#: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:70
+#: ../widgets/misc/e-calendar.c:169
 msgid "Previous"
 msgstr "ì?´ì ?"
 
@@ -21776,7 +20746,7 @@ msgstr "ë©?ì?¼ì?? ì ?ì?¥í??ë?? ì?? í?´ë??ë¥¼ ë§?ë?ë??ë?¤"
 
 #: ../ui/evolution-mail-global.xml.h:5
 msgid "Create or edit Search Folder definitions"
-msgstr "ì°¾ê¸° í?´ë?? ì ?ì??ë¥¼ ë§?ë?¤ê±°ë?? í?¸ì§?í?©ë??ë?¤"
+msgstr "ê²?ì?? í?´ë?? ì ?ì??ë¥¼ ë§?ë?¤ê±°ë?? í?¸ì§?í?©ë??ë?¤"
 
 #: ../ui/evolution-mail-global.xml.h:6
 msgid "Create or edit rules for filtering new mail"
@@ -21805,7 +20775,7 @@ msgstr "ëª¨ë?  í?´ë??ì?? ì?ì ?í?? ë©?ì??ì§?ë¥¼ ì??ì ?í?? ì ?ê±°í?©ë??ë?¤"
 
 #: ../ui/evolution-mail-global.xml.h:13
 msgid "Search F_olders"
-msgstr "ì°¾ê¸° í?´ë??(_O)"
+msgstr "ê²?ì?? í?´ë??(_O)"
 
 #: ../ui/evolution-mail-global.xml.h:14
 msgid "Show Message _Preview"
@@ -21837,7 +20807,7 @@ msgstr "í?´ë?? ë³µì?¬(_C)..."
 
 #: ../ui/evolution-mail-global.xml.h:23
 msgid "_Download Messages for Offline Usage"
-msgstr "ì?¤í??ë?¼ì?¸ ì?¬ì?© ì?©ë??ë¡? ë©?ì??ì§? ë?¤ì?´ë¡?ë??(_D)"
+msgstr "ì?¤í??ë?¼ì?¸ ì?©ë??ë¡? ë©?ì??ì§? ë?¤ì?´ë¡?ë??(_D)"
 
 #: ../ui/evolution-mail-global.xml.h:25
 msgid "_Message Filters"
@@ -21996,7 +20966,7 @@ msgstr "ì?°ê´?ë?? ë©?ì??ì§? ëª©ë¡?"
 msgid "_Group By Threads"
 msgstr "ê¸?í??ë??ë¡? ë¬¶ì??(_G)"
 
-#: ../ui/evolution-mail-list.xml.h:37 ../ui/evolution-mail-message.xml.h:115
+#: ../ui/evolution-mail-list.xml.h:37 ../ui/evolution-mail-message.xml.h:111
 #: ../ui/evolution-mail-messagedisplay.xml.h:7
 msgid "_Message"
 msgstr "ë©?ì??ì§?(_M)"
@@ -22056,19 +21026,19 @@ msgstr "ê·?ì¹? ë§?ë?¤ê¸°(_U)"
 
 #: ../ui/evolution-mail-message.xml.h:15
 msgid "Create a Search Folder for these recipients"
-msgstr "ì?´ ë°?ë?? ì?¬ë??ì?¼ë¡? ì°¾ê¸° í?´ë??ë¥¼ ë§?ë?ë??ë?¤"
+msgstr "ì?´ ë°?ë?? ì?¬ë??ì?¼ë¡? ê²?ì?? í?´ë??ë¥¼ ë§?ë?ë??ë?¤"
 
 #: ../ui/evolution-mail-message.xml.h:16
 msgid "Create a Search Folder for this mailing list"
-msgstr "ì?´ ë©?ì?¼ë§? ë¦¬ì?¤í?¸ë¡? ì°¾ê¸° í?´ë??ë¥¼ ë§?ë?ë??ë?¤"
+msgstr "ì?´ ë©?ì?¼ë§? ë¦¬ì?¤í?¸ë¡? ê²?ì?? í?´ë??ë¥¼ ë§?ë?ë??ë?¤"
 
 #: ../ui/evolution-mail-message.xml.h:17
 msgid "Create a Search Folder for this sender"
-msgstr "ì?´ ë³´ë?¸ ì?¬ë??ì?¼ë¡? ì°¾ê¸° í?´ë??ë¥¼ ë§?ë?ë??ë?¤"
+msgstr "ì?´ ë³´ë?¸ ì?¬ë??ì?¼ë¡? ê²?ì?? í?´ë??ë¥¼ ë§?ë?ë??ë?¤"
 
 #: ../ui/evolution-mail-message.xml.h:18
 msgid "Create a Search Folder for this subject"
-msgstr "ì?´ ì ?ëª©ì?¼ë¡? ì°¾ê¸° í?´ë??ë¥¼ ë§?ë?ë??ë?¤"
+msgstr "ì?´ ì ?ëª©ì?¼ë¡? ê²?ì?? í?´ë??ë¥¼ ë§?ë?ë??ë?¤"
 
 #: ../ui/evolution-mail-message.xml.h:19
 msgid "Create a rule to filter messages from this sender"
@@ -22253,206 +21223,184 @@ msgstr "ì?½ì§? ì??ì?? ì?´ì ? ë©?ì??ì§?(_R)"
 msgid "Paste messages from the clipboard"
 msgstr "í?´ë¦½ë³´ë??ì??ì?? ë©?ì??ì§?ë¥¼ ë¶?ì?¬ ë?£ì?µë??ë?¤"
 
-# post -> ê²?ì??, Microsoft Office XP ì°¸ê³ 
 #: ../ui/evolution-mail-message.xml.h:68
-msgid "Pos_t New Message to Folder"
-msgstr "í?´ë??ì?? ì?? ë©?ì??ì§? ê²?ì??(_T)"
-
-# post -> ê²?ì??, Microsoft Office XP ì°¸ê³ 
-#: ../ui/evolution-mail-message.xml.h:69
-msgid "Post a Repl_y"
-msgstr "í??ì?  ê²?ì??(_Y)"
-
-# post -> ê²?ì??, Microsoft Office XP ì°¸ê³ 
-# public -> ê³µì?©, Microsoft Office XP ì°¸ê³ 
-#: ../ui/evolution-mail-message.xml.h:70
-msgid "Post a message to a Public folder"
-msgstr "ë©?ì??ì§?ë¥¼ ê³µì?© í?´ë??ì?? ê²?ì??í?©ë??ë?¤"
-
-# post -> ê²?ì??, Microsoft Office XP ì°¸ê³ 
-# public -> ê³µì?©, Microsoft Office XP ì°¸ê³ 
-#: ../ui/evolution-mail-message.xml.h:71
-msgid "Post a reply to a message in a Public folder"
-msgstr "ê³µì?© í?´ë??ì?? ë©?ì??ì§?ì?? ë??í?´ í??ì? ì?? ê²?ì??í?©ë??ë?¤"
-
-#: ../ui/evolution-mail-message.xml.h:72
 msgid "Pr_evious Important Message"
 msgstr "ì?´ì ?ì?? ì¤?ì??í?? ë©?ì??ì§?(_E)"
 
-#: ../ui/evolution-mail-message.xml.h:73
+#: ../ui/evolution-mail-message.xml.h:69
 msgid "Preview the message to be printed"
 msgstr "ì?¸ì??í?  ë©?ì??ì§?ë¥¼ ë¯¸ë¦¬ë´?ë??ë?¤"
 
-#: ../ui/evolution-mail-message.xml.h:77
+#: ../ui/evolution-mail-message.xml.h:73
 msgid "Print this message"
 msgstr "ì?´ ë©?ì??ì§?ë¥¼ ì?¸ì??í?©ë??ë?¤"
 
-#: ../ui/evolution-mail-message.xml.h:78
+#: ../ui/evolution-mail-message.xml.h:74
 msgid "Re_direct"
 msgstr "ì??ì? ë§? ë³?ê²½(_D)"
 
-#: ../ui/evolution-mail-message.xml.h:79
+#: ../ui/evolution-mail-message.xml.h:75
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "ì? í??í?? ë©?ì??ì§?ì?? ì??ì? ì??ë¥¼ ë??êµ°ê°?ë¡? ë³?ê²½í?©ë??ë?¤ (ë°?ì?¡í?©ë??ë?¤)"
 
-#: ../ui/evolution-mail-message.xml.h:84
+#: ../ui/evolution-mail-message.xml.h:80
 msgid "Reset the text to its original size"
 msgstr "ê¸?ì??ë¥¼ ì??ë?? í?¬ê¸°ë¡? ë§?ì¶¥ë??ë?¤"
 
-#: ../ui/evolution-mail-message.xml.h:85
+#: ../ui/evolution-mail-message.xml.h:81
 msgid "Save the selected messages as a text file"
 msgstr "ì? í??í?? ë©?ì??ì§?ë¥¼ í??ì?¤í?¸ í??ì?¼ë¡? ì ?ì?¥í?©ë??ë?¤"
 
-#: ../ui/evolution-mail-message.xml.h:86
+#: ../ui/evolution-mail-message.xml.h:82
 msgid "Search Folder from Mailing _List..."
-msgstr "ë©?ì?¼ë§? ë¦¬ì?¤í?¸ì?? ë??í?? ì°¾ê¸° í?´ë??(_L)..."
+msgstr "ë©?ì?¼ë§? ë¦¬ì?¤í?¸ì?? ë??í?? ê²?ì?? í?´ë??(_L)..."
 
-#: ../ui/evolution-mail-message.xml.h:87
+#: ../ui/evolution-mail-message.xml.h:83
 msgid "Search Folder from Recipien_ts..."
-msgstr "ë°?ë?? ì?¬ë??ì?? ë??í?? ì°¾ê¸° í?´ë??(_T)..."
+msgstr "ë°?ë?? ì?¬ë??ì?? ë??í?? ê²?ì?? í?´ë??(_T)..."
 
-#: ../ui/evolution-mail-message.xml.h:88
+#: ../ui/evolution-mail-message.xml.h:84
 msgid "Search Folder from S_ubject..."
-msgstr "ì ?ëª©ì?? ë??í?? ì°¾ê¸° í?´ë??(_U)..."
+msgstr "ì ?ëª©ì?? ë??í?? ê²?ì?? í?´ë??(_U)..."
 
-#: ../ui/evolution-mail-message.xml.h:89
+#: ../ui/evolution-mail-message.xml.h:85
 msgid "Search Folder from Sen_der..."
-msgstr "ë³´ë?¸ ì?¬ë??ì?? ë??í?? ì°¾ê¸° í?´ë??(_D)..."
+msgstr "ë³´ë?¸ ì?¬ë??ì?? ë??í?? ê²?ì?? í?´ë??(_D)..."
 
-#: ../ui/evolution-mail-message.xml.h:90
+#: ../ui/evolution-mail-message.xml.h:86
 msgid "Search for text in the body of the displayed message"
 msgstr "ë³´ì?´ë?? ë©?ì??ì§?ì?? ë³¸ë¬¸ì??ì?? í??ì?¤í?¸ë¥¼ ì°¾ì?µë??ë?¤"
 
-#: ../ui/evolution-mail-message.xml.h:91
+#: ../ui/evolution-mail-message.xml.h:87
 msgid "Select _All Text"
 msgstr "ëª¨ë?  í??ì?¤í?¸ ì? í??(_A)"
 
-#: ../ui/evolution-mail-message.xml.h:92
+#: ../ui/evolution-mail-message.xml.h:88
 msgid "Select all the text in a message"
 msgstr "ë©?ì??ì§?ì?? ëª¨ë?  í??ì?¤í?¸ë¥¼ ì? í??í?©ë??ë?¤"
 
-#: ../ui/evolution-mail-message.xml.h:93 ../ui/evolution.xml.h:27
+#: ../ui/evolution-mail-message.xml.h:89 ../ui/evolution.xml.h:27
 msgid "Set up the page settings for your current printer"
 msgstr "í??ì?¬ í??ë¦°í?°ì?? í??ì?´ì§? ì?¤ì ?ì?? í?©ë??ë?¤"
 
-#: ../ui/evolution-mail-message.xml.h:94
+#: ../ui/evolution-mail-message.xml.h:90
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "í??ì??í??ë?? ë©?ì??ì§?ì?? ë³¸ë¬¸ ì??ì?? ê¹?ë°?ì?´ë?? ì»¤ì??ë¥¼ í??ì??í?©ë??ë?¤"
 
-#: ../ui/evolution-mail-message.xml.h:95
+#: ../ui/evolution-mail-message.xml.h:91
 msgid "Show messages with all email headers"
 msgstr "ë©?ì?¼ì?? ëª¨ë?  í?¤ë??ì?? í?¨ê»? ë©?ì??ì§?ë¥¼ ë³´ì?¬ì¤?ë??ë?¤"
 
-#: ../ui/evolution-mail-message.xml.h:96
+#: ../ui/evolution-mail-message.xml.h:92
 msgid "Show the raw email source of the message"
 msgstr "ë©?ì??ì§?ì?? ë©?ì?¼ ì??ì?¤ë¥¼ ë³´ì?¬ì¤?ë??ë?¤"
 
-#: ../ui/evolution-mail-message.xml.h:97
+#: ../ui/evolution-mail-message.xml.h:93
 msgid "Undelete the selected messages"
 msgstr "ì? í??í?? ë©?ì??ì§?ë¥¼ ë??ì?´ë¦½ë??ë?¤"
 
-#: ../ui/evolution-mail-message.xml.h:98
+#: ../ui/evolution-mail-message.xml.h:94
 msgid "Uni_mportant"
 msgstr "ì¤?ì??í??ì§? ì??ì??(_M)"
 
-#: ../ui/evolution-mail-message.xml.h:99
+#: ../ui/evolution-mail-message.xml.h:95
 msgid "Zoom _Out"
 msgstr "ì¶?ì??(_O)"
 
-#: ../ui/evolution-mail-message.xml.h:100
+#: ../ui/evolution-mail-message.xml.h:96
 msgid "_Attached"
 msgstr "ì²¨ë¶?(_A)"
 
-#: ../ui/evolution-mail-message.xml.h:101
+#: ../ui/evolution-mail-message.xml.h:97
 msgid "_Caret Mode"
 msgstr "ìº?ë¦¿ ëª¨ë??(_C)"
 
-#: ../ui/evolution-mail-message.xml.h:102
+#: ../ui/evolution-mail-message.xml.h:98
 msgid "_Clear Flag"
 msgstr "í??ë??ê·¸ ì§?ì?°ê¸°(_C)"
 
-#: ../ui/evolution-mail-message.xml.h:105
+#: ../ui/evolution-mail-message.xml.h:101
 msgid "_Delete Message"
 msgstr "ë©?ì??ì§? ì?ì ?(_D)"
 
-#: ../ui/evolution-mail-message.xml.h:107
+#: ../ui/evolution-mail-message.xml.h:103
 msgid "_Find in Message..."
 msgstr "ë©?ì??ì§?ì??ì?? ì°¾ê¸°(_F)..."
 
-#: ../ui/evolution-mail-message.xml.h:108
+#: ../ui/evolution-mail-message.xml.h:104
 msgid "_Flag Completed"
 msgstr "í??ë??ê·¸ ì??ë£?(_F)"
 
-#: ../ui/evolution-mail-message.xml.h:110
+#: ../ui/evolution-mail-message.xml.h:106
 msgid "_Go To"
 msgstr "ì?´ë??(_G)"
 
-#: ../ui/evolution-mail-message.xml.h:111
+#: ../ui/evolution-mail-message.xml.h:107
 msgid "_Important"
 msgstr "ì¤?ì??(_I)"
 
-#: ../ui/evolution-mail-message.xml.h:112
+#: ../ui/evolution-mail-message.xml.h:108
 msgid "_Inline"
 msgstr "í?¬í?¨(_I)"
 
-#: ../ui/evolution-mail-message.xml.h:113
+#: ../ui/evolution-mail-message.xml.h:109
 msgid "_Junk"
 msgstr "ì ?í?¬ë©?ì?¼(_J)"
 
-#: ../ui/evolution-mail-message.xml.h:114
+#: ../ui/evolution-mail-message.xml.h:110
 msgid "_Load Images"
 msgstr "ê·¸ë¦¼ ì?½ì?´ë?¤ì?´ê¸°(_L)"
 
-#: ../ui/evolution-mail-message.xml.h:116
+#: ../ui/evolution-mail-message.xml.h:112
 msgid "_Message Source"
 msgstr "ë©?ì??ì§? ì??ë³¸(_M)"
 
-#: ../ui/evolution-mail-message.xml.h:118
+#: ../ui/evolution-mail-message.xml.h:114
 msgid "_Next Message"
 msgstr "ë?¤ì?? ë©?ì??ì§?(_N)"
 
-#: ../ui/evolution-mail-message.xml.h:119
+#: ../ui/evolution-mail-message.xml.h:115
 msgid "_Normal Size"
 msgstr "ë³´í?µ í?¬ê¸°(_N)"
 
-#: ../ui/evolution-mail-message.xml.h:120
+#: ../ui/evolution-mail-message.xml.h:116
 msgid "_Not Junk"
 msgstr "ì ?í?¬ë©?ì?¼ ì??ë??(_N)"
 
-#: ../ui/evolution-mail-message.xml.h:121
+#: ../ui/evolution-mail-message.xml.h:117
 msgid "_Open in New Window"
 msgstr "ì?? ì°½ì??ì?? ì?´ê¸°(_O)"
 
-#: ../ui/evolution-mail-message.xml.h:122
+#: ../ui/evolution-mail-message.xml.h:118
 msgid "_Previous Message"
 msgstr "ì?´ì ? ë©?ì??ì§?(_P)"
 
-#: ../ui/evolution-mail-message.xml.h:124
+#: ../ui/evolution-mail-message.xml.h:120
 msgid "_Quoted"
 msgstr "ì?¸ì?©(_Q)"
 
 #. Translators: "Read" as in "has been read" (evolution-mail-message.xml)
-#: ../ui/evolution-mail-message.xml.h:126
+#: ../ui/evolution-mail-message.xml.h:122
 msgid "_Read"
 msgstr "ì?½ê¸°(_R)"
 
-#: ../ui/evolution-mail-message.xml.h:128
+#: ../ui/evolution-mail-message.xml.h:124
 msgid "_Save Message..."
 msgstr "ë©?ì??ì§? ì ?ì?¥(_S)..."
 
-#: ../ui/evolution-mail-message.xml.h:129
+#: ../ui/evolution-mail-message.xml.h:125
 msgid "_Undelete Message"
 msgstr "ë©?ì??ì§? ë??ì?´ë¦¬ê¸°(_U)"
 
-#: ../ui/evolution-mail-message.xml.h:130
+#: ../ui/evolution-mail-message.xml.h:126
 msgid "_Unread"
 msgstr "ì?½ê¸° ì·¨ì??(_U)"
 
-#: ../ui/evolution-mail-message.xml.h:131
+#: ../ui/evolution-mail-message.xml.h:127
 msgid "_Zoom"
 msgstr "í??ë??/ì¶?ì??(_Z)"
 
-#: ../ui/evolution-mail-message.xml.h:132
+#: ../ui/evolution-mail-message.xml.h:128
 msgid "_Zoom In"
 msgstr "í??ë??(_Z)"
 
@@ -22726,7 +21674,7 @@ msgstr "ë??ë?´ê¸°(_Q)"
 
 #: ../ui/evolution.xml.h:52
 msgid "_Switcher Appearance"
-msgstr "ì ?í??ë²?í?¼ ëª¨ì??(_S)"
+msgstr "ì ?í?? ë?¨ì¶? ëª¨ì??(_S)"
 
 #: ../ui/evolution.xml.h:53
 msgid "_Synchronization Options..."
@@ -22813,11 +21761,11 @@ msgid "With _Status"
 msgstr "ì??í?? í?¬í?¨(_S)"
 
 #. Put the "UTC" entry at the top of the combo's list.
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:234
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:431
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:433
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:435
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:784
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:227
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:428
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:430
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:432
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:771
 msgid "UTC"
 msgstr "UTC"
 
@@ -22846,19 +21794,19 @@ msgstr ""
 "ì?¼ìª½ ë§?ì?°ì?¤ ë?¨ì¶?ë¡? ì§?ë??ì??ì?? í?¹ì ? ì§?ì?ì?? í??ë??í?? ë?¤ì?? ì??ê°?ë??ë¥¼ ì? í??í??ì?ì??ì?¤.\n"
 "ì?¤ë¥¸ìª½ ë§?ì?°ì?¤ ë?¨ì¶?ë¡? ì¶?ì??í?©ë??ë?¤."
 
-#: ../widgets/menus/gal-define-views-dialog.c:76
+#: ../widgets/menus/gal-define-views-dialog.c:74
 #: ../widgets/menus/gal-define-views-model.c:185
 msgid "Collection"
 msgstr "ëª¨ì??"
 
-#: ../widgets/menus/gal-define-views-dialog.c:358
+#: ../widgets/menus/gal-define-views-dialog.c:356
 #: ../widgets/menus/gal-define-views.glade.h:4
 #, no-c-format
 msgid "Define Views for %s"
 msgstr "%sì?? ë??í?? ë·° ì ?ì??"
 
+#: ../widgets/menus/gal-define-views-dialog.c:364
 #: ../widgets/menus/gal-define-views-dialog.c:366
-#: ../widgets/menus/gal-define-views-dialog.c:368
 msgid "Define Views"
 msgstr "ë·° ì ?ì??"
 
@@ -22868,18 +21816,17 @@ msgid "Define Views for \"%s\""
 msgstr "\"%s\"ì?? ë??í?? ë·° ì ?ì??"
 
 #: ../widgets/menus/gal-view-factory-etable.c:37
-#: ../widgets/table/e-table-header-item.c:1921
 #: ../widgets/table/e-table-scrolled.c:215
 #: ../widgets/table/e-table-scrolled.c:216
 msgid "Table"
 msgstr "ë??í??"
 
 # NOTE: ê²?ì?¼ë¡? ë??ì?¤ë?? ë²?ì?ì?´ ì??ë??ë¯?ë¡? ë²?ì?ì?´ ë³?ë¡? ì??ë¯¸ì??ì??.  viewì?? instance.
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:225
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:223
 msgid "Instance"
 msgstr "ì?¸ì?¤í?´ì?¤"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:283
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:281
 msgid "Save Current View"
 msgstr "í??ì?¬ ë·° ì ?ì?¥"
 
@@ -22892,17 +21839,17 @@ msgid "_Replace existing view"
 msgstr "í??ì?¬ ë·° ë°?ê¾¸ê¸°(_R)"
 
 #. bonobo displays this string so it must be in locale
-#: ../widgets/menus/gal-view-instance.c:581
-#: ../widgets/menus/gal-view-menus.c:367
+#: ../widgets/menus/gal-view-instance.c:580
+#: ../widgets/menus/gal-view-menus.c:365
 msgid "Custom View"
 msgstr "ì?¬ì?©ì?? ë³´ê¸°"
 
-#: ../widgets/menus/gal-view-instance.c:582
+#: ../widgets/menus/gal-view-instance.c:581
 msgid "Save Custom View"
 msgstr "ì?¬ì?©ì?? ë³´ê¸° ì ?ì?¥"
 
-#: ../widgets/menus/gal-view-instance.c:586
-#: ../widgets/menus/gal-view-menus.c:391
+#: ../widgets/menus/gal-view-instance.c:585
+#: ../widgets/menus/gal-view-menus.c:388
 msgid "Define Views..."
 msgstr "ë³´ê¸° ì§?ì ?..."
 
@@ -22910,32 +21857,32 @@ msgstr "ë³´ê¸° ì§?ì ?..."
 msgid "C_urrent View"
 msgstr "í??ì?¬ ë³´ê¸°(_U)"
 
-#: ../widgets/menus/gal-view-menus.c:328
+#: ../widgets/menus/gal-view-menus.c:327
 #, c-format
 msgid "Select View: %s"
 msgstr "ë³´ê¸° ì? í??: %s"
 
-#: ../widgets/menus/gal-view-menus.c:372
+#: ../widgets/menus/gal-view-menus.c:370
 msgid "Current view is a customized view"
 msgstr "í??ì?¬ ë³´ê¸°ë?? ì?¬ì?©ì?? ì ?ì?? ë³´ê¸°ì??ë??ë?¤"
 
-#: ../widgets/menus/gal-view-menus.c:377
+#: ../widgets/menus/gal-view-menus.c:374
 msgid "Save Custom View..."
 msgstr "ì?¬ì?©ì?? ë³´ê¸° ì ?ì?¥..."
 
-#: ../widgets/menus/gal-view-menus.c:382
+#: ../widgets/menus/gal-view-menus.c:379
 msgid "Save current custom view"
 msgstr "í??ì?¬ ì?¬ì?©ì?? ë³´ê¸° ì ?ì?¥"
 
-#: ../widgets/menus/gal-view-menus.c:396
+#: ../widgets/menus/gal-view-menus.c:393
 msgid "Create or edit views"
 msgstr "ë³´ê¸° ë§?ë?¤ê¸° ë??ë?? í?¸ì§?"
 
-#: ../widgets/menus/gal-view-new-dialog.c:70
+#: ../widgets/menus/gal-view-new-dialog.c:68
 msgid "Factory"
 msgstr "í?©í? ë¦¬"
 
-#: ../widgets/menus/gal-view-new-dialog.c:105
+#: ../widgets/menus/gal-view-new-dialog.c:103
 msgid "Define New View"
 msgstr "ì?? ë·° ì ?ì??"
 
@@ -22951,64 +21898,164 @@ msgstr "ë·° ì¢?ë¥?"
 msgid "Type of view:"
 msgstr "ë·° ì¢?ë¥?:"
 
-#: ../widgets/misc/e-attachment-bar.c:1132
-msgid "Attachment Bar"
-msgstr "ì²¨ë¶? ëª¨ì??"
+#: ../widgets/misc/e-attachment.c:990
+msgid "Attached message"
+msgstr "ì²¨ë¶?í?? ë©?ì??ì§?"
+
+#. Translators: Default attachment filename.
+#: ../widgets/misc/e-attachment.c:1773 ../widgets/misc/e-attachment.c:2313
+#: ../widgets/misc/e-attachment-store.c:636
+msgid "attachment.dat"
+msgstr "attachment.dat"
+
+#: ../widgets/misc/e-attachment.c:1822 ../widgets/misc/e-attachment.c:2619
+msgid "A load operation is already in progress"
+msgstr "ì?½ì?´ë?¤ì?´ê¸° ë??ì??ì?´ ì?´ë¯¸ ì§?í?? ì¤?ì??ë??ë?¤"
+
+#: ../widgets/misc/e-attachment.c:1830 ../widgets/misc/e-attachment.c:2627
+msgid "A save operation is already in progress"
+msgstr "ì ?ì?¥ ë??ì??ì?´ ì?´ë¯¸ ì§?í?? ì¤?ì??ë??ë?¤"
+
+#: ../widgets/misc/e-attachment.c:1923
+#, c-format
+msgid "Could not load '%s'"
+msgstr "'%s'ì??(ë¥¼) ì?½ì?´ë?¤ì?¼ ì?? ì??ì?µë??ë?¤"
+
+#: ../widgets/misc/e-attachment.c:1926
+#, c-format
+msgid "Could not load the attachment"
+msgstr "ì²¨ë¶?ë¥¼ ì?½ì?´ë?¤ì?¼ ì?? ì??ì?µë??ë?¤"
+
+#: ../widgets/misc/e-attachment.c:2190
+#, c-format
+msgid "Could not open '%s'"
+msgstr "'%s'ì??(ë¥¼) ì?´ ì?? ì??ì?µë??ë?¤"
+
+#: ../widgets/misc/e-attachment.c:2193
+#, c-format
+msgid "Could not open the attachment"
+msgstr "ì²¨ë¶?ë¥¼ ì?´ ì?? ì??ì?µë??ë?¤."
+
+#: ../widgets/misc/e-attachment.c:2635
+msgid "Attachment contents not loaded"
+msgstr "ì²¨ë¶? ë?´ì?©ì?? ì?½ì?´ë?¤ì?´ì§? ì??ì??ì?µë??ë?¤"
 
-#: ../widgets/misc/e-attachment.c:290 ../widgets/misc/e-attachment.c:305
-#: ../widgets/misc/e-attachment.c:590 ../widgets/misc/e-attachment.c:607
+#: ../widgets/misc/e-attachment.c:2712
 #, c-format
-msgid "Cannot attach file %s: %s"
-msgstr "%s í??ì?¼ì?? ì²¨ë¶?í?  ì?? ì??ì?µë??ë?¤: %s"
+msgid "Could not save '%s'"
+msgstr "'%s'ì??(ë¥¼) ì ?ì?¥í?  ì?? ì??ì?µë??ë?¤"
 
-#: ../widgets/misc/e-attachment.c:298 ../widgets/misc/e-attachment.c:599
+#: ../widgets/misc/e-attachment.c:2715
 #, c-format
-msgid "Cannot attach file %s: not a regular file"
-msgstr "%s í??ì?¼ì?? ì²¨ë¶?í?  ì?? ì??ì?µë??ë?¤: ì?¼ë°? í??ì?¼ì?´ ì??ë??ë??ë?¤"
+msgid "Could not save the attachment"
+msgstr "ì²¨ë¶?ë¥¼ ì ?ì?¥í?  ì?? ì??ì?µë??ë?¤"
 
-#: ../widgets/misc/e-attachment.glade.h:1
+#: ../widgets/misc/e-attachment-dialog.c:305
 msgid "Attachment Properties"
 msgstr "ì²¨ë¶? ì??ì?±"
 
-#: ../widgets/misc/e-attachment.glade.h:3
-msgid "File name:"
-msgstr "í??ì?¼ ì?´ë¦?:"
+#: ../widgets/misc/e-attachment-dialog.c:328
+msgid "_Filename:"
+msgstr "í??ì?¼ ì?´ë¦?(_F):"
+
+#: ../widgets/misc/e-attachment-dialog.c:363
+msgid "MIME Type:"
+msgstr "MIME ì¢?ë¥?:"
+
+#: ../widgets/misc/e-attachment-handler-image.c:95
+msgid "Could not set as background"
+msgstr "ë°°ê²½ì?¼ë¡? ì?¤ì ?í?  ì?? ì??ì?µë??ë?¤"
+
+#: ../widgets/misc/e-attachment-handler-sendto.c:87
+msgid "Could not send attachment"
+msgid_plural "Could not send attachments"
+msgstr[0] "ì²¨ë¶?ë¥¼ ë³´ë?¼ ì?? ì??ì?µë??ë?¤."
 
-#: ../widgets/misc/e-attachment.glade.h:4
-msgid "MIME type:"
-msgstr "MIME í??ì??:"
+#: ../widgets/misc/e-attachment-handler-sendto.c:129
+msgid "_Send To..."
+msgstr "ë³´ë?´ê¸°(_S)..."
 
-#: ../widgets/misc/e-attachment.glade.h:5
-msgid "Suggest automatic display of attachment"
-msgstr "ì²¨ë¶? í??ì?¼ì?? ì??ë?? í??ì?? ê¶?í??ê¸°"
+#: ../widgets/misc/e-attachment-handler-sendto.c:131
+msgid "Send the selected attachments somewhere"
+msgstr "ì? í??í?? ì²¨ë¶?ë¥¼ ë?¤ë¥¸ ê³³ì?¼ë¡? ë³´ë??ë??ë?¤"
+
+#: ../widgets/misc/e-attachment-icon-view.c:480
+#: ../widgets/misc/e-attachment-tree-view.c:517
+msgid "Loading"
+msgstr "ì?½ì?´ë?¤ì?´ë?? ì¤?"
+
+#: ../widgets/misc/e-attachment-icon-view.c:492
+#: ../widgets/misc/e-attachment-tree-view.c:529
+msgid "Saving"
+msgstr "ì ?ì?¥í??ë?? ì¤?"
+
+#: ../widgets/misc/e-attachment-paned.c:87
+msgid "Hide _Attachment Bar"
+msgstr "ì²¨ë¶? ëª¨ì?? ì?¨ê¸°ê¸°(_A)"
+
+#: ../widgets/misc/e-attachment-paned.c:89
+#: ../widgets/misc/e-attachment-paned.c:626
+msgid "Show _Attachment Bar"
+msgstr "ì²¨ë¶? ëª¨ì?? ë³´ê¸°(_A)"
+
+#: ../widgets/misc/e-attachment-store.c:541
+msgid "Add Attachment"
+msgstr "ì²¨ë¶? ì¶?ê°?"
+
+#: ../widgets/misc/e-attachment-store.c:544
+msgid "A_ttach"
+msgstr "ì²¨ë¶?(_T)"
+
+#: ../widgets/misc/e-attachment-store.c:607
+msgid "Save Attachment"
+msgid_plural "Save Attachments"
+msgstr[0] "ì²¨ë¶? ì ?ì?¥"
+
+#: ../widgets/misc/e-attachment-view.c:300
+msgid "S_ave All"
+msgstr "ëª¨ë?? ì ?ì?¥(_A)"
+
+#: ../widgets/misc/e-attachment-view.c:326
+msgid "A_dd Attachment..."
+msgstr "ì²¨ë¶?í??ì?¼ ì¶?ê°?(_D)..."
+
+#: ../widgets/misc/e-attachment-view.c:643
+#, c-format
+msgid "Open with \"%s\""
+msgstr "\"%s\"ì??ì?? ì?´ê¸°"
+
+#: ../widgets/misc/e-attachment-view.c:646
+#, c-format
+msgid "Open this attachment in %s"
+msgstr "ì?´ ì²¨ë¶?ë¥¼ \"%s\"ì??ì?? ì?´ê¸°"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1267
+#: ../widgets/misc/e-calendar-item.c:1253
 msgid "%B %Y"
 msgstr "%Yë?? %B"
 
-#: ../widgets/misc/e-calendar.c:220
+#: ../widgets/misc/e-calendar.c:217
 msgid "Month Calendar"
 msgstr "ë?¬ë³? ë?¬ë ¥"
 
 #: ../widgets/misc/e-canvas-background.c:454
-#: ../widgets/misc/e-canvas-background.c:455 ../widgets/text/e-text.c:3641
-#: ../widgets/text/e-text.c:3642
+#: ../widgets/misc/e-canvas-background.c:455 ../widgets/text/e-text.c:3632
+#: ../widgets/text/e-text.c:3633
 msgid "Fill color"
 msgstr "ì±?ì?°ê¸° ì??"
 
 #: ../widgets/misc/e-canvas-background.c:461
 #: ../widgets/misc/e-canvas-background.c:462
 #: ../widgets/misc/e-canvas-background.c:468
-#: ../widgets/misc/e-canvas-background.c:469 ../widgets/text/e-text.c:3648
-#: ../widgets/text/e-text.c:3649 ../widgets/text/e-text.c:3656
-#: ../widgets/text/e-text.c:3657
+#: ../widgets/misc/e-canvas-background.c:469 ../widgets/text/e-text.c:3639
+#: ../widgets/text/e-text.c:3640 ../widgets/text/e-text.c:3646
+#: ../widgets/text/e-text.c:3647
 msgid "GDK fill color"
 msgstr "GDK ì±?ì?°ê¸° ì??"
 
 #: ../widgets/misc/e-canvas-background.c:475
-#: ../widgets/misc/e-canvas-background.c:476 ../widgets/text/e-text.c:3663
-#: ../widgets/text/e-text.c:3664
+#: ../widgets/misc/e-canvas-background.c:476 ../widgets/text/e-text.c:3653
+#: ../widgets/text/e-text.c:3654
 msgid "Fill stipple"
 msgstr "ì?¤í?°í?? ì±?ì?°ê¸°"
 
@@ -23032,26 +22079,25 @@ msgstr "Y1"
 msgid "Y2"
 msgstr "Y2"
 
-#: ../widgets/misc/e-canvas-vbox.c:91 ../widgets/misc/e-reflow.c:1417
-#: ../widgets/table/e-table-group-container.c:1004
+#: ../widgets/misc/e-canvas-vbox.c:89 ../widgets/misc/e-reflow.c:1414
+#: ../widgets/table/e-table-group-container.c:1001
 #: ../widgets/table/e-table-group-leaf.c:649
-#: ../widgets/table/e-table-item.c:3070
+#: ../widgets/table/e-table-item.c:3062
 msgid "Minimum width"
 msgstr "ìµ?ì?? ë??ë¹?"
 
-#: ../widgets/misc/e-canvas-vbox.c:92 ../widgets/misc/e-reflow.c:1418
-#: ../widgets/table/e-table-group-container.c:1005
+#: ../widgets/misc/e-canvas-vbox.c:90 ../widgets/misc/e-reflow.c:1415
+#: ../widgets/table/e-table-group-container.c:1002
 #: ../widgets/table/e-table-group-leaf.c:650
-#: ../widgets/table/e-table-item.c:3071
+#: ../widgets/table/e-table-item.c:3063
 msgid "Minimum Width"
 msgstr "ìµ?ì?? ë??ë¹?"
 
-#: ../widgets/misc/e-canvas-vbox.c:103 ../widgets/misc/e-canvas-vbox.c:104
-#: ../widgets/misc/e-expander.c:206
+#: ../widgets/misc/e-canvas-vbox.c:101 ../widgets/misc/e-canvas-vbox.c:102
 msgid "Spacing"
 msgstr "ê³µë°±"
 
-#: ../widgets/misc/e-cell-date-edit.c:289
+#: ../widgets/misc/e-cell-date-edit.c:296
 msgid "Now"
 msgstr "í??ì?¬"
 
@@ -23060,7 +22106,7 @@ msgstr "í??ì?¬"
 msgid "The time must be in the format: %s"
 msgstr "ì??ê°?ì?? ë?¤ì??ê³¼ ê°?ì?? í??ì??ì?´ì?´ì?¼ í?©ë??ë?¤: %s"
 
-#: ../widgets/misc/e-cell-percent.c:77
+#: ../widgets/misc/e-cell-percent.c:76
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "í?¼ì?¼í?¸ ê°?ì?? 0ê³¼ 100ì?? í?¬í?¨í??ì?¬ ê·¸ ì?¬ì?´ì?´ì?¼ í?©ë??ë?¤."
 
@@ -23159,145 +22205,90 @@ msgstr "ê·¸ ì?¸..."
 msgid "Ch_aracter Encoding"
 msgstr "ë¬¸ì?? ì?¸ì½?ë?©(_A)"
 
-#: ../widgets/misc/e-dateedit.c:303
+#: ../widgets/misc/e-dateedit.c:295
 msgid "Date and Time"
 msgstr "ë? ì§? ë°? ì??ê°?"
 
-#: ../widgets/misc/e-dateedit.c:324
+#: ../widgets/misc/e-dateedit.c:315
 msgid "Text entry to input date"
 msgstr "ë? ì§? ì??ë ¥í??ë?? í??ì?¤í?¸ ì??í?¸ë¦¬"
 
-#: ../widgets/misc/e-dateedit.c:346
+#: ../widgets/misc/e-dateedit.c:337
 msgid "Click this button to show a calendar"
 msgstr "ë?¬ë ¥ì?? ë³´ë ¤ë©´ ë?¨ì¶?ë¥¼ ë??ë¥´ì?ì??ì?¤"
 
-#: ../widgets/misc/e-dateedit.c:388
+#: ../widgets/misc/e-dateedit.c:379
 msgid "Drop-down combination box to select time"
 msgstr "ì??ê°?ì?? ì? í??í??ë?? ë??ë¡ë?¤ì?´ ì½¤ë³´ ì??ì??"
 
-#: ../widgets/misc/e-dateedit.c:464
+#: ../widgets/misc/e-dateedit.c:455
 msgid "No_w"
 msgstr "í??ì?¬(_W)"
 
-#: ../widgets/misc/e-dateedit.c:470
+#: ../widgets/misc/e-dateedit.c:461
 msgid "_Today"
 msgstr "ì?¤ë??(_T)"
 
-#: ../widgets/misc/e-dateedit.c:1635
+#: ../widgets/misc/e-dateedit.c:1583
 msgid "Invalid Date Value"
 msgstr "ë? ì§? ê°?ì?´ ì??ëª»ë??ì??ì?µë??ë?¤"
 
-#: ../widgets/misc/e-dateedit.c:1664
+#: ../widgets/misc/e-dateedit.c:1613
 msgid "Invalid Time Value"
 msgstr "ì??ê°? ê°?ì?´ ì??ëª»ë??ì??ì?µë??ë?¤"
 
-#: ../widgets/misc/e-expander.c:182
-msgid "Expanded"
-msgstr "í??ì?¥ë?¨"
-
-#: ../widgets/misc/e-expander.c:183
-msgid "Whether or not the expander is expanded"
-msgstr "í??ì?¥ ë?¨ì¶?ê°? í??ì?¥ë??ì??ë?? ì§? ì?¬ë¶?"
-
-#: ../widgets/misc/e-expander.c:191
-msgid "Text of the expander's label"
-msgstr "í??ì?¥ ë?¨ì¶?ì?? ë ?ì?´ë¸? í??ì?¤í?¸"
-
-#: ../widgets/misc/e-expander.c:198
-msgid "Use underline"
-msgstr "ë°?ì¤? ì?¬ì?©"
-
-#: ../widgets/misc/e-expander.c:199
-msgid ""
-"If set, an underline in the text indicates the next character should be used "
-"for the mnemonic accelerator key"
-msgstr ""
-"ì°¸ì?¼ ê²½ì?°, í??ì?¤í?¸ì??ì?? ë°?ì¤?ì?? ì?°ë©´ ê·¸ ë?¤ì?? ë¬¸ì??ê°? ë¹¨ë¦¬ ê°?ê¸° í?¤ë¡? ì?°ì??ë??ë?¤"
-
-#: ../widgets/misc/e-expander.c:207
-msgid "Space to put between the label and the child"
-msgstr "ë ?ì?´ë¸?ê³¼ í??ì?? ì??ì ¯ ì?¬ì?´ì?? ë?£ì?? ê³µë°±"
-
-#: ../widgets/misc/e-expander.c:216
-msgid "Label widget"
-msgstr "ë ?ì?´ë¸? ì??ì ¯"
-
-#: ../widgets/misc/e-expander.c:217
-msgid "A widget to display in place of the usual expander label"
-msgstr "ì?¼ë°?ì ?ì?¸ í??ì?¥ ë?¨ì¶? ë ?ì?´ë¸? ë??ì? ì?? í??ì??í?  ì??ì ¯"
-
-#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3390
-msgid "Expander Size"
-msgstr "í??ì?¥ ë?¨ì¶? í?¬ê¸°"
-
-#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3391
-msgid "Size of the expander arrow"
-msgstr "í??ì?¥ í??ì?´í??ì?? í?¬ê¸°"
-
-#: ../widgets/misc/e-expander.c:232
-msgid "Indicator Spacing"
-msgstr "í??ì?? ì?¬ë°±"
-
-#: ../widgets/misc/e-expander.c:233
-msgid "Spacing around expander arrow"
-msgstr "í??ì?¥ í??ì?´í?? ì£¼ì??ì?? ì?¬ë°±"
-
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:125 ../widgets/misc/e-filter-bar.c:180
-#: ../widgets/misc/e-filter-bar.c:308 ../widgets/misc/e-filter-bar.c:750
+#: ../widgets/misc/e-filter-bar.c:123 ../widgets/misc/e-filter-bar.c:178
+#: ../widgets/misc/e-filter-bar.c:306 ../widgets/misc/e-filter-bar.c:737
 msgid "Advanced Search"
-msgstr "ê³ ê¸? ì°¾ê¸°"
+msgstr "ê³ ê¸? ê²?ì??"
 
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:231
+#: ../widgets/misc/e-filter-bar.c:229
 msgid "Save Search"
-msgstr "ì°¾ê¸° ì ?ì?¥"
+msgstr "ê²?ì?? ì ?ì?¥"
 
-#: ../widgets/misc/e-filter-bar.c:268
+#: ../widgets/misc/e-filter-bar.c:266
 msgid "_Searches"
-msgstr "ì°¾ê¸°(_S)"
+msgstr "ê²?ì??(_S)"
 
-#: ../widgets/misc/e-filter-bar.c:270
+#: ../widgets/misc/e-filter-bar.c:268
 msgid "Searches"
-msgstr "ì°¾ê¸°"
+msgstr "ê²?ì??"
 
-#: ../widgets/misc/e-filter-bar.h:104 ../widgets/misc/e-filter-bar.h:115
+#: ../widgets/misc/e-filter-bar.h:100 ../widgets/misc/e-filter-bar.h:110
 msgid "_Save Search..."
-msgstr "ì°¾ê¸° ì ?ì?¥(_S)..."
+msgstr "ê²?ì?? ì ?ì?¥(_S)..."
 
-#: ../widgets/misc/e-filter-bar.h:105 ../widgets/misc/e-filter-bar.h:116
+#: ../widgets/misc/e-filter-bar.h:101 ../widgets/misc/e-filter-bar.h:111
 msgid "_Edit Saved Searches..."
-msgstr "ì ?ì?¥í?? ì°¾ê¸° í?¸ì§?(_E)..."
+msgstr "ì ?ì?¥í?? ê²?ì?? í?¸ì§?(_E)..."
 
-#: ../widgets/misc/e-filter-bar.h:106 ../widgets/misc/e-filter-bar.h:117
+#: ../widgets/misc/e-filter-bar.h:102 ../widgets/misc/e-filter-bar.h:112
 msgid "_Advanced Search..."
-msgstr "ê³ ê¸? ì°¾ê¸°(_A)..."
+msgstr "ê³ ê¸? ê²?ì??(_A)..."
 
-#: ../widgets/misc/e-filter-bar.h:107
+#: ../widgets/misc/e-filter-bar.h:103
 msgid "All Accounts"
 msgstr "ëª¨ë?  ê³?ì ?"
 
-#: ../widgets/misc/e-filter-bar.h:108
+#: ../widgets/misc/e-filter-bar.h:104
 msgid "Current Account"
 msgstr "í??ì?¬ ê³?ì ?"
 
-#: ../widgets/misc/e-filter-bar.h:109
+#: ../widgets/misc/e-filter-bar.h:105
 msgid "Current Folder"
 msgstr "í??ì?¬ í?´ë??"
 
-#: ../widgets/misc/e-filter-bar.h:110
-msgid "Current Message"
-msgstr "í??ì?¬ ë©?ì??ì§?"
-
-#: ../widgets/misc/e-image-chooser.c:169
+#: ../widgets/misc/e-image-chooser.c:168
 msgid "Choose Image"
 msgstr "ê·¸ë¦¼ì?? ê³ ë¥´ì?ì??ì?¤"
 
-#: ../widgets/misc/e-map.c:627
+#: ../widgets/misc/e-map.c:605
 msgid "World Map"
 msgstr "ì?¸ê³? ì§?ë??"
 
-#: ../widgets/misc/e-map.c:629
+#: ../widgets/misc/e-map.c:607
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should instead select the timezone from the drop-down combination box below."
@@ -23313,103 +22304,102 @@ msgstr "ì?¸ë?¼ì?¸"
 msgid "The button state is online"
 msgstr "ë?¨ì¶? ì??í??ê°? ì?¨ë?¼ì?¸ì??ë??ë?¤."
 
-#: ../widgets/misc/e-pilot-settings.c:102
+#: ../widgets/misc/e-pilot-settings.c:99
 msgid "Sync with:"
 msgstr "ë?¤ì??ì?? ë??ê¸°í??:"
 
-#: ../widgets/misc/e-pilot-settings.c:110
+#: ../widgets/misc/e-pilot-settings.c:107
 msgid "Sync Private Records:"
 msgstr "ê°?ì?¸ ì ?ë³´ ë??ê¸°í??:"
 
-#: ../widgets/misc/e-pilot-settings.c:119
+#: ../widgets/misc/e-pilot-settings.c:116
 msgid "Sync Categories:"
 msgstr "ë??ê¸°í?? ë¶?ë¥?:"
 
-#: ../widgets/misc/e-reflow.c:1439 ../widgets/misc/e-reflow.c:1440
+#: ../widgets/misc/e-reflow.c:1435 ../widgets/misc/e-reflow.c:1436
 msgid "Empty message"
 msgstr "ë¹? ë©?ì??ì§?"
 
-#: ../widgets/misc/e-reflow.c:1446 ../widgets/misc/e-reflow.c:1447
+#: ../widgets/misc/e-reflow.c:1442 ../widgets/misc/e-reflow.c:1443
 msgid "Reflow model"
 msgstr "ë¦¬í??ë¡?ì?° ëª¨ë?¸"
 
-#: ../widgets/misc/e-reflow.c:1453 ../widgets/misc/e-reflow.c:1454
+#: ../widgets/misc/e-reflow.c:1449 ../widgets/misc/e-reflow.c:1450
 msgid "Column width"
 msgstr "ì?´ ë??ë¹?"
 
-#: ../widgets/misc/e-search-bar.c:337 ../widgets/misc/e-search-bar.c:470
-#: ../widgets/misc/e-search-bar.c:472
+#: ../widgets/misc/e-search-bar.c:92 ../widgets/misc/e-search-bar.c:359
+#: ../widgets/misc/e-search-bar.c:503 ../widgets/misc/e-search-bar.c:505
+#: ../widgets/misc/e-search-bar.c:1021
 msgid "Search"
-msgstr "ì°¾ê¸°"
+msgstr "ê²?ì??"
 
-#: ../widgets/misc/e-search-bar.c:337 ../widgets/misc/e-search-bar.c:470
-#: ../widgets/misc/e-search-bar.c:472
+#: ../widgets/misc/e-search-bar.c:359 ../widgets/misc/e-search-bar.c:503
+#: ../widgets/misc/e-search-bar.c:505
 msgid "Click here to change the search type"
-msgstr "ì°¾ê¸° ì¢?ë¥?ë¥¼ ë°?ê¾¸ë ¤ë©´ ì?¬ê¸°ë¥¼ ë??ë¥´ì?ì??ì?¤"
+msgstr "ê²?ì?? ì¢?ë¥?ë¥¼ ë°?ê¾¸ë ¤ë©´ ì?¬ê¸°ë¥¼ ë??ë¥´ì?ì??ì?¤"
 
-#: ../widgets/misc/e-search-bar.c:603
+#: ../widgets/misc/e-search-bar.c:637
 msgid "_Search"
-msgstr "ì°¾ê¸°(_S)"
+msgstr "ê²?ì??(_S)"
 
-#: ../widgets/misc/e-search-bar.c:609
+#: ../widgets/misc/e-search-bar.c:643
 msgid "_Find Now"
 msgstr "ì§?ê¸? ì°¾ê¸°(_F)"
 
-#: ../widgets/misc/e-search-bar.c:610
+#: ../widgets/misc/e-search-bar.c:644
 msgid "_Clear"
 msgstr "ì§?ì?°ê¸°(_C)"
 
-#: ../widgets/misc/e-search-bar.c:865
+#: ../widgets/misc/e-search-bar.c:899
 msgid "Item ID"
 msgstr "í?ëª© ID"
 
-#: ../widgets/misc/e-search-bar.c:872 ../widgets/text/e-text.c:3563
-#: ../widgets/text/e-text.c:3564
+#: ../widgets/misc/e-search-bar.c:906 ../widgets/text/e-text.c:3555
+#: ../widgets/text/e-text.c:3556
 msgid "Text"
 msgstr "í??ì?¤í?¸"
 
 #. To Translators: The "Show: " label is followed by the Quick Search Dropdown Menu where you can choose
 #. to display "All Messages", "Unread Messages", "Message with 'Important' Label" and so on...
-#: ../widgets/misc/e-search-bar.c:1003
+#: ../widgets/misc/e-search-bar.c:1053
 msgid "Sho_w: "
 msgstr "ë³´ê¸°(_W): "
 
-#. To Translators: The "Show: " label is followed by the Quick Search Text input field where one enters
-#. the term to search for
-#: ../widgets/misc/e-search-bar.c:1020
+#: ../widgets/misc/e-search-bar.c:1072
 msgid "Sear_ch: "
-msgstr "ì°¾ê¸°(_C): "
+msgstr "ê²?ì??(_C): "
 
 # FIXME - hard to translate UI + string based on English grammar
 #. To Translators: The " in " label is part of the Quick Search Bar, example:
 #. Search: | <user's_search_term> | in | Current Folder/All Accounts/Current Account
-#: ../widgets/misc/e-search-bar.c:1032
+#: ../widgets/misc/e-search-bar.c:1088
 msgid " i_n "
 msgstr " ì??ì¹?(_N) : "
 
-#: ../widgets/misc/e-selection-model-array.c:594
-#: ../widgets/table/e-tree-selection-model.c:806
+#: ../widgets/misc/e-selection-model-array.c:593
+#: ../widgets/table/e-tree-selection-model.c:803
 msgid "Cursor Row"
 msgstr "ì»¤ì?? í??"
 
-#: ../widgets/misc/e-selection-model-array.c:601
-#: ../widgets/table/e-tree-selection-model.c:813
+#: ../widgets/misc/e-selection-model-array.c:600
+#: ../widgets/table/e-tree-selection-model.c:810
 msgid "Cursor Column"
 msgstr "ì»¤ì?? ì?´"
 
-#: ../widgets/misc/e-selection-model.c:209
+#: ../widgets/misc/e-selection-model.c:208
 msgid "Sorter"
 msgstr "ì ?ë ¬"
 
-#: ../widgets/misc/e-selection-model.c:216
+#: ../widgets/misc/e-selection-model.c:215
 msgid "Selection Mode"
 msgstr "ì? í?? ëª¨ë??"
 
-#: ../widgets/misc/e-selection-model.c:224
+#: ../widgets/misc/e-selection-model.c:223
 msgid "Cursor Mode"
 msgstr "ì»¤ì?? ëª¨ë??"
 
-#: ../widgets/misc/e-send-options.c:522
+#: ../widgets/misc/e-send-options.c:519
 msgid "When de_leted:"
 msgstr "ì§?ì?¸ ë??(_L):"
 
@@ -23433,20 +22423,20 @@ msgstr "<b>ì??í?? ì¶?ì ?</b>"
 msgid "A_uto-delete sent item"
 msgstr "ë³´ë?¸ í?ëª© ì??ë??ì?¼ë¡? ì?ì ?(_U)"
 
-#: ../widgets/misc/e-send-options.glade.h:7
+#: ../widgets/misc/e-send-options.glade.h:6
 msgid "Creat_e a sent item to track information"
 msgstr "ì ?ë³´ ì¶?ì ?ì?? ì??í?? ë³´ë?¸ í?ëª© ë§?ë?¤ê¸°(_E)"
 
-#: ../widgets/misc/e-send-options.glade.h:8
+#: ../widgets/misc/e-send-options.glade.h:7
 msgid "Deli_vered and opened"
 msgstr "ë°°ë?¬ë?¨ ë°? ì?´ë¦¼(_V)"
 
-#: ../widgets/misc/e-send-options.glade.h:9
+#: ../widgets/misc/e-send-options.glade.h:8
 msgid "Gene_ral Options"
 msgstr "ì?¼ë°? ì?µì??(_R)"
 
 # read receipt -> ë?´ì?© ì?½ì?? í??ì?¸, Microsoft Office XP ì°¸ê³ 
-#: ../widgets/misc/e-send-options.glade.h:10
+#: ../widgets/misc/e-send-options.glade.h:9
 msgid ""
 "None\n"
 "Mail Receipt"
@@ -23454,7 +22444,7 @@ msgstr ""
 "ì??ì??\n"
 "ë?´ì?© ì?½ì?? í??ì?¸"
 
-#: ../widgets/misc/e-send-options.glade.h:12
+#: ../widgets/misc/e-send-options.glade.h:11
 msgid ""
 "Normal\n"
 "Proprietary\n"
@@ -23470,15 +22460,15 @@ msgstr ""
 "ì?¼ê¸? ë¹?ë°?\n"
 "ë??ì?¸ë¹?"
 
-#: ../widgets/misc/e-send-options.glade.h:18
+#: ../widgets/misc/e-send-options.glade.h:17
 msgid "R_eply requested"
 msgstr "ë?µì?¥ ì??ì²(_E)"
 
-#: ../widgets/misc/e-send-options.glade.h:20
+#: ../widgets/misc/e-send-options.glade.h:19
 msgid "Sta_tus Tracking"
 msgstr "ì??í?? ì¶?ì ?(_T)"
 
-#: ../widgets/misc/e-send-options.glade.h:21
+#: ../widgets/misc/e-send-options.glade.h:20
 msgid ""
 "Undefined\n"
 "High\n"
@@ -23490,31 +22480,35 @@ msgstr ""
 "ë³´í?µ\n"
 "ë?®ì??"
 
-#: ../widgets/misc/e-send-options.glade.h:25
+#: ../widgets/misc/e-send-options.glade.h:24
 msgid "When acce_pted:"
 msgstr "ë°?ì??ë?¤ì?¬ì§?ë©´(_P):"
 
-#: ../widgets/misc/e-send-options.glade.h:26
+#: ../widgets/misc/e-send-options.glade.h:25
 msgid "When co_mpleted:"
 msgstr "ì??ì?±ë??ë©´(_M):"
 
-#: ../widgets/misc/e-send-options.glade.h:27
+#: ../widgets/misc/e-send-options.glade.h:26
 msgid "When decli_ned:"
 msgstr "ê±°ë¶?ë?¹í??ë©´(_N):"
 
-#: ../widgets/misc/e-send-options.glade.h:28
+#: ../widgets/misc/e-send-options.glade.h:27
 msgid "Wi_thin"
 msgstr "ë?¤ì?? ê¸°í?? ì??ì??(_T):"
 
 # FIXME: bad msgid
-#: ../widgets/misc/e-send-options.glade.h:29
+#: ../widgets/misc/e-send-options.glade.h:28
 msgid "_After:"
 msgstr "ë?¤ì?? ë?¤ì??(_A):"
 
-#: ../widgets/misc/e-send-options.glade.h:30
+#: ../widgets/misc/e-send-options.glade.h:29
 msgid "_All information"
 msgstr "ëª¨ë?  ì ?ë³´(_A)"
 
+#: ../widgets/misc/e-send-options.glade.h:30
+msgid "_Classification:"
+msgstr "ë¶?ë¥?(_C):"
+
 #. To translators: This means Delay the message delivery for some time
 #: ../widgets/misc/e-send-options.glade.h:32
 msgid "_Delay message delivery"
@@ -23541,46 +22535,26 @@ msgid "_When opened:"
 msgstr "ì?´ë©´(_W):"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects")
-#: ../widgets/misc/e-task-widget.c:252
+#: ../widgets/misc/e-task-widget.c:251
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects");
 #. %d is a number between 0 and 100, describing the percentage of operation complete
-#: ../widgets/misc/e-task-widget.c:258
+#: ../widgets/misc/e-task-widget.c:257
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% ì??ë£?)"
 
-#: ../widgets/misc/e-url-entry.c:105
+#: ../widgets/misc/e-url-entry.c:103
 msgid "Click here to go to URL"
 msgstr "URLë¡? ê°?ë ¤ë©´ ì?¬ê¸°ë¥¼ ë??ë¥´ì?ì??ì?¤"
 
-#: ../widgets/misc/gal-categories.glade.h:1
-msgid "Edit Master Category List..."
-msgstr "ì£¼ ë¶?ë¥? ëª©ë¡? í?¸ì§?..."
-
-#: ../widgets/misc/gal-categories.glade.h:2
-msgid "Item(s) belong to these _categories:"
-msgstr "ì?´ ë¶?ë¥?ì?? ì??í?? í?ëª©(_C):"
-
-#: ../widgets/misc/gal-categories.glade.h:3
-msgid "_Available Categories:"
-msgstr "ì?¬ì?© ê°?ë?¥í?? ë¶?ë¥?(_A):"
-
-#: ../widgets/misc/gal-categories.glade.h:4
-msgid "categories"
-msgstr "ë¶?ë¥?"
-
-#: ../widgets/table/e-cell-combo.c:170
+#: ../widgets/table/e-cell-combo.c:171
 msgid "popup list"
 msgstr "í??ì?? ëª©ë¡?"
 
-#: ../widgets/table/e-cell-date.c:62
-msgid "%l:%M %p"
-msgstr "%p %l:%M"
-
 #: ../widgets/table/e-cell-pixbuf.c:360
 msgid "Selected Column"
 msgstr "ì? í??í?? ì?´"
@@ -23593,23 +22567,23 @@ msgstr "í?¬ì»¤ì?¤í?? ì?´"
 msgid "Unselected Column"
 msgstr "ì? í?? í?´ì ?í?? ì?´"
 
-#: ../widgets/table/e-cell-text.c:1794
+#: ../widgets/table/e-cell-text.c:1788
 msgid "Strikeout Column"
 msgstr "ì·¨ì??ì?  ì?´"
 
-#: ../widgets/table/e-cell-text.c:1801
+#: ../widgets/table/e-cell-text.c:1795
 msgid "Underline Column"
 msgstr "ë°?ì¤? ì?´"
 
-#: ../widgets/table/e-cell-text.c:1808
+#: ../widgets/table/e-cell-text.c:1802
 msgid "Bold Column"
 msgstr "êµµì?? ê¸?ì?? ì?´"
 
-#: ../widgets/table/e-cell-text.c:1815
+#: ../widgets/table/e-cell-text.c:1809
 msgid "Color Column"
 msgstr "ì??ê¹? ì??ë?? ì?´"
 
-#: ../widgets/table/e-cell-text.c:1829
+#: ../widgets/table/e-cell-text.c:1823
 msgid "BG Color Column"
 msgstr "ë°°ê²½ì?? ì?´"
 
@@ -23633,12 +22607,12 @@ msgstr "ì ?ë ¬ ì?? í?¨"
 msgid "No grouping"
 msgstr "ë¬¶ì§? ì??ì??"
 
-#: ../widgets/table/e-table-config.c:643
+#: ../widgets/table/e-table-config.c:642
 #: ../widgets/table/e-table-config.glade.h:11
 msgid "Show Fields"
 msgstr "í??ë?? í??ì??"
 
-#: ../widgets/table/e-table-config.c:664
+#: ../widgets/table/e-table-config.c:663
 msgid "Available Fields"
 msgstr "ì?¬ì?© ê°?ë?¥í?? í??ë??"
 
@@ -23647,7 +22621,7 @@ msgid "A_vailable Fields:"
 msgstr "ì?¬ì?© ê°?ë?¥í?? í??ë??(_V):"
 
 #: ../widgets/table/e-table-config.glade.h:2
-#: ../widgets/table/e-table-header-item.c:1582
+#: ../widgets/table/e-table-header-item.c:1579
 msgid "Ascending"
 msgstr "ì¦?ê°?"
 
@@ -23660,7 +22634,7 @@ msgid "Clear _All"
 msgstr "ëª¨ë?? ì§?ì?°ê¸°(_A)"
 
 #: ../widgets/table/e-table-config.glade.h:5
-#: ../widgets/table/e-table-header-item.c:1582
+#: ../widgets/table/e-table-header-item.c:1579
 msgid "Descending"
 msgstr "ê°?ì??"
 
@@ -23720,21 +22694,7 @@ msgstr "ë?¤ì?? í??ë??ë¥¼ ì??ì??ë??ë¡? í??ì??(_S):"
 msgid "_Sort..."
 msgstr "ì ?ë ¬(_S)..."
 
-#: ../widgets/table/e-table-field-chooser-dialog.c:67
-#: ../widgets/table/e-table-field-chooser-item.c:633
-#: ../widgets/table/e-table-field-chooser.c:66
-#: ../widgets/table/e-table-header-item.c:1886
-msgid "DnD code"
-msgstr "ë??ì?´ë??ê¸° ì½?ë??"
-
-#: ../widgets/table/e-table-field-chooser-dialog.c:74
-#: ../widgets/table/e-table-field-chooser-item.c:640
-#: ../widgets/table/e-table-field-chooser.c:73
-#: ../widgets/table/e-table-header-item.c:1900
-msgid "Full Header"
-msgstr "ì??ì ?í?? ì ?ëª©"
-
-#: ../widgets/table/e-table-field-chooser-dialog.c:116
+#: ../widgets/table/e-table-field-chooser-dialog.c:114
 msgid "Add a column..."
 msgstr "ì?´ ì¶?ê°?..."
 
@@ -23750,306 +22710,1796 @@ msgstr ""
 "í??ì?? ì?´ì?? ì¶?ê°?í??ë ¤ë©´, ì?´ì?? í??ì??í? \n"
 "ì??ì¹?ì?? ì?´ì?? ë??ì?´ ë??ì?¼ì?ì??ì?¤."
 
-#: ../widgets/table/e-table-group-container.c:344
+#: ../widgets/table/e-table-group-container.c:341
 #, c-format
 msgid "%s : %s (%d item)"
 msgid_plural "%s : %s (%d items)"
 msgstr[0] "%s : %s (%dê°? í?ëª©)"
 
-#: ../widgets/table/e-table-group-container.c:350
+#: ../widgets/table/e-table-group-container.c:347
 #, c-format
 msgid "%s (%d item)"
 msgid_plural "%s (%d items)"
 msgstr[0] "%s (%dê°? í?ëª©)"
 
-#: ../widgets/table/e-table-group-container.c:927
-#: ../widgets/table/e-table-group-container.c:928
+#: ../widgets/table/e-table-group-container.c:924
+#: ../widgets/table/e-table-group-container.c:925
 #: ../widgets/table/e-table-group-leaf.c:586
 #: ../widgets/table/e-table-group-leaf.c:587
-#: ../widgets/table/e-table-item.c:3028 ../widgets/table/e-table-item.c:3029
+#: ../widgets/table/e-table-item.c:3020 ../widgets/table/e-table-item.c:3021
 msgid "Alternating Row Colors"
 msgstr "í??ì?? ì?? êµ?ì°¨"
 
-#: ../widgets/table/e-table-group-container.c:934
-#: ../widgets/table/e-table-group-container.c:935
+#: ../widgets/table/e-table-group-container.c:931
+#: ../widgets/table/e-table-group-container.c:932
 #: ../widgets/table/e-table-group-leaf.c:593
 #: ../widgets/table/e-table-group-leaf.c:594
-#: ../widgets/table/e-table-item.c:3035 ../widgets/table/e-table-item.c:3036
-#: ../widgets/table/e-tree.c:3343 ../widgets/table/e-tree.c:3344
+#: ../widgets/table/e-table-item.c:3027 ../widgets/table/e-table-item.c:3028
+#: ../widgets/table/e-tree.c:3339 ../widgets/table/e-tree.c:3340
 msgid "Horizontal Draw Grid"
 msgstr "ê°?ë¡? ê²©ì?? ê·¸ë¦¬ê¸°"
 
-#: ../widgets/table/e-table-group-container.c:941
-#: ../widgets/table/e-table-group-container.c:942
+#: ../widgets/table/e-table-group-container.c:938
+#: ../widgets/table/e-table-group-container.c:939
 #: ../widgets/table/e-table-group-leaf.c:600
 #: ../widgets/table/e-table-group-leaf.c:601
-#: ../widgets/table/e-table-item.c:3042 ../widgets/table/e-table-item.c:3043
-#: ../widgets/table/e-tree.c:3349 ../widgets/table/e-tree.c:3350
+#: ../widgets/table/e-table-item.c:3034 ../widgets/table/e-table-item.c:3035
+#: ../widgets/table/e-tree.c:3345 ../widgets/table/e-tree.c:3346
 msgid "Vertical Draw Grid"
 msgstr "ì?¸ë¡? ê²©ì?? ê·¸ë¦¬ê¸°"
 
-#: ../widgets/table/e-table-group-container.c:948
-#: ../widgets/table/e-table-group-container.c:949
+#: ../widgets/table/e-table-group-container.c:945
+#: ../widgets/table/e-table-group-container.c:946
 #: ../widgets/table/e-table-group-leaf.c:607
 #: ../widgets/table/e-table-group-leaf.c:608
-#: ../widgets/table/e-table-item.c:3049 ../widgets/table/e-table-item.c:3050
-#: ../widgets/table/e-tree.c:3355 ../widgets/table/e-tree.c:3356
+#: ../widgets/table/e-table-item.c:3041 ../widgets/table/e-table-item.c:3042
+#: ../widgets/table/e-tree.c:3351 ../widgets/table/e-tree.c:3352
 msgid "Draw focus"
 msgstr "í?¬ì»¤ì?¤ ê·¸ë¦¬ê¸°"
 
-#: ../widgets/table/e-table-group-container.c:955
-#: ../widgets/table/e-table-group-container.c:956
+#: ../widgets/table/e-table-group-container.c:952
+#: ../widgets/table/e-table-group-container.c:953
 #: ../widgets/table/e-table-group-leaf.c:614
 #: ../widgets/table/e-table-group-leaf.c:615
-#: ../widgets/table/e-table-item.c:3056 ../widgets/table/e-table-item.c:3057
+#: ../widgets/table/e-table-item.c:3048 ../widgets/table/e-table-item.c:3049
 msgid "Cursor mode"
 msgstr "ì»¤ì?? ëª¨ë??"
 
-#: ../widgets/table/e-table-group-container.c:962
-#: ../widgets/table/e-table-group-container.c:963
+#: ../widgets/table/e-table-group-container.c:959
+#: ../widgets/table/e-table-group-container.c:960
 #: ../widgets/table/e-table-group-leaf.c:628
 #: ../widgets/table/e-table-group-leaf.c:629
-#: ../widgets/table/e-table-item.c:3021 ../widgets/table/e-table-item.c:3022
+#: ../widgets/table/e-table-item.c:3013 ../widgets/table/e-table-item.c:3014
 msgid "Selection model"
 msgstr "ì? í?? ëª¨ë?¸"
 
-#: ../widgets/table/e-table-group-container.c:969
-#: ../widgets/table/e-table-group-container.c:970
+#: ../widgets/table/e-table-group-container.c:966
+#: ../widgets/table/e-table-group-container.c:967
 #: ../widgets/table/e-table-group-leaf.c:621
 #: ../widgets/table/e-table-group-leaf.c:622
-#: ../widgets/table/e-table-item.c:3063 ../widgets/table/e-table-item.c:3064
-#: ../widgets/table/e-table.c:3324 ../widgets/table/e-tree.c:3337
-#: ../widgets/table/e-tree.c:3338
+#: ../widgets/table/e-table-item.c:3055 ../widgets/table/e-table-item.c:3056
+#: ../widgets/table/e-table.c:3316 ../widgets/table/e-tree.c:3333
+#: ../widgets/table/e-tree.c:3334
 msgid "Length Threshold"
 msgstr "ê¸¸ì?´ í??ê³?ì¹?"
 
-#: ../widgets/table/e-table-group-container.c:976
-#: ../widgets/table/e-table-group-container.c:977
+#: ../widgets/table/e-table-group-container.c:973
+#: ../widgets/table/e-table-group-container.c:974
 #: ../widgets/table/e-table-group-leaf.c:663
 #: ../widgets/table/e-table-group-leaf.c:664
-#: ../widgets/table/e-table-item.c:3097 ../widgets/table/e-table-item.c:3098
-#: ../widgets/table/e-table.c:3331 ../widgets/table/e-tree.c:3369
-#: ../widgets/table/e-tree.c:3370
+#: ../widgets/table/e-table-item.c:3089 ../widgets/table/e-table-item.c:3090
+#: ../widgets/table/e-table.c:3323 ../widgets/table/e-tree.c:3365
+#: ../widgets/table/e-tree.c:3366
 msgid "Uniform row height"
 msgstr "í?? ë??ì?´ í?µì?¼"
 
-#: ../widgets/table/e-table-group-container.c:983
-#: ../widgets/table/e-table-group-container.c:984
+#: ../widgets/table/e-table-group-container.c:980
+#: ../widgets/table/e-table-group-container.c:981
 #: ../widgets/table/e-table-group-leaf.c:656
 #: ../widgets/table/e-table-group-leaf.c:657
 msgid "Frozen"
 msgstr "ê³ ì ?"
 
-#: ../widgets/table/e-table-header-item.c:1452
+#: ../widgets/table/e-table-header-item.c:1449
 msgid "Customize Current View"
 msgstr "í??ì?¬ ë·° ì?¬ì?©ì?? ì?¤ì ?í??ê¸°"
 
-#: ../widgets/table/e-table-header-item.c:1472
+#: ../widgets/table/e-table-header-item.c:1469
 msgid "Sort _Ascending"
 msgstr "ì?¤ë¦?ì°¨ì?? ì ?ë ¬ (_A)"
 
-#: ../widgets/table/e-table-header-item.c:1473
+#: ../widgets/table/e-table-header-item.c:1470
 msgid "Sort _Descending"
 msgstr "ë?´ë¦¼ì°¨ì?? ì ?ë ¬(_D)"
 
-#: ../widgets/table/e-table-header-item.c:1474
+#: ../widgets/table/e-table-header-item.c:1471
 msgid "_Unsort"
 msgstr "ì ?ë ¬ ì??í?¨(_U)"
 
-#: ../widgets/table/e-table-header-item.c:1476
+#: ../widgets/table/e-table-header-item.c:1473
 msgid "Group By This _Field"
 msgstr "ì?´ ë²?ì??ë¡? ë¬¶ì??(_F)"
 
-#: ../widgets/table/e-table-header-item.c:1477
+#: ../widgets/table/e-table-header-item.c:1474
 msgid "Group By _Box"
 msgstr "ì??ì??ë¡? ë¬¶ì??(_B)"
 
-#: ../widgets/table/e-table-header-item.c:1479
+#: ../widgets/table/e-table-header-item.c:1476
 msgid "Remove This _Column"
 msgstr "ì?´ ì ?ê±°(_C)"
 
-#: ../widgets/table/e-table-header-item.c:1480
+#: ../widgets/table/e-table-header-item.c:1477
 msgid "Add a C_olumn..."
 msgstr "ì?´ ì¶?ê°?(_O)..."
 
-#: ../widgets/table/e-table-header-item.c:1482
+#: ../widgets/table/e-table-header-item.c:1479
 msgid "A_lignment"
 msgstr "ì ?ë ¬(_L)"
 
-#: ../widgets/table/e-table-header-item.c:1483
+#: ../widgets/table/e-table-header-item.c:1480
 msgid "B_est Fit"
 msgstr "ì??ë?? ë§?ì¶¤(_E)"
 
-#: ../widgets/table/e-table-header-item.c:1484
+#: ../widgets/table/e-table-header-item.c:1481
 msgid "Format Column_s..."
 msgstr "ì?´ í??ì??(_S)..."
 
-#: ../widgets/table/e-table-header-item.c:1486
+#: ../widgets/table/e-table-header-item.c:1483
 msgid "Custo_mize Current View..."
 msgstr "í??ì?¬ ë³´ê¸° ì?¬ì?©ì?? ì?¤ì ?(_M)..."
 
-#: ../widgets/table/e-table-header-item.c:1542
+#: ../widgets/table/e-table-header-item.c:1539
 msgid "_Sort By"
 msgstr "ì ?ë ¬ ê¸°ì¤?(_S)"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1560
+#: ../widgets/table/e-table-header-item.c:1557
 msgid "_Custom"
 msgstr "ì?¬ì?©ì?? ì?¤ì ?(_C)"
 
-#: ../widgets/table/e-table-header-item.c:1893
-msgid "Font Description"
-msgstr "ê¸?ê¼´ ì?¤ëª?"
-
-#: ../widgets/table/e-table-header-item.c:1914
-#: ../widgets/table/e-table-sorter.c:172
-msgid "Sort Info"
-msgstr "ì ?ë ¬ ì ?ë³´"
-
-#: ../widgets/table/e-table-header-item.c:1928
-#: ../widgets/table/e-tree-scrolled.c:225
-#: ../widgets/table/e-tree-scrolled.c:226
-msgid "Tree"
-msgstr "í?¸ë¦¬"
-
-#: ../widgets/table/e-table-item.c:3007 ../widgets/table/e-table-item.c:3008
+#: ../widgets/table/e-table-item.c:2999 ../widgets/table/e-table-item.c:3000
 msgid "Table header"
 msgstr "í??ì?´ë¸? í?¤ë??"
 
-#: ../widgets/table/e-table-item.c:3014 ../widgets/table/e-table-item.c:3015
+#: ../widgets/table/e-table-item.c:3006 ../widgets/table/e-table-item.c:3007
 msgid "Table model"
 msgstr "í??ì?´ë¸? ëª¨ë?¸"
 
-#: ../widgets/table/e-table-item.c:3090 ../widgets/table/e-table-item.c:3091
+#: ../widgets/table/e-table-item.c:3082 ../widgets/table/e-table-item.c:3083
 msgid "Cursor row"
 msgstr "ì»¤ì?? í??"
 
-#: ../widgets/table/e-table.c:3338 ../widgets/table/e-tree.c:3376
-#: ../widgets/table/e-tree.c:3377
+#: ../widgets/table/e-table-sorter.c:172
+msgid "Sort Info"
+msgstr "ì ?ë ¬ ì ?ë³´"
+
+#: ../widgets/table/e-table.c:3330 ../widgets/table/e-tree.c:3372
+#: ../widgets/table/e-tree.c:3373
 msgid "Always search"
-msgstr "ì?¸ì ?ë?? ì°¾ê¸°"
+msgstr "ì?¸ì ?ë?? ê²?ì??"
 
-#: ../widgets/table/e-table.c:3345
+#: ../widgets/table/e-table.c:3337
 msgid "Use click to add"
 msgstr "ì¶?ê°?í??ë ¤ë©´ ë??ë¥´ê¸° ì?¬ì?©"
 
-#: ../widgets/table/e-tree.c:3362 ../widgets/table/e-tree.c:3363
+#: ../widgets/table/e-tree-scrolled.c:225
+#: ../widgets/table/e-tree-scrolled.c:226
+msgid "Tree"
+msgstr "í?¸ë¦¬"
+
+#: ../widgets/table/e-tree.c:3358 ../widgets/table/e-tree.c:3359
 msgid "ETree table adapter"
 msgstr "ETree í??ì?´ë¸? ì?´ë??í?°"
 
-#: ../widgets/table/e-tree.c:3383
+#: ../widgets/table/e-tree.c:3379
 msgid "Retro Look"
 msgstr "ë¦¬í?¸ë¡? ëª¨ì??"
 
-#: ../widgets/table/e-tree.c:3384
+#: ../widgets/table/e-tree.c:3380
 msgid "Draw lines and +/- expanders."
-msgstr "ì? ê³¼ +/- í??ì?¥ ë²?í?¼ì?? ê·¸ë¦½ë??ë?¤."
+msgstr "ì? ê³¼ +/- í??ì?¥ ë?¨ì¶?ë¥¼ ê·¸ë¦½ë??ë?¤."
 
-#: ../widgets/text/e-text.c:2733
+#: ../widgets/table/e-tree.c:3386
+msgid "Expander Size"
+msgstr "í??ì?¥ ë?¨ì¶? í?¬ê¸°"
+
+#: ../widgets/table/e-tree.c:3387
+msgid "Size of the expander arrow"
+msgstr "í??ì?¥ í??ì?´í??ì?? í?¬ê¸°"
+
+#: ../widgets/text/e-text.c:2731
 msgid "Input Methods"
 msgstr "ì??ë ¥ê¸°"
 
-#: ../widgets/text/e-text.c:3556 ../widgets/text/e-text.c:3557
+#: ../widgets/text/e-text.c:3548 ../widgets/text/e-text.c:3549
 msgid "Event Processor"
-msgstr "ì?´ë²¤í?¸ ì²?ë¦¬ê¸°"
+msgstr "í??ì?¬ ì²?ë¦¬"
 
-#: ../widgets/text/e-text.c:3570 ../widgets/text/e-text.c:3571
+#: ../widgets/text/e-text.c:3562 ../widgets/text/e-text.c:3563
 msgid "Bold"
 msgstr "êµµì?? ê¸?ì?¨"
 
-#: ../widgets/text/e-text.c:3577 ../widgets/text/e-text.c:3578
+#: ../widgets/text/e-text.c:3569 ../widgets/text/e-text.c:3570
 msgid "Strikeout"
 msgstr "ì·¨ì??ì? "
 
-#: ../widgets/text/e-text.c:3584 ../widgets/text/e-text.c:3585
+#: ../widgets/text/e-text.c:3576 ../widgets/text/e-text.c:3577
 msgid "Anchor"
 msgstr "ì?°ê²°"
 
-#: ../widgets/text/e-text.c:3592 ../widgets/text/e-text.c:3593
+#: ../widgets/text/e-text.c:3583 ../widgets/text/e-text.c:3584
 msgid "Justification"
 msgstr "ë§?ì¶¤"
 
-#: ../widgets/text/e-text.c:3599 ../widgets/text/e-text.c:3600
+#: ../widgets/text/e-text.c:3590 ../widgets/text/e-text.c:3591
 msgid "Clip Width"
 msgstr "ì??ë¥´ê¸° ë??ë¹?"
 
-#: ../widgets/text/e-text.c:3606 ../widgets/text/e-text.c:3607
+#: ../widgets/text/e-text.c:3597 ../widgets/text/e-text.c:3598
 msgid "Clip Height"
 msgstr "ì??ë¥´ê¸° ë??ì?´"
 
-#: ../widgets/text/e-text.c:3613 ../widgets/text/e-text.c:3614
+#: ../widgets/text/e-text.c:3604 ../widgets/text/e-text.c:3605
 msgid "Clip"
 msgstr "ì??ë¥´ê¸°"
 
-#: ../widgets/text/e-text.c:3620 ../widgets/text/e-text.c:3621
+#: ../widgets/text/e-text.c:3611 ../widgets/text/e-text.c:3612
 msgid "Fill clip rectangle"
 msgstr "ì??ë¥´ê¸° ì?¬ê°?í??"
 
-#: ../widgets/text/e-text.c:3627 ../widgets/text/e-text.c:3628
+#: ../widgets/text/e-text.c:3618 ../widgets/text/e-text.c:3619
 msgid "X Offset"
 msgstr "ê°?ë¡? ì?¤í??ì??"
 
-#: ../widgets/text/e-text.c:3634 ../widgets/text/e-text.c:3635
+#: ../widgets/text/e-text.c:3625 ../widgets/text/e-text.c:3626
 msgid "Y Offset"
 msgstr "ì?¸ë¡? ì?¤í??ì??"
 
-#: ../widgets/text/e-text.c:3670 ../widgets/text/e-text.c:3671
+#: ../widgets/text/e-text.c:3660 ../widgets/text/e-text.c:3661
 msgid "Text width"
 msgstr "í??ì?¤í?¸ ë??ë¹?"
 
-#: ../widgets/text/e-text.c:3677 ../widgets/text/e-text.c:3678
+#: ../widgets/text/e-text.c:3667 ../widgets/text/e-text.c:3668
 msgid "Text height"
 msgstr "í??ì?¤í?¸ ë??ì?´"
 
-#: ../widgets/text/e-text.c:3692 ../widgets/text/e-text.c:3693
+#: ../widgets/text/e-text.c:3681 ../widgets/text/e-text.c:3682
 msgid "Use ellipsis"
 msgstr "ë§?ì¤?ì??í?? ì?¬ì?©"
 
-#: ../widgets/text/e-text.c:3699 ../widgets/text/e-text.c:3700
+#: ../widgets/text/e-text.c:3688 ../widgets/text/e-text.c:3689
 msgid "Ellipsis"
 msgstr "ë§?ì¤?ì??í??"
 
-#: ../widgets/text/e-text.c:3706 ../widgets/text/e-text.c:3707
+#: ../widgets/text/e-text.c:3695 ../widgets/text/e-text.c:3696
 msgid "Line wrap"
 msgstr "ì¤? ë°?ê¿?"
 
-#: ../widgets/text/e-text.c:3713 ../widgets/text/e-text.c:3714
+#: ../widgets/text/e-text.c:3702 ../widgets/text/e-text.c:3703
 msgid "Break characters"
 msgstr "ë??ê¹? ë¬¸ì??"
 
-#: ../widgets/text/e-text.c:3720 ../widgets/text/e-text.c:3721
+#: ../widgets/text/e-text.c:3709 ../widgets/text/e-text.c:3710
 msgid "Max lines"
 msgstr "ìµ?ë?? ì¤? ì??"
 
-#: ../widgets/text/e-text.c:3742 ../widgets/text/e-text.c:3743
+#: ../widgets/text/e-text.c:3730 ../widgets/text/e-text.c:3731
 msgid "Draw borders"
 msgstr "í??ë??ë¦¬ ê·¸ë¦¬ê¸°"
 
-#: ../widgets/text/e-text.c:3749 ../widgets/text/e-text.c:3750
+#: ../widgets/text/e-text.c:3737 ../widgets/text/e-text.c:3738
 msgid "Allow newlines"
 msgstr "ì¤?ë°?ê¿? í??ì?©"
 
-#: ../widgets/text/e-text.c:3756 ../widgets/text/e-text.c:3757
+#: ../widgets/text/e-text.c:3744 ../widgets/text/e-text.c:3745
 msgid "Draw background"
 msgstr "ë°°ê²½ ê·¸ë¦¬ê¸°"
 
-#: ../widgets/text/e-text.c:3763 ../widgets/text/e-text.c:3764
+#: ../widgets/text/e-text.c:3751 ../widgets/text/e-text.c:3752
 msgid "Draw button"
 msgstr "ë?¨ì¶? ê·¸ë¦¬ê¸°"
 
-#: ../widgets/text/e-text.c:3770 ../widgets/text/e-text.c:3771
+#: ../widgets/text/e-text.c:3758 ../widgets/text/e-text.c:3759
 msgid "Cursor position"
 msgstr "ì»¤ì?? ì??ì¹?"
 
 #. Translators: Input Method Context
-#: ../widgets/text/e-text.c:3778 ../widgets/text/e-text.c:3780
+#: ../widgets/text/e-text.c:3766 ../widgets/text/e-text.c:3768
 msgid "IM Context"
 msgstr "ì??ë ¥ê¸° ì»¨í??ì?¤í?¸"
 
-#: ../widgets/text/e-text.c:3786 ../widgets/text/e-text.c:3787
+#: ../widgets/text/e-text.c:3774 ../widgets/text/e-text.c:3775
 msgid "Handle Popup"
 msgstr "í??ì?? ì²?ë¦¬"
 
+#~ msgid "Toggle Attachment Bar"
+#~ msgstr "ì²¨ë¶? ëª¨ì?? í? ê¸?"
+
+#~ msgid "activate"
+#~ msgstr "í??ì?±í??"
+
+#~ msgid "3268"
+#~ msgstr "3268"
+
+#~ msgid "389"
+#~ msgstr "389"
+
+#~ msgid "636"
+#~ msgstr "636"
+
+#~ msgid "<b>Type:</b>"
+#~ msgstr "<b>ì¢?ë¥?:</b> "
+
+#~ msgid "Add Address Book"
+#~ msgstr "ì£¼ì??ë¡?ì?? ì¶?ê°?í?©ë??ë?¤"
+
+#~ msgid "Anonymously"
+#~ msgstr "ì?µëª?ì?¼ë¡?"
+
+#~ msgid "Basic"
+#~ msgstr "ê¸°ë³¸"
+
+#~ msgid "Distinguished name"
+#~ msgstr "ê³ ì?  ì?´ë¦?"
+
+#~ msgid "Email address"
+#~ msgstr "ì ?ì??ë©?ì?¼ ì£¼ì??"
+
+#~ msgid "Find Possible Search Bases"
+#~ msgstr "ê°?ë?¥í?? ì°¾ê¸° ê¸°ì¤?ì?? ì°¾ê¸°"
+
+#~ msgid "Search filter"
+#~ msgstr "ì°¾ê¸° í??í?°"
+
+#~ msgid "Using email address"
+#~ msgstr "ì ?ì??ë©?ì?¼ ì£¼ì?? ì?¬ì?©í?´ì??"
+
+#~ msgid "Whenever Possible"
+#~ msgstr "ê°?ë?¥í??ë©´ ì?¸ì ?ë??"
+
+#~ msgid "_Add Address Book"
+#~ msgstr "ì£¼ì??ë¡? ì¶?ê°?(_A)"
+
+#~ msgid "MSN Messenger"
+#~ msgstr "MSN ë©?ì? ì ?"
+
+#~ msgid "Novell GroupWise"
+#~ msgstr "ë?¸ë²¨ ê·¸ë£¹ì??ì?´ì¦?"
+
+#~ msgid "Novell Groupwise"
+#~ msgstr "ë?¸ë²¨ ê·¸ë£¹ì??ì?´ì¦?"
+
+#~ msgid "_Notes:"
+#~ msgstr "ë©?ëª¨(_N):"
+
+#~ msgid "United States"
+#~ msgstr "ë¯¸êµ"
+
+#~ msgid "Afghanistan"
+#~ msgstr "ì??í??ê°?ë??ì?¤í??"
+
+#~ msgid "Albania"
+#~ msgstr "ì??ë°?ë??ì??"
+
+#~ msgid "Algeria"
+#~ msgstr "ì??ì ?ë¦¬"
+
+#~ msgid "American Samoa"
+#~ msgstr "ë¯¸êµë ¹ ì?¬ëª¨ì??"
+
+#~ msgid "Andorra"
+#~ msgstr "ì??ë??ë?¼"
+
+#~ msgid "Angola"
+#~ msgstr "ì??ê³¨ë?¼"
+
+#~ msgid "Anguilla"
+#~ msgstr "ì??ê·?ë?¼"
+
+#~ msgid "Antarctica"
+#~ msgstr "ë?¨ê·¹"
+
+#~ msgid "Antigua And Barbuda"
+#~ msgstr "ì??í?°ê°? ë°?ë¶?ë?¤"
+
+#~ msgid "Argentina"
+#~ msgstr "ì??ë¥´í?¨í?°ë??"
+
+#~ msgid "Armenia"
+#~ msgstr "ì??ë¥´ë©?ë??ì??"
+
+#~ msgid "Aruba"
+#~ msgstr "ì??ë£¨ë°?"
+
+#~ msgid "Australia"
+#~ msgstr "ì?¤ì?¤í?¸ë ?ì?¼ë¦¬ì??"
+
+#~ msgid "Austria"
+#~ msgstr "ì?¤ì?¤í?¸ë¦¬ì??"
+
+#~ msgid "Azerbaijan"
+#~ msgstr "ì??ì ?ë¥´ë°?ì?´ì??"
+
+#~ msgid "Bahamas"
+#~ msgstr "ë°?í??ë§?"
+
+#~ msgid "Bahrain"
+#~ msgstr "ë°?ë ?ì?¸"
+
+#~ msgid "Bangladesh"
+#~ msgstr "ë°©ê¸?ë?¼ë?°ì??"
+
+#~ msgid "Barbados"
+#~ msgstr "ë°?ë¥´ë°?ë??ì?¤"
+
+#~ msgid "Belarus"
+#~ msgstr "ë²¨ë?¼ë£¨ì?¤"
+
+#~ msgid "Belgium"
+#~ msgstr "ë²¨ê¸°ì??"
+
+#~ msgid "Belize"
+#~ msgstr "ë²¨ë¦¬ì¦?"
+
+#~ msgid "Benin"
+#~ msgstr "ë² ë??"
+
+#~ msgid "Bermuda"
+#~ msgstr "ë²?ë®¤ë?¤"
+
+#~ msgid "Bhutan"
+#~ msgstr "ë¶?í??"
+
+#~ msgid "Bolivia"
+#~ msgstr "ë³¼ë¦¬ë¹?ì??"
+
+#~ msgid "Bosnia And Herzegowina"
+#~ msgstr "ë³´ì?¤ë??ì?? í?¤ë¥´ì²´ì½?ë¹?ë??"
+
+#~ msgid "Botswana"
+#~ msgstr "ë³´ì¸ ì??ë??"
+
+#~ msgid "Bouvet Island"
+#~ msgstr "ë³´ì?°ë²³ ì?¬"
+
+#~ msgid "Brazil"
+#~ msgstr "ë¸?ë?¼ì§?"
+
+#~ msgid "British Indian Ocean Territory"
+#~ msgstr "ì??êµë ¹ ì?¸ë??ì?? ì??ì¹?êµ¬ì?"
+
+#~ msgid "Brunei Darussalam"
+#~ msgstr "ë¸?ë£¨ë??ì?´ ë?¤ë£¨ì?´ë??"
+
+#~ msgid "Bulgaria"
+#~ msgstr "ë¶?ê°?ë¦¬ì??"
+
+#~ msgid "Burkina Faso"
+#~ msgstr "ë¶?ë¥´í?¤ë?? í??ì??"
+
+#~ msgid "Burundi"
+#~ msgstr "ë¶?ë£¬ë??"
+
+#~ msgid "Cambodia"
+#~ msgstr "ìº?ë³´ë??ì??"
+
+#~ msgid "Cameroon"
+#~ msgstr "ì¹´ë©?ë£¬"
+
+#~ msgid "Canada"
+#~ msgstr "ìº?ë??ë?¤"
+
+#~ msgid "Cape Verde"
+#~ msgstr "ì¼?ì?´í?? ë² ë¥´ë??"
+
+#~ msgid "Cayman Islands"
+#~ msgstr "ì¼?ì?´ë§? ì ?ë??"
+
+#~ msgid "Central African Republic"
+#~ msgstr "ì¤?ì?? ì??í??ë¦¬ì¹´ ê³µí??êµ"
+
+#~ msgid "Chad"
+#~ msgstr "ì± ë??"
+
+#~ msgid "Chile"
+#~ msgstr "ì¹ ë ?"
+
+#~ msgid "China"
+#~ msgstr "ì¤?êµ"
+
+#~ msgid "Christmas Island"
+#~ msgstr "í?¬ë¦¬ì?¤ë§?ì?¤ ì?¬"
+
+#~ msgid "Cocos (Keeling) Islands"
+#~ msgstr "ì½?ì½?ì?¤ (í?¬ë§?) ì ?ë??"
+
+#~ msgid "Colombia"
+#~ msgstr "ì½?ë¡¬ë¹?ì??"
+
+#~ msgid "Comoros"
+#~ msgstr "ì½?ëª¨ë¡?ì?¤"
+
+#~ msgid "Congo"
+#~ msgstr "ì½©ê³ "
+
+#~ msgid "Congo, The Democratic Republic Of The"
+#~ msgstr "ì½©ê³  ë¯¼ì£¼ ê³µí??êµ"
+
+#~ msgid "Cook Islands"
+#~ msgstr "ì¿¡ ì ?ë??"
+
+#~ msgid "Costa Rica"
+#~ msgstr "ì½?ì?¤í??ë¦¬ì¹´"
+
+#~ msgid "Cote d'Ivoire"
+#~ msgstr "ì½?í?¸ ë??ë¸?ì??ë¥´"
+
+#~ msgid "Croatia"
+#~ msgstr "í?¬ë¡?ì??í?°ì??"
+
+#~ msgid "Cuba"
+#~ msgstr "ì¿ ë°?"
+
+#~ msgid "Cyprus"
+#~ msgstr "ì?¬ì?´í??ë?¬ì?¤"
+
+#~ msgid "Czech Republic"
+#~ msgstr "ì²´ì½? ê³µí??êµ"
+
+#~ msgid "Denmark"
+#~ msgstr "ë?´ë§?í?¬"
+
+#~ msgid "Djibouti"
+#~ msgstr "ì§?ë¶?í?°"
+
+#~ msgid "Dominica"
+#~ msgstr "ë??ë¯¸ë??ì¹´"
+
+#~ msgid "Dominican Republic"
+#~ msgstr "ë??ë¯¸ë??ì¹´ ê³µí??êµ"
+
+#~ msgid "Ecuador"
+#~ msgstr "ì??ì¿ ì??ë??ë¥´"
+
+#~ msgid "Egypt"
+#~ msgstr "ì?´ì§?í?¸"
+
+#~ msgid "El Salvador"
+#~ msgstr "ì?? ì?´ë°?ë??ë¥´"
+
+#~ msgid "Equatorial Guinea"
+#~ msgstr "ì ?ë??ê¸°ë??"
+
+#~ msgid "Eritrea"
+#~ msgstr "ì??ë¦¬í?¸ë¦¬ì??"
+
+#~ msgid "Estonia"
+#~ msgstr "ì??ì?¤í? ë??ì??"
+
+#~ msgid "Ethiopia"
+#~ msgstr "ì??í?°ì?¤í?¼ì??"
+
+#~ msgid "Falkland Islands"
+#~ msgstr "í?¬í?´ë??ë?? ì ?ë??"
+
+#~ msgid "Faroe Islands"
+#~ msgstr "í?¨ë¡? ì ?ë??"
+
+#~ msgid "Fiji"
+#~ msgstr "í?¼ì§?"
+
+#~ msgid "Finland"
+#~ msgstr "í??ë??ë??"
+
+#~ msgid "France"
+#~ msgstr "í??ë??ì?¤"
+
+#~ msgid "French Guiana"
+#~ msgstr "í??ë??ì?¤ë ¹ ê¸°ì??ë??"
+
+#~ msgid "French Polynesia"
+#~ msgstr "í??ë??ì?¤ë ¹ í?´ë¦¬ë?¤ì??ì??"
+
+#~ msgid "French Southern Territories"
+#~ msgstr "í??ë??ì?¤ë ¹ ë?¨ ì??ì¹?êµ¬ì?"
+
+#~ msgid "Gabon"
+#~ msgstr "ê°?ë´?"
+
+#~ msgid "Gambia"
+#~ msgstr "ê°?ë¹?ì??"
+
+#~ msgid "Georgia"
+#~ msgstr "ê·¸ë£¨ì§?ì??"
+
+#~ msgid "Germany"
+#~ msgstr "ë??ì?¼"
+
+#~ msgid "Ghana"
+#~ msgstr "ê°?ë??"
+
+#~ msgid "Gibraltar"
+#~ msgstr "ì§?ë¸?ë¡¤í?°"
+
+#~ msgid "Greece"
+#~ msgstr "ê·¸ë¦¬ì?¤"
+
+#~ msgid "Greenland"
+#~ msgstr "ê·¸ë¦°ë??ë??"
+
+#~ msgid "Grenada"
+#~ msgstr "ê·¸ë ?ë??ë?¤"
+
+#~ msgid "Guadeloupe"
+#~ msgstr "ê³¼ë?¬ë£¨í??"
+
+#~ msgid "Guam"
+#~ msgstr "ê´?"
+
+#~ msgid "Guatemala"
+#~ msgstr "ê³¼í??ë§?ë?¼"
+
+#~ msgid "Guernsey"
+#~ msgstr "ê±´ì§?"
+
+#~ msgid "Guinea"
+#~ msgstr "ê¸°ë??"
+
+#~ msgid "Guinea-Bissau"
+#~ msgstr "ê¸°ë??ë¹?ì?¬ì?°"
+
+#~ msgid "Guyana"
+#~ msgstr "ê°?ì?´ì??ë??"
+
+#~ msgid "Haiti"
+#~ msgstr "í??ì?´í?°"
+
+#~ msgid "Heard And McDonald Islands"
+#~ msgstr "í??ë?? ë§¥ë??ë??ë?? ì ?ë??"
+
+#~ msgid "Holy See"
+#~ msgstr "ë°?í?°ì¹¸"
+
+#~ msgid "Honduras"
+#~ msgstr "í?¼ë??ë?¼ì?¤"
+
+#~ msgid "Hong Kong"
+#~ msgstr "í??ì½©"
+
+#~ msgid "Hungary"
+#~ msgstr "í??ê°?ë¦¬"
+
+#~ msgid "Iceland"
+#~ msgstr "ì??ì?´ì?¬ë??ë??"
+
+#~ msgid "India"
+#~ msgstr "ì?¸ë??"
+
+#~ msgid "Indonesia"
+#~ msgstr "ì?¸ë??ë?¤ì??ì??"
+
+#~ msgid "Iran"
+#~ msgstr "ì?´ë??"
+
+#~ msgid "Iraq"
+#~ msgstr "ì?´ë?¼í?¬"
+
+#~ msgid "Ireland"
+#~ msgstr "ì??ì?¼ë??ë??"
+
+#~ msgid "Isle of Man"
+#~ msgstr "ë§¨ ì?¬"
+
+#~ msgid "Israel"
+#~ msgstr "ì?´ì?¤ë?¼ì??"
+
+#~ msgid "Italy"
+#~ msgstr "ì?´í??ë¦¬ì??"
+
+#~ msgid "Jamaica"
+#~ msgstr "ì??ë©?ì?´ì¹´"
+
+#~ msgid "Japan"
+#~ msgstr "ì?¼ë³¸"
+
+#~ msgid "Jersey"
+#~ msgstr "ì ?ì§?"
+
+#~ msgid "Jordan"
+#~ msgstr "ì??ë¥´ë?¨"
+
+#~ msgid "Kazakhstan"
+#~ msgstr "ì¹´ì??í??ì?¤í??"
+
+#~ msgid "Kenya"
+#~ msgstr "ì¼?ë??"
+
+#~ msgid "Kiribati"
+#~ msgstr "í?¤ë¦¬ë°?í?°"
+
+#~ msgid "Korea, Democratic People's Republic Of"
+#~ msgstr "ì¡°ì? ë¯¼ì£¼ì£¼ì??ì?¸ë¯¼ê³µí??êµ"
+
+#~ msgid "Korea, Republic Of"
+#~ msgstr "ë??í??ë¯¼êµ"
+
+#~ msgid "Kuwait"
+#~ msgstr "ì¿ ì?¨ì?´í?¸"
+
+#~ msgid "Kyrgyzstan"
+#~ msgstr "í?¤ë¥´ê¸°ì¦?ì?¤í??"
+
+#~ msgid "Laos"
+#~ msgstr "ë?¼ì?¤ì?¤"
+
+#~ msgid "Latvia"
+#~ msgstr "ë?¼í?¸ë¹?ì??"
+
+#~ msgid "Lebanon"
+#~ msgstr "ë ?ë°?ë?¼"
+
+#~ msgid "Lesotho"
+#~ msgstr "ë ?ì??í? "
+
+#~ msgid "Liberia"
+#~ msgstr "ë?¼ì?´ë² ë¦¬ì??"
+
+#~ msgid "Libya"
+#~ msgstr "ë¦¬ë¹?ì??"
+
+#~ msgid "Liechtenstein"
+#~ msgstr "ë¦¬í??í??ì??í??ì?¸"
+
+#~ msgid "Lithuania"
+#~ msgstr "ë¦¬í?¬ì??ë??ì??"
+
+#~ msgid "Luxembourg"
+#~ msgstr "ë£©ì??ë¶?ë¥´í?¬"
+
+#~ msgid "Macao"
+#~ msgstr "ë§?ì¹´ì?¤"
+
+#~ msgid "Macedonia"
+#~ msgstr "ë§?ì¼?ë??ë??ì??"
+
+#~ msgid "Madagascar"
+#~ msgstr "ë§?ë?¤ê°?ì?¤ì¹´ë¥´"
+
+#~ msgid "Malawi"
+#~ msgstr "ë§?ë?¼ì??"
+
+#~ msgid "Malaysia"
+#~ msgstr "ë§?ë ?ì?´ì??ì??"
+
+#~ msgid "Maldives"
+#~ msgstr "ëª°ë??ë¸?"
+
+#~ msgid "Mali"
+#~ msgstr "ë§?ë¦¬"
+
+#~ msgid "Malta"
+#~ msgstr "ëª°í??"
+
+#~ msgid "Marshall Islands"
+#~ msgstr "ë§?ì?¬ ì ?ë??"
+
+#~ msgid "Martinique"
+#~ msgstr "ë§?ë¥´ë? ë??í?¬"
+
+#~ msgid "Mauritania"
+#~ msgstr "ëª¨ë¦¬í??ë??ì??"
+
+#~ msgid "Mauritius"
+#~ msgstr "ëª¨ë¦¬ì??ì?¤"
+
+#~ msgid "Mayotte"
+#~ msgstr "ë§?ì??í?¸"
+
+#~ msgid "Mexico"
+#~ msgstr "ë©?ì??ì½?"
+
+#~ msgid "Micronesia"
+#~ msgstr "ë¯¸í?¬ë¡?ë?¤ì??ì??"
+
+#~ msgid "Moldova, Republic Of"
+#~ msgstr "ëª°ë??ë°?"
+
+#~ msgid "Monaco"
+#~ msgstr "ëª¨ë??ì½?"
+
+#~ msgid "Mongolia"
+#~ msgstr "ëª½ê³¨"
+
+#~ msgid "Montserrat"
+#~ msgstr "ëª½ì?¸ë?¼í?¸"
+
+#~ msgid "Morocco"
+#~ msgstr "ëª¨ë¡?ì½?"
+
+#~ msgid "Mozambique"
+#~ msgstr "ëª¨ì? ë¹?í?¬"
+
+#~ msgid "Myanmar"
+#~ msgstr "ë¯¸ì??ë§?"
+
+#~ msgid "Namibia"
+#~ msgstr "ë??ë¯¸ë¹?ì??"
+
+#~ msgid "Nauru"
+#~ msgstr "ë??ì?°ë£¨"
+
+#~ msgid "Nepal"
+#~ msgstr "ë?¤í??"
+
+#~ msgid "Netherlands"
+#~ msgstr "ë?¤ë??ë??ë??"
+
+#~ msgid "Netherlands Antilles"
+#~ msgstr "ë?¤ë??ë??ë??ë ¹ ì?¤í?¸ë ?ì?¤ ì?´ë??"
+
+#~ msgid "New Caledonia"
+#~ msgstr "ë?´ ì¹¼ë ?ë??ë??ì??"
+
+#~ msgid "New Zealand"
+#~ msgstr "ë?´ì§?ë??ë??"
+
+#~ msgid "Nicaragua"
+#~ msgstr "ë??ì¹´ë?¼ê³¼"
+
+#~ msgid "Niger"
+#~ msgstr "ë??ì ?ë¥´"
+
+#~ msgid "Nigeria"
+#~ msgstr "ë??ì?´ì§?ë¦¬ì??"
+
+#~ msgid "Niue"
+#~ msgstr "ë??ì?°ì??"
+
+#~ msgid "Norfolk Island"
+#~ msgstr "ë?¸í?½ ì?¬"
+
+#~ msgid "Northern Mariana Islands"
+#~ msgstr "ë¶? ë§?ë¦¬ì??ë?? ì ?ë??"
+
+#~ msgid "Norway"
+#~ msgstr "ë?¸ë¥´ì?¨ì?´"
+
+#~ msgid "Oman"
+#~ msgstr "ì?¤ë§?"
+
+#~ msgid "Pakistan"
+#~ msgstr "í??í?¤ì?¤í??"
+
+#~ msgid "Palau"
+#~ msgstr "í??ë?¼ì?°"
+
+#~ msgid "Palestinian Territory"
+#~ msgstr "í??ë ?ì?¤í??ì?¸ ì??ì¹?êµ¬ì?"
+
+#~ msgid "Panama"
+#~ msgstr "í??ë??ë§?"
+
+#~ msgid "Papua New Guinea"
+#~ msgstr "í??í?¸ì?? ë?´ê¸°ë??"
+
+#~ msgid "Paraguay"
+#~ msgstr "í??ë?¼ê³¼ì?´"
+
+#~ msgid "Peru"
+#~ msgstr "í??ë£¨"
+
+#~ msgid "Philippines"
+#~ msgstr "í??ë¦¬í??"
+
+#~ msgid "Pitcairn"
+#~ msgstr "í?¼í?¸ì¼?ì?¸"
+
+#~ msgid "Poland"
+#~ msgstr "í?´ë??ë??"
+
+#~ msgid "Portugal"
+#~ msgstr "í?¬ë¥´í?¬ê°?"
+
+#~ msgid "Puerto Rico"
+#~ msgstr "í?¸ì??ë¥´í? ë¦¬ì½?"
+
+#~ msgid "Qatar"
+#~ msgstr "ì¹´í??ë¥´"
+
+#~ msgid "Reunion"
+#~ msgstr "ë ?ì??ë??ì?¹"
+
+#~ msgid "Romania"
+#~ msgstr "ë£¨ë§?ë??ì??"
+
+#~ msgid "Russian Federation"
+#~ msgstr "ë?¬ì??ì?? ì?°ë°©"
+
+#~ msgid "Rwanda"
+#~ msgstr "ë¥´ì??ë?¤"
+
+#~ msgid "Saint Kitts And Nevis"
+#~ msgstr "ì?¸ì?¸í?¸ í?¤ì¸  ë?¤ë¹?ì?¤"
+
+#~ msgid "Saint Lucia"
+#~ msgstr "ì?¸ì?¸í?¸ ë£¨ì??ì??"
+
+#~ msgid "Saint Vincent And The Grenadines"
+#~ msgstr "ì?¸ì?¸í?¸ ë¹?ì?¼í?¸ ê·¸ë ?ë??ë?¤ì?¸ì¦?"
+
+#~ msgid "Samoa"
+#~ msgstr "ì?¬ëª¨ì??"
+
+#~ msgid "San Marino"
+#~ msgstr "ì?°ë§?ë¦¬ë?¸"
+
+#~ msgid "Sao Tome And Principe"
+#~ msgstr "ì??í?¬ë©? í??ë¦°ì??í??"
+
+#~ msgid "Saudi Arabia"
+#~ msgstr "ì?¬ì?°ë??ì??ë?¼ë¹?ì??"
+
+#~ msgid "Senegal"
+#~ msgstr "ì?¸ë?¤ê°?"
+
+#~ msgid "Serbia And Montenegro"
+#~ msgstr "ì?¸ë¥´ë¹?ì?? ëª¬í??ë?¤ê·¸ë¡?"
+
+#~ msgid "Seychelles"
+#~ msgstr "ì?¸ì?´ì?¸"
+
+#~ msgid "Sierra Leone"
+#~ msgstr "ì??ì??ë?¼ë¦¬ì?¨"
+
+#~ msgid "Singapore"
+#~ msgstr "ì?±ê°?í?¬ë¥´"
+
+#~ msgid "Slovakia"
+#~ msgstr "ì?¬ë¡?ë°?í?¤ì??"
+
+#~ msgid "Slovenia"
+#~ msgstr "ì?¬ë¡?ë² ë??ì??"
+
+#~ msgid "Solomon Islands"
+#~ msgstr "ì??ë¡?ëª¬ ì ?ë??"
+
+#~ msgid "Somalia"
+#~ msgstr "ì??ë§?ë¦¬ì??"
+
+#~ msgid "South Africa"
+#~ msgstr "ë?¨ ì??í??ë¦¬ì¹´ ê³µí??êµ"
+
+#~ msgid "South Georgia And The South Sandwich Islands"
+#~ msgstr "ë?¨ ì¡°ì§?ì?? ë?¨ ì??ë??ì??ì¹? ì ?ë??"
+
+#~ msgid "Spain"
+#~ msgstr "ì?¤í??ì?¸"
+
+#~ msgid "Sri Lanka"
+#~ msgstr "ì?¤ë¦¬ë??ì¹´"
+
+#~ msgid "St. Helena"
+#~ msgstr "ì?¸ì?¸í?¸ í?¬ë ?ë??"
+
+#~ msgid "St. Pierre And Miquelon"
+#~ msgstr "ì?© í?¼ì??ë¥´ ë¯¸ì¼?ë¡ "
+
+#~ msgid "Sudan"
+#~ msgstr "ì??ë?¨"
+
+#~ msgid "Suriname"
+#~ msgstr "ì??ë¦¬ë?¨"
+
+#~ msgid "Svalbard And Jan Mayen Islands"
+#~ msgstr "ì?¤ë°?ë°?ë¥´ë?? ì??ë§?ì?´ì?? ì ?ë??"
+
+#~ msgid "Swaziland"
+#~ msgstr "ì?¤ì??ì§?ë??ë??"
+
+#~ msgid "Sweden"
+#~ msgstr "ì?¤ì?¨ë?´"
+
+#~ msgid "Switzerland"
+#~ msgstr "ì?¤ì??ì?¤"
+
+#~ msgid "Syria"
+#~ msgstr "ì??ë¦¬ì??"
+
+#~ msgid "Taiwan"
+#~ msgstr "í??ì?´ì??"
+
+#~ msgid "Tajikistan"
+#~ msgstr "í??ì§?í?¤ì?¤í??"
+
+#~ msgid "Tanzania, United Republic Of"
+#~ msgstr "í??ì??ë??ì?? ì?°ë°© ê³µí??êµ"
+
+#~ msgid "Thailand"
+#~ msgstr "í??êµ"
+
+#~ msgid "Timor-Leste"
+#~ msgstr "ë??í?°ëª¨ë¥´"
+
+#~ msgid "Togo"
+#~ msgstr "í? ê³ "
+
+#~ msgid "Tokelau"
+#~ msgstr "í? ì¼?ë¡?"
+
+#~ msgid "Tonga"
+#~ msgstr "í?µê°?"
+
+#~ msgid "Trinidad And Tobago"
+#~ msgstr "í?¸ë¦¬ë??ë?¤ë?? í? ë°?ê³ "
+
+#~ msgid "Tunisia"
+#~ msgstr "í??ë??ì§?"
+
+#~ msgid "Turkey"
+#~ msgstr "í?°í?¤"
+
+#~ msgid "Turkmenistan"
+#~ msgstr "í?¬ë¥´í?¬ë©?"
+
+#~ msgid "Turks And Caicos Islands"
+#~ msgstr "í?°í?¬ ì?¤ì¼?ì?´ì»¤ì?¤ ì ?ë??"
+
+#~ msgid "Tuvalu"
+#~ msgstr "í?¬ë°?ë£¨"
+
+#~ msgid "Uganda"
+#~ msgstr "ì?°ê°?ë?¤"
+
+#~ msgid "Ukraine"
+#~ msgstr "ì?°í?¬ë?¼ì?´ë??"
+
+#~ msgid "United Arab Emirates"
+#~ msgstr "ì??ë??ì??ë¯¸ë¦¬í?¸ì?°í?©"
+
+#~ msgid "United Kingdom"
+#~ msgstr "ì??êµ"
+
+#~ msgid "United States Minor Outlying Islands"
+#~ msgstr "ë¯¸êµë ¹ ì??êµ°ë??"
+
+#~ msgid "Uruguay"
+#~ msgstr "ì?°ë¥´ê³¼ì?´"
+
+#~ msgid "Uzbekistan"
+#~ msgstr "ì?°ì¦?ë² í?¤ì?¤í??"
+
+#~ msgid "Vanuatu"
+#~ msgstr "ë°?ë??ì??í?¬"
+
+#~ msgid "Venezuela"
+#~ msgstr "ë² ë?¤ì??ì??ë?¼"
+
+#~ msgid "Viet Nam"
+#~ msgstr "ë² í?¸ë?¨"
+
+#~ msgid "Virgin Islands, British"
+#~ msgstr "ë²?ì§? ì ?ë??, ì??êµë ¹"
+
+#~ msgid "Virgin Islands, U.S."
+#~ msgstr "ë²?ì§? ì ?ë??, ë¯¸êµë ¹"
+
+#~ msgid "Wallis And Futuna Islands"
+#~ msgstr "ì??ë¦¬ì?¤ í??í?¬ë?? ì ?ë??"
+
+#~ msgid "Western Sahara"
+#~ msgstr "ì??ë¶? ì?¬í??ë?¼"
+
+#~ msgid "Yemen"
+#~ msgstr "ì??ë©?"
+
+#~ msgid "Zambia"
+#~ msgstr "ì? ë¹?ì??"
+
+#~ msgid "Zimbabwe"
+#~ msgstr "ì§?ë°?ë¸?ì?¨"
+
+#~ msgid "AOL Instant Messenger"
+#~ msgstr "AOL ì?¸ì?¤í?´ì?¤ ë©?ì? ì ?"
+
+#~ msgid "Yahoo Messenger"
+#~ msgstr "ì?¼í?? ë©?ì? ì ?"
+
+#~ msgid "Gadu-Gadu Messenger"
+#~ msgstr "ê°?ë??ê°?ë?? ë©?ì? ì ?"
+
+#~ msgid "Service"
+#~ msgstr "ì??ë¹?ì?¤"
+
+#~ msgid "Username"
+#~ msgstr "ì?¬ì?©ì?? ì?´ë¦?"
+
+#~ msgid "Address _2:"
+#~ msgstr "ì£¼ì?? _2:"
+
+#~ msgid "Ci_ty:"
+#~ msgstr "ë??ì??(_T):"
+
+#~ msgid "Countr_y:"
+#~ msgstr "êµê°?(_Y):"
+
+#~ msgid "Full Address"
+#~ msgstr "ì ?ì?? ì£¼ì??"
+
+#~ msgid "_ZIP Code:"
+#~ msgstr "ì?°í?¸ ë²?í?¸(_Z):"
+
+#~ msgid "Dr."
+#~ msgstr "Dr."
+
+#~ msgid "Esq."
+#~ msgstr "Esq."
+
+#~ msgid "I"
+#~ msgstr "I"
+
+#~ msgid "II"
+#~ msgstr "II"
+
+#~ msgid "III"
+#~ msgstr "III"
+
+#~ msgid "Jr."
+#~ msgstr "Jr."
+
+#~ msgid "Miss"
+#~ msgstr "Miss"
+
+#~ msgid "Mr."
+#~ msgstr "Mr."
+
+#~ msgid "Mrs."
+#~ msgstr "Mrs."
+
+#~ msgid "Ms."
+#~ msgstr "Ms."
+
+#~ msgid "Sr."
+#~ msgstr "Sr."
+
+#~ msgid "Add IM Account"
+#~ msgstr "ë©?ì? ì ? ê³?ì ? ì¶?ê°?"
+
+#~ msgid "_Account name:"
+#~ msgstr "ê³?ì ? ì?´ë¦?(_A):"
+
+#~ msgid "_IM Service:"
+#~ msgstr "ë©?ì? ì ? ì??ë¹?ì?¤(_I):"
+
+#~ msgid "10 pt. Tahoma"
+#~ msgstr "10 í?¬ì?¸í?¸ Tahoma"
+
+#~ msgid "8 pt. Tahoma"
+#~ msgstr "8 í?¬ì?¸í?¸ Tahoma"
+
+#~ msgid "Blank forms at end:"
+#~ msgstr "ë??ë?¨ ë¹?ì?°ê¸°:"
+
+#~ msgid "Body"
+#~ msgstr "ë³¸ë¬¸"
+
+#~ msgid "Bottom:"
+#~ msgstr "ì??ë??:"
+
+#~ msgid "Dimensions:"
+#~ msgstr "í?¬ê¸°:"
+
+#~ msgid "F_ont..."
+#~ msgstr "ê¸?ê¼´(_O)..."
+
+#~ msgid "Fonts"
+#~ msgstr "ê¸?ê¼´"
+
+#~ msgid "Footer:"
+#~ msgstr "ê¼¬ë¦¬ë§?:"
+
+#~ msgid "Header/Footer"
+#~ msgstr "ë¨¸ë¦¬ë§?/ê¼¬ë¦¬ë§?"
+
+#~ msgid "Headings"
+#~ msgstr "ë¨¸ë¦¬ë§?"
+
+#~ msgid "Headings for each letter"
+#~ msgstr "ê°? ì?¥ë§?ë?¤ í??ì ?ë?¬ê¸°"
+
+#~ msgid "Height:"
+#~ msgstr "ë??ì?´:"
+
+#~ msgid "Immediately follow each other"
+#~ msgstr "ê°?ê°?ì?? ì?´ì?´ì?? í??ì??"
+
+#~ msgid "Include:"
+#~ msgstr "í?¬í?¨:"
+
+#~ msgid "Landscape"
+#~ msgstr "ê°?ë¡?"
+
+#~ msgid "Left:"
+#~ msgstr "ì?¼ìª½:"
+
+#~ msgid "Letter tabs on side"
+#~ msgstr "ê°?ì?¥ì??ë¦¬ì?? ì²«ê¸?ì?? í?"
+
+#~ msgid "Margins"
+#~ msgstr "ì?¬ë°±"
+
+#~ msgid "Number of columns:"
+#~ msgstr "ì?´ ì??:"
+
+#~ msgid "Options"
+#~ msgstr "ì?µì??"
+
+#~ msgid "Orientation"
+#~ msgstr "ë°©í?¥"
+
+#~ msgid "Page"
+#~ msgstr "í??ì?´ì§?"
+
+#~ msgid "Page Setup:"
+#~ msgstr "í??ì?´ì§? ì?¤ì ?:"
+
+#~ msgid "Paper"
+#~ msgstr "ì¢?ì?´"
+
+#~ msgid "Paper source:"
+#~ msgstr "ê¸?ì§?ë°©ë²?:"
+
+#~ msgid "Portrait"
+#~ msgstr "ì?¸ë¡?"
+
+#~ msgid "Preview:"
+#~ msgstr "ë¯¸ë¦¬ ë³´ê¸°:"
+
+#~ msgid "Print using gray shading"
+#~ msgstr "í??ì?? ëª?ì??ì?¼ë¡? ì?¸ì??"
+
+#~ msgid "Reverse on even pages"
+#~ msgstr "ì§?ì?? í??ì?´ì§? ë?¤ì§?ê¸°"
+
+#~ msgid "Right:"
+#~ msgstr "ì?¤ë¥¸ìª½:"
+
+#~ msgid "Sections:"
+#~ msgstr "ì?¹ì??:"
+
+#~ msgid "Start on a new page"
+#~ msgstr "ì?? í??ì?´ì§?ë¥¼ ì??ì??í?©ë??ë?¤"
+
+#~ msgid "Style name:"
+#~ msgstr "í??ì?? ì?´ë¦?:"
+
+#~ msgid "Top:"
+#~ msgstr "ì??:"
+
+#~ msgid "Width:"
+#~ msgstr "ë??ë¹?:"
+
+#~ msgid "_Font..."
+#~ msgstr "ê¸?ê¼´(_F)..."
+
+#~ msgid "Whether to use daylight savings time while displaying events."
+#~ msgstr "í??ì?¬ë¥¼ í??ì??í?  ë?? ì?¼ê´? ì ?ì?½ì??ê°?ì?? ì?¬ì?©í?  ì§? ì?¬ë¶?."
+
+#~ msgid "daylight savings time"
+#~ msgstr "ì?¼ê´? ì ?ì?½ ì??ê°?"
+
+# FIXME: bad msgid
+#~ msgid "after"
+#~ msgstr "ë?¤ì?? ë?¤ì??:"
+
+#~ msgid "day(s)"
+#~ msgstr "ì?¼"
+
+#~ msgid "end of appointment"
+#~ msgstr "ì?½ì?? ë??"
+
+#~ msgid "hour(s)"
+#~ msgstr "ì??ê°?"
+
+#~ msgid "minute(s)"
+#~ msgstr "ë¶?"
+
+#~ msgid "Adjust for daylight sa_ving time"
+#~ msgstr "ì?¼ê´? ì ?ì?½ ì??ê°? ì¡°ì ?(_V)"
+
+#~ msgid "Attached message - %s"
+#~ msgstr "ì²¨ë¶?í?? ë©?ì??ì§? - %s"
+
+#~ msgid "<b>%d</b> Attachment"
+#~ msgid_plural "<b>%d</b> Attachments"
+#~ msgstr[0] "<b>%d</b>ê°? ì²¨ë¶?"
+
+#~ msgid "Hide Attachment _Bar"
+#~ msgstr "ì²¨ë¶? ëª¨ì?? ì?¨ê¸°ê¸°(_B)"
+
+#~ msgid "Show Attachment _Bar"
+#~ msgstr "ì²¨ë¶? ëª¨ì?? ë³´ê¸°(_B)"
+
+#~ msgid "Show Attachments"
+#~ msgstr "ì²¨ë¶? ëª¨ì?? ë³´ê¸°"
+
+#~ msgid "Press space key to toggle attachment bar"
+#~ msgstr "ì?¤í??ì?´ì?¤ë¥¼ ë??ë?¬ ì²¨ë¶? ëª¨ì??ì?? í? ê¸?í??ì?ì??ì?¤"
+
+# "Sh_ow a reminder" <NN> <minute(s)/hour(s)/day(s)> "before every appointment"
+# Reminder -> ë¯¸ë¦¬ ì??ë¦¼, Microsoft Office XP
+#~ msgid "1 day before appointment"
+#~ msgstr "ì?½ì?? í??ë£¨ ì ?ì??"
+
+# "Sh_ow a reminder" <NN> <minute(s)/hour(s)/day(s)> "before every appointment"
+# Reminder -> ë¯¸ë¦¬ ì??ë¦¼, Microsoft Office XP
+#~ msgid "1 hour before appointment"
+#~ msgstr "ì?½ì?? í?? ì??ê°? ì ?ì??"
+
+# "Sh_ow a reminder" <NN> <minute(s)/hour(s)/day(s)> "before every appointment"
+# Reminder -> ë¯¸ë¦¬ ì??ë¦¼, Microsoft Office XP
+#~ msgid "15 minutes before appointment"
+#~ msgstr "ì?½ì?? 15ë¶? ì ?ì??"
+
+# FIXME - hard to translate UI + string based on English grammar
+# "for ... occurrences"
+#~ msgid "for"
+#~ msgstr "ì§?ì??:"
+
+#~ msgid "<b>Att_endees</b>"
+#~ msgstr "<b>ì°¸ì??ì??(_E)</b> "
+
+#~ msgid "C_hange Organizer"
+#~ msgstr "ì£¼ìµ?ì?? ë°?ê¾¸ê¸°(_H)"
+
+#~ msgid "Co_ntacts..."
+#~ msgstr "ì?°ë?½ì²?(_N)..."
+
+# FIXME - hard to translate UI + string based on English grammar
+# "for ... occurrences"
+#~ msgid "forever"
+#~ msgstr "ì??ì??í??"
+
+# FIXME - hard to translate UI + string based on English grammar
+# "for ... occurrences"
+#~ msgid "month(s)"
+#~ msgstr "ë?¬"
+
+# FIXME - hard to translate UI + string based on English grammar
+# "for ... occurrences"
+#~ msgid "week(s)"
+#~ msgstr "ì£¼"
+
+# FIXME - hard to translate UI + string based on English grammar
+# "for ... occurrences"
+#~ msgid "year(s)"
+#~ msgstr "ë??"
+
+#~ msgid "_Save Selected"
+#~ msgstr "ì? í??í?? ì?¬í? ì ?ì?¥(_S)"
+
+#~ msgid "Could not open autosave file"
+#~ msgstr "ì??ë?? ì ?ì?¥ í??ì?¼ì?? ì?´ ì?? ì??ì?µë??ë?¤"
+
+#~ msgid "_Post-To Field"
+#~ msgstr "ì?¬ë¦¬ë?? ê³³ í?ëª©(_P)"
+
+#~ msgid "Toggles whether the Post-To field is displayed"
+#~ msgstr "ì?¬ë¦¬ë?? ê³³ í?ëª©ì?? í??ì??í?  ì§? í? ê¸?í?©ë??ë?¤"
+
+#~ msgid "_Subject Field"
+#~ msgstr "ì ?ëª© í?ëª©(_S)"
+
+#~ msgid "Toggles whether the Subject field is displayed"
+#~ msgstr "ì ?ëª© í?ëª©ì?? í??ì??í?  ì§? í? ê¸?í?©ë??ë?¤"
+
+#~ msgid "_To Field"
+#~ msgstr "ë°?ë?? ì?¬ë?? í?ëª©(_T)"
+
+#~ msgid "Toggles whether the To field is displayed"
+#~ msgstr "ë°?ë?? ì?¬ë?? í?ëª©ì?? í??ì??í?  ì§? í? ê¸?í?©ë??ë?¤"
+
+#~ msgid "ago"
+#~ msgstr "ì ?ì??"
+
+#~ msgid "months"
+#~ msgstr "ë?¬"
+
+#~ msgid "the current time"
+#~ msgstr "í??ì?¬ ì??ê°?"
+
+#~ msgid "the time you specify"
+#~ msgstr "ì§?ì ?í??ë?? ì??ê°?"
+
+#~ msgid "years"
+#~ msgstr "ì?°ë??"
+
+#~ msgid "Retrieving Message..."
+#~ msgstr "ë©?ì??ì§?ë¥¼ ê°?ì ¸ì?¤ë?? ì¤?..."
+
+#~ msgid "C_all To..."
+#~ msgstr "í?¸ì¶?í??ê¸°(_A)..."
+
+#~ msgid "Completed on %B %d, %Y, %l:%M %p"
+#~ msgstr "ë§?ì¹¨: %Yë?? %B %eì?¼, %p %l:%M"
+
+#~ msgid "by %B %d, %Y, %l:%M %p"
+#~ msgstr "%Yë?? %B %eì?¼, %p %l:%Mê¹?ì§?"
+
+#~ msgid "Save attachment as"
+#~ msgstr "ë?¤ë¥¸ ì?´ë¦?ì?¼ë¡? ì²¨ë¶? ë¬¸ì?? ì ?ì?¥"
+
+#~ msgid "_Save Selected..."
+#~ msgstr "ì? í??í?? ì?¬í? ì ?ì?¥(_S)..."
+
+#~ msgid "%d at_tachment"
+#~ msgid_plural "%d at_tachments"
+#~ msgstr[0] "%dê°? ì²¨ë¶?(_T)"
+
+#~ msgid "S_ave"
+#~ msgstr "ì ?ì?¥(_A)"
+
+#~ msgid "No Attachment"
+#~ msgstr "ì²¨ë¶? ì??ì??"
+
+#~ msgid " (%a, %R %Z)"
+#~ msgstr " (%a, %R %Z)"
+
+#~ msgid " (%R %Z)"
+#~ msgstr " (%R %Z)"
+
+#~ msgid ""
+#~ "Enable side bar search feature so that you can start interactive "
+#~ "searching by typing in the text. Use is that you can easily find a folder "
+#~ "in that side bar by just typing the folder name and the selection jumps "
+#~ "automatically to that folder."
+#~ msgstr ""
+#~ "ë³´ì¡° ëª¨ì??ì?? ì°¾ê¸° ê¸°ë?¥ì?? ì?¬ì?©í?´ í??ì?¤í?¸ë¥¼ ì??ë ¥í?´ì?? ì°¾ê¸°ë¥¼ ì??ì??í?  ì?? ì??ì?µë??"
+#~ "ë?¤. í?´ë??ì?? ì?´ë¦?ì?? ì??ë ¥í??ë©´ ë³´ì¡° ëª¨ì??ì?? ì??ë?? í?´ë?¹ í?´ë??ë¡? ë°?ë¡? ì?´ë??í?©ë??ë?¤."
+
+#~ msgid "View/Bcc menu item is checked"
+#~ msgstr "ë³´ê¸°/ì?¨ì?? ì°¸ì¡° ë©?ë?´ í?ëª©ì?´ ì²´í?¬"
+
+#~ msgid "View/Bcc menu item is checked."
+#~ msgstr "ë³´ê¸°/ì?¨ì??_ì°¸ì¡° ë©?ë?´ í?ëª©ì?´ ì²´í?¬."
+
+#~ msgid "View/Cc menu item is checked"
+#~ msgstr "ë³´ê¸°/ì°¸ì¡° ë©?ë?´ í?ëª©ì?´ ì²´í?¬"
+
+#~ msgid "View/Cc menu item is checked."
+#~ msgstr "ë³´ê¸°/ì°¸ì¡° ë©?ë?´ í?ëª©ì?´ ì²´í?¬."
+
+#~ msgid "View/From menu item is checked"
+#~ msgstr "ë³´ê¸°/ë³´ë?¸ ì?¬ë?? ë©?ë?´ í?ëª©ì?´ ì²´í?¬"
+
+#~ msgid "View/From menu item is checked."
+#~ msgstr "ë³´ê¸°/ë³´ë?¸ ì?¬ë?? ë©?ë?´ í?ëª©ì?´ ì²´í?¬."
+
+#~ msgid "View/PostTo menu item is checked"
+#~ msgstr "ë³´ê¸°/ê²?ì??_ì??ì¹? ë©?ë?´ í?ëª©ì?´ ì²´í?¬"
+
+#~ msgid "View/PostTo menu item is checked."
+#~ msgstr "ë³´ê¸°/ê²?ì??_ì??ì¹? ë©?ë?´ í?ëª©ì?´ ì²´í?¬."
+
+#~ msgid "View/ReplyTo menu item is checked"
+#~ msgstr "ë³´ê¸°/í??ì? _ì£¼ì?? ë©?ë?´ í?ëª©ì?´ ì²´í?¬"
+
+#~ msgid "View/ReplyTo menu item is checked."
+#~ msgstr "ë³´ê¸°/í??ì? _ì£¼ì?? ë©?ë?´ í?ëª©ì?´ ì²´í?¬."
+
+#~ msgid " Ch_eck for Supported Types "
+#~ msgstr "ì§?ì??í??ë?? ë°©ì?? í??ì?¸(_E)"
+
+#~ msgid "Ch_eck for Supported Types "
+#~ msgstr "ì§?ì??í??ë?? ë°©ì?? í??ì?¸(_E)"
+
+#~ msgid "Do not quote"
+#~ msgstr "ì?¸ì?©í??ì§? ì??ê¸°"
+
+#~ msgid "Inline"
+#~ msgstr "ì?¸ë?¼ì?¸"
+
+#~ msgid "Inline (Outlook style)"
+#~ msgstr "ì?¸ë?¼ì?¸ (Outlook ë°©ì??)"
+
+#~ msgid "Quoted"
+#~ msgstr "ì?¸ì?©"
+
+#~ msgid "S_OCKS Host:"
+#~ msgstr "SOCKS í?¸ì?¤í?¸(_O):"
+
+#~ msgid "Select Drafts Folder"
+#~ msgstr "ê¸°ë³¸ í?´ë?? ì? í??"
+
+#~ msgid "Select Sent Folder"
+#~ msgstr "ë³´ë?¸ í?¸ì§?í?¨ í?´ë?? ì? í??"
+
+#~ msgid "_Automatic proxy configuration URL:"
+#~ msgstr "ì??ë?? í??ë¡?ì?? ì?¤ì ? URL(_A):"
+
+#~ msgid "Case _sensitive"
+#~ msgstr "ë??ì??ë¬¸ì?? êµ¬ë³?(_S)"
+
+#~ msgid "F_ind:"
+#~ msgstr "ì°¾ê¸°(_I):"
+
+#~ msgid "Find in Message"
+#~ msgstr "ë©?ì??ì§?ì??ì?? ì°¾ì??"
+
+#~ msgid "None Selected"
+#~ msgstr "ì? í??í??ì§? ì??ì??ì?µë??ë?¤"
+
+#~ msgid "Provides core functionality for local address books."
+#~ msgstr "ë¡?ì»¬ ì£¼ì??ë¡?ì?? ì£¼ì?? ê¸°ë?¥ì?? ì ?ê³µí?©ë??ë?¤."
+
+#~ msgid ""
+#~ "Looks for clues in a message for mention of attachments and warns if the "
+#~ "attachment is missing"
+#~ msgstr ""
+#~ "ë©?ì??ì§?ì??ì?? ì²¨ë¶? í??ì?¼ì?? ë??í?´ ì?¸ê¸?í?? ê·¼ê±°ë¥¼ ì°¾ì??ë³´ê³  ì²¨ë¶?ê°? ì??ë?¤ë©´ ê²½ê³ ë¥¼ í??"
+#~ "ì??í?©ë??ë?¤."
+
+#~ msgid ""
+#~ "A formatter plugin which displays audio attachments inline and allows you "
+#~ "to play them directly from Evolution."
+#~ msgstr ""
+#~ "ì?¤ë??ì?¤ ì?¸ë?¼ì?¸ ì²¨ë¶?ë¥¼ í??ì??í??ê³  ì??ë³¼ë£¨ì??ì??ì?? ì§?ì ? í??ë ?ì?´í?  ì?? ì??ë?? í?¬ë§¤í?° í??"
+#~ "ë?¬ê·¸ì?¸."
+
+#~ msgid "A plugin for backing up and restore Evolution data and settings."
+#~ msgstr "ì??ë³¼ë£¨ì?? ë?°ì?´í?° ë°? ì?¤ì ?ì?? ë°±ì??í??ê³  ë³µêµ¬í??ë?? í??ë?¬ê·¸ì?¸."
+
+#~ msgid "CalDAV Calendar sources"
+#~ msgstr "CalDAV ë?¬ë ¥ ì??ì?¤"
+
+#~ msgid "Provides core functionality for local calendars."
+#~ msgstr "ë¡?ì»¬ ë?¬ë ¥ì?? ì£¼ì?? ê¸°ë?¥ì?? ì ?ê³µí?©ë??ë?¤."
+
+#~ msgid "HTTP Calendars"
+#~ msgstr "HTTP ë?¬ë ¥"
+
+#~ msgid "Provides core functionality for webcal and http calendars."
+#~ msgstr "webcal ë°? HTTP ë?¬ë ¥ì?? ì£¼ì?? ê¸°ë?¥ì?? ì ?ê³µí?©ë??ë?¤."
+
+#~ msgid "Provides core functionality for weather calendars."
+#~ msgstr "ë? ì?¨ ë?¬ë ¥ì?? ì£¼ì?? ê¸°ë?¥ì?? ì ?ê³µí?©ë??ë?¤."
+
+#~ msgid ""
+#~ "A test plugin which demonstrates a popup menu plugin which lets you copy "
+#~ "things to the clipboard."
+#~ msgstr "í??ì?? ë©?ë?´ í??ë?¬ê·¸ì?¸ ë?°ëª¨ í??ì?¤í?¸ í??ë?¬ê·¸ì?¸. í?´ë¦½ë³´ë??ë¡? ë³µì?¬í?©ë??ë?¤."
+
+#~ msgid ""
+#~ "Provides functionality for marking a calendar or an address book as the "
+#~ "default one."
+#~ msgstr "ë?¬ë ¥ì?´ë?? ì£¼ì??ë¡?ì?? ê¸°ë³¸ê°?ì?¼ë¡? ì§?ì ?í??ë?? ê¸°ë?¥ì?? ì ?ê³µí?©ë??ë?¤."
+
+#~ msgid "S_pecify the mailbox name"
+#~ msgstr "ë©?ì?¼í?¨ ì?´ë¦? ì§?ì ?(_P)"
+
+#~ msgid ""
+#~ "A plugin that manages a collection of Exchange account specific "
+#~ "operations and features."
+#~ msgstr "ì?µì?¤ì²´ì?¸ì§? ê³?ì ? ê´?ë ¨ ë??ì??ì?´ë?? ê¸°ë?¥ë?¤ì?? ê´?ë¦¬í??ë?? í??ë?¬ê·¸ì?¸."
+
+#~ msgid "Compose messages using an external editor"
+#~ msgstr "ì?¸ë¶? í?¸ì§?ê¸°ë¥¼ ì?¬ì?©í?´ ë©?ì??ì§? ì??ì?±"
+
+#~ msgid "Allows unsubscribing of mail folders in the side bar context menu."
+#~ msgstr ""
+#~ "ê°?ì?¥ì??ë¦¬ ì°½ì?? ì»¨í??ì?¤í?¸ ë©?ë?´ì??ì?? ë©?ì?¼ í?´ë??ë¥¼ êµ¬ë?? í?´ì ?í?  ì?? ì??ê²? í?©ë??ë?¤."
+
+#~ msgid "A plugin to setup Google Calendar and Contacts."
+#~ msgstr "êµ¬ê¸? ìº?ë¦°í?° ë°? ì£¼ì??ë¡?ì?? ì?¤ì ?í??ë?? í??ë?¬ê·¸ì?¸."
+
+#~ msgid "Google sources"
+#~ msgstr "êµ¬ê¸? ì??ì?¤"
+
+#~ msgid "A plugin to setup GroupWise calendar and contacts sources."
+#~ msgstr "ê·¸ë£¹ì??ì?´ì¦? ë?¬ë ¥ ë°? ì?°ë?½ì²? ì??ì?¤ë¥¼ ì?¤ì ?í??ë?? í??ë?¬ê·¸ì?¸."
+
+#~ msgid "A plugin to setup hula calendar sources."
+#~ msgstr "hula ë?¬ë ¥ ì??ì?¤ë¥¼ ì?¤ì ?í??ë?? í??ë?¬ê·¸ì?¸."
+
+#~ msgid "Hula Account Setup"
+#~ msgstr "Hula ê³?ì ? ì?¤ì ?"
+
+#~ msgid "A plugin for the features in the IMAP accounts."
+#~ msgstr "IMAP ê³?ì ? ê¸°ë?¥ì?? ë??í?? í??ë?¬ê·¸ì?¸."
+
+#~ msgid "_Import to Calendar"
+#~ msgstr "ë?¬ë ¥ì?¼ë¡? ê°?ì ¸ì?¤ê¸°(_I)"
+
+#~ msgid "Import ICS"
+#~ msgstr "ICS ê°?ì ¸ì?¤ê¸°"
+
+#~ msgid "Imports ICS attachments to calendar."
+#~ msgstr "ICS ì²¨ë¶? í??ì?¼ì?? ë?¬ë ¥ì?¼ë¡? ê°?ì ¸ì?µë??ë?¤."
+
+#~ msgid ""
+#~ "Synchronize the selected task/memo/calendar/address book with Apple iPod"
+#~ msgstr "ì? í??í?? ì??ì??/ë©?ëª¨/ë?¬ë ¥/ì£¼ì??ë¡?ì?? ì? í?? ì??ì?´í??ê³¼ ë??ê¸°í??"
+
+#~ msgid "_Tasks :"
+#~ msgstr "ì??ì??(_T):"
+
+#~ msgid "Memos :"
+#~ msgstr "ë©?ëª¨:"
+
+#~ msgid "Allows disabling of accounts."
+#~ msgstr "ê³?ì ?ì?? ì?¬ì?©í??ì§? ì??ì?? ì?? ì??ì?µë??ë?¤."
+
+#~ msgid ""
+#~ "Generates a D-Bus message or notifies the user with an icon in "
+#~ "notification area and a notification message whenever a new message has "
+#~ "arrived."
+#~ msgstr ""
+#~ "ì??ë¡?ì?´ ë©?ì??ì§?ê°? ë??ì°©í?  ë??ë§?ë?¤ D-Bus ë©?ì??ì§?ë¥¼ ë³´ë?´ê±°ë?? ì??ë¦¼ ì??ì?ì?? ì??ì?´ì½?"
+#~ "ê³¼ ì??ë¦¼ ë©?ì??ì§?ë¡? ì?¬ì?©ì??ì??ê²? ì??ë¦½ë??ë?¤."
+
+#~ msgid ""
+#~ "A plugin which allows the creation of meetings from the contents of a "
+#~ "mail message."
+#~ msgstr "ë©?ì?¼ ë©?ì??ì§? ë?´ì?©ì??ì?? ëª¨ì??ì?? ë§?ë??ë?? í??ë?¬ê·¸ì?¸."
+
+#~ msgid "Con_vert to Meeting"
+#~ msgstr "ëª¨ì??ì?¼ë¡? ë³?í??(_V)"
+
+#~ msgid "Mail to meeting"
+#~ msgstr "ë©?ì?¼ì??ì?? ëª¨ì??ì?¼ë¡?"
+
+#~ msgid ""
+#~ "A plugin which allows the creation of tasks from the contents of a mail "
+#~ "message."
+#~ msgstr "ë©?ì?¼ ë©?ì??ì§? ë?´ì?©ì??ì?? ì??ì??ì?? ë§?ë??ë?? í??ë?¬ê·¸ì?¸."
+
+#~ msgid "Con_vert to Task"
+#~ msgstr "ì??ì??ì?¼ë¡? ë³?í??(_V)"
+
+#~ msgid "Used for marking all the messages under a folder as read"
+#~ msgstr "í?´ë??ì?? ë?¤ì?´ ì??ë?? ëª¨ë?  ë©?ì??ì§?ë¥¼ ì?½ì?? ê²?ì?¼ë¡? í??ì??í?  ë?? ì?¬ì?©í?©ë??ë?¤"
+
+#~ msgid "A plugin which implements mono plugins."
+#~ msgstr "ëª¨ë?¸ í??ë?¬ê·¸ì?¸ì?? êµ¬í??í??ë?? í??ë?¬ê·¸ì?¸."
+
+#~ msgid "A plugin for managing which plugins are enabled or disabled."
+#~ msgstr "ì?´ë?? í??ë?¬ê·¸ì?¸ì?? ì?¬ì?©í??ê³  ì?¬ì?©í??ì§? ì??ì?? ì§? ê´?ë¦¬í??ë?? í??ë?¬ê·¸ì?¸."
+
+#~ msgid ""
+#~ "A test plugin which demonstrates a formatter plugin which lets you choose "
+#~ "to disable HTML messages.\n"
+#~ "\n"
+#~ "This plugin is unsupported demonstration code only.\n"
+#~ msgstr ""
+#~ "HTML ë©?ì?¼ì?? ì?¬ì?©í??ì§? ì??ë??ë¡? í??ë?? í?¬ë§¤í?° í??ë?¬ê·¸ì?¸ ë?°ëª¨ í??ì?¤í?¸ í??ë?¬ê·¸ì?¸.\n"
+#~ "\n"
+#~ "ì?´ í??ë?¬ê·¸ì?¸ì?? ë?°ëª¨ ì½?ë?? ì ?ì?©ì?´ê³  ì§?ì??í??ì§? ì??ì?µë??ë?¤.\n"
+
+#~ msgid "SpamAssassin (built-in)"
+#~ msgstr "ì?¤í?¸ì?´ì??ì?  (ë?´ë¶?ì?? í?¬í?¨)"
+
+#~ msgid ""
+#~ "Filters junk messages using SpamAssassin. This plugin requires "
+#~ "SpamAssassin to be installed."
+#~ msgstr ""
+#~ "ì?¤í?¸ì?´ì??ì? ì?? ì?´ì?©í?´ ì ?í?¬ë©?ì?¼ì?? ê±¸ë?¬ë??ë??ë?¤. ì?´ í??ë?¬ê·¸ì?¸ì?? ì?¬ì?©í??ë ¤ë©´ ì?¤í?¸ì?´"
+#~ "ì??ì? ì?? ì?¤ì¹?í?´ì?¼ í?©ë??ë?¤."
+
+#~ msgid "A plugin for saving all attachments or parts of a message at once."
+#~ msgstr "ë©?ì??ì§?ì?? ëª¨ë?  ì²¨ë¶?ë¬¼ì?´ë?? ê·¸ ì?¼ë¶?ë¥¼ í?? ë²?ì?? ì ?ì?¥í??ë?? í??ë?¬ê·¸ì?¸."
+
+#~ msgid "Save Attachments..."
+#~ msgstr "ì²¨ë¶? ì ?ì?¥..."
+
+#~ msgid "Save all attachments"
+#~ msgstr "ëª¨ë?  ì²¨ë¶? ì ?ì?¥"
+
+#~ msgid "Select save base name"
+#~ msgstr "ì ?ì?¥í?  ì??ì¹? ì? í??"
+
+#~ msgid "Indicates if threading of messages should fall back to subject."
+#~ msgstr ""
+#~ "ë©?ì??ì§? ê¸?í??ë??ë¡? ë§?ë?¤ ë?? ê¸?í??ë??ê°? ì??ì?¼ë©´ ì ?ëª©ì?? ë?°ë?¼ì?? ê¸?í??ë??ë¥¼ ë§?ë?¤ ì§? ë??"
+#~ "í??ë??ë??ë?¤."
+
+#~ msgid "A simple plugin which uses yTNEF to decode TNEF attachments."
+#~ msgstr "YTNEFë¥¼ ì?¬ì?©í?´ TNEF ì²¨ë¶?ë¥¼ ë??ì½?ë?©í??ë?? ê°?ë?¨í?? í??ë?¬ê·¸ì?¸."
+
+#~ msgid "A plugin to setup WebDAV contacts."
+#~ msgstr "WebDAV ì?°ë?½ì²?ë¥¼ ì?¤ì ?í??ë?? í??ë?¬ê·¸ì?¸."
+
+# post -> ê²?ì??, Microsoft Office XP ì°¸ê³ 
+#~ msgid "Pos_t New Message to Folder"
+#~ msgstr "í?´ë??ì?? ì?? ë©?ì??ì§? ê²?ì??(_T)"
+
+# post -> ê²?ì??, Microsoft Office XP ì°¸ê³ 
+#~ msgid "Post a Repl_y"
+#~ msgstr "í??ì?  ê²?ì??(_Y)"
+
+# post -> ê²?ì??, Microsoft Office XP ì°¸ê³ 
+# public -> ê³µì?©, Microsoft Office XP ì°¸ê³ 
+#~ msgid "Post a message to a Public folder"
+#~ msgstr "ë©?ì??ì§?ë¥¼ ê³µì?© í?´ë??ì?? ê²?ì??í?©ë??ë?¤"
+
+# post -> ê²?ì??, Microsoft Office XP ì°¸ê³ 
+# public -> ê³µì?©, Microsoft Office XP ì°¸ê³ 
+#~ msgid "Post a reply to a message in a Public folder"
+#~ msgstr "ê³µì?© í?´ë??ì?? ë©?ì??ì§?ì?? ë??í?´ í??ì? ì?? ê²?ì??í?©ë??ë?¤"
+
+#~ msgid "Attachment Bar"
+#~ msgstr "ì²¨ë¶? ëª¨ì??"
+
+#~ msgid "Cannot attach file %s: %s"
+#~ msgstr "%s í??ì?¼ì?? ì²¨ë¶?í?  ì?? ì??ì?µë??ë?¤: %s"
+
+#~ msgid "Cannot attach file %s: not a regular file"
+#~ msgstr "%s í??ì?¼ì?? ì²¨ë¶?í?  ì?? ì??ì?µë??ë?¤: ì?¼ë°? í??ì?¼ì?´ ì??ë??ë??ë?¤"
+
+#~ msgid "MIME type:"
+#~ msgstr "MIME í??ì??:"
+
+#~ msgid "Suggest automatic display of attachment"
+#~ msgstr "ì²¨ë¶? í??ì?¼ì?? ì??ë?? í??ì?? ê¶?í??ê¸°"
+
+#~ msgid "Expanded"
+#~ msgstr "í??ì?¥ë?¨"
+
+#~ msgid "Whether or not the expander is expanded"
+#~ msgstr "í??ì?¥ ë?¨ì¶?ê°? í??ì?¥ë??ì??ë?? ì§? ì?¬ë¶?"
+
+#~ msgid "Text of the expander's label"
+#~ msgstr "í??ì?¥ ë?¨ì¶?ì?? ë ?ì?´ë¸? í??ì?¤í?¸"
+
+#~ msgid "Use underline"
+#~ msgstr "ë°?ì¤? ì?¬ì?©"
+
+#~ msgid ""
+#~ "If set, an underline in the text indicates the next character should be "
+#~ "used for the mnemonic accelerator key"
+#~ msgstr ""
+#~ "ì°¸ì?¼ ê²½ì?°, í??ì?¤í?¸ì??ì?? ë°?ì¤?ì?? ì?°ë©´ ê·¸ ë?¤ì?? ë¬¸ì??ê°? ë¹¨ë¦¬ ê°?ê¸° í?¤ë¡? ì?°ì??ë??ë?¤"
+
+#~ msgid "Space to put between the label and the child"
+#~ msgstr "ë ?ì?´ë¸?ê³¼ í??ì?? ì??ì ¯ ì?¬ì?´ì?? ë?£ì?? ê³µë°±"
+
+#~ msgid "Label widget"
+#~ msgstr "ë ?ì?´ë¸? ì??ì ¯"
+
+#~ msgid "A widget to display in place of the usual expander label"
+#~ msgstr "ì?¼ë°?ì ?ì?¸ í??ì?¥ ë?¨ì¶? ë ?ì?´ë¸? ë??ì? ì?? í??ì??í?  ì??ì ¯"
+
+#~ msgid "Indicator Spacing"
+#~ msgstr "í??ì?? ì?¬ë°±"
+
+#~ msgid "Spacing around expander arrow"
+#~ msgstr "í??ì?¥ í??ì?´í?? ì£¼ì??ì?? ì?¬ë°±"
+
+#~ msgid "Current Message"
+#~ msgstr "í??ì?¬ ë©?ì??ì§?"
+
+#~ msgid "Edit Master Category List..."
+#~ msgstr "ì£¼ ë¶?ë¥? ëª©ë¡? í?¸ì§?..."
+
+#~ msgid "Item(s) belong to these _categories:"
+#~ msgstr "ì?´ ë¶?ë¥?ì?? ì??í?? í?ëª©(_C):"
+
+#~ msgid "_Available Categories:"
+#~ msgstr "ì?¬ì?© ê°?ë?¥í?? ë¶?ë¥?(_A):"
+
+#~ msgid "categories"
+#~ msgstr "ë¶?ë¥?"
+
+#~ msgid "%l:%M %p"
+#~ msgstr "%p %l:%M"
+
+#~ msgid "DnD code"
+#~ msgstr "ë??ì?´ë??ê¸° ì½?ë??"
+
+#~ msgid "Full Header"
+#~ msgstr "ì??ì ?í?? ì ?ëª©"
+
+#~ msgid "Font Description"
+#~ msgstr "ê¸?ê¼´ ì?¤ëª?"
+
 #~ msgid ""
 #~ "[Security=Personal;Unclassified;Protected;InConfidence;Secret;Topsecret]"
 #~ msgstr ""
@@ -24315,9 +24765,6 @@ msgstr "í??ì?? ì²?ë¦¬"
 #~ msgid "Enable attachment reminder plugin."
 #~ msgstr "ì²¨ë¶? ì??ë¦¼ í??ë?¬ê·¸ì?¸ ì?¬ì?©."
 
-#~ msgid "Remind _missing attachments"
-#~ msgstr "ì²¨ë¶? ì??ì?? ì??ë¦¬ê¸°(_M)"
-
 #~ msgid "_Refresh:"
 #~ msgstr "ì??ë¡? ê³ ì¹¨(_R):"
 
@@ -24351,9 +24798,6 @@ msgstr "í??ì?? ì²?ë¦¬"
 #~ msgid "'.' and '..' are reserved folder names."
 #~ msgstr "'.' ê³¼ '..'ë?? ì?¸ ì?? ì??ë?? í?´ë?? ì?´ë¦?ì??ë??ë?¤."
 
-#~ msgid "Copy selection to clipboard"
-#~ msgstr "ì? í??í?? ì?¬í?ì?? í?´ë¦½ë³´ë??ë¡? ë³µì?¬í?©ë??ë?¤"
-
 #~ msgid "Cut selection to clipboard"
 #~ msgstr "ì? í??í?? ì?¬í?ì?? í?´ë¦½ë³´ë??ë¡? ì??ë?¼ë??ë??ë?¤"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]