• R/O
  • HTTP
  • SSH
  • HTTPS

karesansui: コミット

Git repository of Karesansui.


コミットメタ情報

リビジョンa164daba45e3581066c8b294b7e86d8f4477d70a (tree)
日時2010-07-22 13:14:41
作者Kazuhiro Ogura <rgoura@kare...>
コミッターKazuhiro Ogura

ログメッセージ

Some translation.

変更サマリ

差分

--- a/doc/messages.pot
+++ b/doc/messages.pot
@@ -8,7 +8,7 @@ msgid ""
88 msgstr ""
99 "Project-Id-Version: PROJECT VERSION\n"
1010 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
11-"POT-Creation-Date: 2010-07-21 17:55+0900\n"
11+"POT-Creation-Date: 2010-07-22 13:10+0900\n"
1212 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -4228,8 +4228,8 @@ msgstr ""
42284228
42294229 #: /root/karesansui.git/karesansui/templates/default/guest/guest.input:364
42304230 msgid ""
4231-"Create New Disk Image: Create a new storage image. \\n\\nUse iSCSI: Use "
4232-"iSCSI networked storage.\\n"
4231+"Create New Disk Image: Create a new storage image. <br />Use iSCSI: Use "
4232+"iSCSI networked storage."
42334233 msgstr ""
42344234
42354235 #: /root/karesansui.git/karesansui/templates/default/guest/guest.input:370
@@ -7025,8 +7025,10 @@ msgstr ""
70257025 #: /root/karesansui.git/karesansui/templates/default/hostby1watch/hostby1watch.input:513
70267026 #: /root/karesansui.git/karesansui/templates/default/hostby1watch/hostby1watch.input:521
70277027 #: /root/karesansui.git/karesansui/templates/default/hostby1watch/hostby1watch.input:529
7028+#: /root/karesansui.git/karesansui/templates/default/hostby1watch/hostby1watch.input:614
70287029 #: /root/karesansui.git/karesansui/templates/default/hostby1watch/hostby1watch.input:618
70297030 #: /root/karesansui.git/karesansui/templates/default/hostby1watch/hostby1watch.input:622
7031+#: /root/karesansui.git/karesansui/templates/default/hostby1watch/hostby1watch.input:880
70307032 #: /root/karesansui.git/karesansui/templates/default/hostby1watch/hostby1watch.input:899
70317033 #: /root/karesansui.git/karesansui/templates/default/hostby1watch/hostby1watch.input:917
70327034 #: /root/karesansui.git/karesansui/templates/default/hostby1watchby1/hostby1watchby1.input:336
@@ -7037,6 +7039,8 @@ msgstr ""
70377039 #: /root/karesansui.git/karesansui/templates/default/hostby1watchby1/hostby1watchby1.input:372
70387040 #: /root/karesansui.git/karesansui/templates/default/hostby1watchby1/hostby1watchby1.input:591
70397041 #: /root/karesansui.git/karesansui/templates/default/hostby1watchby1/hostby1watchby1.input:617
7042+#: /root/karesansui.git/karesansui/templates/default/hostby1watchby1/hostby1watchby1.input:643
7043+#: /root/karesansui.git/karesansui/templates/default/hostby1watchby1/hostby1watchby1.part:212
70407044 #: /root/karesansui.git/karesansui/templates/default/hostby1watchby1/hostby1watchby1.part:240
70417045 #: /root/karesansui.git/karesansui/templates/default/hostby1watchby1/hostby1watchby1.part:268
70427046 msgid "Notification Mail"
@@ -7075,13 +7079,13 @@ msgid "Okay Script"
70757079 msgstr ""
70767080
70777081 #: /root/karesansui.git/karesansui/templates/default/hostby1watch/hostby1watch.input:526
7078-msgid "Script executed when okay value was exceeded."
7082+msgid "Script executed when status returns okay."
70797083 msgstr ""
70807084
70817085 #: /root/karesansui.git/karesansui/templates/default/hostby1watch/hostby1watch.input:530
70827086 msgid ""
7083-"Contents of the notification mail which is sent when the okay value was "
7084-"exceeded."
7087+"Contents of the notification mail which is sent when the status returns "
7088+"okay."
70857089 msgstr ""
70867090
70877091 #: /root/karesansui.git/karesansui/templates/default/hostby1watch/hostby1watch.input:534
@@ -7098,10 +7102,6 @@ msgid ""
70987102 "supported."
70997103 msgstr ""
71007104
7101-#: /root/karesansui.git/karesansui/templates/default/hostby1watch/hostby1watch.input:614
7102-msgid "Notification Mail Body"
7103-msgstr ""
7104-
71057105 #: /root/karesansui.git/karesansui/templates/default/hostby1watch/hostby1watch.input:615
71067106 #: /root/karesansui.git/karesansui/templates/default/hostby1watch/hostby1watch.input:619
71077107 #: /root/karesansui.git/karesansui/templates/default/hostby1watch/hostby1watch.input:623
@@ -7217,10 +7217,6 @@ msgstr ""
72177217 msgid "Warning Settings"
72187218 msgstr ""
72197219
7220-#: /root/karesansui.git/karesansui/templates/default/hostby1watch/hostby1watch.input:880
7221-msgid "Warning Notify Mail"
7222-msgstr ""
7223-
72247220 #: /root/karesansui.git/karesansui/templates/default/hostby1watch/hostby1watch.input:885
72257221 #: /root/karesansui.git/karesansui/templates/default/hostby1watch/hostby1watch.input:904
72267222 #: /root/karesansui.git/karesansui/templates/default/hostby1watch/hostby1watch.input:922
@@ -7311,23 +7307,19 @@ msgid "Contents of the mail notified when the failure value exceeded."
73117307 msgstr ""
73127308
73137309 #: /root/karesansui.git/karesansui/templates/default/hostby1watchby1/hostby1watchby1.input:349
7314-msgid "Script execute when a okay value is exceeded."
7310+msgid "Script executed when the status returns okay."
73157311 msgstr ""
73167312
73177313 #: /root/karesansui.git/karesansui/templates/default/hostby1watchby1/hostby1watchby1.input:353
73187314 msgid ""
7319-"Contents of the notification mail which will be sent when the okay value "
7320-"was exceeded."
7315+"Contents of the notification mail which will be sent when the status "
7316+"returns okay."
73217317 msgstr ""
73227318
73237319 #: /root/karesansui.git/karesansui/templates/default/hostby1watchby1/hostby1watchby1.input:401
73247320 msgid "Edit Watch"
73257321 msgstr ""
73267322
7327-#: /root/karesansui.git/karesansui/templates/default/hostby1watchby1/hostby1watchby1.input:643
7328-msgid "Okay Notify Mail"
7329-msgstr ""
7330-
73317323 #: /root/karesansui.git/karesansui/templates/default/hostby1watchby1/hostby1watchby1.part:178
73327324 msgid "Watch Interval (sec)"
73337325 msgstr ""
@@ -7340,10 +7332,6 @@ msgstr ""
73407332 msgid "Enable"
73417333 msgstr ""
73427334
7343-#: /root/karesansui.git/karesansui/templates/default/hostby1watchby1/hostby1watchby1.part:212
7344-msgid "Failure Mail Body"
7345-msgstr ""
7346-
73477335 #: /root/karesansui.git/karesansui/templates/default/hostby1watchby1/hostby1watchby1.part:225
73487336 msgid "Warning"
73497337 msgstr ""
Binary files a/karesansui/locale/en/LC_MESSAGES/messages.mo and b/karesansui/locale/en/LC_MESSAGES/messages.mo differ
--- a/karesansui/locale/en/LC_MESSAGES/messages.po
+++ b/karesansui/locale/en/LC_MESSAGES/messages.po
@@ -9,7 +9,7 @@ msgstr ""
99 "Project-Id-Version: PROJECT VERSION\n"
1010 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
1111 "POT-Creation-Date: 2009-01-06 15:17+0900\n"
12-"PO-Revision-Date: 2010-07-21 17:56+0900\n"
12+"PO-Revision-Date: 2010-07-22 13:10+0900\n"
1313 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414 "Language-Team: en <LL@li.org>\n"
1515 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
@@ -4229,9 +4229,8 @@ msgstr ""
42294229
42304230 #: /root/karesansui.git/karesansui/templates/default/guest/guest.input:364
42314231 msgid ""
4232-"Create New Disk Image: Create a new storage image. \n"
4233-"\n"
4234-"Use iSCSI: Use iSCSI networked storage.\n"
4232+"Create New Disk Image: Create a new storage image. <br />Use iSCSI: Use "
4233+"iSCSI networked storage."
42354234 msgstr ""
42364235
42374236 #: /root/karesansui.git/karesansui/templates/default/guest/guest.input:370
@@ -7028,8 +7027,10 @@ msgstr ""
70287027 #: /root/karesansui.git/karesansui/templates/default/hostby1watch/hostby1watch.input:513
70297028 #: /root/karesansui.git/karesansui/templates/default/hostby1watch/hostby1watch.input:521
70307029 #: /root/karesansui.git/karesansui/templates/default/hostby1watch/hostby1watch.input:529
7030+#: /root/karesansui.git/karesansui/templates/default/hostby1watch/hostby1watch.input:614
70317031 #: /root/karesansui.git/karesansui/templates/default/hostby1watch/hostby1watch.input:618
70327032 #: /root/karesansui.git/karesansui/templates/default/hostby1watch/hostby1watch.input:622
7033+#: /root/karesansui.git/karesansui/templates/default/hostby1watch/hostby1watch.input:880
70337034 #: /root/karesansui.git/karesansui/templates/default/hostby1watch/hostby1watch.input:899
70347035 #: /root/karesansui.git/karesansui/templates/default/hostby1watch/hostby1watch.input:917
70357036 #: /root/karesansui.git/karesansui/templates/default/hostby1watchby1/hostby1watchby1.input:336
@@ -7040,6 +7041,8 @@ msgstr ""
70407041 #: /root/karesansui.git/karesansui/templates/default/hostby1watchby1/hostby1watchby1.input:372
70417042 #: /root/karesansui.git/karesansui/templates/default/hostby1watchby1/hostby1watchby1.input:591
70427043 #: /root/karesansui.git/karesansui/templates/default/hostby1watchby1/hostby1watchby1.input:617
7044+#: /root/karesansui.git/karesansui/templates/default/hostby1watchby1/hostby1watchby1.input:643
7045+#: /root/karesansui.git/karesansui/templates/default/hostby1watchby1/hostby1watchby1.part:212
70437046 #: /root/karesansui.git/karesansui/templates/default/hostby1watchby1/hostby1watchby1.part:240
70447047 #: /root/karesansui.git/karesansui/templates/default/hostby1watchby1/hostby1watchby1.part:268
70457048 msgid "Notification Mail"
@@ -7078,13 +7081,13 @@ msgid "Okay Script"
70787081 msgstr ""
70797082
70807083 #: /root/karesansui.git/karesansui/templates/default/hostby1watch/hostby1watch.input:526
7081-msgid "Script executed when okay value was exceeded."
7084+msgid "Script executed when status returns okay."
70827085 msgstr ""
70837086
70847087 #: /root/karesansui.git/karesansui/templates/default/hostby1watch/hostby1watch.input:530
70857088 msgid ""
7086-"Contents of the notification mail which is sent when the okay value was "
7087-"exceeded."
7089+"Contents of the notification mail which is sent when the status returns "
7090+"okay."
70887091 msgstr ""
70897092
70907093 #: /root/karesansui.git/karesansui/templates/default/hostby1watch/hostby1watch.input:534
@@ -7101,10 +7104,6 @@ msgid ""
71017104 "supported."
71027105 msgstr ""
71037106
7104-#: /root/karesansui.git/karesansui/templates/default/hostby1watch/hostby1watch.input:614
7105-msgid "Notification Mail Body"
7106-msgstr ""
7107-
71087107 #: /root/karesansui.git/karesansui/templates/default/hostby1watch/hostby1watch.input:615
71097108 #: /root/karesansui.git/karesansui/templates/default/hostby1watch/hostby1watch.input:619
71107109 #: /root/karesansui.git/karesansui/templates/default/hostby1watch/hostby1watch.input:623
@@ -7220,10 +7219,6 @@ msgstr ""
72207219 msgid "Warning Settings"
72217220 msgstr ""
72227221
7223-#: /root/karesansui.git/karesansui/templates/default/hostby1watch/hostby1watch.input:880
7224-msgid "Warning Notify Mail"
7225-msgstr ""
7226-
72277222 #: /root/karesansui.git/karesansui/templates/default/hostby1watch/hostby1watch.input:885
72287223 #: /root/karesansui.git/karesansui/templates/default/hostby1watch/hostby1watch.input:904
72297224 #: /root/karesansui.git/karesansui/templates/default/hostby1watch/hostby1watch.input:922
@@ -7314,23 +7309,19 @@ msgid "Contents of the mail notified when the failure value exceeded."
73147309 msgstr ""
73157310
73167311 #: /root/karesansui.git/karesansui/templates/default/hostby1watchby1/hostby1watchby1.input:349
7317-msgid "Script execute when a okay value is exceeded."
7312+msgid "Script executed when the status returns okay."
73187313 msgstr ""
73197314
73207315 #: /root/karesansui.git/karesansui/templates/default/hostby1watchby1/hostby1watchby1.input:353
73217316 msgid ""
7322-"Contents of the notification mail which will be sent when the okay value "
7323-"was exceeded."
7317+"Contents of the notification mail which will be sent when the status "
7318+"returns okay."
73247319 msgstr ""
73257320
73267321 #: /root/karesansui.git/karesansui/templates/default/hostby1watchby1/hostby1watchby1.input:401
73277322 msgid "Edit Watch"
73287323 msgstr ""
73297324
7330-#: /root/karesansui.git/karesansui/templates/default/hostby1watchby1/hostby1watchby1.input:643
7331-msgid "Okay Notify Mail"
7332-msgstr ""
7333-
73347325 #: /root/karesansui.git/karesansui/templates/default/hostby1watchby1/hostby1watchby1.part:178
73357326 msgid "Watch Interval (sec)"
73367327 msgstr ""
@@ -7343,10 +7334,6 @@ msgstr ""
73437334 msgid "Enable"
73447335 msgstr ""
73457336
7346-#: /root/karesansui.git/karesansui/templates/default/hostby1watchby1/hostby1watchby1.part:212
7347-msgid "Failure Mail Body"
7348-msgstr ""
7349-
73507337 #: /root/karesansui.git/karesansui/templates/default/hostby1watchby1/hostby1watchby1.part:225
73517338 msgid "Warning"
73527339 msgstr ""
@@ -7530,42 +7517,3 @@ msgstr ""
75307517 msgid "Edit User Settings"
75317518 msgstr ""
75327519
7533-#~ msgid "Notify Mail To"
7534-#~ msgstr ""
7535-
7536-#~ msgid "Notify Mail From"
7537-#~ msgstr ""
7538-
7539-#~ msgid "Failure Notify Mail"
7540-#~ msgstr ""
7541-
7542-#~ msgid "Contents of the mail notified when the okay value exceeded."
7543-#~ msgstr ""
7544-
7545-#~ msgid "From address when mail is notified."
7546-#~ msgstr ""
7547-
7548-#~ msgid "To address when mail is notified."
7549-#~ msgstr ""
7550-
7551-#~ msgid "Notify Mail Settings"
7552-#~ msgstr ""
7553-
7554-#~ msgid ""
7555-#~ "Address to put in the From: header"
7556-#~ " of the notify mail. Multiple "
7557-#~ "addresses are not supported."
7558-#~ msgstr ""
7559-
7560-#~ msgid ""
7561-#~ "Address to send the notify mail "
7562-#~ "to. Multiple addresses are not "
7563-#~ "supported."
7564-#~ msgstr ""
7565-
7566-#~ msgid "Warning Mail Body"
7567-#~ msgstr ""
7568-
7569-#~ msgid "Okay Mail Body"
7570-#~ msgstr ""
7571-
Binary files a/karesansui/locale/ja/LC_MESSAGES/messages.mo and b/karesansui/locale/ja/LC_MESSAGES/messages.mo differ
--- a/karesansui/locale/ja/LC_MESSAGES/messages.po
+++ b/karesansui/locale/ja/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgstr ""
88 "Project-Id-Version: PROJECT VERSION\n"
99 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
1010 "POT-Creation-Date: 2010-05-14 18:28+0900\n"
11-"PO-Revision-Date: 2010-07-21 17:56+0900\n"
11+"PO-Revision-Date: 2010-07-22 13:10+0900\n"
1212 "Last-Translator: Kazuhiro Ogura <rgoura@karesansui-project.info>\n"
1313 "Language-Team: ja <LL@li.org>\n"
1414 "Plural-Forms: nplurals=1; plural=0\n"
@@ -4234,13 +4234,11 @@ msgstr "ゲストが使用するメモリのサイズです。単位はMBです
42344234
42354235 #: /root/karesansui.git/karesansui/templates/default/guest/guest.input:364
42364236 msgid ""
4237-"Create New Disk Image: Create a new storage image. \n"
4238-"\n"
4239-"Use iSCSI: Use iSCSI networked storage.\n"
4237+"Create New Disk Image: Create a new storage image. <br />Use iSCSI: Use "
4238+"iSCSI networked storage."
42404239 msgstr ""
4241-"ストレージを新規作成する:新規にストレージのイメージを作成します。\n"
4242-"\n"
4243-"ストレージにiSCSIを利用する:既存のiSCSIネットワークストレージを利用します。\n"
4240+"ストレージを新規作成する:新規にストレージのイメージを作成します。<br "
4241+"/>ストレージにiSCSIを利用する:既存のiSCSIネットワークストレージを利用します。"
42444242
42454243 #: /root/karesansui.git/karesansui/templates/default/guest/guest.input:370
42464244 msgid "Storage Pool To Use"
@@ -7033,9 +7031,8 @@ msgid "Threshold Settings"
70337031 msgstr "しきい値設定"
70347032
70357033 #: /root/karesansui.git/karesansui/templates/default/hostby1watch/hostby1watch.input:498
7036-#, fuzzy
70377034 msgid "Threshold value for alerts."
7038-msgstr "しきい値"
7035+msgstr "アラート発生としてカウントするしきい値です。"
70397036
70407037 #: /root/karesansui.git/karesansui/templates/default/hostby1watch/hostby1watch.input:509
70417038 #: /root/karesansui.git/karesansui/templates/default/hostby1watch/hostby1watch.input:875
@@ -7046,15 +7043,16 @@ msgid "Warning Script"
70467043 msgstr "警告時に実行するスクリプト"
70477044
70487045 #: /root/karesansui.git/karesansui/templates/default/hostby1watch/hostby1watch.input:510
7049-#, fuzzy
70507046 msgid "Script executed when warning value was exceeded."
70517047 msgstr "警告時に実行するスクリプトを指定します。"
70527048
70537049 #: /root/karesansui.git/karesansui/templates/default/hostby1watch/hostby1watch.input:513
70547050 #: /root/karesansui.git/karesansui/templates/default/hostby1watch/hostby1watch.input:521
70557051 #: /root/karesansui.git/karesansui/templates/default/hostby1watch/hostby1watch.input:529
7052+#: /root/karesansui.git/karesansui/templates/default/hostby1watch/hostby1watch.input:614
70567053 #: /root/karesansui.git/karesansui/templates/default/hostby1watch/hostby1watch.input:618
70577054 #: /root/karesansui.git/karesansui/templates/default/hostby1watch/hostby1watch.input:622
7055+#: /root/karesansui.git/karesansui/templates/default/hostby1watch/hostby1watch.input:880
70587056 #: /root/karesansui.git/karesansui/templates/default/hostby1watch/hostby1watch.input:899
70597057 #: /root/karesansui.git/karesansui/templates/default/hostby1watch/hostby1watch.input:917
70607058 #: /root/karesansui.git/karesansui/templates/default/hostby1watchby1/hostby1watchby1.input:336
@@ -7065,14 +7063,14 @@ msgstr "警告時に実行するスクリプトを指定します。"
70657063 #: /root/karesansui.git/karesansui/templates/default/hostby1watchby1/hostby1watchby1.input:372
70667064 #: /root/karesansui.git/karesansui/templates/default/hostby1watchby1/hostby1watchby1.input:591
70677065 #: /root/karesansui.git/karesansui/templates/default/hostby1watchby1/hostby1watchby1.input:617
7066+#: /root/karesansui.git/karesansui/templates/default/hostby1watchby1/hostby1watchby1.input:643
7067+#: /root/karesansui.git/karesansui/templates/default/hostby1watchby1/hostby1watchby1.part:212
70687068 #: /root/karesansui.git/karesansui/templates/default/hostby1watchby1/hostby1watchby1.part:240
70697069 #: /root/karesansui.git/karesansui/templates/default/hostby1watchby1/hostby1watchby1.part:268
7070-#, fuzzy
70717070 msgid "Notification Mail"
70727071 msgstr "通知メール"
70737072
70747073 #: /root/karesansui.git/karesansui/templates/default/hostby1watch/hostby1watch.input:514
7075-#, fuzzy
70767074 msgid ""
70777075 "Contents of the notification mail which is sent when the warning value "
70787076 "was exceeded."
@@ -7087,12 +7085,10 @@ msgid "Failure Script"
70877085 msgstr "危険時に実行するスクリプト"
70887086
70897087 #: /root/karesansui.git/karesansui/templates/default/hostby1watch/hostby1watch.input:518
7090-#, fuzzy
70917088 msgid "Script executed when failure value was exceeded."
70927089 msgstr "危険時に実行するスクリプトを指定します。"
70937090
70947091 #: /root/karesansui.git/karesansui/templates/default/hostby1watch/hostby1watch.input:522
7095-#, fuzzy
70967092 msgid ""
70977093 "Contents of the notification mail which is sent when the failure value "
70987094 "was exceeded."
@@ -7107,20 +7103,17 @@ msgid "Okay Script"
71077103 msgstr "正常値に戻った際に実行するスクリプト"
71087104
71097105 #: /root/karesansui.git/karesansui/templates/default/hostby1watch/hostby1watch.input:526
7110-#, fuzzy
7111-msgid "Script executed when okay value was exceeded."
7112-msgstr "正常時に戻った際に実行するスクリプトを指定します。"
7106+msgid "Script executed when status returns okay."
7107+msgstr "正常値に戻った際に実行するスクリプトを指定します。"
71137108
71147109 #: /root/karesansui.git/karesansui/templates/default/hostby1watch/hostby1watch.input:530
7115-#, fuzzy
71167110 msgid ""
7117-"Contents of the notification mail which is sent when the okay value was "
7118-"exceeded."
7119-msgstr "正常値に戻った際に送信するメールの内容を指定します。"
7111+"Contents of the notification mail which is sent when the status returns "
7112+"okay."
7113+msgstr "危険時に送信するメールの内容を指定します。"
71207114
71217115 #: /root/karesansui.git/karesansui/templates/default/hostby1watch/hostby1watch.input:534
71227116 #: /root/karesansui.git/karesansui/templates/default/hostby1watchby1/hostby1watchby1.input:357
7123-#, fuzzy
71247117 msgid ""
71257118 "Address to put in the From: header of the notification mail. Multiple "
71267119 "addresses are not supported."
@@ -7128,17 +7121,11 @@ msgstr "通知メールの差出人(From)となるメールアドレスを一つ
71287121
71297122 #: /root/karesansui.git/karesansui/templates/default/hostby1watch/hostby1watch.input:538
71307123 #: /root/karesansui.git/karesansui/templates/default/hostby1watchby1/hostby1watchby1.input:361
7131-#, fuzzy
71327124 msgid ""
71337125 "Address to send the notification mail to. Multiple addresses are not "
71347126 "supported."
71357127 msgstr "通知メールの宛先(To)となるメールアドレスを一つ指定します。複数のアドレスは指定できません。"
71367128
7137-#: /root/karesansui.git/karesansui/templates/default/hostby1watch/hostby1watch.input:614
7138-#, fuzzy
7139-msgid "Notification Mail Body"
7140-msgstr "通知メール"
7141-
71427129 #: /root/karesansui.git/karesansui/templates/default/hostby1watch/hostby1watch.input:615
71437130 #: /root/karesansui.git/karesansui/templates/default/hostby1watch/hostby1watch.input:619
71447131 #: /root/karesansui.git/karesansui/templates/default/hostby1watch/hostby1watch.input:623
@@ -7254,11 +7241,6 @@ msgstr "しきい値をパーセントとして扱う"
72547241 msgid "Warning Settings"
72557242 msgstr "警告時設定"
72567243
7257-#: /root/karesansui.git/karesansui/templates/default/hostby1watch/hostby1watch.input:880
7258-#, fuzzy
7259-msgid "Warning Notify Mail"
7260-msgstr "警告時に送信するメール"
7261-
72627244 #: /root/karesansui.git/karesansui/templates/default/hostby1watch/hostby1watch.input:885
72637245 #: /root/karesansui.git/karesansui/templates/default/hostby1watch/hostby1watch.input:904
72647246 #: /root/karesansui.git/karesansui/templates/default/hostby1watch/hostby1watch.input:922
@@ -7281,7 +7263,6 @@ msgstr "正常時設定"
72817263
72827264 #: /root/karesansui.git/karesansui/templates/default/hostby1watch/hostby1watch.input:928
72837265 #: /root/karesansui.git/karesansui/templates/default/hostby1watchby1/hostby1watchby1.input:658
7284-#, fuzzy
72857266 msgid "Notification Mail Settings"
72867267 msgstr "通知メール設定"
72877268
@@ -7350,24 +7331,19 @@ msgid "Contents of the mail notified when the failure value exceeded."
73507331 msgstr "危険時に送信するメールの内容を指定します。"
73517332
73527333 #: /root/karesansui.git/karesansui/templates/default/hostby1watchby1/hostby1watchby1.input:349
7353-msgid "Script execute when a okay value is exceeded."
7354-msgstr "正常時に戻った際に実行するスクリプトを指定します。"
7334+msgid "Script executed when the status returns okay."
7335+msgstr "正常値に戻った際に実行するスクリプトを指定します。"
73557336
73567337 #: /root/karesansui.git/karesansui/templates/default/hostby1watchby1/hostby1watchby1.input:353
7357-#, fuzzy
73587338 msgid ""
7359-"Contents of the notification mail which will be sent when the okay value "
7360-"was exceeded."
7361-msgstr "正常値に戻った際に送信するメールの内容を指定します。"
7339+"Contents of the notification mail which will be sent when the status "
7340+"returns okay."
7341+msgstr "正常時に戻った際に送信するメールの内容を指定します。"
73627342
73637343 #: /root/karesansui.git/karesansui/templates/default/hostby1watchby1/hostby1watchby1.input:401
73647344 msgid "Edit Watch"
73657345 msgstr "監視の編集"
73667346
7367-#: /root/karesansui.git/karesansui/templates/default/hostby1watchby1/hostby1watchby1.input:643
7368-msgid "Okay Notify Mail"
7369-msgstr "正常値に戻った際に送信するメール"
7370-
73717347 #: /root/karesansui.git/karesansui/templates/default/hostby1watchby1/hostby1watchby1.part:178
73727348 msgid "Watch Interval (sec)"
73737349 msgstr "監視間隔(秒)"
@@ -7380,10 +7356,6 @@ msgstr "危険値"
73807356 msgid "Enable"
73817357 msgstr "有効にする"
73827358
7383-#: /root/karesansui.git/karesansui/templates/default/hostby1watchby1/hostby1watchby1.part:212
7384-msgid "Failure Mail Body"
7385-msgstr "危険時に送信するメール"
7386-
73877359 #: /root/karesansui.git/karesansui/templates/default/hostby1watchby1/hostby1watchby1.part:225
73887360 msgid "Warning"
73897361 msgstr "警告値"
@@ -7567,24 +7539,3 @@ msgstr "ユーザー設定"
75677539 msgid "Edit User Settings"
75687540 msgstr "ユーザー設定の編集"
75697541
7570-#~ msgid "Notify Mail To"
7571-#~ msgstr "正常値に戻った際に送信するメール"
7572-
7573-#~ msgid "Notify Mail From"
7574-#~ msgstr ""
7575-
7576-#~ msgid "Failure Notify Mail"
7577-#~ msgstr "危険時に送信するメール"
7578-
7579-#~ msgid "From address when mail is notified."
7580-#~ msgstr "メールで通知を行う際に使用するFrom(差出人)メールアドレスを指定します。"
7581-
7582-#~ msgid "To address when mail is notified."
7583-#~ msgstr "メールで通知を行う際に使用するTo(宛先)メールアドレスを指定します。"
7584-
7585-#~ msgid "Warning Mail Body"
7586-#~ msgstr "警告時に送信するメール"
7587-
7588-#~ msgid "Okay Mail Body"
7589-#~ msgstr "正常値に戻った際に送信するメールの内容"
7590-
--- a/karesansui/templates/default/guest/guest.input
+++ b/karesansui/templates/default/guest/guest.input
@@ -361,7 +361,7 @@ $(document).ready(function(){
361361 // 利用するストレージを設定します。\nストレージ追加\n新規にストレージを作成します。\n\niSCSIストレージ利用\nネットワークストレージを利用します。\n
362362 helptip("#disk_layout_help",
363363 "${_('Storage Type')}",
364- "${_(r'Create New Disk Image: Create a new storage image. \n\nUse iSCSI: Use iSCSI networked storage.\n')}");
364+ "${_(r'Create New Disk Image: Create a new storage image. <br />Use iSCSI: Use iSCSI networked storage.')}");
365365
366366 // TRANSLATORS:
367367 //ストレージプール
--- a/karesansui/templates/default/hostby1watch/hostby1watch.input
+++ b/karesansui/templates/default/hostby1watch/hostby1watch.input
@@ -523,11 +523,11 @@ $(document).ready(function(){
523523
524524 helptip("#okay_script_help",
525525 "${_('Okay Script')}",
526- "${_('Script executed when okay value was exceeded.')}");
526+ "${_('Script executed when status returns okay.')}");
527527
528528 helptip("#enable_okay_mail_help",
529529 "${_('Notification Mail')}",
530- "${_('Contents of the notification mail which is sent when the okay value was exceeded.')}");
530+ "${_('Contents of the notification mail which is sent when the status returns okay.')}");
531531
532532 helptip("#notify_mail_from_help",
533533 "${_('Mail From')}",
@@ -611,7 +611,7 @@ $(document).ready(function(){
611611 </table>
612612 */
613613 helptip("#notification_mail_body_warning_help",
614- "${_('Notification Mail Body')}",
614+ "${_('Notification Mail')}",
615615 "${_(r"Customize the notification mail message. Don't forget to include empty line between mail header part and body part. Available macros are: ")}");
616616
617617 helptip("#notification_mail_body_failure_help",
@@ -877,7 +877,7 @@ $(document).ready(function(){
877877 <input type="checkbox" name="enable_warning_script" id="enable_warning_script" /> ${_('Enabled')}
878878 <textarea cols="85" rows="3" name="warning_script" id="warning_script"></textarea>
879879 </div>
880- <div class="grayout-param">${_('Warning Notify Mail')}<span id="enable_warning_mail_help"></span></div>
880+ <div class="grayout-param">${_('Notification Mail')}<span id="enable_warning_mail_help"></span></div>
881881 <div class="grayout-value grayout-form">
882882 <input type="checkbox" name="enable_warning_mail" id="enable_warning_mail">${_('Enabled')}
883883 <br/>
--- a/karesansui/templates/default/hostby1watchby1/hostby1watchby1.input
+++ b/karesansui/templates/default/hostby1watchby1/hostby1watchby1.input
@@ -346,11 +346,11 @@ $(document).ready(function(){
346346
347347 helptip("#okay_script_help",
348348 "${_('Okay Script')}",
349- "${_('Script execute when a okay value is exceeded.')}");
349+ "${_('Script executed when the status returns okay.')}");
350350
351351 helptip("#enable_okay_mail_help",
352352 "${_('Notification Mail')}",
353- "${_('Contents of the notification mail which will be sent when the okay value was exceeded.')}");
353+ "${_('Contents of the notification mail which will be sent when the status returns okay.')}");
354354
355355 helptip("#notify_mail_from_help",
356356 "${_('Mail From')}",
@@ -640,7 +640,7 @@ $(document).ready(function(){
640640 % endif
641641 <textarea cols="85" rows="3" name="okay_script" id="okay_script">${watch.okay_script |h}</textarea>
642642 </div>
643- <div class="grayout-param">${_('Okay Notify Mail')}<span id="enable_okay_mail_help"></span></div>
643+ <div class="grayout-param">${_('Notification Mail')}<span id="enable_okay_mail_help"></span></div>
644644 <div class="grayout-value grayout-form">
645645 % if watch.is_okay_mail is True:
646646 <input type="checkbox" name="enable_okay_mail" id="enable_okay_mail" checked>${_('Enabled')}
旧リポジトリブラウザで表示