aboutsummaryrefslogtreecommitdiffstats
path: root/po/ja.po
diff options
context:
space:
mode:
authorEttore Perazzoli <ettore@src.gnome.org>2001-11-01 07:07:32 +0800
committerEttore Perazzoli <ettore@src.gnome.org>2001-11-01 07:07:32 +0800
commit1d7f11a189c5c4fa7797b33bdb93822e352319d1 (patch)
tree23a559420d8a89436254040f077f29c65b06ef1d /po/ja.po
parent9450e20fe2e22030f1674c36935fd1603d2c065a (diff)
downloadgsoc2013-evolution-1d7f11a189c5c4fa7797b33bdb93822e352319d1.tar.gz
gsoc2013-evolution-1d7f11a189c5c4fa7797b33bdb93822e352319d1.tar.zst
gsoc2013-evolution-1d7f11a189c5c4fa7797b33bdb93822e352319d1.zip
Syncing up for the 0.16.100 internal release.
svn path=/trunk/; revision=14551
Diffstat (limited to 'po/ja.po')
-rw-r--r--po/ja.po5293
1 files changed, 2911 insertions, 2382 deletions
diff --git a/po/ja.po b/po/ja.po
index 65d752a83b..3e6b7fd152 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: evolution CVS-20010612\n"
-"POT-Creation-Date: 2001-10-10 11:08-0400\n"
+"POT-Creation-Date: 2001-10-31 17:21-0500\n"
"PO-Revision-Date: 2001-23-01 00:28+0900\n"
"Last-Translator: Takuo KITAME <kitame@debian.org>\n"
"Language-Team: Japanese <translation@gnome.gr.jp>\n"
@@ -15,6 +15,16 @@ msgstr ""
"Content-Type: text/plain; charset=euc-jp\n"
"Content-Transfer-Encoding: 8bit\n"
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.h:1
+#, fuzzy
+msgid "Factory to import LDIF files into Evolution."
+msgstr "Evolution �� VCard �ե�����򥤥�ݡ��Ȥ���ե����ȥ�"
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.h:2
+#, fuzzy
+msgid "Imports LDIF files into Evolution."
+msgstr "Evolution �� VCard �ե�����򥤥�ݡ���"
+
#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
msgid "Factory to import VCard files into Evolution."
msgstr "Evolution �� VCard �ե�����򥤥�ݡ��Ȥ���ե����ȥ�"
@@ -23,291 +33,296 @@ msgstr "Evolution �� VCard �ե�����򥤥�ݡ��Ȥ���ե����ȥ�"
msgid "Imports VCard files into Evolution."
msgstr "Evolution �� VCard �ե�����򥤥�ݡ���"
-#: addressbook/backend/ebook/e-card-simple.c:58
-#: addressbook/gui/widgets/e-addressbook-view.c:868
+#: addressbook/backend/ebook/e-card-simple.c:60
+#: addressbook/gui/widgets/e-addressbook-view.c:849
msgid "File As"
msgstr "��̾"
-#: addressbook/backend/ebook/e-card-simple.c:59
+#: addressbook/backend/ebook/e-card-simple.c:61
msgid "Name"
msgstr "̾��"
-#: addressbook/backend/ebook/e-card-simple.c:60
-#: addressbook/gui/widgets/e-addressbook-view.c:870
+#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/gui/widgets/e-addressbook-view.c:851
msgid "Email"
msgstr "�᡼��"
-#: addressbook/backend/ebook/e-card-simple.c:61
-#: addressbook/gui/contact-editor/e-contact-editor.c:1609
+#: addressbook/backend/ebook/e-card-simple.c:63
+#: addressbook/gui/contact-editor/e-contact-editor.c:1630
msgid "Primary"
msgstr "�ץ饤�ޥ�"
-#: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/backend/ebook/e-card-simple.c:63
msgid "Prim"
msgstr "�ץ饤�ޥ�"
-#: addressbook/backend/ebook/e-card-simple.c:62
-#: addressbook/backend/ebook/e-card-simple.c:92
-#: addressbook/gui/contact-editor/e-contact-editor.c:1594
-#: addressbook/gui/widgets/e-addressbook-view.c:902
+#: addressbook/backend/ebook/e-card-simple.c:64
+#: addressbook/backend/ebook/e-card-simple.c:94
+#: addressbook/gui/contact-editor/e-contact-editor.c:1615
+#: addressbook/gui/widgets/e-addressbook-view.c:883
msgid "Assistant"
msgstr "�����������"
-#: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/backend/ebook/e-card-simple.c:68
-#: addressbook/gui/contact-editor/e-contact-editor.c:1595
-#: addressbook/gui/contact-editor/e-contact-editor.c:1662
+#: addressbook/backend/ebook/e-card-simple.c:65
+#: addressbook/backend/ebook/e-card-simple.c:70
+#: addressbook/gui/contact-editor/e-contact-editor.c:1616
+#: addressbook/gui/contact-editor/e-contact-editor.c:1683
msgid "Business"
msgstr "�Ż�"
-#: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/backend/ebook/e-card-simple.c:68
+#: addressbook/backend/ebook/e-card-simple.c:65
+#: addressbook/backend/ebook/e-card-simple.c:70
msgid "Bus"
msgstr "�Ż�"
-#: addressbook/backend/ebook/e-card-simple.c:64
-#: addressbook/gui/contact-editor/e-contact-editor.c:1598
+#: addressbook/backend/ebook/e-card-simple.c:66
+#: addressbook/gui/contact-editor/e-contact-editor.c:1619
msgid "Callback"
msgstr "�Ƥ��ᤷ"
-#: addressbook/backend/ebook/e-card-simple.c:65
-#: addressbook/gui/contact-editor/e-contact-editor.c:1600
+#: addressbook/backend/ebook/e-card-simple.c:67
+#: addressbook/gui/contact-editor/e-contact-editor.c:1621
msgid "Company"
msgstr "���"
-#: addressbook/backend/ebook/e-card-simple.c:65
+#: addressbook/backend/ebook/e-card-simple.c:67
msgid "Comp"
msgstr "���"
-#: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/backend/ebook/e-card-simple.c:69
-#: addressbook/gui/contact-editor/e-contact-editor.c:1601
-#: addressbook/gui/contact-editor/e-contact-editor.c:1663
+#: addressbook/backend/ebook/e-card-simple.c:68
+#: addressbook/backend/ebook/e-card-simple.c:71
+#: addressbook/gui/contact-editor/e-contact-editor.c:1622
+#: addressbook/gui/contact-editor/e-contact-editor.c:1684
msgid "Home"
msgstr "��"
-#: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/widgets/e-addressbook-view.c:877
+#: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/gui/widgets/e-addressbook-view.c:858
msgid "Organization"
msgstr "���"
-#: addressbook/backend/ebook/e-card-simple.c:67
+#: addressbook/backend/ebook/e-card-simple.c:69
msgid "Org"
msgstr "���"
-#: addressbook/backend/ebook/e-card-simple.c:70
-#: addressbook/gui/contact-editor/e-contact-editor.c:1605
+#: addressbook/backend/ebook/e-card-simple.c:72
+#: addressbook/gui/contact-editor/e-contact-editor.c:1626
msgid "Mobile"
msgstr "�����"
-#: addressbook/backend/ebook/e-card-simple.c:71
-#: addressbook/gui/contact-editor/e-contact-editor.c:1599
+#: addressbook/backend/ebook/e-card-simple.c:73
+#: addressbook/gui/contact-editor/e-contact-editor.c:1620
msgid "Car"
msgstr "��"
-#: addressbook/backend/ebook/e-card-simple.c:72
-#: addressbook/gui/contact-editor/e-contact-editor.c:1597
-#: addressbook/gui/widgets/e-addressbook-view.c:882
+#: addressbook/backend/ebook/e-card-simple.c:74
+#: addressbook/gui/contact-editor/e-contact-editor.c:1618
+#: addressbook/gui/widgets/e-addressbook-view.c:863
msgid "Business Fax"
msgstr "�Ż��� FAX"
-#: addressbook/backend/ebook/e-card-simple.c:72
+#: addressbook/backend/ebook/e-card-simple.c:74
msgid "Bus Fax"
msgstr "�Ż��� FAX"
-#: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1603
-#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/backend/ebook/e-card-simple.c:75
+#: addressbook/gui/contact-editor/e-contact-editor.c:1624
+#: addressbook/gui/widgets/e-addressbook-view.c:864
msgid "Home Fax"
msgstr "�Ȥ� FAX"
-#: addressbook/backend/ebook/e-card-simple.c:74
-#: addressbook/gui/contact-editor/e-contact-editor.c:1596
+#: addressbook/backend/ebook/e-card-simple.c:76
+#: addressbook/gui/contact-editor/e-contact-editor.c:1617
msgid "Business 2"
msgstr "�Ż� 2"
-#: addressbook/backend/ebook/e-card-simple.c:74
+#: addressbook/backend/ebook/e-card-simple.c:76
msgid "Bus 2"
msgstr "�Ż� 2"
-#: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1602
+#: addressbook/backend/ebook/e-card-simple.c:77
+#: addressbook/gui/contact-editor/e-contact-editor.c:1623
msgid "Home 2"
msgstr "�� 2"
-#: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1604
-#: addressbook/gui/widgets/e-addressbook-view.c:886
+#: addressbook/backend/ebook/e-card-simple.c:78
+#: addressbook/gui/contact-editor/e-contact-editor.c:1625
+#: addressbook/gui/widgets/e-addressbook-view.c:867
msgid "ISDN"
msgstr "ISDN"
-#: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/contact-editor/e-contact-editor.c:1606
-#: addressbook/gui/contact-editor/e-contact-editor.c:1664
-#: mail/mail-config.glade.h:52
+#: addressbook/backend/ebook/e-card-simple.c:79
+#: addressbook/backend/ebook/e-card-simple.c:85
+#: addressbook/gui/contact-editor/e-contact-editor.c:1627
+#: addressbook/gui/contact-editor/e-contact-editor.c:1685
+#: mail/mail-config.glade.h:49
msgid "Other"
msgstr "����¾"
-#: addressbook/backend/ebook/e-card-simple.c:78
-#: addressbook/gui/contact-editor/e-contact-editor.c:1607
-#: addressbook/gui/widgets/e-addressbook-view.c:888
+#: addressbook/backend/ebook/e-card-simple.c:80
+#: addressbook/gui/contact-editor/e-contact-editor.c:1628
+#: addressbook/gui/widgets/e-addressbook-view.c:869
msgid "Other Fax"
msgstr "����¾�� FAX"
-#: addressbook/backend/ebook/e-card-simple.c:79
-#: addressbook/gui/contact-editor/e-contact-editor.c:1608
-#: addressbook/gui/widgets/e-addressbook-view.c:889
+#: addressbook/backend/ebook/e-card-simple.c:81
+#: addressbook/gui/contact-editor/e-contact-editor.c:1629
+#: addressbook/gui/widgets/e-addressbook-view.c:870
msgid "Pager"
msgstr "�ݥ��٥�"
-#: addressbook/backend/ebook/e-card-simple.c:80
-#: addressbook/gui/contact-editor/e-contact-editor.c:1610
-#: addressbook/gui/widgets/e-addressbook-view.c:890
+#: addressbook/backend/ebook/e-card-simple.c:82
+#: addressbook/gui/contact-editor/e-contact-editor.c:1631
+#: addressbook/gui/widgets/e-addressbook-view.c:871
msgid "Radio"
msgstr "�饸��"
-#: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1611
-#: addressbook/gui/widgets/e-addressbook-view.c:891
+#: addressbook/backend/ebook/e-card-simple.c:83
+#: addressbook/gui/contact-editor/e-contact-editor.c:1632
+#: addressbook/gui/widgets/e-addressbook-view.c:872
msgid "Telex"
msgstr "�ƥ�å���"
-#: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/widgets/e-addressbook-view.c:892
+#: addressbook/backend/ebook/e-card-simple.c:84
+#: addressbook/gui/widgets/e-addressbook-view.c:873
msgid "TTY"
msgstr "TTY"
-#: addressbook/backend/ebook/e-card-simple.c:84
-#: addressbook/gui/component/e-address-popup.c:476
-#: addressbook/gui/contact-editor/e-contact-editor.c:1637
-#: addressbook/gui/widgets/e-addressbook-view.c:894
+#: addressbook/backend/ebook/e-card-simple.c:86
+#: addressbook/gui/component/e-address-popup.c:484
+#: addressbook/gui/contact-editor/e-contact-editor.c:1658
+#: addressbook/gui/widgets/e-addressbook-view.c:875
msgid "Email 2"
msgstr "�᡼��2"
-#: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/component/e-address-popup.c:486
-#: addressbook/gui/contact-editor/e-contact-editor.c:1638
-#: addressbook/gui/widgets/e-addressbook-view.c:895
+#: addressbook/backend/ebook/e-card-simple.c:87
+#: addressbook/gui/component/e-address-popup.c:494
+#: addressbook/gui/contact-editor/e-contact-editor.c:1659
+#: addressbook/gui/widgets/e-addressbook-view.c:876
msgid "Email 3"
msgstr "�᡼��3"
-#: addressbook/backend/ebook/e-card-simple.c:86
-#: addressbook/gui/widgets/e-addressbook-view.c:896
+#: addressbook/backend/ebook/e-card-simple.c:88
+#: addressbook/gui/widgets/e-addressbook-view.c:877
msgid "Web Site"
msgstr "�����֥�����"
-#: addressbook/backend/ebook/e-card-simple.c:86
+#: addressbook/backend/ebook/e-card-simple.c:88
msgid "Url"
msgstr "URL"
-#: addressbook/backend/ebook/e-card-simple.c:87
-#: addressbook/gui/widgets/e-addressbook-view.c:897
+#: addressbook/backend/ebook/e-card-simple.c:89
+#: addressbook/gui/widgets/e-addressbook-view.c:878
msgid "Department"
msgstr "����"
-#: addressbook/backend/ebook/e-card-simple.c:87
+#: addressbook/backend/ebook/e-card-simple.c:89
msgid "Dep"
msgstr "����"
-#: addressbook/backend/ebook/e-card-simple.c:88
-#: addressbook/gui/widgets/e-addressbook-view.c:898
+#: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/gui/widgets/e-addressbook-view.c:879
msgid "Office"
msgstr "��̳��"
-#: addressbook/backend/ebook/e-card-simple.c:88
+#: addressbook/backend/ebook/e-card-simple.c:90
msgid "Off"
msgstr "��̳��"
-#: addressbook/backend/ebook/e-card-simple.c:89
-#: addressbook/gui/widgets/e-addressbook-view.c:899
+#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/gui/widgets/e-addressbook-view.c:880
msgid "Title"
msgstr "�ɾ�(���Ĥ�)"
-#: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/gui/widgets/e-addressbook-view.c:900
+#: addressbook/backend/ebook/e-card-simple.c:92
+#: addressbook/gui/widgets/e-addressbook-view.c:881
msgid "Profession"
msgstr "���翦"
-#: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/backend/ebook/e-card-simple.c:92
msgid "Prof"
msgstr "��"
-#: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/gui/widgets/e-addressbook-view.c:901
+#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/gui/widgets/e-addressbook-view.c:882
msgid "Manager"
msgstr "�ޥ͡�����"
-#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/backend/ebook/e-card-simple.c:93
msgid "Man"
msgstr "�ޥ͡�����"
-#: addressbook/backend/ebook/e-card-simple.c:92
+#: addressbook/backend/ebook/e-card-simple.c:94
msgid "Ass"
msgstr "�������"
-#: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/gui/widgets/e-addressbook-view.c:903
+#: addressbook/backend/ebook/e-card-simple.c:95
+#: addressbook/gui/widgets/e-addressbook-view.c:884
msgid "Nickname"
msgstr "�˥å��͡���"
-#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/backend/ebook/e-card-simple.c:95
msgid "Nick"
msgstr "�˥å��͡���"
-#: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/widgets/e-addressbook-view.c:904
+#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/gui/widgets/e-addressbook-view.c:885
msgid "Spouse"
msgstr "�۶���"
-#: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:905
+#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/gui/widgets/e-addressbook-view.c:886
msgid "Note"
msgstr "����"
-#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/backend/ebook/e-card-simple.c:98
msgid "Calendar URI"
msgstr "������ URI"
-#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/backend/ebook/e-card-simple.c:98
msgid "CALUri"
msgstr "������URI"
-#: addressbook/backend/ebook/e-card-simple.c:97
-#: addressbook/gui/widgets/e-addressbook-view.c:906
+#: addressbook/backend/ebook/e-card-simple.c:99
+#: addressbook/gui/widgets/e-addressbook-view.c:887
msgid "Free-busy URL"
msgstr "����/¿˻ URL"
-#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/backend/ebook/e-card-simple.c:99
msgid "FBUrl"
msgstr "����/¿˻ URL"
-#: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/backend/ebook/e-card-simple.c:100
msgid "Anniversary"
msgstr "��ǰ��"
-#: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/backend/ebook/e-card-simple.c:100
msgid "Anniv"
msgstr "��ǰ��"
-#: addressbook/backend/ebook/e-card-simple.c:99
+#: addressbook/backend/ebook/e-card-simple.c:101
msgid "Birth Date"
msgstr "������"
-#: addressbook/backend/ebook/e-card-simple.c:102
+#: addressbook/backend/ebook/e-card-simple.c:104
#: calendar/gui/e-calendar-table.etspec.h:4
msgid "Categories"
msgstr "���ƥ���"
-#: addressbook/backend/ebook/e-card-simple.c:103
+#: addressbook/backend/ebook/e-card-simple.c:105
msgid "Family Name"
msgstr "��"
-#: addressbook/backend/ebook/e-card.c:3564
+#: addressbook/backend/ebook/e-card-simple.c:787
+#, fuzzy, c-format
+msgid "%x"
+msgstr "x"
+
+#: addressbook/backend/ebook/e-card.c:3712
msgid "Card: "
msgstr "̾��: "
-#: addressbook/backend/ebook/e-card.c:3566
+#: addressbook/backend/ebook/e-card.c:3714
msgid ""
"\n"
"Name: "
@@ -315,7 +330,7 @@ msgstr ""
"\n"
"̾��: "
-#: addressbook/backend/ebook/e-card.c:3567
+#: addressbook/backend/ebook/e-card.c:3715
msgid ""
"\n"
" Prefix: "
@@ -323,7 +338,7 @@ msgstr ""
"\n"
" �ɾ�(���Ĥ�): "
-#: addressbook/backend/ebook/e-card.c:3568
+#: addressbook/backend/ebook/e-card.c:3716
msgid ""
"\n"
" Given: "
@@ -331,7 +346,7 @@ msgstr ""
"\n"
" ��: "
-#: addressbook/backend/ebook/e-card.c:3569
+#: addressbook/backend/ebook/e-card.c:3717
msgid ""
"\n"
" Additional: "
@@ -339,7 +354,7 @@ msgstr ""
"\n"
" ź��: "
-#: addressbook/backend/ebook/e-card.c:3570
+#: addressbook/backend/ebook/e-card.c:3718
msgid ""
"\n"
" Family: "
@@ -347,7 +362,7 @@ msgstr ""
"\n"
" ��: "
-#: addressbook/backend/ebook/e-card.c:3571
+#: addressbook/backend/ebook/e-card.c:3719
msgid ""
"\n"
" Suffix: "
@@ -355,7 +370,7 @@ msgstr ""
"\n"
" �ɾ�(��Ĥ�): "
-#: addressbook/backend/ebook/e-card.c:3585
+#: addressbook/backend/ebook/e-card.c:3733
msgid ""
"\n"
"Birth Date: "
@@ -363,7 +378,7 @@ msgstr ""
"\n"
"������: "
-#: addressbook/backend/ebook/e-card.c:3596
+#: addressbook/backend/ebook/e-card.c:3744
msgid ""
"\n"
"Address:"
@@ -371,7 +386,7 @@ msgstr ""
"\n"
"����:"
-#: addressbook/backend/ebook/e-card.c:3598
+#: addressbook/backend/ebook/e-card.c:3746
msgid ""
"\n"
" Postal Box: "
@@ -379,7 +394,7 @@ msgstr ""
"\n"
"͹���ֹ�: "
-#: addressbook/backend/ebook/e-card.c:3599
+#: addressbook/backend/ebook/e-card.c:3747
msgid ""
"\n"
" Ext: "
@@ -387,7 +402,7 @@ msgstr ""
"\n"
" ����: "
-#: addressbook/backend/ebook/e-card.c:3600
+#: addressbook/backend/ebook/e-card.c:3748
msgid ""
"\n"
" Street: "
@@ -395,7 +410,7 @@ msgstr ""
"\n"
" �̤�: "
-#: addressbook/backend/ebook/e-card.c:3601
+#: addressbook/backend/ebook/e-card.c:3749
msgid ""
"\n"
" City: "
@@ -403,7 +418,7 @@ msgstr ""
"\n"
" ��: "
-#: addressbook/backend/ebook/e-card.c:3602
+#: addressbook/backend/ebook/e-card.c:3750
msgid ""
"\n"
" Region: "
@@ -411,7 +426,7 @@ msgstr ""
"\n"
" �ϰ�: "
-#: addressbook/backend/ebook/e-card.c:3603
+#: addressbook/backend/ebook/e-card.c:3751
msgid ""
"\n"
" Postal Code: "
@@ -419,7 +434,7 @@ msgstr ""
"\n"
" ͹���ֹ�: "
-#: addressbook/backend/ebook/e-card.c:3604
+#: addressbook/backend/ebook/e-card.c:3752
msgid ""
"\n"
" Country: "
@@ -427,7 +442,7 @@ msgstr ""
"\n"
" ��: "
-#: addressbook/backend/ebook/e-card.c:3617
+#: addressbook/backend/ebook/e-card.c:3765
msgid ""
"\n"
"Delivery Label: "
@@ -435,7 +450,7 @@ msgstr ""
"\n"
"��ã��٥�: "
-#: addressbook/backend/ebook/e-card.c:3629
+#: addressbook/backend/ebook/e-card.c:3777
msgid ""
"\n"
"Telephones:\n"
@@ -443,7 +458,7 @@ msgstr ""
"\n"
"�����ֹ�:\n"
-#: addressbook/backend/ebook/e-card.c:3632
+#: addressbook/backend/ebook/e-card.c:3780
msgid ""
"\n"
"Telephone:"
@@ -451,7 +466,7 @@ msgstr ""
"\n"
"�����ֹ�:"
-#: addressbook/backend/ebook/e-card.c:3656
+#: addressbook/backend/ebook/e-card.c:3804
msgid ""
"\n"
"E-mail:\n"
@@ -459,7 +474,7 @@ msgstr ""
"\n"
"�Żҥ᡼��:\n"
-#: addressbook/backend/ebook/e-card.c:3659
+#: addressbook/backend/ebook/e-card.c:3807
msgid ""
"\n"
"E-mail:"
@@ -467,7 +482,7 @@ msgstr ""
"\n"
"�Żҥ᡼��:"
-#: addressbook/backend/ebook/e-card.c:3678
+#: addressbook/backend/ebook/e-card.c:3826
msgid ""
"\n"
"Mailer: "
@@ -475,7 +490,7 @@ msgstr ""
"\n"
"�᡼��: "
-#: addressbook/backend/ebook/e-card.c:3684
+#: addressbook/backend/ebook/e-card.c:3832
msgid ""
"\n"
"Time Zone: "
@@ -483,7 +498,7 @@ msgstr ""
"\n"
"�����ॾ����: "
-#: addressbook/backend/ebook/e-card.c:3692
+#: addressbook/backend/ebook/e-card.c:3840
msgid ""
"\n"
"Geo Location: "
@@ -491,7 +506,7 @@ msgstr ""
"\n"
"�а�: "
-#: addressbook/backend/ebook/e-card.c:3696
+#: addressbook/backend/ebook/e-card.c:3844
msgid ""
"\n"
"Business Role: "
@@ -499,7 +514,7 @@ msgstr ""
"\n"
"�Ż��ο�̳: "
-#: addressbook/backend/ebook/e-card.c:3708
+#: addressbook/backend/ebook/e-card.c:3856
msgid ""
"\n"
"Org: "
@@ -507,7 +522,7 @@ msgstr ""
"\n"
"�ȿ�: "
-#: addressbook/backend/ebook/e-card.c:3709
+#: addressbook/backend/ebook/e-card.c:3857
msgid ""
"\n"
" Name: "
@@ -515,7 +530,7 @@ msgstr ""
"\n"
" ��̾: "
-#: addressbook/backend/ebook/e-card.c:3710
+#: addressbook/backend/ebook/e-card.c:3858
msgid ""
"\n"
" Unit: "
@@ -523,7 +538,7 @@ msgstr ""
"\n"
" ����: "
-#: addressbook/backend/ebook/e-card.c:3711
+#: addressbook/backend/ebook/e-card.c:3859
msgid ""
"\n"
" Unit2: "
@@ -531,7 +546,7 @@ msgstr ""
"\n"
" ����2: "
-#: addressbook/backend/ebook/e-card.c:3712
+#: addressbook/backend/ebook/e-card.c:3860
msgid ""
"\n"
" Unit3: "
@@ -539,7 +554,7 @@ msgstr ""
"\n"
" ����3: "
-#: addressbook/backend/ebook/e-card.c:3713
+#: addressbook/backend/ebook/e-card.c:3861
msgid ""
"\n"
" Unit4: "
@@ -547,7 +562,7 @@ msgstr ""
"\n"
" ����4: "
-#: addressbook/backend/ebook/e-card.c:3717
+#: addressbook/backend/ebook/e-card.c:3865
msgid ""
"\n"
"Categories: "
@@ -555,7 +570,7 @@ msgstr ""
"\n"
"��̳ʬ��: "
-#: addressbook/backend/ebook/e-card.c:3718
+#: addressbook/backend/ebook/e-card.c:3866
msgid ""
"\n"
"Comment: "
@@ -573,7 +588,7 @@ msgstr ""
#.
#. add_SoundType (string, crd->sound.type);
#. }
-#: addressbook/backend/ebook/e-card.c:3731
+#: addressbook/backend/ebook/e-card.c:3879
msgid ""
"\n"
"Unique String: "
@@ -581,7 +596,7 @@ msgstr ""
"\n"
"Ǥ�դ�ʸ����: "
-#: addressbook/backend/ebook/e-card.c:3734
+#: addressbook/backend/ebook/e-card.c:3882
msgid ""
"\n"
"Public Key: "
@@ -589,11 +604,11 @@ msgstr ""
"\n"
"������: "
-#: addressbook/backend/ebook/e-card.c:4087
+#: addressbook/backend/ebook/e-card.c:4235
msgid "Multiple VCards"
msgstr "ʣ���� VCard"
-#: addressbook/backend/ebook/e-card.c:4095
+#: addressbook/backend/ebook/e-card.c:4243
#, c-format
msgid "VCard for %s"
msgstr "%s �� VCard"
@@ -602,82 +617,84 @@ msgstr "%s �� VCard"
#: addressbook/backend/ebook/load-pine-addressbook.c:22
#: addressbook/backend/ebook/test-client-list.c:23
#: addressbook/backend/ebook/test-client.c:33
-#: addressbook/conduit/address-conduit.c:1169
-#: addressbook/gui/component/addressbook-factory.c:48
-#: calendar/conduits/calendar/calendar-conduit.c:1266
-#: calendar/conduits/todo/todo-conduit.c:1034
-#: calendar/gui/alarm-notify/notify-main.c:78 calendar/gui/main.c:63
+#: addressbook/conduit/address-conduit.c:1537
+#: addressbook/gui/component/addressbook-factory.c:50
+#: calendar/conduits/calendar/calendar-conduit.c:1449
+#: calendar/conduits/todo/todo-conduit.c:1128
+#: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:62
+#: tools/evolution-addressbook-export.c:60
+#: tools/evolution-addressbook-import.c:86
msgid "Could not initialize Bonobo"
msgstr "Bonobo �ν����������ޤ���Ǥ���"
-#: addressbook/backend/pas/pas-backend-file.c:257
-#: addressbook/backend/pas/pas-backend-ldap.c:2047
+#: addressbook/backend/pas/pas-backend-file.c:259
+#: addressbook/backend/pas/pas-backend-ldap.c:2212
msgid "Searching..."
msgstr "������..."
-#: addressbook/backend/pas/pas-backend-file.c:259
+#: addressbook/backend/pas/pas-backend-file.c:261
msgid "Loading..."
msgstr "�ɤ߹�����..."
#. need a different error message here.
-#: addressbook/backend/pas/pas-backend-file.c:268
+#: addressbook/backend/pas/pas-backend-file.c:270
msgid "Error in search expression."
msgstr "����������ɽ���ǥ��顼"
-#: addressbook/backend/pas/pas-backend-ldap.c:467
+#: addressbook/backend/pas/pas-backend-ldap.c:475
msgid "Connecting to LDAP server..."
msgstr "LDAP �����Ф���³��..."
-#: addressbook/backend/pas/pas-backend-ldap.c:477
+#: addressbook/backend/pas/pas-backend-ldap.c:485
msgid "Unable to connect to LDAP server."
msgstr "LDAP �����Ф�ǧ�ڽ���ޤ���"
-#: addressbook/backend/pas/pas-backend-ldap.c:493
+#: addressbook/backend/pas/pas-backend-ldap.c:501
msgid "Waiting for connection to LDAP server..."
msgstr "LDAP �����Фؤ���³���Ե���..."
-#: addressbook/backend/pas/pas-backend-ldap.c:862
+#: addressbook/backend/pas/pas-backend-ldap.c:870
msgid "Adding card to LDAP server..."
msgstr "LDAP �����Фإ����ɤ��ɲ���..."
-#: addressbook/backend/pas/pas-backend-ldap.c:959
+#: addressbook/backend/pas/pas-backend-ldap.c:971
msgid "Removing card from LDAP server..."
msgstr "LDAP �����Ф��饫���ɤ�����..."
-#: addressbook/backend/pas/pas-backend-ldap.c:1064
+#: addressbook/backend/pas/pas-backend-ldap.c:1080
msgid "Modifying card from LDAP server..."
msgstr "LDAP �����Ф��饫���ɤ��ѹ���..."
-#: addressbook/backend/pas/pas-backend-ldap.c:1992
+#: addressbook/backend/pas/pas-backend-ldap.c:2157
msgid "Receiving LDAP search results..."
msgstr "LDAP �����η�̤������..."
-#: addressbook/backend/pas/pas-backend-ldap.c:1997
+#: addressbook/backend/pas/pas-backend-ldap.c:2162
msgid "Restarting search."
msgstr "������Ƽ¹���"
-#: addressbook/conduit/address-conduit.c:204
+#: addressbook/conduit/address-conduit.c:284
msgid "Cursor could not be loaded\n"
msgstr "����������ɤ߹��ޤ�뤳�Ȥ�����ޤ���Ǥ���\n"
-#: addressbook/conduit/address-conduit.c:217
+#: addressbook/conduit/address-conduit.c:297
msgid "EBook not loaded\n"
msgstr "EBook �ϥ����ɤ���Ƥ��ޤ���\n"
-#: addressbook/conduit/address-conduit.c:733
-#: calendar/conduits/calendar/calendar-conduit.c:841
-#: calendar/conduits/todo/todo-conduit.c:609
+#: addressbook/conduit/address-conduit.c:1093
+#: calendar/conduits/calendar/calendar-conduit.c:981
+#: calendar/conduits/todo/todo-conduit.c:692
msgid "Could not start wombat server"
msgstr "wombat �����Ф򳫻Ϥ��뤳�Ȥ�����ޤ���Ǥ���"
-#: addressbook/conduit/address-conduit.c:734
-#: calendar/conduits/calendar/calendar-conduit.c:842
-#: calendar/conduits/todo/todo-conduit.c:610
+#: addressbook/conduit/address-conduit.c:1094
+#: calendar/conduits/calendar/calendar-conduit.c:982
+#: calendar/conduits/todo/todo-conduit.c:693
msgid "Could not start wombat"
msgstr "wombat �򳫻Ϥ��뤳�Ȥ�����ޤ���Ǥ���"
-#: addressbook/conduit/address-conduit.c:764
-#: addressbook/conduit/address-conduit.c:767
+#: addressbook/conduit/address-conduit.c:1124
+#: addressbook/conduit/address-conduit.c:1127
msgid "Could not read pilot's Address application block"
msgstr ""
"�ѥ����åȤΥ��ɥ쥹���ץꥱ�������֥��å����ɤ߹��ळ�Ȥ�����ޤ���Ǥ���"
@@ -722,39 +739,39 @@ msgstr "���ɥ쥹Ģ�Υ��ɥ쥹��ݥåץ��åפ��뤿��Υե����ȥ�"
msgid "Factory for the sample Addressbook control"
msgstr "����ץ륢�ɥ쥹Ģ����ȥ�����Τ���Υե����ȥ�"
-#: addressbook/gui/component/addressbook-component.c:66
-#: calendar/gui/dialogs/comp-editor-util.c:289
-#: calendar/gui/dialogs/comp-editor-util.c:345 shell/e-local-storage.c:173
-#: shell/e-shortcuts.c:1062
+#: addressbook/gui/component/addressbook-component.c:71
+#: calendar/gui/dialogs/comp-editor-util.c:310
+#: calendar/gui/dialogs/comp-editor-util.c:366 shell/e-local-storage.c:172
+#: shell/e-shortcuts.c:1061
msgid "Contacts"
msgstr "Ϣ����"
-#: addressbook/gui/component/addressbook-component.c:66
+#: addressbook/gui/component/addressbook-component.c:71
msgid "Folder containing contact information"
msgstr "Ϣ�������Τ���ե����"
-#: addressbook/gui/component/addressbook-component.c:68
+#: addressbook/gui/component/addressbook-component.c:73
msgid "LDAP Server"
msgstr "LDAP ������"
-#: addressbook/gui/component/addressbook-component.c:68
+#: addressbook/gui/component/addressbook-component.c:73
msgid "LDAP server containing contact information"
msgstr "Ϣ�������Τ���LDAP������"
-#: addressbook/gui/component/addressbook-component.c:411
+#: addressbook/gui/component/addressbook-component.c:526
#: ui/evolution-addressbook.xml.h:11
msgid "New Contact"
msgstr "����Ϣ����"
-#: addressbook/gui/component/addressbook-component.c:411
+#: addressbook/gui/component/addressbook-component.c:526
msgid "New _Contact"
msgstr "����Ϣ����"
-#: addressbook/gui/component/addressbook-component.c:412
+#: addressbook/gui/component/addressbook-component.c:527
msgid "New Contact List"
msgstr "����Ϣ����ꥹ��"
-#: addressbook/gui/component/addressbook-component.c:412
+#: addressbook/gui/component/addressbook-component.c:527
msgid "New Contact _List"
msgstr "����Ϣ����ꥹ��(_L)"
@@ -787,7 +804,7 @@ msgid "Base"
msgstr "�١�������ȥ�"
#: addressbook/gui/component/addressbook-config.glade.h:7
-#: calendar/gui/dialogs/task-editor.c:177
+#: calendar/gui/dialogs/task-editor.c:178
msgid "Basic"
msgstr "����"
@@ -870,16 +887,16 @@ msgstr "���������̾(_A):"
#: addressbook/gui/contact-editor/contact-editor.glade.h:19
#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
-#: mail/mail-config.glade.h:92 my-evolution/my-evolution.glade.h:21
+#: mail/mail-config.glade.h:90 my-evolution/my-evolution.glade.h:21
msgid "_Add"
msgstr "�ɲ�(_A)"
#: addressbook/gui/component/addressbook-config.glade.h:25
-#: filter/filter.glade.h:9 mail/mail-config.glade.h:97
+#: filter/filter.glade.h:9 mail/mail-config.glade.h:98
#: ui/evolution-addressbook.xml.h:34 ui/evolution-calendar.xml.h:39
#: ui/evolution-mail-list.xml.h:25 ui/evolution-mail-messagedisplay.xml.h:6
#: ui/evolution-message-composer.xml.h:47
-#: ui/evolution-signature-editor.xml.h:6 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
#: ui/evolution-tasks.xml.h:16
msgid "_Edit"
msgstr "�Խ�(_E)"
@@ -896,15 +913,20 @@ msgstr "�ݡ����ֹ�(_P):"
msgid "_Server name:"
msgstr "������̾(_S):"
-#: addressbook/gui/component/addressbook-storage.c:168
+#: addressbook/gui/component/addressbook-factory.c:70
+#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:134
+msgid "Could not initialize gnome-vfs"
+msgstr "gnome-vfs �ν����������ޤ���Ǥ���"
+
+#: addressbook/gui/component/addressbook-storage.c:167
msgid "Other Contacts"
msgstr "¾��Ϣ����"
-#: addressbook/gui/component/addressbook.c:400
+#: addressbook/gui/component/addressbook.c:468
msgid "Unable to open addressbook"
msgstr "���ɥ쥹Ģ�򳫤����Ȥ�����ޤ���"
-#: addressbook/gui/component/addressbook.c:409
+#: addressbook/gui/component/addressbook.c:477
msgid ""
"We were unable to open this addressbook. This either\n"
"means you have entered an incorrect URI, or the LDAP server\n"
@@ -914,7 +936,7 @@ msgstr ""
"�����Ϥ�����, ���뤤�� LDAP �����Ф�����Ƥ��뤫�Τɤ��餫\n"
"���̣���ޤ�"
-#: addressbook/gui/component/addressbook.c:414
+#: addressbook/gui/component/addressbook.c:482
msgid ""
"This version of Evolution does not have LDAP support\n"
"compiled in to it. If you want to use LDAP in Evolution\n"
@@ -926,7 +948,7 @@ msgstr ""
"���� OpenLDAP ����������� CVS ����������ץ�������\n"
"����ѥ��뤷�ʤ���Фʤ�ޤ���\n"
-#: addressbook/gui/component/addressbook.c:422
+#: addressbook/gui/component/addressbook.c:490
msgid ""
"We were unable to open this addressbook. Please check that the\n"
"path exists and that you have permission to access it."
@@ -934,42 +956,42 @@ msgstr ""
"���Υ��ɥ쥹Ģ�򳫤����Ȥ�����ޤ���Ǥ���. �ѥ���¸�ߤ�, ����������\n"
"����äƤ��뤫�ɤ��������å����Ƥ�������"
-#: addressbook/gui/component/addressbook.c:550
+#: addressbook/gui/component/addressbook.c:623
#, c-format
msgid "Enter password for %s (user %s)"
msgstr "%s (user %s) �Τ���Υѥ���ɤ����Ϥ��Ƥ�������"
-#: addressbook/gui/component/addressbook.c:655
+#: addressbook/gui/component/addressbook.c:760
#: calendar/gui/cal-search-bar.c:55
msgid "Any field contains"
msgstr "�ե�����ɤ����Τ�Τ�ޤ�"
-#: addressbook/gui/component/addressbook.c:656
+#: addressbook/gui/component/addressbook.c:761
msgid "Name contains"
msgstr "̾�������Τ�Τ�ޤ�"
-#: addressbook/gui/component/addressbook.c:657
+#: addressbook/gui/component/addressbook.c:762
msgid "Email contains"
msgstr "�Żҥ᡼�뤬���Τ�Τ�ޤ�"
-#: addressbook/gui/component/addressbook.c:658
+#: addressbook/gui/component/addressbook.c:763
#: calendar/gui/cal-search-bar.c:59
msgid "Category is"
msgstr "���ƥ����"
#. We attach subitems below
-#: addressbook/gui/component/addressbook.c:659 widgets/misc/e-filter-bar.h:97
-#: widgets/misc/e-filter-bar.h:104
+#: addressbook/gui/component/addressbook.c:764 widgets/misc/e-filter-bar.h:98
+#: widgets/misc/e-filter-bar.h:105
msgid "Advanced..."
msgstr "�ܺ�..."
#. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:889
+#: addressbook/gui/component/addressbook.c:1005
#: calendar/gui/cal-search-bar.c:412
msgid "Any Category"
msgstr "���٤ƤΥ��ƥ���"
-#: addressbook/gui/component/addressbook.c:929
+#: addressbook/gui/component/addressbook.c:1045
msgid "The URI that the Folder Browser will display"
msgstr "�ե�����֥饦����ɽ������ URI"
@@ -982,51 +1004,51 @@ msgstr "�ե�����֥饦����ɽ������ URI"
msgid "(none)"
msgstr "(�ʤ�)"
-#: addressbook/gui/component/e-address-popup.c:466
+#: addressbook/gui/component/e-address-popup.c:474
#: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1636
+#: addressbook/gui/contact-editor/e-contact-editor.c:1657
msgid "Primary Email"
msgstr "���פʥ᡼��"
-#: addressbook/gui/component/e-address-popup.c:579
+#: addressbook/gui/component/e-address-popup.c:587
msgid "Select an Action"
msgstr "��������������"
-#: addressbook/gui/component/e-address-popup.c:585
+#: addressbook/gui/component/e-address-popup.c:593
#, c-format
msgid "Create a new contact \"%s\""
msgstr "����Ϣ����\"%s\"��������ޤ�"
-#: addressbook/gui/component/e-address-popup.c:597
+#: addressbook/gui/component/e-address-popup.c:605
#, c-format
msgid "Add address to existing contact \"%s\""
msgstr "���ɥ쥹��¸�ߤ���Ϣ����\"%s\"���ɲ�"
-#: addressbook/gui/component/e-address-popup.c:859
+#: addressbook/gui/component/e-address-popup.c:891
msgid "Querying Addressbook..."
msgstr "���ɥ쥹Ģ�򥯥�����..."
-#: addressbook/gui/component/e-address-popup.c:934
-#: addressbook/gui/component/e-address-widget.c:388
-#: addressbook/gui/component/select-names/e-select-names-popup.c:307
+#: addressbook/gui/component/e-address-popup.c:973
+#: addressbook/gui/component/e-address-widget.c:387
+#: addressbook/gui/component/select-names/e-select-names-popup.c:306
msgid "Edit Contact Info"
msgstr "Ϣ���������Խ�"
-#: addressbook/gui/component/e-address-popup.c:963
-#: addressbook/gui/component/e-address-widget.c:424
-#: addressbook/gui/component/select-names/e-select-names-popup.c:486
+#: addressbook/gui/component/e-address-popup.c:1003
+#: addressbook/gui/component/e-address-widget.c:423
+#: addressbook/gui/component/select-names/e-select-names-popup.c:485
msgid "Add to Contacts"
msgstr "Ϣ������ɲ�"
-#: addressbook/gui/component/e-address-popup.c:1006
+#: addressbook/gui/component/e-address-popup.c:1046
msgid "Merge E-Mail Address"
msgstr "�Żҥ᡼�륢�ɥ쥹������"
-#: addressbook/gui/component/e-address-widget.c:365
+#: addressbook/gui/component/e-address-widget.c:364
msgid "Disable Queries"
msgstr "�������̵��"
-#: addressbook/gui/component/e-address-widget.c:365
+#: addressbook/gui/component/e-address-widget.c:364
msgid "Enable Queries (Dangerous!)"
msgstr "�������ͭ�� (�����Ǥ�!)"
@@ -1038,45 +1060,47 @@ msgstr "Evolution �Υ��ɥ쥹Ģ��̾�����򥤥󥿡��ե�����"
msgid "Factory for the Addressbook's name selection interface"
msgstr "���ɥ쥹Ģ��̾�����򥤥󥿡��ե������Τ���Υե����ȥ�"
-#: addressbook/gui/component/select-names/e-select-names-popup.c:164
-#: addressbook/gui/component/select-names/e-select-names.c:763
-#: composer/e-msg-composer-attachment-bar.c:497 filter/filter-filter.c:436
-#: filter/filter-rule.c:613 shell/e-shortcuts-view.c:181
+#: addressbook/gui/component/select-names/e-select-names-popup.c:163
+#: addressbook/gui/component/select-names/e-select-names.c:777
+#: composer/e-msg-composer-attachment-bar.c:499 filter/filter-filter.c:436
+#: filter/filter-rule.c:625 shell/e-shortcuts-view.c:180
msgid "Remove"
msgstr "���"
-#: addressbook/gui/component/select-names/e-select-names-popup.c:179
+#: addressbook/gui/component/select-names/e-select-names-popup.c:178
msgid "Remove All"
msgstr "���٤ƺ��"
-#: addressbook/gui/component/select-names/e-select-names-popup.c:203
+#: addressbook/gui/component/select-names/e-select-names-popup.c:202
msgid "Send HTML Mail?"
msgstr "HTML �᡼����������ޤ���?"
-#: addressbook/gui/component/select-names/e-select-names-popup.c:406
+#: addressbook/gui/component/select-names/e-select-names-popup.c:405
msgid "Edit Contact List"
msgstr "Ϣ����ꥹ�Ȥ��Խ�"
-#: addressbook/gui/component/select-names/e-select-names-popup.c:424
+#: addressbook/gui/component/select-names/e-select-names-popup.c:423
msgid "Unnamed Contact List"
msgstr "̾���Τʤ�Ϣ����"
-#: addressbook/gui/component/select-names/e-select-names-popup.c:441
+#: addressbook/gui/component/select-names/e-select-names-popup.c:440
#, c-format
msgid "(%d not shown)"
msgstr "(%d ����ɽ��)"
-#: addressbook/gui/component/select-names/e-select-names-popup.c:507
+#: addressbook/gui/component/select-names/e-select-names-popup.c:506
msgid "Unnamed Contact"
msgstr "̾���Τʤ�Ϣ����"
-#: addressbook/gui/component/select-names/e-select-names.c:522
+#: addressbook/gui/component/select-names/e-select-names.c:524
+#, fuzzy
msgid ""
-"Evolution is unable to get the addressbook local storage. This may have been "
-"caused by the evolution-addressbook component crashing. To help us better "
-"understand and ultimately resolve this problem, please send an e-mail to Jon "
-"Trowbridge <trow@ximian.com> with a detailed description of the "
-"circumstances under which this error occurred. Thank you."
+"Evolution is unable to get the addressbook local storage.\n"
+"This may have been caused by the evolution-addressbook component crashing.\n"
+"To help us better understand and ultimately resolve this problem,\n"
+"please send an e-mail to Jon Trowbridge <trow@ximian.com> with a\n"
+"detailed description of the circumstances under which this error\n"
+"occurred. Thank you."
msgstr ""
"Evolution �� �������륹�ȥ졼���Υ��ɥ쥹Ģ������Ǥ��ޤ��� ����Ϥ����餯 "
"evolution-addressbook ����ݡ��ͥ�Ȥ�����å��夷�����Ȥˤ��ޤ��� ��ꡢ��"
@@ -1084,7 +1108,15 @@ msgstr ""
"���顼�ξ����ˤĤ��Ƥξܺ٤�������᡼������äƤ�������������������ꤤ����"
"����"
-#: addressbook/gui/component/select-names/e-select-names.c:599
+#: addressbook/gui/component/select-names/e-select-names.c:532
+msgid ""
+"Evolution is unable to get the addressbook local storage.\n"
+"Under normal circumstances, this should never happen.\n"
+"You may need to exit and restart Evolution in order to\n"
+"correct this problem."
+msgstr ""
+
+#: addressbook/gui/component/select-names/e-select-names.c:608
msgid "Select Contacts from Addressbook"
msgstr "���ɥ쥹Ģ����Ϣ���������"
@@ -1144,12 +1176,12 @@ msgstr "���ϼ�"
#. Construct the app
#: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1241
+#: addressbook/gui/contact-editor/e-contact-editor.c:1264
msgid "Contact Editor"
msgstr "Ϣ���襨�ǥ���"
#: addressbook/gui/contact-editor/contact-editor.glade.h:7
-#: calendar/gui/dialogs/task-editor.c:182
+#: calendar/gui/dialogs/task-editor.c:183
msgid "Details"
msgstr "�ܺ�"
@@ -1218,9 +1250,9 @@ msgstr "Ϣ����(_C)..."
#: addressbook/gui/contact-editor/contact-editor.glade.h:25
#: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/meeting-page.c:841 filter/filter.glade.h:8
-#: mail/folder-browser.c:1422 mail/mail-config.glade.h:96
-#: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:88
+#: calendar/gui/dialogs/meeting-page.c:704 filter/filter.glade.h:8
+#: mail/folder-browser.c:1496 mail/mail-config.glade.h:96
+#: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:94
#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:35
msgid "_Delete"
msgstr "���(_D)"
@@ -1289,37 +1321,47 @@ msgstr ""
msgid "Delete Contact?"
msgstr "Ϣ����������ޤ���?"
-#: addressbook/gui/contact-editor/e-contact-editor.c:759
+#: addressbook/gui/contact-editor/e-contact-editor.c:755
msgid "This contact belongs to these categories:"
msgstr "����Ϣ����Ϥ����Υ��ƥ���˽�°���Ƥ��ޤ�:"
-#: addressbook/gui/contact-editor/e-contact-editor.c:1612
+#: addressbook/gui/contact-editor/e-contact-editor.c:1633
msgid "TTY/TDD"
msgstr "TTY/TDD"
-#: addressbook/gui/contact-editor/e-contact-editor.c:2234
+#: addressbook/gui/contact-editor/e-contact-editor.c:2255
#, c-format
msgid "Could not find widget for a field: `%s'"
msgstr "�ե������`%s'�Υ��������åȤ����Ĥ���ޤ���Ǥ���"
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:283
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:298
msgid "Contact Quick-Add"
msgstr "Ϣ����δʰ��ɲ�"
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:285
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:300
msgid "Edit Full"
msgstr "���٤��Խ�"
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:311
-#: addressbook/gui/widgets/e-addressbook-view.c:869
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:326
+#: addressbook/gui/widgets/e-addressbook-view.c:850
msgid "Full Name"
msgstr "�ե�͡���"
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:317
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:332
msgid "E-mail"
msgstr "�᡼��"
-#: addressbook/gui/contact-editor/e-contact-save-as.c:137
+#. This is a filename. Translators take note.
+#: addressbook/gui/contact-editor/e-contact-save-as.c:106
+msgid "card.vcf"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-save-as.c:170
+#, fuzzy
+msgid "list"
+msgstr "̸"
+
+#: addressbook/gui/contact-editor/e-contact-save-as.c:201
#, c-format
msgid ""
"%s already exists\n"
@@ -2388,7 +2430,7 @@ msgid "contact-list-editor"
msgstr "Ϣ����ꥹ�ȥ��ǥ���"
#. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:229
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:230
msgid "Contact List Editor"
msgstr "Ϣ����ꥹ�ȥ��ǥ���"
@@ -2437,149 +2479,156 @@ msgstr ""
"�ѹ���������Ϣ�����̾�����뤤�ϥ᡼�륢�ɥ쥹��\n"
"���Υե�����ˤ��Ǥ�¸�ߤ��Ƥ��ޤ����ɲä��Ƥ��������Ǥ���?"
-#: addressbook/gui/search/e-addressbook-search-dialog.c:146
-#: widgets/misc/e-filter-bar.c:243
+#: addressbook/gui/search/e-addressbook-search-dialog.c:145
+#: widgets/misc/e-filter-bar.c:237
msgid "Advanced Search"
msgstr "��鸡��"
-#: addressbook/gui/search/e-addressbook-search-dialog.c:152
-#: mail/mail-search.c:264
+#: addressbook/gui/search/e-addressbook-search-dialog.c:151
+#: mail/mail-search.c:263
msgid "Search"
msgstr "����"
-#: addressbook/gui/widgets/e-addressbook-model.c:121
+#: addressbook/gui/widgets/e-addressbook-model.c:127
msgid "No cards"
msgstr "�����ɤʤ�"
-#: addressbook/gui/widgets/e-addressbook-model.c:124
+#: addressbook/gui/widgets/e-addressbook-model.c:130
msgid "1 card"
msgstr "1������"
-#: addressbook/gui/widgets/e-addressbook-model.c:127
+#: addressbook/gui/widgets/e-addressbook-model.c:133
#, c-format
msgid "%d cards"
msgstr "%d ������"
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:138
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
-#: addressbook/gui/widgets/e-addressbook-view.c:691
-#: addressbook/gui/widgets/e-addressbook-view.c:753
-#: addressbook/gui/widgets/e-addressbook-view.c:1422
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:139
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
+#: addressbook/gui/widgets/e-addressbook-view.c:671
+#: addressbook/gui/widgets/e-addressbook-view.c:733
+#: addressbook/gui/widgets/e-addressbook-view.c:1405
#: ui/evolution-addressbook.xml.h:19
msgid "Save as VCard"
msgstr "VCard ����¸"
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:266
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
#: ui/evolution-message-composer.xml.h:13
msgid "Open"
msgstr "����"
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
-#: addressbook/gui/widgets/e-addressbook-view.c:754
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
+#: addressbook/gui/widgets/e-addressbook-view.c:734
#: ui/evolution-addressbook.xml.h:10
msgid "Forward Contact"
msgstr "Ϣ�����ž��"
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
-#: addressbook/gui/widgets/e-addressbook-view.c:755
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:270
+#: addressbook/gui/widgets/e-addressbook-view.c:735
msgid "Send Message to Contact"
msgstr "Ϣ����إ�å�����������"
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:270
-#: addressbook/gui/widgets/e-addressbook-view.c:756
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:271
+#: addressbook/gui/widgets/e-addressbook-view.c:736
#: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:63
+#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:66
#: ui/my-evolution.xml.h:2
msgid "Print"
msgstr "����"
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:272
-#: addressbook/gui/widgets/e-addressbook-view.c:758
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:273
+#: addressbook/gui/widgets/e-addressbook-view.c:738
msgid "Print Envelope"
msgstr "ɽ������"
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:274
-#: addressbook/gui/widgets/e-addressbook-view.c:760 filter/libfilter-i18n.h:11
-#: mail/mail-accounts.c:281 ui/evolution-addressbook.xml.h:8
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:275
+#: addressbook/gui/widgets/e-addressbook-view.c:740 filter/libfilter-i18n.h:11
+#: mail/mail-accounts.c:282 ui/evolution-addressbook.xml.h:8
#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
-#: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:16
+#: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:17
#: ui/evolution-tasks.xml.h:8
msgid "Delete"
msgstr "���"
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:128
-#: addressbook/gui/widgets/e-addressbook-util.c:68
-#: addressbook/gui/widgets/e-minicard.c:452
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
+#: addressbook/gui/widgets/e-addressbook-util.c:85
+#: addressbook/gui/widgets/e-minicard.c:475
msgid "Error modifying card"
msgstr "�����ɤ�����˥��顼��ȯ�����ޤ���"
-#: addressbook/gui/widgets/e-addressbook-util.c:34
+#: addressbook/gui/widgets/e-addressbook-util.c:33
+#: shell/evolution-shell-component.c:1007
msgid "Success"
msgstr "����"
-#: addressbook/gui/widgets/e-addressbook-util.c:35
-#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1712
-#: shell/e-storage.c:525
+#: addressbook/gui/widgets/e-addressbook-util.c:34
+#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1894
+#: shell/e-storage.c:528 shell/evolution-shell-component.c:1044
msgid "Unknown error"
msgstr "�����ʥ��顼"
-#: addressbook/gui/widgets/e-addressbook-util.c:36
+#: addressbook/gui/widgets/e-addressbook-util.c:35
msgid "Repository offline"
msgstr "��ݥ��ȥꥪ�ե饤��"
-#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:515
+#: addressbook/gui/widgets/e-addressbook-util.c:36 shell/e-storage.c:516
+#: shell/evolution-shell-component.c:1035
msgid "Permission denied"
msgstr "���Ĥ�����ޤ���"
-#: addressbook/gui/widgets/e-addressbook-util.c:38
+#: addressbook/gui/widgets/e-addressbook-util.c:37
msgid "Card not found"
msgstr "�����ɤ����Ĥ���ޤ���"
-#: addressbook/gui/widgets/e-addressbook-util.c:39
+#: addressbook/gui/widgets/e-addressbook-util.c:38
msgid "Card ID already exists"
msgstr "������ID�Ϥ��Ǥ�¸�ߤ��ޤ�"
-#: addressbook/gui/widgets/e-addressbook-util.c:40
+#: addressbook/gui/widgets/e-addressbook-util.c:39
msgid "Protocol not supported"
msgstr "�ץ��ȥ���ϥ��ݡ��Ȥ���Ƥ��ޤ���"
-#: addressbook/gui/widgets/e-addressbook-util.c:41
-#: calendar/gui/calendar-model.c:726 calendar/gui/calendar-model.c:1247
+#: addressbook/gui/widgets/e-addressbook-util.c:40
+#: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1193
#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:461 camel/camel-service.c:603
-#: camel/camel-service.c:639
+#: calendar/gui/e-calendar-table.c:481 calendar/gui/print.c:2255
+#: camel/camel-service.c:607 camel/camel-service.c:643
msgid "Cancelled"
msgstr "����󥻥뤷�ޤ���"
-#: addressbook/gui/widgets/e-addressbook-util.c:42
+#: addressbook/gui/widgets/e-addressbook-util.c:41
msgid "Other error"
msgstr "����¾�Υ��顼"
-#: addressbook/gui/widgets/e-addressbook-util.c:59
+#: addressbook/gui/widgets/e-addressbook-util.c:57
+#: calendar/gui/dialogs/save-comp.c:50
+msgid "Do you want to save changes?"
+msgstr "�ѹ�����¸�������Ǥ���?"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:76
msgid "Error adding list"
msgstr "�ꥹ�Ȥ��ɲäǥ��顼��ȯ�����ޤ���"
-#: addressbook/gui/widgets/e-addressbook-util.c:59
+#: addressbook/gui/widgets/e-addressbook-util.c:76
msgid "Error adding card"
msgstr "�����ɤ��ɲäǥ��顼��ȯ�����ޤ���"
-#: addressbook/gui/widgets/e-addressbook-util.c:68
+#: addressbook/gui/widgets/e-addressbook-util.c:85
msgid "Error modifying list"
msgstr "�ꥹ�Ȥν�����˥��顼��ȯ�����ޤ���"
-#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-util.c:95
msgid "Error removing list"
msgstr "�ꥹ�Ȥκ����˥��顼��ȯ�����ޤ���"
-#: addressbook/gui/widgets/e-addressbook-util.c:78
-#: addressbook/gui/widgets/e-addressbook-view.c:1297
+#: addressbook/gui/widgets/e-addressbook-util.c:95
+#: addressbook/gui/widgets/e-addressbook-view.c:1278
msgid "Error removing card"
msgstr "�����ɤκ����˥��顼��ȯ�����ޤ���"
#. Translators: put here a list of labels you want to see on buttons in
#. addressbook. You may use any character to separate labels but it must
#. also be placed at the begining ot the string
-#: addressbook/gui/widgets/e-addressbook-view.c:399
+#: addressbook/gui/widgets/e-addressbook-view.c:378
msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
msgstr ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
@@ -2587,75 +2636,84 @@ msgstr ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
#. in addressbook. You may use any character to separate labels but it
#. must also be placed at the begining ot the string.
#. Use lower case letters if possible.
-#: addressbook/gui/widgets/e-addressbook-view.c:404
+#: addressbook/gui/widgets/e-addressbook-view.c:383
msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
msgstr ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
-#: addressbook/gui/widgets/e-addressbook-view.c:867
+#: addressbook/gui/widgets/e-addressbook-view.c:848
msgid "* Click here to add a contact *"
msgstr "* Ϣ������ɲä��뤿��ˤ����򥯥�å� *"
-#: addressbook/gui/widgets/e-addressbook-view.c:871
+#: addressbook/gui/widgets/e-addressbook-view.c:852
msgid "Primary Phone"
msgstr "�������"
-#: addressbook/gui/widgets/e-addressbook-view.c:872
+#: addressbook/gui/widgets/e-addressbook-view.c:853
msgid "Assistant Phone"
msgstr "���������"
-#: addressbook/gui/widgets/e-addressbook-view.c:873
+#: addressbook/gui/widgets/e-addressbook-view.c:854
msgid "Business Phone"
msgstr "�Ż�������"
-#: addressbook/gui/widgets/e-addressbook-view.c:874
+#: addressbook/gui/widgets/e-addressbook-view.c:855
msgid "Callback Phone"
msgstr "�Ƥ��ᤷ������"
-#: addressbook/gui/widgets/e-addressbook-view.c:875
+#: addressbook/gui/widgets/e-addressbook-view.c:856
msgid "Company Phone"
msgstr "��Ҥ�����"
-#: addressbook/gui/widgets/e-addressbook-view.c:876
+#: addressbook/gui/widgets/e-addressbook-view.c:857
msgid "Home Phone"
msgstr "�Ȥ�����"
-#: addressbook/gui/widgets/e-addressbook-view.c:878
+#: addressbook/gui/widgets/e-addressbook-view.c:859
msgid "Business Address"
msgstr "�Ż��ν���"
-#: addressbook/gui/widgets/e-addressbook-view.c:879
+#: addressbook/gui/widgets/e-addressbook-view.c:860
msgid "Home Address"
msgstr "�Ȥν���"
-#: addressbook/gui/widgets/e-addressbook-view.c:880
+#: addressbook/gui/widgets/e-addressbook-view.c:861
msgid "Mobile Phone"
msgstr "��������"
-#: addressbook/gui/widgets/e-addressbook-view.c:881
+#: addressbook/gui/widgets/e-addressbook-view.c:862
msgid "Car Phone"
msgstr "�ֺ�����"
-#: addressbook/gui/widgets/e-addressbook-view.c:884
+#: addressbook/gui/widgets/e-addressbook-view.c:865
msgid "Business Phone 2"
msgstr "�Ż������� 2"
-#: addressbook/gui/widgets/e-addressbook-view.c:885
+#: addressbook/gui/widgets/e-addressbook-view.c:866
msgid "Home Phone 2"
msgstr "�Ȥ����� 2"
-#: addressbook/gui/widgets/e-addressbook-view.c:887
+#: addressbook/gui/widgets/e-addressbook-view.c:868
msgid "Other Phone"
msgstr "����¾������"
-#: addressbook/gui/widgets/e-addressbook-view.c:893
+#: addressbook/gui/widgets/e-addressbook-view.c:874
msgid "Other Address"
msgstr "����¾�ν���"
-#: addressbook/gui/widgets/e-minicard-control.c:283
+#: addressbook/gui/widgets/e-minicard-control.c:185
+#, c-format
+msgid "and %d other cards."
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard-control.c:187
+msgid "and one other card."
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard-control.c:316
msgid "Save in addressbook"
msgstr "���ɥ쥹Ģ����¸"
-#: addressbook/gui/widgets/e-minicard-view.c:151
+#: addressbook/gui/widgets/e-minicard-view.c:150
msgid ""
"\n"
"\n"
@@ -2841,96 +2899,111 @@ msgstr "��:"
msgid "_Font..."
msgstr "�ե����(_F)..."
-#: addressbook/printing/e-contact-print.c:1092
+#: addressbook/printing/e-contact-print.c:1111
msgid "Print cards"
msgstr "�����ɤΰ���"
-#: addressbook/printing/e-contact-print.c:1152
-#: addressbook/printing/e-contact-print.c:1174
+#: addressbook/printing/e-contact-print.c:1171
+#: addressbook/printing/e-contact-print.c:1193
msgid "Print card"
msgstr "�����ɤΰ���"
-#: addressbook/printing/e-contact-print-envelope.c:216
-#: addressbook/printing/e-contact-print-envelope.c:237
+#: addressbook/printing/e-contact-print-envelope.c:215
+#: addressbook/printing/e-contact-print-envelope.c:236
msgid "Print envelope"
msgstr "���������"
-#: calendar/cal-util/cal-util.c:418 calendar/cal-util/cal-util.c:440
+#: calendar/cal-util/cal-component.c:1202
+#, fuzzy
+msgid "Untitled appointment"
+msgstr "���ݥ���Ȥ��Խ�(_E)"
+
+#: calendar/cal-util/cal-util.c:495 calendar/cal-util/cal-util.c:517
#: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:385 mail/message-list.c:651
+#: calendar/gui/e-calendar-table.c:405 mail/message-list.c:651
msgid "High"
msgstr "�⤤"
-#: calendar/cal-util/cal-util.c:420 calendar/cal-util/cal-util.c:442
-#: calendar/gui/calendar-model.c:1673
+#: calendar/cal-util/cal-util.c:497 calendar/cal-util/cal-util.c:519
+#: calendar/gui/calendar-model.c:1703
#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:386 mail/message-list.c:650
+#: calendar/gui/e-calendar-table.c:406 mail/message-list.c:650
msgid "Normal"
msgstr "����"
-#: calendar/cal-util/cal-util.c:422 calendar/cal-util/cal-util.c:444
+#: calendar/cal-util/cal-util.c:499 calendar/cal-util/cal-util.c:521
#: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:387 mail/message-list.c:649
+#: calendar/gui/e-calendar-table.c:407 mail/message-list.c:649
msgid "Low"
msgstr "�㤤"
#. An empty string is the same as 'None'.
-#: calendar/cal-util/cal-util.c:438
+#: calendar/cal-util/cal-util.c:515
#: calendar/gui/dialogs/task-details-page.glade.h:13
-#: calendar/gui/e-calendar-table.c:388
+#: calendar/gui/e-calendar-table.c:408
msgid "Undefined"
msgstr "̤���"
-#: calendar/conduits/calendar/calendar-conduit.c:797
-#: calendar/conduits/todo/todo-conduit.c:564
+#: calendar/conduits/calendar/calendar-conduit.c:935
+#: calendar/conduits/todo/todo-conduit.c:647
msgid "Error while communicating with calendar server"
msgstr "�����������Ф��̿���˥��顼��ȯ�����ޤ���"
-#: calendar/conduits/calendar/calendar-conduit.c:900
-#: calendar/conduits/calendar/calendar-conduit.c:903
+#: calendar/conduits/calendar/calendar-conduit.c:1075
+#: calendar/conduits/calendar/calendar-conduit.c:1078
msgid "Could not read pilot's Calendar application block"
msgstr ""
"�ѥ����åȤΥ��������ץꥱ�������֥��å����ɤ߹��ळ�Ȥ�����ޤ���Ǥ���"
-#: calendar/conduits/todo/todo-conduit.c:668
-#: calendar/conduits/todo/todo-conduit.c:671
+#: calendar/conduits/todo/todo-conduit.c:754
+#: calendar/conduits/todo/todo-conduit.c:757
msgid "Could not read pilot's ToDo application block"
msgstr ""
"�ѥ����åȤ� ToDo ���ץꥱ�������֥��å����ɤ߹��ळ�Ȥ�����ޤ���Ǥ���"
#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
-msgid "A sample Bonobo control which displays an calendar."
+#, fuzzy
+msgid "A Bonobo control which displays a task list."
msgstr "��������ɽ������ Bonobo ����ȥ�����Υ���ץ�"
#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
+msgid "A sample Bonobo control which displays an calendar."
+msgstr "��������ɽ������ Bonobo ����ȥ�����Υ���ץ�"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
msgid "Evolution calendar executive summary component."
msgstr "Evolution �������¹ԥ��ޥꥳ��ݡ��ͥ��"
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
msgid "Evolution calendar iTip/iMip viewer"
msgstr "Evolution ������ iTip/iMip �ӥ塼��"
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
msgid "Evolution component for handling the calendar."
msgstr "�������򰷤������ Evolution ����ݡ��ͥ��"
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
msgid "Factory for the Calendar Summary component."
msgstr "���������ޥ꡼����ݡ��ͥ�ȤΤ���Υե����ȥ�"
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#, fuzzy
+msgid "Factory for the Evolution Tasks control"
+msgstr "Evolution ����ݡ����Τ���Υե����ȥ�"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
msgid "Factory for the calendar iTip view control"
msgstr "������ iTip �ӥ塼����ȥ�����Τ���Υե����ȥ�"
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
msgid "Factory for the sample Calendar control"
msgstr "����ץ륫��������ȥ�����Υե����ȥ�"
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
msgid "Factory to centralize calendar component editor dialogs"
msgstr ""
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
msgid "Factory to create a component editor factory"
msgstr "Evolution ����ݡ��ͥ�ȥ��ǥ�����������뤿��Υե����ȥ�"
@@ -2942,47 +3015,29 @@ msgstr "���顼�����Υ����ӥ�"
msgid "Factory for the alarm notification service"
msgstr "���顼�����Υ����ӥ��Τ���Υե����ȥ�"
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:152
-#, c-format
-msgid "Notification about your appointment starting on %s and ending on %s"
-msgstr "%s ����Ϥޤꡢ%s �˽���륢�ݥ���ȤˤĤ��Ƥ�����"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:156
-#, c-format
-msgid "Notification about your appointment starting on %s"
-msgstr "%s ����Ϥޤ륢�ݥ���ȤˤĤ��Ƥ�����"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:161
-#, c-format
-msgid "Notification about your appointment ending on %s"
-msgstr "%s �˽���륢�ݥ���ȤˤĤ��Ƥ�����"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:165
-msgid "Notification about your appointment"
-msgstr "���ݥ���ȤˤĤ��Ƥ�����"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:172
-#, c-format
-msgid "Notification about your task starting on %s and ending on %s"
-msgstr "%s �˻Ϥޤꡢ%s �˽���륿�����ˤĤ��Ƥ�����"
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:216
+#, fuzzy
+msgid "Starting:"
+msgstr "����"
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:176
-#, c-format
-msgid "Notification about your task starting on %s"
-msgstr "%s �˻Ϥޤ륿�����ˤĤ��Ƥ�����"
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:218
+msgid "Ending:"
+msgstr ""
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:181
-#, c-format
-msgid "Notification about your task ending on %s"
-msgstr "%s �˽���륿�����ˤĤ��Ƥ�����"
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:231
+#, fuzzy
+msgid "invalid time"
+msgstr "�����(_E):"
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:185
-msgid "Notification about your task"
-msgstr "�������ˤĤ��Ƥ�����"
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:276
+#, fuzzy
+msgid "Evolution Alarm"
+msgstr "Evolution"
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:267
-msgid "Alarm on %A %b %d %Y %H:%M"
-msgstr "%Y/%b/%d %A %H:%M �˥��顼��"
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:371
+#, fuzzy, c-format
+msgid "Alarm on %s"
+msgstr "���顼��"
#: calendar/gui/alarm-notify/alarm-notify.glade.h:1
#: ui/evolution-comp-editor.xml.h:1
@@ -3001,11 +3056,11 @@ msgstr "���顼����߻��� (ʬ)"
msgid "_Edit appointment"
msgstr "���ݥ���Ȥ��Խ�(_E)"
-#: calendar/gui/alarm-notify/alarm-queue.c:658
+#: calendar/gui/alarm-notify/alarm-queue.c:670
msgid "No description available."
msgstr "�����Ϥ���ޤ���"
-#: calendar/gui/alarm-notify/alarm-queue.c:718
+#: calendar/gui/alarm-notify/alarm-queue.c:730
msgid ""
"Evolution does not support calendar reminders with\n"
"email notifications yet, but this reminder was\n"
@@ -3017,7 +3072,7 @@ msgstr ""
"���ꤹ��С�������̾�Υ�ޥ���������������ܥå���\n"
"�ˤ�ɽ�����ޤ���"
-#: calendar/gui/alarm-notify/alarm-queue.c:769
+#: calendar/gui/alarm-notify/alarm-queue.c:781
#, c-format
msgid ""
"An Evolution Calendar reminder is about to trigger.\n"
@@ -3034,136 +3089,115 @@ msgstr ""
"\n"
"�����ˤ��Υץ�������ư���Ƥ褤�Ǥ���?"
-#: calendar/gui/alarm-notify/notify-main.c:73 calendar/gui/main.c:58
+#: calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:57
msgid "Could not initialize GNOME"
msgstr "GNOME �ν����������ޤ���Ǥ���"
-#: calendar/gui/alarm-notify/notify-main.c:81 calendar/gui/main.c:106
-msgid "Could not initialize gnome-vfs"
-msgstr "gnome-vfs �ν����������ޤ���Ǥ���"
+#: calendar/gui/alarm-notify/notify-main.c:181
+#, fuzzy
+msgid "Could not create the alarm notify service"
+msgstr "���顼�����Υ����ӥ��ե����ȥ���������ޤ���Ǥ���"
-#: calendar/gui/alarm-notify/notify-main.c:90
+#: calendar/gui/alarm-notify/notify-main.c:186
msgid "Could not create the alarm notify service factory"
msgstr "���顼�����Υ����ӥ��ե����ȥ���������ޤ���Ǥ���"
-#: calendar/gui/calendar-commands.c:439
+#: calendar/gui/calendar-commands.c:446
msgid "%A %d %B %Y"
msgstr "%Yǯ%m��%d�� %A"
#. strftime format %a = abbreviated weekday name, %d = day of month,
#. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:442 calendar/gui/e-day-view-top-item.c:289
-#: calendar/gui/e-day-view.c:1389 calendar/gui/e-week-view-main-item.c:334
+#: calendar/gui/calendar-commands.c:449 calendar/gui/e-day-view-top-item.c:288
+#: calendar/gui/e-day-view.c:1401 calendar/gui/e-week-view-main-item.c:333
msgid "%a %d %b"
msgstr "%m/%d (%a)"
-#: calendar/gui/calendar-commands.c:444 calendar/gui/calendar-commands.c:449
-#: calendar/gui/calendar-commands.c:451
+#: calendar/gui/calendar-commands.c:451 calendar/gui/calendar-commands.c:456
+#: calendar/gui/calendar-commands.c:458
msgid "%a %d %b %Y"
msgstr "%Y/%m/%d (%a)"
-#: calendar/gui/calendar-commands.c:462 calendar/gui/calendar-commands.c:469
-#: calendar/gui/calendar-commands.c:475 calendar/gui/calendar-commands.c:477
+#: calendar/gui/calendar-commands.c:469 calendar/gui/calendar-commands.c:476
+#: calendar/gui/calendar-commands.c:482 calendar/gui/calendar-commands.c:484
msgid "%d %B %Y"
msgstr "%Yǯ%m��%d��"
#. 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/calendar-commands.c:467
-#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1446
+#: calendar/gui/calendar-commands.c:474
+#: calendar/gui/e-week-view-main-item.c:341 calendar/gui/print.c:1445
msgid "%d %B"
msgstr "%m��%d��"
-#: calendar/gui/calendar-commands.c:677
+#: calendar/gui/calendar-commands.c:805
msgid ""
"Could not create the calendar view. Please check your ORBit and OAF setup."
msgstr ""
"�������ӥ塼���������ޤ���Ǥ���. ORBit��OAF�����������å����Ƥ�������"
-#: calendar/gui/calendar-model.c:399 calendar/gui/calendar-model.c:994
-#: calendar/gui/e-calendar-table.c:364
+#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:984
+#: calendar/gui/e-calendar-table.c:384
msgid "Private"
msgstr "��Ū"
-#: calendar/gui/calendar-model.c:402 calendar/gui/calendar-model.c:996
-#: calendar/gui/e-calendar-table.c:365
+#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:986
+#: calendar/gui/e-calendar-table.c:385
msgid "Confidential"
msgstr "��̩"
-#: calendar/gui/calendar-model.c:405 calendar/gui/e-calendar-table.c:363
+#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:383
msgid "Public"
msgstr "����"
-#: calendar/gui/calendar-model.c:498
+#: calendar/gui/calendar-model.c:536
msgid "N"
msgstr "��"
-#: calendar/gui/calendar-model.c:498
+#: calendar/gui/calendar-model.c:536
msgid "S"
msgstr "��"
-#: calendar/gui/calendar-model.c:500
+#: calendar/gui/calendar-model.c:538
msgid "E"
msgstr "��"
-#: calendar/gui/calendar-model.c:500
+#: calendar/gui/calendar-model.c:538
msgid "W"
msgstr "��"
-#: calendar/gui/calendar-model.c:566 calendar/gui/calendar-model.c:1193
-#: calendar/gui/e-calendar-table.c:437
+#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1143
+#: calendar/gui/e-calendar-table.c:457
msgid "Free"
msgstr "����"
-#: calendar/gui/calendar-model.c:568 calendar/gui/e-calendar-table.c:438
-#: calendar/gui/e-meeting-time-sel.c:393
+#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:458
+#: calendar/gui/e-meeting-time-sel.c:409
+#: shell/evolution-shell-component.c:1029
msgid "Busy"
msgstr "�ӥ���"
-#: calendar/gui/calendar-model.c:717 calendar/gui/calendar-model.c:1241
+#: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1187
#: calendar/gui/dialogs/task-details-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:458
+#: calendar/gui/e-calendar-table.c:478 calendar/gui/print.c:2246
msgid "Not Started"
msgstr "���Ϥ��Ƥ��ʤ�"
-#: calendar/gui/calendar-model.c:720 calendar/gui/calendar-model.c:1243
+#: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1189
#: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:459
+#: calendar/gui/e-calendar-table.c:479 calendar/gui/print.c:2249
msgid "In Progress"
msgstr "������"
-#: calendar/gui/calendar-model.c:723 calendar/gui/calendar-model.c:1245
+#: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1191
#: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:460 calendar/gui/e-meeting-model.c:298
-#: calendar/gui/e-meeting-model.c:321
+#: calendar/gui/e-calendar-table.c:480 calendar/gui/e-meeting-model.c:328
+#: calendar/gui/e-meeting-model.c:351 calendar/gui/print.c:2252
msgid "Completed"
msgstr "��λ���ޤ���"
-#. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:908 e-util/e-time-utils.c:163
-#: e-util/e-time-utils.c:354
-msgid "%a %m/%d/%Y %H:%M:%S"
-msgstr "%Y/%m/%d (%a) %H:%M:%S"
-
-#. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/calendar-model.c:911 e-util/e-time-utils.c:158
-#: e-util/e-time-utils.c:363
-msgid "%a %m/%d/%Y %I:%M:%S %p"
-msgstr "%Y/%m/%d (%a) %p %I:%M:%S"
-
-#: calendar/gui/calendar-model.c:916
-#, c-format
-msgid ""
-"The date must be entered in the format: \n"
-"\n"
-"%s"
-msgstr ""
-"���դϥե����ޥåȤ�����ʤ���Фʤ�ޤ���: \n"
-"\n"
-"%s"
-
-#: calendar/gui/calendar-model.c:1080
+#: calendar/gui/calendar-model.c:1048
msgid ""
"The geographical position must be entered in the format: \n"
"\n"
@@ -3173,53 +3207,56 @@ msgstr ""
"\n"
"45.436845,125.862501"
-#: calendar/gui/calendar-model.c:1120
-msgid "The percent value must be between 0 and 100, inclusive"
-msgstr "�ѡ�������ͤ� 0 �� 100 �δ֤Ǵޤ�Ǥ��ʤ���Фʤ�ޤ���"
-
#. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1239 calendar/gui/dialogs/meeting-page.c:332
-#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1446
-#: mail/mail-accounts.c:143 mail/mail-accounts.c:390
-#: mail/mail-config.glade.h:50
+#: calendar/gui/calendar-model.c:1185 calendar/gui/dialogs/meeting-page.c:311
+#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1482
+#: mail/mail-accounts.c:143 mail/mail-accounts.c:391
+#: mail/mail-config.glade.h:47
#: widgets/e-timezone-dialog/e-timezone-dialog.c:203
-#: widgets/misc/e-cell-date-edit.c:240 widgets/misc/e-dateedit.c:453
-#: widgets/misc/e-dateedit.c:1453 widgets/misc/e-dateedit.c:1568
+#: widgets/misc/e-cell-date-edit.c:246 widgets/misc/e-dateedit.c:452
+#: widgets/misc/e-dateedit.c:1459 widgets/misc/e-dateedit.c:1574
msgid "None"
msgstr "����"
-#: calendar/gui/calendar-model.c:1675
+#: calendar/gui/calendar-model.c:1705
msgid "Recurring"
msgstr "�����֤�"
-#: calendar/gui/calendar-model.c:1677
+#: calendar/gui/calendar-model.c:1707
msgid "Assigned"
msgstr "�����ƺѤ�"
-#: calendar/gui/calendar-model.c:1683 calendar/gui/e-meeting-model.c:270
-#: calendar/gui/e-meeting-model.c:280 calendar/gui/e-meeting-model.c:506
-#: calendar/gui/e-meeting-model.c:702
+#: calendar/gui/calendar-model.c:1713 calendar/gui/e-meeting-model.c:300
+#: calendar/gui/e-meeting-model.c:310 calendar/gui/e-meeting-model.c:536
+#: calendar/gui/e-meeting-model.c:776
msgid "Yes"
msgstr "�Ϥ�"
-#: calendar/gui/calendar-model.c:1683 calendar/gui/e-meeting-model.c:282
-#: calendar/gui/e-meeting-model.c:703
+#: calendar/gui/calendar-model.c:1713 calendar/gui/e-meeting-model.c:312
+#: calendar/gui/e-meeting-model.c:777
msgid "No"
msgstr "������"
-#: calendar/gui/calendar-view-factory.c:149 views/calendar/galview.xml.h:1
+#. No time range is set, so don't start a query
+#: calendar/gui/calendar-model.c:1966 calendar/gui/e-day-view.c:1675
+#: calendar/gui/e-week-view.c:1182
+#, fuzzy
+msgid "Searching"
+msgstr "������..."
+
+#: calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
msgid "Day View"
msgstr "��"
-#: calendar/gui/calendar-view-factory.c:152 views/calendar/galview.xml.h:4
+#: calendar/gui/calendar-view-factory.c:151 views/calendar/galview.xml.h:4
msgid "Work Week View"
msgstr "ʿ��"
-#: calendar/gui/calendar-view-factory.c:155 views/calendar/galview.xml.h:3
+#: calendar/gui/calendar-view-factory.c:154 views/calendar/galview.xml.h:3
msgid "Week View"
msgstr "��"
-#: calendar/gui/calendar-view-factory.c:158 views/calendar/galview.xml.h:2
+#: calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
msgid "Month View"
msgstr "��"
@@ -3235,12 +3272,12 @@ msgstr "�������ޤ�"
msgid "Comment contains"
msgstr "�����Ȥ����Τ�Τ�ޤ�"
-#: calendar/gui/cal-search-bar.c:416 mail/mail-ops.c:1061
+#: calendar/gui/cal-search-bar.c:416 mail/mail-ops.c:1075
msgid "Unmatched"
msgstr "�԰���"
-#: calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:6
-#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1056
+#: calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:7
+#: shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
msgid "Calendar"
msgstr "������"
@@ -3248,9 +3285,9 @@ msgstr "������"
msgid "Folder containing appointments and events"
msgstr "�ե�����ϥ��ݥ���Ȥȥ��٥�Ȥ�ޤ�Ǥޤ�"
-#: calendar/gui/component-factory.c:68 calendar/gui/print.c:1723
-#: my-evolution/e-summary-tasks.c:235 my-evolution/e-summary-tasks.c:251
-#: shell/e-local-storage.c:178 shell/e-shortcuts.c:1059
+#: calendar/gui/component-factory.c:68 calendar/gui/print.c:1733
+#: my-evolution/e-summary-tasks.c:247 my-evolution/e-summary-tasks.c:263
+#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1058
#: views/tasks/galview.xml.h:1
msgid "Tasks"
msgstr "������"
@@ -3259,24 +3296,24 @@ msgstr "������"
msgid "Folder containing to-do items"
msgstr "�ե������ ToDo ���ܤ�ޤ�"
-#: calendar/gui/component-factory.c:581 ui/evolution-calendar.xml.h:7
+#: calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
msgid "Create a new appointment"
msgstr "�������ݥ���Ȥ�������ޤ�"
-#: calendar/gui/component-factory.c:582 calendar/gui/e-day-view.c:3423
+#: calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3447
msgid "New _Appointment"
msgstr "�������ݥ����(_A)"
-#: calendar/gui/component-factory.c:587 ui/evolution-calendar.xml.h:8
+#: calendar/gui/component-factory.c:648 ui/evolution-calendar.xml.h:8
#: ui/evolution-tasks.xml.h:5
msgid "Create a new task"
msgstr "������������������ޤ�"
-#: calendar/gui/component-factory.c:588
+#: calendar/gui/component-factory.c:649
msgid "New _Task"
msgstr "����������(_T)"
-#: calendar/gui/control-factory.c:128
+#: calendar/gui/control-factory.c:127
msgid "The URI that the calendar will display"
msgstr "��������ɽ������ URI"
@@ -3348,48 +3385,48 @@ msgstr "��"
msgid "minutes"
msgstr "ʬ"
-#: calendar/gui/dialogs/alarm-page.c:307
+#: calendar/gui/dialogs/alarm-page.c:309
#, c-format
msgid "%d days"
msgstr "%d ��"
-#: calendar/gui/dialogs/alarm-page.c:310
+#: calendar/gui/dialogs/alarm-page.c:312
msgid "1 day"
msgstr "1 ��"
-#: calendar/gui/dialogs/alarm-page.c:315
+#: calendar/gui/dialogs/alarm-page.c:317
#, c-format
msgid "%d weeks"
msgstr "%d ����"
-#: calendar/gui/dialogs/alarm-page.c:318
+#: calendar/gui/dialogs/alarm-page.c:320
msgid "1 week"
msgstr "1 ����"
-#: calendar/gui/dialogs/alarm-page.c:323
+#: calendar/gui/dialogs/alarm-page.c:325
#, c-format
msgid "%d hours"
msgstr "%d ����"
-#: calendar/gui/dialogs/alarm-page.c:326
+#: calendar/gui/dialogs/alarm-page.c:328
msgid "1 hour"
msgstr "1 ����"
-#: calendar/gui/dialogs/alarm-page.c:331
+#: calendar/gui/dialogs/alarm-page.c:333
#, c-format
msgid "%d minutes"
msgstr "%d ʬ"
-#: calendar/gui/dialogs/alarm-page.c:334
+#: calendar/gui/dialogs/alarm-page.c:336
msgid "1 minute"
msgstr "1 ʬ"
-#: calendar/gui/dialogs/alarm-page.c:339
+#: calendar/gui/dialogs/alarm-page.c:341
#, c-format
msgid "%d seconds"
msgstr "%d ��"
-#: calendar/gui/dialogs/alarm-page.c:342
+#: calendar/gui/dialogs/alarm-page.c:344
msgid "1 second"
msgstr "1 ��"
@@ -3446,17 +3483,12 @@ msgstr "���ݥ���Ȥν�λ�� %s %s"
msgid "%s at the end of the appointment"
msgstr "���ݥ���Ȥν�λ�� %s"
-#: calendar/gui/dialogs/alarm-page.c:439
-#, c-format
-msgid "%s at an unknown time"
-msgstr "̤���� %s"
-
-#: calendar/gui/dialogs/alarm-page.c:445
+#: calendar/gui/dialogs/alarm-page.c:453
#, c-format
msgid "%s at %s"
msgstr "%s �� %s"
-#: calendar/gui/dialogs/alarm-page.c:452
+#: calendar/gui/dialogs/alarm-page.c:459
#, c-format
msgid "%s for an unknown trigger type"
msgstr "%s ��̤�Τ�ȯư������"
@@ -3477,7 +3509,7 @@ msgstr "��¥��"
#: calendar/gui/dialogs/alarm-page.glade.h:7
#: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:737 calendar/gui/e-itip-control.glade.h:11
msgid "Summary:"
msgstr "���ޥ�:"
@@ -3507,7 +3539,7 @@ msgstr "���ݥ���Ȥν�λ"
msgid "hour(s)"
msgstr "��"
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:117
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:120
msgid "minute(s)"
msgstr "ʬ"
@@ -3560,7 +3592,7 @@ msgid "First day of wee_k:"
msgstr "���λϤ�(_K):"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:956
+#: calendar/gui/dialogs/recurrence-page.c:963
msgid "Friday"
msgstr "������"
@@ -3573,7 +3605,7 @@ msgid "Minutes"
msgstr "ʬ��"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:952
+#: calendar/gui/dialogs/recurrence-page.c:959
msgid "Monday"
msgstr "������"
@@ -3582,7 +3614,7 @@ msgid "O_verdue tasks:"
msgstr "���¤�᤮�������ƥ�(_O)"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:957
+#: calendar/gui/dialogs/recurrence-page.c:964
msgid "Saturday"
msgstr "������"
@@ -3603,7 +3635,7 @@ msgid "Su_n"
msgstr "��(_N)"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: calendar/gui/dialogs/recurrence-page.c:958
+#: calendar/gui/dialogs/recurrence-page.c:965
msgid "Sunday"
msgstr "������"
@@ -3620,7 +3652,7 @@ msgid "Tas_ks due today:"
msgstr "���������¤Υ�����(_K):"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-#: calendar/gui/dialogs/recurrence-page.c:955
+#: calendar/gui/dialogs/recurrence-page.c:962
msgid "Thursday"
msgstr "������"
@@ -3641,12 +3673,12 @@ msgid "Time format:"
msgstr "���֤ν�:"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:953
+#: calendar/gui/dialogs/recurrence-page.c:960
msgid "Tuesday"
msgstr "������"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: calendar/gui/dialogs/recurrence-page.c:954
+#: calendar/gui/dialogs/recurrence-page.c:961
msgid "Wednesday"
msgstr "������"
@@ -3715,116 +3747,121 @@ msgstr "��(_W)"
msgid "before the start of the appointment"
msgstr "���ݥ���Ȥγ�����"
-#: calendar/gui/dialogs/cancel-comp.c:52
+#: calendar/gui/dialogs/cancel-comp.c:51
msgid "The meeting status has changed. Send an updated version?"
msgstr "��ľ���Ϲ�������ޤ�������������Τ��������ޤ���?"
-#: calendar/gui/dialogs/cancel-comp.c:58
+#: calendar/gui/dialogs/cancel-comp.c:57
msgid "Are you sure you want to cancel and delete this meeting?"
msgstr "�����ˤ��β�Ĥ򥭥�󥻥뤷������Ƥ��������Ǥ���?"
-#: calendar/gui/dialogs/cancel-comp.c:63
+#: calendar/gui/dialogs/cancel-comp.c:62
msgid "Are you sure you want to cancel and delete this task?"
msgstr "�����ˤ��Υ������򥭥�󥻥뤷������Ƥ��������Ǥ���?"
-#: calendar/gui/dialogs/cancel-comp.c:68
+#: calendar/gui/dialogs/cancel-comp.c:67
msgid "Are you sure you want to cancel and delete this journal entry?"
msgstr "�����ˤ��λ��������򥭥�󥻥뤷������Ƥ��������Ǥ���?"
-#: calendar/gui/dialogs/changed-comp.c:60
+#: calendar/gui/dialogs/changed-comp.c:59
msgid "This event has been deleted."
msgstr "���Υ��٥�ȤϺ������ޤ���"
-#: calendar/gui/dialogs/changed-comp.c:64
+#: calendar/gui/dialogs/changed-comp.c:63
msgid "This task has been deleted."
msgstr "���Υ������Ϻ������ޤ���"
-#: calendar/gui/dialogs/changed-comp.c:68
+#: calendar/gui/dialogs/changed-comp.c:67
msgid "This journal entry has been deleted."
msgstr "���λ��������Ϻ������ޤ���"
-#: calendar/gui/dialogs/changed-comp.c:77
+#: calendar/gui/dialogs/changed-comp.c:76
#, c-format
msgid "%s You have made changes. Forget those changes and close the editor?"
msgstr "%s ���ѹ����ޤ������������ѹ����˴����ƥ��ǥ������Ĥ��ޤ���?"
-#: calendar/gui/dialogs/changed-comp.c:79
+#: calendar/gui/dialogs/changed-comp.c:78
#, c-format
msgid "%s You have made no changes, close the editor?"
msgstr "%s ���ѹ�����Ƥޤ��󡣥��ǥ������Ĥ��ޤ���?"
-#: calendar/gui/dialogs/changed-comp.c:84
+#: calendar/gui/dialogs/changed-comp.c:83
msgid "This event has been changed."
msgstr "���Υ��٥�Ȥ��ѹ�����ޤ���"
-#: calendar/gui/dialogs/changed-comp.c:88
+#: calendar/gui/dialogs/changed-comp.c:87
msgid "This task has been changed."
msgstr "���Υ��������ѹ�����ޤ���"
-#: calendar/gui/dialogs/changed-comp.c:92
+#: calendar/gui/dialogs/changed-comp.c:91
msgid "This journal entry has been changed."
msgstr "���λ����������ѹ�����ޤ���"
-#: calendar/gui/dialogs/changed-comp.c:101
+#: calendar/gui/dialogs/changed-comp.c:100
#, c-format
msgid "%s You have made changes. Forget those changes and update the editor?"
msgstr ""
-#: calendar/gui/dialogs/changed-comp.c:103
+#: calendar/gui/dialogs/changed-comp.c:102
#, c-format
msgid "%s You have made no changes, update the editor?"
msgstr ""
-#: calendar/gui/dialogs/comp-editor-util.c:167 calendar/gui/print.c:2132
+#: calendar/gui/dialogs/comp-editor-util.c:188 calendar/gui/print.c:2164
msgid " to "
msgstr ""
-#: calendar/gui/dialogs/comp-editor-util.c:171 calendar/gui/print.c:2136
+#: calendar/gui/dialogs/comp-editor-util.c:192 calendar/gui/print.c:2168
msgid " (Completed "
msgstr " (��� "
-#: calendar/gui/dialogs/comp-editor-util.c:173 calendar/gui/print.c:2138
+#: calendar/gui/dialogs/comp-editor-util.c:194 calendar/gui/print.c:2170
msgid "Completed "
msgstr "��� "
-#: calendar/gui/dialogs/comp-editor-util.c:178 calendar/gui/print.c:2143
+#: calendar/gui/dialogs/comp-editor-util.c:199 calendar/gui/print.c:2175
msgid " (Due "
msgstr " (���� "
-#: calendar/gui/dialogs/comp-editor-util.c:180 calendar/gui/print.c:2145
+#: calendar/gui/dialogs/comp-editor-util.c:201 calendar/gui/print.c:2177
msgid "Due "
msgstr "���� "
-#: calendar/gui/dialogs/comp-editor.c:521
+#: calendar/gui/dialogs/comp-editor.c:303
+#, fuzzy
+msgid "Could not update object!"
+msgstr "�������ե�����򹹿�����ޤ���Ǥ���"
+
+#: calendar/gui/dialogs/comp-editor.c:676
msgid "Edit Appointment"
msgstr "���ݥ���Ȥ��Խ�"
-#: calendar/gui/dialogs/comp-editor.c:526
+#: calendar/gui/dialogs/comp-editor.c:681
#, c-format
msgid "Appointment - %s"
msgstr "���ݥ���� - %s"
-#: calendar/gui/dialogs/comp-editor.c:529
+#: calendar/gui/dialogs/comp-editor.c:684
#, c-format
msgid "Task - %s"
msgstr "������ - %s"
-#: calendar/gui/dialogs/comp-editor.c:532
+#: calendar/gui/dialogs/comp-editor.c:687
#, c-format
msgid "Journal entry - %s"
msgstr "�������� - %s"
-#: calendar/gui/dialogs/comp-editor.c:546
+#: calendar/gui/dialogs/comp-editor.c:701
msgid "No summary"
msgstr "���ޥ�Ϥ���ޤ���"
-#: calendar/gui/dialogs/comp-editor.c:954 mail/mail-callbacks.c:1748
-#: mail/mail-display.c:100
+#: calendar/gui/dialogs/comp-editor.c:1059 mail/mail-callbacks.c:1876
+#: mail/mail-display.c:102
msgid "Overwrite file?"
msgstr "�ե�������񤭤��ޤ���?"
-#: calendar/gui/dialogs/comp-editor.c:958 mail/mail-callbacks.c:1756
-#: mail/mail-display.c:104
+#: calendar/gui/dialogs/comp-editor.c:1063 mail/mail-callbacks.c:1883
+#: mail/mail-display.c:106
msgid ""
"A file by that name already exists.\n"
"Overwrite it?"
@@ -3832,53 +3869,53 @@ msgstr ""
"����̾���Υե�����Ϥ��Ǥ�¸�ߤ��ޤ�\n"
"��񤭤��ޤ���?"
-#: calendar/gui/dialogs/comp-editor.c:1021 ui/evolution-comp-editor.xml.h:13
-#: widgets/misc/e-filter-bar.h:101
+#: calendar/gui/dialogs/comp-editor.c:1109 ui/evolution-comp-editor.xml.h:13
+#: widgets/misc/e-filter-bar.h:102
msgid "Save As..."
msgstr "��̾����¸..."
-#: calendar/gui/dialogs/comp-editor.c:1174
+#: calendar/gui/dialogs/comp-editor.c:1270
msgid "Unable to obtain current version!"
msgstr ""
-#: calendar/gui/dialogs/delete-comp.c:91
+#: calendar/gui/dialogs/delete-comp.c:96
#, c-format
msgid "Are you sure you want to delete the appointment `%s'?"
msgstr "�����˥��ݥ���� `%s' �������Ƥ��������Ǥ���?"
-#: calendar/gui/dialogs/delete-comp.c:94
+#: calendar/gui/dialogs/delete-comp.c:99
msgid "Are you sure you want to delete this untitled appointment?"
msgstr "�����˥����ȥ�ʤ��Υ��ݥ���Ȥ������Ƥ��������Ǥ���?"
-#: calendar/gui/dialogs/delete-comp.c:100
+#: calendar/gui/dialogs/delete-comp.c:105
#, c-format
msgid "Are you sure you want to delete the task `%s'?"
msgstr "�����˥����� `%s' �������Ƥ��������Ǥ���?"
-#: calendar/gui/dialogs/delete-comp.c:103
+#: calendar/gui/dialogs/delete-comp.c:108
msgid "Are you sure you want to delete this untitled task?"
msgstr "�����˥����ȥ�ʤ��Υ������������Ƥ��������Ǥ���?"
-#: calendar/gui/dialogs/delete-comp.c:109
+#: calendar/gui/dialogs/delete-comp.c:114
#, c-format
msgid "Are you sure you want to delete the journal entry `%s'?"
msgstr "�����˻������� `%s' �������Ƥ��������Ǥ���?"
-#: calendar/gui/dialogs/delete-comp.c:112
+#: calendar/gui/dialogs/delete-comp.c:117
msgid "Are you sure want to delete this untitled journal entry?"
msgstr "�����˥����ȥ�ʤ��λ��������������Ƥ��������Ǥ���?"
-#: calendar/gui/dialogs/delete-comp.c:127
+#: calendar/gui/dialogs/delete-comp.c:132
#, c-format
msgid "Are you sure you want to delete %d appointments?"
msgstr "������ %d �ĤΥ��ݥ���Ȥ������Ƥ��������Ǥ���?"
-#: calendar/gui/dialogs/delete-comp.c:132
+#: calendar/gui/dialogs/delete-comp.c:137
#, c-format
msgid "Are you sure you want to delete %d tasks?"
msgstr "������ %d �ĤΥ������������Ƥ��������Ǥ���?"
-#: calendar/gui/dialogs/delete-comp.c:137
+#: calendar/gui/dialogs/delete-comp.c:142
#, c-format
msgid "Are you sure you want to delete %d journal entries?"
msgstr "������ %d �Ĥλ��������������Ƥ��������Ǥ���?"
@@ -3895,25 +3932,25 @@ msgstr "��Ǥ��:"
msgid "Enter Delegate"
msgstr "��Ǥ�������"
-#: calendar/gui/dialogs/event-editor.c:186
+#: calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
msgid "Appointment"
msgstr "���ݥ����"
-#: calendar/gui/dialogs/event-editor.c:191
+#: calendar/gui/dialogs/event-editor.c:190
msgid "Reminder"
msgstr "��¥��"
-#: calendar/gui/dialogs/event-editor.c:196
+#: calendar/gui/dialogs/event-editor.c:195
msgid "Recurrence"
msgstr "�����֤�"
-#: calendar/gui/dialogs/event-editor.c:203
-#: calendar/gui/dialogs/event-editor.c:353
+#: calendar/gui/dialogs/event-editor.c:202
+#: calendar/gui/dialogs/event-editor.c:352
msgid "Scheduling"
msgstr "�������塼��"
-#: calendar/gui/dialogs/event-editor.c:208
-#: calendar/gui/dialogs/event-editor.c:356
+#: calendar/gui/dialogs/event-editor.c:207
+#: calendar/gui/dialogs/event-editor.c:355
msgid "Meeting"
msgstr "���"
@@ -3932,11 +3969,12 @@ msgid "Classification"
msgstr "ʬ��"
#: calendar/gui/dialogs/event-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:3
msgid "Con_fidential"
msgstr "��̩(_F)"
#: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:3
+#: calendar/gui/dialogs/task-page.glade.h:4
msgid "Date & Time"
msgstr "���դȻ���"
@@ -3945,12 +3983,12 @@ msgid "F_ree"
msgstr "�ե꡼(_R)"
#: calendar/gui/dialogs/event-page.glade.h:8
-#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:6
msgid "Pri_vate"
msgstr "��Ū(_V)"
#: calendar/gui/dialogs/event-page.glade.h:9
-#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:7
msgid "Pu_blic"
msgstr "��Ū(_B)"
@@ -3960,7 +3998,7 @@ msgid "Show Time As"
msgstr "���֤���ꤷ��ɽ��"
#: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/dialogs/task-page.glade.h:8
+#: calendar/gui/dialogs/task-page.glade.h:9
msgid "Su_mmary:"
msgstr "���ޥ�(_M):"
@@ -3972,32 +4010,20 @@ msgstr "�����(_E):"
msgid "_Start time:"
msgstr "���ϻ���(_S):"
-#: calendar/gui/dialogs/meeting-page.c:510
-msgid "That person is already attending the meeting!"
-msgstr ""
-
-#: calendar/gui/dialogs/meeting-page.c:554
-#: calendar/gui/dialogs/meeting-page.c:589
-msgid "Chair Persons"
-msgstr "��Ĺ"
-
-#: calendar/gui/dialogs/meeting-page.c:556
-#: calendar/gui/dialogs/meeting-page.c:589
-#: calendar/gui/dialogs/meeting-page.c:710
-msgid "Required Participants"
-msgstr "ɬ�׻��ü�"
+#: calendar/gui/dialogs/meeting-page.c:422
+#, fuzzy
+msgid "An organizer is required."
+msgstr "��żԤ�ɬ�ܤǤ�"
-#: calendar/gui/dialogs/meeting-page.c:558
-#: calendar/gui/dialogs/meeting-page.c:589
-msgid "Optional Participants"
-msgstr "Ǥ�ջ��ü�"
+#: calendar/gui/dialogs/meeting-page.c:443
+msgid "At least one attendee is required."
+msgstr ""
-#: calendar/gui/dialogs/meeting-page.c:560
-#: calendar/gui/dialogs/meeting-page.c:589
-msgid "Non-Participants"
-msgstr "�Ի��ü�"
+#: calendar/gui/dialogs/meeting-page.c:623
+msgid "That person is already attending the meeting!"
+msgstr ""
-#: calendar/gui/dialogs/meeting-page.c:836
+#: calendar/gui/dialogs/meeting-page.c:698
msgid "_Delegate To..."
msgstr "��Ǥ��(_D)..."
@@ -4037,6 +4063,7 @@ msgid "Member"
msgstr "����"
#: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/e-itip-control.c:798
#: calendar/gui/e-meeting-time-sel.etspec.h:8
msgid "RSVP"
msgstr "RSVP"
@@ -4055,7 +4082,7 @@ msgstr "���ơ�����"
#: calendar/gui/dialogs/meeting-page.etspec.h:11
#: calendar/gui/e-calendar-table.etspec.h:18
-#: calendar/gui/e-meeting-time-sel.etspec.h:11 mail/mail-config.glade.h:87
+#: calendar/gui/e-meeting-time-sel.etspec.h:11 mail/mail-config.glade.h:85
#: shell/glade/e-active-connection-dialog.glade.h:5
msgid "Type"
msgstr "����"
@@ -4070,7 +4097,8 @@ msgid "_Change Organizer"
msgstr "��żԤ��ѹ�(_C)"
#: calendar/gui/dialogs/meeting-page.glade.h:4
-msgid "_Invite Others"
+#: calendar/gui/e-meeting-time-sel.c:427
+msgid "_Invite Others..."
msgstr "¾�ξ���(_I)..."
#: calendar/gui/dialogs/meeting-page.glade.h:5
@@ -4081,23 +4109,23 @@ msgstr "¾�μ�ż�(_O)"
msgid "This appointment contains recurrences that Evolution cannot edit."
msgstr "���Υ��ݥ���Ȥ� Evolution ���Խ�����ʤ������֤��롼���ޤ�Ǥ��ޤ�"
-#: calendar/gui/dialogs/recurrence-page.c:925
+#: calendar/gui/dialogs/recurrence-page.c:932
msgid "on"
msgstr "����"
-#: calendar/gui/dialogs/recurrence-page.c:951 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:958 filter/filter-datespec.c:83
msgid "day"
msgstr "��"
-#: calendar/gui/dialogs/recurrence-page.c:1081
+#: calendar/gui/dialogs/recurrence-page.c:1088
msgid "on the"
msgstr "��"
-#: calendar/gui/dialogs/recurrence-page.c:1089
+#: calendar/gui/dialogs/recurrence-page.c:1096
msgid "th"
msgstr " "
-#: calendar/gui/dialogs/recurrence-page.c:1262
+#: calendar/gui/dialogs/recurrence-page.c:1269
msgid "occurrences"
msgstr "�����"
@@ -4161,19 +4189,15 @@ msgstr "��"
msgid "year(s)"
msgstr "ǯ"
-#: calendar/gui/dialogs/save-comp.c:51
-msgid "Do you want to save changes?"
-msgstr "�ѹ�����¸�������Ǥ���?"
-
-#: calendar/gui/dialogs/send-comp.c:56
+#: calendar/gui/dialogs/send-comp.c:55
msgid "The meeting information has changed. Send an updated version?"
msgstr ""
-#: calendar/gui/dialogs/send-comp.c:61
+#: calendar/gui/dialogs/send-comp.c:60
msgid "The task information has changed. Send an updated version?"
msgstr ""
-#: calendar/gui/dialogs/send-comp.c:66
+#: calendar/gui/dialogs/send-comp.c:65
msgid "The journal entry has changed. Send an updated version?"
msgstr ""
@@ -4192,7 +4216,7 @@ msgid "Progress"
msgstr "������"
#: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:950
+#: my-evolution/e-summary-preferences.c:966
msgid "URL:"
msgstr "URL:"
@@ -4204,138 +4228,169 @@ msgstr "ͥ����(_P):"
msgid "_Status:"
msgstr "���ơ�����(_S):"
-#: calendar/gui/dialogs/task-editor.c:189
-#: calendar/gui/dialogs/task-editor.c:293
+#: calendar/gui/dialogs/task-editor.c:190
+#: calendar/gui/dialogs/task-editor.c:227
+#: calendar/gui/dialogs/task-editor.c:322
msgid "Assignment"
msgstr "������"
-#: calendar/gui/dialogs/task-page.glade.h:4
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:746
#: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:28
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:26
msgid "Description:"
msgstr "����:"
-#: calendar/gui/dialogs/task-page.glade.h:7
+#: calendar/gui/dialogs/task-page.glade.h:8
msgid "Sta_rt Date:"
msgstr "������(_R):"
-#: calendar/gui/dialogs/task-page.glade.h:9
-msgid "_Confidential"
-msgstr "��̩(_C)"
-
#: calendar/gui/dialogs/task-page.glade.h:11
msgid "_Due Date:"
msgstr "����(_D):"
-#: calendar/gui/e-calendar-table.c:407
+#: calendar/gui/e-calendar-table.c:427
#, c-format
msgid "0%"
msgstr "0%"
-#: calendar/gui/e-calendar-table.c:408
+#: calendar/gui/e-calendar-table.c:428
#, c-format
msgid "10%"
msgstr "10%"
-#: calendar/gui/e-calendar-table.c:409
+#: calendar/gui/e-calendar-table.c:429
#, c-format
msgid "20%"
msgstr "20%"
-#: calendar/gui/e-calendar-table.c:410
+#: calendar/gui/e-calendar-table.c:430
#, c-format
msgid "30%"
msgstr "30%"
-#: calendar/gui/e-calendar-table.c:411
+#: calendar/gui/e-calendar-table.c:431
#, c-format
msgid "40%"
msgstr "40%"
-#: calendar/gui/e-calendar-table.c:412
+#: calendar/gui/e-calendar-table.c:432
#, c-format
msgid "50%"
msgstr "50%"
-#: calendar/gui/e-calendar-table.c:413
+#: calendar/gui/e-calendar-table.c:433
#, c-format
msgid "60%"
msgstr "60%"
-#: calendar/gui/e-calendar-table.c:414
+#: calendar/gui/e-calendar-table.c:434
#, c-format
msgid "70%"
msgstr "70%"
-#: calendar/gui/e-calendar-table.c:415
+#: calendar/gui/e-calendar-table.c:435
#, c-format
msgid "80%"
msgstr "80%"
-#: calendar/gui/e-calendar-table.c:416
+#: calendar/gui/e-calendar-table.c:436
#, c-format
msgid "90%"
msgstr "90%"
-#: calendar/gui/e-calendar-table.c:417
+#: calendar/gui/e-calendar-table.c:437
#, c-format
msgid "100%"
msgstr "100%"
-#: calendar/gui/e-calendar-table.c:914 calendar/gui/e-day-view.c:3444
-#: calendar/gui/e-week-view.c:3296 mail/folder-browser.c:1401
-#: shell/e-shortcuts-view.c:385
+#: calendar/gui/e-calendar-table.c:721 calendar/gui/e-day-view.c:2724
+#: calendar/gui/e-week-view.c:1822
+#, fuzzy
+msgid "Deleting selected objects"
+msgstr "���򤷤�Ϣ����������ޤ�"
+
+#: calendar/gui/e-calendar-table.c:939 calendar/gui/e-day-view.c:3468
+#: calendar/gui/e-week-view.c:3395 mail/folder-browser.c:1475
+#: shell/e-shortcuts-view.c:384
msgid "_Open"
msgstr "����(_O)"
-#: calendar/gui/e-calendar-table.c:918 calendar/gui/e-day-view.c:3453
-#: calendar/gui/e-week-view.c:3305 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:943 calendar/gui/e-day-view.c:3477
+#: calendar/gui/e-week-view.c:3404 ui/evolution-addressbook.xml.h:1
#: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
msgid "C_ut"
msgstr "�ڼ��(_U)"
-#: calendar/gui/e-calendar-table.c:920 calendar/gui/e-day-view.c:3455
-#: calendar/gui/e-week-view.c:3307 ui/evolution-addressbook.xml.h:33
+#: calendar/gui/e-calendar-table.c:945 calendar/gui/e-day-view.c:3479
+#: calendar/gui/e-week-view.c:3406 ui/evolution-addressbook.xml.h:33
#: ui/evolution-calendar.xml.h:37 ui/evolution-mail-list.xml.h:24
#: ui/evolution-tasks.xml.h:14
msgid "_Copy"
msgstr "���ԡ�(_C)"
-#: calendar/gui/e-calendar-table.c:922 calendar/gui/e-day-view.c:3430
-#: calendar/gui/e-day-view.c:3457 calendar/gui/e-week-view.c:3283
-#: calendar/gui/e-week-view.c:3309 ui/evolution-addressbook.xml.h:36
+#: calendar/gui/e-calendar-table.c:947 calendar/gui/e-day-view.c:3454
+#: calendar/gui/e-day-view.c:3481 calendar/gui/e-week-view.c:3382
+#: calendar/gui/e-week-view.c:3408 ui/evolution-addressbook.xml.h:36
#: ui/evolution-calendar.xml.h:40 ui/evolution-mail-list.xml.h:29
#: ui/evolution-tasks.xml.h:17
msgid "_Paste"
msgstr "Ž���դ�(_P)"
-#: calendar/gui/e-calendar-table.c:927
+#: calendar/gui/e-calendar-table.c:952
msgid "_Mark as Complete"
msgstr "��λ�Ȥ��ƥޡ���(_M)"
-#: calendar/gui/e-calendar-table.c:929
+#: calendar/gui/e-calendar-table.c:954
msgid "_Delete this Task"
msgstr "������������(_D)"
-#: calendar/gui/e-calendar-table.c:932
+#: calendar/gui/e-calendar-table.c:957
msgid "_Mark Tasks as Complete"
msgstr "��������λ�Ȥ��ƥޡ���(_M)"
-#: calendar/gui/e-calendar-table.c:934
+#: calendar/gui/e-calendar-table.c:959
msgid "_Delete Selected Tasks"
msgstr "���򤷤�����������(_D)"
-#: calendar/gui/e-calendar-table.c:1194
+#: calendar/gui/e-calendar-table.c:1141 calendar/gui/e-day-view.c:7029
+#: calendar/gui/e-week-view.c:3889
+msgid "Updating objects"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:1224
#: calendar/gui/e-calendar-table.etspec.h:6
msgid "Click to add a task"
msgstr "���������ɲä���ˤϤ����򥯥�å�"
+#. strftime format of a weekday, a date and a time, 24-hour.
+#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:163
+#: e-util/e-time-utils.c:357
+msgid "%a %m/%d/%Y %H:%M:%S"
+msgstr "%Y/%m/%d (%a) %H:%M:%S"
+
+#. strftime format of a weekday, a date and a time, 12-hour.
+#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:158
+#: e-util/e-time-utils.c:366
+msgid "%a %m/%d/%Y %I:%M:%S %p"
+msgstr "%Y/%m/%d (%a) %p %I:%M:%S"
+
+#: calendar/gui/e-cell-date-edit-text.c:126
+#, c-format
+msgid ""
+"The date must be entered in the format: \n"
+"\n"
+"%s"
+msgstr ""
+"���դϥե����ޥåȤ�����ʤ���Фʤ�ޤ���: \n"
+"\n"
+"%s"
+
#: calendar/gui/e-calendar-table.etspec.h:3
msgid "Alarms"
msgstr "���顼��"
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:718
-#: camel/camel-filter-driver.c:834
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:721
+#: camel/camel-filter-driver.c:835
msgid "Complete"
msgstr "��λ���ޤ���"
@@ -4366,8 +4421,8 @@ msgstr "������"
#. FIXME: Inbox shortcut should point to something else for
#. people who won't care about using /Local Folders/Inbox
#: calendar/gui/e-calendar-table.etspec.h:16
-#: my-evolution/component-factory.c:45 shell/e-shortcuts.c:1050
-#: shell/e-storage-set-view.c:1453 shell/e-summary-storage.c:80
+#: my-evolution/component-factory.c:44 shell/e-shortcuts.c:1049
+#: shell/e-storage-set-view.c:1465 shell/e-summary-storage.c:79
msgid "Summary"
msgstr "���ޥ�"
@@ -4379,313 +4434,395 @@ msgstr "�������򥽡���"
msgid "URL"
msgstr "URL"
-#: calendar/gui/e-day-view-time-item.c:519
+#: calendar/gui/e-day-view-time-item.c:518
#, c-format
msgid "%02i minute divisions"
msgstr "%02i ʬʬ��"
#. strftime format %A = full weekday name, %d = day of month,
#. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1375
-#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1462
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1387
+#: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1461
msgid "%A %d %B"
msgstr "%B %d %A"
#. strftime format %d = day of month, %b = abbreviated month name.
#. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1402
-#: calendar/gui/e-week-view-main-item.c:348
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1414
+#: calendar/gui/e-week-view-main-item.c:347
msgid "%d %b"
msgstr "%b/%d"
#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:609 calendar/gui/e-week-view.c:345
-#: calendar/gui/print.c:769
+#: calendar/gui/e-day-view.c:612 calendar/gui/e-week-view.c:348
+#: calendar/gui/print.c:768
msgid "am"
msgstr "����"
#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:612 calendar/gui/e-week-view.c:348
-#: calendar/gui/print.c:771
+#: calendar/gui/e-day-view.c:615 calendar/gui/e-week-view.c:351
+#: calendar/gui/print.c:770
msgid "pm"
msgstr "���"
-#: calendar/gui/e-day-view.c:3425 calendar/gui/e-week-view.c:3278
+#: calendar/gui/e-day-view.c:3449 calendar/gui/e-week-view.c:3377
msgid "New All Day _Event"
msgstr "�����������٥��"
-#: calendar/gui/e-day-view.c:3435 calendar/gui/e-week-view.c:3288
+#: calendar/gui/e-day-view.c:3459 calendar/gui/e-week-view.c:3387
#: ui/evolution-calendar.xml.h:17
msgid "Go to _Today"
msgstr "�����ذ�ư(_T)"
-#: calendar/gui/e-day-view.c:3437 calendar/gui/e-week-view.c:3290
+#: calendar/gui/e-day-view.c:3461 calendar/gui/e-week-view.c:3389
msgid "_Go to Date..."
msgstr "�������ذ�ư(_G)..."
-#: calendar/gui/e-day-view.c:3446 calendar/gui/e-week-view.c:3298
+#: calendar/gui/e-day-view.c:3470 calendar/gui/e-week-view.c:3397
msgid "_Delete this Appointment"
msgstr "���Υ��ݥ���Ȥ���(_D)"
-#: calendar/gui/e-day-view.c:3465 calendar/gui/e-week-view.c:3323
+#: calendar/gui/e-day-view.c:3489 calendar/gui/e-week-view.c:3422
msgid "Make this Occurrence _Movable"
msgstr "���ν�������ư�ˤ���(_M)"
-#: calendar/gui/e-day-view.c:3467 calendar/gui/e-week-view.c:3325
+#: calendar/gui/e-day-view.c:3491 calendar/gui/e-week-view.c:3424
msgid "Delete this _Occurrence"
msgstr "����������(_O)"
-#: calendar/gui/e-day-view.c:3469 calendar/gui/e-week-view.c:3327
+#: calendar/gui/e-day-view.c:3493 calendar/gui/e-week-view.c:3426
msgid "Delete _All Occurrences"
msgstr "���٤Ƥν��������(_A)"
-#: calendar/gui/e-itip-control.c:469
+#: calendar/gui/e-itip-control.c:524
msgid "Meeting begins: <b>"
msgstr ""
-#: calendar/gui/e-itip-control.c:474
+#: calendar/gui/e-itip-control.c:529
msgid "Task begins: <b>"
msgstr ""
-#: calendar/gui/e-itip-control.c:479
+#: calendar/gui/e-itip-control.c:534
msgid "Free/Busy info begins: <b>"
msgstr "����/¿˻ ���󳫻�: <b>"
-#: calendar/gui/e-itip-control.c:483
+#: calendar/gui/e-itip-control.c:538
msgid "Begins: <b>"
msgstr "����: <b>"
+#: calendar/gui/e-itip-control.c:550
+#, fuzzy
+msgid "Meeting ends: <b>"
+msgstr "��Ľ�λ����(_E):"
+
+#: calendar/gui/e-itip-control.c:553
+#, fuzzy
+msgid "Free/Busy info ends: <b>"
+msgstr "����/¿˻ ���󳫻�: <b>"
+
+#: calendar/gui/e-itip-control.c:557
+#, fuzzy
+msgid "Ends: <b>"
+msgstr "����: <b>"
+
+#: calendar/gui/e-itip-control.c:571
+#, fuzzy
+msgid "Task Completed: <b>"
+msgstr " (��� "
+
+#: calendar/gui/e-itip-control.c:581
+msgid "Task Due: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:618 calendar/gui/e-itip-control.c:667
+#, fuzzy
+msgid "iCalendar Information"
+msgstr "����������(_C):"
+
+#. Title
+#: calendar/gui/e-itip-control.c:633
+#, fuzzy
+msgid "iCalendar Error"
+msgstr "������"
+
+#: calendar/gui/e-itip-control.c:698 calendar/gui/e-itip-control.c:714
+#, fuzzy
+msgid "An unknown person"
+msgstr "������������"
+
#. Describe what the user can do
-#: calendar/gui/e-itip-control.c:677
+#: calendar/gui/e-itip-control.c:721
msgid ""
"<br> Please review the following information, and then select an action from "
"the menu below."
msgstr ""
-#: calendar/gui/e-itip-control.c:692
-#, c-format
-msgid "<b>Summary:</b> %s<br><br>"
-msgstr "<b>���ޥ�:</b> %s<br><br>"
-
-#: calendar/gui/e-itip-control.c:692
+#: calendar/gui/e-itip-control.c:737
msgid "<i>None</i>"
msgstr "<i>�ʤ�</i>"
-#: calendar/gui/e-itip-control.c:702
-#, c-format
-msgid "<b>Description:</b> %s"
-msgstr "<b>����:</b> %s"
+#: calendar/gui/e-itip-control.c:778 calendar/gui/e-itip-control.c:794
+#: calendar/gui/e-itip-control.c:810 calendar/gui/e-itip-control.c:823
+#: calendar/gui/e-itip-control.c:837 calendar/gui/e-itip-control.c:851
+#, fuzzy
+msgid "Choose an action:"
+msgstr "��������������"
-#: calendar/gui/e-itip-control.c:737
+#: calendar/gui/e-itip-control.c:779
+#, fuzzy
+msgid "Update"
+msgstr "�������򹹿�"
+
+#: calendar/gui/e-itip-control.c:780 calendar/gui/e-itip-control.c:799
+#: calendar/gui/e-itip-control.c:812 calendar/gui/e-itip-control.c:825
+#: calendar/gui/e-itip-control.c:839 calendar/gui/e-itip-control.c:853
+#: shell/e-shell.c:1884 widgets/misc/e-cell-date-edit.c:254
+msgid "OK"
+msgstr "OK"
+
+#: calendar/gui/e-itip-control.c:795
+#, fuzzy
+msgid "Accept"
+msgstr "��������"
+
+#: calendar/gui/e-itip-control.c:796
+#, fuzzy
+msgid "Tentatively accept"
+msgstr "����"
+
+#: calendar/gui/e-itip-control.c:797
+#, fuzzy
+msgid "Decline"
+msgstr "���ष��"
+
+#: calendar/gui/e-itip-control.c:811
+#, fuzzy
+msgid "Send Free/Busy Information"
+msgstr "����/¿˻ ����"
+
+#: calendar/gui/e-itip-control.c:824
+msgid "Update respondent status"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:838
+#, fuzzy
+msgid "Send Latest Information"
+msgstr "����������"
+
+#: calendar/gui/e-itip-control.c:852 ui/evolution-mail-global.xml.h:1
+msgid "Cancel"
+msgstr "����󥻥�"
+
+#: calendar/gui/e-itip-control.c:867
#, c-format
msgid "<b>%s</b> has published meeting information."
msgstr "<b>%s</b> �ϸ������줿��ľ���Ǥ�"
-#: calendar/gui/e-itip-control.c:738
+#: calendar/gui/e-itip-control.c:868
msgid "Meeting Information"
msgstr "��ľ���"
-#: calendar/gui/e-itip-control.c:742
+#: calendar/gui/e-itip-control.c:872
#, c-format
msgid "<b>%s</b> requests your presence at a meeting."
msgstr ""
-#: calendar/gui/e-itip-control.c:743
+#: calendar/gui/e-itip-control.c:873
msgid "Meeting Proposal"
msgstr "��Ĥ����"
-#: calendar/gui/e-itip-control.c:747
+#: calendar/gui/e-itip-control.c:877
#, c-format
msgid "<b>%s</b> wishes to add to an existing meeting."
msgstr ""
-#: calendar/gui/e-itip-control.c:748
+#: calendar/gui/e-itip-control.c:878
msgid "Meeting Update"
msgstr "�����"
-#: calendar/gui/e-itip-control.c:752
+#: calendar/gui/e-itip-control.c:882
#, c-format
msgid "<b>%s</b> wishes to receive the latest meeting information."
msgstr ""
-#: calendar/gui/e-itip-control.c:753
+#: calendar/gui/e-itip-control.c:883
msgid "Meeting Update Request"
msgstr "��Ĥι����׵�"
-#: calendar/gui/e-itip-control.c:757
+#: calendar/gui/e-itip-control.c:887
#, c-format
msgid "<b>%s</b> has replied to a meeting request."
msgstr "<b>%s</b> �ϲ�Ĥ��׵���������ޤ���"
-#: calendar/gui/e-itip-control.c:758
+#: calendar/gui/e-itip-control.c:888
msgid "Meeting Reply"
msgstr "��Ĥ˴ؤ�������"
-#: calendar/gui/e-itip-control.c:762
+#: calendar/gui/e-itip-control.c:892
#, c-format
msgid "<b>%s</b> has cancelled a meeting."
msgstr "<b>%s</b> �ϲ�Ĥ򥭥�󥻥뤷�ޤ���"
-#: calendar/gui/e-itip-control.c:763
+#: calendar/gui/e-itip-control.c:893
msgid "Meeting Cancellation"
msgstr "��Ĥ򥭥�󥻥�"
-#: calendar/gui/e-itip-control.c:767 calendar/gui/e-itip-control.c:815
-#: calendar/gui/e-itip-control.c:848
+#: calendar/gui/e-itip-control.c:897 calendar/gui/e-itip-control.c:947
+#: calendar/gui/e-itip-control.c:982
#, c-format
msgid "<b>%s</b> has sent an unintelligible message."
msgstr ""
-#: calendar/gui/e-itip-control.c:768
+#: calendar/gui/e-itip-control.c:898
msgid "Bad Meeting Message"
msgstr "�����ʲ�ĥ�å�����"
-#: calendar/gui/e-itip-control.c:785
+#: calendar/gui/e-itip-control.c:917
#, c-format
msgid "<b>%s</b> has published task information."
msgstr ""
-#: calendar/gui/e-itip-control.c:786
+#: calendar/gui/e-itip-control.c:918
msgid "Task Information"
msgstr "����������"
-#: calendar/gui/e-itip-control.c:790
+#: calendar/gui/e-itip-control.c:922
#, c-format
msgid "<b>%s</b> requests you perform a task."
msgstr ""
-#: calendar/gui/e-itip-control.c:791
+#: calendar/gui/e-itip-control.c:923
msgid "Task Proposal"
msgstr "�����������"
-#: calendar/gui/e-itip-control.c:795
+#: calendar/gui/e-itip-control.c:927
#, c-format
msgid "<b>%s</b> wishes to add to an existing task."
msgstr ""
-#: calendar/gui/e-itip-control.c:796
+#: calendar/gui/e-itip-control.c:928
msgid "Task Update"
msgstr "�������򹹿�"
-#: calendar/gui/e-itip-control.c:800
+#: calendar/gui/e-itip-control.c:932
#, c-format
msgid "<b>%s</b> wishes to receive the latest task information."
msgstr ""
-#: calendar/gui/e-itip-control.c:801
+#: calendar/gui/e-itip-control.c:933
msgid "Task Update Request"
msgstr "�������ι����׵�"
-#: calendar/gui/e-itip-control.c:805
+#: calendar/gui/e-itip-control.c:937
#, c-format
msgid "<b>%s</b> has replied to a task assignment."
msgstr "<b>%s</b> �ϥ������γ�����Ƥ��������ޤ���"
-#: calendar/gui/e-itip-control.c:806
+#: calendar/gui/e-itip-control.c:938
msgid "Task Reply"
msgstr "�������˴ؤ�������"
-#: calendar/gui/e-itip-control.c:810
+#: calendar/gui/e-itip-control.c:942
#, c-format
msgid "<b>%s</b> has cancelled a task."
msgstr "<b>%s</b> �ϥ������򥭥�󥻥뤷�ޤ���"
-#: calendar/gui/e-itip-control.c:811
+#: calendar/gui/e-itip-control.c:943
msgid "Task Cancellation"
msgstr "�������򥭥�󥻥�"
-#: calendar/gui/e-itip-control.c:816
+#: calendar/gui/e-itip-control.c:948
msgid "Bad Task Message"
msgstr "�����ʥ�������å�����"
-#: calendar/gui/e-itip-control.c:833
+#: calendar/gui/e-itip-control.c:967
#, c-format
msgid "<b>%s</b> has published free/busy information."
msgstr "<b>%s</b> �϶���/¿˻ �����������ޤ���"
-#: calendar/gui/e-itip-control.c:834
+#: calendar/gui/e-itip-control.c:968
msgid "Free/Busy Information"
msgstr "����/¿˻ ����"
-#: calendar/gui/e-itip-control.c:838
+#: calendar/gui/e-itip-control.c:972
#, c-format
msgid "<b>%s</b> requests your free/busy information."
msgstr "<b>%s</b> �� ���ʤ��ζ���/¿˻ ������׵ᤷ�ޤ���"
-#: calendar/gui/e-itip-control.c:839
+#: calendar/gui/e-itip-control.c:973
msgid "Free/Busy Request"
msgstr "����/¿˻ ���׵�"
-#: calendar/gui/e-itip-control.c:843
+#: calendar/gui/e-itip-control.c:977
#, c-format
msgid "<b>%s</b> has replied to a free/busy request."
msgstr "<b>%s</b> �� ���ʤ��ζ���/¿˻ ����˴ؤ����������ޤ���"
-#: calendar/gui/e-itip-control.c:844
+#: calendar/gui/e-itip-control.c:978
msgid "Free/Busy Reply"
msgstr "����/¿˻ ���ֿ�"
-#: calendar/gui/e-itip-control.c:849
+#: calendar/gui/e-itip-control.c:983
msgid "Bad Free/Busy Message"
msgstr "������ ����/¿˻ ��å�����"
-#: calendar/gui/e-itip-control.c:917
+#: calendar/gui/e-itip-control.c:1052
msgid "The message does not appear to be properly formed"
msgstr "���Υ�å������������������ǤϤ���ޤ���"
-#: calendar/gui/e-itip-control.c:936
+#: calendar/gui/e-itip-control.c:1071
msgid "The message contains only unsupported requests."
msgstr "���Υ�å�������̤�б����׵��ޤ�Ǥ��ޤ�"
-#: calendar/gui/e-itip-control.c:964 calendar/gui/e-itip-control.c:970
+#: calendar/gui/e-itip-control.c:1099 calendar/gui/e-itip-control.c:1105
msgid "The attachment does not contain a valid calendar message"
msgstr ""
-#: calendar/gui/e-itip-control.c:995
+#: calendar/gui/e-itip-control.c:1130
msgid "The attachment has no viewable calendar items"
msgstr ""
-#: calendar/gui/e-itip-control.c:1094
+#: calendar/gui/e-itip-control.c:1229
msgid "Calendar file could not be updated!\n"
msgstr "���������ե�����Ϲ����Ǥ��ޤ���Ǥ���!\n"
-#: calendar/gui/e-itip-control.c:1096
+#: calendar/gui/e-itip-control.c:1231
msgid "Update complete\n"
msgstr "������λ\n"
-#: calendar/gui/e-itip-control.c:1141
+#: calendar/gui/e-itip-control.c:1276
msgid "Attendee status could not be updated because of an invalid status!\n"
msgstr ""
-#: calendar/gui/e-itip-control.c:1149
+#: calendar/gui/e-itip-control.c:1284
msgid "Attendee status ould not be updated!\n"
msgstr ""
-#: calendar/gui/e-itip-control.c:1151
+#: calendar/gui/e-itip-control.c:1286
msgid "Attendee status updated\n"
msgstr ""
-#: calendar/gui/e-itip-control.c:1153
+#: calendar/gui/e-itip-control.c:1288
msgid "Attendee status can not be updated because the item no longer exists"
msgstr ""
-#: calendar/gui/e-itip-control.c:1181
+#: calendar/gui/e-itip-control.c:1316
msgid "I couldn't remove the item from your calendar file!\n"
msgstr "��Ϥ��ʤ��Υ������ե����뤫�餽�Υ����ƥ�����Ǥ��ޤ���Ǥ���!\n"
-#: calendar/gui/e-itip-control.c:1183
+#: calendar/gui/e-itip-control.c:1318
msgid "Removal Complete"
msgstr "�����λ"
-#: calendar/gui/e-itip-control.c:1215 calendar/gui/e-itip-control.c:1249
+#: calendar/gui/e-itip-control.c:1350 calendar/gui/e-itip-control.c:1400
msgid "Item sent!\n"
msgstr "�����ƥ������!\n"
-#: calendar/gui/e-itip-control.c:1217 calendar/gui/e-itip-control.c:1253
+#: calendar/gui/e-itip-control.c:1352 calendar/gui/e-itip-control.c:1404
msgid "The item could not be sent!\n"
msgstr ""
-#: calendar/gui/e-itip-control.c:1417
+#: calendar/gui/e-itip-control.c:1568
msgid "Unable to find any of your identities in the attendees list!\n"
msgstr ""
@@ -4726,193 +4863,215 @@ msgstr "���"
msgid "date-start"
msgstr "������"
-#: calendar/gui/e-meeting-model.c:201 calendar/gui/e-meeting-model.c:218
-#: calendar/gui/e-meeting-model.c:502 calendar/gui/e-meeting-model.c:670
+#: calendar/gui/e-meeting-model.c:94
+msgid "Chair Persons"
+msgstr "��Ĺ"
+
+#: calendar/gui/e-meeting-model.c:95 calendar/gui/e-meeting-model.c:1504
+msgid "Required Participants"
+msgstr "ɬ�׻��ü�"
+
+#: calendar/gui/e-meeting-model.c:96
+msgid "Optional Participants"
+msgstr "Ǥ�ջ��ü�"
+
+#: calendar/gui/e-meeting-model.c:97
+msgid "Non-Participants"
+msgstr "�Ի��ü�"
+
+#: calendar/gui/e-meeting-model.c:231 calendar/gui/e-meeting-model.c:248
+#: calendar/gui/e-meeting-model.c:532 calendar/gui/e-meeting-model.c:744
msgid "Individual"
msgstr "�Ŀ�"
-#: calendar/gui/e-meeting-model.c:203 calendar/gui/e-meeting-model.c:220
-#: calendar/gui/e-meeting-model.c:671
+#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
+#: calendar/gui/e-meeting-model.c:745
msgid "Group"
msgstr "���롼��"
-#: calendar/gui/e-meeting-model.c:205 calendar/gui/e-meeting-model.c:222
-#: calendar/gui/e-meeting-model.c:672
+#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
+#: calendar/gui/e-meeting-model.c:746
msgid "Resource"
msgstr "�꥽����"
-#: calendar/gui/e-meeting-model.c:207 calendar/gui/e-meeting-model.c:224
-#: calendar/gui/e-meeting-model.c:673
+#: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
+#: calendar/gui/e-meeting-model.c:747
msgid "Room"
msgstr "����"
-#: calendar/gui/e-meeting-model.c:226 calendar/gui/e-meeting-model.c:261
-#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:674
-#: calendar/gui/e-meeting-model.c:690
-#: camel/providers/smtp/camel-smtp-transport.c:224
-#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:440
+#: calendar/gui/e-meeting-model.c:256 calendar/gui/e-meeting-model.c:291
+#: calendar/gui/e-meeting-model.c:356 calendar/gui/e-meeting-model.c:748
+#: calendar/gui/e-meeting-model.c:764
+#: camel/providers/smtp/camel-smtp-transport.c:222
+#: widgets/misc/e-charset-picker.c:57 widgets/misc/e-charset-picker.c:439
msgid "Unknown"
msgstr "̤��"
-#: calendar/gui/e-meeting-model.c:236 calendar/gui/e-meeting-model.c:253
-#: calendar/gui/e-meeting-model.c:686
+#: calendar/gui/e-meeting-model.c:266 calendar/gui/e-meeting-model.c:283
+#: calendar/gui/e-meeting-model.c:760
msgid "Chair"
msgstr "��Ĺ"
-#: calendar/gui/e-meeting-model.c:238 calendar/gui/e-meeting-model.c:255
-#: calendar/gui/e-meeting-model.c:504 calendar/gui/e-meeting-model.c:687
+#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
+#: calendar/gui/e-meeting-model.c:534 calendar/gui/e-meeting-model.c:761
msgid "Required Participant"
msgstr "���üԤ�ɬ��"
-#: calendar/gui/e-meeting-model.c:240 calendar/gui/e-meeting-model.c:257
-#: calendar/gui/e-meeting-model.c:688
+#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
+#: calendar/gui/e-meeting-model.c:762
msgid "Optional Participant"
msgstr "Ǥ�ջ��ü�"
-#: calendar/gui/e-meeting-model.c:242 calendar/gui/e-meeting-model.c:259
-#: calendar/gui/e-meeting-model.c:689
+#: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-meeting-model.c:763
msgid "Non-Participant"
msgstr "�Ի��ü�"
-#: calendar/gui/e-meeting-model.c:288 calendar/gui/e-meeting-model.c:311
-#: calendar/gui/e-meeting-model.c:512 calendar/gui/e-meeting-model.c:715
+#: calendar/gui/e-meeting-model.c:318 calendar/gui/e-meeting-model.c:341
+#: calendar/gui/e-meeting-model.c:542 calendar/gui/e-meeting-model.c:789
msgid "Needs Action"
msgstr "ư�ɬ��"
-#: calendar/gui/e-meeting-model.c:290 calendar/gui/e-meeting-model.c:313
-#: calendar/gui/e-meeting-model.c:716
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+#: calendar/gui/e-meeting-model.c:790
msgid "Accepted"
msgstr "��������"
-#: calendar/gui/e-meeting-model.c:292 calendar/gui/e-meeting-model.c:315
-#: calendar/gui/e-meeting-model.c:717
+#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:345
+#: calendar/gui/e-meeting-model.c:791
msgid "Declined"
msgstr "���ष��"
-#: calendar/gui/e-meeting-model.c:294 calendar/gui/e-meeting-model.c:317
-#: calendar/gui/e-meeting-model.c:718 calendar/gui/e-meeting-time-sel.c:392
+#: calendar/gui/e-meeting-model.c:324 calendar/gui/e-meeting-model.c:347
+#: calendar/gui/e-meeting-model.c:792 calendar/gui/e-meeting-time-sel.c:408
msgid "Tentative"
msgstr "����"
-#: calendar/gui/e-meeting-model.c:296 calendar/gui/e-meeting-model.c:319
-#: calendar/gui/e-meeting-model.c:719
+#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
+#: calendar/gui/e-meeting-model.c:793
msgid "Delegated"
msgstr "��Ǥ����"
-#: calendar/gui/e-meeting-model.c:300 calendar/gui/e-meeting-model.c:323
+#: calendar/gui/e-meeting-model.c:330 calendar/gui/e-meeting-model.c:353
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:472
-#: calendar/gui/e-meeting-time-sel.c:1937
+#: calendar/gui/e-meeting-time-sel.c:2023
msgid "%A, %B %d, %Y"
msgstr "%Yǯ %m�� %d�� %A"
#. This is a strftime() format string %a = abbreviated weekday
#. name, %m = month number, %d = month day, %Y = full year.
#: calendar/gui/e-meeting-time-sel-item.c:476
-#: calendar/gui/e-meeting-time-sel.c:1965 e-util/e-time-utils.c:186
-#: e-util/e-time-utils.c:345
+#: calendar/gui/e-meeting-time-sel.c:2053 e-util/e-time-utils.c:186
+#: e-util/e-time-utils.c:276 e-util/e-time-utils.c:348
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:480 e-util/e-time-utils.c:221
-#: e-util/e-time-utils.c:276 widgets/misc/e-dateedit.c:1577
+#: e-util/e-time-utils.c:279 widgets/misc/e-dateedit.c:1583
msgid "%m/%d/%Y"
msgstr "%Y/%m/%d"
-#: calendar/gui/e-meeting-time-sel.c:394
+#: calendar/gui/e-meeting-time-sel.c:410
msgid "Out of Office"
msgstr "���ե����γ�"
-#: calendar/gui/e-meeting-time-sel.c:395
+#: calendar/gui/e-meeting-time-sel.c:411
msgid "No Information"
msgstr "����ʤ�"
-#: calendar/gui/e-meeting-time-sel.c:411
-msgid "_Invite Others..."
-msgstr "¾�ξ���(_I)..."
-
-#: calendar/gui/e-meeting-time-sel.c:431
+#: calendar/gui/e-meeting-time-sel.c:447
msgid "_Options"
msgstr "���ץ����(_O)"
-#: calendar/gui/e-meeting-time-sel.c:448
+#: calendar/gui/e-meeting-time-sel.c:464
msgid "Show _Only Working Hours"
msgstr "�Ż���λ��֤���ɽ��(_O)"
-#: calendar/gui/e-meeting-time-sel.c:461
+#: calendar/gui/e-meeting-time-sel.c:477
msgid "Show _Zoomed Out"
msgstr "�̾�����ɽ��(_Z)"
-#: calendar/gui/e-meeting-time-sel.c:479
+#: calendar/gui/e-meeting-time-sel.c:495
msgid "_Update Free/Busy"
msgstr "�ե꡼/�ӥ��� �ι���(_U)"
-#: calendar/gui/e-meeting-time-sel.c:497
+#: calendar/gui/e-meeting-time-sel.c:513
msgid "_<<"
msgstr "<<(_<)"
-#: calendar/gui/e-meeting-time-sel.c:514
+#: calendar/gui/e-meeting-time-sel.c:530
msgid "_Autopick"
msgstr "��ư�ԥå����å�(_A)"
-#: calendar/gui/e-meeting-time-sel.c:528
+#: calendar/gui/e-meeting-time-sel.c:544
msgid ">_>"
msgstr ">>(_>)"
-#: calendar/gui/e-meeting-time-sel.c:545
+#: calendar/gui/e-meeting-time-sel.c:561
msgid "_All People and Resources"
msgstr "���٤Ƥο͡��ȥ꥽����(_A)"
-#: calendar/gui/e-meeting-time-sel.c:558
+#: calendar/gui/e-meeting-time-sel.c:574
msgid "All _People and One Resource"
msgstr "���٤Ƥο͡��ȤҤȤĤΥ꥽����(_P)"
-#: calendar/gui/e-meeting-time-sel.c:571
+#: calendar/gui/e-meeting-time-sel.c:587
msgid "_Required People"
msgstr "�͡���ɬ��(_R)"
-#: calendar/gui/e-meeting-time-sel.c:584
+#: calendar/gui/e-meeting-time-sel.c:600
msgid "Required People and _One Resource"
msgstr "�͡��ȤҤȤĤΥ꥽������ɬ��(_O)"
-#: calendar/gui/e-meeting-time-sel.c:607
+#: calendar/gui/e-meeting-time-sel.c:623
msgid "Meeting _start time:"
msgstr "��ij��ϻ���(_S):"
-#: calendar/gui/e-meeting-time-sel.c:626
+#: calendar/gui/e-meeting-time-sel.c:642
msgid "Meeting _end time:"
msgstr "��Ľ�λ����(_E):"
-#: calendar/gui/e-tasks.c:349
+#: calendar/gui/e-tasks.c:328
+#, fuzzy, c-format
+msgid "Opening tasks at %s"
+msgstr "��¸���줿 %s �򥪡��ץ���"
+
+#: calendar/gui/e-tasks.c:355
#, c-format
msgid "Could not load the tasks in `%s'"
msgstr "'%s' �Υ��������ɤ߹��ळ�Ȥ�����ޤ���Ǥ���"
-#: calendar/gui/e-tasks.c:361
+#: calendar/gui/e-tasks.c:367
#, c-format
msgid "The method required to load `%s' is not supported"
msgstr "'%s' ���ɤ߹��ळ�Ȥ��׵ᤵ���᥽�åɤϥ��ݡ��Ȥ��Ƥ��ޤ���"
-#: calendar/gui/e-week-view.c:3276 calendar/gui/e-week-view.c:3314
+#: calendar/gui/e-week-view.c:3375 calendar/gui/e-week-view.c:3413
msgid "New _Appointment..."
msgstr "�������ݥ����(_A)..."
-#: calendar/gui/gnome-cal.c:1318
+#: calendar/gui/gnome-cal.c:1499
#, c-format
msgid "Could not open the folder in `%s'"
msgstr "`%s' �Υե�����򳫤����Ȥ�����ޤ���Ǥ���"
-#: calendar/gui/gnome-cal.c:1329
+#: calendar/gui/gnome-cal.c:1510
#, c-format
msgid "The method required to open `%s' is not supported"
msgstr "'%s' �򳫤����Ȥ��׵ᤵ���᥽�åɤϥ��ݡ��Ȥ��Ƥ��ޤ���"
+#: calendar/gui/gnome-cal.c:1865
+#, fuzzy, c-format
+msgid "Opening calendar at %s"
+msgstr "�ե���� %s �򥪡��ץ���"
+
#: calendar/gui/goto-dialog.glade.h:1
msgid "April"
msgstr "4 ��"
@@ -4969,226 +5128,274 @@ msgstr "10 ��"
msgid "September"
msgstr "9 ��"
-#: calendar/gui/itip-utils.c:253
+#: calendar/gui/itip-utils.c:243
msgid "Atleast one attendee is necessary"
msgstr ""
-#: calendar/gui/itip-utils.c:283
+#: calendar/gui/itip-utils.c:274
msgid "An organizer must be set."
msgstr "��żԤ�ɬ�ܤǤ�"
-#: calendar/gui/main.c:92
+#: calendar/gui/itip-utils.c:570
+msgid "You must be an attendee of the event."
+msgstr ""
+
+#: calendar/gui/main.c:91
msgid "Could not create the component editor factory"
msgstr "���ǥ����ե����ȥꥳ��ݡ��ͥ�Ȥ��������ޤ���Ǥ���"
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
msgid "1st"
msgstr "1 ��"
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
msgid "2nd"
msgstr "2 ��"
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
msgid "3rd"
msgstr "3 ��"
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
msgid "4th"
msgstr "4 ��"
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
msgid "5th"
msgstr "5 ��"
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
msgid "6th"
msgstr "6 ��"
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
msgid "7th"
msgstr "7 ��"
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
msgid "8th"
msgstr "8 ��"
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
msgid "9th"
msgstr "9 ��"
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
msgid "10th"
msgstr "10 ��"
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
msgid "11th"
msgstr "11 ��"
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
msgid "12th"
msgstr "12 ��"
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
msgid "13th"
msgstr "13 ��"
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
msgid "14th"
msgstr "14 ��"
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
msgid "15th"
msgstr "15 ��"
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
msgid "16th"
msgstr "16 ��"
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
msgid "17th"
msgstr "17 ��"
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
msgid "18th"
msgstr "18 ��"
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
msgid "19th"
msgstr "19 ��"
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
msgid "20th"
msgstr "20 ��"
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
msgid "21st"
msgstr "21 ��"
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
msgid "22nd"
msgstr "22 ��"
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
msgid "23rd"
msgstr "23 ��"
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
msgid "24th"
msgstr "24 ��"
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
msgid "25th"
msgstr "25 ��"
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
msgid "26th"
msgstr "26 ��"
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
msgid "27th"
msgstr "27 ��"
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
msgid "28th"
msgstr "28 ��"
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
msgid "29th"
msgstr "29 ��"
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
msgid "30th"
msgstr "30 ��"
-#: calendar/gui/print.c:432
+#: calendar/gui/print.c:431
msgid "31st"
msgstr "31 ��"
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
msgid "Su"
msgstr "��"
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
msgid "Mo"
msgstr "��"
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
msgid "Tu"
msgstr "��"
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
msgid "We"
msgstr "��"
-#: calendar/gui/print.c:500
+#: calendar/gui/print.c:499
msgid "Th"
msgstr "��"
-#: calendar/gui/print.c:500
+#: calendar/gui/print.c:499
msgid "Fr"
msgstr "��"
-#: calendar/gui/print.c:500
+#: calendar/gui/print.c:499
msgid "Sa"
msgstr "��"
#. Day
-#: calendar/gui/print.c:1831
+#: calendar/gui/print.c:1819
msgid "Selected day (%a %b %d %Y)"
msgstr "���򤷤����� [%Y/%m/%d (%a)]"
-#: calendar/gui/print.c:1850 calendar/gui/print.c:1854
+#: calendar/gui/print.c:1844 calendar/gui/print.c:1848
msgid "%a %b %d"
msgstr "%m/%d (%a)"
-#: calendar/gui/print.c:1851
+#: calendar/gui/print.c:1845
msgid "%a %d %Y"
msgstr "%Y/%d (%a)"
-#: calendar/gui/print.c:1855 calendar/gui/print.c:1857
-#: calendar/gui/print.c:1858
+#: calendar/gui/print.c:1849 calendar/gui/print.c:1851
+#: calendar/gui/print.c:1852
msgid "%a %b %d %Y"
msgstr "%Y/%b/%d (%a)"
-#: calendar/gui/print.c:1862
+#: calendar/gui/print.c:1856
#, c-format
msgid "Selected week (%s - %s)"
msgstr "���򤷤��� (%s - %s)"
#. Month
-#: calendar/gui/print.c:1870
+#: calendar/gui/print.c:1864
msgid "Selected month (%b %Y)"
msgstr "���򤷤��� (%Y/%b)"
#. Year
-#: calendar/gui/print.c:1877
+#: calendar/gui/print.c:1871
msgid "Selected year (%Y)"
msgstr "���򤷤�ǯ (%Y)"
-#: calendar/gui/print.c:2221
+#: calendar/gui/print.c:2205
+#, fuzzy
+msgid "Task"
+msgstr "������(_T)"
+
+#: calendar/gui/print.c:2262
+#, fuzzy, c-format
+msgid "Status: %s"
+msgstr "���ơ�����(_S):"
+
+#: calendar/gui/print.c:2280
+#, fuzzy, c-format
+msgid "Priority: %s"
+msgstr "ͥ����(_P):"
+
+#: calendar/gui/print.c:2294
+#, fuzzy, c-format
+msgid "Percent Complete: %i"
+msgstr "���:"
+
+#: calendar/gui/print.c:2306
+#, fuzzy, c-format
+msgid "URL: %s"
+msgstr "URL:"
+
+#: calendar/gui/print.c:2320
+#, fuzzy, c-format
+msgid "Categories: %s"
+msgstr ""
+"\n"
+"��̳ʬ��: "
+
+#: calendar/gui/print.c:2331
+#, fuzzy
+msgid "Contacts: "
+msgstr "Ϣ����(_N):"
+
+#: calendar/gui/print.c:2386
msgid "Print Calendar"
msgstr "���������"
-#: calendar/gui/print.c:2312 calendar/gui/print.c:2404
-#: mail/mail-callbacks.c:2164 my-evolution/e-summary.c:607
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:64
+#: calendar/gui/print.c:2477 calendar/gui/print.c:2569
+#: mail/mail-callbacks.c:2337 my-evolution/e-summary.c:614
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:67
msgid "Print Preview"
msgstr "�����ץ�ӥ塼"
-#: calendar/gui/print.c:2341
+#: calendar/gui/print.c:2506
msgid "Print Item"
msgstr "�����ƥ�����"
-#: calendar/gui/print.c:2422
+#: calendar/gui/print.c:2587
msgid "Print Setup"
msgstr "�ץ�󥿤�����"
-#: calendar/gui/tasks-control.c:127
+#: calendar/gui/tasks-control.c:126
msgid "The URI of the tasks folder to display"
msgstr "�������ե������ɽ������ URI"
-#: calendar/gui/tasks-migrate.c:106
+#: calendar/gui/tasks-control-factory.c:75
+#, fuzzy
+msgid ""
+"Could not create the tasks view. Please check your ORBit and OAF setup."
+msgstr ""
+"�������ӥ塼���������ޤ���Ǥ���. ORBit��OAF�����������å����Ƥ�������"
+
+#: calendar/gui/tasks-migrate.c:105
msgid ""
"Evolution has taken the tasks that were in your calendar folder and "
"automatically migrated them to the new tasks folder."
@@ -5196,7 +5403,7 @@ msgstr ""
"Evolution �ϥ������ե�����Υ������������, ��ưŪ�˿������������ե������"
"��ư���ޤ�"
-#: calendar/gui/tasks-migrate.c:109
+#: calendar/gui/tasks-migrate.c:108
msgid ""
"Evolution has tried to take the tasks that were in your calendar folder and "
"migrate them to the new tasks folder.\n"
@@ -5208,7 +5415,7 @@ msgstr ""
"������, �����Ĥ��Υ������ϰ�ư���뤳�Ȥ�����ޤ���Ǥ���, �Ǥ��ΤǤ��Υץ���"
"���Ϥ��θ�Ƥӻ���Ǥ��礦"
-#: calendar/gui/tasks-migrate.c:121
+#: calendar/gui/tasks-migrate.c:120
#, c-format
msgid ""
"Could not open `%s'; no items from the calendar folder will be migrated to "
@@ -5217,7 +5424,7 @@ msgstr ""
"`%s' �򳫤����Ȥ�����ޤ���Ǥ���; �������ե�������饿�����ե�����ذ�ư��"
"�륢���ƥब����ޤ���"
-#: calendar/gui/tasks-migrate.c:134
+#: calendar/gui/tasks-migrate.c:133
#, c-format
msgid ""
"The method required to load `%s' is not supported; no items from the "
@@ -5226,111 +5433,111 @@ msgstr ""
"`%s' ���ɤ߹����׵��夲���᥽�åɤϥ��ݡ��Ȥ��Ƥ��ޤ���; �������ե������"
"�饿�����ե�����ذ�ư���륢���ƥब����ޤ���"
-#: calendar/gui/weekday-picker.c:315 calendar/gui/weekday-picker.c:410
+#: calendar/gui/weekday-picker.c:314 calendar/gui/weekday-picker.c:409
msgid "SMTWTFS"
msgstr "SMTWTFS"
-#: calendar/pcs/query.c:231
+#: calendar/pcs/query.c:234
msgid "time-now expects 0 arguments"
msgstr ""
-#: calendar/pcs/query.c:255
+#: calendar/pcs/query.c:258
msgid "make-time expects 1 argument"
msgstr ""
-#: calendar/pcs/query.c:260
+#: calendar/pcs/query.c:263
msgid "make-time expects argument 1 to be a string"
msgstr ""
-#: calendar/pcs/query.c:268
+#: calendar/pcs/query.c:271
msgid "make-time argument 1 must be an ISO 8601 date/time string"
msgstr ""
-#: calendar/pcs/query.c:297
+#: calendar/pcs/query.c:300
msgid "time-add-day expects 2 arguments"
msgstr ""
-#: calendar/pcs/query.c:302
+#: calendar/pcs/query.c:305
msgid "time-add-day expects argument 1 to be a time_t"
msgstr ""
-#: calendar/pcs/query.c:309
+#: calendar/pcs/query.c:312
msgid "time-add-day expects argument 2 to be an integer"
msgstr ""
-#: calendar/pcs/query.c:336
+#: calendar/pcs/query.c:339
msgid "time-day-begin expects 1 argument"
msgstr ""
-#: calendar/pcs/query.c:341
+#: calendar/pcs/query.c:344
msgid "time-day-begin expects argument 1 to be a time_t"
msgstr ""
-#: calendar/pcs/query.c:368
+#: calendar/pcs/query.c:371
msgid "time-day-end expects 1 argument"
msgstr ""
-#: calendar/pcs/query.c:373
+#: calendar/pcs/query.c:376
msgid "time-day-end expects argument 1 to be a time_t"
msgstr ""
-#: calendar/pcs/query.c:409
+#: calendar/pcs/query.c:412
msgid "get-vtype expects 0 arguments"
msgstr ""
-#: calendar/pcs/query.c:505
+#: calendar/pcs/query.c:508
msgid "occur-in-time-range? expects 2 arguments"
msgstr ""
-#: calendar/pcs/query.c:510
+#: calendar/pcs/query.c:513
msgid "occur-in-time-range? expects argument 1 to be a time_t"
msgstr ""
-#: calendar/pcs/query.c:517
+#: calendar/pcs/query.c:520
msgid "occur-in-time-range? expects argument 2 to be a time_t"
msgstr ""
-#: calendar/pcs/query.c:647
+#: calendar/pcs/query.c:650
msgid "contains? expects 2 arguments"
msgstr ""
-#: calendar/pcs/query.c:652
+#: calendar/pcs/query.c:655
msgid "contains? expects argument 1 to be a string"
msgstr ""
-#: calendar/pcs/query.c:659
+#: calendar/pcs/query.c:662
msgid "contains? expects argument 2 to be a string"
msgstr ""
-#: calendar/pcs/query.c:676
+#: calendar/pcs/query.c:679
msgid ""
"contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
"\""
msgstr ""
-#: calendar/pcs/query.c:718
+#: calendar/pcs/query.c:721
msgid "has-categories? expects at least 1 argument"
msgstr ""
-#: calendar/pcs/query.c:730
+#: calendar/pcs/query.c:733
msgid ""
"has-categories? expects all arguments to be strings or one and only one "
"argument to be a boolean false (#f)"
msgstr ""
-#: calendar/pcs/query.c:818
+#: calendar/pcs/query.c:821
msgid "is-completed? expects 0 arguments"
msgstr ""
-#: calendar/pcs/query.c:863
+#: calendar/pcs/query.c:866
msgid "completed-before? expects 1 argument"
msgstr ""
-#: calendar/pcs/query.c:868
+#: calendar/pcs/query.c:871
msgid "completed-before? expects argument 1 to be a time_t"
msgstr ""
-#: calendar/pcs/query.c:1156
+#: calendar/pcs/query.c:1159
msgid "Evaluation of the search expression did not yield a boolean value"
msgstr ""
@@ -5354,7 +5561,7 @@ msgstr "��沽�Ϥ��ΰŹ�򥵥ݡ��Ȥ��Ƥ��ޤ���"
msgid "Decryption is not supported by this cipher"
msgstr "���沽�Ϥ��ΰŹ�򥵥ݡ��Ȥ��Ƥ��ޤ���"
-#: camel/camel-disco-diary.c:181
+#: camel/camel-disco-diary.c:180
#, c-format
msgid ""
"Could not write log entry: %s\n"
@@ -5362,7 +5569,7 @@ msgid ""
"reconnect to the network."
msgstr ""
-#: camel/camel-disco-diary.c:244
+#: camel/camel-disco-diary.c:243
#, c-format
msgid ""
"Could not open `%s':\n"
@@ -5370,89 +5577,89 @@ msgid ""
"Changes made to this folder will not be resynchronized."
msgstr ""
-#: camel/camel-disco-diary.c:278
+#: camel/camel-disco-diary.c:277
msgid "Resynchronizing with server"
msgstr ""
-#: camel/camel-disco-store.c:336
+#: camel/camel-disco-store.c:343
msgid "You must be working online to complete this operation"
msgstr "����ư���λ���뤿��˥���饤��Ǻ�Ȥ��ʤ���Фʤ�ޤ���"
-#: camel/camel-filter-driver.c:549 camel/camel-filter-driver.c:558
+#: camel/camel-filter-driver.c:551 camel/camel-filter-driver.c:560
msgid "Syncing folders"
msgstr "�ե������Ʊ����"
-#: camel/camel-filter-driver.c:659
+#: camel/camel-filter-driver.c:662
msgid "Unable to open spool folder"
msgstr "���ס���ե�����򳫤����Ȥ�����ޤ���"
-#: camel/camel-filter-driver.c:668
+#: camel/camel-filter-driver.c:671
msgid "Unable to process spool folder"
msgstr "���ס���ե������������뤳�Ȥ�����ޤ���"
-#: camel/camel-filter-driver.c:683
+#: camel/camel-filter-driver.c:686
#, c-format
msgid "Getting message %d (%d%%)"
msgstr "������ %d ������� (%d%%)"
-#: camel/camel-filter-driver.c:687 camel/camel-filter-driver.c:700
+#: camel/camel-filter-driver.c:690 camel/camel-filter-driver.c:703
#, c-format
msgid "Failed on message %d"
msgstr "��å����� %d �Ǽ��Ԥ��ޤ���"
-#: camel/camel-filter-driver.c:688
+#: camel/camel-filter-driver.c:691
msgid "Cannot open message"
msgstr "��å������򳫤����Ȥ�����ޤ���"
-#: camel/camel-filter-driver.c:714 camel/camel-filter-driver.c:829
+#: camel/camel-filter-driver.c:717 camel/camel-filter-driver.c:830
msgid "Syncing folder"
msgstr "�ե������Ʊ����"
-#: camel/camel-filter-driver.c:786
+#: camel/camel-filter-driver.c:787
#, c-format
msgid "Getting message %d of %d"
msgstr "������ %d / %d �������"
-#: camel/camel-filter-driver.c:791 camel/camel-filter-driver.c:809
+#: camel/camel-filter-driver.c:792 camel/camel-filter-driver.c:810
#, c-format
msgid "Failed at message %d of %d"
msgstr "��å����� %d / %d �ϼ��Ԥ��ޤ���"
-#: camel/camel-filter-driver.c:918
+#: camel/camel-filter-driver.c:919
#, c-format
msgid "Error parsing filter: %s: %s"
msgstr "�ե��륿�ι�ʸ������˥��顼: %s: %s"
-#: camel/camel-filter-driver.c:924
+#: camel/camel-filter-driver.c:925
#, c-format
msgid "Error executing filter: %s: %s"
msgstr "�ե��륿�¹���˥��顼: %s: %s"
-#: camel/camel-filter-search.c:493 camel/camel-filter-search.c:500
+#: camel/camel-filter-search.c:498 camel/camel-filter-search.c:505
#, c-format
msgid "Error executing filter search: %s: %s"
msgstr "�ե��륿�����¹���˥��顼: %s: %s"
-#: camel/camel-folder.c:478
+#: camel/camel-folder.c:471
#, c-format
msgid "Unsupported operation: append message: for %s"
msgstr ""
-#: camel/camel-folder.c:1047
+#: camel/camel-folder.c:1040
#, c-format
msgid "Unsupported operation: search by expression: for %s"
msgstr "̤�б������: ����ɽ���Ǥθ���: %s ��"
-#: camel/camel-folder.c:1087
+#: camel/camel-folder.c:1080
#, c-format
msgid "Unsupported operation: search by uids: for %s"
msgstr "̤�б������: uid �Ǥθ���: %s ��"
-#: camel/camel-folder.c:1266
+#: camel/camel-folder.c:1262
msgid "Moving messages"
msgstr "��å��������ư"
-#: camel/camel-folder-search.c:333
+#: camel/camel-folder-search.c:332
#, c-format
msgid ""
"Cannot parse search expression: %s:\n"
@@ -5461,7 +5668,7 @@ msgstr ""
"����ɽ���ι�ʸ����Ͻ���ޤ���: %s:\n"
"%s"
-#: camel/camel-folder-search.c:343
+#: camel/camel-folder-search.c:342
#, c-format
msgid ""
"Error executing search expression: %s:\n"
@@ -5470,7 +5677,7 @@ msgstr ""
"����ɽ���Ǥθ�����¹���˥��顼: %s:\n"
"%s"
-#: camel/camel-folder-search.c:560 camel/camel-folder-search.c:588
+#: camel/camel-folder-search.c:559 camel/camel-folder-search.c:587
msgid "(match-all) requires a single bool result"
msgstr ""
@@ -5479,195 +5686,195 @@ msgstr ""
msgid "Performing query on unknown header: %s"
msgstr "̤�ΤΥإå��ǥ������¹Ԥ��Ƥ��ޤ�: %s"
-#: camel/camel-folder-search.c:748 camel/camel-folder-search.c:792
+#: camel/camel-folder-search.c:750 camel/camel-folder-search.c:794
msgid "Invalid type in body-contains, expecting string"
msgstr "̵���ʼ��̤���ʸ�˴ޤޤ�Ƥ��ޤ�, ʸ������Ԥ��Ƥ��ޤ�"
-#: camel/camel-lock-client.c:110
+#: camel/camel-lock-client.c:111
#, c-format
msgid "Cannot build locking helper pipe: %s"
msgstr "���å��󥰥إ�ѡ��ѥ��פ������Ǥ��ޤ���Ǥ���: %s"
-#: camel/camel-lock-client.c:123
+#: camel/camel-lock-client.c:124
#, c-format
msgid "Cannot fork locking helper: %s"
msgstr "���å��󥰥إ�ѡ���ʬ�����뤳�Ȥ�����ޤ���: %s"
-#: camel/camel-lock-client.c:199 camel/camel-lock-client.c:222
+#: camel/camel-lock-client.c:202 camel/camel-lock-client.c:225
#, c-format
msgid "Could not lock '%s': protocol error with lock-helper"
msgstr ""
-#: camel/camel-lock-client.c:212
+#: camel/camel-lock-client.c:215
#, c-format
msgid "Could not lock '%s'"
msgstr "'%s' ����å�����ޤ���Ǥ���"
#. well, this is really only a programatic error
-#: camel/camel-lock.c:92 camel/camel-lock.c:111
+#: camel/camel-lock.c:91 camel/camel-lock.c:110
#, c-format
msgid "Could not create lock file for %s: %s"
msgstr "%s �Υ��å��ե����������Ǥ��ޤ���Ǥ���: %s"
-#: camel/camel-lock.c:151
+#: camel/camel-lock.c:150
#, c-format
msgid "Timed out trying to get lock file on %s. Try again later."
msgstr ""
"%s �Υ��å��ե�����������˥����ॢ���Ȥ��ޤ���. ��Ǥ��ľ���Ƥ�������"
-#: camel/camel-lock.c:205
+#: camel/camel-lock.c:204
#, c-format
msgid "Failed to get lock using fcntl(2): %s"
msgstr "fcntl(2)��Ȥä����å��˼��Ԥ��ޤ���: %s"
-#: camel/camel-lock.c:267
+#: camel/camel-lock.c:266
#, c-format
msgid "Failed to get lock using flock(2): %s"
msgstr "flock(2)��Ȥä����å��˼��Ԥ��ޤ���: %s"
-#: camel/camel-movemail.c:108
+#: camel/camel-movemail.c:107
#, c-format
msgid "Could not check mail file %s: %s"
msgstr "�᡼��ե����� %s ������å����뤳�Ȥ�����ޤ���Ǥ���: %s"
-#: camel/camel-movemail.c:122
+#: camel/camel-movemail.c:121
#, c-format
msgid "Could not open mail file %s: %s"
msgstr "�᡼��ե����� %s �򳫤����Ȥ�����ޤ���Ǥ���: %s"
-#: camel/camel-movemail.c:130
+#: camel/camel-movemail.c:129
#, c-format
msgid "Could not open temporary mail file %s: %s"
msgstr "�᡼��ե����� %s �Υƥ�ݥ��򳫤����Ȥ�����ޤ���Ǥ���: %s"
-#: camel/camel-movemail.c:159
+#: camel/camel-movemail.c:158
#, c-format
msgid "Failed to store mail in temp file %s: %s"
msgstr "��ȥե����� %s �إ᡼�����¸�˼��Ԥ��ޤ���: %s"
-#: camel/camel-movemail.c:189
+#: camel/camel-movemail.c:188
#, c-format
msgid "Could not create pipe: %s"
msgstr "�ѥ��פ������Ǥ��ޤ���Ǥ���: %s"
-#: camel/camel-movemail.c:201
+#: camel/camel-movemail.c:200
#, c-format
msgid "Could not fork: %s"
msgstr "fork ����ޤ���Ǥ���: %s"
-#: camel/camel-movemail.c:239
+#: camel/camel-movemail.c:238
#, c-format
msgid "Movemail program failed: %s"
msgstr "Movemail �ץ������ϼ��Ԥ��ޤ���: %s"
-#: camel/camel-movemail.c:240
+#: camel/camel-movemail.c:239
msgid "(Unknown error)"
msgstr "(̤�ΤΥ��顼)"
-#: camel/camel-movemail.c:263
+#: camel/camel-movemail.c:262
#, c-format
msgid "Error reading mail file: %s"
msgstr "�᡼��ե�������ɤ߹�����˥��顼: %s"
-#: camel/camel-movemail.c:274
+#: camel/camel-movemail.c:273
#, c-format
msgid "Error writing mail temp file: %s"
msgstr "�᡼���ȥե�����ν񤭹�����˥��顼: %s"
-#: camel/camel-movemail.c:467 camel/camel-movemail.c:534
+#: camel/camel-movemail.c:466 camel/camel-movemail.c:533
#, c-format
msgid "Error copying mail temp file: %s"
msgstr "�᡼���ȥե�����Υ��ԡ���˥��顼: %s"
-#: camel/camel-pgp-context.c:191
+#: camel/camel-pgp-context.c:194
#, c-format
msgid "Please enter your %s passphrase for %s"
msgstr "���ʤ��� %s �ѥ��ե졼�� ( %s ��) �����Ϥ��Ƥ�������"
-#: camel/camel-pgp-context.c:194
+#: camel/camel-pgp-context.c:197
#, c-format
msgid "Please enter your %s passphrase"
msgstr "���ʤ��� %s �ѥ��ե졼�������Ϥ��Ƥ�������"
-#: camel/camel-pgp-context.c:525
+#: camel/camel-pgp-context.c:561
msgid "Cannot sign this message: no plaintext to sign"
msgstr "���Υ�å������˽�̾����ޤ���: ��̾����ʿʸ�ƥ����Ȥ�����ޤ���"
-#: camel/camel-pgp-context.c:532 camel/camel-pgp-context.c:706
+#: camel/camel-pgp-context.c:568 camel/camel-pgp-context.c:748
msgid "Cannot sign this message: no password provided"
msgstr "���Υ�å������˽�̾����ޤ���: �ѥ���ɤ�Ϳ�����Ƥ��ޤ���"
-#: camel/camel-pgp-context.c:538 camel/camel-pgp-context.c:712
+#: camel/camel-pgp-context.c:574 camel/camel-pgp-context.c:754
#, c-format
msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
msgstr ""
"���Υ�å������˽�̾�Ǥ��ޤ���: GPG/PGP �ؤΥѥ��פ������Ǥ��ޤ���Ǥ���: %s"
-#: camel/camel-pgp-context.c:699
+#: camel/camel-pgp-context.c:741
msgid "Cannot sign this message: no plaintext to clearsign"
msgstr "���Υ�å������˽�̾����ޤ���: ���ꥢ��̾����ʿʸ�ƥ����Ȥ�����ޤ���"
-#: camel/camel-pgp-context.c:891
+#: camel/camel-pgp-context.c:939
msgid "Cannot verify this message: no plaintext to verify"
msgstr "��å�����������Ǥ��ޤ���: ��������ʿʸ�ƥ����Ȥ�����ޤ���"
-#: camel/camel-pgp-context.c:897
+#: camel/camel-pgp-context.c:945
#, c-format
msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
msgstr ""
"���Υ�å�����������Ǥ��ޤ���: GPG/PGP �ؤΥѥ��פ������Ǥ��ޤ���Ǥ���: %s"
-#: camel/camel-pgp-context.c:908
+#: camel/camel-pgp-context.c:956
#, c-format
msgid "Cannot verify this message: couldn't create temp file: %s"
msgstr "���Υ�å�����������Ǥ��ޤ���: ��ȥե����������Ǥ��ޤ���Ǥ���: %s"
-#: camel/camel-pgp-context.c:1076
+#: camel/camel-pgp-context.c:1129
msgid "Cannot encrypt this message: no plaintext to encrypt"
msgstr "���Υ�å�������Ź沽�Ǥ��ޤ���: �Ź沽����ʿʸ�ƥ����Ȥ�����ޤ���"
-#: camel/camel-pgp-context.c:1086
+#: camel/camel-pgp-context.c:1139
msgid "Cannot encrypt this message: no password provided"
msgstr "���Υ�å�������Ź沽�Ǥ��ޤ���: �ѥ���ɤ�Ϳ�����Ƥ��ޤ���"
-#: camel/camel-pgp-context.c:1093
+#: camel/camel-pgp-context.c:1146
#, c-format
msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
msgstr ""
"���Υ�å�������Ź沽�Ǥ��ޤ���: GPG/PGP �ؤΥѥ��פ������Ǥ��ޤ���Ǥ���: %"
"s"
-#: camel/camel-pgp-context.c:1102
+#: camel/camel-pgp-context.c:1155
msgid "Cannot encrypt this message: no recipients specified"
msgstr "���Υ�å�������Ź沽�Ǥ��ޤ���: �����Ԥ����ꤵ��Ƥ��ޤ���"
-#: camel/camel-pgp-context.c:1264
+#: camel/camel-pgp-context.c:1323
msgid "Cannot decrypt this message: no ciphertext to decrypt"
msgstr "���Υ�å�����������Ǥ��ޤ���: ���椹��Ź沽�ƥ����Ȥ�����ޤ���"
-#: camel/camel-pgp-context.c:1272
+#: camel/camel-pgp-context.c:1331
msgid "Cannot decrypt this message: no password provided"
msgstr "���Υ�å�����������Ǥ��ޤ���: �ѥ���ɤ�Ϳ�����Ƥ��ޤ���"
-#: camel/camel-pgp-context.c:1279
+#: camel/camel-pgp-context.c:1338
#, c-format
msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
msgstr ""
"���Υ�å�����������Ǥ��ޤ���: GPG/PGP �ؤΥѥ��פ������Ǥ��ޤ���Ǥ���: %s"
-#: camel/camel-provider.c:131
+#: camel/camel-provider.c:130
#, c-format
msgid "Could not load %s: Module loading not supported on this system."
msgstr ""
"%s ���ɤ߹��ळ�Ȥ�����ޤ���Ǥ���: ���Υ����ƥ�Ǥϥ⥸�塼����ɤ߹��ߤ�"
"�ݡ��Ȥ��Ƥ��ޤ���"
-#: camel/camel-provider.c:140
+#: camel/camel-provider.c:139
#, c-format
msgid "Could not load %s: %s"
msgstr "%s ������ɽ���ޤ���Ǥ���: %s"
-#: camel/camel-provider.c:148
+#: camel/camel-provider.c:147
#, c-format
msgid "Could not load %s: No initialization code in module."
msgstr "%s ������ɽ���ޤ���Ǥ���: �⥸�塼��Υ����ɤ����������Ƥ��ޤ���"
@@ -5687,7 +5894,7 @@ msgid "Connection cancelled"
msgstr "��³�ϥ���󥻥뤷�ޤ���"
#: camel/camel-remote-store.c:267
-#: camel/providers/smtp/camel-smtp-transport.c:272
+#: camel/providers/smtp/camel-smtp-transport.c:270
#, c-format
msgid "Could not connect to %s (port %d): %s"
msgstr "%s (�ݡ��� %d) ����³����ޤ���Ǥ���: %s"
@@ -5697,12 +5904,12 @@ msgid "(unknown host)"
msgstr "(̤�ΤΥۥ���)"
#: camel/camel-remote-store.c:358 camel/camel-remote-store.c:420
-#: camel/camel-remote-store.c:483
+#: camel/camel-remote-store.c:481
#: camel/providers/imap/camel-imap-command.c:386
msgid "Operation cancelled"
msgstr "���ϥ���󥻥뤷�ޤ���"
-#: camel/camel-remote-store.c:486
+#: camel/camel-remote-store.c:484
#, c-format
msgid "Server unexpectedly disconnected: %s"
msgstr "�����Ф�ͽ�����ʤ����Ǥ򤷤ޤ���: %s"
@@ -5812,7 +6019,7 @@ msgstr ""
"%s"
#: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:494
+#: camel/providers/imap/camel-imap-store.c:496
msgid "Bad authentication response from server."
msgstr "�����Ф���ְ�ä�ǧ�ڱ���������ޤ���"
@@ -5829,8 +6036,8 @@ msgid "Unknown authentication state."
msgstr "̤�Τ�ǧ�ھ��֤Ǥ�"
#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
-#: camel/providers/nntp/camel-nntp-store.c:302
-#: camel/providers/pop3/camel-pop3-provider.c:68 mail/mail-config.glade.h:55
+#: camel/providers/nntp/camel-nntp-store.c:301
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:52
msgid "Password"
msgstr "�ѥ����"
@@ -5859,55 +6066,55 @@ msgstr ""
msgid "Regular expression compilation failed: %s: %s"
msgstr "����ɽ�����Խ��˼���: %s: %s"
-#: camel/camel-service.c:158
+#: camel/camel-service.c:157
#, c-format
msgid "URL '%s' needs a username component"
msgstr "URL '%s' �ϥ桼��̾����ݡ��ͥ�Ȥ�ɬ�פǤ�"
-#: camel/camel-service.c:166
+#: camel/camel-service.c:165
#, c-format
msgid "URL '%s' needs a host component"
msgstr "URL '%s' �ϥۥ��ȥ���ݡ��ͥ�Ȥ�ɬ�פǤ�"
-#: camel/camel-service.c:174
+#: camel/camel-service.c:173
#, c-format
msgid "URL '%s' needs a path component"
msgstr "URL '%s' �ϥѥ�����ݡ��ͥ�Ȥ�ɬ�פǤ�"
-#: camel/camel-service.c:607
+#: camel/camel-service.c:611
#, c-format
msgid "Resolving: %s"
msgstr "�����: %s"
-#: camel/camel-service.c:634
+#: camel/camel-service.c:638
#, c-format
msgid "Failure in name lookup: %s"
msgstr "̾���θ����˼��Ԥ��ޤ���: %s"
-#: camel/camel-service.c:659
+#: camel/camel-service.c:663
#, c-format
msgid "Host lookup failed: %s: host not found"
msgstr "�ۥ��Ȥθ����˼��Ԥ��ޤ���: %s: �ۥ��Ȥϸ��Ĥ���ޤ���"
-#: camel/camel-service.c:661
+#: camel/camel-service.c:665
#, c-format
msgid "Host lookup failed: %s: unknown reason"
msgstr "�ۥ��Ȥθ����˼��Ԥ��ޤ���: %s: ̤�Τ���ͳ�Ǥ�"
-#: camel/camel-session.c:76
+#: camel/camel-session.c:75
msgid "Virtual folder email provider"
msgstr "���ۥե�����᡼��ץ��Х���"
-#: camel/camel-session.c:78
+#: camel/camel-session.c:77
msgid "For reading mail as a query of another set of folders"
msgstr ""
-#: camel/camel-session.c:324 camel/camel-session.c:393
+#: camel/camel-session.c:346 camel/camel-session.c:415
#, c-format
msgid "No provider available for protocol `%s'"
msgstr "�ץ��ȥ��� `%s' �����ѤǤ���ץ��Х����Ϥ���ޤ���"
-#: camel/camel-session.c:510
+#: camel/camel-session.c:532
#, c-format
msgid ""
"Could not create directory %s:\n"
@@ -5953,15 +6160,15 @@ msgstr "��å������Υǥ����ɤ˼��Ԥ��ޤ���"
msgid "Failed to verify certificates."
msgstr "ǧ�ڤξ����˼��Ԥ��ޤ���"
-#: camel/camel-store.c:218
+#: camel/camel-store.c:220
msgid "Cannot get folder: Invalid operation on this store"
msgstr "�ե����������Ǥ��ޤ���: ���Υ��ȥ��Ǥ����������Ǥ�"
-#: camel/camel-store.c:279
+#: camel/camel-store.c:280
msgid "Cannot create folder: Invalid operation on this store"
msgstr "�ե����������Ǥ��ޤ���: ���Υ��ȥ��Ǥ����������Ǥ�"
-#: camel/camel-tcp-stream-openssl.c:491
+#: camel/camel-tcp-stream-openssl.c:536
#, c-format
msgid ""
"Issuer: %s\n"
@@ -5971,7 +6178,7 @@ msgstr ""
"�о�: %s"
#. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:496 camel/camel-tcp-stream-ssl.c:369
+#: camel/camel-tcp-stream-openssl.c:541 camel/camel-tcp-stream-ssl.c:428
#, c-format
msgid ""
"Bad certificate from %s:\n"
@@ -5986,7 +6193,7 @@ msgstr ""
"\n"
"������˾�ߤޤ���?"
-#: camel/camel-tcp-stream-ssl.c:353
+#: camel/camel-tcp-stream-ssl.c:412
#, c-format
msgid ""
"EMail: %s\n"
@@ -6005,37 +6212,37 @@ msgstr ""
"��: %s\n"
"��: %s"
-#: camel/camel-url.c:289
+#: camel/camel-url.c:288
#, c-format
msgid "Could not parse URL `%s'"
msgstr "URL `%s' ����Ϥ��뤳�Ȥ�����ޤ���Ǥ���"
-#: camel/camel-vee-folder.c:562
+#: camel/camel-vee-folder.c:588
#, c-format
msgid "No such message %s in %s"
msgstr "%s �� %s �Τ褦�ʥ�å������Ϥ���ޤ���"
-#: camel/camel-vee-folder.c:702
+#: camel/camel-vee-folder.c:749
#, c-format
msgid "No such message: %s"
msgstr "���Τ褦�ʥ�å������Ϥ���ޤ���: %s"
-#: camel/camel-vee-store.c:250
+#: camel/camel-vee-store.c:258
#, c-format
msgid "Cannot delete folder: %s: Invalid operation"
msgstr "�ե���������Ǥ��ޤ���: %s: ���������Ǥ�"
-#: camel/camel-vee-store.c:285
+#: camel/camel-vee-store.c:293
#, c-format
msgid "Cannot delete folder: %s: No such folder"
msgstr "�ե���������Ǥ��ޤ���: %s: ���Τ褦�ʥե�����Ϥ���ޤ���"
-#: camel/camel-vee-store.c:297
+#: camel/camel-vee-store.c:306
#, c-format
msgid "Cannot rename folder: %s: Invalid operation"
msgstr "�ե�������͡���Ǥ��ޤ���: %s: ���������Ǥ�"
-#: camel/camel-vee-store.c:325
+#: camel/camel-vee-store.c:314
#, c-format
msgid "Cannot rename folder: %s: No such folder"
msgstr "�ե�������͡���Ǥ��ޤ���: %s: ���Τ褦�ʥե�����Ϥ���ޤ���"
@@ -6068,57 +6275,57 @@ msgstr "IMAP �����Фα����� %s �����ޤ�Ǥ��ޤ���"
msgid "Unexpected OK response from IMAP server: %s"
msgstr "IMAP �����Ф���ͽ�����ʤ� OK ����������ޤ���: %s"
-#: camel/providers/imap/camel-imap-folder.c:191
+#: camel/providers/imap/camel-imap-folder.c:194
#, c-format
msgid "Could not create directory %s: %s"
msgstr "�ǥ��쥯�ȥ� %s ���������ޤ���Ǥ���: %s"
-#: camel/providers/imap/camel-imap-folder.c:210
+#: camel/providers/imap/camel-imap-folder.c:213
#, c-format
msgid "Could not load summary for %s"
msgstr "%s �Υ��ޥ꡼������ɽ���ޤ���Ǥ���"
-#: camel/providers/imap/camel-imap-folder.c:274
+#: camel/providers/imap/camel-imap-folder.c:277
msgid "Folder was destroyed and recreated on server."
msgstr "�ե�������˲�����ƺ�������ޤ���"
#. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:436
+#: camel/providers/imap/camel-imap-folder.c:461
msgid "Scanning for changed messages"
msgstr "�ѹ����줿��å�������������"
-#: camel/providers/imap/camel-imap-folder.c:1537
-#: camel/providers/imap/camel-imap-folder.c:1940
+#: camel/providers/imap/camel-imap-folder.c:1562
+#: camel/providers/imap/camel-imap-folder.c:1974
msgid "This message is not currently available"
msgstr "���Υ�å������ϸ������ѽ���ޤ���"
-#: camel/providers/imap/camel-imap-folder.c:1679
-#: camel/providers/imap/camel-imap-folder.c:1760
+#: camel/providers/imap/camel-imap-folder.c:1713
+#: camel/providers/imap/camel-imap-folder.c:1794
msgid "Fetching summary information for new messages"
msgstr ""
-#: camel/providers/imap/camel-imap-folder.c:1685
+#: camel/providers/imap/camel-imap-folder.c:1719
msgid "Scanning for new messages"
msgstr "������������������"
-#: camel/providers/imap/camel-imap-folder.c:1977
+#: camel/providers/imap/camel-imap-folder.c:2011
msgid "Could not find message body in FETCH response."
msgstr "FETCH �����˥�å��������Τ��դ��뤳�Ȥ�����ޤ���Ǥ���"
-#: camel/providers/imap/camel-imap-message-cache.c:155
+#: camel/providers/imap/camel-imap-message-cache.c:154
#, c-format
msgid "Could not open cache directory: %s"
msgstr "����å���ǥ��쥯�ȥ�򳫤����Ȥ�����ޤ���Ǥ���: %s"
-#: camel/providers/imap/camel-imap-message-cache.c:243
-#: camel/providers/imap/camel-imap-message-cache.c:299
-#: camel/providers/imap/camel-imap-message-cache.c:330
-#: camel/providers/imap/camel-imap-message-cache.c:362
+#: camel/providers/imap/camel-imap-message-cache.c:256
+#: camel/providers/imap/camel-imap-message-cache.c:313
+#: camel/providers/imap/camel-imap-message-cache.c:344
+#: camel/providers/imap/camel-imap-message-cache.c:376
#, c-format
msgid "Failed to cache message %s: %s"
msgstr "��å������Υ���å���˼��Ԥ��ޤ��� %s: %s"
-#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:15
+#: camel/providers/imap/camel-imap-provider.c:43
msgid "Checking for new mail"
msgstr "����᡼��Υ����å�"
@@ -6126,7 +6333,7 @@ msgstr "����᡼��Υ����å�"
msgid "Check for new messages in all folders"
msgstr "���٤ƤΥե�����ο���᡼�������å����ޤ�"
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:836
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:820
msgid "Folders"
msgstr "�ե����"
@@ -6159,28 +6366,28 @@ msgid "This option will connect to the IMAP server using a plaintext password."
msgstr ""
"���Υ��ץ����ϥץ쥤��ƥ����ȥѥ���ɤ�Ȥä� IMAP �����Ф���³���ޤ�"
-#: camel/providers/imap/camel-imap-store.c:517
+#: camel/providers/imap/camel-imap-store.c:519
#, c-format
msgid "IMAP server %s does not support requested authentication type %s"
msgstr "IMAP ������ %s ���׵ᤷ��ǧ�ڥ����� %s �򥵥ݡ��Ȥ��Ƥ��ޤ���"
-#: camel/providers/imap/camel-imap-store.c:527
-#: camel/providers/smtp/camel-smtp-transport.c:388
+#: camel/providers/imap/camel-imap-store.c:529
+#: camel/providers/smtp/camel-smtp-transport.c:386
#, c-format
msgid "No support for authentication type %s"
msgstr "ǧ�ڥ����� %s �򥵥ݡ��Ȥ��Ƥ��ޤ���"
-#: camel/providers/imap/camel-imap-store.c:551
+#: camel/providers/imap/camel-imap-store.c:553
#, c-format
msgid "%sPlease enter the IMAP password for %s@%s"
msgstr "%s %s@%s �� IMAP �ѥ���ɤ����Ϥ��Ƥ�������"
-#: camel/providers/imap/camel-imap-store.c:566
-#: camel/providers/smtp/camel-smtp-transport.c:432
+#: camel/providers/imap/camel-imap-store.c:568
+#: camel/providers/smtp/camel-smtp-transport.c:430
msgid "You didn't enter a password."
msgstr "�ѥ���ɤ����Ϥ��Ƥ��ޤ���"
-#: camel/providers/imap/camel-imap-store.c:592
+#: camel/providers/imap/camel-imap-store.c:594
#, c-format
msgid ""
"Unable to authenticate to IMAP server.\n"
@@ -6191,88 +6398,92 @@ msgstr ""
"%s\n"
"\n"
-#: camel/providers/imap/camel-imap-store.c:891
+#: camel/providers/imap/camel-imap-store.c:897
#, c-format
msgid "No such folder %s"
msgstr "���Τ褦�ʥե���� %s �Ϥ���ޤ���"
-#: camel/providers/imap/camel-imap-store.c:1150
+#: camel/providers/imap/camel-imap-store.c:1272
msgid "The parent folder is not allowed to contain subfolders"
msgstr ""
-#: camel/providers/local/camel-local-provider.c:43
+#: camel/providers/local/camel-local-provider.c:42
msgid "MH-format mail directories"
msgstr "MH �����Υ᡼��ǥ��쥯�ȥ�"
-#: camel/providers/local/camel-local-provider.c:44
+#: camel/providers/local/camel-local-provider.c:43
msgid "For storing local mail in MH-like mail directories."
msgstr "MH�饤���ʥ᡼��ǥ��쥯�ȥ�˥�������᡼�����¸"
-#: camel/providers/local/camel-local-provider.c:53
+#: camel/providers/local/camel-local-provider.c:52
msgid "Local delivery"
msgstr "���������ۿ�"
-#: camel/providers/local/camel-local-provider.c:54
+#: camel/providers/local/camel-local-provider.c:53
msgid "For retrieving local mail from standard mbox formated spools."
msgstr "ɸ�� mbox �����ǥ�������᡼������"
-#: camel/providers/local/camel-local-provider.c:63
+#: camel/providers/local/camel-local-provider.c:62
msgid "Apply filters to new messages in INBOX"
msgstr "INBOX ��ˤ��뿷����å������إե��륿��Ŭ�Ѥ���"
-#: camel/providers/local/camel-local-provider.c:69
-msgid "Qmail maildir-format mail files"
-msgstr "Qmail maildir �����Υ᡼��ե�����"
+#: camel/providers/local/camel-local-provider.c:68
+#, fuzzy
+msgid "Maildir-format mail directories"
+msgstr "MH �����Υ᡼��ǥ��쥯�ȥ�"
-#: camel/providers/local/camel-local-provider.c:70
-msgid "For storing local mail in qmail maildir directories."
+#: camel/providers/local/camel-local-provider.c:69
+#, fuzzy
+msgid "For storing local mail in maildir directories."
msgstr "qmail maildir �ǥ��쥯�ȥ�˥�������᡼�����¸"
-#: camel/providers/local/camel-local-provider.c:81
+#: camel/providers/local/camel-local-provider.c:80
msgid "Standard Unix mbox spools"
msgstr "ɸ��Ū�� UNIX �� mbox ���ס���"
-#: camel/providers/local/camel-local-provider.c:82
+#: camel/providers/local/camel-local-provider.c:81
msgid "For reading and storing local mail in standard mbox spool files."
msgstr "ɸ�� mbox �ե�����ˤ˥�������᡼�����¸���ɤ߽Ф�"
-#: camel/providers/local/camel-local-store.c:132
-#: camel/providers/local/camel-spool-store.c:110
+#: camel/providers/local/camel-local-store.c:138
+#: camel/providers/local/camel-local-store.c:227
+#: camel/providers/local/camel-spool-store.c:109
#, c-format
msgid "Store root %s is not an absolute path"
msgstr "��¸���줿�롼�� %s �����Хѥ��ǤϤ���ޤ���"
-#: camel/providers/local/camel-local-store.c:139
+#: camel/providers/local/camel-local-store.c:145
#, c-format
msgid "Store root %s is not a regular directory"
msgstr "��¸���줿�롼�� %s ���̾�Υǥ��쥯�ȥ�ǤϤ���ޤ���"
-#: camel/providers/local/camel-local-store.c:147
-#: camel/providers/local/camel-local-store.c:163
+#: camel/providers/local/camel-local-store.c:153
+#: camel/providers/local/camel-local-store.c:169
+#: camel/providers/local/camel-local-store.c:235
#, c-format
msgid "Cannot get folder: %s: %s"
msgstr "�ե�������������ޤ���: %s: %s"
-#: camel/providers/local/camel-local-store.c:178
+#: camel/providers/local/camel-local-store.c:184
msgid "Local stores do not have an inbox"
msgstr "��������ؤ���¸�� inbox ����Ƥޤ���"
-#: camel/providers/local/camel-local-store.c:190
+#: camel/providers/local/camel-local-store.c:196
#, c-format
msgid "Local mail file %s"
msgstr "��������᡼��ե����� %s"
-#: camel/providers/local/camel-local-store.c:247
+#: camel/providers/local/camel-local-store.c:300 mail/mail-local.c:864
#, c-format
msgid "Could not rename folder %s to %s: %s"
msgstr "�ե������ %s ���� %s ��̾���ѹ����뤳�Ȥ�����ޤ���Ǥ���: %s"
-#: camel/providers/local/camel-local-store.c:289
+#: camel/providers/local/camel-local-store.c:374
#, c-format
msgid "Could not delete folder summary file `%s': %s"
msgstr "�ե�������饵�ޥ꡼�ե����� `%s' �������뤳�Ȥ�����ޤ���Ǥ���: %s"
-#: camel/providers/local/camel-local-store.c:299
+#: camel/providers/local/camel-local-store.c:384
#, c-format
msgid "Could not delete folder index file `%s': %s"
msgstr ""
@@ -6284,23 +6495,28 @@ msgid "Could not save summary: %s: %s"
msgstr "���ޥ꡼�򥻡��ֽ���ޤ���Ǥ���: %s: %s"
#: camel/providers/local/camel-local-summary.c:423
-#: camel/providers/local/camel-spool-summary.c:1158
+#: camel/providers/local/camel-spool-summary.c:1157
msgid "Unable to add message to summary: unknown reason"
msgstr "���ޥ�إ�å��������ɲä��뤳�Ȥ�����ޤ���: ̤�Τ���ͳ�Ǥ�"
#: camel/providers/local/camel-maildir-folder.c:181
+#, fuzzy
+msgid "Maildir append message cancelled"
+msgstr "��å����� %d �Ǽ��Ԥ��ޤ���"
+
+#: camel/providers/local/camel-maildir-folder.c:184
#, c-format
msgid "Cannot append message to maildir folder: %s: %s"
msgstr "maildir �����Υե�����إ�å��������ɲý���ޤ���: %s: %s"
-#: camel/providers/local/camel-maildir-folder.c:206
-#: camel/providers/local/camel-maildir-folder.c:218
-#: camel/providers/local/camel-maildir-folder.c:226
-#: camel/providers/local/camel-mbox-folder.c:328
-#: camel/providers/local/camel-mh-folder.c:195
-#: camel/providers/local/camel-mh-folder.c:204
-#: camel/providers/local/camel-mh-folder.c:212
-#: camel/providers/local/camel-spool-folder.c:580
+#: camel/providers/local/camel-maildir-folder.c:209
+#: camel/providers/local/camel-maildir-folder.c:221
+#: camel/providers/local/camel-maildir-folder.c:229
+#: camel/providers/local/camel-mbox-folder.c:331
+#: camel/providers/local/camel-mh-folder.c:198
+#: camel/providers/local/camel-mh-folder.c:207
+#: camel/providers/local/camel-mh-folder.c:215
+#: camel/providers/local/camel-spool-folder.c:579
#, c-format
msgid ""
"Cannot get message: %s\n"
@@ -6309,20 +6525,20 @@ msgstr ""
"��å��������������ޤ���: %s\n"
" %s"
-#: camel/providers/local/camel-maildir-folder.c:206
-#: camel/providers/local/camel-mbox-folder.c:328
-#: camel/providers/local/camel-mh-folder.c:195
-#: camel/providers/local/camel-spool-folder.c:580
+#: camel/providers/local/camel-maildir-folder.c:209
+#: camel/providers/local/camel-mbox-folder.c:331
+#: camel/providers/local/camel-mh-folder.c:198
+#: camel/providers/local/camel-spool-folder.c:579
msgid "No such message"
msgstr "���Τ褦�ʥ�å������Ϥ���ޤ���"
-#: camel/providers/local/camel-maildir-folder.c:227
-#: camel/providers/local/camel-mh-folder.c:213
+#: camel/providers/local/camel-maildir-folder.c:230
+#: camel/providers/local/camel-mh-folder.c:216
msgid "Invalid message contents"
msgstr "��å����������Ƥ�̵���Ǥ�"
-#: camel/providers/local/camel-maildir-store.c:106
-#: camel/providers/local/camel-mh-store.c:90
+#: camel/providers/local/camel-maildir-store.c:105
+#: camel/providers/local/camel-mh-store.c:89
#, c-format
msgid ""
"Could not open folder `%s':\n"
@@ -6331,15 +6547,15 @@ msgstr ""
"�ե���� `%s' �򳫤����Ȥ�����ޤ���Ǥ���:\n"
"%s"
-#: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:101
-#: camel/providers/local/camel-mh-store.c:97
+#: camel/providers/local/camel-maildir-store.c:109
+#: camel/providers/local/camel-mbox-store.c:100
+#: camel/providers/local/camel-mh-store.c:96
#, c-format
msgid "Folder `%s' does not exist."
msgstr "�ե���� `%s' ��¸�ߤ��ޤ���"
-#: camel/providers/local/camel-maildir-store.c:117
-#: camel/providers/local/camel-mh-store.c:103
+#: camel/providers/local/camel-maildir-store.c:116
+#: camel/providers/local/camel-mh-store.c:102
#, c-format
msgid ""
"Could not create folder `%s':\n"
@@ -6348,19 +6564,19 @@ msgstr ""
"�ե���� `%s' ���������ޤ���Ǥ���:\n"
"%s"
-#: camel/providers/local/camel-maildir-store.c:132
+#: camel/providers/local/camel-maildir-store.c:131
#, c-format
msgid "`%s' is not a maildir directory."
msgstr "`%s' �� maildir �����Υǥ��쥯�ȥ�ǤϤ���ޤ���"
-#: camel/providers/local/camel-maildir-store.c:167
-#: camel/providers/local/camel-maildir-store.c:204
-#: camel/providers/local/camel-mh-store.c:127
+#: camel/providers/local/camel-maildir-store.c:166
+#: camel/providers/local/camel-maildir-store.c:203
+#: camel/providers/local/camel-mh-store.c:126
#, c-format
msgid "Could not delete folder `%s': %s"
msgstr "�ե���� `%s' �������뤳�Ȥ�����ޤ���Ǥ���: %s"
-#: camel/providers/local/camel-maildir-store.c:168
+#: camel/providers/local/camel-maildir-store.c:167
msgid "not a maildir directory"
msgstr "maildir �����Υǥ��쥯�ȥ�ǤϤ���ޤ���"
@@ -6375,29 +6591,34 @@ msgstr "�ե���� `%s' ����������ޤ���Ǥ���: %s"
msgid "Cannot open maildir directory path: %s: %s"
msgstr "maildir �ǥ��쥯�ȥ�ѥ��򳫤����Ȥ�����ޤ���: %s: %s"
-#: camel/providers/local/camel-mbox-folder.c:152
-#: camel/providers/local/camel-spool-folder.c:275
+#: camel/providers/local/camel-mbox-folder.c:151
+#: camel/providers/local/camel-spool-folder.c:274
#, c-format
msgid "Cannot create folder lock on %s: %s"
msgstr "%s �Υե�������å���������뤳�Ȥ�����ޤ���: %s"
-#: camel/providers/local/camel-mbox-folder.c:209
-#: camel/providers/local/camel-spool-folder.c:457
+#: camel/providers/local/camel-mbox-folder.c:208
+#: camel/providers/local/camel-spool-folder.c:456
#, c-format
msgid "Cannot open mailbox: %s: %s\n"
msgstr "mailbox�򳫤����Ȥ�����ޤ���: %s: %s\n"
#: camel/providers/local/camel-mbox-folder.c:265
+#, fuzzy
+msgid "Mail append cancelled"
+msgstr "���ϥ���󥻥뤷�ޤ���"
+
+#: camel/providers/local/camel-mbox-folder.c:268
#, c-format
msgid "Cannot append message to mbox file: %s: %s"
msgstr "mbox �ե�����˥�å��������ɲý���ޤ���: %s: %s"
-#: camel/providers/local/camel-mbox-folder.c:344
-#: camel/providers/local/camel-mbox-folder.c:376
-#: camel/providers/local/camel-mbox-folder.c:389
-#: camel/providers/local/camel-spool-folder.c:596
-#: camel/providers/local/camel-spool-folder.c:628
-#: camel/providers/local/camel-spool-folder.c:641
+#: camel/providers/local/camel-mbox-folder.c:347
+#: camel/providers/local/camel-mbox-folder.c:379
+#: camel/providers/local/camel-mbox-folder.c:392
+#: camel/providers/local/camel-spool-folder.c:595
+#: camel/providers/local/camel-spool-folder.c:627
+#: camel/providers/local/camel-spool-folder.c:640
#, c-format
msgid ""
"Cannot get message: %s from folder %s\n"
@@ -6406,17 +6627,17 @@ msgstr ""
"��å����� %s ��ե���� %s �����������ޤ���\n"
" %s"
-#: camel/providers/local/camel-mbox-folder.c:377
-#: camel/providers/local/camel-spool-folder.c:629
+#: camel/providers/local/camel-mbox-folder.c:380
+#: camel/providers/local/camel-spool-folder.c:628
msgid "The folder appears to be irrecoverably corrupted."
msgstr "�ե�����Dz�����ǽ�ʥ��顼��ȯ�������褦�Ǥ�"
-#: camel/providers/local/camel-mbox-folder.c:390
-#: camel/providers/local/camel-spool-folder.c:642
+#: camel/providers/local/camel-mbox-folder.c:393
+#: camel/providers/local/camel-spool-folder.c:641
msgid "Message construction failed: Corrupt mailbox?"
msgstr "��å������β��˼��Ԥ��ޤ���: �ְ�ä��᡼��ܥå����Ǥ���?"
-#: camel/providers/local/camel-mbox-store.c:94
+#: camel/providers/local/camel-mbox-store.c:93
#, c-format
msgid ""
"Could not open file `%s':\n"
@@ -6425,7 +6646,7 @@ msgstr ""
"�ե����� `%s' �򳫤����Ȥ�����ޤ���Ǥ���:\n"
"%s"
-#: camel/providers/local/camel-mbox-store.c:110
+#: camel/providers/local/camel-mbox-store.c:109
#, c-format
msgid ""
"Could not create file `%s':\n"
@@ -6434,14 +6655,14 @@ msgstr ""
"�ե����� `%s' ��������뤳�Ȥ�����ޤ���Ǥ���:\n"
"%s"
-#: camel/providers/local/camel-mbox-store.c:119
-#: camel/providers/local/camel-mbox-store.c:146
+#: camel/providers/local/camel-mbox-store.c:118
+#: camel/providers/local/camel-mbox-store.c:145
#, c-format
msgid "`%s' is not a regular file."
msgstr "`%s' ���̾�Υե�����ǤϤ���ޤ���"
-#: camel/providers/local/camel-mbox-store.c:138
-#: camel/providers/local/camel-mbox-store.c:161
+#: camel/providers/local/camel-mbox-store.c:137
+#: camel/providers/local/camel-mbox-store.c:160
#, c-format
msgid ""
"Could not delete folder `%s':\n"
@@ -6450,103 +6671,111 @@ msgstr ""
"�ե���� `%s' �������뤳�Ȥ�����ޤ���Ǥ���:\n"
"%s"
-#: camel/providers/local/camel-mbox-store.c:153
+#: camel/providers/local/camel-mbox-store.c:152
#, c-format
msgid "Folder `%s' is not empty. Not deleted."
msgstr "�ե���� `%s' �϶��ǤϤ���ޤ���. ������ޤ���"
#. FIXME: If there is a failure, it shouldn't clear the summary and restart,
#. it should try and merge the summary info's. This is a bit tricky.
-#: camel/providers/local/camel-mbox-summary.c:249
-#: camel/providers/local/camel-mbox-summary.c:499
-#: camel/providers/local/camel-mbox-summary.c:700
-#: camel/providers/local/camel-spool-summary.c:644
-#: camel/providers/local/camel-spool-summary.c:936
+#: camel/providers/local/camel-mbox-summary.c:248
+#: camel/providers/local/camel-mbox-summary.c:497
+#: camel/providers/local/camel-mbox-summary.c:698
+#: camel/providers/local/camel-spool-summary.c:378
+#: camel/providers/local/camel-spool-summary.c:643
+#: camel/providers/local/camel-spool-summary.c:935
msgid "Storing folder"
msgstr "�ե��������¸��"
-#: camel/providers/local/camel-mbox-summary.c:254
+#: camel/providers/local/camel-mbox-summary.c:253
+#: camel/providers/local/camel-spool-summary.c:383
#, c-format
msgid "Could not open folder: %s: %s"
msgstr "�ե�����򳫤����Ȥ�����ޤ���: %s: %s"
-#: camel/providers/local/camel-mbox-summary.c:296
-#: camel/providers/local/camel-spool-summary.c:426
+#: camel/providers/local/camel-mbox-summary.c:295
+#: camel/providers/local/camel-spool-summary.c:425
#, c-format
msgid "Fatal mail parser error near position %ld in folder %s"
msgstr "�ݥ������ %ld �ն� �ե���� %s ����̿Ū�ʥ᡼�빽ʸ���ϥ��顼�Ǥ�"
-#: camel/providers/local/camel-mbox-summary.c:371
+#: camel/providers/local/camel-mbox-summary.c:370
+#: camel/providers/local/camel-spool-summary.c:497
#, c-format
msgid "Cannot check folder: %s: %s"
msgstr "�ե����������å�����ޤ���: %s: %s"
-#: camel/providers/local/camel-mbox-summary.c:504
-#: camel/providers/local/camel-mbox-summary.c:705
-#: camel/providers/local/camel-spool-summary.c:649
+#: camel/providers/local/camel-mbox-summary.c:502
+#: camel/providers/local/camel-mbox-summary.c:703
+#: camel/providers/local/camel-spool-summary.c:648
#, c-format
msgid "Could not open file: %s: %s"
msgstr "�ե�����򳫤����Ȥ�����ޤ���: %s: %s"
-#: camel/providers/local/camel-mbox-summary.c:521
-#: camel/providers/local/camel-spool-summary.c:673
+#: camel/providers/local/camel-mbox-summary.c:519
+#: camel/providers/local/camel-spool-summary.c:672
#, c-format
msgid "Cannot open temporary mailbox: %s"
msgstr "�ƥ�ݥ�� mailbox �򳫤����Ȥ�����ޤ���: %s"
-#: camel/providers/local/camel-mbox-summary.c:546
-#: camel/providers/local/camel-mbox-summary.c:554
-#: camel/providers/local/camel-mbox-summary.c:743
-#: camel/providers/local/camel-mbox-summary.c:751
-#: camel/providers/local/camel-spool-summary.c:698
-#: camel/providers/local/camel-spool-summary.c:706
-#: camel/providers/local/camel-spool-summary.c:979
-#: camel/providers/local/camel-spool-summary.c:987
+#: camel/providers/local/camel-mbox-summary.c:544
+#: camel/providers/local/camel-mbox-summary.c:552
+#: camel/providers/local/camel-mbox-summary.c:741
+#: camel/providers/local/camel-mbox-summary.c:749
+#: camel/providers/local/camel-spool-summary.c:697
+#: camel/providers/local/camel-spool-summary.c:705
+#: camel/providers/local/camel-spool-summary.c:978
+#: camel/providers/local/camel-spool-summary.c:986
msgid "Summary and folder mismatch, even after a sync"
msgstr "Ʊ�����ޤ�����, ���ޥ꡼�ȥե�������԰��פǤ�"
-#: camel/providers/local/camel-mbox-summary.c:597
-#: camel/providers/local/camel-spool-summary.c:750
+#: camel/providers/local/camel-mbox-summary.c:595
+#: camel/providers/local/camel-spool-summary.c:749
#, c-format
msgid "Error writing to temp mailbox: %s"
msgstr "��� mailbox �ؽ񤭽Ф���˥��顼: %s"
-#: camel/providers/local/camel-mbox-summary.c:614
-#: camel/providers/local/camel-spool-summary.c:772
+#: camel/providers/local/camel-mbox-summary.c:612
+#: camel/providers/local/camel-spool-summary.c:771
#, c-format
msgid "Writing to tmp mailbox failed: %s: %s"
msgstr "��� mailbox �ؽ񤭽Ф���˥��顼: %s: %s"
-#: camel/providers/local/camel-mbox-summary.c:632
-#: camel/providers/local/camel-mbox-summary.c:801
-#: camel/providers/local/camel-spool-summary.c:1037
+#: camel/providers/local/camel-mbox-summary.c:630
+#: camel/providers/local/camel-mbox-summary.c:799
+#: camel/providers/local/camel-spool-summary.c:1036
#, c-format
msgid "Could not close source folder %s: %s"
msgstr "���Υե���� %s ���Ĥ��뤳�Ȥ�����ޤ���Ǥ���: %s"
-#: camel/providers/local/camel-mbox-summary.c:641
+#: camel/providers/local/camel-mbox-summary.c:639
#, c-format
msgid "Could not close temp folder: %s"
msgstr "��ȥե�������Ĥ��뤳�Ȥ�����ޤ���Ǥ���: %s"
-#: camel/providers/local/camel-mbox-summary.c:652
+#: camel/providers/local/camel-mbox-summary.c:650
#, c-format
msgid "Could not rename folder: %s"
msgstr "�ե�������͡������ޤ���Ǥ���: %s"
-#: camel/providers/local/camel-mbox-summary.c:875
-#: camel/providers/local/camel-spool-summary.c:545
-#: camel/providers/local/camel-spool-summary.c:1111
+#: camel/providers/local/camel-mbox-summary.c:873
+#: camel/providers/local/camel-spool-summary.c:544
+#: camel/providers/local/camel-spool-summary.c:1110
#, c-format
msgid "Unknown error: %s"
msgstr "̤�ΤΥ��顼: %s"
#: camel/providers/local/camel-mh-folder.c:172
+#, fuzzy
+msgid "MH append message cancelled"
+msgstr "Ϣ����ˤإ�å�����������"
+
+#: camel/providers/local/camel-mh-folder.c:175
#, c-format
msgid "Cannot append message to mh folder: %s: %s"
msgstr "mh �ե�����إ�å��������ɲý���ޤ���: %s: %s"
-#: camel/providers/local/camel-mh-store.c:110
+#: camel/providers/local/camel-mh-store.c:109
#, c-format
msgid "`%s' is not a directory."
msgstr "`%s' �ϥǥ��쥯�ȥ�ǤϤ���ޤ���"
@@ -6556,203 +6785,187 @@ msgstr "`%s' �ϥǥ��쥯�ȥ�ǤϤ���ޤ���"
msgid "Cannot open MH directory path: %s: %s"
msgstr "MH �ǥ��쥯�ȥ�ѥ��򳫤����Ȥ�����ޤ���: %s: %s"
-#: camel/providers/local/camel-spool-folder.c:513
+#: camel/providers/local/camel-spool-folder.c:512
#, c-format
msgid "Cannot append message to spool file: %s: %s"
msgstr "���ס���ե�����˥�å��������ɲý���ޤ���: %s: %s"
-#: camel/providers/local/camel-spool-store.c:116
+#: camel/providers/local/camel-spool-store.c:115
#, c-format
msgid "Spool `%s' does not exist or is not a regular file"
msgstr "���ס���`%s' ��¸�ߤ��ʤ����̾�Υե�����ǤϤ���ޤ���"
-#: camel/providers/local/camel-spool-store.c:142
+#: camel/providers/local/camel-spool-store.c:141
#, c-format
msgid "Folder `%s/%s' does not exist."
msgstr "�ե���� `%s/%s' ��¸�ߤ��ޤ���"
-#: camel/providers/local/camel-spool-store.c:164
+#: camel/providers/local/camel-spool-store.c:163
#, c-format
msgid "Spool mail file %s"
msgstr "���ס���᡼��ե����� %s"
-#: camel/providers/local/camel-spool-store.c:210
+#: camel/providers/local/camel-spool-store.c:209
msgid "Spool folders cannot be renamed"
msgstr "���ס���ե�����ϥ�͡���Ǥ��ޤ���"
-#: camel/providers/local/camel-spool-store.c:218
+#: camel/providers/local/camel-spool-store.c:217
msgid "Spool folders cannot be deleted"
msgstr "���ס���ե�����Ϻ���Ǥ��ޤ���"
-#. FIXME: If there is a failure, it shouldn't clear the summary and restart,
-#. it should try and merge the summary info's. This is a bit tricky.
-#: camel/providers/local/camel-spool-summary.c:379
-msgid "Summarising folder"
-msgstr "�ե�����Υ��ޥ�������"
-
-#: camel/providers/local/camel-spool-summary.c:384
-#, c-format
-msgid "Could not open folder: %s: summarising from position %ld: %s"
-msgstr "�ե�����򳫤��ޤ���Ǥ���: %s: �ݥ������ %ld ���饵�ޥ饤����: %s"
-
-#: camel/providers/local/camel-spool-summary.c:498
-#, c-format
-msgid "Cannot summarise folder: %s: %s"
-msgstr "�ե�����򥵥ޥ饤�����뤳�Ȥ�����ޤ���: %s: %s"
-
-#: camel/providers/local/camel-spool-summary.c:789
-#: camel/providers/local/camel-spool-summary.c:798
-#: camel/providers/local/camel-spool-summary.c:807
+#: camel/providers/local/camel-spool-summary.c:788
+#: camel/providers/local/camel-spool-summary.c:797
+#: camel/providers/local/camel-spool-summary.c:806
#, c-format
msgid "Could not sync temporary folder %s: %s"
msgstr "�ƥ�ݥ��ե������Ʊ������ޤ���Ǥ��� %s: %s"
-#: camel/providers/local/camel-spool-summary.c:822
+#: camel/providers/local/camel-spool-summary.c:821
#, c-format
msgid "Could not sync spool folder %s: %s"
msgstr "���ס���ե������Ʊ������ޤ���Ǥ��� %s: %s"
-#: camel/providers/local/camel-spool-summary.c:852
-#: camel/providers/local/camel-spool-summary.c:870
-#: camel/providers/local/camel-spool-summary.c:882
+#: camel/providers/local/camel-spool-summary.c:851
+#: camel/providers/local/camel-spool-summary.c:869
+#: camel/providers/local/camel-spool-summary.c:881
#, c-format
msgid ""
"Could not sync spool folder %s: %s\n"
"Folder may be corrupt, copy saved in `%s'"
msgstr ""
-#: camel/providers/local/camel-spool-summary.c:941
+#: camel/providers/local/camel-spool-summary.c:940
#, c-format
msgid "Could not file: %s: %s"
msgstr "�ե��������ޤ���Ǥ���: %s: %s"
-#: camel/providers/nntp/camel-nntp-auth.c:45
+#: camel/providers/nntp/camel-nntp-auth.c:44
#, c-format
msgid "Please enter the NNTP password for %s@%s"
msgstr "%s@%s �� NNTP �ѥ���ɤ����Ϥ��Ƥ�������"
-#: camel/providers/nntp/camel-nntp-auth.c:65
+#: camel/providers/nntp/camel-nntp-auth.c:64
msgid "Server rejected username"
msgstr "�����Фϥ桼��̾����ݤ��ޤ���"
-#: camel/providers/nntp/camel-nntp-auth.c:71
+#: camel/providers/nntp/camel-nntp-auth.c:70
msgid "Failed to send username to server"
msgstr "�����Фإ桼��̾�������˼��Ԥ��ޤ���"
-#: camel/providers/nntp/camel-nntp-auth.c:80
+#: camel/providers/nntp/camel-nntp-auth.c:79
msgid "Server rejected username/password"
msgstr "�����Фϥ桼��̾/�ѥ���ɤ���ݤ��ޤ���"
-#: camel/providers/nntp/camel-nntp-folder.c:116
+#: camel/providers/nntp/camel-nntp-folder.c:115
#, c-format
msgid "Message %s not found."
msgstr "��å����� %s �ϸ��դ���ޤ���"
-#: camel/providers/nntp/camel-nntp-grouplist.c:46
+#: camel/providers/nntp/camel-nntp-grouplist.c:45
msgid "Could not get group list from server."
msgstr "�����Ф��饰�롼�ץꥹ�Ȥ��������ޤ���Ǥ���"
-#: camel/providers/nntp/camel-nntp-grouplist.c:99
-#: camel/providers/nntp/camel-nntp-grouplist.c:108
+#: camel/providers/nntp/camel-nntp-grouplist.c:98
+#: camel/providers/nntp/camel-nntp-grouplist.c:107
#, c-format
msgid "Unable to load grouplist file for %s: %s"
msgstr "%s �Υ��롼�ץꥹ�ȥե����������ɽ���ޤ���: %s"
-#: camel/providers/nntp/camel-nntp-grouplist.c:159
+#: camel/providers/nntp/camel-nntp-grouplist.c:158
#, c-format
msgid "Unable to save grouplist file for %s: %s"
msgstr "%s �Υ��롼�ץꥹ�ȥե��������¸����ޤ���: %s"
-#: camel/providers/nntp/camel-nntp-provider.c:42
+#: camel/providers/nntp/camel-nntp-provider.c:41
msgid "USENET news"
msgstr "USENET news"
-#: camel/providers/nntp/camel-nntp-provider.c:44
+#: camel/providers/nntp/camel-nntp-provider.c:43
msgid "This is a provider for reading from and posting toUSENET newsgroups."
msgstr "����� USENET �Υ˥塼�����롼�פ����������뤿��Υץ��Х����Ǥ�"
-#: camel/providers/nntp/camel-nntp-store.c:231
+#: camel/providers/nntp/camel-nntp-store.c:230
#, c-format
msgid "Could not open directory for news server: %s"
msgstr "�˥塼�������ФΥǥ��쥯�ȥ�򳫤����Ȥ�����ޤ���Ǥ���: %s"
-#: camel/providers/nntp/camel-nntp-store.c:297
+#: camel/providers/nntp/camel-nntp-store.c:296
#, c-format
msgid "USENET News via %s"
msgstr "%s ��ͳ�� USENET News"
-#: camel/providers/nntp/camel-nntp-store.c:304
+#: camel/providers/nntp/camel-nntp-store.c:303
msgid ""
"This option will authenticate with the NNTP server using a plaintext "
"password."
msgstr ""
"���Υ��ץ����ϥץ쥤��ƥ����ȥѥ���ɤ�Ȥä� NNTP �����Ф�ǧ�ڤ��ޤ�"
-#: camel/providers/nntp/camel-nntp-store.c:334
-#: camel/providers/nntp/camel-nntp-store.c:496
+#: camel/providers/nntp/camel-nntp-store.c:333
+#: camel/providers/nntp/camel-nntp-store.c:495
#, c-format
msgid "Unable to open or create .newsrc file for %s: %s"
msgstr "%s �� .newsrc �ե����������ޤ��ϳ������Ȥ�����ޤ���: %s"
-#: camel/providers/pop3/camel-pop3-folder.c:176
+#: camel/providers/pop3/camel-pop3-folder.c:175
msgid "Retrieving POP summary"
msgstr "POP ���ޥ�������"
-#: camel/providers/pop3/camel-pop3-folder.c:182
+#: camel/providers/pop3/camel-pop3-folder.c:181
#, c-format
msgid "Could not check POP server for new messages: %s"
msgstr "POP �����Фǿ�����å�����������å����뤳�Ȥ�����ޤ���Ǥ���: %s"
-#: camel/providers/pop3/camel-pop3-folder.c:229
+#: camel/providers/pop3/camel-pop3-folder.c:228
msgid "Could not open folder: message listing was incomplete."
msgstr "�ե�����򳫤��ޤ���Ǥ���: ��å������ꥹ�Ȥ�̤�����Ǥ�"
-#: camel/providers/pop3/camel-pop3-folder.c:253
+#: camel/providers/pop3/camel-pop3-folder.c:252
msgid "Expunging deleted messages"
msgstr "������줿��å�������õ�ޤ�"
-#: camel/providers/pop3/camel-pop3-folder.c:329
+#: camel/providers/pop3/camel-pop3-folder.c:328
#, c-format
msgid "Could not fetch message: %s"
msgstr "��å��������������ޤ���Ǥ���: %s"
-#: camel/providers/pop3/camel-pop3-folder.c:345
+#: camel/providers/pop3/camel-pop3-folder.c:344
#, c-format
msgid "Could not retrieve message from POP server %s: %s"
msgstr "POP ������ %s �����å��������������ޤ���Ǥ���: %s"
-#: camel/providers/pop3/camel-pop3-folder.c:368
+#: camel/providers/pop3/camel-pop3-folder.c:367
#, c-format
msgid "No message with uid %s"
msgstr "uid %s �Υ�å������Ϥ���ޤ���"
-#: camel/providers/pop3/camel-pop3-folder.c:372
+#: camel/providers/pop3/camel-pop3-folder.c:371
#, c-format
msgid "Retrieving POP message %d"
msgstr "POP ������ %d �������"
-#: camel/providers/pop3/camel-pop3-provider.c:37
+#: camel/providers/pop3/camel-pop3-provider.c:36
msgid "Message storage"
msgstr "��å��������ȥ졼��"
-#: camel/providers/pop3/camel-pop3-provider.c:39
+#: camel/providers/pop3/camel-pop3-provider.c:38
msgid "Leave messages on server"
msgstr "�����Ф˥�å�������Ĥ�"
-#: camel/providers/pop3/camel-pop3-provider.c:42
+#: camel/providers/pop3/camel-pop3-provider.c:41
#, c-format
msgid "Delete after %s day(s)"
msgstr "%s ����˺������"
-#: camel/providers/pop3/camel-pop3-provider.c:51 mail/mail-config.glade.h:54
+#: camel/providers/pop3/camel-pop3-provider.c:50 mail/mail-config.glade.h:51
msgid "POP"
msgstr "POP"
-#: camel/providers/pop3/camel-pop3-provider.c:53
+#: camel/providers/pop3/camel-pop3-provider.c:52
msgid "For connecting to and downloading mail from POP servers."
msgstr "POP �����Ф���³���ƥ᡼������������ɤ��뤿��Τ�ΤǤ�"
-#: camel/providers/pop3/camel-pop3-provider.c:70
+#: camel/providers/pop3/camel-pop3-provider.c:69
msgid ""
"This option will connect to the POP server using a plaintext password. This "
"is the only option supported by many POP servers."
@@ -6760,7 +6973,7 @@ msgstr ""
"���Υ��ץ����ϥץ쥤��ƥ����ȤΥѥ���ɤ�Ȥä� POP �����Ф���³���ޤ�. "
"�����¿���� POP �����Фǥ��ݡ��Ȥ���륪�ץ����Ǥ�"
-#: camel/providers/pop3/camel-pop3-provider.c:80
+#: camel/providers/pop3/camel-pop3-provider.c:79
msgid ""
"This option will connect to the POP server using an encrypted password via "
"the APOP protocol. This may not work for all users even on servers that "
@@ -6770,32 +6983,32 @@ msgstr ""
"�Ф���³���ޤ�. ����ϸ�ʿ�ʥ��ݡ��Ȥ��׵᤹�륵���Ф�, ���٤ƤΥ桼��������"
"��ư���櫓�ǤϤ���ޤ���."
-#: camel/providers/pop3/camel-pop3-provider.c:92
+#: camel/providers/pop3/camel-pop3-provider.c:91
msgid ""
"This will connect to the POP server and use Kerberos 4 to authenticate to it."
msgstr "����� POP �����Ф���³��, Kerberos 4 ǧ�ڤ�Ȥ��ޤ�."
-#: camel/providers/pop3/camel-pop3-store.c:199
+#: camel/providers/pop3/camel-pop3-store.c:198
#, c-format
msgid "Could not authenticate to KPOP server: %s"
msgstr "KPOP �����Ф�ǧ�ڽ���ޤ���Ǥ���: %s"
-#: camel/providers/pop3/camel-pop3-store.c:215
+#: camel/providers/pop3/camel-pop3-store.c:214
#, c-format
msgid "Could not connect to server: %s"
msgstr "�����Ф���³���뤳�Ȥ�����ޤ���Ǥ���: %s"
-#: camel/providers/pop3/camel-pop3-store.c:322
+#: camel/providers/pop3/camel-pop3-store.c:321
#, c-format
msgid "Could not connect to POP server on %s."
msgstr "%s �� POP �����Ф���³����ޤ���Ǥ���"
-#: camel/providers/pop3/camel-pop3-store.c:361
+#: camel/providers/pop3/camel-pop3-store.c:360
#, c-format
msgid "%sPlease enter the POP3 password for %s@%s"
msgstr "%s %s@%s �� POP3 �ѥ���ɤ����Ϥ��Ƥ�������"
-#: camel/providers/pop3/camel-pop3-store.c:379
+#: camel/providers/pop3/camel-pop3-store.c:378
#, c-format
msgid ""
"Unable to connect to POP server.\n"
@@ -6804,12 +7017,12 @@ msgstr ""
"POP �����Ф���³����ޤ���\n"
"�桼��̾��������˥��顼: %s"
-#: camel/providers/pop3/camel-pop3-store.c:382
-#: camel/providers/pop3/camel-pop3-store.c:419
+#: camel/providers/pop3/camel-pop3-store.c:381
+#: camel/providers/pop3/camel-pop3-store.c:418
msgid "(Unknown)"
msgstr "(̤��)"
-#: camel/providers/pop3/camel-pop3-store.c:409
+#: camel/providers/pop3/camel-pop3-store.c:408
msgid ""
"Unable to connect to POP server.\n"
"No support for requested authentication mechanism."
@@ -6817,7 +7030,7 @@ msgstr ""
"POP �����Ф���³����ޤ���\n"
"�׵ᤷ��ǧ�ڼ��ʤϥ��ݡ��Ȥ��Ƥ��ޤ���"
-#: camel/providers/pop3/camel-pop3-store.c:417
+#: camel/providers/pop3/camel-pop3-store.c:416
#, c-format
msgid ""
"Unable to connect to POP server.\n"
@@ -6826,195 +7039,195 @@ msgstr ""
"POP �����Ф���³�Ǥ��ޤ���\n"
"�ѥ���ɤ�������˥��顼: %s"
-#: camel/providers/pop3/camel-pop3-store.c:484
+#: camel/providers/pop3/camel-pop3-store.c:483
#, c-format
msgid "No such folder `%s'."
msgstr "���Τ褦�ʥե���� `%s' �Ϥ���ޤ���"
-#: camel/providers/pop3/camel-pop3-store.c:567
+#: camel/providers/pop3/camel-pop3-store.c:566
#, c-format
msgid "Unexpected response from POP server: %s"
msgstr "POP�����Ф���ͽ�����ʤ�����������ޤ���: %s"
-#: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:74
+#: camel/providers/sendmail/camel-sendmail-provider.c:36
+#: mail/mail-config.glade.h:72
msgid "Sendmail"
msgstr "Sendmail"
-#: camel/providers/sendmail/camel-sendmail-provider.c:39
+#: camel/providers/sendmail/camel-sendmail-provider.c:38
msgid ""
"For delivering mail by passing it to the \"sendmail\" program on the local "
"system."
msgstr ""
"�᡼����������뤿��˥������륷���ƥ�� \"sendmail\" �ץ��������Ϥ��ޤ�"
-#: camel/providers/sendmail/camel-sendmail-transport.c:107
+#: camel/providers/sendmail/camel-sendmail-transport.c:106
#, c-format
msgid "Could not create pipe to sendmail: %s: mail not sent"
msgstr ""
"sendmail �إѥ��פ��������ޤ���Ǥ���: %s: �᡼����������ޤ���Ǥ���"
-#: camel/providers/sendmail/camel-sendmail-transport.c:124
+#: camel/providers/sendmail/camel-sendmail-transport.c:123
#, c-format
msgid "Could not fork sendmail: %s: mail not sent"
msgstr "sendmail �� fork ����ޤ���Ǥ���: %s: �᡼����������ޤ���Ǥ���"
-#: camel/providers/sendmail/camel-sendmail-transport.c:150
+#: camel/providers/sendmail/camel-sendmail-transport.c:149
#, c-format
msgid "Could not send message: %s"
msgstr "��å���������������ޤ���Ǥ���: %s"
-#: camel/providers/sendmail/camel-sendmail-transport.c:163
+#: camel/providers/sendmail/camel-sendmail-transport.c:162
#, c-format
msgid "sendmail exited with signal %s: mail not sent."
msgstr "sendmail �ϥ����ʥ� %s �ǽ�λ���ޤ���: �᡼����������ޤ���Ǥ���"
-#: camel/providers/sendmail/camel-sendmail-transport.c:170
+#: camel/providers/sendmail/camel-sendmail-transport.c:169
#, c-format
msgid "Could not execute %s: mail not sent."
msgstr "%s ��¹Խ���ޤ���Ǥ���: �᡼����������ޤ���Ǥ���"
-#: camel/providers/sendmail/camel-sendmail-transport.c:175
+#: camel/providers/sendmail/camel-sendmail-transport.c:174
#, c-format
msgid "sendmail exited with status %d: mail not sent."
msgstr "sendmail �ϥ��ơ����� %d �ǽ�λ���ޤ���: �᡼����������ޤ���Ǥ���"
-#: camel/providers/sendmail/camel-sendmail-transport.c:194
+#: camel/providers/sendmail/camel-sendmail-transport.c:193
msgid "Could not find 'From' address in message"
msgstr "��å������� 'From' ���ɥ쥹�򸫤Ĥ��뤳�Ȥ�����ޤ���Ǥ���"
-#: camel/providers/sendmail/camel-sendmail-transport.c:247
+#: camel/providers/sendmail/camel-sendmail-transport.c:246
msgid "sendmail"
msgstr "sendmail"
-#: camel/providers/sendmail/camel-sendmail-transport.c:249
+#: camel/providers/sendmail/camel-sendmail-transport.c:248
msgid "Mail delivery via the sendmail program"
msgstr "sendmail ��ͳ�ǥ᡼����ۿ�"
-#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:67
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:65
msgid "SMTP"
msgstr "SMTP"
-#: camel/providers/smtp/camel-smtp-provider.c:40
+#: camel/providers/smtp/camel-smtp-provider.c:39
msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
msgstr "SMTP��Ȥäƥ�⡼�ȥ᡼��ϥ֤���³���뤳�Ȥǥ᡼����ۿ����ޤ�\n"
-#: camel/providers/smtp/camel-smtp-transport.c:171
+#: camel/providers/smtp/camel-smtp-transport.c:169
msgid "Syntax error, command unrecognized"
msgstr "��ʸ���ϥ��顼, ���ޥ�ɤǤϤ���ޤ���"
-#: camel/providers/smtp/camel-smtp-transport.c:173
+#: camel/providers/smtp/camel-smtp-transport.c:171
msgid "Syntax error in parameters or arguments"
msgstr "�ѥ�᡼�����뤤�ϰ����˹�ʸ���ϥ��顼"
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:173
msgid "Command not implemented"
msgstr "���ޥ�ɤϼ�������Ƥ��ޤ���"
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:175
msgid "Command parameter not implemented"
msgstr "���ޥ�ɥѥ�᡼���ϼ�������Ƥ��ޤ���"
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:177
msgid "System status, or system help reply"
msgstr "�����ƥॹ�ơ��������뤤�ϥ����ƥ�إ�ױ���"
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: camel/providers/smtp/camel-smtp-transport.c:179
msgid "Help message"
msgstr "�إ�ץ�å�����"
-#: camel/providers/smtp/camel-smtp-transport.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:181
msgid "Service ready"
msgstr "�����ӥ������ѤǤ��ޤ�"
-#: camel/providers/smtp/camel-smtp-transport.c:185
+#: camel/providers/smtp/camel-smtp-transport.c:183
msgid "Service closing transmission channel"
msgstr "�����ӥ������������ͥ���Ĥ��Ƥ��ޤ�"
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:185
msgid "Service not available, closing transmission channel"
msgstr "�����ӥ������ѤǤ��ޤ���, ���������ͥ���Ĥ��Ƥ��ޤ�"
-#: camel/providers/smtp/camel-smtp-transport.c:189
+#: camel/providers/smtp/camel-smtp-transport.c:187
msgid "Requested mail action okay, completed"
msgstr "�׵ᤵ�줿�᡼���ư���OK, ��λ���ޤ���"
-#: camel/providers/smtp/camel-smtp-transport.c:191
+#: camel/providers/smtp/camel-smtp-transport.c:189
msgid "User not local; will forward to <forward-path>"
msgstr "�桼���ϥ�������ǤϤ���ޤ���; <forward-path> ��ž�����ޤ�"
-#: camel/providers/smtp/camel-smtp-transport.c:193
+#: camel/providers/smtp/camel-smtp-transport.c:191
msgid "Requested mail action not taken: mailbox unavailable"
msgstr "�׵ᤵ�줿�᡼���ư��ϴ�λ���ޤ���: �᡼��ܥå��������ѤǤ��ޤ���"
-#: camel/providers/smtp/camel-smtp-transport.c:195
+#: camel/providers/smtp/camel-smtp-transport.c:193
msgid "Requested action not taken: mailbox unavailable"
msgstr "�׵ᤵ�줿ư��ϴ�λ���ޤ���: �᡼��ܥå��������ѤǤ��ޤ���"
-#: camel/providers/smtp/camel-smtp-transport.c:197
+#: camel/providers/smtp/camel-smtp-transport.c:195
msgid "Requested action aborted: error in processing"
msgstr "�׵ᤵ�줿ư������Ǥ��ޤ���: ������˥��顼"
-#: camel/providers/smtp/camel-smtp-transport.c:199
+#: camel/providers/smtp/camel-smtp-transport.c:197
msgid "User not local; please try <forward-path>"
msgstr "�桼���ϥ�������ǤϤ���ޤ���; <forward-path> ���Ƥ�������"
-#: camel/providers/smtp/camel-smtp-transport.c:201
+#: camel/providers/smtp/camel-smtp-transport.c:199
msgid "Requested action not taken: insufficient system storage"
msgstr "�׵ᤵ�줿ư��ϴ�λ���ޤ���: �����ƥ����¸�ΰ褬­��ޤ���"
-#: camel/providers/smtp/camel-smtp-transport.c:203
+#: camel/providers/smtp/camel-smtp-transport.c:201
msgid "Requested mail action aborted: exceeded storage allocation"
msgstr "�׵ᤵ�줿�᡼���ư������Ǥ��ޤ���: �ΰ������Ƥ�ۤ��ޤ���"
-#: camel/providers/smtp/camel-smtp-transport.c:205
+#: camel/providers/smtp/camel-smtp-transport.c:203
msgid "Requested action not taken: mailbox name not allowed"
msgstr "�׵ᤵ�줿ư��ϴ�λ���ޤ���: �᡼��ܥå���̾��ǧ����ޤ���"
-#: camel/providers/smtp/camel-smtp-transport.c:207
+#: camel/providers/smtp/camel-smtp-transport.c:205
msgid "Start mail input; end with <CRLF>.<CRLF>"
msgstr "�᡼������Ϥ򳫻Ϥ��ޤ�; <CRLF>.<CRLF> �ǽ�λ���ޤ�"
-#: camel/providers/smtp/camel-smtp-transport.c:209
+#: camel/providers/smtp/camel-smtp-transport.c:207
msgid "Transaction failed"
msgstr "�����ϼ��Ԥ��ޤ���"
-#: camel/providers/smtp/camel-smtp-transport.c:213
+#: camel/providers/smtp/camel-smtp-transport.c:211
msgid "A password transition is needed"
msgstr "�ѥ���ɤ��ѹ���ɬ�פǤ�"
-#: camel/providers/smtp/camel-smtp-transport.c:215
+#: camel/providers/smtp/camel-smtp-transport.c:213
msgid "Authentication mechanism is too weak"
msgstr "ǧ�ڥᥫ�˥�����Խ�ʬ�᤮�ޤ�"
-#: camel/providers/smtp/camel-smtp-transport.c:217
+#: camel/providers/smtp/camel-smtp-transport.c:215
msgid "Encryption required for requested authentication mechanism"
msgstr "�׵ᤷ��ǧ�ڥᥫ�˥���Τ���˰Ź沽��ɬ�פǤ�"
-#: camel/providers/smtp/camel-smtp-transport.c:219
+#: camel/providers/smtp/camel-smtp-transport.c:217
msgid "Temporary authentication failure"
msgstr "���Ū��ǧ�ڤ˼��Ԥ��ޤ���"
-#: camel/providers/smtp/camel-smtp-transport.c:221
+#: camel/providers/smtp/camel-smtp-transport.c:219
msgid "Authentication required"
msgstr "ǧ�ڤ�ɬ�פȤ��Ƥ��ޤ�"
-#: camel/providers/smtp/camel-smtp-transport.c:316
+#: camel/providers/smtp/camel-smtp-transport.c:314
#, c-format
msgid "Welcome response error: %s: possibly non-fatal"
msgstr "����������顼: %s: ���֤���̿Ū�ǤϤ���ޤ���"
-#: camel/providers/smtp/camel-smtp-transport.c:378
+#: camel/providers/smtp/camel-smtp-transport.c:376
#, c-format
msgid "SMTP server %s does not support requested authentication type %s"
msgstr "SMTP ������ %s ���׵ᤷ��ǧ�ڥ����� %s �򥵥ݡ��Ȥ��Ƥ��ޤ���"
-#: camel/providers/smtp/camel-smtp-transport.c:417
+#: camel/providers/smtp/camel-smtp-transport.c:415
#, c-format
msgid "%sPlease enter the SMTP password for %s@%s"
msgstr "%s %s@%s �� SMTP �ѥ���ɤ����Ϥ��Ƥ�������"
-#: camel/providers/smtp/camel-smtp-transport.c:440
+#: camel/providers/smtp/camel-smtp-transport.c:438
#, c-format
msgid ""
"Unable to authenticate to SMTP server.\n"
@@ -7025,169 +7238,169 @@ msgstr ""
"%s\n"
"\n"
-#: camel/providers/smtp/camel-smtp-transport.c:556
+#: camel/providers/smtp/camel-smtp-transport.c:554
#, c-format
msgid "SMTP server %s"
msgstr "SMTP ������ %s"
-#: camel/providers/smtp/camel-smtp-transport.c:558
+#: camel/providers/smtp/camel-smtp-transport.c:556
#, c-format
msgid "SMTP mail delivery via %s"
msgstr "%s ��ͳ�� SMTP �᡼����ۿ����ޤ�"
-#: camel/providers/smtp/camel-smtp-transport.c:583
+#: camel/providers/smtp/camel-smtp-transport.c:581
msgid "Cannot send message: sender address not defined."
msgstr "��å���������������ޤ���: �����ԤΥ��ɥ쥹���������Ƥ��ޤ���"
-#: camel/providers/smtp/camel-smtp-transport.c:590
+#: camel/providers/smtp/camel-smtp-transport.c:588
msgid "Cannot send message: sender address not valid."
msgstr "��å���������������ޤ���: �����ԤΥ��ɥ쥹������������ޤ���"
-#: camel/providers/smtp/camel-smtp-transport.c:595 mail/mail-ops.c:546
+#: camel/providers/smtp/camel-smtp-transport.c:593 mail/mail-ops.c:561
msgid "Sending message"
msgstr "��������������"
-#: camel/providers/smtp/camel-smtp-transport.c:606
+#: camel/providers/smtp/camel-smtp-transport.c:604
msgid "Cannot send message: no recipients defined."
msgstr "��å���������������ޤ���: �����Ԥ��������Ƥ��ޤ���"
-#: camel/providers/smtp/camel-smtp-transport.c:686
+#: camel/providers/smtp/camel-smtp-transport.c:684
msgid "SMTP Greeting"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:708
+#: camel/providers/smtp/camel-smtp-transport.c:706
#, c-format
msgid "HELO request timed out: %s: non-fatal"
msgstr "HELO �׵�Υ����ॢ����: %s: ��̿Ū�ǤϤ���ޤ���"
-#: camel/providers/smtp/camel-smtp-transport.c:728
+#: camel/providers/smtp/camel-smtp-transport.c:726
#, c-format
msgid "HELO response error: %s: non-fatal"
msgstr "HELO �쥹�ݥ󥹥��顼: %s: ��̿Ū�ǤϤ���ޤ���"
-#: camel/providers/smtp/camel-smtp-transport.c:760
+#: camel/providers/smtp/camel-smtp-transport.c:758
msgid "SMTP Authentication"
msgstr "SMTP ǧ��"
-#: camel/providers/smtp/camel-smtp-transport.c:766
+#: camel/providers/smtp/camel-smtp-transport.c:764
msgid "Error creating SASL authentication object."
msgstr "SASL ǧ�ڥ��֥������Ȥ�������˥��顼��ȯ�����ޤ���"
-#: camel/providers/smtp/camel-smtp-transport.c:781
-#: camel/providers/smtp/camel-smtp-transport.c:793
+#: camel/providers/smtp/camel-smtp-transport.c:779
+#: camel/providers/smtp/camel-smtp-transport.c:791
#, c-format
msgid "AUTH request timed out: %s"
msgstr "AUTH �׵�Υ����ॢ����: %s"
-#: camel/providers/smtp/camel-smtp-transport.c:802
+#: camel/providers/smtp/camel-smtp-transport.c:800
msgid "AUTH request failed."
msgstr "AUTH �׵�˼��Ԥ��ޤ���"
-#: camel/providers/smtp/camel-smtp-transport.c:850
+#: camel/providers/smtp/camel-smtp-transport.c:848
msgid "Bad authentication response from server.\n"
msgstr "�����Ф���ְ�ä�ǧ�ڱ���������ޤ���\n"
-#: camel/providers/smtp/camel-smtp-transport.c:876
+#: camel/providers/smtp/camel-smtp-transport.c:874
#, c-format
msgid "MAIL FROM request timed out: %s: mail not sent"
msgstr "MAIL FROM �׵�Υ����ॢ����: %s: �᡼����������ޤ���Ǥ���"
-#: camel/providers/smtp/camel-smtp-transport.c:895
+#: camel/providers/smtp/camel-smtp-transport.c:893
#, c-format
msgid "MAIL FROM response error: %s: mail not sent"
msgstr "MAIL FROM �쥹�ݥ󥹥��顼: %s: �᡼����������ޤ���Ǥ���"
-#: camel/providers/smtp/camel-smtp-transport.c:920
+#: camel/providers/smtp/camel-smtp-transport.c:918
#, c-format
msgid "RCPT TO request timed out: %s: mail not sent"
msgstr "RCPT TO �׵�Υ����ॢ����: %s: �᡼����������ޤ���Ǥ���"
-#: camel/providers/smtp/camel-smtp-transport.c:939
+#: camel/providers/smtp/camel-smtp-transport.c:937
#, c-format
msgid "RCPT TO response error: %s: mail not sent"
msgstr "RCPT TO �쥹�ݥ󥹥��顼: %s: �᡼����������ޤ���Ǥ���"
-#: camel/providers/smtp/camel-smtp-transport.c:970
+#: camel/providers/smtp/camel-smtp-transport.c:971
#, c-format
msgid "DATA request timed out: %s: mail not sent"
msgstr "DATA �׵�Υ����ॢ����: %s: �᡼����������ޤ���Ǥ���"
-#: camel/providers/smtp/camel-smtp-transport.c:989
+#: camel/providers/smtp/camel-smtp-transport.c:990
#, c-format
msgid "DATA response error: %s: mail not sent"
msgstr "DATA �쥹�ݥ󥹥��顼: %s: �᡼����������ޤ���Ǥ���"
-#: camel/providers/smtp/camel-smtp-transport.c:1008
-#: camel/providers/smtp/camel-smtp-transport.c:1026
+#: camel/providers/smtp/camel-smtp-transport.c:1030
+#: camel/providers/smtp/camel-smtp-transport.c:1048
#, c-format
msgid "DATA send timed out: message termination: %s: mail not sent"
msgstr ""
"DATA �����Υ����ॢ����: ��å������ν�λ: %s: �᡼����������ޤ���Ǥ���"
-#: camel/providers/smtp/camel-smtp-transport.c:1045
+#: camel/providers/smtp/camel-smtp-transport.c:1067
#, c-format
msgid "DATA response error: message termination: %s: mail not sent"
msgstr ""
"DATA �쥹�ݥ󥹥��顼: ��å������ν�λ: %s: �᡼����������ޤ���Ǥ���"
-#: camel/providers/smtp/camel-smtp-transport.c:1069
+#: camel/providers/smtp/camel-smtp-transport.c:1091
#, c-format
msgid "RSET request timed out: %s"
msgstr "RSET �׵�Υ����ॢ����: %s"
-#: camel/providers/smtp/camel-smtp-transport.c:1088
+#: camel/providers/smtp/camel-smtp-transport.c:1110
#, c-format
msgid "RSET response error: %s"
msgstr "RSET �쥹�ݥ󥹥��顼: %s"
-#: camel/providers/smtp/camel-smtp-transport.c:1111
+#: camel/providers/smtp/camel-smtp-transport.c:1133
#, c-format
msgid "QUIT request timed out: %s: non-fatal"
msgstr "QUIT �׵�Υ����ॢ����: %s: ��̿Ū�ǤϤ���ޤ���"
-#: camel/providers/smtp/camel-smtp-transport.c:1130
+#: camel/providers/smtp/camel-smtp-transport.c:1152
#, c-format
msgid "QUIT response error: %s: non-fatal"
msgstr "QUIT �쥹�ݥ󥹥��顼: %s: ��̿Ū�ǤϤ���ޤ���"
-#: composer/e-msg-composer-attachment-bar.c:99
+#: composer/e-msg-composer-attachment-bar.c:101
msgid "1 byte"
msgstr "1 ����"
-#: composer/e-msg-composer-attachment-bar.c:101
+#: composer/e-msg-composer-attachment-bar.c:103
#, c-format
msgid "%u bytes"
msgstr "%u ����"
-#: composer/e-msg-composer-attachment-bar.c:108
+#: composer/e-msg-composer-attachment-bar.c:110
#, c-format
msgid "%.1fK"
msgstr "%.1fK"
-#: composer/e-msg-composer-attachment-bar.c:112
+#: composer/e-msg-composer-attachment-bar.c:114
#, c-format
msgid "%.1fM"
msgstr "%.1fM"
-#: composer/e-msg-composer-attachment-bar.c:116
+#: composer/e-msg-composer-attachment-bar.c:118
#, c-format
msgid "%.1fG"
msgstr "%.1fG"
#. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:357 mail/mail-display.c:134
+#: composer/e-msg-composer-attachment-bar.c:359 mail/mail-display.c:136
msgid "attachment"
msgstr "ź��"
-#: composer/e-msg-composer-attachment-bar.c:498
+#: composer/e-msg-composer-attachment-bar.c:500
msgid "Remove selected items from the attachment list"
msgstr "ź��ʪ�ꥹ�Ȥ������򤷤������ƥ�������ޤ�"
-#: composer/e-msg-composer-attachment-bar.c:529
+#: composer/e-msg-composer-attachment-bar.c:531
msgid "Add attachment..."
msgstr "ź�դ��ɲ�..."
-#: composer/e-msg-composer-attachment-bar.c:530
+#: composer/e-msg-composer-attachment-bar.c:532
msgid "Attach a file to the message"
msgstr "��å������إե������ź�դ��ޤ�"
@@ -7219,52 +7432,52 @@ msgstr "MIME ������:"
msgid "Suggest automatic display of attachment"
msgstr ""
-#: composer/e-msg-composer-hdrs.c:326
+#: composer/e-msg-composer-hdrs.c:327
msgid "Click here for the address book"
msgstr "���ɥ쥹Ģ�Τ���ˤ����ǥ���å�"
#.
#. * From:
#.
-#: composer/e-msg-composer-hdrs.c:357
+#: composer/e-msg-composer-hdrs.c:358
msgid "From:"
msgstr "���п�:"
#.
#. * Reply-To:
#.
-#: composer/e-msg-composer-hdrs.c:363
+#: composer/e-msg-composer-hdrs.c:364
msgid "Reply-To:"
msgstr "�ֿ���:"
#.
#. * Subject:
#.
-#: composer/e-msg-composer-hdrs.c:374
+#: composer/e-msg-composer-hdrs.c:375
msgid "Subject:"
msgstr "��̾:"
-#: composer/e-msg-composer-hdrs.c:388
+#: composer/e-msg-composer-hdrs.c:389
msgid "To:"
msgstr "����:"
-#: composer/e-msg-composer-hdrs.c:389
+#: composer/e-msg-composer-hdrs.c:390
msgid "Enter the recipients of the message"
msgstr "��å������μ����Ԥ����Ϥ��ޤ�"
-#: composer/e-msg-composer-hdrs.c:392
+#: composer/e-msg-composer-hdrs.c:393
msgid "Cc:"
msgstr "Cc:"
-#: composer/e-msg-composer-hdrs.c:393
+#: composer/e-msg-composer-hdrs.c:394
msgid "Enter the addresses that will receive a carbon copy of the message"
msgstr "��å������Υ����ܥ󥳥ԡ���������륢�ɥ쥹�����Ϥ��ޤ�"
-#: composer/e-msg-composer-hdrs.c:396
+#: composer/e-msg-composer-hdrs.c:397
msgid "Bcc:"
msgstr "Bcc:"
-#: composer/e-msg-composer-hdrs.c:397
+#: composer/e-msg-composer-hdrs.c:398
msgid ""
"Enter the addresses that will receive a carbon copy of the message without "
"appearing in the recipient list of the message."
@@ -7277,7 +7490,7 @@ msgstr ""
msgid "Attach a file"
msgstr "�ե������ź�դ��ޤ�"
-#: composer/e-msg-composer.c:676
+#: composer/e-msg-composer.c:690
#, c-format
msgid ""
"Error while reading file %s:\n"
@@ -7286,29 +7499,29 @@ msgstr ""
"�ե�������ɤ߹�����˥��顼: %s\n"
"%s"
-#: composer/e-msg-composer.c:858
+#: composer/e-msg-composer.c:873
msgid "Save as..."
msgstr "��̾����¸..."
-#: composer/e-msg-composer.c:867
+#: composer/e-msg-composer.c:882
msgid "Warning!"
msgstr "�ٹ�!"
-#: composer/e-msg-composer.c:871
+#: composer/e-msg-composer.c:886
msgid "File exists, overwrite?"
msgstr "�ե������¸�ߤ��ޤ�����񤭤��ޤ���?"
-#: composer/e-msg-composer.c:893
+#: composer/e-msg-composer.c:908
#, c-format
msgid "Error saving file: %s"
msgstr "�ե��������¸��˥��顼: %s"
-#: composer/e-msg-composer.c:912
+#: composer/e-msg-composer.c:927
#, c-format
msgid "Error loading file: %s"
msgstr "�ե�����Υ�������˥��顼: %s"
-#: composer/e-msg-composer.c:983
+#: composer/e-msg-composer.c:998
msgid ""
"Unable to open the drafts folder for this account.\n"
"Would you like to use the default drafts folder?"
@@ -7316,16 +7529,16 @@ msgstr ""
"���Υ�������Ȥ���ƥե�����򳫤����Ȥ�����ޤ���\n"
"�ǥե���Ȥ���ƥե������ȤäƤ��������Ǥ���?"
-#: composer/e-msg-composer.c:1036
+#: composer/e-msg-composer.c:1048
#, c-format
msgid "Error accessing file: %s"
msgstr "�ե�����Υ���������˥��顼: %s"
-#: composer/e-msg-composer.c:1044
+#: composer/e-msg-composer.c:1056
msgid "Unable to retrieve message from editor"
msgstr "���ǥ��������å��������������ޤ���Ǥ���"
-#: composer/e-msg-composer.c:1051
+#: composer/e-msg-composer.c:1063
#, c-format
msgid ""
"Unable to seek on file: %s\n"
@@ -7334,7 +7547,7 @@ msgstr ""
"�ե�����������Ǥ��ޤ���: %s\n"
"%s"
-#: composer/e-msg-composer.c:1058
+#: composer/e-msg-composer.c:1070
#, c-format
msgid ""
"Unable to truncate file: %s\n"
@@ -7343,7 +7556,7 @@ msgstr ""
"�ե�������ڤ�ͤ�뤳�Ȥ�����ޤ���: %s\n"
"%s"
-#: composer/e-msg-composer.c:1067
+#: composer/e-msg-composer.c:1079
#, c-format
msgid ""
"Error autosaving message: %s\n"
@@ -7352,7 +7565,7 @@ msgstr ""
"��å������μ�ư��¸��˥��顼: %s\n"
" %s"
-#: composer/e-msg-composer.c:1169
+#: composer/e-msg-composer.c:1181
msgid ""
"Ximian Evolution has found unsaved files from a previous session.\n"
"Would you like to try to recover them?"
@@ -7360,7 +7573,7 @@ msgstr ""
"Evolution �� ����Υ��å�������¸����Ƥ��ʤ��ե������ȯ�����ޤ�����\n"
"������ꥫ�Хꤷ�Ƥߤޤ���?"
-#: composer/e-msg-composer.c:1317
+#: composer/e-msg-composer.c:1334
msgid ""
"This message has not been sent.\n"
"\n"
@@ -7370,27 +7583,38 @@ msgstr ""
"\n"
"�ѹ�����¸���ޤ���?"
-#: composer/e-msg-composer.c:1324
+#: composer/e-msg-composer.c:1341
msgid "Warning: Modified Message"
msgstr "�ٹ�: �ѹ����줿��å�����"
-#: composer/e-msg-composer.c:1347
+#: composer/e-msg-composer.c:1364
msgid "Open file"
msgstr "�ե�����򳫤�"
-#: composer/e-msg-composer.c:1496
+#: composer/e-msg-composer.c:1513
msgid "Insert File"
msgstr "�ե����������"
-#: composer/e-msg-composer.c:1871 composer/e-msg-composer.c:2317
+#: composer/e-msg-composer.c:1888 composer/e-msg-composer.c:2329
msgid "Compose a message"
msgstr "��å�������������ޤ�"
-#: composer/e-msg-composer.c:2407
-msgid "Could not create composer window."
-msgstr "�᡼�����������ɥ����������ޤ���Ǥ���"
+#: composer/e-msg-composer.c:2346
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate address selector control."
+msgstr ""
-#: composer/evolution-composer.c:349
+#: composer/e-msg-composer.c:2369
+#, fuzzy
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate HTML editor component."
+msgstr ""
+"�᡼�륳��ݡ��ͥ�Ȥˤޤ���������Ƥ��ʤ�����\n"
+"��å���������������ɥ���������뤳�Ȥ�����ޤ���Ǥ���"
+
+#: composer/evolution-composer.c:367
msgid ""
"Could not create composer window, because you have not yet\n"
"configured any identities in the mail component."
@@ -7398,11 +7622,11 @@ msgstr ""
"�᡼�륳��ݡ��ͥ�Ȥˤޤ���������Ƥ��ʤ�����\n"
"��å���������������ɥ���������뤳�Ȥ�����ޤ���Ǥ���"
-#: composer/evolution-composer.c:364
+#: composer/evolution-composer.c:382
msgid "Cannot initialize Evolution's composer."
msgstr "Evolution �᡼������ν����������ޤ���"
-#: data/evolution.desktop.in.h:1 shell/main.c:80
+#: data/evolution.desktop.in.h:1 shell/main.c:83
msgid "Evolution"
msgstr "Evolution"
@@ -7450,15 +7674,24 @@ msgstr "��̾�����Τ�Τ�ޤ�"
msgid "Subject does not contain"
msgstr "��̾�����Τ�Τ�ޤޤʤ�"
+#. Remember the password?
+#: e-util/e-passwords.c:347 mail/mail-session.c:258
+msgid "Remember this password"
+msgstr "���Υѥ���ɤ򵭲�"
+
+#: e-util/e-passwords.c:349 mail/mail-session.c:259
+msgid "Remember this password for the remainder of this session"
+msgstr ""
+
#. strptime format of a weekday, a date and a time,
#. in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:168 e-util/e-time-utils.c:359
+#: e-util/e-time-utils.c:168 e-util/e-time-utils.c:362
msgid "%a %m/%d/%Y %I:%M %p"
msgstr "%Y/%m/%d (%a) %p %I:%M"
#. strptime format of a weekday, a date and a time,
#. in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:173 e-util/e-time-utils.c:350
+#: e-util/e-time-utils.c:173 e-util/e-time-utils.c:353
msgid "%a %m/%d/%Y %H:%M"
msgstr "%Y/%m/%d (%a) %H:%M"
@@ -7509,30 +7742,30 @@ msgid "%m/%d/%Y %H"
msgstr "%Y/%m/%d %H"
#. strptime format for a time of day, in 12-hour format.
-#: e-util/e-time-utils.c:300 e-util/e-time-utils.c:399
+#: e-util/e-time-utils.c:303 e-util/e-time-utils.c:402
msgid "%I:%M:%S %p"
msgstr "%p %I:%M:%S"
#. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:304 e-util/e-time-utils.c:391
+#: e-util/e-time-utils.c:307 e-util/e-time-utils.c:394
msgid "%H:%M:%S"
msgstr "%H:%M:%S"
#. strptime format for time of day, without seconds,
#. in 12-hour format.
-#: e-util/e-time-utils.c:309 e-util/e-time-utils.c:396
-#: widgets/misc/e-dateedit.c:1385 widgets/misc/e-dateedit.c:1612
+#: e-util/e-time-utils.c:312 e-util/e-time-utils.c:399
+#: widgets/misc/e-dateedit.c:1391 widgets/misc/e-dateedit.c:1618
msgid "%I:%M %p"
msgstr "%p %I:%M"
#. strptime format for time of day, without seconds 24-hour format.
-#: e-util/e-time-utils.c:313 e-util/e-time-utils.c:388
-#: widgets/misc/e-dateedit.c:1382 widgets/misc/e-dateedit.c:1609
+#: e-util/e-time-utils.c:316 e-util/e-time-utils.c:391
+#: widgets/misc/e-dateedit.c:1388 widgets/misc/e-dateedit.c:1615
msgid "%H:%M"
msgstr "%H:%M"
#. strptime format for hour and AM/PM, 12-hour format.
-#: e-util/e-time-utils.c:317
+#: e-util/e-time-utils.c:320
msgid "%I %p"
msgstr "%p %I"
@@ -7668,7 +7901,7 @@ msgstr "����"
msgid "Add action"
msgstr "ư����ɲ�"
-#: filter/filter-folder.c:147
+#: filter/filter-folder.c:156
msgid ""
"You forgot to choose a folder.\n"
"Please go back and specify a valid folder to deliver mail to."
@@ -7676,16 +7909,16 @@ msgstr ""
"�ե�����������˺��Ƥ��ޤ�\n"
"��äƥ᡼�����������ͭ���ʥե��������ꤷ�Ƥ�������"
-#: filter/filter-folder.c:232 filter/vfolder-rule.c:356
-#: mail/mail-account-gui.c:822
+#: filter/filter-folder.c:242 filter/vfolder-rule.c:356
+#: mail/mail-account-gui.c:834
msgid "Select Folder"
msgstr "�ե����������"
-#: filter/filter-folder.c:257
+#: filter/filter-folder.c:267
msgid "Enter folder URI"
msgstr "�ե���� URI ������"
-#: filter/filter-folder.c:303
+#: filter/filter-folder.c:314
msgid "<click here to select a folder>"
msgstr "<�ե���������򤹤뤿��ˤ����򥯥�å����Ƥ�������>"
@@ -7702,39 +7935,39 @@ msgstr ""
msgid "Test"
msgstr "�ƥ���"
-#: filter/filter-rule.c:696
+#: filter/filter-rule.c:708
msgid "Rule name: "
msgstr "�롼��̾: "
-#: filter/filter-rule.c:700
+#: filter/filter-rule.c:712
msgid "Untitled"
msgstr "�����ȥ�ʤ�"
-#: filter/filter-rule.c:717
+#: filter/filter-rule.c:729
msgid "If"
msgstr "�⤷"
-#: filter/filter-rule.c:735
+#: filter/filter-rule.c:747
msgid "Execute actions"
msgstr "���ξ���ư���¹�:"
-#: filter/filter-rule.c:739
+#: filter/filter-rule.c:751
msgid "if all criteria are met"
msgstr "���٤Ƥδ�ब��ä���"
-#: filter/filter-rule.c:744
+#: filter/filter-rule.c:756
msgid "if any criteria are met"
msgstr "�����Ĥ��δ�ब��ä���"
-#: filter/filter-rule.c:755
+#: filter/filter-rule.c:767
msgid "Add criterion"
msgstr "�����ɲ�"
-#: filter/filter-rule.c:840
+#: filter/filter-rule.c:852
msgid "incoming"
msgstr "����"
-#: filter/filter-rule.c:840
+#: filter/filter-rule.c:852
msgid "outgoing"
msgstr "����"
@@ -7927,7 +8160,7 @@ msgstr "�ֿ���"
msgid "Score"
msgstr "��Ͽ"
-#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1326
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1383
msgid "Sender"
msgstr "������"
@@ -7959,7 +8192,7 @@ msgstr "�����Τ�Τdz��Ϥ���"
msgid "Stop Processing"
msgstr "�������"
-#: filter/libfilter-i18n.h:51 mail/mail-format.c:926
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:901
#: mail/message-list.etspec.h:9
msgid "Subject"
msgstr "��̾"
@@ -7972,15 +8205,15 @@ msgstr "���������"
msgid "was before"
msgstr "����������"
-#: filter/rule-editor.c:147
+#: filter/rule-editor.c:179
msgid "Rules"
msgstr "�롼��"
-#: filter/rule-editor.c:240
+#: filter/rule-editor.c:278
msgid "Add Rule"
msgstr "�롼����ɲ�"
-#: filter/rule-editor.c:301
+#: filter/rule-editor.c:344
msgid "Edit Rule"
msgstr "�롼����Խ�"
@@ -7988,42 +8221,42 @@ msgstr "�롼����Խ�"
msgid "Score Rules"
msgstr "�������롼��"
-#: filter/vfolder-rule.c:206
+#: filter/vfolder-rule.c:205
msgid "You need to to specify at least one folder as a source."
msgstr ""
-#: importers/elm-importer.c:96
+#: importers/elm-importer.c:95
msgid "Evolution is importing your old Elm mail"
msgstr "Evolution �� ���ʤ��θŤ� Elm �᡼��򥤥�ݡ�����"
-#: importers/elm-importer.c:97 importers/netscape-importer.c:108
-#: importers/pine-importer.c:102
+#: importers/elm-importer.c:96 importers/netscape-importer.c:107
+#: importers/pine-importer.c:101
msgid "Importing..."
msgstr "����ݡ�����..."
-#: importers/elm-importer.c:99 importers/netscape-importer.c:110
-#: importers/pine-importer.c:104
+#: importers/elm-importer.c:98 importers/netscape-importer.c:109
+#: importers/pine-importer.c:103
msgid "Please wait"
msgstr "���Ф餯���Ԥ���������"
-#: importers/elm-importer.c:171 importers/netscape-importer.c:708
-#: importers/pine-importer.c:369
+#: importers/elm-importer.c:170 importers/netscape-importer.c:692
+#: importers/pine-importer.c:368
#, c-format
msgid "Importing %s as %s"
msgstr "%s �� %s �Ȥ��ƥ���ݡ�����"
-#: importers/elm-importer.c:377 importers/netscape-importer.c:801
-#: importers/pine-importer.c:506
+#: importers/elm-importer.c:376 importers/netscape-importer.c:785
+#: importers/pine-importer.c:474
#, c-format
msgid "Scanning %s"
msgstr "%s ��������"
-#: importers/elm-importer.c:528 importers/netscape-importer.c:974
-#: importers/pine-importer.c:669 mail/component-factory.c:96
+#: importers/elm-importer.c:527 importers/netscape-importer.c:958
+#: importers/pine-importer.c:637 mail/component-factory.c:100
msgid "Mail"
msgstr "�᡼��"
-#: importers/elm-importer.c:548
+#: importers/elm-importer.c:547
msgid ""
"Evolution has found Elm mail files\n"
"Would you like to import them into Evolution?"
@@ -8031,19 +8264,15 @@ msgstr ""
"Evolution �� Elm �᡼��ե������ȯ�����ޤ���\n"
"Evolution �إ���ݡ��Ȥ��Ƥ��������Ǥ���?"
-#: importers/elm-importer.c:577
+#: importers/elm-importer.c:576
msgid "Elm"
msgstr ""
-#: importers/evolution-gnomecard-importer.c:230
-msgid "GnomeCard:"
-msgstr "GNOME ������: "
-
-#: importers/evolution-gnomecard-importer.c:231 importers/pine-importer.c:674
+#: importers/evolution-gnomecard-importer.c:229 importers/pine-importer.c:642
msgid "Addressbook"
msgstr "���ɥ쥹Ģ"
-#: importers/evolution-gnomecard-importer.c:250
+#: importers/evolution-gnomecard-importer.c:247
msgid ""
"Evolution has found GnomeCard files.\n"
"Would you like them to be imported into Evolution?"
@@ -8051,23 +8280,23 @@ msgstr ""
"Evolution �� GnomeCard �ե������ȯ�����ޤ���\n"
"Evolution �إ���ݡ��Ȥ��Ƥ��������Ǥ���?"
-#: importers/netscape-importer.c:107
+#: importers/netscape-importer.c:106
msgid "Evolution is importing your old Netscape data"
msgstr ""
-#: importers/netscape-importer.c:904 importers/pine-importer.c:602
+#: importers/netscape-importer.c:888 importers/pine-importer.c:570
msgid "Scanning directory"
msgstr "�ǥ��쥯�ȥ��������"
-#: importers/netscape-importer.c:913
+#: importers/netscape-importer.c:897
msgid "Starting import"
msgstr "����ݡ��ȳ���"
-#: importers/netscape-importer.c:979
+#: importers/netscape-importer.c:963
msgid "Settings"
msgstr "����"
-#: importers/netscape-importer.c:1000
+#: importers/netscape-importer.c:984
msgid ""
"Evolution has found Netscape mail files.\n"
"Would you like them to be imported into Evolution?"
@@ -8075,11 +8304,11 @@ msgstr ""
"Evolution �� Netscape �᡼��ե������ȯ�����ޤ���\n"
"Evolution �إ���ݡ��Ȥ��Ƥ��������Ǥ���?"
-#: importers/pine-importer.c:101
+#: importers/pine-importer.c:100
msgid "Evolution is importing your old Pine data"
msgstr ""
-#: importers/pine-importer.c:695
+#: importers/pine-importer.c:663
msgid ""
"Evolution has found Pine mail files.\n"
"Would you like to import them into Evolution?"
@@ -8087,7 +8316,7 @@ msgstr ""
"Evolution �� Pine �᡼��ե������ȯ�����ޤ���\n"
"Evolution �إ���ݡ��Ȥ��Ƥ��������Ǥ���?"
-#: importers/pine-importer.c:723
+#: importers/pine-importer.c:691
msgid "Pine"
msgstr "Pine"
@@ -8123,240 +8352,245 @@ msgstr "�᡼�륵�ޥꥳ��ݡ��ͥ�ȤΤ���Υե����ȥ�"
msgid "Mail configuration interface"
msgstr "�᡼������Υ��󥿡��ե�����"
-#: mail/component-factory.c:96
+#: mail/component-factory.c:100
msgid "Folder containing mail"
msgstr "�᡼���ޤ�ե����"
-#: mail/component-factory.c:97
+#: mail/component-factory.c:101
msgid "Mail storage folder (internal)"
msgstr ""
-#: mail/component-factory.c:98
+#: mail/component-factory.c:102
msgid "Virtual Trash"
msgstr "���ۤ���Ȣ"
-#: mail/component-factory.c:98
+#: mail/component-factory.c:102
msgid "Virtual Trash folder"
msgstr "���ۤ���Ȣ�ե����"
-#: mail/component-factory.c:125
+#: mail/component-factory.c:129
#, c-format
msgid "Cannot connect to store: %s"
msgstr "���ȥ�����³���뤳�Ȥ�����ޤ���Ǥ���: %s"
-#: mail/component-factory.c:146
+#: mail/component-factory.c:147
msgid "This folder cannot contain messages."
msgstr "���Υե�����ˤϥ�å������Ϥ���ޤ���"
-#: mail/component-factory.c:378
+#: mail/component-factory.c:432
msgid "Properties..."
msgstr "�ץ��ѥƥ�..."
-#: mail/component-factory.c:378
+#: mail/component-factory.c:432
msgid "Change this folder's properties"
msgstr "���Υե�����Υץ��ѥƥ����ѹ�"
-#: mail/component-factory.c:721
+#: mail/component-factory.c:805
msgid ""
"Some of your mail settings seem corrupt, please check that everything is in "
"order."
msgstr ""
-#: mail/component-factory.c:857
+#: mail/component-factory.c:973
msgid "New Mail Message"
msgstr "�����᡼���å�����"
-#: mail/component-factory.c:857
+#: mail/component-factory.c:973
msgid "New _Mail Message"
msgstr "�����᡼���å�����(_M)"
-#: mail/component-factory.c:881
+#: mail/component-factory.c:997
msgid "Cannot initialize Evolution's mail component."
msgstr "Evolution �᡼�륳��ݡ��ͥ�Ȥν����������ޤ���"
-#: mail/component-factory.c:890
+#: mail/component-factory.c:1006
msgid "Cannot initialize Evolution's mail config component."
msgstr "Evolution �᡼�����ꥳ��ݡ��ͥ�Ȥν����������ޤ���"
-#: mail/component-factory.c:896
+#: mail/component-factory.c:1012
msgid "Cannot initialize Evolution's folder info component."
msgstr "Evolution �ե�������󥳥�ݡ��ͥ�Ȥν����������ޤ���"
-#: mail/component-factory.c:1061
+#: mail/component-factory.c:1228
msgid "Cannot register storage with shell"
msgstr "������ǥ��ȥ졼������Ͽ����ޤ���"
-#: mail/folder-browser-ui.c:267
+#: mail/folder-browser-ui.c:271
#, c-format
msgid "Properties for \"%s\""
msgstr "\"%s\" �Υץ��ѥƥ�"
-#: mail/folder-browser-ui.c:269
+#: mail/folder-browser-ui.c:273
msgid "Properties"
msgstr "�ץ��ѥƥ�"
-#: mail/folder-browser.c:261 mail/mail-display.c:300
+#: mail/folder-browser.c:297 mail/mail-display.c:298
#, c-format
msgid "Could not create temporary directory: %s"
msgstr "��ȥǥ��쥯�ȥ���������ޤ���Ǥ���: %s"
-#: mail/folder-browser.c:733
+#: mail/folder-browser.c:769
#, c-format
msgid "%d new"
msgstr "����%d��"
-#: mail/folder-browser.c:736 mail/folder-browser.c:741
-#: mail/folder-browser.c:763
+#: mail/folder-browser.c:772 mail/folder-browser.c:777
+#: mail/folder-browser.c:799
msgid ", "
msgstr ","
-#: mail/folder-browser.c:737
+#: mail/folder-browser.c:773
#, c-format
msgid "%d hidden"
msgstr ""
-#: mail/folder-browser.c:742
+#: mail/folder-browser.c:778
#, c-format
msgid "%d selected"
msgstr "%d �����"
-#: mail/folder-browser.c:765
+#: mail/folder-browser.c:801
#, c-format
msgid "%d unsent"
msgstr "%d ̤����"
-#: mail/folder-browser.c:767
+#: mail/folder-browser.c:803
#, c-format
msgid "%d sent"
msgstr "%d ������"
-#: mail/folder-browser.c:769
+#: mail/folder-browser.c:805
#, c-format
msgid "%d total"
msgstr "���%d��"
-#: mail/folder-browser.c:1012
+#: mail/folder-browser.c:1077
msgid "Create vFolder from Search"
msgstr "�������鲾�ۥե��������"
-#: mail/folder-browser.c:1384
+#: mail/folder-browser.c:1458
msgid "VFolder on _Subject"
msgstr "��̾�β��ۥե����(_S)"
-#: mail/folder-browser.c:1385
+#: mail/folder-browser.c:1459
msgid "VFolder on Se_nder"
msgstr "�����Ԥβ��ۥե����(_N)"
-#: mail/folder-browser.c:1386
+#: mail/folder-browser.c:1460
msgid "VFolder on _Recipients"
msgstr "�����Ԥβ��ۥե����(_R)"
-#: mail/folder-browser.c:1387
+#: mail/folder-browser.c:1461
msgid "VFolder on Mailing _List"
msgstr "�᡼��󥰥ꥹ�Ȥβ��ۥե����(_L)"
-#: mail/folder-browser.c:1391
+#: mail/folder-browser.c:1465
msgid "Filter on Sub_ject"
msgstr "��̾�Υե��륿(_J)"
-#: mail/folder-browser.c:1392
+#: mail/folder-browser.c:1466
msgid "Filter on Sen_der"
msgstr "�����ԤΥե��륿(_D)"
-#: mail/folder-browser.c:1393
+#: mail/folder-browser.c:1467
msgid "Filter on Re_cipients"
msgstr "�����ԤΥե��륿(_C)"
-#: mail/folder-browser.c:1394
+#: mail/folder-browser.c:1468
msgid "Filter on _Mailing List"
msgstr "�᡼��󥰥ꥹ�ȤΥե��륿(_M)"
-#: mail/folder-browser.c:1402 ui/evolution-mail-message.xml.h:89
+#: mail/folder-browser.c:1476 ui/evolution-mail-message.xml.h:95
msgid "_Edit as New Message..."
msgstr "������å������Ȥ����Խ�..."
-#: mail/folder-browser.c:1403 ui/evolution-mail-message.xml.h:97
+#: mail/folder-browser.c:1477 ui/evolution-mail-message.xml.h:104
msgid "_Save As..."
msgstr "��̾����¸(_S)..."
-#: mail/folder-browser.c:1404
+#: mail/folder-browser.c:1478
msgid "_Print"
msgstr "����(_P)"
-#: mail/folder-browser.c:1408 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1482 ui/evolution-mail-message.xml.h:103
msgid "_Reply to Sender"
msgstr "�����Ԥ��ֿ�(_R)"
-#: mail/folder-browser.c:1409 ui/evolution-mail-message.xml.h:69
+#: mail/folder-browser.c:1483 ui/evolution-mail-message.xml.h:72
msgid "Reply to _List"
msgstr "�ꥹ�Ȥ��ֿ�(_L)"
-#: mail/folder-browser.c:1410 ui/evolution-mail-message.xml.h:68
+#: mail/folder-browser.c:1484 ui/evolution-mail-message.xml.h:71
msgid "Reply to _All"
msgstr "�������ֿ�(_A)"
-#: mail/folder-browser.c:1411
+#: mail/folder-browser.c:1485
msgid "_Forward"
msgstr "ž��(_F)"
-#: mail/folder-browser.c:1413 ui/evolution-mail-message.xml.h:40
+#: mail/folder-browser.c:1487 ui/evolution-mail-message.xml.h:42
msgid "Mar_k as Read"
msgstr "�����ѤߤȤ��ƥޡ���(_K)"
-#: mail/folder-browser.c:1414 ui/evolution-mail-message.xml.h:42
+#: mail/folder-browser.c:1488 ui/evolution-mail-message.xml.h:44
msgid "Mark as U_nread"
msgstr "̤�ɤȤ��ƥޡ���(_N)"
-#: mail/folder-browser.c:1415
+#: mail/folder-browser.c:1489
msgid "Mark as _Important"
msgstr "���פȤ��ƥޡ���(_I)"
-#: mail/folder-browser.c:1416
+#: mail/folder-browser.c:1490
msgid "Mark as Unim_portant"
msgstr "����פȤ��ƥޡ���(_P)"
-#: mail/folder-browser.c:1420
+#: mail/folder-browser.c:1494
msgid "_Move to Folder..."
msgstr "�ե�����ذ�ư(_M)..."
-#: mail/folder-browser.c:1421
+#: mail/folder-browser.c:1495
msgid "_Copy to Folder..."
msgstr "�ե�����إ��ԡ�(_C)..."
-#: mail/folder-browser.c:1423 ui/evolution-mail-message.xml.h:99
+#: mail/folder-browser.c:1497 ui/evolution-mail-message.xml.h:106
msgid "_Undelete"
msgstr "������(_U)"
-#: mail/folder-browser.c:1427
+#: mail/folder-browser.c:1501
msgid "Add Sender to Address Book"
msgstr "�����Ԥ򥢥ɥ쥹Ģ���ɲ�"
-#: mail/folder-browser.c:1430
+#: mail/folder-browser.c:1504
msgid "Apply Filters"
msgstr "�ե��륿Ŭ��"
-#: mail/folder-browser.c:1432
+#: mail/folder-browser.c:1506
msgid "Create Ru_le From Message"
msgstr "��å���������롼������(_L)"
-#: mail/folder-browser.c:1582
+#: mail/folder-browser.c:1656
msgid "Filter on Mailing List"
msgstr "�᡼��󥰥ꥹ�ȤΥե��륿"
-#: mail/folder-browser.c:1583
+#: mail/folder-browser.c:1657
msgid "VFolder on Mailing List"
msgstr "�᡼��󥰥ꥹ�Ȥβ��ۥե����"
-#: mail/folder-browser.c:1585
+#: mail/folder-browser.c:1659
#, c-format
msgid "Filter on Mailing List (%s)"
msgstr "�᡼��󥰥ꥹ�ȤΥե��륿 (%s)"
-#: mail/folder-browser.c:1586
+#: mail/folder-browser.c:1660
#, c-format
msgid "VFolder on Mailing List (%s)"
msgstr "�᡼��󥰥ꥹ�Ȥβ��ۥե���� (%s)"
+#: mail/folder-browser.h:26
+#, fuzzy
+msgid "Default"
+msgstr "�ǥե����(_F)"
+
#: mail/folder-info.c:64
msgid "Getting Folder Information"
msgstr "�ե��������μ���"
@@ -8378,18 +8612,27 @@ msgid "Imports Outlook Express 4 files into Evolution"
msgstr "Evolution �� Outlook Express 4 �ե�����򥤥�ݡ���"
#: mail/local-config.glade.h:1
+#, fuzzy
+msgid "Body contents"
+msgstr "��ʸ�����Τ�Τ�ޤ�"
+
+#: mail/local-config.glade.h:2
msgid "Current store format:"
msgstr "���ߤ���¸����:"
-#: mail/local-config.glade.h:2
+#: mail/local-config.glade.h:3
+msgid "Indexing:"
+msgstr ""
+
+#: mail/local-config.glade.h:4
msgid "Mailbox Format"
msgstr "�᡼��ܥå����η���"
-#: mail/local-config.glade.h:3
+#: mail/local-config.glade.h:5
msgid "New store format:"
msgstr "������¸����:"
-#: mail/local-config.glade.h:4
+#: mail/local-config.glade.h:6
msgid ""
"Note: When converting between mailbox formats, a failure\n"
"(such as lack of disk space) may not be automatically\n"
@@ -8399,15 +8642,15 @@ msgstr ""
"�������ʤ����⤷��ޤ��� (�㤨�Хǥ��������ڡ�����­��ʤ�)\n"
"���դ��Ƥ��ε�ǽ��ȤäƤ�������"
-#: mail/local-config.glade.h:7
+#: mail/local-config.glade.h:9
msgid "maildir"
msgstr "maildir"
-#: mail/local-config.glade.h:8
+#: mail/local-config.glade.h:10
msgid "mbox"
msgstr "mbox"
-#: mail/local-config.glade.h:9
+#: mail/local-config.glade.h:11
msgid "mh"
msgstr "mh"
@@ -8425,15 +8668,15 @@ msgstr "Evolution �˥塼�����ǥ���"
msgid "Evolution Account Editor"
msgstr "Evolution ��������ȥ��ǥ���"
-#: mail/mail-account-gui.c:947
+#: mail/mail-account-gui.c:959
msgid "Could not save signature file."
msgstr "��̾�ե��������¸����ޤ���Ǥ���"
-#: mail/mail-account-gui.c:1024
+#: mail/mail-account-gui.c:1036
msgid "Save signature"
msgstr "��̾����¸"
-#: mail/mail-account-gui.c:1030
+#: mail/mail-account-gui.c:1042
msgid ""
"This signature has been changed, but hasn't been saved.\n"
"\n"
@@ -8443,7 +8686,7 @@ msgstr ""
"\n"
"�ѹ�����¸���ޤ���?"
-#: mail/mail-account-gui.c:1615
+#: mail/mail-account-gui.c:1651
msgid "You may not create two accounts with the same name."
msgstr "Ʊ��̾���Υ�������Ȥ�2�ĺ����Ǥ��ޤ���"
@@ -8459,52 +8702,52 @@ msgstr "̵��"
msgid "Enable"
msgstr "ͭ��"
-#: mail/mail-accounts.c:278
+#: mail/mail-accounts.c:279
msgid "Are you sure you want to delete this account?"
msgstr "�����ˤ��Υ�������Ȥ������Ƥ��������Ǥ���?"
-#: mail/mail-accounts.c:282
+#: mail/mail-accounts.c:283
msgid "Don't delete"
msgstr "������ʤ�"
-#: mail/mail-accounts.c:285
+#: mail/mail-accounts.c:286
msgid "Really delete account?"
msgstr "�����˥�������Ȥ������ޤ���?"
-#: mail/mail-accounts.c:511 mail/mail-accounts.c:515
+#: mail/mail-accounts.c:512 mail/mail-accounts.c:516
msgid "Are you sure you want to delete this news account?"
msgstr "������ news ��������Ȥ������Ƥ��������Ǥ���?"
#. give our dialog an Close button and title
-#: mail/mail-accounts.c:769 mail/mail-config.glade.h:45
+#: mail/mail-accounts.c:770 mail/mail-config.glade.h:42
msgid "Mail Settings"
msgstr "�᡼������"
-#: mail/mail-autofilter.c:70
+#: mail/mail-autofilter.c:71
#, c-format
msgid "Mail to %s"
msgstr "%s �إ᡼��"
-#: mail/mail-autofilter.c:213
+#: mail/mail-autofilter.c:214
#, c-format
msgid "Subject is %s"
msgstr "��̾�� %s �Ǥ�"
-#: mail/mail-autofilter.c:229
+#: mail/mail-autofilter.c:230
#, c-format
msgid "Mail from %s"
msgstr "%s ����᡼��"
-#: mail/mail-autofilter.c:285
+#: mail/mail-autofilter.c:286
#, c-format
msgid "%s mailing list"
msgstr "%s �᡼��󥰥ꥹ��"
-#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:356
+#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:355
msgid "Add Filter Rule"
msgstr "�ե��륿�롼����ɲ�"
-#: mail/mail-callbacks.c:164
+#: mail/mail-callbacks.c:137
msgid ""
"You have not configured the mail client.\n"
"You need to do this before you can send,\n"
@@ -8516,7 +8759,7 @@ msgstr ""
"ɬ�פ�����ޤ�\n"
"�����ꤷ�ޤ���?"
-#: mail/mail-callbacks.c:216
+#: mail/mail-callbacks.c:186
msgid ""
"You need to configure an identity\n"
"before you can compose mail."
@@ -8524,7 +8767,7 @@ msgstr ""
"���ʤ��ϥ᡼�������������˥桼�������\n"
"����򤹤�ɬ�פ�����ޤ�"
-#: mail/mail-callbacks.c:228
+#: mail/mail-callbacks.c:200
msgid ""
"You need to configure a mail transport\n"
"before you can compose mail."
@@ -8532,22 +8775,22 @@ msgstr ""
"���ʤ��ϥ᡼�������������˥᡼��\n"
"����������򤹤�ɬ�פ�����ޤ�"
-#: mail/mail-callbacks.c:252
+#: mail/mail-callbacks.c:230
msgid "You have not set a mail transport method"
msgstr "�᡼��ž���᥽�åɤ����꤬����ޤ���"
#. FIXME: this wording sucks
-#: mail/mail-callbacks.c:283
+#: mail/mail-callbacks.c:265
msgid ""
"You are sending an HTML-formatted message, but the following recipients do "
"not want HTML-formatted mail:\n"
msgstr ""
-#: mail/mail-callbacks.c:298
+#: mail/mail-callbacks.c:280
msgid "Send anyway?"
msgstr "�Ȥˤ�����������?"
-#: mail/mail-callbacks.c:340
+#: mail/mail-callbacks.c:322
msgid ""
"This message has no subject.\n"
"Really send?"
@@ -8555,57 +8798,57 @@ msgstr ""
"���Υ�å������Ϸ�̾������ޤ���\n"
"�������������ޤ���?"
-#: mail/mail-callbacks.c:384
+#: mail/mail-callbacks.c:366
msgid ""
"Since the contact list you are sending to is configured to hide the list's "
"addresses, this message will contain only Bcc recipients."
msgstr ""
-#: mail/mail-callbacks.c:388
+#: mail/mail-callbacks.c:370
msgid "This message contains only Bcc recipients."
msgstr "���Υ�å������� Bcc �������ꤵ��Ƥ��ޤ���"
-#: mail/mail-callbacks.c:392
+#: mail/mail-callbacks.c:374
msgid ""
"It is possible that the mail server may reveal the recipients by adding an "
"Apparently-To header.\n"
"Send anyway?"
msgstr ""
-#: mail/mail-callbacks.c:486
+#: mail/mail-callbacks.c:468
msgid "This message contains invalid recipients:"
msgstr "���Υ�å���������Ŭ�ڤʼ����Ԥ�ޤ�Ǥ��ޤ�:"
-#: mail/mail-callbacks.c:521
+#: mail/mail-callbacks.c:503
msgid "You must specify recipients in order to send this message."
msgstr "���Υ�å���������������Ŭ�ڤʼ����Ԥ���ꤷ�ʤ���Фʤ�ޤ���"
-#: mail/mail-callbacks.c:617
+#: mail/mail-callbacks.c:599
msgid "You must configure an account before you can send this email."
msgstr "���Υ᡼��������������˥�������Ȥ����ꤷ�ʤ���Фʤ�ޤ���"
-#: mail/mail-callbacks.c:850
+#: mail/mail-callbacks.c:836
msgid "an unknown sender"
msgstr "������������"
-#: mail/mail-callbacks.c:855
+#: mail/mail-callbacks.c:841
msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
msgstr "%Yǯ%m��%d��(%a)��%H��%Mʬ�� %%s ۩��:"
-#: mail/mail-callbacks.c:1244
+#: mail/mail-callbacks.c:1263
msgid "Move message(s) to"
msgstr "��å��������ư���ޤ�: "
-#: mail/mail-callbacks.c:1246
+#: mail/mail-callbacks.c:1265
msgid "Copy message(s) to"
msgstr "��å������򥳥ԡ����ޤ�: "
-#: mail/mail-callbacks.c:1622
+#: mail/mail-callbacks.c:1732
#, c-format
msgid "Are you sure you want to edit all %d messages?"
msgstr "������ %d ��å��������Խ����Ƥ��������Ǥ���?"
-#: mail/mail-callbacks.c:1644
+#: mail/mail-callbacks.c:1757
msgid ""
"You may only edit messages saved\n"
"in the Drafts folder."
@@ -8613,7 +8856,7 @@ msgstr ""
"�ɥ�եȥե���������¸���줿\n"
"��å������������Խ����뤳�Ȥ�����ޤ�"
-#: mail/mail-callbacks.c:1679
+#: mail/mail-callbacks.c:1796
msgid ""
"You may only resend messages\n"
"in the Sent folder."
@@ -8621,28 +8864,28 @@ msgstr ""
"�����ե�����Υ�å���������\n"
"���������뤳�Ȥ�����ޤ�"
-#: mail/mail-callbacks.c:1692
+#: mail/mail-callbacks.c:1810
#, c-format
msgid "Are you sure you want to resend all %d messages?"
msgstr "������ %d ��å�������������Ƥ��������Ǥ���?"
-#: mail/mail-callbacks.c:1713
+#: mail/mail-callbacks.c:1836
msgid "No Message Selected"
msgstr "���򤵤줿��å������Ϥ���ޤ���"
-#: mail/mail-callbacks.c:1800
+#: mail/mail-callbacks.c:1930
msgid "Save Message As..."
msgstr "��å���������̾����¸..."
-#: mail/mail-callbacks.c:1802
+#: mail/mail-callbacks.c:1932
msgid "Save Messages As..."
msgstr "��å���������̾����¸..."
-#: mail/mail-callbacks.c:1947 widgets/misc/e-messagebox.c:159
+#: mail/mail-callbacks.c:2101 widgets/misc/e-messagebox.c:159
msgid "Warning"
msgstr "�ٹ�"
-#: mail/mail-callbacks.c:1954
+#: mail/mail-callbacks.c:2108
msgid ""
"This operation will permanently erase all messages marked as deleted. If you "
"continue, you will not be able to recover these messages.\n"
@@ -8654,11 +8897,11 @@ msgstr ""
"\n"
"�����ˤ����Υ�å�������õ�ޤ���?"
-#: mail/mail-callbacks.c:1961
+#: mail/mail-callbacks.c:2115
msgid "Do not ask me again."
msgstr "���٤ȼ��䤷�ʤ�"
-#: mail/mail-callbacks.c:2066
+#: mail/mail-callbacks.c:2223
#, c-format
msgid ""
"Error loading filter information:\n"
@@ -8667,19 +8910,19 @@ msgstr ""
"�ե��륿����Υ�������˥��顼:\n"
"%s"
-#: mail/mail-callbacks.c:2077
+#: mail/mail-callbacks.c:2235
msgid "Filters"
msgstr "�ե��륿"
-#: mail/mail-callbacks.c:2125
+#: mail/mail-callbacks.c:2298
msgid "Print Message"
msgstr "�����������"
-#: mail/mail-callbacks.c:2171
+#: mail/mail-callbacks.c:2344
msgid "Printing of message failed"
msgstr "��å������ΰ����˼��Ԥ��ޤ���"
-#: mail/mail-callbacks.c:2260
+#: mail/mail-callbacks.c:2446
#, c-format
msgid "Are you sure you want to open all %d messages in separate windows?"
msgstr "������ %d ��å��������̥�����ɥ��dz����Ƥ��������Ǥ���?"
@@ -8733,16 +8976,16 @@ msgstr ""
"���Ѥ���ޤ���"
#. set window title
-#: mail/mail-config-druid.c:591
+#: mail/mail-config-druid.c:599
msgid "Evolution Account Assistant"
msgstr "Evolution��������ȥ����������"
-#: mail/mail-config.c:315
+#: mail/mail-config.c:316
#, c-format
msgid "Account %d"
msgstr "��������� %d"
-#: mail/mail-config.c:1618
+#: mail/mail-config.c:1643
#, c-format
msgid ""
"Could not get inbox for new mail store:\n"
@@ -8753,16 +8996,16 @@ msgstr ""
#. Create the shortcut. FIXME: This only works if the
#. * full name matches the path.
#.
-#: mail/mail-config.c:1629
+#: mail/mail-config.c:1654
#, c-format
msgid "%s: Inbox"
msgstr "%s: ����Ȣ"
-#: mail/mail-config.c:1873
+#: mail/mail-config.c:1896
msgid "Checking Service"
msgstr "�����ӥ�������å���"
-#: mail/mail-config.c:1944 mail/mail-config.c:1947
+#: mail/mail-config.c:1967 mail/mail-config.c:1970
msgid "Connecting to server..."
msgstr "�����Ф���³��..."
@@ -8779,31 +9022,33 @@ msgid "(SSL is not supported in this build of evolution)"
msgstr "(���� Evolution �� SSL �򥵥ݡ��Ȥ��Ƥ��ޤ���)"
#: mail/mail-config.glade.h:4
+#, fuzzy
+msgid "A_lways encrypt to myself when sending encrypted mail"
+msgstr "�Ź沽�����᡼�������������˾�˼�ʬ���Ȥ˰Ź沽���ޤ�"
+
+#: mail/mail-config.glade.h:5
msgid "Account"
msgstr "���������"
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:6
msgid "Account Information"
msgstr "��������Ⱦ���"
-#: mail/mail-config.glade.h:6 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:7 shell/glade/evolution-startup-wizard.glade.h:1
msgid "Account Management"
msgstr "��������ȴ���"
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:8
msgid "Accounts"
msgstr "���������"
-#: mail/mail-config.glade.h:8
-msgid "Always encrypt to myself when sending encrypted mail"
-msgstr "�Ź沽�����᡼�������������˾�˼�ʬ���Ȥ˰Ź沽���ޤ�"
-
#: mail/mail-config.glade.h:9
-msgid "Always encrypt to myself when sending encrypyed mail"
+#, fuzzy
+msgid "Always _encrypt to myself when sending encrypted mail"
msgstr "�Ź沽�����᡼�������������˾�˼�ʬ���Ȥ˰Ź沽���ޤ�"
#: mail/mail-config.glade.h:10
-msgid "Always sign outgoing messages when using this account"
+msgid "Always _sign outgoing messages when using this account"
msgstr ""
#: mail/mail-config.glade.h:11 mail/message-list.etspec.h:1
@@ -8815,26 +9060,23 @@ msgid "Authentication"
msgstr "ǧ��"
#: mail/mail-config.glade.h:13
-msgid "Authentication Type: "
-msgstr "ǧ�ڼ���: "
+#, fuzzy
+msgid "Checking for New Mail"
+msgstr "����᡼��Υ����å�"
#: mail/mail-config.glade.h:14
-msgid "Certificate ID:"
-msgstr "ǧ�� ID"
-
-#: mail/mail-config.glade.h:16
msgid "Composer"
msgstr "�᡼�����"
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:15
msgid "Configuration"
msgstr "����"
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:16
msgid "Confirm when Expunging a folder"
msgstr "�ե�����Ǥκ����ǧ"
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:17
msgid ""
"Congratulations, your mail configuration is complete.\n"
"\n"
@@ -8850,229 +9092,235 @@ msgstr ""
"\n"
"\"��λ\" �򥯥�å������������¸���Ƥ�������"
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:23
msgid "De_fault"
msgstr "�ǥե����(_F)"
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:24
msgid "Default Forward style is: "
msgstr "�ǥե���Ȥ�ž����ˡ: "
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:25
msgid "Default character encoding: "
msgstr "�ǥե���ȤΥ���饯�����󥳡��ǥ���: "
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:27
msgid "Digital IDs..."
msgstr "�ǥ����� ID..."
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:28
msgid "Display"
msgstr "ɽ��"
-#: mail/mail-config.glade.h:31 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:29 shell/glade/evolution-startup-wizard.glade.h:2
msgid "Done"
msgstr "��λ"
-#: mail/mail-config.glade.h:32 shell/e-local-storage.c:174
+#: mail/mail-config.glade.h:30 shell/e-local-storage.c:173
msgid "Drafts"
msgstr "���"
-#: mail/mail-config.glade.h:33
-msgid "Drafts folder:"
-msgstr "��ƥե����:"
-
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:31
msgid "E_nable"
msgstr "ͭ��(_E)"
-#: mail/mail-config.glade.h:35 widgets/misc/e-filter-bar.h:96
-#: widgets/misc/e-filter-bar.h:103
+#: mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:97
+#: widgets/misc/e-filter-bar.h:104
msgid "Edit..."
msgstr "�Խ�..."
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:33
msgid "Enabled"
msgstr "ͭ��"
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:34
msgid "Get Digital ID..."
msgstr "�ǥ�����ID �����..."
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:35
msgid "HTML signature file:"
msgstr "HTML ��̾�ե�����:"
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:36
msgid "IMAPv4 "
msgstr "IMAPv4 "
-#: mail/mail-config.glade.h:40 shell/glade/evolution-startup-wizard.glade.h:4
+#: mail/mail-config.glade.h:37 shell/glade/evolution-startup-wizard.glade.h:4
msgid "Identity"
msgstr "�桼������"
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:38
msgid "In HTML mail"
msgstr "HTML �᡼��"
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:39
msgid "Inline"
msgstr "����饤��"
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:40
msgid "Kerberos "
msgstr "Kerberos "
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:41
msgid "Mail Configuration"
msgstr "�᡼�������"
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:43
msgid "Mailbox location"
msgstr "�᡼��ܥå����ξ��"
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:44
msgid "Make this my _default account"
msgstr "���Υ�������Ȥ��������ꤹ��(_D)"
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:45
msgid "NNTP Server:"
msgstr "NNTP ������:"
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:46
msgid "News"
msgstr "�˥塼��"
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:48
msgid "Optional Information"
msgstr "���ץ����"
-#: mail/mail-config.glade.h:53
-msgid "PGP Key ID:"
+#: mail/mail-config.glade.h:50
+#, fuzzy
+msgid "PGP _Key ID:"
msgstr "PGP���� ID:"
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:53
msgid "Pick a color"
msgstr "���顼������"
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:54
msgid "Pretty Good Privacy"
msgstr "�ץ�ƥ����åɥץ饤�Х���(PGP)"
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:55
msgid "Prompt when sending HTML messages to contacts that don't want them"
msgstr "HTML �᡼���˾��Ǥ��ʤ������ HTML �᡼���������������Τ餻��"
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:56
msgid "Prompt when sending messages with an _empty subject"
msgstr "�������˷�̾�����ξ����Τ餻��(_E)"
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:57
msgid "Prompt when sending messages with only _Bcc recipients defined"
msgstr "�������� Bcc �������ꤵ��Ƥ��ʤ������Τ餻��(_B)"
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:58
msgid "Qmail maildir "
msgstr "Qmail maildir "
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:59
msgid "Quoted"
msgstr "����"
-#: mail/mail-config.glade.h:63 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:60
+#, fuzzy
+msgid "Re_member this password"
+msgstr "���Υѥ���ɤ򵭲�"
+
+#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:6
msgid "Receiving Email"
msgstr "�᡼��μ�����"
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:62
msgid "Receiving Mail"
msgstr "�᡼��μ���"
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:63
msgid "Receiving Options"
msgstr "�������ץ����"
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:64
msgid "Required Information"
msgstr "ɬ�ܾ���"
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:66
msgid "Secure MIME"
msgstr "�����奢 MIME"
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:67
msgid "Security"
msgstr "�������ƥ�"
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:68
msgid "Select Filter Log file..."
msgstr "�ե��륿�������ե����������..."
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:69
msgid "Select PGP binary"
msgstr "PGP �ץ�����������"
-#: mail/mail-config.glade.h:72 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:70 shell/glade/evolution-startup-wizard.glade.h:7
msgid "Sending Email"
msgstr "�᡼���������"
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:71
msgid "Sending Mail"
msgstr "�᡼�������"
-#: mail/mail-config.glade.h:75 mail/message-list.etspec.h:6
-#: shell/e-local-storage.c:177
+#: mail/mail-config.glade.h:73 mail/message-list.etspec.h:6
+#: shell/e-local-storage.c:176
msgid "Sent"
msgstr "������"
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:74
+#, fuzzy
+msgid "Sent _messages folder:"
+msgstr "�����ѥ�å������ե����:"
+
+#: mail/mail-config.glade.h:75
msgid "Sent and Draft Messages"
msgstr "�����Ѥ���ƥ�å�����"
-#: mail/mail-config.glade.h:77
-msgid "Sent messages folder:"
-msgstr "�����ѥ�å������ե����:"
+#: mail/mail-config.glade.h:76
+#, fuzzy
+msgid "Ser_ver requires authentication"
+msgstr "�����Ф�ǧ�ڤ�ɬ��(_A)"
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:77
msgid "Server Configuration"
msgstr "����������"
-#: mail/mail-config.glade.h:79
-msgid "Server Type: "
+#: mail/mail-config.glade.h:78
+#, fuzzy
+msgid "Server _Type: "
msgstr "�������:"
-#: mail/mail-config.glade.h:80
-msgid "Server requires _authentication"
-msgstr "�����Ф�ǧ�ڤ�ɬ��(_A)"
-
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:79
msgid "Signature file:"
msgstr "��̾�ե�����:"
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:80
msgid "Source"
msgstr "������"
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:81
msgid "Source Information"
msgstr "����������"
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:82
msgid "Sources"
msgstr "������"
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:83
msgid "Special Folders"
msgstr "���̤ʥե����"
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:84
msgid "Standard Unix mbox"
msgstr "ɸ��Ū�� UNIX �� mbox �ե�����"
-#: mail/mail-config.glade.h:88
-msgid "Use secure connection (_SSL)"
+#: mail/mail-config.glade.h:86
+#, fuzzy
+msgid "Use s_ecure connection (SSL)"
msgstr "�������ƥ����ݸ�줿��³ (_SSL) ��ɬ��"
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:87
msgid ""
"Welcome to the Evolution Mail Configuration Assistant.\n"
"\n"
@@ -9082,103 +9330,129 @@ msgstr ""
"\n"
"\"��\" �򥯥�å����ƻϤ�Ƥ�������"
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:91
msgid "_Always load images off the net"
msgstr "��˲�����ͥåȤ����ɤ߹���"
+#: mail/mail-config.glade.h:92
+msgid "_Always sign outgoing messages when using this account"
+msgstr ""
+
+#: mail/mail-config.glade.h:93
+#, fuzzy
+msgid "_Authentication Type: "
+msgstr "ǧ�ڼ���: "
+
#: mail/mail-config.glade.h:94
-msgid "_Automatically check for new mail every"
+#, fuzzy
+msgid "_Automatically check for new mail"
msgstr "����᡼���ưŪ�˥����å�����ֳ�(_A)"
#: mail/mail-config.glade.h:95
-msgid "_Check for supported types"
-msgstr "���ݡ��Ȥ��줿���̤�����å�(_C)"
+#, fuzzy
+msgid "_Certificate ID:"
+msgstr "ǧ�� ID"
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:97
+#, fuzzy
+msgid "_Drafts folder:"
+msgstr "��ƥե����:"
+
+#: mail/mail-config.glade.h:99
msgid "_Email Address:"
msgstr "�᡼�륢�ɥ쥹(_E):"
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:100
msgid "_Empty trash folders on exit"
msgstr "��λ���˥���Ȣ����ˤ���(_E)"
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:101
msgid "_Full Name:"
msgstr "�ե�͡���(_F):"
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:102
msgid "_HTML Signature:"
msgstr "HTML��̾�ե�����(_H):"
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:103
msgid "_Highlight citations with"
msgstr "���Ѥ�Ĵ����(_H)"
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:104
msgid "_Host:"
msgstr "�ۥ���(_H):"
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:105
msgid "_Load images if sender is in addressbook"
msgstr "�����Ԥ����ɥ쥹Ģ�ˤ�����������ɤ߹���"
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:106
msgid "_Log filter actions to:"
msgstr ""
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:107
msgid "_Mark messages as Read after"
msgstr "���λ��֥ץ�ӥ塼����ȥ�å����������Ѥߤˤ���(_M):"
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:108
msgid "_Name:"
msgstr "̾��(_N):"
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:109
msgid "_Never load images off the net"
msgstr "������ͥåȤ����ɤ߹��ޤʤ�"
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:110
msgid "_Organization:"
msgstr "���(_O):"
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:111
msgid "_PGP binary path:"
msgstr "_PGP �ץ������Υѥ�:"
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:112
msgid "_Path:"
msgstr "�ѥ�(_P):"
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:113
msgid "_Remember this password"
msgstr "���Υѥ���ɤ򵭲�(_R)"
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:114
msgid "_Send mail in HTML format by default."
msgstr "�ǥե���Ȥ� HTML �����Υ᡼�����������(_S)"
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:115
+#, fuzzy
+msgid "_Server Type: "
+msgstr "�������:"
+
+#: mail/mail-config.glade.h:116
msgid "_Signature file:"
msgstr "��̾�ե�����(_S):"
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:117
msgid "_Username:"
msgstr "�桼��̾(_U):"
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:118
+#, fuzzy
+msgid "_every"
+msgstr "��"
+
+#: mail/mail-config.glade.h:119
msgid "description"
msgstr "����"
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:121
msgid "newswindow1"
msgstr ""
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:122
msgid "placeholder"
msgstr ""
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:123
msgid "seconds."
msgstr " ��"
@@ -9218,151 +9492,145 @@ msgstr "S/MIME ����٥����ץ���ƥ����Ȥ��������ޤ���Ǥ���"
msgid "Could not create a S/MIME decode context."
msgstr "S/MIME �ǥ����ɥ���ƥ����Ȥ��������ޤ���Ǥ���"
-#: mail/mail-display.c:245
+#: mail/mail-display.c:243
msgid "Save Attachment"
msgstr "ź�դ���¸"
-#: mail/mail-display.c:352
+#: mail/mail-display.c:350
msgid "Save to Disk..."
msgstr "�ǥ���������¸..."
-#: mail/mail-display.c:354
+#: mail/mail-display.c:352
msgid "View Inline"
msgstr "����饤��ɽ��"
-#: mail/mail-display.c:356
+#: mail/mail-display.c:354
#, c-format
msgid "Open in %s..."
msgstr "%s �˳���..."
-#: mail/mail-display.c:417
+#: mail/mail-display.c:415
#, c-format
msgid "View Inline (via %s)"
msgstr "����饤��ɽ�� (%s��ͳ)"
-#: mail/mail-display.c:421
+#: mail/mail-display.c:419
msgid "Hide"
msgstr "����"
-#: mail/mail-display.c:442
+#: mail/mail-display.c:440
msgid "External Viewer"
msgstr "�����ӥ塼��"
-#: mail/mail-display.c:1107
+#: mail/mail-display.c:1135
msgid "Loading message content"
msgstr "��å����������Ƥ��ɤ߹�����"
-#: mail/mail-display.c:1587
+#: mail/mail-display.c:1617
msgid "Open Link in Browser"
msgstr "�֥饦���ǥ�󥯤򳫤�"
-#: mail/mail-display.c:1589
+#: mail/mail-display.c:1619
msgid "Copy Link Location"
msgstr "���򥳥ԡ�"
-#: mail/mail-display.c:1592
+#: mail/mail-display.c:1622
msgid "Save Link as (FIXME)"
msgstr "��󥯤���̾����¸"
-#: mail/mail-display.c:1595
+#: mail/mail-display.c:1625
msgid "Save Image as..."
msgstr "��������¸..."
-#: mail/mail-format.c:628
+#: mail/mail-format.c:631
#, c-format
msgid "%s attachment"
msgstr "%s ��ź��"
-#: mail/mail-format.c:681
+#: mail/mail-format.c:676
msgid "Could not parse MIME message. Displaying as source."
msgstr "MIME ��å���������Ͻ���ޤ���Ǥ���, ��������ɽ�����ޤ�"
-#: mail/mail-format.c:765
+#: mail/mail-format.c:760
msgid "Date"
msgstr "����"
-#: mail/mail-format.c:867
+#: mail/mail-format.c:843
msgid "Bad Address"
msgstr "�������ɥ쥹:"
-#: mail/mail-format.c:908 mail/message-list.etspec.h:3
+#: mail/mail-format.c:883 mail/message-list.etspec.h:3
msgid "From"
msgstr "���п�"
-#: mail/mail-format.c:911
+#: mail/mail-format.c:886
msgid "Reply-To"
msgstr "�ֿ���"
-#: mail/mail-format.c:915 mail/message-list.etspec.h:10
+#: mail/mail-format.c:890 mail/message-list.etspec.h:10
msgid "To"
msgstr "����"
-#: mail/mail-format.c:919
+#: mail/mail-format.c:894
msgid "Cc"
msgstr "Cc"
-#: mail/mail-format.c:923
+#: mail/mail-format.c:898
msgid "Bcc"
msgstr "Bcc"
-#: mail/mail-format.c:1370
-msgid "No GPG/PGP program configured."
-msgstr "GPG/PGP �ץ����������꤬����ޤ���"
-
-#: mail/mail-format.c:1386
-msgid "Encrypted message not displayed"
-msgstr "�Ź沽���줿��å�������ɽ�����ޤ���"
-
-#: mail/mail-format.c:1397
-msgid "Encrypted message"
-msgstr "�Ź沽���줿��å�����"
+#: mail/mail-format.c:1799
+#, fuzzy
+msgid ""
+"This message is digitally signed. Click the lock icon for more information."
+msgstr "���Υ�å������ϥǥ������̾���쿮��Ǥ����ΤǤ�"
-#: mail/mail-format.c:1398
-msgid "Click icon to decrypt."
-msgstr "��������򥯥�å��������沽���Ƥ�������"
+#: mail/mail-format.c:1822
+msgid "Evolution does not recognize this type of signed message."
+msgstr ""
-#: mail/mail-format.c:1453
+#: mail/mail-format.c:1830
msgid "This message is digitally signed and has been found to be authentic."
msgstr "���Υ�å������ϥǥ������̾���쿮��Ǥ����ΤǤ�"
-#: mail/mail-format.c:1464
+#: mail/mail-format.c:1838
msgid "This message is digitally signed but can not be proven to be authentic."
msgstr "���Υ�å������ϥǥ������̾���줿��ΤǤ���, ������������ޤ���"
-#: mail/mail-format.c:2141
+#: mail/mail-format.c:2054
#, c-format
msgid "Pointer to FTP site (%s)"
msgstr "FTP ������ (%s) ��ؤ��Ƥ��ޤ�"
-#: mail/mail-format.c:2155
+#: mail/mail-format.c:2068
#, c-format
msgid "Pointer to local file (%s) valid at site \"%s\""
msgstr ""
-#: mail/mail-format.c:2160
+#: mail/mail-format.c:2073
#, c-format
msgid "Pointer to local file (%s)"
msgstr "��������ե����� (%s) ��ؤ��Ƥ��ޤ�"
-#: mail/mail-format.c:2189
+#: mail/mail-format.c:2102
#, c-format
msgid "Pointer to remote data (%s)"
msgstr "��⡼�ȥǡ��� (%s) ��ؤ��Ƥ��ޤ�"
-#: mail/mail-format.c:2197
+#: mail/mail-format.c:2110
#, c-format
msgid "Pointer to unknown external data (\"%s\" type)"
msgstr "̤�Τγ����ǡ��� (\"%s\" ������) ��ؤ��Ƥ��ޤ�"
-#: mail/mail-format.c:2202
+#: mail/mail-format.c:2115
msgid "Malformed external-body part."
msgstr ""
-#: mail/mail-local.c:582
+#: mail/mail-local.c:626
msgid "Reconfiguring folder"
msgstr "�ե������ƹ�����"
-#: mail/mail-local.c:655
+#: mail/mail-local.c:707
#, c-format
msgid ""
"Cannot save folder metainfo; you'll probably find you can't\n"
@@ -9371,27 +9639,27 @@ msgstr ""
"�ե�����Υ᥿�������¸����ޤ���; ��Ϥ䤳�Υե�����򳫤�\n"
"���Ȥ�����ʤ��ȵ��Ť��Ǥ��礦: %s: %s"
-#: mail/mail-local.c:708
+#: mail/mail-local.c:763
#, c-format
msgid "Cannot save folder metainfo to %s: %s"
msgstr "�ե�����Υ᥿����� %s ����¸�Ǥ��ޤ���: %s"
-#: mail/mail-local.c:754
+#: mail/mail-local.c:815
#, c-format
msgid "Cannot delete folder metadata %s: %s"
msgstr "�ե�����Υ᥿�ǡ��� %s �������뤳�Ȥ�����ޤ���: %s"
-#: mail/mail-local.c:1119
+#: mail/mail-local.c:1281
#, c-format
msgid "Changing folder \"%s\" to \"%s\" format"
msgstr "�ե���� \"%s\" �� \"%s\" �������ѹ����Ƥ��ޤ�"
-#: mail/mail-local.c:1134
+#: mail/mail-local.c:1296
#, c-format
msgid "%s may not be reconfigured because it is not a local folder"
msgstr ""
-#: mail/mail-local.c:1156
+#: mail/mail-local.c:1318
msgid ""
"If you can no longer open this mailbox, then\n"
"you may need to repair it manually."
@@ -9399,16 +9667,16 @@ msgstr ""
"�⤷���Υ᡼��ܥå����򳫤����ȤϤʤ��ʤ�\n"
"��ư�Dz���������ɬ�פ����뤫�⤷��ޤ���"
-#: mail/mail-local.c:1244
+#: mail/mail-local.c:1407
msgid "You cannot change the format of a non-local folder."
msgstr "��������ե�����ʳ��η������ѹ��Ǥ��ޤ���"
-#: mail/mail-local.c:1253
+#: mail/mail-local.c:1416
#, c-format
msgid "Reconfigure /%s"
msgstr "/%s �����"
-#: mail/mail-mt.c:199
+#: mail/mail-mt.c:254
#, c-format
msgid ""
"Error while '%s':\n"
@@ -9417,7 +9685,7 @@ msgstr ""
"'%s' �κݤ˥��顼��ȯ�����ޤ���:\n"
"%s"
-#: mail/mail-mt.c:202
+#: mail/mail-mt.c:257
#, c-format
msgid ""
"Error while performing operation:\n"
@@ -9426,25 +9694,7 @@ msgstr ""
"���ν������Ƥ���֤˥��顼��ȯ�����ޤ���:\n"
"%s"
-#. Remember the password?
-#: mail/mail-mt.c:506
-msgid "Remember this password"
-msgstr "���Υѥ���ɤ򵭲�"
-
-#: mail/mail-mt.c:507
-msgid "Remember this password for the remainder of this session"
-msgstr ""
-
-#: mail/mail-mt.c:564
-#, c-format
-msgid "Enter Password for %s"
-msgstr "%s �Τ���Υѥ���ɤ����Ϥ��Ƥ�������"
-
-#: mail/mail-mt.c:567
-msgid "Enter Password"
-msgstr "�ѥ���ɤ����Ϥ��Ƥ�������"
-
-#: mail/mail-mt.c:883
+#: mail/mail-mt.c:901
msgid "Working"
msgstr "�����"
@@ -9452,118 +9702,113 @@ msgstr "�����"
msgid "Filtering Folder"
msgstr "�ե������ե��륿��"
-#: mail/mail-ops.c:229
+#: mail/mail-ops.c:249
msgid "Fetching Mail"
msgstr "�᡼��������"
-#: mail/mail-ops.c:473 mail/mail-ops.c:505
+#: mail/mail-ops.c:492 mail/mail-ops.c:521
msgid "However, the message was successfully sent."
msgstr ""
-#: mail/mail-ops.c:542
+#: mail/mail-ops.c:557
#, c-format
msgid "Sending \"%s\""
msgstr "\"%s\" ��������"
-#: mail/mail-ops.c:661
+#: mail/mail-ops.c:677
#, c-format
msgid "Sending message %d of %d"
msgstr "������ %d / %d ��������"
-#: mail/mail-ops.c:680
+#: mail/mail-ops.c:696
#, c-format
msgid "Failed on message %d of %d"
msgstr "��å����� %d / %d �ϼ��Ԥ��ޤ���"
-#: mail/mail-ops.c:682 mail/mail-send-recv.c:522
+#: mail/mail-ops.c:698 mail/mail-send-recv.c:537
msgid "Complete."
msgstr "��λ���ޤ���"
-#: mail/mail-ops.c:775
+#: mail/mail-ops.c:791
msgid "Saving message to folder"
msgstr "�ե�����إ�å���������¸��"
-#: mail/mail-ops.c:855
+#: mail/mail-ops.c:871
#, c-format
msgid "Moving messages to %s"
msgstr "%s �إ�å��������ư��"
-#: mail/mail-ops.c:855
+#: mail/mail-ops.c:871
#, c-format
msgid "Copying messages to %s"
msgstr "%s �إ�å������򥳥ԡ���"
-#: mail/mail-ops.c:877
-#, c-format
-msgid "Cannot copy a folder `%s' to itself"
-msgstr "�ե���� `%s' ��Ʊ���ե�����ˤϥ��ԡ��Ǥ��ޤ���"
-
-#: mail/mail-ops.c:884
+#: mail/mail-ops.c:898
msgid "Moving"
msgstr "��ư��"
-#: mail/mail-ops.c:887
+#: mail/mail-ops.c:901
msgid "Copying"
msgstr "���ԡ���"
-#: mail/mail-ops.c:997
+#: mail/mail-ops.c:1011
#, c-format
msgid "Scanning folders in \"%s\""
msgstr "\"%s\" ����Υե������������"
#. Fill in the new fields
-#: mail/mail-ops.c:1047 shell/e-local-storage.c:179
+#: mail/mail-ops.c:1061 shell/e-local-storage.c:178
msgid "Trash"
msgstr "����Ȣ"
-#: mail/mail-ops.c:1180
+#: mail/mail-ops.c:1194
msgid "Forwarded messages"
msgstr "��å�������ž��"
-#: mail/mail-ops.c:1223
+#: mail/mail-ops.c:1237
#, c-format
msgid "Opening folder %s"
msgstr "�ե���� %s �򥪡��ץ���"
-#: mail/mail-ops.c:1295
+#: mail/mail-ops.c:1309
#, c-format
msgid "Opening store %s"
msgstr "��¸���줿 %s �򥪡��ץ���"
-#: mail/mail-ops.c:1364
+#: mail/mail-ops.c:1378
#, c-format
msgid "Removing folder %s"
msgstr "�ե���� %s ������"
-#: mail/mail-ops.c:1458
+#: mail/mail-ops.c:1472
#, c-format
msgid "Storing folder '%s'"
msgstr "�ե���� '%s' ����¸��"
-#: mail/mail-ops.c:1509
+#: mail/mail-ops.c:1523
msgid "Refreshing folder"
msgstr "�ե�����򹹿���"
-#: mail/mail-ops.c:1545
+#: mail/mail-ops.c:1559
msgid "Expunging folder"
msgstr "�ե����������"
-#: mail/mail-ops.c:1594
+#: mail/mail-ops.c:1608
#, c-format
msgid "Retrieving message %s"
msgstr "������ %s �������"
-#: mail/mail-ops.c:1661
+#: mail/mail-ops.c:1675
#, c-format
msgid "Retrieving %d message(s)"
msgstr "%d �̤Υ�å������������"
-#: mail/mail-ops.c:1747
+#: mail/mail-ops.c:1761
#, c-format
msgid "Saving %d messsage(s)"
msgstr "%d �̤Υ�å���������¸��"
-#: mail/mail-ops.c:1859
+#: mail/mail-ops.c:1873
#, c-format
msgid ""
"Unable to create output file: %s\n"
@@ -9572,7 +9817,7 @@ msgstr ""
"���ϥե�������������ޤ���: %s\n"
" %s"
-#: mail/mail-ops.c:1887
+#: mail/mail-ops.c:1901
#, c-format
msgid ""
"Error saving messages to: %s:\n"
@@ -9581,11 +9826,11 @@ msgstr ""
"�ե��������¸��˥��顼: %s:\n"
" %s"
-#: mail/mail-ops.c:1961
+#: mail/mail-ops.c:1975
msgid "Saving attachment"
msgstr "ź�դ���¸��"
-#: mail/mail-ops.c:1977
+#: mail/mail-ops.c:1991
#, c-format
msgid ""
"Cannot create output file: %s:\n"
@@ -9594,17 +9839,17 @@ msgstr ""
"���ϥե�������������ޤ���: %s:\n"
" %s"
-#: mail/mail-ops.c:2008
+#: mail/mail-ops.c:2022
#, c-format
msgid "Could not write data: %s"
msgstr "�ǡ�����񤭽Ф����Ȥ�����ޤ���Ǥ���: %s"
-#: mail/mail-ops.c:2077
+#: mail/mail-ops.c:2091
#, c-format
msgid "Disconnecting from %s"
msgstr "%s �Ȥ���³���ڤäƤ��ޤ�"
-#: mail/mail-ops.c:2078
+#: mail/mail-ops.c:2092
#, c-format
msgid "Reconnecting to %s"
msgstr "%s �˺���³��"
@@ -9613,95 +9858,104 @@ msgstr "%s �˺���³��"
msgid "_Search"
msgstr "����(_S)"
-#: mail/mail-search.c:138
+#: mail/mail-search.c:137
msgid "(Untitled Message)"
msgstr "(̵��Υ�å�����)"
-#: mail/mail-search.c:241
+#: mail/mail-search.c:240
msgid "Untitled Message"
msgstr "̵��Υ�å�����"
-#: mail/mail-search.c:245
+#: mail/mail-search.c:244
msgid "Empty Message"
msgstr "���Υ�å�����"
-#: mail/mail-search.c:292
+#: mail/mail-search.c:291
msgid "Find in Message"
msgstr "��å������򸡺�"
-#: mail/mail-search.c:322
+#: mail/mail-search.c:321
msgid "Case Sensitive"
msgstr "��ʸ��/��ʸ������̤���"
-#: mail/mail-search.c:324
+#: mail/mail-search.c:323
msgid "Search Forward"
msgstr "��������"
-#: mail/mail-search.c:344
+#: mail/mail-search.c:343
msgid "Find:"
msgstr "����:"
-#: mail/mail-search.c:347
+#: mail/mail-search.c:346
msgid "Matches:"
msgstr "����:"
-#: mail/mail-send-recv.c:139
+#: mail/mail-send-recv.c:141
msgid "Cancelling..."
msgstr "����󥻥���..."
-#: mail/mail-send-recv.c:243
+#: mail/mail-send-recv.c:245
#, c-format
msgid "Server: %s, Type: %s"
msgstr "������: %s, ����: %s"
-#: mail/mail-send-recv.c:245
+#: mail/mail-send-recv.c:247
#, c-format
msgid "Path: %s, Type: %s"
msgstr ""
-#: mail/mail-send-recv.c:247
+#: mail/mail-send-recv.c:249
#, c-format
msgid "Type: %s"
msgstr "����: %s"
-#: mail/mail-send-recv.c:283
+#: mail/mail-send-recv.c:286
msgid "Send & Receive Mail"
msgstr "�᡼���������"
-#: mail/mail-send-recv.c:284
+#: mail/mail-send-recv.c:288
msgid "Cancel All"
msgstr "���٤ƥ���󥻥�"
-#: mail/mail-send-recv.c:333
+#: mail/mail-send-recv.c:348
msgid "Updating..."
msgstr "������..."
-#: mail/mail-send-recv.c:334 mail/mail-send-recv.c:387
+#: mail/mail-send-recv.c:349 mail/mail-send-recv.c:402
msgid "Waiting..."
msgstr "�Ե���..."
-#: mail/mail-send-recv.c:518
+#: mail/mail-send-recv.c:533
msgid "Cancelled."
msgstr "����󥻥뤷�ޤ���"
-#: mail/mail-session.c:183
+#: mail/mail-session.c:211
msgid "User canceled operation."
msgstr "�桼���ˤ�ä����򥭥�󥻥뤵��ޤ���"
-#: mail/mail-tools.c:241
+#: mail/mail-session.c:310
+#, c-format
+msgid "Enter Password for %s"
+msgstr "%s �Τ���Υѥ���ɤ����Ϥ��Ƥ�������"
+
+#: mail/mail-session.c:313
+msgid "Enter Password"
+msgstr "�ѥ���ɤ����Ϥ��Ƥ�������"
+
+#: mail/mail-tools.c:248
#, c-format
msgid "Forwarded message - %s"
msgstr "��å�������ž�����ޤ��� - %s"
-#: mail/mail-tools.c:245
+#: mail/mail-tools.c:252
msgid "Forwarded message"
msgstr "ž�����줿��å�����"
-#: mail/mail-tools.c:378
+#: mail/mail-tools.c:386
msgid "Forwarded Message"
msgstr "ž�����줿��å�����"
-#: mail/mail-vfolder.c:86
+#: mail/mail-vfolder.c:85
#, c-format
msgid "Setting up vfolder: %s"
msgstr "���ۥե�����������: %s"
@@ -9711,7 +9965,7 @@ msgstr "���ۥե�����������: %s"
msgid "Updating vfolders for uri: %s"
msgstr "URI �β��ۥե�����򹹿���: %s"
-#: mail/mail-vfolder.c:416
+#: mail/mail-vfolder.c:414
#, c-format
msgid ""
"The following vFolder(s):\n"
@@ -9720,28 +9974,28 @@ msgid ""
"And have been updated."
msgstr ""
-#: mail/mail-vfolder.c:638
+#: mail/mail-vfolder.c:723
msgid "VFolders"
msgstr "���ۥե����"
-#: mail/mail-vfolder.c:736
+#: mail/mail-vfolder.c:816
msgid "Edit VFolder"
msgstr "���ۥե�������Խ�"
-#: mail/mail-vfolder.c:751
+#: mail/mail-vfolder.c:832
#, c-format
msgid "Trying to edit a vfolder '%s' which doesn't exist."
msgstr ""
-#: mail/mail-vfolder.c:805
+#: mail/mail-vfolder.c:886
msgid "New VFolder"
msgstr "�������ۥե����"
-#: mail/message-browser.c:121
+#: mail/message-browser.c:123
msgid "(No subject)"
msgstr "(��̾�ʤ�)"
-#: mail/message-browser.c:123
+#: mail/message-browser.c:125
#, c-format
msgid "%s - Message"
msgstr "%s - ������"
@@ -9802,7 +10056,7 @@ msgstr "%p %l:%M (%a)"
msgid "%b %d %Y"
msgstr "%Yǯ %m�� %d��"
-#: mail/message-list.c:2334
+#: mail/message-list.c:2330
msgid "Generating message list"
msgstr "��å������ꥹ�Ȥ������"
@@ -9828,26 +10082,26 @@ msgstr "\"%s\" �� %s �ʲ��Υե������������"
msgid "Scanning root-level folders on \"%s\""
msgstr "\"%s\" �Υ롼�ȥ�٥�ե������������"
-#: mail/subscribe-dialog.c:320
+#: mail/subscribe-dialog.c:318
#, c-format
msgid "Subscribing to folder \"%s\""
msgstr "�ե���� \"%s\" �������"
-#: mail/subscribe-dialog.c:322
+#: mail/subscribe-dialog.c:320
#, c-format
msgid "Unsubscribing to folder \"%s\""
msgstr "�ե���� \"%s\" �ι��ɲ����"
-#: mail/subscribe-dialog.c:1280 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1279 mail/subscribe-dialog.etspec.h:1
#: shell/e-storage-set-view.etspec.h:1
msgid "Folder"
msgstr "�ե����"
-#: mail/subscribe-dialog.c:1521
+#: mail/subscribe-dialog.c:1520
msgid "No server has been selected"
msgstr "���򤵤줿�����ФϤ���ޤ���"
-#: mail/subscribe-dialog.c:1582
+#: mail/subscribe-dialog.c:1581
msgid "Please select a server."
msgstr "����������"
@@ -9887,128 +10141,126 @@ msgstr "���ɲ��(_U)"
msgid "Evolution component for the executive summary."
msgstr "�¹ԥ��ޥ�Τ���� Evolution ����ݡ��ͥ��"
-#: my-evolution/component-factory.c:45
+#: my-evolution/component-factory.c:44
msgid "Folder containing the Evolution Summary"
msgstr "Evolution���ޥ꡼��ޤ�ե����"
-#: my-evolution/component-factory.c:154
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr "Evolution �¹ԥ��ޥ꡼����ݡ��ͥ�Ȥν����������ޤ���"
+#: my-evolution/component-factory.c:153
+#, fuzzy
+msgid "Cannot initialize Evolution's Summary component."
+msgstr "Evolution �᡼�륳��ݡ��ͥ�Ȥν����������ޤ���"
-#: my-evolution/e-summary-calendar.c:326 my-evolution/e-summary-calendar.c:344
+#: my-evolution/e-summary-calendar.c:340 my-evolution/e-summary-calendar.c:358
msgid "Appointments"
msgstr "���ݥ����"
-#: my-evolution/e-summary-calendar.c:327
+#: my-evolution/e-summary-calendar.c:341
msgid "No appointments"
msgstr "���ݥ���ȤϤ���ޤ���"
-#: my-evolution/e-summary-calendar.c:364
-msgid "%k%M %d %B"
+#: my-evolution/e-summary-calendar.c:377
+#, fuzzy
+msgid "%k:%M %d %B"
msgstr "%k%M %B%d��"
-#: my-evolution/e-summary-calendar.c:366
+#: my-evolution/e-summary-calendar.c:379
msgid "%l:%M %d %B"
msgstr "%B%d��%l��%Mʬ"
-#: my-evolution/e-summary-mail.c:130
+#: my-evolution/e-summary-mail.c:129
msgid "Mail summary"
msgstr "�᡼�륵�ޥ�"
-#. translators: Put here a list of codes for locations you want to
-#. see in My Evolution by default. You can find the list of all
-#. stations and their codes in Evolution sources
+#. translators: Put a list of codes for locations you want to see in
+#. My Evolution by default here. You can find the list of all
+#. stations and their codes in Evolution sources.
#. (evolution/my-evolution/Locations)
+#. Codes are seperated with : eg. "KBOS:EGAA"
#: my-evolution/e-summary-preferences.c:80
-msgid "KBOS:ZSAM:EGAA"
-msgstr "RJTT:RJAA:RJTA"
+#: my-evolution/e-summary-weather.c:661
+msgid "KBOS"
+msgstr ""
-#: my-evolution/e-summary-preferences.c:441
+#: my-evolution/e-summary-preferences.c:444
msgid "Dictionary.com Word of the Day"
msgstr "Dictionary.com ����������"
-#: my-evolution/e-summary-preferences.c:464
+#: my-evolution/e-summary-preferences.c:467
msgid "Quotes of the Day"
msgstr "������"
-#: my-evolution/e-summary-preferences.c:930
+#: my-evolution/e-summary-preferences.c:946
msgid "Add a news feed"
msgstr "�˥塼���ۿ����ɲ�"
-#: my-evolution/e-summary-preferences.c:938
+#: my-evolution/e-summary-preferences.c:954
msgid "Enter the URL of the news feed you wish to add"
msgstr "�ɲä������˥塼���ۿ��� URL ������"
-#: my-evolution/e-summary-preferences.c:942
+#: my-evolution/e-summary-preferences.c:958
msgid "Name:"
msgstr "̾��:"
-#: my-evolution/e-summary-preferences.c:1487
+#: my-evolution/e-summary-preferences.c:1504
msgid "Summary Settings"
msgstr "���ޥ������"
-#: my-evolution/e-summary-rdf.c:297 my-evolution/e-summary-rdf.c:382
+#: my-evolution/e-summary-rdf.c:296 my-evolution/e-summary-rdf.c:381
#: my-evolution/e-summary-rdf.c:415
msgid "Error downloading RDF"
msgstr "RDF �Υ������������˥��顼"
-#: my-evolution/e-summary-rdf.c:507
+#: my-evolution/e-summary-rdf.c:528
msgid "News Feed"
msgstr "�˥塼���ե�����"
-#: my-evolution/e-summary-tasks.c:236
+#: my-evolution/e-summary-tasks.c:248
msgid "No tasks"
msgstr "�������Ϥ���ޤ���"
-#: my-evolution/e-summary-tasks.c:275
+#: my-evolution/e-summary-tasks.c:287
msgid "(No Description)"
msgstr "(�����ʤ�)"
-#: my-evolution/e-summary-weather.c:72
+#: my-evolution/e-summary-weather.c:71
msgid "My Weather"
msgstr "��ŷ��"
-#: my-evolution/e-summary-weather.c:349
+#: my-evolution/e-summary-weather.c:348
msgid "<dd><b>The weather server could not be contacted</b></dd>"
msgstr "<dd><b>��ŷ�������С�����³�Ǥ��ޤ���Ǥ���</b></dd>"
-#: my-evolution/e-summary-weather.c:539
+#: my-evolution/e-summary-weather.c:559
msgid "Weather"
msgstr "��ŷ��"
-#. translators: Put here a list of codes for locations you want to
-#. see in My Evolution by default. You can find the list of all
-#. stations and their codes in Evolution sources
-#. (evolution/my-evolution/Locations)
-#: my-evolution/e-summary-weather.c:630
-msgid "KBOS:EGAA:RJTT"
-msgstr "RJTT:RJAA:RJTA"
-
-#: my-evolution/e-summary-weather.c:691
+#: my-evolution/e-summary-weather.c:722
msgid "Regions"
msgstr "�ϰ�"
-#: my-evolution/e-summary.c:187
+#: my-evolution/e-summary.c:193
msgid "%A, %B %e %Y"
msgstr "%Yǯ%B%e�� %A"
-#: my-evolution/e-summary.c:568 ui/my-evolution.xml.h:3
+#: my-evolution/e-summary.c:575 ui/my-evolution.xml.h:3
msgid "Print Summary"
msgstr "���ޥ�����"
-#: my-evolution/e-summary.c:614
+#: my-evolution/e-summary.c:621
msgid "Printing of Summary failed"
msgstr "���ޥ�ΰ����˼��Ԥ��ޤ���"
-#: my-evolution/main.c:67
+#: my-evolution/main.c:66
msgid "Executive summary component could not initialize Bonobo.\n"
msgstr "������������ݡ��ͥ�Ȥ� Bonobo �������Ǥ��ޤ���Ǥ���\n"
#: my-evolution/metar.c:29
+#, fuzzy
msgid "F"
msgstr "�ڻ�"
#: my-evolution/metar.c:29
+#, fuzzy
msgid "C"
msgstr "�ݻ�"
@@ -10056,7 +10308,7 @@ msgstr "����ޤ�"
msgid "Overcast"
msgstr "�ޤ�"
-#: my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:137
+#: my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:485
msgid "Invalid"
msgstr "����"
@@ -10128,1061 +10380,1072 @@ msgstr "����"
msgid "North - Northwest"
msgstr "�� - ����"
-#. NONE VICINITY LIGHT MODERATE HEAVY SHALLOW PATCHES PARTIAL THUNDERSTORM BLOWING SHOWERS DRIFTING FREEZING
-#. ******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************
-#. NONE
#. DRIZZLE
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:127
msgid "Drizzle"
msgstr "̸��"
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:128
msgid "Drizzle in the vicinity"
msgstr "���٤�̸��"
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:129
msgid "Light drizzle"
msgstr "�夤̸��"
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:130
msgid "Moderate drizzle"
msgstr "�¤�̸��"
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:131
msgid "Heavy drizzle"
msgstr "����̸��"
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:132
msgid "Shallow drizzle"
msgstr "����ä�̸��"
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:133
msgid "Patches of drizzle"
msgstr "�꡹̸��"
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:134
msgid "Partial drizzle"
msgstr "����̸��"
-#: my-evolution/metar.c:100 my-evolution/metar.c:101
+#: my-evolution/metar.c:135 my-evolution/metar.c:150
msgid "Thunderstorm"
msgstr "��̸��"
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:136
msgid "Windy drizzle"
msgstr "�᤭�Ĥ���̸��"
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:137
msgid "Showers"
msgstr "�ˤ狼��"
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:138
msgid "Drifting drizzle"
msgstr "�᤭�󤻤�̸��"
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:139
msgid "Freezing drizzle"
msgstr "��ɹ����̸��"
#. RAIN
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:142
msgid "Rain"
msgstr "��"
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:143
msgid "Rain in the vicinity"
msgstr "���٤DZ�"
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:144
msgid "Light rain"
msgstr "�夤��"
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:145
msgid "Moderate rain"
msgstr "�¤α�"
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:146
msgid "Heavy rain"
msgstr "������"
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:147
msgid "Shallow rain"
msgstr "����äȱ�"
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:148
msgid "Patches of rain"
msgstr "�꡹��"
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:149
msgid "Partial rainfall"
msgstr "������"
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:151
msgid "Blowing rainfall"
msgstr "�᤭�Ĥ��뱫"
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:152
msgid "Rain showers"
msgstr "�ˤ狼�˱�"
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:153
msgid "Drifting rain"
msgstr "�᤭�󤻤뱫"
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:154
msgid "Freezing rain"
msgstr "��ɹ���α�"
#. SNOW
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:157
msgid "Snow"
msgstr "��"
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:158
msgid "Snow in the vicinity"
msgstr "���٤���"
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:159
msgid "Light snow"
msgstr "�夤��"
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:160
msgid "Moderate snow"
msgstr "�¤���"
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:161
msgid "Heavy snow"
msgstr "������"
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:162
msgid "Shallow snow"
msgstr "������"
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:163
msgid "Patches of snow"
msgstr "�꡹��"
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:164
msgid "Partial snowfall"
msgstr "������"
-#: my-evolution/metar.c:102 my-evolution/metar.c:103
+#: my-evolution/metar.c:165 my-evolution/metar.c:180
msgid "Snowstorm"
msgstr "�����"
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:166
msgid "Blowing snowfall"
msgstr "����"
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:167
msgid "Snow showers"
msgstr "�ˤ狼��"
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:168
msgid "Drifting snow"
msgstr "�᤭�󤻤���"
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:169
msgid "Freezing snow"
msgstr "��ɹ������"
#. SNOW_GRAINS
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:172
msgid "Snow grains"
msgstr "�����"
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:173
msgid "Snow grains in the vicinity"
msgstr "���٤�γ��"
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:174
msgid "Light snow grains"
msgstr "�夤γ��"
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:175
msgid "Moderate snow grains"
msgstr "�¤�γ��"
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:176
msgid "Heavy snow grains"
msgstr "�����"
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:177
msgid "Shallow snow grains"
msgstr "�����"
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:178
msgid "Patches of snow grains"
msgstr "�꡹γ��"
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:179
msgid "Partial snow grains"
msgstr "�����"
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:181
msgid "Blowing snow grains"
msgstr "�᤭�Ĥ���γ��"
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:182
msgid "Snow grain showers"
msgstr "�ˤ狼γ��"
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:183
msgid "Drifting snow grains"
msgstr "�᤭�󤻤�γ��"
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:184
msgid "Freezing snow grains"
msgstr "��ɹ����γ��"
#. ICE_CRYSTALS
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:187
msgid "Ice crystals"
msgstr "��ɹ"
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:188
msgid "Ice crystals in the vicinity"
msgstr ""
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:189
msgid "Few ice crystals"
msgstr ""
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:190
msgid "Moderate ice crystals"
msgstr ""
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:191
msgid "Heavy ice crystals"
msgstr ""
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:193
msgid "Patches of ice crystals"
msgstr ""
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:194
msgid "Partial ice crystals"
msgstr ""
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:195
msgid "Ice crystal storm"
msgstr ""
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:196
msgid "Blowing ice crystals"
msgstr ""
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:197
msgid "Showers of ice crystals"
msgstr ""
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:198
msgid "Drifting ice crystals"
msgstr ""
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:199
msgid "Freezing ice crystals"
msgstr ""
#. ICE_PELLETS
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:202
msgid "Ice pellets"
msgstr ""
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:203
msgid "Ice pellets in the vicinity"
msgstr ""
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:204
msgid "Few ice pellets"
msgstr ""
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:205
msgid "Moderate ice pellets"
msgstr ""
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:206
msgid "Heavy ice pellets"
msgstr ""
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:207
msgid "Shallow ice pellets"
msgstr ""
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:208
msgid "Patches of ice pellets"
msgstr ""
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:209
msgid "Partial ice pellets"
msgstr ""
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:210
msgid "Ice pellet storm"
msgstr ""
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:211
msgid "Blowing ice pellets"
msgstr ""
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:212
msgid "Showers of ice pellets"
msgstr ""
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:213
msgid "Drifting ice pellets"
msgstr ""
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:214
msgid "Freezing ice pellets"
msgstr ""
#. HAIL
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:217
msgid "Hail"
msgstr "�����"
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:218
msgid "Hail in the vicinity"
msgstr "���٤Ǥ����"
-#: my-evolution/metar.c:106 my-evolution/metar.c:107
+#: my-evolution/metar.c:219 my-evolution/metar.c:234
msgid "Light hail"
msgstr "�夤�����"
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:220
msgid "Moderate hail"
msgstr "�¤Τ����"
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:221
msgid "Heavy hail"
msgstr "���������"
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:222
msgid "Shallow hail"
msgstr "���������"
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:223
msgid "Patches of hail"
msgstr "�꡹�����"
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:224
msgid "Partial hail"
msgstr "���������"
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:225
msgid "Hailstorm"
msgstr "��������"
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:226
msgid "Blowing hail"
msgstr "�᤭�Ĥ��뤢���"
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:227
msgid "Hail showers"
msgstr "�ˤ狼�����"
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:228
msgid "Drifting hail"
msgstr "�᤭�󤻤뤢���"
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:229
msgid "Freezing hail"
msgstr "��ɹ���Τ����"
#. SMALL_HAIL
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:232
msgid "Small hail"
msgstr "�"
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:233
msgid "Small hail in the vicinity"
msgstr "���٤��"
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:235
msgid "Moderate small hail"
msgstr "�¤��"
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:236
msgid "Heavy small hail"
msgstr "�����"
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:237
msgid "Shallow small hail"
msgstr "�����"
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:238
msgid "Patches of small hail"
msgstr "�꡹�"
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:239
msgid "Partial small hail"
msgstr "�����"
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:240
msgid "Small hailstorm"
msgstr "���"
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:241
msgid "Blowing small hail"
msgstr "�᤭�Ĥ����"
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:242
msgid "Showers of small hail"
msgstr "�ˤ狼�"
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:243
msgid "Drifting small hail"
msgstr "�᤭�󤻤��"
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:244
msgid "Freezing small hail"
msgstr "��ɹ�����"
#. PRECIPITATION
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:247
msgid "Unknown precipitation"
msgstr "�����ʹ߿�"
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:248
msgid "Precipitation in the vicinity"
msgstr "���٤ǹ߿�"
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:249
msgid "Light precipitation"
msgstr "�夤�߿�"
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:250
msgid "Moderate precipitation"
msgstr "�¤ι߿�"
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:251
msgid "Heavy precipitation"
msgstr "�����߿�"
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:252
msgid "Shallow precipitation"
msgstr "�����߿�"
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:253
msgid "Patches of precipitation"
msgstr "�꡹�߿�"
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:254
msgid "Partial precipitation"
msgstr "�����߿�"
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:255
msgid "Unknown thunderstorm"
msgstr "̤�Τ�����"
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:256
msgid "Blowing precipitation"
msgstr "�᤭�Ĥ���߿�"
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:257
msgid "Showers, type unknown"
msgstr "�����ʤˤ狼�߿�"
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:258
msgid "Drifting precipitation"
msgstr "�᤭�󤻤�߿�"
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:259
msgid "Freezing precipitation"
msgstr "��ɹ���ι߿�"
#. MIST
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:262
msgid "Mist"
msgstr "̸"
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:263
msgid "Mist in the vicinity"
msgstr "���٤�̸"
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:264
msgid "Light mist"
msgstr "�夤̸"
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:265
msgid "Moderate mist"
msgstr "�¤�̸"
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:266
msgid "Thick mist"
msgstr "ǻ��̸"
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:267
msgid "Shallow mist"
msgstr "����̸"
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:268
msgid "Patches of mist"
msgstr "�꡹̸"
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:269
msgid "Partial mist"
msgstr "����̸"
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:271
msgid "Mist with wind"
msgstr "����̸"
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:273
msgid "Drifting mist"
msgstr "�᤭�󤻤�̸"
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:274
msgid "Freezing mist"
msgstr "��ɹ����̸"
#. FOG
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:277
msgid "Fog"
msgstr "��̸"
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:278
msgid "Fog in the vicinity"
msgstr "���٤DZ�̸"
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:279
msgid "Light fog"
msgstr "�夤��̸"
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:280
msgid "Moderate fog"
msgstr "�¤α�̸"
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:281
msgid "Thick fog"
msgstr "ǻ����̸"
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:282
msgid "Shallow fog"
msgstr "������̸"
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:283
msgid "Patches of fog"
msgstr "�꡹��̸"
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:284
msgid "Partial fog"
msgstr "������̸"
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:286
msgid "Fog with wind"
msgstr "���ȱ�̸"
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:288
msgid "Drifting fog"
msgstr "�᤭�󤻤��̸"
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:289
msgid "Freezing fog"
msgstr "��ɹ���α�̸"
#. SMOKE
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:292
msgid "Smoke"
msgstr "��"
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:293
msgid "Smoke in the vicinity"
msgstr "���٤DZ�"
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:294
msgid "Thin smoke"
msgstr "�٤���"
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:295
msgid "Moderate smoke"
msgstr "�¤α�"
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:296
msgid "Thick smoke"
msgstr "ǻ����"
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:297
msgid "Shallow smoke"
msgstr "������"
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:298
msgid "Patches of smoke"
msgstr "�꡹��"
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:299
msgid "Partial smoke"
msgstr "������"
-#: my-evolution/metar.c:111
-msgid "Smoke w/ thunders"
-msgstr "��ȱ�"
+#: my-evolution/metar.c:300
+#, fuzzy
+msgid "Thunderous smoke"
+msgstr "�뤬���륹������"
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:301
msgid "Smoke with wind"
msgstr "���ȱ�"
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:303
msgid "Drifting smoke"
msgstr "�᤭�󤻤��"
#. VOLCANIC_ASH
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:307
msgid "Volcanic ash"
msgstr "���"
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:308
msgid "Volcanic ash in the vicinity"
msgstr "���٤Dzл���"
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:310
msgid "Moderate volcanic ash"
msgstr "�¤βл���"
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:311
msgid "Thick volcanic ash"
msgstr "ǻ���л���"
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:312
msgid "Shallow volcanic ash"
msgstr "�������"
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:313
msgid "Patches of volcanic ash"
msgstr "�꡹�л���"
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:314
msgid "Partial volcanic ash"
msgstr "�������"
-#: my-evolution/metar.c:112
-msgid "Volcanic ash w/ thunders"
-msgstr "��Ȳл���"
+#: my-evolution/metar.c:315
+#, fuzzy
+msgid "Thunderous volcanic ash"
+msgstr "ǻ���л���"
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:316
msgid "Blowing volcanic ash"
msgstr "�᤭�Ĥ���л���"
-#: my-evolution/metar.c:112
-msgid "Showers of volcanic ash "
+#: my-evolution/metar.c:317
+#, fuzzy
+msgid "Showers of volcanic ash"
msgstr "�ˤ狼�˲л���"
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:318
msgid "Drifting volcanic ash"
msgstr "�᤭�󤻤�л���"
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:319
msgid "Freezing volcanic ash"
msgstr "��ɹ���βл���"
#. SAND
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:322
msgid "Sand"
msgstr "��"
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:323
msgid "Sand in the vicinity"
msgstr "���٤Ǻ�"
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:324
msgid "Light sand"
msgstr "�夤��"
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:325
msgid "Moderate sand"
msgstr "�¤κ�"
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:326
msgid "Heavy sand"
msgstr "������"
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:328
msgid "Patches of sand"
msgstr "�꡹��"
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:329
msgid "Partial sand"
msgstr "������"
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:331
msgid "Blowing sand"
msgstr "�᤭�Ĥ��뺽"
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:333
msgid "Drifting sand"
msgstr "�᤭�󤻤뺽"
#. HAZE
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:337
msgid "Haze"
msgstr "���"
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:338
msgid "Haze in the vicinity"
msgstr "���٤Ǥ��"
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:339
msgid "Light haze"
msgstr "�夤���"
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:340
msgid "Moderate haze"
msgstr "�¤Τ��"
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:341
msgid "Thick haze"
msgstr "ǻ�����"
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:342
msgid "Shallow haze"
msgstr "�������"
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:343
msgid "Patches of haze"
msgstr "�꡹���"
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:344
msgid "Partial haze"
msgstr "�������"
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:346
msgid "Haze with wind"
msgstr "��������"
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:348
msgid "Drifting haze"
msgstr "�᤭�󤻤���"
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:349
msgid "Freezing haze"
msgstr "��ɹ���Τ��"
#. SPRAY
-#: my-evolution/metar.c:115
-msgid "Sprays"
+#: my-evolution/metar.c:352
+#, fuzzy
+msgid "Spray"
msgstr "���"
-#: my-evolution/metar.c:115
-msgid "Sprays in the vicinity"
+#: my-evolution/metar.c:353
+#, fuzzy
+msgid "Spray in the vicinity"
msgstr "���٤ǿ��"
-#: my-evolution/metar.c:115
-msgid "Light sprays"
+#: my-evolution/metar.c:354
+#, fuzzy
+msgid "Light spray"
msgstr "�夤���"
-#: my-evolution/metar.c:115
-msgid "Moderate sprays"
+#: my-evolution/metar.c:355
+#, fuzzy
+msgid "Moderate spray"
msgstr "�¤ο��"
-#: my-evolution/metar.c:115
-msgid "Heavy sprays"
+#: my-evolution/metar.c:356
+#, fuzzy
+msgid "Heavy spray"
msgstr "�������"
-#: my-evolution/metar.c:115
-msgid "Shallow sprays"
+#: my-evolution/metar.c:357
+#, fuzzy
+msgid "Shallow spray"
msgstr "�������"
-#: my-evolution/metar.c:115
-msgid "Patches of sprays"
+#: my-evolution/metar.c:358
+#, fuzzy
+msgid "Patches of spray"
msgstr "�꡹���"
-#: my-evolution/metar.c:115
-msgid "Partial sprays"
+#: my-evolution/metar.c:359
+#, fuzzy
+msgid "Partial spray"
msgstr "�������"
-#: my-evolution/metar.c:115
-msgid "Blowing sprays"
+#: my-evolution/metar.c:361
+#, fuzzy
+msgid "Blowing spray"
msgstr "�᤭�Ĥ�����"
-#: my-evolution/metar.c:115
-msgid "Drifting sprays"
+#: my-evolution/metar.c:363
+#, fuzzy
+msgid "Drifting spray"
msgstr "�᤭�󤻤���"
-#: my-evolution/metar.c:115
-msgid "Freezing sprays"
+#: my-evolution/metar.c:364
+#, fuzzy
+msgid "Freezing spray"
msgstr "��ɹ���ο��"
#. DUST
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:367
msgid "Dust"
msgstr "ʴ��"
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:368
msgid "Dust in the vicinity"
msgstr "���٤�ʴ��"
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:369
msgid "Light dust"
msgstr "�夤ʴ��"
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:370
msgid "Moderate dust"
msgstr "�¤�ʴ��"
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:371
msgid "Heavy dust"
msgstr "����ʴ��"
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:373
msgid "Patches of dust"
msgstr "�꡹ʴ��"
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:374
msgid "Partial dust"
msgstr "����ʴ��"
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:376
msgid "Blowing dust"
msgstr "�᤭�Ĥ���ʴ��"
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:378
msgid "Drifting dust"
msgstr "�᤭�󤻤�ʴ��"
#. SQUALL
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:382
msgid "Squall"
msgstr "��������"
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:383
msgid "Squall in the vicinity"
msgstr "���٤ǥ�������"
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:384
msgid "Light squall"
msgstr "�夤��������"
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:385
msgid "Moderate squall"
msgstr "�¤Υ�������"
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:386
msgid "Heavy squall"
msgstr "������������"
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:389
msgid "Partial squall"
msgstr "������������"
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:390
msgid "Thunderous squall"
msgstr "�뤬���륹������"
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:391
msgid "Blowing squall"
msgstr "�᤭�Ĥ��륹������"
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:393
msgid "Drifting squall"
msgstr "�᤭�󤻤륹������"
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:394
msgid "Freezing squall"
msgstr "��ɹ���Υ�������"
#. SANDSTORM
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:397
msgid "Sandstorm"
msgstr "����"
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:398
msgid "Sandstorm in the vicinity"
msgstr "���٤Ǻ���"
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:399
msgid "Light standstorm"
msgstr "�夤����"
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:400
msgid "Moderate sandstorm"
msgstr "�¤κ���"
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:401
msgid "Heavy sandstorm"
msgstr "��������"
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:402
msgid "Shallow sandstorm"
msgstr "��������"
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:404
msgid "Partial sandstorm"
msgstr "��������"
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:405
msgid "Thunderous sandstorm"
msgstr "��Τ��뺽��"
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:406
msgid "Blowing sandstorm"
msgstr "�᤭�Ĥ��뺽��"
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:408
msgid "Drifting sandstorm"
msgstr "�᤭�󤻤뺽��"
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:409
msgid "Freezing sandstorm"
msgstr "��ɹ���κ���"
#. DUSTSTORM
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:412
msgid "Duststorm"
msgstr "����"
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:413
msgid "Duststorm in the vicinity"
msgstr "���٤ǿ���"
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:414
msgid "Light duststorm"
msgstr "�夤����"
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:415
msgid "Moderate duststorm"
msgstr "�¤ο���"
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:416
msgid "Heavy duststorm"
msgstr "��������"
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:417
msgid "Shallow duststorm"
msgstr "��������"
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:419
msgid "Partial duststorm"
msgstr "��������"
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:420
msgid "Thunderous duststorm"
msgstr "�뤬�������"
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:421
msgid "Blowing duststorm"
msgstr "�᤭�Ĥ������"
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:423
msgid "Drifting duststorm"
msgstr "�᤭�󤻤����"
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:424
msgid "Freezing duststorm"
msgstr "��ɹ���ο���"
#. FUNNEL_CLOUD
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:427
msgid "Funnel cloud"
msgstr ""
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:428
msgid "Funnel cloud in the vicinity"
msgstr ""
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:429
msgid "Light funnel cloud"
msgstr ""
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:430
msgid "Moderate funnel cloud"
msgstr ""
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:431
msgid "Thick funnel cloud"
msgstr ""
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:432
msgid "Shallow funnel cloud"
msgstr ""
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:433
msgid "Patches of funnel clouds"
msgstr ""
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:434
msgid "Partial funnel clouds"
msgstr ""
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:436
msgid "Funnel cloud w/ wind"
msgstr ""
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:438
msgid "Drifting funnel cloud"
msgstr ""
#. TORNADO
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:442 my-evolution/metar.c:451
msgid "Tornado"
msgstr ""
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:443
msgid "Tornado in the vicinity"
msgstr ""
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:445
msgid "Moderate tornado"
msgstr ""
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:446
msgid "Raging tornado"
msgstr ""
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:449
msgid "Partial tornado"
msgstr ""
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:450
msgid "Thunderous tornado"
msgstr ""
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:453
msgid "Drifting tornado"
msgstr ""
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:454
msgid "Freezing tornado"
msgstr ""
#. DUST_WHIRLS
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:457
msgid "Dust whirls"
msgstr ""
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:458
msgid "Dust whirls in the vicinity"
msgstr ""
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:459
msgid "Light dust whirls"
msgstr ""
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:460
msgid "Moderate dust whirls"
msgstr ""
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:461
msgid "Heavy dust whirls"
msgstr ""
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:462
msgid "Shallow dust whirls"
msgstr ""
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:463
msgid "Patches of dust whirls"
msgstr ""
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:464
msgid "Partial dust whirls"
msgstr ""
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:466
msgid "Blowing dust whirls"
msgstr ""
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:468
msgid "Drifting dust whirls"
msgstr ""
@@ -11191,7 +11454,8 @@ msgid " _Remove"
msgstr "��� (_R)"
#: my-evolution/my-evolution.glade.h:2
-msgid "Add n_ew feed"
+#, fuzzy
+msgid "Add n_ews feed"
msgstr "�����˥塼���ۿ����ɲ�(_E)"
#: my-evolution/my-evolution.glade.h:3
@@ -11206,13 +11470,13 @@ msgstr "���٤ƤΥե����(_F):"
msgid "All news _feeds:"
msgstr "���٤ƤΥ˥塼���ۿ�(_F)"
-#: my-evolution/my-evolution.glade.h:7
-msgid "How many days should the calendar display at once?"
-msgstr "���٤˲���ʬ�Υ���������ɽ�����ޤ���?"
+#: my-evolution/my-evolution.glade.h:6
+msgid "C_elcius"
+msgstr ""
#: my-evolution/my-evolution.glade.h:8
-msgid "M_etric"
-msgstr "�᡼�ȥ�ˡ(_E)"
+msgid "How many days should the calendar display at once?"
+msgstr "���٤˲���ʬ�Υ���������ɽ�����ޤ���?"
#: my-evolution/my-evolution.glade.h:9
msgid "Ma_x number of items shown:"
@@ -11251,12 +11515,12 @@ msgid "Show _today's tasks"
msgstr "�����Υ�������ɽ��(_T)"
#: my-evolution/my-evolution.glade.h:18
-msgid "Tasks "
-msgstr "������ "
+msgid "Show temperatures in:"
+msgstr ""
#: my-evolution/my-evolution.glade.h:19
-msgid "Units: "
-msgstr "ñ��: "
+msgid "Tasks "
+msgstr "������ "
#: my-evolution/my-evolution.glade.h:20
msgid "Weather settings"
@@ -11275,12 +11539,12 @@ msgid "_Displayed feeds:"
msgstr "ɽ���Ѥߤ��ۿ�(_D)"
#: my-evolution/my-evolution.glade.h:25
-msgid "_Five days"
-msgstr "5����(_F)"
+msgid "_Fahrenheit"
+msgstr ""
#: my-evolution/my-evolution.glade.h:26
-msgid "_Imperial"
-msgstr "����ڥꥢ��ˡ(_I)"
+msgid "_Five days"
+msgstr "5����(_F)"
#: my-evolution/my-evolution.glade.h:27
msgid "_Mail"
@@ -11314,23 +11578,23 @@ msgstr "�ܺ٤�ɽ��"
msgid "Cancel Operation"
msgstr "���򥭥�󥻥�"
-#: shell/e-local-storage.c:175 shell/e-shortcuts.c:1053
+#: shell/e-local-storage.c:174 shell/e-shortcuts.c:1052
msgid "Inbox"
msgstr "����Ȣ"
-#: shell/e-local-storage.c:176
+#: shell/e-local-storage.c:175
msgid "Outbox"
msgstr "����Ȣ"
-#: shell/e-local-storage.c:624
+#: shell/e-local-storage.c:636
msgid "Local Folders"
msgstr "��������ե����"
-#: shell/e-setup.c:125
+#: shell/e-setup.c:124
msgid "Evolution installation"
msgstr "Evolution �Υ��󥹥ȡ���"
-#: shell/e-setup.c:129
+#: shell/e-setup.c:128
msgid ""
"This new version of Evolution needs to install additional files\n"
"into your personal Evolution directory"
@@ -11338,15 +11602,15 @@ msgstr ""
"���� Evolution �ο������С������Ϥ��ʤ��Υѡ����ʥ� Evolution\n"
"�ǥ��쥯�ȥ������ղåե�����򥤥󥹥ȡ��뤹��ɬ�פ�����ޤ�"
-#: shell/e-setup.c:130
+#: shell/e-setup.c:129
msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
msgstr "\"OK\" �ǥե�����򥤥󥹥ȡ���, �ޤ��� \"����󥻥�\" �ǽ�λ���ޤ�"
-#: shell/e-setup.c:170
+#: shell/e-setup.c:169
msgid "Could not update files correctly"
msgstr "�������ե�����򹹿�����ޤ���Ǥ���"
-#: shell/e-setup.c:193
+#: shell/e-setup.c:192
#, c-format
msgid ""
"Cannot create the directory\n"
@@ -11357,7 +11621,7 @@ msgstr ""
"\n"
"���顼: %s"
-#: shell/e-setup.c:208
+#: shell/e-setup.c:207
#, c-format
msgid ""
"An error occurred in copying files into\n"
@@ -11366,7 +11630,7 @@ msgstr ""
"�ե������ `%s' �إ��ԡ����\n"
"���顼��ȯ�����ޤ���"
-#: shell/e-setup.c:282
+#: shell/e-setup.c:281
#, c-format
msgid ""
"The file `%s' is not a directory.\n"
@@ -11377,7 +11641,7 @@ msgstr ""
"Evolution �桼���ե�����Υ��󥹥ȡ����\n"
"���Ƥ��뤿��˰�ư���Ʋ�����"
-#: shell/e-setup.c:296
+#: shell/e-setup.c:295
msgid ""
"Evolution has detected an old\n"
"Executive-Summary directory.\n"
@@ -11391,7 +11655,7 @@ msgstr ""
"�������ɬ�פ�����ޤ�\n"
"���Υǥ��쥯�ȥ�������ޤ���?"
-#: shell/e-setup.c:321
+#: shell/e-setup.c:320
#, c-format
msgid ""
"The directory `%s' exists but is not the\n"
@@ -11402,6 +11666,19 @@ msgstr ""
"�ǥ��쥯�ȥ�ǤϤ���ޤ���Evolution �桼��\n"
"�ե�����Υ��󥹥ȡ������Ƥ��뤿��˰�ư���Ʋ�����"
+#: shell/e-shell-about-box.c:40
+#, fuzzy
+msgid "Evolution "
+msgstr "Evolution"
+
+#: shell/e-shell-about-box.c:41
+msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
+msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
+
+#: shell/e-shell-about-box.c:43
+msgid "Brought to you by"
+msgstr ""
+
#: shell/e-shell-folder-commands.c:176
msgid "Cannot move a folder over itself."
msgstr "�ե������Ʊ���ե�����ˤϰ�ư�Ǥ��ޤ���"
@@ -11414,25 +11691,25 @@ msgstr "�ե������Ʊ���ե�����ˤϥ��ԡ��Ǥ��ޤ���"
msgid "Cannot move a folder into one of its descendants."
msgstr ""
-#: shell/e-shell-folder-commands.c:308
+#: shell/e-shell-folder-commands.c:307
#, c-format
msgid "Specify a folder to copy folder \"%s\" into:"
msgstr "�ե���� \"%s\" �򥳥ԡ�����ե��������ꤷ�ޤ�:"
-#: shell/e-shell-folder-commands.c:313
+#: shell/e-shell-folder-commands.c:312
msgid "Copy folder"
msgstr "�ե�����Υ��ԡ�"
-#: shell/e-shell-folder-commands.c:355
+#: shell/e-shell-folder-commands.c:354
#, c-format
msgid "Specify a folder to move folder \"%s\" into:"
msgstr "�ե���� \"%s\" ���ư����ե��������ꤷ�ޤ�:"
-#: shell/e-shell-folder-commands.c:360
+#: shell/e-shell-folder-commands.c:359
msgid "Move folder"
msgstr "�ե�����ΰ�ư"
-#: shell/e-shell-folder-commands.c:386
+#: shell/e-shell-folder-commands.c:385
#, c-format
msgid ""
"Cannot delete folder:\n"
@@ -11441,18 +11718,18 @@ msgstr ""
"�ե���������Ǥ��ޤ���:\n"
"%s"
-#: shell/e-shell-folder-commands.c:402
+#: shell/e-shell-folder-commands.c:401
#, c-format
msgid "Delete \"%s\""
msgstr "\"%s\" ����"
#. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:412
+#: shell/e-shell-folder-commands.c:411
#, c-format
msgid "Are you sure you want to remove the \"%s\" folder?"
msgstr "������ �ե���� \"%s\" �������Ƥ��������Ǥ���?"
-#: shell/e-shell-folder-commands.c:457
+#: shell/e-shell-folder-commands.c:488
#, c-format
msgid ""
"Cannot rename folder:\n"
@@ -11461,15 +11738,21 @@ msgstr ""
"�ե�������͡���Ǥ��ޤ���:\n"
"%s"
-#: shell/e-shell-folder-commands.c:490
+#: shell/e-shell-folder-commands.c:536
#, c-format
msgid "Rename the \"%s\" folder to:"
msgstr "�ե���� \"%s\" ���͡���"
-#: shell/e-shell-folder-commands.c:493
+#: shell/e-shell-folder-commands.c:542
msgid "Rename folder"
msgstr "�ե�������͡���"
+#: shell/e-shell-folder-commands.c:552
+#: shell/e-shell-folder-creation-dialog.c:148
+#, c-format
+msgid "The specified folder name is not valid: %s"
+msgstr "���ꤵ�줿�ե����̾��ͭ���ǤϤ���ޤ���: %s"
+
#: shell/e-shell-folder-creation-dialog.c:111
#, c-format
msgid ""
@@ -11479,32 +11762,11 @@ msgstr ""
"���ꤵ�줿�ե������������뤳�Ȥ�����ޤ���:\n"
"%s"
-#: shell/e-shell-folder-creation-dialog.c:126
-msgid "No folder name specified."
-msgstr "���ꤵ�줿�ե�����Ϥ���ޤ���"
-
-#: shell/e-shell-folder-creation-dialog.c:132
-msgid "Folder name cannot contain the Return character."
-msgstr ""
-
-#: shell/e-shell-folder-creation-dialog.c:137
-msgid "Folder cannot contain the directory separator."
-msgstr "�ե����̾�ˤϥǥ��쥯�ȥ���ڤ�ʸ���ϻȤ��ޤ���"
-
-#: shell/e-shell-folder-creation-dialog.c:142
-msgid "'.' and '..' are reserved folder names."
-msgstr ""
-
-#: shell/e-shell-folder-creation-dialog.c:180
-#, c-format
-msgid "The specified folder name is not valid: %s"
-msgstr "���ꤵ�줿�ե����̾��ͭ���ǤϤ���ޤ���: %s"
-
-#: shell/e-shell-folder-creation-dialog.c:300
+#: shell/e-shell-folder-creation-dialog.c:267
msgid "Evolution - Create new folder"
msgstr "Evolution - �����ե�����κ���"
-#: shell/e-shell-folder-selection-dialog.c:99
+#: shell/e-shell-folder-selection-dialog.c:98
msgid ""
"The type of the selected folder is not valid for\n"
"the requested operation."
@@ -11512,19 +11774,19 @@ msgstr ""
"���򤷤��ե�����μ��̤��׵ᤵ�줿���Τ����\n"
"ͭ���ǤϤ���ޤ���"
-#: shell/e-shell-folder-selection-dialog.c:360
+#: shell/e-shell-folder-selection-dialog.c:359
msgid "New..."
msgstr "����..."
-#: shell/e-shell-folder-title-bar.c:585 shell/e-shell-folder-title-bar.c:586
+#: shell/e-shell-folder-title-bar.c:584 shell/e-shell-folder-title-bar.c:585
msgid "(Untitled)"
msgstr "(�����ȥ�ʤ�)"
-#: shell/e-shell-importer.c:141
+#: shell/e-shell-importer.c:142
msgid "Choose the type of importer to run"
msgstr ""
-#: shell/e-shell-importer.c:144
+#: shell/e-shell-importer.c:145
msgid ""
"Choose the file that you want to import into Evolution, and select what type "
"of file it is from the list.\n"
@@ -11538,13 +11800,13 @@ msgstr ""
"�⤷ʬ����ʤ��ʤ� \"��Ư\" �����򤹤뤳�Ȥ����衤Evolution �ϲ����ߤ��"
"���礦"
-#: shell/e-shell-importer.c:150
+#: shell/e-shell-importer.c:151
msgid "Please select the information that you would like to import"
msgstr ""
#. Importer isn't ready yet.
#. Wait 5 seconds and try again.
-#: shell/e-shell-importer.c:242
+#: shell/e-shell-importer.c:243
#, c-format
msgid ""
"Importing %s\n"
@@ -11555,7 +11817,7 @@ msgstr ""
"����ݡ����ν���������Ƥ��ޤ���\n"
"5���Ԥäƺ��ٻ�Ƥ�������"
-#: shell/e-shell-importer.c:262 shell/e-shell-importer.c:293
+#: shell/e-shell-importer.c:263 shell/e-shell-importer.c:294
#, c-format
msgid ""
"Importing %s\n"
@@ -11564,16 +11826,16 @@ msgstr ""
"%s �򥤥�ݡ�����\n"
"�����ƥ� %d �򥤥�ݡ�����"
-#: shell/e-shell-importer.c:396
+#: shell/e-shell-importer.c:397
#, c-format
msgid "File %s does not exist"
msgstr "�ե���� %s ��¸�ߤ��ޤ���"
-#: shell/e-shell-importer.c:408
+#: shell/e-shell-importer.c:409
msgid "You may only import to local folders"
msgstr ""
-#: shell/e-shell-importer.c:423
+#: shell/e-shell-importer.c:424
#, c-format
msgid ""
"There is no importer that is able to handle\n"
@@ -11582,11 +11844,11 @@ msgstr ""
"�������Ȥ�����륤��ݡ��Ȥ�����ޤ���\n"
"%s"
-#: shell/e-shell-importer.c:433
+#: shell/e-shell-importer.c:434
msgid "Importing"
msgstr "����ݡ�����"
-#: shell/e-shell-importer.c:441
+#: shell/e-shell-importer.c:442
#, c-format
msgid ""
"Importing %s.\n"
@@ -11595,17 +11857,17 @@ msgstr ""
"%s �򥤥�ݡ�����\n"
"%s �򳫻Ϥ��ޤ�"
-#: shell/e-shell-importer.c:454
+#: shell/e-shell-importer.c:455
#, c-format
msgid "Error starting %s"
msgstr "%s �γ�����˥��顼��ȯ�����ޤ���"
-#: shell/e-shell-importer.c:473
+#: shell/e-shell-importer.c:474
#, c-format
msgid "Error loading %s"
msgstr "%s �Υ�������˥��顼��ȯ�����ޤ���"
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:491
#, c-format
msgid ""
"Importing %s\n"
@@ -11614,136 +11876,144 @@ msgstr ""
"%s �򥤥�ݡ�����\n"
"�����ƥ� 1 �򥤥�ݡ�����"
-#: shell/e-shell-importer.c:560
+#: shell/e-shell-importer.c:561
msgid "Automatic"
msgstr "��Ư"
-#: shell/e-shell-importer.c:611
+#: shell/e-shell-importer.c:612
msgid "Filename:"
msgstr "�ե�����̾:"
-#: shell/e-shell-importer.c:616
+#: shell/e-shell-importer.c:617
msgid "Select a file"
msgstr "�ե����������"
-#: shell/e-shell-importer.c:626
+#: shell/e-shell-importer.c:627
msgid "File type:"
msgstr "�ե��������:"
-#: shell/e-shell-importer.c:651
+#: shell/e-shell-importer.c:652
msgid "Import data and settings from older programs"
msgstr ""
-#: shell/e-shell-importer.c:655
+#: shell/e-shell-importer.c:656
msgid "Import a single file"
msgstr "���󥰥�ե�����򥤥�ݡ��Ȥ��ޤ�"
-#: shell/e-shell-importer.c:720 shell/e-shell-startup-wizard.c:582
+#: shell/e-shell-importer.c:721 shell/e-shell-startup-wizard.c:586
msgid ""
"Please wait...\n"
"Scanning for existing setups"
msgstr ""
-#: shell/e-shell-importer.c:721 shell/e-shell-startup-wizard.c:585
+#: shell/e-shell-importer.c:724 shell/e-shell-startup-wizard.c:589
msgid "Starting Intelligent Importers"
msgstr ""
-#: shell/e-shell-importer.c:840 shell/e-shell-startup-wizard.c:703
+#: shell/e-shell-importer.c:848 shell/e-shell-startup-wizard.c:712
#, c-format
msgid "From %s:"
msgstr "%s ����:"
-#: shell/e-shell-importer.c:1003
+#: shell/e-shell-importer.c:1011
msgid "Select folder"
msgstr "�ե����������"
-#: shell/e-shell-importer.c:1004
+#: shell/e-shell-importer.c:1012
msgid "Select a destination folder for importing this data"
msgstr "���Υǡ����򥤥�ݡ��Ȥ���������Υե���������򤷤Ƥ�������"
-#: shell/e-shell-importer.c:1116 shell/importer/intelligent.c:194
+#: shell/e-shell-importer.c:1124 shell/importer/intelligent.c:193
msgid "Import"
msgstr "����ݡ���"
-#: shell/e-shell-offline-handler.c:562
+#: shell/e-shell-offline-handler.c:572
msgid "Closing connections..."
msgstr "��³���Ĥ��Ƥ��ޤ�..."
#: shell/e-shell-startup-wizard.c:159
-#, c-format
+#, fuzzy, c-format
msgid ""
-"Could not start the Evolution Mailer Wizard interface\n"
-"%s"
-msgstr ""
+"Could not start the Evolution Mailer Assistant interface\n"
+"(%s)"
+msgstr "Evolution �᡼�륦�������ɥ��󥿡��ե������ν����������ޤ���"
-#: shell/e-shell-startup-wizard.c:168
-msgid "Cannot initialize the Evolution Mailer Wizard interface"
+#: shell/e-shell-startup-wizard.c:169
+#, fuzzy
+msgid "Could not start the Evolution Mailer Assistant interface\n"
msgstr "Evolution �᡼�륦�������ɥ��󥿡��ե������ν����������ޤ���"
-#: shell/e-shell-startup-wizard.c:745
+#: shell/e-shell-startup-wizard.c:754
msgid ""
"Please select the information\n"
"that you would like to import"
msgstr ""
-#: shell/e-shell-view-menu.c:201
+#: shell/e-shell-utils.c:114
+msgid "No folder name specified."
+msgstr "���ꤵ�줿�ե�����Ϥ���ޤ���"
+
+#: shell/e-shell-utils.c:121
+msgid "Folder name cannot contain the Return character."
+msgstr ""
+
+#: shell/e-shell-utils.c:127
+#, fuzzy
+msgid "Folder name cannot contain slashes."
+msgstr "���Υե�����ˤϥ�å������Ϥ���ޤ���"
+
+#: shell/e-shell-utils.c:133
+msgid "'.' and '..' are reserved folder names."
+msgstr ""
+
+#: shell/e-shell-view-menu.c:165
msgid "Bug buddy was not found in your $PATH."
msgstr "Bug buddy �Ϥ��ʤ��� $PATH �ˤϸ��Ĥ���ޤ���"
-#: shell/e-shell-view-menu.c:209
+#: shell/e-shell-view-menu.c:173
msgid "Bug buddy could not be run."
msgstr "Bug buddy �ϼ¹ԤǤ��ޤ���Ǥ���"
-#: shell/e-shell-view-menu.c:235
-msgid "Ximian Evolution"
-msgstr "Ximian Evolution"
-
-#: shell/e-shell-view-menu.c:237
-msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
-msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
-
-#: shell/e-shell-view-menu.c:239
-msgid ""
-"Ximian Evolution is a suite of groupware applications\n"
-"for mail, calendaring, and contact management\n"
-"within the GNOME desktop environment."
-msgstr ""
-"Evolution �� GNOME �ǥ����ȥå�\n"
-"�Ķ��ǤΥ᡼�롤��������������\n"
-"Ϣ����ޥ͡������ȤΤ����\n"
-"���롼�ץ��������ץꥱ�������Ǥ�"
+#: shell/e-shell-view-menu.c:215
+#, fuzzy
+msgid "About Ximian Evolution"
+msgstr "Ximian Evolution �ˤĤ���..."
-#: shell/e-shell-view-menu.c:442
+#: shell/e-shell-view-menu.c:409
msgid "Go to folder..."
msgstr "�ե�����ذ�ư..."
-#: shell/e-shell-view-menu.c:443
+#: shell/e-shell-view-menu.c:410
msgid "Select the folder that you want to open"
msgstr "���������ե���������򤷤ޤ�"
-#: shell/e-shell-view-menu.c:563
+#: shell/e-shell-view-menu.c:530
msgid "Create a new shortcut"
msgstr "�������硼�ȥ��åȤ�������ޤ�"
-#: shell/e-shell-view-menu.c:564
+#: shell/e-shell-view-menu.c:531
msgid "Select the folder you want the shortcut to point to:"
msgstr "���硼�ȥ��åȤˤ������ե���������򤷤ޤ�:"
-#: shell/e-shell-view-menu.c:595
+#: shell/e-shell-view-menu.c:562
msgid "The GNOME Pilot tools do not appear to be installed on this system."
msgstr ""
-#: shell/e-shell-view-menu.c:603
+#: shell/e-shell-view-menu.c:570
#, c-format
msgid "Error executing %s."
msgstr "%s ��¹���˥��顼"
-#: shell/e-shell-view-menu.c:705
-msgid "Work Online"
+#: shell/e-shell-view-menu.c:672
+#, fuzzy
+msgid "_Work Online"
msgstr "����饤����"
-#: shell/e-shell-view-menu.c:718 shell/e-shell-view-menu.c:731
-#: ui/evolution.xml.h:30
+#: shell/e-shell-view-menu.c:685 ui/evolution.xml.h:51
+msgid "_Work Offline"
+msgstr "���ե饤����(_W)"
+
+#: shell/e-shell-view-menu.c:698 ui/evolution.xml.h:30
msgid "Work Offline"
msgstr "���ե饤����"
@@ -11751,49 +12021,39 @@ msgstr "���ե饤����"
msgid "(No folder displayed)"
msgstr "(ɽ�������ե�����Ϥ���ޤ���)"
-#: shell/e-shell-view.c:1584
+#: shell/e-shell-view.c:1574
#, c-format
msgid "%s (%d)"
msgstr "%s (%d)"
-#: shell/e-shell-view.c:1586
+#: shell/e-shell-view.c:1576
msgid "(None)"
msgstr "(�ʤ�)"
-#: shell/e-shell-view.c:1591
-#, c-format
-msgid "%s - Ximian Evolution %s"
-msgstr "%s - Ximian Evolution - %s"
-
-#: shell/e-shell-view.c:1593
-#, c-format
-msgid "%s - Ximian Evolution %s [%s]"
-msgstr "%s - Ximian Evolution %s [%s]"
-
-#: shell/e-shell-view.c:1633
+#: shell/e-shell-view.c:1623
msgid ""
"Ximian Evolution is currently online. Click on this button to work offline."
msgstr ""
"Ximian Evolution �ϸ��ߥ���饤��Ǥ������ե饤��ˤ���ˤϤ��Υܥ���򥯥��"
"�����Ƥ�������"
-#: shell/e-shell-view.c:1640
+#: shell/e-shell-view.c:1630
msgid "Ximian Evolution is in the process of going offline."
msgstr "Ximian Evolution �ϥ��ե饤�������Ǥ�"
-#: shell/e-shell-view.c:1646
+#: shell/e-shell-view.c:1636
msgid ""
"Ximian Evolution is currently offline. Click on this button to work online."
msgstr ""
"Ximian Evolution �ϸ��ߥ��ե饤��Ǥ�������饤��ˤ���ˤϤ��Υܥ���򥯥��"
"�����Ƥ�������"
-#: shell/e-shell.c:563
+#: shell/e-shell.c:651
#, c-format
msgid "Cannot set up local storage -- %s"
msgstr "�����������֤Υ��åȥ��åפ�����ޤ��� -- %s"
-#: shell/e-shell.c:1497
+#: shell/e-shell.c:1659
#, c-format
msgid ""
"The Evolution component that handles folders of type \"%s\"\n"
@@ -11801,35 +12061,31 @@ msgid ""
"in order to access that data again."
msgstr ""
-#: shell/e-shell.c:1702 widgets/misc/e-cell-date-edit.c:248
-msgid "OK"
-msgstr "OK"
-
-#: shell/e-shell.c:1704
+#: shell/e-shell.c:1886
msgid "Invalid arguments"
msgstr "�����ʰ����Ǥ�"
-#: shell/e-shell.c:1706
+#: shell/e-shell.c:1888
msgid "Cannot register on OAF"
msgstr "OAF ����Ͽ����ޤ���"
-#: shell/e-shell.c:1708
+#: shell/e-shell.c:1890
msgid "Configuration Database not found"
msgstr "����ե����졼�����ǡ����١������ߤĤ���ޤ���"
-#: shell/e-shell.c:1710 shell/e-storage.c:501
+#: shell/e-shell.c:1892 shell/e-storage.c:500
msgid "Generic error"
msgstr "����Ū�ʥ��顼"
-#: shell/e-shortcuts-view.c:75
+#: shell/e-shortcuts-view.c:74
msgid "Create new shortcut group"
msgstr "�������硼�ȥ��åȥ��롼�פ�������ޤ�"
-#: shell/e-shortcuts-view.c:76
+#: shell/e-shortcuts-view.c:75
msgid "Group name:"
msgstr "���롼��̾:"
-#: shell/e-shortcuts-view.c:176
+#: shell/e-shortcuts-view.c:175
#, c-format
msgid ""
"Do you really want to remove group\n"
@@ -11838,111 +12094,111 @@ msgstr ""
"�����˥��硼�ȥ��åȥС����饰�롼��\n"
"`%s' �����������Ǥ���?"
-#: shell/e-shortcuts-view.c:181
+#: shell/e-shortcuts-view.c:180
msgid "Don't remove"
msgstr "������ޤ���"
-#: shell/e-shortcuts-view.c:210
+#: shell/e-shortcuts-view.c:209
msgid "Rename Shortcut Group"
msgstr "���硼�ȥ��åȥ��롼�פ��͡���"
-#: shell/e-shortcuts-view.c:211
+#: shell/e-shortcuts-view.c:210
msgid "Rename selected shortcut group to:"
msgstr "���򤵤줿���硼�ȥ��åȥ��롼�פ��͡���:"
-#: shell/e-shortcuts-view.c:225
+#: shell/e-shortcuts-view.c:224
msgid "_Small Icons"
msgstr "��������������(_S)"
-#: shell/e-shortcuts-view.c:226
+#: shell/e-shortcuts-view.c:225
msgid "Show the shortcuts as small icons"
msgstr "��������������ǥ��硼�ȥ��åȤ�ɽ�����ޤ�"
-#: shell/e-shortcuts-view.c:228
+#: shell/e-shortcuts-view.c:227
msgid "_Large Icons"
msgstr "�礭����������(_L)"
-#: shell/e-shortcuts-view.c:229
+#: shell/e-shortcuts-view.c:228
msgid "Show the shortcuts as large icons"
msgstr "�礭����������ǥ��硼�ȥ��åȤ�ɽ�����ޤ�"
-#: shell/e-shortcuts-view.c:240
+#: shell/e-shortcuts-view.c:239
msgid "_New Group..."
msgstr "�������롼��(_N)..."
-#: shell/e-shortcuts-view.c:241
+#: shell/e-shortcuts-view.c:240
msgid "Create a new shortcut group"
msgstr "�������硼�ȥ��åȥ��롼�פ�������ޤ�"
-#: shell/e-shortcuts-view.c:243
+#: shell/e-shortcuts-view.c:242
msgid "_Remove this Group..."
msgstr "���Υ��롼�פ���(_R)..."
-#: shell/e-shortcuts-view.c:244
+#: shell/e-shortcuts-view.c:243
msgid "Remove this shortcut group"
msgstr "���Υ��硼�ȥ��åȥ��롼�פ������ޤ�"
-#: shell/e-shortcuts-view.c:246
+#: shell/e-shortcuts-view.c:245
msgid "Re_name this Group..."
msgstr "���Υ��롼�פ��͡���(_N)..."
-#: shell/e-shortcuts-view.c:247
+#: shell/e-shortcuts-view.c:246
msgid "Rename this shortcut group"
msgstr "���Υ��硼�ȥ��åȥ��롼�פ��͡��ष�ޤ�"
-#: shell/e-shortcuts-view.c:252
+#: shell/e-shortcuts-view.c:251
msgid "_Hide the Shortcut Bar"
msgstr "���硼�ȥ��åȥС��򱣤�(_H)"
-#: shell/e-shortcuts-view.c:253
+#: shell/e-shortcuts-view.c:252
msgid "Hide the shortcut bar"
msgstr "���硼�ȥ��åȥС��򱣤��ޤ�"
-#: shell/e-shortcuts-view.c:372
+#: shell/e-shortcuts-view.c:371
msgid "Rename shortcut"
msgstr "���硼�ȥ��åȤ��͡���"
-#: shell/e-shortcuts-view.c:373
+#: shell/e-shortcuts-view.c:372
msgid "Rename selected shortcut to:"
msgstr "���򤵤줿���硼�ȥ��åȤ��͡���:"
-#: shell/e-shortcuts-view.c:385
+#: shell/e-shortcuts-view.c:384
msgid "Open the folder linked to this shortcut"
msgstr "���Υ��硼�ȥ��åȤ˥�󥯤��줿�ե�����򳫤�"
-#: shell/e-shortcuts-view.c:387 ui/evolution.xml.h:19
+#: shell/e-shortcuts-view.c:386 ui/evolution.xml.h:19
msgid "Open in New _Window"
msgstr "����������ɥ��dz���(_W)"
-#: shell/e-shortcuts-view.c:387
+#: shell/e-shortcuts-view.c:386
msgid "Open the folder linked to this shortcut in a new window"
msgstr "���Υ��硼�ȥ��åȤ˥�󥯤��줿�ե�����򿷤���������ɥ��dz���"
-#: shell/e-shortcuts-view.c:390
+#: shell/e-shortcuts-view.c:389
msgid "_Rename"
msgstr "��͡���(_R)"
-#: shell/e-shortcuts-view.c:390
+#: shell/e-shortcuts-view.c:389
msgid "Rename this shortcut"
msgstr "���Υ��硼�ȥ��åȤ��͡���"
-#: shell/e-shortcuts-view.c:392
+#: shell/e-shortcuts-view.c:391
msgid "Re_move"
msgstr "���(_M)"
-#: shell/e-shortcuts-view.c:392
+#: shell/e-shortcuts-view.c:391
msgid "Remove this shortcut from the shortcut bar"
msgstr "���硼�ȥ��åȥС����餳�Υ��硼�ȥ��åȤ������ޤ�"
-#: shell/e-shortcuts.c:641
+#: shell/e-shortcuts.c:640
msgid "Error saving shortcuts."
msgstr "���硼�ȥ��åȤ���¸��˥��顼��ȯ�����ޤ���"
-#: shell/e-shortcuts.c:1044
+#: shell/e-shortcuts.c:1043
msgid "Shortcuts"
msgstr "���硼�ȥ��å�"
-#: shell/e-storage-set-view.c:645
+#: shell/e-storage-set-view.c:644
#, c-format
msgid ""
"Cannot transfer folder:\n"
@@ -11951,64 +12207,170 @@ msgstr ""
"�ե����ž���Ǥ��ޤ���:\n"
"%s"
-#: shell/e-storage.c:182 shell/e-storage.c:188
+#: shell/e-storage.c:181 shell/e-storage.c:187
msgid "(No name)"
msgstr "(̾���ʤ�)"
-#: shell/e-storage.c:499
+#: shell/e-storage.c:498
msgid "No error"
msgstr "���顼�Ϥ���ޤ���"
-#: shell/e-storage.c:503
+#: shell/e-storage.c:502
msgid "A folder with the same name already exists"
msgstr "Ʊ��̾���Υե���������Ǥ�¸�ߤ��Ƥ��ޤ�"
-#: shell/e-storage.c:505
+#: shell/e-storage.c:504
msgid "The specified folder type is not valid"
msgstr "���ꤵ�줿�ե�������̤�ͭ���ǤϤ���ޤ���"
-#: shell/e-storage.c:507
+#: shell/e-storage.c:506
msgid "I/O error"
msgstr "I/O ���顼"
-#: shell/e-storage.c:509
+#: shell/e-storage.c:508
msgid "Not enough space to create the folder"
msgstr "�ե������������뽽ʬ�ʶ���������ޤ���"
-#: shell/e-storage.c:511
+#: shell/e-storage.c:510
+msgid "The folder is not empty"
+msgstr ""
+
+#: shell/e-storage.c:512
msgid "The specified folder was not found"
msgstr "���ꤵ�줿�ե�����ϸ��դ���ޤ���Ǥ���"
-#: shell/e-storage.c:513
+#: shell/e-storage.c:514
msgid "Function not implemented in this storage"
msgstr "��ǽ�Ϥ��ε������֤Ǥϼ�������Ƥ��ޤ���"
-#: shell/e-storage.c:517
+#: shell/e-storage.c:518
msgid "Operation not supported"
msgstr "���ϥ��ݡ��Ȥ���Ƥ��ޤ���"
-#: shell/e-storage.c:519
+#: shell/e-storage.c:520
msgid "The specified type is not supported in this storage"
msgstr "���ꤵ�줿���̤Ϥ��ε������֤Ǥϥ��ݡ��Ȥ���Ƥ��ޤ���"
-#: shell/e-storage.c:521
+#: shell/e-storage.c:522
msgid "The specified folder cannot be modified or removed"
msgstr "���ꤵ�줿�ե�������ѹ�������Ǥ��ޤ���Ǥ���"
-#: shell/e-storage.c:523
+#: shell/e-storage.c:524
msgid "Cannot make a folder a child of one of its descendants"
msgstr ""
-#: shell/e-task-widget.c:192
+#: shell/e-storage.c:526
+#, fuzzy
+msgid "Cannot create a folder with that name"
+msgstr "%s �Υե�������å���������뤳�Ȥ�����ޤ���: %s"
+
+#: shell/e-task-widget.c:191
#, c-format
msgid "%s (...)"
msgstr "%s (...)"
-#: shell/e-task-widget.c:197
+#: shell/e-task-widget.c:196
#, c-format
msgid "%s (%d%% complete)"
msgstr "%s (%d%% ��λ)"
+#: shell/evolution-shell-component.c:1009
+#, fuzzy
+msgid "CORBA error"
+msgstr "I/O ���顼"
+
+#: shell/evolution-shell-component.c:1011
+msgid "Interrupted"
+msgstr ""
+
+#: shell/evolution-shell-component.c:1013
+#, fuzzy
+msgid "Invalid argument"
+msgstr "�����ʰ����Ǥ�"
+
+#: shell/evolution-shell-component.c:1015
+msgid "Already has an owner"
+msgstr ""
+
+#: shell/evolution-shell-component.c:1017
+#, fuzzy
+msgid "No owner"
+msgstr "����"
+
+#: shell/evolution-shell-component.c:1019
+#, fuzzy
+msgid "Not found"
+msgstr "�����ɤ����Ĥ���ޤ���"
+
+#: shell/evolution-shell-component.c:1021
+#, fuzzy
+msgid "Unsupported type"
+msgstr "���ݡ��Ȥ��줿���̤�����å�(_C)"
+
+#: shell/evolution-shell-component.c:1023
+msgid "Unsupported schema"
+msgstr ""
+
+#: shell/evolution-shell-component.c:1025
+#, fuzzy
+msgid "Unsupported operation"
+msgstr "�桼���ˤ�ä����򥭥�󥻥뤵��ޤ���"
+
+#: shell/evolution-shell-component.c:1027
+#, fuzzy
+msgid "Internal error"
+msgstr "����¾�Υ��顼"
+
+#: shell/evolution-shell-component.c:1031
+#, fuzzy
+msgid "Exists"
+msgstr "��¸�ߤ���"
+
+#: shell/evolution-shell-component.c:1033
+#, fuzzy
+msgid "Invalid URI"
+msgstr "����"
+
+#: shell/evolution-shell-component.c:1037
+#, fuzzy
+msgid "Has subfolders"
+msgstr "���Τ褦�ʥե���� %s �Ϥ���ޤ���"
+
+#: shell/evolution-shell-component.c:1039
+#, fuzzy
+msgid "No space left"
+msgstr "���򤵤줿��å������Ϥ���ޤ���"
+
+#: shell/evolution-shell-component.c:1041
+msgid "Old owner has died"
+msgstr ""
+
+#: shell/evolution-shell-component-utils.c:124
+#, fuzzy, c-format
+msgid ""
+"%s\n"
+"\n"
+"Unknown error."
+msgstr "�����ʥ��顼"
+
+#: shell/evolution-shell-component-utils.c:127
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"The error from the component system is:\n"
+"%s"
+msgstr ""
+
+#: shell/evolution-shell-component-utils.c:134
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"The error from the activation system is:\n"
+"%s"
+msgstr ""
+
#: shell/glade/e-active-connection-dialog.glade.h:1
msgid "Active connections"
msgstr "�����ƥ��֤���³"
@@ -12107,81 +12469,68 @@ msgstr ""
"���Υ���������ȤǤ� Evolution ����˳����ե�����򥤥�ݡ���\n"
"����������̤��ư��⤷�ޤ�"
-#: shell/importer/intelligent.c:191
+#: shell/importer/intelligent.c:190
msgid "Importers"
msgstr "����ݡ���"
-#: shell/importer/intelligent.c:197
+#: shell/importer/intelligent.c:196
msgid "Don't import"
msgstr "����ݡ��Ȥ��ޤ���"
-#: shell/importer/intelligent.c:199
+#: shell/importer/intelligent.c:198
msgid "Don't ask me again"
msgstr "���Υ�å����������٤�ɽ�����ʤ�"
-#: shell/importer/intelligent.c:209
+#: shell/importer/intelligent.c:208
msgid "Evolution can import data from the following files:"
msgstr "Evolution �ϼ��Υǡ����򥤥�ݡ��ȤǤ��ޤ�:"
-#: shell/main.c:86
+#: shell/main.c:89
msgid "Evolution is now exiting ..."
msgstr "Evolution �Ϥ������޽�λ��Ǥ�..."
-#: shell/main.c:162
-#, no-c-format
-msgid ""
-"Hi. Thanks for taking the time to download this preview release\n"
-"of the Ximian Evolution groupware suite.\n"
-"\n"
-"Ximian Evolution is not yet complete. It's getting close, but there are\n"
-"places where features are either missing or only half working. \n"
-"\n"
-"If you find bugs, please report them to us at bugzilla.ximian.com.\n"
-"This product comes with no warranty and is not intended for\n"
-"individuals prone to violent fits of anger.\n"
-"\n"
-"We hope that you enjoy the results of our hard work, and we\n"
-"eagerly await your contributions!\n"
-msgstr ""
-"Ximian Evolution���롼�ץ������������ȤΤ��Υץ�ӥ塼��꡼����\n"
-"����������ɤ˻��֤�䤤�Ƥ���Ƥ��꤬�Ȥ��������ޤ���\n"
-"\n"
-"Ximian Evolution�Ϥޤ�̤�����Ǥ�. ����϶��դ��Ƥ��ޤ���, ��ǽ��\n"
-"�ޤ��ʤ��ä��ꡢȾʬ���餤������ȤǤ��Ƥ��ʤ��ä��ꤹ��Ȥ������ȤǤ���\n"
-"\n"
-"�⤷�Х�������С�bugzilla.ximian.com�ǥ�ݡ��Ȥ��Ƥ���������\n"
-"���Υץ������Ȥ�̵�ݾڤǡ��ܤ�äݤ����ʤοͤˤϸ����Ƥ��ޤ���\n"
-"\n"
-"�桹�Ϥ��ʤ����桹�����̤�ڤ��ळ�Ȥ�˾��Ǥ��ޤ��������Ʋ桹��\n"
-"Ǯ���ˤ��ʤ��ι׸����Ԥ������Ƥ��ޤ�!\n"
-
-#: shell/main.c:183
-msgid ""
-"Thanks\n"
-"The Ximian Evolution Team\n"
-msgstr "Ximian Evolution��������\n"
-
-#: shell/main.c:236
+#: shell/main.c:210
msgid "Cannot access the Ximian Evolution shell."
msgstr "Ximian Evolution ������˥��������Ǥ��ޤ���"
-#: shell/main.c:245
+#: shell/main.c:219
#, c-format
msgid "Cannot initialize the Ximian Evolution shell: %s"
msgstr "Ximian Evolution ������ν�������Ǥ��ޤ���: %s"
-#: shell/main.c:301
+#: shell/main.c:289
msgid "Disable splash screen"
msgstr "���ץ�å�����̤�̵���ˤ���"
-#: shell/main.c:302
+#: shell/main.c:290
msgid "Send the debugging output of all components to a file."
msgstr "���٤ƤΥ���ݡ��ͥ�ȤΥǥХå����Ϥ�ե����������"
-#: shell/main.c:344
+#: shell/main.c:332
msgid "Cannot initialize the Bonobo component system."
msgstr "Bonobo ����ݡ��ͥ�ȥ����ƥ����������ޤ���"
+#: tools/evolution-addressbook-export.c:36
+#: tools/evolution-addressbook-import.c:46
+#, fuzzy
+msgid "Error loading default addressbook."
+msgstr "�ե�����Υ�������˥��顼: %s"
+
+#: tools/evolution-addressbook-export.c:46
+#, fuzzy
+msgid "Output File"
+msgstr "�ե�����򳫤�"
+
+#: tools/evolution-addressbook-import.c:67
+#, fuzzy
+msgid "Input File"
+msgstr "�ե����������"
+
+#: tools/evolution-addressbook-import.c:80
+#, fuzzy
+msgid "No filename provided."
+msgstr "���ꤵ�줿�ե�����Ϥ���ޤ���"
+
#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:5
#: ui/evolution-tasks.xml.h:3
msgid "Copy"
@@ -12271,7 +12620,7 @@ msgstr "�Ӥ߹��ߤ���ߤ��ޤ�"
#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
#: ui/evolution-contact-list-editor.xml.h:10 ui/evolution-event-editor.xml.h:9
#: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-list.xml.h:23
-#: ui/evolution-mail-message.xml.h:84 ui/evolution-mail-messagedisplay.xml.h:4
+#: ui/evolution-mail-message.xml.h:90 ui/evolution-mail-messagedisplay.xml.h:4
#: ui/evolution-task-editor.xml.h:9
msgid "_Actions"
msgstr "ư��(_A)"
@@ -12293,7 +12642,7 @@ msgid "_Forward Contact..."
msgstr "Ϣ�����ž��(_F)..."
#: ui/evolution-addressbook.xml.h:37 ui/evolution-calendar.xml.h:41
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:95
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:102
#: ui/my-evolution.xml.h:7
msgid "_Print..."
msgstr "����(_P)..."
@@ -12338,7 +12687,7 @@ msgstr "��"
msgid "Delete the appointment"
msgstr "���Υ��ݥ���Ȥ���"
-#: ui/evolution-calendar.xml.h:13 ui/evolution-mail-message.xml.h:38
+#: ui/evolution-calendar.xml.h:13 ui/evolution-mail-message.xml.h:39
msgid "Go To"
msgstr "��ư"
@@ -12461,11 +12810,12 @@ msgstr "����..."
#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-list-editor.xml.h:5
#: ui/evolution-message-composer.xml.h:19
-#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:245
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:239
msgid "Save"
msgstr "��¸"
#: ui/evolution-comp-editor.xml.h:14 ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-signature-editor.xml.h:4
msgid "Save and Close"
msgstr "��¸�����Ĥ���"
@@ -12481,7 +12831,7 @@ msgstr "�ǥ������ˤ��ι��ܤ���¸���ޤ�"
#: ui/evolution-contact-list-editor.xml.h:11
#: ui/evolution-mail-messagedisplay.xml.h:7
#: ui/evolution-message-composer.xml.h:48
-#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:11
+#: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
#: ui/evolution.xml.h:36
msgid "_File"
msgstr "�ե�����(_F)"
@@ -12503,7 +12853,7 @@ msgstr "Ϣ�������¸���Ƥ��Υ����������ܥå������Ĥ��ޤ�"
#: ui/evolution-contact-editor.xml.h:15
#: ui/evolution-contact-list-editor.xml.h:12
#: ui/evolution-message-composer.xml.h:53
-#: ui/evolution-signature-editor.xml.h:10
+#: ui/evolution-signature-editor.xml.h:11
msgid "_Save"
msgstr "��¸(_S)"
@@ -12563,10 +12913,6 @@ msgstr "���Υ����ƥ�ؤΥߡ��ƥ��󥰤򥹥����塼��"
msgid "Customise My Evolution"
msgstr "My Evolution �Υ������ޥ���"
-#: ui/evolution-mail-global.xml.h:1
-msgid "Cancel"
-msgstr "����󥻥�"
-
#: ui/evolution-mail-global.xml.h:2
msgid "Cancel the current mail operation"
msgstr "���ߤΥ᡼�����򥭥�󥻥뤷�ޤ�"
@@ -12820,279 +13166,309 @@ msgstr "���������ԤΤ���β��ۥե������������ޤ�"
msgid "Create a virtual folder for this subject"
msgstr "���η�̾�Τ���β��ۥե������������ޤ�"
-#: ui/evolution-mail-message.xml.h:17
+#: ui/evolution-mail-message.xml.h:16
+msgid "Decrease the text size"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:18
msgid "Display the next important message"
msgstr "���ν��פʥ�å�������ɽ�����ޤ�"
-#: ui/evolution-mail-message.xml.h:18
+#: ui/evolution-mail-message.xml.h:19
msgid "Display the next message"
msgstr "���Υ�å�������ɽ�����ޤ�"
-#: ui/evolution-mail-message.xml.h:19
+#: ui/evolution-mail-message.xml.h:20
msgid "Display the next unread message"
msgstr "����̤�ɥ�å�������ɽ�����ޤ�"
-#: ui/evolution-mail-message.xml.h:20
+#: ui/evolution-mail-message.xml.h:21
msgid "Display the next unread thread"
msgstr "����̤�ɥ���åɤ�ɽ�����ޤ�"
-#: ui/evolution-mail-message.xml.h:21
+#: ui/evolution-mail-message.xml.h:22
msgid "Display the previous important message"
msgstr "���ν��פʥ�å�������ɽ�����ޤ�"
-#: ui/evolution-mail-message.xml.h:22
+#: ui/evolution-mail-message.xml.h:23
msgid "Display the previous message"
msgstr "���Υ�å�������ɽ�����ޤ�"
-#: ui/evolution-mail-message.xml.h:23
+#: ui/evolution-mail-message.xml.h:24
msgid "Display the previous unread message"
msgstr "����̤�ɥ�å�������ɽ�����ޤ�"
-#: ui/evolution-mail-message.xml.h:24
+#: ui/evolution-mail-message.xml.h:25
msgid "Filter on Mailing _List..."
msgstr "�᡼��󥰥ꥹ�ȤΥե��륿(_L)..."
-#: ui/evolution-mail-message.xml.h:25
+#: ui/evolution-mail-message.xml.h:26
msgid "Filter on Se_nder..."
msgstr "�����ԤΥե��륿(_N)..."
-#: ui/evolution-mail-message.xml.h:26
+#: ui/evolution-mail-message.xml.h:27
msgid "Filter on _Recipients..."
msgstr "�����ԤΥե��륿(_R)..."
-#: ui/evolution-mail-message.xml.h:27
+#: ui/evolution-mail-message.xml.h:28
msgid "Filter on _Subject..."
msgstr "��̾�Υե��륿(_S)..."
-#: ui/evolution-mail-message.xml.h:28
+#: ui/evolution-mail-message.xml.h:29
msgid "Force images in HTML mail to be loaded"
msgstr "����Ū�� HTML �᡼��β������ɤ߹���"
-#: ui/evolution-mail-message.xml.h:29
+#: ui/evolution-mail-message.xml.h:30
msgid "Forward"
msgstr "ž��"
-#: ui/evolution-mail-message.xml.h:30
+#: ui/evolution-mail-message.xml.h:31
msgid "Forward As"
msgstr "ž��"
-#: ui/evolution-mail-message.xml.h:31
+#: ui/evolution-mail-message.xml.h:32
msgid "Forward _Attached"
msgstr "ź�դ���ž��(_A)"
-#: ui/evolution-mail-message.xml.h:32
+#: ui/evolution-mail-message.xml.h:33
msgid "Forward _Inline"
msgstr "����饤���ž��(_I)"
-#: ui/evolution-mail-message.xml.h:33
+#: ui/evolution-mail-message.xml.h:34
msgid "Forward _Quoted"
msgstr "���Ѥ���ž��(_Q)"
-#: ui/evolution-mail-message.xml.h:34
+#: ui/evolution-mail-message.xml.h:35
msgid "Forward the selected message in the body of a new message"
msgstr "������å���������ʸ��������򤵤줿��å�������ž�����ޤ�"
-#: ui/evolution-mail-message.xml.h:35
+#: ui/evolution-mail-message.xml.h:36
msgid "Forward the selected message quoted like a reply"
msgstr "���Ѥ������򤵤줿��å�������ž�����ޤ�"
-#: ui/evolution-mail-message.xml.h:36
+#: ui/evolution-mail-message.xml.h:37
msgid "Forward the selected message to someone"
msgstr "ï�������򤵤줿��å�������ž�����ޤ�"
-#: ui/evolution-mail-message.xml.h:37
+#: ui/evolution-mail-message.xml.h:38
msgid "Forward the selected message to someone as an attachment"
msgstr "ź�դȤ���ï�������򤵤줿��å�������ž�����ޤ�"
-#: ui/evolution-mail-message.xml.h:39
+#: ui/evolution-mail-message.xml.h:40
+#, fuzzy
+msgid "Increase the text size"
+msgstr "�ƥ����ȥե����������..."
+
+#: ui/evolution-mail-message.xml.h:41
msgid "Load _Images"
msgstr "�������ɤ߹���(_I)"
-#: ui/evolution-mail-message.xml.h:41
+#: ui/evolution-mail-message.xml.h:43
msgid "Mark as I_mportant"
msgstr "���פ˥ޡ���(_M)"
-#: ui/evolution-mail-message.xml.h:43
+#: ui/evolution-mail-message.xml.h:45
msgid "Mark as Unimp_ortant"
msgstr "���פǤʤ��˥ޡ���(_O)"
-#: ui/evolution-mail-message.xml.h:44
+#: ui/evolution-mail-message.xml.h:46
msgid "Mark the selected messages as having been read"
msgstr "�����ѤߤȤ������򤵤줿��å�������ޡ������ޤ�"
-#: ui/evolution-mail-message.xml.h:45
+#: ui/evolution-mail-message.xml.h:47
msgid "Mark the selected messages as important"
msgstr "���򤵤줿��å���������פ˥ޡ���"
-#: ui/evolution-mail-message.xml.h:46
+#: ui/evolution-mail-message.xml.h:48
msgid "Mark the selected messages as not having been read"
msgstr "̤�ɤȤ������򤵤줿��å�������ޡ������ޤ�"
-#: ui/evolution-mail-message.xml.h:47
+#: ui/evolution-mail-message.xml.h:49
msgid "Mark the selected messages as unimportant"
msgstr "���򤵤줿��å������ν��פǤʤ��˥ޡ���"
-#: ui/evolution-mail-message.xml.h:48
+#: ui/evolution-mail-message.xml.h:50
msgid "Mark the selected messages for deletion"
msgstr "���򤵤줿��å������˺���ޡ����򤷤ޤ�"
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:51
msgid "Move"
msgstr "��ư"
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:52
msgid "Move selected messages to another folder"
msgstr "�̤Υե���������򤵤줿��å��������ư���ޤ�"
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:53
msgid "Next"
msgstr "��"
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:54
msgid "Next Important Message"
msgstr "���ν��פʥ�å�����"
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:55
msgid "Next Message"
msgstr "���Υ�å�����"
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:56
msgid "Next Thread"
msgstr "���Υ���å�"
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:57
msgid "Next Unread Message"
msgstr "����̤�ɥ�å�����"
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:58
msgid "Open the selected message in a new window"
msgstr "����������ɥ������򤵤줿��å������򳫤��ޤ�"
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:59
msgid "Open the selected message in the composer to re-send it"
msgstr "���򤵤줿��å������򥳥�ݡ����dz����������ޤ�"
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:60
+msgid "Original Si_ze"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:61
msgid "Preview the message to be printed"
msgstr "���������å������Υץ�ӥ塼"
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:62
msgid "Previous"
msgstr "��"
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:63
msgid "Previous Important Message"
msgstr "���ν��פʥ�å�����"
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:64
msgid "Previous Message"
msgstr "���Υ�å�����"
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:65
msgid "Previous Unread Message"
msgstr "����̤�ɥ�å�����"
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:68
msgid "Print this message"
msgstr "���Υ�å����������"
-#: ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-message.xml.h:69
msgid "Reply"
msgstr "�ֿ�"
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:70
msgid "Reply to All"
msgstr "�������ֿ�"
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:73
+msgid "Reset the text to its original size"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:74
msgid "S_earch Message..."
msgstr "��å������θ���(_E)"
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:75
+msgid "S_maller"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:76
msgid "Save the message as a text file"
msgstr "�ƥ����ȥե�����إ�å���������¸���ޤ�"
-#: ui/evolution-mail-message.xml.h:72
+#: ui/evolution-mail-message.xml.h:77
msgid "Search for text in the body of the displayed message"
msgstr "ɽ�����줿��å��������Τδޤޤ��ƥ����Ȥ򸡺����ޤ�"
-#: ui/evolution-mail-message.xml.h:73
+#: ui/evolution-mail-message.xml.h:78
msgid "Setup the page settings for your current printer"
msgstr "���ߤΥץ�󥿤Υڡ��������Ԥ��ޤ�"
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:79
msgid "Show Email _Source"
msgstr "�᡼��Υ�������ɽ��(_S)"
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:80
msgid "Show Full _Headers"
msgstr "���٤ƤΥإå���ɽ��(_H)"
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:81
msgid "Show message in the normal style"
msgstr "�̾�Υ�å�������ɽ�����ޤ�"
-#: ui/evolution-mail-message.xml.h:77
+#: ui/evolution-mail-message.xml.h:82
msgid "Show message with all email headers"
msgstr "���٤ƤΥ᡼��إå���ޤ�ƥ�å�������ɽ�����ޤ�"
-#: ui/evolution-mail-message.xml.h:78
+#: ui/evolution-mail-message.xml.h:83
msgid "Show the raw email source of the message"
msgstr "��å������Υ�������ɽ�����ޤ�"
-#: ui/evolution-mail-message.xml.h:79
+#: ui/evolution-mail-message.xml.h:84
+msgid "Text Si_ze"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:85
msgid "Un-delete the selected messages"
msgstr "���򤵤줿��å������������ä��ޤ�"
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:86
msgid "VFolder on Mailing _List..."
msgstr "�᡼��󥰥ꥹ�Ȥβ��ۥե����(_L)..."
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:87
msgid "VFolder on Se_nder..."
msgstr "�����Ԥβ��ۥե����(_N)..."
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:88
msgid "VFolder on _Recipients..."
msgstr "�����Ԥβ��ۥե����(_R)..."
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:89
msgid "VFolder on _Subject..."
msgstr "��̾�β��ۥե����(_S)..."
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:91
msgid "_Apply Filters"
msgstr "�ե��륿Ŭ��(_A)"
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:92
msgid "_Copy to Folder"
msgstr "�ե�����إ��ԡ�(_C)"
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:93
msgid "_Create Filter From Message"
msgstr "��å���������ե��륿�����(_C)"
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:96
msgid "_Forward Message"
msgstr "��å�������ž��(_F)"
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:97
+#, fuzzy
+msgid "_Larger"
+msgstr "�ݥ��٥�"
+
+#: ui/evolution-mail-message.xml.h:98
msgid "_Message Display"
msgstr "��å�����ɽ��(_M)"
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:99
msgid "_Move to Folder"
msgstr "�ե�����ذ�ư(_M)"
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:100
msgid "_Normal Display"
msgstr "�̾�ɽ��(_N)"
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:101
msgid "_Open Message"
msgstr "��å������򳫤�(_O)"
-#: ui/evolution-mail-message.xml.h:98 ui/evolution.xml.h:49
+#: ui/evolution-mail-message.xml.h:105 ui/evolution.xml.h:49
#: ui/my-evolution.xml.h:9
msgid "_Tools"
msgstr "�ġ���(_T)"
@@ -13103,7 +13479,7 @@ msgstr "���Υ�����ɥ����Ĥ��ޤ�"
#: ui/evolution-mail-messagedisplay.xml.h:5
#: ui/evolution-message-composer.xml.h:45
-#: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
+#: ui/evolution-signature-editor.xml.h:6 ui/evolution-subscribe.xml.h:9
#: ui/evolution.xml.h:33
msgid "_Close"
msgstr "�Ĥ���(_C)"
@@ -13134,11 +13510,13 @@ msgid "Encrypt this message with your S/MIME Encryption Cetificate"
msgstr "���Υ�å������� S/MIME �Ź�ǧ�ڤ��Ѥ��ưŹ沽���ޤ�"
#: ui/evolution-message-composer.xml.h:8
-msgid "F_ormat"
-msgstr "�ե����ޥå�(_O)"
+#, fuzzy
+msgid "For_mat"
+msgstr "��"
#: ui/evolution-message-composer.xml.h:9
-msgid "HTML"
+#, fuzzy
+msgid "H_TML"
msgstr "HTML"
#: ui/evolution-message-composer.xml.h:10
@@ -13186,7 +13564,7 @@ msgid "Save in folder..."
msgstr "�ե��������¸..."
#: ui/evolution-message-composer.xml.h:24
-#: ui/evolution-signature-editor.xml.h:4
+#: ui/evolution-signature-editor.xml.h:5
msgid "Save the current file"
msgstr "���ߤΥե��������¸���ޤ�"
@@ -13279,7 +13657,7 @@ msgid "_From Field"
msgstr "���пͥե������(_F)"
#: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:9
+#: ui/evolution-signature-editor.xml.h:10
msgid "_Insert"
msgstr "����(_I)"
@@ -13295,7 +13673,7 @@ msgstr "�ֿ���ե������(_R)"
msgid "_Security"
msgstr "�������ƥ�(_S)"
-#: ui/evolution-signature-editor.xml.h:8 ui/evolution.xml.h:40
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:40
msgid "_Help"
msgstr "�إ��(_H)"
@@ -13531,10 +13909,6 @@ msgstr "���硼�ȥ��å�(_S)"
msgid "_Shortcut Bar"
msgstr "���硼�ȥ��åȥС�(_S)"
-#: ui/evolution.xml.h:51
-msgid "_Work Offline"
-msgstr "���ե饤����(_W)"
-
#: ui/my-evolution.xml.h:1
msgid "Change the settings for the summary"
msgstr "���Υե������������ѹ�"
@@ -13609,132 +13983,136 @@ msgstr ""
"����\n"
"�ޥ����α��ܥ���ǽ̾����ޤ���"
-#: widgets/menus/gal-view-menus.c:218
+#: widgets/menus/gal-view-menus.c:195
msgid "_Current View"
msgstr "���ߤ�ɽ��(_C)"
-#: widgets/menus/gal-view-menus.c:260
+#: widgets/menus/gal-view-menus.c:222
msgid "Define Views"
msgstr "ɽ�������"
#. Translators: These are the first characters of each day of the
#. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:428
+#: widgets/misc/e-calendar-item.c:427
msgid "MTWTFSS"
msgstr "MTWTFSS"
#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1071
+#: widgets/misc/e-calendar-item.c:1070
msgid "%B %Y"
msgstr "%Y %B"
-#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:439
+#: widgets/misc/e-cell-date-edit.c:230 widgets/misc/e-dateedit.c:438
msgid "Now"
msgstr "��"
-#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:445
+#: widgets/misc/e-cell-date-edit.c:238 widgets/misc/e-dateedit.c:444
msgid "Today"
msgstr "����"
-#: widgets/misc/e-cell-date-edit.c:738
+#: widgets/misc/e-cell-date-edit.c:769
#, c-format
msgid "The time must be in the format: %s"
msgstr "���֤ϥե����ޥåȤ�����ʤ���Фʤ�ޤ���: %s"
-#: widgets/misc/e-charset-picker.c:59
+#: widgets/misc/e-cell-percent.c:77
+msgid "The percent value must be between 0 and 100, inclusive"
+msgstr "�ѡ�������ͤ� 0 �� 100 �δ֤Ǵޤ�Ǥ��ʤ���Фʤ�ޤ���"
+
+#: widgets/misc/e-charset-picker.c:58
msgid "Baltic"
msgstr "���3��"
-#: widgets/misc/e-charset-picker.c:60
+#: widgets/misc/e-charset-picker.c:59
msgid "Central European"
msgstr "����衼���å�"
-#: widgets/misc/e-charset-picker.c:61
+#: widgets/misc/e-charset-picker.c:60
msgid "Chinese"
msgstr "����"
-#: widgets/misc/e-charset-picker.c:62
+#: widgets/misc/e-charset-picker.c:61
msgid "Cyrillic"
msgstr "������"
-#: widgets/misc/e-charset-picker.c:63
+#: widgets/misc/e-charset-picker.c:62
msgid "Greek"
msgstr "���ꥷ���"
-#: widgets/misc/e-charset-picker.c:64
+#: widgets/misc/e-charset-picker.c:63
msgid "Japanese"
msgstr "���ܸ�"
-#: widgets/misc/e-charset-picker.c:65
+#: widgets/misc/e-charset-picker.c:64
msgid "Korean"
msgstr "�ڹ��"
-#: widgets/misc/e-charset-picker.c:66
+#: widgets/misc/e-charset-picker.c:65
msgid "Turkish"
msgstr "�ȥ륳��"
-#: widgets/misc/e-charset-picker.c:67
+#: widgets/misc/e-charset-picker.c:66
msgid "Unicode"
msgstr "Unicode"
-#: widgets/misc/e-charset-picker.c:68
+#: widgets/misc/e-charset-picker.c:67
msgid "Western European"
msgstr "����"
-#: widgets/misc/e-charset-picker.c:85
+#: widgets/misc/e-charset-picker.c:84
msgid "Traditional"
msgstr "����"
-#: widgets/misc/e-charset-picker.c:86 widgets/misc/e-charset-picker.c:87
+#: widgets/misc/e-charset-picker.c:85 widgets/misc/e-charset-picker.c:86
msgid "Simplified"
msgstr "����"
-#: widgets/misc/e-charset-picker.c:91
+#: widgets/misc/e-charset-picker.c:90
msgid "Ukrainian"
msgstr "������˥�"
-#: widgets/misc/e-charset-picker.c:102
+#: widgets/misc/e-charset-picker.c:101
msgid "New"
msgstr "�˥塼��"
-#: widgets/misc/e-charset-picker.c:160
+#: widgets/misc/e-charset-picker.c:159
#, c-format
msgid "Unknown character set: %s"
msgstr "������ʸ�������ɥ��å�: %s"
-#: widgets/misc/e-charset-picker.c:202
+#: widgets/misc/e-charset-picker.c:201
msgid "Enter the character set to use"
msgstr "���Ѥ��륭��饯�����åȤ����Ϥ��Ƥ�������"
-#: widgets/misc/e-charset-picker.c:277
+#: widgets/misc/e-charset-picker.c:276
msgid "Other..."
msgstr "����¾..."
-#: widgets/misc/e-charset-picker.c:396
+#: widgets/misc/e-charset-picker.c:395
msgid "Character Encoding"
msgstr "���󥳡��ǥ���"
-#: widgets/misc/e-clipped-label.c:112
+#: widgets/misc/e-clipped-label.c:111
msgid "..."
msgstr "..."
-#: widgets/misc/e-filter-bar.c:158
+#: widgets/misc/e-filter-bar.c:152
msgid "Search Editor"
msgstr "�������Խ�"
-#: widgets/misc/e-filter-bar.c:174
+#: widgets/misc/e-filter-bar.c:168
msgid "Save Search"
msgstr "��������¸"
-#: widgets/misc/e-filter-bar.h:94
+#: widgets/misc/e-filter-bar.h:95
msgid "Add to Saved Searches"
msgstr "��¸�����������ɲ�"
-#: widgets/misc/e-filter-bar.h:95
+#: widgets/misc/e-filter-bar.h:96
msgid "Clear"
msgstr "���ꥢ"
-#: widgets/misc/e-filter-bar.h:102
+#: widgets/misc/e-filter-bar.h:103
msgid "Show All"
msgstr "���٤�ɽ��"
@@ -13777,18 +14155,176 @@ msgstr "�ѡ����ʥ륢�ɥ쥹Ģ������"
msgid "The Personal Calendar Server; calendar factory"
msgstr "�ѡ����ʥ륫����������; �������ե����ȥ�"
-#: wombat/wombat.c:176
+#: wombat/wombat.c:200
msgid "setup_vfs(): could not initialize GNOME-VFS"
msgstr "setup_vfs(): GNOME-VFS���������뤳�Ȥ�����ޤ���Ǥ���"
-#: wombat/wombat.c:188
+#: wombat/wombat.c:212
msgid "init_corba(): could not initialize GNOME"
msgstr "init_corba(): GNOME ���������뤳�Ȥ�����ޤ���Ǥ���"
-#: wombat/wombat.c:201
+#: wombat/wombat.c:225
msgid "init_bonobo(): could not initialize Bonobo"
msgstr "init_bonobo(): Bonobo ���������뤳�Ȥ�����ޤ���Ǥ���"
+#~ msgid "Notification about your appointment starting on %s and ending on %s"
+#~ msgstr "%s ����Ϥޤꡢ%s �˽���륢�ݥ���ȤˤĤ��Ƥ�����"
+
+#~ msgid "Notification about your appointment starting on %s"
+#~ msgstr "%s ����Ϥޤ륢�ݥ���ȤˤĤ��Ƥ�����"
+
+#~ msgid "Notification about your appointment ending on %s"
+#~ msgstr "%s �˽���륢�ݥ���ȤˤĤ��Ƥ�����"
+
+#~ msgid "Notification about your appointment"
+#~ msgstr "���ݥ���ȤˤĤ��Ƥ�����"
+
+#~ msgid "Notification about your task starting on %s and ending on %s"
+#~ msgstr "%s �˻Ϥޤꡢ%s �˽���륿�����ˤĤ��Ƥ�����"
+
+#~ msgid "Notification about your task starting on %s"
+#~ msgstr "%s �˻Ϥޤ륿�����ˤĤ��Ƥ�����"
+
+#~ msgid "Notification about your task ending on %s"
+#~ msgstr "%s �˽���륿�����ˤĤ��Ƥ�����"
+
+#~ msgid "Notification about your task"
+#~ msgstr "�������ˤĤ��Ƥ�����"
+
+#~ msgid "Alarm on %A %b %d %Y %H:%M"
+#~ msgstr "%Y/%b/%d %A %H:%M �˥��顼��"
+
+#~ msgid "%s at an unknown time"
+#~ msgstr "̤���� %s"
+
+#~ msgid "_Invite Others"
+#~ msgstr "¾�ξ���(_I)..."
+
+#~ msgid "_Confidential"
+#~ msgstr "��̩(_C)"
+
+#~ msgid "<b>Summary:</b> %s<br><br>"
+#~ msgstr "<b>���ޥ�:</b> %s<br><br>"
+
+#~ msgid "<b>Description:</b> %s"
+#~ msgstr "<b>����:</b> %s"
+
+#~ msgid "Qmail maildir-format mail files"
+#~ msgstr "Qmail maildir �����Υ᡼��ե�����"
+
+#~ msgid "Summarising folder"
+#~ msgstr "�ե�����Υ��ޥ�������"
+
+#~ msgid "Could not open folder: %s: summarising from position %ld: %s"
+#~ msgstr "�ե�����򳫤��ޤ���Ǥ���: %s: �ݥ������ %ld ���饵�ޥ饤����: %s"
+
+#~ msgid "Cannot summarise folder: %s: %s"
+#~ msgstr "�ե�����򥵥ޥ饤�����뤳�Ȥ�����ޤ���: %s: %s"
+
+#~ msgid "Could not create composer window."
+#~ msgstr "�᡼�����������ɥ����������ޤ���Ǥ���"
+
+#~ msgid "GnomeCard:"
+#~ msgstr "GNOME ������: "
+
+#~ msgid "Always encrypt to myself when sending encrypyed mail"
+#~ msgstr "�Ź沽�����᡼�������������˾�˼�ʬ���Ȥ˰Ź沽���ޤ�"
+
+#~ msgid "No GPG/PGP program configured."
+#~ msgstr "GPG/PGP �ץ����������꤬����ޤ���"
+
+#~ msgid "Encrypted message not displayed"
+#~ msgstr "�Ź沽���줿��å�������ɽ�����ޤ���"
+
+#~ msgid "Encrypted message"
+#~ msgstr "�Ź沽���줿��å�����"
+
+#~ msgid "Click icon to decrypt."
+#~ msgstr "��������򥯥�å��������沽���Ƥ�������"
+
+#~ msgid "Cannot copy a folder `%s' to itself"
+#~ msgstr "�ե���� `%s' ��Ʊ���ե�����ˤϥ��ԡ��Ǥ��ޤ���"
+
+#~ msgid "Cannot initialize Evolution's Executive Summary component."
+#~ msgstr "Evolution �¹ԥ��ޥ꡼����ݡ��ͥ�Ȥν����������ޤ���"
+
+#~ msgid "KBOS:ZSAM:EGAA"
+#~ msgstr "RJTT:RJAA:RJTA"
+
+#~ msgid "KBOS:EGAA:RJTT"
+#~ msgstr "RJTT:RJAA:RJTA"
+
+#~ msgid "Smoke w/ thunders"
+#~ msgstr "��ȱ�"
+
+#~ msgid "Volcanic ash w/ thunders"
+#~ msgstr "��Ȳл���"
+
+#~ msgid "M_etric"
+#~ msgstr "�᡼�ȥ�ˡ(_E)"
+
+#~ msgid "Units: "
+#~ msgstr "ñ��: "
+
+#~ msgid "_Imperial"
+#~ msgstr "����ڥꥢ��ˡ(_I)"
+
+#~ msgid "Folder cannot contain the directory separator."
+#~ msgstr "�ե����̾�ˤϥǥ��쥯�ȥ���ڤ�ʸ���ϻȤ��ޤ���"
+
+#~ msgid "Ximian Evolution"
+#~ msgstr "Ximian Evolution"
+
+#~ msgid ""
+#~ "Ximian Evolution is a suite of groupware applications\n"
+#~ "for mail, calendaring, and contact management\n"
+#~ "within the GNOME desktop environment."
+#~ msgstr ""
+#~ "Evolution �� GNOME �ǥ����ȥå�\n"
+#~ "�Ķ��ǤΥ᡼�롤��������������\n"
+#~ "Ϣ����ޥ͡������ȤΤ����\n"
+#~ "���롼�ץ��������ץꥱ�������Ǥ�"
+
+#~ msgid "%s - Ximian Evolution %s"
+#~ msgstr "%s - Ximian Evolution - %s"
+
+#~ msgid "%s - Ximian Evolution %s [%s]"
+#~ msgstr "%s - Ximian Evolution %s [%s]"
+
+#~ msgid ""
+#~ "Hi. Thanks for taking the time to download this preview release\n"
+#~ "of the Ximian Evolution groupware suite.\n"
+#~ "\n"
+#~ "Ximian Evolution is not yet complete. It's getting close, but there are\n"
+#~ "places where features are either missing or only half working. \n"
+#~ "\n"
+#~ "If you find bugs, please report them to us at bugzilla.ximian.com.\n"
+#~ "This product comes with no warranty and is not intended for\n"
+#~ "individuals prone to violent fits of anger.\n"
+#~ "\n"
+#~ "We hope that you enjoy the results of our hard work, and we\n"
+#~ "eagerly await your contributions!\n"
+#~ msgstr ""
+#~ "Ximian Evolution���롼�ץ������������ȤΤ��Υץ�ӥ塼��꡼����\n"
+#~ "����������ɤ˻��֤�䤤�Ƥ���Ƥ��꤬�Ȥ��������ޤ���\n"
+#~ "\n"
+#~ "Ximian Evolution�Ϥޤ�̤�����Ǥ�. ����϶��դ��Ƥ��ޤ���, ��ǽ��\n"
+#~ "�ޤ��ʤ��ä��ꡢȾʬ���餤������ȤǤ��Ƥ��ʤ��ä��ꤹ��Ȥ������ȤǤ���\n"
+#~ "\n"
+#~ "�⤷�Х�������С�bugzilla.ximian.com�ǥ�ݡ��Ȥ��Ƥ���������\n"
+#~ "���Υץ������Ȥ�̵�ݾڤǡ��ܤ�äݤ����ʤοͤˤϸ����Ƥ��ޤ���\n"
+#~ "\n"
+#~ "�桹�Ϥ��ʤ����桹�����̤�ڤ��ळ�Ȥ�˾��Ǥ��ޤ��������Ʋ桹��\n"
+#~ "Ǯ���ˤ��ʤ��ι׸����Ԥ������Ƥ��ޤ�!\n"
+
+#~ msgid ""
+#~ "Thanks\n"
+#~ "The Ximian Evolution Team\n"
+#~ msgstr "Ximian Evolution��������\n"
+
+#~ msgid "F_ormat"
+#~ msgstr "�ե����ޥå�(_O)"
+
#~ msgid "Please enter your email address and password for access to %s"
#~ msgstr ""
#~ "%s�˥����������뤿����Żҥ᡼�륢�ɥ쥹�ȥѥ���ɤ����Ϥ��Ƥ�������"
@@ -13812,9 +14348,6 @@ msgstr "init_bonobo(): Bonobo ���������뤳�Ȥ�����ޤ���Ǥ���"
#~ "���ä�! `%s' �Υӥ塼��������˴���ޤ��� :-(\n"
#~ "����Ϥ��֤� %s ����ݡ��ͥ�Ȥ�����å��夷�����Ȥ��̣���ޤ�"
-#~ msgid "_Calendar Information:"
-#~ msgstr "����������(_C):"
-
#~ msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
#~ msgstr ""
#~ "ͥ���٤� '�⤤', '����', '�㤤' ���뤤�� '̤���' �����򤷤ʤ���Фʤ�ޤ�"
@@ -13932,10 +14465,6 @@ msgstr "init_bonobo(): Bonobo ���������뤳�Ȥ�����ޤ���Ǥ���"
#~ msgstr "%Y/%m/%d (%a)"
#, fuzzy
-#~ msgid "%x"
-#~ msgstr "x"
-
-#, fuzzy
#~ msgid "No such folder /%s"
#~ msgstr "���Τ褦�ʥե���� %s �Ϥ���ޤ���"