aboutsummaryrefslogtreecommitdiffstats
path: root/po/ja.po
diff options
context:
space:
mode:
Diffstat (limited to 'po/ja.po')
-rw-r--r--po/ja.po4928
1 files changed, 2892 insertions, 2036 deletions
diff --git a/po/ja.po b/po/ja.po
index e328d17368..eab4a77f9a 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -4,9 +4,9 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: evolution CVS-20000909\n"
-"POT-Creation-Date: 2000-09-09 19:41+0900\n"
-"PO-Revision-Date: 2000-09-09 21:51+0900\n"
+"Project-Id-Version: evolution CVS-20001025\n"
+"POT-Creation-Date: 2000-10-25 16:02+0900\n"
+"PO-Revision-Date: 2000-10-25 18:25+0900\n"
"Last-Translator: Akira TAGOH <tagoh@gnome.gr.jp>\n"
"Language-Team: Japanese <translation@gnome.gr.jp>\n"
"MIME-Version: 1.0\n"
@@ -14,14 +14,13 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#: addressbook/backend/ebook/load-gnomecard-addressbook.c:16
-#: addressbook/backend/ebook/load-pine-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/conduit/address-conduit.c:1215
-#: addressbook/gui/component/addressbook-factory.c:37
-#: addressbook/gui/minicard/test-minicard-view.c:45
-#: calendar/conduits/calendar/calendar-conduit.c:1673
-#: calendar/conduits/todo/todo-conduit.c:1298 calendar/gui/main.c:55
+#: addressbook/conduit/address-conduit.c:1064
+#: addressbook/gui/component/addressbook-factory.c:38
+#: calendar/conduits/calendar/calendar-conduit.c:1053
+#: calendar/conduits/todo/todo-conduit.c:934 calendar/gui/main.c:55
msgid "Could not initialize Bonobo"
msgstr "Bonobo �ν����������ޤ���Ǥ���"
@@ -29,86 +28,98 @@ msgstr "Bonobo �ν����������ޤ���Ǥ���"
#. in GnomePilotConduitSyncType as they are used as index.
#. Custom type implies Disabled state.
#.
-#: addressbook/conduit/address-conduit-control-applet.c:54
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:55
-#: calendar/conduits/todo/todo-conduit-control-applet.c:55
+#: addressbook/conduit/address-conduit-control-applet.c:77
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:77
+#: calendar/conduits/todo/todo-conduit-control-applet.c:77
msgid "Disabled"
msgstr "̵��"
-#: addressbook/conduit/address-conduit-control-applet.c:55
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:56
-#: calendar/conduits/todo/todo-conduit-control-applet.c:56
+#: addressbook/conduit/address-conduit-control-applet.c:78
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:78
+#: calendar/conduits/todo/todo-conduit-control-applet.c:78
msgid "Synchronize"
msgstr "Ʊ��"
-#: addressbook/conduit/address-conduit-control-applet.c:56
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:57
-#: calendar/conduits/todo/todo-conduit-control-applet.c:57
+#: addressbook/conduit/address-conduit-control-applet.c:79
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:79
+#: calendar/conduits/todo/todo-conduit-control-applet.c:79
msgid "Copy From Pilot"
msgstr "�ѥ����åȤ��饳�ԡ�"
-#: addressbook/conduit/address-conduit-control-applet.c:57
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:58
-#: calendar/conduits/todo/todo-conduit-control-applet.c:58
+#: addressbook/conduit/address-conduit-control-applet.c:80
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:80
+#: calendar/conduits/todo/todo-conduit-control-applet.c:80
msgid "Copy To Pilot"
msgstr "�ѥ����åȤإ��ԡ�"
-#: addressbook/conduit/address-conduit-control-applet.c:58
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:59
-#: calendar/conduits/todo/todo-conduit-control-applet.c:59
+#: addressbook/conduit/address-conduit-control-applet.c:81
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:81
+#: calendar/conduits/todo/todo-conduit-control-applet.c:81
msgid "Merge From Pilot"
msgstr "�ѥ����åȤ���ޡ���"
-#: addressbook/conduit/address-conduit-control-applet.c:59
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:60
-#: calendar/conduits/todo/todo-conduit-control-applet.c:60
+#: addressbook/conduit/address-conduit-control-applet.c:82
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:82
+#: calendar/conduits/todo/todo-conduit-control-applet.c:82
msgid "Merge To Pilot"
msgstr "�ѥ����åȤإޡ���"
-#: addressbook/conduit/address-conduit-control-applet.c:143
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:144
-#: calendar/conduits/todo/todo-conduit-control-applet.c:144
+#: addressbook/conduit/address-conduit-control-applet.c:121
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:121
+#: calendar/conduits/todo/todo-conduit-control-applet.c:121
+msgid "JP Rosevear <jpr@helixcode.com>"
+msgstr "JP Rosevear <jpr@helixcode.com>"
+
+#: addressbook/conduit/address-conduit-control-applet.c:122
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:122
+#: calendar/conduits/todo/todo-conduit-control-applet.c:122
+msgid "Original Author:"
+msgstr "���ꥸ�ʥ������:"
+
+#: addressbook/conduit/address-conduit-control-applet.c:123
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:123
+#: calendar/conduits/todo/todo-conduit-control-applet.c:123
msgid "Eskil Heyn Olsen <deity@eskil.dk>"
msgstr "Eskil Heyn Olsen <deity@eskil.dk>"
-#: addressbook/conduit/address-conduit-control-applet.c:145
-msgid "Gpilotd address conduit"
-msgstr "Gpilotd ���ɥ쥹���󥸥å�"
+#: addressbook/conduit/address-conduit-control-applet.c:127
+msgid "Evolution Addressbook Conduit"
+msgstr "Evolution ���ɥ쥹Ģ���󥸥å�"
-#: addressbook/conduit/address-conduit-control-applet.c:146
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:147
-#: calendar/conduits/todo/todo-conduit-control-applet.c:147
-msgid "(C) 1998 the Free Software Foundation"
-msgstr "(C) 1998 the Free Software Foundation"
+#: addressbook/conduit/address-conduit-control-applet.c:128
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:128
+#: calendar/conduits/todo/todo-conduit-control-applet.c:128
+msgid "(C) 1998-2000 the Free Software Foundation and Helix Code"
+msgstr "(C) 1998-2000 the Free Software Foundation and Helix Code"
-#: addressbook/conduit/address-conduit-control-applet.c:148
-msgid "Configuration utility for the address conduit.\n"
-msgstr "���ɥ쥹���󥸥åȤΤ��������桼�ƥ���ƥ��Ǥ�\n"
+#: addressbook/conduit/address-conduit-control-applet.c:130
+msgid "Configuration utility for the evolution addressbook conduit.\n"
+msgstr "Evolution ���ɥ쥹Ģ���󥸥åȤΤ��������桼�ƥ���ƥ��Ǥ�\n"
-#: addressbook/conduit/address-conduit-control-applet.c:149
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:150
-#: calendar/conduits/todo/todo-conduit-control-applet.c:150
+#: addressbook/conduit/address-conduit-control-applet.c:131
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:131
+#: calendar/conduits/todo/todo-conduit-control-applet.c:131
msgid "gnome-unknown.xpm"
msgstr "gnome-unknown.xpm"
-#: addressbook/conduit/address-conduit-control-applet.c:190
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:191
-#: calendar/conduits/todo/todo-conduit-control-applet.c:191
+#: addressbook/conduit/address-conduit-control-applet.c:162
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:162
+#: calendar/conduits/todo/todo-conduit-control-applet.c:162
msgid "Synchronize Action"
msgstr "Ʊ��ư��"
-#: addressbook/conduit/address-conduit-control-applet.c:261
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:262
-#: calendar/conduits/todo/todo-conduit-control-applet.c:262
+#: addressbook/conduit/address-conduit-control-applet.c:214
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:215
+#: calendar/conduits/todo/todo-conduit-control-applet.c:214
msgid "Conduit state"
msgstr "���󥸥åȤξ���"
-#: addressbook/conduit/address-conduit-control-applet.c:315
-#: addressbook/conduit/address-conduit-control-applet.c:328
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:316
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:329
-#: calendar/conduits/todo/todo-conduit-control-applet.c:316
-#: calendar/conduits/todo/todo-conduit-control-applet.c:329
+#: addressbook/conduit/address-conduit-control-applet.c:266
+#: addressbook/conduit/address-conduit-control-applet.c:279
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:267
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:280
+#: calendar/conduits/todo/todo-conduit-control-applet.c:266
+#: calendar/conduits/todo/todo-conduit-control-applet.c:279
msgid ""
"No pilot configured, please choose the\n"
"'Pilot Link Properties' capplet first."
@@ -116,15 +127,15 @@ msgstr ""
"�ѥ����åȤ����ꤵ��Ƥ��ޤ��󡤽���\n"
"'�ѥ����åȥ�󥯥ץ��ѥƥ�' ����ץ�åȤ����򤷤Ƥ�������"
-#: addressbook/conduit/address-conduit-control-applet.c:334
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:335
-#: calendar/conduits/todo/todo-conduit-control-applet.c:335
+#: addressbook/conduit/address-conduit-control-applet.c:285
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:286
+#: calendar/conduits/todo/todo-conduit-control-applet.c:285
msgid "Not connected to the gnome-pilot daemon"
msgstr "gnome-pilot �ǡ�������³���Ƥ��ޤ���"
-#: addressbook/conduit/address-conduit-control-applet.c:339
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:340
-#: calendar/conduits/todo/todo-conduit-control-applet.c:340
+#: addressbook/conduit/address-conduit-control-applet.c:290
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:291
+#: calendar/conduits/todo/todo-conduit-control-applet.c:290
msgid ""
"An error occured when trying to fetch\n"
"pilot list from the gnome-pilot daemon"
@@ -132,31 +143,29 @@ msgstr ""
"gnome-pilot �ǡ���󤫤�ѥ����åȥꥹ�Ȥ�\n"
"�������褦�Ȥ������˥��顼��ȯ�����ޤ���"
-#: addressbook/conduit/address-conduit.c:127
-#: addressbook/conduit/address-conduit.c:141
+#: addressbook/conduit/address-conduit.c:194
+#: addressbook/conduit/address-conduit.c:208
msgid "BLARG\n"
msgstr "BLARG\n"
-#: addressbook/conduit/address-conduit.c:471
-#, c-format
-msgid "Address holds %ld address entries"
-msgstr ""
+#: addressbook/conduit/address-conduit.c:638
+#: calendar/conduits/calendar/calendar-conduit.c:615
+#: calendar/conduits/todo/todo-conduit.c:495
+msgid "Could not start wombat server"
+msgstr "wombat �����Ф򳫻Ϥ��뤳�Ȥ�����ޤ���Ǥ���"
-#: addressbook/conduit/address-conduit.c:497
-#: addressbook/conduit/address-conduit.c:499
-msgid "Could not start addressbook server"
-msgstr "���ɥ쥹Ģ�����Ф򳫻Ͻ���ޤ���Ǥ���"
+#: addressbook/conduit/address-conduit.c:639
+#: calendar/conduits/calendar/calendar-conduit.c:616
+#: calendar/conduits/todo/todo-conduit.c:496
+msgid "Could not start wombat"
+msgstr "wombat �򳫻Ϥ��뤳�Ȥ�����ޤ���Ǥ���"
-#: addressbook/conduit/address-conduit.c:512
-#: addressbook/conduit/address-conduit.c:515
+#: addressbook/conduit/address-conduit.c:665
+#: addressbook/conduit/address-conduit.c:668
msgid "Could not read pilot's Address application block"
msgstr ""
"�ѥ����åȤΥ��ɥ쥹���ץꥱ�������֥��å����ɤ߹��ळ�Ȥ�����ޤ���Ǥ���"
-#: addressbook/conduit/address-conduit.c:853
-msgid "Error while communicating with address server"
-msgstr "���ɥ쥹�����Ф��̿���˥��顼��ȯ�����ޤ���"
-
#.
#. * Translatable strings file generated by Glade.
#. * Add this file to your project's POTFILES.in.
@@ -174,471 +183,96 @@ msgstr "�����ƥ�Ϥ����Υ��ƥ����°���Ƥ��ޤ�:"
msgid "Available Categories:"
msgstr "���ѤǤ��륫�ƥ���:"
-#: addressbook/contact-editor/e-contact-editor.c:665
-#: calendar/gui/dialogs/task-editor.c:422 calendar/gui/event-editor.c:1179
-msgid "FIXME: _Appointment"
-msgstr "FIXME: ͽ��(_A)"
-
-#: addressbook/contact-editor/e-contact-editor.c:666
-#: calendar/gui/dialogs/task-editor.c:423 calendar/gui/event-editor.c:1180
-msgid "FIXME: Meeting Re_quest"
-msgstr "FIXME: �����(_q)"
-
-#: addressbook/contact-editor/e-contact-editor.c:668
-#: calendar/gui/dialogs/task-editor.c:421 calendar/gui/event-editor.c:1182
-msgid "FIXME: _Mail Message"
-msgstr "FIXME: �᡼���å�����(_M)"
-
-#: addressbook/contact-editor/e-contact-editor.c:669
-#: calendar/gui/dialogs/task-editor.c:424 calendar/gui/event-editor.c:1183
-msgid "FIXME: _Contact"
-msgstr "FIXME: ���(_C)"
-
-#: addressbook/contact-editor/e-contact-editor.c:670
-#: calendar/gui/dialogs/task-editor.c:418
-#: calendar/gui/dialogs/task-editor.c:425 calendar/gui/event-editor.c:1184
-msgid "FIXME: _Task"
-msgstr "FIXME: ���(_T)"
-
-#: addressbook/contact-editor/e-contact-editor.c:671
-#: calendar/gui/dialogs/task-editor.c:419
-#: calendar/gui/dialogs/task-editor.c:426 calendar/gui/event-editor.c:1185
-msgid "FIXME: Task _Request"
-msgstr "FIXME: ��Ȱ���(_R)"
-
-#: addressbook/contact-editor/e-contact-editor.c:672
-#: calendar/gui/dialogs/task-editor.c:427 calendar/gui/event-editor.c:1186
-msgid "FIXME: _Journal Entry"
-msgstr "FIXME: ��������(_J)"
-
-#: addressbook/contact-editor/e-contact-editor.c:673
-#: calendar/gui/dialogs/task-editor.c:428 calendar/gui/event-editor.c:1187
-msgid "FIXME: _Note"
-msgstr "FIXME: ����(_N)"
-
-#: addressbook/contact-editor/e-contact-editor.c:675
-#: addressbook/contact-editor/e-contact-editor.c:780
-#: calendar/gui/dialogs/task-editor.c:430
-#: calendar/gui/dialogs/task-editor.c:538 calendar/gui/event-editor.c:1189
-#: calendar/gui/event-editor.c:1297
-msgid "FIXME: Ch_oose Form..."
-msgstr "FIXME: �ե����������(_o)..."
-
-#: addressbook/contact-editor/e-contact-editor.c:680
-#: calendar/gui/dialogs/task-editor.c:435 calendar/gui/event-editor.c:1194
-msgid "FIXME: _Memo Style"
-msgstr "FIXME: ��⥹������(_M)"
-
-#: addressbook/contact-editor/e-contact-editor.c:682
-#: calendar/gui/dialogs/task-editor.c:437 calendar/gui/event-editor.c:1196
-msgid "FIXME: Define Print _Styles..."
-msgstr "FIXME: ����������������(_S)..."
-
-#: addressbook/contact-editor/e-contact-editor.c:689
-#: calendar/gui/dialogs/task-editor.c:444 calendar/gui/event-editor.c:1203
-msgid "FIXME: S_end"
-msgstr "FIXME: ����(_e)"
-
-#: addressbook/contact-editor/e-contact-editor.c:693
-#: calendar/gui/dialogs/task-editor.c:448 calendar/gui/event-editor.c:1207
-msgid "FIXME: Save Attac_hments..."
-msgstr "FIXME: ź�դ���¸..."
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:8
-#: addressbook/contact-editor/e-contact-editor.c:695
-#: calendar/gui/dialogs/task-editor.c:450 calendar/gui/event-editor.c:1209
-msgid "_Delete"
-msgstr "���(_D)"
-
-#: addressbook/contact-editor/e-contact-editor.c:696
-#: calendar/gui/dialogs/task-editor.c:452 calendar/gui/event-editor.c:1211
-msgid "FIXME: _Move to Folder..."
-msgstr "FIXME: �ե�����ذ�ư(_M)..."
-
-#: addressbook/contact-editor/e-contact-editor.c:697
-#: calendar/gui/dialogs/task-editor.c:453 calendar/gui/event-editor.c:1212
-msgid "FIXME: Cop_y to Folder..."
-msgstr "FIXME: �ե�����إ��ԡ�(_y)..."
-
-#: addressbook/contact-editor/e-contact-editor.c:699
-#: calendar/gui/dialogs/task-editor.c:455 calendar/gui/event-editor.c:1214
-msgid "Page Set_up"
-msgstr "�ڡ�������(_u)"
-
-#: addressbook/contact-editor/e-contact-editor.c:700
-#: calendar/gui/dialogs/task-editor.c:456 calendar/gui/event-editor.c:1215
-msgid "FIXME: Print Pre_view"
-msgstr "FIXME: �����ץ�ӥ塼(_v)"
-
-#: addressbook/contact-editor/e-contact-editor.c:721
-#: calendar/gui/dialogs/task-editor.c:477 calendar/gui/event-editor.c:1236
-msgid "FIXME: Paste _Special..."
-msgstr "FIXME: �ü�Ž���դ�(_S)..."
-
-#: addressbook/contact-editor/e-contact-editor.c:726
-#: calendar/gui/dialogs/task-editor.c:482 calendar/gui/event-editor.c:1241
-msgid "FIXME: Mark as U_nread"
-msgstr "FIXME: ̤�ɤ˥ޡ���(_n)"
-
-#: addressbook/contact-editor/e-contact-editor.c:730
-#: calendar/gui/dialogs/task-editor.c:486 calendar/gui/event-editor.c:1245
-msgid "_Object"
-msgstr "���֥�������(_O)"
-
-#: addressbook/contact-editor/e-contact-editor.c:735
-#: addressbook/contact-editor/e-contact-editor.c:742
-#: calendar/gui/dialogs/task-editor.c:491
-#: calendar/gui/dialogs/task-editor.c:499 calendar/gui/event-editor.c:1250
-#: calendar/gui/event-editor.c:1257
-msgid "FIXME: _Item"
-msgstr "FIXME: �����ƥ�(_I)"
-
-#: addressbook/contact-editor/e-contact-editor.c:736
-#: addressbook/contact-editor/e-contact-editor.c:743
-#: calendar/gui/dialogs/task-editor.c:492
-#: calendar/gui/dialogs/task-editor.c:500 calendar/gui/event-editor.c:1251
-#: calendar/gui/event-editor.c:1258
-msgid "FIXME: _Unread Item"
-msgstr "FIXME: ̤�ɥ����ƥ�(_U)"
-
-#: addressbook/contact-editor/e-contact-editor.c:737
-#: calendar/gui/dialogs/task-editor.c:494 calendar/gui/event-editor.c:1252
-msgid "FIXME: Fi_rst Item in Folder"
-msgstr "FIXME: �ե�����κǽ�Υ����ƥ�(_r)"
-
-#: addressbook/contact-editor/e-contact-editor.c:744
-#: calendar/gui/dialogs/task-editor.c:502 calendar/gui/event-editor.c:1259
-msgid "FIXME: _Last Item in Folder"
-msgstr "FIXME: �ե�����κǸ�Υ����ƥ�(_L)"
-
-#: addressbook/contact-editor/e-contact-editor.c:749
-#: calendar/gui/dialogs/task-editor.c:507 calendar/gui/event-editor.c:1264
-msgid "FIXME: _Standard"
-msgstr "FIXME: ɸ��(_S)"
-
-#: addressbook/contact-editor/e-contact-editor.c:751
-#: calendar/gui/dialogs/task-editor.c:509 calendar/gui/event-editor.c:1266
-msgid "FIXME: __Formatting"
-msgstr "FIXME: ��(__)"
-
-#: addressbook/contact-editor/e-contact-editor.c:754
-#: calendar/gui/dialogs/task-editor.c:512 calendar/gui/event-editor.c:1269
-msgid "FIXME: _Customize..."
-msgstr "FIXME: �������ޥ���(_C)..."
-
-#: addressbook/contact-editor/e-contact-editor.c:759
-#: calendar/gui/dialogs/task-editor.c:517 calendar/gui/event-editor.c:1274
-msgid "Pre_vious"
-msgstr "��(_v)"
-
-#: addressbook/contact-editor/e-contact-editor.c:760
-#: calendar/gui/dialogs/task-editor.c:518 calendar/gui/event-editor.c:1275
-msgid "Ne_xt"
-msgstr "��(_x)"
-
-#: addressbook/contact-editor/e-contact-editor.c:762
-#: calendar/gui/dialogs/task-editor.c:520 calendar/gui/event-editor.c:1279
-msgid "_Toolbars"
-msgstr "�ġ���С�(_T)"
-
-#: addressbook/contact-editor/e-contact-editor.c:767
-#: calendar/gui/dialogs/task-editor.c:525 calendar/gui/event-editor.c:1284
-msgid "FIXME: _File..."
-msgstr "FIXME: �ե�����(_F)..."
-
-#: addressbook/contact-editor/e-contact-editor.c:768
-#: calendar/gui/dialogs/task-editor.c:526 calendar/gui/event-editor.c:1285
-msgid "FIXME: It_em..."
-msgstr "FIXME: �����ƥ�(_e)..."
-
-#: addressbook/contact-editor/e-contact-editor.c:769
-#: calendar/gui/dialogs/task-editor.c:527 calendar/gui/event-editor.c:1286
-msgid "FIXME: _Object..."
-msgstr "FIXME: ���֥�������(_O)..."
-
-#: addressbook/contact-editor/e-contact-editor.c:774
-#: calendar/gui/dialogs/task-editor.c:532 calendar/gui/event-editor.c:1291
-msgid "FIXME: _Font..."
-msgstr "FIXME: �ե����(_F)..."
-
-#: addressbook/contact-editor/e-contact-editor.c:775
-#: calendar/gui/dialogs/task-editor.c:533 calendar/gui/event-editor.c:1292
-msgid "FIXME: _Paragraph..."
-msgstr "FIXME: ����(_P)..."
-
-#: addressbook/contact-editor/e-contact-editor.c:782
-#: calendar/gui/dialogs/task-editor.c:540 calendar/gui/event-editor.c:1299
-msgid "FIXME: Desi_gn This Form"
-msgstr "FIXME: ���Υե�����Υǥ�����(_g)"
-
-#: addressbook/contact-editor/e-contact-editor.c:783
-#: calendar/gui/dialogs/task-editor.c:541 calendar/gui/event-editor.c:1300
-msgid "FIXME: D_esign a Form..."
-msgstr "FIXME: �ե�����Υǥ�����(_e)"
-
-#: addressbook/contact-editor/e-contact-editor.c:785
-#: calendar/gui/dialogs/task-editor.c:543 calendar/gui/event-editor.c:1302
-msgid "FIXME: Publish _Form..."
-msgstr "FIXME: ȯ�ԥե�����(_F)..."
-
-#: addressbook/contact-editor/e-contact-editor.c:786
-#: calendar/gui/dialogs/task-editor.c:544 calendar/gui/event-editor.c:1303
-msgid "FIXME: Pu_blish Form As..."
-msgstr "FIXME: ¾��ȯ�ԥե�����(_b)..."
-
-#: addressbook/contact-editor/e-contact-editor.c:788
-#: calendar/gui/dialogs/task-editor.c:546 calendar/gui/event-editor.c:1305
-msgid "FIXME: Script _Debugger"
-msgstr "FIXME: ������ץȥǥХå�(_D)"
-
-#: addressbook/contact-editor/e-contact-editor.c:793
-#: calendar/gui/dialogs/task-editor.c:551 calendar/gui/event-editor.c:1310
-msgid "FIXME: _Spelling..."
-msgstr "FIXME: ���ڥ�(_S)..."
-
-#: addressbook/contact-editor/e-contact-editor.c:795
-#: calendar/gui/dialogs/task-editor.c:556 calendar/gui/event-editor.c:1315
-msgid "_Forms"
-msgstr "�ե�����(_F)"
-
-#: addressbook/contact-editor/e-contact-editor.c:800
-msgid "FIXME: _New Contact"
-msgstr "FIXME: �������(_C)"
-
-#: addressbook/contact-editor/e-contact-editor.c:801
-msgid "FIXME: New _Contact from Same Company"
-msgstr "FIXME: Ʊ����꤫�鿷�����(_C)"
-
-#: addressbook/contact-editor/e-contact-editor.c:803
-msgid "FIXME: New _Letter to Contact"
-msgstr "FIXME: �������˸��(_L)"
-
-#: addressbook/contact-editor/e-contact-editor.c:804
-msgid "FIXME: New _Message to Contact"
-msgstr "FIXME: ��Ĥ��뿷����å�����(_M)"
-
-#: addressbook/contact-editor/e-contact-editor.c:805
-msgid "FIXME: New Meetin_g with Contact"
-msgstr "FIXME: ��ĤȤο������(_g)"
-
-#: addressbook/contact-editor/e-contact-editor.c:806
-msgid "FIXME: _Plan a Meeting..."
-msgstr "FIXME: ��ķײ�(_P)..."
-
-#: addressbook/contact-editor/e-contact-editor.c:807
-msgid "FIXME: New _Task for Contact"
-msgstr "FIXME: ��ĤΤ���ο������(_T)"
-
-#: addressbook/contact-editor/e-contact-editor.c:808
-msgid "FIXME: New _Journal Entry for Contact"
-msgstr "FIXME: ��ĤΤ���ο�����������"
-
-#: addressbook/contact-editor/e-contact-editor.c:810
-msgid "FIXME: _Flag for Follow Up..."
-msgstr "FIXME: ��Ĵ���Τ���Υե饰(_F)..."
-
-#: addressbook/contact-editor/e-contact-editor.c:811
-msgid "FIXME: _Display Map of Address"
-msgstr "FIXME: ���ɥ쥹�Υޥåפ�ɽ��(_D)"
-
-#: addressbook/contact-editor/e-contact-editor.c:812
-msgid "FIXME: _Open Web Page"
-msgstr "FIXME: Web �ڡ����򳫤�(_O)"
-
-#: addressbook/contact-editor/e-contact-editor.c:814
-msgid "FIXME: Forward as _vCard"
-msgstr "FIXME: vCard ��ž��(_v)"
-
-#: addressbook/contact-editor/e-contact-editor.c:815
-#: calendar/gui/dialogs/task-editor.c:573 calendar/gui/event-editor.c:1328
-msgid "FIXME: For_ward"
-msgstr "FIXME: ž��(_w)"
-
-#: addressbook/contact-editor/e-contact-editor.c:827
-#: calendar/gui/dialogs/task-editor.c:586 calendar/gui/event-editor.c:1341
-msgid "_Insert"
-msgstr "����(_I)"
-
-#: addressbook/contact-editor/e-contact-editor.c:828
-#: calendar/gui/dialogs/task-editor.c:587 calendar/gui/event-editor.c:1342
-#: composer/e-msg-composer.c:1020
-msgid "F_ormat"
-msgstr "�ե����ޥå�(_o)"
-
-#: addressbook/contact-editor/e-contact-editor.c:829
-#: addressbook/gui/component/addressbook.c:544
-#: calendar/gui/dialogs/task-editor.c:588 calendar/gui/event-editor.c:1343
-msgid "_Tools"
-msgstr "�ġ���(_T)"
-
-#: addressbook/contact-editor/e-contact-editor.c:830
-#: calendar/gui/dialogs/task-editor.c:589 calendar/gui/event-editor.c:1344
-msgid "Actio_ns"
-msgstr "��ư(_n)"
-
-#: addressbook/contact-editor/e-contact-editor.c:861
-#: calendar/gui/dialogs/task-editor.c:615 calendar/gui/event-editor.c:1369
-msgid "Save and Close"
-msgstr "��¸���Ĥ���"
-
-#: addressbook/contact-editor/e-contact-editor.c:862
-msgid "Save the appointment and close the dialog box"
-msgstr "ͽ�����¸���ƥ����������ܥå������Ĥ��ޤ�"
-
-#: addressbook/contact-editor/e-contact-editor.c:866
-#: calendar/gui/calendar-commands.c:633
-msgid "Print..."
-msgstr "����..."
-
-#: addressbook/contact-editor/e-contact-editor.c:867
-#: calendar/gui/dialogs/task-editor.c:621 calendar/gui/event-editor.c:1387
-msgid "Print this item"
-msgstr "���Υ����ƥ��������ޤ�"
-
-#: addressbook/contact-editor/e-contact-editor.c:870
-#: calendar/gui/dialogs/task-editor.c:624 calendar/gui/event-editor.c:1392
-msgid "FIXME: Insert File..."
-msgstr "FIXME: �ե����������..."
-
-#: addressbook/contact-editor/e-contact-editor.c:871
-#: calendar/gui/dialogs/task-editor.c:625 calendar/gui/event-editor.c:1393
-msgid "Insert a file as an attachment"
-msgstr "�ե������ź�դȤ����������ޤ�"
-
-#: addressbook/contact-editor/e-contact-editor.c:874
-#: addressbook/gui/component/addressbook.c:442
-#: calendar/gui/dialogs/task-editor.c:635 calendar/gui/e-calendar-table.c:324
-#: calendar/gui/event-editor-dialog.glade.h:92
-#: calendar/gui/event-editor.c:1374 mail/folder-browser-factory.c:51
-#: mail/mail-config.glade.h:13 mail/mail-config.glade.h:18
-#: mail/mail-config.glade.h:24 mail/mail-view.c:160
-msgid "Delete"
-msgstr "���"
-
-#: addressbook/contact-editor/e-contact-editor.c:875
-msgid "Delete this item"
-msgstr "���Υ����ƥ�������ޤ�"
-
-#: addressbook/contact-editor/e-contact-editor.c:879
-#: calendar/gui/dialogs/task-editor.c:640 calendar/gui/event-editor.c:1403
-msgid "FIXME: Previous"
-msgstr "FIXME: ��"
-
-#: addressbook/contact-editor/e-contact-editor.c:880
-#: calendar/gui/dialogs/task-editor.c:641 calendar/gui/event-editor.c:1404
-msgid "Go to the previous item"
-msgstr "���Υ����ƥ�ذ�ư���ޤ�"
-
-#: addressbook/contact-editor/e-contact-editor.c:882
-#: calendar/gui/dialogs/task-editor.c:644 calendar/gui/event-editor.c:1406
-msgid "FIXME: Next"
-msgstr "FIXME: ��"
-
-#: addressbook/contact-editor/e-contact-editor.c:883
-#: calendar/gui/dialogs/task-editor.c:645 calendar/gui/event-editor.c:1407
-msgid "Go to the next item"
-msgstr "���Υ����ƥ�ذ�ư���ޤ�"
-
-#: addressbook/contact-editor/e-contact-editor.c:886
-#: calendar/gui/dialogs/task-editor.c:648 calendar/gui/event-editor.c:1409
-msgid "FIXME: Help"
-msgstr "FIXME: �إ��"
-
-#: addressbook/contact-editor/e-contact-editor.c:887
-#: calendar/gui/dialogs/task-editor.c:649 calendar/gui/event-editor.c:1410
-msgid "See online help"
-msgstr "����饤��إ�פ򸫤ޤ�"
-
-#: addressbook/contact-editor/e-contact-editor.c:1343
+#: addressbook/contact-editor/e-contact-editor.c:1218
msgid "Assistant"
msgstr "�����������"
-#: addressbook/contact-editor/e-contact-editor.c:1344
-#: addressbook/contact-editor/e-contact-editor.c:1448
+#: addressbook/contact-editor/e-contact-editor.c:1219
+#: addressbook/contact-editor/e-contact-editor.c:1323
msgid "Business"
msgstr "�Ż�"
-#: addressbook/contact-editor/e-contact-editor.c:1345
+#: addressbook/contact-editor/e-contact-editor.c:1220
msgid "Business 2"
msgstr "�Ż� 2"
-#: addressbook/contact-editor/e-contact-editor.c:1346
+#: addressbook/contact-editor/e-contact-editor.c:1221
msgid "Business Fax"
msgstr "�Ż��� FAX"
-#: addressbook/contact-editor/e-contact-editor.c:1347
+#: addressbook/contact-editor/e-contact-editor.c:1222
msgid "Callback"
msgstr "�Ƥ��ᤷ"
-#: addressbook/contact-editor/e-contact-editor.c:1348
+#: addressbook/contact-editor/e-contact-editor.c:1223
msgid "Car"
msgstr "��"
-#: addressbook/contact-editor/e-contact-editor.c:1349
+#: addressbook/contact-editor/e-contact-editor.c:1224
msgid "Company"
msgstr "���"
-#: addressbook/contact-editor/e-contact-editor.c:1350
-#: addressbook/contact-editor/e-contact-editor.c:1449
+#: addressbook/contact-editor/e-contact-editor.c:1225
+#: addressbook/contact-editor/e-contact-editor.c:1324
msgid "Home"
msgstr "��"
-#: addressbook/contact-editor/e-contact-editor.c:1351
+#: addressbook/contact-editor/e-contact-editor.c:1226
msgid "Home 2"
msgstr "�� 2"
-#: addressbook/contact-editor/e-contact-editor.c:1352
+#: addressbook/contact-editor/e-contact-editor.c:1227
msgid "Home Fax"
msgstr "�Ȥ� FAX"
-#: addressbook/contact-editor/e-contact-editor.c:1353
+#: addressbook/contact-editor/e-contact-editor.c:1228
msgid "ISDN"
msgstr "ISDN"
-#: addressbook/contact-editor/e-contact-editor.c:1354
+#: addressbook/contact-editor/e-contact-editor.c:1229
msgid "Mobile"
msgstr "�����"
-#: addressbook/contact-editor/e-contact-editor.c:1355
-#: addressbook/contact-editor/e-contact-editor.c:1450
+#: addressbook/contact-editor/e-contact-editor.c:1230
+#: addressbook/contact-editor/e-contact-editor.c:1325
#: mail/mail-config.glade.h:28
msgid "Other"
msgstr "����¾"
-#: addressbook/contact-editor/e-contact-editor.c:1356
+#: addressbook/contact-editor/e-contact-editor.c:1231
msgid "Other Fax"
msgstr "����¾�� FAX"
-#: addressbook/contact-editor/e-contact-editor.c:1357
+#: addressbook/contact-editor/e-contact-editor.c:1232
msgid "Pager"
msgstr "�ݥ��٥�"
-#: addressbook/contact-editor/e-contact-editor.c:1358
+#: addressbook/contact-editor/e-contact-editor.c:1233
msgid "Primary"
-msgstr "���פ�"
+msgstr "�ץ饤�ޥ�"
-#: addressbook/contact-editor/e-contact-editor.c:1359
+#: addressbook/contact-editor/e-contact-editor.c:1234
msgid "Radio"
msgstr "�饸��"
-#: addressbook/contact-editor/e-contact-editor.c:1360
+#: addressbook/contact-editor/e-contact-editor.c:1235
msgid "Telex"
msgstr "�ƥ�å���"
-#: addressbook/contact-editor/e-contact-editor.c:1361
+#: addressbook/contact-editor/e-contact-editor.c:1236
msgid "TTY/TDD"
msgstr "TTY/TDD"
-#: addressbook/contact-editor/e-contact-editor-strings.h:23
-#: addressbook/contact-editor/e-contact-editor.c:1405
+#: addressbook/contact-editor/e-contact-editor-strings.h:22
+#: addressbook/contact-editor/e-contact-editor.c:1280
msgid "Primary Email"
msgstr "���פ� Email"
-#: addressbook/contact-editor/e-contact-editor.c:1406
+#: addressbook/contact-editor/e-contact-editor.c:1281
msgid "Email 2"
msgstr "Email 2"
-#: addressbook/contact-editor/e-contact-editor.c:1407
+#: addressbook/contact-editor/e-contact-editor.c:1282
msgid "Email 3"
msgstr "Email 3"
@@ -668,6 +302,11 @@ msgstr "���󥿥��Ȥ���?"
msgid "_Add"
msgstr "�ɲ�(_A)"
+#: addressbook/contact-editor/e-contact-editor-strings.h:8
+#: ui/evolution-mail.h:31
+msgid "_Delete"
+msgstr "���(_D)"
+
#: addressbook/contact-editor/e-contact-editor-strings.h:9
msgid "Phone Types"
msgstr "�������"
@@ -678,8 +317,10 @@ msgid "New phone type"
msgstr "�����������"
#: addressbook/contact-editor/e-contact-editor-strings.h:11
-#: calendar/gui/event-editor-dialog.glade.h:90 mail/mail-config.glade.h:11
-#: mail/mail-config.glade.h:16 mail/mail-config.glade.h:22
+#: calendar/gui/event-editor-dialog.glade.h:90 filter/filter.glade.h:12
+#: filter/filter.glade.h:17 filter/filter.glade.h:21 filter/filter.glade.h:24
+#: mail/mail-config.glade.h:11 mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:22
msgid "Add"
msgstr "�ɲ�"
@@ -704,50 +345,50 @@ msgid "Wants to receive _HTML mail"
msgstr "HTML �᡼����������(_H)"
#: addressbook/contact-editor/e-contact-editor-strings.h:18
-msgid "Address:"
-msgstr "����:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:19
msgid "_Business"
msgstr "�Ż�(_B)"
-#: addressbook/contact-editor/e-contact-editor-strings.h:20
+#: addressbook/contact-editor/e-contact-editor-strings.h:19
msgid "_Home"
msgstr "��(_H)"
-#: addressbook/contact-editor/e-contact-editor-strings.h:21
+#: addressbook/contact-editor/e-contact-editor-strings.h:20
msgid "Business _Fax"
msgstr "�Ż��� FAX(_F)"
-#: addressbook/contact-editor/e-contact-editor-strings.h:22
+#: addressbook/contact-editor/e-contact-editor-strings.h:21
msgid "_Mobile"
msgstr "�����(_M)"
-#: addressbook/contact-editor/e-contact-editor-strings.h:24
+#: addressbook/contact-editor/e-contact-editor-strings.h:23
msgid "B_usiness"
msgstr "�Ż�(_u)"
-#: addressbook/contact-editor/e-contact-editor-strings.h:25
+#: addressbook/contact-editor/e-contact-editor-strings.h:24
msgid "_This is the mailing address"
msgstr "�����͹��ʪ�ν���Ǥ�"
-#: addressbook/contact-editor/e-contact-editor-strings.h:26
+#: addressbook/contact-editor/e-contact-editor-strings.h:25
msgid "C_ontacts..."
msgstr "���󥿥���(_o)..."
-#: addressbook/contact-editor/e-contact-editor-strings.h:27
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:29
+#: addressbook/contact-editor/e-contact-editor-strings.h:26
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
msgid "Ca_tegories..."
msgstr "���ƥ���(_t)..."
-#: addressbook/contact-editor/e-contact-editor-strings.h:28
+#: addressbook/contact-editor/e-contact-editor-strings.h:27
msgid "_Job title:"
msgstr "����(_J):"
-#: addressbook/contact-editor/e-contact-editor-strings.h:29
+#: addressbook/contact-editor/e-contact-editor-strings.h:28
msgid "_Company:"
msgstr "���(_C):"
+#: addressbook/contact-editor/e-contact-editor-strings.h:29
+msgid "_Address..."
+msgstr "����(_A)..."
+
#: addressbook/contact-editor/e-contact-editor-strings.h:30
#: calendar/gui/event-editor-dialog.glade.h:17
msgid "General"
@@ -794,7 +435,7 @@ msgid "No_tes:"
msgstr "����(_t):"
#: addressbook/contact-editor/e-contact-editor-strings.h:41
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:33
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:31
msgid "Details"
msgstr "�ܺ�"
@@ -803,31 +444,60 @@ msgstr "�ܺ�"
#. * Add this file to your project's POTFILES.in.
#. * DO NOT compile it as part of your application.
#.
-#: addressbook/contact-editor/fullname-strings.h:7
-msgid "Check Full Name"
-msgstr "�ե�͡���Υ����å�"
+#: addressbook/contact-editor/fulladdr.glade.h:7
+msgid "Check Address"
+msgstr "���������å�"
-#: addressbook/contact-editor/fullname-strings.h:8
-msgid "_Title:"
-msgstr "����(_T):"
+#: addressbook/contact-editor/fulladdr.glade.h:8
+msgid "_Address:"
+msgstr "����(_A):"
-#: addressbook/contact-editor/fullname-strings.h:9
-msgid "_First:"
-msgstr "̾(_F):"
+#: addressbook/contact-editor/fulladdr.glade.h:9
+msgid "_City:"
+msgstr "��Į¼(_C):"
-#: addressbook/contact-editor/fullname-strings.h:10
-msgid "_Middle:"
-msgstr "���̾(_M):"
+#: addressbook/contact-editor/fulladdr.glade.h:10
+msgid "_PO Box:"
+msgstr ""
-#: addressbook/contact-editor/fullname-strings.h:11
-msgid "_Last:"
-msgstr "��(_L):"
+#: addressbook/contact-editor/fulladdr.glade.h:11
+msgid "Address _2:"
+msgstr "���� 2(_2):"
-#: addressbook/contact-editor/fullname-strings.h:12
-msgid "_Suffix:"
-msgstr "������(_S):"
+#: addressbook/contact-editor/fulladdr.glade.h:12
+msgid "_State/Province:"
+msgstr "��/��(_S):"
-#: addressbook/contact-editor/fullname-strings.h:13
+#: addressbook/contact-editor/fulladdr.glade.h:13
+msgid "USA"
+msgstr "USA"
+
+#: addressbook/contact-editor/fulladdr.glade.h:14
+msgid "Canada"
+msgstr "���ʥ�"
+
+#: addressbook/contact-editor/fulladdr.glade.h:15
+msgid "Finland"
+msgstr "�ե������"
+
+#: addressbook/contact-editor/fulladdr.glade.h:16
+msgid "_ZIP Code:"
+msgstr "͹���ֹ�(_Z):"
+
+#: addressbook/contact-editor/fulladdr.glade.h:17
+msgid "Countr_y:"
+msgstr "��(_y):"
+
+#.
+#. * Translatable strings file generated by Glade.
+#. * Add this file to your project's POTFILES.in.
+#. * DO NOT compile it as part of your application.
+#.
+#: addressbook/contact-editor/fullname-strings.h:7
+msgid "Check Full Name"
+msgstr "�ե�͡���Υ����å�"
+
+#: addressbook/contact-editor/fullname-strings.h:8
msgid ""
"\n"
"Mr.\n"
@@ -839,7 +509,7 @@ msgstr ""
"Mrs.\n"
"Dr.\n"
-#: addressbook/contact-editor/fullname-strings.h:18
+#: addressbook/contact-editor/fullname-strings.h:13
msgid ""
"\n"
"Sr.\n"
@@ -857,63 +527,39 @@ msgstr ""
"III\n"
"Esq.\n"
-#: addressbook/gui/component/addressbook.c:436
-#: calendar/gui/calendar-commands.c:506 notes/component-factory.c:27
-msgid "New"
-msgstr "����"
-
-#: addressbook/gui/component/addressbook.c:436
-msgid "Create a new contact"
-msgstr "�������󥿥��Ȥ�������ޤ�"
-
-#: addressbook/gui/component/addressbook.c:440
-msgid "Find"
-msgstr "����"
+#: addressbook/contact-editor/fullname-strings.h:21
+msgid "_First:"
+msgstr "̾(_F):"
-#: addressbook/gui/component/addressbook.c:440
-msgid "Find a contact"
-msgstr "���󥿥��Ȥ򸡺����ޤ�"
+#: addressbook/contact-editor/fullname-strings.h:22
+msgid "_Title:"
+msgstr "����(_T):"
-#: addressbook/gui/component/addressbook.c:441
-#: calendar/gui/calendar-commands.c:511 mail/folder-browser-factory.c:49
-#: mail/mail-view.c:158
-msgid "Print"
-msgstr "����"
+#: addressbook/contact-editor/fullname-strings.h:23
+msgid "_Middle:"
+msgstr "���̾(_M):"
-#: addressbook/gui/component/addressbook.c:441
-msgid "Print contacts"
-msgstr "���󥿥��Ȥ�������ޤ�"
+#: addressbook/contact-editor/fullname-strings.h:24
+msgid "_Last:"
+msgstr "��(_L):"
-#: addressbook/gui/component/addressbook.c:442
-msgid "Delete a contact"
-msgstr "���󥿥��Ȥ������ޤ�"
+#: addressbook/contact-editor/fullname-strings.h:25
+msgid "_Suffix:"
+msgstr "������(_S):"
-#: addressbook/gui/component/addressbook.c:511
-msgid "_Print Contacts..."
-msgstr "���󥿥��Ȥ����(_P)..."
+#: addressbook/gui/component/addressbook.c:310
+msgid "As _Minicards"
+msgstr "�ߥ˥�����"
-#: addressbook/gui/component/addressbook.c:521
-#: addressbook/gui/component/addressbook.c:1052
+#: addressbook/gui/component/addressbook.c:316 ui/evolution-addressbook.h:10
msgid "As _Table"
msgstr "�ơ��֥�(_T)"
-#: addressbook/gui/component/addressbook.c:528
-msgid "_New Contact"
-msgstr "�������󥿥���(_N)"
-
-#: addressbook/gui/component/addressbook.c:536
-msgid "N_ew Directory Server"
-msgstr "�����ǥ��쥯�ȥꥵ����(_e)"
-
-#: addressbook/gui/component/addressbook.c:550
-msgid "_Search for contacts"
-msgstr "���󥿥��Ȥθ���(_S)"
-
-#: addressbook/gui/component/addressbook.c:632
+#: addressbook/gui/component/addressbook.c:444
msgid "Unable to open addressbook"
msgstr "����Ͽ�򳫤����Ȥ�����ޤ���"
-#: addressbook/gui/component/addressbook.c:637
+#: addressbook/gui/component/addressbook.c:449
msgid ""
"We were unable to open this addressbook. This either\n"
"means you have entered an incorrect URI, or have tried\n"
@@ -933,198 +579,189 @@ msgstr ""
"OpenLDAP �Υ���������ɤȥ��󥹥ȡ���, ������ evolution\n"
"�򥤥󥹥ȡ��뤹��ɬ�פ�����Ǥ��礦\n"
-#: addressbook/gui/component/addressbook.c:920
-#: addressbook/gui/minicard/e-minicard.c:334
-msgid "Save as VCard"
-msgstr "VCard ����¸"
+#: addressbook/gui/component/addressbook.c:584
+msgid "The URI that the Folder Browser will display"
+msgstr "�ե�����֥饦����ɽ������ URI"
-#: addressbook/gui/component/addressbook.c:1022
-msgid "* Click here to add a contact *"
-msgstr "* �����򥯥�å����ƥ��󥿥��Ȥ��ɲä��Ƥ������� *"
+#: addressbook/gui/component/e-ldap-storage.c:88
+msgid "External Directories"
+msgstr "�����ǥ��쥯�ȥ�"
-#: addressbook/gui/component/addressbook.c:1059
-msgid "As _Minicards"
-msgstr "�ߥ˥�����"
+#.
+#. * Translatable strings file generated by Glade.
+#. * Add this file to your project's POTFILES.in.
+#. * DO NOT compile it as part of your application.
+#.
+#: addressbook/gui/component/ldap-server-dialog.glade.h:7
+#: composer/e-msg-composer-attachment.glade.h:9
+msgid "Description:"
+msgstr "����:"
-#: addressbook/gui/component/addressbook.c:1110
-msgid "The URI that the Folder Browser will display"
-msgstr "�ե�����֥饦����ɽ������ URI"
+#: addressbook/gui/component/ldap-server-dialog.glade.h:8
+msgid "LDAP Server:"
+msgstr "LDAP ������:"
+
+#: addressbook/gui/component/ldap-server-dialog.glade.h:9
+msgid "Port Number:"
+msgstr "�ݡ����ֹ�:"
+
+#: addressbook/gui/component/ldap-server-dialog.glade.h:10
+msgid "Root DN:"
+msgstr "Root DN:"
+
+#: addressbook/gui/component/ldap-server-dialog.glade.h:11
+msgid "Name:"
+msgstr "̾��:"
+
+#.
+#. * Translatable strings file generated by Glade.
+#. * Add this file to your project's POTFILES.in.
+#. * DO NOT compile it as part of your application.
+#.
+#: addressbook/gui/component/select-names/select-names.glade.h:7
+msgid "Select Names"
+msgstr "̾��������"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:8
+msgid "Find..."
+msgstr "����..."
+
+#: addressbook/gui/component/select-names/select-names.glade.h:9
+msgid "Select name from List:"
+msgstr "�ꥹ�Ȥ���̾��������:"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:10
+msgid "Message Recipients"
+msgstr "�����ԤΥ�å�����"
#.
#. * Translatable strings file generated by Glade.
#. * Add this file to your project's POTFILES.in.
#. * DO NOT compile it as part of your application.
#.
-#: addressbook/gui/component/alphabet.glade.h:7
+#: addressbook/gui/widgets/alphabet.glade.h:7
msgid "window2"
msgstr "window2"
-#: addressbook/gui/component/alphabet.glade.h:8
+#: addressbook/gui/widgets/alphabet.glade.h:8
msgid "123"
msgstr "123"
-#: addressbook/gui/component/alphabet.glade.h:9
+#: addressbook/gui/widgets/alphabet.glade.h:9
msgid "a"
msgstr "a"
-#: addressbook/gui/component/alphabet.glade.h:10
+#: addressbook/gui/widgets/alphabet.glade.h:10
msgid "b"
msgstr "b"
-#: addressbook/gui/component/alphabet.glade.h:11
+#: addressbook/gui/widgets/alphabet.glade.h:11
msgid "c"
msgstr "c"
-#: addressbook/gui/component/alphabet.glade.h:12
+#: addressbook/gui/widgets/alphabet.glade.h:12
msgid "d"
msgstr "d"
-#: addressbook/gui/component/alphabet.glade.h:13
+#: addressbook/gui/widgets/alphabet.glade.h:13
msgid "e"
msgstr "e"
-#: addressbook/gui/component/alphabet.glade.h:14
+#: addressbook/gui/widgets/alphabet.glade.h:14
msgid "f"
msgstr "f"
-#: addressbook/gui/component/alphabet.glade.h:15
+#: addressbook/gui/widgets/alphabet.glade.h:15
msgid "g"
msgstr "g"
-#: addressbook/gui/component/alphabet.glade.h:16
+#: addressbook/gui/widgets/alphabet.glade.h:16
#: calendar/cal-util/timeutil.c:100
msgid "h"
msgstr "h"
-#: addressbook/gui/component/alphabet.glade.h:17
+#: addressbook/gui/widgets/alphabet.glade.h:17
msgid "i"
msgstr "i"
-#: addressbook/gui/component/alphabet.glade.h:18
+#: addressbook/gui/widgets/alphabet.glade.h:18
msgid "j"
msgstr "j"
-#: addressbook/gui/component/alphabet.glade.h:19
+#: addressbook/gui/widgets/alphabet.glade.h:19
msgid "k"
msgstr "k"
-#: addressbook/gui/component/alphabet.glade.h:20
+#: addressbook/gui/widgets/alphabet.glade.h:20
msgid "l"
msgstr "l"
-#: addressbook/gui/component/alphabet.glade.h:21
+#: addressbook/gui/widgets/alphabet.glade.h:21
msgid "m"
msgstr "m"
-#: addressbook/gui/component/alphabet.glade.h:22
+#: addressbook/gui/widgets/alphabet.glade.h:22
msgid "n"
msgstr "n"
-#: addressbook/gui/component/alphabet.glade.h:23
+#: addressbook/gui/widgets/alphabet.glade.h:23
msgid "o"
msgstr "o"
-#: addressbook/gui/component/alphabet.glade.h:24
+#: addressbook/gui/widgets/alphabet.glade.h:24
msgid "p"
msgstr "p"
-#: addressbook/gui/component/alphabet.glade.h:25
+#: addressbook/gui/widgets/alphabet.glade.h:25
msgid "q"
msgstr "q"
-#: addressbook/gui/component/alphabet.glade.h:26
+#: addressbook/gui/widgets/alphabet.glade.h:26
msgid "r"
msgstr "r"
-#: addressbook/gui/component/alphabet.glade.h:27
+#: addressbook/gui/widgets/alphabet.glade.h:27
msgid "s"
msgstr "s"
-#: addressbook/gui/component/alphabet.glade.h:28
+#: addressbook/gui/widgets/alphabet.glade.h:28
msgid "t"
msgstr "t"
-#: addressbook/gui/component/alphabet.glade.h:29
+#: addressbook/gui/widgets/alphabet.glade.h:29
msgid "u"
msgstr "u"
-#: addressbook/gui/component/alphabet.glade.h:30
+#: addressbook/gui/widgets/alphabet.glade.h:30
msgid "v"
msgstr "v"
-#: addressbook/gui/component/alphabet.glade.h:31
+#: addressbook/gui/widgets/alphabet.glade.h:31
msgid "w"
msgstr "w"
-#: addressbook/gui/component/alphabet.glade.h:32
+#: addressbook/gui/widgets/alphabet.glade.h:32
msgid "x"
msgstr "x"
-#: addressbook/gui/component/alphabet.glade.h:33
+#: addressbook/gui/widgets/alphabet.glade.h:33
msgid "y"
msgstr "y"
-#: addressbook/gui/component/alphabet.glade.h:34
+#: addressbook/gui/widgets/alphabet.glade.h:34
msgid "z"
msgstr "z"
-#: addressbook/gui/component/e-ldap-storage.c:88
-msgid "External Directories"
-msgstr "�����ǥ��쥯�ȥ�"
-
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: addressbook/gui/component/ldap-server-dialog.glade.h:7
-#: composer/e-msg-composer-attachment.glade.h:9
-msgid "Description:"
-msgstr "����:"
-
-#: addressbook/gui/component/ldap-server-dialog.glade.h:8
-msgid "LDAP Server:"
-msgstr "LDAP ������:"
-
-#: addressbook/gui/component/ldap-server-dialog.glade.h:9
-msgid "Port Number:"
-msgstr "�ݡ����ֹ�:"
-
-#: addressbook/gui/component/ldap-server-dialog.glade.h:10
-msgid "Root DN:"
-msgstr "Root DN:"
-
-#: addressbook/gui/component/ldap-server-dialog.glade.h:11
-#: composer/e-msg-composer-address-dialog.glade.h:8
-msgid "Name:"
-msgstr "̾��:"
-
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: addressbook/gui/component/select-names/select-names.glade.h:7
-msgid "Select Names"
-msgstr "̾��������"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:8
-msgid "Find..."
-msgstr "����..."
-
-#: addressbook/gui/component/select-names/select-names.glade.h:9
-msgid "Select name from List:"
-msgstr "�ꥹ�Ȥ���̾��������:"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:10
-msgid "Message Recipients"
-msgstr "�����ԤΥ�å�����"
+#: addressbook/gui/widgets/e-addressbook-view.c:414
+#: addressbook/gui/widgets/e-minicard.c:337
+msgid "Save as VCard"
+msgstr "VCard ����¸"
-#: addressbook/gui/minicard/e-minicard-control.c:278
+#: addressbook/gui/widgets/e-minicard-control.c:278
msgid "Save in addressbook"
msgstr "����Ͽ����¸"
-#: addressbook/gui/minicard/e-minicard-view.c:110
+#: addressbook/gui/widgets/e-minicard-view.c:111
msgid ""
"\n"
"\n"
@@ -1138,21 +775,8 @@ msgstr ""
"\n"
"���֥륯��å��򤷤ƿ������󥿥��Ȥ�������Ʋ�����"
-#: addressbook/gui/minicard/test-minicard-view.c:100
-msgid "Reflow Test"
-msgstr "��ե����ƥ���"
-
-#: addressbook/gui/minicard/test-minicard-view.c:101
-msgid "Copyright (C) 2000, Helix Code, Inc."
-msgstr "Copyright (C) 2000, Helix Code, Inc."
-
-#: addressbook/gui/minicard/test-minicard-view.c:103
-msgid "This should test the reflow canvas item"
-msgstr "����ϥ�ե��������Х������ƥ��ƥ��Ȥ��٤��Ǥ���"
-
-#. gtk_signal_connect(fb->search_entry, "changed", search_activate, fb);
-#: addressbook/gui/search/e-addressbook-search-dialog.c:150
-#: mail/folder-browser.c:404
+#: addressbook/gui/search/e-addressbook-search-dialog.c:151
+#: mail/folder-browser.c:494
msgid "Search"
msgstr "����"
@@ -1338,271 +962,162 @@ msgstr "�����ڡ�����ȿž"
msgid "Header/Footer"
msgstr "�إå�/�եå�"
-#: calendar/cal-util/timeutil.c:98 calendar/gui/print.c:604
+#: calendar/cal-util/timeutil.c:98 calendar/gui/print.c:605
msgid "am"
msgstr "����"
-#: calendar/cal-util/timeutil.c:98 calendar/gui/print.c:603
+#: calendar/cal-util/timeutil.c:98 calendar/gui/print.c:604
msgid "pm"
msgstr "���"
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:146
-msgid "Gpilotd calendar conduit"
-msgstr "Gpilotd ���������󥸥å�"
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:127
+msgid "Evolution Calendar Conduit"
+msgstr "Evolution ���������󥸥å�"
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:149
-msgid "Configuration utility for the calendar conduit.\n"
-msgstr "���������󥸥åȤΤ��������桼�ƥ���ƥ��Ǥ�\n"
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:130
+msgid "Configuration utility for the evolution calendar conduit.\n"
+msgstr "Evolution ���������󥸥åȤΤ��������桼�ƥ���ƥ��Ǥ�\n"
-#: calendar/conduits/calendar/calendar-conduit.c:398
-#: calendar/conduits/calendar/calendar-conduit.c:1111
-#: calendar/conduits/todo/todo-conduit.c:443
-#: calendar/conduits/todo/todo-conduit.c:1025
+#: calendar/conduits/calendar/calendar-conduit.c:571
+#: calendar/conduits/todo/todo-conduit.c:451
msgid "Error while communicating with calendar server"
msgstr "�����������Ф��̿���˥��顼��ȯ�����ޤ���"
-#: calendar/conduits/calendar/calendar-conduit.c:778
-#: calendar/conduits/calendar/calendar-conduit.c:780
-#: calendar/conduits/todo/todo-conduit.c:707
-#: calendar/conduits/todo/todo-conduit.c:709
-msgid "Could not start gnomecal server"
-msgstr "gnomecal �����Ф򳫻Ͻ���ޤ���Ǥ���"
-
-#: calendar/conduits/calendar/calendar-conduit.c:808
-#: calendar/conduits/calendar/calendar-conduit.c:811
-msgid "Could not read pilot's DateBook application block"
+#: calendar/conduits/calendar/calendar-conduit.c:669
+#: calendar/conduits/calendar/calendar-conduit.c:672
+msgid "Could not read pilot's Calendar application block"
msgstr ""
-"�ѥ����åȤ� DateBook "
-"���ץꥱ�������֥��å����ɤ߹��ळ�Ȥ�����ޤ���Ǥ���"
+"�ѥ����åȤΥ��������ץꥱ�������֥��å����ɤ߹��ळ�Ȥ�����ޤ���Ǥ���"
-#: calendar/conduits/todo/todo-conduit-control-applet.c:146
-msgid "Gpilotd todo conduit"
-msgstr "Gpilotd TODO ���󥸥å�"
+#: calendar/conduits/todo/todo-conduit-control-applet.c:127
+msgid "Evolution ToDo Conduit"
+msgstr "Evolution ToDo ���󥸥å�"
-#: calendar/conduits/todo/todo-conduit-control-applet.c:149
-msgid "Configuration utility for the todo conduit.\n"
-msgstr "TODO ���󥸥åȤΤ��������桼�ƥ���ƥ��Ǥ�\n"
+#: calendar/conduits/todo/todo-conduit-control-applet.c:130
+msgid "Configuration utility for the evolution todo conduit.\n"
+msgstr "Evolutiuon ToDo ���󥸥åȤΤ��������桼�ƥ���ƥ��Ǥ�\n"
-#: calendar/conduits/todo/todo-conduit.c:737
-#: calendar/conduits/todo/todo-conduit.c:740
+#: calendar/conduits/todo/todo-conduit.c:549
+#: calendar/conduits/todo/todo-conduit.c:552
msgid "Could not read pilot's ToDo application block"
msgstr ""
-"�ѥ����åȤ� TODO ���ץꥱ�������֥��å����ɤ߹��ळ�Ȥ�����ޤ���Ǥ���"
+"�ѥ����åȤ� ToDo ���ץꥱ�������֥��å����ɤ߹��ळ�Ȥ�����ޤ���Ǥ���"
-#: calendar/gui/calendar-commands.c:59
+#: calendar/gui/calendar-commands.c:60
msgid "Outline:"
msgstr "����:"
-#: calendar/gui/calendar-commands.c:60
+#: calendar/gui/calendar-commands.c:61
msgid "Headings:"
msgstr "����:"
-#: calendar/gui/calendar-commands.c:61
+#: calendar/gui/calendar-commands.c:62
msgid "Empty days:"
msgstr "������:"
-#: calendar/gui/calendar-commands.c:62
+#: calendar/gui/calendar-commands.c:63
msgid "Appointments:"
msgstr "ͽ��:"
-#: calendar/gui/calendar-commands.c:63
+#: calendar/gui/calendar-commands.c:64
msgid "Highlighted day:"
msgstr "���פ���:"
-#: calendar/gui/calendar-commands.c:64
+#: calendar/gui/calendar-commands.c:65
msgid "Day numbers:"
msgstr "����:"
-#: calendar/gui/calendar-commands.c:65
+#: calendar/gui/calendar-commands.c:66
msgid "Current day's number:"
msgstr "���ߤ�����:"
-#: calendar/gui/calendar-commands.c:66
+#: calendar/gui/calendar-commands.c:67
msgid "To-Do item that is not yet due:"
-msgstr "�ޤ����¤���Ƥ��ʤ� TODO �����ƥ�:"
+msgstr "�ޤ����¤���Ƥ��ʤ� ToDo �����ƥ�:"
-#: calendar/gui/calendar-commands.c:67
+#: calendar/gui/calendar-commands.c:68
msgid "To-Do item that is due today:"
-msgstr "�������¤� TODO �����ƥ�:"
+msgstr "�������¤� ToDo �����ƥ�:"
-#: calendar/gui/calendar-commands.c:68
+#: calendar/gui/calendar-commands.c:69
msgid "To-Do item that is overdue:"
-msgstr "���¤β᤮�� TODO �����ƥ�:"
+msgstr "���¤β᤮�� ToDo �����ƥ�:"
-#: calendar/gui/calendar-commands.c:175
-msgid "Gnome Calendar"
-msgstr "GNOME ������"
-
-#: calendar/gui/calendar-commands.c:178
-msgid "The GNOME personal calendar and schedule manager."
-msgstr "GNOME �Ŀͥ������ȥ������塼�����"
-
-#: calendar/gui/calendar-commands.c:392 tests/ui-tests/message-browser.c:676
+#: calendar/gui/calendar-commands.c:386
msgid "File not found"
msgstr "�ե����뤬���Ĥ���ޤ���"
-#: calendar/gui/calendar-commands.c:416
+#: calendar/gui/calendar-commands.c:410
msgid "Open calendar"
msgstr "�������򳫤�"
-#: calendar/gui/calendar-commands.c:455
+#: calendar/gui/calendar-commands.c:449
msgid "Save calendar"
msgstr "����������¸"
-#: calendar/gui/calendar-commands.c:484
-msgid "Day"
-msgstr "��"
-
-#: calendar/gui/calendar-commands.c:484
-msgid "Show 1 day"
-msgstr "1 ��ʬ��ɽ�����ޤ�"
-
-#: calendar/gui/calendar-commands.c:487
-msgid "5 Days"
-msgstr "5 ��"
-
-#: calendar/gui/calendar-commands.c:487
-msgid "Show the working week"
-msgstr "�Ż���ν���ɽ�����ޤ�"
-
-#: calendar/gui/calendar-commands.c:490
-msgid "Week"
-msgstr "��"
-
-#: calendar/gui/calendar-commands.c:490
-msgid "Show 1 week"
-msgstr "1 ����ʬ��ɽ�����ޤ�"
-
-#: calendar/gui/calendar-commands.c:493
-msgid "Month"
-msgstr "��"
-
-#: calendar/gui/calendar-commands.c:493
-msgid "Show 1 month"
-msgstr "1 ����ʬ��ɽ�����ޤ�"
-
-#: calendar/gui/calendar-commands.c:497
-msgid "Year"
-msgstr "ǯ"
-
-#: calendar/gui/calendar-commands.c:497
-msgid "Show 1 year"
-msgstr "1 ǯ��ʬ��ɽ�����ޤ�"
-
-#: calendar/gui/calendar-commands.c:506 calendar/gui/calendar-commands.c:642
-msgid "Create a new appointment"
-msgstr "����ͽ���������ޤ�"
-
-#: calendar/gui/calendar-commands.c:511 calendar/gui/calendar-commands.c:634
-msgid "Print this calendar"
-msgstr "���Υ�������������ޤ�"
-
-#: calendar/gui/calendar-commands.c:515
-msgid "Prev"
-msgstr "��"
-
-#: calendar/gui/calendar-commands.c:515
-msgid "Go back in time"
-msgstr "���֤��ᤷ�ޤ�"
-
-#: calendar/gui/calendar-commands.c:516
-msgid "Today"
-msgstr "����"
-
-#: calendar/gui/calendar-commands.c:516
-msgid "Go to present time"
-msgstr "���ߤλ��֤ذ�ư���ޤ�"
-
-#: calendar/gui/calendar-commands.c:517
-msgid "Next"
-msgstr "��"
-
-#: calendar/gui/calendar-commands.c:517
-msgid "Go forward in time"
-msgstr "���֤�ʤߤޤ�"
-
-#: calendar/gui/calendar-commands.c:521
-msgid "Go to"
-msgstr "��ư"
-
-#: calendar/gui/calendar-commands.c:521
-msgid "Go to a specific date"
-msgstr "�������ذ�ư���ޤ�"
-
-#. file menu
-#: calendar/gui/calendar-commands.c:619
-msgid "New Ca_lendar"
-msgstr "����������(_l)"
-
-#: calendar/gui/calendar-commands.c:620
-msgid "Create a new calendar"
-msgstr "������������������ޤ�"
-
-#: calendar/gui/calendar-commands.c:623
-msgid "Open Ca_lendar"
-msgstr "�������򳫤�(_l)"
-
-#: calendar/gui/calendar-commands.c:624
-msgid "Open a calendar"
-msgstr "�������򳫤��ޤ�"
-
-#: calendar/gui/calendar-commands.c:628 calendar/gui/calendar-commands.c:629
-msgid "Save Calendar As"
-msgstr "����������̾����¸"
-
-#: calendar/gui/calendar-commands.c:642
-msgid "_New appointment..."
-msgstr "����ͽ��(_N)..."
-
-#: calendar/gui/calendar-commands.c:650 calendar/gui/prop.c:718
-msgid "Preferences"
-msgstr "����"
-
-#: calendar/gui/calendar-commands.c:657 calendar/gui/calendar-commands.c:658
-msgid "About Calendar"
-msgstr "�������ˤĤ���"
-
-#: calendar/gui/calendar-model.c:327
+#. strftime format of a weekday and a date.
+#: calendar/gui/calendar-model.c:282
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2495
+msgid "%a %m/%d/%Y"
+msgstr "%Y/%m/%d (%a)"
+
+#. strftime format of a weekday, a date and a time,
+#. in 24-hour format.
+#: calendar/gui/calendar-model.c:286 calendar/gui/calendar-model.c:726
+msgid "%a %m/%d/%Y %H:%M:%S"
+msgstr "%Y/%m/%d (%a) %I:%M:%S"
+
+#. strftime format of a weekday, a date and a time,
+#. in 12-hour format.
+#: calendar/gui/calendar-model.c:290 calendar/gui/calendar-model.c:729
+msgid "%a %m/%d/%Y %I:%M:%S %p"
+msgstr "%Y/%m/%d (%a) %p %I:%M:%S"
+
+#: calendar/gui/calendar-model.c:344
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
msgid "Public"
-msgstr "����"
+msgstr "��Ū"
-#: calendar/gui/calendar-model.c:330
+#: calendar/gui/calendar-model.c:347
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
msgid "Private"
-msgstr "�ץ饤�١���"
+msgstr "��Ū"
-#: calendar/gui/calendar-model.c:333
+#: calendar/gui/calendar-model.c:350
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
msgid "Confidential"
-msgstr "��̩"
+msgstr "��̩"
-#: calendar/gui/calendar-model.c:336 calendar/gui/calendar-model.c:503
+#: calendar/gui/calendar-model.c:353 calendar/gui/calendar-model.c:521
msgid "Unknown"
msgstr "̤��"
-#: calendar/gui/calendar-model.c:423
+#: calendar/gui/calendar-model.c:441
msgid "N"
msgstr "��"
-#: calendar/gui/calendar-model.c:423
+#: calendar/gui/calendar-model.c:441
msgid "S"
msgstr "��"
-#: calendar/gui/calendar-model.c:425
+#: calendar/gui/calendar-model.c:443
msgid "E"
msgstr "��"
-#: calendar/gui/calendar-model.c:425
+#: calendar/gui/calendar-model.c:443
msgid "W"
msgstr "��"
-#: calendar/gui/calendar-model.c:497
+#: calendar/gui/calendar-model.c:515
msgid "Transparent"
msgstr "Ʃ��"
-#: calendar/gui/calendar-model.c:500
+#: calendar/gui/calendar-model.c:518
msgid "Opaque"
msgstr "��Ʃ��"
-#: calendar/gui/calendar-model.c:732
+#: calendar/gui/calendar-model.c:734
#, c-format
msgid ""
"The date must be entered in the format: \n"
@@ -1613,7 +1128,37 @@ msgstr ""
"\n"
"%s"
-#: calendar/gui/calendar-model.c:909
+#. strptime format for a date.
+#: calendar/gui/calendar-model.c:835 calendar/gui/calendar-model.c:883
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
+#: widgets/misc/e-dateedit.c:480 widgets/misc/e-dateedit.c:512
+#: widgets/misc/e-dateedit.c:669 widgets/misc/e-dateedit.c:725
+msgid "%m/%d/%Y"
+msgstr "%Y/%m/%d"
+
+#. strptime format for a time of day, in 12-hour format.
+#. If it is is not appropriate in the locale set to an empty string.
+#: calendar/gui/calendar-model.c:853
+msgid "%I:%M:%S %p%n"
+msgstr "%H:%M:%S %p%n"
+
+#. strptime format for a time of day, in 24-hour format.
+#: calendar/gui/calendar-model.c:856
+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.
+#: calendar/gui/calendar-model.c:860
+msgid "%I:%M %p%n"
+msgstr "%I:%M %p%n"
+
+#. strptime format for time of day, without seconds 24-hour format.
+#: calendar/gui/calendar-model.c:863
+msgid "%H:%M%n"
+msgstr "%H:%M%n"
+
+#: calendar/gui/calendar-model.c:983
msgid ""
"The geographical position must be entered in the format: \n"
"\n"
@@ -1623,11 +1168,11 @@ msgstr ""
"\n"
"45.436845,125.862501"
-#: calendar/gui/calendar-model.c:949
+#: calendar/gui/calendar-model.c:1023
msgid "The percent value must be between 0 and 100, inclusive"
msgstr "�ѡ�������ͤ� 0 �� 100 �δ֤Ǵޤ�Ǥ��ʤ���Фʤ�ޤ���"
-#: calendar/gui/calendar-model.c:983
+#: calendar/gui/calendar-model.c:1063
msgid "The priority must be between 1 and 9, inclusive"
msgstr "ͥ���̤� 1 �� 9 �δ֤Ǵޤ�Ǥ��ʤ���Фʤ�ޤ���"
@@ -1637,11 +1182,11 @@ msgstr "��������ɽ������ URI"
#: calendar/gui/dialogs/alarm-notify-dialog.c:183
msgid "Alarm on %A %b %d %Y %H:%M"
-msgstr "%A %b %d %Y %H:%M �˥��顼��"
+msgstr "%Y/%b/%d %A %H:%M �˥��顼��"
#: calendar/gui/dialogs/alarm-notify-dialog.c:190
msgid "Notification about your appointment on %A %b %d %Y %H:%M"
-msgstr "%A %b %d %Y %H:%M �Τ��ʤ���ͽ��ˤĤ�������"
+msgstr "%Y/%b/%d %A %H:%M �Τ��ʤ���ͽ��ˤĤ�������"
#: calendar/gui/dialogs/alarm-notify-dialog.c:201
msgid "No summary available."
@@ -1653,11 +1198,11 @@ msgstr "���ѤǤ��륵�ޥ�Ϥ���ޤ���"
#. * DO NOT compile it as part of your application.
#.
#: calendar/gui/dialogs/alarm-notify.glade.h:7
-#: calendar/gui/event-editor.c:1379
+#: ui/evolution-contact-editor.h:14 ui/evolution-subscribe.h:10
msgid "Close"
msgstr "�Ĥ���"
-#: calendar/gui/dialogs/alarm-notify.glade.h:8 calendar/gui/gnome-cal.c:1463
+#: calendar/gui/dialogs/alarm-notify.glade.h:8 calendar/gui/gnome-cal.c:1458
msgid "Snooze"
msgstr "��̲��"
@@ -1669,90 +1214,282 @@ msgstr "ͽ����Խ�"
msgid "Snooze time (minutes)"
msgstr "��̲����� (ʬ)"
-#: calendar/gui/dialogs/task-editor.c:493
-#: calendar/gui/dialogs/task-editor.c:501
-msgid "FIXME: In_complete Task"
-msgstr "FIXME: ̤��λ�κ��(_c)"
+#.
+#. * Translatable strings file generated by Glade.
+#. * Add this file to your project's POTFILES.in.
+#. * DO NOT compile it as part of your application.
+#.
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+msgid "Calendar Preferences"
+msgstr "������������"
-#: calendar/gui/dialogs/task-editor.c:553 calendar/gui/event-editor.c:1312
-msgid "FIXME: Chec_k Names"
-msgstr "FIXME: ̾�������å�(_k)"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+msgid "Work week"
+msgstr "�Ż��򤹤뽵"
-#: calendar/gui/dialogs/task-editor.c:554 calendar/gui/event-editor.c:1313
-msgid "FIXME: Address _Book..."
-msgstr "FIXME: ����Ͽ(_B)..."
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: calendar/gui/event-editor-dialog.glade.h:53
+#: calendar/gui/gnome-month-item.c:737
+msgid "Mon"
+msgstr "��"
-#: calendar/gui/dialogs/task-editor.c:561
-msgid "FIXME: _New Task"
-msgstr "FIXME: �������(_N)"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: calendar/gui/event-editor-dialog.glade.h:54
+#: calendar/gui/gnome-month-item.c:738
+msgid "Tue"
+msgstr "��"
-#: calendar/gui/dialogs/task-editor.c:563
-msgid "FIXME: S_end Status Report"
-msgstr "FIXME: ���ơ�������ݡ��Ȥ�����(_e)"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: calendar/gui/event-editor-dialog.glade.h:55
+#: calendar/gui/gnome-month-item.c:739
+msgid "Wed"
+msgstr "��"
-#: calendar/gui/dialogs/task-editor.c:564
-msgid "FIXME: _Mark Complete"
-msgstr "FIXME: ��λ��ޡ���(_M)"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: calendar/gui/event-editor-dialog.glade.h:56
+#: calendar/gui/gnome-month-item.c:740
+msgid "Thu"
+msgstr "��"
-#: calendar/gui/dialogs/task-editor.c:566 calendar/gui/event-editor.c:1322
-msgid "FIXME: Rec_urrence..."
-msgstr "FIXME: ����ʬ��(_u)..."
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/event-editor-dialog.glade.h:57
+#: calendar/gui/gnome-month-item.c:741
+msgid "Fri"
+msgstr "��"
-#: calendar/gui/dialogs/task-editor.c:567
-msgid "FIXME: S_kip Occurrence"
-msgstr "FIXME: ������򥹥��å�(_k)"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/event-editor-dialog.glade.h:58
+#: calendar/gui/gnome-month-item.c:742
+msgid "Sat"
+msgstr "��"
+
+#. Initialize by default to three-letter day names
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: calendar/gui/event-editor-dialog.glade.h:59
+#: calendar/gui/gnome-month-item.c:736
+msgid "Sun"
+msgstr "��"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+msgid "First day of week:"
+msgstr "���ΤϤ���:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17 calendar/gui/prop.c:354
+msgid "Monday"
+msgstr "������"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+msgid "Tuesday"
+msgstr "������"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+msgid "Wednesday"
+msgstr "������"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+msgid "Thursday"
+msgstr "������"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+msgid "Friday"
+msgstr "������"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+msgid "Saturday"
+msgstr "������"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23 calendar/gui/prop.c:353
+msgid "Sunday"
+msgstr "������"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+msgid "Start of day:"
+msgstr "������:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+msgid "End of day:"
+msgstr "���:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
+msgid "Display options"
+msgstr "ɽ�����ץ����"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+msgid "Time divisions:"
+msgstr "���֤�ʬ��:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+msgid "Time format:"
+msgstr "���֤Υե����ޥå�:"
-#: calendar/gui/dialogs/task-editor.c:569
-msgid "FIXME: Assig_n Task"
-msgstr "FIXME: ��ȳ�����(_n)"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+msgid "Show appointment end times"
+msgstr "ͽ��λ���֤�ɽ��"
-#: calendar/gui/dialogs/task-editor.c:571
-msgid "FIXME: _Reply"
-msgstr "FIXME: �ֿ�(_R)"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+msgid "Compress weekends"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+msgid "12 hour (am/pm)"
+msgstr "12 ������ (����/���)"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+msgid "24 hour"
+msgstr "24 ������"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+msgid "60 minutes"
+msgstr "60 ʬ"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+msgid "30 minutes"
+msgstr "30 ʬ"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+msgid "15 minutes"
+msgstr "15 ʬ"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+msgid "10 minutes"
+msgstr "10 ʬ"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+msgid "05 minutes"
+msgstr "05 ʬ"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+msgid "Date navigator options"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+msgid "Show week numbers"
+msgstr ""
-#: calendar/gui/dialogs/task-editor.c:572
-msgid "FIXME: Reply to A_ll"
-msgstr "FIXME: �������ֿ�(_l)"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+msgid "Calendar"
+msgstr "������"
-#: calendar/gui/dialogs/task-editor.c:616
-msgid "Save the task and close the dialog box"
-msgstr "��Ȥ���¸���ƥ����������ܥå������Ĥ��ޤ�"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+msgid "Show"
+msgstr "ɽ��"
-#: calendar/gui/dialogs/task-editor.c:620 calendar/gui/event-editor.c:1386
-msgid "FIXME: Print..."
-msgstr "FIXME: ����..."
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42 calendar/gui/prop.c:610
+msgid "Due Date"
+msgstr "����"
-#: calendar/gui/dialogs/task-editor.c:630
-msgid "FIXME: Assign Task..."
-msgstr "FIXME: ��Ȥγ������..."
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43 calendar/gui/prop.c:612
+msgid "Time Until Due"
+msgstr "���¤ޤǤλ���"
-#: calendar/gui/dialogs/task-editor.c:631
-msgid "Assign the task to someone"
-msgstr "��Ȥ�ï���˳�����ƤƤ�������"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 calendar/gui/prop.c:611
+#: filter/libfilter-i18n.h:14
+msgid "Priority"
+msgstr "ͥ����"
-#: calendar/gui/dialogs/task-editor.c:636
-msgid "Delete this task"
-msgstr "���κ�Ȥ������ޤ�"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+msgid "Highlight"
+msgstr "��Ĵ"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+msgid "Overdue Items"
+msgstr "���¤��᤮�������ƥ�"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+msgid "Items Due Today"
+msgstr "�������¤Υ����ƥ�"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+msgid "Items Not Yet Due"
+msgstr "�ޤ����¤���Ƥ��ʤ������ƥ�"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49 calendar/gui/prop.c:528
+msgid "Colors"
+msgstr "��"
-#: calendar/gui/dialogs/task-editor.c:902
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+msgid "Pick a color"
+msgstr "�������򤷤ޤ�"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+msgid "Items Not Yet Due:"
+msgstr "�ޤ����¤���Ƥ��ʤ������ƥ�:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+msgid "Items Due Today:"
+msgstr "�������¤Υ����ƥ�:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+msgid "Overdue Items:"
+msgstr "���¤��᤮�������ƥ�:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+msgid "TaskPad"
+msgstr ""
+
+#. populate default frame/box
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57 calendar/gui/prop.c:842
+msgid "Defaults"
+msgstr "�ǥե����"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+msgid "Remind me of all appointments"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+msgid "minutes before they occur."
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
+msgid "Visual Alarms"
+msgstr "���Ū�ʥ��顼��"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+msgid "Beep when alarm windows appear."
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
+msgid "Audio Alarms"
+msgstr "�����ǥ������顼��"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
+msgid "Alarms timeout after"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
+msgid "seconds."
+msgstr " ��"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
+msgid "Enable snoozing for"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:67
+msgid "Reminders"
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor.c:657
msgid "Edit Task"
msgstr "��Ȥ��Խ�"
-#: calendar/gui/dialogs/task-editor.c:908 calendar/gui/event-editor.c:283
+#: calendar/gui/dialogs/task-editor.c:663 calendar/gui/event-editor.c:285
msgid "No summary"
msgstr "���ޥ�ʤ�"
-#: calendar/gui/dialogs/task-editor.c:914 calendar/gui/event-editor.c:289
+#: calendar/gui/dialogs/task-editor.c:669 calendar/gui/event-editor.c:291
#, c-format
msgid "Appointment - %s"
msgstr "ͽ�� - %s"
-#: calendar/gui/dialogs/task-editor.c:917 calendar/gui/event-editor.c:292
+#: calendar/gui/dialogs/task-editor.c:672 calendar/gui/event-editor.c:294
#, c-format
msgid "Task - %s"
msgstr "��� - %s"
-#: calendar/gui/dialogs/task-editor.c:920 calendar/gui/event-editor.c:295
+#: calendar/gui/dialogs/task-editor.c:675 calendar/gui/event-editor.c:297
#, c-format
msgid "Journal entry - %s"
msgstr "�������� - %s"
@@ -1787,212 +1524,162 @@ msgid "_Status:"
msgstr "����(_S):"
#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
-msgid ""
-"Not Started\n"
-"In Progress\n"
-"Completed\n"
-"Cancelled\n"
-msgstr ""
-"̤�幩\n"
-"�ʹ���\n"
-"��λ\n"
-"����󥻥�\n"
+msgid "Not Started"
+msgstr "���Ϥ��Ƥ��ʤ�"
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
+msgid "In Progress"
+msgstr "�ʹ���"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
+msgid "Completed"
+msgstr "��λ"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
+msgid "Cancelled"
+msgstr "����󥻥�"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
msgid "_Priority:"
msgstr "ͥ����(_P):"
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
+msgid "High"
+msgstr "�⤤"
+
#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
-msgid ""
-"High\n"
-"Normal\n"
-"Low\n"
-msgstr ""
-"��\n"
-"��\n"
-"��\n"
+msgid "Normal"
+msgstr "����"
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:20
+msgid "Low"
+msgstr "�㤤"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:21
msgid "C_lassification:"
msgstr "ʬ��(_l)"
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
-msgid ""
-"Public\n"
-"Private\n"
-"Confidential\n"
-msgstr ""
-"����\n"
-"�ץ饤�١���\n"
-"��̩\n"
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
+#: calendar/gui/event-editor-dialog.glade.h:42 shell/e-shell-view.c:989
+#: widgets/misc/e-dateedit.c:337 widgets/misc/e-dateedit.c:709
+#: widgets/misc/e-dateedit.c:1171
+msgid "None"
+msgstr "����"
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:28
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
msgid "_Contacts..."
msgstr "���󥿥���(_C)..."
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:30
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:28
msgid "Task"
msgstr "���"
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:31
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:29
msgid "Date Completed:"
msgstr "���:"
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:32
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:30
msgid "URL:"
msgstr "URL:"
-#. Create the header columns
-#: calendar/gui/e-calendar-table.c:196
-msgid "Categories"
-msgstr "���ƥ���"
-
-#: calendar/gui/e-calendar-table.c:197
-#: calendar/gui/event-editor-dialog.glade.h:13
-msgid "Classification"
-msgstr "ʬ��"
-
-#: calendar/gui/e-calendar-table.c:198
-msgid "Completion date"
-msgstr "���"
-
-#: calendar/gui/e-calendar-table.c:199
-msgid "End date"
-msgstr "���"
-
-#: calendar/gui/e-calendar-table.c:200
-msgid "Start date"
-msgstr "������"
-
-#: calendar/gui/e-calendar-table.c:201
-msgid "Due date"
-msgstr "����"
-
-#: calendar/gui/e-calendar-table.c:202
-msgid "Geographical position"
-msgstr "����Ū�ʰ���"
-
-#: calendar/gui/e-calendar-table.c:203
-msgid "Percent complete"
-msgstr "�ѡ�����ȴ�λ"
-
-#: calendar/gui/e-calendar-table.c:204 calendar/gui/prop.c:611
-#: mail/message-list.c:659
-msgid "Priority"
-msgstr "ͥ����"
-
-#: calendar/gui/e-calendar-table.c:212
-msgid "Summary"
-msgstr "���ޥ�"
-
-#: calendar/gui/e-calendar-table.c:216
-msgid "Transparency"
-msgstr "Ʃ����"
-
-#: calendar/gui/e-calendar-table.c:217
-msgid "URL"
-msgstr "URL"
-
-#: calendar/gui/e-calendar-table.c:219 calendar/gui/prop.c:786
-msgid "Alarms"
-msgstr "���顼��"
-
-#: calendar/gui/e-calendar-table.c:318
+#: calendar/gui/e-calendar-table.c:294
msgid "Open..."
msgstr "����..."
-#: calendar/gui/e-calendar-table.c:319
+#: calendar/gui/e-calendar-table.c:295
msgid "Open the task"
msgstr "��Ȥ򳫤�"
-#: calendar/gui/e-calendar-table.c:321
+#: calendar/gui/e-calendar-table.c:297
msgid "Mark Complete"
msgstr "��λ��ޡ���"
-#: calendar/gui/e-calendar-table.c:322
+#: calendar/gui/e-calendar-table.c:298
msgid "Mark the task complete"
msgstr "��λ������Ȥ�ޡ������ޤ�"
-#: calendar/gui/e-calendar-table.c:325
+#: calendar/gui/e-calendar-table.c:300
+#: calendar/gui/event-editor-dialog.glade.h:92 filter/filter.glade.h:14
+#: filter/filter.glade.h:19 filter/libfilter-i18n.h:7
+#: mail/mail-config.glade.h:13 mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:24 mail/mail-view.c:163
+#: ui/evolution-addressbook.h:20 ui/evolution-contact-editor.h:12
+#: ui/evolution-contact-editor.h:19 ui/evolution-mail.h:59
+msgid "Delete"
+msgstr "���"
+
+#: calendar/gui/e-calendar-table.c:301
msgid "Delete the task"
msgstr "��Ȥ�������"
-#: calendar/gui/e-day-view-time-item.c:393
+#: calendar/gui/e-day-view-time-item.c:406
#, c-format
msgid "%02i minute divisions"
msgstr "%02i ʬʬ��"
-#: calendar/gui/e-day-view.c:2508 calendar/gui/e-day-view.c:2515
-#: calendar/gui/e-day-view.c:2524 calendar/gui/e-week-view.c:2958
-#: calendar/gui/e-week-view.c:2965 calendar/gui/e-week-view.c:2974
+#. 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:261 calendar/gui/e-day-view.c:1172
+#: 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:265 calendar/gui/e-day-view.c:1186
+#: 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:269 calendar/gui/e-day-view.c:1199
+#: calendar/gui/e-week-view-main-item.c:348
+msgid "%d %b"
+msgstr "%b/%d"
+
+#: calendar/gui/e-day-view.c:2634 calendar/gui/e-day-view.c:2641
+#: calendar/gui/e-day-view.c:2650 calendar/gui/e-week-view.c:2932
+#: calendar/gui/e-week-view.c:2939 calendar/gui/e-week-view.c:2948
msgid "New appointment..."
msgstr "����ͽ��..."
-#: calendar/gui/e-day-view.c:2512 calendar/gui/e-day-view.c:2519
-#: calendar/gui/e-week-view.c:2962 calendar/gui/e-week-view.c:2969
+#: calendar/gui/e-day-view.c:2638 calendar/gui/e-day-view.c:2645
+#: calendar/gui/e-week-view.c:2936 calendar/gui/e-week-view.c:2943
msgid "Edit this appointment..."
msgstr "����ͽ����Խ�..."
-#: calendar/gui/e-day-view.c:2513 calendar/gui/e-week-view.c:2963
-#: calendar/gui/event-editor.c:1375
+#: calendar/gui/e-day-view.c:2639 calendar/gui/e-week-view.c:2937
msgid "Delete this appointment"
msgstr "����ͽ�����"
-#: calendar/gui/e-day-view.c:2520 calendar/gui/e-week-view.c:2970
+#: calendar/gui/e-day-view.c:2646 calendar/gui/e-week-view.c:2944
msgid "Make this appointment movable"
msgstr "����ͽ����ư�ˤ���"
-#: calendar/gui/e-day-view.c:2521 calendar/gui/e-week-view.c:2971
+#: calendar/gui/e-day-view.c:2647 calendar/gui/e-week-view.c:2945
msgid "Delete this occurrence"
msgstr "����������"
-#: calendar/gui/e-day-view.c:2522 calendar/gui/e-week-view.c:2972
+#: calendar/gui/e-day-view.c:2648 calendar/gui/e-week-view.c:2946
msgid "Delete all occurrences"
msgstr "���٤Ƥν��������"
-#: calendar/gui/event-editor.c:277
+#. 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:342
+msgid "%d %B"
+msgstr "%B %d"
+
+#: calendar/gui/event-editor.c:279
msgid "Edit Appointment"
msgstr "ͽ����Խ�"
-#: calendar/gui/event-editor.c:1277
-msgid "FIXME: Ca_lendar..."
-msgstr "FIXME: ������(_l)..."
-
-#: calendar/gui/event-editor.c:1320
-msgid "FIXME: _New Appointment"
-msgstr "FIXME: ����ͽ��(_N)"
-
-#: calendar/gui/event-editor.c:1324
-msgid "FIXME: Invite _Attendees..."
-msgstr "FIXME: �դ�ź������..."
-
-#: calendar/gui/event-editor.c:1325
-msgid "FIXME: C_ancel Invitation..."
-msgstr "FIXME: ���ԤΥ���󥻥�(_a)..."
-
-#: calendar/gui/event-editor.c:1327
-msgid "FIXME: Forward as v_Calendar"
-msgstr "FIXME: vCalendar ��ž��(_C)"
-
-#: calendar/gui/event-editor.c:1370
-msgid "Save and close this appointment"
-msgstr "����ͽ�����¸�����Ĥ��ޤ�"
-
-#: calendar/gui/event-editor.c:1380
-msgid "Close this appointment"
-msgstr "����ͽ����Ĥ��ޤ�"
-
-#: calendar/gui/event-editor.c:1396
-msgid "FIXME: Invite Attendees..."
-msgstr "FIXME: �դ�ź������..."
-
-#: calendar/gui/event-editor.c:1397
-msgid "Invite attendees to a meeting"
-msgstr "��Ĥ��դ�ź�����Ԥ��ޤ�"
-
-#: calendar/gui/event-editor.c:1954
+#: calendar/gui/event-editor.c:1749 calendar/gui/print.c:1085
+#: calendar/gui/print.c:1087 calendar/gui/print.c:1088
msgid "%a %b %d %Y"
-msgstr "%a %b %d %Y"
+msgstr "%Y/%b/%d (%a)"
#. todo
#.
@@ -2038,17 +1725,21 @@ msgstr "�����:"
msgid "A_ll day event"
msgstr "�����Υ��٥��(_l)"
+#: calendar/gui/event-editor-dialog.glade.h:13
+msgid "Classification"
+msgstr "ʬ��"
+
#: calendar/gui/event-editor-dialog.glade.h:14
msgid "Pu_blic"
-msgstr "����(_b)"
+msgstr "��Ū(_b)"
#: calendar/gui/event-editor-dialog.glade.h:15
msgid "Pri_vate"
-msgstr "�ץ饤�١���(_v)"
+msgstr "��Ū(_v)"
#: calendar/gui/event-editor-dialog.glade.h:16
msgid "_Confidential"
-msgstr "��̩(_C)"
+msgstr "��̩(_C)"
#: calendar/gui/event-editor-dialog.glade.h:18
#: calendar/gui/event-editor-dialog.glade.h:22
@@ -2095,10 +1786,6 @@ msgstr "��¥��"
msgid "Recurrence rule"
msgstr "����ʬ���롼��"
-#: calendar/gui/event-editor-dialog.glade.h:42 shell/e-shell-view.c:937
-msgid "None"
-msgstr "����"
-
#: calendar/gui/event-editor-dialog.glade.h:43
msgid "Daily"
msgstr "����"
@@ -2137,42 +1824,6 @@ msgstr "label24"
msgid "week(s)"
msgstr "��"
-#: calendar/gui/event-editor-dialog.glade.h:53
-#: calendar/gui/gnome-month-item.c:737
-msgid "Mon"
-msgstr "��"
-
-#: calendar/gui/event-editor-dialog.glade.h:54
-#: calendar/gui/gnome-month-item.c:738
-msgid "Tue"
-msgstr "��"
-
-#: calendar/gui/event-editor-dialog.glade.h:55
-#: calendar/gui/gnome-month-item.c:739
-msgid "Wed"
-msgstr "��"
-
-#: calendar/gui/event-editor-dialog.glade.h:56
-#: calendar/gui/gnome-month-item.c:740
-msgid "Thu"
-msgstr "��"
-
-#: calendar/gui/event-editor-dialog.glade.h:57
-#: calendar/gui/gnome-month-item.c:741
-msgid "Fri"
-msgstr "��"
-
-#: calendar/gui/event-editor-dialog.glade.h:58
-#: calendar/gui/gnome-month-item.c:742
-msgid "Sat"
-msgstr "��"
-
-#. Initialize by default to three-letter day names
-#: calendar/gui/event-editor-dialog.glade.h:59
-#: calendar/gui/gnome-month-item.c:736
-msgid "Sun"
-msgstr "��"
-
#: calendar/gui/event-editor-dialog.glade.h:60
msgid "label25"
msgstr "label25"
@@ -2482,11 +2133,11 @@ msgstr "����"
#: calendar/gui/gncal-todo.c:139
msgid "Create to-do item"
-msgstr "TODO �����ƥ�����"
+msgstr "ToDo �����ƥ�����"
#: calendar/gui/gncal-todo.c:139
msgid "Edit to-do item"
-msgstr "TODO �����ƥ���Խ�"
+msgstr "ToDo �����ƥ���Խ�"
#: calendar/gui/gncal-todo.c:175
msgid "Summary:"
@@ -2504,28 +2155,28 @@ msgstr "ͥ����:"
msgid "Item Comments:"
msgstr "�����ƥ�Υ�����:"
-#: calendar/gui/gnome-cal.c:689 calendar/gui/gnome-cal.c:1471
-#: calendar/gui/gnome-cal.c:1527
+#: calendar/gui/gnome-cal.c:710 calendar/gui/gnome-cal.c:1466
+#: calendar/gui/gnome-cal.c:1522
msgid "Reminder of your appointment at "
msgstr "���ʤ���ͽ��κ�¥ "
-#: calendar/gui/gnome-cal.c:1169
+#: calendar/gui/gnome-cal.c:1144
#, c-format
msgid "Could not load the calendar in `%s'"
msgstr "'%s' �Υ��������ɤ߹��ळ�Ȥ�����ޤ���Ǥ���"
-#: calendar/gui/gnome-cal.c:1180
+#: calendar/gui/gnome-cal.c:1155
#, c-format
msgid "Could not create a calendar in `%s'"
msgstr "'%s' �Υ�������������뤳�Ȥ�����ޤ���Ǥ���"
-#: calendar/gui/gnome-cal.c:1191
+#: calendar/gui/gnome-cal.c:1166
#, c-format
msgid "The method required to load `%s' is not supported"
msgstr "'%s' ���ɤ߹��ळ�Ȥ��׵ᤵ�����ˡ�ϥ��ݡ��Ȥ��Ƥ��ޤ���"
#. Idea: we need Snooze option :-)
-#: calendar/gui/gnome-cal.c:1476 calendar/gui/gnome-cal.c:1531
+#: calendar/gui/gnome-cal.c:1471 calendar/gui/gnome-cal.c:1526
msgid "Ok"
msgstr "Ok"
@@ -2704,55 +2355,43 @@ msgstr "��"
msgid "Sa"
msgstr "��"
-#: calendar/gui/print.c:951
-msgid "TODO Items"
-msgstr "TODO �����ƥ�"
+#: calendar/gui/print.c:936
+msgid "Tasks"
+msgstr "���"
#. Day
-#: calendar/gui/print.c:1052
+#: calendar/gui/print.c:1066
msgid "Current day (%a %b %d %Y)"
-msgstr "���������� (%a %b %d %Y)"
+msgstr "���������� [%Y/%b/%d (%a)]"
-#: calendar/gui/print.c:1072 calendar/gui/print.c:1086
-#: calendar/gui/print.c:1087
-msgid "%a"
-msgstr "%a"
+#: calendar/gui/print.c:1080 calendar/gui/print.c:1084
+msgid "%a %b %d"
+msgstr "%b/%d (%a)"
-#: calendar/gui/print.c:1073 calendar/gui/print.c:1074
-#: calendar/gui/print.c:1088 calendar/gui/print.c:1089
-msgid "%b"
-msgstr "%b"
+#: calendar/gui/print.c:1081
+msgid "%a %d %Y"
+msgstr "%Y/%d (%a)"
-#: calendar/gui/print.c:1076
+#: calendar/gui/print.c:1092
#, c-format
-msgid "Current week (%s %s %d - %s %d %d)"
-msgstr "���� (%s %s %d - %s %d %d)"
-
-#: calendar/gui/print.c:1093
-#, c-format
-msgid "Current week (%s %s %d - %s %s %d %d)"
-msgstr "���� (%s %s %d - %s %s %d %d)"
-
-#: calendar/gui/print.c:1099
-#, c-format
-msgid "Current week (%s %s %d %d - %s %s %d %d)"
-msgstr "���� (%s %s %d %d - %s %s %d %d)"
+msgid "Current week (%s - %s)"
+msgstr "���� (%s - %s)"
#. Month
-#: calendar/gui/print.c:1112
-msgid "Current month (%a %Y)"
-msgstr "���� (%a %Y)"
+#: calendar/gui/print.c:1100
+msgid "Current month (%b %Y)"
+msgstr "���� (%Y/%b)"
#. Year
-#: calendar/gui/print.c:1119
+#: calendar/gui/print.c:1107
msgid "Current year (%Y)"
msgstr "��ǯ (%Y)"
-#: calendar/gui/print.c:1156
+#: calendar/gui/print.c:1144
msgid "Print Calendar"
msgstr "���������"
-#: calendar/gui/print.c:1321
+#: calendar/gui/print.c:1309 mail/mail-callbacks.c:803
msgid "Print Preview"
msgstr "�����ץ�ӥ塼"
@@ -2778,14 +2417,6 @@ msgstr "24 ������"
msgid "Weeks start on"
msgstr "���λϤ�"
-#: calendar/gui/prop.c:353
-msgid "Sunday"
-msgstr "����"
-
-#: calendar/gui/prop.c:354
-msgid "Monday"
-msgstr "����"
-
#. Day range
#: calendar/gui/prop.c:364
msgid "Day range"
@@ -2815,25 +2446,13 @@ msgstr "���:"
msgid "Colors for display"
msgstr "ɽ����"
-#: calendar/gui/prop.c:528
-msgid "Colors"
-msgstr "��"
-
#: calendar/gui/prop.c:605
msgid "Show on TODO List:"
msgstr "TODO �ꥹ�Ȥ�ɽ��:"
-#: calendar/gui/prop.c:610
-msgid "Due Date"
-msgstr "����"
-
-#: calendar/gui/prop.c:612
-msgid "Time Until Due"
-msgstr "���¤ޤǤλ���"
-
#: calendar/gui/prop.c:643
msgid "To Do List style options:"
-msgstr "TODO �ꥹ�ȥ�������Υ��ץ����:"
+msgstr "ToDo �ꥹ�ȥ�������Υ��ץ����:"
#: calendar/gui/prop.c:648
msgid "Highlight overdue items"
@@ -2849,11 +2468,19 @@ msgstr "�������¤Υ����ƥ��Ĵ"
#: calendar/gui/prop.c:684
msgid "To Do List Properties"
-msgstr "TODO �ꥹ�ȤΥץ��ѥƥ�"
+msgstr "ToDo �ꥹ�ȤΥץ��ѥƥ�"
#: calendar/gui/prop.c:687
msgid "To Do List"
-msgstr "TODO �ꥹ��"
+msgstr "ToDo �ꥹ��"
+
+#: calendar/gui/prop.c:718
+msgid "Preferences"
+msgstr "����"
+
+#: calendar/gui/prop.c:786
+msgid "Alarms"
+msgstr "���顼��"
#. build miscellaneous box
#: calendar/gui/prop.c:789
@@ -2876,137 +2503,712 @@ msgstr " ��"
msgid "Enable snoozing for "
msgstr "��̲���ͭ�� "
-#. populate default frame/box
-#: calendar/gui/prop.c:842
-msgid "Defaults"
-msgstr "�ǥե����"
+#: camel/camel-movemail.c:96
+#, c-format
+msgid "Could not check mail file %s: %s"
+msgstr "�᡼��ե����� %s ������å����뤳�Ȥ�����ޤ���Ǥ���: %s"
-#: composer/e-msg-composer-address-dialog.c:186
-msgid "Cut"
-msgstr "�ڤ���"
+#: camel/camel-movemail.c:133 camel/camel-movemail.c:180
+#, c-format
+msgid "Could not create lock file for %s: %s"
+msgstr "%s �Υ��å��ե����������Ǥ��ޤ���Ǥ���: %s"
-#: composer/e-msg-composer-address-dialog.c:187
-msgid "Cut selected item into clipboard"
-msgstr "����åץܡ��ɤ�������򤵤줿�����ƥ���ڤ���ޤ�"
+#: camel/camel-movemail.c:143
+#, c-format
+msgid "Could not open mail file %s: %s"
+msgstr "�᡼��ե����� %s �򳫤����Ȥ�����ޤ���Ǥ���: %s"
-#: composer/e-msg-composer-address-dialog.c:190
-#: mail/folder-browser-factory.c:47
-msgid "Copy"
-msgstr "���ԡ�"
+#: camel/camel-movemail.c:153
+#, c-format
+msgid "Could not open temporary mail file %s: %s"
+msgstr "�᡼��ե����� %s �Υƥ�ݥ��򳫤����Ȥ�����ޤ���Ǥ���: %s"
-#: composer/e-msg-composer-address-dialog.c:191
-msgid "Copy selected item into clipboard"
-msgstr "����åץܡ��ɤ�������򤵤줿�����ƥ�򥳥ԡ����ޤ�"
+#: camel/camel-movemail.c:194
+#, c-format
+msgid "Could not test lock file for %s: %s"
+msgstr "%s �Υ��å��ե������ƥ��Ƚ���ޤ���Ǥ���: %s"
-#: composer/e-msg-composer-address-dialog.c:194
-#: composer/e-msg-composer-address-dialog.c:202
-msgid "Paste"
-msgstr "Ž���դ�"
+#: camel/camel-movemail.c:214
+#, c-format
+msgid "Timed out trying to get lock file on %s. Try again later."
+msgstr ""
-#: composer/e-msg-composer-address-dialog.c:195
-#: composer/e-msg-composer-address-dialog.c:203
-msgid "Paste item from clipboard"
-msgstr "����åץܡ��ɤ��饢���ƥ��Ž���դ��ޤ�"
+#: camel/camel-movemail.c:240
+#, c-format
+msgid "Error reading mail file: %s"
+msgstr "�᡼��ե�������ɤ߹�����˥��顼: %s"
-#: composer/e-msg-composer-address-dialog.c:529
-msgid "Select recipients' addresses"
-msgstr "����ͤΥ��ɥ쥹�����򤷤ޤ�"
+#: camel/camel-movemail.c:251
+#, c-format
+msgid "Error writing mail temp file: %s"
+msgstr "�᡼���ȥե�����ν񤭹�����˥��顼: %s"
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: composer/e-msg-composer-address-dialog.glade.h:7
-msgid "Recipient list:"
-msgstr "�����ԤΥꥹ��:"
+#: camel/camel-movemail.c:269
+#, c-format
+msgid "Failed to store mail in temp file %s: %s"
+msgstr "��ȥե����� %s �إ᡼�����¸�˼��Ԥ��ޤ���: %s"
-#: composer/e-msg-composer-address-dialog.glade.h:9
-msgid "Search..."
-msgstr "����..."
+#: camel/camel-movemail.c:301
+#, c-format
+msgid "Could not create pipe: %s"
+msgstr "�ѥ��פ������Ǥ��ޤ���Ǥ���: %s"
-#: composer/e-msg-composer-address-dialog.glade.h:10
-msgid "Name"
-msgstr "̾��"
+#: camel/camel-movemail.c:313
+#, c-format
+msgid "Could not fork: %s"
+msgstr "fork ����ޤ���Ǥ���: %s"
-#: composer/e-msg-composer-address-dialog.glade.h:11
-#: mail/mail-config.glade.h:8
-msgid "Address"
-msgstr "���ɥ쥹"
+#: camel/camel-movemail.c:351
+#, c-format
+msgid "Movemail program failed: %s"
+msgstr "Movemail �ץ������ϼ��Ԥ��ޤ���: %s"
+
+#: camel/camel-movemail.c:352
+msgid "(Unknown error)"
+msgstr "(̤�ΤΥ��顼)"
+
+#: camel/camel-provider.c:133
+#, c-format
+msgid "Could not load %s: %s"
+msgstr "%s ������ɽ���ޤ���Ǥ���: %s"
+
+#: camel/camel-provider.c:141
+#, c-format
+msgid "Could not load %s: No initialization code in module."
+msgstr "%s ������ɽ���ޤ���Ǥ���: �⥸�塼��Υ����ɤ����������Ƥ��ޤ���"
+
+#: camel/camel-remote-store.c:185
+#, c-format
+msgid "%s server %s"
+msgstr "%s ������ %s"
+
+#: camel/camel-remote-store.c:189
+#, c-format
+msgid "%s service for %s on %s"
+msgstr ""
+
+#: camel/camel-remote-store.c:230
+#, c-format
+msgid "Could not connect to %s (port %d): %s"
+msgstr "%s (�ݡ��� %d) ����³����ޤ���Ǥ���: %s"
+
+#: camel/camel-remote-store.c:231 camel/providers/imap/camel-imap-store.c:190
+msgid "(unknown host)"
+msgstr "(̤�ΤΥۥ���)"
+
+#: camel/camel-service.c:119
+#, c-format
+msgid "URL '%s' needs a username component"
+msgstr "URL '%s' �ϥ桼��̾����ݡ��ͥ�Ȥ�ɬ�פǤ�"
+
+#: camel/camel-service.c:128
+#, c-format
+msgid "URL '%s' needs a host component"
+msgstr "URL '%s' �ϥۥ��ȥ���ݡ��ͥ�Ȥ�ɬ�פǤ�"
+
+#: camel/camel-service.c:137
+#, c-format
+msgid "URL '%s' needs a path component"
+msgstr "URL '%s' �ϥѥ�����ݡ��ͥ�Ȥ�ɬ�פǤ�"
+
+#: camel/camel-service.c:516
+#, c-format
+msgid "No such host %s."
+msgstr "���Τ褦�ʥۥ��� %s �Ϥ���ޤ���"
+
+#: camel/camel-service.c:519
+#, c-format
+msgid "Temporarily unable to look up hostname %s."
+msgstr ""
+
+#: camel/camel-session.c:271
+#, c-format
+msgid "No provider available for protocol `%s'"
+msgstr "�ץ��ȥ��� `%s' �����ѤǤ���ץ��Х����Ϥ���ޤ���"
+
+#: camel/camel-session.c:359
+#, c-format
+msgid ""
+"Could not create directory %s:\n"
+"%s"
+msgstr ""
+"�ǥ��쥯�ȥ� %s ���������ޤ���:\n"
+"%s"
+
+#: camel/camel-url.c:77
+#, c-format
+msgid "URL string `%s' contains no protocol"
+msgstr "URL ʸ���� `%s' �ϥץ��ȥ����ޤ�Ǥ��ޤ���"
+
+#: camel/camel-url.c:92
+#, c-format
+msgid "URL string `%s' contains an invalid protocol"
+msgstr "URL ʸ���� `%s' ��̵���ʥץ��ȥ����ޤ�Ǥ��ޤ�"
+
+#: camel/camel-url.c:153
+#, c-format
+msgid "Port number in URL `%s' is non-numeric"
+msgstr "URL `%s' �Υݡ����ֹ�Ͽ����ǤϤ���ޤ���"
+
+#: camel/providers/imap/camel-imap-command.c:220
+#, c-format
+msgid "Unexpected response from IMAP server: %s"
+msgstr "IMAP �����Ф���ͽ�����ʤ�����������ޤ���: %s"
+
+#: camel/providers/imap/camel-imap-command.c:228
+#, c-format
+msgid "IMAP command failed: %s"
+msgstr "IMAP ���ޥ�ɤϼ��Ԥ��ޤ���: %s"
+
+#: camel/providers/imap/camel-imap-command.c:229 shell/e-storage.c:340
+msgid "Unknown error"
+msgstr "̤�ΤΥ��顼"
+
+#: camel/providers/imap/camel-imap-command.c:370
+#, c-format
+msgid "IMAP server response did not contain %s information"
+msgstr "IMAP �����Фα����� %s �����ޤ�Ǥ��ޤ���"
+
+#: camel/providers/imap/camel-imap-command.c:406
+#, c-format
+msgid "Unexpected OK response from IMAP server: %s"
+msgstr "IMAP �����Ф���ͽ�����ʤ� OK ����������ޤ���: %s"
+
+#: camel/providers/imap/camel-imap-folder.c:219
+#, c-format
+msgid "Could not load summary for %s"
+msgstr "%s �Υ��ޥ꡼������ɽ���ޤ���Ǥ���"
+
+#: camel/providers/imap/camel-imap-folder.c:578
+msgid "Could not find message body in FETCH response."
+msgstr "FETCH �����˥�å��������Τ��դ��뤳�Ȥ�����ޤ���Ǥ���"
+
+#: camel/providers/imap/camel-imap-provider.c:39
+msgid "IMAPv4"
+msgstr "IMAPv4"
+
+#: camel/providers/imap/camel-imap-provider.c:41
+msgid "For reading and storing mail on IMAP servers."
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:161
+#: camel/providers/nntp/camel-nntp-store.c:292
+#: camel/providers/pop3/camel-pop3-store.c:150
+msgid "Password"
+msgstr "�ѥ����"
+
+#: camel/providers/imap/camel-imap-store.c:163
+msgid "This option will connect to the IMAP server using a plaintext password."
+msgstr ""
+"���Υ��ץ����ϥץ쥤��ƥ����ȥѥ���ɤ�Ȥä� IMAP �����Ф���³���ޤ�"
+
+#: camel/providers/imap/camel-imap-store.c:188
+#, c-format
+msgid "Could not connect to IMAP server on %s."
+msgstr "%s �� IMAP �����Ф���³�Ǥ��ޤ���Ǥ���"
+
+#: camel/providers/imap/camel-imap-store.c:252
+#, c-format
+msgid "%sPlease enter the IMAP password for %s@%s"
+msgstr "%s %s@%s �� IMAP �ѥ���ɤ����Ϥ��Ƥ�������"
+
+#: camel/providers/imap/camel-imap-store.c:274
+#, c-format
+msgid ""
+"Unable to authenticate to IMAP server.\n"
+"%s\n"
+"\n"
+msgstr ""
+"IMAP �����Ф�ǧ�ڽ���ޤ���\n"
+"%s\n"
+"\n"
+
+#: camel/providers/imap/camel-imap-store.c:479
+#, c-format
+msgid "Could not create directory %s: %s"
+msgstr "�ǥ��쥯�ȥ� %s ���������ޤ���Ǥ���: %s"
+
+#. FIXME: right error code
+#: camel/providers/mbox/camel-mbox-folder.c:220
+msgid "Could not create summary"
+msgstr "���ޥ꡼���������ޤ���Ǥ���"
+
+#: camel/providers/mbox/camel-mbox-folder.c:383
+#: camel/providers/mbox/camel-mbox-folder.c:386
+#, c-format
+msgid "Cannot append message to mbox file: %s"
+msgstr "mbox �ե�����˥�å��������ɲý���ޤ���: %s"
+
+#: camel/providers/mbox/camel-mbox-folder.c:489
+#, c-format
+msgid "Cannot get message: %s"
+msgstr "��å��������������ޤ���: %s"
+
+#: camel/providers/mbox/camel-mbox-provider.c:34
+msgid "UNIX mbox-format mail files"
+msgstr "UNIX mbox �����Υ᡼��ե�����"
+
+#: camel/providers/mbox/camel-mbox-provider.c:36
+msgid ""
+"For reading mail delivered by the local system, and for storing mail on "
+"local disk."
+msgstr ""
+
+#: camel/providers/mbox/camel-mbox-store.c:121
+#, c-format
+msgid ""
+"Could not open file `%s':\n"
+"%s"
+msgstr ""
+"�ե����� `%s' �򳫤����Ȥ�����ޤ���Ǥ���:\n"
+"%s"
+
+#: camel/providers/mbox/camel-mbox-store.c:128
+#: camel/providers/mh/camel-mh-store.c:122
+#, c-format
+msgid "Folder `%s' does not exist."
+msgstr "�ե���� `%s' ��¸�ߤ��ޤ���"
-#: composer/e-msg-composer-address-dialog.glade.h:12
-msgid "Properties..."
-msgstr "�ץ��ѥƥ�..."
+#: camel/providers/mbox/camel-mbox-store.c:137
+#, c-format
+msgid ""
+"Could not create file `%s':\n"
+"%s"
+msgstr ""
+"�ե����� `%s' ��������뤳�Ȥ�����ޤ���Ǥ���:\n"
+"%s"
+
+#: camel/providers/mbox/camel-mbox-store.c:146
+#: camel/providers/mbox/camel-mbox-store.c:180
+#, c-format
+msgid "`%s' is not a regular file."
+msgstr "`%s' ���̾�Υե�����ǤϤ���ޤ���"
-#: composer/e-msg-composer-address-dialog.glade.h:13
-msgid "Add..."
-msgstr "�ɲ�..."
+#: camel/providers/mbox/camel-mbox-store.c:172
+#: camel/providers/mbox/camel-mbox-store.c:208
+#, c-format
+msgid ""
+"Could not delete folder `%s':\n"
+"%s"
+msgstr ""
+"�ե���� `%s' �������뤳�Ȥ�����ޤ���Ǥ���:\n"
+"%s"
+
+#: camel/providers/mbox/camel-mbox-store.c:187
+#, c-format
+msgid "Folder `%s' is not empty. Not deleted."
+msgstr "�ե���� `%s' �϶��ǤϤ���ޤ���. ������ޤ���"
+
+#: camel/providers/mbox/camel-mbox-store.c:225
+#, c-format
+msgid "Could not rename folder %s to %s: destination exists"
+msgstr "�ե������ %s ���� %s �إ�͡������ޤ���Ǥ���: ���褬¸�ߤ��ޤ�"
+
+#: camel/providers/mbox/camel-mbox-store.c:263
+msgid "Mbox folders may not be nested."
+msgstr ""
+
+#: camel/providers/mbox/camel-mbox-store.c:277
+#, c-format
+msgid "Local mail file %s"
+msgstr "��������᡼��ե����� %s"
-#: composer/e-msg-composer-address-dialog.glade.h:14
-msgid "To: >>"
-msgstr "To: >>"
+#: camel/providers/mbox/camel-mbox-summary.c:650
+#, c-format
+msgid "Could not open summary %s"
+msgstr "���ޥ꡼ %s �򳫤����Ȥ�����ޤ���Ǥ���"
+
+#: camel/providers/mbox/camel-mbox-summary.c:671
+#, c-format
+msgid "Cannot open temporary mailbox: %s"
+msgstr "�ƥ�ݥ�� mailbox �򳫤����Ȥ�����ޤ���: %s"
+
+#: camel/providers/mbox/camel-mbox-summary.c:715
+msgid "Summary mismatch, aborting sync"
+msgstr ""
+
+#: camel/providers/mbox/camel-mbox-summary.c:735
+msgid "Summary mismatch, X-Evolution header missing"
+msgstr ""
+
+#: camel/providers/mbox/camel-mbox-summary.c:757
+#, c-format
+msgid "Error writing to temp mailbox: %s"
+msgstr "��� mailbox �ؽ񤭽Ф���˥��顼: %s"
+
+#: camel/providers/mbox/camel-mbox-summary.c:770
+#: camel/providers/mbox/camel-mbox-summary.c:788
+#, c-format
+msgid "Cannot copy data to output file: %s"
+msgstr "���ϥե�����إǡ����򥳥ԡ�����ޤ���: %s"
+
+#: camel/providers/mbox/camel-mbox-summary.c:813
+#, c-format
+msgid "Could not close source folder %s: %s"
+msgstr "���Υե���� %s ���Ĥ��뤳�Ȥ�����ޤ���Ǥ���: %s"
+
+#: camel/providers/mbox/camel-mbox-summary.c:822
+#, c-format
+msgid "Could not close temp folder: %s"
+msgstr "��ȥե�������Ĥ��뤳�Ȥ�����ޤ���Ǥ���: %s"
+
+#: camel/providers/mbox/camel-mbox-summary.c:830
+#, c-format
+msgid "Could not rename folder: %s"
+msgstr "�ե�������͡������ޤ���Ǥ���: %s"
+
+#: camel/providers/mbox/camel-mbox-summary.c:842
+#, c-format
+msgid "Unknown error: %s"
+msgstr "̤�ΤΥ��顼: %s"
+
+#. FIXME: right error code
+#: camel/providers/mh/camel-mh-folder.c:211
+msgid "Could not load or create summary"
+msgstr "���ޥ꡼������ޤ��ϥ����ɤ��뤳�Ȥ�����ޤ���Ǥ���"
+
+#: camel/providers/mh/camel-mh-folder.c:330
+#: camel/providers/mh/camel-mh-folder.c:333
+#, c-format
+msgid "Cannot append message to mh folder: %s"
+msgstr "mh �ե�����إ�å��������ɲý���ޤ���: %s"
+
+#: camel/providers/mh/camel-mh-folder.c:399
+#, c-format
+msgid ""
+"Cannot get message: %s\n"
+" %s"
+msgstr ""
+"��å��������������ޤ���: %s\n"
+" %s"
+
+#: camel/providers/mh/camel-mh-provider.c:34
+msgid "UNIX MH-format mail directories"
+msgstr "UNIX MH �����Υ᡼��ǥ��쥯�ȥ�"
+
+#: camel/providers/mh/camel-mh-provider.c:36
+msgid "For storing local mail in MH-like mail directories"
+msgstr ""
+
+#: camel/providers/mh/camel-mh-store.c:115
+#, c-format
+msgid ""
+"Could not open folder `%s':\n"
+"%s"
+msgstr ""
+"�ե���� `%s' �򳫤����Ȥ�����ޤ���Ǥ���:\n"
+"%s"
+
+#: camel/providers/mh/camel-mh-store.c:130
+#, c-format
+msgid ""
+"Could not create folder `%s':\n"
+"%s"
+msgstr ""
+"�ե���� `%s' ���������ޤ���Ǥ���:\n"
+"%s"
+
+#: camel/providers/mh/camel-mh-store.c:139
+#, c-format
+msgid "`%s' is not a directory."
+msgstr "`%s' �ϥǥ��쥯�ȥ�ǤϤ���ޤ���"
+
+#: camel/providers/mh/camel-mh-store.c:158
+#: camel/providers/mh/camel-mh-store.c:171
+#, c-format
+msgid "Could not delete folder `%s': %s"
+msgstr "�ե���� `%s' �������뤳�Ȥ�����ޤ���Ǥ���: %s"
+
+#: camel/providers/mh/camel-mh-store.c:189
+#: camel/providers/mh/camel-mh-store.c:193
+#, c-format
+msgid "Could not rename folder `%s': %s"
+msgstr "�ե���� `%s' ���͡������ޤ���Ǥ���: %s"
+
+#: camel/providers/mh/camel-mh-store.c:197
+#, c-format
+msgid "Could not rename folder `%s': %s exists"
+msgstr "�ե���� `%s' ���͡������ޤ���Ǥ���: %s ��¸�ߤ��ޤ�"
+
+#: camel/providers/mh/camel-mh-store.c:205
+msgid "MH folders may not be nested."
+msgstr ""
+
+#: camel/providers/mh/camel-mh-store.c:217
+#, c-format
+msgid "Local mail directory %s"
+msgstr "��������᡼��ǥ��쥯�ȥ� %s"
+
+#: camel/providers/nntp/camel-nntp-auth.c:41
+#, c-format
+msgid "Please enter the NNTP password for %s@%s"
+msgstr "%s@%s �� NNTP �ѥ���ɤ����Ϥ��Ƥ�������"
+
+#: camel/providers/nntp/camel-nntp-auth.c:62
+msgid "Server rejected username"
+msgstr "�����Фϥ桼��̾����ݤ��ޤ���"
+
+#: camel/providers/nntp/camel-nntp-auth.c:68
+msgid "Failed to send username to server"
+msgstr "�����Фإ桼��̾�������˼��Ԥ��ޤ���"
+
+#: camel/providers/nntp/camel-nntp-auth.c:77
+msgid "Server rejected username/password"
+msgstr "�����Фϥ桼��̾/�ѥ���ɤ���ݤ��ޤ���"
+
+#: camel/providers/nntp/camel-nntp-folder.c:140
+#, c-format
+msgid "Message %s not found."
+msgstr "��å����� %s �ϸ��դ���ޤ���"
+
+#: camel/providers/nntp/camel-nntp-grouplist.c:45
+msgid "Could not get group list from server."
+msgstr "�����Ф��饰�롼�ץꥹ�Ȥ��������ޤ���Ǥ���"
+
+#: camel/providers/nntp/camel-nntp-grouplist.c:93
+#: camel/providers/nntp/camel-nntp-grouplist.c:102
+#, c-format
+msgid "Unable to load grouplist file for %s: %s"
+msgstr "%s �Υ��롼�ץꥹ�ȥե����������ɽ���ޤ���: %s"
+
+#: camel/providers/nntp/camel-nntp-grouplist.c:151
+#, c-format
+msgid "Unable to save grouplist file for %s: %s"
+msgstr "%s �Υ��롼�ץꥹ�ȥե��������¸����ޤ���: %s"
+
+#: camel/providers/nntp/camel-nntp-provider.c:38
+msgid "USENET news"
+msgstr "USENET news"
+
+#: camel/providers/nntp/camel-nntp-provider.c:40
+msgid "This is a provider for reading from and posting toUSENET newsgroups."
+msgstr "����� USENET �Υ˥塼�����롼�פ����������뤿��Υץ��Х����Ǥ�"
+
+#: camel/providers/nntp/camel-nntp-store.c:226
+#, c-format
+msgid "Could not open directory for news server: %s"
+msgstr "�˥塼�������ФΥǥ��쥯�ȥ�򳫤����Ȥ�����ޤ���Ǥ���: %s"
+
+#: camel/providers/nntp/camel-nntp-store.c:287
+#, c-format
+msgid "USENET News via %s"
+msgstr "USENET News via %s"
+
+#: camel/providers/nntp/camel-nntp-store.c:294
+msgid ""
+"This option will authenticate with the NNTP server using a plaintext "
+"password."
+msgstr ""
+"���Υ��ץ����ϥץ쥤��ƥ����ȥѥ���ɤ�Ȥä� NNTP �����Ф�ǧ�ڤ��ޤ�"
+
+#: camel/providers/nntp/camel-nntp-store.c:333
+#: camel/providers/nntp/camel-nntp-store.c:499
+#, c-format
+msgid "Unable to open or create .newsrc file for %s: %s"
+msgstr "%s �� .newsrc �ե����������ޤ��ϳ������Ȥ�����ޤ���: %s"
+
+#: camel/providers/pop3/camel-pop3-folder.c:177
+msgid "Could not open folder: message listing was incomplete."
+msgstr "�ե�����򳫤��ޤ���Ǥ���: ��å������ꥹ�Ȥ�̤�����Ǥ�"
+
+#: camel/providers/pop3/camel-pop3-folder.c:271
+#, c-format
+msgid "No message with uid %s"
+msgstr "uid %s �Υ�å������Ϥ���ޤ���"
+
+#: camel/providers/pop3/camel-pop3-folder.c:285
+#, c-format
+msgid "Could not retrieve message from POP server %s: %s"
+msgstr "POP ������ %s �����å��������������ޤ���Ǥ���: %s"
+
+#: camel/providers/pop3/camel-pop3-provider.c:34
+msgid "POP"
+msgstr "POP"
+
+#: camel/providers/pop3/camel-pop3-provider.c:36
+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."
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-store.c:152
+msgid ""
+"This option will connect to the POP server using a plaintext password. This "
+"is the only option supported by many POP servers."
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-store.c:162
+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 "
+"claim to support it."
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-store.c:174
+msgid ""
+"This will connect to the POP server and use Kerberos 4 to authenticate to it."
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-store.c:219
+#, c-format
+msgid "Could not authenticate to KPOP server: %s"
+msgstr "KPOP �����Ф�ǧ�ڽ���ޤ���Ǥ���: %s"
+
+#: camel/providers/pop3/camel-pop3-store.c:337
+#, c-format
+msgid "Could not connect to POP server on %s."
+msgstr "%s �� POP �����Ф���³����ޤ���Ǥ���"
+
+#: camel/providers/pop3/camel-pop3-store.c:391
+#, c-format
+msgid "%sPlease enter the POP3 password for %s@%s"
+msgstr "%s %s@%s �� POP3 �ѥ���ɤ����Ϥ��Ƥ�������"
+
+#: camel/providers/pop3/camel-pop3-store.c:410
+#, c-format
+msgid ""
+"Unable to connect to POP server.\n"
+"Error sending username: %s"
+msgstr ""
+"POP �����Ф���³����ޤ���\n"
+"�桼��̾��������˥��顼: %s"
+
+#: camel/providers/pop3/camel-pop3-store.c:413
+#: camel/providers/pop3/camel-pop3-store.c:450
+msgid "(Unknown)"
+msgstr "(̤��)"
+
+#: camel/providers/pop3/camel-pop3-store.c:440
+msgid ""
+"Unable to connect to POP server.\n"
+"No support for requested authentication mechanism."
+msgstr ""
+"POP �����Ф���³����ޤ���\n"
+"�׵ᤷ��ǧ�ڼ��ʤϥ��ݡ��Ȥ��Ƥ��ޤ���"
+
+#: camel/providers/pop3/camel-pop3-store.c:448
+#, c-format
+msgid ""
+"Unable to connect to POP server.\n"
+"Error sending password: %s"
+msgstr ""
+"POP �����Ф���³�Ǥ��ޤ���\n"
+"�ѥ���ɤ�������˥��顼: %s"
+
+#: camel/providers/pop3/camel-pop3-store.c:554
+#, c-format
+msgid "No such folder `%s'."
+msgstr "���Τ褦�ʥե���� `%s' �Ϥ���ޤ���"
+
+#: camel/providers/sendmail/camel-sendmail-provider.c:34
+msgid "Sendmail"
+msgstr "Sendmail"
+
+#: camel/providers/sendmail/camel-sendmail-provider.c:36
+msgid ""
+"For delivering mail by passing it to the \"sendmail\" program on the local "
+"system."
+msgstr ""
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:105
+#, c-format
+msgid "Could not create pipe to sendmail: %s: mail not sent"
+msgstr ""
+"sendmail �إѥ��פ��������ޤ���Ǥ���: %s: �᡼����������ޤ���Ǥ���"
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:122
+#, c-format
+msgid "Could not fork sendmail: %s: mail not sent"
+msgstr "sendmail �� fork ����ޤ���Ǥ���: %s: �᡼����������ޤ���Ǥ���"
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:148
+#, c-format
+msgid "Could not send message: %s"
+msgstr "��å���������������ޤ���Ǥ���: %s"
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:161
+#, c-format
+msgid "sendmail exited with signal %s: mail not sent."
+msgstr "sendmail �ϥ����ʥ� %s �ǽ�λ���ޤ���: �᡼����������ޤ���Ǥ���"
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:168
+#, c-format
+msgid "Could not execute %s: mail not sent."
+msgstr "%s ��¹Խ���ޤ���Ǥ���: �᡼����������ޤ���Ǥ���"
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:173
+#, c-format
+msgid "sendmail exited with status %d: mail not sent."
+msgstr "sendmail �ϥ��ơ����� %d �ǽ�λ���ޤ���: �᡼����������ޤ���Ǥ���"
-#: composer/e-msg-composer-address-dialog.glade.h:15
-msgid "Cc: >>"
-msgstr "Cc: >>"
+#: camel/providers/sendmail/camel-sendmail-transport.c:220
+msgid "sendmail"
+msgstr "sendmail"
-#: composer/e-msg-composer-address-dialog.glade.h:16
-msgid "Bcc: >>"
-msgstr "Bcc: >>"
+#: camel/providers/sendmail/camel-sendmail-transport.c:222
+msgid "Mail delivery via the sendmail program"
+msgstr "sendmail ��ͳ�ǥ᡼����ۿ�"
-#: composer/e-msg-composer-address-dialog.glade.h:17
-msgid "label9"
-msgstr "label9"
+#: camel/providers/smtp/camel-smtp-provider.c:36
+msgid "For delivering mail by connecting to a remote mailhub using SMTP."
+msgstr "SMTP ��Ȥäƥ�⡼�ȤΥ᡼��ϥ֤���³���᡼����ۿ�"
-#: composer/e-msg-composer-address-dialog.glade.h:18
-msgid "label7"
-msgstr "label7"
+#: camel/providers/vee/camel-vee-provider.c:30
+msgid "Virtual folder email provider"
+msgstr "���ۥե�����᡼��ץ��Х���"
-#: composer/e-msg-composer-address-dialog.glade.h:19
-msgid "label8"
-msgstr "label8"
+#: camel/providers/vee/camel-vee-provider.c:32
+msgid "For reading mail as a query of another set of folders"
+msgstr ""
-#: composer/e-msg-composer-attachment-bar.c:76
+#: composer/e-msg-composer-attachment-bar.c:85
msgid "1 byte"
msgstr "1 ����"
-#: composer/e-msg-composer-attachment-bar.c:78
+#: composer/e-msg-composer-attachment-bar.c:87
#, c-format
msgid "%u bytes"
msgstr "%u ����"
-#: composer/e-msg-composer-attachment-bar.c:85
+#: composer/e-msg-composer-attachment-bar.c:94
#, c-format
msgid "%.1fK"
msgstr "%.1fK"
-#: composer/e-msg-composer-attachment-bar.c:89
+#: composer/e-msg-composer-attachment-bar.c:98
#, c-format
msgid "%.1fM"
msgstr "%.1fM"
-#: composer/e-msg-composer-attachment-bar.c:93
+#: composer/e-msg-composer-attachment-bar.c:102
#, c-format
msgid "%.1fG"
msgstr "%.1fG"
-#: composer/e-msg-composer-attachment-bar.c:299
-msgid "Add attachment"
-msgstr "ź��ʪ���ɲ�"
+#. This is a filename. Translators take note.
+#: composer/e-msg-composer-attachment-bar.c:299 mail/mail-display.c:119
+msgid "attachment"
+msgstr "ź��"
+
+#: composer/e-msg-composer-attachment-bar.c:395
+msgid "Attach a file"
+msgstr "�ե������ź�դ��ޤ�"
-#: composer/e-msg-composer-attachment-bar.c:362 shell/e-shortcuts-view.c:333
+#: composer/e-msg-composer-attachment-bar.c:442 filter/filter.glade.h:22
+#: filter/filter.glade.h:25 shell/e-shortcuts-view.c:239
+#: shell/e-shortcuts-view.c:356
msgid "Remove"
msgstr "���"
-#: composer/e-msg-composer-attachment-bar.c:363
+#: composer/e-msg-composer-attachment-bar.c:443
msgid "Remove selected items from the attachment list"
msgstr "ź��ʪ�ꥹ�Ȥ������򤷤������ƥ�������ޤ�"
-#: composer/e-msg-composer-attachment-bar.c:394
+#: composer/e-msg-composer-attachment-bar.c:474
msgid "Add attachment..."
-msgstr "ź��ʪ���ɲ�..."
+msgstr "ź�դ��ɲ�..."
-#: composer/e-msg-composer-attachment-bar.c:395
+#: composer/e-msg-composer-attachment-bar.c:475
msgid "Attach a file to the message"
msgstr "��å������إե������ź�դ��ޤ�"
@@ -3027,39 +3229,39 @@ msgstr "MIME ����:"
msgid "File name:"
msgstr "�ե�����̾:"
-#: composer/e-msg-composer-hdrs.c:138 composer/e-msg-composer-hdrs.c:296
+#: composer/e-msg-composer-hdrs.c:137 composer/e-msg-composer-hdrs.c:295
msgid "From:"
msgstr "���п�:"
-#: composer/e-msg-composer-hdrs.c:244
+#: composer/e-msg-composer-hdrs.c:243
msgid "Click here for the address book"
msgstr "���ɥ쥹Ģ�Τ���ˤ����ǥ���å�"
-#: composer/e-msg-composer-hdrs.c:297
-msgid "Enter the identitiy you wish to send this message from"
+#: composer/e-msg-composer-hdrs.c:296
+msgid "Enter the identity you wish to send this message from"
msgstr "���Υ�å������������������ȸ������Ϥ��ޤ�"
-#: composer/e-msg-composer-hdrs.c:301
+#: composer/e-msg-composer-hdrs.c:300
msgid "To:"
msgstr "�����:"
-#: composer/e-msg-composer-hdrs.c:302
+#: composer/e-msg-composer-hdrs.c:301
msgid "Enter the recipients of the message"
msgstr "��å������μ���ͤ����Ϥ��ޤ�"
-#: composer/e-msg-composer-hdrs.c:306
+#: composer/e-msg-composer-hdrs.c:305
msgid "Cc:"
msgstr "Cc:"
-#: composer/e-msg-composer-hdrs.c:307
+#: composer/e-msg-composer-hdrs.c:306
msgid "Enter the addresses that will receive a carbon copy of the message"
msgstr "��å������Υ����ܥ󥳥ԡ���������륢�ɥ쥹�����Ϥ��ޤ�"
-#: composer/e-msg-composer-hdrs.c:312
+#: composer/e-msg-composer-hdrs.c:311
msgid "Bcc:"
msgstr "Bcc:"
-#: composer/e-msg-composer-hdrs.c:313
+#: composer/e-msg-composer-hdrs.c:312
msgid ""
"Enter the addresses that will receive a carbon copy of the message without "
"appearing in the recipient list of the message."
@@ -3067,41 +3269,55 @@ msgstr ""
"��å������μ���ͥꥹ�Ȥ���˸���ʤ���, "
"��å������Υ����ܥ󥳥ԡ���������륢�ɥ쥹�����Ϥ��ޤ�"
-#: composer/e-msg-composer-hdrs.c:319
+#: composer/e-msg-composer-hdrs.c:318
msgid "Subject:"
msgstr "Subject:"
-#: composer/e-msg-composer-hdrs.c:320
+#: composer/e-msg-composer-hdrs.c:319
msgid "Enter the subject of the mail"
msgstr "�᡼���ɽ������Ϥ��ޤ�"
-#: composer/e-msg-composer.c:466
+#: composer/e-msg-composer.c:298
+#, c-format
+msgid ""
+"Could not open signature file %s:\n"
+"%s"
+msgstr ""
+"��̾�ե����� %s �򳫤����Ȥ�����ޤ���Ǥ���:\n"
+"%s"
+
+#: composer/e-msg-composer.c:407
msgid "Save as..."
msgstr "��̾����¸..."
-#: composer/e-msg-composer.c:477
+#: composer/e-msg-composer.c:418
#, c-format
msgid "Error saving file: %s"
msgstr "�ե��������¸��˥��顼: %s"
-#: composer/e-msg-composer.c:497
+#: composer/e-msg-composer.c:438
#, c-format
msgid "Error loading file: %s"
msgstr "�ե�����Υ�������˥��顼: %s"
-#: composer/e-msg-composer.c:519
+#: composer/e-msg-composer.c:460
msgid "Saving changes to message..."
msgstr "��å��������ѹ�����¸��..."
-#: composer/e-msg-composer.c:521
-msgid "About to save changes to message..."
-msgstr "��å��������ѹ�����¸���褦�Ȥ��Ƥ��ޤ�..."
+#: composer/e-msg-composer.c:462
+msgid "Save changes to message..."
+msgstr "��å��������ѹ�����¸..."
+
+#: composer/e-msg-composer.c:503
+#, c-format
+msgid "Error saving composition to 'Drafts': %s"
+msgstr ""
-#: composer/e-msg-composer.c:606 shell/e-shell-view-menu.c:165
+#: composer/e-msg-composer.c:547 shell/e-shell-view-menu.c:167
msgid "Evolution"
msgstr "Evolution"
-#: composer/e-msg-composer.c:612
+#: composer/e-msg-composer.c:553
msgid ""
"This message has not been sent.\n"
"\n"
@@ -3111,27 +3327,27 @@ msgstr ""
"\n"
"�ѹ�����¸���ޤ���?"
-#: composer/e-msg-composer.c:634
+#: composer/e-msg-composer.c:575
msgid "Open file"
msgstr "�ե�����򳫤�"
-#: composer/e-msg-composer.c:753
+#: composer/e-msg-composer.c:701
msgid "That file does not exist."
msgstr "���Υե������¸�ߤ��ޤ���"
-#: composer/e-msg-composer.c:763
+#: composer/e-msg-composer.c:711
msgid "That is not a regular file."
msgstr "������̾�Υե�����ǤϤ���ޤ���"
-#: composer/e-msg-composer.c:773
+#: composer/e-msg-composer.c:721
msgid "That file exists but is not readable."
msgstr "���Υե������¸�ߤ��ޤ������ɤ߼���ǽ�ǤϤ���ޤ���"
-#: composer/e-msg-composer.c:783
+#: composer/e-msg-composer.c:731
msgid "That file appeared accesible but open(2) failed."
msgstr "���Υե�����ϥ���������ǽ�Τ褦�˸����ޤ�����open(2) �ϼ��Ԥ��ޤ���"
-#: composer/e-msg-composer.c:805
+#: composer/e-msg-composer.c:753
msgid ""
"The file is very large (more than 100K).\n"
"Are you sure you wish to insert it?"
@@ -3139,123 +3355,18 @@ msgstr ""
"�ե�����ϤȤƤ��礭�� (100K �ʾ�) �Ǥ�\n"
"������������뤳�Ȥ�˾��ΤϳΤ��Ǥ���?"
-#: composer/e-msg-composer.c:826
+#: composer/e-msg-composer.c:774
msgid "An error occurred while reading the file."
msgstr "�ե������ɹ���δ֤˥��顼��ȯ�����ޤ���"
-#: composer/e-msg-composer.c:922 shell/e-shell-view-menu.c:434
-msgid "_File"
-msgstr "�ե�����(_F)"
-
-#: composer/e-msg-composer.c:928
-msgid "_Open..."
-msgstr "����(_O)..."
-
-#: composer/e-msg-composer.c:929
-msgid "Load a previously saved message"
-msgstr "��������¸������å��������ɤ߹��ߤޤ�"
-
-#: composer/e-msg-composer.c:937
-msgid "_Save..."
-msgstr "��¸(_S)..."
-
-#: composer/e-msg-composer.c:938
-msgid "Save message"
-msgstr "��å���������¸���ޤ�"
-
-#: composer/e-msg-composer.c:946
-msgid "_Save as..."
-msgstr "��̾����¸(_S)..."
-
-#: composer/e-msg-composer.c:947
-msgid "Save message with a different name"
-msgstr "�̤�̾���ǥ�å���������¸���ޤ�"
-
-#: composer/e-msg-composer.c:955
-msgid "Save in _folder..."
-msgstr "�ե���������¸(_f)..."
-
-#: composer/e-msg-composer.c:956
-msgid "Save the message in a specified folder"
-msgstr "���ꤷ���ե������Υ�å���������¸���ޤ�"
-
-#: composer/e-msg-composer.c:965
-msgid "_Insert text file... (FIXME)"
-msgstr "�ƥ����ȥե����������(_I)... (FIXME)"
-
-#: composer/e-msg-composer.c:966
-msgid "Insert a file as text into the message"
-msgstr "�ƥ����ȥե�������å�����������������ޤ�"
-
-#: composer/e-msg-composer.c:975
-msgid "Send _Now"
-msgstr "����������(_N)"
-
-#: composer/e-msg-composer.c:976
-msgid "Send the message now"
-msgstr "��å������򺣤����������ޤ�"
-
-#: composer/e-msg-composer.c:984
-msgid "Send _Later"
-msgstr "�������(_L)"
-
-#: composer/e-msg-composer.c:985
-msgid "Send the message later"
-msgstr "��å����������������ޤ�"
-
-#: composer/e-msg-composer.c:995
-msgid "_Close..."
-msgstr "�Ĥ���(_C)..."
-
-#: composer/e-msg-composer.c:996
-msgid "Quit the message composer"
-msgstr "��å�����������λ���ޤ�"
-
-#: composer/e-msg-composer.c:1009 shell/e-shell-view-menu.c:478
-msgid "_Edit"
-msgstr "�Խ�(_E)"
-
-#: composer/e-msg-composer.c:1026
-msgid "HTML"
-msgstr "HTML"
-
-#: composer/e-msg-composer.c:1027
-msgid "Send the mail in HTML format"
-msgstr "HTML �����ǥ�å��������������ޤ�"
-
-#: composer/e-msg-composer.c:1040 shell/e-shell-view-menu.c:383
-#: shell/e-shell-view-menu.c:489 shell/e-storage-set-view.c:221
-msgid "_View"
-msgstr "ɽ��(_V)"
-
-#: composer/e-msg-composer.c:1046
-msgid "Show _attachments"
-msgstr "ź��ʪ��ɽ��(_a)"
-
-#: composer/e-msg-composer.c:1047
-msgid "Show/hide attachments"
-msgstr "ź��ʪ��ɽ��/����"
-
-#: composer/e-msg-composer.c:1080
-msgid "Send"
-msgstr "����"
-
-#: composer/e-msg-composer.c:1081
-msgid "Send this message"
-msgstr "���Υ�å��������������ޤ�"
-
-#: composer/e-msg-composer.c:1090
-msgid "Attach"
-msgstr "ź��"
-
-#: composer/e-msg-composer.c:1091
-msgid "Attach a file"
-msgstr "�ե������ź�դ��ޤ�"
-
-#: composer/e-msg-composer.c:1278
+#: composer/e-msg-composer.c:1136
msgid "Compose a message"
msgstr "��å�������������ޤ�"
+#: composer/e-msg-composer.c:1210
+msgid "Could not create composer window."
+msgstr "composer ������ɥ����������ޤ���Ǥ���"
+
#: filter/filter-datespec.c:61
msgid "years"
msgstr "ǯ"
@@ -3334,32 +3445,46 @@ msgstr "�����"
msgid "<click here to select a date>"
msgstr "<���դ����򤹤뤿��ˤ����򥯥�å����Ƥ�������>"
-#: filter/filter-editor.c:157 filter/score-editor.c:127
-#: filter/vfolder-editor.c:153
-msgid "Add Rule"
-msgstr "�롼����ɲ�"
+#: filter/filter-editor.c:159 mail/mail-autofilter.c:287
+#: mail/mail-autofilter.c:336
+msgid "Add Filter Rule"
+msgstr "�ե��륿�롼����ɲ�"
-#: filter/filter-editor.c:191
-msgid "Edit Rule"
-msgstr "�롼����Խ�"
+#: filter/filter-editor.c:207
+msgid "Edit Filter Rule"
+msgstr "�ե��륿�롼����Խ�"
-#: filter/filter-filter.c:401 filter/filter-rule.c:539
-msgid "Less"
-msgstr "��꾮����"
+#.
+#. * Translatable strings file generated by Glade.
+#. * Add this file to your project's POTFILES.in.
+#. * DO NOT compile it as part of your application.
+#.
+#: filter/filter-editor.c:404 filter/filter.glade.h:7
+msgid "Edit Filters"
+msgstr "�ե��륿���Խ�"
-#: filter/filter-filter.c:404 filter/filter-rule.c:542
-msgid "More"
-msgstr "����礭��"
+#. and now for the action area
+#: filter/filter-filter.c:401
+msgid "Then"
+msgstr ""
+
+#: filter/filter-filter.c:414
+msgid "Add action"
+msgstr "ư����ɲ�"
+
+#: filter/filter-filter.c:420
+msgid "Remove action"
+msgstr "ư�����"
#: filter/filter-folder.c:186 filter/vfolder-rule.c:271
msgid "Select Folder"
-msgstr "�ե���������򤷤ޤ�"
+msgstr "�ե����������"
#: filter/filter-folder.c:209
msgid "Enter folder URI"
msgstr "�ե���� URI ������"
-#: filter/filter-folder.c:253
+#: filter/filter-folder.c:254
msgid "<click here to select a folder>"
msgstr "<�ե���������򤹤뤿��ˤ����򥯥�å����Ƥ�������>"
@@ -3367,202 +3492,290 @@ msgstr "<�ե���������򤹤뤿��ˤ����򥯥�å����Ƥ�������>"
msgid "Test"
msgstr "�ƥ���"
-#: filter/score-editor.c:165
-msgid "Edit Score Rule"
-msgstr "�������롼����Խ�"
+#: filter/filter-rule.c:509
+msgid "Rule name: "
+msgstr "�롼��̾: "
-#: filter/vfolder-editor.c:192
-msgid "Edit VFolder Rule"
-msgstr "VFolder �롼����Խ�"
+#: filter/filter-rule.c:513
+msgid "Untitled"
+msgstr "�����ȥ�ʤ�"
-#: mail/component-factory.c:195
-msgid "Cannot initialize Evolution's mail component."
-msgstr "Evolution �᡼�륳��ݡ��ͥ�Ȥν����������ޤ���"
+#: filter/filter-rule.c:527
+msgid "If"
+msgstr "�⤷"
-#: mail/folder-browser-factory.c:33
-msgid "Get Mail"
-msgstr "�᡼��μ���"
+#: filter/filter-rule.c:544
+msgid "Execute actions"
+msgstr "ư���¹�"
-#: mail/folder-browser-factory.c:33
-msgid "Send queued mail and retrieve new mail"
-msgstr "���塼�������줿�᡼����������ƿ������᡼���������ޤ�"
+#: filter/filter-rule.c:548
+msgid "if all criteria are met"
+msgstr ""
-#: mail/folder-browser-factory.c:35
-msgid "Compose"
-msgstr "����"
+#: filter/filter-rule.c:553
+msgid "if any criteria are met"
+msgstr ""
-#: mail/folder-browser-factory.c:35
-msgid "Compose a new message"
-msgstr "������å�������������ޤ�"
+#: filter/filter-rule.c:564
+msgid "Add criterion"
+msgstr "�����ɲ�"
-#. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
-#. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/folder-browser-factory.c:39 mail/mail-view.c:148
-msgid "Reply"
-msgstr "�ֿ�"
+#: filter/filter-rule.c:570
+msgid "Remove criterion"
+msgstr "������"
-#: mail/folder-browser-factory.c:39 mail/mail-view.c:148
-msgid "Reply to the sender of this message"
-msgstr "��å������κ��пͤ��ֿ����ޤ�"
+#: filter/filter.glade.h:8
+msgid ""
+"Incoming\n"
+"Outgoing\n"
+msgstr ""
+"��\n"
+"��\n"
-#: mail/folder-browser-factory.c:40 mail/mail-view.c:151
-msgid "Reply to All"
-msgstr "�������ֿ�"
+#: filter/filter.glade.h:11
+msgid "Filter Rules"
+msgstr "�ե��륿�롼��"
-#: mail/folder-browser-factory.c:40 mail/mail-view.c:151
-msgid "Reply to all recipients of this message"
-msgstr "���Υ�å������μ�����������ֿ����ޤ�"
+#: filter/filter.glade.h:13 filter/filter.glade.h:18
+#: mail/mail-config.glade.h:12 mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:23
+msgid "Edit"
+msgstr "�Խ�"
-#: mail/folder-browser-factory.c:42 mail/mail-view.c:154
-msgid "Forward"
-msgstr "ž��"
+#: filter/filter.glade.h:15
+msgid "Edit VFolders"
+msgstr "���ۥե�������Խ�"
-#: mail/folder-browser-factory.c:42 mail/mail-view.c:154
-msgid "Forward this message"
-msgstr "���Υ�å�������ž�����ޤ�"
+#: filter/filter.glade.h:16
+msgid "Virtual Folders"
+msgstr "���ۥե����"
-#: mail/folder-browser-factory.c:46
-msgid "Move"
-msgstr "��ư"
+#: filter/filter.glade.h:20 filter/filter.glade.h:23
+msgid "vFolder Sources"
+msgstr "���ۥե����������"
-#: mail/folder-browser-factory.c:46
-msgid "Move message to a new folder"
-msgstr "�����ե�����إ�å��������ư���ޤ�"
+#. Automatically generated. Do not edit.
+#: filter/libfilter-i18n.h:2
+msgid "Assign Colour"
+msgstr ""
-#: mail/folder-browser-factory.c:47
-msgid "Copy message to a new folder"
-msgstr "�����ե�����إ�å������򥳥ԡ����ޤ�"
+#: filter/libfilter-i18n.h:3
+msgid "Assign Score"
+msgstr ""
-#: mail/folder-browser-factory.c:49 mail/mail-view.c:158
-msgid "Print the selected message"
-msgstr "���򤵤줿��å�������������ޤ�"
+#: filter/libfilter-i18n.h:4
+msgid "Copy to Folder"
+msgstr "�ե�����إ��ԡ�"
-#: mail/folder-browser-factory.c:51 mail/mail-view.c:160
-msgid "Delete this message"
-msgstr "���Υ�å������������ޤ�"
+#: filter/libfilter-i18n.h:5
+msgid "Date received"
+msgstr "������"
-#: mail/folder-browser-factory.c:72
-#, c-format
-msgid "Run filter \"%s\""
-msgstr "�ե��륿 \"%s\" ��¹�"
+#: filter/libfilter-i18n.h:6
+msgid "Date sent"
+msgstr "������"
-#: mail/folder-browser-factory.c:130 mail/folder-browser-factory.c:189
-msgid "_Print Message"
-msgstr "�����������(_P)"
+#: filter/libfilter-i18n.h:8
+msgid "Expression"
+msgstr "ɽ��"
-#: mail/folder-browser-factory.c:140
-msgid "_Threaded Message List"
-msgstr "��å������򥹥�å�ɽ��(_T)"
+#: filter/libfilter-i18n.h:9
+msgid "Forward to Address"
+msgstr "���ɥ쥹��ž��"
-#: mail/folder-browser-factory.c:151
-msgid "Mail _Filters..."
-msgstr "�᡼��ե��륿(_F) ..."
+#: filter/libfilter-i18n.h:10
+msgid "Message Body"
+msgstr "������"
-#: mail/folder-browser-factory.c:156
-msgid "_Virtual Folder Editor..."
-msgstr "���ۥե�������ǥ���(_V)..."
+#: filter/libfilter-i18n.h:11
+msgid "Message was received"
+msgstr "��å������ϼ������ޤ���"
-#: mail/folder-browser-factory.c:161
-msgid "_Mail Configuration..."
-msgstr "�᡼������(_M)..."
+#: filter/libfilter-i18n.h:12
+msgid "Message was sent"
+msgstr "��å��������������ޤ���"
-#: mail/folder-browser-factory.c:166
-msgid "Forget _Passwords"
-msgstr "�ѥ����ʶ��(_P)"
+#: filter/libfilter-i18n.h:13
+msgid "Move to Folder"
+msgstr "�ե�����ذ�ư"
-#: mail/folder-browser-factory.c:174
-msgid "_Message"
-msgstr "������(_M)"
+#: filter/libfilter-i18n.h:15
+msgid "Recipients"
+msgstr "������"
-#: mail/folder-browser-factory.c:178
-msgid "_Open in New Window"
-msgstr "����������ɥ��򳫤�(_O)"
+#: filter/libfilter-i18n.h:16
+msgid "Sender"
+msgstr "������"
-#: mail/folder-browser-factory.c:184
-msgid "_Edit Message"
-msgstr "��å��������Խ�(_E)"
+#: filter/libfilter-i18n.h:17
+msgid "Source"
+msgstr "������"
-#: mail/folder-browser-factory.c:196
-msgid "Reply to _Sender"
-msgstr "�����Ԥ��ֿ�(_S)"
+#: filter/libfilter-i18n.h:18
+msgid "Specific header"
+msgstr "����Υإå�"
-#: mail/folder-browser-factory.c:201
-msgid "Reply to _All"
-msgstr "�������ֿ�(_A)"
+#: filter/libfilter-i18n.h:19
+msgid "Stop Processing"
+msgstr ""
-#: mail/folder-browser-factory.c:206
-msgid "_Forward"
-msgstr "ž��(_F)"
+#: filter/libfilter-i18n.h:20
+msgid "Subject"
+msgstr "ɽ��"
-#: mail/folder-browser-factory.c:213
-msgid "_Delete Message"
-msgstr "����������(_D)"
+#: filter/libfilter-i18n.h:21
+msgid "after"
+msgstr "��"
-#: mail/folder-browser-factory.c:218
-msgid "_Move Message"
-msgstr "��å��������ư(_M)"
+#: filter/libfilter-i18n.h:22
+msgid "before"
+msgstr "��"
-#: mail/folder-browser-factory.c:223
-msgid "_Copy Message"
-msgstr "��å������򥳥ԡ�(_C)"
+#: filter/libfilter-i18n.h:23
+msgid "contains"
+msgstr "�ޤ�"
-#: mail/folder-browser-factory.c:230
-msgid "_VFolder on Subject"
-msgstr "ɽ��β��ۥե����(_V)"
+#: filter/libfilter-i18n.h:24
+msgid "does not contain"
+msgstr "�ޤޤʤ�"
-#: mail/folder-browser-factory.c:235
-msgid "VFolder on Se_nder"
-msgstr "�����Ԥβ��ۥե����(_n)"
+#: filter/libfilter-i18n.h:25
+msgid "is greater than"
+msgstr "����礭��"
-#: mail/folder-browser-factory.c:240
-msgid "VFolder on _Recipients"
-msgstr "�����Ԥβ��ۥե����(_R)"
+#: filter/libfilter-i18n.h:26
+msgid "is less than"
+msgstr "��꾮����"
-#: mail/folder-browser-factory.c:247
-msgid "_Filter on Subject"
-msgstr "ɽ��Υե��륿(_F)"
+#: filter/libfilter-i18n.h:27
+msgid "is not"
+msgstr ""
-#: mail/folder-browser-factory.c:252
-msgid "Fi_lter on Sender"
-msgstr "�����ԤΥե��륿(_l)"
+#: filter/libfilter-i18n.h:28
+msgid "is"
+msgstr ""
-#: mail/folder-browser-factory.c:257
-msgid "Filter on Rec_ipients"
-msgstr "�����ԤΥե��륿(_i)"
+#: filter/libfilter-i18n.h:29
+msgid "on or after"
+msgstr ""
-#: mail/folder-browser-factory.c:264
-msgid "F_older"
-msgstr "�ե����(_o)"
+#: filter/libfilter-i18n.h:30
+msgid "on or before"
+msgstr ""
-#: mail/folder-browser-factory.c:268
-msgid "_Mark all as Read"
-msgstr "���ɤȤ��Ƥ��٤Ƥ�ޡ���(_M)"
+#: filter/libfilter-i18n.h:31
+msgid "was after"
+msgstr ""
-#: mail/folder-browser-factory.c:273
-msgid "_Delete all"
-msgstr "���٤ƺ��(_D)"
+#: filter/libfilter-i18n.h:32
+msgid "was before"
+msgstr ""
-#: mail/folder-browser-factory.c:278
-msgid "_Expunge"
-msgstr "����(_E)"
+#: filter/score-editor.c:127
+msgid "Add Rule"
+msgstr "�롼����ɲ�"
-#: mail/folder-browser-factory.c:283
-msgid "_Configure Folder"
-msgstr "�ե��������(_C)"
+#: filter/score-editor.c:166
+msgid "Edit Score Rule"
+msgstr "�������롼����Խ�"
+
+#: filter/score-rule.c:192 filter/score-rule.c:194
+msgid "Score"
+msgstr ""
+
+#: filter/vfolder-editor.c:155
+msgid "Add VFolder Rule"
+msgstr "���ۥե�����롼����ɲ�"
-#: mail/folder-browser.c:407
+#: filter/vfolder-editor.c:204
+msgid "Edit VFolder Rule"
+msgstr "���ۥե�����롼����Խ�"
+
+#: mail/component-factory.c:236
+msgid "Cannot initialize Evolution's mail component."
+msgstr "Evolution �᡼�륳��ݡ��ͥ�Ȥν����������ޤ���"
+
+#: mail/component-factory.c:243
+msgid "Cannot initialize Evolution's mail summary component."
+msgstr "Evolution �᡼�륵�ޥ꡼����ݡ��ͥ�Ȥν����������ޤ���"
+
+#: mail/component-factory.c:248
+msgid "Cannot initialize Evolution's mail storage hash."
+msgstr "Evolution �᡼�뵭���ϥå���ν����������ޤ���"
+
+#: mail/component-factory.c:330
+#, c-format
+msgid "Bad storage URL (no server): %s"
+msgstr ""
+
+#: mail/component-factory.c:349
+msgid "Cannot register storage with shell"
+msgstr ""
+
+#: mail/folder-browser.c:137
+msgid "Body or subject contains"
+msgstr ""
+
+#: mail/folder-browser.c:138
+msgid "Body contains"
+msgstr ""
+
+#: mail/folder-browser.c:139
+msgid "Subject contains"
+msgstr "ɽ���ޤ�"
+
+#: mail/folder-browser.c:140
+msgid "Body does not contain"
+msgstr "���Τϴޤޤʤ�"
+
+#: mail/folder-browser.c:141
+msgid "Subject does not contain"
+msgstr "ɽ��ϴޤޤʤ�"
+
+#: mail/folder-browser.c:142
+msgid "Custom search"
+msgstr "�������ม��"
+
+#: mail/folder-browser.c:314
+msgid "Custom"
+msgstr "��������"
+
+#: mail/folder-browser.c:492
+msgid "Full Search"
+msgstr "������"
+
+#: mail/folder-browser.c:497
msgid "Save"
msgstr "��¸"
-#: mail/mail-callbacks.c:84
+#: mail/mail-autofilter.c:76
+#, c-format
+msgid "Mail to %s"
+msgstr "%s �إ᡼��"
+
+#: mail/mail-autofilter.c:230
+#, c-format
+msgid "Mail from %s"
+msgstr "%s ����᡼��"
+
+#: mail/mail-autofilter.c:332
+#, c-format
+msgid "%s mailing list"
+msgstr "%s �᡼��󥰥ꥹ��"
+
+#: mail/mail-callbacks.c:73
msgid ""
-"You need to configure the mail client\n"
-"before you can compose mail."
+"You have not configured the mail client.\n"
+"You need to do this before you can send,\n"
+"receive or compose mail.\n"
+"Would you like to configure it now?"
msgstr ""
-"���ʤ��ϥ᡼�������������˥᡼��\n"
-"���饤����Ȥ�����򤹤�ɬ�פ�����ޤ�"
+"�᡼�륯�饤����Ȥ����꤬����ޤ���\n"
+"���������᡼��κ����򤹤��������ꤹ��\n"
+"ɬ�פ�����ޤ�\n"
+"�����ꤷ�ޤ���?"
-#: mail/mail-callbacks.c:97
+#: mail/mail-callbacks.c:113
msgid ""
"You need to configure an identity\n"
"before you can compose mail."
@@ -3570,7 +3783,7 @@ msgstr ""
"���ʤ��ϥ᡼�������������˿ȸ���\n"
"����򤹤�ɬ�פ�����ޤ�"
-#: mail/mail-callbacks.c:111
+#: mail/mail-callbacks.c:127
msgid ""
"You need to configure a mail transport\n"
"before you can compose mail."
@@ -3578,7 +3791,19 @@ msgstr ""
"���ʤ��ϥ᡼�������������˥᡼��\n"
"����������򤹤�ɬ�פ�����ޤ�"
-#: mail/mail-callbacks.c:231
+#: mail/mail-callbacks.c:163 mail/mail-callbacks.c:175
+msgid "You have no mail sources configured"
+msgstr "�᡼�륽���������꤬����ޤ���"
+
+#: mail/mail-callbacks.c:212
+msgid "You have not set a mail transport method"
+msgstr ""
+
+#: mail/mail-callbacks.c:221
+msgid "You have no Outbox configured"
+msgstr "����Ȣ�����꤬����ޤ���"
+
+#: mail/mail-callbacks.c:245
msgid ""
"This message has no subject.\n"
"Really send?"
@@ -3586,15 +3811,15 @@ msgstr ""
"���Υ�å�������ɽ�꤬����ޤ���\n"
"�������������ޤ���?"
-#: mail/mail-callbacks.c:477
+#: mail/mail-callbacks.c:515
msgid "Move message(s) to"
msgstr "��å��������ư���ޤ�: "
-#: mail/mail-callbacks.c:479
+#: mail/mail-callbacks.c:517
msgid "Copy message(s) to"
msgstr "��å������򥳥ԡ����ޤ�: "
-#: mail/mail-callbacks.c:548
+#: mail/mail-callbacks.c:619
msgid ""
"You may only edit messages saved\n"
"in the Drafts folder."
@@ -3602,7 +3827,7 @@ msgstr ""
"�ɥ�եȥե���������¸���줿\n"
"��å������������Խ����뤳�Ȥ�����ޤ�"
-#: mail/mail-callbacks.c:639
+#: mail/mail-callbacks.c:718
#, c-format
msgid ""
"Error loading filter information:\n"
@@ -3611,7 +3836,15 @@ msgstr ""
"�ե��륿����Υ�������˥��顼:\n"
"%s"
-#: mail/mail-config-gui.c:435
+#: mail/mail-callbacks.c:763 mail/message-list.c:1564
+msgid "Print Message"
+msgstr "�����������"
+
+#: mail/mail-callbacks.c:810
+msgid "Printing of message failed"
+msgstr "��å������ΰ����˼��Ԥ��ޤ���"
+
+#: mail/mail-config-gui.c:432
msgid ""
"Enter your name and email address to be used in outgoing mail. You may also, "
"optionally, enter the name of your organization, and the name of a file to "
@@ -3620,63 +3853,59 @@ msgstr ""
"�᡼��������ǻȤ��뤢�ʤ���̾���� email ���ɥ쥹�����Ϥ��Ƥ�������. �ޤ�, "
"Ǥ�դˤ��ʤ����ȿ��䥷���ͥ�����ɤ�ե�����̾�����Ϥ��뤳�Ȥ�����ޤ�"
-#: mail/mail-config-gui.c:448
+#: mail/mail-config-gui.c:445
msgid "Full name:"
msgstr "�ե�͡���:"
-#: mail/mail-config-gui.c:472
+#: mail/mail-config-gui.c:469
msgid "Email address:"
msgstr "Email ���ɥ쥹:"
-#: mail/mail-config-gui.c:487
+#: mail/mail-config-gui.c:484
msgid "Organization:"
msgstr "�ȿ�:"
-#: mail/mail-config-gui.c:498
+#: mail/mail-config-gui.c:495
msgid "Signature file:"
msgstr "��̾�ե�����:"
-#: mail/mail-config-gui.c:503 mail/mail-config.glade.h:10
+#: mail/mail-config-gui.c:500 mail/mail-config.glade.h:10
msgid "Signature File"
msgstr "��̾�ե�����"
-#: mail/mail-config-gui.c:927
+#: mail/mail-config-gui.c:906
msgid "Server:"
msgstr "������:"
-#: mail/mail-config-gui.c:933
-msgid "Port:"
-msgstr "�ݡ���:"
-
-#: mail/mail-config-gui.c:947
-msgid "Use default port"
-msgstr "�ǥե���ȥݡ��Ȥ�Ȥ�"
-
-#: mail/mail-config-gui.c:961
+#: mail/mail-config-gui.c:912
msgid "Username:"
msgstr "�桼��̾:"
-#: mail/mail-config-gui.c:967
+#: mail/mail-config-gui.c:918
msgid "Path:"
msgstr "�ѥ�:"
-#: mail/mail-config-gui.c:976
+#: mail/mail-config-gui.c:927
msgid "Authentication:"
msgstr "ǧ������:"
-#: mail/mail-config-gui.c:988
+#: mail/mail-config-gui.c:941
msgid "Detect supported types..."
msgstr "���ݡ��Ȥ��줿���̤򸡽�..."
-#: mail/mail-config-gui.c:1015
+#: mail/mail-config-gui.c:968
msgid "Don't delete messages from server"
msgstr "�����Ф����å������������ʤ�"
-#: mail/mail-config-gui.c:1027
+#: mail/mail-config-gui.c:980
msgid "Test Settings"
-msgstr "�ƥ�������"
+msgstr "�����ƥ���"
+
+#: mail/mail-config-gui.c:1107
+msgid "Mail source type:"
+msgstr "�᡼�륽��������:"
-#: mail/mail-config-gui.c:1159 mail/mail-config-gui.c:1207
+#: mail/mail-config-gui.c:1112 mail/mail-config-gui.c:1160
msgid ""
"Select the kind of mail server you have, and enter the relevant information "
"about it.\n"
@@ -3689,7 +3918,11 @@ msgstr ""
"�����Ф�ǧ�ڤ�ɬ�פȤ���ʤ顤\"���ݡ��Ȥ��줿���̤򸡽�...\" �ܥ����\n"
"����å��������¾�ξ�������Ϥ��뤳�Ȥ�����ޤ�"
-#: mail/mail-config-gui.c:1183
+#: mail/mail-config-gui.c:1131
+msgid "News source type:"
+msgstr "�˥塼������������:"
+
+#: mail/mail-config-gui.c:1136
msgid ""
"Select the kind of news server you have, and enter the relevant information "
"about it.\n"
@@ -3702,44 +3935,54 @@ msgstr ""
"�����Ф�ǧ�ڤ�ɬ�פȤ���ʤ顤\"���ݡ��Ȥ��줿���̤򸡽�...\" �ܥ����\n"
"����å��������¾�ξ�������Ϥ��뤳�Ȥ�����ޤ�"
-#: mail/mail-config-gui.c:1202
+#: mail/mail-config-gui.c:1155
msgid "Mail transport type:"
msgstr "�᡼����������:"
-#: mail/mail-config-gui.c:1257
+#: mail/mail-config-gui.c:1210
msgid "Add Identity"
msgstr "�ȸ����ɲ�"
-#: mail/mail-config-gui.c:1259
+#: mail/mail-config-gui.c:1212
msgid "Edit Identity"
msgstr "�ȸ����Խ�"
-#: mail/mail-config-gui.c:1351
+#: mail/mail-config-gui.c:1310
msgid "Add Source"
msgstr "���������ɲ�"
-#: mail/mail-config-gui.c:1353
+#: mail/mail-config-gui.c:1312
msgid "Edit Source"
msgstr "���������Խ�"
-#: mail/mail-config-gui.c:1448
+#: mail/mail-config-gui.c:1407
msgid "Add News Server"
msgstr "�˥塼�������Ф��ɲ�"
-#: mail/mail-config-gui.c:1450
+#: mail/mail-config-gui.c:1409
msgid "Edit News Server"
msgstr "�˥塼�������Ф��Խ�"
-#: mail/mail-config-gui.c:2321
+#: mail/mail-config-gui.c:2233
+#, c-format
+msgid "Testing \"%s\""
+msgstr "\"%s\" ��ƥ�����"
+
+#: mail/mail-config-gui.c:2235
+#, c-format
+msgid "Test connection to \"%s\""
+msgstr "\"%s\" ����³�ƥ���"
+
+#: mail/mail-config-gui.c:2277
msgid "The connection was successful!"
msgstr "��³���������ޤ���!"
-#: mail/mail-config-gui.c:2371
+#: mail/mail-config-gui.c:2327
#, c-format
msgid "Querying authorization capabilities of \"%s\""
msgstr ""
-#: mail/mail-config-gui.c:2373
+#: mail/mail-config-gui.c:2329
#, c-format
msgid "Query authorization at \"%s\""
msgstr ""
@@ -3749,19 +3992,60 @@ msgstr ""
#. * Add this file to your project's POTFILES.in.
#. * DO NOT compile it as part of your application.
#.
+#: mail/mail-config-druid.glade.h:7 mail/mail-config-druid.glade.h:8
+#: mail/mail-config-druid.glade.h:16
+msgid "Mail Configuration"
+msgstr "�᡼������"
+
+#: mail/mail-config-druid.glade.h:9
+msgid ""
+"Welcome to the Evolution Mail configuration wizard!\n"
+"By filling in some information about your email\n"
+"settings, you can start sending and receiving email\n"
+"right away. Click Next to continue."
+msgstr ""
+"�褦������Evolution �᡼�����ꥦ�������ɤ�!\n"
+"���ʤ����Żҥ᡼������ˤĤ��Ƥ����Ĥ��ξ��������\n"
+"���뤳�Ȥˤ�äơ��������Żҥ᡼������������Ϥ��\n"
+"���Ȥ�����ޤ������򥯥�å�����³���Ƥ���������"
+
+#: mail/mail-config-druid.glade.h:13
+msgid "Identity"
+msgstr "�ȸ�"
+
+#: mail/mail-config-druid.glade.h:14
+msgid "Mail Source"
+msgstr "�᡼�륽����"
+
+#: mail/mail-config-druid.glade.h:15 mail/mail-config.glade.h:20
+msgid "Mail Transport"
+msgstr "�᡼�������"
+
+#: mail/mail-config-druid.glade.h:17
+msgid ""
+"Your email configuration is now complete.\n"
+"Click \"Finish\" to save your new settings"
+msgstr ""
+"���ʤ����Żҥ᡼�������ϴ�λ���ޤ���\n"
+"\"��λ\" �򥯥�å����ƿ������������¸���Ƥ�������"
+
+#.
+#. * Translatable strings file generated by Glade.
+#. * Add this file to your project's POTFILES.in.
+#. * DO NOT compile it as part of your application.
+#.
#: mail/mail-config.glade.h:7 mail/mail-config.glade.h:14
msgid "Identities"
msgstr "�ȸ�"
+#: mail/mail-config.glade.h:8
+msgid "Address"
+msgstr "���ɥ쥹"
+
#: mail/mail-config.glade.h:9
msgid "Organization"
msgstr "�ȿ�"
-#: mail/mail-config.glade.h:12 mail/mail-config.glade.h:17
-#: mail/mail-config.glade.h:23
-msgid "Edit"
-msgstr "�Խ�"
-
#: mail/mail-config.glade.h:15
msgid "Sources"
msgstr "������"
@@ -3770,10 +4054,6 @@ msgstr "������"
msgid "Mail Sources"
msgstr "�᡼�륽����"
-#: mail/mail-config-druid.glade.h:15 mail/mail-config.glade.h:20
-msgid "Mail Transport"
-msgstr "�᡼�������"
-
#: mail/mail-config.glade.h:21
msgid "News Servers"
msgstr "�˥塼��������"
@@ -3790,43 +4070,20 @@ msgstr "HTML �����ǥ�å�����������"
msgid "Mark message as seen [ms]: "
msgstr ""
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: mail/mail-config-druid.glade.h:7 mail/mail-config-druid.glade.h:8
-#: mail/mail-config-druid.glade.h:16
-msgid "Mail Configuration"
-msgstr "�᡼������"
-
-#: mail/mail-config-druid.glade.h:9
-msgid ""
-"Welcome to the Evolution Mail configuration wizard!\n"
-"By filling in some information about your email\n"
-"settings, you can start sending and receiving email\n"
-"right away. Click Next to continue."
-msgstr ""
-"�褦������Evolution �᡼�����ꥦ�������ɤ�!\n"
-"���ʤ����Żҥ᡼������ˤĤ��Ƥ����Ĥ��ξ��������\n"
-"���뤳�Ȥˤ�äơ��������Żҥ᡼������������Ϥ��\n"
-"���Ȥ�����ޤ������򥯥�å�����³���Ƥ���������"
-
-#: mail/mail-config-druid.glade.h:13
-msgid "Identity"
-msgstr "�ȸ�"
+#: mail/mail-crypto.c:137
+#, c-format
+msgid "Couldn't create pipe to %s: %s"
+msgstr "%s �ؤΥѥ��פ������Ǥ��ޤ���Ǥ���: %s"
-#: mail/mail-config-druid.glade.h:14
-msgid "Mail Source"
-msgstr "�᡼�륽����"
+#: mail/mail-crypto.c:164
+#, c-format
+msgid "Could not execute %s: %s\n"
+msgstr "%s ��¹Խ���ޤ���Ǥ���: %s\n"
-#: mail/mail-config-druid.glade.h:17
-msgid ""
-"Your email configuration is now complete.\n"
-"Click \"Finish\" to save your new settings"
-msgstr ""
-"���ʤ����Żҥ᡼�������ϴ�λ���ޤ���\n"
-"\"��λ\" �򥯥�å����ƿ������������¸���Ƥ�������"
+#: mail/mail-crypto.c:168
+#, c-format
+msgid "Cannot fork %s: %s"
+msgstr "%s �� fork ����ޤ���: %s"
#: mail/mail-crypto.c:345 mail/mail-crypto.c:441 mail/mail-crypto.c:604
msgid "Please enter your PGP/GPG passphrase."
@@ -3845,293 +4102,374 @@ msgstr "GPG/PGP �ؤΥѥ��פ������Ǥ��ޤ���Ǥ���: %s"
msgid "No GPG/PGP program available."
msgstr "GPG/PGP �ץ����������ѤǤ��ޤ���"
-#: mail/mail-local.c:257
+#: mail/mail-display.c:68
+msgid "Overwrite file?"
+msgstr "�ե�������񤭤��ޤ���?"
+
+#: mail/mail-display.c:72
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
+msgstr ""
+"����̾���Υե�����Ϥ��Ǥ�¸�ߤ��ޤ�\n"
+"��񤭤��ޤ���?"
+
+#: mail/mail-display.c:87
+#, c-format
+msgid ""
+"Could not open file %s:\n"
+"%s"
+msgstr ""
+"�ե����� %s �򳫤����Ȥ�����ޤ���Ǥ���:\n"
+"%s"
+
+#: mail/mail-display.c:99
+#, c-format
+msgid "Could not write data: %s"
+msgstr "�ǡ�����񤭽Ф����Ȥ�����ޤ���Ǥ���: %s"
+
+#: mail/mail-display.c:195
+msgid "Save Attachment"
+msgstr "ź�դ���¸"
+
+#: mail/mail-display.c:235
+#, c-format
+msgid "Could not create temporary directory: %s"
+msgstr "��ȥǥ��쥯�ȥ���������ޤ���Ǥ���: %s"
+
+#: mail/mail-display.c:277
+msgid "Save to Disk..."
+msgstr "�ǥ���������¸..."
+
+#: mail/mail-display.c:279
+#, c-format
+msgid "Open in %s..."
+msgstr "%s �˳���..."
+
+#: mail/mail-display.c:281
+msgid "View Inline"
+msgstr ""
+
+#: mail/mail-display.c:305
+msgid "External Viewer"
+msgstr "�����ӥ塼��"
+
+#: mail/mail-display.c:328
+#, c-format
+msgid "View Inline (via %s)"
+msgstr ""
+
+#: mail/mail-display.c:332
+msgid "Hide"
+msgstr "����"
+
+#: mail/mail-local.c:279
#, c-format
msgid "Changing folder \"%s\" to \"%s\" format"
msgstr "�ե���� \"%s\" �� \"%s\" �������ѹ����Ƥ��ޤ�"
-#: mail/mail-local.c:261
+#: mail/mail-local.c:283
#, c-format
msgid "Change folder \"%s\" to \"%s\" format"
msgstr "�ե���� \"%s\" �� \"%s\" �������ѹ����ޤ�"
-#: mail/mail-ops.c:74
+#: mail/mail-local.c:327
+msgid "Closing current folder"
+msgstr "���ߤΥե�����򥯥�������"
+
+#: mail/mail-local.c:359
+msgid "Renaming old folder and opening"
+msgstr ""
+
+#: mail/mail-local.c:380
+msgid "Creating new folder"
+msgstr "�����ե�����������"
+
+#: mail/mail-local.c:395
+msgid "Copying messages"
+msgstr "��å������򥳥ԡ���"
+
+#: mail/mail-local.c:407
+#, c-format
+msgid ""
+"Cannot save folder metainfo; you'll probably find you can't\n"
+"open this folder anymore: %s"
+msgstr ""
+
+#: mail/mail-local.c:443
+msgid ""
+"If you can no longer open this mailbox, then\n"
+"you may need to repair it manually."
+msgstr ""
+
+#. This is how we could do to display extra information about the
+#. folder.
+#: mail/mail-local-storage.c:97
+msgid " (XXX unread)"
+msgstr ""
+
+#: mail/mail-ops.c:68
#, c-format
msgid "Fetching email from %s"
-msgstr "%s ����᡼���������Ƥ��ޤ�"
+msgstr "%s ����᡼��������"
-#: mail/mail-ops.c:76
+#: mail/mail-ops.c:70
#, c-format
msgid "Fetch email from %s"
msgstr "%s ����᡼���������ޤ�"
-#: mail/mail-ops.c:87
-msgid "You have no remote mail source configured to fetch mail from."
-msgstr "�᡼��������������򤷤���⡼�ȥ᡼�뤬����ޤ���"
-
-#: mail/mail-ops.c:97
-msgid "Bad folder passed to fetch_mail"
-msgstr "fetch_mail ���Ϥ����ե�����ǤϤ���ޤ���"
+#: mail/mail-ops.c:110
+#, c-format
+msgid "Retrieving messages : %s"
+msgstr "������������� : %s"
-#: mail/mail-ops.c:220
+#: mail/mail-ops.c:253
#, c-format
msgid "There is no new mail at %s."
msgstr "�����᡼��� %s �ˤϤ���ޤ���"
-#: mail/mail-ops.c:284
+#: mail/mail-ops.c:310
msgid "Filtering email on demand"
-msgstr ""
+msgstr "�׵ᤵ�줿�᡼���ե��륿��"
-#: mail/mail-ops.c:286
+#: mail/mail-ops.c:312
msgid "Filter email on demand"
msgstr ""
-#: mail/mail-ops.c:297
-msgid "Bad filter driver specified"
-msgstr "���ꤵ�줿�ե��륿�ɥ饤�Фϴְ�äƤ��ޤ�"
-
-#: mail/mail-ops.c:306
-msgid "Bad input source defined for filtering"
-msgstr "�ե��륿��������줿���ϥ��������ְ�äƤ��ޤ�"
-
-#: mail/mail-ops.c:315
-msgid "Bad default destination folder"
-msgstr "�ǥե���Ȥ�����ե�������ְ�äƤ��ޤ�"
-
-#: mail/mail-ops.c:456
+#: mail/mail-ops.c:441
#, c-format
msgid "Sending \"%s\""
-msgstr "\"%s\" ���������Ƥ��ޤ�"
+msgstr "\"%s\" ��������"
-#: mail/mail-ops.c:461
+#: mail/mail-ops.c:446
msgid "Sending a message without a subject"
msgstr "ɽ��ʤ��Υ�å��������������Ƥ��ޤ�"
-#: mail/mail-ops.c:464
+#: mail/mail-ops.c:449
#, c-format
msgid "Send \"%s\""
msgstr "\"%s\" ���������ޤ�"
-#: mail/mail-ops.c:467
+#: mail/mail-ops.c:452
msgid "Send a message without a subject"
msgstr "ɽ��ʤ��Υ�å��������������ޤ�"
-#: mail/mail-ops.c:648
+#: mail/mail-ops.c:626
msgid "Sending queue"
-msgstr "���塼���������Ƥ��ޤ�"
+msgstr "���塼��������"
-#: mail/mail-ops.c:650
+#: mail/mail-ops.c:628
msgid "Send queue"
msgstr "���塼���������ޤ�"
-#: mail/mail-ops.c:804 mail/mail-ops.c:811
+#: mail/mail-ops.c:764 mail/mail-ops.c:771
#, c-format
msgid "Appending \"%s\""
-msgstr "\"%s\" ���ղä��Ƥ��ޤ�"
+msgstr "\"%s\" ���ɲ���"
-#: mail/mail-ops.c:808 mail/mail-ops.c:814
+#: mail/mail-ops.c:768 mail/mail-ops.c:774
msgid "Appending a message without a subject"
msgstr "ɽ��ʤ��Υ�å��������ղä��Ƥ��ޤ�"
-#: mail/mail-ops.c:909
+#: mail/mail-ops.c:846
#, c-format
msgid "Expunging \"%s\""
msgstr "\"%s\" ��������"
-#: mail/mail-ops.c:911
+#: mail/mail-ops.c:848
#, c-format
msgid "Expunge \"%s\""
msgstr "\"%s\" �����ä��ޤ�"
-#: mail/mail-ops.c:983
+#: mail/mail-ops.c:907
#, c-format
msgid "Moving messages from \"%s\" into \"%s\""
msgstr "\"%s\" ���� \"%s\" ����إ�å��������ư���Ƥ��ޤ�"
-#: mail/mail-ops.c:985
+#: mail/mail-ops.c:909
#, c-format
msgid "Copying messages from \"%s\" into \"%s\""
msgstr "\"%s\" ���� \"%s\" ����إ�å������򥳥ԡ����Ƥ��ޤ�"
-#: mail/mail-ops.c:988
+#: mail/mail-ops.c:912
#, c-format
msgid "Move messages from \"%s\" into \"%s\""
msgstr "\"%s\" ���� \"%s\" ����إ�å��������ư���ޤ�"
-#: mail/mail-ops.c:990
+#: mail/mail-ops.c:914
#, c-format
msgid "Copy messages from \"%s\" into \"%s\""
msgstr "\"%s\" ���� \"%s\" ����إ�å������򥳥ԡ����ޤ�"
-#: mail/mail-ops.c:1048
+#: mail/mail-ops.c:945
msgid "Moving"
-msgstr "��ư���Ƥ��ޤ�"
+msgstr "��ư��"
-#: mail/mail-ops.c:1051
+#: mail/mail-ops.c:948
msgid "Copying"
-msgstr "���ԡ����Ƥ��ޤ�"
+msgstr "���ԡ���"
-#: mail/mail-ops.c:1063
+#: mail/mail-ops.c:968
#, c-format
msgid "%s message %d of %d (uid \"%s\")"
msgstr "�������� %s %d / %d (uid \"%s\")"
-#: mail/mail-ops.c:1144
+#: mail/mail-ops.c:1047
#, c-format
msgid "Marking messages in folder \"%s\""
msgstr "�ե���� \"%s\" ����Υ�å�������ޡ������Ƥ��ޤ�"
-#: mail/mail-ops.c:1147
+#: mail/mail-ops.c:1050
#, c-format
msgid "Mark messages in folder \"%s\""
msgstr "�ե���� \"%s\" ����Υ�å�������ޡ������ޤ�"
-#: mail/mail-ops.c:1306
+#: mail/mail-ops.c:1081
+#, c-format
+msgid "Marking message %d of %d"
+msgstr "��å����� %d / %d ��ޡ�����"
+
+#: mail/mail-ops.c:1201
#, c-format
msgid "Scanning folders in \"%s\""
-msgstr "\"%s\" ����Υե�������������Ƥ��ޤ�"
+msgstr "\"%s\" ����Υե������������"
-#: mail/mail-ops.c:1309
+#: mail/mail-ops.c:1204
#, c-format
msgid "Scan folders in \"%s\""
msgstr "\"%s\" ����Υե�������������ޤ�"
-#: mail/mail-ops.c:1364
-#, c-format
-msgid "Found subfolder \"%s\""
-msgstr "���֥ե���� \"%s\" �򸫤Ĥ��ޤ���"
-
-#: mail/mail-ops.c:1398
+#: mail/mail-ops.c:1275 mail/subscribe-dialog.c:163
msgid "(No description)"
msgstr "(�����ʤ�)"
-#: mail/mail-ops.c:1461
+#: mail/mail-ops.c:1335
#, c-format
msgid "Attaching messages from folder \"%s\""
-msgstr "�ե���� \"%s\" �����å������򥢥��å����Ƥ��ޤ�"
+msgstr "�ե���� \"%s\" �����å�������ź����"
-#: mail/mail-ops.c:1464
+#: mail/mail-ops.c:1338
#, c-format
msgid "Attach messages from \"%s\""
-msgstr "\"%s\" �����å������򥢥��å����ޤ�"
+msgstr "\"%s\" �����å�������ź�դ��ޤ�"
-#: mail/mail-ops.c:1590
+#: mail/mail-ops.c:1441
#, c-format
msgid "Forwarding messages \"%s\""
-msgstr "��å����� \"%s\" ��ž�����Ƥ��ޤ�"
+msgstr "��å����� \"%s\" ��ž����"
-#: mail/mail-ops.c:1595
+#: mail/mail-ops.c:1446
msgid "Forwarding a message without a subject"
-msgstr "ɽ��ʤ��Υ�å�������ž�����Ƥ��ޤ�"
+msgstr "ɽ��ʤ��Υ�å�������ž����"
-#: mail/mail-ops.c:1598
+#: mail/mail-ops.c:1449
#, c-format
msgid "Forward message \"%s\""
msgstr "��å����� \"%s\" ��ž�����ޤ�"
-#: mail/mail-ops.c:1603
+#: mail/mail-ops.c:1454
msgid "Forward a message without a subject"
msgstr "ɽ��ʤ��Υ�å�������ž�����ޤ�"
-#: mail/mail-ops.c:1657
+#: mail/mail-ops.c:1491
#, c-format
msgid "Retrieving message number %d of %d (uid \"%s\")"
msgstr "��å������ֹ��������Ƥ��ޤ� %d / %d (uid \"%s\")"
-#: mail/mail-ops.c:1670
+#: mail/mail-ops.c:1508
msgid ""
"Failed to generate mime part from message while generating forwarded message."
msgstr ""
"ž��������å�������������˥�å��������� MIME �ѡ��Ȥ������Ǽ��Ԥ��ޤ���"
-#: mail/mail-ops.c:1759
+#: mail/mail-ops.c:1594
#, c-format
msgid "Loading \"%s\""
-msgstr "\"%s\" ���ɤ߹���Ǥ��ޤ�"
+msgstr "\"%s\" ���������"
-#: mail/mail-ops.c:1761
+#: mail/mail-ops.c:1596
#, c-format
msgid "Load \"%s\""
-msgstr "\"%s\" ���ɤ߹��ߤޤ�"
+msgstr "\"%s\" ������ɤ��ޤ�"
-#: mail/mail-ops.c:1881
+#: mail/mail-ops.c:1698
#, c-format
msgid "Creating \"%s\""
-msgstr "\"%s\" ��������Ƥ��ޤ�"
+msgstr "\"%s\" �������"
-#: mail/mail-ops.c:1883
+#: mail/mail-ops.c:1700
#, c-format
msgid "Create \"%s\""
msgstr "\"%s\" ��������ޤ�"
-#: mail/mail-ops.c:1954
+#: mail/mail-ops.c:1748
msgid "Exception while reporting result to shell component listener."
msgstr "�����륳��ݡ��ͥ�ȥꥹ�ʡ��ط�̤���𤹤�֤��㳰��ȯ�����ޤ���"
-#: mail/mail-ops.c:2007
+#: mail/mail-ops.c:1794
#, c-format
msgid "Synchronizing \"%s\""
-msgstr "\"%s\" ��Ʊ�����Ƥ��ޤ�"
+msgstr "\"%s\" ��Ʊ����"
-#: mail/mail-ops.c:2009
+#: mail/mail-ops.c:1796
#, c-format
msgid "Synchronize \"%s\""
msgstr "\"%s\" ��Ʊ�����ޤ�"
-#: mail/mail-ops.c:2085
+#: mail/mail-ops.c:1859
#, c-format
msgid "Displaying message UID \"%s\""
-msgstr "��å����� UID \"%s\" ��ɽ�����Ƥ��ޤ�"
+msgstr "��å����� UID \"%s\" ��ɽ����"
-#: mail/mail-ops.c:2088
+#: mail/mail-ops.c:1862
msgid "Clearing message display"
-msgstr "��å������ǥ����ץ쥤�򥯥ꥢ���Ƥ��ޤ�"
+msgstr "��å������ǥ����ץ쥤�򥯥ꥢ��"
-#: mail/mail-ops.c:2091
+#: mail/mail-ops.c:1865
#, c-format
msgid "Display message UID \"%s\""
msgstr "��å����� UID \"%s\" ��ɽ�����ޤ�"
-#: mail/mail-ops.c:2094
+#: mail/mail-ops.c:1868
msgid "Clear message display"
msgstr "��å������ǥ����ץ쥤�򥯥ꥢ���ޤ�"
-#: mail/mail-ops.c:2221
+#: mail/mail-ops.c:1977
#, c-format
msgid "Opening messages from folder \"%s\""
msgstr "�ե���� \"%s\" �����å������򳫤��Ƥ��ޤ�"
-#: mail/mail-ops.c:2224
+#: mail/mail-ops.c:1980
#, c-format
msgid "Open messages from \"%s\""
msgstr "\"%s\" �����å������򳫤��ޤ�"
-#: mail/mail-ops.c:2345
+#: mail/mail-ops.c:2084
#, c-format
msgid "Loading %s Folder"
-msgstr "%s �ե�������ɤ߹���Ǥ��ޤ�"
+msgstr "%s �ե�������������"
-#: mail/mail-ops.c:2347
+#: mail/mail-ops.c:2086
#, c-format
msgid "Load %s Folder"
msgstr "%s �ե�������ɤ߹��ߤޤ�"
-#: mail/mail-ops.c:2422
+#: mail/mail-ops.c:2153
#, c-format
msgid "Viewing messages from folder \"%s\""
-msgstr "�ե���� \"%s\" �����å�������ɽ�����Ƥ��ޤ�"
+msgstr "�ե���� \"%s\" �����å�������ɽ����"
-#: mail/mail-ops.c:2425
+#: mail/mail-ops.c:2156
#, c-format
msgid "View messages from \"%s\""
msgstr "\"%s\" �����å�������ɽ�����ޤ�"
-#: mail/mail-ops.c:2471
+#: mail/mail-ops.c:2182
#, c-format
msgid "Retrieving message %d of %d (uid \"%s\")"
msgstr "��å�������������Ƥ��ޤ� %d / %d (uid \"%s\")"
-#: mail/mail-threads.c:274
+#: mail/mail-threads.c:299
#, c-format
msgid ""
"Error while preparing to %s:\n"
@@ -4140,7 +4478,7 @@ msgstr ""
"%s �ؽ������Ƥ���֤˥��顼��ȯ�����ޤ���:\n"
"%s"
-#: mail/mail-threads.c:623
+#: mail/mail-threads.c:648
#, c-format
msgid ""
"Error while `%s':\n"
@@ -4149,31 +4487,37 @@ msgstr ""
"'%s' ���Ƥ���֤˥��顼��ȯ�����ޤ���:\n"
"%s"
-#: mail/mail-threads.c:676
+#: mail/mail-threads.c:701
msgid "Incomplete message written on pipe!"
msgstr "�ѥ��׾���Դ����ʥ�å��������񤫤�ޤ���!"
-#: mail/mail-threads.c:680
+#: mail/mail-threads.c:705
msgid "Error reading commands from dispatching thread."
msgstr "�ɸ����줿����åɤ��饳�ޥ���ɤ߹�����˥��顼��ȯ�����ޤ���"
-#: mail/mail-threads.c:745
+#: mail/mail-threads.c:770
msgid "Corrupted message from dispatching thread?"
msgstr "�ɸ����줿����åɤ��������ʥ�å�����?"
-#: mail/mail-threads.c:856
+#: mail/mail-threads.c:889
msgid "Could not create dialog box."
msgstr "�����������ܥå�����������뤳�Ȥ�����ޤ���Ǥ���"
-#: mail/mail-threads.c:865
+#: mail/mail-threads.c:899
msgid "User cancelled query."
msgstr "�桼���ϥ�����򥭥�󥻥뤷�ޤ���"
-#: mail/mail-tools.c:206
+#: mail/mail-tools.c:210
#, c-format
msgid "Couldn't create temporary mbox `%s': %s"
msgstr "�ƥ�ݥ�� mbox '%s' ������Ǥ��ޤ���Ǥ���: %s"
+#. Get all uids of source
+#: mail/mail-tools.c:264
+#, c-format
+msgid "Examining %s"
+msgstr "%s ��Ĵ����"
+
#: mail/mail-tools.c:294
#, c-format
msgid ""
@@ -4182,35 +4526,47 @@ msgstr ""
"UID ����å���ե����� \"%s\" ���ɤ߹��ळ�Ȥ�����ޤ���Ǥ���. "
"��ʣ������å�������������뤫�⤷��ޤ���"
-#: mail/mail-tools.c:387
+#. Info
+#: mail/mail-tools.c:315
#, c-format
-msgid "[%s] %s"
-msgstr "[%s] %s"
+msgid "Retrieving message %d of %d"
+msgstr "��å�������������Ƥ��ޤ� %d / %d"
-#: mail/mail-tools.c:389
+#. Append it to dest
+#: mail/mail-tools.c:328
+#, c-format
+msgid "Writing message %d of %d"
+msgstr "��å�������񤭽Ф��Ƥ��ޤ� %d / %d"
+
+#: mail/mail-tools.c:357
+#, c-format
+msgid "Saving changes to %s"
+msgstr "%s ���ѹ�����¸��"
+
+#: mail/mail-tools.c:391
#, c-format
msgid "[%s] (forwarded message)"
msgstr "[%s] (��å�������ž��)"
-#: mail/mail-tools.c:398
+#: mail/mail-tools.c:400
msgid "Fwd: (no subject)"
-msgstr "ž��: (ɽ��ʤ�)"
+msgstr "Fwd: (ɽ��ʤ�)"
-#: mail/mail-tools.c:435
+#: mail/mail-tools.c:437
#, c-format
msgid "Forwarded message - %s"
msgstr "��å�������ž�����ޤ��� - %s"
-#: mail/mail-tools.c:437
+#: mail/mail-tools.c:439
msgid "Forwarded message (no subject)"
msgstr "��å�������ž�����ޤ��� (ɽ��ʤ�)"
-#: mail/mail-tools.c:545
+#: mail/mail-tools.c:551
#, c-format
msgid "Don't know protocol to open URI `%s'"
msgstr "URI '%s' �򳫤��ץ��ȥ�����Τ�ޤ���"
-#: mail/mail-tools.c:574
+#: mail/mail-tools.c:580
#, c-format
msgid ""
"Cannot open location `%s':\n"
@@ -4219,64 +4575,170 @@ msgstr ""
"'%s' �ξ��򳫤����Ȥ�����ޤ���:\n"
"%s"
-#: mail/mail-vfolder.c:302
+#: mail/mail-vfolder.c:147
+msgid "VFolders"
+msgstr "���ۥե����"
+
+#: mail/mail-vfolder.c:292
msgid "New VFolder"
msgstr "�������ۥե����"
-#: mail/message-list.c:641
-msgid "Online Status"
-msgstr "����饤�����"
+#. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
+#. save_msg, GNOME_STOCK_PIXMAP_SAVE),
+#: mail/mail-view.c:151 ui/evolution-mail.h:47
+msgid "Reply"
+msgstr "�ֿ�"
-#: mail/message-list.c:677
-msgid "From"
-msgstr "���п�"
+#: mail/mail-view.c:151 ui/evolution-mail.h:48
+msgid "Reply to the sender of this message"
+msgstr "��å������κ��пͤ��ֿ����ޤ�"
-#: mail/message-list.c:684
-msgid "Subject"
-msgstr "ɽ��"
+#: mail/mail-view.c:154 mail/message-list.c:1567 ui/evolution-mail.h:49
+msgid "Reply to All"
+msgstr "�������ֿ�"
+
+#: mail/mail-view.c:154 ui/evolution-mail.h:50
+msgid "Reply to all recipients of this message"
+msgstr "���Υ�å������μ�����������ֿ����ޤ�"
+
+#: mail/mail-view.c:157 ui/evolution-mail.h:51
+msgid "Forward"
+msgstr "ž��"
+
+#: mail/mail-view.c:157 ui/evolution-mail.h:52
+msgid "Forward this message"
+msgstr "���Υ�å�������ž�����ޤ�"
+
+#: mail/mail-view.c:161 ui/evolution-addressbook.h:18
+#: ui/evolution-calendar.h:24 ui/evolution-mail.h:57
+msgid "Print"
+msgstr "����"
+
+#: mail/mail-view.c:161 ui/evolution-mail.h:58
+msgid "Print the selected message"
+msgstr "���򤵤줿��å�������������ޤ�"
+
+#: mail/mail-view.c:163 ui/evolution-mail.h:60
+msgid "Delete this message"
+msgstr "���Υ�å������������ޤ�"
+
+#: mail/message-list.c:511
+msgid "Unseen"
+msgstr ""
+
+#: mail/message-list.c:514
+msgid "Seen"
+msgstr ""
+
+#: mail/message-list.c:517
+msgid "Answered"
+msgstr ""
+
+#: mail/message-list.c:1562
+msgid "Open in New Window"
+msgstr "����������ɥ��򳫤�"
+
+#: mail/message-list.c:1563
+msgid "Edit Message"
+msgstr "��å��������Խ�"
+
+#: mail/message-list.c:1566
+msgid "Reply to Sender"
+msgstr "�����Ԥ��ֿ�"
+
+#: mail/message-list.c:1568
+msgid "Forward Message"
+msgstr "��å�������ž��"
+
+#: mail/message-list.c:1570
+msgid "Delete Message"
+msgstr "����������"
-#: mail/message-list.c:691
-msgid "Date"
-msgstr "����"
+#: mail/message-list.c:1571
+msgid "Move Message"
+msgstr "��å��������ư"
-#: mail/message-list.c:698
-msgid "Received"
-msgstr "����"
+#: mail/message-list.c:1572
+msgid "Copy Message"
+msgstr "��å������򥳥ԡ�"
-#: mail/message-list.c:705
-msgid "To"
-msgstr "�����"
+#: mail/message-list.c:1574
+msgid "VFolder on Subject"
+msgstr "ɽ��β��ۥե����"
-#: mail/message-list.c:712
-msgid "Size"
-msgstr "������"
+#: mail/message-list.c:1575
+msgid "VFolder on Sender"
+msgstr "�����Ԥβ��ۥե����"
-#: notes/component-factory.c:27
-msgid "Create a new note"
-msgstr "�����Ρ��Ȥ����"
+#: mail/message-list.c:1576
+msgid "VFolder on Recipients"
+msgstr "�����Ԥβ��ۥե����"
-#: notes/component-factory.c:148
-msgid "Cannot initialize Evolution's notes component."
-msgstr "Evolution �Ρ��ȥ���ݡ��ͥ�Ȥν����������ޤ���"
+#: mail/message-list.c:1578
+msgid "Filter on Subject"
+msgstr "ɽ��Υե��륿"
-#: notes/main.c:30
-msgid "Notes Component: Could not initialize bonobo"
-msgstr "�Ρ��ȥ���ݡ��ͥ��: Bonobo �ν����������ޤ���Ǥ���"
+#: mail/message-list.c:1579
+msgid "Filter on Sender"
+msgstr "�����ԤΥե��륿"
-#: shell/e-setup.c:47
+#: mail/message-list.c:1580
+msgid "Filter on Recipients"
+msgstr "�����ԤΥե��륿"
+
+#: mail/message-list.c:1581 mail/message-list.c:1604
+msgid "Filter on Mailing List"
+msgstr "�᡼��󥰥ꥹ�ȤΥե��륿"
+
+#: mail/message-list.c:1606
+#, c-format
+msgid "Filter on Mailing List (%s)"
+msgstr "�᡼��󥰥ꥹ�ȤΥե��륿 (%s)"
+
+#: mail/message-list.c:1694
+msgid "Rebuilding message view"
+msgstr "��å������ӥ塼��ƹ�����"
+
+#: mail/message-list.c:1696
+msgid "Rebuild message view"
+msgstr "��å������ӥ塼��ƹ���"
+
+#: mail/subscribe-dialog.c:118
+msgid "Display folders containing:"
+msgstr ""
+
+#: shell/e-setup.c:106 shell/e-setup.c:175
msgid "Evolution installation"
msgstr "Evolution �Υ��󥹥ȡ���"
-#: shell/e-setup.c:51
+#: shell/e-setup.c:110
+msgid ""
+"This new version of Evolution needs to install additional files\n"
+"into your personal Evolution directory"
+msgstr ""
+
+#: shell/e-setup.c:111
+msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
+msgstr "\"OK\" �ǥե�����򥤥󥹥ȡ���, �ޤ��� \"����󥻥�\" �ǽ�λ���ޤ�"
+
+#: shell/e-setup.c:152
+msgid "Could not update files correctly"
+msgstr "�������ե�����򹹿�����ޤ���Ǥ���"
+
+#: shell/e-setup.c:156 shell/e-setup.c:216
+msgid "Evolution files successfully installed."
+msgstr "Evolution �Υե���������������󥹥ȡ��뤵��ޤ���"
+
+#: shell/e-setup.c:179
msgid "This seems to be the first time you run Evolution."
msgstr "���ʤ��� Evolution ����Ƽ¹Ԥ����褦�˻פ��ޤ�"
-#: shell/e-setup.c:52
+#: shell/e-setup.c:180
msgid "Please click \"OK\" to install the Evolution user files under"
msgstr ""
"Evolution �桼���ե�����򥤥󥹥ȡ��뤷�ޤ��Τ� \"OK\" �򥯥�å����Ʋ�����"
-#: shell/e-setup.c:69
+#: shell/e-setup.c:197
#, c-format
msgid ""
"Cannot create the directory\n"
@@ -4287,7 +4749,7 @@ msgstr ""
"\n"
"���顼: %s"
-#: shell/e-setup.c:84
+#: shell/e-setup.c:212
#, c-format
msgid ""
"Cannot copy files into\n"
@@ -4296,11 +4758,7 @@ msgstr ""
"'%s' ����˥ե������\n"
"���ԡ�����ޤ���"
-#: shell/e-setup.c:88
-msgid "Evolution files successfully installed."
-msgstr "Evolution �Υե���������������󥹥ȡ��뤵��ޤ���"
-
-#: shell/e-setup.c:109
+#: shell/e-setup.c:237
#, c-format
msgid ""
"The file `%s' is not a directory.\n"
@@ -4311,7 +4769,7 @@ msgstr ""
"Evolution �桼���ե�����Υ��󥹥ȡ����\n"
"���Ƥ��뤿��˰�ư���Ʋ�����"
-#: shell/e-setup.c:121
+#: shell/e-setup.c:249
#, c-format
msgid ""
"The directory `%s' exists but is not the\n"
@@ -4347,31 +4805,31 @@ msgstr ""
"���򤷤��ե�����μ��̤��׵ᤵ�줿���Τ����\n"
"ͭ���ǤϤ���ޤ���"
-#: shell/e-shell-folder-selection-dialog.c:272
+#: shell/e-shell-folder-selection-dialog.c:291
msgid "New..."
msgstr "����..."
-#: shell/e-shell-folder-title-bar.c:452 shell/e-shell-folder-title-bar.c:453
+#: shell/e-shell-folder-title-bar.c:447 shell/e-shell-folder-title-bar.c:448
msgid "(Untitled)"
msgstr "(�����ȥ�ʤ�)"
#. you might have to call gnome_dialog_run() on the
#. * dialog returned here, I don't remember...
#.
-#: shell/e-shell-view-menu.c:113
+#: shell/e-shell-view-menu.c:114
msgid "Bug buddy was not found in your $PATH."
msgstr "Bug buddy �Ϥ��ʤ��� $PATH �ˤϸ��Ĥ���ޤ���"
#. same as above
-#: shell/e-shell-view-menu.c:119
+#: shell/e-shell-view-menu.c:120
msgid "Bug buddy could not be run."
msgstr "Bug buddy �ϼ¹ԤǤ��ޤ���Ǥ���"
-#: shell/e-shell-view-menu.c:167
+#: shell/e-shell-view-menu.c:169
msgid "Copyright 1999, 2000 Helix Code, Inc."
msgstr "Copyright 1999, 2000 Helix Code, Inc."
-#: shell/e-shell-view-menu.c:169
+#: shell/e-shell-view-menu.c:171
msgid ""
"Evolution is a suite of groupware applications\n"
"for mail, calendaring, and contact management\n"
@@ -4383,161 +4841,95 @@ msgstr ""
"���롼�ץ��������ץꥱ��������\n"
"�ѥå��������եȤǤ�"
-#: shell/e-shell-view-menu.c:319
+#: shell/e-shell-view-menu.c:332
msgid "Go to folder..."
msgstr "�ե�����ذ�ư..."
-#: shell/e-shell-view-menu.c:377
-msgid "_New"
-msgstr "����(_N)"
-
-#: shell/e-shell-view-menu.c:389
-msgid "_Folder"
-msgstr "�ե����(_F)"
-
-#: shell/e-shell-view-menu.c:395
-msgid "Evolution bar _shortcut"
-msgstr "Evolution �С����硼�ȥ��å�(_s)"
-
-#: shell/e-shell-view-menu.c:404
-msgid "_Mail message (FIXME)"
-msgstr "�᡼���å�����(_M) (FIXME)"
-
-#: shell/e-shell-view-menu.c:410
-msgid "_Appointment (FIXME)"
-msgstr "��«(_A) (FIXME)"
-
-#: shell/e-shell-view-menu.c:416
-msgid "_Contact (FIXME)"
-msgstr "���󥿥���(_C) (FIXME)"
-
-#: shell/e-shell-view-menu.c:422
-msgid "_Task (FIXME)"
-msgstr "���(_T) (FIXME)"
-
-#: shell/e-shell-view-menu.c:444
-msgid "_Go to Folder..."
-msgstr "�ե�����ذ�ư(_G)..."
-
-#: shell/e-shell-view-menu.c:445
-msgid "Display a different folder"
-msgstr "�̤Υե������ɽ�����ޤ�"
-
-#: shell/e-shell-view-menu.c:452
-msgid "_Create New Folder..."
-msgstr "�����ե�����κ���(_C)..."
-
-#: shell/e-shell-view-menu.c:453 shell/e-shell-view-menu.c:465
-msgid "Create a new folder"
-msgstr "�����ե������������ޤ�"
-
-#: shell/e-shell-view-menu.c:464
-msgid "E_xit..."
-msgstr "��λ(_x)..."
-
-#: shell/e-shell-view-menu.c:495
-msgid "Show _Shortcut Bar"
-msgstr "���硼�ȥ��åȥС���ɽ��(_S)"
-
-#: shell/e-shell-view-menu.c:496
-msgid "Show the shortcut bar"
-msgstr "���硼�ȥ��åȥС���ɽ�����ޤ�"
-
-#: shell/e-shell-view-menu.c:501
-msgid "Show _Folder Bar"
-msgstr "�ե�����С���ɽ��(_F)"
-
-#: shell/e-shell-view-menu.c:502
-msgid "Show the folder bar"
-msgstr "�ե�����С���ɽ�����ޤ�"
-
-#: shell/e-shell-view-menu.c:513
-msgid "_Settings"
-msgstr "����(_S)"
-
-#: shell/e-shell-view-menu.c:524
-msgid "_Help"
-msgstr "�إ��(_H)"
-
-#: shell/e-shell-view-menu.c:530
-msgid "Help _Index"
-msgstr "�إ�ץ���ǥå���(_I)"
-
-#: shell/e-shell-view-menu.c:537
-msgid "Getting _Started"
-msgstr "�Ϥ�(_S)"
-
-#: shell/e-shell-view-menu.c:544
-msgid "Using the _Mailer"
-msgstr "�᡼��λȤ���(_M)"
-
-#: shell/e-shell-view-menu.c:551
-msgid "Using the _Calendar"
-msgstr "�������λȤ���(_C)"
-
-#: shell/e-shell-view-menu.c:558
-msgid "Using the C_ontact Manager"
-msgstr "���󥿥��ȥޥ͡�����λȤ���(_o)"
-
-#: shell/e-shell-view-menu.c:568
-msgid "_Submit Bug Report"
-msgstr "�Զ��������(_S)"
-
-#: shell/e-shell-view-menu.c:569
-msgid "Submit bug report using Bug Buddy"
-msgstr "Bug Buddy �Ȥä��Զ��������Ф��ޤ�"
-
-#: shell/e-shell-view-menu.c:578
-msgid "_About Evolution..."
-msgstr "Evolution �ˤĤ���(_A)..."
-
-#: shell/e-shell-view-menu.c:579
-msgid "Show information about Evolution"
-msgstr "Evolution �ˤĤ��Ƥξ����ɽ�����ޤ�"
-
-#: shell/e-shell-view.c:127
+#: shell/e-shell-view.c:136
msgid "(No folder displayed)"
msgstr "(ɽ�������ե�����Ϥ���ޤ���)"
-#: shell/e-shell-view.c:395
+#: shell/e-shell-view.c:417
msgid "Folders"
msgstr "�ե����"
-#: shell/e-shell-view.c:941
+#: shell/e-shell-view.c:993
#, c-format
msgid "Evolution - %s"
msgstr "Evolution - %s"
-#: shell/e-shell.c:315
+#: shell/e-shell-view.c:1133
+#, c-format
+msgid ""
+"Ooops! The view for `%s' has died unexpectedly. :-(\n"
+"This probably means that the %s component has crashed."
+msgstr ""
+
+#: shell/e-shell.c:336
#, c-format
msgid "Cannot set up local storage -- %s"
msgstr "�����������֤Υ��åȥ��åפ�����ޤ��� -- %s"
-#: shell/e-shortcuts-view.c:235
-msgid "_Small icons"
+#: shell/e-shortcuts-view.c:122
+msgid "Create new shortcut group"
+msgstr "�������硼�ȥ��åȥ��롼�פ�������ޤ�"
+
+#: shell/e-shortcuts-view.c:125
+msgid "Group name:"
+msgstr "���롼��̾:"
+
+#: shell/e-shortcuts-view.c:234
+#, c-format
+msgid ""
+"Do you really want to remove group\n"
+"`%s' from the shortcut bar?"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:239
+msgid "Don't remove"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:250
+msgid "_Small Icons"
msgstr "��������������(_S)"
-#: shell/e-shortcuts-view.c:236
+#: shell/e-shortcuts-view.c:251
msgid "Show the shortcuts as small icons"
msgstr "��������������ǥ��硼�ȥ��åȤ�ɽ�����ޤ�"
-#: shell/e-shortcuts-view.c:238
-msgid "_Large icons"
+#: shell/e-shortcuts-view.c:253
+msgid "_Large Icons"
msgstr "�礭����������(_L)"
-#: shell/e-shortcuts-view.c:239
+#: shell/e-shortcuts-view.c:254
msgid "Show the shortcuts as large icons"
msgstr "�礭����������ǥ��硼�ȥ��åȤ�ɽ�����ޤ�"
-#: shell/e-shortcuts-view.c:330
+#: shell/e-shortcuts-view.c:265
+msgid "_New Group..."
+msgstr "�������롼��(_N)..."
+
+#: shell/e-shortcuts-view.c:266
+msgid "Create a new shortcut group"
+msgstr "�������硼�ȥ��åȥ��롼�פ�������ޤ�"
+
+#: shell/e-shortcuts-view.c:268
+msgid "_Remove This Group..."
+msgstr "���Υ��롼�פ���(_R)..."
+
+#: shell/e-shortcuts-view.c:269
+msgid "Remove this shortcut group"
+msgstr "���Υ��硼�ȥ��åȥ��롼�פ������ޤ�"
+
+#: shell/e-shortcuts-view.c:353
msgid "Activate"
msgstr "�����ƥ���"
-#: shell/e-shortcuts-view.c:330
+#: shell/e-shortcuts-view.c:353
msgid "Activate this shortcut"
msgstr "���Υ��硼�ȥ��åȤ򥢥��ƥ��֤ˤ��ޤ�"
-#: shell/e-shortcuts-view.c:333
+#: shell/e-shortcuts-view.c:356
msgid "Remove this shortcut from the shortcut bar"
msgstr "���硼�ȥ��åȥС����餳�Υ��硼�ȥ��åȤ������ޤ�"
@@ -4545,63 +4937,63 @@ msgstr "���硼�ȥ��åȥС����餳�Υ��硼�ȥ��åȤ������ޤ�"
msgid "Error saving shortcuts."
msgstr "���硼�ȥ��åȤ���¸��˥��顼��ȯ�����ޤ���"
-#: shell/e-storage.c:146
+#: shell/e-storage.c:127
msgid "(No name)"
msgstr "(̾���ʤ�)"
-#: shell/e-storage.c:337
+#: shell/e-storage.c:318
msgid "No error"
msgstr "���顼�Ϥ���ޤ���"
-#: shell/e-storage.c:339
+#: shell/e-storage.c:320
msgid "Generic error"
msgstr "����Ū�ʥ��顼"
-#: shell/e-storage.c:341
+#: shell/e-storage.c:322
msgid "A folder with the same name already exists"
msgstr "Ʊ��̾���Υե���������Ǥ�¸�ߤ��Ƥ��ޤ�"
-#: shell/e-storage.c:343
+#: shell/e-storage.c:324
msgid "The specified folder type is not valid"
msgstr "���ꤵ�줿�ե�������̤�ͭ���ǤϤ���ޤ���"
-#: shell/e-storage.c:345
+#: shell/e-storage.c:326
msgid "I/O error"
msgstr "I/O ���顼"
-#: shell/e-storage.c:347
+#: shell/e-storage.c:328
msgid "Not enough space to create the folder"
msgstr "�ե������������뽽ʬ�ʶ���������ޤ���"
-#: shell/e-storage.c:349
+#: shell/e-storage.c:330
msgid "The specified folder was not found"
msgstr "���ꤵ�줿�ե�����ϸ��դ���ޤ���Ǥ���"
-#: shell/e-storage.c:351
+#: shell/e-storage.c:332
msgid "Function not implemented in this storage"
msgstr "��ǽ�Ϥ��ε������֤Ǥϼ�������Ƥ��ޤ���"
-#: shell/e-storage.c:353
+#: shell/e-storage.c:334
msgid "Permission denied"
msgstr "���Ĥ�����ޤ���"
-#: shell/e-storage.c:355
+#: shell/e-storage.c:336
msgid "Operation not supported"
msgstr "���ϥ��ݡ��Ȥ���Ƥ��ޤ���"
-#: shell/e-storage.c:357
+#: shell/e-storage.c:338
msgid "The specified type is not supported in this storage"
msgstr "���ꤵ�줿���̤Ϥ��ε������֤Ǥϥ��ݡ��Ȥ���Ƥ��ޤ���"
-#: shell/e-storage.c:359
-msgid "Unknown error"
-msgstr "̤�ΤΥ��顼"
+#: shell/e-storage-set-view.c:223 ui/evolution.h:15 ui/evolution.h:29
+msgid "_View"
+msgstr "ɽ��(_V)"
-#: shell/e-storage-set-view.c:221
+#: shell/e-storage-set-view.c:223
msgid "View the selected folder"
msgstr "���򤵤줿�ե������ɽ�����ޤ�"
-#: shell/main.c:67
+#: shell/main.c:68
msgid ""
"Hi. Thanks for taking the time to download this preview release\n"
"of the Evolution groupware suite.\n"
@@ -4643,7 +5035,7 @@ msgstr ""
"�桹�Ϥ��ʤ����桹�����̤�ڤ��ळ�Ȥ�˾��Ǥ��ޤ��������Ʋ桹��\n"
"Ǯ���ˤ��ʤ��ι׸����Ԥ������Ƥ��ޤ�!\n"
-#: shell/main.c:94
+#: shell/main.c:95
msgid ""
"Thanks\n"
"The Evolution Team\n"
@@ -4651,146 +5043,580 @@ msgstr ""
"���꤬�Ȥ�\n"
"Evolution ������\n"
-#: shell/main.c:122
+#: shell/main.c:123
msgid "Cannot initialize the Evolution shell."
msgstr "Evolution ������ν����������ޤ���"
-#: shell/main.c:159
+#: shell/main.c:160
msgid "Cannot initialize the Bonobo component system."
msgstr "Bonobo ����ݡ��ͥ�ȥ����ƥ����������ޤ���"
-#: tests/ui-tests/message-browser.c:360
-msgid "The component now claims that it doesn't support PersistStream!"
-msgstr "����ݡ��ͥ�Ȥϸ��� PersistStream �򥵥ݡ��Ȥ��ʤ��ȼ�ĥ���ޤ�!"
+#.
+#. * This file is autogenerated from evolution-addressbook-ldap.xml, do not edit
+#. *
+#. * This file contains translatable strings generated by
+#. * bonobo-ui-extract. Add this file to your project's
+#. * POTFILES.in. DO NOT compile it as part of your application.
+#.
+#: ui/evolution-addressbook-ldap.h:9
+msgid "_Actions"
+msgstr "ư��(_A)"
-#: tests/ui-tests/message-browser.c:378
-msgid ""
-"An exception occured while trying to load data into the component with "
-"PersistStream"
+#: ui/evolution-addressbook-ldap.h:10
+msgid "N_ew Directory Server"
+msgstr "�����ǥ��쥯�ȥꥵ����(_e)"
+
+#.
+#. * This file is autogenerated from evolution-addressbook.xml, do not edit
+#. *
+#. * This file contains translatable strings generated by
+#. * bonobo-ui-extract. Add this file to your project's
+#. * POTFILES.in. DO NOT compile it as part of your application.
+#.
+#: ui/evolution-addressbook.h:9
+msgid "_Print Contacts..."
+msgstr "���󥿥��Ȥ����(_P)..."
+
+#: ui/evolution-addressbook.h:11
+msgid "_New Contact"
+msgstr "�������󥿥���(_N)"
+
+#: ui/evolution-addressbook.h:12
+msgid "_Tools"
+msgstr "�ġ���(_T)"
+
+#: ui/evolution-addressbook.h:13
+msgid "_Search for contacts"
+msgstr "���󥿥��Ȥθ���(_S)"
+
+#: ui/evolution-addressbook.h:14 ui/evolution-calendar.h:22
+msgid "New"
+msgstr "����"
+
+#: ui/evolution-addressbook.h:15
+msgid "Create a new contact"
+msgstr "�������󥿥��Ȥ�������ޤ�"
+
+#: ui/evolution-addressbook.h:16
+msgid "Find"
+msgstr "����"
+
+#: ui/evolution-addressbook.h:17
+msgid "Find a contact"
+msgstr "���󥿥��Ȥ򸡺����ޤ�"
+
+#: ui/evolution-addressbook.h:19
+msgid "Print contacts"
+msgstr "���󥿥��Ȥ�������ޤ�"
+
+#: ui/evolution-addressbook.h:21
+msgid "Delete a contact"
+msgstr "���󥿥��Ȥ������ޤ�"
+
+#: ui/evolution-addressbook.h:22
+msgid "View All"
+msgstr "���٤�ɽ��"
+
+#: ui/evolution-addressbook.h:23
+msgid "View all contacts"
+msgstr "���٤ƤΥ��󥿥��Ȥ�ɽ�����ޤ�"
+
+#: ui/evolution-addressbook.h:24
+msgid "Stop"
+msgstr "���"
+
+#: ui/evolution-addressbook.h:25
+msgid "Stop Loading"
+msgstr "�����ɤ���ߤ��ޤ�"
+
+#.
+#. * This file is autogenerated from evolution-calendar.xml, do not edit
+#. *
+#. * This file contains translatable strings generated by
+#. * bonobo-ui-extract. Add this file to your project's
+#. * POTFILES.in. DO NOT compile it as part of your application.
+#.
+#: ui/evolution-calendar.h:9 ui/evolution.h:14
+msgid "_New"
+msgstr "����(_N)"
+
+#: ui/evolution-calendar.h:10
+msgid "New Ca_lendar"
+msgstr "����������(_l)"
+
+#: ui/evolution-calendar.h:11
+msgid "Create a new calendar"
+msgstr "������������������ޤ�"
+
+#: ui/evolution-calendar.h:12
+msgid "_Open"
+msgstr "����(_O)"
+
+#: ui/evolution-calendar.h:13
+msgid "_Open Calendar"
+msgstr "�������򳫤�(_O)"
+
+#: ui/evolution-calendar.h:14
+msgid "Open a calendar"
+msgstr "�������򳫤��ޤ�"
+
+#: ui/evolution-calendar.h:15
+msgid "_Save Calendar As"
+msgstr "����������̾����¸(_S)"
+
+#: ui/evolution-calendar.h:16
+msgid "Save calendar As something else"
+msgstr "����������̾����¸���ޤ�"
+
+#: ui/evolution-calendar.h:17
+msgid "_Print this calendar"
+msgstr "�������������(_P)"
+
+#: ui/evolution-calendar.h:18
+msgid "_New appointment..."
+msgstr "����ͽ��(_N)..."
+
+#: ui/evolution-calendar.h:19 ui/evolution-calendar.h:23
+msgid "Create a new appointment"
+msgstr "����ͽ���������ޤ�"
+
+#: ui/evolution-calendar.h:20
+msgid "Calendar Preferences..."
+msgstr "������������..."
+
+#: ui/evolution-calendar.h:21
+msgid "Alter preferences"
msgstr ""
-"PersistStream "
-"�ǥ���ݡ��ͥ�Ȥ���إǡ������ɤ߹��⤦�Ȥ��Ƥ���֤��㳰��ȯ�����ޤ���"
-#: tests/ui-tests/message-browser.c:471
-#, c-format
-msgid "The %s component doesn't support PersistStream!\n"
-msgstr "%s ����ݡ��ͥ�Ȥ� PersistStream �򥵥ݡ��Ȥ��Ƥ��ޤ���!\n"
+#: ui/evolution-calendar.h:25
+msgid "Print this calendar"
+msgstr "���Υ�������������ޤ�"
+
+#: ui/evolution-calendar.h:26
+msgid "Prev"
+msgstr "��"
+
+#: ui/evolution-calendar.h:27
+msgid "Go back in time"
+msgstr "���֤��ᤷ�ޤ�"
+
+#: ui/evolution-calendar.h:28 widgets/misc/e-dateedit.c:331
+msgid "Today"
+msgstr "����"
+
+#: ui/evolution-calendar.h:29
+msgid "Go to present time"
+msgstr "���ߤλ��֤ذ�ư���ޤ�"
+
+#: ui/evolution-calendar.h:30
+msgid "Next"
+msgstr "��"
+
+#: ui/evolution-calendar.h:31
+msgid "Go forward in time"
+msgstr "���֤�ʤߤޤ�"
+
+#: ui/evolution-calendar.h:32
+msgid "Go to"
+msgstr "��ư"
+
+#: ui/evolution-calendar.h:33
+msgid "Go to a specific date"
+msgstr "�������ذ�ư���ޤ�"
+
+#: ui/evolution-calendar.h:34
+msgid "Day"
+msgstr "��"
+
+#: ui/evolution-calendar.h:35
+msgid "Show 1 day"
+msgstr "1 ��ʬ��ɽ�����ޤ�"
+
+#: ui/evolution-calendar.h:36
+msgid "5 Days"
+msgstr "5 ��"
-#: tests/ui-tests/message-browser.c:710
-msgid "Open Mime Message"
-msgstr "MIME ��å������򳫤�"
+#: ui/evolution-calendar.h:37
+msgid "Show the working week"
+msgstr "�Ż���ν���ɽ�����ޤ�"
+
+#: ui/evolution-calendar.h:38
+msgid "Week"
+msgstr "��"
+
+#: ui/evolution-calendar.h:39
+msgid "Show 1 week"
+msgstr "1 ����ʬ��ɽ�����ޤ�"
+
+#: ui/evolution-calendar.h:40
+msgid "Month"
+msgstr "��"
+
+#: ui/evolution-calendar.h:41
+msgid "Show 1 month"
+msgstr "1 ����ʬ��ɽ�����ޤ�"
#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * This file is autogenerated from evolution-contact-editor.xml, do not edit
+#. *
+#. * This file contains translatable strings generated by
+#. * bonobo-ui-extract. Add this file to your project's
+#. * POTFILES.in. DO NOT compile it as part of your application.
#.
-#: widgets/e-table/e-table-config.glade.h:7
-msgid "Fields"
-msgstr "�ե������"
+#: ui/evolution-contact-editor.h:9 ui/evolution-subscribe.h:9
+#: ui/evolution.h:13
+msgid "_File"
+msgstr "�ե�����(_F)"
-#: widgets/e-table/e-table-config.glade.h:8
-msgid "Grouping"
-msgstr "���롼��"
+#: ui/evolution-contact-editor.h:10
+msgid "_Save"
+msgstr "��¸(_S)"
-#: widgets/e-table/e-table-config.glade.h:9
-msgid "Sort"
-msgstr "������"
+#: ui/evolution-contact-editor.h:11
+msgid "Save _As"
+msgstr "��̾����¸(_A)"
-#: widgets/e-table/e-table-config.glade.h:10
-msgid "Filter"
-msgstr "�ե��륿"
+#: ui/evolution-contact-editor.h:13
+msgid "_Print"
+msgstr "����(_P)"
+
+#: ui/evolution-contact-editor.h:15
+msgid "Save and Close"
+msgstr "��¸���Ĥ���"
+
+#: ui/evolution-contact-editor.h:16
+msgid "Save the contact and close the dialog box"
+msgstr "���󥿥��Ȥ���¸���ƥ����������ܥå������Ĥ��ޤ�"
+
+#: ui/evolution-contact-editor.h:17
+msgid "Print..."
+msgstr "����..."
+
+#: ui/evolution-contact-editor.h:18
+msgid "Print this item"
+msgstr "���Υ����ƥ��������ޤ�"
+
+#: ui/evolution-contact-editor.h:20
+msgid "Delete this item"
+msgstr "���Υ����ƥ�������ޤ�"
#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * This file is autogenerated from evolution-mail.xml, do not edit
+#. *
+#. * This file contains translatable strings generated by
+#. * bonobo-ui-extract. Add this file to your project's
+#. * POTFILES.in. DO NOT compile it as part of your application.
#.
-#: widgets/e-table/e-table-field-chooser.glade.h:7
-#: widgets/e-table/e-table-header-item.c:1164
-msgid "Field Chooser"
-msgstr "�ե����������"
+#: ui/evolution-mail.h:9
+msgid "_Threaded"
+msgstr "����å�(_T)"
-#: widgets/e-table/e-table-field-chooser.glade.h:8
-msgid ""
-"To add a column to your table, drag it into\n"
-"the location in which you want it to appear."
+#: ui/evolution-mail.h:10
+msgid "Threaded Message list"
+msgstr "��å������ꥹ�Ȥ򥹥�åɤ�ɽ�����ޤ�"
+
+#: ui/evolution-mail.h:11
+msgid "Print message..."
+msgstr "�����������..."
+
+#: ui/evolution-mail.h:12
+msgid "Print message to the printer"
+msgstr "�ץ�󥿤إ�å�������������ޤ�"
+
+#: ui/evolution-mail.h:13
+msgid "Print Preview of message..."
+msgstr "��å������ΰ����ץ�ӥ塼..."
+
+#: ui/evolution-mail.h:14
+msgid "Previews the message to be printed"
+msgstr "���������å�������ɽ�����ޤ�"
+
+#: ui/evolution-mail.h:15 ui/evolution-subscribe.h:12
+msgid "Select _All"
+msgstr "���٤�����(_A)"
+
+#: ui/evolution-mail.h:16
+msgid "_Invert Selection"
+msgstr "�����ȿž(_I)"
+
+#: ui/evolution-mail.h:17
+msgid "Mail _Filters..."
+msgstr "�᡼��ե��륿(_F) ..."
+
+#: ui/evolution-mail.h:18
+msgid "_Virtual Folder Editor..."
+msgstr "���ۥե�������ǥ���(_V)..."
+
+#: ui/evolution-mail.h:19
+msgid "_Mail Configuration..."
+msgstr "�᡼������(_M)..."
+
+#: ui/evolution-mail.h:20
+msgid "Manage Subscriptions..."
+msgstr "ͽ�����..."
+
+#: ui/evolution-mail.h:21
+msgid "Forget _Passwords"
+msgstr "�ѥ����ʶ��(_P)"
+
+#: ui/evolution-mail.h:22
+msgid "_Message"
+msgstr "������(_M)"
+
+#: ui/evolution-mail.h:23
+msgid "_Open in New Window"
+msgstr "����������ɥ��򳫤�(_O)"
+
+#: ui/evolution-mail.h:24
+msgid "_Edit Message"
+msgstr "��å��������Խ�(_E)"
+
+#: ui/evolution-mail.h:25
+msgid "_Print Message"
+msgstr "�����������(_P)"
+
+#: ui/evolution-mail.h:26
+msgid "Reply to _Sender"
+msgstr "�����Ԥ��ֿ�(_S)"
+
+#: ui/evolution-mail.h:27
+msgid "Reply to _All"
+msgstr "�������ֿ�(_A)"
+
+#: ui/evolution-mail.h:28
+msgid "_Forward"
+msgstr "ž��(_F)"
+
+#: ui/evolution-mail.h:29
+msgid "Mar_k As Read"
+msgstr "���ɤȤ��ƥޡ���(_k)"
+
+#: ui/evolution-mail.h:30
+msgid "Mark As U_nread"
+msgstr "̤�ɤȤ��ƥޡ���(_n)"
+
+#: ui/evolution-mail.h:32
+msgid "_Move to Folder"
+msgstr "�ե�����ذ�ư(_M)"
+
+#: ui/evolution-mail.h:33
+msgid "_Copy to Folder"
+msgstr "�ե�����إ��ԡ�(_C)"
+
+#: ui/evolution-mail.h:34
+msgid "_VFolder on Subject"
+msgstr "ɽ��β��ۥե����(_V)"
+
+#: ui/evolution-mail.h:35
+msgid "VFolder on Se_nder"
+msgstr "�����Ԥβ��ۥե����(_n)"
+
+#: ui/evolution-mail.h:36
+msgid "VFolder on _Recipients"
+msgstr "�����Ԥβ��ۥե����(_R)"
+
+#: ui/evolution-mail.h:37
+msgid "_Filter on Subject"
+msgstr "ɽ��Υե��륿(_F)"
+
+#: ui/evolution-mail.h:38
+msgid "Fi_lter on Sender"
+msgstr "�����ԤΥե��륿(_l)"
+
+#: ui/evolution-mail.h:39
+msgid "Filter on Rec_ipients"
+msgstr "�����ԤΥե��륿(_i)"
+
+#: ui/evolution-mail.h:40 ui/evolution-subscribe.h:14
+msgid "F_older"
+msgstr "�ե����(_o)"
+
+#: ui/evolution-mail.h:41
+msgid "_Expunge"
+msgstr "����(_E)"
+
+#: ui/evolution-mail.h:42
+msgid "_Configure Folder"
+msgstr "�ե��������(_C)"
+
+#: ui/evolution-mail.h:43
+msgid "Get Mail"
+msgstr "�᡼��μ���"
+
+#: ui/evolution-mail.h:44
+msgid "Send queued mail and retrieve new mail"
+msgstr "���塼�������줿�᡼����������ƿ������᡼���������ޤ�"
+
+#: ui/evolution-mail.h:45
+msgid "Compose"
+msgstr "����"
+
+#: ui/evolution-mail.h:46
+msgid "Compose a new message"
+msgstr "������å�������������ޤ�"
+
+#: ui/evolution-mail.h:53
+msgid "Move"
+msgstr "��ư"
+
+#: ui/evolution-mail.h:54
+msgid "Move message to a new folder"
+msgstr "�����ե�����إ�å��������ư���ޤ�"
+
+#: ui/evolution-mail.h:55
+msgid "Copy"
+msgstr "���ԡ�"
+
+#: ui/evolution-mail.h:56
+msgid "Copy message to a new folder"
+msgstr "�����ե�����إ�å������򥳥ԡ����ޤ�"
+
+#: ui/evolution-subscribe.h:11 ui/evolution.h:28
+msgid "_Edit"
+msgstr "�Խ�(_E)"
+
+#: ui/evolution-subscribe.h:13
+msgid "_Unselect All"
+msgstr "���٤�������(_U)"
+
+#: ui/evolution-subscribe.h:15 ui/evolution-subscribe.h:17
+msgid "Subscribe"
+msgstr ""
+
+#: ui/evolution-subscribe.h:16 ui/evolution-subscribe.h:19
+msgid "Unsubscribe"
+msgstr ""
+
+#: ui/evolution-subscribe.h:18
+msgid "Add folder to your list of subscribed folders"
+msgstr ""
+
+#: ui/evolution-subscribe.h:20
+msgid "Remove folder from your list of subscribed folders"
msgstr ""
-"�����򤢤ʤ��Υơ��֥�˲ä��뤿��ˡ������\n"
-"ɽ�����������˥ɥ�å����Ƥ���������"
+
+#: ui/evolution-subscribe.h:21
+msgid "Refresh List"
+msgstr "�ꥹ�Ȥ򹹿�"
+
+#: ui/evolution-subscribe.h:22
+msgid "Refresh List of Folders"
+msgstr "�ե�����ꥹ�Ȥ򹹿����ޤ�"
#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * This file is autogenerated from evolution.xml, do not edit
+#. *
+#. * This file contains translatable strings generated by
+#. * bonobo-ui-extract. Add this file to your project's
+#. * POTFILES.in. DO NOT compile it as part of your application.
#.
-#: widgets/e-table/e-table-group.glade.h:7
-msgid "window1"
-msgstr "window1"
+#: ui/evolution.h:9
+msgid "Show the _Shortcut Bar"
+msgstr "���硼�ȥ��åȥС���ɽ��(_S)"
-#: widgets/e-table/e-table-group.glade.h:8
-msgid "Available fields"
-msgstr "���ѤǤ���ե������"
+#: ui/evolution.h:10
+msgid "Toggle whether to show the shortcut bar"
+msgstr "���硼�ȥ��åȥС���ɽ�������ؤ��ޤ�"
-#: widgets/e-table/e-table-group.glade.h:9
-msgid "label1"
-msgstr "label1"
+#: ui/evolution.h:11
+msgid "Show the _Folder Bar"
+msgstr "�ե�����С���ɽ��(_F)"
-#: widgets/e-table/e-table-group.glade.h:10
-msgid "Show in this order"
-msgstr "���Υ���������ɽ������"
+#: ui/evolution.h:12
+msgid "Toggle whether to show the folder bar"
+msgstr "�ե�����С���ɽ�������ؤ��ޤ�"
-#: widgets/e-table/e-table-group.glade.h:11
-msgid "label2"
-msgstr "label2"
+#: ui/evolution.h:16
+msgid "_Folder"
+msgstr "�ե����(_F)"
-#: widgets/e-table/e-table-group.glade.h:12
-msgid "Add >>"
-msgstr "�ɲ� >>"
+#: ui/evolution.h:17
+msgid "Evolution bar _shortcut"
+msgstr "Evolution �С����硼�ȥ��å�(_s)"
+
+#: ui/evolution.h:18
+msgid "_Mail message (FIXME)"
+msgstr "�᡼���å�����(_M) (FIXME)"
+
+#: ui/evolution.h:19
+msgid "_Appointment (FIXME)"
+msgstr "��«(_A) (FIXME)"
+
+#: ui/evolution.h:20
+msgid "_Contact (FIXME)"
+msgstr "���󥿥���(_C) (FIXME)"
+
+#: ui/evolution.h:21
+msgid "_Task (FIXME)"
+msgstr "���(_T) (FIXME)"
+
+#: ui/evolution.h:22
+msgid "_Go to Folder..."
+msgstr "�ե�����ذ�ư(_G)..."
+
+#: ui/evolution.h:23
+msgid "Display a different folder"
+msgstr "�̤Υե������ɽ�����ޤ�"
+
+#: ui/evolution.h:24
+msgid "_Create New Folder..."
+msgstr "�����ե�����κ���(_C)..."
+
+#: ui/evolution.h:25
+msgid "Create a new folder"
+msgstr "�����ե������������ޤ�"
+
+#: ui/evolution.h:26
+msgid "E_xit"
+msgstr "��λ(_x)"
-#: widgets/e-table/e-table-group.glade.h:13
-msgid "<< Remove"
-msgstr "<< ���"
+#: ui/evolution.h:27
+msgid "Exit the program"
+msgstr "�ץ�������λ���ޤ�"
-#: widgets/e-table/e-table-header-item.c:1156
-msgid "Sort Ascending"
-msgstr "����ǥ�����"
+#: ui/evolution.h:30
+msgid "_Settings"
+msgstr "����(_S)"
-#: widgets/e-table/e-table-header-item.c:1157
-msgid "Sort Descending"
-msgstr "�߽�ǥ�����"
+#: ui/evolution.h:31
+msgid "_Help"
+msgstr "�إ��(_H)"
-#: widgets/e-table/e-table-header-item.c:1158
-msgid "Unsort"
-msgstr "�����Ȳ��"
+#: ui/evolution.h:32
+msgid "_Index"
+msgstr "����ǥå���(_I)"
-#: widgets/e-table/e-table-header-item.c:1160
-msgid "Group By This Field"
-msgstr "���Υե��������˥��롼��"
+#: ui/evolution.h:33
+msgid "Getting _Started"
+msgstr "�Ϥ�(_S)"
-#: widgets/e-table/e-table-header-item.c:1161
-msgid "Group By Box"
-msgstr "�ܥå�����˥��롼��"
+#: ui/evolution.h:34
+msgid "Using the _Mailer"
+msgstr "�᡼��λȤ���(_M)"
+
+#: ui/evolution.h:35
+msgid "Using the _Calendar"
+msgstr "�������λȤ���(_C)"
-#: widgets/e-table/e-table-header-item.c:1163
-msgid "Remove This Column"
-msgstr "����������"
+#: ui/evolution.h:36
+msgid "Using the C_ontact Manager"
+msgstr "���󥿥��ȥޥ͡�����λȤ���(_o)"
-#: widgets/e-table/e-table-header-item.c:1166
-msgid "Alignment"
-msgstr "����"
+#: ui/evolution.h:37
+msgid "_Submit Bug Report"
+msgstr "�Զ��������(_S)"
-#: widgets/e-table/e-table-header-item.c:1167
-msgid "Best Fit"
-msgstr "Ŭ��"
+#: ui/evolution.h:38
+msgid "Submit bug report using Bug Buddy"
+msgstr "Bug Buddy �Ȥä��Զ��������Ф��ޤ�"
-#: widgets/e-table/e-table-header-item.c:1168
-msgid "Format Columns..."
-msgstr "�����Υե����ޥå�..."
+#: ui/evolution.h:39
+msgid "_About Evolution..."
+msgstr "Evolution �ˤĤ���(_A)..."
-#: widgets/e-table/e-table-header-item.c:1170
-msgid "Customize Current View..."
-msgstr "���ߤΥӥ塼�򥫥����ޥ���..."
+#: ui/evolution.h:40
+msgid "Show information about Evolution"
+msgstr "Evolution �ˤĤ��Ƥξ����ɽ�����ޤ�"
#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
msgid "Tentative"
@@ -4868,16 +5694,46 @@ msgstr "��Ľ�λ����(_e):"
msgid "All Attendees"
msgstr "���٤Ƥ��դ�ź��"
+#. 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:2468
+msgid "%A, %B %d, %Y"
+msgstr "%Y/%B/%d %A"
+
#. Translators: These are the first characters of each day of the
#. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:417
+#: widgets/misc/e-calendar-item.c:415
msgid "MTWTFSS"
msgstr "MTWTFSS"
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: widgets/misc/e-calendar-item.c:1039 widgets/misc/e-calendar-item.c:2670
+msgid "%B %Y"
+msgstr "%Y %B"
+
#: widgets/misc/e-clipped-label.c:106
msgid "..."
msgstr "..."
+#: widgets/misc/e-dateedit.c:325
+msgid "Now"
+msgstr ""
+
+#. This is a strptime() format. %H = hour (0-23), %M = minute.
+#: widgets/misc/e-dateedit.c:641 widgets/misc/e-dateedit.c:731
+#: widgets/misc/e-dateedit.c:768 widgets/misc/e-dateedit.c:813
+#: widgets/misc/e-dateedit.c:1127
+msgid "%H:%M"
+msgstr "%H:%M"
+
+#. This is a strptime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
+#: widgets/misc/e-dateedit.c:644 widgets/misc/e-dateedit.c:734
+#: widgets/misc/e-dateedit.c:771 widgets/misc/e-dateedit.c:816
+#: widgets/misc/e-dateedit.c:1130
+msgid "%I:%M %p"
+msgstr "%p %I:%M"
+
#: widgets/shortcut-bar/e-group-bar.c:632
#, c-format
msgid "Group %i"