aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUpdated ja.po. T.Aihana <aihana@gnome.gr.jp>2004-03-23 10:39:59 +0800
committerTakeshi Aihana <aihana@src.gnome.org>2004-03-23 10:39:59 +0800
commit4ed1140a6e81275c07860120c493b402e2613343 (patch)
tree7806978d7cd11d1ee9365de990de77f8d6bf96ed
parent17d85681a4b8f28c5fa0ba021c96fcdd22ea27cc (diff)
downloadgsoc2013-evolution-4ed1140a6e81275c07860120c493b402e2613343.tar.gz
gsoc2013-evolution-4ed1140a6e81275c07860120c493b402e2613343.tar.zst
gsoc2013-evolution-4ed1140a6e81275c07860120c493b402e2613343.zip
svn path=/trunk/; revision=25149
2004-03-23 Updated ja.po. T.Aihana <aihana@gnome.gr.jp> svn path=/trunk/; revision=25149
-rw-r--r--po/ChangeLog4
-rw-r--r--po/ja.po2244
2 files changed, 1131 insertions, 1117 deletions
diff --git a/po/ChangeLog b/po/ChangeLog
index a4c7f75328..3c8ae5e851 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2004-03-23 Takeshi AIHANA <aihana@gnome.gr.jp>
+
+ * ja.po: Updated Japanese translation.
+
2004-03-22 Francisco Javier F. Serrador <serrador@cvs.gnome.org>
* es.po: updated Spansih translation.
diff --git a/po/ja.po b/po/ja.po
index 69247f6baf..d027e69876 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,14 +8,14 @@
msgid ""
msgstr ""
"Project-Id-Version: evolution HEAD\n"
-"POT-Creation-Date: 2004-03-05 13:00-0500\n"
-"PO-Revision-Date: 2004-02-11 16:19+0900\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-03-23 11:36+0900\n"
+"PO-Revision-Date: 2004-03-23 11:36+0900\n"
"Last-Translator: Takeshi AIHANA <aihana@gnome.gr.jp>\n"
"Language-Team: Japanese <gnome-translation@gnome.gr.jp>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Report-Msgid-Bugs-To: \n"
#: addressbook/conduit/address-conduit.c:272
msgid "Default Sync Address:"
@@ -47,6 +47,7 @@ msgstr "ここで自動補完を設定します"
#. can not get name, should be a bug of e-book.Anyway, should set a default name.
#.
#. name = e_book_get_name (book);
+#. Create the contacts group
#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
#: calendar/gui/migration.c:363
@@ -90,18 +91,17 @@ msgid "Manager your S/Mime certificates here"
msgstr "この S/MIME 証明書のマネージャ"
#: addressbook/gui/component/addressbook-component.c:225
-#, fuzzy, c-format
+#, c-format
msgid "Address book '%s' will be removed. Are you sure you want to continue?"
-msgstr "アドレス帳 '%s' を削除します。続行してもよろしいですか?"
+msgstr "アドレス帳 '%s' を削除します。本当に続行してもよろしいですか?"
#: addressbook/gui/component/addressbook-component.c:308
#: addressbook/gui/component/ldap-config.glade.h:29
-#, fuzzy
msgid "New Address Book"
msgstr "新しいアドレス帳"
#: addressbook/gui/component/addressbook-component.c:309
-#: addressbook/gui/widgets/e-addressbook-view.c:1074
+#: addressbook/gui/widgets/e-addressbook-view.c:1077
#: calendar/gui/calendar-component.c:374 calendar/gui/tasks-component.c:365
#: filter/libfilter-i18n.h:11 mail/em-account-prefs.c:236
#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
@@ -191,14 +191,16 @@ msgid "Migrating `%s':"
msgstr "'%s' の移行中:"
#. create the local source group
+#. On This Computer is always first and VFolders is always last
#: addressbook/gui/component/addressbook-migrate.c:409
#: calendar/gui/migration.c:426 calendar/gui/migration.c:503
-#: mail/em-folder-tree-model.c:163 mail/em-folder-tree-model.c:165
-#: mail/mail-component.c:201
+#: mail/em-folder-tree-model.c:192 mail/em-folder-tree-model.c:194
+#: mail/mail-component.c:236
msgid "On This Computer"
msgstr "このコンピュータ"
#. Create the default Person addressbook
+#. orange
#: addressbook/gui/component/addressbook-migrate.c:417
#: calendar/gui/migration.c:434 calendar/gui/migration.c:511
#: filter/filter-label.c:123 mail/em-migrate.c:925 mail/mail-config.c:65
@@ -311,9 +313,8 @@ msgid "UID of the contacts source that the view will display"
msgstr "表示する連絡先ソースの UID が表示されます"
#: addressbook/gui/component/addressbook.c:1121
-#, fuzzy
msgid "The URI that the address book will display"
-msgstr "カレンダが表示する URI"
+msgstr "アドレス帳が表示する URI"
#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
msgid "EFolderList xml for the list of completion uris"
@@ -390,19 +391,16 @@ msgid "636"
msgstr "636"
#: addressbook/gui/component/ldap-config.glade.h:11
-#, fuzzy
msgid "Address Book Creation Assistant"
msgstr "アドレス帳の作成アシスタント"
#: addressbook/gui/component/ldap-config.glade.h:12
-#, fuzzy
msgid "Address Book Properties"
msgstr "アドレス帳のプロパティ"
#: addressbook/gui/component/ldap-config.glade.h:13
-#, fuzzy
msgid "Address Book Sources"
-msgstr "アドレス帳のソース..."
+msgstr "アドレス帳のソース"
#: addressbook/gui/component/ldap-config.glade.h:14 mail/mail-account-gui.c:65
#: mail/mail-config.glade.h:16
@@ -414,16 +412,16 @@ msgid "Anonymously"
msgstr "匿名"
#: addressbook/gui/component/ldap-config.glade.h:16
-#, fuzzy
msgid ""
"Congratulations, you are\n"
"\t finished setting up this address book.\n"
"\n"
"Please click the \"Apply\" button to save the settings you have entered here."
msgstr ""
-"おめでとうございます。このアドレス帳の設定が完了しました。\n"
+"おめでとうございます。\n"
+"\t このアドレス帳の設定が完了しました。\n"
"\n"
-"\"適用\" ボタンをクリックして、ここで入力した設定を保存して下さい。"
+"[適用] ボタンをクリックして、ここで入力した設定を保存して下さい。"
#: addressbook/gui/component/ldap-config.glade.h:20
msgid "Connecting"
@@ -552,13 +550,14 @@ msgstr ""
"連絡先の生成や編集の初期値を変更できます。"
#: addressbook/gui/component/ldap-config.glade.h:48
-#, fuzzy
msgid ""
"Specifying a\n"
"\t\t\t display name and group is the first step in setting\n"
"\t\t\t up an address book."
msgstr ""
-"アドレス帳の設定の最初のステップとして、表示名とグループを指定して下さい。"
+"アドレス帳を設定する\n"
+"\t\t\t 最初のステップとして、\n"
+"\t\t\t 表示名とグループを指定して下さい。"
#: addressbook/gui/component/ldap-config.glade.h:51
#: calendar/gui/dialogs/calendar-setup.glade.h:20
@@ -624,7 +623,6 @@ msgstr ""
"検索範囲 \"レベル1\" には検索ベースの第一レベルのエントリのみ含まれます。\n"
#: addressbook/gui/component/ldap-config.glade.h:66
-#, fuzzy
msgid ""
"This assistant will help you\n"
"\t create a new address book. \n"
@@ -633,9 +631,10 @@ msgid ""
"parameters may be required. Please contact your system\n"
"administrator if you need help finding this information."
msgstr ""
-"このアシスタントでは、新しいアドレス帳の作成をお手伝いします。\n"
+"このアシスタントでは、\n"
+"\t 新しいアドレス帳の作成をお手伝いします。\n"
"\n"
-"作成するアドレス帳の種類に応じて、\n"
+"作成するアドレス帳の種類に応じて\n"
"追加すべき情報が必要になるかもしれません。\n"
"それらの情報が不明な場合は、システム管理者に連絡して下さい。"
@@ -647,14 +646,13 @@ msgstr ""
"これはお使いの LDAP サーバのフルパス名です。(例: \"ldap.mycompany.com\")"
#: addressbook/gui/component/ldap-config.glade.h:73
-#, fuzzy
msgid ""
"This is the maximum number of entries to download. Setting this number to "
"be \n"
"too large will slow down your address book."
msgstr ""
"これはダウンロードするエントリの最大数です。\n"
-"この数を大きくすると、アドレス帳を開くのが遅くなります。"
+"この数を大きくすると、アドレス帳を開く速度が遅くなります。"
#: addressbook/gui/component/ldap-config.glade.h:75
msgid ""
@@ -736,7 +734,7 @@ msgstr "ダウンロード制限(_D):"
#: addressbook/gui/component/ldap-config.glade.h:91
#: addressbook/gui/contact-editor/contact-editor.glade.h:34
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:17
#: mail/mail-config.glade.h:148 ui/evolution-addressbook.xml.h:34
#: ui/evolution-calendar.xml.h:36 ui/evolution-composer-entries.xml.h:8
#: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
@@ -893,7 +891,7 @@ msgstr "コラボレーション"
#. Construct the app
#: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:2061
+#: addressbook/gui/contact-editor/e-contact-editor.c:2065
msgid "Contact Editor"
msgstr "連絡先エディタ"
@@ -986,12 +984,12 @@ msgstr "カテゴリ(_C)..."
#. FIXME: need to disable for undeletable folders
#: addressbook/gui/contact-editor/contact-editor.glade.h:33
-#: calendar/gui/dialogs/meeting-page.c:651 calendar/gui/e-cal-view.c:1300
-#: calendar/gui/e-cal-view.c:1331 calendar/gui/e-calendar-table.c:1057
-#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2237
-#: mail/em-folder-view.c:775 ui/evolution-addressbook.xml.h:33
+#: calendar/gui/dialogs/meeting-page.c:651 calendar/gui/e-calendar-view.c:1332
+#: calendar/gui/e-calendar-view.c:1363 calendar/gui/e-calendar-table.c:1057
+#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2504
+#: mail/em-folder-view.c:765 ui/evolution-addressbook.xml.h:33
#: ui/evolution-calendar.xml.h:35 ui/evolution-comp-editor.xml.h:17
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:112
#: ui/evolution-tasks.xml.h:19
msgid "_Delete"
msgstr "削除(_D)"
@@ -1037,22 +1035,22 @@ msgid "_Web page address:"
msgstr "ウェブ・ページの URL(_W):"
#: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:251
-#: addressbook/gui/widgets/eab-contact-display.c:267
+#: addressbook/gui/widgets/eab-contact-display.c:316
+#: addressbook/gui/widgets/eab-contact-display.c:337
msgid "Address"
msgstr "住所"
#: addressbook/gui/contact-editor/e-contact-editor-address.c:103
#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
#: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-editor/e-contact-editor.c:244
+#: addressbook/gui/contact-editor/e-contact-editor.c:250
#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:168
#: addressbook/gui/widgets/e-addressbook-model.c:312
#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
#: addressbook/gui/widgets/e-minicard-label.c:164
#: addressbook/gui/widgets/e-minicard-view-widget.c:119
#: addressbook/gui/widgets/e-minicard-view.c:474
-#: addressbook/gui/widgets/e-minicard.c:182
+#: addressbook/gui/widgets/e-minicard.c:173
msgid "Editable"
msgstr "編集可"
@@ -2029,14 +2027,13 @@ msgid "AOL Instant Messenger"
msgstr "AOL インスタント・メッセンジャ"
#: addressbook/gui/contact-editor/e-contact-editor-im.c:63
-#, fuzzy
msgid "Novell Groupwise"
-msgstr "Novell GroupWise"
+msgstr "Novell Groupwise"
#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/contact-editor/e-contact-editor.c:2908
-#: addressbook/gui/widgets/eab-contact-display.c:245
-#: addressbook/gui/widgets/eab-contact-display.c:260
+#: addressbook/gui/contact-editor/e-contact-editor.c:2917
+#: addressbook/gui/widgets/eab-contact-display.c:310
+#: addressbook/gui/widgets/eab-contact-display.c:329
msgid "Jabber"
msgstr "Jabber"
@@ -2049,19 +2046,19 @@ msgid "MSN Messenger"
msgstr "MSN メッセンジャ"
#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:2911
-#: addressbook/gui/widgets/eab-contact-display.c:244
-#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/contact-editor/e-contact-editor.c:2920
+#: addressbook/gui/widgets/eab-contact-display.c:309
+#: addressbook/gui/widgets/eab-contact-display.c:328
msgid "ICQ"
msgstr "ICQ"
#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-#: addressbook/gui/contact-editor/e-contact-editor.c:735
+#: addressbook/gui/contact-editor/e-contact-editor.c:741
msgid "Service"
msgstr "サービス"
#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
-#: addressbook/gui/contact-editor/e-contact-editor.c:758
+#: addressbook/gui/contact-editor/e-contact-editor.c:764
#: calendar/gui/dialogs/cal-prefs-dialog.c:426
msgid "Location"
msgstr "場所"
@@ -2071,69 +2068,69 @@ msgid "Username"
msgstr "ユーザ名"
#: addressbook/gui/contact-editor/e-contact-editor-im.c:246
-#: addressbook/gui/contact-editor/e-contact-editor.c:2575
-#: addressbook/gui/contact-editor/e-contact-editor.c:2872
+#: addressbook/gui/contact-editor/e-contact-editor.c:2585
+#: addressbook/gui/contact-editor/e-contact-editor.c:2881
msgid "Home"
msgstr "自宅"
#. red
#: addressbook/gui/contact-editor/e-contact-editor-im.c:250
-#: addressbook/gui/contact-editor/e-contact-editor.c:2876
+#: addressbook/gui/contact-editor/e-contact-editor.c:2885
#: filter/filter-label.c:122 mail/em-migrate.c:924 mail/mail-config.c:64
#: mail/mail-config.glade.h:135
msgid "Work"
msgstr "仕事"
#: addressbook/gui/contact-editor/e-contact-editor-im.c:254
-#: addressbook/gui/contact-editor/e-contact-editor.c:2576
-#: addressbook/gui/contact-editor/e-contact-editor.c:2880
+#: addressbook/gui/contact-editor/e-contact-editor.c:2586
+#: addressbook/gui/contact-editor/e-contact-editor.c:2889
msgid "Other"
msgstr "その他"
-#: addressbook/gui/contact-editor/e-contact-editor.c:209
+#: addressbook/gui/contact-editor/e-contact-editor.c:215
msgid "Source Book"
msgstr "元のアドレス帳"
-#: addressbook/gui/contact-editor/e-contact-editor.c:216
+#: addressbook/gui/contact-editor/e-contact-editor.c:222
msgid "Target Book"
msgstr "対象のアドレス帳"
-#: addressbook/gui/contact-editor/e-contact-editor.c:223
+#: addressbook/gui/contact-editor/e-contact-editor.c:229
#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:154
#: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
-#: addressbook/gui/widgets/e-minicard.c:189
+#: addressbook/gui/widgets/e-minicard.c:180
msgid "Contact"
msgstr "連絡先"
-#: addressbook/gui/contact-editor/e-contact-editor.c:230
+#: addressbook/gui/contact-editor/e-contact-editor.c:236
msgid "Is New Contact"
msgstr "新しい連絡先です"
-#: addressbook/gui/contact-editor/e-contact-editor.c:237
+#: addressbook/gui/contact-editor/e-contact-editor.c:243
msgid "Writable Fields"
msgstr "書き込み可能な項目"
-#: addressbook/gui/contact-editor/e-contact-editor.c:251
+#: addressbook/gui/contact-editor/e-contact-editor.c:257
msgid "Changed"
msgstr "変更済"
-#: addressbook/gui/contact-editor/e-contact-editor.c:749
+#: addressbook/gui/contact-editor/e-contact-editor.c:755
msgid "Account Name"
msgstr "アカウント名"
-#: addressbook/gui/contact-editor/e-contact-editor.c:1494
+#: addressbook/gui/contact-editor/e-contact-editor.c:1500
msgid "Category editor not available."
msgstr "カテゴリ・エディタが起動していません。"
-#: addressbook/gui/contact-editor/e-contact-editor.c:1502
+#: addressbook/gui/contact-editor/e-contact-editor.c:1508
msgid "This contact belongs to these categories:"
msgstr "この連絡先が属しているカテゴリ:"
-#: addressbook/gui/contact-editor/e-contact-editor.c:1725
+#: addressbook/gui/contact-editor/e-contact-editor.c:1731
msgid "Save Contact as VCard"
msgstr "vCard 形式で連絡先の保存"
-#: addressbook/gui/contact-editor/e-contact-editor.c:1765
+#: addressbook/gui/contact-editor/e-contact-editor.c:1771
msgid ""
"Are you sure you want\n"
"to delete these contacts?"
@@ -2141,7 +2138,7 @@ msgstr ""
"この連絡先を\n"
"本当に削除してもよろしいですか?"
-#: addressbook/gui/contact-editor/e-contact-editor.c:1768
+#: addressbook/gui/contact-editor/e-contact-editor.c:1774
msgid ""
"Are you sure you want\n"
"to delete this contact?"
@@ -2149,34 +2146,33 @@ msgstr ""
"この連絡先を\n"
"本当に削除してもよろしいですか?"
-#: addressbook/gui/contact-editor/e-contact-editor.c:2574
+#: addressbook/gui/contact-editor/e-contact-editor.c:2584
msgid "Business"
msgstr "仕事"
-#: addressbook/gui/contact-editor/e-contact-editor.c:2907
-#: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:257
+#: addressbook/gui/contact-editor/e-contact-editor.c:2916
+#: addressbook/gui/widgets/eab-contact-display.c:307
+#: addressbook/gui/widgets/eab-contact-display.c:326
msgid "AIM"
msgstr "AIM"
-#: addressbook/gui/contact-editor/e-contact-editor.c:2909
-#: addressbook/gui/widgets/eab-contact-display.c:247
-#: addressbook/gui/widgets/eab-contact-display.c:262
+#: addressbook/gui/contact-editor/e-contact-editor.c:2918
+#: addressbook/gui/widgets/eab-contact-display.c:312
+#: addressbook/gui/widgets/eab-contact-display.c:331
msgid "Yahoo"
msgstr "Yahoo"
-#: addressbook/gui/contact-editor/e-contact-editor.c:2910
-#: addressbook/gui/widgets/eab-contact-display.c:246
-#: addressbook/gui/widgets/eab-contact-display.c:261
+#: addressbook/gui/contact-editor/e-contact-editor.c:2919
+#: addressbook/gui/widgets/eab-contact-display.c:311
+#: addressbook/gui/widgets/eab-contact-display.c:330
msgid "MSN"
msgstr "MSN"
-#: addressbook/gui/contact-editor/e-contact-editor.c:2912
-#, fuzzy
+#: addressbook/gui/contact-editor/e-contact-editor.c:2921
msgid "GroupWise"
-msgstr "Novell GroupWise"
+msgstr "GroupWise"
-#: addressbook/gui/contact-editor/e-contact-editor.c:3199
+#: addressbook/gui/contact-editor/e-contact-editor.c:3208
#, c-format
msgid "Could not find widget for a field: `%s'"
msgstr "フィールドのウィジットが見つかりませんでした: '%s'"
@@ -2299,21 +2295,20 @@ msgid "_Title:"
msgstr "敬称(前つけ)(_T):"
#: addressbook/gui/contact-editor/im.glade.h:2
-msgid "Account name:"
-msgstr "アカウント名:"
-
-#: addressbook/gui/contact-editor/im.glade.h:3
msgid "Add IM Account"
msgstr "IM アカウントの追加"
+#: addressbook/gui/contact-editor/im.glade.h:3
+msgid "_Account name:"
+msgstr "アカウント名(_A):"
+
#: addressbook/gui/contact-editor/im.glade.h:4
-msgid "IM Service:"
-msgstr "IM サービス:"
+msgid "_IM Service:"
+msgstr "IM サービス(_I):"
#: addressbook/gui/contact-editor/im.glade.h:5
-#: calendar/gui/e-itip-control.c:947
-msgid "Location:"
-msgstr "場所:"
+msgid "_Location:"
+msgstr "場所(_L):"
#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
msgid "Members"
@@ -2460,103 +2455,101 @@ msgstr "拡張..."
#: addressbook/gui/widgets/e-addressbook-view.c:230
#: calendar/gui/dialogs/meeting-page.etspec.h:11
#: calendar/gui/e-calendar-table.etspec.h:17
-#: calendar/gui/e-meeting-list-view.c:249
+#: calendar/gui/e-meeting-list-view.c:340
#: calendar/gui/e-meeting-time-sel.etspec.h:11
msgid "Type"
msgstr "種類"
-#: addressbook/gui/widgets/e-addressbook-view.c:494
+#: addressbook/gui/widgets/e-addressbook-view.c:497
#: camel/providers/groupwise/camel-groupwise-provider.c:66
msgid "Address Book"
msgstr "アドレス帳"
-#: addressbook/gui/widgets/e-addressbook-view.c:838
-#: addressbook/gui/widgets/e-addressbook-view.c:1058
-#: addressbook/gui/widgets/e-addressbook-view.c:2016
+#: addressbook/gui/widgets/e-addressbook-view.c:841
+#: addressbook/gui/widgets/e-addressbook-view.c:1061
+#: addressbook/gui/widgets/e-addressbook-view.c:2019
#: ui/evolution-addressbook.xml.h:19
msgid "Save as VCard"
msgstr "vCard 形式で保存"
-#: addressbook/gui/widgets/e-addressbook-view.c:1045
+#: addressbook/gui/widgets/e-addressbook-view.c:1048
msgid "New Contact..."
msgstr "新しい連絡先..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1046
+#: addressbook/gui/widgets/e-addressbook-view.c:1049
msgid "New Contact List..."
msgstr "新しい連絡先一覧..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1049
+#: addressbook/gui/widgets/e-addressbook-view.c:1052
msgid "Go to Folder..."
msgstr "フォルダへ移動..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1050
+#: addressbook/gui/widgets/e-addressbook-view.c:1053
msgid "Import..."
msgstr "インポート..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1052
+#: addressbook/gui/widgets/e-addressbook-view.c:1055
msgid "Search for Contacts..."
msgstr "連絡先の検索..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1053
+#: addressbook/gui/widgets/e-addressbook-view.c:1056
msgid "Address Book Sources..."
msgstr "アドレス帳のソース..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1055
+#: addressbook/gui/widgets/e-addressbook-view.c:1058
msgid "Pilot Settings..."
msgstr "パイロットの設定..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1059
+#: addressbook/gui/widgets/e-addressbook-view.c:1062
#: ui/evolution-addressbook.xml.h:10
msgid "Forward Contact"
msgstr "この連絡先の転送"
-#: addressbook/gui/widgets/e-addressbook-view.c:1060
+#: addressbook/gui/widgets/e-addressbook-view.c:1063
msgid "Send Message to Contact"
msgstr "この連絡先へメッセージの送信"
-#: addressbook/gui/widgets/e-addressbook-view.c:1061 calendar/gui/print.c:2481
+#: addressbook/gui/widgets/e-addressbook-view.c:1064 calendar/gui/print.c:2480
#: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:78
+#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:80
msgid "Print"
msgstr "印刷"
-#: addressbook/gui/widgets/e-addressbook-view.c:1063
+#: addressbook/gui/widgets/e-addressbook-view.c:1066
msgid "Print Envelope"
msgstr "宛名の印刷"
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
+#: addressbook/gui/widgets/e-addressbook-view.c:1070
msgid "Copy to Address Book..."
msgstr "アドレス帳へコピー..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1068
+#: addressbook/gui/widgets/e-addressbook-view.c:1071
msgid "Move to Address Book..."
msgstr "アドレス帳へ移動..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1071
+#: addressbook/gui/widgets/e-addressbook-view.c:1074
#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
msgid "Cut"
msgstr "切り取り"
-#. create the dialog
-#: addressbook/gui/widgets/e-addressbook-view.c:1072
-#: calendar/gui/calendar-component.c:372
-#: calendar/gui/dialogs/copy-source-dialog.c:159
-#: calendar/gui/tasks-component.c:363 ui/evolution-addressbook.xml.h:2
-#: ui/evolution-mail-message.xml.h:9 ui/evolution-tasks.xml.h:2
+#: addressbook/gui/widgets/e-addressbook-view.c:1075
+#: calendar/gui/calendar-component.c:372 calendar/gui/tasks-component.c:363
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
+#: ui/evolution-tasks.xml.h:2
msgid "Copy"
msgstr "コピー"
-#: addressbook/gui/widgets/e-addressbook-view.c:1073
+#: addressbook/gui/widgets/e-addressbook-view.c:1076
#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:10
msgid "Paste"
msgstr "貼り付け"
-#: addressbook/gui/widgets/e-addressbook-view.c:1078
-#: calendar/gui/e-cal-view.c:1269
+#: addressbook/gui/widgets/e-addressbook-view.c:1081
+#: calendar/gui/e-calendar-view.c:1299
msgid "Current View"
msgstr "現在の表示"
-#: addressbook/gui/widgets/e-addressbook-view.c:1267
+#: addressbook/gui/widgets/e-addressbook-view.c:1270
#, c-format
msgid ""
"The addressbook backend for\n"
@@ -2568,7 +2561,7 @@ msgstr ""
"再度利用する場合は Evolution を再起動して下さい。"
#. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1607
+#: addressbook/gui/widgets/e-addressbook-view.c:1610
#: calendar/gui/cal-search-bar.c:359
msgid "Any Category"
msgstr "任意のカテゴリ"
@@ -2612,7 +2605,7 @@ msgid "Company Phone"
msgstr "会社の電話"
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:447 smime/lib/e-cert.c:774
+#: addressbook/gui/widgets/eab-contact-display.c:522 smime/lib/e-cert.c:774
msgid "Email"
msgstr "メール"
@@ -2663,6 +2656,7 @@ msgid "Manager"
msgstr "マネージャ"
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: addressbook/gui/widgets/eab-contact-display.c:336
msgid "Mobile Phone"
msgstr "携帯電話"
@@ -2671,7 +2665,7 @@ msgid "Nickname"
msgstr "あだ名"
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:273
+#: addressbook/gui/widgets/eab-contact-display.c:347
msgid "Note"
msgstr "ノート"
@@ -2680,7 +2674,7 @@ msgid "Office"
msgstr "事務所"
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:240
+#: addressbook/gui/widgets/eab-contact-display.c:305
msgid "Organization"
msgstr "組織"
@@ -2706,7 +2700,7 @@ msgstr "ラジオ"
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:256
+#: calendar/gui/e-meeting-list-view.c:347
#: calendar/gui/e-meeting-time-sel.etspec.h:9
msgid "Role"
msgstr "役割"
@@ -2736,17 +2730,17 @@ msgid "Web Site"
msgstr "ウェブ・サイト"
#: addressbook/gui/widgets/e-minicard-label.c:115
-#: addressbook/gui/widgets/e-minicard.c:145
+#: addressbook/gui/widgets/e-minicard.c:136
msgid "Width"
msgstr "幅"
#: addressbook/gui/widgets/e-minicard-label.c:122
-#: addressbook/gui/widgets/e-minicard.c:152
+#: addressbook/gui/widgets/e-minicard.c:143
msgid "Height"
msgstr "高さ"
#: addressbook/gui/widgets/e-minicard-label.c:129
-#: addressbook/gui/widgets/e-minicard.c:160
+#: addressbook/gui/widgets/e-minicard.c:151
msgid "Has Focus"
msgstr "フォーカスあり"
@@ -2798,75 +2792,77 @@ msgstr ""
msgid "Adapter"
msgstr "アダプタ"
-#: addressbook/gui/widgets/e-minicard.c:168
+#: addressbook/gui/widgets/e-minicard.c:159
msgid "Selected"
msgstr "選択済"
-#: addressbook/gui/widgets/e-minicard.c:175
+#: addressbook/gui/widgets/e-minicard.c:166
msgid "Has Cursor"
msgstr "カーソルあり"
-#: addressbook/gui/widgets/eab-contact-display.c:117
+#: addressbook/gui/widgets/eab-contact-display.c:118
+#: addressbook/gui/widgets/eab-contact-display.c:180
msgid "(map)"
msgstr "(マップ)"
-#: addressbook/gui/widgets/eab-contact-display.c:127
+#: addressbook/gui/widgets/eab-contact-display.c:128
+#: addressbook/gui/widgets/eab-contact-display.c:190
msgid "map"
msgstr "マップ"
-#: addressbook/gui/widgets/eab-contact-display.c:177
-#: addressbook/gui/widgets/eab-contact-display.c:423
+#: addressbook/gui/widgets/eab-contact-display.c:242
+#: addressbook/gui/widgets/eab-contact-display.c:498
msgid "List Members"
msgstr "メンバーのリスト化"
-#: addressbook/gui/widgets/eab-contact-display.c:233
+#: addressbook/gui/widgets/eab-contact-display.c:298
msgid "E-mail"
msgstr "E-メール"
-#: addressbook/gui/widgets/eab-contact-display.c:238
-msgid "work"
-msgstr "仕事"
-
-#: addressbook/gui/widgets/eab-contact-display.c:241
+#: addressbook/gui/widgets/eab-contact-display.c:306
msgid "Position"
msgstr "役職"
-#: addressbook/gui/widgets/eab-contact-display.c:243
-#: addressbook/gui/widgets/eab-contact-display.c:258
-#, fuzzy
+#: addressbook/gui/widgets/eab-contact-display.c:308
+#: addressbook/gui/widgets/eab-contact-display.c:327
msgid "Groupwise"
-msgstr "グループ"
+msgstr "Groupwise"
-#: addressbook/gui/widgets/eab-contact-display.c:248
+#: addressbook/gui/widgets/eab-contact-display.c:313
msgid "Video Conferencing"
msgstr "ビデオ会議"
-#: addressbook/gui/widgets/eab-contact-display.c:249
+#: addressbook/gui/widgets/eab-contact-display.c:314
+#: addressbook/gui/widgets/eab-contact-display.c:335
msgid "Phone"
msgstr "電話"
-#: addressbook/gui/widgets/eab-contact-display.c:250
+#: addressbook/gui/widgets/eab-contact-display.c:315
msgid "Fax"
msgstr "FAX"
-#: addressbook/gui/widgets/eab-contact-display.c:255
-msgid "personal"
-msgstr "プライベート"
+#: addressbook/gui/widgets/eab-contact-display.c:319
+msgid "work"
+msgstr "仕事"
-#: addressbook/gui/widgets/eab-contact-display.c:264
+#: addressbook/gui/widgets/eab-contact-display.c:332
msgid "WWW"
msgstr "ウェブ"
-#: addressbook/gui/widgets/eab-contact-display.c:265
-#: addressbook/gui/widgets/eab-contact-display.c:482
+#: addressbook/gui/widgets/eab-contact-display.c:333
+#: addressbook/gui/widgets/eab-contact-display.c:557
msgid "Blog"
msgstr "Blog"
-#: addressbook/gui/widgets/eab-contact-display.c:443
+#: addressbook/gui/widgets/eab-contact-display.c:340
+msgid "personal"
+msgstr "プライベート"
+
+#: addressbook/gui/widgets/eab-contact-display.c:518
msgid "Job Title"
msgstr "職業"
-#: addressbook/gui/widgets/eab-contact-display.c:474
+#: addressbook/gui/widgets/eab-contact-display.c:549
msgid "Home page"
msgstr "ホームページ"
@@ -2906,7 +2902,7 @@ msgstr "プロトコルがサポートされていません"
#: calendar/gui/dialogs/task-details-page.glade.h:3
#: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:599
#: calendar/gui/e-calendar-table.c:467 calendar/gui/e-tasks.c:209
-#: calendar/gui/print.c:2350 camel/camel-service.c:728
+#: calendar/gui/print.c:2349 camel/camel-service.c:728
#: camel/camel-service.c:766 camel/camel-service.c:850
#: camel/camel-service.c:890 camel/providers/pop3/camel-pop3-store.c:451
#: camel/providers/pop3/camel-pop3-store.c:532
@@ -2926,7 +2922,6 @@ msgid "TLS not Available"
msgstr "TLS は無効です"
#: addressbook/gui/widgets/eab-gui-util.c:57
-#, fuzzy
msgid "Address Book does not exist"
msgstr "アドレス帳がありません"
@@ -3061,7 +3056,6 @@ msgid "Add address to existing contact \"%s\""
msgstr "既存の連絡先 \"%s\" へのアドレスの追加"
#: addressbook/gui/widgets/eab-popup-control.c:888
-#, fuzzy
msgid "Querying Address Book..."
msgstr "アドレス帳の問い合わせ中..."
@@ -3103,42 +3097,39 @@ msgstr "カード表示"
msgid "GTK Tree View"
msgstr "GTK+ ツリー表示"
-#: addressbook/gui/widgets/test-reflow.c:106
+#: addressbook/gui/widgets/test-reflow.c:119
msgid "Reflow Test"
msgstr "Reflow のテスト"
-#: addressbook/gui/widgets/test-reflow.c:107
+#: addressbook/gui/widgets/test-reflow.c:120
#: addressbook/printing/test-contact-print-style-editor.c:54
#: addressbook/printing/test-print.c:53
msgid "Copyright (C) 2000, Ximian, Inc."
msgstr "Copyright (C) 2000, Ximian, Inc."
-#: addressbook/gui/widgets/test-reflow.c:109
+#: addressbook/gui/widgets/test-reflow.c:122
msgid "This should test the reflow canvas item"
msgstr "キャンバスのアイテムを Reflow するどうかをテストします"
#: addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
-#, fuzzy
msgid "Evolution LDIF importer"
-msgstr "Evolution Elm インポータ"
+msgstr "Evolution LDIF インポータ"
#: addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
msgid "LDAP Data Interchange Format (.ldif)"
-msgstr ""
+msgstr "LDAP データ交換フォーマット (.ldif)"
#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
-#, fuzzy
msgid "Evolution VCard Importer"
-msgstr "Evolution iCalendar インポータ"
+msgstr "Evolution vCard インポータ"
#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
-#, fuzzy
msgid "Evolution VCard importer"
-msgstr "Evolution vCalendar インポータ"
+msgstr "Evolution vCard インポータ"
#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
msgid "VCard (.vcf, .gcrd)"
-msgstr ""
+msgstr "VCard (.vcf, .gcrd)"
#: addressbook/printing/e-contact-print-envelope.c:212
#: addressbook/printing/e-contact-print-envelope.c:233
@@ -3498,7 +3489,7 @@ msgid "Evolution's Tasks component"
msgstr "Evolution タスクのコンポーネント"
#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/e-tasks.c:1134 calendar/gui/print.c:1820
+#: calendar/gui/e-tasks.c:1138 calendar/gui/print.c:1819
#: calendar/gui/tasks-control.c:516 calendar/importers/icalendar-importer.c:79
#: calendar/importers/icalendar-importer.c:709
msgid "Tasks"
@@ -3544,26 +3535,24 @@ msgstr "アラーム停止時間 (分)"
msgid "_Edit appointment"
msgstr "予定の編集(_E)"
-#: calendar/gui/alarm-notify/alarm-queue.c:903
+#: calendar/gui/alarm-notify/alarm-queue.c:906
#: ui/evolution-message-composer.xml.h:10
msgid "Open"
msgstr "開く"
-#: calendar/gui/alarm-notify/alarm-queue.c:905
-#, fuzzy
+#: calendar/gui/alarm-notify/alarm-queue.c:908
msgid "Dismiss"
-msgstr "却下(_D)"
+msgstr "却下"
-#: calendar/gui/alarm-notify/alarm-queue.c:907
-#, fuzzy
+#: calendar/gui/alarm-notify/alarm-queue.c:910
msgid "Dismiss All"
-msgstr "全て却下(_A)"
+msgstr "全て却下"
-#: calendar/gui/alarm-notify/alarm-queue.c:972
+#: calendar/gui/alarm-notify/alarm-queue.c:975
msgid "No description available."
msgstr "無効な説明です。"
-#: calendar/gui/alarm-notify/alarm-queue.c:990
+#: calendar/gui/alarm-notify/alarm-queue.c:993
#, c-format
msgid ""
"Alarm on %s\n"
@@ -3576,12 +3565,12 @@ msgstr ""
"起動: %s\n"
"終了: %s"
-#: calendar/gui/alarm-notify/alarm-queue.c:1082
-#: calendar/gui/alarm-notify/alarm-queue.c:1106
+#: calendar/gui/alarm-notify/alarm-queue.c:1085
+#: calendar/gui/alarm-notify/alarm-queue.c:1109
msgid "Warning"
msgstr "警告"
-#: calendar/gui/alarm-notify/alarm-queue.c:1086
+#: calendar/gui/alarm-notify/alarm-queue.c:1089
msgid ""
"Evolution does not support calendar reminders with\n"
"email notifications yet, but this reminder was\n"
@@ -3593,7 +3582,7 @@ msgstr ""
"の設定がされていました。その代わりに Evolution は\n"
"通常のリマインダ・ダイアログを表示します。"
-#: calendar/gui/alarm-notify/alarm-queue.c:1112
+#: calendar/gui/alarm-notify/alarm-queue.c:1115
#, c-format
msgid ""
"An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3610,7 +3599,7 @@ msgstr ""
"\n"
"本当に、このプログラムを起動してもよろしいですか?"
-#: calendar/gui/alarm-notify/alarm-queue.c:1126
+#: calendar/gui/alarm-notify/alarm-queue.c:1129
msgid "Do not ask me about this program again."
msgstr "このメッセージを二度と表示しない"
@@ -3771,15 +3760,14 @@ msgid "Comment contains"
msgstr "コメントが次のものを含む"
#: calendar/gui/cal-search-bar.c:53
-#, fuzzy
msgid "Location contains"
-msgstr "説明が次のものを含む"
+msgstr "場所が次のものを含む"
-#: calendar/gui/cal-search-bar.c:363 mail/mail-ops.c:1100
+#: calendar/gui/cal-search-bar.c:363 mail/mail-ops.c:1059
msgid "Unmatched"
msgstr "一致しない"
-#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1599
+#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1585
#: camel/providers/groupwise/camel-gw-listener.c:298
#: camel/providers/groupwise/camel-gw-listener.c:322
msgid "Calendar"
@@ -3799,7 +3787,7 @@ msgid "Purge events older than"
msgstr "次より古いイベントを抹消する"
#: calendar/gui/calendar-commands.c:362
-#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:17
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:20
msgid "days"
msgstr "日"
@@ -3809,8 +3797,12 @@ msgstr "%Y年 %B %e日 %A"
#. strftime format %a = abbreviated weekday name, %d = day of month,
#. %b = abbreviated month name. Don't use any other specifiers.
+#. strftime format %a = abbreviated weekday name,
+#. %d = day of month, %b = abbreviated month name.
+#. You can change the order but don't change the
+#. specifiers or add anything.
#: calendar/gui/calendar-commands.c:434 calendar/gui/e-day-view-top-item.c:692
-#: calendar/gui/e-day-view.c:1367 calendar/gui/e-week-view-main-item.c:329
+#: calendar/gui/e-day-view.c:1589 calendar/gui/e-week-view-main-item.c:329
msgid "%a %d %b"
msgstr "%m/%d (%a)"
@@ -4019,11 +4011,11 @@ msgstr "dialog1"
msgid "extra times every"
msgstr "回 / "
-#: calendar/gui/dialogs/alarm-options.glade.h:13 filter/filter.glade.h:18
+#: calendar/gui/dialogs/alarm-options.glade.h:13 filter/filter.glade.h:21
msgid "hours"
msgstr "時間"
-#: calendar/gui/dialogs/alarm-options.glade.h:14 filter/filter.glade.h:19
+#: calendar/gui/dialogs/alarm-options.glade.h:14 filter/filter.glade.h:22
msgid "minutes"
msgstr "分"
@@ -4062,8 +4054,8 @@ msgstr "リマインダ"
msgid "Run a program"
msgstr "プログラムを実行する"
-#: calendar/gui/dialogs/alarm-page.glade.h:8
-msgid "Send an Email"
+#: calendar/gui/dialogs/alarm-page.glade.h:8 calendar/gui/e-alarm-list.c:467
+msgid "Send an email"
msgstr "E-メールを送信する"
#: calendar/gui/dialogs/alarm-page.glade.h:9
@@ -4109,7 +4101,7 @@ msgstr "予定を開始した時"
#. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
#. has "activatable" set.
-#: calendar/gui/dialogs/cal-prefs-dialog.c:415 mail/em-account-prefs.c:487
+#: calendar/gui/dialogs/cal-prefs-dialog.c:415 mail/em-account-prefs.c:493
#: mail/em-composer-prefs.c:712 mail/em-composer-prefs.c:876
msgid "Enabled"
msgstr "有効"
@@ -4125,7 +4117,7 @@ msgstr "削除しない"
#: calendar/gui/dialogs/cal-prefs-dialog.c:710
#: calendar/gui/dialogs/cal-prefs-dialog.c:742
#: calendar/gui/dialogs/cal-prefs-dialog.c:773 mail/em-account-prefs.c:315
-#: mail/em-account-prefs.c:356 mail/em-account-prefs.c:397
+#: mail/em-account-prefs.c:356 mail/em-account-prefs.c:399
#: mail/em-composer-prefs.c:679 mail/em-composer-prefs.c:697
#: mail/em-composer-prefs.c:721
msgid "Disable"
@@ -4134,7 +4126,7 @@ msgstr "無効"
#: calendar/gui/dialogs/cal-prefs-dialog.c:710
#: calendar/gui/dialogs/cal-prefs-dialog.c:742
#: calendar/gui/dialogs/cal-prefs-dialog.c:775 mail/em-account-prefs.c:315
-#: mail/em-account-prefs.c:356 mail/em-account-prefs.c:399
+#: mail/em-account-prefs.c:356 mail/em-account-prefs.c:401
#: mail/em-composer-prefs.c:679 mail/em-composer-prefs.c:697
#: mail/em-composer-prefs.c:721
msgid "Enable"
@@ -4407,7 +4399,7 @@ msgid ""
msgstr ""
"おめでとうございます。このカレンダの設定が完了しました。\n"
"\n"
-"\"適用\" ボタンをクリックして、ここで入力した設定を保存して下さい。"
+"[適用] ボタンをクリックして、ここで入力した設定を保存して下さい。"
#: calendar/gui/dialogs/calendar-setup.glade.h:7
msgid ""
@@ -4417,7 +4409,7 @@ msgid ""
msgstr ""
"おめでとうございます。このタスク一覧の設定が完了しました。\n"
"\n"
-"\"適用\" ボタンをクリックして、ここで入力した設定を保存して下さい。"
+"[適用] ボタンをクリックして、ここで入力した設定を保存して下さい。"
#: calendar/gui/dialogs/calendar-setup.glade.h:14
#: calendar/gui/tasks-component.c:361
@@ -4574,28 +4566,28 @@ msgstr "%s 変更しました。この変更を無視してエディタを更
msgid "%s You have made no changes, update the editor?"
msgstr "%s 何も変更していませんが、エディタを更新しますか?"
-#: calendar/gui/dialogs/comp-editor-page.c:441
+#: calendar/gui/dialogs/comp-editor-page.c:440
#, c-format
msgid "Validation error: %s"
msgstr "整合性のエラー: %s"
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2259
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
msgid " to "
msgstr " から "
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2263
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
msgid " (Completed "
msgstr "(完了 "
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2265
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
msgid "Completed "
msgstr "完了しました"
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2270
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
msgid " (Due "
msgstr " (期日 "
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2272
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
msgid "Due "
msgstr "期日 "
@@ -4631,7 +4623,7 @@ msgstr "ジャーナル・エントリ - %s"
msgid "No summary"
msgstr "サマリ無し"
-#: calendar/gui/dialogs/comp-editor.c:1360 calendar/gui/e-cal-view.c:1083
+#: calendar/gui/dialogs/comp-editor.c:1360 calendar/gui/e-calendar-view.c:1057
#: calendar/gui/e-calendar-table.c:1190 composer/e-msg-composer.c:1146
msgid "Save as..."
msgstr "別名で保存..."
@@ -4646,33 +4638,18 @@ msgstr "更新が届いたらこのアイテムに対する変更を破棄する
msgid "Unable to use current version!"
msgstr "現在のバージョンを使用できません!"
-#: calendar/gui/dialogs/copy-source-dialog.c:83
+#: calendar/gui/dialogs/copy-source-dialog.c:58
msgid "Could not open source"
msgstr "送信元ソースを開けませんでした"
-#: calendar/gui/dialogs/copy-source-dialog.c:91
+#: calendar/gui/dialogs/copy-source-dialog.c:66
msgid "Could not open destination"
msgstr "転送先ソースを開けませんでした"
-#: calendar/gui/dialogs/copy-source-dialog.c:100
+#: calendar/gui/dialogs/copy-source-dialog.c:75
msgid "Destination is read only"
msgstr "転送先は読み込み専用"
-#: calendar/gui/dialogs/copy-source-dialog.c:165
-#, fuzzy, c-format
-msgid "Select destination %s"
-msgstr "転送先ソースの選択"
-
-#: calendar/gui/dialogs/copy-source-dialog.c:167
-#, fuzzy
-msgid "calendar"
-msgstr "カレンダ"
-
-#: calendar/gui/dialogs/copy-source-dialog.c:167
-#, fuzzy
-msgid "task list"
-msgstr "新しいタスク一覧"
-
#: calendar/gui/dialogs/delete-comp.c:95
#, c-format
msgid "Are you sure you want to delete the appointment `%s'?"
@@ -4775,7 +4752,7 @@ msgstr "委任先:"
msgid "Enter Delegate"
msgstr "委任先の入力"
-#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2296
+#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2295
msgid "Appointment"
msgstr "予定"
@@ -4800,13 +4777,12 @@ msgid "Meeting"
msgstr "会議"
#: calendar/gui/dialogs/event-page.c:458
-#, fuzzy
msgid "Event with no start date"
-msgstr "期日が開始日の前にあります!"
+msgstr "開始日のないイベント"
#: calendar/gui/dialogs/event-page.c:461
msgid "Event with no end date"
-msgstr ""
+msgstr "終了日のないイベント"
#: calendar/gui/dialogs/event-page.c:615 calendar/gui/dialogs/task-page.c:512
msgid "Start date is wrong"
@@ -4898,15 +4874,20 @@ msgid "_Start time:"
msgstr "開始時刻(_S):"
#. an empty string is the same as 'None'
+#. add a "None" option to the stores menu
+#. Put the "None" and "UTC" entries at the top of the combo's list.
+#. When "None" is selected we want the field to be cleared.
+#. Note that we don't show this here, since by default a 'None' date
+#. is not permitted.
#: calendar/gui/dialogs/meeting-page.c:311
#: calendar/gui/dialogs/meeting-page.glade.h:3
#: calendar/gui/e-cal-model-tasks.c:591 composer/e-msg-composer.c:2084
-#: mail/em-account-prefs.c:448 mail/em-folder-view.c:784
-#: mail/mail-account-gui.c:1258 mail/mail-account-gui.c:1782
+#: mail/em-account-prefs.c:454 mail/em-folder-view.c:774
+#: mail/mail-account-gui.c:1310 mail/mail-account-gui.c:1838
#: mail/mail-config.glade.h:80
#: widgets/e-timezone-dialog/e-timezone-dialog.c:193
-#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
-#: widgets/misc/e-dateedit.c:1482 widgets/misc/e-dateedit.c:1597
+#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
+#: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
msgid "None"
msgstr "なし"
@@ -4927,7 +4908,7 @@ msgid "_Delegate To..."
msgstr "委任先(_D)..."
#: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-meeting-list-view.c:240
+#: calendar/gui/e-meeting-list-view.c:331
#: calendar/gui/e-meeting-time-sel.etspec.h:1
msgid "Attendee"
msgstr "出席者"
@@ -4963,14 +4944,14 @@ msgid "Member"
msgstr "メンバー"
#: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1065 calendar/gui/e-meeting-list-view.c:263
+#: calendar/gui/e-itip-control.c:1065 calendar/gui/e-meeting-list-view.c:354
#: calendar/gui/e-meeting-time-sel.etspec.h:8
msgid "RSVP"
msgstr "返信の有無"
#: calendar/gui/dialogs/meeting-page.etspec.h:10
#: calendar/gui/e-calendar-table.etspec.h:14
-#: calendar/gui/e-meeting-list-view.c:270
+#: calendar/gui/e-meeting-list-view.c:361
#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:62
#: mail/message-list.etspec.h:12
msgid "Status"
@@ -5219,7 +5200,7 @@ msgstr "% 完了(_C)"
#: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:597
#: calendar/gui/e-calendar-table.c:466 calendar/gui/e-meeting-store.c:187
#: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:206
-#: calendar/gui/print.c:2347
+#: calendar/gui/print.c:2346
msgid "Completed"
msgstr "完了"
@@ -5232,7 +5213,7 @@ msgstr "高い"
#: calendar/gui/dialogs/task-details-page.glade.h:6
#: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:595
#: calendar/gui/e-cal-model-tasks.c:657 calendar/gui/e-calendar-table.c:465
-#: calendar/gui/e-tasks.c:203 calendar/gui/print.c:2344
+#: calendar/gui/e-tasks.c:203 calendar/gui/print.c:2343
msgid "In Progress"
msgstr "進行中"
@@ -5243,7 +5224,7 @@ msgid "Low"
msgstr "低い"
#: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:392
+#: calendar/gui/e-cal-model.c:864 calendar/gui/e-calendar-table.c:392
#: calendar/gui/e-tasks.c:229 mail/message-list.c:938
msgid "Normal"
msgstr "普通"
@@ -5251,7 +5232,7 @@ msgstr "普通"
#: calendar/gui/dialogs/task-details-page.glade.h:9
#: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:593
#: calendar/gui/e-calendar-table.c:464 calendar/gui/e-tasks.c:213
-#: calendar/gui/print.c:2341
+#: calendar/gui/print.c:2340
msgid "Not Started"
msgstr "開始していない"
@@ -5265,7 +5246,7 @@ msgid "Undefined"
msgstr "未定義"
#: calendar/gui/dialogs/task-details-page.glade.h:12
-msgid "_Date Completed:"
+msgid "_Date completed:"
msgstr "完了日(_D):"
#: calendar/gui/dialogs/task-details-page.glade.h:13
@@ -5319,11 +5300,11 @@ msgid "Folder:"
msgstr "フォルダ:"
#: calendar/gui/dialogs/task-page.glade.h:10
-msgid "Sta_rt Date:"
+msgid "Sta_rt date:"
msgstr "開始日(_R):"
#: calendar/gui/dialogs/task-page.glade.h:12
-msgid "_Due Date:"
+msgid "_Due date:"
msgstr "期日(_D):"
#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
@@ -5419,10 +5400,6 @@ msgstr "%d 秒"
msgid "1 second"
msgstr "1 秒"
-#: calendar/gui/e-alarm-list.c:467
-msgid "Send an email"
-msgstr "E-メールを送信する"
-
#: calendar/gui/e-alarm-list.c:477
msgid "Unknown action to be performed"
msgstr "実行するアクションが不明です"
@@ -5467,17 +5444,17 @@ msgstr "%s (%s の時点で)"
msgid "%s for an unknown trigger type"
msgstr "トリガーの種類が不明な %s"
-#: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:283
-#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:369
+#: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:312
+#: calendar/gui/e-cal-model.c:319 calendar/gui/e-calendar-table.c:369
msgid "Public"
msgstr "公開"
-#: calendar/gui/e-cal-list-view.c:265 calendar/gui/e-cal-model.c:292
+#: calendar/gui/e-cal-list-view.c:265 calendar/gui/e-cal-model.c:321
#: calendar/gui/e-calendar-table.c:370
msgid "Private"
msgstr "非公開"
-#: calendar/gui/e-cal-list-view.c:266 calendar/gui/e-cal-model.c:294
+#: calendar/gui/e-cal-list-view.c:266 calendar/gui/e-cal-model.c:323
#: calendar/gui/e-calendar-table.c:371
msgid "Confidential"
msgstr "極秘"
@@ -5488,7 +5465,6 @@ msgid "Description"
msgstr "説明"
#: calendar/gui/e-cal-list-view.etspec.h:4
-#: calendar/gui/e-calendar-table.etspec.h:13
msgid "Start Date"
msgstr "開始日"
@@ -5540,138 +5516,146 @@ msgstr ""
"\n"
"45.436845,125.862501"
-#: calendar/gui/e-cal-model-tasks.c:966 calendar/gui/e-cal-model.c:841
-#: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-cal-model-tasks.c:966 calendar/gui/e-cal-model.c:870
+#: calendar/gui/e-meeting-list-view.c:259 calendar/gui/e-meeting-store.c:159
#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
msgid "Yes"
msgstr "はい"
-#: calendar/gui/e-cal-model-tasks.c:966 calendar/gui/e-cal-model.c:841
-#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:171
+#: calendar/gui/e-cal-model-tasks.c:966 calendar/gui/e-cal-model.c:870
+#: calendar/gui/e-meeting-list-view.c:260 calendar/gui/e-meeting-store.c:171
msgid "No"
msgstr "いいえ"
#. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:296 calendar/gui/e-cal-model.c:299
+#: calendar/gui/e-cal-model.c:325 calendar/gui/e-cal-model.c:328
#: calendar/gui/e-itip-control.c:978 calendar/gui/e-itip-control.c:1180
-#: calendar/gui/e-meeting-list-view.c:144
-#: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-store.c:115
+#: calendar/gui/e-meeting-list-view.c:235
+#: calendar/gui/e-meeting-list-view.c:249 calendar/gui/e-meeting-store.c:115
#: calendar/gui/e-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
#: camel/camel-gpg-context.c:1665 camel/camel-gpg-context.c:1716
#: camel/camel-tcp-stream-openssl.c:631
#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2112
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2130
#: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:60
msgid "Unknown"
msgstr "未知"
-#: calendar/gui/e-cal-model.c:837
+#: calendar/gui/e-cal-model.c:866
msgid "Recurring"
msgstr "繰り返し"
-#: calendar/gui/e-cal-model.c:839
+#: calendar/gui/e-cal-model.c:868
msgid "Assigned"
msgstr "割当て済み"
-#: calendar/gui/e-cal-view.c:719 calendar/gui/e-calendar-table.c:698
+#: calendar/gui/e-calendar-view.c:677 calendar/gui/e-calendar-table.c:698
msgid "Deleting selected objects"
msgstr "指定したオブジェクトを削除します"
-#: calendar/gui/e-cal-view.c:820 calendar/gui/e-calendar-table.c:861
+#: calendar/gui/e-calendar-view.c:778 calendar/gui/e-calendar-table.c:861
msgid "Updating objects"
msgstr "オブジェクトの更新"
-#: calendar/gui/e-cal-view.c:1254 calendar/gui/e-cal-view.c:1339
+#: calendar/gui/e-calendar-view.c:1284 calendar/gui/e-calendar-view.c:1371
msgid "New _Appointment..."
msgstr "新しい予定(_A)..."
-#: calendar/gui/e-cal-view.c:1255 calendar/gui/e-cal-view.c:1341
+#: calendar/gui/e-calendar-view.c:1285 calendar/gui/e-calendar-view.c:1373
msgid "New All Day _Event"
msgstr "新しい終日のイベント(_E)"
-#: calendar/gui/e-cal-view.c:1256 calendar/gui/e-cal-view.c:1343
+#: calendar/gui/e-calendar-view.c:1286 calendar/gui/e-calendar-view.c:1375
msgid "New Meeting"
msgstr "新しい会議"
-#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1345
+#: calendar/gui/e-calendar-view.c:1287 calendar/gui/e-calendar-view.c:1377
msgid "New Task"
msgstr "新しいタスク"
-#: calendar/gui/e-cal-view.c:1261 calendar/gui/e-cal-view.c:1284
-#: calendar/gui/e-cal-view.c:1351 calendar/gui/e-calendar-table.c:1040
+#: calendar/gui/e-calendar-view.c:1291 calendar/gui/e-calendar-view.c:1314
+#: calendar/gui/e-calendar-view.c:1383 calendar/gui/e-calendar-table.c:1040
#: calendar/gui/e-calendar-table.c:1082 ui/evolution-addressbook.xml.h:40
#: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
-#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:122
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:124
#: ui/evolution-tasks.xml.h:23
msgid "_Print..."
msgstr "印刷(_P)..."
-#: calendar/gui/e-cal-view.c:1265 calendar/gui/e-cal-view.c:1291
-#: calendar/gui/e-cal-view.c:1349 calendar/gui/e-calendar-table.c:1046
+#: calendar/gui/e-calendar-view.c:1295 calendar/gui/e-calendar-view.c:1321
+#: calendar/gui/e-calendar-view.c:1381 calendar/gui/e-calendar-table.c:1046
#: calendar/gui/e-calendar-table.c:1080 ui/evolution-addressbook.xml.h:38
#: ui/evolution-calendar.xml.h:38 ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-message.xml.h:120 ui/evolution-tasks.xml.h:22
+#: ui/evolution-mail-message.xml.h:122 ui/evolution-tasks.xml.h:22
msgid "_Paste"
msgstr "貼り付け(_P)"
-#: calendar/gui/e-cal-view.c:1271 calendar/gui/e-cal-view.c:1335
+#: calendar/gui/e-calendar-view.c:1301 calendar/gui/e-calendar-view.c:1367
#: ui/evolution-calendar.xml.h:13
msgid "Go to _Today"
msgstr "今日へ移動(_T)"
-#: calendar/gui/e-cal-view.c:1272 calendar/gui/e-cal-view.c:1337
+#: calendar/gui/e-calendar-view.c:1302 calendar/gui/e-calendar-view.c:1369
msgid "_Go to Date..."
msgstr "指定日へ移動(_G)..."
-#: calendar/gui/e-cal-view.c:1276 ui/evolution-calendar.xml.h:40
+#: calendar/gui/e-calendar-view.c:1306 ui/evolution-calendar.xml.h:40
msgid "_Publish Free/Busy Information"
msgstr "予定の有無の公開(_P)"
-#: calendar/gui/e-cal-view.c:1282 calendar/gui/e-cal-view.c:1347
+#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1379
#: calendar/gui/e-calendar-table.c:1037 calendar/gui/e-calendar-table.c:1078
-#: mail/em-folder-view.c:750 ui/evolution-addressbook.xml.h:37
+#: mail/em-folder-view.c:740 ui/evolution-addressbook.xml.h:37
msgid "_Open"
msgstr "開く(_O)"
-#: calendar/gui/e-cal-view.c:1283 calendar/gui/e-cal-view.c:1353
+#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1385
#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1084
-#: mail/em-folder-view.c:752 mail/em-popup.c:689 mail/em-popup.c:804
-#: ui/evolution-mail-message.xml.h:126
+#: mail/em-folder-view.c:742 mail/em-popup.c:689 mail/em-popup.c:804
+#: ui/evolution-mail-message.xml.h:128
msgid "_Save As..."
msgstr "別名で保存(_S)..."
-#: calendar/gui/e-cal-view.c:1289 calendar/gui/e-cal-view.c:1329
+#: calendar/gui/e-calendar-view.c:1319 calendar/gui/e-calendar-view.c:1361
#: calendar/gui/e-calendar-table.c:1044 calendar/gui/e-calendar-table.c:1073
#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
#: ui/evolution-tasks.xml.h:1
msgid "C_ut"
msgstr "切り取り(_U)"
-#: calendar/gui/e-cal-view.c:1290 calendar/gui/e-cal-view.c:1327
+#: calendar/gui/e-calendar-view.c:1320 calendar/gui/e-calendar-view.c:1359
#: calendar/gui/e-calendar-table.c:1045 calendar/gui/e-calendar-table.c:1071
-#: mail/em-folder-tree.c:2230 ui/evolution-addressbook.xml.h:31
+#: mail/em-folder-tree.c:2497 ui/evolution-addressbook.xml.h:31
#: ui/evolution-calendar.xml.h:34 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:18
+#: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:18
msgid "_Copy"
msgstr "コピー(_C)"
-#: calendar/gui/e-cal-view.c:1295
+#: calendar/gui/e-calendar-view.c:1325
+msgid "Cop_y to Calendar..."
+msgstr "カレンダへコピー(_Y)..."
+
+#: calendar/gui/e-calendar-view.c:1326
+msgid "Mo_ve to Calendar..."
+msgstr "カレンダへ移動(_V)..."
+
+#: calendar/gui/e-calendar-view.c:1327
msgid "_Schedule Meeting..."
msgstr "会議のスケジュール(_S)..."
-#: calendar/gui/e-cal-view.c:1296
+#: calendar/gui/e-calendar-view.c:1328
msgid "_Forward as iCalendar..."
msgstr "iCalender 形式で転送(_F)..."
-#: calendar/gui/e-cal-view.c:1301 calendar/gui/e-cal-view.c:1332
+#: calendar/gui/e-calendar-view.c:1333 calendar/gui/e-calendar-view.c:1364
msgid "Delete this _Occurrence"
msgstr "このイベントの削除(_O)"
-#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-cal-view.c:1333
+#: calendar/gui/e-calendar-view.c:1334 calendar/gui/e-calendar-view.c:1365
msgid "Delete _All Occurrences"
msgstr "全てのイベントの削除(_A)"
-#: calendar/gui/e-cal-view.c:1355 ui/evolution.xml.h:33
+#: calendar/gui/e-calendar-view.c:1387 ui/evolution.xml.h:33
msgid "_Settings..."
msgstr "設定(_S)..."
@@ -5763,21 +5747,25 @@ msgid "Complete"
msgstr "完了しました"
#: calendar/gui/e-calendar-table.etspec.h:8
-msgid "Completion Date"
+msgid "Completion date"
msgstr "完了日"
#: calendar/gui/e-calendar-table.etspec.h:10
-msgid "Due Date"
+msgid "Due date"
msgstr "期日"
#: calendar/gui/e-calendar-table.etspec.h:11
-msgid "Geographical Position"
+msgid "Geographical position"
msgstr "緯度経度"
#: calendar/gui/e-calendar-table.etspec.h:12
msgid "Priority"
msgstr "優先度"
+#: calendar/gui/e-calendar-table.etspec.h:13
+msgid "Start date"
+msgstr "開始日"
+
#: calendar/gui/e-calendar-table.etspec.h:16
msgid "Task sort"
msgstr "タスクの並び替え"
@@ -5787,12 +5775,20 @@ msgid "URL"
msgstr "URL"
#. strftime format of a weekday, a date and a time, 24-hour.
+#. strptime format of a weekday, a date and a time,
+#. in 24-hour format.
+#. strftime format of a weekday, a date and a
+#. time, in 24-hour format.
#: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
#: e-util/e-time-utils.c:393
msgid "%a %m/%d/%Y %H:%M:%S"
msgstr "%Y/%m/%d (%a) %H:%M:%S"
#. strftime format of a weekday, a date and a time, 12-hour.
+#. strptime format of a weekday, a date and a time,
+#. in 12-hour format.
+#. strftime format of a weekday, a date and a
+#. time, in 12-hour format.
#: calendar/gui/e-cell-date-edit-text.c:120 e-util/e-time-utils.c:175
#: e-util/e-time-utils.c:402
msgid "%a %m/%d/%Y %I:%M:%S %p"
@@ -5816,26 +5812,33 @@ msgstr "%02i 分分割"
#. strftime format %A = full weekday name, %d = day of month,
#. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:688 calendar/gui/e-day-view.c:1350
+#. strftime format %A = full weekday name, %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-day-view-top-item.c:688 calendar/gui/e-day-view.c:1572
#: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
msgid "%A %d %B"
msgstr "%B%e日 %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:696 calendar/gui/e-day-view.c:1383
+#. strftime format %d = day of month, %b = abbreviated
+#. month name. You can change the order but don't
+#. change the specifiers or add anything.
+#: calendar/gui/e-day-view-top-item.c:696 calendar/gui/e-day-view.c:1605
#: calendar/gui/e-week-view-main-item.c:343
msgid "%d %b"
msgstr "%B%e日"
#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:604 calendar/gui/e-week-view.c:334
+#: calendar/gui/e-day-view.c:822 calendar/gui/e-week-view.c:593
#: calendar/gui/print.c:838
msgid "am"
msgstr "午前"
#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:607 calendar/gui/e-week-view.c:337
+#: calendar/gui/e-day-view.c:825 calendar/gui/e-week-view.c:596
#: calendar/gui/print.c:840
msgid "pm"
msgstr "午後"
@@ -5955,12 +5958,16 @@ msgstr ""
msgid "<i>None</i>"
msgstr "<i>なし</i>"
+#: calendar/gui/e-itip-control.c:947
+msgid "Location:"
+msgstr "場所:"
+
#. write status
#: calendar/gui/e-itip-control.c:961 calendar/gui/e-tasks.c:199
msgid "Status:"
msgstr "ステータス:"
-#: calendar/gui/e-itip-control.c:966 calendar/gui/e-meeting-list-view.c:180
+#: calendar/gui/e-itip-control.c:966 calendar/gui/e-meeting-list-view.c:271
#: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
#: calendar/gui/itip-utils.c:422
msgid "Accepted"
@@ -5970,7 +5977,7 @@ msgstr "受諾済"
msgid "Tentatively Accepted"
msgstr "暫定的に受諾済"
-#: calendar/gui/e-itip-control.c:974 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:974 calendar/gui/e-meeting-list-view.c:272
#: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
#: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
msgid "Declined"
@@ -6019,7 +6026,7 @@ msgstr "最新情報の送信"
#: calendar/gui/e-itip-control.c:1127 calendar/gui/itip-utils.c:442
#: mail/mail-send-recv.c:394 mail/mail-send-recv.c:446
-#: shell/e-shell-startup-wizard.c:794 ui/evolution-mail-global.xml.h:1
+#: ui/evolution-mail-global.xml.h:1
msgid "Cancel"
msgstr "キャンセル"
@@ -6300,7 +6307,7 @@ msgid "Chair Persons"
msgstr "議長"
#: calendar/gui/e-meeting-list-view.c:63
-#: calendar/gui/e-meeting-list-view.c:479
+#: calendar/gui/e-meeting-list-view.c:570
msgid "Required Participants"
msgstr "必須の参加者"
@@ -6312,57 +6319,57 @@ msgstr "任意の参加者"
msgid "Resources"
msgstr "リソース"
-#: calendar/gui/e-meeting-list-view.c:140 calendar/gui/e-meeting-store.c:90
+#: calendar/gui/e-meeting-list-view.c:231 calendar/gui/e-meeting-store.c:90
#: calendar/gui/e-meeting-store.c:107 calendar/gui/e-meeting-store.c:759
msgid "Individual"
msgstr "個人"
-#: calendar/gui/e-meeting-list-view.c:141 calendar/gui/e-meeting-store.c:92
+#: calendar/gui/e-meeting-list-view.c:232 calendar/gui/e-meeting-store.c:92
#: calendar/gui/e-meeting-store.c:109
msgid "Group"
msgstr "グループ"
-#: calendar/gui/e-meeting-list-view.c:142 calendar/gui/e-meeting-store.c:94
+#: calendar/gui/e-meeting-list-view.c:233 calendar/gui/e-meeting-store.c:94
#: calendar/gui/e-meeting-store.c:111
msgid "Resource"
msgstr "リソース"
-#: calendar/gui/e-meeting-list-view.c:143 calendar/gui/e-meeting-store.c:96
+#: calendar/gui/e-meeting-list-view.c:234 calendar/gui/e-meeting-store.c:96
#: calendar/gui/e-meeting-store.c:113
msgid "Room"
msgstr "ルーム"
-#: calendar/gui/e-meeting-list-view.c:154 calendar/gui/e-meeting-store.c:125
+#: calendar/gui/e-meeting-list-view.c:245 calendar/gui/e-meeting-store.c:125
#: calendar/gui/e-meeting-store.c:142
msgid "Chair"
msgstr "議長"
-#: calendar/gui/e-meeting-list-view.c:155 calendar/gui/e-meeting-store.c:127
+#: calendar/gui/e-meeting-list-view.c:246 calendar/gui/e-meeting-store.c:127
#: calendar/gui/e-meeting-store.c:144 calendar/gui/e-meeting-store.c:762
msgid "Required Participant"
msgstr "必須の参加者"
-#: calendar/gui/e-meeting-list-view.c:156 calendar/gui/e-meeting-store.c:129
+#: calendar/gui/e-meeting-list-view.c:247 calendar/gui/e-meeting-store.c:129
#: calendar/gui/e-meeting-store.c:146
msgid "Optional Participant"
msgstr "任意の参加者"
-#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:131
+#: calendar/gui/e-meeting-list-view.c:248 calendar/gui/e-meeting-store.c:131
#: calendar/gui/e-meeting-store.c:148
msgid "Non-Participant"
msgstr "不参加者"
-#: calendar/gui/e-meeting-list-view.c:179 calendar/gui/e-meeting-store.c:177
+#: calendar/gui/e-meeting-list-view.c:270 calendar/gui/e-meeting-store.c:177
#: calendar/gui/e-meeting-store.c:200 calendar/gui/e-meeting-store.c:772
msgid "Needs Action"
msgstr "要アクション"
-#: calendar/gui/e-meeting-list-view.c:182 calendar/gui/e-meeting-store.c:183
+#: calendar/gui/e-meeting-list-view.c:273 calendar/gui/e-meeting-store.c:183
#: calendar/gui/e-meeting-store.c:206 calendar/gui/e-meeting-time-sel.c:398
msgid "Tentative"
msgstr "暫定"
-#: calendar/gui/e-meeting-list-view.c:183 calendar/gui/e-meeting-store.c:185
+#: calendar/gui/e-meeting-list-view.c:274 calendar/gui/e-meeting-store.c:185
#: calendar/gui/e-meeting-store.c:208
msgid "Delegated"
msgstr "委任済"
@@ -6380,6 +6387,10 @@ msgstr "%Y年 %B %e日 %A"
#. This is a strftime() format string %a = abbreviated weekday
#. name, %m = month number, %d = month day, %Y = full year.
+#. This is a strftime() format string %a = abbreviated weekday name,
+#. %m = month number, %d = month day, %Y = full year.
+#. strptime format of a weekday and a date.
+#. strftime format of a weekday and a date.
#: calendar/gui/e-meeting-time-sel-item.c:456
#: calendar/gui/e-meeting-time-sel.c:2093 e-util/e-time-utils.c:203
#: e-util/e-time-utils.c:296 e-util/e-time-utils.c:384
@@ -6388,8 +6399,12 @@ msgstr "%Y/%m/%d (%a)"
#. This is a strftime() format string %m = month number,
#. %d = month day, %Y = full year.
+#. strptime format of a weekday and a date.
+#. This is the preferred date format for the locale.
+#. This is a strftime() format for a short date. %m = month,
+#. %d = day of month, %Y = year (all digits).
#: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1606
+#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1604
msgid "%m/%d/%Y"
msgstr "%Y/%m/%d"
@@ -6471,12 +6486,12 @@ msgstr "優先度:"
msgid "Web Page:"
msgstr "ウェブ・ページ"
-#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2179
+#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2176
#, c-format
msgid "Click to open %s"
msgstr "クリックすると %s を開きます"
-#: calendar/gui/e-tasks.c:769 calendar/gui/gnome-cal.c:1916
+#: calendar/gui/e-tasks.c:773 calendar/gui/gnome-cal.c:1903
#, c-format
msgid ""
"Error on %s:\n"
@@ -6486,7 +6501,7 @@ msgstr ""
" %s"
#. FIXME: this doesn't remove the task list from the list or anything
-#: calendar/gui/e-tasks.c:788 calendar/gui/gnome-cal.c:1937
+#: calendar/gui/e-tasks.c:792 calendar/gui/gnome-cal.c:1924
#, c-format
msgid ""
"The task backend for\n"
@@ -6497,12 +6512,12 @@ msgstr ""
"用のタスク・バックエンドが\n"
"クラッシュしました。"
-#: calendar/gui/e-tasks.c:868
+#: calendar/gui/e-tasks.c:872
#, c-format
msgid "Opening tasks at %s"
msgstr "%s のタスクを開きます"
-#: calendar/gui/e-tasks.c:889
+#: calendar/gui/e-tasks.c:893
#, c-format
msgid ""
"Error opening %s:\n"
@@ -6511,38 +6526,38 @@ msgstr ""
"%s を開く際にエラー:\n"
"%s"
-#: calendar/gui/e-tasks.c:908
+#: calendar/gui/e-tasks.c:912
msgid "Loading tasks"
msgstr "タスクの読み込み"
-#: calendar/gui/e-tasks.c:1010
+#: calendar/gui/e-tasks.c:1014
msgid "Completing tasks..."
msgstr "タスクの完了..."
-#: calendar/gui/e-tasks.c:1033
+#: calendar/gui/e-tasks.c:1037
msgid "Deleting selected objects..."
msgstr "指定したオブジェクトの削除..."
-#: calendar/gui/e-tasks.c:1058
+#: calendar/gui/e-tasks.c:1062
msgid "Expunging"
msgstr "抹消"
-#: calendar/gui/gnome-cal.c:1751
-#, fuzzy, c-format
+#: calendar/gui/gnome-cal.c:1738
+#, c-format
msgid "Loading tasks at %s"
-msgstr "タスクの読み込み"
+msgstr "%s のタスクの読み込み"
-#: calendar/gui/gnome-cal.c:1763
-#, fuzzy, c-format
+#: calendar/gui/gnome-cal.c:1750
+#, c-format
msgid "Loading appointments at %s"
-msgstr "予定 - %s"
+msgstr "%s の予定の読み込み"
-#: calendar/gui/gnome-cal.c:1796
+#: calendar/gui/gnome-cal.c:1783
#, c-format
msgid "Opening %s"
msgstr "%s を開く"
-#: calendar/gui/gnome-cal.c:1945
+#: calendar/gui/gnome-cal.c:1932
#, c-format
msgid ""
"The calendar backend for\n"
@@ -6553,7 +6568,7 @@ msgstr ""
"用のカレンダ・バックエンドが\n"
"クラッシュしました。"
-#: calendar/gui/gnome-cal.c:2799
+#: calendar/gui/gnome-cal.c:2776
msgid "Purging"
msgstr "抹消中"
@@ -6858,81 +6873,81 @@ msgid "Sa"
msgstr "土"
#. Day
-#: calendar/gui/print.c:1915
+#: calendar/gui/print.c:1914
msgid "Selected day (%a %b %d %Y)"
msgstr "日の指定 (%Y年 %B %e日 %a)"
-#: calendar/gui/print.c:1940 calendar/gui/print.c:1944
+#: calendar/gui/print.c:1939 calendar/gui/print.c:1943
msgid "%a %b %d"
msgstr "%B %e日 (%a)"
-#: calendar/gui/print.c:1941
+#: calendar/gui/print.c:1940
msgid "%a %d %Y"
msgstr "%Y/%d (%a)"
-#: calendar/gui/print.c:1945 calendar/gui/print.c:1947
-#: calendar/gui/print.c:1948
+#: calendar/gui/print.c:1944 calendar/gui/print.c:1946
+#: calendar/gui/print.c:1947
msgid "%a %b %d %Y"
msgstr "%Y/%m/%d (%a)"
-#: calendar/gui/print.c:1952
+#: calendar/gui/print.c:1951
#, c-format
msgid "Selected week (%s - %s)"
msgstr "週の指定 (%s - %s)"
#. Month
-#: calendar/gui/print.c:1960
+#: calendar/gui/print.c:1959
msgid "Selected month (%b %Y)"
msgstr "月の指定 (%Y年 %B)"
#. Year
-#: calendar/gui/print.c:1967
+#: calendar/gui/print.c:1966
msgid "Selected year (%Y)"
msgstr "年の指定 (%Y年)"
-#: calendar/gui/print.c:2298
+#: calendar/gui/print.c:2297
msgid "Task"
msgstr "タスク"
-#: calendar/gui/print.c:2357
+#: calendar/gui/print.c:2356
#, c-format
msgid "Status: %s"
msgstr "状態: %s"
-#: calendar/gui/print.c:2374
+#: calendar/gui/print.c:2373
#, c-format
msgid "Priority: %s"
msgstr "優先度: %s"
-#: calendar/gui/print.c:2386
+#: calendar/gui/print.c:2385
#, c-format
msgid "Percent Complete: %i"
msgstr "達成率: %i"
-#: calendar/gui/print.c:2398
+#: calendar/gui/print.c:2397
#, c-format
msgid "URL: %s"
msgstr "URL: %s"
-#: calendar/gui/print.c:2412
+#: calendar/gui/print.c:2411
#, c-format
msgid "Categories: %s"
msgstr "カテゴリ: %s"
-#: calendar/gui/print.c:2423
+#: calendar/gui/print.c:2422
msgid "Contacts: "
msgstr "連絡先: "
-#: calendar/gui/print.c:2560 calendar/gui/print.c:2646
-#: calendar/gui/print.c:2738 mail/em-format-html-print.c:173
+#: calendar/gui/print.c:2559 calendar/gui/print.c:2645
+#: calendar/gui/print.c:2737 mail/em-format-html-print.c:173
msgid "Print Preview"
msgstr "印刷プレビュー"
-#: calendar/gui/print.c:2594
+#: calendar/gui/print.c:2593
msgid "Print Item"
msgstr "アイテムの印刷"
-#: calendar/gui/print.c:2760
+#: calendar/gui/print.c:2759
msgid "Print Setup"
msgstr "プリンタの設定"
@@ -8614,7 +8629,7 @@ msgstr "キャッシュファイルを生成できません"
msgid "Could not remove cache entry: %s: %s"
msgstr "キャッシュ・エントリを開けませんでした: %s: %s"
-#: camel/camel-disco-diary.c:185
+#: camel/camel-disco-diary.c:194
#, c-format
msgid ""
"Could not write log entry: %s\n"
@@ -8625,7 +8640,7 @@ msgstr ""
"ネットワークに再接続しても、このサーバにおける\n"
"それ以降の操作を再現しません。"
-#: camel/camel-disco-diary.c:248
+#: camel/camel-disco-diary.c:257
#, c-format
msgid ""
"Could not open `%s':\n"
@@ -8636,7 +8651,7 @@ msgstr ""
"%s\n"
"このフォルダに対する変更は再同期されません。"
-#: camel/camel-disco-diary.c:282
+#: camel/camel-disco-diary.c:293
msgid "Resynchronizing with server"
msgstr "サーバの再同期"
@@ -8653,7 +8668,7 @@ msgstr "オフライン・モードでの新しいメッセージのダウンロ
msgid "Preparing folder '%s' for offline"
msgstr "オフライン用の準備フォルダ '%s'"
-#: camel/camel-disco-store.c:367
+#: camel/camel-disco-store.c:377
msgid "You must be working online to complete this operation"
msgstr "この動作を完了するためにオンラインで作業して下さい"
@@ -8768,30 +8783,34 @@ msgstr "(match-all) は一つの論理結果を必要とします。"
msgid "Performing query on unknown header: %s"
msgstr "未知のヘッダでクエリを実行しています: %s"
-#: camel/camel-folder.c:584
+#: camel/camel-folder.c:586
#, c-format
msgid "Unsupported operation: append message: for %s"
msgstr "サポートしていない操作: %s のメッセージの追加"
-#: camel/camel-folder.c:1164
+#: camel/camel-folder.c:1177
#, c-format
msgid "Unsupported operation: search by expression: for %s"
msgstr "サポートしていない操作: 式 %s による検索"
-#: camel/camel-folder.c:1204
+#: camel/camel-folder.c:1217
#, c-format
msgid "Unsupported operation: search by uids: for %s"
msgstr "サポートしていない操作: UID %s による検索"
-#: camel/camel-folder.c:1322
+#: camel/camel-folder.c:1335
msgid "Moving messages"
msgstr "メッセージの移動中"
-#: camel/camel-folder.c:1322
+#: camel/camel-folder.c:1335
msgid "Copying messages"
msgstr "メッセージのコピー中"
-#: camel/camel-folder.c:1571
+#: camel/camel-folder.c:1589
+msgid "Learning junk and/or non junk message(s)"
+msgstr "Junk と非 Junk またはそのどちらかのメッセージの学習中"
+
+#: camel/camel-folder.c:1618
msgid "Filtering new message(s)"
msgstr "新しいメッセージのフィルタリング中"
@@ -8825,7 +8844,8 @@ msgstr ""
#: camel/camel-gpg-context.c:779 camel/camel-gpg-context.c:1263
#: camel/camel-gpg-context.c:1422 camel/camel-gpg-context.c:1508
-#: camel/camel-gpg-context.c:1615 mail/mail-send-recv.c:593
+#: camel/camel-gpg-context.c:1615 mail/mail-ops.c:697
+#: mail/mail-send-recv.c:593
msgid "Cancelled."
msgstr "キャンセルしました"
@@ -9205,7 +9225,7 @@ msgstr "参照している証明書の期限が過ぎています。"
#: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
#: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
#: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1240
+#: camel/providers/imap/camel-imap-store.c:1193
msgid "Bad authentication response from server."
msgstr "サーバから間違った認証応答がありました。"
@@ -9403,26 +9423,26 @@ msgstr "署名者: %s <%s>: %s\n"
msgid "Cannot get folder: Invalid operation on this store"
msgstr "フォルダを取得できません: この格納場所で不正な操作です"
-#: camel/camel-store.c:244
-#, fuzzy, c-format
+#: camel/camel-store.c:242
+#, c-format
msgid "Cannot create folder `%s': folder exists"
-msgstr "フォルダを作成できません: %s: %s"
+msgstr "フォルダ '%s' を作成できません: フォルダが存在します"
-#: camel/camel-store.c:297
+#: camel/camel-store.c:293
msgid "Cannot create folder: Invalid operation on this store"
msgstr "フォルダを作成できません: この格納場所で不正な操作です"
-#: camel/camel-store.c:381 camel/camel-vee-store.c:351
+#: camel/camel-store.c:377 camel/camel-vee-store.c:354
#, c-format
msgid "Cannot delete folder: %s: Invalid operation"
msgstr "フォルダを削除できません: %s: 不正な操作です"
-#: camel/camel-store.c:779 mail/mail-ops.c:1120
+#: camel/camel-store.c:773 mail/mail-ops.c:1079
msgid "Trash"
msgstr "ゴミ箱"
-#: camel/camel-store.c:781 filter/libfilter-i18n.h:35 mail/mail-ops.c:1124
-#: ui/evolution-mail-message.xml.h:46
+#: camel/camel-store.c:775 filter/libfilter-i18n.h:35 mail/mail-ops.c:1083
+#: ui/evolution-mail-message.xml.h:48
msgid "Junk"
msgstr "Junk"
@@ -9653,30 +9673,28 @@ msgstr "%s に %s のようなメッセージはありません"
msgid "Cannot copy or move messages into a Virtual Folder"
msgstr "メッセージの仮想フォルダへのコピーまたは移動ができません"
-#: camel/camel-vee-store.c:365
+#: camel/camel-vee-store.c:368
#, c-format
msgid "Cannot delete folder: %s: No such folder"
msgstr "フォルダを削除できません: %s: そのようなフォルダはありません"
-#: camel/camel-vee-store.c:378
+#: camel/camel-vee-store.c:381
#, c-format
msgid "Cannot rename folder: %s: Invalid operation"
msgstr "フォルダ名を変更できません: %s: 不正な操作です"
-#: camel/camel-vee-store.c:386
+#: camel/camel-vee-store.c:389
#, c-format
msgid "Cannot rename folder: %s: No such folder"
msgstr "フォルダ名を変更できません: %s: そのようなフォルダはありません"
#: camel/camel-vtrash-folder.c:44
-#, fuzzy
msgid "Cannot copy messages to the Trash folder"
-msgstr "NNTP フォルダからメッセージのコピーはできません!"
+msgstr "ゴミ箱フォルダへメッセージをコピーできません"
#: camel/camel-vtrash-folder.c:46
-#, fuzzy
msgid "Cannot copy messages to the Junk folder"
-msgstr "NNTP フォルダからメッセージのコピーはできません!"
+msgstr "Junk フォルダへメッセージをコピーできません"
#: camel/providers/groupwise/camel-groupwise-provider.c:53
#: camel/providers/imap/camel-imap-provider.c:50
@@ -9731,19 +9749,18 @@ msgstr ""
#: camel/providers/groupwise/camel-gw-listener.c:299
#: camel/providers/groupwise/camel-gw-listener.c:323
-#, fuzzy
msgid "Checklist"
-msgstr "一覧"
+msgstr "チェックリスト"
#: camel/providers/imap/camel-imap-command.c:218
#: camel/providers/imap/camel-imap-command.c:257
#: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:2888
+#: camel/providers/imap/camel-imap-store.c:2860
msgid "Operation cancelled"
msgstr "操作はキャンセルされました"
#: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:2891
+#: camel/providers/imap/camel-imap-store.c:2863
#, c-format
msgid "Server unexpectedly disconnected: %s"
msgstr "突然サーバが接続を切りました: %s"
@@ -9766,7 +9783,7 @@ msgstr "IMAP サーバから予期しない応答がありました: %s"
#: camel/providers/imap/camel-imap-command.c:399
#, c-format
msgid "IMAP command failed: %s"
-msgstr "IMAP コマンドは失敗しました: %s"
+msgstr "IMAP コマンドが失敗しました: %s"
#: camel/providers/imap/camel-imap-command.c:457
msgid "Server response ended too soon."
@@ -9801,12 +9818,12 @@ msgstr "フォルダは破壊され再作成されました"
msgid "Scanning for changed messages"
msgstr "変更メッセージの解析中"
-#: camel/providers/imap/camel-imap-folder.c:1917
+#: camel/providers/imap/camel-imap-folder.c:1926
#, c-format
msgid "Unable to retrieve message: %s"
msgstr "メッセージを取得できません: %s"
-#: camel/providers/imap/camel-imap-folder.c:1948
+#: camel/providers/imap/camel-imap-folder.c:1972
#: camel/providers/local/camel-maildir-folder.c:211
#: camel/providers/local/camel-maildir-folder.c:224
#: camel/providers/local/camel-maildir-folder.c:233
@@ -9822,25 +9839,25 @@ msgstr ""
"メッセージを取得できません: %s\n"
" %s"
-#: camel/providers/imap/camel-imap-folder.c:1948
+#: camel/providers/imap/camel-imap-folder.c:1972
#: camel/providers/local/camel-maildir-folder.c:211
#: camel/providers/local/camel-mbox-folder.c:417
#: camel/providers/local/camel-mh-folder.c:200
msgid "No such message"
msgstr "そのようなメッセージはありません"
-#: camel/providers/imap/camel-imap-folder.c:1971
-#: camel/providers/imap/camel-imap-folder.c:2567
+#: camel/providers/imap/camel-imap-folder.c:1995
+#: camel/providers/imap/camel-imap-folder.c:2591
#: camel/providers/nntp/camel-nntp-folder.c:205
msgid "This message is not currently available"
msgstr "現在このメッセージは有効ではありません"
-#: camel/providers/imap/camel-imap-folder.c:2231
-#: camel/providers/imap/camel-imap-folder.c:2301
+#: camel/providers/imap/camel-imap-folder.c:2255
+#: camel/providers/imap/camel-imap-folder.c:2325
msgid "Fetching summary information for new messages"
msgstr "新規メッセージのサマリ情報の同期中"
-#: camel/providers/imap/camel-imap-folder.c:2605
+#: camel/providers/imap/camel-imap-folder.c:2629
msgid "Could not find message body in FETCH response."
msgstr "FETCH 応答にメッセージ本体がありませんでした。"
@@ -9896,14 +9913,12 @@ msgid "Apply filters to new messages in INBOX on this server"
msgstr "このサーバ上の INBOX 内にある新規メッセージへフィルタを適用する"
#: camel/providers/imap/camel-imap-provider.c:66
-#, fuzzy
msgid "Check new messages for Junk contents"
-msgstr "全てのフォルダの新着メールをチェックします"
+msgstr "新着メールがスパムかどうかチェックします"
#: camel/providers/imap/camel-imap-provider.c:68
-#, fuzzy
msgid "Only check for Junk messages in the INBOX folder"
-msgstr "全てのフォルダの新着メールをチェックします"
+msgstr "INBOX フォルダにあるメールのみスパムかどうかチェックします"
#: camel/providers/imap/camel-imap-provider.c:76
msgid "IMAP"
@@ -9913,18 +9928,18 @@ msgstr "IMAP"
msgid "For reading and storing mail on IMAP servers."
msgstr "IMAP サーバのメールを読んだり大切なメールを保存します"
-#: camel/providers/imap/camel-imap-store.c:478
+#: camel/providers/imap/camel-imap-store.c:425
#, c-format
msgid "IMAP server %s"
msgstr "IMAP サーバ %s"
-#: camel/providers/imap/camel-imap-store.c:480
+#: camel/providers/imap/camel-imap-store.c:427
#, c-format
msgid "IMAP service for %s on %s"
msgstr "%s の %s にある IMAP サービス"
-#: camel/providers/imap/camel-imap-store.c:601
-#: camel/providers/imap/camel-imap-store.c:621
+#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/imap/camel-imap-store.c:567
#: camel/providers/imapp/camel-imapp-store.c:231
#: camel/providers/nntp/camel-nntp-store.c:140
#: camel/providers/pop3/camel-pop3-store.c:175
@@ -9934,14 +9949,14 @@ msgstr "%s の %s にある IMAP サービス"
msgid "Could not connect to %s (port %d): %s"
msgstr "%s (ポート %d) へ接続できませんでした: %s"
-#: camel/providers/imap/camel-imap-store.c:603
+#: camel/providers/imap/camel-imap-store.c:549
#: camel/providers/pop3/camel-pop3-store.c:177
#: camel/providers/smtp/camel-smtp-transport.c:271
msgid "SSL unavailable"
msgstr "SSL は無効です"
-#: camel/providers/imap/camel-imap-store.c:618
-#: camel/providers/imap/camel-imap-store.c:850
+#: camel/providers/imap/camel-imap-store.c:564
+#: camel/providers/imap/camel-imap-store.c:796
#: camel/providers/imapp/camel-imapp-store.c:228
#: camel/providers/nntp/camel-nntp-store.c:137
#: camel/providers/nntp/camel-nntp-store.c:155
@@ -9949,50 +9964,50 @@ msgstr "SSL は無効です"
msgid "Connection cancelled"
msgstr "接続をキャンセルしました"
-#: camel/providers/imap/camel-imap-store.c:684
-#: camel/providers/imap/camel-imap-store.c:715
+#: camel/providers/imap/camel-imap-store.c:630
+#: camel/providers/imap/camel-imap-store.c:661
#, c-format
msgid "Failed to connect to IMAP server %s in secure mode: %s"
msgstr ""
"セキュリティ保護されたモードで IMAP サーバ %s への接続に失敗しました: %s"
-#: camel/providers/imap/camel-imap-store.c:685
+#: camel/providers/imap/camel-imap-store.c:631
#: camel/providers/pop3/camel-pop3-store.c:228
msgid "SSL/TLS extension not supported."
msgstr "SSL/TLS 拡張がサポートされていません。"
-#: camel/providers/imap/camel-imap-store.c:716
+#: camel/providers/imap/camel-imap-store.c:662
#: camel/providers/pop3/camel-pop3-store.c:269
msgid "SSL negotiations failed"
msgstr "SSL 接続に失敗しました"
-#: camel/providers/imap/camel-imap-store.c:853
+#: camel/providers/imap/camel-imap-store.c:799
#, c-format
msgid "Could not connect with command \"%s\": %s"
msgstr "コマンド \"%s\" で接続できませんでした: %s"
-#: camel/providers/imap/camel-imap-store.c:1270
+#: camel/providers/imap/camel-imap-store.c:1223
#, c-format
msgid "IMAP server %s does not support requested authentication type %s"
msgstr "IMAP サーバ %s は要求した認証タイプ %s をサポートしていません"
-#: camel/providers/imap/camel-imap-store.c:1280
+#: camel/providers/imap/camel-imap-store.c:1233
#: camel/providers/smtp/camel-smtp-transport.c:486
#, c-format
msgid "No support for authentication type %s"
msgstr "認証タイプ %s をサポートしていません"
-#: camel/providers/imap/camel-imap-store.c:1303
+#: camel/providers/imap/camel-imap-store.c:1256
#: camel/providers/imapp/camel-imapp-store.c:344
#, c-format
msgid "%sPlease enter the IMAP password for %s@%s"
msgstr "%s %s@%s の IMAP パスワードを入力して下さい"
-#: camel/providers/imap/camel-imap-store.c:1317
+#: camel/providers/imap/camel-imap-store.c:1270
msgid "You didn't enter a password."
msgstr "パスワードを入力していません"
-#: camel/providers/imap/camel-imap-store.c:1346
+#: camel/providers/imap/camel-imap-store.c:1299
#, c-format
msgid ""
"Unable to authenticate to IMAP server.\n"
@@ -10003,32 +10018,32 @@ msgstr ""
"%s\n"
"\n"
-#: camel/providers/imap/camel-imap-store.c:1693
-#: camel/providers/imap/camel-imap-store.c:1845
+#: camel/providers/imap/camel-imap-store.c:1717
+#: camel/providers/imap/camel-imap-store.c:1798
#, c-format
msgid "No such folder %s"
msgstr "そのようなフォルダ %s はありません"
-#: camel/providers/imap/camel-imap-store.c:1786
+#: camel/providers/imap/camel-imap-store.c:1739
#: camel/providers/local/camel-maildir-store.c:137
#: camel/providers/local/camel-mbox-store.c:212
-#: camel/providers/local/camel-mh-store.c:234
-#, fuzzy, c-format
+#: camel/providers/local/camel-mh-store.c:236
+#, c-format
msgid "Cannot create folder `%s': folder exists."
-msgstr "フォルダを作成できません: %s: %s"
+msgstr "フォルダ '%s' を作成できません: フォルダが存在します"
-#: camel/providers/imap/camel-imap-store.c:2046
+#: camel/providers/imap/camel-imap-store.c:1999
#, c-format
msgid ""
"The folder name \"%s\" is invalid because it containes the character \"%c\""
msgstr "フォルダ名 \"%s\" に文字 \"%c\"を含めることはできません"
-#: camel/providers/imap/camel-imap-store.c:2058
+#: camel/providers/imap/camel-imap-store.c:2011
#, c-format
msgid "Unknown parent folder: %s"
msgstr "未知の親フォルダ: %s"
-#: camel/providers/imap/camel-imap-store.c:2094
+#: camel/providers/imap/camel-imap-store.c:2047
msgid "The parent folder is not allowed to contain subfolders"
msgstr "親フォルダには複数のサブフォルダを含めることはできません"
@@ -10064,20 +10079,20 @@ msgid "Index message body data"
msgstr "メッセージ本体のデータの目録を作成する"
#. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:382
+#: camel/providers/local/camel-local-folder.c:388
#, c-format
msgid "~%s (%s)"
msgstr "~%s (%s)"
#. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:386
-#: camel/providers/local/camel-local-folder.c:389
+#: camel/providers/local/camel-local-folder.c:392
+#: camel/providers/local/camel-local-folder.c:395
#, c-format
msgid "mailbox:%s (%s)"
msgstr "mailbox: %s (%s)"
#. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:393
+#: camel/providers/local/camel-local-folder.c:399
#, c-format
msgid "%s (%s)"
msgstr "%s (%s)"
@@ -10138,7 +10153,7 @@ msgstr ""
#: camel/providers/local/camel-local-store.c:138
#: camel/providers/local/camel-local-store.c:215
-#: camel/providers/local/camel-mbox-store.c:355
+#: camel/providers/local/camel-mbox-store.c:356
#: camel/providers/local/camel-spool-store.c:116
#, c-format
msgid "Store root %s is not an absolute path"
@@ -10187,8 +10202,8 @@ msgstr "フォルダからサマリ・ファイル '%s' を削除できません
msgid "Could not delete folder index file `%s': %s"
msgstr "フォルダからインデックス・ファイル '%s' を削除できませんでした: %s"
-#: camel/providers/local/camel-local-store.c:417
-#: camel/providers/local/camel-mbox-store.c:319
+#: camel/providers/local/camel-local-store.c:418
+#: camel/providers/local/camel-mbox-store.c:320
#, c-format
msgid "Could not delete folder meta file `%s': %s"
msgstr "フォルダのメタ・ファイル '%s' を削除できませんでした: %s"
@@ -10218,33 +10233,33 @@ msgstr "メッセージの内容は無効です"
#: camel/providers/local/camel-maildir-store.c:107
#: camel/providers/local/camel-mbox-store.c:154
-#: camel/providers/local/camel-mh-store.c:202
-#, fuzzy, c-format
+#: camel/providers/local/camel-mh-store.c:204
+#, c-format
msgid "Cannot get folder `%s': %s"
-msgstr "フォルダを取得できません: %s: %s"
+msgstr "フォルダ '%s' を取得できません: %s"
#: camel/providers/local/camel-maildir-store.c:111
#: camel/providers/local/camel-mbox-store.c:162
-#: camel/providers/local/camel-mh-store.c:209
-#, fuzzy, c-format
+#: camel/providers/local/camel-mh-store.c:211
+#, c-format
msgid "Cannot get folder `%s': folder does not exist."
-msgstr "フォルダ '%s' がありません。"
+msgstr "フォルダ '%s' を取得できません: フォルダが存在しません"
#: camel/providers/local/camel-maildir-store.c:119
#: camel/providers/local/camel-mbox-store.c:184
#: camel/providers/local/camel-mbox-store.c:196
-#, fuzzy, c-format
+#, c-format
msgid "Cannot create folder `%s': %s"
-msgstr "フォルダを作成できません: %s: %s"
+msgstr "フォルダ '%s' を作成できません: %s"
#: camel/providers/local/camel-maildir-store.c:134
-#, fuzzy, c-format
+#, c-format
msgid "Cannot get folder `%s': not a maildir directory."
-msgstr "'%s' は maildir 形式のフォルダではありません"
+msgstr "フォルダ '%s' を取得できません: maildir フォルダが存在しません"
#: camel/providers/local/camel-maildir-store.c:173
#: camel/providers/local/camel-maildir-store.c:211
-#: camel/providers/local/camel-mh-store.c:258
+#: camel/providers/local/camel-mh-store.c:260
#, c-format
msgid "Could not delete folder `%s': %s"
msgstr "フォルダ '%s' を削除できませんでした: %s"
@@ -10253,7 +10268,7 @@ msgstr "フォルダ '%s' を削除できませんでした: %s"
msgid "not a maildir directory"
msgstr "maildir 形式のフォルダではありません"
-#: camel/providers/local/camel-maildir-store.c:375
+#: camel/providers/local/camel-maildir-store.c:336
#: camel/providers/local/camel-spool-store.c:286
#: camel/providers/local/camel-spool-store.c:316
#, c-format
@@ -10322,14 +10337,14 @@ msgid "Message construction failed: Corrupt mailbox?"
msgstr "メッセージの解釈に失敗しました: 間違ったメールボックスですか?"
#: camel/providers/local/camel-mbox-store.c:176
-#: camel/providers/local/camel-mbox-store.c:361
+#: camel/providers/local/camel-mbox-store.c:362
msgid "Cannot create a folder by this name."
msgstr "そのような名前でフォルダを作成できません。"
#: camel/providers/local/camel-mbox-store.c:206
-#, fuzzy, c-format
+#, c-format
msgid "Cannot get folder `%s': not a regular file."
-msgstr "ファイル %s を添付できません: 通常のファイルではありません"
+msgstr "フォルダ '%s' を取得できません: 通常のファイルではありません"
#: camel/providers/local/camel-mbox-store.c:236
#: camel/providers/local/camel-mbox-store.c:247
@@ -10352,30 +10367,30 @@ msgstr "'%s' は通常のファイルではありません"
msgid "Folder `%s' is not empty. Not deleted."
msgstr "フォルダ '%s' は空ではありません。削除しません。"
-#: camel/providers/local/camel-mbox-store.c:374
+#: camel/providers/local/camel-mbox-store.c:375
#, c-format
msgid "Cannot create directory `%s': %s."
msgstr "フォルダ '%s' を作成できません: %s"
-#: camel/providers/local/camel-mbox-store.c:388
+#: camel/providers/local/camel-mbox-store.c:389
#, c-format
msgid "Cannot create folder: %s: %s"
msgstr "フォルダを作成できません: %s: %s"
-#: camel/providers/local/camel-mbox-store.c:390
+#: camel/providers/local/camel-mbox-store.c:391
msgid "Folder already exists"
msgstr "既にフォルダがあります"
-#: camel/providers/local/camel-mbox-store.c:472
+#: camel/providers/local/camel-mbox-store.c:473
msgid "The new folder name is illegal."
msgstr "新しいフォルダの名前は正しくありません。"
-#: camel/providers/local/camel-mbox-store.c:485
+#: camel/providers/local/camel-mbox-store.c:486
#, c-format
msgid "Could not rename `%s': `%s': %s"
msgstr "'%s' の名前を変更できませんでした: '%s': %s"
-#: camel/providers/local/camel-mbox-store.c:560
+#: camel/providers/local/camel-mbox-store.c:561
#, c-format
msgid "Could not rename '%s' to %s: %s"
msgstr "'%s' から %s へ名前を変更できませんでした: %s"
@@ -10419,7 +10434,7 @@ msgstr "元のフォルダ %s を閉じることができませんでした: %s"
msgid "Could not close temp folder: %s"
msgstr "作業フォルダを閉じることができませんでした: %s"
-#: camel/providers/local/camel-mbox-summary.c:592 mail/em-folder-tree.c:2192
+#: camel/providers/local/camel-mbox-summary.c:592 mail/em-folder-tree.c:2459
#, c-format
msgid "Could not rename folder: %s"
msgstr "フォルダ名を変更できませんでした: %s"
@@ -10462,17 +10477,15 @@ msgstr "MH 形式のメッセージ追加が取り消されました"
msgid "Cannot append message to mh folder: %s: %s"
msgstr "MH 形式フォルダへメッセージを追加できません: %s: %s"
-#: camel/providers/local/camel-mh-store.c:217
-#, fuzzy, c-format
+#: camel/providers/local/camel-mh-store.c:219
+#, c-format
msgid "Could not create folder `%s': %s"
-msgstr ""
-"フォルダ '%s' を作成できませんでした:\n"
-"%s"
+msgstr "フォルダ '%s' を作成できませんでした: %s"
-#: camel/providers/local/camel-mh-store.c:229
-#, fuzzy, c-format
+#: camel/providers/local/camel-mh-store.c:231
+#, c-format
msgid "Cannot get folder `%s': not a directory."
-msgstr "フォルダを取得できません: %s: %s"
+msgstr "フォルダ '%s' を取得できません: フォルダではありません"
#: camel/providers/local/camel-mh-summary.c:244
#, c-format
@@ -10758,46 +10771,46 @@ msgid "You cannot remove a folder in a News store: unsubscribe instead."
msgstr ""
"ニュース格納場所のフォルダを削除できません: 代わりに購読を停止して下さい。"
-#: camel/providers/nntp/camel-nntp-summary.c:247
+#: camel/providers/nntp/camel-nntp-summary.c:253
#, c-format
msgid "Connection error: %s"
msgstr "接続エラー: %s"
-#: camel/providers/nntp/camel-nntp-summary.c:258
+#: camel/providers/nntp/camel-nntp-summary.c:262
#, c-format
msgid "No such folder: %s"
msgstr "そのようなフォルダはありません: %s"
-#: camel/providers/nntp/camel-nntp-summary.c:264
+#: camel/providers/nntp/camel-nntp-summary.c:268
#, c-format
msgid "Could not get group: %s"
msgstr "グループを取得できませんでした: %s"
-#: camel/providers/nntp/camel-nntp-summary.c:329
+#: camel/providers/nntp/camel-nntp-summary.c:333
msgid "Could not get messages: unspecificed error"
msgstr "メッセージを受信できませんでした: 想定していないエラーです"
-#: camel/providers/nntp/camel-nntp-summary.c:374
+#: camel/providers/nntp/camel-nntp-summary.c:378
#, c-format
msgid "NNTP Command failed: %s"
msgstr "NNTP コマンドが失敗しました: %s"
-#: camel/providers/nntp/camel-nntp-summary.c:434
-#: camel/providers/nntp/camel-nntp-summary.c:539
+#: camel/providers/nntp/camel-nntp-summary.c:438
+#: camel/providers/nntp/camel-nntp-summary.c:543
#, c-format
msgid "%s: Scanning new messages"
msgstr "%s: 新しいメッセージの解析中"
-#: camel/providers/nntp/camel-nntp-summary.c:554
+#: camel/providers/nntp/camel-nntp-summary.c:558
#, c-format
msgid "Unknown server response: %s"
msgstr "未知のサーバ応答: %s"
-#: camel/providers/nntp/camel-nntp-summary.c:601
+#: camel/providers/nntp/camel-nntp-summary.c:605
msgid "Use cancel"
msgstr "キャンセルを利用する"
-#: camel/providers/nntp/camel-nntp-summary.c:603
+#: camel/providers/nntp/camel-nntp-summary.c:607
#, c-format
msgid "Operation failed: %s"
msgstr "操作が失敗しました: %s"
@@ -11111,12 +11124,12 @@ msgstr "サーバは SSL をサポートしていないようです"
#: camel/providers/smtp/camel-smtp-transport.c:358
#, c-format
-msgid "STARTTLS request timed out: %s"
-msgstr "STARTTLS 要求のタイムアウト: %s"
+msgid "STARTTLS command failed: %s"
+msgstr "STARTTLS コマンドが失敗しました: %s"
#: camel/providers/smtp/camel-smtp-transport.c:373
-msgid "STARTTLS response error"
-msgstr "STARTTLS 応答エラー"
+msgid "STARTTLS command failed"
+msgstr "STARTTLS コマンドが失敗しました"
#: camel/providers/smtp/camel-smtp-transport.c:476
#, c-format
@@ -11150,114 +11163,111 @@ msgid "SMTP mail delivery via %s"
msgstr "%s 経由で SMTP メールを配信します"
#: camel/providers/smtp/camel-smtp-transport.c:686
+msgid "Cannot send message: service not connected."
+msgstr "メッセージを送信できません: サービスが接続されていません"
+
+#: camel/providers/smtp/camel-smtp-transport.c:692
msgid "Cannot send message: sender address not valid."
-msgstr "メッセージを送信できません: 差出人のアドレスが正しくありません。"
+msgstr "メッセージを送信できません: 差出人のアドレスが正しくありません"
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:606
+#: camel/providers/smtp/camel-smtp-transport.c:696
msgid "Sending message"
msgstr "メッセージの送信中"
-#: camel/providers/smtp/camel-smtp-transport.c:706
+#: camel/providers/smtp/camel-smtp-transport.c:711
msgid "Cannot send message: no recipients defined."
-msgstr "メッセージを送信できません: 宛先が定義されていません。"
+msgstr "メッセージを送信できません: 宛先が定義されていません"
-#: camel/providers/smtp/camel-smtp-transport.c:717
+#: camel/providers/smtp/camel-smtp-transport.c:722
msgid "Cannot send message: one or more invalid recipients"
-msgstr "メッセージを送信できません: 不正な応答が一つ以上あります。"
+msgstr "メッセージを送信できません: 不正な応答が一つ以上あります"
-#: camel/providers/smtp/camel-smtp-transport.c:885
+#: camel/providers/smtp/camel-smtp-transport.c:894
msgid "SMTP Greeting"
msgstr "SMTP 接続中"
-#: camel/providers/smtp/camel-smtp-transport.c:934
+#: camel/providers/smtp/camel-smtp-transport.c:943
#, c-format
-msgid "HELO request timed out: %s"
-msgstr "HELO 要求のタイムアウト: %s"
+msgid "HELO command failed: %s"
+msgstr "HELO コマンドが失敗しました: %s"
-#: camel/providers/smtp/camel-smtp-transport.c:956
-msgid "HELO response error"
-msgstr "HELO 応答エラー"
+#: camel/providers/smtp/camel-smtp-transport.c:960
+msgid "HELO command failed"
+msgstr "HELO コマンドが失敗しました"
-#: camel/providers/smtp/camel-smtp-transport.c:1022
+#: camel/providers/smtp/camel-smtp-transport.c:1026
msgid "SMTP Authentication"
msgstr "SMTP 認証"
-#: camel/providers/smtp/camel-smtp-transport.c:1028
+#: camel/providers/smtp/camel-smtp-transport.c:1032
msgid "Error creating SASL authentication object."
msgstr "SASL 認証オブジェクトの生成中にエラーが発生しました"
-#: camel/providers/smtp/camel-smtp-transport.c:1045
-#: camel/providers/smtp/camel-smtp-transport.c:1057
+#: camel/providers/smtp/camel-smtp-transport.c:1049
+#: camel/providers/smtp/camel-smtp-transport.c:1060
#, c-format
-msgid "AUTH request timed out: %s"
-msgstr "AUTH 要求のタイムアウト: %s"
+msgid "AUTH command failed: %s"
+msgstr "AUTH コマンドが失敗しました: %s"
#: camel/providers/smtp/camel-smtp-transport.c:1066
-msgid "AUTH request failed."
-msgstr "AUTH 要求に失敗しました"
+msgid "AUTH command failed"
+msgstr "AUTH コマンドが失敗しました"
-#: camel/providers/smtp/camel-smtp-transport.c:1127
+#: camel/providers/smtp/camel-smtp-transport.c:1128
msgid "Bad authentication response from server.\n"
msgstr "サーバから間違った認証応答がありました\n"
-#: camel/providers/smtp/camel-smtp-transport.c:1152
+#: camel/providers/smtp/camel-smtp-transport.c:1153
#, c-format
-msgid "MAIL FROM request timed out: %s: mail not sent"
-msgstr "MAIL FROM 要求のタイムアウト: %s: メールを送信しません"
+msgid "MAIL FROM command failed: %s: mail not sent"
+msgstr "MAIL FROM コマンドが失敗しました: %s: メールを送信しません"
-#: camel/providers/smtp/camel-smtp-transport.c:1172
-msgid "MAIL FROM response error"
-msgstr "MAIL FROM 応答エラー"
+#: camel/providers/smtp/camel-smtp-transport.c:1170
+msgid "MAIL FROM command failed"
+msgstr "MAIL FROM コマンドが失敗しました"
-#: camel/providers/smtp/camel-smtp-transport.c:1196
+#: camel/providers/smtp/camel-smtp-transport.c:1194
#, c-format
-msgid "RCPT TO request timed out: %s: mail not sent"
-msgstr "RCPT TO 要求のタイムアウト: %s: メールを送信しません"
+msgid "RCPT TO command failed: %s: mail not sent"
+msgstr "RCPT TO コマンドが失敗しました: %s: メールを送信しません"
-#: camel/providers/smtp/camel-smtp-transport.c:1218
+#: camel/providers/smtp/camel-smtp-transport.c:1213
#, c-format
msgid "RCPT TO <%s> failed"
-msgstr "RCPT TO <%s> 失敗"
+msgstr "RCPT TO <%s> コマンドが失敗しました"
-#: camel/providers/smtp/camel-smtp-transport.c:1257
+#: camel/providers/smtp/camel-smtp-transport.c:1252
+#: camel/providers/smtp/camel-smtp-transport.c:1310
+#: camel/providers/smtp/camel-smtp-transport.c:1329
#, c-format
-msgid "DATA request timed out: %s: mail not sent"
-msgstr "DATA 要求のタイムアウト: %s: メールを送信しません"
+msgid "DATA command failed: %s: mail not sent"
+msgstr "DATA コマンドが失敗しました: %s: メールを送信しません"
#. we should have gotten instructions on how to use the DATA command:
#. * 354 Enter mail, end with "." on a line by itself
#.
-#: camel/providers/smtp/camel-smtp-transport.c:1277
-msgid "DATA response error"
-msgstr "DATA 応答エラー"
+#: camel/providers/smtp/camel-smtp-transport.c:1269
+#: camel/providers/smtp/camel-smtp-transport.c:1345
+msgid "DATA command failed"
+msgstr "DATA コマンドが失敗しました"
-#: camel/providers/smtp/camel-smtp-transport.c:1318
-#: camel/providers/smtp/camel-smtp-transport.c:1341
+#: camel/providers/smtp/camel-smtp-transport.c:1368
#, c-format
-msgid "DATA send timed out: message termination: %s: mail not sent"
-msgstr "DATA 送信のタイムアウト: メッセージの終了: %s: メールを送信しません"
-
-#: camel/providers/smtp/camel-smtp-transport.c:1361
-msgid "DATA termination response error"
-msgstr "DATA 終了の応答エラー"
+msgid "RSET command failed: %s"
+msgstr "RSET コマンドが失敗しました: %s"
#: camel/providers/smtp/camel-smtp-transport.c:1384
-#, c-format
-msgid "RSET request timed out: %s"
-msgstr "RSET 要求のタイムアウト: %s"
+msgid "RSET command failed"
+msgstr "RSET コマンドが失敗しました"
-#: camel/providers/smtp/camel-smtp-transport.c:1404
-msgid "RSET response error"
-msgstr "RSET 応答エラー"
-
-#: camel/providers/smtp/camel-smtp-transport.c:1427
+#: camel/providers/smtp/camel-smtp-transport.c:1407
#, c-format
-msgid "QUIT request timed out: %s"
-msgstr "QUIT 要求のタイムアウト: %s"
+msgid "QUIT command failed: %s"
+msgstr "QUIT コマンドが失敗しました"
-#: camel/providers/smtp/camel-smtp-transport.c:1447
-msgid "QUIT response error"
-msgstr "QUIT 応答エラー"
+#: camel/providers/smtp/camel-smtp-transport.c:1421
+msgid "QUIT command failed"
+msgstr "QUIT コマンドが失敗しました"
#: composer/e-msg-composer-attachment-bar.c:104
#, c-format
@@ -11274,7 +11284,7 @@ msgstr "%.0fM"
msgid "%.0fG"
msgstr "%.0fG"
-#: composer/e-msg-composer-attachment-bar.c:301 mail/em-utils.c:1476
+#: composer/e-msg-composer-attachment-bar.c:301 mail/em-utils.c:1482
msgid "attachment"
msgstr "添付"
@@ -11282,11 +11292,11 @@ msgstr "添付"
msgid "Remove selected items from the attachment list"
msgstr "添付した内容の一覧から指定したアイテムを削除します"
-#: composer/e-msg-composer-attachment-bar.c:483
+#: composer/e-msg-composer-attachment-bar.c:492
msgid "Add attachment..."
msgstr "添付の追加..."
-#: composer/e-msg-composer-attachment-bar.c:484
+#: composer/e-msg-composer-attachment-bar.c:493
msgid "Attach a file to the message"
msgstr "メッセージへファイルを添付します"
@@ -11322,15 +11332,15 @@ msgstr "添付した内容を自動的に表示するか提示する"
msgid "You need to configure an account before you can compose mail."
msgstr "メールを作成する前にアカウントを設定して下さい。"
-#: composer/e-msg-composer-hdrs.c:507
+#: composer/e-msg-composer-hdrs.c:508
msgid "Posting destination"
msgstr "送信先を指定します"
-#: composer/e-msg-composer-hdrs.c:508
+#: composer/e-msg-composer-hdrs.c:509
msgid "Choose folders to post the message to."
msgstr "メッセージを投稿するフォルダを選択して下さい。"
-#: composer/e-msg-composer-hdrs.c:542
+#: composer/e-msg-composer-hdrs.c:543
msgid "Click here for the address book"
msgstr "アドレス帳のためにここでクリック"
@@ -11341,45 +11351,45 @@ msgstr "アドレス帳のためにここでクリック"
#. * because that causes from_changed to be called, which
#. * expects the reply_to fields to be initialized.
#.
-#: composer/e-msg-composer-hdrs.c:572
+#: composer/e-msg-composer-hdrs.c:573
msgid "Reply-To:"
msgstr "返信先:"
#.
#. * From
#.
-#: composer/e-msg-composer-hdrs.c:578
+#: composer/e-msg-composer-hdrs.c:579
msgid "From:"
msgstr "差出人:"
#.
#. * Subject
#.
-#: composer/e-msg-composer-hdrs.c:584
+#: composer/e-msg-composer-hdrs.c:585
msgid "Subject:"
msgstr "件名:"
-#: composer/e-msg-composer-hdrs.c:593
+#: composer/e-msg-composer-hdrs.c:594
msgid "To:"
msgstr "宛先:"
-#: composer/e-msg-composer-hdrs.c:594
+#: composer/e-msg-composer-hdrs.c:595
msgid "Enter the recipients of the message"
msgstr "メッセージの宛先を入力します"
-#: composer/e-msg-composer-hdrs.c:597
+#: composer/e-msg-composer-hdrs.c:598
msgid "Cc:"
msgstr "Cc:"
-#: composer/e-msg-composer-hdrs.c:598
+#: composer/e-msg-composer-hdrs.c:599
msgid "Enter the addresses that will receive a carbon copy of the message"
msgstr "メッセージのカーボン・コピー (CC) を受信するアドレスを入力します"
-#: composer/e-msg-composer-hdrs.c:601
+#: composer/e-msg-composer-hdrs.c:602
msgid "Bcc:"
msgstr "Bcc:"
-#: composer/e-msg-composer-hdrs.c:602
+#: composer/e-msg-composer-hdrs.c:603
msgid ""
"Enter the addresses that will receive a carbon copy of the message without "
"appearing in the recipient list of the message."
@@ -11390,11 +11400,11 @@ msgstr ""
#.
#. * Post-To
#.
-#: composer/e-msg-composer-hdrs.c:609
+#: composer/e-msg-composer-hdrs.c:610
msgid "Post To:"
msgstr "送信先:"
-#: composer/e-msg-composer-hdrs.c:614
+#: composer/e-msg-composer-hdrs.c:615
msgid "Click here to select folders to post to"
msgstr "<ここをクリックして投稿するフォルダを選択して下さい>"
@@ -11505,6 +11515,10 @@ msgstr ""
"\n"
"この変更を保存しますか?"
+#: composer/e-msg-composer.c:1560
+msgid "Untitled Message"
+msgstr "タイトルなしのメッセージ"
+
#: composer/e-msg-composer.c:1567
msgid "Warning: Modified Message"
msgstr "警告: 変更済みのメッセージ"
@@ -11517,7 +11531,7 @@ msgstr "ファイルを開く"
msgid "Signature:"
msgstr "署名:"
-#: composer/e-msg-composer.c:2085 mail/mail-account-gui.c:1259
+#: composer/e-msg-composer.c:2085 mail/mail-account-gui.c:1311
msgid "Autogenerated"
msgstr "自動生成"
@@ -11570,7 +11584,7 @@ msgstr ""
"コンポーザ・ウィンドウを作成できませんでした:\n"
"HTML エディタ・コンポーネントを開けません。"
-#: composer/e-msg-composer.c:4237
+#: composer/e-msg-composer.c:4239
msgid ""
"<b>(The composer contains a non-text message body, which cannot be edited.)"
"<b>"
@@ -11695,7 +11709,7 @@ msgid ""
msgstr ""
"開封通知つきで E-メールを受信した際に、Evolution でどう処理するかを指定します"
-#: e-util/e-dialog-utils.c:247
+#: e-util/e-dialog-utils.c:249
msgid ""
"A file by that name already exists.\n"
"Overwrite it?"
@@ -11703,15 +11717,15 @@ msgstr ""
"既にその名前のファイルがあります。\n"
"上書きしますか?"
-#: e-util/e-dialog-utils.c:249
+#: e-util/e-dialog-utils.c:251
msgid "Overwrite file?"
msgstr "ファイルを上書きしますか?"
-#: e-util/e-passwords.c:357
+#: e-util/e-passwords.c:358
msgid "Remember this password"
msgstr "このパスワードを記憶する"
-#: e-util/e-passwords.c:359
+#: e-util/e-passwords.c:360
msgid "Remember this password for the remainder of this session"
msgstr "このパスワードをこのセッション用に保存する"
@@ -11725,12 +11739,16 @@ msgstr "カテゴリの同期:"
#. strptime format of a weekday, a date and a time,
#. in 12-hour format, without seconds.
+#. strftime format of a weekday, a date and a
+#. time, in 12-hour format, without seconds.
#: e-util/e-time-utils.c:185 e-util/e-time-utils.c:398
msgid "%a %m/%d/%Y %I:%M %p"
msgstr "%Y/%m/%d (%a) %p %I:%M"
#. strptime format of a weekday, a date and a time,
#. in 24-hour format, without seconds.
+#. strftime format of a weekday, a date and a
+#. time, in 24-hour format, without seconds.
#: e-util/e-time-utils.c:190 e-util/e-time-utils.c:389
msgid "%a %m/%d/%Y %H:%M"
msgstr "%Y/%m/%d (%a) %H:%M"
@@ -11782,25 +11800,33 @@ msgid "%m/%d/%Y %H"
msgstr "%Y/%m/%d %H時"
#. strptime format for a time of day, in 12-hour format.
+#. strftime format of a time in 12-hour format.
#: e-util/e-time-utils.c:339 e-util/e-time-utils.c:438
msgid "%I:%M:%S %p"
msgstr "%p %I時%M分%S秒"
#. strptime format for a time of day, in 24-hour format.
+#. strftime format of a time in 24-hour format.
#: e-util/e-time-utils.c:343 e-util/e-time-utils.c:430
msgid "%H:%M:%S"
msgstr "%H時%M分%S秒"
#. strptime format for time of day, without seconds,
#. in 12-hour format.
+#. strftime format of a time in 12-hour format,
+#. without seconds.
+#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
#: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
-#: widgets/misc/e-dateedit.c:1416 widgets/misc/e-dateedit.c:1641
+#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
msgid "%I:%M %p"
msgstr "%p %I時%M分"
#. strptime format for time of day, without seconds 24-hour format.
+#. strftime format of a time in 24-hour format,
+#. without seconds.
+#. This is a strftime() format. %H = hour (0-23), %M = minute.
#: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
-#: widgets/misc/e-dateedit.c:1413 widgets/misc/e-dateedit.c:1638
+#: widgets/misc/e-dateedit.c:1411 widgets/misc/e-dateedit.c:1636
msgid "%H:%M"
msgstr "%H時%M分"
@@ -11809,118 +11835,100 @@ msgstr "%H時%M分"
msgid "%I %p"
msgstr "%p %I時"
-#: filter/filter-datespec.c:65
+#: filter/filter-datespec.c:73
+#, c-format
msgid "1 second ago"
-msgstr "1 秒前"
+msgid_plural "%d seconds ago"
+msgstr[0] "1 秒前"
+msgstr[1] "%d 秒前"
-#: filter/filter-datespec.c:65
+#: filter/filter-datespec.c:74
#, c-format
-msgid "%d seconds ago"
-msgstr "%d 秒前"
-
-#: filter/filter-datespec.c:66
msgid "1 minute ago"
-msgstr "1 分前"
+msgid_plural "%d minutes ago"
+msgstr[0] "1 分前"
+msgstr[1] "%d 分前"
-#: filter/filter-datespec.c:66
+#: filter/filter-datespec.c:75
#, c-format
-msgid "%d minutes ago"
-msgstr "%d 分前"
-
-#: filter/filter-datespec.c:67
msgid "1 hour ago"
-msgstr "1 時間前"
+msgid_plural "%d hours ago"
+msgstr[0] "1 時間前"
+msgstr[1] "%d 時間前"
-#: filter/filter-datespec.c:67
+#: filter/filter-datespec.c:76
#, c-format
-msgid "%d hours ago"
-msgstr "%d 時間前"
-
-#: filter/filter-datespec.c:68
msgid "1 day ago"
-msgstr "1 日前"
+msgid_plural "%d days ago"
+msgstr[0] "1 日前"
+msgstr[1] "%d 日前"
-#: filter/filter-datespec.c:68
+#: filter/filter-datespec.c:77
#, c-format
-msgid "%d days ago"
-msgstr "%d 日前"
-
-#: filter/filter-datespec.c:69
msgid "1 week ago"
-msgstr "1 週間前"
+msgid_plural "%d weeks ago"
+msgstr[0] "1 週間前"
+msgstr[1] "%d 週間前"
-#: filter/filter-datespec.c:69
+#: filter/filter-datespec.c:78
#, c-format
-msgid "%d weeks ago"
-msgstr "%d 週間前"
-
-#: filter/filter-datespec.c:70
msgid "1 month ago"
-msgstr "1 ヶ月前"
+msgid_plural "%d months ago"
+msgstr[0] "1 ヶ月前"
+msgstr[1] "%d ヶ月前"
-#: filter/filter-datespec.c:70
+#: filter/filter-datespec.c:79
#, c-format
-msgid "%d months ago"
-msgstr "%d ヶ月前"
-
-#: filter/filter-datespec.c:71
msgid "1 year ago"
-msgstr "1 年前"
+msgid_plural "%d years ago"
+msgstr[0] "1 年前"
+msgstr[1] "%d 年前"
-#: filter/filter-datespec.c:71
-#, c-format
-msgid "%d years ago"
-msgstr "%d 年前"
-
-#: filter/filter-datespec.c:176
+#: filter/filter-datespec.c:187
msgid "You must choose a date."
msgstr "日付を選択して下さい。"
-#: filter/filter-datespec.c:275
+#: filter/filter-datespec.c:287
msgid "<click here to select a date>"
msgstr "<ここをクリックして日付を選択して下さい>"
-#: filter/filter-datespec.c:278 filter/filter-datespec.c:289
+#: filter/filter-datespec.c:290 filter/filter-datespec.c:301
msgid "now"
msgstr "現在"
#. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: filter/filter-datespec.c:285
+#: filter/filter-datespec.c:297
msgid "%d-%b-%Y"
msgstr "%Y-%m-%d"
-#: filter/filter-datespec.c:406
+#: filter/filter-datespec.c:413
msgid "Select a time to compare against"
msgstr "比較するもう一つの時間の選択"
-#: filter/filter-editor.c:114 filter/filter.glade.h:4
-msgid "Filter Rules"
-msgstr "フィルタのルール"
-
#: filter/filter-file.c:166
msgid "You must specify a file name."
msgstr "ファイル名を指定して下さい。"
-#: filter/filter-file.c:184
+#: filter/filter-file.c:185
#, c-format
msgid "File '%s' does not exist or is not a regular file."
msgstr "ファイル '%s' は存在しないか、または通常のファイルではありません。"
-#: filter/filter-file.c:299
+#: filter/filter-file.c:301
msgid "Choose a file"
msgstr "ファイルの選択"
#. and now for the action area
#: filter/filter-filter.c:491
-msgid "Then"
-msgstr "その結果"
+msgid "<b>Then</b>"
+msgstr "<b>実施</b> "
#: filter/filter-folder.c:153
msgid "You must specify a folder."
msgstr "フォルダを指定して下さい。"
-#: filter/filter-folder.c:242 filter/vfolder-rule.c:505
-#: mail/mail-account-gui.c:1098
+#: filter/filter-folder.c:243 filter/vfolder-rule.c:507
+#: mail/mail-account-gui.c:1147
msgid "Select Folder"
msgstr "フォルダの選択"
@@ -11950,7 +11958,7 @@ msgstr "ToDo"
msgid "Later"
msgstr "保留"
-#: filter/filter-part.c:531 shell/GNOME_Evolution_Test.server.in.in.h:3
+#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
msgid "Test"
msgstr "テスト"
@@ -11958,59 +11966,79 @@ msgstr "テスト"
msgid "You must name this filter."
msgstr "このフィルタに名前を付けて下さい。"
-#: filter/filter-rule.c:751
-msgid "Rule name: "
-msgstr "ルール名: "
+#: filter/filter-rule.c:752
+msgid "Rule name:"
+msgstr "ルール名:"
-#: filter/filter-rule.c:755
+#: filter/filter-rule.c:756
msgid "Untitled"
msgstr "タイトルなし"
-#: filter/filter-rule.c:772
-msgid "If"
-msgstr "もし"
+#: filter/filter-rule.c:779
+msgid "<b>If</b>"
+msgstr "<b>条件</b> "
-#: filter/filter-rule.c:791
+#: filter/filter-rule.c:810
msgid "Execute actions"
msgstr "次の条件で実行する:"
-#: filter/filter-rule.c:795
+#: filter/filter-rule.c:814
msgid "if all criteria are met"
msgstr "全ての条件が合った時"
-#: filter/filter-rule.c:800
+#: filter/filter-rule.c:819
msgid "if any criteria are met"
msgstr "幾つかの条件が合った時"
-#: filter/filter-rule.c:895
+#: filter/filter-rule.c:910
msgid "incoming"
msgstr "入力"
-#: filter/filter-rule.c:895
+#: filter/filter-rule.c:910
msgid "outgoing"
msgstr "出力"
#: filter/filter.glade.h:1
+msgid " "
+msgstr " "
+
+#: filter/filter.glade.h:2
+msgid "<b>Filter Rules</b>"
+msgstr "<b>フィルタのルール</b>"
+
+#: filter/filter.glade.h:3
+msgid "<b>Virtual _Folders</b>"
+msgstr "<b>仮想フォルダ(_F)</b>"
+
+#: filter/filter.glade.h:4
+msgid "<b>_Filter Rules</b>"
+msgstr "<b>フィルタのルール(_F)</b>"
+
+#: filter/filter.glade.h:5
+msgid "<b>vFolder Sources</b>"
+msgstr "<b>仮想フォルダのソース</b>"
+
+#: filter/filter.glade.h:6
msgid "Compare against"
msgstr "逆比較"
-#: filter/filter.glade.h:2
+#: filter/filter.glade.h:7
msgid "Edit Filters"
msgstr "フィルタを編集"
-#: filter/filter.glade.h:3
+#: filter/filter.glade.h:8
msgid "Edit VFolders"
msgstr "仮想フォルダの編集"
-#: filter/filter.glade.h:5
+#: filter/filter.glade.h:9
msgid "Incoming"
msgstr "入力"
-#: filter/filter.glade.h:6
+#: filter/filter.glade.h:10
msgid "Outgoing"
msgstr "出力"
-#: filter/filter.glade.h:7
+#: filter/filter.glade.h:11
msgid ""
"The message's date will be compared against\n"
"12:00am of the date specified."
@@ -12018,7 +12046,7 @@ msgstr ""
"メッセージの日付は\n"
"指定した日付の 0:00 と比較されます。"
-#: filter/filter.glade.h:9
+#: filter/filter.glade.h:13
msgid ""
"The message's date will be compared against\n"
"a time relative to when filtering occurs."
@@ -12026,7 +12054,7 @@ msgstr ""
"メッセージの日付は、フィルタが実行された時の\n"
"相対的な時間と比較されます。"
-#: filter/filter.glade.h:11
+#: filter/filter.glade.h:15
msgid ""
"The message's date will be compared against\n"
"the current time when filtering occurs."
@@ -12034,59 +12062,51 @@ msgstr ""
"メッセージの日付は、フィルタが実行された時の\n"
"現在の時刻と比較されます。"
-#: filter/filter.glade.h:13 filter/vfolder-editor.c:112
-msgid "Virtual Folders"
-msgstr "仮想フォルダ"
-
-#: filter/filter.glade.h:15
+#: filter/filter.glade.h:18
msgid "a time relative to the current time"
msgstr "現在時刻への相対時間"
-#: filter/filter.glade.h:16
+#: filter/filter.glade.h:19
msgid "ago"
msgstr "前"
-#: filter/filter.glade.h:20
+#: filter/filter.glade.h:23
msgid "months"
msgstr "月"
-#: filter/filter.glade.h:21 mail/mail-config.glade.h:183
+#: filter/filter.glade.h:24 mail/mail-config.glade.h:183
msgid "seconds"
msgstr " 秒"
-#: filter/filter.glade.h:22
+#: filter/filter.glade.h:25
msgid "specific folders only"
msgstr "指定したフォルダだけ"
-#: filter/filter.glade.h:23
+#: filter/filter.glade.h:26
msgid "the current time"
msgstr "現在時刻"
-#: filter/filter.glade.h:24
+#: filter/filter.glade.h:27
msgid "the time you specify"
msgstr "指定した時間"
-#: filter/filter.glade.h:25
-msgid "vFolder Sources"
-msgstr "仮想フォルダのソース"
-
-#: filter/filter.glade.h:26
+#: filter/filter.glade.h:28
msgid "weeks"
msgstr "週"
-#: filter/filter.glade.h:27
+#: filter/filter.glade.h:29
msgid "with all active remote folders"
msgstr "有効な全てのリモート・フォルダ"
-#: filter/filter.glade.h:28
+#: filter/filter.glade.h:30
msgid "with all local and active remote folders"
msgstr "全てのローカル・フォルダと有効なリモート・フォルダ"
-#: filter/filter.glade.h:29
+#: filter/filter.glade.h:31
msgid "with all local folders"
msgstr "全てのローカル・フォルダ"
-#: filter/filter.glade.h:30
+#: filter/filter.glade.h:32
msgid "years"
msgstr "年"
@@ -12219,7 +12239,7 @@ msgstr "にフラグがない"
msgid "Junk Test"
msgstr "ジャンクのテスト"
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:783
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:773
#: widgets/misc/e-expander.c:189
msgid "Label"
msgstr "ラベル"
@@ -12325,8 +12345,8 @@ msgstr "が次のもので始まる"
msgid "Stop Processing"
msgstr "処理停止"
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1484
-#: mail/em-format-quote.c:301 mail/em-format.c:747 mail/em-mailer-prefs.c:72
+#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1512
+#: mail/em-format-quote.c:301 mail/em-format.c:748 mail/em-mailer-prefs.c:72
#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
#: smime/lib/e-cert.c:1079
msgid "Subject"
@@ -12336,17 +12356,13 @@ msgstr "件名"
msgid "Unset Status"
msgstr "ステータスの解除"
-#: filter/rule-context.c:682 filter/rule-editor.c:243 filter/rule-editor.c:328
+#: filter/rule-context.c:682 filter/rule-editor.c:239 filter/rule-editor.c:326
#: mail/mail-vfolder.c:1007
#, c-format
msgid "Rule name '%s' is not unique, choose another."
msgstr "ルール名 '%s' がユニークではありません。別のものを選択して下さい"
-#: filter/rule-editor.c:172
-msgid "Rules"
-msgstr "ルール"
-
-#: filter/rule-editor.c:293
+#: filter/rule-editor.c:291
msgid "Add Rule"
msgstr "ルールの追加"
@@ -12398,11 +12414,11 @@ msgstr "件名が次のものを含まない"
msgid "You must name this vfolder."
msgstr "この仮想フォルダに名前を付けて下さい。"
-#: filter/vfolder-rule.c:229
+#: filter/vfolder-rule.c:230
msgid "You need to to specify at least one folder as a source."
msgstr "ソースとして少なくとも一つフォルダを指定する必要があります。"
-#: filter/vfolder-rule.c:585
+#: filter/vfolder-rule.c:587
msgid "VFolder source"
msgstr "仮想フォルダのソース"
@@ -12451,7 +12467,7 @@ msgstr "Evolution メール・フォルダ・ビューア"
msgid "Evolution Mail preferences control"
msgstr "Evolution メール設定コントロール"
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:826
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:830
#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1872
#: mail/importers/pine-importer.c:473
msgid "Mail"
@@ -12474,15 +12490,15 @@ msgid "Don't delete"
msgstr "削除しない"
#. translators: default account indicator
-#: mail/em-account-prefs.c:439
+#: mail/em-account-prefs.c:445
msgid "[Default]"
msgstr "[デフォルト]"
-#: mail/em-account-prefs.c:493
+#: mail/em-account-prefs.c:499
msgid "Account name"
msgstr "アカウント名"
-#: mail/em-account-prefs.c:495
+#: mail/em-account-prefs.c:501
msgid "Protocol"
msgstr "プロトコル"
@@ -12564,7 +12580,7 @@ msgstr ""
"このアカウントの草案フォルダを開けません。\n"
"デフォルトの草案フォルダを使ってもよろしいですか?"
-#: mail/em-folder-browser.c:133
+#: mail/em-folder-browser.c:137
msgid "Create _Virtual Folder From Search..."
msgstr "検索結果から仮想フォルダの作成(_V)..."
@@ -12594,272 +12610,301 @@ msgstr "未読のメッセージ数"
msgid "<click here to select a folder>"
msgstr "<ここをクリックしてフォルダを選択して下さい>"
-#: mail/em-folder-selector.c:137 shell/e-shell-folder-creation-dialog.c:318
+#: mail/em-folder-selector.c:166 shell/e-shell-folder-creation-dialog.c:318
msgid "Create New Folder"
msgstr "新規フォルダの作成"
-#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1950
-#: mail/mail-component.c:597
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2217
+#: mail/mail-component.c:638
#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
msgid "Specify where to create the folder:"
msgstr "フォルダを作成する場所を指定して下さい:"
-#: mail/em-folder-selector.c:267
+#: mail/em-folder-selector.c:303
#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
msgid "Folder _name:"
msgstr "フォルダ名(_N):"
-#: mail/em-folder-tree-model.c:167 mail/em-folder-tree-model.c:169
+#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
#: mail/mail-vfolder.c:855
msgid "VFolders"
msgstr "仮想フォルダ"
-#: mail/em-folder-tree-model.c:177 mail/em-folder-tree-model.c:179
+#: mail/em-folder-tree-model.c:206 mail/em-folder-tree-model.c:208
msgid "UNMATCHED"
msgstr "一致しないもの"
#. Inbox is always first
-#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
+#: mail/em-folder-tree-model.c:236 mail/em-folder-tree-model.c:238
msgid "Inbox"
msgstr "受信箱"
-#: mail/em-folder-tree-model.c:458 mail/em-folder-tree-model.c:741
+#: mail/em-folder-tree-model.c:483 mail/em-folder-tree-model.c:792
msgid "Loading..."
msgstr "読み込み中..."
-#: mail/em-folder-tree.c:831
+#: mail/em-folder-tree.c:874
+#, c-format
+msgid "Moving folder %s"
+msgstr "フォルダ %s の移動中"
+
+#: mail/em-folder-tree.c:876
+#, c-format
+msgid "Copying folder %s"
+msgstr "フォルダ %s のコピー中"
+
+#: mail/em-folder-tree.c:883
+#, c-format
+msgid "Moving messages into folder %s"
+msgstr "フォルダ %s へメッセージの移動中"
+
+#: mail/em-folder-tree.c:885
+#, c-format
+msgid "Copying messages into folder %s"
+msgstr "フォルダ %s へメッセージのコピー中"
+
+#: mail/em-folder-tree.c:901
msgid "Cannot drop message(s) into toplevel store"
msgstr "メッセージをトップレベルの中に移せません"
-#: mail/em-folder-tree.c:1798
-#, fuzzy, c-format
+#: mail/em-folder-tree.c:1947
+#, c-format
msgid "Cannot move folder `%s': illegal operation"
-msgstr "フォルダ名を変更できません: %s: 不正な操作です"
+msgstr "フォルダ '%s' を移動できません: 不正な操作です"
-#: mail/em-folder-tree.c:1827 mail/em-folder-tree.c:1915
+#: mail/em-folder-tree.c:1976 mail/em-folder-tree.c:2152
#, c-format
msgid "%s"
msgstr "%s"
-#: mail/em-folder-tree.c:1843 mail/em-folder-tree.c:1856
-#: mail/em-folder-view.c:660 mail/em-folder-view.c:674
+#: mail/em-folder-tree.c:1992 mail/em-folder-tree.c:2005
+#: mail/em-folder-view.c:642 mail/em-folder-view.c:656
#: mail/importers/evolution-mbox-importer.c:119
msgid "Select folder"
msgstr "フォルダの選択"
-#: mail/em-folder-tree.c:1950 mail/mail-component.c:597
+#: mail/em-folder-tree.c:2032
+#, c-format
+msgid "Creating folder `%s'"
+msgstr "フォルダ '%s' の作成中"
+
+#: mail/em-folder-tree.c:2217 mail/mail-component.c:638
msgid "Create folder"
msgstr "フォルダの作成"
-#: mail/em-folder-tree.c:2069
+#: mail/em-folder-tree.c:2336
#, c-format
msgid "Could not delete folder: %s"
msgstr "フォルダを削除できませんでした: %s"
-#: mail/em-folder-tree.c:2094
-#, fuzzy, c-format
+#: mail/em-folder-tree.c:2361
+#, c-format
msgid "Cannot delete local %s folder."
-msgstr "フォルダを削除できません: %s: そのようなフォルダはありません"
+msgstr "ローカルのフォルダ '%s' を削除できません"
-#: mail/em-folder-tree.c:2100
+#: mail/em-folder-tree.c:2367
#, c-format
msgid "Really delete folder \"%s\" and all of its subfolders?"
msgstr "本当にフォルダ \"%s\" とそのサブフォルダの全てを削除しますか?"
-#: mail/em-folder-tree.c:2110
+#: mail/em-folder-tree.c:2377
#, c-format
msgid "Delete \"%s\""
msgstr "\"%s\" の削除"
-#: mail/em-folder-tree.c:2144
-#, fuzzy, c-format
+#: mail/em-folder-tree.c:2411
+#, c-format
msgid "Cannot rename local %s folder."
-msgstr "フォルダ名を変更できません: %s: そのようなフォルダはありません"
+msgstr "ローカルのフォルダ %s の名前を変更できません"
-#: mail/em-folder-tree.c:2153
+#: mail/em-folder-tree.c:2420
#, c-format
msgid "Rename the \"%s\" folder to:"
msgstr "フォルダ \"%s\" の変更先:"
-#: mail/em-folder-tree.c:2155
+#: mail/em-folder-tree.c:2422
msgid "Rename Folder"
msgstr "フォルダ名の変更"
-#: mail/em-folder-tree.c:2179
+#: mail/em-folder-tree.c:2446
#, c-format
msgid "A folder named \"%s\" already exists. Please use a different name."
msgstr "既にフォルダ名 \"%s\" があります。別の名前を使用して下さい。"
-#: mail/em-folder-tree.c:2225 ui/evolution-addressbook.xml.h:45
+#: mail/em-folder-tree.c:2492 ui/evolution-addressbook.xml.h:45
#: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:35
msgid "_View"
msgstr "表示(_V)"
-#: mail/em-folder-tree.c:2226
+#: mail/em-folder-tree.c:2493
msgid "Open in _New Window"
msgstr "新しいウィンドウで開く(_N)"
-#: mail/em-folder-tree.c:2231
+#: mail/em-folder-tree.c:2498
msgid "_Move"
msgstr "移動(_M)"
#. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2235
+#: mail/em-folder-tree.c:2502
msgid "_New Folder..."
msgstr "新しいフォルダ(_N)"
-#: mail/em-folder-tree.c:2238
+#: mail/em-folder-tree.c:2505
msgid "_Rename"
msgstr "名前の変更(_R)"
-#: mail/em-folder-tree.c:2241 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2508 ui/evolution-mail-list.xml.h:27
msgid "_Properties..."
msgstr "プロパティ(_P)..."
#. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:751 mail/em-popup.c:688
+#: mail/em-folder-view.c:741 mail/em-popup.c:688
msgid "_Edit as New Message..."
msgstr "新規のメッセージとして編集(_E)..."
-#: mail/em-folder-view.c:753
+#: mail/em-folder-view.c:743
msgid "_Print"
msgstr "印刷(_P)"
-#: mail/em-folder-view.c:756 ui/evolution-mail-message.xml.h:124
+#: mail/em-folder-view.c:746 ui/evolution-mail-message.xml.h:126
msgid "_Reply to Sender"
msgstr "差出人へ返信(_R)"
-#: mail/em-folder-view.c:757 mail/em-popup.c:808
-#: ui/evolution-mail-message.xml.h:86
+#: mail/em-folder-view.c:747 mail/em-popup.c:808
+#: ui/evolution-mail-message.xml.h:88
msgid "Reply to _List"
msgstr "メーリング・リストへ返信(_L)"
-#: mail/em-folder-view.c:758 mail/em-popup.c:809
-#: ui/evolution-mail-message.xml.h:85
+#: mail/em-folder-view.c:748 mail/em-popup.c:809
+#: ui/evolution-mail-message.xml.h:87
msgid "Reply to _All"
msgstr "全員へ返信(_A)"
-#: mail/em-folder-view.c:759 mail/em-popup.c:811
-#: ui/evolution-mail-message.xml.h:111
+#: mail/em-folder-view.c:749 mail/em-popup.c:811
+#: ui/evolution-mail-message.xml.h:113
msgid "_Forward"
msgstr "転送(_F)"
-#: mail/em-folder-view.c:762
+#: mail/em-folder-view.c:752
msgid "Follo_w Up..."
msgstr "フォロー・アップ(_W)..."
-#: mail/em-folder-view.c:763
+#: mail/em-folder-view.c:753
msgid "Fla_g Completed"
msgstr "完了フラグの付与(_G)"
-#: mail/em-folder-view.c:764
+#: mail/em-folder-view.c:754
msgid "Cl_ear Flag"
msgstr "フラグの解除(_E)"
-#: mail/em-folder-view.c:767 ui/evolution-mail-message.xml.h:48
+#: mail/em-folder-view.c:757 ui/evolution-mail-message.xml.h:50
msgid "Mar_k as Read"
msgstr "既読としてマーク(_K)"
-#: mail/em-folder-view.c:768
+#: mail/em-folder-view.c:758
msgid "Mark as _Unread"
msgstr "未読としてマーク(_U)"
-#: mail/em-folder-view.c:769
+#: mail/em-folder-view.c:759
msgid "Mark as _Important"
msgstr "重要としてマーク(_I)"
-#: mail/em-folder-view.c:770
+#: mail/em-folder-view.c:760
msgid "_Mark as Unimportant"
msgstr "重要でないとしてマーク(_M)"
-#: mail/em-folder-view.c:771 ui/evolution-mail-message.xml.h:52
+#: mail/em-folder-view.c:761 ui/evolution-mail-message.xml.h:54
msgid "Mark as _Junk"
msgstr "ジャンクとしてマーク(_J)"
-#: mail/em-folder-view.c:772 ui/evolution-mail-message.xml.h:53
+#: mail/em-folder-view.c:762 ui/evolution-mail-message.xml.h:55
msgid "Mark as _Not Junk"
msgstr "ジャンクではないとしてマーク(_N)"
-#: mail/em-folder-view.c:776
+#: mail/em-folder-view.c:766
msgid "U_ndelete"
msgstr "削除の取り消し(_N)"
-#: mail/em-folder-view.c:779
+#: mail/em-folder-view.c:769
msgid "Mo_ve to Folder..."
msgstr "フォルダへ移動(_V)..."
-#: mail/em-folder-view.c:780 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:770 ui/evolution-addressbook.xml.h:32
msgid "_Copy to Folder..."
msgstr "フォルダへコピー(_C)..."
-#: mail/em-folder-view.c:788
+#: mail/em-folder-view.c:778
msgid "Add Sender to Address_book"
msgstr "差出人をアドレス帳に追加"
-#: mail/em-folder-view.c:791
+#: mail/em-folder-view.c:781
msgid "Appl_y Filters"
msgstr "フィルタの適用(_Y)"
-#: mail/em-folder-view.c:794
+#: mail/em-folder-view.c:782
+msgid "F_ilter Junk"
+msgstr "Junk のフィルタ(_I)"
+
+#: mail/em-folder-view.c:785
msgid "Crea_te Rule From Message"
msgstr "メッセージからルールの作成(_T)"
-#: mail/em-folder-view.c:795
+#: mail/em-folder-view.c:786
msgid "VFolder on _Subject"
msgstr "件名の仮想フォルダ(_S)"
-#: mail/em-folder-view.c:796
+#: mail/em-folder-view.c:787
msgid "VFolder on Se_nder"
msgstr "差出人の仮想フォルダ(_N)"
-#: mail/em-folder-view.c:797
+#: mail/em-folder-view.c:788
msgid "VFolder on _Recipients"
msgstr "宛先の仮想フォルダ(_R)"
-#: mail/em-folder-view.c:798
+#: mail/em-folder-view.c:789
msgid "VFolder on Mailing _List"
msgstr "メーリング・リストの仮想フォルダ(_L)"
-#: mail/em-folder-view.c:800
+#: mail/em-folder-view.c:791
msgid "VFolder on Thread"
msgstr "仮想フォルダのスレッド表示"
-#: mail/em-folder-view.c:804
+#: mail/em-folder-view.c:795
msgid "Filter on Sub_ject"
msgstr "件名のフィルタ(_J)"
-#: mail/em-folder-view.c:805
+#: mail/em-folder-view.c:796
msgid "Filter on Sen_der"
msgstr "差出人のフィルタ(_D)"
-#: mail/em-folder-view.c:806
+#: mail/em-folder-view.c:797
msgid "Filter on Re_cipients"
msgstr "宛先のフィルタ(_C)"
-#: mail/em-folder-view.c:807
+#: mail/em-folder-view.c:798
msgid "Filter on _Mailing List"
msgstr "メーリング・リストのフィルタ(_M)"
-#: mail/em-folder-view.c:809
+#: mail/em-folder-view.c:800
msgid "Filter on Thread"
msgstr "スレッド表示のフィルタ"
#. default charset used in mail view
-#: mail/em-folder-view.c:1586 mail/em-folder-view.c:1624
+#: mail/em-folder-view.c:1583 mail/em-folder-view.c:1621
#: mail/mail-config.glade.h:41
msgid "Default"
msgstr "デフォルト"
-#: mail/em-folder-view.c:1660
+#: mail/em-folder-view.c:1657
msgid "Print Message"
msgstr "メッセージの印刷"
-#: mail/em-folder-view.c:1907
+#: mail/em-folder-view.c:1904
msgid "_Copy Link Location"
msgstr "リンク先のコピー(_C)"
-#: mail/em-folder-view.c:2174
+#: mail/em-folder-view.c:2171
#, c-format
msgid "Click to mail %s"
msgstr "メール %s をクリックして下さい"
@@ -12875,25 +12920,23 @@ msgid "Unsigned"
msgstr "署名なし"
#: mail/em-format-html-display.c:638
-#, fuzzy
msgid ""
"This message is not signed. There is no guarantee that this message is "
"authentic."
msgstr ""
-"このメッセージは署名されていません。このメッセージの差出人を証明できません。"
+"このメッセージは署名されていません。このメッセージの信頼性を保証できません。"
#: mail/em-format-html-display.c:639 mail/em-format-html.c:563
msgid "Valid signature"
msgstr "妥当な署名"
#: mail/em-format-html-display.c:639
-#, fuzzy
msgid ""
"This message is signed and is valid meaning that it is very likely that this "
"message is authentic."
msgstr ""
-"このメッセージには妥当な署名が付与されています。このメッセージの差出人は適切"
-"な人物と思われます。"
+"このメッセージには署名が付与されています。このメッセージは非常に信頼できるも"
+"のであることを意味します。"
#: mail/em-format-html-display.c:640 mail/em-format-html.c:564
msgid "Invalid signature"
@@ -12976,23 +13019,23 @@ msgstr "証明書の表示(_V)"
msgid "This certificate is not viewable"
msgstr "この証明書は表示可能な形式ではありません"
-#: mail/em-format-html-display.c:973
+#: mail/em-format-html-display.c:972
msgid "Completed on %B %d, %Y, %l:%M %p"
msgstr "%Y年%B%e日 %p %l:%M に完了"
-#: mail/em-format-html-display.c:981
+#: mail/em-format-html-display.c:980
msgid "Overdue:"
msgstr "期限切れ:"
-#: mail/em-format-html-display.c:984
+#: mail/em-format-html-display.c:983
msgid "by %B %d, %Y, %l:%M %p"
msgstr "%Y年%B%e日 %p %l:%M まで"
-#: mail/em-format-html-display.c:1054
+#: mail/em-format-html-display.c:1053
msgid "_View Inline"
msgstr "インライン表示(_V)"
-#: mail/em-format-html-display.c:1055
+#: mail/em-format-html-display.c:1054
msgid "_Hide"
msgstr "隠す(_H)"
@@ -13035,90 +13078,122 @@ msgstr "リモート・データ (%s) にリンクしています"
msgid "Pointer to unknown external data (\"%s\" type)"
msgstr "不明な外部データ (\"%s\" タイプ) にリンクしています"
-#: mail/em-format-html.c:1098
+#: mail/em-format-html.c:1129
msgid "Formatting message"
msgstr "メッセージの整形"
-#: mail/em-format-html.c:1375 mail/em-format-quote.c:191 mail/em-format.c:742
+#: mail/em-format-html.c:1406 mail/em-format-quote.c:191 mail/em-format.c:743
#: mail/em-mailer-prefs.c:67 mail/message-list.etspec.h:7
#: mail/message-tag-followup.c:301
msgid "From"
msgstr "差出人"
-#: mail/em-format-html.c:1375 mail/em-format-quote.c:191 mail/em-format.c:743
+#: mail/em-format-html.c:1406 mail/em-format-quote.c:191 mail/em-format.c:744
#: mail/em-mailer-prefs.c:68
msgid "Reply-To"
msgstr "返信先"
-#: mail/em-format-html.c:1375 mail/em-format-quote.c:191 mail/em-format.c:744
+#: mail/em-format-html.c:1406 mail/em-format-quote.c:191 mail/em-format.c:745
#: mail/em-mailer-prefs.c:69 mail/message-list.etspec.h:14
msgid "To"
msgstr "宛先"
-#: mail/em-format-html.c:1375 mail/em-format-quote.c:191 mail/em-format.c:745
+#: mail/em-format-html.c:1406 mail/em-format-quote.c:191 mail/em-format.c:746
#: mail/em-mailer-prefs.c:70
msgid "Cc"
msgstr "Cc"
-#: mail/em-format-html.c:1375 mail/em-format-quote.c:191 mail/em-format.c:746
+#: mail/em-format-html.c:1406 mail/em-format-quote.c:191 mail/em-format.c:747
#: mail/em-mailer-prefs.c:71
msgid "Bcc"
msgstr "Bcc"
-#: mail/em-format-html.c:1491 mail/em-format-quote.c:308
-#: mail/em-mailer-prefs.c:729
+#. pseudo-header
+#: mail/em-format-html.c:1516 mail/em-format-quote.c:308
+#: mail/em-mailer-prefs.c:769
msgid "Mailer"
msgstr "メール・クライアント"
#. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1517
+#: mail/em-format-html.c:1543
msgid "<I> (%a, %R %Z)</I>"
msgstr "<I> (%R %a %Z)</I>"
#. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1520
+#: mail/em-format-html.c:1546
msgid "<I> (%R %Z)</I>"
msgstr "<I> (%R %Z)</I>"
-#: mail/em-format-html.c:1532 mail/em-format-quote.c:315 mail/em-format.c:748
+#: mail/em-format-html.c:1556 mail/em-format-quote.c:315 mail/em-format.c:749
#: mail/em-mailer-prefs.c:73 mail/message-list.etspec.h:2
msgid "Date"
msgstr "日付"
-#: mail/em-format.c:963
+#: mail/em-format-html.c:1577 mail/em-format.c:750 mail/em-mailer-prefs.c:74
+msgid "Newsgroups"
+msgstr "ニュースグループ"
+
+#: mail/em-format.c:987
#, c-format
msgid "%s attachment"
msgstr "添付ファイル: %s"
-#: mail/em-format.c:1042 mail/em-format.c:1161
+#: mail/em-format.c:1066 mail/em-format.c:1188
msgid "Could not parse S/MIME message: Unknown error"
msgstr "S/MIME メッセージを解析できませんでした: 不明なエラーです"
-#: mail/em-format.c:1151
+#: mail/em-format.c:1086 mail/em-format.c:1106 mail/em-format.c:1130
+#: mail/em-format.c:1223
+#, c-format
+msgid "Internal error: expecting CamelMultipart, got \"%s\""
+msgstr "内部エラー: CamelMultipart を要求しましたが \"%s\" を受け取りました"
+
+#: mail/em-format.c:1178
msgid "Unsupported encryption type for multipart/encrypted"
msgstr "サポートしていない S/MIME の暗号化の種類"
-#: mail/em-format.c:1297
+#: mail/em-format.c:1325
msgid "Could not parse MIME message. Displaying as source."
msgstr "MIME メッセージを解析できませんでした。ソースを表示します。"
-#: mail/em-format.c:1316
+#: mail/em-format.c:1344
msgid "Unsupported signature format"
msgstr "サポートしていない署名の書式"
-#: mail/em-format.c:1324
-#, fuzzy
+#: mail/em-format.c:1352
msgid "Error verifying signature"
-msgstr "署名を検証する際に不明なエラーが発生しました"
+msgstr "署名を検証する際にエラーが発生しました"
-#: mail/em-format.c:1324
+#: mail/em-format.c:1352
msgid "Unknown error verifying signature"
msgstr "署名を検証する際に不明なエラーが発生しました"
+#: mail/em-format.c:1372
+#, c-format
+msgid "Internal error: expecting CamelMimeMessage, got \"%s\""
+msgstr ""
+"内部エラー: GamelIMimeMessage を要求しましたが、\"%s\" を受け取りました"
+
#: mail/em-junk-filter.c:82
msgid "Spamassassin (built-in)"
msgstr "Spamassassin (内蔵)"
+#: mail/em-mailer-prefs.c:85
+msgid "Every time"
+msgstr "いつでも"
+
+#: mail/em-mailer-prefs.c:86
+msgid "Once per day"
+msgstr "日に一度"
+
+#: mail/em-mailer-prefs.c:87
+msgid "Once per week"
+msgstr "週に一度"
+
+#: mail/em-mailer-prefs.c:88
+msgid "Once per month"
+msgstr "月に一度"
+
#: mail/em-migrate.c:1079
msgid ""
"The location and hierarchy of the Evolution mailbox folders has changed "
@@ -13237,7 +13312,7 @@ msgstr "差出人が不明"
msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
msgstr "%Y/%m/%d (%a) %H:%M %%+05d に %%s さんは書きました:"
-#: mail/em-utils.c:1426 mail/em-utils.c:1510 mail/em-utils.c:1519
+#: mail/em-utils.c:1432 mail/em-utils.c:1516 mail/em-utils.c:1525
#, c-format
msgid ""
"Cannot save to `%s'\n"
@@ -13246,7 +13321,7 @@ msgstr ""
"'%s' へ保存できません。\n"
" %s"
-#: mail/em-utils.c:1431
+#: mail/em-utils.c:1437
#, c-format
msgid ""
"`%s' already exists.\n"
@@ -13255,35 +13330,35 @@ msgstr ""
"既に '%s' があります。\n"
"上書きしてもよろしいですか?"
-#: mail/em-utils.c:1474
+#: mail/em-utils.c:1480
msgid "message"
msgstr "メッセージ"
-#: mail/em-utils.c:1526
+#: mail/em-utils.c:1532
#, c-format
msgid "Error: '%s' exists and is not a regular file"
msgstr "エラー: '%s' は存在していますが、通常のファイルではありません。"
-#: mail/em-utils.c:1580
+#: mail/em-utils.c:1586
msgid "Save Message..."
msgstr "メッセージの保存..."
-#: mail/em-utils.c:1618
+#: mail/em-utils.c:1635
msgid "Add address"
msgstr "住所の追加"
#. Drop filename for messages from a mailbox
-#: mail/em-utils.c:2052
-#, fuzzy, c-format
+#: mail/em-utils.c:2070
+#, c-format
msgid "Messages from %s"
-msgstr "%s からメール"
+msgstr "%s からのメッセージ"
-#: mail/em-utils.c:2103
+#: mail/em-utils.c:2121
#, c-format
msgid "Could not create temporary directory: %s"
msgstr "作業フォルダを作成できませんでした: %s"
-#: mail/em-utils.c:2434
+#: mail/em-utils.c:2452
#, c-format
msgid ""
"This operation will permanently remove all deleted messages in the folder `%"
@@ -13296,7 +13371,7 @@ msgstr ""
"\n"
"本当にこれらのメッセージを削除しますか?"
-#: mail/em-utils.c:2459
+#: mail/em-utils.c:2477
msgid ""
"This operation will permanently remove all deleted messages in all folders. "
"If you continue, you will not be able to recover these messages.\n"
@@ -13329,14 +13404,12 @@ msgid "Citation highlight colour."
msgstr "引用を強調表示する際の色です。"
#: mail/evolution-mail.schemas.in.in.h:6
-#, fuzzy
msgid "Composer Window default height"
-msgstr "メッセージ・ウィンドウの高さ (デフォルト)"
+msgstr "メッセージ作成ウィンドウの高さ (デフォルト)"
#: mail/evolution-mail.schemas.in.in.h:7
-#, fuzzy
msgid "Composer Window default width"
-msgstr "メッセージ・ウィンドウの幅 (デフォルト)"
+msgstr "メッセージ作成ウィンドウの幅 (デフォルト)"
#: mail/evolution-mail.schemas.in.in.h:8
msgid "Default charset in which to compose messages"
@@ -13359,9 +13432,8 @@ msgid "Default forward style"
msgstr "デフォルトの転送スタイル"
#: mail/evolution-mail.schemas.in.in.h:13
-#, fuzzy
msgid "Default height of the Composer Window"
-msgstr "メッセージ・ウィンドウのデフォルトの高さです。"
+msgstr "メッセージ作成ウィンドウのデフォルトの高さです。"
#: mail/evolution-mail.schemas.in.in.h:14
msgid "Default height of the Message Window"
@@ -13372,9 +13444,8 @@ msgid "Default reply style"
msgstr "デフォルトの返信スタイル"
#: mail/evolution-mail.schemas.in.in.h:16
-#, fuzzy
msgid "Default width of the Composer Window"
-msgstr "メッセージ・ウィンドウのデフォルトの幅です。"
+msgstr "メッセージ作成ウィンドウのデフォルトの幅です。"
#: mail/evolution-mail.schemas.in.in.h:17
msgid "Default width of the Message Window"
@@ -13420,14 +13491,18 @@ msgstr ""
"データベースを表示する bonobo コンポーネント・ビューアにマップされます。"
#: mail/evolution-mail.schemas.in.in.h:26
+msgid "Last time empty trash was run"
+msgstr "最後にゴミ箱を空にした時間"
+
+#: mail/evolution-mail.schemas.in.in.h:27
msgid "List of Labels and their associated colours"
msgstr "ラベルと対応する色のリスト"
-#: mail/evolution-mail.schemas.in.in.h:27
+#: mail/evolution-mail.schemas.in.in.h:28
msgid "List of accounts"
msgstr "アカウントのリスト"
-#: mail/evolution-mail.schemas.in.in.h:28
+#: mail/evolution-mail.schemas.in.in.h:29
msgid ""
"List of accounts known to the mail component of Evolution. The list contains "
"strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -13436,11 +13511,11 @@ msgstr ""
"は /apps/evolution/mail/accounts からの相対的な名前つきサブ・フォルダが含まれ"
"ます。"
-#: mail/evolution-mail.schemas.in.in.h:29
+#: mail/evolution-mail.schemas.in.in.h:30
msgid "List of custom headers and whether they are enabled."
msgstr "カスタムのヘッダとそれらが有効かどうかのリストです。"
-#: mail/evolution-mail.schemas.in.in.h:30
+#: mail/evolution-mail.schemas.in.in.h:31
msgid ""
"List of labels known to the mail component of Evolution. The list contains "
"strings containing name:colour where colour uses the HTML hex encoding."
@@ -13448,15 +13523,15 @@ msgstr ""
"Evolution メール・コンポーザで利用するラベルのリストです。このリストには "
"name:color という形式で HTML で使用する色 (16形式) が含まれています。"
-#: mail/evolution-mail.schemas.in.in.h:31
+#: mail/evolution-mail.schemas.in.in.h:32
msgid "List of mime types to check for bonobo component viewers"
msgstr "bonobo コンポーネント・ビューアでチェックする MIME 型のリスト"
-#: mail/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:33
msgid "Load images for HTML messages over http"
msgstr "http を介して受信する HTML メッセージの画像読み込み"
-#: mail/evolution-mail.schemas.in.in.h:33
+#: mail/evolution-mail.schemas.in.in.h:34
msgid ""
"Load images for HTML messages over http(s). Possible values are: 0 - Never "
"load images off the net 1 - Load images if sender is in the addressbook 2 - "
@@ -13466,173 +13541,185 @@ msgstr ""
"可能な値: 0: 画像を読み込まない、1: 差出人がアドレス帳に登録されている場合は"
"読み込む、2: 画像を常に読み込む"
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:35
msgid "Log filter actions"
msgstr "ログのフィルタリング"
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:36
msgid "Log filter actions to the specified log file."
msgstr "指定したログ・ファイルに対してログのフィルタリング処理を行います。"
-#: mail/evolution-mail.schemas.in.in.h:36
+#: mail/evolution-mail.schemas.in.in.h:37
msgid "Logfile to log filter actions"
msgstr "フィルタリングするログ・ファイル"
-#: mail/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:38
msgid "Logfile to log filter actions."
msgstr "フィルタリング処理の対象となるログファイルです。"
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:39
msgid "Mark as Seen after specified timeout"
msgstr "既読マークを付与するまでの時間"
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:40
msgid "Mark as Seen after specified timeout."
msgstr "メールを指定してから既読マークを付与するまでの時間です。"
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:41
msgid "Mark citations in the message \"Preview\""
msgstr "メッセージの \"プレビュー\" で使用する引用記号"
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:42
msgid "Mark citations in the message \"Preview\"."
msgstr "メッセージの \"プレビュー\" で使用する引用記号です。"
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:43
msgid "Message Window default hight"
msgstr "メッセージ・ウィンドウの高さ (デフォルト)"
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:44
msgid "Message Window default width"
msgstr "メッセージ・ウィンドウの幅 (デフォルト)"
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:45
msgid "Message-display style (normal, full headers, source)"
msgstr "メッセージの表示スタイル (標準、全てのヘッダ、ソース)"
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:46
+msgid "Minimum days between emptying the trash on exit"
+msgstr "終了時にゴミ箱を空にするまでの最小日数"
+
+#: mail/evolution-mail.schemas.in.in.h:47
+msgid "Minimum time between emptying the trash on exit, in days."
+msgstr "終了時にゴミ箱を空にするまでの最短の日数です。"
+
+#: mail/evolution-mail.schemas.in.in.h:48
msgid "New Mail Notify sound file"
msgstr "新着メールの通知で使用するサウンド・ファイル"
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:49
msgid "New Mail Notify type"
msgstr "新着メール通知の種類"
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:50
msgid "Prompt on empty subject"
msgstr "件名が空の場合に警告する"
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:51
msgid "Prompt the user when he or she tries to expunge a folder."
msgstr "フォルダを完全に抹消する前にユーザに警告します。"
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:52
msgid ""
"Prompt the user when he or she tries to send a message without a Subject."
msgstr "送信するメールの件名が空の場合、送信する前に警告します。"
-#: mail/evolution-mail.schemas.in.in.h:50
+#: mail/evolution-mail.schemas.in.in.h:53
msgid "Prompt when user expunges"
msgstr "ユーザが完全削除する際に警告する"
-#: mail/evolution-mail.schemas.in.in.h:51
+#: mail/evolution-mail.schemas.in.in.h:54
msgid "Prompt when user only fills Bcc"
msgstr "ユーザが Bcc のみ入力したら警告する"
-#: mail/evolution-mail.schemas.in.in.h:52
+#: mail/evolution-mail.schemas.in.in.h:55
msgid ""
"Prompt when user tries to send HTML mail to recipients that may not want to "
"receive HTML mail."
msgstr "HTML 形式を希望しない連絡先へ HTML メールを送信する前に確認します。"
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:56
msgid "Prompt when user tries to send a message with no To or Cc recipients."
msgstr "ユーザが To/Cc 先を付けずに送信しようとする時に確認します。"
-#: mail/evolution-mail.schemas.in.in.h:54
+#: mail/evolution-mail.schemas.in.in.h:57
msgid "Prompt when user tries to send unwanted HTML"
msgstr "希望しない HTML をユーザが送信する前に警告する"
-#: mail/evolution-mail.schemas.in.in.h:55
+#: mail/evolution-mail.schemas.in.in.h:58
msgid "Recognize links in text and replace them."
msgstr ""
"テキストの中に混入されているリンク情報を識別して、URI タグで置き換えます。"
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:59
msgid "Recognize smileys in text and replace them with images."
msgstr ""
"テキストの中に混入されているスマイリーの情報を識別して、画像に置き換えます。"
-#: mail/evolution-mail.schemas.in.in.h:57
+#: mail/evolution-mail.schemas.in.in.h:60
msgid "Run junk test on incoming mail"
msgstr "メールを受信したらスパムテストを実行する"
-#: mail/evolution-mail.schemas.in.in.h:58
+#: mail/evolution-mail.schemas.in.in.h:61
msgid "S3kr3t 0pt10n"
msgstr "S3kr3t 0pt10n"
-#: mail/evolution-mail.schemas.in.in.h:59
+#: mail/evolution-mail.schemas.in.in.h:62
msgid "S3kr3t 0pt10n."
msgstr "S3kr3t 0pt10n です。"
-#: mail/evolution-mail.schemas.in.in.h:60
+#: mail/evolution-mail.schemas.in.in.h:63
msgid "Send HTML mail by default"
msgstr "デフォルトで HTML メールを送信する"
-#: mail/evolution-mail.schemas.in.in.h:61
+#: mail/evolution-mail.schemas.in.in.h:64
msgid "Send HTML mail by default."
msgstr "デフォルトで HTML 形式のメールを送信します。"
-#: mail/evolution-mail.schemas.in.in.h:62
+#: mail/evolution-mail.schemas.in.in.h:65
msgid "Show Animations"
msgstr "アニメーションの表示可否"
-#: mail/evolution-mail.schemas.in.in.h:63
+#: mail/evolution-mail.schemas.in.in.h:66
msgid "Show animated images as animations."
msgstr "画像をアニメーションとして表示します。"
-#: mail/evolution-mail.schemas.in.in.h:64
+#: mail/evolution-mail.schemas.in.in.h:67
msgid "Show deleted messages (with a strike-through) in the message-list."
msgstr ""
"メッセージ一覧の中に削除したメッセージを (打ち消し線を付けて) 表示します。"
-#: mail/evolution-mail.schemas.in.in.h:65
+#: mail/evolution-mail.schemas.in.in.h:68
msgid "Show deleted messages in the message-list"
msgstr "メッセージ一覧の中に削除したメッセージを表示する"
-#: mail/evolution-mail.schemas.in.in.h:66
+#: mail/evolution-mail.schemas.in.in.h:69
msgid "Show the \"Preview\" pane"
msgstr "\"プレビュー\" ウィンドウの表示可否"
-#: mail/evolution-mail.schemas.in.in.h:67
+#: mail/evolution-mail.schemas.in.in.h:70
msgid "Show the \"Preview\" pane."
msgstr "\"プレビュー\" ペインを表示します。"
-#: mail/evolution-mail.schemas.in.in.h:68
+#: mail/evolution-mail.schemas.in.in.h:71
msgid "Sound file to play when new mail arrives."
msgstr "新着メールが届いたら演奏するサウンド・ファイルです。"
-#: mail/evolution-mail.schemas.in.in.h:69
+#: mail/evolution-mail.schemas.in.in.h:72
msgid "Specifies the type of New Mail Notification the user wishes to use."
msgstr "ユーザが使用する新着メール通知の種類を指定します。"
-#: mail/evolution-mail.schemas.in.in.h:70
+#: mail/evolution-mail.schemas.in.in.h:73
msgid "Spell check inline"
msgstr "インラインでスペルをチェックする"
-#: mail/evolution-mail.schemas.in.in.h:71
+#: mail/evolution-mail.schemas.in.in.h:74
msgid "Terminal font"
msgstr "端末のフォント"
-#: mail/evolution-mail.schemas.in.in.h:72
+#: mail/evolution-mail.schemas.in.in.h:75
+msgid "The last time empty trash was run, in days since the epoch."
+msgstr "最後にゴミ箱を空にした時間 (1970-01-01 からの経過日数) です。"
+
+#: mail/evolution-mail.schemas.in.in.h:76
msgid "The terminal font for mail display"
msgstr "メールを表示するための端末フォントです。"
-#: mail/evolution-mail.schemas.in.in.h:73
+#: mail/evolution-mail.schemas.in.in.h:77
msgid "The variable width font for mail display"
msgstr "メールを表示するための可変幅フォントです。"
-#: mail/evolution-mail.schemas.in.in.h:74
+#: mail/evolution-mail.schemas.in.in.h:78
msgid ""
"This key should contain a list of XML structures specifying custom headers, "
"and whether they are to be displayed. The format of the XML structure is &lt;"
@@ -13644,101 +13731,101 @@ msgstr ""
"enabled&gt; - メール表示ペインの中にヘッダを表示する場合は enabled をセットし"
"ます。"
-#: mail/evolution-mail.schemas.in.in.h:75
+#: mail/evolution-mail.schemas.in.in.h:79
msgid "Thread the message list."
msgstr "メッセージ一覧をスレッド表示にします。"
-#: mail/evolution-mail.schemas.in.in.h:76
+#: mail/evolution-mail.schemas.in.in.h:80
msgid "Thread the message-list"
msgstr "メッセージ一覧のスレッド化"
-#: mail/evolution-mail.schemas.in.in.h:77
+#: mail/evolution-mail.schemas.in.in.h:81
msgid "Thread the message-list based on Subject"
msgstr "メッセージ一覧を件名でスレッド表示する"
-#: mail/evolution-mail.schemas.in.in.h:78
+#: mail/evolution-mail.schemas.in.in.h:82
msgid "Timeout for marking message as Seen"
msgstr "既読マークを付与するまでの時間"
-#: mail/evolution-mail.schemas.in.in.h:79
+#: mail/evolution-mail.schemas.in.in.h:83
msgid "Timeout for marking message as Seen."
msgstr "メッセージを選択してから既読マークを付与するまでの時間です。"
-#: mail/evolution-mail.schemas.in.in.h:80
+#: mail/evolution-mail.schemas.in.in.h:84
msgid "UID string of the default account."
msgstr "デフォルト・アカウントの UID (文字列) です。"
-#: mail/evolution-mail.schemas.in.in.h:81
+#: mail/evolution-mail.schemas.in.in.h:85
msgid "Use Spamasssassin daemon and client"
msgstr "Spamasssassin デーモンとクライアントを使用する"
-#: mail/evolution-mail.schemas.in.in.h:82
+#: mail/evolution-mail.schemas.in.in.h:86
msgid "Use Spamasssassin daemon and client (spamc/spamd)"
msgstr ""
"Spamasssassin デーモンとクライアント (spamc/spamd) で受信したメールを SPAM "
"フィルタリングします。"
-#: mail/evolution-mail.schemas.in.in.h:83
+#: mail/evolution-mail.schemas.in.in.h:87
msgid "Use custom fonts"
msgstr "カスタム・フォントを使用する"
-#: mail/evolution-mail.schemas.in.in.h:84
+#: mail/evolution-mail.schemas.in.in.h:88
msgid "Use custom fonts for displaying mail"
msgstr "メールを表示するフォントにカスタム・フォントを使用します。"
-#: mail/evolution-mail.schemas.in.in.h:85
+#: mail/evolution-mail.schemas.in.in.h:89
msgid "Use only local spam tests."
msgstr "ローカルの SPAM フィルタリングのみ行います。"
-#: mail/evolution-mail.schemas.in.in.h:86
+#: mail/evolution-mail.schemas.in.in.h:90
msgid "Use only the local spam tests (no DNS)."
msgstr "ローカルの SPAM フィルタリングのみ行います (DNS 使用せず)。"
-#: mail/evolution-mail.schemas.in.in.h:87
+#: mail/evolution-mail.schemas.in.in.h:91
msgid "Variable width font"
msgstr "可変幅フォント"
-#: mail/evolution-mail.schemas.in.in.h:88
+#: mail/evolution-mail.schemas.in.in.h:92
msgid "View/Bcc menu item is checked"
msgstr "メニュー [表示]-[Bcc フィールド] の状態"
-#: mail/evolution-mail.schemas.in.in.h:89
+#: mail/evolution-mail.schemas.in.in.h:93
msgid "View/Bcc menu item is checked."
msgstr "メニュー [表示]-[Bcc フィールド] が有効な状態です。"
-#: mail/evolution-mail.schemas.in.in.h:90
+#: mail/evolution-mail.schemas.in.in.h:94
msgid "View/Cc menu item is checked"
msgstr "\"Cc フィールド\" を表示する"
-#: mail/evolution-mail.schemas.in.in.h:91
+#: mail/evolution-mail.schemas.in.in.h:95
msgid "View/Cc menu item is checked."
msgstr "メニュー [表示]-[Cc フィールド] が有効であることを示します。"
-#: mail/evolution-mail.schemas.in.in.h:92
+#: mail/evolution-mail.schemas.in.in.h:96
msgid "View/From menu item is checked"
msgstr "\"差出人フィールド\" を表示する"
-#: mail/evolution-mail.schemas.in.in.h:93
+#: mail/evolution-mail.schemas.in.in.h:97
msgid "View/From menu item is checked."
msgstr "メニュー [表示]-[差出人フィールド] が有効であることを示します。"
-#: mail/evolution-mail.schemas.in.in.h:94
+#: mail/evolution-mail.schemas.in.in.h:98
msgid "View/PostTo menu item is checked"
msgstr "\"送信先フィールド\" を表示する"
-#: mail/evolution-mail.schemas.in.in.h:95
+#: mail/evolution-mail.schemas.in.in.h:99
msgid "View/PostTo menu item is checked."
msgstr "メニュー [表示]-[送信先フィールド] が有効であることを示します。"
-#: mail/evolution-mail.schemas.in.in.h:96
+#: mail/evolution-mail.schemas.in.in.h:100
msgid "View/ReplyTo menu item is checked"
msgstr "\"返信先フィールド\" を表示する"
-#: mail/evolution-mail.schemas.in.in.h:97
+#: mail/evolution-mail.schemas.in.in.h:101
msgid "View/ReplyTo menu item is checked."
msgstr "メニュー [表示]-[返信先フィールド] が有効であることを示します。"
-#: mail/evolution-mail.schemas.in.in.h:98
+#: mail/evolution-mail.schemas.in.in.h:102
msgid ""
"Whether or not to fall back on threading by subjects when the messages do "
"not contain In-Reply-To or References headers."
@@ -13746,11 +13833,11 @@ msgstr ""
"メッセージに In-Reply-To または Refeences ヘッダが無い場合に、件名によるス"
"レッド表示で fall back するかどうかを指定します。"
-#: mail/evolution-mail.schemas.in.in.h:99
+#: mail/evolution-mail.schemas.in.in.h:103
msgid "port for starting user runned spamd"
msgstr "ユーザが起動した spamd のポート番号です。"
-#: mail/evolution-mail.schemas.in.in.h:100
+#: mail/evolution-mail.schemas.in.in.h:104
msgid "spamd port"
msgstr "spamd のポート番号"
@@ -13801,9 +13888,8 @@ msgid "Please wait"
msgstr "少々お待ち下さい"
#: mail/importers/elm-importer.c:244
-#, fuzzy
msgid "Importing Elm data"
-msgstr "ファイルのインポート"
+msgstr "Elm データのインポート"
#: mail/importers/elm-importer.c:436
msgid ""
@@ -13818,32 +13904,29 @@ msgid "Elm"
msgstr "Elm"
#: mail/importers/evolution-mbox-importer.c:116
-#, fuzzy
msgid "Destination folder:"
-msgstr "転送先は読み込み専用"
+msgstr "転送先フォルダ:"
#: mail/importers/evolution-mbox-importer.c:119
-#, fuzzy
msgid "Select folder to import into"
-msgstr "インポートする証明書の選択..."
+msgstr "インポート先フォルダの選択"
#: mail/importers/evolution-mbox-importer.c:219
#: mail/importers/evolution-outlook-importer.c:224
#: mail/importers/mail-importer.c:220
-#, fuzzy, c-format
+#, c-format
msgid "Importing `%s'"
-msgstr "%s をインポートしています。\n"
+msgstr "'%s' のインポート"
#: mail/importers/evolution-outlook-importer.c:271
#: mail/importers/mail-importer.c:134
-#, fuzzy
msgid "Importing mailbox"
-msgstr "ファイルのインポート"
+msgstr "mailbox のインポート"
#: mail/importers/mail-importer.c:354
#, c-format
msgid "Scanning %s"
-msgstr "%s の解析中"
+msgstr "%s の解析"
#: mail/importers/netscape-importer.c:72
#, c-format
@@ -13906,9 +13989,8 @@ msgid "Evolution is importing your old Netscape data"
msgstr "Evolution は古い Netscape データのインポート中です"
#: mail/importers/netscape-importer.c:1677
-#, fuzzy
msgid "Importing Netscape data"
-msgstr "Evolution は古い Netscape データのインポート中です"
+msgstr "Netscape データのインポート"
#: mail/importers/netscape-importer.c:1877
msgid "Settings"
@@ -13931,9 +14013,8 @@ msgid "Evolution is importing your old Pine data"
msgstr "Evolution は古い Pine データのインポート中です"
#: mail/importers/pine-importer.c:313
-#, fuzzy
msgid "Importing Pine data"
-msgstr "ファイルのインポート"
+msgstr "Pine データのインポート"
#: mail/importers/pine-importer.c:478
msgid "Addressbook"
@@ -13994,19 +14075,19 @@ msgstr "必要な情報の全てを埋めていません。"
msgid "Evolution Account Editor"
msgstr "Evolution アカウント・エディタ"
-#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:155
+#: mail/mail-account-gui.c:790 mail/mail-config.glade.h:155
msgid "_Host:"
msgstr "ホスト(_H):"
-#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:129
+#: mail/mail-account-gui.c:794 mail/mail-config.glade.h:129
msgid "User_name:"
msgstr "ユーザ名:"
-#: mail/mail-account-gui.c:763 mail/mail-config.glade.h:164
+#: mail/mail-account-gui.c:798 mail/mail-config.glade.h:164
msgid "_Path:"
msgstr "パス(_P):"
-#: mail/mail-account-gui.c:1969
+#: mail/mail-account-gui.c:2074
msgid "You may not create two accounts with the same name."
msgstr "同じ名前のアカウントを二つ作れません。"
@@ -14054,38 +14135,35 @@ msgstr ""
" '%s'\n"
"更に更新されています。"
-#: mail/mail-component.c:487
+#: mail/mail-component.c:519
msgid "You have unsent messages, do you wish to quit anyway?"
msgstr "送信していないメッセージがあります。それでも終了しますか?"
-#: mail/mail-component.c:546
+#: mail/mail-component.c:587
msgid "New Mail Message"
msgstr "新しいメッセージ"
-#: mail/mail-component.c:547
+#: mail/mail-component.c:588
msgid "_Mail Message"
msgstr "メッセージ(_M)"
-#: mail/mail-component.c:548
+#: mail/mail-component.c:589
msgid "Compose a new mail message"
msgstr "新しいメッセージを作成します"
-#: mail/mail-component.c:553
-#, fuzzy
+#: mail/mail-component.c:594
msgid "New Mail Folder"
-msgstr "新しい仮想フォルダ"
+msgstr "新しいメール・フォルダ"
-#: mail/mail-component.c:554
-#, fuzzy
+#: mail/mail-component.c:595
msgid "Mail _Folder"
-msgstr "メールのフィルタ"
+msgstr "メールのフォルダ(_F)"
-#: mail/mail-component.c:555
-#, fuzzy
+#: mail/mail-component.c:596
msgid "Create a new mail folder"
-msgstr "新しいカレンダを作成します"
+msgstr "新しいメール・フォルダを作成します"
-#: mail/mail-component.c:722
+#: mail/mail-component.c:760
msgid "URI of the mail source that the view will display"
msgstr "表示するメール・ソースの URI"
@@ -14588,7 +14666,7 @@ msgid ""
msgstr ""
"Evolution メール設定アシスタントへようこそ。\n"
"\n"
-"\"進む\" ボタンをクリックして下さい。"
+"[進む] ボタンをクリックして下さい。"
#: mail/mail-config.glade.h:136
msgid "_Add Signature"
@@ -14754,7 +14832,7 @@ msgstr "他のアプリと同じフォントを使う(_U)"
msgid "description"
msgstr "説明"
-#: mail/mail-folder-cache.c:792
+#: mail/mail-folder-cache.c:796
#, c-format
msgid "Pinging %s"
msgstr "%s へ ping"
@@ -14785,16 +14863,16 @@ msgstr "作業"
msgid "Filtering Folder"
msgstr "フォルダのフィルタリング中"
-#: mail/mail-ops.c:243
+#: mail/mail-ops.c:249
msgid "Fetching Mail"
msgstr "メールの同期中"
-#: mail/mail-ops.c:528
+#: mail/mail-ops.c:534
#, c-format
msgid "Failed to apply outgoing filters: %s"
msgstr "出力フィルタの適用に失敗しました: %s"
-#: mail/mail-ops.c:553
+#: mail/mail-ops.c:559
#, c-format
msgid ""
"Failed to append to %s: %s\n"
@@ -14803,116 +14881,111 @@ msgstr ""
"%s への追加に失敗しました: %s\n"
"かわりにローカルの '送信箱' へ追加します。"
-#: mail/mail-ops.c:562
+#: mail/mail-ops.c:568
#, c-format
msgid "Failed to append to local `Sent' folder: %s"
msgstr "ローカルの '送信箱' フォルダへの追加に失敗しました: %s"
-#: mail/mail-ops.c:604
-#, c-format
-msgid "Sending \"%s\""
-msgstr "\"%s\" を送信中"
-
-#: mail/mail-ops.c:722
+#: mail/mail-ops.c:664
#, c-format
msgid "Sending message %d of %d"
msgstr "メッセージ %d / %d 通を送信中"
-#: mail/mail-ops.c:741
+#: mail/mail-ops.c:695
#, c-format
-msgid "Failed on message %d of %d"
-msgstr "メッセージ %d / %d 通は失敗しました"
+msgid "Failed to send %d of %d messages"
+msgstr "メッセージ %d / %d の送信に失敗しました"
-#: mail/mail-ops.c:743
+#: mail/mail-ops.c:699
msgid "Complete."
msgstr "完了しました"
-#: mail/mail-ops.c:837
+#: mail/mail-ops.c:796
msgid "Saving message to folder"
msgstr "フォルダへメッセージを保存中"
-#: mail/mail-ops.c:922
+#: mail/mail-ops.c:881
#, c-format
msgid "Moving messages to %s"
msgstr "%s へメッセージを移動中"
-#: mail/mail-ops.c:922
+#: mail/mail-ops.c:881
#, c-format
msgid "Copying messages to %s"
msgstr "%s へメッセージをコピー中"
-#: mail/mail-ops.c:1035
+#: mail/mail-ops.c:994
#, c-format
msgid "Scanning folders in \"%s\""
msgstr "\"%s\" の中のフォルダを走査中"
-#: mail/mail-ops.c:1231
+#: mail/mail-ops.c:1190
msgid "Forwarded messages"
msgstr "転送メッセージ"
-#: mail/mail-ops.c:1274
+#: mail/mail-ops.c:1233
#, c-format
msgid "Opening folder %s"
msgstr "フォルダ %s をオープンする"
-#: mail/mail-ops.c:1346
+#: mail/mail-ops.c:1305
#, c-format
msgid "Opening store %s"
msgstr "保存された %s をオープンする"
-#: mail/mail-ops.c:1424
+#: mail/mail-ops.c:1383
#, c-format
msgid "Removing folder %s"
msgstr "フォルダ %s を削除"
-#: mail/mail-ops.c:1518
+#: mail/mail-ops.c:1477
#, c-format
msgid "Storing folder '%s'"
msgstr "フォルダ '%s' の格納"
-#: mail/mail-ops.c:1583
+#: mail/mail-ops.c:1542
#, c-format
msgid "Expunging and storing account '%s'"
msgstr "アカウント '%s' の削除と保存"
-#: mail/mail-ops.c:1584
+#: mail/mail-ops.c:1543
#, c-format
msgid "Storing account '%s'"
msgstr "アカウント '%s' の格納"
-#: mail/mail-ops.c:1639
+#: mail/mail-ops.c:1598
msgid "Refreshing folder"
msgstr "フォルダを更新中"
-#: mail/mail-ops.c:1675 mail/mail-ops.c:1726
+#: mail/mail-ops.c:1634 mail/mail-ops.c:1685
msgid "Expunging folder"
msgstr "フォルダを抹消中"
-#: mail/mail-ops.c:1723
+#: mail/mail-ops.c:1682
#, c-format
msgid "Emptying trash in '%s'"
msgstr "'%s' の中にあるゴミ箱を空にする"
-#: mail/mail-ops.c:1724
+#: mail/mail-ops.c:1683
msgid "Local Folders"
msgstr "ローカル・フォルダ"
-#: mail/mail-ops.c:1807
+#: mail/mail-ops.c:1766
#, c-format
msgid "Retrieving message %s"
msgstr "メッセージ %s を取得中"
-#: mail/mail-ops.c:1879
+#: mail/mail-ops.c:1838
#, c-format
msgid "Retrieving %d message(s)"
msgstr "メッセージ %d 通の受信中"
-#: mail/mail-ops.c:1963
+#: mail/mail-ops.c:1922
#, c-format
msgid "Saving %d messsage(s)"
msgstr "メッセージ %d 通の保存中"
-#: mail/mail-ops.c:2011
+#: mail/mail-ops.c:1970
#, c-format
msgid ""
"Unable to create output file: %s\n"
@@ -14921,7 +14994,7 @@ msgstr ""
"出力ファイルを生成できません: %s\n"
" %s"
-#: mail/mail-ops.c:2039
+#: mail/mail-ops.c:1998
#, c-format
msgid ""
"Error saving messages to: %s:\n"
@@ -14930,11 +15003,11 @@ msgstr ""
"ファイルの保存中にエラー: %s:\n"
" %s"
-#: mail/mail-ops.c:2110
+#: mail/mail-ops.c:2069
msgid "Saving attachment"
msgstr "添付した内容の保存中"
-#: mail/mail-ops.c:2127
+#: mail/mail-ops.c:2086
#, c-format
msgid ""
"Cannot create output file: %s:\n"
@@ -14943,25 +15016,21 @@ msgstr ""
"出力ファイルを生成できません: %s:\n"
" %s"
-#: mail/mail-ops.c:2157
+#: mail/mail-ops.c:2116
#, c-format
msgid "Could not write data: %s"
msgstr "データを書き出せませんでした: %s"
-#: mail/mail-ops.c:2305
+#: mail/mail-ops.c:2264
#, c-format
msgid "Disconnecting from %s"
msgstr "%s からの接続はありません"
-#: mail/mail-ops.c:2305
+#: mail/mail-ops.c:2264
#, c-format
msgid "Reconnecting to %s"
msgstr "%s へ再接続"
-#: mail/mail-ops.c:2407
-msgid "Changing junk status"
-msgstr "Junk のステータス変更"
-
#: mail/mail-search.glade.h:2
msgid "Case Sensitive"
msgstr "大/小文字を区別する"
@@ -15038,11 +15107,11 @@ msgstr "%s のパスワードを入力して下さい"
msgid "Enter Password"
msgstr "パスワードの入力"
-#: mail/mail-session.c:294
+#: mail/mail-session.c:295
msgid "_Remember this password"
msgstr "このパスワードを記憶する(_R)"
-#: mail/mail-session.c:295
+#: mail/mail-session.c:296
msgid "_Remember this password for the remainder of this session"
msgstr "このパスワードをこのセッション用に保存する(_R)"
@@ -15253,7 +15322,7 @@ msgstr "フローアップ"
msgid "For Your Information"
msgstr "F.Y.I"
-#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:40
+#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:42
msgid "Forward"
msgstr "転送"
@@ -15261,11 +15330,11 @@ msgstr "転送"
msgid "No Response Necessary"
msgstr "返信の必要なし"
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:83
+#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:85
msgid "Reply"
msgstr "返信"
-#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:84
+#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:86
msgid "Reply to All"
msgstr "全員へ返信"
@@ -15511,7 +15580,7 @@ msgstr ""
"チェックしました: Pine, Netscape, Elm, iCalendar\n"
"インポートできる設定は見つかりませんでした。\n"
"再度チェックを実行する場合は、\n"
-"\"戻る\" ボタンをクリックして下さい。\n"
+"[戻る] ボタンをクリックして下さい。\n"
#: shell/e-shell-importer.c:228 shell/e-shell-importer.c:259
#, c-format
@@ -15664,10 +15733,6 @@ msgstr ""
"\n"
"今すぐ、アシスタントを終了しますか?"
-#: shell/e-shell-startup-wizard.c:795
-msgid "Quit Assistant"
-msgstr "アシスタントを終了する"
-
#: shell/e-shell-utils.c:116
msgid "No folder name specified."
msgstr "フォルダ名が指定されていません。"
@@ -15710,15 +15775,15 @@ msgstr "Bug buddy は実行できませんでした"
msgid "About Ximian Evolution"
msgstr "Ximian Evolution について"
-#: shell/e-shell-window-commands.c:381
+#: shell/e-shell-window-commands.c:382
msgid "_Work Online"
msgstr "オンライン作業(_W)"
-#: shell/e-shell-window-commands.c:394 ui/evolution.xml.h:37
+#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
msgid "_Work Offline"
msgstr "オフライン作業(_W)"
-#: shell/e-shell-window-commands.c:407 ui/evolution.xml.h:22
+#: shell/e-shell-window-commands.c:408 ui/evolution.xml.h:22
msgid "Work Offline"
msgstr "オフライン作業"
@@ -15902,7 +15967,7 @@ msgstr ""
"E-メールのアカウントに接続できるよう準備をします。\n"
"また他のアプリからファイルを取り込む準備をします。\n"
"\n"
-"続行する場合は、\"進む\" ボタンをクリックして下さい。"
+"続行する場合は、[進む] ボタンをクリックして下さい。"
#: shell/glade/evolution-startup-wizard.glade.h:11
msgid ""
@@ -15914,7 +15979,7 @@ msgstr ""
"Evolution を設定するのに必要な情報が\n"
"全て集まりました。\n"
"\n"
-"設定を保存する場合は、\"適用\" ボタンをクリックして下さい。"
+"設定を保存する場合は、[適用] ボタンをクリックして下さい。"
#: shell/importer/import.glade.h:1
msgid "Click \"Import\" to begin importing the file into Evolution. "
@@ -16075,7 +16140,7 @@ msgid "Select a cert to import..."
msgstr "インポートする証明書の選択..."
#: smime/gui/certificate-manager.c:238 smime/gui/certificate-manager.c:400
-#: smime/gui/certificate-manager.c:546
+#: smime/gui/certificate-manager.c:545
msgid "Certificate Name"
msgstr "証明書の名前"
@@ -16096,7 +16161,7 @@ msgstr "有効期限"
msgid "E-Mail Address"
msgstr "E-メール・アドレス"
-#: smime/gui/certificate-viewer.c:331
+#: smime/gui/certificate-viewer.c:334
#, c-format
msgid "Certificate Viewer: %s"
msgstr "証明書ビューア: %s"
@@ -16106,6 +16171,15 @@ msgstr "証明書ビューア: %s"
msgid "Enter the password for `%s'"
msgstr "'%s' のパスワードを入力して下さい"
+#. we're setting the password initially
+#: smime/gui/component.c:64
+msgid "Enter new password for certificate database"
+msgstr "データベースを証明する新しいパスワードを入力して下さい"
+
+#: smime/gui/component.c:66
+msgid "Enter new password"
+msgstr "新しいパスワードの入力"
+
#. FIXME: add serial no, validity date, uses
#: smime/gui/e-cert-selector.c:121
#, c-format
@@ -16295,7 +16369,7 @@ msgstr "次の人達の身元を確認できる証明書 (ファイル) があ
msgid "Your Certificates"
msgstr "ユーザの証明書"
-#: smime/lib/e-cert-db.c:571
+#: smime/lib/e-cert-db.c:582
msgid "Certificate already exists"
msgstr "既に証明書があります"
@@ -16575,7 +16649,7 @@ msgid "Previews the contacts to be printed"
msgstr "連絡先の印刷プレビューを表示します"
#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:20
-#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:79
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:81
#: ui/evolution-tasks.xml.h:13
msgid "Print Pre_view"
msgstr "印刷プレビュー(_V)"
@@ -16628,7 +16702,7 @@ msgstr "現在の連絡先の表示"
#: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:13
#: ui/evolution-contact-list-editor.xml.h:11
#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:15
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:107
#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
#: ui/evolution-tasks.xml.h:17 ui/evolution.xml.h:25
msgid "_Actions"
@@ -17027,7 +17101,7 @@ msgstr "全て既読としてマーク(_R)"
msgid "Mark all visible messages as read"
msgstr "全てのメッセージに既読のマークを付けます"
-#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:72
+#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:74
msgid "Paste message(s) from the clipboard"
msgstr "クリップボードからメッセージを貼り付けます"
@@ -17084,16 +17158,14 @@ msgid "_Threaded Message List"
msgstr "メッセージ一覧のスレッド化(_T)"
#: ui/evolution-mail-message.xml.h:1
-#, fuzzy
msgid "A_dd Sender to Address Book"
-msgstr "差出人をアドレス帳に追加(_D)"
+msgstr "差出人をアドレス帳へ追加(_D)"
#: ui/evolution-mail-message.xml.h:2
msgid "A_pply Filters"
msgstr "フィルタの適用(_P)"
#: ui/evolution-mail-message.xml.h:3
-#, fuzzy
msgid "Add Sender to Address Book"
msgstr "差出人をアドレス帳に追加します"
@@ -17194,306 +17266,314 @@ msgid "F_orward As..."
msgstr "別名で転送(_O)..."
#: ui/evolution-mail-message.xml.h:33
+msgid "Filter _Junk"
+msgstr "Junk のフィルタ(_J)"
+
+#: ui/evolution-mail-message.xml.h:34
msgid "Filter on Mailing _List..."
msgstr "メーリング・リストのフィルタ(_L)..."
-#: ui/evolution-mail-message.xml.h:34
+#: ui/evolution-mail-message.xml.h:35
msgid "Filter on Se_nder..."
msgstr "差出人のフィルタ(_N)..."
-#: ui/evolution-mail-message.xml.h:35
+#: ui/evolution-mail-message.xml.h:36
msgid "Filter on _Recipients..."
msgstr "宛先のフィルタ(_R)..."
-#: ui/evolution-mail-message.xml.h:36
+#: ui/evolution-mail-message.xml.h:37
msgid "Filter on _Subject..."
msgstr "件名のフィルタ(_S)..."
-#: ui/evolution-mail-message.xml.h:37
+#: ui/evolution-mail-message.xml.h:38
+msgid "Filter the selected messages for junk status"
+msgstr "選択したメッセージがスパムであるかどうかをチェックします"
+
+#: ui/evolution-mail-message.xml.h:39
msgid "Flag selected message(s) for follow-up"
msgstr "選択したメッセージにフォローアップ・マークを付けます"
-#: ui/evolution-mail-message.xml.h:38
+#: ui/evolution-mail-message.xml.h:40
msgid "Follow _Up..."
msgstr "フォローアップ(_U)..."
-#: ui/evolution-mail-message.xml.h:39
+#: ui/evolution-mail-message.xml.h:41
msgid "Force images in HTML mail to be loaded"
msgstr "HTML メールの画像を強制的に読み込みます"
-#: ui/evolution-mail-message.xml.h:41
+#: ui/evolution-mail-message.xml.h:43
msgid "Forward the selected message in the body of a new message"
msgstr "選択したメッセージを新しいメッセージの本文に挿入して転送します"
-#: ui/evolution-mail-message.xml.h:42
+#: ui/evolution-mail-message.xml.h:44
msgid "Forward the selected message quoted like a reply"
msgstr "選択したメッセージを返信のように引用して転送します"
-#: ui/evolution-mail-message.xml.h:43
+#: ui/evolution-mail-message.xml.h:45
msgid "Forward the selected message to someone"
msgstr "選択したメッセージを誰かに転送します"
-#: ui/evolution-mail-message.xml.h:44
+#: ui/evolution-mail-message.xml.h:46
msgid "Forward the selected message to someone as an attachment"
msgstr "選択したメッセージを添付して誰かに転送します"
-#: ui/evolution-mail-message.xml.h:45
+#: ui/evolution-mail-message.xml.h:47
msgid "Increase the text size"
msgstr "文字のサイズを大きくします"
-#: ui/evolution-mail-message.xml.h:47
+#: ui/evolution-mail-message.xml.h:49
msgid "Load _Images"
msgstr "画像を読み込む(_I)"
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:51
msgid "Mark as I_mportant"
msgstr "重要としてマーク(_M)"
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:52
msgid "Mark as U_nread"
msgstr "未読としてマーク(_N)"
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:53
msgid "Mark as Unimp_ortant"
msgstr "重要でないとしてマーク(_O)"
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:56
msgid "Mark the selected message(s) as having been read"
msgstr "選択したメッセージに既読マークを付けます"
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:57
msgid "Mark the selected message(s) as important"
msgstr "選択したメッセージに重要マークを付けます"
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:58
msgid "Mark the selected message(s) as junk"
msgstr "選択したメッセージにジャンク・マークを付けます"
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:59
msgid "Mark the selected message(s) as not being junk"
msgstr "選択したメッセージのジャンク・マークを外します"
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:60
msgid "Mark the selected message(s) as not having been read"
msgstr "選択したメッセージに未読マークを付けます"
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:61
msgid "Mark the selected message(s) as unimportant"
msgstr "選択したメッセージに重要ではないマークを付けます"
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:62
msgid "Mark the selected messages for deletion"
msgstr "選択したメッセージに削除マークを付けます"
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:63
msgid "Move"
msgstr "移動"
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:64
msgid "Move selected message(s) to another folder"
msgstr "選択したメッセージを別のフォルダへ移動します"
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:65
msgid "Next"
msgstr "次へ"
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:66
msgid "Next _Important Message"
msgstr "次の重要なメッセージへ(_I)"
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:67
msgid "Next _Thread"
msgstr "次のスレッドへ(_T)"
-#: ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-message.xml.h:68
msgid "Next _Unread Message"
msgstr "次の未読メッセージへ(_U)"
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:69
msgid "Not Junk"
msgstr "ジャンクにしない"
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:70
msgid "Open the selected message in a new window"
msgstr "選択したメッセージを新しいウィンドウの中で開きます"
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:71
msgid "Open the selected message in the composer to re-send it"
msgstr "選択したメッセージをコンポーザで開き再送します"
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:72
msgid "Original Si_ze"
msgstr "通常サイズ(_Z)"
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:73
msgid "P_revious Unread Message"
msgstr "前の未読メッセージへ(_R)"
-#: ui/evolution-mail-message.xml.h:73
+#: ui/evolution-mail-message.xml.h:75
msgid "Post a Repl_y"
msgstr "返信の投稿(_Y)"
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:76
msgid "Post a reply to a message in a Public folder"
msgstr "公開フォルダの中にあるメッセージに返信します"
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:77
msgid "Pr_evious Important Message"
msgstr "前の重要なメッセージへ(_E)"
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:78
msgid "Preview the message to be printed"
msgstr "印刷されるメッセージのプレビューを表示します"
-#: ui/evolution-mail-message.xml.h:77
+#: ui/evolution-mail-message.xml.h:79
msgid "Previous"
msgstr "前へ"
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:82
msgid "Print this message"
msgstr "メッセージを印刷します"
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:83
msgid "Re_direct"
msgstr "リダイレクト(_D)"
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:84
msgid "Redirect (bounce) the selected message to someone"
msgstr "選択したメッセージを誰かに転送します"
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:89
msgid "Reset the text to its original size"
msgstr "文字のサイズを初期サイズに戻します"
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:90
msgid "S_earch in Message..."
msgstr "メッセージから検索(_S)..."
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:91
msgid "S_maller"
msgstr "小さく(_M)"
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:92
msgid "Save the message as a text file"
msgstr "メッセージをテキスト・ファイルに保存します"
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:93
msgid "Search for text in the body of the displayed message"
msgstr "表示されたメッセージ本体の含まれるテキストを検索します"
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:94
msgid "Set up the page settings for your current printer"
msgstr "現在のプリンタのページ設定を行います"
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:95
msgid "Show Email _Source"
msgstr "ソースの表示(_S)"
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:96
msgid "Show Full _Headers"
msgstr "全てのヘッダの表示(_H)"
-#: ui/evolution-mail-message.xml.h:95
+#: ui/evolution-mail-message.xml.h:97
msgid "Show a blinking cursor in the body of displayed messages"
msgstr "表示されたメッセージ本体に点滅するカーソルを表示します"
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:98
msgid "Show message in the normal style"
msgstr "通常のメッセージを表示します"
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:99
msgid "Show message with all email headers"
msgstr "E-メール・ヘッダも含めてメッセージを全て表示します"
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:100
msgid "Show the raw email source of the message"
msgstr "メッセージのソースを表示します"
-#: ui/evolution-mail-message.xml.h:99
+#: ui/evolution-mail-message.xml.h:101
msgid "Text Si_ze"
msgstr "文字サイズ(_Z)"
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:102
msgid "Un-delete the selected messages"
msgstr "選択したメッセージ削除を取り消します"
-#: ui/evolution-mail-message.xml.h:101
+#: ui/evolution-mail-message.xml.h:103
msgid "VFolder on Mailing _List..."
msgstr "メーリング・リストの仮想フォルダ(_L)..."
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:104
msgid "VFolder on Se_nder..."
msgstr "差出人の仮想フォルダ(_N)..."
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:105
msgid "VFolder on _Recipients..."
msgstr "宛先の仮想フォルダ(_R)..."
-#: ui/evolution-mail-message.xml.h:104
+#: ui/evolution-mail-message.xml.h:106
msgid "VFolder on _Subject..."
msgstr "件名の仮想フォルダ(_S)..."
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:108
msgid "_Attached"
msgstr "添付する(_A)"
-#: ui/evolution-mail-message.xml.h:108
+#: ui/evolution-mail-message.xml.h:110
msgid "_Copy to Folder"
msgstr "フォルダへコピー(_C)"
-#: ui/evolution-mail-message.xml.h:109
+#: ui/evolution-mail-message.xml.h:111
msgid "_Create Filter From Message"
msgstr "メッセージからフィルタの作成(_C)"
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:114
msgid "_Go To"
msgstr "ジャンプ(_G)"
-#: ui/evolution-mail-message.xml.h:113
+#: ui/evolution-mail-message.xml.h:115
msgid "_Inline"
msgstr "インライン(_I)"
-#: ui/evolution-mail-message.xml.h:114
+#: ui/evolution-mail-message.xml.h:116
msgid "_Larger"
msgstr "大きく(_L)"
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:117
msgid "_Message Display"
msgstr "メッセージの表示方法(_M)"
-#: ui/evolution-mail-message.xml.h:116
+#: ui/evolution-mail-message.xml.h:118
msgid "_Move to Folder"
msgstr "フォルダへ移動(_M)"
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:119
msgid "_Next Message"
msgstr "次のメッセージへ(_N)"
-#: ui/evolution-mail-message.xml.h:118
+#: ui/evolution-mail-message.xml.h:120
msgid "_Normal Display"
msgstr "通常表示(_N)"
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:121
msgid "_Open Message"
msgstr "メッセージを開く(_O)"
-#: ui/evolution-mail-message.xml.h:121
+#: ui/evolution-mail-message.xml.h:123
msgid "_Previous Message"
msgstr "前のメッセージへ(_P)"
-#: ui/evolution-mail-message.xml.h:123
+#: ui/evolution-mail-message.xml.h:125
msgid "_Quoted"
msgstr "引用する(_Q)"
-#: ui/evolution-mail-message.xml.h:125
+#: ui/evolution-mail-message.xml.h:127
msgid "_Resend..."
msgstr "再送(_R)..."
-#: ui/evolution-mail-message.xml.h:127 ui/evolution.xml.h:34
+#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
msgid "_Tools"
msgstr "ツール(_T)"
-#: ui/evolution-mail-message.xml.h:128
+#: ui/evolution-mail-message.xml.h:130
msgid "_Undelete"
msgstr "削除の取り消し(_U)"
@@ -18014,11 +18094,11 @@ msgstr "月火水木金土日"
msgid "%B %Y"
msgstr "%Y年 %B"
-#: widgets/misc/e-cell-date-edit.c:241 widgets/misc/e-dateedit.c:431
+#: widgets/misc/e-cell-date-edit.c:241 widgets/misc/e-dateedit.c:429
msgid "Now"
msgstr "今"
-#: widgets/misc/e-cell-date-edit.c:249 widgets/misc/e-dateedit.c:437
+#: widgets/misc/e-cell-date-edit.c:249 widgets/misc/e-dateedit.c:435
msgid "Today"
msgstr "今日"
@@ -18170,12 +18250,12 @@ msgstr "表示部のスペース挿入"
msgid "Spacing around expander arrow"
msgstr "エキスパンダの矢印の周りに配置する領域"
-#: widgets/misc/e-filter-bar.c:191
+#: widgets/misc/e-filter-bar.c:193
msgid "Search Editor"
msgstr "検索エディタ"
#. FIXME: get the toplevel window...
-#: widgets/misc/e-filter-bar.c:212
+#: widgets/misc/e-filter-bar.c:214
msgid "Save Search"
msgstr "検索結果の保存"
@@ -18195,15 +18275,15 @@ msgstr "拡張(_A)..."
msgid "Choose Image"
msgstr "画像の選択"
-#: widgets/misc/e-search-bar.c:531
+#: widgets/misc/e-search-bar.c:540
msgid "_Search"
msgstr "検索(_S)"
-#: widgets/misc/e-search-bar.c:537
+#: widgets/misc/e-search-bar.c:546
msgid "_Find Now"
msgstr "今すぐ見つける(_F)"
-#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:929
+#: widgets/misc/e-search-bar.c:547 widgets/misc/e-search-bar.c:929
msgid "_Clear"
msgstr "クリア(_C)"
@@ -18232,73 +18312,3 @@ msgstr "%s (...)"
#, c-format
msgid "%s (%d%% complete)"
msgstr "%s (%d%% 完了)"
-
-#~ msgid "Addressbook Sources"
-#~ msgstr "アドレス帳のソース"
-
-#~ msgid "No data provided"
-#~ msgstr "期日が指定されていません"
-
-#~ msgid ""
-#~ "Could not open file `%s':\n"
-#~ "%s"
-#~ msgstr ""
-#~ "ファイル '%s' を開けませんでした:\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "Could not create directory `%s':\n"
-#~ "%s"
-#~ msgstr ""
-#~ "フォルダ '%s' を作成できませんでした:\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "Could not create file `%s':\n"
-#~ "%s"
-#~ msgstr ""
-#~ "ファイル '%s' を作成できませんでした:\n"
-#~ "%s"
-
-#~ msgid "`%s' is not a directory."
-#~ msgstr "'%s' はフォルダではありません"
-
-#~ msgid "On this Computer"
-#~ msgstr "このコンピュータ"
-
-#~ msgid "Check incoming mail being junk for IMAP accounts"
-#~ msgstr "IMAP アカウントの受信メールがジャンクかどうかチェックする"
-
-#~ msgid ""
-#~ "Run junk test on incoming mail for IMAP accounts (only valid if "
-#~ "check_incoming is set to true)"
-#~ msgstr ""
-#~ "(check_incoming が TRUE の場合) IMAP アカウントで受信するメールに対して"
-#~ "ジャンク・テストを実行します。"
-
-#~ msgid "Importing %s as %s"
-#~ msgstr "%s を %s でインポート中"
-
-#~ msgid "Scanning mail filters"
-#~ msgstr "メール・フィルタのスキャン中"
-
-#~ msgid "Scanning directory"
-#~ msgstr "フォルダのスキャン中"
-
-#~ msgid " "
-#~ msgstr " "
-
-#~ msgid "Do _Not Check Incoming Mail For IMAP Accounts"
-#~ msgstr "IMAP アカウントの受信メールは除外する(_N)"
-
-#~ msgid "Print Summary"
-#~ msgstr "サマリを印刷します"
-
-#~ msgid "Print summary"
-#~ msgstr "サマリを印刷します"
-
-#~ msgid "Reload"
-#~ msgstr "再読込み"
-
-#~ msgid "Reload the view"
-#~ msgstr "表示を更新します"