[evolution] Updated Japanese translation

From: Takayuki Kusano <kusano src gnome org>
To: svn-commits-list gnome org
Cc:
Subject: [evolution] Updated Japanese translation
Date: Tue, 22 Sep 2009 16:29:14 +0000 (UTC)
commit 7c80528594c272e3295dae6a4e11e27fd1763466
Author: Takayuki KUSANO <AE5T-KSN asahi-net or jp>
Date:   Wed Sep 23 01:27:57 2009 +0900

    Updated Japanese translation

 po/ja.po |11905 ++++++++++++++++++++++++++++++++------------------------------
 1 files changed, 6186 insertions(+), 5719 deletions(-)
---
diff --git a/po/ja.po b/po/ja.po
index 5601cc1..99033f0 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -5,43 +5,44 @@
 # Takuo KITAME <kitame debian org>, 2001.
 # Takeshi AIHANA <takeshi aihana gmail com>, 2001-2009.
 # Satoru SATOH <ss gnome gr jp>, 2006.
+# Takayuki KUSANO <AE5T-KSN asahi-net or jp>, 2009.
 #
-#: ../shell/main.c:603
+#: ../shell/main.c:631
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution trunk\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-21 12:04+0900\n"
-"PO-Revision-Date: 2009-03-21 12:04+0900\n"
-"Last-Translator: Takeshi AIHANA <takeshi aihana gmail com>\n"
+"Project-Id-Version: evolution gnome-2-28\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
+"product=evolution\n"
+"POT-Creation-Date: 2009-09-23 01:10+0900\n"
+"PO-Revision-Date: 2009-09-23 01:24+0900\n"
+"Last-Translator: Takayuki KUSANO <AE5T-KSN asahi-net or jp>\n"
 "Language-Team: Japanese <gnome-translation gnome gr jp>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ../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 "Evolution ã?¢ã??ã?¬ã?¹å¸³"
 
 #: ../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"
 msgstr[0] "ã??ã?®ã?¢ã??ã?¬ã?¹å¸³ã??ã?©ã?«ã?? (%s) ã?«ã?¯ %då??ã?®ã?«ã?¼ã??ã??ã??ã??ã?¾ã??"
-msgstr[1] "ã??ã?®ã?¢ã??ã?¬ã?¹å¸³ã??ã?©ã?«ã?? (%s) ã?«ã?¯ %då??ã?®ã?«ã?¼ã??ã??ã??ã??ã?¾ã??"
 
 #: ../a11y/addressbook/ea-minicard.c:31
 msgid "Open"
@@ -59,32 +60,32 @@ msgstr "é?£çµ¡å??: "
 msgid "evolution minicard"
 msgstr "Evolution ã??ã??ã?«ã?¼ã??"
 
-#: ../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/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/calendar/ea-cal-view-event.c:279
+#: ../a11y/calendar/ea-cal-view-event.c:277
 msgid "Calendar Event: It has no summary."
 msgstr "ã?«ã?¬ã?³ã??ã?®ã?¤ã??ã?³ã??: ã?µã??ã?ªã?ªã??"
 
-#: ../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 "ã??ã?©ã?¼ã?«ã?¹ã?®å??å¾?"
 
@@ -108,8 +109,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 "ç?¾å?¨æ??å?»ã?®ç¯?å?²ã??è¡¨ç¤º/é?¸æ??ã??ã??ã??ã??ã?®ã??ã?¼ã??ã?«"
 
@@ -120,7 +121,6 @@ msgstr "ç?¾å?¨æ??å?»ã?®ç¯?å?²ã??è¡¨ç¤º/é?¸æ??ã??ã??ã??ã??ã?®ã??ã?¼ã??ã?«"
 msgid "It has %d event."
 msgid_plural "It has %d events."
 msgstr[0] "%då??ã?®ã?¤ã??ã?³ã??ã??ã??"
-msgstr[1] "%då??ã?®ã?¤ã??ã?³ã??ã??ã??"
 
 #. To translators: Here, "It" is either like "Work Week View: July
 #. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
@@ -153,7 +153,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"
 
@@ -164,18 +164,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 "%m/%d (%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/%m/%d (%a)"
 
@@ -183,10 +183,10 @@ msgstr "%Y/%m/%d (%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æ?¥"
 
@@ -196,15 +196,15 @@ 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%eæ?¥"
 
 #: ../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 "GNOME ã?«ã?¬ã?³ã??"
 
@@ -216,11 +216,11 @@ msgstr "æ¤?ç´¢ã??ã?¼"
 msgid "evolution calendar search bar"
 msgstr "Evolution ã?«ã?¬ã?³ã??ã?®æ¤?ç´¢ã??ã?¼"
 
-#: ../a11y/calendar/ea-jump-button.c:147
+#: ../a11y/calendar/ea-jump-button.c:146
 msgid "Jump button"
 msgstr "ã?¸ã?£ã?³ã??ã?»ã??ã?¿ã?³"
 
-#: ../a11y/calendar/ea-jump-button.c:156
+#: ../a11y/calendar/ea-jump-button.c:155
 msgid "Click here, you can find more events."
 msgstr "ã??ã??ã??ã?¯ã?ªã??ã?¯ã??ã??ã?¨ã??ä»?ã?®ã?¤ã??ã?³ã??ã??æ¤?ç´¢ã?§ã??ã?¾ã??"
 
@@ -251,20 +251,20 @@ 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 "ã?»ã?«ã??å??ã??æ?¿ã??ã?¾ã??"
 
@@ -284,17 +284,17 @@ msgstr "ç?³ã??"
 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 "ã?¯ã?ªã??ã?¯"
 
@@ -328,14 +328,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 ""
@@ -389,9 +381,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 ""
 "ç?¾å?¨ã?®ã?¨ã??ã?? Evolution ã??ã??ã?¯ GroupWise ã?·ã?¹ã??ã? ã?®ã?¢ã??ã?¬ã?¹å¸³ã?®ã?¿ã?¢ã?¯ã?»ã?¹å?¯è?½"
 "ã?§ã??ã??GroupWise Frequent Contact ã?¨ Groupwise Personal Contacts ã??ã?©ã?«ã??ã??å??"
@@ -416,7 +408,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 "é?£çµ¡å??ã?®å??é?¤ã?«å¤±æ??ã??ã?¾ã??ã??"
 
@@ -563,104 +555,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 "ã??ã?¤ã?ã??ã??ã?®ã?¢ã??ã?¬ã?¹ã?»ã?¢ã??ã?ªã?±ã?¼ã?·ã?§ã?³ã?»ã??ã?ã??ã?¯ã??èªã?¿è¾¼ã??ã?¾ã??ã??ã?§ã??ã??"
 
 #: ../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 "Evolution ã?¢ã??ã?¬ã?¹å¸³"
 
-#: ../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 "Evolutoin ã?¢ã??ã?¬ã?¹å¸³ã?®ã?¢ã??ã?¬ã?¹ã?»ã??ã??ã??ã?¢ã??ã??"
 
-#: ../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 "Evolution ã?¢ã??ã?¬ã?¹å¸³ã?®ã?¢ã??ã?¬ã?¹ã?»ã??ã?¥ã?¼ã?¢"
 
-#: ../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 "Evolution ã?¢ã??ã?¬ã?¹å¸³ã?®ã?«ã?¼ã??ã?»ã??ã?¥ã?¼ã?¢"
 
-#: ../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 "Evolution ã?¢ã??ã?¬ã?¹å¸³ã?®ã?³ã?³ã??ã?¼ã??ã?³ã??"
 
-#: ../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 "Evolution 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 "Evolution ã??ã?©ã?«ã??è¨å®?ã?³ã?³ã??ã?ã?¼ã?«"
 
-#: ../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
@@ -672,144 +653,192 @@ 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:20
-#: ../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 ã??ã?µã??ã?¼ã??ã??ã?¦ã??ã??å ´"
+"å??ã?«ã?®ã?¿ã??Evolution ã?¯ 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 ã?µã?¼ã??ã?? TLS ã??ã?µã??ã?¼ã??ã??ã?¦ã??ã??å ´"
+"å??ã?«ã?®ã?¿ã??Evolution ã?¯ 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 ã?¾ã??ã?¯ TLS ã??ã?µã??ã?¼ã??ã??ã?¦"
+"ã??ã?ªã??ã?¨ã??ã??ã??ã?¨ã??æ??å?³ã??ã?¦ã??ã?¾ã??ã??å¾?ã?£ã?¦ã??ã??ã?®æ?¥ç¶?ã?¯ã?»ã?ã?¥ã?¢ã?«ã?¯è¡?ã??ã??ã??ã??ã?»"
+"ã?ã?¥ã?ªã??ã?£ä¸?ã?®ç©´ã??ã?¤ã??ã?¦æ?»æ??ã??ã??ã??å?¯è?½æ?§ã??ã??ã??ã?¾ã??ã??"
+
+#: ../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 ""
+"ã??ã??ã?¯ã??Evolution ã??æ?¥ç¶?ã??ã??å??ã?® 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 ""
+"ã??ã??ã?¯ Evolution ã??ã??ã?ªã??ã??èª?è¨¼ã??ã??é??ã?«ä½¿ç?¨ã??ã??æ?¹æ³?ã?§ã??\"E-ã?¡ã?¼ã?«ã?»ã?¢ã??ã?¬ã?¹ã??"
+"ä½¿ã??\" ã??é?¸æ??ã??ã??ã?¨ã??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 "æ¤?ç´¢"
 
-#: ../addressbook/gui/component/addressbook-config.c:1011
+#: ../addressbook/gui/component/addressbook-config.c:1033
 msgid "Downloading"
 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"
@@ -821,7 +850,7 @@ msgstr ""
 "\n"
 "Evolution ã??ã??ä½¿ã??ã?®ã??ã?©ã?«ã??ã??ç§»è¡?ã??ã?¦ã??ã??é??ã??å°?ã??ã??å¾?ã?¡ä¸?ã??ã??..."
 
-#: ../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"
@@ -831,7 +860,7 @@ msgstr ""
 "\n"
 "Evolution ã??ã??ä½¿ã??ã?®ã??ã?©ã?«ã??ã??ç§»è¡?ã??ã?¦ã??ã??é??ã??å°?ã??ã??å¾?ã?¡ä¸?ã??ã??..."
 
-#: ../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"
@@ -841,7 +870,7 @@ msgstr ""
 "\n"
 "Evolution ã??ã??ä½¿ã??ã?®ã??ã?©ã?«ã??ã??ç§»è¡?ã??ã?¦ã??ã??é??ã??å°?ã??ã??å¾?ã?¡ä¸?ã??ã??..."
 
-#: ../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"
@@ -852,18 +881,18 @@ msgstr ""
 "Evolution ã??ã??ä½¿ã??ã?®ã??ã?¤ã?ã??ã??å??æ??ã??ã?¼ã?¿ã??ç§»è¡?ã??ã?¦ã??ã??é??ã??å°?ã??ã??å¾?ã?¡ä¸?ã??ã??..."
 
 #: ../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 "ã??ã?©ã?«ã??å??ã?«ã?¯ '/' ã??å?«ã??ã??ã??ã?¨ã?¯ã?§ã??ã?¾ã??ã??ã??"
 
@@ -876,19 +905,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:1835 ../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
@@ -896,11 +925,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)"
 
@@ -913,20 +941,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:519
+#: ../plugins/publish-calendar/publish-calendar.c:216
 #: ../smime/gui/component.c:49
 msgid "Enter password"
 msgstr "ã??ã?¹ã?¯ã?¼ã??ã?®å?¥å??"
@@ -974,7 +1002,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 "å??ç?´æ?¹å??ã??ã?¤ã?³ã?®ä½?ç½®"
 
@@ -991,10 +1019,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 "è?ªå??è£?å®?ã??ã??é?£çµ¡å??ã?« E-ã?¡ã?¼ã?«ã?»ã?¢ã??ã?¬ã?¹ã??è¡¨ç¤ºã??ã??(_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 "è?ªå??è£?å®?ã?§å¯¾è±¡ã?¨ã?ªã??ã?¢ã??ã?¬ã?¹å¸³"
 
@@ -1003,21 +1044,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 "398"
+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>"
@@ -1030,146 +1069,74 @@ 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"
+"E-ã?¡ã?¼ã?«ã?»ã?¢ã??ã?¬ã?¹ã??ä½¿ã??\n"
+"è?å?¥å?? (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 "E-ã?¡ã?¼ã?«ã?»ã?¢ã??ã?¬ã?¹"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:20
 msgid ""
 "Evolution will use this email address to authenticate you with the server."
 msgstr "ã??ã??ã?§æ??å®?ã??ã?? E-ã?¡ã?¼ã?«ã?»ã?¢ã??ã?¬ã?¹ã??ä½¿ã?£ã?¦ã??ã?ªã??ã?®èª?è¨¼ã??è¡?ã??ã?¾ã??"
 
-#: ../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 ""
+"One\n"
+"Sub"
 
-#. 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 "ä»®æ?³ã??ã?©ã?«ã??"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:29
+#: ../addressbook/gui/component/ldap-config.glade.h:25
 msgid "Search _base:"
 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 ""
-"æ¤?ç´¢ã??ã?£ã?«ã?¿ã?¨ã?¯æ¤?ç´¢ã??ã??ã?ªã??ã?¸ã?§ã?¯ã??ã?®ç¨®é¡?ã?§æ¤?ç´¢ã?®å¯¾è±¡ã?¨ã?ªã??ã??ã?®ã?§ã?? (ã??ã??ã??"
-"å¤?æ?´ã??ã?ªã??ã?£ã??å ´å??ã??ã??ã??ã?©ã?«ã??ã?®æ¤?ç´¢ã??ã?£ã?«ã?¿ã?§ã??ã?? \"äººç?©\" ã?§æ¤?ç´¢ã??ã?¾ã??)"
-
-#: ../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 ã??ã?µã??ã?¼ã??ã??ã?¦ã??ã??å ´"
-"å??ã?«ã?®ã?¿ã??Evolution ã?¯ 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 ã?µã?¼ã??ã?? TLS ã??ã?µã??ã?¼ã??ã??ã?¦ã??ã??å ´"
-"å??ã?«ã?®ã?¿ã??Evolution ã?¯ LDAP ã?µã?¼ã??ã?«æ?¥ç¶?ã?®ã?¿è¡?ã??ã?¾ã??ã??"
-
-#: ../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."
+"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 ""
-"ã??ã?®ã?ªã??ã?·ã?§ã?³ã??æ??å?¹ã?«ã??ã??ã?¨ã??ã??ä½¿ã??ã?®ã?µã?¼ã??ã?? SSL ã?¾ã??ã?¯ TLS ã??ã?µã??ã?¼ã??ã??ã?¦"
-"ã??ã?ªã??ã?¨ã??ã??ã??ã?¨ã??æ??å?³ã??ã?¦ã??ã?¾ã??ã??å¾?ã?£ã?¦ã??ã??ã?®æ?¥ç¶?ã?¯ã?»ã?ã?¥ã?¢ã?«ã?¯è¡?ã??ã??ã??ã??ã?»"
-"ã?ã?¥ã?ªã??ã?£ä¸?ã?®ç©´ã??ã?¤ã??ã?¦æ?»æ??ã??ã??ã??å?¯è?½æ?§ã??ã??ã??ã?¾ã??ã??"
+"æ¤?ç´¢ã??ã?£ã?«ã?¿ã?¨ã?¯æ¤?ç´¢ã??ã??ã?ªã??ã?¸ã?§ã?¯ã??ã?®ç¨®é¡?ã?§æ¤?ç´¢ã?®å¯¾è±¡ã?¨ã?ªã??ã??ã?®ã?§ã??ã??ã??ã??ã??"
+"å¤?æ?´ã??ã?ªã??ã?£ã??å ´å??ã??ã??ã??ã?©ã?«ã??ã?®æ¤?ç´¢ã??ã?£ã?«ã?¿ã?§ã??ã?? \"äººç?©\" ã?§æ¤?ç´¢ã??ã?¾ã??ã??"
 
-#: ../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 "ã?µã??ã?¼ã??ã??ã??æ¤?ç´¢ã??ã?¼ã?¹"
 
-#. 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 "
@@ -1178,25 +1145,13 @@ msgstr ""
 "æ¤?ç´¢ã??ã?¼ã?¹ã?¨ã?¯æ¤?ç´¢ã??é??å§?ã??ã??ã?¨ã?³ã??ã?ªã?®è?å?¥å?? (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."
@@ -1204,16 +1159,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 ""
-"ã??ã??ã?¯ Evolution ã??ã??ã?ªã??ã??èª?è¨¼ã??ã??é??ã?«ä½¿ç?¨ã??ã??æ?¹æ³?ã?§ã??\"E-ã?¡ã?¼ã?«ã?»ã?¢ã??ã?¬ã?¹ã??"
-"ä½¿ã??\" ã??é?¸æ??ã??ã??ã?¨ã??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. "
@@ -1221,87 +1167,61 @@ msgstr ""
 "ã??ã??ã?¯ã??ã??ã?®ã?µã?¼ã??ã?®å??å??ã?§ Evolution ã?®ã??ã?©ã?«ã??ã?»ã??ã?¤ã?³ã?«è¡¨ç¤ºã??ã??ã?¾ã?? (è¡¨ç¤ºç?®"
 "ç??ã?«ã?®ã?¿ä½¿ç?¨ã??ã??ã?¾ã??)"
 
-#: ../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 ""
-"ã??ã??ã?¯ã??Evolution ã??æ?¥ç¶?ã??ã??å??ã?® LDAP ã?µã?¼ã??ã?®ã??ã?¼ã??ç?ªå?·ã?§ã??æ¨?æº?ç??ã?ªã??ã?¼ã??ç?ª"
-"å?·ã??ã?³ã?³ã??ã?»ã??ã??ã?¯ã?¹ã?®ã?ªã?¹ã??ã?«è¡¨ç¤ºã??ã??ã??ã?®ã?§ã??ã??ã??ã??é?¸æ??ã?§ã??ã?¾ã?? (ç?¹å?¥ã?ªç?ªå?·"
-"ã??æ??å®?ã??ã??å¿?è¦?ã??ã??ã??å ´å??ã?¯ã?·ã?¹ã??ã? ç®¡ç??è??ã?«å??ã??å??ã??ã??ã?¦ä¸?ã??ã??)"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:46
-msgid "Using distinguished name (DN)"
-msgstr "è?å?¥å?? (DN) ã??ä½¿ã??"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:47
-msgid "Using email address"
-msgstr "E-ã?¡ã?¼ã?«ã?»ã?¢ã??ã?¬ã?¹ã??ä½¿ã??"
-
-#: ../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)"
 
-#: ../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):"
 
-#: ../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:375
+#: ../calendar/gui/dialogs/event-page.glade.h:24
+#: ../plugins/caldav/caldav-source.c:448
+#: ../plugins/calendar-file/calendar-file.c:293
+#: ../plugins/calendar-http/calendar-http.c:323
+#: ../plugins/calendar-weather/calendar-weather.c:523
+#: ../plugins/google-account-setup/google-source.c:740
+#: ../plugins/google-account-setup/google-contacts-source.c:330
 msgid "minutes"
 msgstr "å??"
 
@@ -1326,44 +1246,42 @@ msgid "<b>Miscellaneous</b>"
 msgstr "<b>ã??ã?®ä»?ã?®æ??å ±</b>"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:6
+msgid "<b>Notes</b>"
+msgstr ""
+
+#: ../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 "é?£çµ¡å??ã?¨ã??ã?£ã?¿"
 
@@ -1372,1276 +1290,259 @@ msgid "Full _Name..."
 msgstr "æ°?å??(_N)..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:15
-#: ../composer/e-msg-composer.c:2494
 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 "Novell GroupWise"
+#: ../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:21
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
 msgid "Personal Information"
 msgstr "å??äººã?®æ??å ±"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
 msgid "Telephone"
 msgstr "é?»è©±"
 
-#. red
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
-#: ../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:24
-#: ../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:25
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "_Anniversary:"
 msgstr "è¨?å¿µæ?¥(_A):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "_Assistant:"
 msgstr "ã?¢ã?·ã?¹ã?¿ã?³ã??(_A):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "_Birthday:"
 msgstr "èª?ç??æ?¥(_B):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: ../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:29
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_City:"
 msgstr "å¸?(_C):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Company:"
 msgstr "ä¼?ç¤¾(_C):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Country:"
 msgstr "å?½(_C):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Department:"
 msgstr "æ??å½?é?¨ç½²(_D):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_File under:"
 msgstr "ã??ã?¡ã?¤ã?«ã?®ã?°ã?«ã?¼ã??(_F);"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Free/Busy:"
 msgstr "Free/Busy(_F):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Home Page:"
 msgstr "ã??ã?¼ã? ã??ã?¼ã?¸(_H):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Manager:"
 msgstr "ã??ã??ã?¼ã?¸ã?£(_M):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
-msgid "_Notes:"
-msgstr "ã?¡ã?¢(_N)):"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_Office:"
 msgstr "ã?ªã??ã?£ã?¹(_O):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
-#: ../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:40
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Profession:"
 msgstr "å?£ä½?(_P):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
 msgid "_Spouse:"
 msgstr "é??å?¶è??(_S):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
-#: ../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:43
-#: ../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:44
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
 msgid "_Video Chat:"
 msgstr "ã??ã??ã?ªã?»ã??ã?£ã??ã??(_V):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:45
+#: ../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:46
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
 msgid "_Web Log:"
 msgstr "ã??ã?ã?°(_W):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
+#: ../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:48
+#: ../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 "ã??ã?«ã??ã?¤ Darussalam"
-
-#: ../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 "St. ã??ã?¬ã??"
-
-#: ../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:706
-#: ../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 "Jabber"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:56
-msgid "Yahoo Messenger"
-msgstr "Yahoo ã?¡ã??ã?»ã?³ã?¸ã?£"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
+#: ../addressbook/gui/widgets/eab-contact-display.c:608
+msgid "Yahoo"
+msgstr "Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:57
-msgid "Gadu-Gadu Messenger"
-msgstr "Gadu-Gadu ã?¡ã??ã?»ã?³ã?¸ã?£"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
+#: ../addressbook/gui/widgets/eab-contact-display.c:609
+msgid "Gadu-Gadu"
+msgstr "Gadu-Gadu"
 
-#: ../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 "GroupWise"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
+#: ../addressbook/gui/widgets/eab-contact-display.c:610
 msgid "Skype"
 msgstr "Skype"
 
-#: ../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:2297
+#: ../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 "Yahoo"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
-#: ../addressbook/gui/widgets/eab-contact-display.c:611
-msgid "Gadu-Gadu"
-msgstr "Gadu-Gadu"
-
-#: ../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 "GroupWise"
-
-#: ../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"
@@ -2649,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 "E-ã?¡ã?¼ã?«(_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)"
 
@@ -2723,111 +1624,48 @@ 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 "ã??ã?¯ã?¿ã?¼"
+msgid ""
+"\n"
+"Mr.\n"
+"Mrs.\n"
+"Ms.\n"
+"Miss\n"
+"Dr."
+msgstr ""
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:2
-msgid "Esq."
-msgstr "æ§?"
+#: ../addressbook/gui/contact-editor/fullname.glade.h:7
+msgid ""
+"\n"
+"Sr.\n"
+"Jr.\n"
+"I\n"
+"II\n"
+"III\n"
+"Esq."
+msgstr ""
 
-#: ../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 "ä¸?ä»£ç?®"
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:5
-msgid "II"
-msgstr "äº?ä»£ç?®"
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:6
-msgid "III"
-msgstr "ä¸?ä»£ç?®"
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:7
-msgid "Jr."
-msgstr "ã?¸ã?¥ã??ã?¢"
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:8
-msgid "Miss"
-msgstr "ã??ã?¹"
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:9
-msgid "Mr."
-msgstr "ã??ã?¹ã?¿ã?¼"
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:10
-msgid "Mrs."
-msgstr "ã??ã?»ã?¹"
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:11
-msgid "Ms."
-msgstr "å¤«äºº"
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:12
-msgid "Sr."
-msgstr "ä¼¯ç?µ"
-
-#: ../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):"
 
-#: ../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 "IM ã?¢ã?«ã?¦ã?³ã??ã?®è¿½å? "
-
-#: ../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 "IM ã?µã?¼ã??ã?¹(_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>"
@@ -2838,9 +1676,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 "é?¸æ??..."
 
@@ -2867,11 +1705,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 "æ?¸ç±?"
 
@@ -2917,27 +1755,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 "ã??ã??ã??ã??ã?®é ?ç?®ã??æ¬¡ã??å?«ã??"
@@ -2951,35 +1789,34 @@ msgstr "E-ã?¡ã?¼ã?«ã??æ¬¡ã?§å§?ã?¾ã??"
 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å??ã?®é?£çµ¡å??"
-msgstr[1] "%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 "ã?¢ã??ã?«"
 
@@ -2996,105 +1833,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:566
+#: ../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:1813 ../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:1820 ../calendar/gui/e-memo-table.c:945
-#: ../composer/e-msg-composer.c:2072 ../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 "ã?¢ã?·ã?¹ã?¿ã?³ã??"
 
@@ -3123,8 +1958,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
@@ -3132,7 +1967,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 "ä¼?ç¤¾"
 
@@ -3181,22 +2016,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 "ã??ã?¼ã??"
 
@@ -3225,14 +2060,14 @@ msgid "Radio"
 msgstr "ã?©ã?¸ã?ª"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:578
+#: ../calendar/gui/e-meeting-list-view.c:576
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:710
+#: ../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 "é??å?¶è??"
 
@@ -3262,55 +2097,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 "ã??ã?©ã?¼ã?«ã?¹ã??ã??"
 
-#: ../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 "é ?ç?®å??ã?®æ??å¤§é?·"
 
@@ -3318,7 +2151,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"
@@ -3328,7 +2161,7 @@ msgstr ""
 "\n"
 "é?£çµ¡å??ã?®æ¤?ç´¢ä¸..."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:181
+#: ../addressbook/gui/widgets/e-minicard-view.c:180
 msgid ""
 "\n"
 "\n"
@@ -3342,7 +2175,7 @@ msgstr ""
 "\n"
 "ã?¾ã??ã?¯ã??ã??ã??ã?«ã?»ã?¯ã?ªã??ã?¯ã??ã?¦æ?°ã??ã??é?£çµ¡å??ã??ä½?æ??ã??ã?¦ä¸?ã??ã??ã??"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:184
+#: ../addressbook/gui/widgets/e-minicard-view.c:183
 msgid ""
 "\n"
 "\n"
@@ -3356,7 +2189,7 @@ msgstr ""
 "\n"
 "ã??ã??ã?«ã?¯ã?ªã??ã?¯ã??ã??ã?¦æ?°ã??ã??é?£çµ¡å??ã??ä½?æ??ã??ã?¦ä¸?ã??ã??ã??"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:188
+#: ../addressbook/gui/widgets/e-minicard-view.c:187
 msgid ""
 "\n"
 "\n"
@@ -3366,7 +2199,7 @@ msgstr ""
 "\n"
 "é?£çµ¡å??ã?®æ¤?ç´¢ã?§ã??ã??"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:190
+#: ../addressbook/gui/widgets/e-minicard-view.c:189
 msgid ""
 "\n"
 "\n"
@@ -3376,41 +2209,41 @@ msgstr ""
 "\n"
 "ã??ã?®ã??ã?¥ã?¼ã?®ä¸ã?«è¡¨ç¤ºã?§ã??ã??ã?¢ã?¤ã??ã? ã?¯ã??ã??ã?¾ã??ã??ã??"
 
-#: ../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 "å?¤å??å??ã?® E-ã?¡ã?¼ã?«"
 
-#: ../addressbook/gui/widgets/e-minicard.c:101
+#: ../addressbook/gui/widgets/e-minicard.c:100
 msgid "Home Email"
 msgstr "è?ªå®?ã?® E-ã?¡ã?¼ã?«"
 
-#: ../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 "ã??ã?®ä»?ã?® E-ã?¡ã?¼ã?«"
 
-#: ../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:621
+#: ../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:622
+#: ../addressbook/gui/widgets/eab-contact-display.c:171 ../mail/em-popup.c:546
 msgid "_Send New Message To..."
 msgstr "æ?°ã??ã??ã?¡ã??ã?»ã?¼ã?¸ã?®é??ä¿¡(_S)..."
 
@@ -3419,96 +2252,101 @@ msgstr "æ?°ã??ã??ã?¡ã??ã?»ã?¼ã?¸ã?®é??ä¿¡(_S)..."
 msgid "Copy _Email Address"
 msgstr "E-ã?¡ã?¼ã?«ã?»ã?¢ã??ã?¬ã?¹ã?®ã?³ã??ã?¼(_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 "å?°å?³"
 
-#: ../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:2523
-#: ../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 "ã?«ã?¬ã?³ã??"
 
-#: ../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 "Free/Busy"
 
-#: ../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 "FAX"
 
-#: ../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:2576
+#: ../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:2577
+#: ../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 "å?¤å??å??"
 
-#: ../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 "ã??ã?ã?°"
 
@@ -3563,12 +2401,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 "ã?ã?£ã?³ã?»ã?«æ¸?ã?¿"
 
@@ -3579,13 +2416,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 "èª?è¨¼ã??å¿?è¦?ã?¨ã??ã?¦ã??ã?¾ã??"
 
@@ -3702,7 +2539,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 "é?£çµ¡å??ã??è¿½å? ã??ã??é??ã?«ã?¨ã?©ã?¼ã??ç?ºç??ã??ã?¾ã??ã??"
 
@@ -3719,7 +2556,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 "é?£çµ¡å??ã??å??é?¤ã??ã??é??ã?«ã?¨ã?©ã?¼ã??ç?ºç??ã??ã?¾ã??ã??"
 
@@ -3734,9 +2571,6 @@ msgid_plural ""
 msgstr[0] ""
 "%då??ã?®é?£çµ¡å??ã?? %då??ã?®æ?°ã??ã??ã?¦ã?£ã?³ã??ã?¦ã?§é??ã??ã??ã?¨ã?«ã?ªã??ã?¾ã??ã??\n"
 "æ?¬å½?ã?«ã??ã?®é?£çµ¡å??ã??è¡¨ç¤ºã??ã?¦ã??ã??ã??ã??ã??ã?§ã??ã??ï¼?"
-msgstr[1] ""
-"%då??ã?®é?£çµ¡å??ã?? %då??ã?®æ?°ã??ã??ã?¦ã?£ã?³ã??ã?¦ã?§é??ã??ã??ã?¨ã?«ã?ªã??ã?¾ã??ã??\n"
-"æ?¬å½?ã?«ã??ã?®é?£çµ¡å??ã??è¡¨ç¤ºã??ã?¦ã??ã??ã??ã??ã??ã?§ã??ã??ï¼?"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:324
 msgid "_Don't Display"
@@ -3747,7 +2581,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"
@@ -3756,46 +2590,45 @@ 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] "é?£çµ¡å??"
-msgstr[1] "é?£çµ¡å??"
 
 #. 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 "card.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 "è¤?æ?°ã?®é?£çµ¡å??ã?®ã?³ã??ã?¼å??"
 
@@ -3819,330 +2652,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] "ä»?ã?« 1å??ã?®é?£çµ¡å??ã??ã??ã??ã?¾ã??"
-msgstr[1] "ä»?ã?« %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 "Outlook ã?® 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 "Outlook CSV/Tab ã?¤ã?³ã??ã?¼ã?¿"
 
-#: ../addressbook/importers/evolution-csv-importer.c:872
+#: ../addressbook/importers/evolution-csv-importer.c:870
 msgid "Mozilla CSV or Tab (.csv, .tab)"
 msgstr "Mozilla ã?® 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 "Mozilla CSV/Tab ã?¤ã?³ã??ã?¼ã?¿"
 
-#: ../addressbook/importers/evolution-csv-importer.c:881
+#: ../addressbook/importers/evolution-csv-importer.c:879
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "Evolution ã?® 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 "Evolution 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 "Evolution 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 "Evolution vCard ã?¤ã?³ã??ã?¼ã?¿"
 
-#: ../addressbook/printing/e-contact-print.glade.h:1
-msgid "10 pt. Tahoma"
-msgstr "10 pt. Tahoma"
-
-#: ../addressbook/printing/e-contact-print.glade.h:2
-msgid "8 pt. Tahoma"
-msgstr "8 pt. 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 "OUTPUTFILE"
 
-#: ../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 "NUMBER"
 
-#: ../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 "å?¦ç??ã?§ã??ã?ªã??ã?¨ã?©ã?¼"
 
@@ -4538,7 +3172,7 @@ msgstr "Evolution ã??å??èµ·å??ã??ã??ã?¾ã?§ã?¿ã?¹ã?¯ã?¯å?©ç?¨ã?§ã??ã?¾ã??ã??ã??"
 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)"
 
@@ -4560,56 +3194,56 @@ msgstr "é??ç?¥ã??ã??(_S)"
 msgid "{0}."
 msgstr "{0}ã??"
 
-#: ../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/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 "ã??ã?¤ã?ã??ã??ã?®ã?¡ã?¢ã?»ã?¢ã??ã?ªã?±ã?¼ã?·ã?§ã?³ã?»ã??ã?ã??ã?¯ã??èªã?¿è¾¼ã??ã?¾ã??ã??ã?§ã??ã??"
 
-#: ../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 "ã??ã?¤ã?ã??ã??ã?®ã?¡ã?¢ã?»ã?¢ã??ã?ªã?±ã?¼ã?·ã?§ã?³ã?»ã??ã?ã??ã?¯ã??æ?¸ã??è¾¼ã??ã?¾ã??ã??ã?§ã??ã??"
 
-#: ../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 "ã?«ã?¬ã?³ã??"
 
@@ -4650,24 +3284,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 "ã?¿ã?¹ã?¯"
@@ -4678,7 +3312,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)"
 
@@ -4686,27 +3320,25 @@ msgstr "ã?¿ã?¹ã?¯(_T)"
 msgid "Evolution Calendar alarm notification service"
 msgstr "Evolution ã?«ã?¬ã?³ã??ã?»ã?¢ã?©ã?¼ã? é??ç?¥ã?µã?¼ã??ã?¹"
 
-#: ../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] "å??"
-msgstr[1] "å??é??"
+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:376
+#: ../calendar/gui/dialogs/event-page.glade.h:23
+#: ../plugins/caldav/caldav-source.c:449
+#: ../plugins/calendar-file/calendar-file.c:294
+#: ../plugins/calendar-http/calendar-http.c:324
+#: ../plugins/calendar-weather/calendar-weather.c:524
+#: ../plugins/google-account-setup/google-source.c:741
+#: ../plugins/google-account-setup/google-contacts-source.c:331
 msgid "hours"
 msgid_plural "hours"
-msgstr[0] "æ??"
-msgstr[1] "æ??é??"
+msgstr[0] "æ??é??"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:298
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:293
 msgid "Start time"
 msgstr "é??å§?æ??å?»"
 
@@ -4721,10 +3353,10 @@ msgstr "å?¨ã?¦å?´ä¸?(_A)"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:3
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1610
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1616
-#: ../calendar/gui/e-itip-control.c:1167
-#: ../plugins/itip-formatter/itip-view.c:1021
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1582
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1588
+#: ../calendar/gui/e-itip-control.c:1164
+#: ../plugins/itip-formatter/itip-view.c:1023
 msgid "Location:"
 msgstr "å ´æ??:"
 
@@ -4737,11 +3369,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
@@ -4757,32 +3389,32 @@ msgstr "ã?¢ã?©ã?¼ã? å??æ¢(_S)"
 msgid "location of appointment"
 msgstr "äº?å®?ã?®å ´æ??"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1468
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1593
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1441
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1565
 msgid "No summary available."
 msgstr "ã?µã??ã?ªã?¯ã??ã??ã?¾ã??ã??ã??"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1477
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1479
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1450
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1452
 msgid "No description available."
 msgstr "èª¬æ??ã?¯ã??ã??ã?¾ã??ã??ã??"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1487
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1460
 msgid "No location information available."
 msgstr "å ´æ??ã?®æ??å ±ã?¯ã??ã??ã?¾ã??ã??ã??"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1532
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1505
 #, c-format
 msgid "You have %d alarms"
 msgstr "%då??ã?®ã?¢ã?©ã?¼ã? ã??ã??ã??ã?¾ã??"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1694
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1722
-#: ../e-util/e-non-intrusive-error-dialog.h:41
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1665
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1693
+#: ../e-util/e-non-intrusive-error-dialog.h:40
 msgid "Warning"
 msgstr "è¦å??"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1698
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1669
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4794,7 +3426,7 @@ msgstr ""
 "ã?®è¨å®?ã??ã??ã??ã?¦ã??ã?¾ã??ã??ã??ã??ã?®ä»£ã??ã??ã?« Evolution ã?¯\n"
 "é??å¸¸ã?®ã?ªã??ã?¤ã?³ã??ã?»ã??ã?¤ã?¢ã?ã?°ã??è¡¨ç¤ºã??ã?¾ã??ã??"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1728
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1699
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4811,7 +3443,7 @@ msgstr ""
 "\n"
 "æ?¬å½?ã?«ã??ã??ã?®ã??ã?ã?°ã?©ã? ã??èµ·å??ã??ã?¦ã??ã??ã??ã??ã??ã?§ã??ã??ï¼?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1742
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1713
 msgid "Do not ask me about this program again."
 msgstr "ã??ã?®ã?¡ã??ã?»ã?¼ã?¸ã??äº?åº¦ã?¨è¡¨ç¤ºã??ã?ªã??"
 
@@ -4838,7 +3470,6 @@ msgstr "æ??é??ã??æ£ã??ã??ã??ã??ã?¾ã??ã??"
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%dæ??é??"
-msgstr[1] "%dæ??é??"
 
 #. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
 #: ../calendar/gui/alarm-notify/util.c:75 ../calendar/gui/e-alarm-list.c:412
@@ -4846,8 +3477,7 @@ msgstr[1] "%dæ??é??"
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
-msgstr[0] "%då??"
-msgstr[1] "%då??é??"
+msgstr[0] "%då??é??"
 
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
 #. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
@@ -4857,8 +3487,7 @@ msgstr[1] "%då??é??"
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
-msgstr[0] "%dç§?"
-msgstr[1] "%dç§?é??"
+msgstr[0] "%dç§?é??"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:1
 msgid "Alarm programs"
@@ -4886,160 +3515,173 @@ 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 ""
+"Evolution ã?§ã?·ã?¹ã??ã? ã?®ã?¿ã?¤ã? ã?¾ã?¼ã?³ã??ä½¿ã??ã?«ã?¯ã??ã??ã??ã??ã?§ã??ã?¯ã??ã?¦ã??ã? ã??ã??ã??"
+
+#: ../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 ""
 "æ??é??ã??ã?¼ã?®ä¸ã?«æ??ç?»ã??ã?? \"Marcus Bains Line\" ã?®è?²ã?§ã?? (ã??ã??ã?©ã?«ã??ã?¯ç©º)ã??"
 
-#: ../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 "æ?¥é??ã??ã?¥ã?¼ã?®ä¸ã?«æ??ç?»ã??ã?? \"Marcus Bains line\" ã?®è?²ã?§ã??ã??"
 
-#: ../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 ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
 msgid "Days on which the start and end of work hours should be indicated."
 msgstr "å¹³æ?¥ã?®é??å§?/çµ?äº?æ??å?»ã??è¡¨ç¤ºã??ã??æ?¥æ?°ã?§ã??ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
 msgid "Default appointment reminder"
 msgstr "ã??ã??ã?©ã?«ã??ã?§äº?å®?ã?®ã?ªã??ã?¤ã?³ã??ã??æ??å®?ã??ã??ã??ã?©ã??ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
+msgid "Default recurrence count"
+msgstr "ç¹°ã??è¿?ã??å??æ?° (ã??ã??ã?©ã?«ã??)<"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
 msgid "Default reminder units"
 msgstr "ã?ªã??ã?¤ã?³ã??ã?®å??ä½? (ã??ã??ã?©ã?«ã??)"
 
-#: ../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 "ã?¢ã?©ã?¼ã? ã?®æ¥½æ?²ã??ã?¡ã?¤ã?«ã??ä¿?å?ã??ã??ã??ã?©ã?«ã??ã?§ã??ã??"
 
-#: ../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 "ã?¤ã??ã?³ã??è¡¨ç¤ºã?®é??é??åº¦"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
 msgid "Free/busy server URLs"
 msgstr "Free/Busy ã?µã?¼ã??ã?® URL"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
 msgid "Free/busy template URL"
 msgstr "Free/Busy ã??ã?³ã??ã?¬ã?¼ã??ã?® 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 "æ?¥é??ã??ã?¥ã?¼ã?§ç?¾å?¨ä½¿ç?¨ã??ã?¦ã??ã??ã?¿ã?¤ã? ã?¾ã?¼ã?³ã?®ã?ªã?¹ã??ã?§ã??ã??"
 
-#: ../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 "Free/Busy ã?¨ã??ã?¦å?¬é??ã??ã??ã?µã?¼ã?? URL ã?®ä¸¦ã?³ã?§ã??ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
 msgid "Marcus Bains Line"
 msgstr "Marcus Bains Line ã??è¡¨ç¤ºã??ã??ã??ã?©ã??ã??"
 
-#: ../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 "Marcus Bains Line ã?®è?² - æ?¥é??ã??ã?¥ã?¼"
 
-#: ../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 "Marcus Bains Line ã?®è?² - æ??é??ã??ã?¼"
 
-#: ../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 "æ??é??ã??ã?¥ã?¼ã?®å??ç?´ã??ã?¤ã?³ã?®ä½?ç½®"
 
-#: ../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."
@@ -5047,7 +3689,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."
@@ -5055,13 +3697,13 @@ 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."
@@ -5069,7 +3711,7 @@ 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."
@@ -5077,7 +3719,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."
@@ -5085,69 +3727,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 "ã?¤ã??ã?³ã??/ã?¿ã?¹ã?¯/ä¼?è°ã?¨ã??ã?£ã?¿ã?®ä¸ã?« RSVP ã??è¡¨ç¤ºã??ã??ã??ã?©ã??ã??"
 
-#: ../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."
@@ -5155,15 +3813,15 @@ 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 "ã?¿ã?¹ã?¯ã?®å??ç?´æ?¹å??ã??ã?¤ã?³ã?®ä½?ç½®"
 
-#: ../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 "
@@ -5172,7 +3830,7 @@ msgstr ""
 "Free/Busy ã??ã?¼ã?¿ã?®ä»£æ?¿ã??ã?¨ã??ã?¦ä½¿ç?¨ã??ã?? 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\"."
@@ -5180,11 +3838,11 @@ msgstr ""
 "ã?«ã?¬ã?³ã??ã?®æ?¥ä»?ã?¨æ??å?»ã?§ä½¿ç?¨ã??ã??ã?¿ã?¤ã? ã?¾ã?¼ã?³ã?®ã??ã??ã?©ã?«ã??å?¤ã?§ã??Olsen ã?¿ã?¤ã? ã?¾ã?¼"
 "ã?³ã?»ã??ã?¼ã?¿ã??ã?¼ã?¹ã?®å ´æ?? (ä¾?: \"America/New York\") ã?§ã??ã??"
 
-#: ../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."
@@ -5192,20 +3850,19 @@ 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)."
@@ -5213,191 +3870,210 @@ 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:78
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
+msgid "URI of the highlighted (\"primary\") calendar"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
+msgid "URI of the highlighted (\"primary\") memo list"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
+msgid "URI of the highlighted (\"primary\") task list"
+msgstr ""
+
+#: ../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 ""
+"Evolution ã?§é?¸æ??ã??ã??ã?¿ã?¤ã? ã?¾ã?¼ã?³ã?§ã?¯ã?ªã??ã??ã?·ã?¹ã??ã? ã?®ã?¿ã?¤ã? ã?¾ã?¼ã?³ã??ä½¿ç?¨ã??ã??"
+
+#: ../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 ""
 "ã?«ã?¬ã?³ã??ã?®ä¸ã?« \"Marcus Bains Line\" (ç?¾å?¨æ??å?»ã?§ã?®ç·?) ã??æ??ç?»ã??ã??ã??ã?©ã??ã??ã?§"
 "ã??ã??"
 
-#: ../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:90
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
+msgid "Whether to scroll a Month View by a week, not by a month."
+msgstr ""
+
+#: ../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 "ã?¤ã??ã?³ã??/ã?¿ã?¹ã?¯/ä¼?è°ã?®ã?¨ã??ã?£ã?¿ã?§ RSVP ã?®é ?ç?®ã??è¡¨ç¤ºã??ã??ã??ã?©ã??ã??ã?§ã??ã??"
 
-#: ../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 ""
-"ã?¤ã??ã?³ã??ã??è¡¨ç¤ºã??ã??é??ã?«ã?µã??ã?¼ã?¿ã?¤ã?  (Daylight Saving Time) ã??ä½¿ç?¨ã??ã??ã??ã?©ã??ã??"
-"ã?§ã??ã??"
-
-#: ../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 "æ??é??ã??é??ã??ã??ã?¿ã?¹ã?¯"
 
-#: ../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 "å?°å?·"
 
-#: ../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 "
@@ -5406,137 +4082,126 @@ msgstr ""
 "ã??ã?®æ??ä½?ã?¯é?¸æ??ã??ã??ã?¤ã??ã?³ã??ã??ã??å?¤ã??ã?¤ã??ã?³ã??ã??å?¨ã?¦å®?å?¨ã?«å??é?¤ã??ã?¾ã??ã??ç¶?è¡?ã??ã??"
 "ã?¨ã??ã??ã??ã??ã?®ã?¤ã??ã?³ã??ã??å¾©æ?§ã?§ã??ã?ªã??ã?ªã??ã?¾ã??ã??"
 
-#: ../calendar/gui/calendar-commands.c:321
+#: ../calendar/gui/calendar-commands.c:337
 msgid "Purge events older than"
 msgstr "æ¬¡ã??ã??å?¤ã??ã?¤ã??ã?³ã??ã??æ?¹æ¶?ã??ã??"
 
-#: ../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:377
+#: ../calendar/gui/calendar-commands.c:342
+#: ../plugins/caldav/caldav-source.c:450
+#: ../plugins/calendar-file/calendar-file.c:295
+#: ../plugins/calendar-http/calendar-http.c:325
+#: ../plugins/calendar-weather/calendar-weather.c:525
+#: ../plugins/google-account-setup/google-source.c:742
+#: ../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 "ã?«ã?¬ã?³ã??ã?®ã?¢ã??ã??ã?°ã?¬ã?¼ã??ã?«å¤±æ??ã??ã?¾ã??ã??ã??"
 
-#: ../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' ã??é??ã??ã?¾ã??ã??"
 
-#: ../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 "æ?°ã??ã??ã?«ã?¬ã?³ã??ã??ä½?æ??ã??ã?¾ã??"
 
@@ -5578,20 +4243,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 "èª¬æ??"
@@ -5611,21 +4276,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 "å?¬é??"
 
@@ -5635,11 +4306,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 "ã?µã??ã?ª"
 
@@ -5659,35 +4330,55 @@ msgid "does not contain"
 msgstr "ã??æ¬¡ã??å?«ã?¾ã?ªã??"
 
 #: ../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 "ã??æ¬¡ã?§ã??ã??"
 
 #: ../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 "E-ã?¡ã?¼ã?«ã??é??ä¿¡ã??ã??"
+
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:1
 msgid "<b>Alarm</b>"
 msgstr "<b>è¦å??</b>"
@@ -5717,83 +4408,68 @@ 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 "E-ã?¡ã?¼ã?«ã??é??ä¿¡ã??ã??"
-
-#: ../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):"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:18
-msgid "after"
-msgstr "å¾?"
-
-#: ../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"
+"äº?å®?ã??çµ?äº?ã??ã??æ??"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.c:244
 msgid "Action/Trigger"
@@ -5804,47 +4480,54 @@ msgid "A_dd"
 msgstr "è¿½å? (_D)"
 
 #: ../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:1727
+#: ../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 "(æ?¥é??ã??ã?¥ã?¼ã?«è¡¨ç¤ºã??ã??ã?¾ã??)"
@@ -5872,51 +4555,60 @@ msgstr ""
 "ã??ã??ã?¾ã??ã??</i>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-#: ../mail/mail-config.glade.h:10
-msgid "<span weight=\"bold\">Alerts</span>"
+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: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\">ã??ã??ã?©ã?«ã??ã?® Free/Busy ã?µã?¼ã??</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 "ã?¢ã?©ã?¼ã? ã??é??ç?¥ã?¹ã??ã?¼ã?¹ã?®ã?¿ã?«è¡¨ç¤ºã??ã??ã??ã?©ã??ã??"
+
+#: ../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"
@@ -5926,13 +4618,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"
@@ -5950,215 +4642,231 @@ 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 "ã?¢ã?©ã?¼ã? ã?§é??ç?¥ã??ã??ã?«ã?¬ã?³ã??ã??é?¸æ??ã??ã?¦ä¸?ã??ã??:"
 
-#: ../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)"
 
-#: ../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 æ??é??å?¶ (å??å??/å??å¾?)(_1)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
 msgid "_24 hour"
 msgstr "24 æ??é??å?¶(_2)"
 
-#: ../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)"
 
-#: ../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 "å??ã?«è¡¨ç¤ºã??ã??"
 
-#: ../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 "æ?°ã??ã??ã?¡ã?¢ã?®ä¸?è¦§"
 
@@ -6211,297 +4919,237 @@ msgstr "%s  ä½?ã??å¤?æ?´ã??ã?¦ã??ã?¾ã??ã??ã??ã??ã?¨ã??ã?£ã?¿ã??æ?´æ?°ã??ã?¾ã??
 msgid "Validation error: %s"
 msgstr "æ?´å??æ?§ã?®ã?¨ã?©ã?¼: %s"
 
-#: ../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 " ã??ã?? "
 
-#: ../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 "(å®?äº? "
 
-#: ../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 "å®?äº?ã??ã?¾ã??ã??"
 
-#: ../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 " (æ??æ?¥ "
 
-#: ../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:1786
-#: ../composer/e-msg-composer.c:2005
-#, c-format
-msgid "Attached message"
-msgid_plural "%d attached messages"
-msgstr[0] "æ·»ä»?ã?¡ã??ã?»ã?¼ã?¸"
-msgstr[1] "%dé??ã?®æ·»ä»?ã?¡ã??ã?»ã?¼ã?¸"
-
-#: ../calendar/gui/dialogs/comp-editor.c:488 ../composer/e-msg-composer.c:2073
-#: ../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:490 ../composer/e-msg-composer.c:2075
-#: ../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:3316 ../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:224
+msgid "Could not save attachments"
+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 "RSVP(_R)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1490
+#: ../calendar/gui/dialogs/comp-editor.c:1146
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "RSVP ã?®è¡¨ç¤º/é??è¡¨ç¤ºã??å??ã??æ?¿ã??ã?¾ã??"
 
-#: ../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>å??"
-msgstr[1] "æ·»ä»?ã??ã?¡ã?¤ã?«: <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 "[SPACE] ã?ã?¼ã??æ?¼ã??ã?¨æ·»ä»?ã??ã?¡ã?¤ã?«ã?»ã??ã?¼ã?®è¡¨ç¤ºã??å??ã??æ?¿ã??ã??ã?¾ã??"
+#: ../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:3349
+#: ../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:3378
+#: ../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 "ç?¾å?¨ã?®ã??ã?¼ã?¸ã?§ã?³ã??ä½¿ç?¨ã?§ã??ã?¾ã??ã??ï¼?"
 
@@ -6574,7 +5222,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 "å§?ä»»å??:"
 
@@ -6601,7 +5249,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 "é??ä¿¡ã?ªã??ã?·ã?§ã?³"
 
@@ -6638,199 +5286,220 @@ 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 ã??ã??ã?®ä»£ã??ã??ã?«å?¦ç??ã??ã?¦ã??ã?¾ã??"
 
-#: ../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æ?¥å??"
-msgstr[1] "äº?å®?ã?® %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"
 msgstr[0] "äº?å®?ã?® %dæ??é??å??"
-msgstr[1] "äº?å®?ã?® %dæ??é??å??"
 
-#: ../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å??å??"
-msgstr[1] "äº?å®?ã?® %då??å??"
 
-#: ../calendar/gui/dialogs/event-page.c:2950
+#: ../calendar/gui/dialogs/event-page.c:2992
 msgid "Customize"
 msgstr "ã??ã?®ä»?"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:1
-msgid "1 day before appointment"
-msgstr "äº?å®?ã?® 1æ?¥å??"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:2
-msgid "1 hour before appointment"
-msgstr "äº?å®?ã?® 1æ??é??å??"
-
-#: ../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 ""
 
 #: ../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):"
 
-#. 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 ""
 
-#. 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"
+#, fuzzy
+msgid ""
+"for\n"
+"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 "ä¸»å?¬è??ã?®å¤?æ?´(_G)"
-
-#: ../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 "ä¸»å?¬è??:"
-
-#: ../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 "å®?å??"
 
@@ -6844,7 +5513,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):"
@@ -6869,23 +5538,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 "ã??ã?®äº?å®?ã?«ã?¯ Evolution ã??ç·¨é??ã?§ã??ã?ªã??ç¹°ã??è¿?ã??ã??ã??ã??ã?¾ã??ã??"
 
@@ -6907,7 +5576,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 "æ??å??ã?®"
 
@@ -6916,7 +5585,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 "äº?ç?ªç?®ã?®"
 
@@ -6924,7 +5593,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 "ä¸?ç?ªç?®ã?®"
 
@@ -6932,21 +5601,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 "ã??ã?®ä»?ã?®æ?¥"
 
@@ -6954,7 +5631,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æ?¥"
 
@@ -6962,7 +5639,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æ?¥"
 
@@ -6970,45 +5647,45 @@ 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 "æ?¥"
 
 #. 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 "ã?®"
 
-#: ../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 "æ?¥ä»?/æ??å?»"
 
@@ -7017,7 +5694,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>"
 
@@ -7025,50 +5702,49 @@ msgstr "<b>ã??ã?¬ã??ã?¥ã?¼</b>"
 msgid "<b>Recurrence</b>"
 msgstr "<b>ç¹°ã??è¿?ã??</b>"
 
-#. 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 "æ¯?"
 
-#. 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)"
 
 #. 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 "ä»¥é??"
-
-#. 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 ""
 
 #. 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 "é?±"
-
-#: ../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 ""
 
-#: ../calendar/gui/dialogs/send-comp.c:116
+#: ../calendar/gui/dialogs/send-comp.c:160
 msgid "Send my alarms with this event"
 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 ""
+
+#: ../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 "ã?¦ã?§ã??ã?»ã??ã?¼ã?¸"
 
@@ -7080,74 +5756,30 @@ 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 ""
 
 #: ../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:1007 ../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 ""
 
-#: ../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):"
@@ -7170,7 +5802,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)"
 
@@ -7182,16 +5814,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' ã?®ã?¿ã?¹ã?¯ã??é??ã??ã?¾ã??ã??ã??"
@@ -7217,8 +5857,7 @@ msgstr "ã?¿ã?¤ã? ã?¾ã?¼ã?³:"
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
-msgstr[0] "%dæ?¥"
-msgstr[1] "%dæ?¥é??"
+msgstr[0] "%dæ?¥é??"
 
 #. Translator: Entire string is like "Pop up an alert %d weeks before start of appointment"
 #: ../calendar/gui/e-alarm-list.c:400
@@ -7226,7 +5865,6 @@ msgstr[1] "%dæ?¥é??"
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%dé?±é??"
-msgstr[1] "%dé?±é??"
 
 #: ../calendar/gui/e-alarm-list.c:462
 msgid "Unknown action to be performed"
@@ -7288,80 +5926,161 @@ msgstr "%2$sã?®æ??ç?¹ã?§%1$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 ã??é??ã??ã?¾ã??"
 
-#: ../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"
@@ -7371,225 +6090,200 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1029 ../calendar/gui/e-cal-model.c:1013
+#: ../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:1013
+#: ../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:1009
+#: ../calendar/gui/e-cal-model.c:1078
 msgid "Recurring"
 msgstr "ç¹°ã??è¿?ã??"
 
-#: ../calendar/gui/e-cal-model.c:1011
+#: ../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 "untitled_image.%s"
-
-#: ../calendar/gui/e-cal-popup.c:286 ../calendar/gui/e-calendar-table.c:1600
-#: ../calendar/gui/e-calendar-view.c:1814 ../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:431 ../mail/em-popup.c:827
-#, 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:2437
+#: ../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:2441
+#: ../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:659 ../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:873 ../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:1336 ../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:1796
+#: ../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:1799 ../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:1819 ../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:1802
-#: ../calendar/gui/e-calendar-view.c:1821 ../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 "iCalender å½¢å¼?ã?§è»¢é??(_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 "<ã??ã??ã??ã?¯ã?ªã??ã?¯ã??ã?¦ã?¿ã?¹ã?¯ã??è¿½å? ã??ã?¦ä¸?ã??ã??>"
@@ -7607,167 +6301,167 @@ 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:2345
-#: ../calendar/gui/e-meeting-list-view.c:603
+#: ../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:1482
+#: ../calendar/gui/e-calendar-view.c:1478
 msgid "Moving items"
 msgstr "ã?¢ã?¤ã??ã? ã?®ç§»å??ä¸"
 
-#: ../calendar/gui/e-calendar-view.c:1484
+#: ../calendar/gui/e-calendar-view.c:1480
 msgid "Copying items"
 msgstr "ã?¢ã?¤ã??ã? ã?®ã?³ã??ã?¼ä¸"
 
-#: ../calendar/gui/e-calendar-view.c:1793
+#: ../calendar/gui/e-calendar-view.c:1786
 msgid "New _Appointment..."
 msgstr "æ?°ã??ã??äº?å®?(_A)..."
 
-#: ../calendar/gui/e-calendar-view.c:1794
+#: ../calendar/gui/e-calendar-view.c:1787
 msgid "New All Day _Event"
 msgstr "æ?°ã??ã??çµ?æ?¥ã?®ã?¤ã??ã?³ã??(_E)"
 
-#: ../calendar/gui/e-calendar-view.c:1795
+#: ../calendar/gui/e-calendar-view.c:1788
 msgid "New _Meeting"
 msgstr "æ?°ã??ã??ä¼?è°(_M)"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1806
+#: ../calendar/gui/e-calendar-view.c:1799
 msgid "_Current View"
 msgstr "ç?¾å?¨ã?®ã??ã?¥ã?¼(_C)"
 
-#: ../calendar/gui/e-calendar-view.c:1808
+#: ../calendar/gui/e-calendar-view.c:1801
 msgid "Select T_oday"
 msgstr "ä»?æ?¥ã?«ã??ã??(_O)"
 
-#: ../calendar/gui/e-calendar-view.c:1809
+#: ../calendar/gui/e-calendar-view.c:1802
 msgid "_Select Date..."
 msgstr "æ?¥ä»?ã?®é?¸æ??(_S)..."
 
-#: ../calendar/gui/e-calendar-view.c:1815
+#: ../calendar/gui/e-calendar-view.c:1808
 msgid "Pri_nt..."
 msgstr "å?°å?·(_N)..."
 
-#: ../calendar/gui/e-calendar-view.c:1825
+#: ../calendar/gui/e-calendar-view.c:1818
 msgid "Cop_y to Calendar..."
 msgstr "ã?«ã?¬ã?³ã??ã?¸ã?³ã??ã?¼(_Y)..."
 
-#: ../calendar/gui/e-calendar-view.c:1826
+#: ../calendar/gui/e-calendar-view.c:1819
 msgid "Mo_ve to Calendar..."
 msgstr "ã?«ã?¬ã?³ã??ã?¸ç§»å??(_V)..."
 
-#: ../calendar/gui/e-calendar-view.c:1827
+#: ../calendar/gui/e-calendar-view.c:1820
 msgid "_Delegate Meeting..."
 msgstr "ä¼?è°ã?®å§?ä»»(_D)..."
 
-#: ../calendar/gui/e-calendar-view.c:1828
+#: ../calendar/gui/e-calendar-view.c:1821
 msgid "_Schedule Meeting..."
 msgstr "ä¼?è°ã?®ã?¹ã?±ã?¸ã?¥ã?¼ã?«(_S)..."
 
-#: ../calendar/gui/e-calendar-view.c:1829
+#: ../calendar/gui/e-calendar-view.c:1822
 msgid "_Forward as iCalendar..."
 msgstr "iCalender å½¢å¼?ã?§è»¢é??(_F)..."
 
-#: ../calendar/gui/e-calendar-view.c:1830
+#: ../calendar/gui/e-calendar-view.c:1823
 msgid "_Reply"
 msgstr "è¿?ä¿¡(_R)"
 
-#: ../calendar/gui/e-calendar-view.c:1831 ../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:1836
+#: ../calendar/gui/e-calendar-view.c:1829
 msgid "Make this Occurrence _Movable"
 msgstr "ã??ã?®ã?¤ã??ã?³ã??ã??ç§»å??å?¯è?½ã?«ã??ã??(_M)"
 
-#: ../calendar/gui/e-calendar-view.c:1837 ../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:1838
+#: ../calendar/gui/e-calendar-view.c:1831
 msgid "Delete _All Occurrences"
 msgstr "å?¨ã?¦ã?®ã?¤ã??ã?³ã??ã?®å??é?¤(_A)"
 
-#: ../calendar/gui/e-calendar-view.c:2292
-#: ../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:2293
-#: ../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:2294
+#: ../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:2295
+#: ../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:2296
+#: ../calendar/gui/e-calendar-view.c:2288
 msgid "Needs action"
 msgstr "è¦?ã?¢ã?¯ã?·ã?§ã?³"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2457 ../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:2491
+#: ../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) %k:%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%l:%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"
@@ -7780,12 +6474,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 "å?¥ã?®ã?¿ã?¤ã? ã?¾ã?¼ã?³ã??è¡¨ç¤ºã??ã??"
 
@@ -7795,121 +6489,115 @@ 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:2321
+#: ../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] "æ¯?æ?¥"
-msgstr[1] "%dæ?¥é??æ¯?"
+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] "æ¯?é?±"
-msgstr[1] "%dé?±é??æ¯?"
+msgstr[0] "%dé?±é??æ¯?"
 
-#: ../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 "
-msgstr[0] "æ¬¡ã?®æ¯?é?± "
-msgstr[1] "æ¬¡ã?® %dé?±é??æ¯? "
+msgstr[0] "æ¬¡ã?® %dé?±é??æ¯? "
 
 #. 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 " ã?¨ "
 
-#: ../calendar/gui/e-itip-control.c:817
+#: ../calendar/gui/e-itip-control.c:815
 #, c-format
 msgid "The %s day of "
 msgstr "æ¬¡ã?® %s æ?¥ "
 
-#: ../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] "æ¯?æ??"
-msgstr[1] "%dã?¶æ??æ¯?"
+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] "æ¯?å¹´"
-msgstr[1] "%då¹´æ¯?"
+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"
 msgstr[0] " %då??ã?®å??è¨?"
-msgstr[1] " %då??ã?®å??è¨?"
 
 #. 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 "çµ?äº?"
 
-#: ../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
@@ -7920,7 +6608,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."
@@ -7928,280 +6616,280 @@ 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 "ã??ã??ã??ã?ªã?¿ã?¹ã?¯ã?¡ã??ã?»ã?¼ã?¸"
 
-#: ../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> ã??ã??ã??äº?å®?ã??å?¬é??ã??ã?¾ã??ã??ã??"
 
-#: ../calendar/gui/e-itip-control.c:1509
+#: ../calendar/gui/e-itip-control.c:1504
 msgid "Free/Busy Information"
 msgstr "Free/Busy ã?®æ??å ±"
 
-#: ../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> ã??ã??ã??äº?å®?ã??è¦?æ±?ã??ã?¦ã??ã?¾ã??ã??ã??"
 
-#: ../calendar/gui/e-itip-control.c:1514
+#: ../calendar/gui/e-itip-control.c:1509
 msgid "Free/Busy Request"
 msgstr "Free/Busy ã?®è¦?æ±?"
 
-#: ../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</s> ã??ã??ã??è¿?ä¿¡ã??ã?¦ã??ã?¾ã??ã??ã??"
 
-#: ../calendar/gui/e-itip-control.c:1519
+#: ../calendar/gui/e-itip-control.c:1514
 msgid "Free/Busy Reply"
 msgstr "Free/Busy ã?®è¿?ä¿¡"
 
-#: ../calendar/gui/e-itip-control.c:1524
+#: ../calendar/gui/e-itip-control.c:1519
 msgid "Bad Free/Busy Message"
 msgstr "Free/Busy ã?®ã?¡ã??ã?»ã?¼ã?¸ã??é??é??ã?£ã?¦ã??ã?¾ã??"
 
-#: ../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:591
+#: ../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 "è¾?é??"
 
-#: ../calendar/gui/e-itip-control.c:2381
+#: ../calendar/gui/e-itip-control.c:2401
 msgid "Send Free/Busy Information"
 msgstr "Free/Busy æ??å ±ã?®é??ä¿¡"
 
-#: ../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 "ã?ã?£ã?³ã?»ã?«"
 
@@ -8225,6 +6913,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 "ã?µã?¼ã??ã?®ã?¡ã??ã?»ã?¼ã?¸:"
@@ -8245,77 +6937,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:2127
+#: ../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"
 
@@ -8323,78 +7011,78 @@ 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:2158
+#: ../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)"
 
-#: ../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 "_<<"
 
-#: ../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):"
 
@@ -8422,15 +7110,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"
@@ -8439,165 +7127,133 @@ 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:2648
+#: ../calendar/gui/gnome-cal.c:2673
 msgid "_Custom View"
 msgstr "ã?«ã?¹ã?¿ã? è¡¨ç¤º(_C)"
 
-#: ../calendar/gui/gnome-cal.c:2649
+#: ../calendar/gui/gnome-cal.c:2674
 msgid "_Save Custom View"
 msgstr "ã?«ã?¹ã?¿ã? è¡¨ç¤ºã?®ä¿?å?(_S)"
 
-#: ../calendar/gui/gnome-cal.c:2654
+#: ../calendar/gui/gnome-cal.c:2679
 msgid "_Define Views..."
 msgstr "ã??ã?¥ã?¼ã?®å®?ç¾©(_D)..."
 
-#: ../calendar/gui/gnome-cal.c:2891
+#: ../calendar/gui/gnome-cal.c:2916
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "%s ã?«ã??ã??äº?å®?ã?®èªã?¿è¾¼ã?¿ä¸"
 
-#: ../calendar/gui/gnome-cal.c:2906
+#: ../calendar/gui/gnome-cal.c:2931
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "%s ã?«ã??ã??ã?¿ã?¹ã?¯ã?®èªã?¿è¾¼ã?¿ä¸"
 
-#: ../calendar/gui/gnome-cal.c:2915
+#: ../calendar/gui/gnome-cal.c:2940
 #, c-format
 msgid "Loading memos at %s"
 msgstr "%s ã?®ã?¡ã?¢ã?®èªã?¿è¾¼ã?¿ä¸"
 
-#: ../calendar/gui/gnome-cal.c:3027
+#: ../calendar/gui/gnome-cal.c:3052
 #, c-format
 msgid "Opening %s"
 msgstr "%s ã??é??ã??ã?¾ã??"
 
-#: ../calendar/gui/gnome-cal.c:3995
+#: ../calendar/gui/gnome-cal.c:4018
 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 ""
 
-#: ../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 "æ??ä½?ä¸?å??ã?®å?ºå¸è??ã??å¿?è¦?ã?§ã??"
 
-#: ../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 "ã?¡ã?¢ã?®æ??å ±"
 
-#: ../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 "Free/Busy ã?®æ??å ±"
 
-#: ../calendar/gui/itip-utils.c:640
+#: ../calendar/gui/itip-utils.c:643
 msgid "Calendar information"
 msgstr "ã?«ã?¬ã?³ã??ã?®æ??å ±"
 
@@ -8605,7 +7261,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 "å??è«¾æ¸?"
@@ -8614,7 +7270,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 "(ä»®)å??è«¾æ¸?"
@@ -8626,7 +7282,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 "è¾?é??æ¸?"
@@ -8635,7 +7291,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 "å§?ä»»æ¸?"
@@ -8643,7 +7299,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 "æ?´æ?°æ¸?"
@@ -8651,7 +7307,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 "ã?ã?£ã?³ã?»ã?«"
@@ -8659,7 +7315,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 "æ?´æ?°"
@@ -8667,99 +7323,97 @@ 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 "å??å¯¾æ¡?"
 
-#: ../calendar/gui/itip-utils.c:799
+#: ../calendar/gui/itip-utils.c:802
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Free/Busy ã?®æ??å ± (%s ã??ã?? %s)"
 
-#: ../calendar/gui/itip-utils.c:807
+#: ../calendar/gui/itip-utils.c:810
 msgid "iCalendar information"
 msgstr "iCalendar æ??å ±"
 
-#: ../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å??ã?®ã?¡ã?¢"
-msgstr[1] "%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å??"
-msgstr[1] "ã??é?¸æ??æ¸? %då??"
 
-#: ../calendar/gui/memos-component.c:639
+#: ../calendar/gui/memos-component.c:609
 msgid "Failed upgrading memos."
 msgstr "ã?¡ã?¢ã?®ç§»è¡?ã?«å¤±æ??ã??ã?¾ã??ã??ã??"
 
-#: ../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 "ã?¡ã?¢ã?®å?°å?·"
 
@@ -8788,297 +7442,288 @@ msgstr ""
 "Evolution ã??ã??ä½¿ã??ã?®ã??ã?©ã?«ã??ã??ç§»è¡?ã??ã?¦ã??ã??é??ã??å°?ã??ã??å¾?ã?¡ä¸?ã??ã??..."
 
 #. 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 "${HOME}/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å??ã?®ã?¿ã?¹ã?¯"
-msgstr[1] "%då??ã?®ã?¿ã?¹ã?¯"
 
-#: ../calendar/gui/tasks-component.c:631
+#: ../calendar/gui/tasks-component.c:602
 msgid "Failed upgrading tasks."
 msgstr "ã?¿ã?¹ã?¯ã?®ç§»è¡?ã?«å¤±æ??ã??ã?¾ã??ã??ã??"
 
-#: ../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"
@@ -9090,11 +7735,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 "ã?¿ã?¹ã?¯ã?®å?°å?·"
 
@@ -9111,11 +7756,11 @@ msgstr "ã?ã?£ã?³ã?»ã?«ã??ã??ã??"
 msgid "In progress"
 msgstr "é?²è¡?ä¸ã?§ã??ã??"
 
-#: ../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 "ã??æ¬¡ã??ã??å¤§ã??ã??"
 
-#: ../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 "ã??æ¬¡ã??ã??å°?ã??ã??"
 
@@ -9123,37 +7768,37 @@ 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 "Evolution iCalendar ã?¤ã?³ã??ã?¼ã?¿"
 
-#: ../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 "Evolution vCalendar ã?¤ã?³ã??ã?¼ã?¿"
 
-#: ../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 "Evolution ã?«ã?¬ã?³ã??ã?»ã?¤ã?³ã??ã?ªã?¸ã?§ã?³ã??ã?»ã?¤ã?³ã??ã?¼ã?¿"
 
@@ -10707,217 +9352,190 @@ 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 "ã?¡ã??ã?»ã?¼ã?¸ã?®å?ªå??åº¦ã??é«?ã??ã??ã?¾ã??"
 
-#: ../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 "Bcc(_B)"
 
-#: ../composer/e-composer-actions.c:608
+#: ../composer/e-composer-actions.c:454
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Bcc ã?®è¡¨ç¤º/é??è¡¨ç¤ºã??å??ã??æ?¿ã??ã?¾ã??"
 
-#: ../composer/e-composer-actions.c:614
+#: ../composer/e-composer-actions.c:460
 msgid "_Cc Field"
 msgstr "Cc(_C)"
 
-#: ../composer/e-composer-actions.c:616
+#: ../composer/e-composer-actions.c:462
 msgid "Toggles whether the CC field is displayed"
 msgstr "Cc ã?®è¡¨ç¤º/é??è¡¨ç¤ºã??å??ã??æ?¿ã??ã?¾ã??"
 
-#: ../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 "ã?¡ã??ã?»ã?¼ã?¸ã?®ã?«ã?¼ã??ã?³ã?»ã?³ã??ã?¼ (Cc) ã??å??ã??ã?¨ã??äººã?®ã?¢ã??ã?¬ã?¹ã??å?¥å??ã??ã?¾ã??"
 
-#: ../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"
@@ -10925,39 +9543,53 @@ msgstr ""
 "ã?¡ã??ã?»ã?¼ã?¸ã?®å®?å??ã?«ã?¯å?¥ã??ã??ã?«ã?«ã?¼ã??ã?³ã?»ã?³ã??ã?¼ (Bcc) ã?¨ã??ã?¦ã?¡ã??ã?»ã?¼ã?¸ã??å??ã??å??ã??"
 "äººã?®ã?¢ã??ã?¬ã?¹ã??å?¥å??ã??ã?¾ã??"
 
-#: ../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 "Cc(_C):"
 
-#: ../composer/e-composer-header-table.c:666
+#: ../composer/e-composer-header-table.c:965 ../mail/em-filter-i18n.h:8
+msgid "CC"
+msgstr "Cc"
+
+#: ../composer/e-composer-header-table.c:971
 msgid "_Bcc:"
 msgstr "Bcc(_B):"
 
-#: ../composer/e-composer-header-table.c:671
+#: ../composer/e-composer-header-table.c:971 ../mail/em-filter-i18n.h:6
+msgid "BCC"
+msgstr "Bcc"
+
+#: ../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 "ã??ã??ã??ã?¯ã?ªã??ã?¯ã??ã??ã?¨ã?¢ã??ã?¬ã?¹å¸³ã??è¡¨ç¤ºã??ã??ã?¾ã??"
 
@@ -10973,18 +9605,18 @@ msgstr "ã?¡ã??ã?»ã?¼ã?¸ã??æ??ç¨¿ã??ã??ã??ã?©ã?«ã??ã??é?¸æ??ã??ã?¦ä¸?ã??ã??ã??"
 msgid "Click here to select folders to post to"
 msgstr "<ã??ã??ã??ã?¯ã?ªã??ã?¯ã??ã?¦æ??ç¨¿ã??ã??ã??ã?©ã?«ã??ã??é?¸æ??ã??ã?¦ä¸?ã??ã??>"
 
-#: ../composer/e-composer-private.c:179 ../composer/e-msg-composer.c:1573
-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:808
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "é??ä¿¡ã?¡ã??ã?»ã?¼ã?¸ã?«ç½²å??ã?§ã??ã?¾ã??ã??: ã??ã?®ã?¢ã?«ã?¦ã?³ã??ã?«å¯¾ã??ã?¦ç½²å??ä»?ã??ã?®è¨¼æ??æ?¸ã??ã?»ã??"
 "ã??ã??ã??ã?¦ã??ã?¾ã??ã??"
 
-#: ../composer/e-msg-composer.c:873
+#: ../composer/e-msg-composer.c:815
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
@@ -10992,23 +9624,11 @@ msgstr ""
 "é??ä¿¡ã??ã??ã?¡ã??ã?»ã?¼ã?¸ã??æ??å?·å??ã?§ã??ã?¾ã??ã??: ã??ã?®ã?¢ã?«ã?¦ã?³ã??ã?«å¯¾ã??ã?¦æ??å?·å??ã??ã??ã??è¨¼æ??"
 "æ?¸ã??ã?»ã??ã??ã??ã??ã?¦ã??ã?¾ã??ã??"
 
-#: ../composer/e-msg-composer.c:1515 ../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] "æ·»ä»?ã??ã?¡ã?¤ã?«"
-msgstr[1] "æ·»ä»?ã??ã?¡ã?¤ã?«"
-
-#: ../composer/e-msg-composer.c:1571
-msgid "Hide _Attachment Bar"
-msgstr "æ·»ä»?ã??ã?¡ã?¤ã?«ã?»ã??ã?¼ã??é? ã??(_A)"
-
-#: ../composer/e-msg-composer.c:1588 ../composer/e-msg-composer.c:2813
+#: ../composer/e-msg-composer.c:1351 ../composer/e-msg-composer.c:2190
 msgid "Compose Message"
 msgstr "ã?¡ã??ã?»ã?¼ã?¸ã?®ä½?æ??"
 
-#: ../composer/e-msg-composer.c:4095
+#: ../composer/e-msg-composer.c:3348
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)</"
 "b>"
@@ -11173,7 +9793,7 @@ msgstr "è??æ¡?ã??ä¿?å?ã??ã??(_S)"
 msgid "Evolution Mail and Calendar"
 msgstr "Evolution ã?®ã?¡ã?¼ã?«ã?¨ã?«ã?¬ã?³ã??"
 
-#: ../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:1035
 msgid "Groupware Suite"
 msgstr "ã?°ã?«ã?¼ã??ã?¦ã?§ã?¢ã?»ã?¹ã?¤ã?¼ã??ã?§ã??ã??"
 
@@ -11189,6 +9809,40 @@ msgstr "ã?¢ã??ã?¬ã?¹ã?»ã?«ã?¼ã??"
 msgid "calendar information"
 msgstr "ã?«ã?¬ã?³ã??æ??å ±"
 
+#. strftime format of a weekday and a date.
+#: ../e-util/e-datetime-format.c:193 ../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:202 ../plugins/itip-formatter/itip-view.c:219
+msgid "Tomorrow"
+msgstr "æ??æ?¥"
+
+#: ../e-util/e-datetime-format.c:204
+msgid "Yesterday"
+msgstr "æ?¨æ?¥"
+
+#: ../e-util/e-datetime-format.c:207
+#, c-format
+msgid "%d days from now"
+msgstr "ä»?ã??ã?? %d æ?¥"
+
+#: ../e-util/e-datetime-format.c:209
+#, c-format
+msgid "%d days ago"
+msgstr "%d æ?¥å??"
+
+#: ../e-util/e-datetime-format.c:283 ../e-util/e-datetime-format.c:293
+#: ../e-util/e-datetime-format.c:302
+msgid "Use locale default"
+msgstr "ã?·ã?¹ã??ã? ã?®ã??ã??ã?©ã?«ã??ã??ä½¿ç?¨"
+
+#: ../e-util/e-datetime-format.c:496
+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 "Evolution ã?®ã?¨ã?©ã?¼"
@@ -11206,7 +9860,7 @@ msgid "Evolution Query"
 msgstr "Evolution ã??ã??ã?®ç¢ºèª?"
 
 #. 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' ã??è¦?æ±?ã??ã?¾ã??ã??)"
@@ -11219,67 +9873,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 "æ??å?¹"
 
@@ -11300,6 +9954,10 @@ msgid ""
 "The printing system did not report any additional details about the error."
 msgstr "å?°å?·ã?·ã?¹ã??ã? ã?¯ã?¨ã?©ã?¼ã?«é?¢ã??ã?¦ä½?ã??è©³ç´°ã??å ±å??ã??ã?¦ã??ã?¾ã??ã??ã?§ã??ã??ã??"
 
+#: ../e-util/e-signature.c:695
+msgid "Autogenerated"
+msgstr "è?ªå??ç??æ??"
+
 #: ../e-util/e-system.error.xml.h:1 ../mail/mail.error.xml.h:19
 msgid "Because \"{1}\"."
 msgstr "å??å? ã?¯ \"{1}\" ã?§ã??ã??"
@@ -11328,55 +9986,55 @@ 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 "Evolution ã?®ã??ã?«ã??ã??è¡¨ç¤ºã?§ã??ã?¾ã??ã??ã?§ã??ã??ã??"
 
-#: ../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 "ToDo(_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."
@@ -11384,190 +10042,176 @@ 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] "1ç§?å??"
-msgstr[1] "%dç§?å??"
+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] "1ç§?å¾?"
-msgstr[1] "%dç§?å¾?"
+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] "1å??å??"
-msgstr[1] "%då??å??"
+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] "1å??å¾?"
-msgstr[1] "%då??å¾?"
+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] "1æ??é??å??"
-msgstr[1] "%dæ??é??å??"
+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] "1æ??é??å¾?"
-msgstr[1] "%dæ??é??å¾?"
+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] "æ?¨æ?¥"
-msgstr[1] "%dæ?¥å??"
+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] "1æ?¥å¾?"
-msgstr[1] "%dæ?¥å¾?"
+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] "å??é?±"
-msgstr[1] "%dé?±é??å??"
+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] "1é?±é??å¾?"
-msgstr[1] "%dé?±é??å¾?"
+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] "å??æ??"
-msgstr[1] "%dã?¶æ??å??"
+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] "1ã?¶æ??å¾?"
-msgstr[1] "%dã?¶æ??å¾?"
+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] "æ?¨å¹´"
-msgstr[1] "%då¹´å??"
+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] "1å¹´å¾?"
-msgstr[1] "%då¹´å¾?"
+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 "é??ä¿¡ã??ã??ã?¡ã??ã?»ã?¼ã?¸"
 
@@ -11654,54 +10298,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:378
-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 "ã?«ã?¼ã?«å??"
 
@@ -11754,21 +10394,21 @@ msgstr "Evolution ã?®ã?¡ã?¼ã?«ã??è¨å®?ã??ã??ã?³ã?³ã??ã?ã?¼ã?«"
 msgid "Evolution Network configuration control"
 msgstr "Evolution ã?®ã??ã??ã??ã?¯ã?¼ã?¯æ?¥ç¶?ã??è¨å®?ã??ã??ã?³ã?³ã??ã?ã?¼ã?«"
 
-#: ../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 "ã?¡ã?¼ã?«ã?®è¨å®?"
 
@@ -11777,16 +10417,114 @@ 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
+#, fuzzy
+msgid "Mat_ch case"
+msgstr "å?¨ã?¦ã?«ä¸?è?´ã??ã??(_A)"
+
+#: ../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"
@@ -11799,107 +10537,111 @@ msgstr ""
 "æ³¨æ??æ·±ã??èªã??ã?§ã??å??æ??ã??ã??å ´å??ã?¯\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 "ã?¡ã?¼ã?«ã?®å??ä¿¡"
 
-#: ../mail/em-account-editor.c:2130
+#: ../mail/em-account-editor.c:2216
 msgid "Check for _new messages every"
 msgstr "æ?°ç??ã?¡ã?¼ã?«ã??ã??ã?§ã??ã?¯ã??ã??å?¨æ??(_N): "
 
-#: ../mail/em-account-editor.c:2138
+#: ../mail/em-account-editor.c:2224
 msgid "minu_tes"
 msgstr "å??å??ä½?(_T)"
 
-#: ../mail/em-account-editor.c:2326 ../mail/mail-config.glade.h:139
+#: ../mail/em-account-editor.c:2420 ../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:2479 ../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:2545 ../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:2582 ../mail/em-account-editor.c:2677
 msgid "Receiving Options"
 msgstr "å??ä¿¡ã?®ã?ªã??ã?·ã?§ã?³"
 
-#: ../mail/em-account-editor.c:2489 ../mail/em-account-editor.c:2580
+#: ../mail/em-account-editor.c:2583 ../mail/em-account-editor.c:2678
 msgid "Checking for New Messages"
 msgstr "æ?°ç??ã?¡ã?¼ã?«ã?®ç¢ºèª?"
 
-#: ../mail/em-account-editor.c:2931 ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:3145 ../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:3145 ../mail/mail-config.glade.h:89
 msgid "Evolution Account Assistant"
 msgstr "Evolution ã?¢ã?«ã?¦ã?³ã??ã?»ã?¢ã?·ã?¹ã?¿ã?³ã??"
 
 #. 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 "-------- è»¢é??ã??ã??ã?¡ã??ã?»ã?¼ã?¸ --------"
 
-#: ../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 "å?©ç?¨ã?§ã??ã??ã?¢ã?«ã?¦ã?³ã??ã??ã?ªã??ã?®ã?§ã??ã?¡ã??ã?»ã?¼ã?¸ã?®è»¢é??ã??ã?ã?£ã?³ã?»ã?«ã??ã?¾ã??ã??"
 
@@ -11922,7 +10664,7 @@ msgstr ""
 msgid "-----Original Message-----"
 msgstr "-------- ã?ªã?ªã?¸ã??ã?«ã?®ã?¡ã??ã?»ã?¼ã?¸ --------"
 
-#: ../mail/em-filter-editor.c:156
+#: ../mail/em-filter-editor.c:172
 msgid "_Filter Rules"
 msgstr "ã??ã?£ã?«ã?¿ã?®ã?«ã?¼ã?«(_F)"
 
@@ -11939,18 +10681,10 @@ msgstr "è?²ã??ä»?ã??ã??"
 msgid "Assign Score"
 msgstr "ã?¹ã?³ã?¢ã??ä»?ã??ã??"
 
-#: ../mail/em-filter-i18n.h:6
-msgid "BCC"
-msgstr "Bcc"
-
 #: ../mail/em-filter-i18n.h:7
 msgid "Beep"
 msgstr "ã??ã?¼ã??é?³ã??é³´ã??ã??"
 
-#: ../mail/em-filter-i18n.h:8
-msgid "CC"
-msgstr "Cc"
-
 #: ../mail/em-filter-i18n.h:9
 msgid "Completed On"
 msgstr "å®?äº?ã??ã?©ã?°"
@@ -11968,7 +10702,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
@@ -12019,226 +10753,235 @@ msgstr "è¡¨ç?¾"
 msgid "Follow Up"
 msgstr "ã??ã?ã?¼ã?¢ã??ã??"
 
-#: ../mail/em-filter-i18n.h:29 ../mail/em-migrate.c:1056
+#: ../mail/em-filter-i18n.h:29
+#, fuzzy
+msgid "Forward to"
+msgstr "è»¢é??"
+
+#: ../mail/em-filter-i18n.h:30 ../mail/em-migrate.c:958
 msgid "Important"
 msgstr "é??è¦?"
 
-#: ../mail/em-filter-i18n.h:31
+#: ../mail/em-filter-i18n.h:32
 msgid "is after"
 msgstr "ã??æ¬¡ã?®æ?¥ã??ã??å¾?ã?«ã??ã??"
 
-#: ../mail/em-filter-i18n.h:32
+#: ../mail/em-filter-i18n.h:33
 msgid "is before"
 msgstr "ã??æ¬¡ã?®æ?¥ã??ã??å??ã?«ã??ã??"
 
-#: ../mail/em-filter-i18n.h:33
+#: ../mail/em-filter-i18n.h:34
 msgid "is Flagged"
 msgstr "ã?«ã??ã?©ã?°ã??ä»?ã??ã?¦ã??ã??"
 
-#: ../mail/em-filter-i18n.h:37
+#: ../mail/em-filter-i18n.h:38
 msgid "is not Flagged"
 msgstr "ã?«ã??ã?©ã?°ã??ä»?ã??ã?¦ã??ã?ªã??"
 
-#: ../mail/em-filter-i18n.h:38
+#: ../mail/em-filter-i18n.h:39
 msgid "is not set"
 msgstr "ã??ä»?ä¸?ã??ã??ã?¦ã??ã?ªã??"
 
-#: ../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 "è¿?ä¿¡æ¸?"
 
-#: ../mail/em-filter-i18n.h:56
+#: ../mail/em-filter-i18n.h:58
 msgid "returns"
 msgstr "ã??æ¬¡ã?®å?¤ã??è¿?ã??"
 
-#: ../mail/em-filter-i18n.h:57
+#: ../mail/em-filter-i18n.h:59
 msgid "returns greater than"
 msgstr "ã??æ¬¡ã??ã??å¤§ã??ã??å?¤ã??è¿?ã??"
 
-#: ../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)"
 
-#: ../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 "æ??å®?ã??ã??ã??ã?©ã?«ã??"
 
-#: ../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)..."
 
-#: ../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 "ã?¢ã?«ã?¦ã?³ã??ã?®æ¤?ç´¢"
 
-#: ../mail/em-folder-browser.c:1241
+#: ../mail/em-folder-browser.c:1256
 msgid "All Account Search"
 msgstr "å?¨ã?¦ã?®ã?¢ã?«ã?¦ã?³ã??ã?®æ¤?ç´¢"
 
@@ -12247,7 +10990,6 @@ msgstr "å?¨ã?¦ã?®ã?¢ã?«ã?¦ã?³ã??ã?®æ¤?ç´¢"
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "æ?ªèªã?®ã?¡ã??ã?»ã?¼ã?¸æ?°:"
-msgstr[1] "æ?ªèªã?®ã?¡ã??ã?»ã?¼ã?¸æ?°:"
 
 #. TODO: can this be done in a loop?
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
@@ -12255,7 +10997,6 @@ msgstr[1] "æ?ªèªã?®ã?¡ã??ã?»ã?¼ã?¸æ?°:"
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "ã?¡ã??ã?»ã?¼ã?¸ã?®ç·?æ?°:"
-msgstr[1] "ã?¡ã??ã?»ã?¼ã?¸ã?®ç·?æ?°:"
 
 #: ../mail/em-folder-properties.c:196
 #, c-format
@@ -12268,11 +11009,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 "å??ä¿¡ç®±"
 
@@ -12285,381 +11026,350 @@ 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 "ä»®æ?³ã??ã?©ã?«ã??"
 
 #. 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)"
 
-#: ../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:691
-#: ../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:691
-#: ../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)"
 
-#: ../mail/em-folder-view.c:1371
+#: ../mail/em-folder-view.c:1369
 msgid "Search Folder based on Se_nder"
 msgstr "å·®å?ºäººã?®ä»®æ?³ã??ã?©ã?«ã??(_N)"
 
-#: ../mail/em-folder-view.c:1372
+#: ../mail/em-folder-view.c:1370
 msgid "Search Folder based on _Recipients"
 msgstr "å®?å??ã?®ä»®æ?³ã??ã?©ã?«ã??(_R)"
 
-#: ../mail/em-folder-view.c:1373
+#: ../mail/em-folder-view.c:1371
 msgid "Search Folder based on Mailing _List"
 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:304
+#: ../plugins/google-account-setup/google-source.c:613
+#: ../plugins/google-account-setup/google-source.c:784
 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)"
 
-#: ../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 "ã?¯ã?ªã??ã?¯ã??ã??ã?¨ E-ã?¡ã?¼ã?«ã?»ã?¢ã??ã?¬ã?¹ã?®è¡¨ç¤º/é??è¡¨ç¤ºã??å??ã??æ?¿ã??ã?¾ã??"
 
-#. 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."
 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."
@@ -12667,21 +11377,21 @@ 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."
 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."
@@ -12689,11 +11399,11 @@ 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."
@@ -12701,11 +11411,11 @@ 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."
@@ -12713,11 +11423,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 "
@@ -12727,11 +11437,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."
@@ -12739,11 +11449,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 "
@@ -12752,87 +11462,59 @@ 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 ã?«å®?äº?"
+#: ../mail/em-format-html-display.c:980
+#, fuzzy
+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 ""
 
-#: ../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)"
-msgstr[1] "%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."
@@ -12846,208 +11528,197 @@ msgstr ""
 msgid "Page %d of %d"
 msgstr "%d / %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 "external-body ã?®å??å®¹ã??ç¢ºèª?ã?§ã??ã?¾ã??ã??"
 
-#: ../mail/em-format-html.c:938
+#: ../mail/em-format-html.c:937
 msgid "Malformed external-body part."
 msgstr "external-body ã?®å??å®¹ã??å£?ã??ã?¦ã??ã?¾ã??"
 
-#: ../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 "ã?ã?¼ã?«ã?«ã?»ã??ã?¡ã?¤ã?« (%s) ã?¯ã?µã?¤ã?? \"%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 "Cc"
 
-#: ../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 "Bcc"
 
 #. 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 "ã?µã??ã?¼ã??ã??ã?¦ã??ã?ªã?? S/MIME ã?®æ??å?·å??ã?®ç¨®é¡?"
 
-#: ../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."
@@ -13055,40 +11726,44 @@ 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 "ToDo"
 
 #. 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"
@@ -13100,31 +11775,31 @@ msgstr ""
 "\n"
 "Evolution ã??ã??ä½¿ã??ã?®ã??ã?©ã?«ã??ã??ç§»è¡?ã??ã?¦ã??ã??é??ã??å°?ã??ã??å¾?ã?¡ä¸?ã??ã??..."
 
-#: ../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 "POP3 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"
@@ -13136,12 +11811,12 @@ msgstr ""
 "\n"
 "Evolution ã??ã??ä½¿ã??ã?®ã??ã?©ã?«ã??ã??å¤?æ??ã??ã?¦ã??ã??é??ã??å°?ã??ã??å¾?ã?¡ä¸?ã??ã??..."
 
-#: ../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."
@@ -13149,74 +11824,91 @@ msgstr ""
 "Evolution ã?®ä»¥å??ã?®è¨å®?ã??èªã?¿è¾¼ã??ã??ã?¨ã??ã?§ã??ã?¾ã??ã??ã??'${HOME}/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 "untitled_image.%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)"
 
-#: ../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:623 ../mail/em-popup.c:848
+#: ../mail/em-popup.c:547 ../mail/em-popup.c:746
 msgid "_Add to Address Book"
 msgstr "ã?¢ã??ã?¬ã?¹å¸³ã?«è¿½å? (_A)"
 
-#: ../mail/em-subscribe-editor.c:605
+#: ../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:638
+#: ../mail/em-subscribe-editor.c:639
 msgid "Subscribed"
 msgstr "è³¼èªæ¸?ã?¿"
 
-#: ../mail/em-subscribe-editor.c:642
+#: ../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:844
+#: ../mail/em-subscribe-editor.c:858
 msgid "Please select a server."
 msgstr "ã?µã?¼ã??ã??ä¸?ã?¤é?¸æ??ã??ã?¦ä¸?ã??ã??ã??"
 
-#: ../mail/em-subscribe-editor.c:865
+#: ../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)"
 
-#: ../mail/em-vfolder-rule.c:593
+#: ../mail/em-vfolder-rule.c:592
 msgid "Search Folder source"
 msgstr "ä»®æ?³ã??ã?©ã?«ã??ã?®ã?½ã?¼ã?¹"
 
@@ -13398,7 +12090,8 @@ msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view."
 msgstr ""
-"ç¸¦å??ã?®è¡¨ç¤ºã?®é??ã?« \"å·®å?ºäºº\" ã?¨ \"ä»¶å??\" ã?«å??ã??ã??ã?©ã?³ã??ã??ä½¿ç?¨ã??ã??ã??ã?©ã??ã??"
+"ç¸¦å??ã?®è¡¨ç¤ºã?®é??ã?« \"ã?¡ã??ã?»ã?¼ã?¸\" ã?®é ?ç?®ã?® \"å·®å?ºäºº\" ã?¨ \"ä»¶å??\" ã?«å??ã??ã??ã?©ã?³"
+"ã??ã??ä½¿ç?¨ã??ã??ã??ã?©ã??ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:39
 msgid "Directory for loading/attaching files to composer."
@@ -13433,40 +12126,46 @@ msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Evolution ã??çµ?äº?ã??ã??æ??ã?«ã?´ã??ç®±ã??ã?©ã?«ã??ã??ç©ºã?«ã??ã??ã??ã?©ã??ã??ã?§ã??ã??"
 
 #: ../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 ""
+
+#: ../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
+#, fuzzy
+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 "ã?¤ã?³ã?¯ã?ªã?¡ã?³ã?¿ã?«æ¤?ç´¢ã?®æ©?è?½ã??æ??å?¹ã?«ã??ã??ã??ã?©ã??ã??"
 
 # "æ¤?ç´¢ã??ã?©ã?«ã??"ã?¯é?©è¨³ã?§ã?¯ã?ªã??
-#: ../mail/evolution-mail.schemas.in.h:50
+#: ../mail/evolution-mail.schemas.in.h:52
 msgid "Enable search folders"
 msgstr "ä»®æ?³ã??ã?©ã?«ã??ã??æ??å?¹ã?«ã??ã??ã??ã?©ã??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:51
+#: ../mail/evolution-mail.schemas.in.h:53
 msgid "Enable search folders on startup."
 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."
+"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."
@@ -13474,42 +12173,43 @@ 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 "Outlook/GMail å??æ§?ã?«ã?¨ã?³ã?³ã?¼ã??ã??ã??ã??ã?¡ã?¤ã?«å??ã??ä½¿ç?¨ã??ã??ã??ã?©ã??ã??"
 
-#: ../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."
+"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 ""
-"Outlook ã?? GMail å??æ§?ã?«ã??ã?¡ã?¼ã?«ã?®ã??ã??ã??ã?«ã??ã??ã?¨ã?³ã?³ã?¼ã??ã?®ã??ã?¡ã?¤ã?«å??ã??ä½¿ã?£ã?¦ "
-"Evolution ã??ã??é??ä¿¡ã??ã??æ?¥æ?¬èª?ã?ªã?©ã?®å??å?½èª?ã?«å¯¾å¿?ã??ã??ã??ã?¡ã?¤ã?«å??ã??ç??è§£ã?§ã??ã??ã??ã??"
-"ã?«ã??ã??ã??ã?©ã??ã??ã?§ã??ã??ã??ã?®ã??ã??ã?ªã??ã?¡ã?¤ã?«ã?¯ RFC 2231 ã?®è¦?æ ¼ã?«ã?¯æº?æ? ã??ã?¦ã??ã?¾ã??ã??"
-"ã??ã??(ä¸?ä½?æ³?ã?ª) RFC 2047 ã?®è¦?æ ¼ã?«æº?æ? ã??ã?¾ã??ã??"
+"Outlook ã?? GMail ã?¨å??ã??æ?¹æ³?ã?§ã??ã?¡ã?¼ã?«ã?®ã??ã??ã??ã?§ã??ã?¡ã?¤ã?«å??ã??ã?¨ã?³ã?³ã?¼ã??ã??ã??"
+"Evolution ã??ã??é??ã?? UTF-8 ã?®æ??å?ã?®ã??ã?¡ã?¤ã?«å??ã?? Outlook ã?? GMail ã?§ã??æ£ã??ã??è¡¨ç¤º"
+"ã?§ã??ã??ã??ã??ã?«ã??ã?¾ã??ã??Outlook ã?? GMailã?¯ 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."
@@ -13517,7 +12217,7 @@ 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."
@@ -13525,7 +12225,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 "
@@ -13536,7 +12236,7 @@ msgstr ""
 "ç?¨ã??ã?¦ã??ã?? bonobo ã?³ã?³ã??ã?¼ã??ã?³ã??ã?®ã??ã?¥ã?¼ã?¢ã?«ã??ã??ã??ã??ã??ã??å¤?é?¨ã?®ã??ã?ã?°ã?©ã? ã??"
 "ä½¿ã?£ã?¦è¡¨ç¤ºã??ã??ã??ã??ã?¨ã?«ã?ªã??ã?¾ã??ã??"
 
-#: ../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."
@@ -13544,7 +12244,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 "
@@ -13557,7 +12257,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."
@@ -13565,11 +12265,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."
@@ -13577,7 +12273,7 @@ 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 "
@@ -13586,31 +12282,31 @@ 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 "bonobo ã?³ã?³ã??ã?¼ã??ã?³ã??ã?»ã??ã?¥ã?¼ã?¢ã?§ã??ã?§ã??ã?¯ã??ã?? 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."
@@ -13619,15 +12315,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."
@@ -13635,15 +12331,15 @@ msgstr ""
 "Evolution ã?¡ã?¼ã?«ä½?æ??ã?¦ã?£ã?³ã??ã?¦ã?§å?©ç?¨ã??ã??ã?©ã??ã?«ã?®ã?ªã?¹ã??ã?§ã??ã??ã??ã?®ã?ªã?¹ã??ã?«ã?¯ "
 "name:color ã?¨ã??ã??å½¢å¼?ã?§ 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 "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 "
@@ -13653,184 +12349,256 @@ msgstr ""
 "ã??ã??æ??å®?å?¯è?½ã?ªå?¤: \"0\" (ç?»å??ã??èªã?¿è¾¼ã?¾ã?ªã??)ã??\"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 "å·®å?ºäºº/Cc/Bcc ã?§è¡¨ç¤ºã??å?¶é??ã??ã?? E-ã?¡ã?¼ã?«ã?»ã?¢ã??ã?¬ã?¹ã?®å??æ?°"
 
-#: ../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 "æ¤?ç´¢ã??ã?©ã?«ã??ã?§ã?¡ã??ã?»ã?¼ã?¸ã??å??é?¤ã??ã??é??ã?«ç¢ºèª?ã??ã??ã??ã?©ã??ã??"
 
-#: ../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 "æ??å?å??ã?®ä¸ã?«å?«ã?¾ã??ã?¦ã??ã??ã?ªã?³ã?¯æ??å ±ã??è?å?¥ã??ã?¦ URI ã?¿ã?°ã?§ç½®ã??æ??ã??ã?¾ã??ã??"
 
-#: ../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 "ã?ã?¼ã?«ã?«ã?®ã?¢ã??ã?¬ã?¹å¸³ã??ã??é??ä¿¡è??ã?®å??ç??ã??æ¤?ç´¢ã??ã??ã??ã?©ã??ã??"
 
-#: ../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 "ã?¡ã?¼ã?«ã??é??ã??æ??ã?« \"Bcc\" ã??ã?£ã?¼ã?«ã??ã??è¡¨ç¤ºã??ã??"
+
+#: ../mail/evolution-mail.schemas.in.h:125
+msgid "Show \"Cc\" field when sending a mail message"
+msgstr "ã?¡ã?¼ã?«ã??é??ã??æ??ã?« \"Cc\" ã??ã?£ã?¼ã?«ã??ã??è¡¨ç¤ºã??ã??<"
+
+#: ../mail/evolution-mail.schemas.in.h:126
+msgid "Show \"From\" field when posting to a newsgroup"
+msgstr "ã??ã?¥ã?¼ã?¹ã?°ã?«ã?¼ã??ã?«æ??ç¨¿ã??ã??æ??ã?« \"From\" ã??ã?£ã?¼ã?«ã??ã??è¡¨ç¤ºã??ã??<<"
+
+#: ../mail/evolution-mail.schemas.in.h:127
+msgid "Show \"From\" field when sending a mail message"
+msgstr "ã?¡ã?¼ã?«ã??é??ã??æ??ã?« \"From\" ã??ã?£ã?¼ã?«ã??ã??è¡¨ç¤ºã??ã??<<"
+
+#: ../mail/evolution-mail.schemas.in.h:128
+msgid "Show \"Reply To\" field when posting to a newsgroup"
+msgstr "ã??ã?¥ã?¼ã?¹ã?°ã?«ã?¼ã??ã?«æ??ç¨¿ã??ã??æ??ã?« \"Reply To\" ã??ã?£ã?¼ã?«ã??ã??è¡¨ç¤ºã??ã??<"
+
+#: ../mail/evolution-mail.schemas.in.h:129
+msgid "Show \"Reply To\" field when sending a mail message"
+msgstr "ã?¡ã?¼ã?«ã??é??ä¿¡ã??ã??æ??ã?« \"Reply To\" ã??ã?£ã?¼ã?«ã??ã??è¡¨ç¤ºã??ã??"
+
+#: ../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 "ç?»å??ã??ã?¢ã??ã?¡ã?¼ã?·ã?§ã?³ã?¨ã??ã?¦è¡¨ç¤ºã??ã??ã??ã?©ã??ã??ã?§ã??ã??"
+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 "é??ä¿¡è??ã?® FACE ã??è¡¨ç¤ºã??ã??ã??ã?©ã??ã??"
 
-#: ../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."
@@ -13838,60 +12606,60 @@ msgstr ""
 "ã?¡ã??ã?»ã?¼ã?¸ã?®ä¸?è¦§ã?«å·®å?ºäººã?® E-ã?¡ã?¼ã?«ã?»ã?¢ã??ã?¬ã?¹ã??è¡¨ã??é ?ç?®ã??è¡¨ç¤ºã??ã??ã??ã?©ã??ã??ã?§"
 "ã??ã??"
 
-#: ../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 "ã?¡ã??ã?»ã?¼ã?¸ã?®ã??ã?¬ã??ã?¥ã?¼ã?«é??ä¿¡è??ã?® FACE ã??è¡¨ç¤ºã??ã??ã??ã?©ã??ã??ã?§ã??ã??"
 
-#: ../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-01-01 ã??ã??ã?®çµ?é??æ?¥æ?°) ã?§ã??ã??"
 
-#: ../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-01-01 ã??ã??ã?®çµ?é??æ?¥æ?°) ã?§ã??ã??"
 
-#: ../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."
@@ -13899,7 +12667,7 @@ 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."
@@ -13907,7 +12675,7 @@ msgstr ""
 "Evolution ã?®ä¸ã?§æ?´å½¢ã??ã??ã??ã?¨ã??å?¯è?½ã?ªã?¡ã?¼ã?«ã?®å¤§ã??ã??ã??æ??å®?ã??ã?¾ã??ã??ã??ã??ã?©ã?«ã??å?¤"
 "ã?¯ 4096KB (4MB) ã?§ 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 "
@@ -13917,7 +12685,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."
@@ -13926,7 +12694,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;"
@@ -13938,7 +12706,7 @@ msgstr ""
 "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 "
@@ -13949,11 +12717,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."
@@ -13962,7 +12730,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."
@@ -13970,7 +12738,7 @@ msgstr ""
 "ã?¡ã?¼ã?«ã?®ã?¹ã?¬ã??ã??ã??ã??ã??ã?©ã?«ã??ã?§å±?é??ã??ã??ç?¶æ??ã?«ã??ã??ã??ã??ã?¾ã??ã?¯ç?³ã??ã? ç?¶æ??ã?«ã??ã??ã??"
 "ã??æ??å®?ã??ã?¾ã??ã??å¤?æ?´ã??ã??ã?? Evolution ã?®å??èµ·å??ã??å¿?è¦?ã?«ã?ªã??ã?¾ã??ã??"
 
-#: ../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 "
@@ -13979,120 +12747,94 @@ msgstr ""
 "ã?¹ã?¬ã??ã??ã?®ä¸ã?«ã??ã??æ??æ?°ã?®ã?¡ã??ã?»ã?¼ã?¸ã??å?ºç?¹ã?«å?¨ã?¦ã?®ã?¹ã?¬ã??ã??ã??ä¸¦ã?³æ?¿ã??ã??ã??ã?©ã??ã??"
 "ã??æ??å®?ã??ã?¾ã??ã??å¤?æ?´ã??ã??ã?? Evolution ã?®å??èµ·å??ã??å¿?è¦?ã?«ã?ªã??ã?¾ã??ã??"
 
-#: ../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 "SpamAssassin ã?®ã??ã?¼ã?¢ã?³ã?¨ã?¯ã?©ã?¤ã?¢ã?³ã??ã??ä½¿ã??ã??ã?©ã??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:176
 msgid "Use SpamAssassin daemon and client (spamc/spamd)."
 msgstr ""
 "SpamAssassin ã?®ã??ã?¼ã?¢ã?³ã?¨ã?¯ã?©ã?¤ã?¢ã?³ã?? (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 "Bcc å?¥å??ã??ã?£ã?¼ã?«ã??ã??è¡¨ç¤ºã??ã??ã??ã?©ã??ã??"
-
-#: ../mail/evolution-mail.schemas.in.h:168
-msgid "View/Bcc menu item is checked."
-msgstr "ã?¡ã?¼ã?«ä½?æ??ã?¦ã?£ã?³ã??ã?¦ã?§ \"Bcc\" ã??ã?£ã?¼ã?«ã??ã??è¡¨ç¤ºã??ã??ã??ã?©ã??ã??ã?§ã??ã??"
-
-#: ../mail/evolution-mail.schemas.in.h:169
-msgid "View/Cc menu item is checked"
-msgstr "Cc å?¥å??ã??ã?£ã?¼ã?«ã??ã??è¡¨ç¤ºã??ã??ã??ã?©ã??ã??"
-
-#: ../mail/evolution-mail.schemas.in.h:170
-msgid "View/Cc menu item is checked."
-msgstr "ã?¡ã?¼ã?«ä½?æ??ã?¦ã?£ã?³ã??ã?¦ã?§ \"Cc\" ã??ã?£ã?¼ã?«ã??ã??è¡¨ç¤ºã??ã??ã??ã?©ã??ã??ã?§ã??ã??"
-
-#: ../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."
@@ -14100,15 +12842,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 "ã?¡ã??ã?»ã?¼ã?¸ä¸?è¦§ã??ã?¤ã?³ã?®å¹?ã?§ã??ã??"
 
@@ -14125,12 +12867,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 "ã?¤ã?³ã??ã?¼ã??å??ã??ã?©ã?«ã??ã?®é?¸æ??"
 
@@ -14148,8 +12890,8 @@ msgstr "mailbox ã?®ã?¤ã?³ã??ã?¼ã??"
 
 #. 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' ã?®ã?¤ã?³ã??ã?¼ã??"
@@ -14176,152 +12918,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é??ã??"
-msgstr[1] " é?¸æ??æ¸? %dé??ã??"
 
-#: ../mail/mail-component.c:554
+#: ../mail/mail-component.c:577
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "å??é?¤æ¸? %dé??"
-msgstr[1] "å??é?¤æ¸? %dé??"
 
-#: ../mail/mail-component.c:561
+#: ../mail/mail-component.c:584
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "ã?¸ã?£ã?³ã?¯ %dé??"
-msgstr[1] "ã?¸ã?£ã?³ã?¯ %dé??"
 
-#: ../mail/mail-component.c:564
+#: ../mail/mail-component.c:587
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "è??æ¡? %dé??"
-msgstr[1] "è??æ¡? %dé??"
 
-#: ../mail/mail-component.c:566
+#: ../mail/mail-component.c:589
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "é??ä¿¡æ¸? %dé??"
-msgstr[1] "é??ä¿¡æ¸? %dé??"
 
-#: ../mail/mail-component.c:568
+#: ../mail/mail-component.c:591
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "æ?ªé??ä¿¡ %dé??"
-msgstr[1] "æ?ªé??ä¿¡ %dé??"
 
-#: ../mail/mail-component.c:574
+#: ../mail/mail-component.c:597
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "æ?ªèª %dé??, "
-msgstr[1] "æ?ªèª %dé??, "
 
-#: ../mail/mail-component.c:575
+#: ../mail/mail-component.c:598
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "å??è¨? %dé??"
-msgstr[1] "å??è¨? %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 "(æ³¨è¨?: å¤?æ?´ã??ã??ã?? Evolution ã?®å??èµ·å??ã??å¿?è¦?ã?§ã??)"
 
-#: ../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>ã??ã?® Evolution ã?¯ SSL ã?µã??ã?¼ã??ä»?ã??ã?§ã??ã?«ã??ã??ã??ã?¦ã??ã?¾ã??ã??</b>"
 
-#: ../mail/mail-config.glade.h:5
+#: ../mail/mail-config.glade.h:4
 msgid "<b>Sender Photograph</b>"
 msgstr "<b>é??ä¿¡è??ã?®å??ç?? (X-FACE)</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>Top Post æ©?è?½ã?®ã?ªã??ã?·ã?§ã?³</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>"
 
@@ -14442,60 +13172,83 @@ 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"
+"ã?¤ã?³ã?©ã?¤ã?³ (Outlook é¢¨)\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 "
-msgstr "ã?µã??ã?¼ã??ã??ã?¦ã??ã??ã??ã??ã?§ã??ã?¯ã??ã??(_E) "
+#: ../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 ""
 "å??ä¿¡ã??ã??ã?¡ã?¼ã?«ã?»ã?¡ã??ã?»ã?¼ã?¸ã??ã?¸ã?£ã?³ã?¯ (SPAM; UCE, UBE) ã??ã?©ã??ã??ã??ã?§ã??ã?¯ã??ã?¾ã??"
 
-#: ../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"
@@ -14511,187 +13264,185 @@ 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)"
 
-#: ../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 "E-ã?¡ã?¼ã?«ã?»ã?¢ã?«ã?¦ã?³ã??"
 
-#: ../mail/mail-config.glade.h:77
+#: ../mail/mail-config.glade.h:82
 msgid "Email _Address:"
 msgstr "E-ã?¡ã?¼ã?«ã?»ã?¢ã??ã?¬ã?¹(_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)"
 
-#: ../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."
+"Please enter a descriptive name for this account in the space below. This "
+"name will be used for display purposes only."
 msgstr ""
-"ã??ã?®ã?¢ã?«ã?¦ã?³ã??ã??èª¬æ??ã??ã??ã??ã??ã?ªå??å??ã??å?¥å??ã??ã?¦ä¸?ã??ã??ã??\n"
-"ã??ã??ã?§å?¥å??ã??ã??å??å??ã?¯è¡¨ç¤ºã?§ã?®ã?¿ä½¿ç?¨ã??ã??ã?¾ã??ã??"
+"ä¸?ã?®å?¥å??æ¬?ã?«ã??ã?®ã?¢ã?«ã?¦ã?³ã??ã??èª¬æ??ã??ã??ã??ã??ã?ªå??å??ã??å?¥å??ã??ã?¦ä¸?ã??ã??ã??ã??ã??ã?§å?¥å??ã??"
+"ã??å??å??ã?¯è¡¨ç¤ºã?§ã?®ã?¿ä½¿ç?¨ã??ã??ã?¾ã??ã??"
 
-#: ../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."
@@ -14699,7 +13450,7 @@ msgstr ""
 "ã?¡ã?¼ã?«ã??é??ä¿¡ã??ã??æ?¹æ³?ã?«ã?¤ã??ã?¦æ??å ±ã??å?¥å??ã??ã?¦ä¸?ã??ã??ã??ä¸?æ??ã?ªå ´å??ã?¯ã??ã?·ã?¹ã??ã? ç®¡ç??"
 "è??ã?¾ã??ã?¯ã?¤ã?³ã?¿ã?¼ã??ã??ã??ã?»ã?µã?¼ã??ã?¹ã?»ã??ã?ã??ã?¤ã?? (ISP) ã?«ã??å°?ã?ä¸?ã??ã??ã??"
 
-#: ../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 "
@@ -14708,58 +13459,42 @@ msgstr ""
 "ã??ã?ªã??ã?®ã??å??å??ã?¨ E-ã?¡ã?¼ã?«ã?»ã?¢ã??ã?¬ã?¹ã??å?¥å??ã??ã?¦ä¸?ã??ã??ã??\"è¿½å? æ??å ±\" ã?®æ¬?ã?¯å¿?é ?"
 "ã?§ã?¯ã??ã??ã?¾ã??ã??ã??ã??è?ªå??ç??ã?«ã?¡ã??ã?»ã?¼ã?¸ã?®ä¸ã?«æ?¿å?¥ã??ã??ã??å ´å??ã?¯å?¥å??ã??ã?¦ä¸?ã??ã??ã??"
 
-#: ../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 "ã??ã?¼ã??ç?ªå?·(_P):"
 
-#: ../mail/mail-config.glade.h:121
+#: ../mail/mail-config.glade.h:124
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Bcc å??ä¿¡è??ã?®ã?¿æ??å®?ã??ã??ã?¦ã??ã??å ´å??ã?¯é??ä¿¡ã??ã??å??ã?«ç¢ºèª?ã??ã??(_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)"
 
-#: ../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 è¡¨ç¤º)"
@@ -14776,70 +13511,67 @@ msgstr "å?¯å¤?å¹?ã??ã?©ã?³ã??ã?®é?¸æ?? (HTML è¡¨ç¤º)"
 msgid "Select HTML variable width font for printing"
 msgstr "å?°å?·æ??ã?®å?¯å¤?å¹?ã??ã?©ã?³ã??ã?®é?¸æ??"
 
-#: ../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: "
+#: ../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: "
+#: ../mail/mail-config.glade.h:149
+#, fuzzy
+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
+#, fuzzy
 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. "
+"signature. The name you specify will be used for display purposes only."
 msgstr ""
 "ã??ã?®ã?¹ã?¯ã?ªã??ã??ã?®å?ºå??ã??ç½²å??ã?¨ã??ã?¦ä½¿ç?¨ã??ã?¾ã??ã??\n"
 "\"å??å??\" ã?¯è¡¨ç¤ºã?®ç?®ç??ã?§ã?®ã?¿ä½¿ç?¨ã??ã??ã?¾ã??ã??"
 
-#: ../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\""
@@ -14847,156 +13579,156 @@ 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:325
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:349
+#: ../mail/mail-config.glade.h:157 ../plugins/caldav/caldav-source.c:405
+#: ../plugins/google-account-setup/google-source.c:701
+#: ../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 ""
 "Evolution ã?¡ã?¼ã?«è¨å®?ã?¢ã?·ã?¹ã?¿ã?³ã??ã?¸ã??ã??ã??ã??ã??\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):"
 
-#: ../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)"
 
-#: ../mail/mail-config.glade.h:191
+#: ../mail/mail-config.glade.h:188
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "ã??ã??ã??ã?«è¡¨ç¤ºã??ã?? E-ã?¡ã?¼ã?«ã?»ã?¢ã??ã?¬ã?¹ã?®å??æ?°(_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)"
 
-#: ../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 "    "
@@ -15026,50 +13758,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."
@@ -15077,19 +13793,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)"
 
@@ -15098,21 +13814,21 @@ msgstr "ã?©ã?¤ã?»ã?³ã?¹å??æ??æ?¸ã??å??è«¾ã??ã??å ´å??ã?¯ã??ã??ã??ã??ã?§ã??ã?¯ã??
 msgid "Pinging %s"
 msgstr "%s ã?¸ ping ä¸ã?«"
 
-#: ../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"
@@ -15121,123 +13837,121 @@ 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 "%d / %d é??ã?®ã?¡ã??ã?»ã?¼ã?¸ã?®é??ä¿¡ä¸"
 
-#: ../mail/mail-ops.c:762
+#: ../mail/mail-ops.c:761
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "%d / %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é??ã?®ã?¡ã??ã?»ã?¼ã?¸ã?®å??ä¿¡ä¸"
-msgstr[1] "%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é??ã?®ã?¡ã??ã?»ã?¼ã?¸ã?®ä¿?å?ä¸"
-msgstr[1] "%dé??ã?®ã?¡ã??ã?»ã?¼ã?¸ã?®ä¿?å?ä¸"
 
-#: ../mail/mail-ops.c:2088
+#: ../mail/mail-ops.c:2096
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -15246,11 +13960,11 @@ msgstr ""
 "ã??ã?¡ã?¤ã?«ã?®ä¿?å?ä¸ã?«ã?¨ã?©ã?¼: %s:\n"
 " %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"
@@ -15259,27 +13973,27 @@ 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 "ã?µã?¼ã??ã?¹ã?®ç¢ºèª?ä¸"
 
@@ -15303,43 +14017,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):"
 
@@ -15372,21 +14086,21 @@ msgstr "ç?¡å?¹ã?ªã??ã?©ã?«ã??: '%s'"
 msgid "Setting up Search Folder: %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' ã?®æ?´æ?°ä¸"
 
-#: ../mail/mail-vfolder.c:247
+#: ../mail/mail-vfolder.c:241
 #, c-format
 msgid "Updating Search Folders for '%s'"
 msgstr "ä»®æ?³ã??ã?©ã?«ã?? '%s' ã?®æ?´æ?°ä¸"
 
-#: ../mail/mail-vfolder.c:1086
+#: ../mail/mail-vfolder.c:1067
 msgid "Edit Search Folder"
 msgstr "ã??ã?©ã?«ã??ã?®ç·¨é??"
 
-#: ../mail/mail-vfolder.c:1175
+#: ../mail/mail-vfolder.c:1155
 msgid "New Search Folder"
 msgstr "æ?°ã??ã??ä»®æ?³ã??ã?©ã?«ã??"
 
@@ -16006,79 +14720,78 @@ 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:71
+#: ../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:81
+#: ../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:93
+#: ../mail/message-list.c:1682
 msgid "%a %l:%M %p"
 msgstr "%p%l:%M (%a)"
 
-#: ../mail/message-list.c:1692 ../widgets/table/e-cell-date.c:101
+#: ../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:103
+#: ../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."
@@ -16086,7 +14799,13 @@ 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 "ã??ã?®ã??ã?©ã?«ã??ã?«ã?¡ã??ã?»ã?¼ã?¸ã?¯ã??ã??ã?¾ã??ã??ã??"
 
@@ -16116,6 +14835,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 "ã?µã?¤ã?º"
 
@@ -16123,39 +14843,39 @@ msgstr "ã?µã?¤ã?º"
 msgid "Subject - Trimmed"
 msgstr "ä»¶å?? - Trimmed"
 
-#: ../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 "F.Y.I"
 
-#: ../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 "ã?¬ã??ã?¥ã?¼"
 
@@ -16180,20 +14900,24 @@ 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 "ä»¶å??ã?¾ã??ã?¯å·®å?ºäºº"
 
 #: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:1
-msgid "Local Address Books"
-msgstr "ã?ã?¼ã?«ã?«ã?®ã?¢ã??ã?¬ã?¹å¸³"
+msgid "Add local address books to Evolution."
+msgstr "ã?ã?¼ã?«ã?«ã?«ã??ã??ã?¢ã??ã?¬ã?¹å¸³ã?? Evolution ã?«è¿½å? ã??ã??ã??"
 
 #: ../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 ""
@@ -16209,8 +14933,8 @@ 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 "ã?ã?¼ã?¯ã?¼ã??"
 
@@ -16220,12 +14944,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"
+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 ""
@@ -16239,23 +14959,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 ""
-"ã?ªã?¼ã??ã?£ã?ªé?¢é?£ã?®æ·»ä»?ã??ã?¡ã?¤ã?«ã??ã?¤ã?³ã?©ã?¤ã?³è¡¨ç¤ºã??ã?¦ã??ç?´æ?¥ Evolution ã??ã??æ¼?å¥?ã?§ã??"
-"ã??ã??ã??ã?«ã??ã??ã??ã??ã?®ã??ã?©ã?°ã?¤ã?³ã?§ã??ã??"
+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 "Evolution ã??ã??ç?´æ?¥ã?ªã?¼ã??ã?£ã?ªã??å??ç??ã??ã??ã??"
 
-#: ../plugins/backup-restore/backup-restore.c:138
+#: ../plugins/backup-restore/backup-restore.c:139
 msgid "Select name of the Evolution backup file"
 msgstr "ã??ã??ã?¯ã?¢ã??ã??ã?»ã??ã?¡ã?¤ã?«ã?®é?¸æ??"
 
@@ -16278,138 +14998,138 @@ 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."
+"Calendars, Tasks, Memos, Contacts. It also restores all your personal "
+"settings, mail filters etc."
 msgstr ""
-"æ??å®?ã??ã??ã??ã??ã?¯ã?¢ã??ã??ã?»ã??ã?¡ã?¤ã?«ã??ã?? Evolution ã?®æ§?æ??ã??ã?ªã?¹ã??ã?¢ã?§ã??ã?¾ã??ã??ã?¡ã?¼"
-"ã?«/ã?«ã?¬ã?³ã??/ã?¿ã?¹ã?¯/ã?¡ã?¢/ã?¢ã??ã?¬ã?¹å¸³ã?®å?¨ã?¦ã??ã?ªã?¹ã??ã?¢ã??ã?¾ã??ã??\n"
-"ã??ã??ã?«å??äººã?®è¨å®?ã??ã?¡ã?¼ã?«ã?»ã??ã?£ã?«ã?¿ã?ªã?©ã??ä¸?ç·?ã?«ã?ªã?¹ã??ã?¢ã??ã?¾ã??ã??"
+"Evolution ã??ã??ã??ã?¯ã?¢ã??ã??ã??ã??ã?ªã?¹ã??ã?¢ã?§ã??ã?¾ã??ã??ã?¡ã?¼ã?«ã??ã?«ã?¬ã?³ã??ã??ã?¿ã?¹ã?¯ã??ã?¡"
+"ã?¢ã??é?£çµ¡å??ã?®å?¨ã?¦ã??ã?ªã?¹ã??ã?¢ã??ã?¾ã??ã??ã??ã??ã?«å??äººã?®è¨å®?ã??ã?¡ã?¼ã?«ã?»ã??ã?£ã?«ã?¿ã?ªã?©ã??ä¸?"
+"ç·?ã?«ã?ªã?¹ã??ã?¢ã??ã?¾ã??ã??"
 
-#: ../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 "ã?ªã?¹ã??ã?¢ã??ã?? Evolution ã?®ã?¢ã?¼ã?«ã?¤ã??ã??é?¸æ??ã??ã?¦ä¸?ã??ã??:"
 
-#: ../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 "Evolution ã??ã?©ã?«ã??ã?®ã??ã??ã?¯ã?¢ã??ã??"
 
-#: ../plugins/backup-restore/backup.c:67
+#: ../plugins/backup-restore/backup.c:64
 msgid "Restore Evolution directory"
 msgstr "Evolution ã??ã?©ã?«ã??ã?®ã?ªã?¹ã??ã?¢"
 
-#: ../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 "Evolution ã?®å??èµ·å??"
 
-#: ../plugins/backup-restore/backup.c:73
+#: ../plugins/backup-restore/backup.c:70
 msgid "With Graphical User Interface"
 msgstr "GUI ã??è¡¨ç¤ºã??ã??"
 
-#: ../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 "Evolution ã?®ã?·ã?£ã??ã??ã??ã?¦ã?³ä¸"
 
-#: ../plugins/backup-restore/backup.c:131
+#: ../plugins/backup-restore/backup.c:195
 msgid "Backing Evolution accounts and settings"
 msgstr "Evolution ã?¢ã?«ã?¦ã?³ã??ã?¨è¨å®?ã?®ã??ã??ã?¯ã?¢ã??ã??ä¸"
 
-#: ../plugins/backup-restore/backup.c:135
+#: ../plugins/backup-restore/backup.c:201
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr ""
 "Evolution ã?®ã??ã?¼ã?¿ (ã?¡ã?¼ã?«ã??é?£çµ¡å??ã??ã?«ã?¬ã?³ã??ã??ã?¿ã?¹ã?¯ã??ã?¡ã?¢) ã??ã??ã??ã?¯ã?¢ã??ã??ã??"
 "ã?¦ã??ã?¾ã??"
 
-#: ../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 "Evolution ã?®ã?ªã?¹ã??ã?¢ä¸"
 
-#: ../plugins/backup-restore/backup.c:261
+#: ../plugins/backup-restore/backup.c:254
 msgid "Backup current Evolution data"
 msgstr "ç?¾å?¨ã?® Evolution ã??ã?¼ã?¿ã??ã??ã??ã?¯ã?¢ã??ã??ã??ã??"
 
-#: ../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 "Evolution ã?®è¨å®?ã??èªã?¿è¾¼ã??ã?§ã??ã?¾ã??"
 
-#: ../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 "Evolution ã?®ã??ã??ã?¯ã?¢ã??ã??"
 
-#: ../plugins/backup-restore/backup.c:478
+#: ../plugins/backup-restore/backup.c:454
 msgid "Evolution Restore"
 msgstr "Evolution ã?®ã?ªã?¹ã??ã?¢"
 
-#: ../plugins/backup-restore/backup.c:513
+#: ../plugins/backup-restore/backup.c:489
 msgid "Backing up Evolution Data"
 msgstr "Evolution ã??ã?¼ã?¿ã?®ã??ã??ã?¯ã?¢ã??ã??ä¸"
 
-#: ../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 "Evolution ã??ã?¼ã?¿ã?®ã?ªã?¹ã??ã?¢ä¸"
 
-#: ../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 ""
-"Evolution ã?®ã??ã?¼ã?¿ã?¨è¨å®?ã??ã??ã??ã?¯ã?¢ã??ã??ã??ã??ã??ã?ªã?¹ã??ã?¢ã??ã??ã??ã??ã?®ã??ã?©ã?°ã?¤ã?³ã?§"
-"ã??ã??"
-
 #. 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 "ã??ã??ã?¯ã?¢ã??ã??/ã?ªã?¹ã??ã?¢ã?®ã??ã?©ã?°ã?¤ã?³"
+#, fuzzy
+msgid "Backup and restore your Evolution data and settings."
+msgstr "Evolution ã?®ã??ã?¼ã?¿ã?¨è¨å®?ã??ã??ã??ã?¯ã?¢ã??ã??ã??ã??ã??ã?ªã?¹ã??ã?¢ã??ã?¾ã??"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:1
 msgid "Are you sure you want to close Evolution?"
@@ -16477,74 +15197,77 @@ 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 "å®?æ??ç??ã?« Pidgin ã?®ä»²é??ã?ªã?¹ã??ã??ã??é?£çµ¡å??ã?¨ã??ã?®ç?»å??ã??å??æ??ã??ã??"
 
-#: ../plugins/bbdb/bbdb.c:681
+#: ../plugins/bbdb/bbdb.c:688
 msgid "Select Address book for Pidgin buddy list"
 msgstr "Pidgin ã?®ä»²é??ã?ªã?¹ã??ã?¨ã??ã?¦ä½¿ç?¨ã??ã??ã?¢ã??ã?¬ã?¹å¸³ã??é?¸æ??ã??ã?¦ä¸?ã??ã??:"
 
 #. 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
+#, fuzzy
 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 ""
 "ã?¡ã??ã?»ã?¼ã?¸ã?«è¿?ä¿¡ã??ã??é??ã?®å®?å?? (æ°?å??ã?¨ E-ã?¡ã?¼ã?«ã?»ã?¢ã??ã?¬ã?¹) ã??å?ºã?«ã??ã?¦è?ªå??ç??ã?«é?£"
 "çµ¡å??ã??ç??æ??ã??ã??ã??ã?©ã?°ã?¤ã?³ã?§ã??ã??ã??ã??ã?«ã??ã?¤ã?³ã?¹ã?¿ã?³ã??ã?»ã?¡ã??ã?»ã?³ã?¸ã?£ã?¼ã?®ä»²é??ã?ªã?¹"
 "ã??ã??ã??é?£çµ¡å??ã?®æ??å ±ã??å??å¾?ã??ã?¾ã??ã??"
 
-#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3
-msgid "BBDB"
-msgstr "BBDB"
-
 #. 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 "Bogofilter ã?®å?ã??ã?ã?»ã?¹ã??ã??å¿?ç?ã??ã?ªã??ã?®ã?§å¼·å?¶çµ?äº?ã??ã??ã?¦ã??ã?¾ã??..."
 
-#: ../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 "Bogofilter ã?®å?ã??ã?ã?»ã?¹ã??ã??ã?®å?²ã??è¾¼ã?¿å¾?ã?¡ã?«å?¥ã??ã?¾ã??..."
 
-#: ../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 "Bogofilter ã?«å¯¾ã??ã??ã??ã?¤ã??ã??å¤±æ??ã??ã?¾ã??ã?? (ã?¨ã?©ã?¼ã?»ã?³ã?¼ã??: %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 "ã?¡ã??ã?»ã?¼ã?¸ã?? Unicode ã?«å¤?æ??ã??ã??(_U)"
 
@@ -16561,75 +15284,113 @@ msgstr ""
 "\"ã?¹ã??ã? \" ã?? \"ã??ã? \" ã?®èª?å?¥ã??ä¸?å??å??ã??ã??ã??ã?©ã??ã??ã?§ã??ã??"
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:1
-msgid "Bogofilter Options"
-msgstr "Bogofilter ã?®ã?ªã??ã?·ã?§ã?³"
+#, fuzzy
+msgid "Bogofilter Junk Filter"
+msgstr "Bogofilter ã?¸ã?£ã?³ã?¯ã?»ã?¡ã?¼ã?«ã?®ã??ã?©ã?°ã?¤ã?³"
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:2
-msgid "Bogofilter junk plugin"
-msgstr "Bogofilter ã?¸ã?£ã?³ã?¯ã?»ã?¡ã?¼ã?«ã?®ã??ã?©ã?°ã?¤ã?³"
+msgid "Bogofilter Options"
+msgstr "Bogofilter ã?®ã?ªã??ã?·ã?§ã?³"
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:3
-msgid "Filters junk messages using Bogofilter."
+#, fuzzy
+msgid "Filter junk messages using Bogofilter."
 msgstr ""
 "Bogofilter ã??ä½¿ã?£ã?¦ã?¸ã?£ã?³ã?¯ã?»ã?¡ã?¼ã?«ã??ã??ã?£ã?«ã?¿ã?ªã?³ã?°ã??ã??ã??ã?©ã?°ã?¤ã?³ã?§ã??ã??"
 
-#. 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(_U):"
 
-#: ../plugins/caldav/caldav-source.c:372
-#: ../plugins/google-account-setup/google-source.c:608
-#: ../plugins/google-account-setup/google-contacts-source.c:348
+#: ../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:367
+#: ../plugins/caldav/caldav-source.c:433
+#: ../plugins/calendar-file/calendar-file.c:274
+#: ../plugins/calendar-http/calendar-http.c:308
+#: ../plugins/calendar-weather/calendar-weather.c:508
+#: ../plugins/google-account-setup/google-source.c:718
+#: ../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:296
+#: ../plugins/calendar-http/calendar-http.c:326
+#: ../plugins/calendar-weather/calendar-weather.c:526
+#: ../plugins/google-account-setup/google-source.c:743
+#: ../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 "Evolution ã?? 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:208
+msgid "_Customize options"
+msgstr "ã?ªã??ã?·ã?§ã?³ã?®è¨å®?(_C)"
+
+#: ../plugins/calendar-file/calendar-file.c:227
+msgid "File _name:"
+msgstr "ã??ã?¡ã?¤ã?«å??(_N):"
+
+#: ../plugins/calendar-file/calendar-file.c:231
+msgid "Choose calendar file"
+msgstr "ã?«ã?¬ã?³ã??ã?¼ã?»ã??ã?¡ã?¤ã?«ã?®é?¸æ??"
+
+#: ../plugins/calendar-file/calendar-file.c:279
+msgid "On open"
+msgstr "é??ã??ã??æ??"
+
+#: ../plugins/calendar-file/calendar-file.c:280
+msgid "On file change"
+msgstr ""
+
+#: ../plugins/calendar-file/calendar-file.c:281
+#, fuzzy
+msgid "Periodically"
+msgstr "ã??ã?©ã?¤ã??ã?¼ã??"
+
+#: ../plugins/calendar-file/calendar-file.c:308
+msgid "Force read _only"
+msgstr ""
 
 #: ../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"
@@ -16671,37 +15432,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"
@@ -16713,13 +15470,14 @@ msgid ""
 msgstr "Evolution ã??èµ·å??ã??ã??ã??ã?³ã?«ã??ã??ã??ã?©ã?«ã??ã?®ã?¡ã?¼ã?©ã?¼ã??ã?©ã??ã??ã??ç¢ºèª?ã??ã?¾ã??ã??"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:1
-msgid "Checks whether Evolution is the default mail client on startup."
+#, fuzzy
+msgid "Check whether Evolution is the default mail client on startup."
 msgstr ""
 "Evolution ã??ã??ã??ã?©ã?«ã??ã?®ã?¡ã?¼ã?©ã?¼ (ã?¡ã?¼ã?«ã?»ã?¯ã?©ã?¤ã?¢ã?³ã??) ã??ã?©ã??ã??ã??èµ·å??æ??ã?«ç¢º"
 "èª?ã??ã??ã??ã?©ã?°ã?¤ã?³ã?§ã??ã??"
 
 #: ../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
@@ -16727,23 +15485,23 @@ msgid "Do you want to make Evolution your default e-mail client?"
 msgstr "Evolution ã??ã??ã??ã?©ã?«ã??ã?®ã?¡ã?¼ã?©ã?¼ã?«ã??ã?¾ã??ã??ï¼?"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:599
+#: ../shell/main.c:627
 msgid "Evolution"
 msgstr "Evolution"
 
-#: ../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)"
 
@@ -16752,41 +15510,39 @@ 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 "ã?»ã?ã?¥ã?ªã??ã?£:"
 
-#: ../plugins/email-custom-header/email-custom-header.c:339
+#: ../plugins/email-custom-header/email-custom-header.c:338
 msgid "Unclassified"
 msgstr "æ©?å¯?æ?±ã??ã?§ã?¯ã?ªã??"
 
-#: ../plugins/email-custom-header/email-custom-header.c:340
+#: ../plugins/email-custom-header/email-custom-header.c:339
 msgid "Protected"
 msgstr "ä¿?è·æ¸?"
 
-#: ../plugins/email-custom-header/email-custom-header.c:342
+#: ../plugins/email-custom-header/email-custom-header.c:341
 msgid "Secret"
 msgstr "æ©?å¯?"
 
-#: ../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)"
 
-#: ../plugins/email-custom-header/email-custom-header.c:907
+#: ../plugins/email-custom-header/email-custom-header.c:906
 msgid "Key"
 msgstr "ã?ã?¼"
 
-#: ../plugins/email-custom-header/email-custom-header.c:918
-#: ../plugins/templates/templates.c:396
+#: ../plugins/email-custom-header/email-custom-header.c:917
+#: ../plugins/templates/templates.c:395
 msgid "Values"
 msgstr "å?¤"
 
@@ -16805,8 +15561,8 @@ msgstr "E-ã?¡ã?¼ã?«ã?®ç?¬è?ªã??ã??ã??"
 
 #. 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."
-msgstr "ç?¬è?ªã?®ã??ã??ã??ã??é??ä¿¡ã??ã??ã?¡ã?¼ã?«ã?«ä»?ä¸?ã??ã??ã??ã?©ã?°ã?¤ã?³ã?§ã??ã??"
+msgid "Add custom headers to outgoing mail messages."
+msgstr "é??ä¿¡ã??ã??ã?¡ã?¼ã?«ã?®ã?¡ã??ã?»ã?¼ã?¸ã?«ç?¬è?ªã?®ã??ã??ã??ã??ä»?å? ã??ã?¾ã??ã??"
 
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:3
 msgid "Custom Header"
@@ -16866,11 +15622,11 @@ msgid ""
 msgstr ""
 "æ¨?æº?ç??ã?ªã??ã?¹ã?¯ã?¼ã??èª?è¨¼ã??ç?¨ã??ã?¦ Exchange ã?µã?¼ã??ã?¨æ?¥ç¶?ã??ã??ã?ªã??ã?·ã?§ã?³ã?§ã??ã??"
 
-#: ../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."
@@ -16878,90 +15634,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 "Exchange ã?¢ã?«ã?¦ã?³ã??ã?®ã??ã?¹ã?¯ã?¼ã??ã?®å¤?æ?´"
 
-#: ../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 "Exchange ã?¢ã?«ã?¦ã?³ã??ã?®ã??ã?ªã?²ã?¼ã??è¨å®?ã?®ç®¡ç??"
 
-#: ../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 "å?¨ã?¦ã?® Exchange ã??ã?©ã?«ã??ã?®ã?µã?¤ã?ºã??è¡¨ç¤ºã??ã??"
 
-#: ../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 "Exchange ã?®è¨å®?"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:730
+#: ../plugins/exchange-operations/exchange-account-setup.c:726
 msgid "_OWA URL:"
 msgstr "OWA URL(_O):"
 
-#: ../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 ""
 
-#: ../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 Kã??ã?¤ã??"
 
-#: ../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 Kã??ã?¤ã??"
 
+#. 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 ""
@@ -17002,38 +15761,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:565
+#: ../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 ã??ã??ã?«å¯¾ã??ã??æ¨©é??"
@@ -17041,7 +15797,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."
@@ -17052,84 +15808,92 @@ 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 "Active Directory ã?«ã?¢ã?¯ã?»ã?¹ã?§ã??ã?¾ã??ã??ã?§ã??ã??"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:712
+#: ../plugins/exchange-operations/exchange-delegates.c:710
 msgid "Could not find self in Active Directory"
 msgstr "Active Directory ã?§ self ã??è¦?ã?¤ã??ã??ã?¾ã??ã??ã?§ã??ã??"
 
-#: ../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 "Active Directory ã?§ DeleGate %s ã??è¦?ã?¤ã??ã??ã?¾ã??ã??ã?§ã??ã??<"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:737
+#: ../plugins/exchange-operations/exchange-delegates.c:735
 #, c-format
 msgid "Could not remove delegate %s"
 msgstr "DeleGate %s ã??å??é?¤ã?§ã??ã?¾ã??ã??ã?§ã??ã??"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:797
+#: ../plugins/exchange-operations/exchange-delegates.c:795
 msgid "Could not update list of delegates."
 msgstr "DeleGate ã?®ä¸?è¦§ã??æ?´æ?°ã?§ã??ã?¾ã??ã??ã?§ã??ã??"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:815
+#: ../plugins/exchange-operations/exchange-delegates.c:813
 #, c-format
 msgid "Could not add delegate %s"
 msgstr "DeleGate %s ã??è¿½å? ã?§ã??ã?¾ã??ã??ã?§ã??ã??"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:983
+#: ../plugins/exchange-operations/exchange-delegates.c:980
 msgid "Error reading delegates list."
 msgstr "DeleGate ã?®ä¸?è¦§ã??èªã?¿è¾¼ã??é??ã?«ã?¨ã?©ã?¼"
 
 #. 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 "DeleGate"
 
-#: ../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 ""
+
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:11
 msgid "Permissions for"
 msgstr "æ©?è?½å?¥ã?®æ¨©é??"
 
@@ -17156,6 +15920,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):"
 
@@ -17173,11 +15938,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 "ä»?ã?¦ã?¼ã?¶ã?®ã??ã?©ã?«ã??ã?®è³¼èª"
@@ -17186,20 +15951,20 @@ msgstr "ä»?ã?¦ã?¼ã?¶ã?®ã??ã?©ã?«ã??ã?®è³¼èª"
 msgid "Exchange Folder Tree"
 msgstr "Exchange ã??ã?©ã?«ã??ã?®ã??ã?ªã?¼"
 
-#: ../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\" ã?®è³¼èªå??æ¢"
@@ -17263,18 +16028,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 "ã?¦ã?¼ã?¶ã?®è¿½å? "
 
@@ -17392,11 +16157,11 @@ msgstr "Sensitivity(_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 "ã?¢ã??ã?¬ã?¹å¸³..."
 
@@ -17409,11 +16174,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."
+msgid "Activates the Evolution-Exchange extension package."
 msgstr ""
-"Exchange ã?®ã?¢ã?«ã?¦ã?³ã??ã?®å??é??ã?«é?¢ã??ã??æ??ä½?ã?¨æ©?è?½ã??ç®¡ç??ã??ã??ã??ã?©ã?°ã?¤ã?³ã?§ã??ã??"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:2
 msgid "Exchange Operations"
@@ -17562,7 +16324,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 "ä¸?è?¬ç??ã?ªã?¨ã?©ã?¼"
 
@@ -17684,7 +16446,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:624
+#: ../plugins/mail-to-task/mail-to-task.c:599
+#: ../plugins/mail-to-task/mail-to-task.c:821
 msgid "Unknown error."
 msgstr "å??å? ã??ç?¹å®?ã?§ã??ã?ªã??ã?¨ã?©ã?¼ã?§ã??ã??"
 
@@ -17770,35 +16534,40 @@ 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 ""
-"ã?¡ã?¼ã?«ã?®ä½?æ??ã?§å¤?é?¨ã?¨ã??ã?£ã?¿ã??å?©ç?¨ã?§ã??ã??ã??ã??ã?«ã??ã??ã??ã?©ã?°ã?¤ã?³ã?§ã?? (HTML ã?¡ã?¼ã?«ã?®"
-"ä½?æ??ã?§ã?¯å?©ç?¨ã?§ã??ã?¾ã??ã??)ã??"
-
-#. 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."
@@ -17806,7 +16575,19 @@ 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."
@@ -17814,26 +16595,25 @@ 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
+#, fuzzy
 msgid ""
 "For Emacs use \"xemacs\"\n"
-"For VI use \"gvim\""
+"For VI use \"gvim -f\""
 msgstr ""
 "Emacs ã?ªã??ã?° \"xemacs\"\n"
 "VI ã?ªã??ã?° \"gvim\" ã??ã??ã??ã??ã??æ??å®?ã??ã?¦ä¸?ã??ã??ã??"
 
+#: ../plugins/external-editor/external-editor.c:354
+#: ../plugins/external-editor/external-editor.c:356
+#, fuzzy
+msgid "Compose in External Editor"
+msgstr "å¤?é?¨ã?¨ã??ã?£ã?¿ã??ä½¿ã??(_E)"
+
 #: ../plugins/face/face.c:59
 msgid "Select a (48*48) png of size < 700bytes"
 msgstr "PNG ç?»å?? (48x48/700ã??ã?¤ã??æ?ªæº?) ã?®é?¸æ??"
@@ -17847,10 +16627,13 @@ msgid "_Face"
 msgstr "ã??ã?§ã?¤ã?¹(_F)"
 
 #: ../plugins/face/org-gnome-face.eplug.xml.h:1
+#, fuzzy
 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 ""
 "é??ä¿¡ã??ã??ã?¡ã?¼ã?«ã?« X-Face ã?®ã??ã??ã??ã??è¿½å? ã??ã??ã??ã?©ã?°ã?¤ã?³ã?§ã??ã??ã?¾ã?? 48*48 ã?® PNG "
 "ç?»å??ã??ç?¨æ??ã??ã?¦ä¸?ã??ã??ã??ä¸?åº¦ã??ã?®ç?»å??ã??ã?¡ã??ã?»ã?¼ã?¸ã?®ç·¨é??ã?¦ã?£ã?³ã??ã?¦ã?§æ?¿å?¥ã??ã??ã?¨è?ª"
@@ -17858,33 +16641,37 @@ msgstr ""
 "ã?«ã?¨ã??ã?¦ä¿?å?ã??ã?¦ä¸?ã??ã??ã??ã??ã??ä»¥é??ã?¯ã??é??ä¿¡ã??ã??ã?¡ã??ã?»ã?¼ã?¸ã?®ä¸ã?« face ã??ã?¡ã?¤ã?«ã?®"
 "å??å®¹ã??ã??ã??ã??ã?¨ã??ã?¦è?ªå??ç??ã?«è¿½å? ã??ã??ã??ã??ã??ã?«ã?ªã??ã?¾ã??ã??"
 
-#: ../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 ""
+
 #: ../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:82
+#: ../plugins/google-account-setup/google-contacts-source.c:51
+msgid "Google"
+msgstr "Google"
+
+#: ../plugins/google-account-setup/google-source.c:518
 #, 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:624
 #, c-format
 msgid ""
 "Cannot read data from Google server.\n"
@@ -17893,45 +16680,44 @@ msgstr ""
 "Google ã?µã?¼ã??ã??ã??ã??ã?¼ã?¿ã??å??å¾?ã?§ã??ã?¾ã??ã??:\n"
 "%s"
 
-#: ../plugins/google-account-setup/google-source.c:683
+#: ../plugins/google-account-setup/google-source.c:759
 msgid "Cal_endar:"
 msgstr "ã?«ã?¬ã?³ã??(_E):"
 
-#: ../plugins/google-account-setup/google-source.c:718
+#: ../plugins/google-account-setup/google-source.c:794
 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 "Google"
-
-#: ../plugins/google-account-setup/google-contacts-source.c:315
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:326
+#: ../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>"
 
+# è¨³æ³¨: ã??Google Calendarã??ã?¯å?ºæ??å??è©?ã?ªã?®ã?§ã??ã??ã?®è¡¨è¨?ã?«å¾?ã??ã??
+# ã??ã?«ã?¬ã?³ã??ã?¼ã??ã?§ã?¯ã?ªã??ã??ã??ã?«ã?¬ã?³ã??ã?¼ã??ã?¨ã??ã?¾ã??
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
-msgid "A plugin to setup Google Calendar and Contacts."
-msgstr "Google ã?«ã?¬ã?³ã??ã?¨é?£çµ¡å??ã??è¨å®?ã??ã??ã??ã??ã?®ã??ã?©ã?°ã?¤ã?³ã?§ã??ã??"
+msgid "Add Google Calendars to Evolution."
+msgstr "Google ã?«ã?¬ã?³ã??ã?¼ã?? Evolution ã?«è¿½å? "
 
+# è¨³æ³¨: ã??Google Calendarã??ã?¯å?ºæ??å??è©?ã?ªã?®ã?§ã??ã??ã?®è¡¨è¨?ã?«å¾?ã??ã??
+# ã??ã?«ã?¬ã?³ã??ã?¼ã??ã?§ã?¯ã?ªã??ã??ã??ã?«ã?¬ã?³ã??ã?¼ã??ã?¨ã??ã?¾ã??
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
-msgid "Google sources"
-msgstr "Google ã?«ã?¬ã?³ã??"
+msgid "Google Calendars"
+msgstr "GNOME ã?«ã?¬ã?³ã??ã?¼"
 
-#: ../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 "GroupWise ã?®ã?«ã?¬ã?³ã??ã?¨é?£çµ¡å??ã?®ã?½ã?¼ã?¹ã??è¨å®?ã??ã??ã??ã??ã?®ã??ã?©ã?°ã?¤ã?³ã?§ã??ã??"
+msgid "Add Novell GroupWise support to Evolution."
+msgstr "Novell GroupWise ã?? Evolution ã?§ã?µã??ã?¼ã??ã??ã??ã??ã??ã?«ã??ã?¾ã??"
 
 #: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:2
 msgid "GroupWise Account Setup"
 msgstr "GroupWise ã?¢ã?«ã?¦ã?³ã??ã?®è¨å®?"
 
-#: ../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"
@@ -17956,11 +16742,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 "å?±æ??ã??ã?©ã?«ã??ã?®ã?¤ã?³ã?¹ã??ã?¼ã?«"
 
@@ -17998,11 +16784,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 ?"
@@ -18010,11 +16796,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 "ã?¡ã?¼ã?«ã?®å??ã??æ¶?ã??"
 
@@ -18023,92 +16809,128 @@ msgid "Add Send Options to GroupWise messages"
 msgstr "GroupWise ã?¡ã??ã?»ã?¼ã?¸ã?®é??ä¿¡ã?ªã??ã?·ã?§ã?³ã?®è¿½å? "
 
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
-msgid "A plugin for the features in GroupWise accounts."
-msgstr "GroupWise ã?¢ã?«ã?¦ã?³ã??ã?§å¿?è¦?ã?¨ã?ªã??ã??ã?©ã?°ã?¤ã?³ã?§ã??ã??"
+msgid "Fine-tune your GroupWise accounts."
+msgstr "GroupWise ã?®ã?¢ã?«ã?¦ã?³ã??ã??å¾®èª¿æ?´ã??ã?¾ã??ã??"
 
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:2
 msgid "GroupWise Features"
 msgstr "GroupWise ã?®æ©?è?½"
 
-#: ../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; ã?§ã??ã?ã?ã?·ã?»ã?ã?°ã?¤ã?³ã?§ã??ã?¾ã??ã??ã?§ã??ã??ã??E-ã?¡ã?¼ã?«ã?»ã?¢ã??ã?¬ã?¹ã??ç¢º"
+"èª?ã??ã?¦ã??ã??ã??ã??ä¸?åº¦å®?è¡?ã??ã?¦ä¸?ã??ã??ã??"
+
 #. 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; ã?§ã??ã?ã?ã?·ã?»ã?ã?°ã?¤ã?³ã?§ã??ã?¾ã??ã??ã?§ã??ã??ã??E-ã?¡ã?¼ã?«ã?»ã?¢ã??ã?¬ã?¹ã??ç¢º"
-"èª?ã??ã?¦ã??ã??ã??ã??ä¸?åº¦å®?è¡?ã??ã?¦ä¸?ã??ã??ã??"
+#: ../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-shared-folder.errors.xml.h:3
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:2
+#, fuzzy
+msgid "Do you want to resend the recurring meeting ?"
+msgstr "æ?¬å½?ã?«ã??ã?®ä¼?è°ã??å??é?¤ã??ã?¦ã??ã??ã??ã??ã??ã?§ã??ã??ï¼?"
+
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:3
+#, fuzzy
+msgid "Do you want to retract the original item ?"
+msgstr "å®?äº?ã??ã?¦ã??ã?ªã??ã?¡ã??ã?»ã?¼ã?¸ã??å¾©æ?§ã??ã?¾ã??ã??ï¼?"
+
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:4
+#, fuzzy
+msgid "The original will be removed from the recipient's mailbox."
+msgstr "ã??ã?®ã?¢ã?¤ã??ã? ã??ä»?ã?®å?¨ã?¦ã?®å??ä¿¡ç®±ã??ã??å??é?¤ã??ã?¾ã??ã??ï¼?(_D)"
+
+#: ../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
+#, fuzzy
+msgid "Rese_nd Meeting..."
+msgstr "ä¼?è°ã?®å§?ä»»(_D)..."
+
 #: ../plugins/groupwise-features/properties.glade.h:1
 msgid "<b>Users:</b>"
 msgstr "<b>ã?¦ã?¼ã?¶:</b>"
@@ -18122,7 +16944,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 "ã?¡ã??ã?»ã?¼ã?¸"
 
@@ -18205,10 +17027,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) ã?®ã??ã?¹ã?¯ã?¼ã??ã??å?¥å??ã??ã?¦ä¸?ã??ã??"
@@ -18216,18 +17038,18 @@ 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 "ã??ã?® \"ã??ã?ã?ã?·\" ã?¿ã??ã?¯ã?¢ã?«ã?¦ã?³ã??ã??æ??å?¹ã?«ã??ã??æ??ã?«ã?®ã?¿å?©ç?¨ã?§ã??ã?¾ã??ã??"
 
@@ -18235,101 +17057,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 "Evolution ã?§ 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 ã?®ã??ã??ã??"
 
@@ -18346,10 +17168,6 @@ msgid "Basic and _Mailing List Headers (Default)"
 msgstr "å?ºæ?¬ç??ã?ªã??ã??ã??ã?¨ã?¡ã?¼ã?ªã?³ã?°ã?ªã?¹ã??ã?®ã??ã??ã??ã?®ã?¿ (ã??ã??ã?©ã?«ã??)(_M)"
 
 #: ../plugins/imap-features/imap-headers.glade.h:4
-msgid "Fetch A_ll Headers"
-msgstr "å?¨ã?¦ã?®ã??ã??ã??ã??å??æ??ã??ã??"
-
-#: ../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"
@@ -18358,7 +17176,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."
@@ -18366,7 +17184,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"
@@ -18374,53 +17192,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."
@@ -18429,7 +17217,7 @@ msgstr ""
 "ã?«ã??ã?¦ã??ã?? Evolution ã??å??èµ·å??ã??ã?¦ä¸?ã??ã??ã??ã??ã??ã??ã?¯ã?·ã?¹ã??ã? ç®¡ç??è??ã?«å??ã??å??ã??ã??ã?¦"
 "ä¸?ã??ã??ã??"
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:83
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:81
 msgid "Search for an iPod failed"
 msgstr "iPod ã?®æ¤?ç´¢ã?«å¤±æ??ã??ã?¾ã??ã??"
 
@@ -18447,143 +17235,146 @@ 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 ""
-"é?¸æ??ã??ã??ã?¿ã?¹ã?¯/ã?¡ã?¢/ã?«ã?¬ã?³ã??/ã?¢ã??ã?¬ã?¹å¸³ã?? Apple ã?® iPod ã?¨å??æ??ã??ã??ã??ã?©ã?°ã?¤ã?³"
-"ã?§ã??ã??"
+msgid "Synchronize to iPod"
+msgstr "iPod ã?¨å??æ??ã??ã??"
 
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:2
-msgid "Synchronize to iPod"
+#, fuzzy
+msgid "Synchronize your data with your Apple iPod."
 msgstr "iPod ã?¨å??æ??ã??ã??"
 
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:3
 msgid "iPod Synchronization"
 msgstr "iPod ã?¨ã?®å??æ??"
 
-#: ../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' ã??é??ã??ã?¾ã??ã??"
 
-#: ../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:839
+#, fuzzy
+msgid "Opening the calendar. Please wait.."
+msgstr "ã?«ã?¬ã?³ã??ã??é??ã??"
+
 # è¦?å??è??
-#: ../plugins/itip-formatter/itip-formatter.c:838
+#: ../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 "Organizer ã?? DeleGate %s ã??å??é?¤ã??ã?¾ã??ã??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1234
+#: ../plugins/itip-formatter/itip-formatter.c:1238
 msgid "Sent a cancelation notice to the delegate"
 msgstr "DeleGate ã?¸ã?ã?£ã?³ã?»ã?«é??ç?¥ã??é??ä¿¡ã??ã?¾ã??ã??"
 
-#: ../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 "DeleGate ã?¸ã?ã?£ã?³ã?»ã?«é??ç?¥ã??é??ä¿¡ã?§ã??ã?¾ã??ã??ã?§ã??ã??"
 
-#: ../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."
@@ -18591,15 +17382,15 @@ 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 "ã?«ã?¬ã?³ã??ã?®ã?¢ã?¤ã??ã? ã??ä¸?æ£ã?§ã??"
 
-#: ../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"
@@ -18607,11 +17398,11 @@ 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"
@@ -18619,40 +17410,34 @@ 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 "é??è¤?ã??ã??ã?¤ã??ã?³ã??ã?®æ¤?ç´¢"
 
 #. 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
@@ -18671,11 +17456,6 @@ msgstr "ä»?æ?¥ã?®%k:%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
@@ -19019,110 +17799,108 @@ 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 "ã?¡ã?¢ :"
+#, fuzzy
+msgid "_Memos:"
+msgstr "ã?¡ã?¢(_M)"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:1
-msgid "Displays text/calendar parts in messages."
+#, fuzzy
+msgid "Display \"text/calendar\" MIME parts in mail messages."
 msgstr "ã?¡ã??ã?»ã?¼ã?¸ã?®ä¸ã?«æ??å?å??ã??ã?«ã?¬ã?³ã??ã?®ä¸?é?¨ã??è¡¨ç¤ºã??ã??ã??ã??ã?®ã??ã?©ã?°ã?¤ã?³ã?§ã??ã??"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:2
@@ -19153,13 +17931,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 "ã??ã?¼ã??é?³ã??é³´ã??ã??ã??ã?©ã??ã??"
@@ -19235,20 +18013,20 @@ msgstr "ã?¢ã?¤ã?³ã?³ã??ç?¹æ»?ã??ã??ã??ã??ã?©ã??ã??ã?§ã??ã??"
 msgid "Whether to notify new messages in Inbox folder only."
 msgstr "å??ä¿¡ç®± (Inbox) ã??ã?©ã?«ã??ã?®ã?¿æ?°ç??ã?¡ã??ã?»ã?¼ã?¸ã??é??ç?¥ã??ã??ã??ã?©ã??ã??ã?§ã??ã??"
 
-#: ../plugins/mail-notification/mail-notification.c:260
+#: ../plugins/mail-notification/mail-notification.c:245
 msgid "Generate a _D-Bus message"
 msgstr "D-BUS ã?¡ã??ã?»ã?¼ã?¸ã??ç??æ??ã??ã??(_D)"
 
-#: ../plugins/mail-notification/mail-notification.c:383
+#: ../plugins/mail-notification/mail-notification.c:368
 msgid "Evolution's Mail Notification"
 msgstr "Evolution ã?®ã?¡ã?¼ã?«é??ç?¥æ©?è?½"
 
-#: ../plugins/mail-notification/mail-notification.c:404
+#: ../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:483
+#: ../plugins/mail-notification/mail-notification.c:498
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -19257,92 +18035,162 @@ msgid_plural ""
 "You have received %d new messages\n"
 "in %s."
 msgstr[0] "%2$s ã?«%1$dé??ã?®æ?°ã??ã??ã?¡ã??ã?»ã?¼ã?¸ã??å±?ã??ã?¦ã??ã?¾ã??"
-msgstr[1] "%2$s ã?«%1$dé??ã?®æ?°ã??ã??ã?¡ã??ã?»ã?¼ã?¸ã??å±?ã??ã?¦ã??ã?¾ã??"
 
-#: ../plugins/mail-notification/mail-notification.c:488
+#: ../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é??ã?®æ?°ã??ã??ã?¡ã??ã?»ã?¼ã?¸ã??å±?ã??ã?¦ã??ã?¾ã??"
-msgstr[1] "%dé??ã?®æ?°ã??ã??ã?¡ã??ã?»ã?¼ã?¸ã??å±?ã??ã?¦ã??ã?¾ã??"
 
-#: ../plugins/mail-notification/mail-notification.c:505
-#: ../plugins/mail-notification/mail-notification.c:510
+#: ../plugins/mail-notification/mail-notification.c:520
+#: ../plugins/mail-notification/mail-notification.c:525
 msgid "New email"
 msgstr "æ?°ã??ã??ã?¡ã?¼ã?«"
 
-#: ../plugins/mail-notification/mail-notification.c:570
+#: ../plugins/mail-notification/mail-notification.c:588
 msgid "Show icon in _notification area"
 msgstr "ã??ã??ã?«ã?®é??ç?¥ã?¹ã??ã?¼ã?¹ã?«ã?¢ã?¤ã?³ã?³ã??è¡¨ç¤ºã??ã??(_N)"
 
-#: ../plugins/mail-notification/mail-notification.c:573
+#: ../plugins/mail-notification/mail-notification.c:591
 msgid "B_link icon in notification area"
 msgstr "é??ç?¥ã?¹ã??ã?¼ã?¹ã?§ã?¢ã?¤ã?³ã?³ã??ç?¹æ»?ã??ã??ã??(_L)"
 
-#: ../plugins/mail-notification/mail-notification.c:575
+#: ../plugins/mail-notification/mail-notification.c:593
 msgid "Popup _message together with the icon"
 msgstr "ã?¢ã?¤ã?³ã?³ã?¨å?±ã?«ã?¡ã??ã?»ã?¼ã?¸ã??ã??ã??ã??ã?¢ã??ã??è¡¨ç¤ºã??ã??(_M)"
 
-#: ../plugins/mail-notification/mail-notification.c:756
+#: ../plugins/mail-notification/mail-notification.c:774
 msgid "_Play sound when new messages arrive"
 msgstr "æ?°ã??ã??ã?¡ã?¼ã?«ã??å±?ã??ã??ã??æ¼?å¥?ã??ã??(_P)"
 
-#: ../plugins/mail-notification/mail-notification.c:762
+#: ../plugins/mail-notification/mail-notification.c:780
 msgid "_Beep"
 msgstr "ã??ã?¼ã??é?³ã??é³´ã??ã??(_B)"
 
-#: ../plugins/mail-notification/mail-notification.c:763
+#: ../plugins/mail-notification/mail-notification.c:781
 msgid "Play _sound file"
 msgstr "ã?µã?¦ã?³ã??ã?»ã??ã?¡ã?¤ã?«ã??æ¼?å¥?ã??ã??(_S)"
 
-#: ../plugins/mail-notification/mail-notification.c:774
+#: ../plugins/mail-notification/mail-notification.c:792
 msgid "Specify _filename:"
 msgstr "ã??ã?¡ã?¤ã?«å??ã?®æ??å®?(_F):"
 
-#: ../plugins/mail-notification/mail-notification.c:775
+#: ../plugins/mail-notification/mail-notification.c:793
 msgid "Select sound file"
 msgstr "ã?µã?¦ã?³ã??ã?»ã??ã?¡ã?¤ã?«ã?®é?¸æ??"
 
-#: ../plugins/mail-notification/mail-notification.c:776
+#: ../plugins/mail-notification/mail-notification.c:794
 msgid "Pl_ay"
 msgstr "æ¼?å¥?(_A)"
 
-#: ../plugins/mail-notification/mail-notification.c:833
+#: ../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 "Mail Notification"
+msgstr "æ?°ç??ã?¡ã?¼ã?«ã?®é??ç?¥"
+
+#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:2
+#, fuzzy
+msgid "Notifies you when new mail messages arrive."
+msgstr "æ?°ã??ã??ã?¡ã?¼ã?«ã??å±?ã??ã??ã??æ¼?å¥?ã??ã??ã??ã?©ã??ã??"
+
+#: ../plugins/mail-to-task/mail-to-task.c:376
+#, c-format
 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."
+"Selected calendar contains event '%s' already. Would you like to edit the "
+"old event?"
 msgstr ""
-"æ?°ã??ã??ã?¡ã?¼ã?«ã??å±?ã??ã??ã?? D-BUS ã?®ã?¡ã??ã?»ã?¼ã?¸ã??ç??æ??ã??ã??ã??ã??ã?¾ã??ã?¯é??ç?¥ã?¹ã??ã?¼ã?¹ã?«ã?¢"
-"ã?¤ã?³ã?³ã??è¡¨ç¤ºã??ã??ã??ã?¡ã??ã?»ã?¼ã?¸ã??ã??ã??ã??ã?¢ã??ã??ã??ã??ã??ã?©ã?°ã?¤ã?³ã?§ã??ã??"
 
-#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:2
-msgid "Mail Notification"
-msgstr "æ?°ç??ã?¡ã?¼ã?«ã?®é??ç?¥"
+#: ../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 ""
+
+#: ../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 ""
+
+#: ../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: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-meeting/org-gnome-mail-to-meeting.eplug.xml.h:1
+#: ../plugins/mail-to-task/mail-to-task.c:435
 msgid ""
-"A plugin which allows the creation of meetings from the contents of a mail "
-"message."
-msgstr "ã?¡ã??ã?»ã?¼ã?¸ã?®å??å®¹ã??ã??ä¼?è°é??å?¬é??ç?¥ã??ç??æ??ã??ã??ã??ã??ã?®ã??ã?©ã?°ã?¤ã?³ã?§ã??ã??"
+"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-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:494
+#, fuzzy
+msgid "[No Summary]"
+msgstr "ã?µã??ã?ªç?¡ã??"
 
-#: ../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:505
+msgid "Invalid object returned from a server"
+msgstr ""
 
-#: ../plugins/mail-to-task/mail-to-task.c:287
+#: ../plugins/mail-to-task/mail-to-task.c:570
+#, fuzzy, c-format
+msgid "An error occurred during processing: %s"
+msgstr "å?°å?·ã??ã??é??ã?«ã?¨ã?©ã?¼ã??ç?ºç??ã??ã?¾ã??ã??"
+
+#: ../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
+#, fuzzy
+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."
@@ -19350,24 +18198,69 @@ msgstr ""
 "é?¸æ??ã??ã??ã?½ã?¼ã?¹ã?¯èªã?¿è¾¼ã?¿å°?ç?¨ã?®ã??ã??ã?¿ã?¹ã?¯ã??ç??æ??ã?§ã??ã?¾ã??ã?? (ä»?ã?®ã?½ã?¼ã?¹ã??é?¸æ??ã??"
 "ã?¦ä¸?ã??ã??)ã??"
 
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:1
+#: ../plugins/mail-to-task/mail-to-task.c:612
+#, fuzzy
 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
+#, fuzzy, c-format
+msgid "Cannot get source list. %s"
+msgstr "\"{2}\" ã?¨ã??ã??ã?½ã?¼ã?¹ã??é??ã??ã?¾ã??ã??ã??"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:1
+#, fuzzy
+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
+#, fuzzy
+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
+#, fuzzy
+msgid "Create a new event from the selected message"
+msgstr "é?¸æ??ã??ã??ã?¡ã??ã?»ã?¼ã?¸ã?®å·®å?ºäººã?¸è¿?ä¿¡ã??ã?¾ã??"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:5
+#, fuzzy
+msgid "Create a new meeting from the selected message"
+msgstr "æ?°ã??ã??ä¼?è°ã??å?¬é??ã??ã?¾ã??"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:6
+#, fuzzy
+msgid "Create a new memo from the selected message"
+msgstr "é?¸æ??ã??ã??ã?¡ã??ã?»ã?¼ã?¸ã?®å·®å?ºäººã?¸è¿?ä¿¡ã??ã?¾ã??"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:7
+#, fuzzy
+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"
@@ -19391,8 +18284,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...)."
+#, fuzzy
+msgid "Perform common mailing list actions (subscribe, unsubscribe, etc.)."
 msgstr ""
 "ã?¡ã?¼ã?ªã?³ã?°ã?»ã?ªã?¹ã??ã?«å?±é??ã?ªã?³ã??ã?³ã?? (è³¼èªã?¨ã??è³¼èªè§£é?¤ã?ªã?©) ã??æ??ä¾?ã??ã??ã??ã?©ã?°ã?¤"
 "ã?³ã?§ã??ã??"
@@ -19547,12 +18440,14 @@ msgstr ""
 "ã??ã?®ã??ã?©ã?«ã??ã?«ã??ã??ã?¡ã??ã?»ã?¼ã?¸ã? ã??æ?¢èªã??ã?¼ã?¯ã??ä»?ä¸?ã??ã??ã??ã??ã?µã??ã??ã?©ã?«ã??ã?®ä¸ã?®"
 "ã?¡ã??ã?»ã?¼ã?¸ã??å??æ§?ã?«æ?¢èªã??ã?¼ã?¯ã??ä»?ä¸?ã??ã?¾ã??ã??ï¼?"
 
-#: ../plugins/mark-all-read/mark-all-read.c:164
-msgid "Current Folder and _Subfolders"
+#: ../plugins/mark-all-read/mark-all-read.c:166
+#, fuzzy
+msgid "In Current Folder and _Subfolders"
 msgstr "ã??ã?®ã??ã?©ã?«ã??ã?¨ã?µã??ã??ã?©ã?«ã??(_S)"
 
-#: ../plugins/mark-all-read/mark-all-read.c:176
-msgid "Current _Folder Only"
+#: ../plugins/mark-all-read/mark-all-read.c:180
+#, fuzzy
+msgid "In Current _Folder Only"
 msgstr "ã??ã?®ã??ã?©ã?«ã??ã? ã??(_F)"
 
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
@@ -19564,20 +18459,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 "Mono ã?®ã??ã?©ã?°ã?¤ã?³ã??å®?è£?ã??ã??ã??ã?©ã?°ã?¤ã?³ã?§ã??ã??"
-
-#: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:2
 msgid "Mono Loader"
 msgstr "Mono ã?ã?¼ã??"
 
+#: ../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 "Evolution ã?®ã??ã?©ã?°ã?¤ã?³ã??ç®¡ç??ã??ã?¾ã??ã??"
 
 #. Setup the ui
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
@@ -19615,25 +18510,18 @@ 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 "HTML å½¢å¼?ã?®å??ã??æ?±ã??"
+msgstr "ã??ã?¬ã?¼ã?³ã?»ã??ã?ã?¹ã??ã?»ã?¢ã?¼ã??"
+
+#: ../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:7
-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 ""
 
 #: ../plugins/prefer-plain/prefer-plain.c:189
 msgid "Show HTML if present"
@@ -19656,10 +18544,8 @@ msgid "Evolution Profiler"
 msgstr "Evolution ã?®ã??ã?ã??ã?¡ã?¤ã?©"
 
 #: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:2
-msgid "Writes a log of profiling data events."
+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"
@@ -19674,44 +18560,74 @@ msgid "Outlook personal folders (.pst)"
 msgstr "Outlook ã?®å??äººã?®ã??ã?©ã?«ã?? (.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
-#: ../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 "Outlook ã??ã?¼ã?¿ã?®ã?¤ã?³ã??ã?¼ã??ä¸"
 
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
-msgid "Allows calendars to be published to the web"
-msgstr "Evolution ã?«ã?¬ã?³ã??ã??ã?¦ã?§ã??ä¸?ã?«å?¬é??ã?§ã??ã??ã??ã??ã?«ã??ã??ã??ã?©ã?°ã?¤ã?³ã?§ã??ã??"
-
-#: ../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 ""
+
+#: ../plugins/publish-calendar/publish-calendar.c:164
+#, c-format
+msgid "Mount of %s failed:"
+msgstr ""
+
+#: ../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>"
@@ -19768,27 +18684,38 @@ 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 ""
+
+#: ../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:28
+#: ../plugins/publish-calendar/publish-calendar.glade.h:29
+msgid ""
+"days\n"
+"weeks\n"
+"months"
+msgstr ""
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:32
 msgid ""
 "iCal\n"
 "Free/Busy"
@@ -19796,11 +18723,17 @@ msgstr ""
 "iCal å½¢å¼?\n"
 "Free/Busy å½¢å¼?"
 
-#: ../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 "å ´æ??ã?®ç·¨é??"
 
@@ -19828,180 +18761,135 @@ msgstr "Python ã?§è¨?è¿°ã??ã??ã??ä»?ã?®ã??ã?©ã?°ã?¤ã?³ã??èªã?¿è¾¼ã??ã??ã?©ã?°
 msgid "Python Loader"
 msgstr "Python ã?ã?¼ã??"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:107
-msgid "SpamAssassin (built-in)"
-msgstr "SpamAssassin (å??è?µ)"
-
-#: ../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 "SpamAssassin ã??è¦?ã?¤ã??ã??ã?¾ã??ã?? (ã?¨ã?©ã?¼ã?»ã?³ã?¼ã??: %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 "fork() ã??ã??å¾?ã?§ã?¨ã?©ã?¼: %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 "SpamAssassin ã?®å?ã??ã?ã?»ã?¹ã??ã??å¿?ç?ã??ã?ªã??ã?®ã?§å¼·å?¶çµ?äº?ã??ã??ã?¾ã??..."
 
-#: ../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 "SpamAssassin ã?®å?ã??ã?ã?»ã?¹ã??ã??ã?®å?²ã??è¾¼ã?¿å¾?ã?¡ã?«å?¥ã??ã?¾ã??..."
 
-#: ../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 "SpamAssassin ã?«å¯¾ã??ã??ã??ã?¤ã??ã??å¤±æ??ã??ã?¾ã??ã?? (ã?¨ã?©ã?¼ã?»ã?³ã?¼ã??: %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 "SpamAssassin ã?¯å?©ç?¨ã?§ã??ã?¾ã??ã??"
 
-#: ../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 ""
-"SpamAssassin ã??ä½¿ã?£ã?¦ã?¸ã?£ã?³ã?¯ã?ªã?¡ã?¼ã?«ã??ã??ã?£ã?«ã?¿ã?ªã?³ã?°ã??ã??ã??ã?©ã?°ã?¤ã?³ã?§ã??ã??ã??ã?®"
-"ã??ã?©ã?°ã?¤ã?³ã??å?©ç?¨ã??ã??ã?«ã?¯ SpamAssassin ã??ã?¤ã?³ã?¹ã??ã?¼ã?«ã??ã??ã?¦ã??ã?ªã??ã??ã?°ã?ªã??ã?¾ã??"
-"ã??ã??"
+msgid "Filter junk messages using SpamAssassin."
+msgstr "SpamAssassin ã??ä½¿ã?£ã?¦ã?¸ã?£ã?³ã?¯ã?»ã?¡ã?¼ã?«ã??ã??ã?£ã?«ã?¿ã??ã?¾ã??ã??"
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
-msgid "SpamAssassin Options"
-msgstr "SpamAssassin ã?®ã?ªã??ã?·ã?§ã?³"
+msgid "SpamAssassin Junk Filter"
+msgstr "SpamAssassin ã?¸ã?£ã?³ã?¯ã?»ã??ã?£ã?«ã?¿"
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:3
-msgid "SpamAssassin junk plugin"
-msgstr "SpamAssassin ã?¸ã?£ã?³ã?¯ã?»ã?¡ã?¼ã?«ã?®ã??ã?©ã?°ã?¤ã?³"
-
-#: ../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 "SpamAssassin ã?®ã?ªã??ã?·ã?§ã?³"
 
 #.
 #. * 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)"
 
@@ -20010,9 +18898,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"
@@ -20027,22 +18914,26 @@ 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 "å½¢å¼?:"
+
+#: ../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 ""
-"å??ä¸?ã?®ã?«ã?¬ã?³ã??ã?¾ã??ã?¯ã?¿ã?¹ã?¯ã?®æ??å ±ã??è¡¨ç¤ºç?¨ã?«é?¸æ??ã??ã??ã??ã??ã?®ã??ã?©ã?°ã?¤ã?³ã?§ã??ã??"
+#, fuzzy
+msgid "Select One Source"
+msgstr "å??ä¸?ã?½ã?¼ã?¹ã?®é?¸æ??"
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:3
 msgid "Show _only this Calendar"
@@ -20064,15 +18955,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 "Evolution è¨å®?ã?¢ã?·ã?¹ã?¿ã?³ã??"
 
-#: ../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"
@@ -20085,35 +18976,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"
@@ -20136,15 +19027,15 @@ 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 "ã??ã?³ã??ã?¬ã?¼ã??ã?¨ã??ã?¦ä¿?å?ã??ã?¾ã??"
 
@@ -20153,31 +19044,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 ""
 
 #: ../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 "ä»?ã?« 1å??ã?®é?£çµ¡å??ã??ã??ã??ã?¾ã??ã??"
+
+#: ../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 ã?®é?£çµ¡å??ã?? Evolution ã?«è¿½å? ã??ã?¾ã??ã??"
 
 #: ../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:337
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:295
 msgid "URL:"
 msgstr "URL:"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:364
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:321
 msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "IfMatch ã??ã?ã??ã??ã?£ã??é?¿ã??ã?? (è¦? Apache < 2.2.8)(_A)"
 
@@ -20265,43 +19186,63 @@ msgstr ""
 "ã?¯ã?¼ã??ã?»ã??ã?¡ã?¤ã?«ã??ã??å??å¾?ã??ã?¾ã??ã??"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:15
+#, fuzzy
+msgid "Initial attachment view"
+msgstr "æ·»ä»?ã??ã??ã??ã?¡ã?¤ã?«ã?®é?¸æ??"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:16
+#, fuzzy
+msgid "Initial file chooser folder"
+msgstr "å?±æ??ã??ã?©ã?«ã??ã?®ã?¤ã?³ã?¹ã??ã?¼ã?«"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:17
+msgid "Initial folder for GtkFileChooser dialogs."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:18
+msgid ""
+"Initial view for attachment bar widgets. \"0\" is Icon View, \"1\" is List "
+"View."
+msgstr ""
+
+#: ../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 "
@@ -20312,23 +19253,23 @@ msgstr ""
 "ã??)ã??1 (ã??ã?ã?ã?·ã??å?©ç?¨ã??ã?ªã??)ã??2 (æ??å??ã?§ã??ã?ã?ã?·ã?®è¨å®?ã??æ??å®?ã??ã??)ã??3 "
 "(autoconfig_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\")."
@@ -20336,19 +19277,19 @@ msgstr ""
 "Evolution ã?®è¨å®?ã??ã?¼ã?¸ã?§ã?³ (æ?¸å¼?: ã?¡ã?¸ã?£ã?¼ç?ªå?·/ã??ã?¤ã??ã?¼ç?ªå?·/è¨å®?ã?¬ã??ã?«) ã?§ã?? "
 "(ä¾?: \"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\")."
@@ -20356,19 +19297,19 @@ msgstr ""
 "æ??å¾?ã?«ã?¢ã??ã??ã?°ã?¬ã?¼ã??ã??ã?? Evolution ã?®è¨å®?ã??ã?¼ã?¸ã?§ã?³ (æ?¸å¼?: ã?¡ã?¸ã?£ã?¼ç?ªå?·/ã??ã?¤"
 "ã??ã?¼ç?ªå?·/è¨å®?ã?¬ã??ã?«) ã?§ã?? (ä¾?: \"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."
@@ -20376,7 +19317,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."
@@ -20384,7 +19325,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."
@@ -20392,7 +19333,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 +19343,7 @@ msgstr ""
 "ã?®ã?¹ã?¿ã?¤ã?«ã?¯ GNOME ã??ã?¹ã?¯ã??ã??ã??ã?®è¨å®?ã?«å¾?ã??ã?¾ã??ã??å?©ç?¨å?¯è?½ã?ªå?¤: \"text\"ã??"
 "\"icons\"ã??\"both\"ã??\"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,60 +19355,60 @@ msgstr ""
 "ã?¤ã?«ã??ã?«ã?¼ã??ã?®å?©ç?¨ã??å?¯)ã??IP-ã?¢ã??ã?¬ã?¹ (IPv4 ã?¨ IPv6 ã?®ä¸¡æ?¹)ã??ã??ã??ã??ã??ã?¹ã?¯ä»?ã??"
 "ã?® IP-ã?¢ã??ã?¬ã?¹ (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 ""
 "ã?ªã?³ã?©ã?¤ã?³ã?»ã?¢ã?¼ã??ã?§ã?¯ã?ªã??ã??ã?ªã??ã?©ã?¤ã?³ã?»ã?¢ã?¼ã??ã?§ Evolution ã??èµ·å??ã??ã??ã??ã?©ã??ã??"
 "ã?§ã??ã??"
 
-#: ../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 ""
 "Evolution ã?®é??ç?ºã??ã?¼ã?¸ã?§ã?³ã?§ã??ã??æ?¨ã??è¦å??ã??ã??ã??ã?¤ã?¢ã?ã?°ã??è¡¨ç¤ºã??ã?ªã??ã??ã??ã?«ã??ã??"
 "ã??ã?©ã??ã??ã?§ã??ã??"
 
-#: ../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 "ã?¦ã?£ã?³ã??ã?¦ã?»ã??ã?¿ã?³ã??è¡¨ç¤ºã??ã??ã??ã?©ã??ã??"
 
@@ -20483,11 +19424,11 @@ msgstr "å¯¾è±¡ã?¨ã?ªã??æ?¥ç¶?"
 msgid "Click OK to close these connections and go offline"
 msgstr "[OK] ã??ã?¯ã?ªã??ã?¯ã??ã??ã?¨ã??ä¸?è¨?ã?®æ?¥ç¶?ã??é??ã??ã?¦ã?ªã??ã?©ã?¤ã?³ã?«ã?ªã??ã?¾ã??"
 
-#: ../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."
@@ -20495,11 +19436,11 @@ msgstr ""
 "Evolution ã?«å??ã??è¾¼ã??ã??ã?¡ã?¤ã?«ã??é?¸æ??ã??ã??ã??ã?«ã??ã?¦ã?³ã?»ã?ªã?¹ã??ã??ã??ã??ã?®ã??ã?¡ã?¤ã?«ã?®ç¨®"
 "é¡?ã??é?¸æ??ã??ã?¦ä¸?ã??ã??ã??"
 
-#: ../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"
@@ -20511,59 +19452,63 @@ msgstr ""
 "ã?¤ã?³ã??ã?¼ã??ã?§ã??ã??è¨å®?ã?¯è¦?ã?¤ã??ã??ã?¾ã??ã??ã?§ã??ã??ã??\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 "Evolution ã?®è¨å®?"
 
 #. 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 - Evolution"
 
-#: ../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 ""
 "ã??ã?®ã?·ã?¹ã??ã? ä¸?ã?« GNOME ã??ã?¤ã?ã??ã??ã?»ã??ã?¼ã?«ã??ã?¤ã?³ã?¹ã??ã?¼ã?«ã??ã??ã?¦ã??ã?ªã??ã??ã??ã?§ã??ã??"
 
-#: ../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:1026
 msgid "translator-credits"
 msgstr ""
 "ç?¸è?± æ¯? <takeshi aihana gmail com>\n"
@@ -20571,25 +19516,26 @@ msgstr ""
 "Akira TAGOH <tagoh gnome gr jp>\n"
 "Yukihiro Nakai <nakai gnome gr jp>\n"
 "Takuo KITAME <kitame debian org>\n"
-"æ?¥æ?¬GNOMEã?¦ã?¼ã?¶ã?¼ä¼? http://www.gnome.gr.jp";
+"è??é?? è²´ä¹? <AE5T-KSN asahi-net or jp>\n"
+"æ?¥æ?¬GNOMEã?¦ã?¼ã?¶ã?¼ä¼? http://www.gnome.gr.jp/";
 
-#: ../shell/e-shell-window-commands.c:953
+#: ../shell/e-shell-window-commands.c:1037
 msgid "Evolution Website"
 msgstr "Evolution ã?®ã?¦ã?§ã??ã?µã?¤ã??"
 
-#: ../shell/e-shell-window-commands.c:1170
+#: ../shell/e-shell-window-commands.c:1251
 msgid "_Work Online"
 msgstr "ã?ªã?³ã?©ã?¤ã?³ã?§å??ä½?(_W)"
 
-#: ../shell/e-shell-window-commands.c:1183 ../ui/evolution.xml.h:57
+#: ../shell/e-shell-window-commands.c:1264 ../ui/evolution.xml.h:57
 msgid "_Work Offline"
 msgstr "ã?ªã??ã?©ã?¤ã?³ã?§å??ä½?(_W)"
 
-#: ../shell/e-shell-window-commands.c:1196
+#: ../shell/e-shell-window-commands.c:1277
 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."
@@ -20597,11 +19543,11 @@ msgstr ""
 "Evolution ã?¯ç?¾å?¨ã?ªã?³ã?©ã?¤ã?³ã?§ã??\n"
 "(ã?ªã??ã?©ã?¤ã?³ã?«ã??ã??æ??ã?¯ã??ã??ã?®ã??ã?¿ã?³ã??ã?¯ã?ªã??ã?¯ã??ã?¦ä¸?ã??ã??)"
 
-#: ../shell/e-shell-window.c:384
+#: ../shell/e-shell-window.c:379
 msgid "Evolution is in the process of going offline."
 msgstr "Evolution ã?¯ã?ªã??ã?©ã?¤ã?³ã?®ã?¾ã?¾ã?§å?¦ç??ã??ã?¾ã??"
 
-#: ../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."
@@ -20609,52 +19555,52 @@ msgstr ""
 "Evolution ã?¯ç?¾å?¨ã?ªã??ã?©ã?¤ã?³ã?§ã??\n"
 "(ã?ªã?³ã?©ã?¤ã?³ã?«ã??ã??æ??ã?¯ã??ã??ã?®ã??ã?¿ã?³ã??ã?¯ã?ªã??ã?¯ã??ã?¦ä¸?ã??ã??)"
 
-#: ../shell/e-shell-window.c:785
+#: ../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 Kã??ã?¤ã??"
 
-#: ../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 "OK"
 
-#: ../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 "æ?°ã??ã??ã?¿ã?¹ã?¯ã?»ã?¢ã?¤ã??ã? ã??ä½?æ??ã??ã?¾ã??"
 
@@ -20697,7 +19643,7 @@ msgstr ""
 "Evolution ã?¸ã?¤ã?³ã??ã?¼ã??ã??ã??æ??é ?ã??ã??æ¡?å??ã??ã?¾ã??ã??"
 
 #. 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"
@@ -20734,7 +19680,7 @@ msgstr ""
 "ç§?ã??ã?¡ã?®æ¿?å??ã?®æ??æ??ã?«æº?è¶³ã??ã?¦ã??ã??ã??ã??ã?¨ã??é¡?ã??ã??\n"
 "ã??ã??ã?¦ã??ã?ªã??ã?®è²¢ç?®ã??ç?±å¿?ã?«å¾?ã?¤ã??ã?¨ã?«ã??ã?¾ã??ï¼?\n"
 
-#: ../shell/main.c:245
+#: ../shell/main.c:250
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -20742,43 +19688,43 @@ msgstr ""
 "æ??è¬?ã??ã?¾ã??\n"
 "Evolution é??ç?ºã??ã?¼ã? \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 "æ??å®?ã??ã??ã?³ã?³ã??ã?¼ã??ã?³ã??ã??æ??å?¹ã?«ã??ã?¦ Evolution ã??èµ·å??ã??ã??"
 
-#: ../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 "å?¨ã?¦ã?® Evolution ã?³ã?³ã??ã?¼ã??ã?³ã??ã??å¼·å?¶çµ?äº?ã??ã??"
 
-#: ../shell/main.c:492
+#: ../shell/main.c:498
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Evolution 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 "- Evolution PIM ã?¨ã?¡ã?¼ã?«ã?»ã?¯ã?©ã?¤ã?¢ã?³ã??"
 
-#: ../shell/main.c:614
+#: ../shell/main.c:642
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -20934,7 +19880,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 "
@@ -20943,7 +19889,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 "
@@ -20953,8 +19899,8 @@ msgstr ""
 "ã??ã?¦ã??ã??ã?®è¨¼æ??æ?¸ã?®ä¿¡æ??æ?§ã??ä¿¡ç?¨ã??ã?ªã??ã??ã?¨ã?«ã?ªã??ã?¾ã??ã??"
 
 #: ../smime/gui/certificate-manager.c:136
-#: ../smime/gui/certificate-manager.c:382
-#: ../smime/gui/certificate-manager.c:609
+#: ../smime/gui/certificate-manager.c:383
+#: ../smime/gui/certificate-manager.c:611
 msgid "Select a certificate to import..."
 msgstr "ã?¤ã?³ã??ã?¼ã??ã??ã??è¨¼æ??æ?¸ã?®é?¸æ??..."
 
@@ -20962,41 +19908,41 @@ msgstr "ã?¤ã?³ã??ã?¼ã??ã??ã??è¨¼æ??æ?¸ã?®é?¸æ??..."
 msgid "All PKCS12 files"
 msgstr "å?¨ã?¦ã?® PKCS12 ã??ã?¡ã?¤ã?«"
 
-#: ../smime/gui/certificate-manager.c:150
-#: ../smime/gui/certificate-manager.c:396
-#: ../smime/gui/certificate-manager.c:623
+#: ../smime/gui/certificate-manager.c:151
+#: ../smime/gui/certificate-manager.c:398
+#: ../smime/gui/certificate-manager.c:625
 msgid "All files"
 msgstr "å?¨ã?¦ã?®ã??ã?¡ã?¤ã?«"
 
-#: ../smime/gui/certificate-manager.c:274
-#: ../smime/gui/certificate-manager.c:486
-#: ../smime/gui/certificate-manager.c:711
+#: ../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:283
-#: ../smime/gui/certificate-manager.c:504
+#: ../smime/gui/certificate-manager.c:284
+#: ../smime/gui/certificate-manager.c:506
 msgid "Purposes"
 msgstr "å?©ç?¨ã?®ç?®ç??"
 
-#: ../smime/gui/certificate-manager.c:292 ../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:300
+#: ../smime/gui/certificate-manager.c:301
 msgid "Expires"
 msgstr "æ??å?¹æ??é??"
 
-#: ../smime/gui/certificate-manager.c:391
+#: ../smime/gui/certificate-manager.c:392
 msgid "All email certificate files"
 msgstr "å?¨ã?¦ã?® E-ã?¡ã?¼ã?«èª?è¨¼ã??ã?¡ã?¤ã?«"
 
-#: ../smime/gui/certificate-manager.c:495
+#: ../smime/gui/certificate-manager.c:497
 msgid "E-Mail Address"
 msgstr "E-ã?¡ã?¼ã?«ã?»ã?¢ã??ã?¬ã?¹"
 
-#: ../smime/gui/certificate-manager.c:618
+#: ../smime/gui/certificate-manager.c:620
 msgid "All CA certificate files"
 msgstr "å?¨ã?¦ã?® CA èª?è¨¼ã??ã?¡ã?¤ã?«"
 
@@ -21098,7 +20044,7 @@ msgstr ""
 "èª?è¨¼å±? (CA) ã??ä¿¡ç?¨ã??ã??å??ã?«ã??(å?¯è?½ã?§ã??ã??ã?°) ã??ã?®è¨¼æ??æ?¸ã??ã??ã?ªã?·ã?¼ã??ã??ã??ã?¦æ??ç¶?ã??"
 "ã??ã??ã??èª¿ã?¹ã??å¿?è¦?ã??ã??ã??ã?¾ã??ã??"
 
-#: ../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 "è¨¼æ??æ?¸"
 
@@ -21174,11 +20120,11 @@ msgstr "çµ?ç¹?ã?®å??ä½? (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 ã?µã?¼ã??è¨¼æ??æ?¸"
 
@@ -21224,7 +20170,7 @@ msgid "_Edit CA Trust"
 msgstr "CA ã??ã?©ã?¹ã??ã?®ç·¨é??(_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 "æ?¢ã?«è¨¼æ??æ?¸ã??ã??ã??ã?¾ã??"
 
@@ -21233,161 +20179,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 "ã??ã?¼ã?¸ã?§ã?³ï¼?"
 
-#: ../smime/lib/e-cert.c:532
+#: ../smime/lib/e-cert.c:531
 msgid "Version 2"
 msgstr "ã??ã?¼ã?¸ã?§ã?³ï¼?"
 
-#: ../smime/lib/e-cert.c:535
+#: ../smime/lib/e-cert.c:534
 msgid "Version 3"
 msgstr "ã??ã?¼ã?¸ã?§ã?³ï¼?"
 
-#: ../smime/lib/e-cert.c:617
+#: ../smime/lib/e-cert.c:616
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr "RSA ã?§æ??å?·å??ã??ã??ã?? PKCS #1 MD2"
 
-#: ../smime/lib/e-cert.c:620
+#: ../smime/lib/e-cert.c:619
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr "RSA ã?§æ??å?·å??ã??ã??ã?? PKCS #1 MD5"
 
-#: ../smime/lib/e-cert.c:623
+#: ../smime/lib/e-cert.c:622
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "RSA ã?§æ??å?·å??ã??ã??ã?? PKCS #1 SHA-1"
 
-#: ../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 "Netscape è¨¼æ??æ?¸ã?®ç¨®é¡?"
 
-#: ../smime/lib/e-cert.c:659
+#: ../smime/lib/e-cert.c:658
 msgid "Certificate Authority Key Identifier"
 msgstr "èª?è¨¼å±?ã?®é?µã?®è?å?¥å?"
 
-#: ../smime/lib/e-cert.c:671
+#: ../smime/lib/e-cert.c:670
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "ã?ªã??ã?¸ã?§ã?¯ã??ã?®è?å?¥å? (%s)"
 
-#: ../smime/lib/e-cert.c:722
+#: ../smime/lib/e-cert.c:720
 msgid "Algorithm Identifier"
 msgstr "ã?¢ã?«ã?´ã?ªã?ºã? ã?®è?å?¥å?"
 
-#: ../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 "E-ã?¡ã?¼ã?«èª?è¨¼å±?"
 
-#: ../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 "è¨¼æ??æ?¸ã?®ç½²å??ã?®å?¤"
 
@@ -21535,7 +20481,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 "å?¨ã?¦é?¸æ??"
 
@@ -21669,7 +20615,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 "æ¬¡ã?¸"
 
@@ -21677,8 +20623,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 "å??ã?¸"
 
@@ -21990,7 +20936,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)"
@@ -22245,199 +21191,183 @@ msgid "Paste messages from the clipboard"
 msgstr "ã?¯ã?ªã??ã??ã??ã?¼ã??ã??ã??ã?¡ã??ã?»ã?¼ã?¸ã??è²¼ã??ä»?ã??ã?¾ã??"
 
 #: ../ui/evolution-mail-message.xml.h:68
-msgid "Pos_t New Message to Folder"
-msgstr "ã??ã?©ã?«ã??ã?¸æ?°ã??ã??ã?¡ã??ã?»ã?¼ã?¸ã?®æ??ç¨¿(_T)"
-
-#: ../ui/evolution-mail-message.xml.h:69
-msgid "Post a Repl_y"
-msgstr "è¿?ä¿¡ã?®æ??ç¨¿(_Y)"
-
-#: ../ui/evolution-mail-message.xml.h:70
-msgid "Post a message to a Public folder"
-msgstr "ã?¡ã??ã?»ã?¼ã?¸ã??å?¬é??ã??ã?©ã?«ã??ã?«æ??ç¨¿ã??ã?¾ã??"
-
-#: ../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)..."
 
-#: ../ui/evolution-mail-message.xml.h:87
+#: ../ui/evolution-mail-message.xml.h:83
 msgid "Search Folder from Recipien_ts..."
 msgstr "å®?å??ã??ã??ã??ã?©ã?«ã??ã?®æ¤?ç´¢(_T)..."
 
-#: ../ui/evolution-mail-message.xml.h:88
+#: ../ui/evolution-mail-message.xml.h:84
 msgid "Search Folder from S_ubject..."
 msgstr "ä»¶å??ã?®ä»®æ?³ã??ã?©ã?«ã??(_U)..."
 
-#: ../ui/evolution-mail-message.xml.h:89
+#: ../ui/evolution-mail-message.xml.h:85
 msgid "Search Folder from Sen_der..."
 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 "E-ã?¡ã?¼ã?«ã?»ã??ã??ã??ã??å?«ã??ã?¦ã?¡ã??ã?»ã?¼ã?¸ã??å?¨ã?¦è¡¨ç¤ºã??ã?¾ã??"
 
-#: ../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)"
 
@@ -22798,11 +21728,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"
 
@@ -22832,19 +21762,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 "ã??ã?¥ã?¼ã?®å®?ç¾©"
 
@@ -22854,17 +21784,16 @@ 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 "è¡¨"
 
-#: ../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 "ã??ã?®ã??ã?¥ã?¼ã?®ä¿?å?"
 
@@ -22877,17 +21806,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 "ã??ã?¥ã?¼ã?®å®?ç¾©..."
 
@@ -22895,32 +21824,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 "æ?°ã??ã??ã??ã?¥ã?¼ã?®å®?ç¾©"
 
@@ -22936,64 +21865,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-handler-sendto.c:129
+msgid "_Send To..."
+msgstr "é??ã??(_S)..."
+
+#: ../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.glade.h:4
-msgid "MIME type:"
-msgstr "MIME ã?¿ã?¤ã??:"
+#: ../widgets/misc/e-attachment-store.c:607
+msgid "Save Attachment"
+msgid_plural "Save Attachments"
+msgstr[0] "æ·»ä»?ã??ã?¡ã?¤ã?«ã?®ä¿?å?"
 
-#: ../widgets/misc/e-attachment.glade.h:5
-msgid "Suggest automatic display of attachment"
-msgstr "æ·»ä»?ã??ã??å??å®¹ã??è?ªå??ç??ã?«è¡¨ç¤ºã??ã??ã??æ??ç¤ºã??ã??"
+#: ../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"
+msgstr "%Yå¹´%mæ??"
 
-#: ../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 "ç?¹ã?§å??ã??ã??"
 
@@ -23017,26 +22046,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 "ä»?"
 
@@ -23045,7 +22073,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 ã?®é??ã?§å?«ã??ã?§ã??ã?ªã??ã??ã?°ã?ªã??ã?¾ã??ã??"
 
@@ -23144,146 +22172,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:1666
+#: ../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 "æ?¡å¼µæ¤?ç´¢"
 
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:231
+#: ../widgets/misc/e-filter-bar.c:229
 msgid "Save Search"
 msgstr "æ¤?ç´¢çµ?æ??ã?®ä¿?å?"
 
-#: ../widgets/misc/e-filter-bar.c:268
+#: ../widgets/misc/e-filter-bar.c:266
 msgid "_Searches"
 msgstr "æ¤?ç´¢(_S)"
 
-#: ../widgets/misc/e-filter-bar.c:270
+#: ../widgets/misc/e-filter-bar.c:268
 msgid "Searches"
 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)..."
 
-#: ../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)..."
 
-#: ../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)..."
 
-#: ../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."
@@ -23300,102 +22272,101 @@ 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 "Reflow model"
 
-#: ../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 "æ¤?ç´¢"
 
-#: ../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 "ã??ã??ã??ã?¯ã?ªã??ã?¯ã??ã?¦æ¤?ç´¢ã?®ç¨®é¡?ã??å¤?æ?´ã??ã?¦ä¸?ã??ã??"
 
-#: ../widgets/misc/e-search-bar.c:603
+#: ../widgets/misc/e-search-bar.c:637
 msgid "_Search"
 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): "
 
 #. 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):"
 
@@ -23419,19 +22390,19 @@ 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)"
 
-#: ../widgets/misc/e-send-options.glade.h:10
+#: ../widgets/misc/e-send-options.glade.h:9
 msgid ""
 "None\n"
 "Mail Receipt"
@@ -23439,7 +22410,7 @@ msgstr ""
 "ã?ªã??\n"
 "é??å°?é??ç?¥"
 
-#: ../widgets/misc/e-send-options.glade.h:12
+#: ../widgets/misc/e-send-options.glade.h:11
 msgid ""
 "Normal\n"
 "Proprietary\n"
@@ -23455,15 +22426,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"
@@ -23475,30 +22446,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)"
 
-#: ../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
+#, fuzzy
+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"
@@ -23525,46 +22501,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:63
-msgid "%l:%M %p"
-msgstr "%p%l:%M"
-
 #: ../widgets/table/e-cell-pixbuf.c:360
 msgid "Selected Column"
 msgstr "é?¸æ??ã??ã??é ?ç?®"
@@ -23577,23 +22533,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 "è??æ?¯è?²ã?¤ã??ã?®é ?ç?®"
 
@@ -23617,12 +22573,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 "å?©ç?¨å?¯è?½ã?ªé ?ç?®"
 
@@ -23631,7 +22587,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 "æ??é ?"
 
@@ -23644,7 +22600,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 "é??é ?"
 
@@ -23704,21 +22660,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 "DnD ã?³ã?¼ã??"
-
-#: ../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 "é ?ç?®ã?®è¿½å? ..."
 
@@ -23734,304 +22676,1829 @@ 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å??ã?®ã?¢ã?¤ã??ã? )"
-msgstr[1] "%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å??ã?®ã?¢ã?¤ã??ã? )"
-msgstr[1] "%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 "å¸¸ã?«æ¤?ç´¢ã??ã??"
 
-#: ../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 "ç·?ã?¨ +/- ã?®ã?¨ã?ã?¹ã??ã?³ã??ã??æ??ç?»ã??ã?¾ã??ã??"
 
-#: ../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 "ã?¤ã??ã?³ã??ã?»ã??ã?ã?»ã??ã?µ"
 
-#: ../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 "IM ã?³ã?³ã??ã?ã?¹ã??"
 
-#: ../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 "398"
+
+#~ 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 "E-ã?¡ã?¼ã?«ã?»ã?¢ã??ã?¬ã?¹"
+
+#~ msgid "Find Possible Search Bases"
+#~ msgstr "å?©ç?¨å?¯è?½ã?ªæ¤?ç´¢ã??ã?¼ã?¹ã??æ¤?ç´¢ã??ã?¾ã??"
+
+#~ msgid "Search filter"
+#~ msgstr "æ¤?ç´¢ã??ã?£ã?«ã?¿"
+
+#~ msgid "Sub"
+#~ msgstr "ã?µã??"
+
+#~ msgid "Using email address"
+#~ msgstr "E-ã?¡ã?¼ã?«ã?»ã?¢ã??ã?¬ã?¹ã??ä½¿ã??"
+
+#~ msgid "Whenever Possible"
+#~ msgstr "å?¯è?½ã?ªã??ã?°"
+
+#~ msgid "_Add Address Book"
+#~ msgstr "ã?¢ã??ã?¬ã?¹å¸³ã?®è¿½å? (_A)"
+
+#~ msgid "MSN Messenger"
+#~ msgstr "MSN ã?¡ã??ã?»ã?³ã?¸ã?£"
+
+#~ msgid "Novell GroupWise"
+#~ msgstr "Novell GroupWise"
+
+#~ 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 "ã??ã?«ã??ã?¤ Darussalam"
+
+#~ 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 "St. ã??ã?¬ã??"
+
+#~ 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 "Yahoo ã?¡ã??ã?»ã?³ã?¸ã?£"
+
+#~ msgid "Gadu-Gadu Messenger"
+#~ msgstr "Gadu-Gadu ã?¡ã??ã?»ã?³ã?¸ã?£"
+
+#~ 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 "ã??ã?¯ã?¿ã?¼"
+
+#~ msgid "Esq."
+#~ msgstr "æ§?"
+
+#~ msgid "I"
+#~ msgstr "ä¸?ä»£ç?®"
+
+#~ msgid "II"
+#~ msgstr "äº?ä»£ç?®"
+
+#~ msgid "III"
+#~ msgstr "ä¸?ä»£ç?®"
+
+#~ msgid "Jr."
+#~ msgstr "ã?¸ã?¥ã??ã?¢"
+
+#~ msgid "Miss"
+#~ msgstr "ã??ã?¹"
+
+#~ msgid "Mr."
+#~ msgstr "ã??ã?¹ã?¿ã?¼"
+
+#~ msgid "Mrs."
+#~ msgstr "ã??ã?»ã?¹"
+
+#~ msgid "Ms."
+#~ msgstr "å¤«äºº"
+
+#~ msgid "Sr."
+#~ msgstr "ä¼¯ç?µ"
+
+#~ msgid "Add IM Account"
+#~ msgstr "IM ã?¢ã?«ã?¦ã?³ã??ã?®è¿½å? "
+
+#~ msgid "_Account name:"
+#~ msgstr "ã?¢ã?«ã?¦ã?³ã??å??(_A):"
+
+#~ msgid "_IM Service:"
+#~ msgstr "IM ã?µã?¼ã??ã?¹(_I):"
+
+#~ msgid "10 pt. Tahoma"
+#~ msgstr "10 pt. Tahoma"
+
+#~ msgid "8 pt. Tahoma"
+#~ msgstr "8 pt. 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 ""
+#~ "ã?¤ã??ã?³ã??ã??è¡¨ç¤ºã??ã??é??ã?«ã?µã??ã?¼ã?¿ã?¤ã?  (Daylight Saving Time) ã??ä½¿ç?¨ã??ã??ã??ã?©ã??"
+#~ "ã??ã?§ã??ã??"
+
+#~ msgid "daylight savings time"
+#~ msgstr "ã?µã??ã?¼ã?¿ã?¤ã? ã??å°?å?¥ã??ã??ã??ã?©ã??ã??"
+
+#~ 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 "[SPACE] ã?ã?¼ã??æ?¼ã??ã?¨æ·»ä»?ã??ã?¡ã?¤ã?«ã?»ã??ã?¼ã?®è¡¨ç¤ºã??å??ã??æ?¿ã??ã??ã?¾ã??"
+
+#~ msgid "1 day before appointment"
+#~ msgstr "äº?å®?ã?® 1æ?¥å??"
+
+#~ msgid "1 hour before appointment"
+#~ msgstr "äº?å®?ã?® 1æ??é??å??"
+
+#~ msgid "15 minutes before appointment"
+#~ msgstr "äº?å®?ã?® 15å??å??"
+
+#~ msgid "for"
+#~ msgstr "ã??ã??"
+
+#~ msgid "<b>Att_endees</b>"
+#~ msgstr "<b>å?ºå¸è??(_E)</b>"
+
+#~ msgid "C_hange Organizer"
+#~ msgstr "ä¸»å?¬è??ã?®å¤?æ?´(_G)"
+
+#~ msgid "Co_ntacts..."
+#~ msgstr "é?£çµ¡å??(_N)..."
+
+#~ msgid "forever"
+#~ msgstr "ä»¥é??"
+
+#~ msgid "month(s)"
+#~ msgstr "æ??"
+
+#~ msgid "week(s)"
+#~ msgstr "é?±"
+
+#~ msgid "year(s)"
+#~ msgstr "å¹´"
+
+#~ msgid "_Save Selected"
+#~ msgstr "é?¸æ??ã??ã??ã??ã?®ã?®ä¿?å?(_S)"
+
+#~ msgid "April"
+#~ msgstr "4æ??"
+
+#~ msgid "August"
+#~ msgstr "8æ??"
+
+#~ msgid "December"
+#~ msgstr "12æ??"
+
+#~ msgid "February"
+#~ msgstr "2æ??"
+
+#~ msgid "January"
+#~ msgstr "1æ??"
+
+#~ msgid "July"
+#~ msgstr "7æ??"
+
+#~ msgid "June"
+#~ msgstr "6æ??"
+
+#~ msgid "March"
+#~ msgstr "3æ??"
+
+#~ msgid "May"
+#~ msgstr "5æ??"
+
+#~ msgid "November"
+#~ msgstr "11æ??"
+
+#~ msgid "October"
+#~ msgstr "10æ??"
+
+#~ msgid "September"
+#~ msgstr "9æ??"
+
+#~ 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 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 "Bcc å?¥å??ã??ã?£ã?¼ã?«ã??ã??è¡¨ç¤ºã??ã??ã??ã?©ã??ã??"
+
+#~ msgid "View/Bcc menu item is checked."
+#~ msgstr "ã?¡ã?¼ã?«ä½?æ??ã?¦ã?£ã?³ã??ã?¦ã?§ \"Bcc\" ã??ã?£ã?¼ã?«ã??ã??è¡¨ç¤ºã??ã??ã??ã?©ã??ã??ã?§ã??ã??"
+
+#~ msgid "View/Cc menu item is checked"
+#~ msgstr "Cc å?¥å??ã??ã?£ã?¼ã?«ã??ã??è¡¨ç¤ºã??ã??ã??ã?©ã??ã??"
+
+#~ msgid "View/Cc menu item is checked."
+#~ msgstr "ã?¡ã?¼ã?«ä½?æ??ã?¦ã?£ã?³ã??ã?¦ã?§ \"Cc\" ã??ã?£ã?¼ã?«ã??ã??è¡¨ç¤ºã??ã??ã??ã?©ã??ã??ã?§ã??ã??"
+
+#~ 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 ""
+#~ "ã?ªã?¼ã??ã?£ã?ªé?¢é?£ã?®æ·»ä»?ã??ã?¡ã?¤ã?«ã??ã?¤ã?³ã?©ã?¤ã?³è¡¨ç¤ºã??ã?¦ã??ç?´æ?¥ Evolution ã??ã??æ¼?å¥?"
+#~ "ã?§ã??ã??ã??ã??ã?«ã??ã??ã??ã??ã?®ã??ã?©ã?°ã?¤ã?³ã?§ã??ã??"
+
+#~ msgid "A plugin for backing up and restore Evolution data and settings."
+#~ msgstr ""
+#~ "Evolution ã?®ã??ã?¼ã?¿ã?¨è¨å®?ã??ã??ã??ã?¯ã?¢ã??ã??ã??ã??ã??ã?ªã?¹ã??ã?¢ã??ã??ã??ã??ã?®ã??ã?©ã?°ã?¤ã?³ã?§"
+#~ "ã??ã??"
+
+#~ 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 ""
+#~ "Exchange ã?®ã?¢ã?«ã?¦ã?³ã??ã?®å??é??ã?«é?¢ã??ã??æ??ä½?ã?¨æ©?è?½ã??ç®¡ç??ã??ã??ã??ã?©ã?°ã?¤ã?³ã?§ã??ã??"
+
+#~ 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 "Google ã?«ã?¬ã?³ã??ã?¨é?£çµ¡å??ã??è¨å®?ã??ã??ã??ã??ã?®ã??ã?©ã?°ã?¤ã?³ã?§ã??ã??"
+
+#~ msgid "Google sources"
+#~ msgstr "Google ã?«ã?¬ã?³ã??"
+
+#~ msgid "A plugin to setup GroupWise calendar and contacts sources."
+#~ msgstr ""
+#~ "GroupWise ã?®ã?«ã?¬ã?³ã??ã?¨é?£çµ¡å??ã?®ã?½ã?¼ã?¹ã??è¨å®?ã??ã??ã??ã??ã?®ã??ã?©ã?°ã?¤ã?³ã?§ã??ã??"
+
+#~ 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 ""
+#~ "é?¸æ??ã??ã??ã?¿ã?¹ã?¯/ã?¡ã?¢/ã?«ã?¬ã?³ã??/ã?¢ã??ã?¬ã?¹å¸³ã?? Apple ã?® iPod ã?¨å??æ??ã??ã??ã??ã?©ã?°ã?¤"
+#~ "ã?³ã?§ã??ã??"
+
+#~ 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 "Mono ã?®ã??ã?©ã?°ã?¤ã?³ã??å®?è£?ã??ã??ã??ã?©ã?°ã?¤ã?³ã?§ã??ã??"
+
+#~ 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 "Writes a log of profiling data events."
+#~ msgstr ""
+#~ "ã??ã?¼ã?¿æ??ä½?ã?®ã?¤ã??ã?³ã??ã??ã??ã?ã??ã?¡ã?¤ã?ªã?³ã?°ã??ã?¦ã??ã??ã?®çµ?æ??ã??ã?ã?°ã?«è¨?é?²ã??ã??ã??ã?©ã?°"
+#~ "ã?¤ã?³ã?§ã??ã??"
+
+#~ msgid "SpamAssassin (built-in)"
+#~ msgstr "SpamAssassin (å??è?µ)"
+
+#~ msgid ""
+#~ "Filters junk messages using SpamAssassin. This plugin requires "
+#~ "SpamAssassin to be installed."
+#~ msgstr ""
+#~ "SpamAssassin ã??ä½¿ã?£ã?¦ã?¸ã?£ã?³ã?¯ã?ªã?¡ã?¼ã?«ã??ã??ã?£ã?«ã?¿ã?ªã?³ã?°ã??ã??ã??ã?©ã?°ã?¤ã?³ã?§ã??ã??"
+#~ "ã??ã?®ã??ã?©ã?°ã?¤ã?³ã??å?©ç?¨ã??ã??ã?«ã?¯ SpamAssassin ã??ã?¤ã?³ã?¹ã??ã?¼ã?«ã??ã??ã?¦ã??ã?ªã??ã??ã?°ã?ª"
+#~ "ã??ã?¾ã??ã??ã??"
+
+#~ 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 ã?®é?£çµ¡å??ã??è¨å®?ã??ã??ã??ã??ã?®ã??ã?©ã?°ã?¤ã?³ã?§ã??ã??"
+
+#~ msgid "Pos_t New Message to Folder"
+#~ msgstr "ã??ã?©ã?«ã??ã?¸æ?°ã??ã??ã?¡ã??ã?»ã?¼ã?¸ã?®æ??ç¨¿(_T)"
+
+#~ msgid "Post a Repl_y"
+#~ msgstr "è¿?ä¿¡ã?®æ??ç¨¿(_Y)"
+
+#~ msgid "Post a message to a Public folder"
+#~ msgstr "ã?¡ã??ã?»ã?¼ã?¸ã??å?¬é??ã??ã?©ã?«ã??ã?«æ??ç¨¿ã??ã?¾ã??"
+
+#~ 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 "DnD ã?³ã?¼ã??"
+
+#~ msgid "Full Header"
+#~ msgstr "å?¨ã?¦ã?®ã??ã??ã??"
+
+#~ msgid "Font Description"
+#~ msgstr "ã??ã?©ã?³ã??å??"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]