diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | ChangeLog.ja | 7 | ||||
| -rw-r--r-- | libsylph/prefs_common.c | 6 | ||||
| -rw-r--r-- | libsylph/prefs_common.h | 1 | ||||
| -rw-r--r-- | po/ja.po | 612 | ||||
| -rw-r--r-- | src/prefs_common_dialog.c | 14 | ||||
| -rw-r--r-- | src/trayicon.c | 18 |
7 files changed, 354 insertions, 311 deletions
@@ -1,5 +1,12 @@ 2007-01-11 + * libsylph/prefs_common.[ch] + src/trayicon.c + src/prefs_common_dialog.c: added the option to toggle window on + trayicon click. + +2007-01-11 + * libsylph/ssl.c: find_certs_file(): also look for "ca-root.crt". 2006-12-28 diff --git a/ChangeLog.ja b/ChangeLog.ja index c4c90db9..cae2d9bd 100644 --- a/ChangeLog.ja +++ b/ChangeLog.ja @@ -1,5 +1,12 @@ 2007-01-11 + * libsylph/prefs_common.[ch] + src/trayicon.c + src/prefs_common_dialog.c: トレイアイコンのクリックでウィンドウを + トグルするオプションを追加。 + +2007-01-11 + * libsylph/ssl.c: find_certs_file(): "ca-root.crt" も探すようにした。 2006-12-28 diff --git a/libsylph/prefs_common.c b/libsylph/prefs_common.c index 220e1e69..82d34662 100644 --- a/libsylph/prefs_common.c +++ b/libsylph/prefs_common.c @@ -339,6 +339,12 @@ static PrefParam param[] = { {"show_trayicon", "TRUE", &prefs_common.show_trayicon, P_BOOL}, {"minimize_to_tray", "FALSE", &prefs_common.minimize_to_tray, P_BOOL}, +#ifdef G_OS_WIN32 + {"toggle_window_on_trayicon_click", "FALSE", +#else + {"toggle_window_on_trayicon_click", "TRUE", +#endif + &prefs_common.toggle_window_on_trayicon_click, P_BOOL}, /* Other */ {"receive_dialog_mode", "1", &prefs_common.recv_dialog_mode, P_ENUM}, diff --git a/libsylph/prefs_common.h b/libsylph/prefs_common.h index cbb4d8a4..6435bd7b 100644 --- a/libsylph/prefs_common.h +++ b/libsylph/prefs_common.h @@ -240,6 +240,7 @@ struct _PrefsCommon gboolean comply_gnome_hig; gboolean show_trayicon; gboolean minimize_to_tray; + gboolean toggle_window_on_trayicon_click; /* Other */ RecvDialogMode recv_dialog_mode; @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: sylpheed\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-12-19 16:36+0900\n" +"POT-Creation-Date: 2007-01-11 15:29+0900\n" "PO-Revision-Date: 1999-10-12\n" "Last-Translator: Hiroyuki Yamamoto <hiro-y@kcn.ne.jp>\n" "Language-Team: Japanese <ja@li.org>\n" @@ -168,44 +168,44 @@ msgstr "IMAP4 茯荐若紊掩障\n" msgid "IMAP4 login failed.\n" msgstr "IMAP4違ゃ潟紊掩障\n" -#: libsylph/imap.c:3689 +#: libsylph/imap.c:3690 #, c-format msgid "can't append %s to %s\n" msgstr "%s %s 菴遵с障\n" -#: libsylph/imap.c:3696 +#: libsylph/imap.c:3697 msgid "(sending file...)" msgstr "(＜ゃ篆＞賢...)" -#: libsylph/imap.c:3725 +#: libsylph/imap.c:3726 #, c-format msgid "can't append message to %s\n" msgstr "＜祉若吾 %s 菴遵с障\n" -#: libsylph/imap.c:3757 +#: libsylph/imap.c:3758 #, c-format msgid "can't copy %s to %s\n" msgstr "%s %s 潟若с障\n" -#: libsylph/imap.c:3781 +#: libsylph/imap.c:3782 #, c-format msgid "error while imap command: STORE %s %s\n" msgstr "imap 潟潟筝: STORE %s %s\n" -#: libsylph/imap.c:3795 +#: libsylph/imap.c:3796 msgid "error while imap command: EXPUNGE\n" msgstr "imap 潟潟筝: EXPUNGE\n" -#: libsylph/imap.c:3808 +#: libsylph/imap.c:3809 msgid "error while imap command: CLOSE\n" msgstr "imap 潟潟筝: CLOSE\n" -#: libsylph/imap.c:4084 +#: libsylph/imap.c:4085 #, c-format msgid "iconv cannot convert UTF-7 to %s\n" msgstr "iconv UTF-7 %s 紊с障\n" -#: libsylph/imap.c:4114 +#: libsylph/imap.c:4115 #, c-format msgid "iconv cannot convert %s to UTF-7\n" msgstr "iconv %s UTF-7 紊с障\n" @@ -246,48 +246,48 @@ msgstr "" "鴻宴若 From 荀ゃ障:\n" "%s" -#: libsylph/mbox.c:250 +#: libsylph/mbox.c:265 #, c-format msgid "%d messages found.\n" msgstr "%d ＜祉若吾荀ゃ障\n" -#: libsylph/mbox.c:268 +#: libsylph/mbox.c:283 #, c-format msgid "can't create lock file %s\n" msgstr "＜ゃ %s 障\n" -#: libsylph/mbox.c:269 +#: libsylph/mbox.c:284 msgid "use 'flock' instead of 'file' if possible.\n" msgstr "純с 'file' 篁ｃ 'flock' 篏睡\n" -#: libsylph/mbox.c:281 +#: libsylph/mbox.c:296 #, c-format msgid "can't create %s\n" msgstr "%s 篏с障\n" -#: libsylph/mbox.c:287 +#: libsylph/mbox.c:302 msgid "mailbox is owned by another process, waiting...\n" msgstr "＜若鴻ャ祉鴻ｃ障緇罘筝...\n" -#: libsylph/mbox.c:316 +#: libsylph/mbox.c:331 #, c-format msgid "can't lock %s\n" msgstr "%s с障\n" -#: libsylph/mbox.c:323 libsylph/mbox.c:373 +#: libsylph/mbox.c:338 libsylph/mbox.c:388 msgid "invalid lock type\n" msgstr "≦鴻帥ゃс\n" -#: libsylph/mbox.c:359 +#: libsylph/mbox.c:374 #, c-format msgid "can't unlock %s\n" msgstr "%s 茹ｉゃс障\n" -#: libsylph/mbox.c:394 +#: libsylph/mbox.c:409 msgid "can't truncate mailbox to zero.\n" msgstr "＜若鴻若荅違障\n" -#: libsylph/mbox.c:418 +#: libsylph/mbox.c:433 #, c-format msgid "Exporting messages from %s into %s...\n" msgstr "＜祉若吾 %s %s 吾冴障...\n" @@ -500,11 +500,11 @@ msgstr "%s 荀ゃ障\n" msgid "Configuration is saved.\n" msgstr "荐絎篆絖障\n" -#: libsylph/prefs_common.c:507 +#: libsylph/prefs_common.c:513 msgid "Junk mail filter (manual)" msgstr "菴傑＜若ｃ ()" -#: libsylph/prefs_common.c:510 +#: libsylph/prefs_common.c:516 msgid "Junk mail filter" msgstr "菴傑＜若ｃ" @@ -512,16 +512,16 @@ msgstr "菴傑＜若ｃ" msgid "procmime_get_text_content(): Code conversion failed.\n" msgstr "procmime_get_text_content(): 潟若紊紊掩障\n" -#: libsylph/procmsg.c:655 +#: libsylph/procmsg.c:656 msgid "can't open mark file\n" msgstr "若＜ゃ障\n" -#: libsylph/procmsg.c:1107 +#: libsylph/procmsg.c:1132 #, c-format msgid "can't fetch message %d\n" msgstr "＜祉若 %d 莨若障\n" -#: libsylph/procmsg.c:1339 +#: libsylph/procmsg.c:1364 #, c-format msgid "Print command line is invalid: `%s'\n" msgstr "医激潟潟ゃ潟≦鴻с: `%s'\n" @@ -546,50 +546,50 @@ msgstr "筝罩ｃ SMTP 綽膈с\n" msgid "error occurred on SMTP session\n" msgstr "SMTP 祉激с割賢若榊障\n" -#: libsylph/ssl.c:127 +#: libsylph/ssl.c:128 msgid "SSLv23 not available\n" msgstr "SSLv23 с障\n" -#: libsylph/ssl.c:129 +#: libsylph/ssl.c:130 msgid "SSLv23 available\n" msgstr "SSLv23 純с\n" -#: libsylph/ssl.c:138 +#: libsylph/ssl.c:139 msgid "TLSv1 not available\n" msgstr "TLSv1 с障\n" -#: libsylph/ssl.c:140 +#: libsylph/ssl.c:141 msgid "TLSv1 available\n" msgstr "TLSv1 純с\n" -#: libsylph/ssl.c:195 libsylph/ssl.c:202 +#: libsylph/ssl.c:196 libsylph/ssl.c:203 msgid "SSL method not available\n" msgstr "SSL ＜純с障\n" -#: libsylph/ssl.c:208 +#: libsylph/ssl.c:209 msgid "Unknown SSL method *PROGRAM BUG*\n" msgstr "ャ SSL ＜純 *PROGRAM BUG*\n" -#: libsylph/ssl.c:214 +#: libsylph/ssl.c:215 msgid "Error creating ssl context\n" msgstr "ssl 潟潟鴻筝主榊\n" #. Get the cipher -#: libsylph/ssl.c:233 +#: libsylph/ssl.c:234 #, c-format msgid "SSL connection using %s\n" msgstr "%s SSL ･膓\n" -#: libsylph/ssl.c:242 +#: libsylph/ssl.c:243 msgid "Server certificate:\n" msgstr "泣若荐惹:\n" -#: libsylph/ssl.c:245 +#: libsylph/ssl.c:246 #, c-format msgid " Subject: %s\n" msgstr " : %s\n" -#: libsylph/ssl.c:250 +#: libsylph/ssl.c:251 #, c-format msgid " Issuer: %s\n" msgstr " 肴: %s\n" @@ -683,7 +683,7 @@ msgstr "" "緇鴻G鴻с" #: src/account_dialog.c:366 src/addressadd.c:177 src/addressbook.c:491 -#: src/compose.c:4435 src/editaddress.c:200 src/editaddress.c:942 +#: src/compose.c:4439 src/editaddress.c:200 src/editaddress.c:942 #: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265 #: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184 #: src/mimeview.c:208 src/prefs_filter.c:259 src/prefs_folder_item.c:171 @@ -819,7 +819,7 @@ msgstr "≪激с潟若九" msgid "Add Address to Book" msgstr "≪鴻≪劫験菴遵" -#: src/addressadd.c:187 src/compose.c:4939 src/editaddress.c:201 +#: src/addressadd.c:187 src/compose.c:4943 src/editaddress.c:201 #: src/select-keys.c:320 msgid "Address" msgstr "≪" @@ -962,7 +962,7 @@ msgstr "/(_D)" msgid "E-Mail address" msgstr "糸＜若 ≪" -#: src/addressbook.c:496 src/compose.c:4940 src/prefs_common_dialog.c:2264 +#: src/addressbook.c:496 src/compose.c:4944 src/prefs_common_dialog.c:2274 msgid "Address book" msgstr "≪劫験" @@ -1132,7 +1132,7 @@ msgstr "≪劫験紊" msgid "Addressbook Conversion" msgstr "≪劫験紊" -#: src/addressbook.c:3080 src/prefs_common_dialog.c:2098 +#: src/addressbook.c:3080 src/prefs_common_dialog.c:2103 msgid "Interface" msgstr "ゃ潟帥с若" @@ -1178,7 +1178,7 @@ msgstr "掩≪" msgid "Personal address" msgstr "篋榊≪" -#: src/alertpanel.c:142 src/compose.c:5672 src/main.c:638 +#: src/alertpanel.c:142 src/compose.c:5684 src/main.c:638 msgid "Notice" msgstr "羈" @@ -1683,131 +1683,131 @@ msgstr "＜祉若吾篆≦罘с障\n" msgid "generated Message-ID: %s\n" msgstr "＜祉若ID: %s\n" -#: src/compose.c:4250 +#: src/compose.c:4252 msgid "Creating compose window...\n" msgstr "＜祉若娯ｃ潟篏筝...\n" -#: src/compose.c:4301 src/headerview.c:54 +#: src/compose.c:4305 src/headerview.c:54 msgid "From:" msgstr "綏坂査:" -#: src/compose.c:4375 +#: src/compose.c:4379 msgid "PGP Sign" msgstr "PGP臀峨" -#: src/compose.c:4378 +#: src/compose.c:4382 msgid "PGP Encrypt" msgstr "PGP垸" -#: src/compose.c:4416 src/compose.c:5506 +#: src/compose.c:4420 src/compose.c:5510 msgid "MIME type" msgstr "MIME 帥ゃ" #. S_COL_DATE -#: src/compose.c:4425 src/mimeview.c:199 src/prefs_filter_edit.c:496 +#: src/compose.c:4429 src/mimeview.c:199 src/prefs_filter_edit.c:496 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5019 msgid "Size" msgstr "泣ゃ" -#: src/compose.c:4860 src/mainwindow.c:2382 src/prefs_account_dialog.c:553 -#: src/prefs_common_dialog.c:680 +#: src/compose.c:4864 src/mainwindow.c:2382 src/prefs_account_dialog.c:553 +#: src/prefs_common_dialog.c:684 msgid "Send" msgstr "篆" -#: src/compose.c:4861 +#: src/compose.c:4865 msgid "Send message" msgstr "＜祉若吾篆" -#: src/compose.c:4869 +#: src/compose.c:4873 msgid "Send later" msgstr "緇ч篆" -#: src/compose.c:4870 +#: src/compose.c:4874 msgid "Put into queue folder and send later" msgstr "篆≦＜ャ緇ч篆" -#: src/compose.c:4878 +#: src/compose.c:4882 msgid "Draft" msgstr "腮" -#: src/compose.c:4879 +#: src/compose.c:4883 msgid "Save to draft folder" msgstr "腮帥篆絖" -#: src/compose.c:4889 +#: src/compose.c:4893 msgid "Insert" msgstr "水" -#: src/compose.c:4890 +#: src/compose.c:4894 msgid "Insert file" msgstr "＜ゃ水" -#: src/compose.c:4898 +#: src/compose.c:4902 msgid "Attach" msgstr "羞私" -#: src/compose.c:4899 +#: src/compose.c:4903 msgid "Attach file" msgstr "＜ゃ羞私" #. signature -#: src/compose.c:4909 src/prefs_account_dialog.c:1243 -#: src/prefs_common_dialog.c:1005 +#: src/compose.c:4913 src/prefs_account_dialog.c:1243 +#: src/prefs_common_dialog.c:1009 msgid "Signature" msgstr "臀峨" -#: src/compose.c:4910 +#: src/compose.c:4914 msgid "Append signature" msgstr "臀峨菴遵" #. editor -#: src/compose.c:4919 src/prefs_common_dialog.c:1045 -#: src/prefs_common_dialog.c:2388 +#: src/compose.c:4923 src/prefs_common_dialog.c:1049 +#: src/prefs_common_dialog.c:2398 msgid "Editor" msgstr "ｃ" -#: src/compose.c:4920 +#: src/compose.c:4924 msgid "Edit with external editor" msgstr "紊ｃ帥х隈" -#: src/compose.c:4928 +#: src/compose.c:4932 msgid "Linewrap" msgstr "翫就" -#: src/compose.c:4929 +#: src/compose.c:4933 msgid "Wrap all long lines" msgstr "鴻激茵菴" -#: src/compose.c:5402 +#: src/compose.c:5406 msgid "Invalid MIME type." msgstr "≦鴻 MIME 帥ゃс" -#: src/compose.c:5420 +#: src/compose.c:5424 msgid "File doesn't exist or is empty." msgstr "＜ゃ絖障腥冴с" -#: src/compose.c:5488 +#: src/compose.c:5492 msgid "Properties" msgstr "" -#: src/compose.c:5508 src/prefs_common_dialog.c:1500 +#: src/compose.c:5512 src/prefs_common_dialog.c:1504 msgid "Encoding" msgstr "潟潟若ｃ潟" -#: src/compose.c:5531 src/prefs_folder_item.c:202 +#: src/compose.c:5535 src/prefs_folder_item.c:202 msgid "Path" msgstr "" -#: src/compose.c:5532 +#: src/compose.c:5536 msgid "File name" msgstr "＜ゃ" -#: src/compose.c:5621 +#: src/compose.c:5626 #, c-format msgid "External editor command line is invalid: `%s'\n" msgstr "紊ｃ帥潟潟ゃ潟≦鴻с: `%s'\n" -#: src/compose.c:5669 +#: src/compose.c:5681 #, c-format msgid "" "The external editor is still working.\n" @@ -1816,44 +1816,44 @@ msgstr "" "紊ｃ帥篏筝с\n" "祉鴻綣桁句篋障(pid: %d)?\n" -#: src/compose.c:6045 src/compose.c:6050 src/compose.c:6056 +#: src/compose.c:6057 src/compose.c:6062 src/compose.c:6068 msgid "Can't queue the message." msgstr "＜祉若吾篆≦罘с障" -#: src/compose.c:6147 +#: src/compose.c:6159 msgid "Select files" msgstr "＜ゃ御" -#: src/compose.c:6170 +#: src/compose.c:6182 msgid "Select file" msgstr "＜ゃ御" -#: src/compose.c:6205 +#: src/compose.c:6217 msgid "Save message" msgstr "＜祉若吾篆絖" -#: src/compose.c:6206 +#: src/compose.c:6218 msgid "This message has been modified. Save it to draft folder?" msgstr "＜祉若吾紊眼障腮帥篆絖障?" -#: src/compose.c:6208 +#: src/compose.c:6220 msgid "Close _without saving" msgstr "篆絖(_W)" -#: src/compose.c:6250 +#: src/compose.c:6262 #, c-format msgid "Do you want to apply the template `%s' ?" msgstr "潟若 `%s' 障?" -#: src/compose.c:6252 +#: src/compose.c:6264 msgid "Apply template" msgstr "潟若" -#: src/compose.c:6253 +#: src/compose.c:6265 msgid "_Replace" msgstr "臀(_R)" -#: src/compose.c:6253 +#: src/compose.c:6265 msgid "_Insert" msgstr "水(_I)" @@ -2037,7 +2037,7 @@ msgstr "JPilot潟膩" #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203 #: src/importldif.c:535 src/prefs_account_dialog.c:1792 -#: src/prefs_common_dialog.c:1902 +#: src/prefs_common_dialog.c:1906 msgid " ... " msgstr " ... " @@ -2338,7 +2338,7 @@ msgstr "若罕膀紊掩障" msgid "Checking for new messages in all folders..." msgstr "亥＜祉若吾с筝..." -#: src/folderview.c:1232 src/mainwindow.c:2458 src/prefs_common_dialog.c:1846 +#: src/folderview.c:1232 src/mainwindow.c:2458 src/prefs_common_dialog.c:1850 msgid "Junk" msgstr "菴傑＜若" @@ -3678,7 +3678,7 @@ msgid "Send queued message(s)" msgstr "篆≦罘筝＜祉若吾篆＜" #: src/mainwindow.c:2393 src/prefs_account_dialog.c:555 -#: src/prefs_common_dialog.c:682 src/prefs_folder_item.c:140 +#: src/prefs_common_dialog.c:686 src/prefs_folder_item.c:140 msgid "Compose" msgstr "篏" @@ -3686,7 +3686,7 @@ msgstr "篏" msgid "Compose new message" msgstr "域＜祉若吾篏" -#: src/mainwindow.c:2402 src/prefs_common_dialog.c:1027 +#: src/mainwindow.c:2402 src/prefs_common_dialog.c:1031 msgid "Reply" msgstr "菴篆" @@ -4041,11 +4041,11 @@ msgstr "≪潟荐絎" msgid "Creating account preferences window...\n" msgstr "≪潟＜潟鴻ｃ潟篏筝...\n" -#: src/prefs_account_dialog.c:551 src/prefs_common_dialog.c:678 +#: src/prefs_account_dialog.c:551 src/prefs_common_dialog.c:682 msgid "Receive" msgstr "篆" -#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:689 +#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:693 msgid "Privacy" msgstr "篋堺" @@ -4053,7 +4053,7 @@ msgstr "篋堺" msgid "SSL" msgstr "SSL" -#: src/prefs_account_dialog.c:565 src/prefs_common_dialog.c:2183 +#: src/prefs_account_dialog.c:565 src/prefs_common_dialog.c:2192 msgid "Advanced" msgstr "蕭綺荐絎" @@ -4177,7 +4177,7 @@ msgid "Authentication method" msgstr "茯荐惹劫" #: src/prefs_account_dialog.c:985 src/prefs_account_dialog.c:1141 -#: src/prefs_common_dialog.c:896 src/prefs_common_dialog.c:2569 +#: src/prefs_common_dialog.c:900 src/prefs_common_dialog.c:2579 msgid "Automatic" msgstr "" @@ -4217,8 +4217,8 @@ msgstr "＜祉若ID" msgid "Add user-defined header" msgstr "若九臂菴遵" -#: src/prefs_account_dialog.c:1098 src/prefs_common_dialog.c:1605 -#: src/prefs_common_dialog.c:1632 +#: src/prefs_account_dialog.c:1098 src/prefs_common_dialog.c:1609 +#: src/prefs_common_dialog.c:1636 msgid " Edit... " msgstr " 膩... " @@ -4554,85 +4554,85 @@ msgstr "≪激с潟" msgid "Do you really want to delete this action?" msgstr "綵≪激с潟ゃс?" -#: src/prefs_common_dialog.c:658 +#: src/prefs_common_dialog.c:662 msgid "Creating common preferences window...\n" msgstr "＜潟鴻ｃ潟篏筝...\n" -#: src/prefs_common_dialog.c:662 +#: src/prefs_common_dialog.c:666 msgid "Common Preferences" msgstr "荐絎" -#: src/prefs_common_dialog.c:684 +#: src/prefs_common_dialog.c:688 msgid "Display" msgstr "茵腓" -#: src/prefs_common_dialog.c:686 +#: src/prefs_common_dialog.c:690 msgid "Junk mail" msgstr "菴傑＜若" -#: src/prefs_common_dialog.c:692 +#: src/prefs_common_dialog.c:696 msgid "Details" msgstr "荅括完" -#: src/prefs_common_dialog.c:746 +#: src/prefs_common_dialog.c:750 msgid "Auto-check new mail" msgstr "亥＜若с" -#: src/prefs_common_dialog.c:748 src/prefs_common_dialog.c:1121 +#: src/prefs_common_dialog.c:752 src/prefs_common_dialog.c:1125 msgid "every" msgstr " " -#: src/prefs_common_dialog.c:760 src/prefs_common_dialog.c:1135 +#: src/prefs_common_dialog.c:764 src/prefs_common_dialog.c:1139 msgid "minute(s)" msgstr "" -#: src/prefs_common_dialog.c:769 +#: src/prefs_common_dialog.c:773 msgid "Check new mail on startup" msgstr "莎桁亥＜若с" -#: src/prefs_common_dialog.c:771 +#: src/prefs_common_dialog.c:775 msgid "Update all local folders after incorporation" msgstr "篆≦鴻若贋違" -#: src/prefs_common_dialog.c:776 +#: src/prefs_common_dialog.c:780 msgid "Execute command when new messages arrived" msgstr "亥＜祉若吾亥潟潟絎茵" -#: src/prefs_common_dialog.c:788 src/prefs_common_dialog.c:2425 -#: src/prefs_common_dialog.c:2447 src/prefs_common_dialog.c:2469 +#: src/prefs_common_dialog.c:792 src/prefs_common_dialog.c:2435 +#: src/prefs_common_dialog.c:2457 src/prefs_common_dialog.c:2479 msgid "Command" msgstr "潟潟" -#: src/prefs_common_dialog.c:799 +#: src/prefs_common_dialog.c:803 #, c-format msgid "`%d' will be replaced with the number of new messages." msgstr "`%d' 亥＜祉若御違х舟障" -#: src/prefs_common_dialog.c:803 +#: src/prefs_common_dialog.c:807 msgid "Incorporate from local spool" msgstr "若鴻若莨若" -#: src/prefs_common_dialog.c:816 +#: src/prefs_common_dialog.c:820 msgid "Filter on incorporation" msgstr "莨惹" -#: src/prefs_common_dialog.c:822 +#: src/prefs_common_dialog.c:826 msgid "Spool path" msgstr "鴻若" -#: src/prefs_common_dialog.c:873 +#: src/prefs_common_dialog.c:877 msgid "Save sent messages to outbox" msgstr "篆＜＜祉若吾篆≧ｧ篆絖" -#: src/prefs_common_dialog.c:875 +#: src/prefs_common_dialog.c:879 msgid "Apply filter rules to sent messages" msgstr "篆＜＜祉若吾ｃ帥若" -#: src/prefs_common_dialog.c:882 +#: src/prefs_common_dialog.c:886 msgid "Transfer encoding" msgstr "荵∫膃垸劫" -#: src/prefs_common_dialog.c:905 +#: src/prefs_common_dialog.c:909 msgid "" "Specify Content-Transfer-Encoding used when message body contains non-ASCII " "characters." @@ -4640,15 +4640,15 @@ msgstr "" "＜祉若御ASCII絖篁ュ翫篏睡 Content-Transfer-Encoding " "絎" -#: src/prefs_common_dialog.c:912 +#: src/prefs_common_dialog.c:916 msgid "MIME filename encoding" msgstr "MIME＜ゃ潟潟若ｃ潟" -#: src/prefs_common_dialog.c:923 +#: src/prefs_common_dialog.c:927 msgid "MIME header" msgstr "MIME" -#: src/prefs_common_dialog.c:933 +#: src/prefs_common_dialog.c:937 msgid "" "Specify encoding method for MIME filename with non-ASCII characters.\n" "MIME header: most popular, but violates RFC 2047\n" @@ -4658,162 +4658,162 @@ msgstr "" "MIME: RFC 2047\n" "RFC 2231: 罔羣羣" -#: src/prefs_common_dialog.c:1001 src/prefs_common_dialog.c:1390 +#: src/prefs_common_dialog.c:1005 src/prefs_common_dialog.c:1394 #: src/prefs_folder_item.c:139 msgid "General" msgstr "筝" -#: src/prefs_common_dialog.c:1016 +#: src/prefs_common_dialog.c:1020 msgid "Signature separator" msgstr "臀峨阪" -#: src/prefs_common_dialog.c:1025 +#: src/prefs_common_dialog.c:1029 msgid "Insert automatically" msgstr "水ャ" -#: src/prefs_common_dialog.c:1035 +#: src/prefs_common_dialog.c:1039 msgid "Automatically select account for replies" msgstr "菴篆≧≪潟御" -#: src/prefs_common_dialog.c:1037 +#: src/prefs_common_dialog.c:1041 msgid "Quote message when replying" msgstr "菴篆≧＜祉若吾綣" -#: src/prefs_common_dialog.c:1039 +#: src/prefs_common_dialog.c:1043 msgid "Reply button invokes mailing list reply" msgstr "菴篆＜帥潟с＜若潟違鴻菴篆＜" -#: src/prefs_common_dialog.c:1041 +#: src/prefs_common_dialog.c:1045 msgid "Inherit recipients on reply to self messages" msgstr "冴＜祉若吾菴篆＜翫絎綣膓" -#: src/prefs_common_dialog.c:1052 +#: src/prefs_common_dialog.c:1056 msgid "Automatically launch the external editor" msgstr "紊ｃ帥莎桁" -#: src/prefs_common_dialog.c:1062 +#: src/prefs_common_dialog.c:1066 msgid "Undo level" msgstr "≪潟ャ" -#: src/prefs_common_dialog.c:1082 +#: src/prefs_common_dialog.c:1086 msgid "Wrap messages at" msgstr "＜祉若吾茹" -#: src/prefs_common_dialog.c:1094 +#: src/prefs_common_dialog.c:1098 msgid "characters" msgstr "絖ф壕" -#: src/prefs_common_dialog.c:1104 +#: src/prefs_common_dialog.c:1108 msgid "Wrap quotation" msgstr "綣翫就" -#: src/prefs_common_dialog.c:1110 +#: src/prefs_common_dialog.c:1114 msgid "Wrap on input" msgstr "ュ翫就" -#: src/prefs_common_dialog.c:1119 +#: src/prefs_common_dialog.c:1123 msgid "Auto-save to draft" msgstr "腮帥篆絖" -#: src/prefs_common_dialog.c:1144 +#: src/prefs_common_dialog.c:1148 msgid "Format" msgstr "後" -#: src/prefs_common_dialog.c:1149 +#: src/prefs_common_dialog.c:1153 msgid "Spell checking" msgstr "鴻с" #. reply -#: src/prefs_common_dialog.c:1201 +#: src/prefs_common_dialog.c:1205 msgid "Reply format" msgstr "菴篆＜後" -#: src/prefs_common_dialog.c:1216 src/prefs_common_dialog.c:1258 +#: src/prefs_common_dialog.c:1220 src/prefs_common_dialog.c:1262 msgid "Quotation mark" msgstr "綣膃" #. forward -#: src/prefs_common_dialog.c:1243 +#: src/prefs_common_dialog.c:1247 msgid "Forward format" msgstr "荵∫後" -#: src/prefs_common_dialog.c:1290 +#: src/prefs_common_dialog.c:1294 msgid " Description of symbols " msgstr " 荐垩茯 " -#: src/prefs_common_dialog.c:1319 +#: src/prefs_common_dialog.c:1323 msgid "Enable Spell checking" msgstr "鴻с鴻" -#: src/prefs_common_dialog.c:1331 +#: src/prefs_common_dialog.c:1335 msgid "Default language:" msgstr "√荐茯:" -#: src/prefs_common_dialog.c:1398 +#: src/prefs_common_dialog.c:1402 msgid "Text font" msgstr "鴻潟" #. ---- Folder View ---- -#: src/prefs_common_dialog.c:1410 +#: src/prefs_common_dialog.c:1414 msgid "Folder View" msgstr "ャ" -#: src/prefs_common_dialog.c:1418 +#: src/prefs_common_dialog.c:1422 msgid "Display unread number next to folder name" msgstr "罔茯違茵腓冴" -#: src/prefs_common_dialog.c:1420 +#: src/prefs_common_dialog.c:1424 msgid "Display message number columns in the folder view" msgstr "ャ若＜祉若御違茵腓冴" -#: src/prefs_common_dialog.c:1429 +#: src/prefs_common_dialog.c:1433 msgid "Abbreviate newsgroups longer than" msgstr "絖違" -#: src/prefs_common_dialog.c:1444 +#: src/prefs_common_dialog.c:1448 msgid "letters" msgstr "絖激ャ若鴻違若膂∞ヨ；腓" #. ---- Summary ---- -#: src/prefs_common_dialog.c:1450 +#: src/prefs_common_dialog.c:1454 msgid "Summary View" msgstr "泣ャ" -#: src/prefs_common_dialog.c:1459 +#: src/prefs_common_dialog.c:1463 msgid "Display recipient on `From' column if sender is yourself" msgstr "綏坂査翫 `綏坂査' 絎茵腓冴" -#: src/prefs_common_dialog.c:1461 +#: src/prefs_common_dialog.c:1465 msgid "Expand threads" msgstr "鴻絮" -#: src/prefs_common_dialog.c:1469 src/prefs_common_dialog.c:2812 -#: src/prefs_common_dialog.c:2850 +#: src/prefs_common_dialog.c:1473 src/prefs_common_dialog.c:2822 +#: src/prefs_common_dialog.c:2860 msgid "Date format" msgstr "ヤ後" -#: src/prefs_common_dialog.c:1490 +#: src/prefs_common_dialog.c:1494 msgid " Set display item of summary... " msgstr " 泣茵腓咲荐絎... " -#: src/prefs_common_dialog.c:1496 +#: src/prefs_common_dialog.c:1500 msgid "Message" msgstr "＜祉若" -#: src/prefs_common_dialog.c:1506 +#: src/prefs_common_dialog.c:1510 msgid "Default character encoding" msgstr "√絖潟潟若ｃ潟" -#: src/prefs_common_dialog.c:1520 +#: src/prefs_common_dialog.c:1524 msgid "This is used when displaying messages with missing character encoding." msgstr "" "潟潟若ｃ潟違絎＜祉若吾茵腓冴篏睡障" -#: src/prefs_common_dialog.c:1526 +#: src/prefs_common_dialog.c:1530 msgid "Outgoing character encoding" msgstr "篆≧絖潟潟若ｃ潟" -#: src/prefs_common_dialog.c:1540 +#: src/prefs_common_dialog.c:1544 msgid "" "If `Automatic' is selected, the optimal encoding for the current locale will " "be used." @@ -4821,89 +4821,89 @@ msgstr "" "荐絎御翫憜荐茯荐絎潟潟若ｃ潟違篏睡" "障" -#: src/prefs_common_dialog.c:1601 +#: src/prefs_common_dialog.c:1605 msgid "Enable coloration of message" msgstr "＜祉若吾蚊鴻" -#: src/prefs_common_dialog.c:1616 +#: src/prefs_common_dialog.c:1620 msgid "" "Display multi-byte alphabet and numeric as\n" "ASCII character (Japanese only)" msgstr "ゃ掩医 ASCII 絖ц；腓冴 (ユ茯)" -#: src/prefs_common_dialog.c:1623 +#: src/prefs_common_dialog.c:1627 msgid "Display header pane above message view" msgstr "＜祉若吾ャ若筝ゃ潟茵腓冴" -#: src/prefs_common_dialog.c:1630 +#: src/prefs_common_dialog.c:1634 msgid "Display short headers on message view" msgstr "＜祉若吾ャ若膂∞ャ茵腓冴" -#: src/prefs_common_dialog.c:1642 +#: src/prefs_common_dialog.c:1646 msgid "Render HTML messages as text" msgstr "HTML ＜祉若吾茹ｉ鴻茵腓冴" -#: src/prefs_common_dialog.c:1646 +#: src/prefs_common_dialog.c:1650 msgid "Display cursor in message view" msgstr "＜祉若吾ャ若若純茵腓冴" -#: src/prefs_common_dialog.c:1659 +#: src/prefs_common_dialog.c:1663 msgid "Line space" msgstr "茵腥冴" -#: src/prefs_common_dialog.c:1673 src/prefs_common_dialog.c:1711 +#: src/prefs_common_dialog.c:1677 src/prefs_common_dialog.c:1715 msgid "pixel(s)" msgstr "祉" -#: src/prefs_common_dialog.c:1678 +#: src/prefs_common_dialog.c:1682 msgid "Scroll" msgstr "鴻若" -#: src/prefs_common_dialog.c:1685 +#: src/prefs_common_dialog.c:1689 msgid "Half page" msgstr "若後篏" -#: src/prefs_common_dialog.c:1691 +#: src/prefs_common_dialog.c:1695 msgid "Smooth scroll" msgstr "鴻若冴鴻若" -#: src/prefs_common_dialog.c:1697 +#: src/prefs_common_dialog.c:1701 msgid "Step" msgstr "" -#: src/prefs_common_dialog.c:1717 +#: src/prefs_common_dialog.c:1721 msgid "Images" msgstr "糸" -#: src/prefs_common_dialog.c:1725 +#: src/prefs_common_dialog.c:1729 msgid "Resize attached large images to fit in the window" msgstr "紊с羞私糸ｃ潟泣ゃ冴" -#: src/prefs_common_dialog.c:1727 +#: src/prefs_common_dialog.c:1731 msgid "Display images as inline" msgstr "糸ゃ潟ゃ潟ц；腓冴" -#: src/prefs_common_dialog.c:1812 +#: src/prefs_common_dialog.c:1816 msgid "Enable Junk mail control" msgstr "菴傑＜若絲丞鴻" -#: src/prefs_common_dialog.c:1824 +#: src/prefs_common_dialog.c:1828 msgid "Learning command:" msgstr "絖膺潟潟:" -#: src/prefs_common_dialog.c:1833 +#: src/prefs_common_dialog.c:1837 msgid "(Select preset)" msgstr "(祉御)" -#: src/prefs_common_dialog.c:1858 +#: src/prefs_common_dialog.c:1862 msgid "Not Junk" msgstr "菴傑＜若" -#: src/prefs_common_dialog.c:1873 +#: src/prefs_common_dialog.c:1877 msgid "Classifying command" msgstr "ゅ潟潟" -#: src/prefs_common_dialog.c:1884 +#: src/prefs_common_dialog.c:1888 msgid "" "To classify junk mails automatically, both junk and not junk mails must be " "learned manually to a certain extent." @@ -4911,202 +4911,206 @@ msgstr "" "菴傑＜若ゅ菴傑＜若菴傑＜若筝≧鴻腮綺" "фу膺綽荀障" -#: src/prefs_common_dialog.c:1894 +#: src/prefs_common_dialog.c:1898 msgid "Junk folder" msgstr "菴傑＜若" -#: src/prefs_common_dialog.c:1912 +#: src/prefs_common_dialog.c:1916 msgid "The messages which are set as junk mail will be moved to this folder." msgstr "菴傑＜若絎＜祉若吾腱糸障" -#: src/prefs_common_dialog.c:1923 +#: src/prefs_common_dialog.c:1927 msgid "Filter messages classified as junk on receiving" msgstr "篆≧菴傑＜若ゅ＜祉若吾" -#: src/prefs_common_dialog.c:1926 +#: src/prefs_common_dialog.c:1930 msgid "Filter junk mails before normal filtering" msgstr "絽吾菴傑＜若" -#: src/prefs_common_dialog.c:1929 +#: src/prefs_common_dialog.c:1933 msgid "Delete junk mails from server on receiving" msgstr "篆≧菴傑＜若泣若ゃ" -#: src/prefs_common_dialog.c:1934 +#: src/prefs_common_dialog.c:1938 msgid "Mark filtered junk mails as read" msgstr "菴傑＜若∵" -#: src/prefs_common_dialog.c:1976 +#: src/prefs_common_dialog.c:1980 msgid "Automatically check signatures" msgstr "臀峨罎荐若" -#: src/prefs_common_dialog.c:1979 +#: src/prefs_common_dialog.c:1983 msgid "Show signature check result in a popup window" msgstr "臀峨罎荐主≪ｃ潟ц；腓冴" -#: src/prefs_common_dialog.c:1982 +#: src/prefs_common_dialog.c:1986 msgid "Store passphrase in memory temporarily" msgstr "鴻若冴＜≪筝筝荐吟" -#: src/prefs_common_dialog.c:1997 +#: src/prefs_common_dialog.c:2001 msgid "Expired after" msgstr "号" -#: src/prefs_common_dialog.c:2010 +#: src/prefs_common_dialog.c:2014 msgid "minute(s) " msgstr "" -#: src/prefs_common_dialog.c:2024 +#: src/prefs_common_dialog.c:2028 msgid "Setting to '0' will store the passphrase for the whole session." msgstr "'0' 荐絎祉激с潟筝鴻若冴荐吟障" -#: src/prefs_common_dialog.c:2033 +#: src/prefs_common_dialog.c:2037 msgid "Grab input while entering a passphrase" msgstr "鴻若冴ュュ" -#: src/prefs_common_dialog.c:2038 +#: src/prefs_common_dialog.c:2042 msgid "Display warning on startup if GnuPG doesn't work" msgstr "GnuPG 篏翫莎桁茘茵腓冴" -#: src/prefs_common_dialog.c:2106 +#: src/prefs_common_dialog.c:2111 msgid "Always open messages in summary when selected" msgstr "泣с＜祉若吾御絽吾" -#: src/prefs_common_dialog.c:2110 +#: src/prefs_common_dialog.c:2115 msgid "Open first unread message when a folder is opened" msgstr "茯＜祉若吾" -#: src/prefs_common_dialog.c:2117 +#: src/prefs_common_dialog.c:2122 msgid "Remember last selected message" msgstr "緇御＜祉若吾荐吟" -#: src/prefs_common_dialog.c:2121 +#: src/prefs_common_dialog.c:2126 msgid "Only mark message as read when opened in new window" msgstr "域ｃ潟ч帥＜祉若吾∵若" -#: src/prefs_common_dialog.c:2125 +#: src/prefs_common_dialog.c:2130 msgid "Open inbox after receiving new mail" msgstr "亥＜若篆＜緇篆∞宴" -#: src/prefs_common_dialog.c:2127 +#: src/prefs_common_dialog.c:2132 msgid "Open inbox on startup" msgstr "莎桁篆∞宴" -#: src/prefs_common_dialog.c:2135 +#: src/prefs_common_dialog.c:2140 msgid "Execute immediately when moving or deleting messages" msgstr "＜祉若吾腱糸障ゃ喝婚絎茵" -#: src/prefs_common_dialog.c:2147 +#: src/prefs_common_dialog.c:2152 msgid "Messages will be marked until execution if this is turned off." msgstr "" "≦鴻＜祉若吾絎茵障с若倶障" -#: src/prefs_common_dialog.c:2156 +#: src/prefs_common_dialog.c:2161 msgid "Make the order of buttons comply with GNOME HIG" msgstr "帥潟臀GNOME HIG羣" -#: src/prefs_common_dialog.c:2159 +#: src/prefs_common_dialog.c:2164 msgid "Display tray icon" msgstr "ゃ≪ゃ潟潟茵腓冴" -#: src/prefs_common_dialog.c:2161 +#: src/prefs_common_dialog.c:2166 msgid "Minimize to tray icon" msgstr "絨ゃ≪ゃ潟潟主" -#: src/prefs_common_dialog.c:2169 +#: src/prefs_common_dialog.c:2168 +msgid "Toggle window on trayicon click" +msgstr "ゃ≪ゃ潟潟сｃ潟茵腓冴帥" + +#: src/prefs_common_dialog.c:2178 msgid " Set key bindings... " msgstr " 若ゃ潟荐絎... " -#: src/prefs_common_dialog.c:2175 src/select-keys.c:344 +#: src/prefs_common_dialog.c:2184 src/select-keys.c:344 msgid "Other" msgstr "篁" -#: src/prefs_common_dialog.c:2179 +#: src/prefs_common_dialog.c:2188 msgid "External commands" msgstr "紊潟潟" -#: src/prefs_common_dialog.c:2231 +#: src/prefs_common_dialog.c:2241 msgid "Receive dialog" msgstr "篆＜ゃ≪" -#: src/prefs_common_dialog.c:2241 +#: src/prefs_common_dialog.c:2251 msgid "Show receive dialog" msgstr "篆＜ゃ≪違" -#: src/prefs_common_dialog.c:2251 +#: src/prefs_common_dialog.c:2261 msgid "Always" msgstr "絽吾茵腓" -#: src/prefs_common_dialog.c:2252 +#: src/prefs_common_dialog.c:2262 msgid "Only on manual receiving" msgstr "у篆＜翫粋；腓" -#: src/prefs_common_dialog.c:2254 +#: src/prefs_common_dialog.c:2264 msgid "Never" msgstr "茵腓冴" -#: src/prefs_common_dialog.c:2259 +#: src/prefs_common_dialog.c:2269 msgid "Don't popup error dialog on receive error" msgstr "篆＜惹若ゃ≪違≪" -#: src/prefs_common_dialog.c:2262 +#: src/prefs_common_dialog.c:2272 msgid "Close receive dialog when finished" msgstr "絎篋篆＜ゃ≪違" -#: src/prefs_common_dialog.c:2273 +#: src/prefs_common_dialog.c:2283 msgid "Add address to destination when double-clicked" msgstr "≪鴻絎菴遵" -#: src/prefs_common_dialog.c:2275 +#: src/prefs_common_dialog.c:2285 msgid "On exit" msgstr "腟篋" -#: src/prefs_common_dialog.c:2283 +#: src/prefs_common_dialog.c:2293 msgid "Confirm on exit" msgstr "腟篋腆肴" -#: src/prefs_common_dialog.c:2290 +#: src/prefs_common_dialog.c:2300 msgid "Empty trash on exit" msgstr "腟篋睡宴腥冴" -#: src/prefs_common_dialog.c:2292 +#: src/prefs_common_dialog.c:2302 msgid "Ask before emptying" msgstr "腥冴絨" -#: src/prefs_common_dialog.c:2296 +#: src/prefs_common_dialog.c:2306 msgid "Warn if there are queued messages" msgstr "篆≦罘筝＜祉若吾域" -#: src/prefs_common_dialog.c:2351 +#: src/prefs_common_dialog.c:2361 #, c-format msgid "External commands (%s will be replaced with file name / URI)" msgstr "紊潟潟 (%s ＜ゃURIх舟障)" -#: src/prefs_common_dialog.c:2360 +#: src/prefs_common_dialog.c:2370 msgid "Web browser" msgstr "Web" -#: src/prefs_common_dialog.c:2372 src/prefs_common_dialog.c:3817 -#: src/prefs_common_dialog.c:3838 +#: src/prefs_common_dialog.c:2382 src/prefs_common_dialog.c:3827 +#: src/prefs_common_dialog.c:3848 msgid "(Default browser)" msgstr "(√)" -#: src/prefs_common_dialog.c:2413 +#: src/prefs_common_dialog.c:2423 msgid "Use external program for printing" msgstr "医激紊違篏睡" -#: src/prefs_common_dialog.c:2435 +#: src/prefs_common_dialog.c:2445 msgid "Use external program for incorporation" msgstr "＜若篆＜紊違篏睡" -#: src/prefs_common_dialog.c:2457 +#: src/prefs_common_dialog.c:2467 msgid "Use external program for sending" msgstr "＜若篆＜紊違篏睡" -#: src/prefs_common_dialog.c:2516 +#: src/prefs_common_dialog.c:2526 msgid "Enable strict checking of the integrity of summary caches" msgstr "泣ｃ激ャ翫сｳ絲с" -#: src/prefs_common_dialog.c:2519 +#: src/prefs_common_dialog.c:2529 msgid "" "Enable this if the contents of folders have the possibility of modification " "by other applications.\n" @@ -5116,275 +5120,275 @@ msgstr "" "\n" "激с潟泣茵腓冴ц純篏筝障" -#: src/prefs_common_dialog.c:2526 +#: src/prefs_common_dialog.c:2536 msgid "Socket I/O timeout:" msgstr "純宴 I/O 帥ゃ≪:" -#: src/prefs_common_dialog.c:2539 +#: src/prefs_common_dialog.c:2549 msgid "second(s)" msgstr "腱" -#: src/prefs_common_dialog.c:2567 +#: src/prefs_common_dialog.c:2577 msgid "Automatic (Recommended)" msgstr "荐絎 (ｨ絅)" -#: src/prefs_common_dialog.c:2572 +#: src/prefs_common_dialog.c:2582 msgid "7bit ascii (US-ASCII)" msgstr "7bit ascii (US-ASCII)" -#: src/prefs_common_dialog.c:2574 +#: src/prefs_common_dialog.c:2584 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: src/prefs_common_dialog.c:2576 +#: src/prefs_common_dialog.c:2586 msgid "Western European (ISO-8859-1)" msgstr "罨х嘘 (ISO-8859-1)" -#: src/prefs_common_dialog.c:2577 +#: src/prefs_common_dialog.c:2587 msgid "Western European (ISO-8859-15)" msgstr "罨х嘘 (ISO-8859-15)" -#: src/prefs_common_dialog.c:2579 +#: src/prefs_common_dialog.c:2589 msgid "Western European (Windows-1252)" msgstr "罨х嘘 (Windows-1252)" -#: src/prefs_common_dialog.c:2583 +#: src/prefs_common_dialog.c:2593 msgid "Central European (ISO-8859-2)" msgstr "筝罨 (ISO-8859-2)" -#: src/prefs_common_dialog.c:2585 +#: src/prefs_common_dialog.c:2595 msgid "Baltic (ISO-8859-13)" msgstr "茫後 (ISO-8859-13)" -#: src/prefs_common_dialog.c:2586 +#: src/prefs_common_dialog.c:2596 msgid "Baltic (ISO-8859-4)" msgstr "茫後 (ISO-8859-4)" -#: src/prefs_common_dialog.c:2587 +#: src/prefs_common_dialog.c:2597 msgid "Baltic (Windows-1257)" msgstr "茫後 (Windows-1257)" -#: src/prefs_common_dialog.c:2589 +#: src/prefs_common_dialog.c:2599 msgid "Greek (ISO-8859-7)" msgstr "激ｈ (ISO-8859-7)" -#: src/prefs_common_dialog.c:2591 +#: src/prefs_common_dialog.c:2601 msgid "Arabic (ISO-8859-6)" msgstr "≪∵ (ISO-8859-4)" -#: src/prefs_common_dialog.c:2592 +#: src/prefs_common_dialog.c:2602 msgid "Arabic (Windows-1256)" msgstr "≪∵ (Windows-1251)" -#: src/prefs_common_dialog.c:2594 +#: src/prefs_common_dialog.c:2604 msgid "Hebrew (ISO-8859-8)" msgstr "よ (ISO-8859-8)" -#: src/prefs_common_dialog.c:2595 +#: src/prefs_common_dialog.c:2605 msgid "Hebrew (Windows-1255)" msgstr "よ (Windows-1255)" -#: src/prefs_common_dialog.c:2597 +#: src/prefs_common_dialog.c:2607 msgid "Turkish (ISO-8859-9)" msgstr "活 (ISO-8859-9)" -#: src/prefs_common_dialog.c:2599 +#: src/prefs_common_dialog.c:2609 msgid "Cyrillic (ISO-8859-5)" msgstr "絖 (ISO-8859-5)" -#: src/prefs_common_dialog.c:2600 +#: src/prefs_common_dialog.c:2610 msgid "Cyrillic (KOI8-R)" msgstr "絖 (KOI8-R)" -#: src/prefs_common_dialog.c:2601 +#: src/prefs_common_dialog.c:2611 msgid "Cyrillic (KOI8-U)" msgstr "絖 (KOI8-U)" -#: src/prefs_common_dialog.c:2602 +#: src/prefs_common_dialog.c:2612 msgid "Cyrillic (Windows-1251)" msgstr "絖 (Windows-1251)" -#: src/prefs_common_dialog.c:2604 +#: src/prefs_common_dialog.c:2614 msgid "Japanese (ISO-2022-JP)" msgstr "ユ茯 (ISO-2022-JP)" -#: src/prefs_common_dialog.c:2606 +#: src/prefs_common_dialog.c:2616 msgid "Japanese (EUC-JP)" msgstr "ユ茯 (EUC-JP)" -#: src/prefs_common_dialog.c:2607 +#: src/prefs_common_dialog.c:2617 msgid "Japanese (Shift_JIS)" msgstr "ユ茯 (Shift_JIS)" -#: src/prefs_common_dialog.c:2610 +#: src/prefs_common_dialog.c:2620 msgid "Simplified Chinese (GB2312)" msgstr "膂＞絖筝処 (GB2312)" -#: src/prefs_common_dialog.c:2611 +#: src/prefs_common_dialog.c:2621 msgid "Simplified Chinese (GBK)" msgstr "膂＞絖筝処 (GBK)" -#: src/prefs_common_dialog.c:2612 +#: src/prefs_common_dialog.c:2622 msgid "Traditional Chinese (Big5)" msgstr "膵篏絖筝処 (Big5)" -#: src/prefs_common_dialog.c:2614 +#: src/prefs_common_dialog.c:2624 msgid "Traditional Chinese (EUC-TW)" msgstr "膵篏絖筝処 (EUC-TW)" -#: src/prefs_common_dialog.c:2615 +#: src/prefs_common_dialog.c:2625 msgid "Chinese (ISO-2022-CN)" msgstr "筝処 (ISO-2022-CN)" -#: src/prefs_common_dialog.c:2618 +#: src/prefs_common_dialog.c:2628 msgid "Korean (EUC-KR)" msgstr "処 (EUC-KR)" -#: src/prefs_common_dialog.c:2620 +#: src/prefs_common_dialog.c:2630 msgid "Thai (TIS-620)" msgstr "帥よ (TIS-620)" -#: src/prefs_common_dialog.c:2621 +#: src/prefs_common_dialog.c:2631 msgid "Thai (Windows-874)" msgstr "帥よ (Windows-874)" -#: src/prefs_common_dialog.c:2788 +#: src/prefs_common_dialog.c:2798 msgid "the full abbreviated weekday name" msgstr "ャュ" -#: src/prefs_common_dialog.c:2789 +#: src/prefs_common_dialog.c:2799 msgid "the full weekday name" msgstr "ャ絎" -#: src/prefs_common_dialog.c:2790 +#: src/prefs_common_dialog.c:2800 msgid "the abbreviated month name" msgstr "ュ" -#: src/prefs_common_dialog.c:2791 +#: src/prefs_common_dialog.c:2801 msgid "the full month name" msgstr "絎" -#: src/prefs_common_dialog.c:2792 +#: src/prefs_common_dialog.c:2802 msgid "the preferred date and time for the current locale" msgstr "憜医筝ヤ祉茵荐" -#: src/prefs_common_dialog.c:2793 +#: src/prefs_common_dialog.c:2803 msgid "the century number (year/100)" msgstr "筝膣(茱炊綛眼筝2罅)" -#: src/prefs_common_dialog.c:2794 +#: src/prefs_common_dialog.c:2804 msgid "the day of the month as a decimal number" msgstr "(10我域；荐)" -#: src/prefs_common_dialog.c:2795 +#: src/prefs_common_dialog.c:2805 msgid "the hour as a decimal number using a 24-hour clock" msgstr "24荐с" -#: src/prefs_common_dialog.c:2796 +#: src/prefs_common_dialog.c:2806 msgid "the hour as a decimal number using a 12-hour clock" msgstr "12荐с" -#: src/prefs_common_dialog.c:2797 +#: src/prefs_common_dialog.c:2807 msgid "the day of the year as a decimal number" msgstr "綛眼膊ユ(10我域；荐)" -#: src/prefs_common_dialog.c:2798 +#: src/prefs_common_dialog.c:2808 msgid "the month as a decimal number" msgstr "(10我域；荐)" -#: src/prefs_common_dialog.c:2799 +#: src/prefs_common_dialog.c:2809 msgid "the minute as a decimal number" msgstr "(10我域；荐)" -#: src/prefs_common_dialog.c:2800 +#: src/prefs_common_dialog.c:2810 msgid "either AM or PM" msgstr "障緇" -#: src/prefs_common_dialog.c:2801 +#: src/prefs_common_dialog.c:2811 msgid "the second as a decimal number" msgstr "腱(10我域；荐)" -#: src/prefs_common_dialog.c:2802 +#: src/prefs_common_dialog.c:2812 msgid "the day of the week as a decimal number" msgstr "宴篏ャ(10我域；荐)" -#: src/prefs_common_dialog.c:2803 +#: src/prefs_common_dialog.c:2813 msgid "the preferred date for the current locale" msgstr "憜医筝ヤ茵荐" -#: src/prefs_common_dialog.c:2804 +#: src/prefs_common_dialog.c:2814 msgid "the last two digits of a year" msgstr "茱炊筝2罅(筝膣障綛)" -#: src/prefs_common_dialog.c:2805 +#: src/prefs_common_dialog.c:2815 msgid "the year as a decimal number" msgstr "(4罅)茱炊綛" -#: src/prefs_common_dialog.c:2806 +#: src/prefs_common_dialog.c:2816 msgid "the time zone or name or abbreviation" msgstr "帥ゃ障若潟障障若喝障ュ" -#: src/prefs_common_dialog.c:2827 +#: src/prefs_common_dialog.c:2837 msgid "Specifier" msgstr "絎絖" -#: src/prefs_common_dialog.c:2828 +#: src/prefs_common_dialog.c:2838 msgid "Description" msgstr "茯" -#: src/prefs_common_dialog.c:2868 +#: src/prefs_common_dialog.c:2878 msgid "Example" msgstr "箴" -#: src/prefs_common_dialog.c:2949 +#: src/prefs_common_dialog.c:2959 msgid "Set message colors" msgstr "＜祉若吾蚊絎" -#: src/prefs_common_dialog.c:2957 +#: src/prefs_common_dialog.c:2967 msgid "Colors" msgstr "" -#: src/prefs_common_dialog.c:2991 +#: src/prefs_common_dialog.c:3001 msgid "Quoted Text - First Level" msgstr "綣 - 1罧級" -#: src/prefs_common_dialog.c:2997 +#: src/prefs_common_dialog.c:3007 msgid "Quoted Text - Second Level" msgstr "綣 - 2罧級" -#: src/prefs_common_dialog.c:3003 +#: src/prefs_common_dialog.c:3013 msgid "Quoted Text - Third Level" msgstr "綣 - 3罧級" -#: src/prefs_common_dialog.c:3009 +#: src/prefs_common_dialog.c:3019 msgid "URI link" msgstr "URI 潟" -#: src/prefs_common_dialog.c:3016 +#: src/prefs_common_dialog.c:3026 msgid "Recycle quote colors" msgstr "綣蚊緇" -#: src/prefs_common_dialog.c:3083 +#: src/prefs_common_dialog.c:3093 msgid "Pick color for quotation level 1" msgstr "綣1蚊御" -#: src/prefs_common_dialog.c:3086 +#: src/prefs_common_dialog.c:3096 msgid "Pick color for quotation level 2" msgstr "綣2蚊御" -#: src/prefs_common_dialog.c:3089 +#: src/prefs_common_dialog.c:3099 msgid "Pick color for quotation level 3" msgstr "綣3蚊御" -#: src/prefs_common_dialog.c:3092 +#: src/prefs_common_dialog.c:3102 msgid "Pick color for URI" msgstr "URI 蚊御" -#: src/prefs_common_dialog.c:3232 +#: src/prefs_common_dialog.c:3242 msgid "Description of symbols" msgstr "荐垩茯" -#: src/prefs_common_dialog.c:3288 +#: src/prefs_common_dialog.c:3298 msgid "" "Date\n" "From\n" @@ -5408,11 +5412,11 @@ msgstr "" "ャ若鴻違若\n" "＜祉若ID" -#: src/prefs_common_dialog.c:3301 +#: src/prefs_common_dialog.c:3311 msgid "If x is set, displays expr" msgstr "x絎expr茵腓" -#: src/prefs_common_dialog.c:3305 +#: src/prefs_common_dialog.c:3315 msgid "" "Message body\n" "Quoted message body\n" @@ -5426,7 +5430,7 @@ msgstr "" "綣膃篁＜祉若御(臀峨)\n" "絖 %" -#: src/prefs_common_dialog.c:3313 +#: src/prefs_common_dialog.c:3323 msgid "" "Literal backslash\n" "Literal question mark\n" @@ -5438,19 +5442,19 @@ msgstr "" "絖 筝綣\n" "絖 筝綣" -#: src/prefs_common_dialog.c:3359 +#: src/prefs_common_dialog.c:3369 msgid "Key bindings" msgstr "若ゃ潟" -#: src/prefs_common_dialog.c:3372 +#: src/prefs_common_dialog.c:3382 msgid "Select the preset of key bindings." msgstr " 若ゃ潟祉御" -#: src/prefs_common_dialog.c:3382 src/prefs_common_dialog.c:3706 +#: src/prefs_common_dialog.c:3392 src/prefs_common_dialog.c:3716 msgid "Default" msgstr "罔羣" -#: src/prefs_common_dialog.c:3385 src/prefs_common_dialog.c:3715 +#: src/prefs_common_dialog.c:3395 src/prefs_common_dialog.c:3725 msgid "Old Sylpheed" msgstr "Sylpheed" @@ -6712,6 +6716,6 @@ msgstr "篆≦罘筝＜祉若吾篆(_S)" msgid "E_xit" msgstr "腟篋(_X)" -#: src/trayicon.c:198 src/trayicon.c:285 +#: src/trayicon.c:198 src/trayicon.c:289 msgid "Sylpheed" msgstr "Sylpheed" diff --git a/src/prefs_common_dialog.c b/src/prefs_common_dialog.c index b8c27d32..f2ce4f59 100644 --- a/src/prefs_common_dialog.c +++ b/src/prefs_common_dialog.c @@ -194,6 +194,7 @@ static struct Interface { #endif GtkWidget *checkbtn_show_trayicon; GtkWidget *checkbtn_minimize_to_tray; + GtkWidget *checkbtn_tray_toggle_window; } interface; static struct Other { @@ -475,6 +476,9 @@ static PrefsUIData ui_data[] = { prefs_set_data_from_toggle, prefs_set_toggle}, {"minimize_to_tray", &interface.checkbtn_minimize_to_tray, prefs_set_data_from_toggle, prefs_set_toggle}, + {"toggle_window_on_trayicon_click", + &interface.checkbtn_tray_toggle_window, + prefs_set_data_from_toggle, prefs_set_toggle}, /* Other */ {"receive_dialog_mode", &other.optmenu_recvdialog, @@ -2079,6 +2083,7 @@ static void prefs_details_create(void) #endif GtkWidget *checkbtn_show_trayicon; GtkWidget *checkbtn_minimize_to_tray; + GtkWidget *checkbtn_tray_toggle_window; GtkWidget *button_keybind; @@ -2159,8 +2164,12 @@ static void prefs_details_create(void) _("Display tray icon")); PACK_CHECK_BUTTON (vbox2, checkbtn_minimize_to_tray, _("Minimize to tray icon")); + PACK_CHECK_BUTTON (vbox2, checkbtn_tray_toggle_window, + _("Toggle window on trayicon click")); SET_TOGGLE_SENSITIVITY (checkbtn_show_trayicon, checkbtn_minimize_to_tray); + SET_TOGGLE_SENSITIVITY (checkbtn_show_trayicon, + checkbtn_tray_toggle_window); hbox1 = gtk_hbox_new (FALSE, 8); gtk_widget_show (hbox1); @@ -2196,8 +2205,9 @@ static void prefs_details_create(void) #ifndef G_OS_WIN32 interface.checkbtn_comply_gnome_hig = checkbtn_comply_gnome_hig; #endif - interface.checkbtn_show_trayicon = checkbtn_show_trayicon; - interface.checkbtn_minimize_to_tray = checkbtn_minimize_to_tray; + interface.checkbtn_show_trayicon = checkbtn_show_trayicon; + interface.checkbtn_minimize_to_tray = checkbtn_minimize_to_tray; + interface.checkbtn_tray_toggle_window = checkbtn_tray_toggle_window; } static GtkWidget *prefs_other_create(void) diff --git a/src/trayicon.c b/src/trayicon.c index 51d9f47c..fc1f1f15 100644 --- a/src/trayicon.c +++ b/src/trayicon.c @@ -41,7 +41,7 @@ #include "main.h" #include "inc.h" #include "compose.h" -#include "gtkutils.h" +#include "prefs_common.h" #if GTK_CHECK_VERSION(2, 10, 0) || defined(GDK_WINDOWING_X11) @@ -241,7 +241,11 @@ static void trayicon_activated(GtkStatusIcon *status_icon, gpointer data) { MainWindow *mainwin = (MainWindow *)data; - main_window_popup(mainwin); + if (prefs_common.toggle_window_on_trayicon_click && + gtk_window_is_active(GTK_WINDOW(mainwin->window))) + gtk_window_iconify(GTK_WINDOW(mainwin->window)); + else + main_window_popup(mainwin); } static void trayicon_popup_menu_cb(GtkStatusIcon *status_icon, guint button, @@ -317,9 +321,13 @@ static void trayicon_button_pressed(GtkWidget *widget, GdkEventButton *event, if (!event) return; - if (event->button == 1) - main_window_popup(mainwin); - else if (event->button == 3) { + if (event->button == 1) { + if (prefs_common.toggle_window_on_trayicon_click && + gtk_window_is_active(GTK_WINDOW(mainwin->window))) + gtk_window_iconify(GTK_WINDOW(mainwin->window)); + else + main_window_popup(mainwin); + } else if (event->button == 3) { gtk_menu_popup(GTK_MENU(trayicon_menu), NULL, NULL, NULL, NULL, event->button, event->time); } |