aboutsummaryrefslogtreecommitdiffstats
path: root/po
diff options
context:
space:
mode:
authorAkira TAGOH <tagoh@gnome.gr.jp>2001-04-08 16:40:39 +0800
committerAkira Tagoh <tagoh@src.gnome.org>2001-04-08 16:40:39 +0800
commit7e47d41fdf51b5e43493613bcb7292b864ad787e (patch)
tree98571451af2eca0b837fc6b362738f506cc2f610 /po
parent9582b8384d61ecb22d8a4f9b95685b54312ba68b (diff)
downloadgsoc2013-evolution-7e47d41fdf51b5e43493613bcb7292b864ad787e.tar
gsoc2013-evolution-7e47d41fdf51b5e43493613bcb7292b864ad787e.tar.gz
gsoc2013-evolution-7e47d41fdf51b5e43493613bcb7292b864ad787e.tar.bz2
gsoc2013-evolution-7e47d41fdf51b5e43493613bcb7292b864ad787e.tar.lz
gsoc2013-evolution-7e47d41fdf51b5e43493613bcb7292b864ad787e.tar.xz
gsoc2013-evolution-7e47d41fdf51b5e43493613bcb7292b864ad787e.tar.zst
gsoc2013-evolution-7e47d41fdf51b5e43493613bcb7292b864ad787e.zip
Updated Japanese translation.
2001-04-08 Akira TAGOH <tagoh@gnome.gr.jp> * ja.po: Updated Japanese translation. svn path=/trunk/; revision=9203
Diffstat (limited to 'po')
-rw-r--r--po/ChangeLog4
-rw-r--r--po/ja.po3115
2 files changed, 1608 insertions, 1511 deletions
diff --git a/po/ChangeLog b/po/ChangeLog
index cf2b83451e..86221335af 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2001-04-08 Akira TAGOH <tagoh@gnome.gr.jp>
+
+ * ja.po: Updated Japanese translation.
+
2001-04-04 Kjartan Maraas <kmaraas@gnome.org>
* no.po: Updated Norwegian (bokm�l) translation.
diff --git a/po/ja.po b/po/ja.po
index b59e7c6a53..0b6de6505d 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -4,20 +4,20 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: evolution CVS-20010323\n"
-"POT-Creation-Date: 2001-03-23 02:56+0900\n"
-"PO-Revision-Date: 2001-03-23 04:30+0900\n"
+"Project-Id-Version: evolution CVS-20010408\n"
+"POT-Creation-Date: 2001-04-08 06:36+0900\n"
+"PO-Revision-Date: 2001-04-08 17:38+0900\n"
"Last-Translator: Akira TAGOH <tagoh@gnome.gr.jp>\n"
"Language-Team: Japanese <translation@gnome.gr.jp>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=euc-jp\n"
"Content-Transfer-Encoding: 8bit\n"
-#: addressbook/backend/ebook/e-card.c:3255
+#: addressbook/backend/ebook/e-card.c:3269
msgid "Card: "
msgstr "̾��: "
-#: addressbook/backend/ebook/e-card.c:3257
+#: addressbook/backend/ebook/e-card.c:3271
msgid ""
"\n"
"Name: "
@@ -25,7 +25,7 @@ msgstr ""
"\n"
"̾��: "
-#: addressbook/backend/ebook/e-card.c:3258
+#: addressbook/backend/ebook/e-card.c:3272
msgid ""
"\n"
" Prefix: "
@@ -33,7 +33,7 @@ msgstr ""
"\n"
" �ɾ�(���Ĥ�): "
-#: addressbook/backend/ebook/e-card.c:3259
+#: addressbook/backend/ebook/e-card.c:3273
msgid ""
"\n"
" Given: "
@@ -41,13 +41,13 @@ msgstr ""
"\n"
" ��: "
-#: addressbook/backend/ebook/e-card.c:3260
+#: addressbook/backend/ebook/e-card.c:3274
msgid ""
"\n"
" Additional: "
msgstr ""
-#: addressbook/backend/ebook/e-card.c:3261
+#: addressbook/backend/ebook/e-card.c:3275
msgid ""
"\n"
" Family: "
@@ -55,7 +55,7 @@ msgstr ""
"\n"
" �ե��ߥ꡼̾: "
-#: addressbook/backend/ebook/e-card.c:3262
+#: addressbook/backend/ebook/e-card.c:3276
msgid ""
"\n"
" Suffix: "
@@ -63,7 +63,7 @@ msgstr ""
"\n"
" �ɾ�(��Ĥ�): "
-#: addressbook/backend/ebook/e-card.c:3276
+#: addressbook/backend/ebook/e-card.c:3290
msgid ""
"\n"
"Birth Date: "
@@ -71,7 +71,7 @@ msgstr ""
"\n"
"������: "
-#: addressbook/backend/ebook/e-card.c:3287
+#: addressbook/backend/ebook/e-card.c:3301
msgid ""
"\n"
"Address:"
@@ -79,7 +79,7 @@ msgstr ""
"\n"
"����:"
-#: addressbook/backend/ebook/e-card.c:3289
+#: addressbook/backend/ebook/e-card.c:3303
msgid ""
"\n"
" Postal Box: "
@@ -87,7 +87,7 @@ msgstr ""
"\n"
"͹���ֹ�: "
-#: addressbook/backend/ebook/e-card.c:3290
+#: addressbook/backend/ebook/e-card.c:3304
msgid ""
"\n"
" Ext: "
@@ -95,25 +95,25 @@ msgstr ""
"\n"
" "
-#: addressbook/backend/ebook/e-card.c:3291
+#: addressbook/backend/ebook/e-card.c:3305
msgid ""
"\n"
" Street: "
msgstr ""
-#: addressbook/backend/ebook/e-card.c:3292
+#: addressbook/backend/ebook/e-card.c:3306
msgid ""
"\n"
" City: "
msgstr ""
-#: addressbook/backend/ebook/e-card.c:3293
+#: addressbook/backend/ebook/e-card.c:3307
msgid ""
"\n"
" Region: "
msgstr ""
-#: addressbook/backend/ebook/e-card.c:3294
+#: addressbook/backend/ebook/e-card.c:3308
msgid ""
"\n"
" Postal Code: "
@@ -121,7 +121,7 @@ msgstr ""
"\n"
" ͹���ֹ�: "
-#: addressbook/backend/ebook/e-card.c:3295
+#: addressbook/backend/ebook/e-card.c:3309
msgid ""
"\n"
" Country: "
@@ -129,13 +129,13 @@ msgstr ""
"\n"
" ��: "
-#: addressbook/backend/ebook/e-card.c:3308
+#: addressbook/backend/ebook/e-card.c:3322
msgid ""
"\n"
"Delivery Label: "
msgstr ""
-#: addressbook/backend/ebook/e-card.c:3320
+#: addressbook/backend/ebook/e-card.c:3334
msgid ""
"\n"
"Telephones:\n"
@@ -143,7 +143,7 @@ msgstr ""
"\n"
"�����ֹ�:\n"
-#: addressbook/backend/ebook/e-card.c:3323
+#: addressbook/backend/ebook/e-card.c:3337
msgid ""
"\n"
"Telephone:"
@@ -151,7 +151,7 @@ msgstr ""
"\n"
"�����ֹ�:"
-#: addressbook/backend/ebook/e-card.c:3347
+#: addressbook/backend/ebook/e-card.c:3361
msgid ""
"\n"
"E-mail:\n"
@@ -159,7 +159,7 @@ msgstr ""
"\n"
"�᡼��:\n"
-#: addressbook/backend/ebook/e-card.c:3350
+#: addressbook/backend/ebook/e-card.c:3364
msgid ""
"\n"
"E-mail:"
@@ -167,7 +167,7 @@ msgstr ""
"\n"
"�᡼��:"
-#: addressbook/backend/ebook/e-card.c:3369
+#: addressbook/backend/ebook/e-card.c:3383
msgid ""
"\n"
"Mailer: "
@@ -175,7 +175,7 @@ msgstr ""
"\n"
"�᡼��: "
-#: addressbook/backend/ebook/e-card.c:3375
+#: addressbook/backend/ebook/e-card.c:3389
msgid ""
"\n"
"Time Zone: "
@@ -183,7 +183,7 @@ msgstr ""
"\n"
"�����ॾ����: "
-#: addressbook/backend/ebook/e-card.c:3383
+#: addressbook/backend/ebook/e-card.c:3397
msgid ""
"\n"
"Geo Location: "
@@ -191,7 +191,7 @@ msgstr ""
"\n"
"�а�: "
-#: addressbook/backend/ebook/e-card.c:3387
+#: addressbook/backend/ebook/e-card.c:3401
msgid ""
"\n"
"Business Role: "
@@ -199,7 +199,7 @@ msgstr ""
"\n"
"�Ż��ο�̳: "
-#: addressbook/backend/ebook/e-card.c:3399
+#: addressbook/backend/ebook/e-card.c:3413
msgid ""
"\n"
"Org: "
@@ -207,7 +207,7 @@ msgstr ""
"\n"
"�ȿ�: "
-#: addressbook/backend/ebook/e-card.c:3400
+#: addressbook/backend/ebook/e-card.c:3414
msgid ""
"\n"
" Name: "
@@ -215,7 +215,7 @@ msgstr ""
"\n"
" ��̾: "
-#: addressbook/backend/ebook/e-card.c:3401
+#: addressbook/backend/ebook/e-card.c:3415
msgid ""
"\n"
" Unit: "
@@ -223,7 +223,7 @@ msgstr ""
"\n"
" ����: "
-#: addressbook/backend/ebook/e-card.c:3402
+#: addressbook/backend/ebook/e-card.c:3416
msgid ""
"\n"
" Unit2: "
@@ -231,7 +231,7 @@ msgstr ""
"\n"
" ����2: "
-#: addressbook/backend/ebook/e-card.c:3403
+#: addressbook/backend/ebook/e-card.c:3417
msgid ""
"\n"
" Unit3: "
@@ -239,7 +239,7 @@ msgstr ""
"\n"
" ����3: "
-#: addressbook/backend/ebook/e-card.c:3404
+#: addressbook/backend/ebook/e-card.c:3418
msgid ""
"\n"
" Unit4: "
@@ -247,7 +247,7 @@ msgstr ""
"\n"
" ����4: "
-#: addressbook/backend/ebook/e-card.c:3408
+#: addressbook/backend/ebook/e-card.c:3422
msgid ""
"\n"
"Categories: "
@@ -255,7 +255,7 @@ msgstr ""
"\n"
"��̳ʬ��: "
-#: addressbook/backend/ebook/e-card.c:3409
+#: addressbook/backend/ebook/e-card.c:3423
msgid ""
"\n"
"Comment: "
@@ -273,13 +273,13 @@ msgstr ""
#.
#. add_SoundType (string, crd->sound.type);
#. }
-#: addressbook/backend/ebook/e-card.c:3422
+#: addressbook/backend/ebook/e-card.c:3436
msgid ""
"\n"
"Unique String: "
-msgstr ""
+msgstr "\nǤ�դ�ʸ����: "
-#: addressbook/backend/ebook/e-card.c:3425
+#: addressbook/backend/ebook/e-card.c:3439
msgid ""
"\n"
"Public Key: "
@@ -295,15 +295,15 @@ msgstr "Evolution �� GnomeCard �ե�����򥤥�ݡ��Ȥ���ե����ȥ�"
msgid "Imports GnomeCard files into Evolution."
msgstr "Evolution �� GnomeCard �ե�����򥤥�ݡ���"
-#: addressbook/backend/ebook/load-gnomecard-addressbook.c:16
-#: addressbook/backend/ebook/load-pine-addressbook.c:17
-#: addressbook/backend/ebook/test-client-list.c:18
-#: addressbook/backend/ebook/test-client.c:29
+#: addressbook/backend/ebook/load-gnomecard-addressbook.c:21
+#: 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:1089
-#: addressbook/gui/component/addressbook-factory.c:39
+#: addressbook/gui/component/addressbook-factory.c:43
#: calendar/conduits/calendar/calendar-conduit.c:1151
#: calendar/conduits/todo/todo-conduit.c:965
-#: calendar/gui/alarm-notify/notify-main.c:68 calendar/gui/main.c:54
+#: calendar/gui/alarm-notify/notify-main.c:72 calendar/gui/main.c:57
msgid "Could not initialize Bonobo"
msgstr "Bonobo �ν����������ޤ���Ǥ���"
@@ -337,7 +337,7 @@ msgstr ""
#: addressbook/gui/component/addressbook-config.glade.h:1
#: calendar/gui/e-meeting-dialog.glade.h:1
#: calendar/gui/event-editor-dialog.glade.h:2 filter/filter.glade.h:1
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:7
msgid "Add"
msgstr "�ɲ�"
@@ -378,7 +378,6 @@ msgstr "��̾:"
#: addressbook/contact-editor/contact-editor.glade.h:10
#: executive-summary/component/executive-summary-config.glade.h:3
-#: mail/mail-config.glade.h:28
msgid "General"
msgstr "����"
@@ -395,7 +394,7 @@ msgid "Phone Types"
msgstr "���ü���"
#: addressbook/contact-editor/contact-editor.glade.h:14
-#: addressbook/contact-editor/e-contact-editor.c:1271
+#: addressbook/contact-editor/e-contact-editor.c:1284
msgid "Primary Email"
msgstr "���פʥ᡼��"
@@ -408,7 +407,7 @@ msgid "Web page address:"
msgstr "�����֥ڡ����� URL:"
#: addressbook/contact-editor/contact-editor.glade.h:17
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:74
msgid "_Add"
msgstr "�ɲ�(_A)"
@@ -433,8 +432,8 @@ msgid "_Company:"
msgstr "���(_C):"
#: addressbook/contact-editor/contact-editor.glade.h:23
-#: mail/mail-config.glade.h:83 ui/evolution-event-editor.xml.h:57
-#: ui/evolution-mail.xml.h:59 ui/evolution-task-editor-dialog.xml.h:69
+#: mail/mail-config.glade.h:75 ui/evolution-event-editor.xml.h:57
+#: ui/evolution-mail.xml.h:60 ui/evolution-task-editor-dialog.xml.h:69
msgid "_Delete"
msgstr "���(_D)"
@@ -486,126 +485,126 @@ msgstr "�����͹��ʪ�ν���Ǥ�"
msgid "Delete Contact?"
msgstr "���󥿥��Ȥ������ޤ���?"
-#: addressbook/contact-editor/e-contact-editor.c:590
+#: addressbook/contact-editor/e-contact-editor.c:603
msgid "This contact belongs to these categories:"
msgstr "���Υ��󥿥��ȤϤ����Υ��ƥ���˽�°���Ƥ��ޤ�:"
-#: addressbook/contact-editor/e-contact-editor.c:1229
-#: addressbook/gui/widgets/e-addressbook-view.c:628
+#: addressbook/contact-editor/e-contact-editor.c:1242
+#: addressbook/gui/widgets/e-addressbook-view.c:624
msgid "Assistant"
msgstr "�����������"
-#: addressbook/contact-editor/e-contact-editor.c:1230
-#: addressbook/contact-editor/e-contact-editor.c:1297
-#: addressbook/gui/widgets/e-addressbook-view.c:608
+#: addressbook/contact-editor/e-contact-editor.c:1243
+#: addressbook/contact-editor/e-contact-editor.c:1310
+#: addressbook/gui/widgets/e-addressbook-view.c:604
msgid "Business"
msgstr "�Ż�"
-#: addressbook/contact-editor/e-contact-editor.c:1231
-#: addressbook/gui/widgets/e-addressbook-view.c:615
+#: addressbook/contact-editor/e-contact-editor.c:1244
+#: addressbook/gui/widgets/e-addressbook-view.c:611
msgid "Business 2"
msgstr "�Ż� 2"
-#: addressbook/contact-editor/e-contact-editor.c:1232
-#: addressbook/gui/widgets/e-addressbook-view.c:613
+#: addressbook/contact-editor/e-contact-editor.c:1245
+#: addressbook/gui/widgets/e-addressbook-view.c:609
msgid "Business Fax"
msgstr "�Ż��� FAX"
-#: addressbook/contact-editor/e-contact-editor.c:1233
+#: addressbook/contact-editor/e-contact-editor.c:1246
msgid "Callback"
msgstr "�Ƥ��ᤷ"
-#: addressbook/contact-editor/e-contact-editor.c:1234
-#: addressbook/gui/widgets/e-addressbook-view.c:612
+#: addressbook/contact-editor/e-contact-editor.c:1247
+#: addressbook/gui/widgets/e-addressbook-view.c:608
msgid "Car"
msgstr "��"
-#: addressbook/contact-editor/e-contact-editor.c:1235
+#: addressbook/contact-editor/e-contact-editor.c:1248
msgid "Company"
msgstr "���"
-#: addressbook/contact-editor/e-contact-editor.c:1236
-#: addressbook/contact-editor/e-contact-editor.c:1298
-#: addressbook/gui/widgets/e-addressbook-view.c:609
+#: addressbook/contact-editor/e-contact-editor.c:1249
+#: addressbook/contact-editor/e-contact-editor.c:1311
+#: addressbook/gui/widgets/e-addressbook-view.c:605
msgid "Home"
msgstr "��"
-#: addressbook/contact-editor/e-contact-editor.c:1237
-#: addressbook/gui/widgets/e-addressbook-view.c:616
+#: addressbook/contact-editor/e-contact-editor.c:1250
+#: addressbook/gui/widgets/e-addressbook-view.c:612
msgid "Home 2"
msgstr "�� 2"
-#: addressbook/contact-editor/e-contact-editor.c:1238
-#: addressbook/gui/widgets/e-addressbook-view.c:614
+#: addressbook/contact-editor/e-contact-editor.c:1251
+#: addressbook/gui/widgets/e-addressbook-view.c:610
msgid "Home Fax"
msgstr "�Ȥ� FAX"
-#: addressbook/contact-editor/e-contact-editor.c:1239
-#: addressbook/gui/widgets/e-addressbook-view.c:617
+#: addressbook/contact-editor/e-contact-editor.c:1252
+#: addressbook/gui/widgets/e-addressbook-view.c:613
msgid "ISDN"
msgstr "ISDN"
-#: addressbook/contact-editor/e-contact-editor.c:1240
-#: addressbook/gui/widgets/e-addressbook-view.c:611
+#: addressbook/contact-editor/e-contact-editor.c:1253
+#: addressbook/gui/widgets/e-addressbook-view.c:607
msgid "Mobile"
msgstr "�����"
-#: addressbook/contact-editor/e-contact-editor.c:1241
-#: addressbook/contact-editor/e-contact-editor.c:1299
-#: addressbook/gui/widgets/e-addressbook-view.c:618
-#: calendar/gui/e-meeting-dialog.glade.h:14 mail/mail-config.glade.h:48
+#: addressbook/contact-editor/e-contact-editor.c:1254
+#: addressbook/contact-editor/e-contact-editor.c:1312
+#: addressbook/gui/widgets/e-addressbook-view.c:614
+#: calendar/gui/e-meeting-dialog.glade.h:14 mail/mail-config.glade.h:40
msgid "Other"
msgstr "����¾"
-#: addressbook/contact-editor/e-contact-editor.c:1242
+#: addressbook/contact-editor/e-contact-editor.c:1255
msgid "Other Fax"
msgstr "����¾�� FAX"
-#: addressbook/contact-editor/e-contact-editor.c:1243
-#: addressbook/gui/widgets/e-addressbook-view.c:619
+#: addressbook/contact-editor/e-contact-editor.c:1256
+#: addressbook/gui/widgets/e-addressbook-view.c:615
msgid "Pager"
msgstr "�ݥ��٥�"
-#: addressbook/contact-editor/e-contact-editor.c:1244
-#: addressbook/gui/widgets/e-addressbook-view.c:607
+#: addressbook/contact-editor/e-contact-editor.c:1257
+#: addressbook/gui/widgets/e-addressbook-view.c:603
msgid "Primary"
msgstr "�ץ饤�ޥ�"
-#: addressbook/contact-editor/e-contact-editor.c:1245
+#: addressbook/contact-editor/e-contact-editor.c:1258
msgid "Radio"
msgstr "�饸��"
-#: addressbook/contact-editor/e-contact-editor.c:1246
+#: addressbook/contact-editor/e-contact-editor.c:1259
msgid "Telex"
msgstr "�ƥ�å���"
-#: addressbook/contact-editor/e-contact-editor.c:1247
+#: addressbook/contact-editor/e-contact-editor.c:1260
msgid "TTY/TDD"
msgstr "TTY/TDD"
-#: addressbook/contact-editor/e-contact-editor.c:1272
-#: addressbook/gui/widgets/e-addressbook-view.c:620
+#: addressbook/contact-editor/e-contact-editor.c:1285
+#: addressbook/gui/widgets/e-addressbook-view.c:616
msgid "Email 2"
msgstr "�᡼��2"
-#: addressbook/contact-editor/e-contact-editor.c:1273
-#: addressbook/gui/widgets/e-addressbook-view.c:621
+#: addressbook/contact-editor/e-contact-editor.c:1286
+#: addressbook/gui/widgets/e-addressbook-view.c:617
msgid "Email 3"
msgstr "�᡼��3"
-#: addressbook/contact-editor/e-contact-quick-add.c:215
+#: addressbook/contact-editor/e-contact-quick-add.c:223
msgid "Contact Quick-Add"
msgstr "���󥿥��Ȥδʰ��ɲ�"
-#: addressbook/contact-editor/e-contact-quick-add.c:217
+#: addressbook/contact-editor/e-contact-quick-add.c:225
msgid "Edit Full"
msgstr "���٤��Խ�"
-#: addressbook/contact-editor/e-contact-quick-add.c:254
+#: addressbook/contact-editor/e-contact-quick-add.c:262
msgid "Full Name"
msgstr "�ե�͡���"
-#: addressbook/contact-editor/e-contact-quick-add.c:260
+#: addressbook/contact-editor/e-contact-quick-add.c:268
msgid "E-mail"
msgstr "�᡼��"
@@ -721,25 +720,25 @@ msgstr "�ɾ�(��Ĥ�)(_S):"
msgid "_Title:"
msgstr "�ɾ�(���Ĥ�)(_T):"
-#: addressbook/gui/component/addressbook.c:237
+#: addressbook/gui/component/addressbook.c:241
msgid "As _Minicards"
msgstr "�ߥ˥�����"
-#: addressbook/gui/component/addressbook.c:243
+#: addressbook/gui/component/addressbook.c:247
#: ui/evolution-addressbook.xml.h:1
msgid "As _Table"
msgstr "�ơ��֥�(_T)"
-#: addressbook/gui/component/addressbook.c:413
+#: addressbook/gui/component/addressbook.c:399
#, c-format
msgid "Enter password for %s"
msgstr "%s �Υѥ���ɤ����Ϥ��Ƥ�������"
-#: addressbook/gui/component/addressbook.c:441
+#: addressbook/gui/component/addressbook.c:427
msgid "Unable to open addressbook"
msgstr "���ɥ쥹Ģ�򳫤����Ȥ�����ޤ���"
-#: addressbook/gui/component/addressbook.c:446
+#: addressbook/gui/component/addressbook.c:432
msgid ""
"We were unable to open this addressbook. This either\n"
"means you have entered an incorrect URI, or have tried\n"
@@ -760,171 +759,171 @@ msgstr ""
"����������ɡ������ƥ��󥹥ȡ��뤷��, ����ѥ����ľ��\n"
"�� Evolution �򥤥󥹥ȡ��뤹��ɬ�פ�����Ǥ��礦.\n"
-#: addressbook/gui/component/addressbook.c:569
+#: addressbook/gui/component/addressbook.c:555
msgid "Show All"
msgstr "���٤�ɽ��"
-#: addressbook/gui/component/addressbook.c:571
+#: addressbook/gui/component/addressbook.c:557
msgid "Advanced..."
msgstr "�ܺ�..."
-#: addressbook/gui/component/addressbook.c:601
+#: addressbook/gui/component/addressbook.c:587
msgid "Any field contains"
msgstr "�ե�����ɤ����Τ�Τ�ޤ�"
-#: addressbook/gui/component/addressbook.c:602
+#: addressbook/gui/component/addressbook.c:588
msgid "Name contains"
msgstr "̾�������Τ�Τ�ޤ�"
-#: addressbook/gui/component/addressbook.c:603
+#: addressbook/gui/component/addressbook.c:589
msgid "Email contains"
msgstr "�᡼�뤬���Τ�Τ�ޤ�"
-#: addressbook/gui/component/addressbook.c:746
+#: addressbook/gui/component/addressbook.c:732
msgid "The URI that the Folder Browser will display"
msgstr "�ե�����֥饦����ɽ������ URI"
-#: addressbook/gui/component/addressbook-storage.c:95
+#: addressbook/gui/component/addressbook-storage.c:99
msgid "Other Contacts"
msgstr "����¾�Υ��󥿥���"
-#: addressbook/gui/component/addressbook-config.c:143
+#: addressbook/gui/component/addressbook-config.c:148
msgid "LDAP Server"
msgstr "LDAP ������"
-#: addressbook/gui/component/addressbook-config.c:145
+#: addressbook/gui/component/addressbook-config.c:150
msgid "File"
msgstr "�ե�����"
-#: addressbook/gui/component/addressbook-config.c:148
+#: addressbook/gui/component/addressbook-config.c:153
msgid "Unknown addressbook type"
msgstr "̤�ΤΥ��ɥ쥹Ģ����"
-#: addressbook/gui/component/addressbook-config.c:158
+#: addressbook/gui/component/addressbook-config.c:163
msgid "None (anonymous mode)"
msgstr "�ʤ� (ƿ̾�⡼��)"
-#: addressbook/gui/component/addressbook-config.c:160
-#: camel/providers/imap/camel-imap-provider.c:75
+#: addressbook/gui/component/addressbook-config.c:165
+#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
#: camel/providers/nntp/camel-nntp-store.c:293
-#: camel/providers/pop3/camel-pop3-provider.c:69
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:43
msgid "Password"
msgstr "�ѥ����"
-#: addressbook/gui/component/addressbook-config.c:162
+#: addressbook/gui/component/addressbook-config.c:167
msgid "SASL"
msgstr "SASL"
-#: addressbook/gui/component/addressbook-config.c:165
+#: addressbook/gui/component/addressbook-config.c:170
msgid "Unknown auth type"
msgstr "̤�Τ�ǧ�ڼ���"
-#: addressbook/gui/component/addressbook-config.c:174
+#: addressbook/gui/component/addressbook-config.c:179
msgid "Base"
msgstr "�١���"
-#: addressbook/gui/component/addressbook-config.c:176
+#: addressbook/gui/component/addressbook-config.c:181
msgid "One"
msgstr ""
-#: addressbook/gui/component/addressbook-config.c:178
+#: addressbook/gui/component/addressbook-config.c:183
msgid "Subtree"
msgstr ""
-#: addressbook/gui/component/addressbook-config.c:181
+#: addressbook/gui/component/addressbook-config.c:186
msgid "Unknown scope type"
msgstr "̤�ΤΥ������׼���"
-#: addressbook/gui/component/addressbook-config.c:348
+#: addressbook/gui/component/addressbook-config.c:353
msgid "Bind DN:"
msgstr ""
-#: addressbook/gui/component/addressbook-config.c:349
+#: addressbook/gui/component/addressbook-config.c:354
msgid "FIXME Bind DN Help text here"
msgstr "FIXME �Х���� DN �Υإ�ץƥ����ȤǤ�"
-#: addressbook/gui/component/addressbook-config.c:351
+#: addressbook/gui/component/addressbook-config.c:356
+#: mail/mail-config.glade.h:50
msgid "Remember this password"
msgstr "���Υѥ���ɤ򵭲�"
-#: addressbook/gui/component/addressbook-config.c:401
-#: mail/mail-config.glade.h:30
+#: addressbook/gui/component/addressbook-config.c:406
+#: mail/mail-config.glade.h:28
msgid "Host:"
msgstr "�ۥ���:"
-#: addressbook/gui/component/addressbook-config.c:402
+#: addressbook/gui/component/addressbook-config.c:407
msgid "FIXME Host help text here."
msgstr "FIXME �ۥ��ȥإ�ץƥ����ȤǤ�"
-#: addressbook/gui/component/addressbook-config.c:404
+#: addressbook/gui/component/addressbook-config.c:409
msgid "Port:"
msgstr "�ݡ���:"
-#: addressbook/gui/component/addressbook-config.c:405
+#: addressbook/gui/component/addressbook-config.c:410
msgid "FIXME Port help text here."
msgstr "FIXME �ݡ��ȥإ�ץƥ����ȤǤ�"
-#: addressbook/gui/component/addressbook-config.c:409
+#: addressbook/gui/component/addressbook-config.c:414
msgid "Root DN:"
msgstr "�롼�� DN:"
-#: addressbook/gui/component/addressbook-config.c:410
+#: addressbook/gui/component/addressbook-config.c:415
msgid "FIXME Root DN help text here."
msgstr "FIXME �롼�� DN �إ�ץƥ����ȤǤ�"
-#: addressbook/gui/component/addressbook-config.c:430
+#: addressbook/gui/component/addressbook-config.c:435
msgid "Search Scope:"
msgstr "�����ϰ�:"
-#: addressbook/gui/component/addressbook-config.c:484
-#: mail/mail-config.glade.h:9
+#: addressbook/gui/component/addressbook-config.c:489
msgid "Authentication:"
msgstr "ǧ������:"
-#: addressbook/gui/component/addressbook-config.c:502
-#: mail/mail-config-druid.c:517 mail/mail-config.glade.h:51
+#: addressbook/gui/component/addressbook-config.c:507
+#: mail/mail-config.glade.h:44
msgid "Path:"
msgstr "�ѥ�:"
-#: addressbook/gui/component/addressbook-config.c:503
+#: addressbook/gui/component/addressbook-config.c:508
msgid "FIXME Path Help text here"
msgstr "FIXME �ѥ��إ�ץƥ����ȤǤ�"
-#: addressbook/gui/component/addressbook-config.c:508
+#: addressbook/gui/component/addressbook-config.c:513
msgid "Create path if it doesn't exist."
msgstr "¸�ߤ��ʤ����ѥ����������"
-#: addressbook/gui/component/addressbook-config.c:642
+#: addressbook/gui/component/addressbook-config.c:647
msgid "Edit Addressbook"
msgstr "���ɥ쥹Ģ���Խ�"
-#: addressbook/gui/component/addressbook-config.c:644
+#: addressbook/gui/component/addressbook-config.c:649
msgid "Add Addressbook"
msgstr "���ɥ쥹Ģ���ɲ�"
-#: addressbook/gui/component/addressbook-config.c:660
+#: addressbook/gui/component/addressbook-config.c:665
msgid ""
"Select the kind of addressbook you have, and enter the relevant information "
"about it."
msgstr ""
"���ʤ��λ��ĥ��ɥ쥹Ģ������, ����ˤĤ��Ƥδ�Ϣ������������Ϥ��Ƥ�������"
-#: addressbook/gui/component/addressbook-config.c:666
-#: mail/mail-config.glade.h:43
+#: addressbook/gui/component/addressbook-config.c:671
+#: mail/mail-config.glade.h:35
msgid "Name:"
msgstr "̾��:"
-#: addressbook/gui/component/addressbook-config.c:667
+#: addressbook/gui/component/addressbook-config.c:672
msgid "FIXME Name help text here"
msgstr "FIXME ̾���إ�ץƥ����ȤǤ�"
-#: addressbook/gui/component/addressbook-config.c:669
+#: addressbook/gui/component/addressbook-config.c:674
#: calendar/gui/e-itip-control.glade.h:6
#: composer/e-msg-composer-attachment.glade.h:3
msgid "Description:"
msgstr "����:"
-#: addressbook/gui/component/addressbook-config.c:670
+#: addressbook/gui/component/addressbook-config.c:675
msgid "FIXME Description help text here"
msgstr "FIXME �����إ�ץƥ����ȤǤ�"
@@ -935,8 +934,8 @@ msgstr "���ɥ쥹Ģ�Υ�����"
#: addressbook/gui/component/addressbook-config.glade.h:3
#: calendar/gui/e-meeting-dialog.glade.h:8
#: calendar/gui/event-editor-dialog.glade.h:9 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:11 mail/folder-browser.c:574
-#: mail/mail-config.glade.h:21 mail/mail-view.c:150
+#: filter/libfilter-i18n.h:8 mail/folder-browser.c:597
+#: mail/mail-config.glade.h:19 mail/mail-view.c:156
#: ui/evolution-addressbook.xml.h:3 ui/evolution-event-editor.xml.h:17
#: ui/evolution-mail.xml.h:6 ui/evolution-task-editor-dialog.xml.h:18
msgid "Delete"
@@ -949,7 +948,7 @@ msgid "Edit"
msgstr "�Խ�"
#: addressbook/gui/component/addressbook-config.glade.h:5
-#: addressbook/gui/widgets/e-addressbook-view.c:605
+#: addressbook/gui/widgets/e-addressbook-view.c:601
msgid "Name"
msgstr "̾��"
@@ -957,57 +956,65 @@ msgstr "̾��"
msgid "URI"
msgstr "URI"
-#: addressbook/gui/component/e-address-widget.c:366
+#: addressbook/gui/component/e-address-widget.c:365
msgid "Disable Queries"
msgstr "�������̵��"
-#: addressbook/gui/component/e-address-widget.c:366
+#: addressbook/gui/component/e-address-widget.c:365
msgid "Enable Queries (Dangerous!)"
msgstr "�������ͭ�� (�����Ǥ�!)"
-#: addressbook/gui/component/e-address-widget.c:389
-#: addressbook/gui/component/select-names/e-select-names-popup.c:200
+#: addressbook/gui/component/e-address-widget.c:388
+#: addressbook/gui/component/select-names/e-select-names-popup.c:210
msgid "Edit Contact Info"
msgstr "���󥿥��Ⱦ�����Խ�"
-#: addressbook/gui/component/e-address-widget.c:425
-#: addressbook/gui/component/select-names/e-select-names-popup.c:259
+#: addressbook/gui/component/e-address-widget.c:424
+#: addressbook/gui/component/select-names/e-select-names-popup.c:269
msgid "Add to Contacts"
msgstr "���󥿥��Ȥ��ɲ�"
#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
+msgid "A Bonobo control for an address popup."
+msgstr "���ɥ쥹��ݥåץ��åפ��뤿��� Bonobo ����ȥ�����"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
msgid "A Bonobo control for displaying an address."
msgstr "���ɥ쥹��ɽ�����뤿��� Bonobo ����ȥ�����"
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
msgid "A sample Bonobo control which displays an addressbook."
msgstr "���ɥ쥹Ģ��ɽ������ Bonobo ����ȥ�����Υ���ץ�Ǥ�"
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
msgid "Control that displays an Evolution addressbook minicard."
msgstr "Evolution ���ɥ쥹Ģ�ߥ˥����ɤ�ɽ�����륳��ȥ�����"
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
msgid "Evolution Addressbook minicard viewer"
msgstr "Evolution ���ɥ쥹Ģ�ߥ˥����ɥӥ塼��"
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
msgid "Evolution component for handling contacts."
msgstr "���󥿥��Ȥ򰷤������ Evolution ����ݡ��ͥ��"
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
msgid "Factory for the Addressbook Minicard control"
msgstr "���ɥ쥹Ģ�ߥ˥����ɥ���ȥ�����Τ���Υե����ȥ�"
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
msgid "Factory for the Addressbook's address displayer"
msgstr "���ɥ쥹Ģ�Υ��ɥ쥹ɽ���Τ���Υե����ȥ�"
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+msgid "Factory for the Addressbook's address popup"
+msgstr "���ɥ쥹Ģ�Υ��ɥ쥹��ݥåץ��åפ��뤿��Υե����ȥ�"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
msgid "Factory for the Evolution addressbook component."
msgstr "Evolution ���ɥ쥹Ģ����ݡ��ͥ�ȤΤ���Υե����ȥ�"
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
msgid "Factory for the sample Addressbook control"
msgstr "����ץ륢�ɥ쥹Ģ����ȥ�����Τ���Υե����ȥ�"
@@ -1019,13 +1026,14 @@ msgstr "Evolution �Υ��ɥ쥹Ģ��̾�����򥤥󥿡��ե�����"
msgid "Factory for the Addressbook's name selection interface"
msgstr "���ɥ쥹Ģ��̾�����򥤥󥿡��ե������Τ���Υե����ȥ�"
-#: addressbook/gui/component/select-names/e-select-names-popup.c:121
-#: composer/e-msg-composer-attachment-bar.c:460 filter/filter.glade.h:9
-#: shell/e-shortcuts-view.c:254 shell/e-shortcuts-view.c:377
+#: addressbook/gui/component/select-names/e-select-names-popup.c:131
+#: composer/e-msg-composer-attachment-bar.c:468 filter/filter-filter.c:402
+#: filter/filter-rule.c:547 filter/filter.glade.h:9
+#: shell/e-shortcuts-view.c:265 shell/e-shortcuts-view.c:388
msgid "Remove"
msgstr "���"
-#: addressbook/gui/component/select-names/e-select-names-popup.c:136
+#: addressbook/gui/component/select-names/e-select-names-popup.c:146
msgid "Remove All"
msgstr "���٤ƺ��"
@@ -1045,7 +1053,7 @@ msgstr "̾��������"
msgid "Select name from:"
msgstr "������̾��������:"
-#: addressbook/gui/search/e-addressbook-search-dialog.c:150
+#: addressbook/gui/search/e-addressbook-search-dialog.c:158
msgid "Search"
msgstr "����"
@@ -1157,72 +1165,72 @@ msgstr "y"
msgid "z"
msgstr "z"
-#: addressbook/gui/widgets/e-addressbook-view.c:508
-#: addressbook/gui/widgets/e-minicard.c:450
+#: addressbook/gui/widgets/e-addressbook-view.c:504
+#: addressbook/gui/widgets/e-minicard.c:454
msgid "Save as VCard"
msgstr "VCard ����¸"
-#: addressbook/gui/widgets/e-addressbook-view.c:604
+#: addressbook/gui/widgets/e-addressbook-view.c:600
msgid "* Click here to add a contact *"
msgstr "* ���󥿥��Ȥ��ɲä��뤿��ˤ����򥯥�å� *"
-#: addressbook/gui/widgets/e-addressbook-view.c:606
+#: addressbook/gui/widgets/e-addressbook-view.c:602
msgid "Email"
msgstr "�᡼��"
-#: addressbook/gui/widgets/e-addressbook-view.c:610
+#: addressbook/gui/widgets/e-addressbook-view.c:606
msgid "Organization"
msgstr "�ȿ�"
-#: addressbook/gui/widgets/e-addressbook-view.c:622
+#: addressbook/gui/widgets/e-addressbook-view.c:618
msgid "Web Site"
msgstr "�����֥�����"
-#: addressbook/gui/widgets/e-addressbook-view.c:623
+#: addressbook/gui/widgets/e-addressbook-view.c:619
msgid "Department"
msgstr "����"
-#: addressbook/gui/widgets/e-addressbook-view.c:624
+#: addressbook/gui/widgets/e-addressbook-view.c:620
msgid "Office"
msgstr "��̳��"
-#: addressbook/gui/widgets/e-addressbook-view.c:625
+#: addressbook/gui/widgets/e-addressbook-view.c:621
msgid "Title"
msgstr "�ɾ�(���Ĥ�)"
-#: addressbook/gui/widgets/e-addressbook-view.c:626
+#: addressbook/gui/widgets/e-addressbook-view.c:622
msgid "Profession"
msgstr "���翦"
-#: addressbook/gui/widgets/e-addressbook-view.c:627
+#: addressbook/gui/widgets/e-addressbook-view.c:623
msgid "Manager"
msgstr "�ޥ͡�����"
-#: addressbook/gui/widgets/e-addressbook-view.c:629
+#: addressbook/gui/widgets/e-addressbook-view.c:625
msgid "Nickname"
msgstr "�˥å��͡���"
-#: addressbook/gui/widgets/e-addressbook-view.c:630
+#: addressbook/gui/widgets/e-addressbook-view.c:626
msgid "Spouse"
msgstr "�۶���"
-#: addressbook/gui/widgets/e-addressbook-view.c:631
+#: addressbook/gui/widgets/e-addressbook-view.c:627
msgid "Note"
msgstr "����"
-#: addressbook/gui/widgets/e-addressbook-view.c:632
+#: addressbook/gui/widgets/e-addressbook-view.c:628
msgid "Free-busy URL"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:633
+#: addressbook/gui/widgets/e-addressbook-view.c:629
msgid "Click here to add a contact"
msgstr "���󥿥��Ȥ��ɲä��뤿��ˤ����򥯥�å�"
-#: addressbook/gui/widgets/e-minicard-control.c:280
+#: addressbook/gui/widgets/e-minicard-control.c:282
msgid "Save in addressbook"
msgstr "���ɥ쥹Ģ����¸"
-#: addressbook/gui/widgets/e-minicard-view.c:145
+#: addressbook/gui/widgets/e-minicard-view.c:148
msgid ""
"\n"
"\n"
@@ -1236,7 +1244,7 @@ msgstr ""
"\n"
"���֥륯��å��򤷤ƿ������󥿥��Ȥ�������Ʋ�����"
-#: addressbook/gui/widgets/gal-view-factory-minicard.c:25
+#: addressbook/gui/widgets/gal-view-factory-minicard.c:26
msgid "Card View"
msgstr "̾��ɽ��"
@@ -1422,125 +1430,126 @@ msgid "Could not read pilot's ToDo application block"
msgstr ""
"�ѥ����åȤ� ToDo ���ץꥱ�������֥��å����ɤ߹��ळ�Ȥ�����ޤ���Ǥ���"
-#: calendar/gui/calendar-commands.c:258
+#: calendar/gui/calendar-commands.c:266
msgid "File not found"
msgstr "�ե����뤬���Ĥ���ޤ���"
-#: calendar/gui/calendar-commands.c:282
+#: calendar/gui/calendar-commands.c:290
msgid "Open calendar"
msgstr "�������򳫤�"
-#: calendar/gui/calendar-commands.c:324
+#: calendar/gui/calendar-commands.c:332
msgid "Save calendar"
msgstr "����������¸"
-#: calendar/gui/calendar-commands.c:478
+#: calendar/gui/calendar-commands.c:468
msgid ""
"Could not create the calendar view. Please check your ORBit and OAF setup."
msgstr ""
"�������ӥ塼���������ޤ���Ǥ���. ORBit��OAF�����������å����Ƥ�������"
-#: calendar/gui/calendar-model.c:366 calendar/gui/calendar-model.c:901
-#: calendar/gui/e-calendar-table.c:329
+#: calendar/gui/calendar-model.c:363 calendar/gui/calendar-model.c:898
+#: calendar/gui/e-calendar-table.c:330
msgid "Public"
msgstr "����"
-#: calendar/gui/calendar-model.c:369 calendar/gui/calendar-model.c:903
-#: calendar/gui/e-calendar-table.c:330
+#: calendar/gui/calendar-model.c:366 calendar/gui/calendar-model.c:900
+#: calendar/gui/e-calendar-table.c:331
msgid "Private"
msgstr "��Ū"
-#: calendar/gui/calendar-model.c:372 calendar/gui/calendar-model.c:905
-#: calendar/gui/e-calendar-table.c:331
+#: calendar/gui/calendar-model.c:369 calendar/gui/calendar-model.c:902
+#: calendar/gui/e-calendar-table.c:332
msgid "Confidential"
msgstr "����"
-#: calendar/gui/calendar-model.c:375 calendar/gui/event-editor.c:1590
-#: calendar/gui/event-editor.c:1617
-#: camel/providers/smtp/camel-smtp-transport.c:199
+#: calendar/gui/calendar-model.c:372 calendar/gui/event-editor.c:1592
+#: calendar/gui/event-editor.c:1619
+#: camel/providers/smtp/camel-smtp-transport.c:218
msgid "Unknown"
msgstr "̤��"
-#: calendar/gui/calendar-model.c:463
+#: calendar/gui/calendar-model.c:460
msgid "N"
msgstr "��"
-#: calendar/gui/calendar-model.c:463
+#: calendar/gui/calendar-model.c:460
msgid "S"
msgstr "��"
-#: calendar/gui/calendar-model.c:465
+#: calendar/gui/calendar-model.c:462
msgid "E"
msgstr "��"
-#: calendar/gui/calendar-model.c:465
+#: calendar/gui/calendar-model.c:462
msgid "W"
msgstr "��"
-#: calendar/gui/calendar-model.c:503 calendar/gui/calendar-model.c:1069
+#: calendar/gui/calendar-model.c:500 calendar/gui/calendar-model.c:1066
#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
-#: calendar/gui/e-calendar-table.c:351 mail/message-list.c:626
+#: calendar/gui/e-calendar-table.c:352 mail/message-list.c:629
msgid "High"
msgstr "�⤤"
-#: calendar/gui/calendar-model.c:505 calendar/gui/calendar-model.c:1071
-#: calendar/gui/calendar-model.c:1596
+#: calendar/gui/calendar-model.c:502 calendar/gui/calendar-model.c:1068
+#: calendar/gui/calendar-model.c:1593
#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
-#: calendar/gui/e-calendar-table.c:352 mail/message-list.c:625
+#: calendar/gui/e-calendar-table.c:353 mail/message-list.c:628
msgid "Normal"
msgstr "����"
-#: calendar/gui/calendar-model.c:507 calendar/gui/calendar-model.c:1073
+#: calendar/gui/calendar-model.c:504 calendar/gui/calendar-model.c:1070
#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
-#: calendar/gui/e-calendar-table.c:353 mail/message-list.c:624
+#: calendar/gui/e-calendar-table.c:354 mail/message-list.c:627
msgid "Low"
msgstr "�㤤"
-#: calendar/gui/calendar-model.c:543 calendar/gui/calendar-model.c:1125
-#: calendar/gui/e-calendar-table.c:405
+#: calendar/gui/calendar-model.c:540 calendar/gui/calendar-model.c:1122
+#: calendar/gui/e-calendar-table.c:406
msgid "Transparent"
msgstr "Ʃ��"
-#: calendar/gui/calendar-model.c:546 calendar/gui/calendar-model.c:1127
-#: calendar/gui/e-calendar-table.c:404
+#: calendar/gui/calendar-model.c:543 calendar/gui/calendar-model.c:1124
+#: calendar/gui/e-calendar-table.c:405
msgid "Opaque"
msgstr "��Ʃ��"
-#: calendar/gui/calendar-model.c:641 calendar/gui/calendar-model.c:1179
+#: calendar/gui/calendar-model.c:638 calendar/gui/calendar-model.c:1176
#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
-#: calendar/gui/e-calendar-table.c:425
+#: calendar/gui/e-calendar-table.c:426
msgid "Not Started"
msgstr "���Ϥ��Ƥ��ʤ�"
-#: calendar/gui/calendar-model.c:644 calendar/gui/calendar-model.c:1181
+#: calendar/gui/calendar-model.c:641 calendar/gui/calendar-model.c:1178
#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/e-calendar-table.c:427
msgid "In Progress"
msgstr "������"
-#: calendar/gui/calendar-model.c:647 calendar/gui/calendar-model.c:1183
+#: calendar/gui/calendar-model.c:644 calendar/gui/calendar-model.c:1180
#: calendar/gui/dialogs/task-editor-dialog.glade.h:6
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-calendar-table.c:428
msgid "Completed"
msgstr "��λ���ޤ���"
-#: calendar/gui/calendar-model.c:650 calendar/gui/calendar-model.c:1185
+#: calendar/gui/calendar-model.c:647 calendar/gui/calendar-model.c:1182
#: calendar/gui/dialogs/task-editor-dialog.glade.h:4
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/e-calendar-table.c:429 camel/camel-service.c:544
+#: camel/camel-service.c:580
msgid "Cancelled"
msgstr "����󥻥뤷�ޤ���"
#. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:797 e-util/e-time-utils.c:277
+#: calendar/gui/calendar-model.c:794 e-util/e-time-utils.c:278
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:800 e-util/e-time-utils.c:286
+#: calendar/gui/calendar-model.c:797 e-util/e-time-utils.c:287
msgid "%a %m/%d/%Y %I:%M:%S %p"
msgstr "%Y/%m/%d (%a) %p %I:%M:%S"
-#: calendar/gui/calendar-model.c:805
+#: calendar/gui/calendar-model.c:802
#, c-format
msgid ""
"The date must be entered in the format: \n"
@@ -1551,25 +1560,24 @@ msgstr ""
"\n"
"%s"
-#: calendar/gui/calendar-model.c:885
+#: calendar/gui/calendar-model.c:882
msgid ""
"The classification must be 'Public', 'Private', 'Confidential' or 'None'"
msgstr ""
"ʬ��� '����', '��Ū', '����' ���뤤�� '�ʤ�' �����򤷤ʤ���Фʤ�ޤ���"
#. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:899 calendar/gui/calendar-model.c:1123
-#: calendar/gui/calendar-model.c:1177 calendar/gui/e-calendar-table.c:328
-#: calendar/gui/e-calendar-table.c:403 mail/mail-account-editor.c:770
-#: mail/mail-account-editor.c:772 mail/mail-account-editor.c:863
-#: mail/mail-accounts.c:115 mail/mail-config-druid.c:1090
-#: mail/mail-config.glade.h:45 shell/e-shell-view.c:1119
-#: widgets/misc/e-cell-date-edit.c:231 widgets/misc/e-dateedit.c:421
-#: widgets/misc/e-dateedit.c:1330 widgets/misc/e-dateedit.c:1445
+#: calendar/gui/calendar-model.c:896 calendar/gui/calendar-model.c:1120
+#: calendar/gui/calendar-model.c:1174 calendar/gui/e-calendar-table.c:329
+#: calendar/gui/e-calendar-table.c:404 mail/mail-account-gui.c:968
+#: mail/mail-accounts.c:120 mail/mail-accounts.c:164
+#: mail/mail-config.glade.h:37 shell/e-shell-view.c:1124
+#: widgets/misc/e-cell-date-edit.c:234 widgets/misc/e-dateedit.c:430
+#: widgets/misc/e-dateedit.c:1339 widgets/misc/e-dateedit.c:1454
msgid "None"
msgstr "����"
-#: calendar/gui/calendar-model.c:973
+#: calendar/gui/calendar-model.c:970
msgid ""
"The geographical position must be entered in the format: \n"
"\n"
@@ -1579,39 +1587,39 @@ msgstr ""
"\n"
"45.436845,125.862501"
-#: calendar/gui/calendar-model.c:1013
+#: calendar/gui/calendar-model.c:1010
msgid "The percent value must be between 0 and 100, inclusive"
msgstr "�ѡ�������ͤ� 0 �� 100 �δ֤Ǵޤ�Ǥ��ʤ���Фʤ�ޤ���"
-#: calendar/gui/calendar-model.c:1054
+#: calendar/gui/calendar-model.c:1051
msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
msgstr ""
"ͥ���٤� '�⤤', '����', '�㤤' ���뤤�� '̤���' �����򤷤ʤ���Фʤ�ޤ���"
#. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1067
+#: calendar/gui/calendar-model.c:1064
#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
-#: calendar/gui/e-calendar-table.c:354
+#: calendar/gui/e-calendar-table.c:355
msgid "Undefined"
msgstr "̤���"
-#: calendar/gui/calendar-model.c:1108
+#: calendar/gui/calendar-model.c:1105
msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
-msgstr ""
+msgstr "Ʃ���٤� 'Ʃ��', '��Ʃ��', ���뤤�� '�ʤ�' �Ǥʤ���Фʤ�ޤ���"
-#: calendar/gui/calendar-model.c:1598
+#: calendar/gui/calendar-model.c:1595
msgid "Recurring"
msgstr "��ȯ"
-#: calendar/gui/calendar-model.c:1600
+#: calendar/gui/calendar-model.c:1597
msgid "Assigned"
msgstr "�����ƺѤ�"
-#: calendar/gui/calendar-model.c:1606
+#: calendar/gui/calendar-model.c:1603
msgid "Yes"
msgstr "�Ϥ�"
-#: calendar/gui/calendar-model.c:1606
+#: calendar/gui/calendar-model.c:1603
msgid "No"
msgstr "������"
@@ -1676,23 +1684,23 @@ msgstr "���顼�����Υ����ӥ�"
msgid "Factory for the alarm notification service"
msgstr "���顼�����Υ����ӥ��Τ���Υե����ȥ�"
-#: calendar/gui/alarm-notify/notify-main.c:63 calendar/gui/main.c:49
+#: calendar/gui/alarm-notify/notify-main.c:67 calendar/gui/main.c:52
msgid "Could not initialize GNOME"
msgstr "GNOME �ν����������ޤ���Ǥ���"
-#: calendar/gui/alarm-notify/notify-main.c:73
+#: calendar/gui/alarm-notify/notify-main.c:77
msgid "Could not create the alarm notify service factory"
msgstr "���顼�����Υ����ӥ��ե����ȥ���������ޤ���Ǥ���"
-#: calendar/gui/dialogs/alarm-notify-dialog.c:184
+#: calendar/gui/dialogs/alarm-notify-dialog.c:189
msgid "Alarm on %A %b %d %Y %H:%M"
msgstr "%Y/%b/%d %A %H:%M �˥��顼��"
-#: calendar/gui/dialogs/alarm-notify-dialog.c:191
+#: calendar/gui/dialogs/alarm-notify-dialog.c:196
msgid "Notification about your appointment on %A %b %d %Y %H:%M"
msgstr "%Y/%b/%d %A %H:%M �Τ��ʤ�����«�ˤĤ�������"
-#: calendar/gui/dialogs/alarm-notify-dialog.c:202
+#: calendar/gui/dialogs/alarm-notify-dialog.c:207
msgid "No summary available."
msgstr "���ѤǤ��륵�ޥ꡼�Ϥ���ޤ���"
@@ -1781,7 +1789,7 @@ msgid "Display options"
msgstr "ɽ�����ץ����"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: calendar/gui/e-calendar-table.c:161
+#: calendar/gui/e-calendar-table.c:162
msgid "Due Date"
msgstr "����"
@@ -1802,7 +1810,7 @@ msgid "Fri"
msgstr "��"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/event-editor.c:479
+#: calendar/gui/event-editor.c:481
msgid "Friday"
msgstr "������"
@@ -1831,7 +1839,7 @@ msgid "Mon"
msgstr "��"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/event-editor.c:475
+#: calendar/gui/event-editor.c:477
msgid "Monday"
msgstr "������"
@@ -1844,12 +1852,12 @@ msgid "Overdue Items:"
msgstr "���¤�᤮�������ƥ�:"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:45
msgid "Pick a color"
msgstr "���顼������"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/e-calendar-table.c:164
+#: calendar/gui/e-calendar-table.c:165
msgid "Priority"
msgstr "ͥ����"
@@ -1867,7 +1875,7 @@ msgid "Sat"
msgstr "��"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: calendar/gui/event-editor.c:480
+#: calendar/gui/event-editor.c:482
msgid "Saturday"
msgstr "������"
@@ -1892,7 +1900,7 @@ msgid "Sun"
msgstr "��"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: calendar/gui/event-editor.c:481
+#: calendar/gui/event-editor.c:483
msgid "Sunday"
msgstr "������"
@@ -1905,7 +1913,7 @@ msgid "Thu"
msgstr "��"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/event-editor.c:478
+#: calendar/gui/event-editor.c:480
msgid "Thursday"
msgstr "������"
@@ -1926,7 +1934,7 @@ msgid "Tue"
msgstr "��"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: calendar/gui/event-editor.c:476
+#: calendar/gui/event-editor.c:478
msgid "Tuesday"
msgstr "������"
@@ -1939,7 +1947,7 @@ msgid "Wed"
msgstr "��"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-#: calendar/gui/event-editor.c:477
+#: calendar/gui/event-editor.c:479
msgid "Wednesday"
msgstr "������"
@@ -1952,7 +1960,7 @@ msgid "minutes before they occur."
msgstr "ʬ��"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:78
msgid "seconds."
msgstr " ��"
@@ -1993,7 +2001,7 @@ msgid "% Comp_lete:"
msgstr "% ��λ(_l):"
#: calendar/gui/dialogs/task-editor-dialog.glade.h:5
-#: calendar/gui/e-calendar-table.c:157
+#: calendar/gui/e-calendar-table.c:158
#: calendar/gui/event-editor-dialog.glade.h:6
msgid "Classification"
msgstr "ʬ��"
@@ -2060,300 +2068,299 @@ msgstr "ͥ����(_P):"
msgid "_Status:"
msgstr "���ơ�����(_S):"
-#: calendar/gui/dialogs/task-editor.c:689
+#: calendar/gui/dialogs/task-editor.c:697
msgid "Edit Task"
msgstr "���������Խ�"
-#: calendar/gui/dialogs/task-editor.c:695 calendar/gui/event-editor.c:377
+#: calendar/gui/dialogs/task-editor.c:703 calendar/gui/event-editor.c:379
msgid "No summary"
msgstr "���ޥ꡼�ʤ�"
-#: calendar/gui/dialogs/task-editor.c:701 calendar/gui/event-editor.c:383
+#: calendar/gui/dialogs/task-editor.c:709 calendar/gui/event-editor.c:385
#, c-format
msgid "Appointment - %s"
msgstr "��« - %s"
-#: calendar/gui/dialogs/task-editor.c:704 calendar/gui/event-editor.c:386
+#: calendar/gui/dialogs/task-editor.c:712 calendar/gui/event-editor.c:388
#, c-format
msgid "Task - %s"
msgstr "������ - %s"
-#: calendar/gui/dialogs/task-editor.c:707 calendar/gui/event-editor.c:389
+#: calendar/gui/dialogs/task-editor.c:715 calendar/gui/event-editor.c:391
#, c-format
msgid "Journal entry - %s"
msgstr "�������� - %s"
-#: calendar/gui/e-calendar-table.c:156
+#: calendar/gui/e-calendar-table.c:157
msgid "Categories"
msgstr "���ƥ���"
-#: calendar/gui/e-calendar-table.c:158
+#: calendar/gui/e-calendar-table.c:159
msgid "Completion Date"
msgstr "���"
-#: calendar/gui/e-calendar-table.c:159
+#: calendar/gui/e-calendar-table.c:160
msgid "End Date"
msgstr "���"
-#: calendar/gui/e-calendar-table.c:160
+#: calendar/gui/e-calendar-table.c:161
msgid "Start Date"
msgstr "������"
-#: calendar/gui/e-calendar-table.c:162
+#: calendar/gui/e-calendar-table.c:163
msgid "Geographical Position"
msgstr "���ٷ���"
-#: calendar/gui/e-calendar-table.c:163
+#: calendar/gui/e-calendar-table.c:164
msgid "Percent complete"
msgstr "�ѡ�����ȴ�λ"
-#: calendar/gui/e-calendar-table.c:165
+#: calendar/gui/e-calendar-table.c:166
msgid "Summary"
msgstr "���ޥ꡼"
-#: calendar/gui/e-calendar-table.c:166
+#: calendar/gui/e-calendar-table.c:167
msgid "Transparency"
-msgstr ""
+msgstr "Ʃ����"
-#: calendar/gui/e-calendar-table.c:167
+#: calendar/gui/e-calendar-table.c:168
msgid "URL"
msgstr "URL"
-#: calendar/gui/e-calendar-table.c:168
+#: calendar/gui/e-calendar-table.c:169
msgid "Alarms"
msgstr "���顼��"
-#: calendar/gui/e-calendar-table.c:169
+#: calendar/gui/e-calendar-table.c:170
msgid "Click here to add a task"
msgstr "���������ɲä��뤿��ˤ����򥯥�å�"
-#: calendar/gui/e-calendar-table.c:373
+#: calendar/gui/e-calendar-table.c:374
#, c-format
msgid "0%"
msgstr "0%"
-#: calendar/gui/e-calendar-table.c:374
+#: calendar/gui/e-calendar-table.c:375
#, c-format
msgid "10%"
msgstr "10%"
-#: calendar/gui/e-calendar-table.c:375
+#: calendar/gui/e-calendar-table.c:376
#, c-format
msgid "20%"
msgstr "20%"
-#: calendar/gui/e-calendar-table.c:376
+#: calendar/gui/e-calendar-table.c:377
#, c-format
msgid "30%"
msgstr "30%"
-#: calendar/gui/e-calendar-table.c:377
+#: calendar/gui/e-calendar-table.c:378
#, c-format
msgid "40%"
msgstr "40%"
-#: calendar/gui/e-calendar-table.c:378
+#: calendar/gui/e-calendar-table.c:379
#, c-format
msgid "50%"
msgstr "50%"
-#: calendar/gui/e-calendar-table.c:379
+#: calendar/gui/e-calendar-table.c:380
#, c-format
msgid "60%"
msgstr "60%"
-#: calendar/gui/e-calendar-table.c:380
+#: calendar/gui/e-calendar-table.c:381
#, c-format
msgid "70%"
msgstr "70%"
-#: calendar/gui/e-calendar-table.c:381
+#: calendar/gui/e-calendar-table.c:382
#, c-format
msgid "80%"
msgstr "80%"
-#: calendar/gui/e-calendar-table.c:382
+#: calendar/gui/e-calendar-table.c:383
#, c-format
msgid "90%"
msgstr "90%"
-#: calendar/gui/e-calendar-table.c:383
+#: calendar/gui/e-calendar-table.c:384
#, c-format
msgid "100%"
msgstr "100%"
-#: calendar/gui/e-calendar-table.c:550
+#: calendar/gui/e-calendar-table.c:551
msgid "Mark Complete"
msgstr "��λ��ޡ���"
-#: calendar/gui/e-calendar-table.c:551
+#: calendar/gui/e-calendar-table.c:552
msgid "Mark the task complete"
msgstr "��λ������������ޡ������ޤ�"
-#: calendar/gui/e-calendar-table.c:556
+#: calendar/gui/e-calendar-table.c:557
msgid "Edit this task..."
msgstr "���Υ��������Խ�..."
-#: calendar/gui/e-calendar-table.c:557
+#: calendar/gui/e-calendar-table.c:558
msgid "Edit the task"
msgstr "���������Խ����ޤ�"
-#: calendar/gui/e-calendar-table.c:559
+#: calendar/gui/e-calendar-table.c:560
#: ui/evolution-task-editor-dialog.xml.h:19
msgid "Delete this task"
msgstr "���Υ������������ޤ�"
-#: calendar/gui/e-calendar-table.c:560
+#: calendar/gui/e-calendar-table.c:561
msgid "Delete the task"
msgstr "�������������ޤ�"
-#: calendar/gui/e-day-view-time-item.c:516
+#: calendar/gui/e-day-view-time-item.c:519
#, 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:271 calendar/gui/e-day-view.c:1281
-#: calendar/gui/e-week-view-main-item.c:321
+#: calendar/gui/e-day-view-top-item.c:274 calendar/gui/e-day-view.c:1290
+#: calendar/gui/e-week-view-main-item.c:325
msgid "%A %d %B"
msgstr "%B %d %A"
#. strftime format %a = abbreviated weekday name, %d = day of month,
#. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:275 calendar/gui/e-day-view.c:1295
-#: calendar/gui/e-week-view-main-item.c:330
+#: calendar/gui/e-day-view-top-item.c:278 calendar/gui/e-day-view.c:1304
+#: calendar/gui/e-week-view-main-item.c:334
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:279 calendar/gui/e-day-view.c:1308
-#: calendar/gui/e-week-view-main-item.c:344
+#: calendar/gui/e-day-view-top-item.c:282 calendar/gui/e-day-view.c:1317
+#: calendar/gui/e-week-view-main-item.c:348
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:563 calendar/gui/e-week-view.c:297
-#: calendar/gui/print.c:613
+#: calendar/gui/e-day-view.c:572 calendar/gui/e-week-view.c:302
+#: calendar/gui/print.c:617
msgid "am"
msgstr "����"
#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:566 calendar/gui/e-week-view.c:300
-#: calendar/gui/print.c:612
+#: calendar/gui/e-day-view.c:575 calendar/gui/e-week-view.c:305
+#: calendar/gui/print.c:616
msgid "pm"
msgstr "���"
-#: calendar/gui/e-day-view.c:3027 ui/evolution-calendar.xml.h:16
+#: calendar/gui/e-day-view.c:3036 ui/evolution-calendar.xml.h:16
msgid "New Appointment"
msgstr "������«"
-#: calendar/gui/e-day-view.c:3029 calendar/gui/e-week-view.c:3237
+#: calendar/gui/e-day-view.c:3038 calendar/gui/e-week-view.c:3242
msgid "New All Day Event"
msgstr "���������Υ��٥��"
-#: calendar/gui/e-day-view.c:3034 calendar/gui/e-week-view.c:3242
+#: calendar/gui/e-day-view.c:3043 calendar/gui/e-week-view.c:3247
msgid "Go to Today"
msgstr "�����ذ�ư"
-#: calendar/gui/e-day-view.c:3036 calendar/gui/e-week-view.c:3244
+#: calendar/gui/e-day-view.c:3045 calendar/gui/e-week-view.c:3249
msgid "Go to Date..."
msgstr "�������ذ�ư..."
-#: calendar/gui/e-day-view.c:3043 calendar/gui/e-week-view.c:3250
-#: mail/folder-browser.c:543 ui/evolution-calendar.xml.h:19
+#: calendar/gui/e-day-view.c:3052 calendar/gui/e-week-view.c:3255
+#: mail/folder-browser.c:566 ui/evolution-calendar.xml.h:19
#: ui/evolution-message-composer.xml.h:10
msgid "Open"
msgstr "����"
-#: calendar/gui/e-day-view.c:3045 calendar/gui/e-week-view.c:3252
+#: calendar/gui/e-day-view.c:3054 calendar/gui/e-week-view.c:3257
msgid "Delete this Appointment"
msgstr "������«����"
-#: calendar/gui/e-day-view.c:3047 calendar/gui/e-week-view.c:3254
+#: calendar/gui/e-day-view.c:3056 calendar/gui/e-week-view.c:3259
#: ui/evolution-event-editor.xml.h:45
msgid "Schedule Meeting"
msgstr "�ǹ礻�Υ������塼��"
-#: calendar/gui/e-day-view.c:3056 calendar/gui/e-week-view.c:3267
+#: calendar/gui/e-day-view.c:3065 calendar/gui/e-week-view.c:3272
msgid "Make this Occurrence Movable"
msgstr "���ν�������ư�ˤ���"
-#: calendar/gui/e-day-view.c:3058 calendar/gui/e-week-view.c:3269
+#: calendar/gui/e-day-view.c:3067 calendar/gui/e-week-view.c:3274
msgid "Delete this Occurrence"
msgstr "����������"
-#: calendar/gui/e-day-view.c:3060
+#: calendar/gui/e-day-view.c:3069
msgid "Delete all Occurrences"
msgstr "���٤Ƥν��������"
-#: calendar/gui/e-itip-control.c:153
+#: calendar/gui/e-itip-control.c:161
msgid "I couldn't update your calendar file!\n"
msgstr "�������ե�����򹹿�����ޤ���Ǥ���!\n"
-#: calendar/gui/e-itip-control.c:159 calendar/gui/e-itip-control.c:502
+#: calendar/gui/e-itip-control.c:167 calendar/gui/e-itip-control.c:510
msgid "Component successfully updated."
msgstr "����ݡ��ͥ�Ȥ���������������ޤ���"
-#: calendar/gui/e-itip-control.c:165
+#: calendar/gui/e-itip-control.c:173
msgid "There was an error loading the calendar file."
msgstr "�������ե�������ɤ߹�����˥��顼��ȯ�����ޤ���"
-#: calendar/gui/e-itip-control.c:189
+#: calendar/gui/e-itip-control.c:197
msgid "I couldn't open your calendar file!\n"
msgstr "�������ե�����򳫤����Ȥ�����ޤ���Ǥ���!\n"
-#: calendar/gui/e-itip-control.c:450 calendar/gui/e-itip-control.c:521
+#: calendar/gui/e-itip-control.c:458 calendar/gui/e-itip-control.c:529
msgid "I couldn't load your calendar file!\n"
msgstr "�������ե����������ɤ��뤳�Ȥ�����ޤ���Ǥ���!\n"
-#: calendar/gui/e-itip-control.c:462
+#: calendar/gui/e-itip-control.c:470
msgid "I couldn't read your calendar file!\n"
msgstr "�������ե�������ɤ߹��ळ�Ȥ�����ޤ���Ǥ���!\n"
-#: calendar/gui/e-itip-control.c:475
+#: calendar/gui/e-itip-control.c:483
msgid "This is a reply from someone who was uninvited!"
msgstr "����Ͼ�������ï��������ֻ��Ǥ�!"
-#: calendar/gui/e-itip-control.c:491
+#: calendar/gui/e-itip-control.c:499
msgid "I couldn't update your calendar store."
msgstr "��¸�����������򹹿�����ޤ���Ǥ���"
-#: calendar/gui/e-itip-control.c:532
+#: calendar/gui/e-itip-control.c:540
msgid "I couldn't delete the calendar component!\n"
msgstr "����������ݡ��ͥ�Ȥ�������ޤ���Ǥ���!\n"
-#: calendar/gui/e-itip-control.c:542
+#: calendar/gui/e-itip-control.c:550
msgid "Component successfully deleted."
msgstr "����ݡ��ͥ�Ȥ��������������ޤ���"
-#: calendar/gui/e-itip-control.c:686
+#: calendar/gui/e-itip-control.c:694
msgid "I don't recognize this type of calendar component."
msgstr "���Υ���������ݡ��ͥ�Ȥμ��̤�ǧ�����ޤ���"
-#: calendar/gui/e-itip-control.c:772
+#: calendar/gui/e-itip-control.c:780
msgid "Add to Calendar"
msgstr "���������ɲ�"
-#: calendar/gui/e-itip-control.c:806
-msgid "Accept"
-msgstr "����"
+#: calendar/gui/e-itip-control.c:814
+msgid " Accept "
+msgstr " ���� "
-#: calendar/gui/e-itip-control.c:807
-msgid "Decline"
-msgstr "����"
+#: calendar/gui/e-itip-control.c:815
+msgid " Decline "
+msgstr " ���� "
-#: calendar/gui/e-itip-control.c:808
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
-msgid "Tentative"
-msgstr "����"
+#: calendar/gui/e-itip-control.c:816
+msgid " Tentative "
+msgstr " ���� "
-#: calendar/gui/e-itip-control.c:852
+#: calendar/gui/e-itip-control.c:860
msgid "Update Calendar"
msgstr "�������򹹿�"
-#: calendar/gui/e-itip-control.c:875
+#: calendar/gui/e-itip-control.c:883
msgid "Cancel Meeting"
msgstr "�ǹ礻�򥭥�󥻥�"
@@ -2370,7 +2377,7 @@ msgstr ""
msgid "Calendar Message"
msgstr "������������"
-#: calendar/gui/e-itip-control.glade.h:5 mail/mail-format.c:598
+#: calendar/gui/e-itip-control.glade.h:5 mail/mail-format.c:613
msgid "Date:"
msgstr "����:"
@@ -2382,9 +2389,9 @@ msgstr "���������������..."
msgid "Organizer:"
msgstr "��ż�:"
-#: calendar/gui/e-itip-control.glade.h:10 filter/libfilter-i18n.h:43
-msgid "Sender"
-msgstr "������"
+#: calendar/gui/e-itip-control.glade.h:10
+msgid "Server Message:"
+msgstr "�����Х�å�����:"
#: calendar/gui/e-itip-control.glade.h:11
msgid "Summary:"
@@ -2474,26 +2481,26 @@ msgstr ""
"�������塼��\n"
"����"
-#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:48
-#: mail/message-list.c:1014
+#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:30
+#: mail/message-list.c:1017
msgid "Status"
msgstr "���ơ�����"
-#: calendar/gui/e-tasks.c:148 calendar/gui/e-tasks.c:468
-#: calendar/gui/e-tasks.c:501
+#: calendar/gui/e-tasks.c:149 calendar/gui/e-tasks.c:469
+#: calendar/gui/e-tasks.c:502
msgid "All"
msgstr "���٤�"
-#: calendar/gui/e-tasks.c:154
+#: calendar/gui/e-tasks.c:155
msgid "Category:"
msgstr "���ƥ���:"
-#: calendar/gui/e-tasks.c:297
+#: calendar/gui/e-tasks.c:298
#, c-format
msgid "Could not load the tasks in `%s'"
msgstr "'%s' �Υ��������ɤ߹��ळ�Ȥ�����ޤ���Ǥ���"
-#: calendar/gui/e-tasks.c:309
+#: calendar/gui/e-tasks.c:310
#, c-format
msgid "The method required to load `%s' is not supported"
msgstr "'%s' ���ɤ߹��ळ�Ȥ��׵ᤵ���᥽�åɤϥ��ݡ��Ȥ��Ƥ��ޤ���"
@@ -2501,15 +2508,15 @@ msgstr "'%s' ���ɤ߹��ळ�Ȥ��׵ᤵ���᥽�åɤϥ��ݡ��Ȥ��Ƥ��ޤ���"
#. strftime format %d = day of month, %B = full
#. month name. You can change the order but don't
#. change the specifiers or add anything.
-#: calendar/gui/e-week-view-main-item.c:338
+#: calendar/gui/e-week-view-main-item.c:342
msgid "%d %B"
msgstr "%B %d"
-#: calendar/gui/e-week-view.c:3235 calendar/gui/e-week-view.c:3258
+#: calendar/gui/e-week-view.c:3240 calendar/gui/e-week-view.c:3263
msgid "New Appointment..."
msgstr "������«..."
-#: calendar/gui/e-week-view.c:3271
+#: calendar/gui/e-week-view.c:3276
msgid "Delete All Occurrences"
msgstr "���٤Ƥν��������"
@@ -2546,7 +2553,7 @@ msgid "No recurrence"
msgstr "��ȯ�ʤ�"
#: calendar/gui/event-editor-dialog.glade.h:14
-#: calendar/gui/event-editor.c:1577
+#: calendar/gui/event-editor.c:1579
msgid "Play a sound"
msgstr "���ڤ����"
@@ -2567,12 +2574,12 @@ msgid "Reminder"
msgstr "��¥��"
#: calendar/gui/event-editor-dialog.glade.h:22
-#: calendar/gui/event-editor.c:1586
+#: calendar/gui/event-editor.c:1588
msgid "Run a program"
msgstr "�ץ�������¹Ԥ���"
#: calendar/gui/event-editor-dialog.glade.h:23
-#: calendar/gui/event-editor.c:1583
+#: calendar/gui/event-editor.c:1585
msgid "Send an email"
msgstr "�᡼�����������"
@@ -2581,7 +2588,7 @@ msgid "Settings..."
msgstr "����..."
#: calendar/gui/event-editor-dialog.glade.h:25
-#: calendar/gui/event-editor.c:1580
+#: calendar/gui/event-editor.c:1582
msgid "Show a dialog"
msgstr "������������ɽ������"
@@ -2601,12 +2608,11 @@ msgstr "���ϻ���(_S):"
msgid "_Starting date:"
msgstr "������(_S):"
-#. Automatically generated. Do not edit.
-#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:2
+#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:33
msgid "after"
msgstr "��"
-#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:6
+#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:34
msgid "before"
msgstr "��"
@@ -2630,7 +2636,7 @@ msgstr ""
msgid "hour(s)"
msgstr "��"
-#: calendar/gui/event-editor-dialog.glade.h:40
+#: calendar/gui/event-editor-dialog.glade.h:40 mail/mail-config.glade.h:77
msgid "minute(s)"
msgstr "ʬ"
@@ -2654,97 +2660,97 @@ msgstr "��"
msgid "year(s)"
msgstr "ǯ"
-#: calendar/gui/event-editor.c:371
+#: calendar/gui/event-editor.c:373
msgid "Edit Appointment"
msgstr "��«���Խ�"
-#: calendar/gui/event-editor.c:449
+#: calendar/gui/event-editor.c:451
msgid "on"
msgstr ""
-#: calendar/gui/event-editor.c:474 filter/filter-datespec.c:65
+#: calendar/gui/event-editor.c:476 filter/filter-datespec.c:81
msgid "day"
msgstr "��"
-#: calendar/gui/event-editor.c:601
+#: calendar/gui/event-editor.c:603
msgid "on the"
msgstr ""
-#: calendar/gui/event-editor.c:608
+#: calendar/gui/event-editor.c:610
msgid "th"
msgstr ""
-#: calendar/gui/event-editor.c:754
+#: calendar/gui/event-editor.c:756
msgid "occurrences"
msgstr "�����"
-#: calendar/gui/event-editor.c:871
+#: calendar/gui/event-editor.c:873
msgid "This appointment contains recurrences that Evolution cannot edit."
msgstr "������«�� Evolution ���Խ�����ʤ���ȯ��ޤ�Ǥ��ޤ�"
-#: calendar/gui/event-editor.c:1532
+#: calendar/gui/event-editor.c:1534
#, c-format
msgid " %d days"
msgstr "%d ��"
-#: calendar/gui/event-editor.c:1534
+#: calendar/gui/event-editor.c:1536
msgid " 1 day"
msgstr "1 ��"
-#: calendar/gui/event-editor.c:1537
+#: calendar/gui/event-editor.c:1539
#, c-format
msgid " %d weeks"
msgstr "%d ����"
-#: calendar/gui/event-editor.c:1539
+#: calendar/gui/event-editor.c:1541
msgid " 1 week"
msgstr "1 ����"
-#: calendar/gui/event-editor.c:1542
+#: calendar/gui/event-editor.c:1544
#, c-format
msgid " %d hours"
msgstr "%d ����"
-#: calendar/gui/event-editor.c:1544
+#: calendar/gui/event-editor.c:1546
msgid " 1 hour"
msgstr "1 ����"
-#: calendar/gui/event-editor.c:1547
+#: calendar/gui/event-editor.c:1549
#, c-format
msgid " %d minutes"
msgstr "%d ʬ"
-#: calendar/gui/event-editor.c:1549
+#: calendar/gui/event-editor.c:1551
msgid " 1 minute"
msgstr "1 ʬ"
-#: calendar/gui/event-editor.c:1552
+#: calendar/gui/event-editor.c:1554
#, c-format
msgid " %d seconds"
msgstr "%d ��"
-#: calendar/gui/event-editor.c:1554
+#: calendar/gui/event-editor.c:1556
msgid " 1 second"
msgstr "1 ��"
-#: calendar/gui/event-editor.c:1601
+#: calendar/gui/event-editor.c:1603
msgid " before start of appointment"
msgstr "�ǽ����«����"
-#: calendar/gui/event-editor.c:1603
+#: calendar/gui/event-editor.c:1605
msgid " after start of appointment"
msgstr "�ǽ����«�θ�"
-#: calendar/gui/event-editor.c:1611
+#: calendar/gui/event-editor.c:1613
msgid " before end of appointment"
msgstr "�Ǹ����«����"
-#: calendar/gui/event-editor.c:1613
+#: calendar/gui/event-editor.c:1615
msgid " after end of appointment"
msgstr "�Ǹ����«�θ�"
-#: calendar/gui/event-editor.c:3113 calendar/gui/print.c:1093
-#: calendar/gui/print.c:1095 calendar/gui/print.c:1096
+#: calendar/gui/event-editor.c:3123 calendar/gui/print.c:1097
+#: calendar/gui/print.c:1099 calendar/gui/print.c:1100
msgid "%a %b %d %Y"
msgstr "%Y/%b/%d (%a)"
@@ -2780,12 +2786,12 @@ msgstr "������ iTip �ӥ塼����ȥ�����Τ���Υե����ȥ�"
msgid "Factory for the sample Calendar control"
msgstr "����ץ륫��������ȥ�����Υե����ȥ�"
-#: calendar/gui/gnome-cal.c:695
+#: calendar/gui/gnome-cal.c:700
#, c-format
msgid "Could not open the folder in `%s'"
msgstr "`%s' �Υե�����򳫤����Ȥ�����ޤ���Ǥ���"
-#: calendar/gui/gnome-cal.c:706
+#: calendar/gui/gnome-cal.c:711
#, c-format
msgid "The method required to open `%s' is not supported"
msgstr "'%s' �򳫤����Ȥ��׵ᤵ���᥽�åɤϥ��ݡ��Ȥ��Ƥ��ޤ���"
@@ -2846,201 +2852,201 @@ msgstr "10 ��"
msgid "September"
msgstr "9 ��"
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:300
msgid "1st"
msgstr "1 ��"
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:300
msgid "2nd"
msgstr "2 ��"
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:300
msgid "3rd"
msgstr "3 ��"
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:300
msgid "4th"
msgstr "4 ��"
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:300
msgid "5th"
msgstr "5 ��"
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:301
msgid "6th"
msgstr "6 ��"
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:301
msgid "7th"
msgstr "7 ��"
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:301
msgid "8th"
msgstr "8 ��"
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:301
msgid "9th"
msgstr "9 ��"
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:301
msgid "10th"
msgstr "10 ��"
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:302
msgid "11th"
msgstr "11 ��"
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:302
msgid "12th"
msgstr "12 ��"
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:302
msgid "13th"
msgstr "13 ��"
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:302
msgid "14th"
msgstr "14 ��"
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:302
msgid "15th"
msgstr "15 ��"
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:303
msgid "16th"
msgstr "16 ��"
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:303
msgid "17th"
msgstr "17 ��"
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:303
msgid "18th"
msgstr "18 ��"
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:303
msgid "19th"
msgstr "19 ��"
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:303
msgid "20th"
msgstr "20 ��"
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:304
msgid "21st"
msgstr "21 ��"
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:304
msgid "22nd"
msgstr "22 ��"
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:304
msgid "23rd"
msgstr "23 ��"
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:304
msgid "24th"
msgstr "24 ��"
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:304
msgid "25th"
msgstr "25 ��"
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:305
msgid "26th"
msgstr "26 ��"
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:305
msgid "27th"
msgstr "27 ��"
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:305
msgid "28th"
msgstr "28 ��"
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:305
msgid "29th"
msgstr "29 ��"
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:305
msgid "30th"
msgstr "30 ��"
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:306
msgid "31st"
msgstr "31 ��"
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:362
msgid "Su"
msgstr "��"
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:362
msgid "Mo"
msgstr "��"
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:362
msgid "Tu"
msgstr "��"
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:362
msgid "We"
msgstr "��"
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:362
msgid "Th"
msgstr "��"
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:362
msgid "Fr"
msgstr "��"
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:362
msgid "Sa"
msgstr "��"
-#: calendar/gui/print.c:944
+#: calendar/gui/print.c:948
msgid "Tasks"
msgstr "������"
#. Day
-#: calendar/gui/print.c:1074
+#: calendar/gui/print.c:1078
msgid "Current day (%a %b %d %Y)"
msgstr "���������� [%Y/%b/%d (%a)]"
-#: calendar/gui/print.c:1088 calendar/gui/print.c:1092
+#: calendar/gui/print.c:1092 calendar/gui/print.c:1096
msgid "%a %b %d"
msgstr "%b/%d (%a)"
-#: calendar/gui/print.c:1089
+#: calendar/gui/print.c:1093
msgid "%a %d %Y"
msgstr "%Y/%d (%a)"
-#: calendar/gui/print.c:1100
+#: calendar/gui/print.c:1104
#, c-format
msgid "Current week (%s - %s)"
msgstr "���� (%s - %s)"
#. Month
-#: calendar/gui/print.c:1108
+#: calendar/gui/print.c:1112
msgid "Current month (%b %Y)"
msgstr "���� (%Y/%b)"
#. Year
-#: calendar/gui/print.c:1115
+#: calendar/gui/print.c:1119
msgid "Current year (%Y)"
msgstr "��ǯ (%Y)"
-#: calendar/gui/print.c:1152
+#: calendar/gui/print.c:1156
msgid "Print Calendar"
msgstr "���������"
-#: calendar/gui/print.c:1317 mail/mail-callbacks.c:1334
+#: calendar/gui/print.c:1321 mail/mail-callbacks.c:1341
#: ui/evolution-addressbook.xml.h:10 ui/evolution-calendar.xml.h:24
-#: ui/evolution-mail.xml.h:29
+#: ui/evolution-mail.xml.h:30
msgid "Print Preview"
msgstr "�����ץ�ӥ塼"
-#: calendar/gui/tasks-control.c:105
+#: calendar/gui/tasks-control.c:108
msgid "The URI of the tasks folder to display"
msgstr "�������ե������ɽ������ URI"
@@ -3048,7 +3054,7 @@ msgstr "�������ե������ɽ������ URI"
msgid ""
"Evolution has taken the tasks that were in your calendar folder and "
"automatically migrated them to the new tasks folder."
-msgstr ""
+msgstr "Evolution �ϥ������ե�����Υ������������, ��ưŪ�˿������������ե�����ذ�ư���ޤ�"
#: calendar/gui/tasks-migrate.c:109
msgid ""
@@ -3057,41 +3063,86 @@ msgid ""
"Some of the tasks could not be migrated, so this process may be attempted "
"again in the future."
msgstr ""
+"Evolution �ϥ������ե�����Υ������������, �������������ե�����ذ�ư���褦�Ȥ��ޤ���\n"
+"������, �����Ĥ��Υ������ϰ�ư���뤳�Ȥ�����ޤ���Ǥ���, �Ǥ��ΤǤ��Υץ������Ϥ��θ�Ƥӻ���Ǥ��礦"
#: calendar/gui/tasks-migrate.c:121
#, c-format
msgid ""
"Could not open `%s'; no items from the calendar folder will be migrated to "
"the tasks folder."
-msgstr ""
+msgstr "`%s' �򳫤����Ȥ�����ޤ���Ǥ���; �������ե�������饿�����ե�����ذ�ư���륢���ƥब����ޤ���"
#: calendar/gui/tasks-migrate.c:134
#, c-format
msgid ""
"The method required to load `%s' is not supported; no items from the "
"calendar folder will be migrated to the tasks folder."
-msgstr ""
+msgstr "`%s' ���ɤ߹����׵��夲���᥽�åɤϥ��ݡ��Ȥ��Ƥ��ޤ���; �������ե�������饿�����ե�����ذ�ư���륢���ƥब����ޤ���"
-#: calendar/gui/weekday-picker.c:313 calendar/gui/weekday-picker.c:408
+#: calendar/gui/weekday-picker.c:315 calendar/gui/weekday-picker.c:410
msgid "SMTWTFS"
msgstr "SMTWTFS"
-#: camel/camel-filter-driver.c:848
+#: camel/camel-filter-driver.c:534 camel/camel-filter-driver.c:543
+msgid "Syncing folders"
+msgstr "�ե������Ʊ����"
+
+#: camel/camel-filter-driver.c:643
+msgid "Unable to open spool folder"
+msgstr "���ס���ե�����򳫤����Ȥ�����ޤ���"
+
+#: camel/camel-filter-driver.c:652
+msgid "Unable to process spool folder"
+msgstr "���ס���ե������������뤳�Ȥ�����ޤ���"
+
+#: camel/camel-filter-driver.c:666
+msgid "Getting message %d (%d%%)"
+msgstr "������ %d ������� (%d%%)"
+
+#: camel/camel-filter-driver.c:670 camel/camel-filter-driver.c:679
+#, c-format
+msgid "Failed message %d"
+msgstr "��å����� %d �ϼ��Ԥ��ޤ���"
+
+#: camel/camel-filter-driver.c:671
+msgid "Cannot open message"
+msgstr "��å������򳫤����Ȥ�����ޤ���"
+
+#: camel/camel-filter-driver.c:690 camel/camel-filter-driver.c:788
+msgid "Syncing folder"
+msgstr "�ե������Ʊ����"
+
+#: camel/camel-filter-driver.c:694 camel/camel-filter-driver.c:793
+msgid "Complete"
+msgstr "��λ���ޤ���"
+
+#: camel/camel-filter-driver.c:748
+#, c-format
+msgid "Getting message %d of %d"
+msgstr "������ %d / %d �������"
+
+#: camel/camel-filter-driver.c:753 camel/camel-filter-driver.c:771
+#, c-format
+msgid "Failed at message %d of %d"
+msgstr "��å����� %d / %d �ϼ��Ԥ��ޤ���"
+
+#: camel/camel-filter-driver.c:866
#, c-format
msgid "Error parsing filter: %s: %s"
msgstr "�ե��륿�ι�ʸ������˥��顼: %s: %s"
-#: camel/camel-filter-driver.c:853
+#: camel/camel-filter-driver.c:871
#, c-format
msgid "Error executing filter: %s: %s"
msgstr "�ե��륿�¹���˥��顼: %s: %s"
-#: camel/camel-filter-search.c:426 camel/camel-filter-search.c:432
+#: camel/camel-filter-search.c:431 camel/camel-filter-search.c:437
#, c-format
msgid "Error executing filter search: %s: %s"
msgstr "�ե��륿�����¹���˥��顼: %s: %s"
-#: camel/camel-folder-search.c:323
+#: camel/camel-folder-search.c:328
#, c-format
msgid ""
"Cannot parse search expression: %s:\n"
@@ -3100,7 +3151,7 @@ msgstr ""
"����ɽ���ι�ʸ����Ͻ���ޤ���: %s:\n"
"%s"
-#: camel/camel-folder-search.c:333
+#: camel/camel-folder-search.c:338
#, c-format
msgid ""
"Error executing search expression: %s:\n"
@@ -3109,145 +3160,163 @@ msgstr ""
"����ɽ���Ǥθ�����¹���˥��顼: %s:\n"
"%s"
-#: camel/camel-folder-search.c:480 camel/camel-folder-search.c:508
+#: camel/camel-folder-search.c:485 camel/camel-folder-search.c:513
msgid "(match-all) requires a single bool result"
msgstr ""
-#: camel/camel-folder-search.c:554
+#: camel/camel-folder-search.c:559
#, c-format
msgid "Performing query on unknown header: %s"
-msgstr ""
+msgstr "̤�ΤΥإå��ǥ������¹Ԥ��Ƥ��ޤ�: %s"
-#: camel/camel-folder-search.c:663 camel/camel-folder-search.c:700
+#: camel/camel-folder-search.c:670 camel/camel-folder-search.c:714
msgid "Invalid type in body-contains, expecting string"
msgstr ""
#. well, this is really only a programatic error
-#: camel/camel-lock.c:90 camel/camel-lock.c:109 camel/camel-movemail.c:136
-#: camel/camel-movemail.c:183
+#: camel/camel-lock.c:92 camel/camel-lock.c:111 camel/camel-movemail.c:138
+#: camel/camel-movemail.c:185
#, c-format
msgid "Could not create lock file for %s: %s"
msgstr "%s �Υ��å��ե����������Ǥ��ޤ���Ǥ���: %s"
-#: camel/camel-lock.c:149 camel/camel-movemail.c:217
+#: camel/camel-lock.c:151 camel/camel-movemail.c:219
#, c-format
msgid "Timed out trying to get lock file on %s. Try again later."
msgstr ""
"%s �Υ��å��ե�����������˥����ॢ���Ȥ��ޤ���. ��Ǥ��ľ���Ƥ�������"
-#: camel/camel-lock.c:199
+#: camel/camel-lock.c:201
#, c-format
msgid "Failed to get lock using fcntl(2): %s"
msgstr "fcntl(2)��Ȥä����å��˼��Ԥ��ޤ���: %s"
-#: camel/camel-lock.c:253
+#: camel/camel-lock.c:255
#, c-format
msgid "Failed to get lock using flock(2): %s"
msgstr "flock(2)��Ȥä����å��˼��Ԥ��ޤ���: %s"
-#: camel/camel-movemail.c:99
+#: camel/camel-movemail.c:101
#, c-format
msgid "Could not check mail file %s: %s"
msgstr "�᡼��ե����� %s ������å����뤳�Ȥ�����ޤ���Ǥ���: %s"
-#: camel/camel-movemail.c:146
+#: camel/camel-movemail.c:148
#, c-format
msgid "Could not open mail file %s: %s"
msgstr "�᡼��ե����� %s �򳫤����Ȥ�����ޤ���Ǥ���: %s"
-#: camel/camel-movemail.c:156
+#: camel/camel-movemail.c:158
#, c-format
msgid "Could not open temporary mail file %s: %s"
msgstr "�᡼��ե����� %s �Υƥ�ݥ��򳫤����Ȥ�����ޤ���Ǥ���: %s"
-#: camel/camel-movemail.c:197
+#: camel/camel-movemail.c:199
#, c-format
msgid "Could not test lock file for %s: %s"
msgstr "%s �Υ��å��ե������ƥ��Ƚ���ޤ���Ǥ���: %s"
-#: camel/camel-movemail.c:243
+#: camel/camel-movemail.c:245
#, c-format
msgid "Error reading mail file: %s"
msgstr "�᡼��ե�������ɤ߹�����˥��顼: %s"
-#: camel/camel-movemail.c:254
+#: camel/camel-movemail.c:256
#, c-format
msgid "Error writing mail temp file: %s"
msgstr "�᡼���ȥե�����ν񤭹�����˥��顼: %s"
-#: camel/camel-movemail.c:272
+#: camel/camel-movemail.c:274
#, c-format
msgid "Failed to store mail in temp file %s: %s"
msgstr "��ȥե����� %s �إ᡼�����¸�˼��Ԥ��ޤ���: %s"
-#: camel/camel-movemail.c:304
+#: camel/camel-movemail.c:306
#, c-format
msgid "Could not create pipe: %s"
msgstr "�ѥ��פ������Ǥ��ޤ���Ǥ���: %s"
-#: camel/camel-movemail.c:316
+#: camel/camel-movemail.c:318
#, c-format
msgid "Could not fork: %s"
msgstr "fork ����ޤ���Ǥ���: %s"
-#: camel/camel-movemail.c:354
+#: camel/camel-movemail.c:356
#, c-format
msgid "Movemail program failed: %s"
msgstr "Movemail �ץ������ϼ��Ԥ��ޤ���: %s"
-#: camel/camel-movemail.c:355
+#: camel/camel-movemail.c:357
msgid "(Unknown error)"
msgstr "(̤�ΤΥ��顼)"
-#: camel/camel-provider.c:137
+#: camel/camel-movemail.c:587
+#, c-format
+msgid "Error copying mail temp file: %s"
+msgstr "�᡼���ȥե�����Υ��ԡ���˥��顼: %s"
+
+#: camel/camel-provider.c:131
+#, c-format
+msgid "Could not load %s: Module loading not supported on this system."
+msgstr "%s ���ɤ߹��ळ�Ȥ�����ޤ���Ǥ���: ���Υ����ƥ�Ǥϥ⥸�塼����ɤ߹��ߤ򥵥ݡ��Ȥ��Ƥ��ޤ���"
+
+#: camel/camel-provider.c:140
#, c-format
msgid "Could not load %s: %s"
msgstr "%s ������ɽ���ޤ���Ǥ���: %s"
-#: camel/camel-provider.c:145
+#: camel/camel-provider.c:148
#, c-format
msgid "Could not load %s: No initialization code in module."
msgstr "%s ������ɽ���ޤ���Ǥ���: �⥸�塼��Υ����ɤ����������Ƥ��ޤ���"
-#: camel/camel-remote-store.c:170
+#: camel/camel-remote-store.c:189
#, c-format
msgid "%s server %s"
msgstr "%s ������ %s"
-#: camel/camel-remote-store.c:174
+#: camel/camel-remote-store.c:193
#, c-format
msgid "%s service for %s on %s"
-msgstr ""
+msgstr "%s �����ӥ� (�桼��: %s �ۥ��� %s)"
-#: camel/camel-remote-store.c:221
+#: camel/camel-remote-store.c:243
msgid "Connection cancelled"
msgstr "��³�ϥ���󥻥뤷�ޤ���"
-#: camel/camel-remote-store.c:224
-#: camel/providers/smtp/camel-smtp-transport.c:243
+#: camel/camel-remote-store.c:246
+#: camel/providers/smtp/camel-smtp-transport.c:261
#, c-format
msgid "Could not connect to %s (port %d): %s"
msgstr "%s (�ݡ��� %d) ����³����ޤ���Ǥ���: %s"
-#: camel/camel-remote-store.c:225
+#: camel/camel-remote-store.c:247
msgid "(unknown host)"
msgstr "(̤�ΤΥۥ���)"
-#: camel/camel-remote-store.c:306 camel/camel-remote-store.c:368
-#: camel/camel-remote-store.c:439
-#: camel/providers/imap/camel-imap-command.c:289
+#: camel/camel-remote-store.c:328 camel/camel-remote-store.c:390
+#: camel/camel-remote-store.c:461
+#: camel/providers/imap/camel-imap-command.c:264
msgid "Operation cancelled"
msgstr "���ϥ���󥻥뤷�ޤ���"
-#: camel/camel-remote-store.c:445
+#: camel/camel-remote-store.c:467
msgid "Server unexpectedly disconnected"
msgstr "�����Ф��������Ǥ��ޤ���"
-#: camel/camel-sasl-anonymous.c:97 camel/camel-sasl-plain.c:84
+#: camel/camel-sasl-anonymous.c:33
+msgid "Anonymous"
+msgstr "ƿ̾"
+
+#: camel/camel-sasl-anonymous.c:35
+msgid "This option will connect to the server using an anonymous login."
+msgstr "���Υ��ץ�����ƿ̾���������Ȥäƥ����Ф���³���ޤ�"
+
+#: camel/camel-sasl-anonymous.c:110 camel/camel-sasl-plain.c:87
msgid "Authentication failed."
msgstr "ǧ�ڤ˼��Ԥ��ޤ���"
-#: camel/camel-sasl-anonymous.c:106
+#: camel/camel-sasl-anonymous.c:119
#, c-format
msgid ""
"Invalid email address trace information:\n"
@@ -3256,7 +3325,7 @@ msgstr ""
"̵���ʥ᡼�륢�ɥ쥹�ȥ졼������:\n"
"%s"
-#: camel/camel-sasl-anonymous.c:118
+#: camel/camel-sasl-anonymous.c:131
#, c-format
msgid ""
"Invalid opaque trace information:\n"
@@ -3265,7 +3334,7 @@ msgstr ""
"̵�����ԲIJ�ʥȥ졼������:\n"
"%s"
-#: camel/camel-sasl-anonymous.c:130
+#: camel/camel-sasl-anonymous.c:143
#, c-format
msgid ""
"Invalid trace information:\n"
@@ -3274,11 +3343,11 @@ msgstr ""
"̵���ʥȥ졼������:\n"
"%s"
-#: camel/camel-sasl-cram-md5.c:32 mail/mail-config.glade.h:11
+#: camel/camel-sasl-cram-md5.c:35
msgid "CRAM-MD5"
msgstr "CRAM-MD5"
-#: camel/camel-sasl-cram-md5.c:34
+#: camel/camel-sasl-cram-md5.c:37
msgid ""
"This option will connect to the server using a secure CRAM-MD5 password, if "
"the server supports it."
@@ -3286,11 +3355,11 @@ msgstr ""
"�⤷�����Ф����ݡ��Ȥ��Ƥ���ʤ�, ���Υ��ץ����ϥ����奢�� CRAM-MD5 "
"ǧ�ڤ�Ȥäƥ����Ф���³���ޤ�"
-#: camel/camel-sasl-digest-md5.c:37 mail/mail-config.glade.h:19
+#: camel/camel-sasl-digest-md5.c:42
msgid "DIGEST-MD5"
msgstr "DIGEST-MD5"
-#: camel/camel-sasl-digest-md5.c:39
+#: camel/camel-sasl-digest-md5.c:44
msgid ""
"This option will connect to the server using a secure DIGEST-MD5 password, "
"if the server supports it."
@@ -3298,39 +3367,39 @@ msgstr ""
"�⤷�����Ф����ݡ��Ȥ��Ƥ���ʤ�, ���Υ��ץ����ϥ����奢�� DIGEST-MD5 "
"��Ȥäƥ����Ф���³���ޤ�"
-#: camel/camel-sasl-digest-md5.c:761
+#: camel/camel-sasl-digest-md5.c:802
msgid "Server challenge too long (>2048 octets)\n"
msgstr ""
-#: camel/camel-sasl-digest-md5.c:770
+#: camel/camel-sasl-digest-md5.c:811
msgid "Server challenge invalid\n"
msgstr ""
-#: camel/camel-sasl-digest-md5.c:776
+#: camel/camel-sasl-digest-md5.c:817
msgid "Server challenge contained invalid \"Quality of Protection\" token\n"
msgstr ""
-#: camel/camel-sasl-digest-md5.c:798
+#: camel/camel-sasl-digest-md5.c:839
msgid "Server response did not contain authorization data\n"
msgstr "�����Фα�����ǧ�ڥǡ�����ޤ�Ǥ��ޤ���\n"
-#: camel/camel-sasl-digest-md5.c:816
+#: camel/camel-sasl-digest-md5.c:857
msgid "Server response contained incomplete authorization data\n"
-msgstr ""
+msgstr "�����Фα������Դ�����ǧ�ڥǡ�����ޤ�Ǥ��ޤ�\n"
-#: camel/camel-sasl-digest-md5.c:826
+#: camel/camel-sasl-digest-md5.c:867
msgid "Server response does not match\n"
msgstr "�����Фα����ϰ��פ��ޤ���\n"
-#: camel/camel-sasl-kerberos4.c:38
+#: camel/camel-sasl-kerberos4.c:40
msgid "Kerberos 4"
msgstr "Kerberos 4"
-#: camel/camel-sasl-kerberos4.c:40
+#: camel/camel-sasl-kerberos4.c:42
msgid "This option will connect to the server using Kerberos 4 authentication."
msgstr "���Υ��ץ����� Kerberos 4 ǧ�ڤ�Ȥäƥ����Ф���³���ޤ�"
-#: camel/camel-sasl-kerberos4.c:158
+#: camel/camel-sasl-kerberos4.c:161
#, c-format
msgid ""
"Could not get Kerberos ticket:\n"
@@ -3339,67 +3408,69 @@ msgstr ""
"Kerberos �����åȤ�������뤳�Ȥ�����ޤ���Ǥ���:\n"
"%s"
-#: camel/camel-sasl-kerberos4.c:215
-#: camel/providers/imap/camel-imap-store.c:418
+#: camel/camel-sasl-kerberos4.c:218
+#: camel/providers/imap/camel-imap-store.c:417
msgid "Bad authentication response from server."
msgstr "�����Ф���ְ�ä�ǧ�ڱ���������ޤ���"
-#: camel/camel-sasl-plain.c:29
-msgid "PLAIN"
-msgstr "�ץ쥤��"
-
-#: camel/camel-sasl-plain.c:31
-msgid ""
-"This option will connect to the server using a the PLAIN SASL mechanism if "
-"the server supports it."
-msgstr ""
-"�⤷�����Ф����ݡ��Ȥ��Ƥ���ʤ�, ���Υ��ץ����ϥץ쥤�� SASL "
-"�ᥫ�˥����Ȥäƥ����Ф���³���ޤ�"
+#: camel/camel-sasl-plain.c:34
+msgid "This option will connect to the server using a simple password."
+msgstr "���Υ��ץ����ϴ�ñ�ʥѥ���ɤ�Ȥäƥ����Ф���³���ޤ�"
-#: camel/camel-search-private.c:105
+#: camel/camel-search-private.c:110
#, c-format
msgid "Regular expression compilation failed: %s: %s"
msgstr "����ɽ�����Խ��˼���: %s: %s"
-#: camel/camel-service.c:139
+#: camel/camel-service.c:152
#, c-format
msgid "URL '%s' needs a username component"
msgstr "URL '%s' �ϥ桼��̾����ݡ��ͥ�Ȥ�ɬ�פǤ�"
-#: camel/camel-service.c:147
+#: camel/camel-service.c:160
#, c-format
msgid "URL '%s' needs a host component"
msgstr "URL '%s' �ϥۥ��ȥ���ݡ��ͥ�Ȥ�ɬ�פǤ�"
-#: camel/camel-service.c:155
+#: camel/camel-service.c:168
#, c-format
msgid "URL '%s' needs a path component"
msgstr "URL '%s' �ϥѥ�����ݡ��ͥ�Ȥ�ɬ�פǤ�"
-#: camel/camel-service.c:478
+#: camel/camel-service.c:548
+#, c-format
+msgid "Resolving: %s"
+msgstr "�����: %s"
+
+#: camel/camel-service.c:575
+#, c-format
+msgid "Failure in name lookup: %s"
+msgstr "̾���θ����˼��Ԥ��ޤ���: %s"
+
+#: camel/camel-service.c:600
#, c-format
-msgid "No such host %s."
-msgstr "���Τ褦�ʥۥ��� %s �Ϥ���ޤ���"
+msgid "Host lookup failed: %s: host not found"
+msgstr "�ۥ��Ȥθ����˼��Ԥ��ޤ���: %s: �ۥ��Ȥϸ��Ĥ���ޤ���"
-#: camel/camel-service.c:481
+#: camel/camel-service.c:602
#, c-format
-msgid "Temporarily unable to look up hostname %s."
-msgstr "���Ū�˥ۥ���̾ %s �򸫤Ĥ��뤳�Ȥ�����ޤ���"
+msgid "Host lookup failed: %s: unknown reason"
+msgstr "�ۥ��Ȥθ����˼��Ԥ��ޤ���: %s: ̤�Τ���ͳ�Ǥ�"
-#: camel/camel-session.c:54
+#: camel/camel-session.c:57
msgid "Virtual folder email provider"
msgstr "���ۥե�����᡼��ץ��Х���"
-#: camel/camel-session.c:56
+#: camel/camel-session.c:59
msgid "For reading mail as a query of another set of folders"
msgstr ""
-#: camel/camel-session.c:320
+#: camel/camel-session.c:274 camel/camel-session.c:364
#, c-format
msgid "No provider available for protocol `%s'"
msgstr "�ץ��ȥ��� `%s' �����ѤǤ���ץ��Х����Ϥ���ޤ���"
-#: camel/camel-session.c:415
+#: camel/camel-session.c:462
#, c-format
msgid ""
"Could not create directory %s:\n"
@@ -3409,121 +3480,137 @@ msgstr ""
"%s"
#. Fill in the new fields
-#: camel/camel-store.c:382 mail/mail-ops.c:941 mail/mail-ops.c:948
-#: mail/mail-ops.c:966 mail/mail-ops.c:967
+#: camel/camel-store.c:380 mail/mail-ops.c:995 mail/mail-ops.c:1002
+#: mail/mail-ops.c:1020 mail/mail-ops.c:1021
msgid "Trash"
msgstr "����Ȣ"
-#: camel/camel-url.c:77
+#: camel/camel-url.c:288
#, c-format
-msgid "URL string `%s' contains no protocol"
-msgstr "URL ʸ���� `%s' �ϥץ��ȥ����ޤ�Ǥ��ޤ���"
+msgid "Could not parse URL `%s'"
+msgstr "URL `%s' ����Ϥ��뤳�Ȥ�����ޤ���Ǥ���"
-#: camel/camel-url.c:92
+#: camel/camel-vee-folder.c:451
#, c-format
-msgid "URL string `%s' contains an invalid protocol"
-msgstr "URL ʸ���� `%s' ��̵���ʥץ��ȥ����ޤ�Ǥ��ޤ�"
+msgid "No such message %s in %s"
+msgstr "%s �� %s �Τ褦�ʥ�å������Ϥ���ޤ���"
-#: camel/camel-url.c:152
-#, c-format
-msgid "Port number in URL `%s' is non-numeric"
-msgstr "URL `%s' �Υݡ����ֹ�Ͽ����ǤϤ���ޤ���"
-
-#: camel/camel-vee-folder.c:962
+#: camel/camel-vee-folder.c:545
#, c-format
msgid "No such message: %s"
msgstr "���Τ褦�ʥ�å������Ϥ���ޤ���: %s"
-#: camel/providers/imap/camel-imap-command.c:234
+#: camel/providers/imap/camel-imap-command.c:209
#, c-format
msgid "Unexpected response from IMAP server: %s"
msgstr "IMAP �����Ф���ͽ�����ʤ�����������ޤ���: %s"
-#: camel/providers/imap/camel-imap-command.c:242
+#: camel/providers/imap/camel-imap-command.c:217
#, c-format
msgid "IMAP command failed: %s"
msgstr "IMAP ���ޥ�ɤϼ��Ԥ��ޤ���: %s"
-#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:481
+#: camel/providers/imap/camel-imap-command.c:218 shell/e-storage.c:481
msgid "Unknown error"
msgstr "̤�ΤΥ��顼"
-#: camel/providers/imap/camel-imap-command.c:297
+#: camel/providers/imap/camel-imap-command.c:272
msgid "Server response ended too soon."
msgstr "�����Х쥹�ݥ󥹤Ϥ��ä��ʤ������ޤ���"
-#: camel/providers/imap/camel-imap-command.c:433
+#: camel/providers/imap/camel-imap-command.c:456
#, c-format
msgid "IMAP server response did not contain %s information"
msgstr "IMAP �����Фα����� %s �����ޤ�Ǥ��ޤ���"
-#: camel/providers/imap/camel-imap-command.c:469
+#: camel/providers/imap/camel-imap-command.c:490
#, c-format
msgid "Unexpected OK response from IMAP server: %s"
msgstr "IMAP �����Ф���ͽ�����ʤ� OK ����������ޤ���: %s"
-#: camel/providers/imap/camel-imap-folder.c:176
+#: camel/providers/imap/camel-imap-folder.c:172
#, c-format
msgid "Could not load summary for %s"
msgstr "%s �Υ��ޥ꡼������ɽ���ޤ���Ǥ���"
-#: camel/providers/imap/camel-imap-folder.c:345
+#: camel/providers/imap/camel-imap-folder.c:351
msgid "Scanning IMAP folder"
msgstr "IMAP �ե������������"
-#: camel/providers/imap/camel-imap-folder.c:946
-#: camel/providers/imap/camel-imap-folder.c:1143
+#: camel/providers/imap/camel-imap-folder.c:986
+#: camel/providers/imap/camel-imap-folder.c:1197
msgid "This message is not currently available"
msgstr "���Υ�å������ϸ������ѽ���ޤ���"
-#: camel/providers/imap/camel-imap-folder.c:976
-#: camel/providers/imap/camel-imap-folder.c:1177
+#: camel/providers/imap/camel-imap-folder.c:1016
+#: camel/providers/imap/camel-imap-folder.c:1231
msgid "Could not find message body in FETCH response."
msgstr "FETCH �����˥�å��������Τ��դ��뤳�Ȥ�����ޤ���Ǥ���"
-#: camel/providers/imap/camel-imap-provider.c:40
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:11
+msgid "Checking for new mail"
+msgstr "����᡼��Υ����å�"
+
+#: camel/providers/imap/camel-imap-provider.c:45
+msgid "Check for new messages in all folders"
+msgstr "���٤ƤΥե�����ο���᡼�������å����ޤ�"
+
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:479
+msgid "Folders"
+msgstr "�ե����"
+
+#: camel/providers/imap/camel-imap-provider.c:50
+msgid "Show only subscribed folders"
+msgstr "���ɤ����ե��������ɽ��"
+
+#: camel/providers/imap/camel-imap-provider.c:52
+msgid "Override server-supplied folder namespace"
+msgstr "�����Ф��󶡤���ե�����Υ͡��ॹ�ڡ������ͥ�褹��"
+
+#: camel/providers/imap/camel-imap-provider.c:54
+msgid "Namespace"
+msgstr "�͡��ॹ�ڡ���"
+
+#: camel/providers/imap/camel-imap-provider.c:57
+msgid "Apply filters to new messages in INBOX on this server"
+msgstr "���Υ����о�� INBOX ��ˤ��뿷����å������إե��륿��Ŭ�Ѥ���"
+
+#: camel/providers/imap/camel-imap-provider.c:63
msgid "IMAPv4"
msgstr "IMAPv4"
-#: camel/providers/imap/camel-imap-provider.c:42
+#: camel/providers/imap/camel-imap-provider.c:65
msgid "For reading and storing mail on IMAP servers."
msgstr "IMAP �����Фǥ᡼����ɤ�������Ѥ��뤿��Τ�ΤǤ�"
-#: camel/providers/imap/camel-imap-provider.c:58
-msgid "Secure IMAPv4"
-msgstr "�����奢 IMAPv4"
-
-#: camel/providers/imap/camel-imap-provider.c:60
-msgid "For reading and storing mail on IMAP servers over an SSL connection."
-msgstr "SSL ��³��ۤ��� IMAP �����о�Υ᡼����ɤ������¸���뤿��Τ�ΤǤ�"
-
-#: camel/providers/imap/camel-imap-provider.c:77
+#: camel/providers/imap/camel-imap-provider.c:82
msgid "This option will connect to the IMAP server using a plaintext password."
msgstr ""
"���Υ��ץ����ϥץ쥤��ƥ����ȥѥ���ɤ�Ȥä� IMAP �����Ф���³���ޤ�"
-#: camel/providers/imap/camel-imap-store.c:441
+#: camel/providers/imap/camel-imap-store.c:440
#, c-format
msgid "IMAP server %s does not support requested authentication type %s"
msgstr "IMAP ������ %s ���׵ᤷ��ǧ�ڥ����� %s �򥵥ݡ��Ȥ��Ƥ��ޤ���"
-#: camel/providers/imap/camel-imap-store.c:451
+#: camel/providers/imap/camel-imap-store.c:450
+#: camel/providers/smtp/camel-smtp-transport.c:358
#, c-format
msgid "No support for authentication type %s"
msgstr "ǧ�ڥ����� %s �򥵥ݡ��Ȥ��Ƥ��ޤ���"
-#: camel/providers/imap/camel-imap-store.c:476
+#: camel/providers/imap/camel-imap-store.c:475
#, c-format
msgid "%sPlease enter the IMAP password for %s@%s"
msgstr "%s %s@%s �� IMAP �ѥ���ɤ����Ϥ��Ƥ�������"
-#: camel/providers/imap/camel-imap-store.c:491
-#: camel/providers/smtp/camel-smtp-transport.c:374
+#: camel/providers/imap/camel-imap-store.c:490
+#: camel/providers/smtp/camel-smtp-transport.c:403
msgid "You didn't enter a password."
msgstr "�ѥ���ɤ����Ϥ��Ƥ��ޤ���"
-#: camel/providers/imap/camel-imap-store.c:519
-#: camel/providers/smtp/camel-smtp-transport.c:382
+#: camel/providers/imap/camel-imap-store.c:518
+#: camel/providers/smtp/camel-smtp-transport.c:411
#, c-format
msgid ""
"Unable to authenticate to IMAP server.\n"
@@ -3534,94 +3621,99 @@ msgstr ""
"%s\n"
"\n"
-#: camel/providers/imap/camel-imap-store.c:871
+#: camel/providers/imap/camel-imap-store.c:858
+#, c-format
+msgid "%s is not a selectable folder"
+msgstr "%s �������ǽ�ʥե�����ǤϤ���ޤ���"
+
+#: camel/providers/imap/camel-imap-store.c:872
#, c-format
msgid "Could not create directory %s: %s"
msgstr "�ǥ��쥯�ȥ� %s ���������ޤ���Ǥ���: %s"
-#: camel/providers/imap/camel-imap-store.c:1328
+#: camel/providers/imap/camel-imap-store.c:1373
msgid "You must be working online to complete this operation"
msgstr "����ư���λ���뤿��˥���饤��Ǻ�Ȥ��ʤ���Фʤ�ޤ���"
-#: camel/providers/local/camel-local-provider.c:36
+#: camel/providers/local/camel-local-provider.c:39
msgid "MH-format mail directories"
msgstr "MH �����Υ᡼��ǥ��쥯�ȥ�"
-#: camel/providers/local/camel-local-provider.c:37
+#: camel/providers/local/camel-local-provider.c:40
msgid "For storing local mail in MH-like mail directories"
msgstr "MH�饤���ʥ᡼��ǥ��쥯�ȥ�˥�������᡼�����¸���ޤ�"
-#: camel/providers/local/camel-local-provider.c:46
+#: camel/providers/local/camel-local-provider.c:49
msgid "Standard Unix mailbox file"
msgstr "ɸ��Ū�� UNIX �� mailbox �ե�����"
-#: camel/providers/local/camel-local-provider.c:47
+#: camel/providers/local/camel-local-provider.c:50
msgid "For storing local mail in standard mbox format"
msgstr "ɸ�� mbox �����ǥ�������᡼�����¸���ޤ�"
-#: camel/providers/local/camel-local-provider.c:56
+#: camel/providers/local/camel-local-provider.c:59
msgid "Qmail maildir-format mail files"
msgstr "Qmail maildir�����Υ᡼��ե�����"
-#: camel/providers/local/camel-local-provider.c:57
+#: camel/providers/local/camel-local-provider.c:60
msgid "For storing local mail in qmail maildir directories"
msgstr "qmail maildir�ǥ��쥯�ȥ�˥�������᡼�����¸���ޤ�"
-#: camel/providers/local/camel-local-store.c:128
+#: camel/providers/local/camel-local-store.c:129
#, c-format
msgid "Store root %s is not an absolute path"
msgstr "��¸���줿�롼�� %s �����Хѥ��ǤϤ���ޤ���"
-#: camel/providers/local/camel-local-store.c:135
+#: camel/providers/local/camel-local-store.c:136
#, c-format
msgid "Store root %s is not a regular directory"
msgstr "��¸���줿�롼�� %s ���̾�Υǥ��쥯�ȥ�ǤϤ���ޤ���"
-#: camel/providers/local/camel-local-store.c:143
-#: camel/providers/local/camel-local-store.c:159
+#: camel/providers/local/camel-local-store.c:144
+#: camel/providers/local/camel-local-store.c:160
#, c-format
msgid "Cannot get folder: %s: %s"
msgstr "�ե�������������ޤ���: %s: %s"
-#: camel/providers/local/camel-local-store.c:174
+#: camel/providers/local/camel-local-store.c:175
msgid "Local stores do not have an inbox"
msgstr "��������ؤ���¸�� inbox ����Ƥޤ���"
-#: camel/providers/local/camel-local-store.c:184
+#: camel/providers/local/camel-local-store.c:185
#, c-format
msgid "Local mail file %s"
msgstr "��������᡼��ե����� %s"
-#: camel/providers/local/camel-local-store.c:240
+#: camel/providers/local/camel-local-store.c:241
#, c-format
msgid "Could not rename folder %s to %s: %s"
msgstr "�ե������ %s ���� %s ��̾���ѹ����뤳�Ȥ�����ޤ���Ǥ���: %s"
-#: camel/providers/local/camel-local-store.c:282
+#: camel/providers/local/camel-local-store.c:283
#, c-format
msgid "Could not delete folder summary file `%s': %s"
msgstr "�ե�������饵�ޥ꡼�ե����� `%s' �������뤳�Ȥ�����ޤ���Ǥ���: %s"
-#: camel/providers/local/camel-local-store.c:292
+#: camel/providers/local/camel-local-store.c:293
#, c-format
msgid "Could not delete folder index file `%s': %s"
msgstr ""
"�ե�������饤��ǥå����ե����� `%s' �������뤳�Ȥ�����ޤ���Ǥ���: %s"
-#: camel/providers/local/camel-maildir-folder.c:148
-#: camel/providers/local/camel-maildir-folder.c:156
-#: camel/providers/local/camel-maildir-folder.c:167
+#: camel/providers/local/camel-maildir-folder.c:150
+#: camel/providers/local/camel-maildir-folder.c:158
+#: camel/providers/local/camel-maildir-folder.c:169
#, c-format
msgid "Cannot append message to maildir folder: %s: %s"
msgstr "maildir �����Υե�����إ�å��������ɲý���ޤ���: %s: %s"
-#: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-maildir-folder.c:207
-#: camel/providers/local/camel-maildir-folder.c:215
-#: camel/providers/local/camel-mbox-folder.c:317
-#: camel/providers/local/camel-mh-folder.c:183
-#: camel/providers/local/camel-mh-folder.c:192
-#: camel/providers/local/camel-mh-folder.c:200
+#: camel/providers/local/camel-maildir-folder.c:197
+#: camel/providers/local/camel-maildir-folder.c:209
+#: camel/providers/local/camel-maildir-folder.c:217
+#: camel/providers/local/camel-mbox-folder.c:319
+#: camel/providers/local/camel-mh-folder.c:185
+#: camel/providers/local/camel-mh-folder.c:194
+#: camel/providers/local/camel-mh-folder.c:202
#, c-format
msgid ""
"Cannot get message: %s\n"
@@ -3630,19 +3722,19 @@ msgstr ""
"��å��������������ޤ���: %s\n"
" %s"
-#: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-mbox-folder.c:317
-#: camel/providers/local/camel-mh-folder.c:183
+#: camel/providers/local/camel-maildir-folder.c:197
+#: camel/providers/local/camel-mbox-folder.c:319
+#: camel/providers/local/camel-mh-folder.c:185
msgid "No such message"
msgstr "���Τ褦�ʥ�å������Ϥ���ޤ���"
-#: camel/providers/local/camel-maildir-folder.c:216
-#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-maildir-folder.c:218
+#: camel/providers/local/camel-mh-folder.c:203
msgid "Invalid message contents"
msgstr "��å����������Ƥ�̵���Ǥ�"
-#: camel/providers/local/camel-maildir-store.c:94
-#: camel/providers/local/camel-mh-store.c:88
+#: camel/providers/local/camel-maildir-store.c:96
+#: camel/providers/local/camel-mh-store.c:90
#, c-format
msgid ""
"Could not open folder `%s':\n"
@@ -3651,15 +3743,15 @@ msgstr ""
"�ե���� `%s' �򳫤����Ȥ�����ޤ���Ǥ���:\n"
"%s"
-#: camel/providers/local/camel-maildir-store.c:98
-#: camel/providers/local/camel-mbox-store.c:99
-#: camel/providers/local/camel-mh-store.c:95
+#: camel/providers/local/camel-maildir-store.c:100
+#: camel/providers/local/camel-mbox-store.c:101
+#: camel/providers/local/camel-mh-store.c:97
#, c-format
msgid "Folder `%s' does not exist."
msgstr "�ե���� `%s' ��¸�ߤ��ޤ���"
-#: camel/providers/local/camel-maildir-store.c:105
-#: camel/providers/local/camel-mh-store.c:101
+#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-mh-store.c:103
#, c-format
msgid ""
"Could not create folder `%s':\n"
@@ -3668,35 +3760,40 @@ msgstr ""
"�ե���� `%s' ���������ޤ���Ǥ���:\n"
"%s"
-#: camel/providers/local/camel-maildir-store.c:120
+#: camel/providers/local/camel-maildir-store.c:122
#, c-format
msgid "`%s' is not a maildir directory."
msgstr "`%s' �� maildir �����Υǥ��쥯�ȥ�ǤϤ���ޤ���"
-#: camel/providers/local/camel-maildir-store.c:149
-#: camel/providers/local/camel-maildir-store.c:186
-#: camel/providers/local/camel-mh-store.c:125
+#: camel/providers/local/camel-maildir-store.c:151
+#: camel/providers/local/camel-maildir-store.c:188
+#: camel/providers/local/camel-mh-store.c:127
#, c-format
msgid "Could not delete folder `%s': %s"
msgstr "�ե���� `%s' �������뤳�Ȥ�����ޤ���Ǥ���: %s"
-#: camel/providers/local/camel-maildir-store.c:150
+#: camel/providers/local/camel-maildir-store.c:152
msgid "not a maildir directory"
msgstr "maildir �����Υǥ��쥯�ȥ�ǤϤ���ޤ���"
-#: camel/providers/local/camel-mbox-folder.c:201
+#: camel/providers/local/camel-mbox-folder.c:152
+#, c-format
+msgid "Cannot create folder lock on %s: %s"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-folder.c:203
#, c-format
msgid "Cannot open mailbox: %s: %s\n"
msgstr "mailbox�򳫤����Ȥ�����ޤ���: %s: %s\n"
-#: camel/providers/local/camel-mbox-folder.c:257
+#: camel/providers/local/camel-mbox-folder.c:259
#, c-format
msgid "Cannot append message to mbox file: %s: %s"
msgstr "mbox �ե�����˥�å��������ɲý���ޤ���: %s: %s"
-#: camel/providers/local/camel-mbox-folder.c:333
-#: camel/providers/local/camel-mbox-folder.c:365
-#: camel/providers/local/camel-mbox-folder.c:378
+#: camel/providers/local/camel-mbox-folder.c:335
+#: camel/providers/local/camel-mbox-folder.c:367
+#: camel/providers/local/camel-mbox-folder.c:380
#, c-format
msgid ""
"Cannot get message: %s from folder %s\n"
@@ -3705,15 +3802,15 @@ msgstr ""
"��å����� %s ��ե���� %s �����������ޤ���\n"
" %s"
-#: camel/providers/local/camel-mbox-folder.c:366
+#: camel/providers/local/camel-mbox-folder.c:368
msgid "The folder appears to be irrecoverably corrupted."
msgstr "�ե�����Dz�����ǽ�ʥ��顼��ȯ�������褦�Ǥ�"
-#: camel/providers/local/camel-mbox-folder.c:379
+#: camel/providers/local/camel-mbox-folder.c:381
msgid "Message construction failed: Corrupt mailbox?"
msgstr "��å������β��˼��Ԥ��ޤ���: �ְ�ä��᡼��ܥå����Ǥ���?"
-#: camel/providers/local/camel-mbox-store.c:92
+#: camel/providers/local/camel-mbox-store.c:94
#, c-format
msgid ""
"Could not open file `%s':\n"
@@ -3722,7 +3819,7 @@ msgstr ""
"�ե����� `%s' �򳫤����Ȥ�����ޤ���Ǥ���:\n"
"%s"
-#: camel/providers/local/camel-mbox-store.c:108
+#: camel/providers/local/camel-mbox-store.c:110
#, c-format
msgid ""
"Could not create file `%s':\n"
@@ -3731,14 +3828,14 @@ msgstr ""
"�ե����� `%s' ��������뤳�Ȥ�����ޤ���Ǥ���:\n"
"%s"
-#: camel/providers/local/camel-mbox-store.c:117
-#: camel/providers/local/camel-mbox-store.c:144
+#: camel/providers/local/camel-mbox-store.c:119
+#: camel/providers/local/camel-mbox-store.c:146
#, c-format
msgid "`%s' is not a regular file."
msgstr "`%s' ���̾�Υե�����ǤϤ���ޤ���"
-#: camel/providers/local/camel-mbox-store.c:136
-#: camel/providers/local/camel-mbox-store.c:159
+#: camel/providers/local/camel-mbox-store.c:138
+#: camel/providers/local/camel-mbox-store.c:161
#, c-format
msgid ""
"Could not delete folder `%s':\n"
@@ -3747,111 +3844,111 @@ msgstr ""
"�ե���� `%s' �������뤳�Ȥ�����ޤ���Ǥ���:\n"
"%s"
-#: camel/providers/local/camel-mbox-store.c:151
+#: camel/providers/local/camel-mbox-store.c:153
#, 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:240
+#: camel/providers/local/camel-mbox-summary.c:248
msgid "Summarising folder"
msgstr "�ե�����򥵥ޥ饤����"
-#: camel/providers/local/camel-mbox-summary.c:245
+#: camel/providers/local/camel-mbox-summary.c:253
#, c-format
msgid "Could not open folder: %s: summarising from position %ld: %s"
msgstr "�ե�����򳫤��ޤ���Ǥ���: %s: �ݥ������ %ld ���饵�ޥ饤����: %s"
-#: camel/providers/local/camel-mbox-summary.c:287
+#: camel/providers/local/camel-mbox-summary.c:295
#, c-format
msgid "Fatal mail parser error near position %ld in folder %s"
msgstr "�ݥ������ %ld �ն� �ե���� %s ����̿Ū�ʥ᡼�빽ʸ���ϥ��顼�Ǥ�"
-#: camel/providers/local/camel-mbox-summary.c:362
+#: camel/providers/local/camel-mbox-summary.c:370
#, c-format
msgid "Cannot summarise folder: %s: %s"
msgstr "�ե�����򥵥ޥ饤�����뤳�Ȥ�����ޤ���: %s: %s"
-#: camel/providers/local/camel-mbox-summary.c:493
-#: camel/providers/local/camel-mbox-summary.c:694 mail/mail-ops.c:1327
+#: camel/providers/local/camel-mbox-summary.c:501
+#: camel/providers/local/camel-mbox-summary.c:702 mail/mail-ops.c:1383
msgid "Synchronising folder"
msgstr "�ե������Ʊ����"
-#: camel/providers/local/camel-mbox-summary.c:498
-#: camel/providers/local/camel-mbox-summary.c:699
+#: camel/providers/local/camel-mbox-summary.c:506
+#: camel/providers/local/camel-mbox-summary.c:707
#, c-format
msgid "Could not open folder to summarise: %s: %s"
msgstr "�ե�����򥵥ޥ饤�����뤳�Ȥ�����ޤ���Ǥ���: %s: %s"
-#: camel/providers/local/camel-mbox-summary.c:515
+#: camel/providers/local/camel-mbox-summary.c:523
#, c-format
msgid "Cannot open temporary mailbox: %s"
msgstr "�ƥ�ݥ�� mailbox �򳫤����Ȥ�����ޤ���: %s"
-#: camel/providers/local/camel-mbox-summary.c:540
#: camel/providers/local/camel-mbox-summary.c:548
-#: camel/providers/local/camel-mbox-summary.c:737
+#: camel/providers/local/camel-mbox-summary.c:556
#: camel/providers/local/camel-mbox-summary.c:745
+#: camel/providers/local/camel-mbox-summary.c:753
msgid "Summary and folder mismatch, even after a sync"
msgstr "Ʊ�����ޤ�����, ���ޥ꡼�ȥե�������԰��פǤ�"
-#: camel/providers/local/camel-mbox-summary.c:591
+#: camel/providers/local/camel-mbox-summary.c:599
#, c-format
msgid "Error writing to temp mailbox: %s"
msgstr "��� mailbox �ؽ񤭽Ф���˥��顼: %s"
-#: camel/providers/local/camel-mbox-summary.c:608
+#: camel/providers/local/camel-mbox-summary.c:616
#, c-format
msgid "Writing to tmp mailbox failed: %s: %s"
msgstr "��� mailbox �ؽ񤭽Ф���˥��顼: %s: %s"
-#: camel/providers/local/camel-mbox-summary.c:626
-#: camel/providers/local/camel-mbox-summary.c:795
+#: camel/providers/local/camel-mbox-summary.c:634
+#: camel/providers/local/camel-mbox-summary.c:803
#, c-format
msgid "Could not close source folder %s: %s"
msgstr "���Υե���� %s ���Ĥ��뤳�Ȥ�����ޤ���Ǥ���: %s"
-#: camel/providers/local/camel-mbox-summary.c:635
+#: camel/providers/local/camel-mbox-summary.c:643
#, c-format
msgid "Could not close temp folder: %s"
msgstr "��ȥե�������Ĥ��뤳�Ȥ�����ޤ���Ǥ���: %s"
-#: camel/providers/local/camel-mbox-summary.c:646
+#: camel/providers/local/camel-mbox-summary.c:654
#, c-format
msgid "Could not rename folder: %s"
msgstr "�ե�������͡������ޤ���Ǥ���: %s"
-#: camel/providers/local/camel-mbox-summary.c:870
+#: camel/providers/local/camel-mbox-summary.c:878
#, c-format
msgid "Unknown error: %s"
msgstr "̤�ΤΥ��顼: %s"
-#: camel/providers/local/camel-mh-folder.c:147
-#: camel/providers/local/camel-mh-folder.c:155
+#: camel/providers/local/camel-mh-folder.c:149
+#: camel/providers/local/camel-mh-folder.c:157
#, c-format
msgid "Cannot append message to mh folder: %s: %s"
msgstr "mh �ե�����إ�å��������ɲý���ޤ���: %s: %s"
-#: camel/providers/local/camel-mh-store.c:108
+#: camel/providers/local/camel-mh-store.c:110
#, c-format
msgid "`%s' is not a directory."
msgstr "`%s' �ϥǥ��쥯�ȥ�ǤϤ���ޤ���"
-#: camel/providers/nntp/camel-nntp-auth.c:41
+#: camel/providers/nntp/camel-nntp-auth.c:45
#, c-format
msgid "Please enter the NNTP password for %s@%s"
msgstr "%s@%s �� NNTP �ѥ���ɤ����Ϥ��Ƥ�������"
-#: camel/providers/nntp/camel-nntp-auth.c:62
+#: camel/providers/nntp/camel-nntp-auth.c:66
msgid "Server rejected username"
msgstr "�����Фϥ桼��̾����ݤ��ޤ���"
-#: camel/providers/nntp/camel-nntp-auth.c:68
+#: camel/providers/nntp/camel-nntp-auth.c:72
msgid "Failed to send username to server"
msgstr "�����Фإ桼��̾�������˼��Ԥ��ޤ���"
-#: camel/providers/nntp/camel-nntp-auth.c:77
+#: camel/providers/nntp/camel-nntp-auth.c:81
msgid "Server rejected username/password"
msgstr "�����Фϥ桼��̾/�ѥ���ɤ���ݤ��ޤ���"
@@ -3875,11 +3972,11 @@ msgstr "%s �Υ��롼�ץꥹ�ȥե����������ɽ���ޤ���: %s"
msgid "Unable to save grouplist file for %s: %s"
msgstr "%s �Υ��롼�ץꥹ�ȥե��������¸����ޤ���: %s"
-#: camel/providers/nntp/camel-nntp-provider.c:38
+#: camel/providers/nntp/camel-nntp-provider.c:42
msgid "USENET news"
msgstr "USENET news"
-#: camel/providers/nntp/camel-nntp-provider.c:40
+#: camel/providers/nntp/camel-nntp-provider.c:44
msgid "This is a provider for reading from and posting toUSENET newsgroups."
msgstr "����� USENET �Υ˥塼�����롼�פ����������뤿��Υץ��Х����Ǥ�"
@@ -3914,26 +4011,39 @@ msgstr "POP ���ޥ�������"
msgid "Could not open folder: message listing was incomplete."
msgstr "�ե�����򳫤��ޤ���Ǥ���: ��å������ꥹ�Ȥ�̤�����Ǥ�"
-#: camel/providers/pop3/camel-pop3-folder.c:286
+#: camel/providers/pop3/camel-pop3-folder.c:285
#, c-format
msgid "No message with uid %s"
msgstr "uid %s �Υ�å������Ϥ���ޤ���"
-#: camel/providers/pop3/camel-pop3-folder.c:290
+#: camel/providers/pop3/camel-pop3-folder.c:289
#, c-format
msgid "Retrieving POP message %d"
msgstr "POP ������ %d �������"
-#: camel/providers/pop3/camel-pop3-folder.c:308
+#: camel/providers/pop3/camel-pop3-folder.c:307
#, c-format
msgid "Could not retrieve message from POP server %s: %s"
msgstr "POP ������ %s �����å��������������ޤ���Ǥ���: %s"
-#: camel/providers/pop3/camel-pop3-provider.c:34
+#: camel/providers/pop3/camel-pop3-provider.c:37
+msgid "Message storage"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-provider.c:39
+msgid "Leave messages on server"
+msgstr "�����Ф˥�å�������Ĥ�"
+
+#: 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:48 mail/mail-config.glade.h:42
msgid "POP"
msgstr "POP"
-#: camel/providers/pop3/camel-pop3-provider.c:36
+#: camel/providers/pop3/camel-pop3-provider.c:50
msgid ""
"For connecting to POP servers. The POP protocol can also be used to retrieve "
"mail from certain web mail providers and proprietary email systems."
@@ -3942,21 +4052,7 @@ msgstr ""
"�᡼��ץ��Х������ȼ��Υ᡼�륷���ƥफ�� E "
"�᡼���������뤿��˻Ȥ����Ȥ�����ޤ�"
-#: camel/providers/pop3/camel-pop3-provider.c:52
-msgid "Secure POP"
-msgstr "�����奢 POP"
-
-#: camel/providers/pop3/camel-pop3-provider.c:54
-msgid ""
-"For connecting to POP servers over an SSL connection. The POP protocol can "
-"also be used to retrieve mail from certain web mail providers and "
-"proprietary email systems."
-msgstr ""
-"SSL ��³��ۤ��� POP �����Ф���³���뤿���, POP �ץ��ȥ��������� web "
-"�᡼��ץ��Х������ȼ��Υ᡼�륷���ƥफ�� E "
-"�᡼���������뤿��˻Ȥ����Ȥ�����ޤ�"
-
-#: camel/providers/pop3/camel-pop3-provider.c:71
+#: 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."
@@ -3964,7 +4060,7 @@ msgstr ""
"���Υ��ץ����ϥץ쥤��ƥ����ȤΥѥ���ɤ�Ȥä� POP �����Ф���³���ޤ�. "
"�����¿���� POP �����Фǥ��ݡ��Ȥ���륪�ץ����Ǥ�"
-#: camel/providers/pop3/camel-pop3-provider.c:81
+#: 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 "
@@ -3974,27 +4070,27 @@ msgstr ""
"�����Ф���³���ޤ�. ����ϸ�ʿ�ʥ��ݡ��Ȥ��׵᤹�륵���Ф�, "
"���٤ƤΥ桼���������ư���櫓�ǤϤ���ޤ���."
-#: camel/providers/pop3/camel-pop3-provider.c:93
+#: 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:181
+#: camel/providers/pop3/camel-pop3-store.c:207
#, c-format
msgid "Could not authenticate to KPOP server: %s"
msgstr "KPOP �����Ф�ǧ�ڽ���ޤ���Ǥ���: %s"
-#: camel/providers/pop3/camel-pop3-store.c:298
+#: camel/providers/pop3/camel-pop3-store.c:319
#, c-format
msgid "Could not connect to POP server on %s."
msgstr "%s �� POP �����Ф���³����ޤ���Ǥ���"
-#: camel/providers/pop3/camel-pop3-store.c:337
+#: camel/providers/pop3/camel-pop3-store.c:358
#, c-format
msgid "%sPlease enter the POP3 password for %s@%s"
msgstr "%s %s@%s �� POP3 �ѥ���ɤ����Ϥ��Ƥ�������"
-#: camel/providers/pop3/camel-pop3-store.c:356
+#: camel/providers/pop3/camel-pop3-store.c:377
#, c-format
msgid ""
"Unable to connect to POP server.\n"
@@ -4003,12 +4099,12 @@ msgstr ""
"POP �����Ф���³����ޤ���\n"
"�桼��̾��������˥��顼: %s"
-#: camel/providers/pop3/camel-pop3-store.c:359
-#: camel/providers/pop3/camel-pop3-store.c:396
+#: camel/providers/pop3/camel-pop3-store.c:380
+#: camel/providers/pop3/camel-pop3-store.c:417
msgid "(Unknown)"
msgstr "(̤��)"
-#: camel/providers/pop3/camel-pop3-store.c:386
+#: camel/providers/pop3/camel-pop3-store.c:407
msgid ""
"Unable to connect to POP server.\n"
"No support for requested authentication mechanism."
@@ -4016,7 +4112,7 @@ msgstr ""
"POP �����Ф���³����ޤ���\n"
"�׵ᤷ��ǧ�ڼ��ʤϥ��ݡ��Ȥ��Ƥ��ޤ���"
-#: camel/providers/pop3/camel-pop3-store.c:394
+#: camel/providers/pop3/camel-pop3-store.c:415
#, c-format
msgid ""
"Unable to connect to POP server.\n"
@@ -4025,348 +4121,345 @@ msgstr ""
"POP �����Ф���³�Ǥ��ޤ���\n"
"�ѥ���ɤ�������˥��顼: %s"
-#: camel/providers/pop3/camel-pop3-store.c:503
+#: camel/providers/pop3/camel-pop3-store.c:483
#, c-format
msgid "No such folder `%s'."
msgstr "���Τ褦�ʥե���� `%s' �Ϥ���ޤ���"
-#: camel/providers/sendmail/camel-sendmail-provider.c:34
-#: mail/mail-config.glade.h:64
+#: camel/providers/sendmail/camel-sendmail-provider.c:37
+#: mail/mail-config.glade.h:57
msgid "Sendmail"
msgstr "Sendmail"
-#: camel/providers/sendmail/camel-sendmail-provider.c:36
+#: camel/providers/sendmail/camel-sendmail-provider.c:39
msgid ""
"For delivering mail by passing it to the \"sendmail\" program on the local "
"system."
msgstr ""
"�᡼����������뤿��˥������륷���ƥ�� \"sendmail\" �ץ��������Ϥ��ޤ�"
-#: camel/providers/sendmail/camel-sendmail-transport.c:105
+#: camel/providers/sendmail/camel-sendmail-transport.c:107
#, c-format
msgid "Could not create pipe to sendmail: %s: mail not sent"
msgstr ""
"sendmail �إѥ��פ��������ޤ���Ǥ���: %s: �᡼����������ޤ���Ǥ���"
-#: camel/providers/sendmail/camel-sendmail-transport.c:122
+#: camel/providers/sendmail/camel-sendmail-transport.c:124
#, c-format
msgid "Could not fork sendmail: %s: mail not sent"
msgstr "sendmail �� fork ����ޤ���Ǥ���: %s: �᡼����������ޤ���Ǥ���"
-#: camel/providers/sendmail/camel-sendmail-transport.c:148
+#: camel/providers/sendmail/camel-sendmail-transport.c:150
#, c-format
msgid "Could not send message: %s"
msgstr "��å���������������ޤ���Ǥ���: %s"
-#: camel/providers/sendmail/camel-sendmail-transport.c:161
+#: camel/providers/sendmail/camel-sendmail-transport.c:163
#, c-format
msgid "sendmail exited with signal %s: mail not sent."
msgstr "sendmail �ϥ����ʥ� %s �ǽ�λ���ޤ���: �᡼����������ޤ���Ǥ���"
-#: camel/providers/sendmail/camel-sendmail-transport.c:168
+#: camel/providers/sendmail/camel-sendmail-transport.c:170
#, c-format
msgid "Could not execute %s: mail not sent."
msgstr "%s ��¹Խ���ޤ���Ǥ���: �᡼����������ޤ���Ǥ���"
-#: camel/providers/sendmail/camel-sendmail-transport.c:173
+#: camel/providers/sendmail/camel-sendmail-transport.c:175
#, c-format
msgid "sendmail exited with status %d: mail not sent."
msgstr "sendmail �ϥ��ơ����� %d �ǽ�λ���ޤ���: �᡼����������ޤ���Ǥ���"
-#: camel/providers/sendmail/camel-sendmail-transport.c:192
+#: camel/providers/sendmail/camel-sendmail-transport.c:194
msgid "Could not find 'From' address in message"
msgstr "��å������� 'From' ���ɥ쥹�򸫤Ĥ��뤳�Ȥ�����ޤ���Ǥ���"
-#: camel/providers/sendmail/camel-sendmail-transport.c:245
+#: camel/providers/sendmail/camel-sendmail-transport.c:247
msgid "sendmail"
msgstr "sendmail"
-#: camel/providers/sendmail/camel-sendmail-transport.c:247
+#: camel/providers/sendmail/camel-sendmail-transport.c:249
msgid "Mail delivery via the sendmail program"
msgstr "sendmail ��ͳ�ǥ᡼����ۿ�"
-#: camel/providers/smtp/camel-smtp-provider.c:35 mail/mail-config.glade.h:58
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:52
msgid "SMTP"
msgstr "SMTP"
-#: camel/providers/smtp/camel-smtp-provider.c:37
+#: camel/providers/smtp/camel-smtp-provider.c:40
msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
msgstr "SMTP��Ȥäƥ�⡼�ȥ᡼��ϥ֤���³���뤳�Ȥǥ᡼����ۿ����ޤ�\n"
-#: camel/providers/smtp/camel-smtp-provider.c:52
-msgid "Secure SMTP"
-msgstr "�����奢 SMTP"
-
-#: camel/providers/smtp/camel-smtp-provider.c:54
-msgid ""
-"For delivering mail by connecting to a remote mailhub using SMTP over an SSL "
-"connection.\n"
-msgstr ""
-"SSL ��³��ۤ��� "
-"SMTP��Ȥäƥ�⡼�ȥ᡼��ϥ֤���³���뤳�Ȥǥ᡼����ۿ����ޤ�\n"
-
-#: camel/providers/smtp/camel-smtp-transport.c:146
+#: camel/providers/smtp/camel-smtp-transport.c:165
msgid "Syntax error, command unrecognized"
msgstr "��ʸ���ϥ��顼, ���ޥ�ɤǤϤ���ޤ���"
-#: camel/providers/smtp/camel-smtp-transport.c:148
+#: camel/providers/smtp/camel-smtp-transport.c:167
msgid "Syntax error in parameters or arguments"
msgstr "�ѥ�᡼�����뤤�ϰ����˹�ʸ���ϥ��顼"
-#: camel/providers/smtp/camel-smtp-transport.c:150
+#: camel/providers/smtp/camel-smtp-transport.c:169
msgid "Command not implemented"
msgstr "���ޥ�ɤϼ�������Ƥ��ޤ���"
-#: camel/providers/smtp/camel-smtp-transport.c:152
+#: camel/providers/smtp/camel-smtp-transport.c:171
msgid "Command parameter not implemented"
msgstr "���ޥ�ɥѥ�᡼���ϼ�������Ƥ��ޤ���"
-#: camel/providers/smtp/camel-smtp-transport.c:154
+#: camel/providers/smtp/camel-smtp-transport.c:173
msgid "System status, or system help reply"
msgstr "�����ƥॹ�ơ��������뤤�ϥ����ƥ�إ�ױ���"
-#: camel/providers/smtp/camel-smtp-transport.c:156
+#: camel/providers/smtp/camel-smtp-transport.c:175
msgid "Help message"
msgstr "�إ�ץ�å�����"
-#: camel/providers/smtp/camel-smtp-transport.c:158
+#: camel/providers/smtp/camel-smtp-transport.c:177
msgid "Service ready"
msgstr "�����ӥ������ѤǤ��ޤ�"
-#: camel/providers/smtp/camel-smtp-transport.c:160
+#: camel/providers/smtp/camel-smtp-transport.c:179
msgid "Service closing transmission channel"
msgstr "�����ӥ������������ͥ���Ĥ��Ƥ��ޤ�"
-#: camel/providers/smtp/camel-smtp-transport.c:162
+#: camel/providers/smtp/camel-smtp-transport.c:181
msgid "Service not available, closing transmission channel"
msgstr "�����ӥ������ѤǤ��ޤ���, ���������ͥ���Ĥ��Ƥ��ޤ�"
-#: camel/providers/smtp/camel-smtp-transport.c:164
+#: camel/providers/smtp/camel-smtp-transport.c:183
msgid "Requested mail action okay, completed"
msgstr "�׵ᤵ�줿�᡼���ư���OK, ��λ���ޤ���"
-#: camel/providers/smtp/camel-smtp-transport.c:166
+#: camel/providers/smtp/camel-smtp-transport.c:185
msgid "User not local; will forward to <forward-path>"
msgstr "�桼���ϥ�������ǤϤ���ޤ���; <forward-path> ��ž�����ޤ�"
-#: camel/providers/smtp/camel-smtp-transport.c:168
+#: camel/providers/smtp/camel-smtp-transport.c:187
msgid "Requested mail action not taken: mailbox unavailable"
msgstr "�׵ᤵ�줿�᡼���ư��ϴ�λ���ޤ���: �᡼��ܥå��������ѤǤ��ޤ���"
-#: camel/providers/smtp/camel-smtp-transport.c:170
+#: camel/providers/smtp/camel-smtp-transport.c:189
msgid "Requested action not taken: mailbox unavailable"
msgstr "�׵ᤵ�줿ư��ϴ�λ���ޤ���: �᡼��ܥå��������ѤǤ��ޤ���"
-#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:191
msgid "Requested action aborted: error in processing"
msgstr "�׵ᤵ�줿ư������Ǥ��ޤ���: ������˥��顼"
-#: camel/providers/smtp/camel-smtp-transport.c:174
+#: camel/providers/smtp/camel-smtp-transport.c:193
msgid "User not local; please try <forward-path>"
msgstr "�桼���ϥ�������ǤϤ���ޤ���; <forward-path> ���Ƥ�������"
-#: camel/providers/smtp/camel-smtp-transport.c:176
+#: camel/providers/smtp/camel-smtp-transport.c:195
msgid "Requested action not taken: insufficient system storage"
msgstr "�׵ᤵ�줿ư��ϴ�λ���ޤ���: �����ƥ����¸�ΰ褬­��ޤ���"
-#: camel/providers/smtp/camel-smtp-transport.c:178
+#: camel/providers/smtp/camel-smtp-transport.c:197
msgid "Requested mail action aborted: exceeded storage allocation"
msgstr "�׵ᤵ�줿�᡼���ư������Ǥ��ޤ���: �ΰ������Ƥ�ۤ��ޤ���"
-#: camel/providers/smtp/camel-smtp-transport.c:180
+#: camel/providers/smtp/camel-smtp-transport.c:199
msgid "Requested action not taken: mailbox name not allowed"
msgstr "�׵ᤵ�줿ư��ϴ�λ���ޤ���: �᡼��ܥå���̾��ǧ����ޤ���"
-#: camel/providers/smtp/camel-smtp-transport.c:182
+#: camel/providers/smtp/camel-smtp-transport.c:201
msgid "Start mail input; end with <CRLF>.<CRLF>"
msgstr "�᡼������Ϥ򳫻Ϥ��ޤ�; <CRLF>.<CRLF> �ǽ�λ���ޤ�"
-#: camel/providers/smtp/camel-smtp-transport.c:184
+#: camel/providers/smtp/camel-smtp-transport.c:203
msgid "Transaction failed"
msgstr "�����ϼ��Ԥ��ޤ���"
-#: camel/providers/smtp/camel-smtp-transport.c:188
+#: camel/providers/smtp/camel-smtp-transport.c:207
msgid "A password transition is needed"
msgstr "�ѥ���ɤ��ѹ���ɬ�פǤ�"
-#: camel/providers/smtp/camel-smtp-transport.c:190
+#: camel/providers/smtp/camel-smtp-transport.c:209
msgid "Authentication mechanism is too weak"
msgstr "ǧ�ڥᥫ�˥�����Խ�ʬ�᤮�ޤ�"
-#: camel/providers/smtp/camel-smtp-transport.c:192
+#: camel/providers/smtp/camel-smtp-transport.c:211
msgid "Encryption required for requested authentication mechanism"
msgstr "�׵ᤷ��ǧ�ڥᥫ�˥���Τ���˰Ź沽��ɬ�פǤ�"
-#: camel/providers/smtp/camel-smtp-transport.c:194
+#: camel/providers/smtp/camel-smtp-transport.c:213
msgid "Temporary authentication failure"
msgstr "���Ū��ǧ�ڤ˼��Ԥ��ޤ���"
-#: camel/providers/smtp/camel-smtp-transport.c:196
+#: camel/providers/smtp/camel-smtp-transport.c:215
msgid "Authentication required"
msgstr "ǧ�ڤ�ɬ�פȤ��Ƥ��ޤ�"
-#: camel/providers/smtp/camel-smtp-transport.c:287
+#: camel/providers/smtp/camel-smtp-transport.c:305
#, c-format
msgid "Welcome response error: %s: possibly non-fatal"
msgstr "����������顼: %s: ���֤���̿Ū�ǤϤ���ޤ���"
-#: camel/providers/smtp/camel-smtp-transport.c:359
+#: camel/providers/smtp/camel-smtp-transport.c:348
+#, c-format
+msgid "SMTP server %s does not support requested authentication type %s"
+msgstr "SMTP ������ %s ���׵ᤷ��ǧ�ڥ����� %s �򥵥ݡ��Ȥ��Ƥ��ޤ���"
+
+#: camel/providers/smtp/camel-smtp-transport.c:388
#, c-format
msgid "%sPlease enter the SMTP password for %s@%s"
msgstr "%s %s@%s �� SMTP �ѥ���ɤ����Ϥ��Ƥ�������"
-#: camel/providers/smtp/camel-smtp-transport.c:494
+#: camel/providers/smtp/camel-smtp-transport.c:527
#, c-format
msgid "SMTP server %s"
msgstr "SMTP ������ %s"
-#: camel/providers/smtp/camel-smtp-transport.c:496
+#: camel/providers/smtp/camel-smtp-transport.c:529
#, c-format
msgid "SMTP mail delivery via %s"
msgstr "%s ��ͳ�� SMTP �᡼����ۿ����ޤ�"
-#: camel/providers/smtp/camel-smtp-transport.c:521
+#: camel/providers/smtp/camel-smtp-transport.c:554
msgid "Cannot send message: sender address not defined."
msgstr "��å���������������ޤ���: �����ԤΥ��ɥ쥹���������Ƥ��ޤ���"
-#: camel/providers/smtp/camel-smtp-transport.c:528
+#: camel/providers/smtp/camel-smtp-transport.c:561
msgid "Cannot send message: sender address not valid."
msgstr "��å���������������ޤ���: �����ԤΥ��ɥ쥹������������ޤ���"
-#: camel/providers/smtp/camel-smtp-transport.c:542
+#: camel/providers/smtp/camel-smtp-transport.c:575
msgid "Cannot send message: no recipients defined."
msgstr "��å���������������ޤ���: �����Ԥ��������Ƥ��ޤ���"
-#: camel/providers/smtp/camel-smtp-transport.c:636
+#: camel/providers/smtp/camel-smtp-transport.c:669
#, c-format
msgid "HELO request timed out: %s: non-fatal"
msgstr "HELO �׵�Υ����ॢ����: %s: ��̿Ū�ǤϤ���ޤ���"
-#: camel/providers/smtp/camel-smtp-transport.c:655
+#: camel/providers/smtp/camel-smtp-transport.c:688
#, c-format
msgid "HELO response error: %s: non-fatal"
msgstr "HELO �쥹�ݥ󥹥��顼: %s: ��̿Ū�ǤϤ���ޤ���"
-#: camel/providers/smtp/camel-smtp-transport.c:690
-#: camel/providers/smtp/camel-smtp-transport.c:702
+#: camel/providers/smtp/camel-smtp-transport.c:721
+msgid "Error creating SASL authentication object."
+msgstr "SASL ǧ�ڥ��֥������Ȥ�������˥��顼��ȯ�����ޤ���"
+
+#: camel/providers/smtp/camel-smtp-transport.c:736
+#: camel/providers/smtp/camel-smtp-transport.c:748
#, c-format
msgid "AUTH request timed out: %s"
msgstr "AUTH �׵�Υ����ॢ����: %s"
-#: camel/providers/smtp/camel-smtp-transport.c:760
+#: camel/providers/smtp/camel-smtp-transport.c:798
msgid "Bad authentication response from server.\n"
msgstr "�����Ф���ְ�ä�ǧ�ڱ���������ޤ���\n"
-#: camel/providers/smtp/camel-smtp-transport.c:785
+#: camel/providers/smtp/camel-smtp-transport.c:824
#, c-format
msgid "MAIL FROM request timed out: %s: mail not sent"
msgstr "MAIL FROM �׵�Υ����ॢ����: %s: �᡼����������ޤ���Ǥ���"
-#: camel/providers/smtp/camel-smtp-transport.c:804
+#: camel/providers/smtp/camel-smtp-transport.c:843
#, c-format
msgid "MAIL FROM response error: %s: mail not sent"
msgstr "MAIL FROM �쥹�ݥ󥹥��顼: %s: �᡼����������ޤ���Ǥ���"
-#: camel/providers/smtp/camel-smtp-transport.c:829
+#: camel/providers/smtp/camel-smtp-transport.c:868
#, c-format
msgid "RCPT TO request timed out: %s: mail not sent"
msgstr "RCPT TO �׵�Υ����ॢ����: %s: �᡼����������ޤ���Ǥ���"
-#: camel/providers/smtp/camel-smtp-transport.c:848
+#: camel/providers/smtp/camel-smtp-transport.c:887
#, c-format
msgid "RCPT TO response error: %s: mail not sent"
msgstr "RCPT TO �쥹�ݥ󥹥��顼: %s: �᡼����������ޤ���Ǥ���"
-#: camel/providers/smtp/camel-smtp-transport.c:879
+#: camel/providers/smtp/camel-smtp-transport.c:918
#, c-format
msgid "DATA request timed out: %s: mail not sent"
msgstr "DATA �׵�Υ����ॢ����: %s: �᡼����������ޤ���Ǥ���"
-#: camel/providers/smtp/camel-smtp-transport.c:898
+#: camel/providers/smtp/camel-smtp-transport.c:937
#, c-format
msgid "DATA response error: %s: mail not sent"
msgstr "DATA �쥹�ݥ󥹥��顼: %s: �᡼����������ޤ���Ǥ���"
-#: camel/providers/smtp/camel-smtp-transport.c:913
-#: camel/providers/smtp/camel-smtp-transport.c:931
+#: camel/providers/smtp/camel-smtp-transport.c:952
+#: camel/providers/smtp/camel-smtp-transport.c:970
#, c-format
msgid "DATA send timed out: message termination: %s: mail not sent"
msgstr ""
"DATA �����Υ����ॢ����: ��å������ν�λ: %s: �᡼����������ޤ���Ǥ���"
-#: camel/providers/smtp/camel-smtp-transport.c:950
+#: camel/providers/smtp/camel-smtp-transport.c:989
#, c-format
msgid "DATA response error: message termination: %s: mail not sent"
msgstr ""
"DATA �쥹�ݥ󥹥��顼: ��å������ν�λ: %s: �᡼����������ޤ���Ǥ���"
-#: camel/providers/smtp/camel-smtp-transport.c:974
+#: camel/providers/smtp/camel-smtp-transport.c:1013
#, c-format
msgid "RSET request timed out: %s"
msgstr "RSET �׵�Υ����ॢ����: %s"
-#: camel/providers/smtp/camel-smtp-transport.c:993
+#: camel/providers/smtp/camel-smtp-transport.c:1032
#, c-format
msgid "RSET response error: %s"
msgstr "RSET �쥹�ݥ󥹥��顼: %s"
-#: camel/providers/smtp/camel-smtp-transport.c:1016
+#: camel/providers/smtp/camel-smtp-transport.c:1055
#, c-format
msgid "QUIT request timed out: %s: non-fatal"
msgstr "QUIT �׵�Υ����ॢ����: %s: ��̿Ū�ǤϤ���ޤ���"
-#: camel/providers/smtp/camel-smtp-transport.c:1035
+#: camel/providers/smtp/camel-smtp-transport.c:1074
#, c-format
msgid "QUIT response error: %s: non-fatal"
msgstr "QUIT �쥹�ݥ󥹥��顼: %s: ��̿Ū�ǤϤ���ޤ���"
-#: composer/e-msg-composer-attachment-bar.c:87
+#: composer/e-msg-composer-attachment-bar.c:95
msgid "1 byte"
msgstr "1 ����"
-#: composer/e-msg-composer-attachment-bar.c:89
+#: composer/e-msg-composer-attachment-bar.c:97
#, c-format
msgid "%u bytes"
msgstr "%u ����"
-#: composer/e-msg-composer-attachment-bar.c:96
+#: composer/e-msg-composer-attachment-bar.c:104
#, c-format
msgid "%.1fK"
msgstr "%.1fK"
-#: composer/e-msg-composer-attachment-bar.c:100
+#: composer/e-msg-composer-attachment-bar.c:108
#, c-format
msgid "%.1fM"
msgstr "%.1fM"
-#: composer/e-msg-composer-attachment-bar.c:104
+#: composer/e-msg-composer-attachment-bar.c:112
#, c-format
msgid "%.1fG"
msgstr "%.1fG"
#. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:324 mail/mail-display.c:115
+#: composer/e-msg-composer-attachment-bar.c:332 mail/mail-display.c:120
msgid "attachment"
msgstr "ź��"
-#: composer/e-msg-composer-attachment-bar.c:413
+#: composer/e-msg-composer-attachment-bar.c:421
#: ui/evolution-message-composer.xml.h:2
msgid "Attach a file"
msgstr "�ե������ź�դ��ޤ�"
-#: composer/e-msg-composer-attachment-bar.c:461
+#: composer/e-msg-composer-attachment-bar.c:469
msgid "Remove selected items from the attachment list"
msgstr "ź��ʪ�ꥹ�Ȥ������򤷤������ƥ�������ޤ�"
-#: composer/e-msg-composer-attachment-bar.c:492
+#: composer/e-msg-composer-attachment-bar.c:500
msgid "Add attachment..."
msgstr "ź�դ��ɲ�..."
-#: composer/e-msg-composer-attachment-bar.c:493
+#: composer/e-msg-composer-attachment-bar.c:501
msgid "Attach a file to the message"
msgstr "��å������إե������ź�դ��ޤ�"
-#: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1014
+#: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1017
msgid "Attachment"
msgstr "ź��"
@@ -4390,52 +4483,52 @@ msgstr "MIME ������:"
msgid "Send as:"
msgstr "������:"
-#: composer/e-msg-composer-hdrs.c:314
+#: composer/e-msg-composer-hdrs.c:321
msgid "Click here for the address book"
msgstr "���ɥ쥹Ģ�Τ���ˤ����ǥ���å�"
#.
#. * From:
#.
-#: composer/e-msg-composer-hdrs.c:345 mail/mail-format.c:718
+#: composer/e-msg-composer-hdrs.c:352 mail/mail-format.c:709
msgid "From:"
msgstr "���п�:"
#.
#. * Reply-To:
#.
-#: composer/e-msg-composer-hdrs.c:351 mail/mail-format.c:720
+#: composer/e-msg-composer-hdrs.c:358 mail/mail-format.c:711
msgid "Reply-To:"
msgstr "�ֿ���:"
#.
#. * Subject:
#.
-#: composer/e-msg-composer-hdrs.c:362 mail/mail-format.c:618
+#: composer/e-msg-composer-hdrs.c:369 mail/mail-format.c:633
msgid "Subject:"
msgstr "��̾:"
-#: composer/e-msg-composer-hdrs.c:376 mail/mail-format.c:722
+#: composer/e-msg-composer-hdrs.c:383 mail/mail-format.c:713
msgid "To:"
msgstr "����:"
-#: composer/e-msg-composer-hdrs.c:377
+#: composer/e-msg-composer-hdrs.c:384
msgid "Enter the recipients of the message"
msgstr "��å������μ���ͤ����Ϥ��ޤ�"
-#: composer/e-msg-composer-hdrs.c:380 mail/mail-format.c:724
+#: composer/e-msg-composer-hdrs.c:387 mail/mail-format.c:715
msgid "Cc:"
-msgstr ""
+msgstr "Cc:"
-#: composer/e-msg-composer-hdrs.c:381
+#: composer/e-msg-composer-hdrs.c:388
msgid "Enter the addresses that will receive a carbon copy of the message"
msgstr "��å������Υ����ܥ󥳥ԡ���������륢�ɥ쥹�����Ϥ��ޤ�"
-#: composer/e-msg-composer-hdrs.c:384
+#: composer/e-msg-composer-hdrs.c:391
msgid "Bcc:"
-msgstr ""
+msgstr "Bcc:"
-#: composer/e-msg-composer-hdrs.c:385
+#: composer/e-msg-composer-hdrs.c:392
msgid ""
"Enter the addresses that will receive a carbon copy of the message without "
"appearing in the recipient list of the message."
@@ -4443,7 +4536,7 @@ msgstr ""
"��å������μ���ͥꥹ�Ȥ���˸���ʤ���, "
"��å������Υ����ܥ󥳥ԡ���������륢�ɥ쥹�����Ϥ��ޤ�"
-#: composer/e-msg-composer.c:518
+#: composer/e-msg-composer.c:528
#, c-format
msgid ""
"Could not open signature file %s:\n"
@@ -4452,26 +4545,34 @@ msgstr ""
"��̾�ե����� %s �򳫤����Ȥ�����ޤ���Ǥ���:\n"
"%s"
-#: composer/e-msg-composer.c:706
+#: composer/e-msg-composer.c:716
msgid "Save as..."
msgstr "��̾����¸..."
-#: composer/e-msg-composer.c:717
+#: composer/e-msg-composer.c:727
#, c-format
msgid "Error saving file: %s"
msgstr "�ե��������¸��˥��顼: %s"
-#: composer/e-msg-composer.c:737
+#: composer/e-msg-composer.c:747
#, c-format
msgid "Error loading file: %s"
msgstr "�ե�����Υ�������˥��顼: %s"
-#: composer/e-msg-composer.c:818 data/evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:193
+#: composer/e-msg-composer.c:819
+msgid ""
+"Unable to open the drafts folder for this account.\n"
+"Would you like to use the default drafts folder?"
+msgstr ""
+"���Υ�������Ȥ���ƥե�����򳫤����Ȥ�����ޤ���\n"
+"�ǥե���Ȥ���ƥե������ȤäƤ��������Ǥ���?"
+
+#: composer/e-msg-composer.c:877 data/evolution.desktop.in.h:1
+#: shell/e-shell-view-menu.c:206
msgid "Evolution"
msgstr "Evolution"
-#: composer/e-msg-composer.c:824
+#: composer/e-msg-composer.c:883
msgid ""
"This message has not been sent.\n"
"\n"
@@ -4481,27 +4582,27 @@ msgstr ""
"\n"
"�ѹ�����¸���ޤ���?"
-#: composer/e-msg-composer.c:849
+#: composer/e-msg-composer.c:908
msgid "Open file"
msgstr "�ե�����򳫤�"
-#: composer/e-msg-composer.c:975
+#: composer/e-msg-composer.c:1034
msgid "That file does not exist."
msgstr "���Υե������¸�ߤ��ޤ���"
-#: composer/e-msg-composer.c:985
+#: composer/e-msg-composer.c:1044
msgid "That is not a regular file."
msgstr "������̾�Υե�����ǤϤ���ޤ���"
-#: composer/e-msg-composer.c:995
+#: composer/e-msg-composer.c:1054
msgid "That file exists but is not readable."
msgstr "���Υե������¸�ߤ��ޤ������ɤ߼���ǽ�ǤϤ���ޤ���"
-#: composer/e-msg-composer.c:1005
+#: composer/e-msg-composer.c:1064
msgid "That file appeared accesible but open(2) failed."
msgstr "���Υե�����ϥ���������ǽ�Τ褦�˸����ޤ�����open(2) �ϼ��Ԥ��ޤ���"
-#: composer/e-msg-composer.c:1027
+#: composer/e-msg-composer.c:1086
msgid ""
"The file is very large (more than 100K).\n"
"Are you sure you wish to insert it?"
@@ -4509,25 +4610,27 @@ msgstr ""
"�ե�����ϤȤƤ��礭�� (100K �ʾ�) �Ǥ�\n"
"�����ˤ�����������뤳�Ȥ�˾�ߤޤ���?"
-#: composer/e-msg-composer.c:1048
+#: composer/e-msg-composer.c:1107
msgid "An error occurred while reading the file."
msgstr "�ե������ɹ���δ֤˥��顼��ȯ�����ޤ���"
-#: composer/e-msg-composer.c:1349 composer/e-msg-composer.c:1681
+#: composer/e-msg-composer.c:1408 composer/e-msg-composer.c:1740
msgid "Compose a message"
msgstr "��å�������������ޤ�"
-#: composer/e-msg-composer.c:1765
+#: composer/e-msg-composer.c:1829
msgid "Could not create composer window."
msgstr "�᡼�����������ɥ����������ޤ���Ǥ���"
-#: composer/evolution-composer.c:352
+#: composer/evolution-composer.c:355
msgid ""
"Could not create composer window, because you have not yet\n"
"configured any identities in the mail component."
msgstr ""
+"�᡼�륳��ݡ��ͥ�Ȥˤޤ���������Ƥ��ʤ�����\n"
+"��å���������������ɥ���������뤳�Ȥ�����ޤ���Ǥ���"
-#: composer/evolution-composer.c:367
+#: composer/evolution-composer.c:370
msgid "Cannot initialize Evolution's composer."
msgstr "Evolution �᡼������ν����������ޤ���"
@@ -4544,74 +4647,74 @@ msgid "calendar information"
msgstr "����������"
#. strptime format for a date.
-#: e-util/e-time-utils.c:68 e-util/e-time-utils.c:116
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
-#: widgets/misc/e-dateedit.c:1273 widgets/misc/e-dateedit.c:1454
+#: e-util/e-time-utils.c:69 e-util/e-time-utils.c:117
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
+#: widgets/misc/e-dateedit.c:1282 widgets/misc/e-dateedit.c:1463
msgid "%m/%d/%Y"
msgstr "%Y/%m/%d"
#. strptime format for a time of day, in 12-hour format.
#. If it is not appropriate in the locale set to an empty string.
-#: e-util/e-time-utils.c:86 e-util/e-time-utils.c:197
+#: e-util/e-time-utils.c:87 e-util/e-time-utils.c:198
msgid "%I:%M:%S %p%n"
msgstr "%I:%M:%S %p%n"
#. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:89 e-util/e-time-utils.c:200
+#: e-util/e-time-utils.c:90 e-util/e-time-utils.c:201
msgid "%H:%M:%S%n"
msgstr "%H:%M:%S%n"
#. strptime format for time of day, without seconds, 12-hour format.
#. If it is is not appropriate in the locale set to an empty string.
-#: e-util/e-time-utils.c:93 e-util/e-time-utils.c:204
+#: e-util/e-time-utils.c:94 e-util/e-time-utils.c:205
msgid "%I:%M %p%n"
msgstr "%I:%M %p%n"
#. strptime format for time of day, without seconds 24-hour format.
-#: e-util/e-time-utils.c:96 e-util/e-time-utils.c:207
+#: e-util/e-time-utils.c:97 e-util/e-time-utils.c:208
msgid "%H:%M%n"
msgstr "%H:%M%n"
#. strftime format of a weekday and a date.
-#: e-util/e-time-utils.c:268
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2499
+#: e-util/e-time-utils.c:269
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:473
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2503
msgid "%a %m/%d/%Y"
msgstr "%Y/%m/%d (%a)"
#. strftime format of a weekday, a date and a
#. time, in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:273
+#: e-util/e-time-utils.c:274
msgid "%a %m/%d/%Y %H:%M"
msgstr "%Y/%m/%d (%a) %H:%M"
#. strftime format of a weekday, a date and a
#. time, in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:282
+#: e-util/e-time-utils.c:283
msgid "%a %m/%d/%Y %I:%M %p"
msgstr "%Y/%m/%d (%a) %p %I:%M"
#. strftime format of a time in 24-hour format,
#. without seconds.
-#: e-util/e-time-utils.c:311 widgets/misc/e-dateedit.c:1248
-#: widgets/misc/e-dateedit.c:1307 widgets/misc/e-dateedit.c:1486
+#: e-util/e-time-utils.c:312 widgets/misc/e-dateedit.c:1257
+#: widgets/misc/e-dateedit.c:1316 widgets/misc/e-dateedit.c:1495
msgid "%H:%M"
msgstr "%H:%M"
#. strftime format of a time in 24-hour format.
-#: e-util/e-time-utils.c:314
+#: e-util/e-time-utils.c:315
msgid "%H:%M:%S"
msgstr "%H:%M:%S"
#. strftime format of a time in 12-hour format,
#. without seconds.
-#: e-util/e-time-utils.c:319 widgets/misc/e-dateedit.c:1251
-#: widgets/misc/e-dateedit.c:1310 widgets/misc/e-dateedit.c:1489
+#: e-util/e-time-utils.c:320 widgets/misc/e-dateedit.c:1260
+#: widgets/misc/e-dateedit.c:1319 widgets/misc/e-dateedit.c:1498
msgid "%I:%M %p"
msgstr "%p %I:%M"
#. strftime format of a time in 12-hour format.
-#: e-util/e-time-utils.c:322
+#: e-util/e-time-utils.c:323
msgid "%I:%M:%S %p"
msgstr "%I:%M:%S %p"
@@ -4695,7 +4798,7 @@ msgstr "���������� %s ���ư"
msgid "Configure %s"
msgstr "%s ������"
-#: executive-summary/component/e-summary.c:918
+#: executive-summary/component/e-summary.c:924
#, c-format
msgid ""
"Cannot open the HTML file:\n"
@@ -4704,7 +4807,7 @@ msgstr ""
"HTML �ե�����򳫤����Ȥ�����ޤ���:\n"
"%s"
-#: executive-summary/component/e-summary.c:932
+#: executive-summary/component/e-summary.c:938
#, c-format
msgid ""
"Error reading data:\n"
@@ -4713,7 +4816,7 @@ msgstr ""
"�ǡ����Ӥ߹�����˥��顼:\n"
"%s"
-#: executive-summary/component/e-summary.c:950
+#: executive-summary/component/e-summary.c:956
msgid "File does not have a place for the services.\n"
msgstr "�ե�����ϥ����ӥ��ξ�����äƤ��ޤ���\n"
@@ -4725,7 +4828,7 @@ msgstr "����"
msgid "Background:"
msgstr "�ط�:"
-#: executive-summary/component/main.c:60
+#: executive-summary/component/main.c:62
msgid ""
"Executive summary component could not initialize Bonobo.\n"
"If there was a warning message about the RootPOA, it probably means\n"
@@ -4759,87 +4862,87 @@ msgstr "�ƥ��� Bonobo �����ӥ�"
msgid "Test service"
msgstr "�ƥ��ȥ����ӥ�"
-#: executive-summary/test-service/rdf-summary.c:509
-#: executive-summary/test-service/rdf-summary.c:546
-#: executive-summary/test-service/rdf-summary.c:591
-#: widgets/misc/e-messagebox.c:155
+#: executive-summary/test-service/rdf-summary.c:512
+#: executive-summary/test-service/rdf-summary.c:549
+#: executive-summary/test-service/rdf-summary.c:594
+#: widgets/misc/e-messagebox.c:166
msgid "Error"
msgstr "���顼"
-#: executive-summary/test-service/rdf-summary.c:765
+#: executive-summary/test-service/rdf-summary.c:768
msgid "Update automatically"
msgstr "��ưŪ�˹���"
-#: executive-summary/test-service/rdf-summary.c:775
+#: executive-summary/test-service/rdf-summary.c:778
msgid "Update now"
msgstr "����������"
-#: executive-summary/test-service/rdf-summary.c:785
+#: executive-summary/test-service/rdf-summary.c:788
msgid "Update every "
msgstr "���٤ƹ��� "
-#: executive-summary/test-service/rdf-summary.c:793
-#: filter/filter-datespec.c:67
+#: executive-summary/test-service/rdf-summary.c:796
+#: filter/filter-datespec.c:83
msgid "minutes"
msgstr "ʬ"
-#: filter/filter-datespec.c:62
+#: filter/filter-datespec.c:78
msgid "year"
msgstr "ǯ"
-#: filter/filter-datespec.c:62
+#: filter/filter-datespec.c:78
msgid "years"
msgstr "ǯ"
-#: filter/filter-datespec.c:63
+#: filter/filter-datespec.c:79
msgid "month"
msgstr "��"
-#: filter/filter-datespec.c:63
+#: filter/filter-datespec.c:79
msgid "months"
msgstr "��"
-#: filter/filter-datespec.c:64
+#: filter/filter-datespec.c:80
msgid "week"
msgstr "��"
-#: filter/filter-datespec.c:64
+#: filter/filter-datespec.c:80
msgid "weeks"
msgstr "��"
-#: filter/filter-datespec.c:65
+#: filter/filter-datespec.c:81
msgid "days"
msgstr "��"
-#: filter/filter-datespec.c:66
+#: filter/filter-datespec.c:82
msgid "hour"
msgstr "��"
-#: filter/filter-datespec.c:66
+#: filter/filter-datespec.c:82
msgid "hours"
msgstr "��"
-#: filter/filter-datespec.c:67
+#: filter/filter-datespec.c:83
msgid "minute"
msgstr "ʬ"
-#: filter/filter-datespec.c:68
+#: filter/filter-datespec.c:84
msgid "second"
msgstr " ��"
-#: filter/filter-datespec.c:68
+#: filter/filter-datespec.c:84
msgid "seconds"
msgstr " ��"
-#: filter/filter-datespec.c:183
+#: filter/filter-datespec.c:199
msgid "Oops. You have forgotten to choose a date."
msgstr "���դ������˺��Ƥ��ޤ�"
-#: filter/filter-datespec.c:185
+#: filter/filter-datespec.c:201
msgid "Oops. You have chosen an invalid date."
msgstr "̵�������դ����򤷤Ƥ��ޤ�"
-#: filter/filter-datespec.c:259
+#: filter/filter-datespec.c:275
msgid ""
"The message's date will be compared against\n"
"whatever the time is when the filter is run\n"
@@ -4849,7 +4952,7 @@ msgstr ""
"������������å����������դϤɤ�ʻ��֤�\n"
"�Ф��ƤǤ���Ӥ����Ǥ��礦"
-#: filter/filter-datespec.c:282
+#: filter/filter-datespec.c:298
msgid ""
"The message's date will be compared against\n"
"the time that you specify here."
@@ -4857,7 +4960,7 @@ msgstr ""
"��å����������դϤ����ǻ��ꤹ����֤��Ф���\n"
"��Ӥ����Ǥ��礦"
-#: filter/filter-datespec.c:322
+#: filter/filter-datespec.c:338
msgid ""
"The message's date will be compared against\n"
"a time relative to when the filter is run;\n"
@@ -4868,49 +4971,45 @@ msgstr ""
"�㤨�С�\"�콵����\""
#. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:357
+#: filter/filter-datespec.c:373
msgid "the current time"
msgstr "���߻���"
-#: filter/filter-datespec.c:357
+#: filter/filter-datespec.c:373
msgid "a time you specify"
msgstr "���ꤹ�����"
-#: filter/filter-datespec.c:358
+#: filter/filter-datespec.c:374
msgid "a time relative to the current time"
msgstr "���߻���ؤ����л���"
#. The label
-#: filter/filter-datespec.c:416
+#: filter/filter-datespec.c:432
msgid "Compare against"
msgstr "�����"
-#: filter/filter-datespec.c:533 filter/filter-datespec.c:693
+#: filter/filter-datespec.c:549 filter/filter-datespec.c:709
msgid "now"
msgstr "��"
-#: filter/filter-datespec.c:690
+#: filter/filter-datespec.c:706
msgid "<click here to select a date>"
msgstr "<���դ����򤹤뤿��ˤ����򥯥�å����Ƥ�������>"
-#: filter/filter-editor.c:126 filter/filter.glade.h:6
+#: filter/filter-editor.c:132 filter/filter.glade.h:6
msgid "Filter Rules"
msgstr "�ե��륿�롼��"
#. and now for the action area
-#: filter/filter-filter.c:424
+#: filter/filter-filter.c:453
msgid "Then"
msgstr "����"
-#: filter/filter-filter.c:437
+#: filter/filter-filter.c:467
msgid "Add action"
msgstr "ư����ɲ�"
-#: filter/filter-filter.c:443
-msgid "Remove action"
-msgstr "ư�����"
-
-#: filter/filter-folder.c:143
+#: filter/filter-folder.c:147
msgid ""
"Oops, you forgot to choose a folder.\n"
"Please go back and specify a valid folder to deliver mail to."
@@ -4918,19 +5017,20 @@ msgstr ""
"�ե�����������˺��Ƥ��ޤ�\n"
"��äƥ᡼�����������ͭ���ʥե��������ꤷ�Ƥ�������"
-#: filter/filter-folder.c:218 filter/vfolder-rule.c:279
+#: filter/filter-folder.c:222 filter/vfolder-rule.c:285
+#: mail/mail-account-gui.c:678
msgid "Select Folder"
msgstr "�ե����������"
-#: filter/filter-folder.c:243
+#: filter/filter-folder.c:247
msgid "Enter folder URI"
msgstr "�ե���� URI ������"
-#: filter/filter-folder.c:289
+#: filter/filter-folder.c:293
msgid "<click here to select a folder>"
msgstr "<�ե���������򤹤뤿��ˤ����򥯥�å����Ƥ�������>"
-#: filter/filter-input.c:189
+#: filter/filter-input.c:194
#, c-format
msgid ""
"Error in regular expression '%s':\n"
@@ -4939,42 +5039,38 @@ msgstr ""
"����ɽ�� '%s' �ǥ��顼�Ǥ�:\n"
"%s"
-#: filter/filter-part.c:467
+#: filter/filter-part.c:475
msgid "Test"
msgstr "�ƥ���"
-#: filter/filter-rule.c:598
+#: filter/filter-rule.c:624
msgid "Rule name: "
msgstr "�롼��̾: "
-#: filter/filter-rule.c:602
+#: filter/filter-rule.c:628
msgid "Untitled"
msgstr "�����ȥ�ʤ�"
-#: filter/filter-rule.c:618
+#: filter/filter-rule.c:644
msgid "If"
msgstr "�⤷"
-#: filter/filter-rule.c:635
+#: filter/filter-rule.c:662
msgid "Execute actions"
msgstr "���ξ���ư���¹�:"
-#: filter/filter-rule.c:639
+#: filter/filter-rule.c:666
msgid "if all criteria are met"
msgstr "���٤Ƥδ�ब��ä���"
-#: filter/filter-rule.c:644
+#: filter/filter-rule.c:671
msgid "if any criteria are met"
msgstr "�����Ĥ��δ�ब��ä���"
-#: filter/filter-rule.c:655
+#: filter/filter-rule.c:682
msgid "Add criterion"
msgstr "�����ɲ�"
-#: filter/filter-rule.c:661
-msgid "Remove criterion"
-msgstr "������"
-
#: filter/filter.glade.h:4
msgid "Edit Filters"
msgstr "�ե��륿���Խ�"
@@ -4991,7 +5087,7 @@ msgstr "����"
msgid "Outgoing"
msgstr "����"
-#: filter/filter.glade.h:10 filter/vfolder-editor.c:126
+#: filter/filter.glade.h:10 filter/vfolder-editor.c:130
msgid "Virtual Folders"
msgstr "���ۥե����"
@@ -5015,183 +5111,188 @@ msgstr "���٤ƤΥ��������ͭ���ʥ�⡼�ȥե����"
msgid "with all local folders"
msgstr "���٤ƤΥ�������ե����"
-#: filter/libfilter-i18n.h:3
+#. Automatically generated. Do not edit.
+#: filter/libfilter-i18n.h:2
msgid "Assign Colour"
msgstr ""
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:3
msgid "Assign Score"
msgstr ""
-#: filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:4
msgid "Attachments"
msgstr "ź��"
-#: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr "�����Τ�Τ�ޤ�"
-
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:5
msgid "Copy to Folder"
msgstr "�ե�����إ��ԡ�"
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:6
msgid "Date received"
msgstr "������"
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:7
msgid "Date sent"
msgstr "������"
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:9
msgid "Deleted"
msgstr "���"
-#: filter/libfilter-i18n.h:13
-msgid "does not contain"
-msgstr "�����Τ�Τ�ޤޤʤ�"
-
-#: filter/libfilter-i18n.h:14
-msgid "does not end with"
-msgstr "�����Τ�Τǽ���ʤ�"
-
-#: filter/libfilter-i18n.h:15
-msgid "does not exist"
-msgstr "��¸�ߤ��ʤ�"
-
-#: filter/libfilter-i18n.h:16
-msgid "does not sound like"
-msgstr "�����Τ�ΤΤ褦�Ǥʤ�"
-
-#: filter/libfilter-i18n.h:17
-msgid "does not start with"
-msgstr "�����Τ�ΤǻϤޤ�ʤ�"
-
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:10
msgid "Do Not Exist"
msgstr "��¸�ߤ��ʤ�"
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:11
msgid "Draft"
msgstr "���"
-#: filter/libfilter-i18n.h:20
-msgid "ends with"
-msgstr "�����Τ�Τǽ����"
-
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:12
msgid "Exist"
msgstr "��¸�ߤ���"
-#: filter/libfilter-i18n.h:22
-msgid "exists"
-msgstr "��¸�ߤ���"
-
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:13
msgid "Expression"
msgstr "ɽ��"
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:14
msgid "Forward to Address"
msgstr "���ɥ쥹��ž��"
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:15
msgid "Important"
msgstr "����"
-#: filter/libfilter-i18n.h:26
-msgid "is"
-msgstr "�����Τ�ΤȰ��פ���"
-
-#: filter/libfilter-i18n.h:27
-msgid "is greater than"
-msgstr "�����Τ�Τ���礭��"
-
-#: filter/libfilter-i18n.h:28
-msgid "is less than"
-msgstr "�����Τ�Τ�꾮����"
-
-#: filter/libfilter-i18n.h:29
-msgid "is not"
-msgstr "�����Τ�ΤǤϤʤ�"
-
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:16
msgid "Mailing list"
msgstr "�᡼��󥰥ꥹ��"
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:17
msgid "Message Body"
msgstr "����������"
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:18
msgid "Message Header"
msgstr "��å������إå�"
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:19
msgid "Message was received"
msgstr "��������������"
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:20
msgid "Message was sent"
msgstr "��������������"
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:21
msgid "Move to Folder"
msgstr "�ե�����ذ�ư"
-#: filter/libfilter-i18n.h:36
-msgid "on or after"
-msgstr ""
-
-#: filter/libfilter-i18n.h:37
-msgid "on or before"
-msgstr ""
-
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:22
msgid "Read"
msgstr "����"
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:23
msgid "Recipients"
msgstr "������"
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:24
msgid "Regex Match"
msgstr "����ɽ���Ȱ���"
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:25
msgid "Replied to"
msgstr ""
-#: filter/libfilter-i18n.h:42 filter/score-rule.c:192 filter/score-rule.c:194
-#: mail/message-list.c:1014
+#: filter/libfilter-i18n.h:26 filter/score-rule.c:203 filter/score-rule.c:205
+#: mail/message-list.c:1017
msgid "Score"
msgstr "��Ͽ"
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:27
+msgid "Sender"
+msgstr "������"
+
+#: filter/libfilter-i18n.h:28
msgid "Set Status"
msgstr "���ơ���������"
-#: filter/libfilter-i18n.h:45
-msgid "sounds like"
-msgstr "�����Τ�ΤΤ褦�˸�����"
-
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:29
msgid "Specific header"
msgstr "����Υإå�"
-#: filter/libfilter-i18n.h:47
-msgid "starts with"
-msgstr "�����Τ�Τdz��Ϥ���"
-
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:31
msgid "Stop Processing"
msgstr "�������"
-#: filter/libfilter-i18n.h:50 mail/message-list.c:1015
+#: filter/libfilter-i18n.h:32 mail/message-list.c:1018
msgid "Subject"
msgstr "��̾"
+#: filter/libfilter-i18n.h:35
+msgid "contains"
+msgstr "�����Τ�Τ�ޤ�"
+
+#: filter/libfilter-i18n.h:36
+msgid "does not contain"
+msgstr "�����Τ�Τ�ޤޤʤ�"
+
+#: filter/libfilter-i18n.h:37
+msgid "does not end with"
+msgstr "�����Τ�Τǽ���ʤ�"
+
+#: filter/libfilter-i18n.h:38
+msgid "does not exist"
+msgstr "��¸�ߤ��ʤ�"
+
+#: filter/libfilter-i18n.h:39
+msgid "does not sound like"
+msgstr "�����Τ�ΤΤ褦�Ǥʤ�"
+
+#: filter/libfilter-i18n.h:40
+msgid "does not start with"
+msgstr "�����Τ�ΤǻϤޤ�ʤ�"
+
+#: filter/libfilter-i18n.h:41
+msgid "ends with"
+msgstr "�����Τ�Τǽ����"
+
+#: filter/libfilter-i18n.h:42
+msgid "exists"
+msgstr "��¸�ߤ���"
+
+#: filter/libfilter-i18n.h:43
+msgid "is greater than"
+msgstr "�����Τ�Τ���礭��"
+
+#: filter/libfilter-i18n.h:44
+msgid "is less than"
+msgstr "�����Τ�Τ�꾮����"
+
+#: filter/libfilter-i18n.h:45
+msgid "is not"
+msgstr "�����Τ�ΤǤϤʤ�"
+
+#: filter/libfilter-i18n.h:46
+msgid "is"
+msgstr "�����Τ�ΤȰ��פ���"
+
+#: filter/libfilter-i18n.h:47
+msgid "on or after"
+msgstr ""
+
+#: filter/libfilter-i18n.h:48
+msgid "on or before"
+msgstr ""
+
+#: filter/libfilter-i18n.h:49
+msgid "sounds like"
+msgstr "�����Τ�ΤΤ褦�˸�����"
+
+#: filter/libfilter-i18n.h:50
+msgid "starts with"
+msgstr "�����Τ�Τdz��Ϥ���"
+
#: filter/libfilter-i18n.h:51
msgid "was after"
msgstr "���������"
@@ -5200,111 +5301,111 @@ msgstr "���������"
msgid "was before"
msgstr "����������"
-#: filter/score-editor.c:126
+#: filter/score-editor.c:130
msgid "Score Rules"
msgstr "�������롼��"
-#: mail/component-factory.c:319
+#: mail/component-factory.c:332
msgid "Cannot initialize Evolution's mail component."
msgstr "Evolution �᡼�륳��ݡ��ͥ�Ȥν����������ޤ���"
-#: mail/component-factory.c:392
+#: mail/component-factory.c:405
msgid "Cannot register storage with shell"
msgstr "������ǥ��ȥ졼������Ͽ����ޤ���"
-#: mail/folder-browser-factory.c:244
+#: mail/folder-browser-factory.c:209
#, c-format
msgid "Properties for \"%s\""
msgstr "\"%s\" �Υץ��ѥƥ�"
-#: mail/folder-browser-factory.c:246 ui/evolution-event-editor.xml.h:39
+#: mail/folder-browser-factory.c:211 ui/evolution-event-editor.xml.h:39
#: ui/evolution-task-editor-dialog.xml.h:42
msgid "Properties"
msgstr "�ץ��ѥƥ�"
-#: mail/folder-browser.c:219
+#: mail/folder-browser.c:225
msgid "Store search as vFolder"
msgstr ""
-#: mail/folder-browser.c:510
+#: mail/folder-browser.c:533
msgid "VFolder on Subject"
msgstr "��̾�β��ۥե����"
-#: mail/folder-browser.c:513
+#: mail/folder-browser.c:536
msgid "VFolder on Sender"
msgstr "�����Ԥβ��ۥե����"
-#: mail/folder-browser.c:516
+#: mail/folder-browser.c:539
msgid "VFolder on Recipients"
msgstr "�����Ԥβ��ۥե����"
-#: mail/folder-browser.c:519 mail/folder-browser.c:710
+#: mail/folder-browser.c:542 mail/folder-browser.c:733
msgid "VFolder on Mailing List"
msgstr "�᡼��󥰥ꥹ�Ȥβ��ۥե����"
-#: mail/folder-browser.c:525
+#: mail/folder-browser.c:548
msgid "Filter on Subject"
msgstr "��̾�Υե��륿"
-#: mail/folder-browser.c:528
+#: mail/folder-browser.c:551
msgid "Filter on Sender"
msgstr "�����ԤΥե��륿"
-#: mail/folder-browser.c:531
+#: mail/folder-browser.c:554
msgid "Filter on Recipients"
msgstr "�����ԤΥե��륿"
-#: mail/folder-browser.c:534 mail/folder-browser.c:709
+#: mail/folder-browser.c:557 mail/folder-browser.c:732
msgid "Filter on Mailing List"
msgstr "�᡼��󥰥ꥹ�ȤΥե��륿"
-#: mail/folder-browser.c:545
+#: mail/folder-browser.c:568
msgid "Resend"
msgstr "������"
-#: mail/folder-browser.c:547
+#: mail/folder-browser.c:570
msgid "Save As..."
msgstr "��̾����¸..."
-#: mail/folder-browser.c:549 mail/mail-view.c:148
+#: mail/folder-browser.c:572 mail/mail-view.c:154
#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:23
-#: ui/evolution-mail.xml.h:28 ui/evolution-tasks.xml.h:4
+#: ui/evolution-mail.xml.h:29 ui/evolution-tasks.xml.h:4
msgid "Print"
msgstr "����"
-#: mail/folder-browser.c:554
+#: mail/folder-browser.c:577
msgid "Reply to Sender"
msgstr "�����Ԥ��ֿ�"
-#: mail/folder-browser.c:556 mail/mail-view.c:141 ui/evolution-mail.xml.h:35
+#: mail/folder-browser.c:579 mail/mail-view.c:147 ui/evolution-mail.xml.h:36
msgid "Reply to All"
msgstr "�������ֿ�"
-#: mail/folder-browser.c:558 mail/mail-view.c:144 ui/evolution-mail.xml.h:14
+#: mail/folder-browser.c:581 mail/mail-view.c:150 ui/evolution-mail.xml.h:14
msgid "Forward"
msgstr "ž��"
-#: mail/folder-browser.c:560
+#: mail/folder-browser.c:583
msgid "Forward inline"
msgstr "����饤���ž��"
-#: mail/folder-browser.c:563
+#: mail/folder-browser.c:586
msgid "Mark as Read"
msgstr "���ɤȤ��ƥޡ���"
-#: mail/folder-browser.c:565
+#: mail/folder-browser.c:588
msgid "Mark as Unread"
msgstr "̤�ɤȤ��ƥޡ���"
-#: mail/folder-browser.c:570
+#: mail/folder-browser.c:593
msgid "Move to Folder..."
msgstr "�ե�����ذ�ư..."
-#: mail/folder-browser.c:572
+#: mail/folder-browser.c:595
msgid "Copy to Folder..."
msgstr "�ե�����إ��ԡ�..."
-#: mail/folder-browser.c:576
+#: mail/folder-browser.c:599
msgid "Undelete"
msgstr "������"
@@ -5312,20 +5413,20 @@ msgstr "������"
#. GTK_SIGNAL_FUNC (addrbook_sender), NULL, 0 },
#. { "", NULL,
#. GTK_SIGNAL_FUNC (NULL), NULL, 0 },
-#: mail/folder-browser.c:586
+#: mail/folder-browser.c:609
msgid "Apply Filters"
msgstr "�ե��륿Ŭ��"
-#: mail/folder-browser.c:590
+#: mail/folder-browser.c:613
msgid "Create Rule From Message"
msgstr "��å���������롼������"
-#: mail/folder-browser.c:712
+#: mail/folder-browser.c:735
#, c-format
msgid "Filter on Mailing List (%s)"
msgstr "�᡼��󥰥ꥹ�ȤΥե��륿 (%s)"
-#: mail/folder-browser.c:713
+#: mail/folder-browser.c:736
#, c-format
msgid "VFolder on Mailing List (%s)"
msgstr "�᡼��󥰥ꥹ�Ȥβ��ۥե���� (%s)"
@@ -5375,11 +5476,12 @@ msgid "New store format:"
msgstr "������¸����:"
#: mail/local-config.glade.h:4
+#, fuzzy
msgid ""
"Note: When converting between mailbox formats, a failure\n"
"(such as lack of disk space) may not be automatically\n"
"recoverable. Please use this feature with care."
-msgstr ""
+msgstr "����: mailbox �ե����ޥåȤ��Ѵ���˼��Ԥ��ޤ���"
#: mail/local-config.glade.h:7
msgid "maildir"
@@ -5393,65 +5495,65 @@ msgstr "mbox"
msgid "mh"
msgstr "mh"
-#: mail/mail-accounts.c:116
+#: mail/mail-accounts.c:121 mail/mail-accounts.c:165
msgid " (default)"
msgstr " (�ǥե����)"
-#: mail/mail-accounts.c:224 mail/mail-accounts.c:228
+#: mail/mail-accounts.c:197
+msgid "Disable"
+msgstr "̵��"
+
+#: mail/mail-accounts.c:199 mail/mail-config.glade.h:25
+msgid "Enable"
+msgstr "ͭ��"
+
+#: mail/mail-accounts.c:280 mail/mail-accounts.c:284
msgid "Are you sure you want to delete this account?"
msgstr "�����ˤ��Υ�������Ȥ������Ƥ��������Ǥ���?"
-#: mail/mail-accounts.c:334 mail/mail-accounts.c:338
+#: mail/mail-accounts.c:418 mail/mail-accounts.c:422
msgid "Are you sure you want to delete this news account?"
msgstr "������ news ��������Ȥ������Ƥ��������Ǥ���?"
#. give our dialog an OK button and title
-#: mail/mail-accounts.c:452
+#: mail/mail-accounts.c:536
msgid "Evolution Account Manager"
msgstr "Evolution ��������ȥޥ͡�����"
-#: mail/mail-account-editor.c:301
-msgid ""
-"One or more of your servers are not configured correctly.\n"
-"Do you wish to save anyway?"
+#: mail/mail-account-editor.c:105
+msgid "You have not filled in all of the required information."
msgstr ""
-"¿���Υ����Ф����������ꤵ��Ƥ��ޤ���\n"
-"�ɤ����Ƥ���¸�������Ǥ���?"
#. give our dialog an OK button and title
-#: mail/mail-account-editor.c:720
+#: mail/mail-account-editor.c:173
msgid "Evolution Account Editor"
msgstr "Evolution ��������ȥ��ǥ���"
-#: mail/mail-account-editor.c:741
-msgid "Unspecified"
-msgstr "̤����"
-
-#: mail/mail-autofilter.c:71
+#: mail/mail-autofilter.c:70
#, c-format
msgid "Mail to %s"
msgstr "%s �إ᡼��"
-#: mail/mail-autofilter.c:214
+#: mail/mail-autofilter.c:213
#, c-format
msgid "Subject is %s"
msgstr "��̾�� %s �Ǥ�"
-#: mail/mail-autofilter.c:230
+#: mail/mail-autofilter.c:229
#, c-format
msgid "Mail from %s"
msgstr "%s ����᡼��"
-#: mail/mail-autofilter.c:286
+#: mail/mail-autofilter.c:285
#, c-format
msgid "%s mailing list"
msgstr "%s �᡼��󥰥ꥹ��"
-#: mail/mail-autofilter.c:336 mail/mail-autofilter.c:358
+#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:357
msgid "Add Filter Rule"
msgstr "�ե��륿�롼����ɲ�"
-#: mail/mail-callbacks.c:85
+#: mail/mail-callbacks.c:93
msgid ""
"You have not configured the mail client.\n"
"You need to do this before you can send,\n"
@@ -5463,7 +5565,7 @@ msgstr ""
"ɬ�פ�����ޤ�\n"
"�����ꤷ�ޤ���?"
-#: mail/mail-callbacks.c:138
+#: mail/mail-callbacks.c:146
msgid ""
"You need to configure an identity\n"
"before you can compose mail."
@@ -5471,7 +5573,7 @@ msgstr ""
"���ʤ��ϥ᡼�������������˿ȸ���\n"
"����򤹤�ɬ�פ�����ޤ�"
-#: mail/mail-callbacks.c:150
+#: mail/mail-callbacks.c:158
msgid ""
"You need to configure a mail transport\n"
"before you can compose mail."
@@ -5479,11 +5581,11 @@ msgstr ""
"���ʤ��ϥ᡼�������������˥᡼��\n"
"����������򤹤�ɬ�פ�����ޤ�"
-#: mail/mail-callbacks.c:194
+#: mail/mail-callbacks.c:202
msgid "You have not set a mail transport method"
msgstr "�᡼��ž���᥽�åɤ����꤬����ޤ���"
-#: mail/mail-callbacks.c:227
+#: mail/mail-callbacks.c:235
msgid ""
"This message has no subject.\n"
"Really send?"
@@ -5491,32 +5593,32 @@ msgstr ""
"���Υ�å������Ϸ�̾������ޤ���\n"
"�������������ޤ���?"
-#: mail/mail-callbacks.c:296
-msgid "You must configure an account before you can send this email."
-msgstr "���Υ᡼��������������˥�������Ȥ����ꤷ�ʤ���Фʤ�ޤ���"
-
-#: mail/mail-callbacks.c:318
+#: mail/mail-callbacks.c:308
msgid "You must specify recipients in order to send this message."
msgstr "���Υ�å���������������Ŭ�ڤʼ����Ԥ���ꤷ�ʤ���Фʤ�ޤ���"
-#: mail/mail-callbacks.c:583
+#: mail/mail-callbacks.c:351
+msgid "You must configure an account before you can send this email."
+msgstr "���Υ᡼��������������˥�������Ȥ����ꤷ�ʤ���Фʤ�ޤ���"
+
+#: mail/mail-callbacks.c:591
#, c-format
msgid "On %s, %s wrote:\n"
msgstr "On %s, %s wrote:\n"
-#: mail/mail-callbacks.c:765
+#: mail/mail-callbacks.c:773
msgid "Forwarded message:\n"
msgstr "��å�������ž��:\n"
-#: mail/mail-callbacks.c:868
+#: mail/mail-callbacks.c:876
msgid "Move message(s) to"
msgstr "��å��������ư���ޤ�: "
-#: mail/mail-callbacks.c:870
+#: mail/mail-callbacks.c:878
msgid "Copy message(s) to"
msgstr "��å������򥳥ԡ����ޤ�: "
-#: mail/mail-callbacks.c:1011
+#: mail/mail-callbacks.c:1019
msgid ""
"You may only edit messages saved\n"
"in the Drafts folder."
@@ -5524,7 +5626,7 @@ msgstr ""
"�ɥ�եȥե���������¸���줿\n"
"��å������������Խ����뤳�Ȥ�����ޤ�"
-#: mail/mail-callbacks.c:1048
+#: mail/mail-callbacks.c:1056
msgid ""
"You may only resend messages\n"
"in the Sent folder."
@@ -5532,11 +5634,11 @@ msgstr ""
"�����ե�����Υ�å���������\n"
"���������뤳�Ȥ�����ޤ�"
-#: mail/mail-callbacks.c:1081 mail/mail-display.c:85
+#: mail/mail-callbacks.c:1089 mail/mail-display.c:90
msgid "Overwrite file?"
msgstr "�ե�������񤭤��ޤ���?"
-#: mail/mail-callbacks.c:1085 mail/mail-display.c:89
+#: mail/mail-callbacks.c:1093 mail/mail-display.c:94
msgid ""
"A file by that name already exists.\n"
"Overwrite it?"
@@ -5544,15 +5646,15 @@ msgstr ""
"����̾���Υե�����Ϥ��Ǥ�¸�ߤ��ޤ�\n"
"��񤭤��ޤ���?"
-#: mail/mail-callbacks.c:1129
+#: mail/mail-callbacks.c:1137
msgid "Save Message As..."
msgstr "��å���������̾����¸..."
-#: mail/mail-callbacks.c:1131
+#: mail/mail-callbacks.c:1139
msgid "Save Messages As..."
msgstr "��å���������̾����¸..."
-#: mail/mail-callbacks.c:1245
+#: mail/mail-callbacks.c:1252
#, c-format
msgid ""
"Error loading filter information:\n"
@@ -5561,51 +5663,55 @@ msgstr ""
"�ե��륿����Υ�������˥��顼:\n"
"%s"
-#: mail/mail-callbacks.c:1294
+#: mail/mail-callbacks.c:1301
msgid "Print Message"
msgstr "�����������"
-#: mail/mail-callbacks.c:1341
+#: mail/mail-callbacks.c:1348
msgid "Printing of message failed"
msgstr "��å������ΰ����˼��Ԥ��ޤ���"
+#: mail/mail-config.c:1043 mail/mail-config.c:1046
+msgid "Connecting to server..."
+msgstr "�����Ф���³��..."
+
#: mail/mail-config.glade.h:1
+msgid " Check for supported types "
+msgstr "���ݡ��Ȥ��줿���̤�����å�"
+
+#: mail/mail-config.glade.h:2
msgid " color"
msgstr " ���顼"
-#: mail/mail-config.glade.h:2
+#: mail/mail-config.glade.h:3
msgid "Account"
msgstr "���������"
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:4
msgid "Account Information"
msgstr "��������Ⱦ���"
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:5
msgid "Account Management"
msgstr "��������ȴ���"
#: mail/mail-config.glade.h:6
-msgid "Advanced"
-msgstr "���"
+msgid "Accounts"
+msgstr "���������"
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:8
msgid "Authentication"
msgstr "ǧ��"
-#: mail/mail-config.glade.h:8
-msgid "Authentication Type:"
-msgstr "ǧ�ڼ���:"
+#: mail/mail-config.glade.h:9
+msgid "Authentication Type: "
+msgstr "ǧ�ڼ���: "
#: mail/mail-config.glade.h:10
-msgid "Automatically check mail every"
-msgstr "���٤ƤΥ᡼���ưŪ�˥����å�����"
+msgid "Automatically check for new mail every"
+msgstr "����᡼���ưŪ�˥����å�����"
#: mail/mail-config.glade.h:12
-msgid "Check settings"
-msgstr "�����������"
-
-#: mail/mail-config.glade.h:13
msgid ""
"Congratulations, your mail configuration is complete.\n"
"\n"
@@ -5621,202 +5727,163 @@ msgstr ""
"\n"
"\"��λ\" �򥯥�å������������¸���Ƥ�������"
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:18
msgid "De_fault"
msgstr "�ǥե����(_f)"
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:20
msgid "Done"
msgstr "��λ"
+#: mail/mail-config.glade.h:21
+msgid "Drafts"
+msgstr "���"
+
+#: mail/mail-config.glade.h:22
+msgid "Drafts folder:"
+msgstr "��ƥե����:"
+
#: mail/mail-config.glade.h:24
msgid "Email Address:"
msgstr "�᡼�륢�ɥ쥹:"
-#: mail/mail-config.glade.h:25
-msgid "Email address:"
-msgstr "�᡼�륢�ɥ쥹:"
-
#: mail/mail-config.glade.h:26
-msgid "Evolution Mail Configuration"
-msgstr "Evolution �᡼������"
-
-#: mail/mail-config.glade.h:27
msgid "Full Name:"
msgstr "�ե�͡���:"
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:27
msgid "Highlight citations with "
msgstr ""
-#: mail/mail-config.glade.h:31
-msgid "Hostname:"
-msgstr "�ۥ���̾:"
-
-#: mail/mail-config.glade.h:32
-msgid "IMAP"
-msgstr "IMAP"
+#: mail/mail-config.glade.h:29
+msgid "IMAPv4 "
+msgstr "IMAPv4 "
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:30
msgid "Identity"
msgstr "�ȸ�"
-#: mail/mail-config.glade.h:34
-msgid "Include this account when receiving mail"
-msgstr ""
-
-#: mail/mail-config.glade.h:35
-msgid "Keep mail on server"
-msgstr "�����Ф˥᡼���Ĥ��ޤ�"
-
-#: mail/mail-config.glade.h:36
-msgid "Kerberos"
-msgstr "Kerberos"
-
-#: mail/mail-config.glade.h:37
-msgid "Mail"
-msgstr "�᡼��"
-
-#: mail/mail-config.glade.h:38
-msgid "Mail Account"
-msgstr "�᡼�륢�������"
+#: mail/mail-config.glade.h:31
+msgid "Kerberos "
+msgstr "Kerberos "
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:32
msgid "Mail Configuration"
msgstr "�᡼�������"
-#: mail/mail-config.glade.h:40
-msgid "Mail Configuration Druid"
-msgstr "�᡼������ɥ륤��"
-
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:33
msgid "Make this my default account"
msgstr "�ǥե���ȥ�������Ȥ���"
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:34
msgid "Mark messages as \"Read\" after:"
msgstr ""
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:36
msgid "News"
msgstr "�˥塼��"
-#: mail/mail-config.glade.h:46
-msgid "Optional"
-msgstr "���ץ����"
+#: mail/mail-config.glade.h:38
+msgid "Optional Information"
+msgstr "�ղþ���"
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:39
msgid "Organization:"
msgstr "�ȿ�:"
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:41
msgid "PGP binary path:"
msgstr "PGP �ץ������Υѥ�:"
-#: mail/mail-config.glade.h:50
-msgid "Password:"
-msgstr "�ѥ����:"
-
-#: mail/mail-config.glade.h:53
-msgid "Plain Text"
-msgstr "�ץ쥤��ƥ�����"
+#: mail/mail-config.glade.h:46
+msgid "Qmail maildir "
+msgstr "Qmail maildir "
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:47
msgid "Receiving Email"
msgstr "�᡼��������"
-#: mail/mail-config.glade.h:55
-msgid "Remember my password"
-msgstr "���Υѥ���ɤ򵭲�"
-
-#: mail/mail-config.glade.h:56
-msgid "Reply address:"
-msgstr "�ֿ����ɥ쥹:"
+#: mail/mail-config.glade.h:48
+msgid "Receiving Mail"
+msgstr "�᡼��������"
-#: mail/mail-config.glade.h:57
-msgid "Required"
-msgstr "ɬ��"
+#: mail/mail-config.glade.h:49
+msgid "Receiving Options"
+msgstr "���ץ����������"
-#: mail/mail-config.glade.h:59
-msgid "Save password"
-msgstr "�ѥ���ɤ���¸"
+#: mail/mail-config.glade.h:51
+msgid "Required Information"
+msgstr "ɬ�ܾ���"
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:53
msgid "Select PGP binary"
msgstr "PGP �ץ�����������"
-#: mail/mail-config.glade.h:61
-msgid "Select signature file"
-msgstr "��̾�ե����������"
-
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:54
msgid "Send mail in HTML format by default."
msgstr "�ǥե���Ȥ� HTML �����Υ᡼�����������"
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:55
msgid "Sending Email"
msgstr "�᡼���������"
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:56
+msgid "Sending Mail"
+msgstr "�᡼���������"
+
+#: mail/mail-config.glade.h:58
+msgid "Sent"
+msgstr "������"
+
+#: mail/mail-config.glade.h:59
+msgid "Sent and Draft Messages"
+msgstr "�����Ѥ���ƥ�å�����"
+
+#: mail/mail-config.glade.h:60
+msgid "Sent messages folder:"
+msgstr "�����ѥ�å������ե����:"
+
+#: mail/mail-config.glade.h:61
msgid "Server Configuration"
msgstr "����������"
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:62
msgid "Server Type: "
msgstr "�������:"
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:63
msgid "Server requires authentication"
msgstr "�����Ф�ǧ�ڤ�ɬ��"
-#: mail/mail-config.glade.h:68
-msgid "Server type:"
-msgstr "�������:"
-
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:64
msgid "Signature file:"
msgstr "��̾�ե�����:"
-#: mail/mail-config.glade.h:70
-msgid "Signature:"
-msgstr "��̾:"
-
-#: mail/mail-config.glade.h:71
-msgid "Source"
-msgstr "������"
-
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:65
msgid "Sources"
msgstr "������"
-#: mail/mail-config.glade.h:73
-msgid "Transport"
-msgstr "����"
+#: mail/mail-config.glade.h:66
+msgid "Special Folders"
+msgstr "���̤ʥե����"
-#: mail/mail-config.glade.h:74
-msgid "Transport Authentication"
-msgstr "������ǧ��"
+#: mail/mail-config.glade.h:67
+msgid "Standard Unix mbox"
+msgstr "ɸ��Ū�� UNIX �� mbox �ե�����"
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:68
msgid "Type"
msgstr "����"
-#: mail/mail-config.glade.h:76
-msgid ""
-"Type the name by which you would like to refer to these servers. For "
-"example: \"Work\" or \"Home\"."
-msgstr ""
-"�����Υ����Ф򻲾Ȥ�����̾���μ��̤Ǥ�. �㤨��: \"�Ż�\" ���뤤�� \"��\""
-
-#: mail/mail-config.glade.h:77
-msgid "User Information"
-msgstr "�桼������"
+#: mail/mail-config.glade.h:69
+msgid "Use secure connection (SSL)"
+msgstr "�����奢��³ (SSL) ��Ȥ�"
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:70
msgid "Username:"
msgstr "�桼��̾:"
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:71
msgid ""
"Welcome to the Evolution Mail Configuration Druid.\n"
"\n"
@@ -5826,193 +5893,193 @@ msgstr ""
"\n"
"\"��\" �򥯥�å����ƻϤ�Ƥ�������"
-#: mail/mail-config.glade.h:84 ui/evolution-event-editor.xml.h:58
+#: mail/mail-config.glade.h:76 ui/evolution-event-editor.xml.h:58
#: ui/evolution-message-composer.xml.h:43 ui/evolution-subscribe.xml.h:10
#: ui/evolution-task-editor-dialog.xml.h:70 ui/evolution.xml.h:29
msgid "_Edit"
msgstr "�Խ�(_E)"
-#: mail/mail-config.glade.h:85
-msgid "minutes."
-msgstr "ʬ"
+#: mail/mail-config-druid.c:99
+msgid ""
+"Please enter your name and email address below. The \"optional\" fields "
+"below do not need to be filled in, unless you wish to include this "
+"information in email you send."
+msgstr ""
-#: mail/mail-config-druid.c:421
-#, c-format
+#: mail/mail-config-druid.c:101
msgid ""
-"Failed to verify the incoming mail configuration.\n"
-"You may experience problems retrieving your mail from %s"
+"Please enter information about your incoming mail server below. If you don't "
+"know what kind of server you use, contact your system administrator or "
+"Internet Service Provider."
msgstr ""
-"���ϤΥ᡼������γ�ǧ�˼��Ԥ��ޤ���\n"
-"%s ���餢�ʤ��Υ᡼��������������ȯ��������ǽ��������ޤ�"
-#: mail/mail-config-druid.c:515
-msgid "Namespace:"
-msgstr "̾������:"
+#: mail/mail-config-druid.c:105
+msgid ""
+"Please enter information about your outgoing mail protocol below. If you "
+"don't know which protocol you use, contact your system administrator or "
+"Internet Service Provider."
+msgstr ""
-#: mail/mail-config-druid.c:708
-#, c-format
+#: mail/mail-config-druid.c:107
msgid ""
-"Failed to verify the outgoing mail configuration.\n"
-"You may experience problems sending your mail using %s"
+"You are almost done with the mail configuration process. The identity, "
+"incoming mail server and outgoing mail transport method which you provided "
+"will be grouped together to make an Evolution mail account. Please enter a "
+"name for this account in the space below. This name will be used for display "
+"purposes only."
msgstr ""
-"���ϤΥ᡼������γ�ǧ�˼��Ԥ��ޤ���\n"
-"%s ��ȤäƤ��ʤ��Υ᡼���������������ȯ��������ǽ��������ޤ�"
#. set window title
-#: mail/mail-config-druid.c:1215
+#: mail/mail-config-druid.c:445
msgid "Evolution Account Wizard"
msgstr "Evolution ��������ȥ���������"
-#: mail/mail-display.c:191
+#: mail/mail-display.c:194
msgid "Save Attachment"
msgstr "ź�դ���¸"
-#: mail/mail-display.c:231
+#: mail/mail-display.c:234
#, c-format
msgid "Could not create temporary directory: %s"
msgstr "��ȥǥ��쥯�ȥ���������ޤ���Ǥ���: %s"
-#: mail/mail-display.c:292
+#: mail/mail-display.c:295
msgid "Save to Disk..."
msgstr "�ǥ���������¸..."
-#: mail/mail-display.c:294
+#: mail/mail-display.c:297
#, c-format
msgid "Open in %s..."
msgstr "%s �˳���..."
-#: mail/mail-display.c:296
+#: mail/mail-display.c:299
msgid "View Inline"
msgstr "����饤��ɽ��"
-#: mail/mail-display.c:325
+#: mail/mail-display.c:334
msgid "External Viewer"
msgstr "�����ӥ塼��"
-#: mail/mail-display.c:348
+#: mail/mail-display.c:357
#, c-format
msgid "View Inline (via %s)"
msgstr "����饤��ɽ�� (%s��ͳ)"
-#: mail/mail-display.c:352
+#: mail/mail-display.c:361
msgid "Hide"
msgstr "����"
-#: mail/mail-display.c:1073
-msgid "Add to addressbook (FIXME)"
-msgstr "���ɥ쥹Ģ���ɲ� (FIXME)"
-
-#: mail/mail-display.c:1075
-msgid "Open in addressbook (FIXME)"
-msgstr "���ɥ쥹Ģ�򳫤� (FIXME)"
-
-#: mail/mail-display.c:1082
-msgid "Open link in browser (FIXME)"
-msgstr "�֥饦���ǥ�󥯤򳫤� (FIXME)"
+#: mail/mail-display.c:1100
+msgid "Open link in browser"
+msgstr "�֥饦���ǥ�󥯤򳫤�"
-#: mail/mail-display.c:1084
+#: mail/mail-display.c:1102
msgid "Save as (FIXME)"
msgstr "��̾����¸ (FIXME)"
-#: mail/mail-display.c:1086
+#: mail/mail-display.c:1104
msgid "Copy location (FIXME)"
msgstr "���򥳥ԡ� (FIXME)"
-#: mail/mail-format.c:506
+#: mail/mail-format.c:512
#, c-format
msgid "%s attachment"
msgstr "%s ��ź��"
-#: mail/mail-format.c:745
+#: mail/mail-format.c:554
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "MIME ��å���������Ͻ���ޤ���Ǥ���, ��������ɽ�����ޤ�"
+
+#: mail/mail-format.c:736
msgid "Loading message content"
msgstr "��å����������Ƥ��ɤ߹�����"
-#: mail/mail-format.c:1034
+#: mail/mail-format.c:1025
msgid "Encrypted message not displayed"
msgstr "�Ź沽���줿��å�������ɽ�����ޤ���"
-#: mail/mail-format.c:1040
+#: mail/mail-format.c:1031
msgid "Encrypted message"
msgstr "�Ź沽���줿��å�����"
-#: mail/mail-format.c:1041
+#: mail/mail-format.c:1032
msgid "Click icon to decrypt."
msgstr "��������򥯥�å��������沽���Ƥ�������"
-#: mail/mail-format.c:1110 mail/mail-format.c:1497
+#: mail/mail-format.c:1101 mail/mail-format.c:1488
msgid "This message is digitally signed and has been found to be authentic."
msgstr "���Υ�å������ϥǥ������̾���쿮��Ǥ����ΤǤ�"
-#: mail/mail-format.c:1118 mail/mail-format.c:1505
+#: mail/mail-format.c:1109 mail/mail-format.c:1496
msgid "This message is digitally signed but can not be proven to be authentic."
msgstr "���Υ�å������ϥǥ������̾���줿��ΤǤ���, ������������ޤ���"
-#: mail/mail-format.c:1718
+#: mail/mail-format.c:1709
#, c-format
msgid "Pointer to FTP site (%s)"
msgstr "FTP ������ (%s) ��ؤ��Ƥ��ޤ�"
-#: mail/mail-format.c:1730
+#: mail/mail-format.c:1721
#, c-format
msgid "Pointer to local file (%s) valid at site \"%s\""
msgstr ""
-#: mail/mail-format.c:1734
+#: mail/mail-format.c:1725
#, c-format
msgid "Pointer to local file (%s)"
msgstr "��������ե����� (%s) ��ؤ��Ƥ��ޤ�"
-#: mail/mail-format.c:1768
+#: mail/mail-format.c:1759
#, c-format
msgid "Pointer to unknown external data (\"%s\" type)"
msgstr "̤�Τγ����ǡ��� (\"%s\" ������) ��ؤ��Ƥ��ޤ�"
-#: mail/mail-format.c:1773
+#: mail/mail-format.c:1764
msgid "Malformed external-body part."
msgstr ""
-#: mail/mail-local.c:335
+#: mail/mail-local.c:337
#, c-format
msgid "No such folder %s"
msgstr "���Τ褦�ʥե���� %s �Ϥ���ޤ���"
-#: mail/mail-local.c:508
+#: mail/mail-local.c:509
#, c-format
msgid "Opening '%s'"
msgstr "'%s' �򥪡��ץ���"
-#: mail/mail-local.c:786
+#: mail/mail-local.c:787
#, c-format
msgid "Changing folder \"%s\" to \"%s\" format"
msgstr "�ե���� \"%s\" �� \"%s\" �������ѹ����Ƥ��ޤ�"
-#: mail/mail-local.c:790
+#: mail/mail-local.c:791
#, c-format
msgid "Change folder \"%s\" to \"%s\" format"
msgstr "�ե���� \"%s\" �� \"%s\" �������ѹ����ޤ�"
-#: mail/mail-local.c:814
+#: mail/mail-local.c:815
msgid "Reconfiguring folder"
msgstr "�ե�����κƹ�����"
#. first, 'close' the old folder
-#: mail/mail-local.c:843
+#: mail/mail-local.c:844
msgid "Closing current folder"
msgstr "���ߤΥե�����򥯥�������"
-#: mail/mail-local.c:875
+#: mail/mail-local.c:876
msgid "Renaming old folder and opening"
msgstr "�Ť��ե�������͡��ष�ƥ����ץ���"
-#: mail/mail-local.c:893
+#: mail/mail-local.c:894
msgid "Creating new folder"
msgstr "�����ե�����������"
-#: mail/mail-local.c:907
+#: mail/mail-local.c:908
msgid "Copying messages"
msgstr "��å������򥳥ԡ���"
-#: mail/mail-local.c:928
+#: mail/mail-local.c:925
#, c-format
msgid ""
"Cannot save folder metainfo; you'll probably find you can't\n"
@@ -6021,13 +6088,13 @@ msgstr ""
"�ե�����Υ᥿�������¸����ޤ���; ��Ϥ䤳�Υե�����򳫤�\n"
"���Ȥ�����ʤ��Ȥ��֤󵤤Ť����ΤǤ��礦: %s"
-#: mail/mail-local.c:967
+#: mail/mail-local.c:964
msgid ""
"If you can no longer open this mailbox, then\n"
"you may need to repair it manually."
msgstr ""
-#: mail/mail-mt.c:181
+#: mail/mail-mt.c:190
#, c-format
msgid ""
"Error while '%s':\n"
@@ -6036,7 +6103,7 @@ msgstr ""
"'%s' �κݤ˥��顼��ȯ�����ޤ���:\n"
"%s"
-#: mail/mail-mt.c:183
+#: mail/mail-mt.c:192
#, c-format
msgid ""
"Error while performing operation:\n"
@@ -6045,96 +6112,105 @@ msgstr ""
"���ν������Ƥ���֤˥��顼��ȯ�����ޤ���:\n"
"%s"
-#: mail/mail-mt.c:506 mail/mail-mt.c:535 mail/mail-mt.c:882
+#: mail/mail-mt.c:515 mail/mail-mt.c:544 mail/mail-mt.c:891
msgid "Working"
msgstr "�����"
-#: mail/mail-mt.c:670 mail/session.c:91
+#: mail/mail-mt.c:679 mail/session.c:98
msgid "Do you accept?"
msgstr "��ǧ���ޤ���?"
-#: mail/mail-mt.c:864
+#: mail/mail-mt.c:873
msgid "Evolution progress"
msgstr "Evolution �ʹ�"
-#: mail/mail-ops.c:518
+#: mail/mail-ops.c:588
#, c-format
msgid "Sending \"%s\""
msgstr "\"%s\" ��������"
-#: mail/mail-ops.c:520
+#: mail/mail-ops.c:590
msgid "Sending message"
msgstr "��������������"
-#: mail/mail-ops.c:751
+#: mail/mail-ops.c:705
+#, c-format
+msgid "Sending message %d of %d"
+msgstr "������ %d / %d ��������"
+
+#: mail/mail-ops.c:724
+#, c-format
+msgid "Failed on message %d of %d"
+msgstr "��å����� %d / %d �ϼ��Ԥ��ޤ���"
+
+#: mail/mail-ops.c:726 mail/mail-send-recv.c:475
+msgid "Complete."
+msgstr "��λ���ޤ���"
+
+#: mail/mail-ops.c:812
msgid "Saving message to folder"
msgstr "�ե�����إ�å���������¸��"
-#: mail/mail-ops.c:824
+#: mail/mail-ops.c:885
#, c-format
msgid "Moving messages to %s"
msgstr "%s �إ�å��������ư��"
-#: mail/mail-ops.c:824
+#: mail/mail-ops.c:885
#, c-format
msgid "Copying messages to %s"
msgstr "%s �إ�å������򥳥ԡ���"
-#: mail/mail-ops.c:841
+#: mail/mail-ops.c:901
msgid "Moving"
msgstr "��ư��"
-#: mail/mail-ops.c:844
+#: mail/mail-ops.c:904
msgid "Copying"
msgstr "���ԡ���"
-#: mail/mail-ops.c:855
-#, c-format
-msgid "%s message %d of %d (uid \"%s\")"
-msgstr "�������� %s %d / %d (uid \"%s\")"
-
-#: mail/mail-ops.c:926
+#: mail/mail-ops.c:979
#, c-format
msgid "Scanning folders in \"%s\""
msgstr "\"%s\" ����Υե������������"
-#: mail/mail-ops.c:1084
+#: mail/mail-ops.c:1140
msgid "Forwarded messages"
msgstr "��å�������ž��"
-#: mail/mail-ops.c:1125 mail/mail-ops.c:1263
+#: mail/mail-ops.c:1181 mail/mail-ops.c:1319
#, c-format
msgid "Opening folder %s"
msgstr "\"%s\" ����Υե�����򥪡��ץ���"
-#: mail/mail-ops.c:1192
+#: mail/mail-ops.c:1248
#, c-format
msgid "Opening store %s"
msgstr ""
-#: mail/mail-ops.c:1379
+#: mail/mail-ops.c:1435
msgid "Expunging folder"
msgstr "�ե����������"
-#: mail/mail-ops.c:1428
+#: mail/mail-ops.c:1484
#, c-format
msgid "Retrieving message %s"
msgstr "������ %s �������"
-#: mail/mail-ops.c:1495
+#: mail/mail-ops.c:1551
msgid "Retrieving messages"
msgstr "�������������"
-#: mail/mail-ops.c:1505
+#: mail/mail-ops.c:1561
#, c-format
msgid "Retrieving message number %d of %d (uid \"%s\")"
msgstr "��å������ֹ� %d / %d (uid \"%s\") �������"
-#: mail/mail-ops.c:1579
+#: mail/mail-ops.c:1635
msgid "Saving messages"
msgstr "��å���������¸��"
-#: mail/mail-ops.c:1658
+#: mail/mail-ops.c:1714
#, c-format
msgid ""
"Unable to create output file: %s\n"
@@ -6143,12 +6219,12 @@ msgstr ""
"���ϥե�������������ޤ���: %s\n"
" %s"
-#: mail/mail-ops.c:1671
+#: mail/mail-ops.c:1727
#, c-format
msgid "Saving message %d of %d (uid \"%s\")"
msgstr "��å����� %d / %d (uid \"%s\") ����¸��"
-#: mail/mail-ops.c:1685
+#: mail/mail-ops.c:1741
#, c-format
msgid ""
"Error saving messages to: %s:\n"
@@ -6157,11 +6233,11 @@ msgstr ""
"�ե��������¸��˥��顼: %s:\n"
" %s"
-#: mail/mail-ops.c:1759
+#: mail/mail-ops.c:1815
msgid "Saving attachment"
msgstr "ź�դ���¸��"
-#: mail/mail-ops.c:1774
+#: mail/mail-ops.c:1830
#, c-format
msgid ""
"Cannot create output file: %s:\n"
@@ -6170,75 +6246,71 @@ msgstr ""
"���ϥե�������������ޤ���: %s:\n"
" %s"
-#: mail/mail-ops.c:1802
+#: mail/mail-ops.c:1858
#, c-format
msgid "Could not write data: %s"
msgstr "�ǡ�����񤭽Ф����Ȥ�����ޤ���Ǥ���: %s"
-#: mail/mail-search-dialogue.c:107
+#: mail/mail-search-dialogue.c:113
msgid "_Search"
msgstr "����(_S)"
-#: mail/mail-send-recv.c:136
+#: mail/mail-send-recv.c:138
msgid "Cancelling ..."
msgstr "����󥻥��� ..."
-#: mail/mail-send-recv.c:231
+#: mail/mail-send-recv.c:233
msgid "Send & Receive mail"
msgstr "�᡼���������"
-#: mail/mail-send-recv.c:234
+#: mail/mail-send-recv.c:236
msgid "Receiving"
msgstr "������"
-#: mail/mail-send-recv.c:283
+#: mail/mail-send-recv.c:285
msgid "Updating ..."
msgstr "������ ..."
-#: mail/mail-send-recv.c:285 mail/mail-send-recv.c:331
+#: mail/mail-send-recv.c:287 mail/mail-send-recv.c:333
msgid "Waiting ..."
msgstr "�Ե��� ..."
-#: mail/mail-send-recv.c:304
+#: mail/mail-send-recv.c:306
msgid "Sending"
msgstr "������"
-#: mail/mail-send-recv.c:469
+#: mail/mail-send-recv.c:471
msgid "Cancelled."
msgstr "����󥻥뤷�ޤ���"
-#: mail/mail-send-recv.c:473
-msgid "Complete."
-msgstr "��λ���ޤ���"
-
-#: mail/mail-summary.c:111
+#: mail/mail-summary.c:109
msgid "Incomplete message written on pipe!"
msgstr "�ѥ��׾���Դ����ʥ�å��������񤫤�ޤ���!"
-#: mail/mail-tools.c:138
+#: mail/mail-tools.c:141
#, c-format
msgid "Couldn't create temporary mbox `%s': %s"
msgstr "�ƥ�ݥ�� mbox '%s' ������Ǥ��ޤ���Ǥ���: %s"
-#: mail/mail-tools.c:185
+#: mail/mail-tools.c:188
#, c-format
msgid "[%s] (forwarded message)"
msgstr "[%s] (��å�������ž��)"
-#: mail/mail-tools.c:195
+#: mail/mail-tools.c:198
msgid "Fwd: (no subject)"
msgstr "Fwd: (��̾�ʤ�)"
-#: mail/mail-tools.c:212
+#: mail/mail-tools.c:215
#, c-format
msgid "Forwarded message - %s"
msgstr "��å�������ž�����ޤ��� - %s"
-#: mail/mail-tools.c:214
+#: mail/mail-tools.c:217
msgid "Forwarded message (no subject)"
msgstr "��å�������ž�����ޤ��� (��̾�ʤ�)"
-#: mail/mail-tools.c:411
+#: mail/mail-tools.c:414
#, c-format
msgid ""
"-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
@@ -6247,184 +6319,189 @@ msgstr ""
"-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
"%s<br><b>Subject:</b> %s<br>"
-#: mail/mail-vfolder.c:248
+#: mail/mail-vfolder.c:249
msgid "VFolders"
msgstr "���ۥե����"
-#: mail/mail-vfolder.c:426
+#: mail/mail-vfolder.c:427
msgid "New VFolder"
msgstr "�������ۥե����"
#. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
#. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:138 ui/evolution-mail.xml.h:34
+#: mail/mail-view.c:144 ui/evolution-mail.xml.h:35
msgid "Reply"
msgstr "�ֿ�"
-#: mail/mail-view.c:138 ui/evolution-mail.xml.h:38
+#: mail/mail-view.c:144 ui/evolution-mail.xml.h:39
msgid "Reply to the sender of this message"
msgstr "��å������κ��пͤ��ֿ����ޤ�"
-#: mail/mail-view.c:141 ui/evolution-mail.xml.h:37
+#: mail/mail-view.c:147 ui/evolution-mail.xml.h:38
msgid "Reply to all recipients of this message"
msgstr "���Υ�å������μ�����������ֿ����ޤ�"
-#: mail/mail-view.c:144 ui/evolution-mail.xml.h:16
+#: mail/mail-view.c:150 ui/evolution-mail.xml.h:16
msgid "Forward this message"
msgstr "���Υ�å�������ž�����ޤ�"
-#: mail/mail-view.c:148 ui/evolution-mail.xml.h:31
+#: mail/mail-view.c:154 ui/evolution-mail.xml.h:32
msgid "Print the selected message"
msgstr "���򤵤줿��å�������������ޤ�"
-#: mail/mail-view.c:150 ui/evolution-mail.xml.h:7
+#: mail/mail-view.c:156 ui/evolution-mail.xml.h:7
msgid "Delete this message"
msgstr "���Υ�å������������ޤ�"
-#: mail/message-list.c:614
+#: mail/message-list.c:617
msgid "Unseen"
msgstr "̤��"
-#: mail/message-list.c:615
+#: mail/message-list.c:618
msgid "Seen"
msgstr "����"
-#: mail/message-list.c:616
+#: mail/message-list.c:619
msgid "Answered"
msgstr "�����Ѥ�"
-#: mail/message-list.c:617
+#: mail/message-list.c:620
msgid "Multiple Unseen Messages"
msgstr "ʣ����̤�ɥ�å�����"
-#: mail/message-list.c:618
+#: mail/message-list.c:621
msgid "Multiple Messages"
msgstr "ʣ���Υ�å�����"
-#: mail/message-list.c:622
+#: mail/message-list.c:625
msgid "Lowest"
msgstr "�Ǥ��㤤"
-#: mail/message-list.c:623
+#: mail/message-list.c:626
msgid "Lower"
msgstr "�㤤"
-#: mail/message-list.c:627
+#: mail/message-list.c:630
msgid "Higher"
msgstr "�⤤"
-#: mail/message-list.c:628
+#: mail/message-list.c:631
msgid "Highest"
msgstr "�Ǥ�⤤"
-#: mail/message-list.c:878
+#: mail/message-list.c:881
msgid "?"
msgstr "?"
-#: mail/message-list.c:885
+#: mail/message-list.c:888
msgid "Today %l:%M %p"
msgstr "������ %p %l:%M"
-#: mail/message-list.c:894
+#: mail/message-list.c:897
msgid "Yesterday %l:%M %p"
msgstr "������ %p %l:%M"
-#: mail/message-list.c:906
+#: mail/message-list.c:909
msgid "%a %l:%M %p"
msgstr "%p %l:%M (%a)"
-#: mail/message-list.c:914
+#: mail/message-list.c:917
msgid "%b %d %l:%M %p"
msgstr "%m�� %d�� %p %l:%M"
-#: mail/message-list.c:916
+#: mail/message-list.c:919
msgid "%b %d %Y"
msgstr "%Yǯ %m�� %d��"
-#: mail/message-list.c:1014
+#: mail/message-list.c:1017
msgid "Flagged"
msgstr "�ե饰"
-#: mail/message-list.c:1015
+#: mail/message-list.c:1018
msgid "From"
msgstr "���п�"
-#: mail/message-list.c:1015
+#: mail/message-list.c:1018
msgid "Date"
msgstr "����"
-#: mail/message-list.c:1015
+#: mail/message-list.c:1018
msgid "Received"
msgstr ""
-#: mail/message-list.c:1016
+#: mail/message-list.c:1019
msgid "To"
msgstr "����"
-#: mail/message-list.c:1016
+#: mail/message-list.c:1019
msgid "Size"
msgstr "������"
-#: mail/openpgp-utils.c:89
+#: mail/openpgp-utils.c:92
#, c-format
msgid "Please enter your %s passphrase for %s"
msgstr "���ʤ��� %s �ѥ��ե졼�� ( %s ��) �����Ϥ��Ƥ�������"
-#: mail/openpgp-utils.c:92
+#: mail/openpgp-utils.c:95
#, c-format
msgid "Please enter your %s passphrase"
msgstr "���ʤ��� %s �ѥ��ե졼�������Ϥ��Ƥ�������"
-#: mail/openpgp-utils.c:452 mail/openpgp-utils.c:558 mail/openpgp-utils.c:760
-#: mail/openpgp-utils.c:913 mail/openpgp-utils.c:1071
+#: mail/openpgp-utils.c:455 mail/openpgp-utils.c:562 mail/openpgp-utils.c:766
+#: mail/openpgp-utils.c:920 mail/openpgp-utils.c:1079
msgid "No GPG/PGP program available."
msgstr "GPG/PGP �ץ����������ѤǤ��ޤ���"
-#: mail/openpgp-utils.c:459 mail/openpgp-utils.c:567 mail/openpgp-utils.c:767
-#: mail/openpgp-utils.c:920
+#: mail/openpgp-utils.c:462 mail/openpgp-utils.c:571 mail/openpgp-utils.c:773
+#: mail/openpgp-utils.c:927
msgid "No password provided."
msgstr "�󶡤��줿�ѥ���ɤϤ���ޤ���"
-#: mail/openpgp-utils.c:467 mail/openpgp-utils.c:574 mail/openpgp-utils.c:773
-#: mail/openpgp-utils.c:928 mail/openpgp-utils.c:1077
+#: mail/openpgp-utils.c:470 mail/openpgp-utils.c:578 mail/openpgp-utils.c:779
+#: mail/openpgp-utils.c:935 mail/openpgp-utils.c:1085
#, c-format
msgid "Couldn't create pipe to GPG/PGP: %s"
msgstr "GPG/PGP �ؤΥѥ��פ������Ǥ��ޤ���Ǥ���: %s"
-#: mail/openpgp-utils.c:588
+#: mail/openpgp-utils.c:592
msgid "No recipients specified"
msgstr "�����Ԥ����ꤵ��Ƥ��ޤ���"
-#: mail/openpgp-utils.c:1088
+#: mail/openpgp-utils.c:1096
#, c-format
msgid "Couldn't create temp file: %s"
msgstr "��ȥե������������뤳�Ȥ�����ޤ���Ǥ���: %s"
-#: mail/subscribe-dialog.c:73 shell/e-storage-set-view.c:46
+#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.c:46
msgid "Folder"
msgstr "�ե����"
-#: mail/subscribe-dialog.c:74
+#: mail/subscribe-dialog.c:77
msgid "Store"
msgstr "��Ͽ"
-#: mail/subscribe-dialog.c:156
+#: mail/subscribe-dialog.c:138
msgid "Display folders starting with:"
msgstr "ɽ������ե�����򳫻Ϥ���:"
-#: mail/subscribe-dialog.c:186
+#: mail/subscribe-dialog.c:168
#, c-format
msgid "Getting store for \"%s\""
msgstr "\"%s\" �ε�Ͽ�������"
-#: mail/subscribe-dialog.c:289
+#: mail/subscribe-dialog.c:271
#, c-format
msgid "Subscribing to folder \"%s\""
-msgstr ""
+msgstr "�ե���� \"%s\" �������"
-#: mail/subscribe-dialog.c:291
+#: mail/subscribe-dialog.c:273
#, c-format
msgid "Unsubscribing to folder \"%s\""
+msgstr "�ե���� \"%s\" �ι��ɲ����"
+
+#. Construct the app
+#: mail/subscribe-dialog.c:873
+msgid "Manage Subscriptions"
msgstr ""
#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
@@ -6439,9 +6516,18 @@ msgstr "�ե��������:"
msgid "Specify where to create the folder:"
msgstr "�ե������������������ꤷ�Ƥ�������:"
+#: shell/importer/importer.c:87
+msgid ""
+"Choose the file that you want to import into Evolution, and select what type "
+"of file it is from the list.\n"
+"\n"
+"You can select \"Automatic\" if you do not know, and Evolution will attempt "
+"to work it out."
+msgstr ""
+
#. Importer isn't ready yet.
#. Wait 5 seconds and try again.
-#: shell/importer/importer.c:157
+#: shell/importer/importer.c:182
#, c-format
msgid ""
"Importing %s\n"
@@ -6452,7 +6538,7 @@ msgstr ""
"����ݡ����ν���������Ƥ��ޤ���\n"
"5���Ԥäƺ��ٻ�Ƥ�������"
-#: shell/importer/importer.c:175 shell/importer/importer.c:202
+#: shell/importer/importer.c:202 shell/importer/importer.c:233
#, c-format
msgid ""
"Importing %s\n"
@@ -6461,7 +6547,7 @@ msgstr ""
"%s �򥤥�ݡ�����\n"
"�����ƥ� %d �򥤥�ݡ�����"
-#: shell/importer/importer.c:309
+#: shell/importer/importer.c:341
#, c-format
msgid ""
"There is no importer that is able to handle\n"
@@ -6470,11 +6556,11 @@ msgstr ""
"�������Ȥ�����륤��ݡ��Ȥ�����ޤ���\n"
"%s"
-#: shell/importer/importer.c:319
+#: shell/importer/importer.c:351
msgid "Importing"
msgstr "����ݡ�����"
-#: shell/importer/importer.c:327
+#: shell/importer/importer.c:359
#, c-format
msgid ""
"Importing %s.\n"
@@ -6483,12 +6569,17 @@ msgstr ""
"%s �򥤥�ݡ�����\n"
"%s �򳫻Ϥ��ޤ�"
-#: shell/importer/importer.c:342
+#: shell/importer/importer.c:372
+#, c-format
+msgid "Error starting %s"
+msgstr "%s �γ�����˥��顼��ȯ�����ޤ���"
+
+#: shell/importer/importer.c:387
#, c-format
msgid "Error loading %s"
-msgstr "%s �Υ�������˥��顼"
+msgstr "%s �Υ�������˥��顼��ȯ�����ޤ���"
-#: shell/importer/importer.c:357
+#: shell/importer/importer.c:402
#, c-format
msgid ""
"Importing %s\n"
@@ -6497,35 +6588,26 @@ msgstr ""
"%s �򥤥�ݡ�����\n"
"�����ƥ� 1 �򥤥�ݡ�����"
-#: shell/importer/importer.c:428
+#: shell/importer/importer.c:473
msgid "Automatic"
msgstr "��Ư"
-#: shell/importer/importer.c:478
+#: shell/importer/importer.c:523
msgid "Filename:"
msgstr "�ե�����̾:"
-#: shell/importer/import.glade.h:5 shell/importer/importer.c:483
+#: shell/importer/import.glade.h:5 shell/importer/importer.c:528
msgid "Select a file"
msgstr "�ե����������"
-#: shell/importer/importer.c:493
+#: shell/importer/importer.c:538
msgid "File type:"
msgstr "�ե��������:"
-#: shell/importer/import.glade.h:4 shell/importer/importer.c:574
+#: shell/importer/import.glade.h:4 shell/importer/importer.c:619
msgid "Import"
msgstr "����ݡ���"
-#: shell/importer/importer.c:609
-msgid ""
-"Choose the file that you want to import into Evolution, and select what type "
-"of file it is from the list.\n"
-"\n"
-"You can select \"Automatic\" if you do not know, and Evolution will attempt "
-"to work it out."
-msgstr ""
-
#: shell/importer/import.glade.h:1
msgid "Click \"Import\" to begin importing the file into Evolution. "
msgstr ""
@@ -6550,11 +6632,11 @@ msgstr ""
"���Υ��������ɤǤ� Evolution ����˳����ե�����򥤥�ݡ���\n"
"����������̤��ư��⤷�ޤ�"
-#: shell/e-setup.c:112 shell/e-setup.c:185
+#: shell/e-setup.c:118 shell/e-setup.c:191
msgid "Evolution installation"
msgstr "Evolution �Υ��󥹥ȡ���"
-#: shell/e-setup.c:116
+#: shell/e-setup.c:122
msgid ""
"This new version of Evolution needs to install additional files\n"
"into your personal Evolution directory"
@@ -6562,28 +6644,28 @@ msgstr ""
"���� Evolution �ο������С������Ϥ��ʤ��Υѡ����ʥ� Evolution\n"
"�ǥ��쥯�ȥ������ղåե�����򥤥󥹥ȡ��뤹��ɬ�פ�����ޤ�"
-#: shell/e-setup.c:117
+#: shell/e-setup.c:123
msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
msgstr "\"OK\" �ǥե�����򥤥󥹥ȡ���, �ޤ��� \"����󥻥�\" �ǽ�λ���ޤ�"
-#: shell/e-setup.c:157
+#: shell/e-setup.c:163
msgid "Could not update files correctly"
msgstr "�������ե�����򹹿�����ޤ���Ǥ���"
-#: shell/e-setup.c:160 shell/e-setup.c:228
+#: shell/e-setup.c:166 shell/e-setup.c:234
msgid "Evolution files successfully installed."
msgstr "Evolution �Υե���������������󥹥ȡ��뤵��ޤ���"
-#: shell/e-setup.c:189
+#: shell/e-setup.c:195
msgid "This seems to be the first time you are running Evolution."
msgstr "����� Evolution ��¹Ԥ����ǽ�Τ褦�˻פ��ޤ�"
-#: shell/e-setup.c:190
+#: shell/e-setup.c:196
msgid "Please click \"OK\" to install the Evolution user files under"
msgstr ""
"Evolution �桼���ե�����򥤥󥹥ȡ��뤷�ޤ��Τ� \"OK\" �򥯥�å����Ʋ�����"
-#: shell/e-setup.c:209
+#: shell/e-setup.c:215
#, c-format
msgid ""
"Cannot create the directory\n"
@@ -6594,7 +6676,7 @@ msgstr ""
"\n"
"���顼: %s"
-#: shell/e-setup.c:224
+#: shell/e-setup.c:230
#, c-format
msgid ""
"Cannot copy files into\n"
@@ -6603,7 +6685,7 @@ msgstr ""
"'%s' ����˥ե������\n"
"���ԡ�����ޤ���"
-#: shell/e-setup.c:249
+#: shell/e-setup.c:255
#, c-format
msgid ""
"The file `%s' is not a directory.\n"
@@ -6614,7 +6696,7 @@ msgstr ""
"Evolution �桼���ե�����Υ��󥹥ȡ����\n"
"���Ƥ��뤿��˰�ư���Ʋ�����"
-#: shell/e-setup.c:261
+#: shell/e-setup.c:267
#, c-format
msgid ""
"The directory `%s' exists but is not the\n"
@@ -6625,7 +6707,7 @@ msgstr ""
"�ǥ��쥯�ȥ�ǤϤ���ޤ���Evolution �桼��\n"
"�ե�����Υ��󥹥ȡ������Ƥ��뤿��˰�ư���Ʋ�����"
-#: shell/e-shell-folder-creation-dialog.c:96
+#: shell/e-shell-folder-creation-dialog.c:99
#, c-format
msgid ""
"Cannot create the specified folder:\n"
@@ -6634,11 +6716,11 @@ msgstr ""
"���ꤵ�줿�ե������������뤳�Ȥ�����ޤ���:\n"
"%s"
-#: shell/e-shell-folder-creation-dialog.c:153
+#: shell/e-shell-folder-creation-dialog.c:156
msgid "The specified folder name is not valid."
msgstr "���ꤵ�줿�ե����̾��ͭ���ǤϤ���ޤ���"
-#: shell/e-shell-folder-creation-dialog.c:245
+#: shell/e-shell-folder-creation-dialog.c:248
msgid "Evolution - Create new folder"
msgstr "Evolution - �����ե�����κ���"
@@ -6650,27 +6732,27 @@ msgstr ""
"���򤷤��ե�����μ��̤��׵ᤵ�줿���Τ����\n"
"ͭ���ǤϤ���ޤ���"
-#: shell/e-shell-folder-selection-dialog.c:318
+#: shell/e-shell-folder-selection-dialog.c:319
msgid "New..."
msgstr "����..."
-#: shell/e-shell-folder-title-bar.c:451 shell/e-shell-folder-title-bar.c:452
+#: shell/e-shell-folder-title-bar.c:459 shell/e-shell-folder-title-bar.c:460
msgid "(Untitled)"
msgstr "(�����ȥ�ʤ�)"
-#: shell/e-shell-view-menu.c:160
+#: shell/e-shell-view-menu.c:173
msgid "Bug buddy was not found in your $PATH."
msgstr "Bug buddy �Ϥ��ʤ��� $PATH �ˤϸ��Ĥ���ޤ���"
-#: shell/e-shell-view-menu.c:166
+#: shell/e-shell-view-menu.c:179
msgid "Bug buddy could not be run."
msgstr "Bug buddy �ϼ¹ԤǤ��ޤ���Ǥ���"
-#: shell/e-shell-view-menu.c:195
+#: shell/e-shell-view-menu.c:208
msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
-#: shell/e-shell-view-menu.c:197
+#: shell/e-shell-view-menu.c:210
msgid ""
"Evolution is a suite of groupware applications\n"
"for mail, calendaring, and contact management\n"
@@ -6682,34 +6764,30 @@ msgstr ""
"���롼�ץ��������ץꥱ��������\n"
"�ѥå��������եȤǤ�"
-#: shell/e-shell-view-menu.c:361
+#: shell/e-shell-view-menu.c:374
msgid "Go to folder..."
msgstr "�ե�����ذ�ư..."
-#: shell/e-shell-view.c:143
+#: shell/e-shell-view.c:148
msgid "(No folder displayed)"
msgstr "(ɽ�������ե�����Ϥ���ޤ���)"
-#: shell/e-shell-view.c:474
-msgid "Folders"
-msgstr "�ե����"
-
-#: shell/e-shell-view.c:1124
+#: shell/e-shell-view.c:1129
#, c-format
msgid "%s - Evolution %s"
msgstr "%s - Evolution - %s"
-#: shell/e-shell-view.c:1126
+#: shell/e-shell-view.c:1131
#, c-format
msgid "%s - Evolution %s [%s]"
msgstr "%s - Evolution %s [%s]"
-#: shell/e-shell.c:372
+#: shell/e-shell.c:378
#, c-format
msgid "Cannot set up local storage -- %s"
msgstr "�����������֤Υ��åȥ��åפ�����ޤ��� -- %s"
-#: shell/e-shell.c:1242
+#: shell/e-shell.c:1248
#, c-format
msgid ""
"Ooops! The view for `%s' have died unexpectedly. :-(\n"
@@ -6718,15 +6796,15 @@ msgstr ""
"`%s' �ӥ塼��������˴���ޤ��� :-(\n"
"����Ϥ��֤� %s ����ݡ��ͥ�Ȥ�����å��夷�����Ȥ��̣���ޤ�"
-#: shell/e-shortcuts-view.c:123
+#: shell/e-shortcuts-view.c:134
msgid "Create new shortcut group"
msgstr "�������硼�ȥ��åȥ��롼�פ�������ޤ�"
-#: shell/e-shortcuts-view.c:126
+#: shell/e-shortcuts-view.c:137
msgid "Group name:"
msgstr "���롼��̾:"
-#: shell/e-shortcuts-view.c:249
+#: shell/e-shortcuts-view.c:260
#, c-format
msgid ""
"Do you really want to remove group\n"
@@ -6735,63 +6813,63 @@ msgstr ""
"�����˥��硼�ȥ��åȥС����饰�롼��\n"
"`%s' �����������Ǥ���?"
-#: shell/e-shortcuts-view.c:254
+#: shell/e-shortcuts-view.c:265
msgid "Don't remove"
msgstr "������ޤ���"
-#: shell/e-shortcuts-view.c:265
+#: shell/e-shortcuts-view.c:276
msgid "_Small Icons"
msgstr "��������������(_S)"
-#: shell/e-shortcuts-view.c:266
+#: shell/e-shortcuts-view.c:277
msgid "Show the shortcuts as small icons"
msgstr "��������������ǥ��硼�ȥ��åȤ�ɽ�����ޤ�"
-#: shell/e-shortcuts-view.c:268
+#: shell/e-shortcuts-view.c:279
msgid "_Large Icons"
msgstr "�礭����������(_L)"
-#: shell/e-shortcuts-view.c:269
+#: shell/e-shortcuts-view.c:280
msgid "Show the shortcuts as large icons"
msgstr "�礭����������ǥ��硼�ȥ��åȤ�ɽ�����ޤ�"
-#: shell/e-shortcuts-view.c:280
+#: shell/e-shortcuts-view.c:291
msgid "_New Group..."
msgstr "�������롼��(_N)..."
-#: shell/e-shortcuts-view.c:281
+#: shell/e-shortcuts-view.c:292
msgid "Create a new shortcut group"
msgstr "�������硼�ȥ��åȥ��롼�פ�������ޤ�"
-#: shell/e-shortcuts-view.c:283
+#: shell/e-shortcuts-view.c:294
msgid "_Remove This Group..."
msgstr "���Υ��롼�פ���(_R)..."
-#: shell/e-shortcuts-view.c:284
+#: shell/e-shortcuts-view.c:295
msgid "Remove this shortcut group"
msgstr "���Υ��硼�ȥ��åȥ��롼�פ������ޤ�"
-#: shell/e-shortcuts-view.c:289
+#: shell/e-shortcuts-view.c:300
msgid "_Hide the Shortcut Bar"
msgstr "���硼�ȥ��åȥС��򱣤�(_H)"
-#: shell/e-shortcuts-view.c:290
+#: shell/e-shortcuts-view.c:301
msgid "Hide the shortcut bar"
msgstr "���硼�ȥ��åȥС��򱣤��ޤ�"
-#: shell/e-shortcuts-view.c:374
+#: shell/e-shortcuts-view.c:385
msgid "Activate"
msgstr "�����ƥ���"
-#: shell/e-shortcuts-view.c:374
+#: shell/e-shortcuts-view.c:385
msgid "Activate this shortcut"
msgstr "���Υ��硼�ȥ��åȤ򥢥��ƥ��֤ˤ��ޤ�"
-#: shell/e-shortcuts-view.c:377
+#: shell/e-shortcuts-view.c:388
msgid "Remove this shortcut from the shortcut bar"
msgstr "���硼�ȥ��åȥС����餳�Υ��硼�ȥ��åȤ������ޤ�"
-#: shell/e-shortcuts.c:375
+#: shell/e-shortcuts.c:379
msgid "Error saving shortcuts."
msgstr "���硼�ȥ��åȤ���¸��˥��顼��ȯ�����ޤ���"
@@ -6857,7 +6935,7 @@ msgstr "���ꤵ�줿���̤Ϥ��ε������֤Ǥϥ��ݡ��Ȥ���Ƥ��ޤ���"
msgid "The Evolution shell."
msgstr "Evolution ������"
-#: shell/main.c:73
+#: shell/main.c:83
#, no-c-format
msgid ""
"Hi. Thanks for taking the time to download this PREVIEW RELEASE\n"
@@ -6893,7 +6971,7 @@ msgstr ""
"�桹�Ϥ��ʤ����桹�����̤�ڤ��ळ�Ȥ�˾��Ǥ��ޤ��������Ʋ桹��\n"
"Ǯ���ˤ��ʤ��ι׸����Ԥ������Ƥ��ޤ�!\n"
-#: shell/main.c:98
+#: shell/main.c:108
msgid ""
"Thanks\n"
"The Evolution Team\n"
@@ -6901,15 +6979,19 @@ msgstr ""
"���꤬�Ȥ�\n"
"Evolution ������\n"
-#: shell/main.c:129
+#: shell/main.c:139
msgid "Cannot initialize the Evolution shell."
msgstr "Evolution ������ν����������ޤ���"
-#: shell/main.c:175
-msgid "Disable."
-msgstr "̵��"
+#: shell/main.c:185
+msgid "Disable splash screen"
+msgstr "���ץ�å�����̤�̵���ˤ���"
+
+#: shell/main.c:186
+msgid "Send the debugging output of all components to a file."
+msgstr ""
-#: shell/main.c:195
+#: shell/main.c:219
msgid "Cannot initialize the Bonobo component system."
msgstr "Bonobo ����ݡ��ͥ�ȥ����ƥ����������ޤ���"
@@ -6933,8 +7015,7 @@ msgstr "���󥿥��Ȥ򸡺����ޤ�"
msgid "New contact"
msgstr "�������󥿥���"
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:22
-#: ui/evolution-mail.xml.h:27
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-mail.xml.h:28
msgid "Previews the message to be printed"
msgstr "����������å������Υץ�ӥ塼��ɽ�����ޤ�"
@@ -6942,7 +7023,7 @@ msgstr "����������å������Υץ�ӥ塼��ɽ�����ޤ�"
msgid "Print contacts"
msgstr "���󥿥��Ȥ�������ޤ�"
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:47
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:48
msgid "Stop"
msgstr "���"
@@ -6976,7 +7057,7 @@ msgid "_Search for contacts"
msgstr "���󥿥��Ȥθ���(_S)"
#: ui/evolution-addressbook.xml.h:20 ui/evolution-calendar.xml.h:44
-#: ui/evolution-event-editor.xml.h:74 ui/evolution-mail.xml.h:77
+#: ui/evolution-event-editor.xml.h:74 ui/evolution-mail.xml.h:78
#: ui/evolution-task-editor-dialog.xml.h:88 ui/evolution.xml.h:42
msgid "_Tools"
msgstr "�ġ���(_T)"
@@ -7054,6 +7135,10 @@ msgstr "�������򳫤�"
msgid "Prev"
msgstr "��"
+#: ui/evolution-calendar.xml.h:22
+msgid "Previews the calendar to be printed"
+msgstr "��������륫�����Υץ�ӥ塼��ɽ�����ޤ�"
+
#: ui/evolution-calendar.xml.h:25
msgid "Print calendar"
msgstr "���������"
@@ -7086,8 +7171,8 @@ msgstr "1 ���֤�ɽ��"
msgid "Show the working week"
msgstr "��ϫƯ���֤�ɽ��"
-#: ui/evolution-calendar.xml.h:34 widgets/misc/e-cell-date-edit.c:223
-#: widgets/misc/e-dateedit.c:413
+#: ui/evolution-calendar.xml.h:34 widgets/misc/e-cell-date-edit.c:226
+#: widgets/misc/e-dateedit.c:422
msgid "Today"
msgstr "����"
@@ -7120,7 +7205,7 @@ msgstr "����(_N)"
msgid "_Open Calendar"
msgstr "�������򳫤�(_O)"
-#: ui/evolution-calendar.xml.h:43 ui/evolution-mail.xml.h:74
+#: ui/evolution-calendar.xml.h:43 ui/evolution-mail.xml.h:75
#: ui/evolution-tasks.xml.h:8
msgid "_Save As..."
msgstr "��̾����¸(_S)..."
@@ -7151,7 +7236,7 @@ msgid "Print this item"
msgstr "���Υ����ƥ�����"
#: ui/evolution-contact-editor.xml.h:7 ui/evolution-event-editor.xml.h:38
-#: ui/evolution-mail.xml.h:32 ui/evolution-task-editor-dialog.xml.h:41
+#: ui/evolution-mail.xml.h:33 ui/evolution-task-editor-dialog.xml.h:41
msgid "Print..."
msgstr "����..."
@@ -7328,7 +7413,7 @@ msgid "Print Setup"
msgstr "�ץ�󥿤�����"
#: ui/evolution-event-editor.xml.h:40 ui/evolution-message-composer.xml.h:14
-#: ui/evolution-task-editor-dialog.xml.h:50 widgets/misc/e-filter-bar.c:233
+#: ui/evolution-task-editor-dialog.xml.h:50 widgets/misc/e-filter-bar.c:239
msgid "Save"
msgstr "��¸"
@@ -7427,7 +7512,7 @@ msgstr "Ž���դ�(_P)"
msgid "_Print"
msgstr "����(_P)"
-#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:70
+#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:71
#: ui/evolution-task-editor-dialog.xml.h:83
msgid "_Properties..."
msgstr "�ץ��ѥƥ�(_P)..."
@@ -7514,70 +7599,74 @@ msgid "Full _Headers"
msgstr "���٤ƤΥإå�(_H)"
#: ui/evolution-mail.xml.h:18
+msgid "Hide Deleted Messages"
+msgstr "������줿��å������򱣤�"
+
+#: ui/evolution-mail.xml.h:19
msgid "Hide S_elected Messages"
msgstr "���򤵤줿��å������򱣤�(_e)"
-#: ui/evolution-mail.xml.h:19
+#: ui/evolution-mail.xml.h:20
msgid "Hide _Deleted Messages"
msgstr "������줿��å������򱣤�(_D)"
-#: ui/evolution-mail.xml.h:20
+#: ui/evolution-mail.xml.h:21
msgid "Hide _Read messages"
msgstr "���ɥ�å������򱣤�(_R)"
-#: ui/evolution-mail.xml.h:21
+#: ui/evolution-mail.xml.h:22
msgid "Manage _Subscriptions..."
msgstr "������ɴ���(_S)..."
-#: ui/evolution-mail.xml.h:22
+#: ui/evolution-mail.xml.h:23
msgid "Mar_k as Read"
msgstr "���ɤȤ��ƥޡ���(_k)"
-#: ui/evolution-mail.xml.h:23
+#: ui/evolution-mail.xml.h:24
msgid "Mark All as R_ead"
msgstr "���ɤȤ��Ƥ��٤ƥޡ���(_e)"
-#: ui/evolution-mail.xml.h:24
+#: ui/evolution-mail.xml.h:25
msgid "Mark as U_nread"
msgstr "̤�ɤȤ��ƥޡ���(_n)"
-#: ui/evolution-mail.xml.h:25
+#: ui/evolution-mail.xml.h:26
msgid "Move"
msgstr "��ư"
-#: ui/evolution-mail.xml.h:26
+#: ui/evolution-mail.xml.h:27
msgid "Move message to a new folder"
msgstr "��å������򿷵��ե�����ذ�ư���ޤ�"
-#: ui/evolution-mail.xml.h:30
+#: ui/evolution-mail.xml.h:31
msgid "Print message to the printer"
msgstr "��å�������ץ�󥿤ذ������ޤ�"
-#: ui/evolution-mail.xml.h:33
+#: ui/evolution-mail.xml.h:34
msgid "Redirect (FIXME: implement me)"
msgstr "��̾��񤭴����� (FIXME: �������Ƥ�������)"
-#: ui/evolution-mail.xml.h:36
+#: ui/evolution-mail.xml.h:37
msgid "Reply to _All"
msgstr "�������ֿ�(_A)"
-#: ui/evolution-mail.xml.h:39
+#: ui/evolution-mail.xml.h:40
msgid "S_ource"
msgstr "������(_o)"
-#: ui/evolution-mail.xml.h:40 ui/evolution-subscribe.xml.h:7
+#: ui/evolution-mail.xml.h:41 ui/evolution-subscribe.xml.h:7
msgid "Select _All"
msgstr "���٤�����(_A)"
-#: ui/evolution-mail.xml.h:41
+#: ui/evolution-mail.xml.h:42
msgid "Select _Thread"
msgstr "����åɤ�����(_T)"
-#: ui/evolution-mail.xml.h:42
+#: ui/evolution-mail.xml.h:43
msgid "Send / Receive"
msgstr "������"
-#: ui/evolution-mail.xml.h:43
+#: ui/evolution-mail.xml.h:44
msgid ""
"Send queued mail\n"
" and retrieve new mail"
@@ -7585,119 +7674,119 @@ msgstr ""
"���塼�ˤ���᡼�����������\n"
" �����᡼���������ޤ�"
-#: ui/evolution-mail.xml.h:45
+#: ui/evolution-mail.xml.h:46
msgid "Send queued mail and retrieve new mail"
msgstr "���塼�ˤ���᡼����������ƿ����᡼���������ޤ�"
-#: ui/evolution-mail.xml.h:46
+#: ui/evolution-mail.xml.h:47
msgid "Show _All"
msgstr "���٤�ɽ��(_A)"
-#: ui/evolution-mail.xml.h:48
+#: ui/evolution-mail.xml.h:49
msgid "Threaded Message list"
msgstr "��å������ꥹ�Ȥ򥹥�åɲ����ޤ�"
-#: ui/evolution-mail.xml.h:49
+#: ui/evolution-mail.xml.h:50
msgid "VFolder on Se_nder"
msgstr "�����Ԥβ��ۥե����(_n)"
-#: ui/evolution-mail.xml.h:50
+#: ui/evolution-mail.xml.h:51
msgid "VFolder on _Recipients"
msgstr "�����Ԥβ��ۥե����(_R)"
-#: ui/evolution-mail.xml.h:51
+#: ui/evolution-mail.xml.h:52
msgid "VFolder on _Subject"
msgstr "��̾�β��ۥե����(_S)"
-#: ui/evolution-mail.xml.h:52
+#: ui/evolution-mail.xml.h:53
msgid "View Raw Message Source"
msgstr "̤�ù���å������Υ�������ɽ�����ޤ�"
-#: ui/evolution-mail.xml.h:53
+#: ui/evolution-mail.xml.h:54
msgid "Virtual Folder _Editor..."
msgstr "���ۥե�������ǥ���(_E)..."
-#: ui/evolution-mail.xml.h:54
+#: ui/evolution-mail.xml.h:55
msgid "_Apply Filters"
msgstr "�ե��륿Ŭ��(_A)"
-#: ui/evolution-mail.xml.h:55
+#: ui/evolution-mail.xml.h:56
msgid "_Attachment"
msgstr "ź��(_A)"
-#: ui/evolution-mail.xml.h:56
+#: ui/evolution-mail.xml.h:57
msgid "_Compose"
msgstr "����(_C)"
-#: ui/evolution-mail.xml.h:57
+#: ui/evolution-mail.xml.h:58
msgid "_Copy to Folder..."
msgstr "�ե�����إ��ԡ�(_C)..."
-#: ui/evolution-mail.xml.h:58
+#: ui/evolution-mail.xml.h:59
msgid "_Create Filter From Message"
msgstr "��å���������ե��륿�����(_C)"
-#: ui/evolution-mail.xml.h:60
+#: ui/evolution-mail.xml.h:61
msgid "_Expunge"
msgstr "����(_E)"
-#: ui/evolution-mail.xml.h:61
+#: ui/evolution-mail.xml.h:62
msgid "_Filters..."
msgstr "�ե��륿(_F)..."
-#: ui/evolution-mail.xml.h:62 ui/evolution.xml.h:31
+#: ui/evolution-mail.xml.h:63 ui/evolution.xml.h:31
msgid "_Folder"
msgstr "�ե����(_F)"
-#: ui/evolution-mail.xml.h:63
+#: ui/evolution-mail.xml.h:64
msgid "_Forward"
msgstr "ž��(_F)"
-#: ui/evolution-mail.xml.h:64
+#: ui/evolution-mail.xml.h:65
msgid "_Inline"
msgstr "����饤��(_I)"
-#: ui/evolution-mail.xml.h:65 ui/evolution-subscribe.xml.h:12
+#: ui/evolution-mail.xml.h:66 ui/evolution-subscribe.xml.h:12
msgid "_Invert Selection"
msgstr "�����ȿž(_I)"
-#: ui/evolution-mail.xml.h:66
+#: ui/evolution-mail.xml.h:67
msgid "_Mail Message"
msgstr "��å�������᡼��(_M)"
-#: ui/evolution-mail.xml.h:67
+#: ui/evolution-mail.xml.h:68
msgid "_Mail Settings..."
msgstr "�᡼������(_M)..."
-#: ui/evolution-mail.xml.h:68
+#: ui/evolution-mail.xml.h:69
msgid "_Move to Folder..."
msgstr "�ե�����ذ�ư(_M)..."
-#: ui/evolution-mail.xml.h:69
+#: ui/evolution-mail.xml.h:70
msgid "_Open Selected Items"
msgstr "���򤵤줿�����ƥ�򳫤�(_O)"
-#: ui/evolution-mail.xml.h:71
+#: ui/evolution-mail.xml.h:72
msgid "_Quoted"
msgstr "����(_Q)"
-#: ui/evolution-mail.xml.h:72
+#: ui/evolution-mail.xml.h:73
msgid "_Reply"
msgstr "�ֿ�(_R)"
-#: ui/evolution-mail.xml.h:73
+#: ui/evolution-mail.xml.h:74
msgid "_Resend Messages"
msgstr "�������������(_R)"
-#: ui/evolution-mail.xml.h:75
+#: ui/evolution-mail.xml.h:76
msgid "_Send / Receive"
msgstr "������(_S)"
-#: ui/evolution-mail.xml.h:76
+#: ui/evolution-mail.xml.h:77
msgid "_Threaded"
msgstr "����å�(_T)"
-#: ui/evolution-mail.xml.h:78
+#: ui/evolution-mail.xml.h:79
msgid "_Undelete"
msgstr "������(_U)"
@@ -7856,7 +7945,7 @@ msgstr "�������ƥ�(_S)"
#: ui/evolution-subscribe.xml.h:1
msgid "Add folder to your list of subscribed folders"
-msgstr ""
+msgstr "���ɥե�����Υꥹ�Ȥإե�������ɲ�"
#: ui/evolution-subscribe.xml.h:3
msgid "F_older"
@@ -7872,7 +7961,7 @@ msgstr "�ե�����ꥹ�Ȥ򹹿�"
#: ui/evolution-subscribe.xml.h:6
msgid "Remove folder from your list of subscribed folders"
-msgstr ""
+msgstr "���ɥե�����Υꥹ�Ȥ���ե��������"
#: ui/evolution-subscribe.xml.h:8
msgid "Subscribe"
@@ -8100,84 +8189,88 @@ msgstr "���硼�ȥ��åȥС�(_S)"
#. This is a strftime() format string %A = full weekday name,
#. %B = full month name, %d = month day, %Y = full year.
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:463
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2471
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2475
msgid "%A, %B %d, %Y"
msgstr "%Yǯ %m�� %d�� %A"
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:390
+msgid "Tentative"
+msgstr "����"
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:391
msgid "Busy"
msgstr "�ӥ���"
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
msgid "Out of Office"
msgstr "���ե����γ�"
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
msgid "No Information"
msgstr "����ʤ�"
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:405
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:409
msgid "_Invite Others..."
msgstr "¾�ξ���(_I)..."
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:429
msgid "_Options"
msgstr "���ץ����(_O)"
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:442
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:446
msgid "Show _Only Working Hours"
msgstr "�Ż���λ��֤���ɽ��(_O)"
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:455
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:459
msgid "Show _Zoomed Out"
msgstr "�̾�����ɽ��(_Z)"
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:477
msgid "_Update Free/Busy"
msgstr "�ե꡼/�ӥ��� �ι���(_U)"
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:491
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:495
msgid "_<<"
msgstr "<<(_<)"
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:508
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:512
msgid "_Autopick"
msgstr "��ư�ԥå����å�(_A)"
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:522
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:526
msgid ">_>"
msgstr ">>(_>)"
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:539
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:543
msgid "_All People and Resources"
msgstr "���٤Ƥο͡��ȥ꥽����(_A)"
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:552
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:556
msgid "All _People and One Resource"
msgstr "���٤Ƥο͡��ȤҤȤĤΥ꥽����(_P)"
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:565
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:569
msgid "_Required People"
msgstr "�͡���ɬ��(_R)"
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:578
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:582
msgid "Required People and _One Resource"
msgstr "�͡��ȤҤȤĤΥ꥽������ɬ��(_O)"
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:601
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:605
msgid "Meeting _start time:"
msgstr "��ij��ϻ���(_s):"
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:625
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:629
msgid "Meeting _end time:"
msgstr "��Ľ�λ����(_e):"
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:738
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:742
msgid "All Attendees"
msgstr "���٤Ƥ��դ�ź��"
-#: widgets/menus/gal-view-menus.c:171
+#: widgets/menus/gal-view-menus.c:177
msgid "_Current View"
msgstr "���ߤ�ɽ��(_C)"
@@ -8192,15 +8285,15 @@ msgstr "MTWTFSS"
msgid "%B %Y"
msgstr "%Y %B"
-#: widgets/misc/e-cell-date-edit.c:215 widgets/misc/e-dateedit.c:407
+#: widgets/misc/e-cell-date-edit.c:218 widgets/misc/e-dateedit.c:416
msgid "Now"
msgstr "��"
-#: widgets/misc/e-cell-date-edit.c:239
+#: widgets/misc/e-cell-date-edit.c:242
msgid "OK"
msgstr "OK"
-#: widgets/misc/e-cell-date-edit.c:720
+#: widgets/misc/e-cell-date-edit.c:723
#, c-format
msgid "The time must be in the format: %s"
msgstr "���֤ϥե����ޥåȤ�����ʤ���Фʤ�ޤ���: %s"
@@ -8209,40 +8302,40 @@ msgstr "���֤ϥե����ޥåȤ�����ʤ���Фʤ�ޤ���: %s"
msgid "..."
msgstr "..."
-#: widgets/misc/e-filter-bar.c:160
+#: widgets/misc/e-filter-bar.c:166
msgid "Save Search"
msgstr ""
-#: widgets/misc/e-filter-bar.c:231
+#: widgets/misc/e-filter-bar.c:237
msgid "Advanced Search"
msgstr "��鸡��"
-#: widgets/misc/e-filter-bar.c:311
+#: widgets/misc/e-filter-bar.c:317
msgid "Advanced ..."
msgstr "��� ..."
-#: widgets/misc/e-messagebox.c:141
+#: widgets/misc/e-messagebox.c:152
msgid "Information"
msgstr "����"
-#: widgets/misc/e-messagebox.c:148
+#: widgets/misc/e-messagebox.c:159
msgid "Warning"
msgstr "�ٹ�"
-#: widgets/misc/e-messagebox.c:162
+#: widgets/misc/e-messagebox.c:173
msgid "Question"
msgstr "����"
-#: widgets/misc/e-messagebox.c:169
+#: widgets/misc/e-messagebox.c:180
msgid "Message"
msgstr "������"
#. Add the "Don't show this message again." checkbox
-#: widgets/misc/e-messagebox.c:213
+#: widgets/misc/e-messagebox.c:224
msgid "Don't show this message again."
msgstr "���Υ�å����������٤�ɽ�����ʤ�"
-#: widgets/misc/e-search-bar.c:140
+#: widgets/misc/e-search-bar.c:147
msgid "Sear_ch"
msgstr "����(_c)"
@@ -8254,14 +8347,14 @@ msgstr "�ѡ����ʥ륢�ɥ쥹Ģ������"
msgid "The Personal Calendar Server; calendar factory"
msgstr "�ѡ����ʥ륫����������; �������ե����ȥ�"
-#: wombat/wombat.c:165
+#: wombat/wombat.c:173
msgid "setup_vfs(): could not initialize GNOME-VFS"
msgstr "setup_vfs(): GNOME-VFS���������뤳�Ȥ�����ޤ���Ǥ���"
-#: wombat/wombat.c:177
+#: wombat/wombat.c:185
msgid "init_corba(): could not initialize GNOME"
msgstr "init_corba(): GNOME ���������뤳�Ȥ�����ޤ���Ǥ���"
-#: wombat/wombat.c:190
+#: wombat/wombat.c:198
msgid "init_bonobo(): could not initialize Bonobo"
msgstr "init_bonobo(): Bonobo ���������뤳�Ȥ�����ޤ���Ǥ���"