luci-0.10: merge r7301 - r7306

diff --git a/po/he/asterisk.po b/po/he/asterisk.po
index 527b1d2..f2ab5e3 100644 (file)
--- a/po/he/asterisk.po
+++ b/po/he/asterisk.po
@@ -2,213 +2,218 @@
 #  generated from ./applications/luci-asterisk/luasrc/i18n/asterisk.en.lua
 msgid ""
 msgstr ""
-"Content-Type: text/plain; charset=UTF-8\n"
 "Project-Id-Version: PACKAGE VERSION\n"
-"Last-Translator: Automatically generated\n"
+"PO-Revision-Date: 2011-07-14 12:48+0200\n"
+"Last-Translator: zstorch <zstorch@gmail.com>\n"
 "Language-Team: none\n"
+"Language: he\n"
 "MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.4\n"
 
 #. Asterisk General Options
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:1
 msgid "Asterisk General Options"
-msgstr ""
+msgstr "הגדרות כלליות של Asterisk"
 
 #. AGI directory
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:2
 msgid "AGI directory"
-msgstr ""
+msgstr "תיקית AGI"
 
 #. Cache recorded sound files during recording
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:3
 msgid "Cache recorded sound files during recording"
-msgstr ""
+msgstr "שמור את קבצי הקול במהלך ההקלטה"
 
 #. Debug Level
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:4
 msgid "Debug Level"
-msgstr ""
+msgstr "רמת מצב ניפוי שגיאות"
 
 #. Disable some warnings
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:5
 msgid "Disable some warnings"
-msgstr ""
+msgstr "בטל חלק מהאזהרות"
 
 #. Dump core on crash
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:6
 msgid "Dump core on crash"
-msgstr ""
+msgstr "תעד את מצב הליבה בעת נפילת המערכת"
 
 #. High Priority
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:7
 msgid "High Priority"
-msgstr ""
+msgstr "עדיפות גבוהה"
 
 #. Initialise Crypto
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:8
 msgid "Initialise Crypto"
-msgstr ""
+msgstr "מפעיל את Crypto"
 
 #. Use Internal Timing
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:9
 msgid "Use Internal Timing"
-msgstr ""
+msgstr "השתמש בשעון הפנימי"
 
 #. Log directory
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:10
 msgid "Log directory"
-msgstr ""
+msgstr "תיקית התיעוד"
 
+# צריך לבדוק אם מדובר על שיחות "בו זמנית" אם כן חשוב לציין אם לא הנל טעות חמורה
 #. Maximum number of calls allowed
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:11
+#, fuzzy
 msgid "Maximum number of calls allowed"
-msgstr ""
+msgstr "מקסימום שיחות בו זמנית"
 
 #. Maximum load to stop accepting new calls
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:12
 msgid "Maximum load to stop accepting new calls"
-msgstr ""
+msgstr "מקסימות שיחות שבו המערכת תדחה שיחות נוספות"
 
 #. Disable console colors
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:13
 msgid "Disable console colors"
-msgstr ""
+msgstr "בטל צבעים במסוף"
 
 #. Sound files Cache directory
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:14
 msgid "Sound files Cache directory"
-msgstr ""
+msgstr "תיקית קבצי הקול"
 
 #. The Group to run as
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:15
 msgid "The Group to run as"
-msgstr ""
+msgstr "הפעל עם הרשאות קבוצת"
 
 #. The User to run as
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:16
 msgid "The User to run as"
-msgstr ""
+msgstr "הפעל עם הרשאות משתמש"
 
 #. Voicemail Spool directory
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:17
 msgid "Voicemail Spool directory"
-msgstr ""
+msgstr "תיקית התא קולי"
 
 #. Prefix UniquID with system name
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:18
 msgid "Prefix UniquID with system name"
-msgstr ""
+msgstr "הוסף לUniquID את שם המערכת"
 
 #. Build transcode paths via SLINEAR, not directly
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:19
 msgid "Build transcode paths via SLINEAR, not directly"
-msgstr ""
+msgstr "המר תבניות קול ישירות עם SLINEAR"
 
 #. Transmit SLINEAR silence while recording a channel
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:20
 msgid "Transmit SLINEAR silence while recording a channel"
-msgstr ""
+msgstr "שדר שקט של SLINEAR במהלך הקלטה"
 
 #. Verbose Level
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:21
 msgid "Verbose Level"
-msgstr ""
+msgstr "רמת דו\"ח המערכת"
 
 #. Time Zone
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:22
 msgid "Time Zone"
-msgstr ""
+msgstr "אזור זמן"
 
 #. Section dialplan
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:23
 msgid "Section dialplan"
-msgstr ""
+msgstr "מחלקה בתוכנית השיחות"
 
 #. include
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:24
 msgid "include"
-msgstr ""
+msgstr "כולל"
 
 #. Dialplan Extension
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:25
 msgid "Dialplan Extension"
-msgstr ""
+msgstr "שלוחה בתוכנית השיחות"
 
 #. Dialplan General Options
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:26
 msgid "Dialplan General Options"
-msgstr ""
+msgstr "הגדרות כללית של תוכנית השיחות"
 
 #. Allow transfer
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:27
 msgid "Allow transfer"
-msgstr ""
+msgstr "אפשר העברה"
 
 #. Clear global vars
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:29
 msgid "Clear global vars"
-msgstr ""
+msgstr "נקה משתנים כללים"
 
 #. Dialplan Goto
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:30
 msgid "Dialplan Goto"
-msgstr ""
+msgstr "\"לך אל\" בתוכנית השיחות"
 
 #. Dialplan Conference
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:31
 msgid "Dialplan Conference"
-msgstr ""
+msgstr "שיחת ועידה בתוכנית השיחות"
 
 #. Dialplan Time
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:32
 msgid "Dialplan Time"
-msgstr ""
+msgstr "זמן בתוכנית השיחות"
 
 #. Dialplan Voicemail
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:33
 msgid "Dialplan Voicemail"
-msgstr ""
+msgstr "תא קולי בתוכנית השיחות"
 
 #. Dial Zones for Dialplan
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:34
 msgid "Dial Zones for Dialplan"
-msgstr ""
+msgstr "אזורי חיוג עבור תוכנית השיחות"
 
 #. Prefix to add matching dialplans
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:35
 msgid "Prefix to add matching dialplans"
-msgstr ""
+msgstr "קידומת להוספה עבור תוכניות שיחה דומות"
 
 #. Match International prefix
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:36
 msgid "Match International prefix"
-msgstr ""
+msgstr "השווה קידומת בין לאומית"
 
 #. Prefix (0) to add/remove to/from international numbers
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:37
 msgid "Prefix (0) to add/remove to/from international numbers"
-msgstr ""
+msgstr "קידומת (0) להוספה או הסרה במספר בין לאומי"
 
 #. localzone
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:38
 msgid "localzone"
-msgstr ""
+msgstr "מיקום"
 
 #. Match plan
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:39
 msgid "Match plan"
-msgstr ""
+msgstr "תוכנית מתאימה"
 
 #. Connection to use
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:40
 msgid "Connection to use"
-msgstr ""
+msgstr "השתמש בחיבור מסוג"
 
 #. Feature Key maps
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:41
 msgid "Feature Key maps"
-msgstr ""
+msgstr "מיפוי מקשים יעודיים"
 
 #. Attended transfer key
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:42
@@ -1028,37 +1033,38 @@ msgstr ""
 #. NAT between phone and Asterisk
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:226
 msgid "NAT between phone and Asterisk"
-msgstr ""
+msgstr "נתב (NAT) בין מכשיר הטלפון לAsterisk"
 
 #. Check tags in headers
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:227
 msgid "Check tags in headers"
-msgstr ""
+msgstr "בדוק את התגיות בהקדמה"
 
 #. Reply Timeout (ms) for down connection
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:230
+#, fuzzy
 msgid "Reply Timeout (ms) for down connection"
-msgstr ""
+msgstr "החזר את פרק זמן (timeout) במילישניות עבור חבורים סגורים"
 
 #. Register connection
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:231
 msgid "Register connection"
-msgstr ""
+msgstr "חיבור רשום (מנוי)"
 
 #. Dial own extension for mailbox
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:233
 msgid "Dial own extension for mailbox"
-msgstr ""
+msgstr "חיוג סיפרה בודדת עבור תא דואר"
 
 #. Client Type
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:235
 msgid "Client Type"
-msgstr ""
+msgstr "סוג הלקוח"
 
 #. Username
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:236
 msgid "Username"
-msgstr ""
+msgstr "שם משתמש"
 
 #. Section sipgeneral
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:237
@@ -1068,59 +1074,59 @@ msgstr ""
 #. Allow codecs
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:238
 msgid "Allow codecs"
-msgstr ""
+msgstr "מקודדים מאושרים"
 
 #. SIP realm
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:240
 msgid "SIP realm"
-msgstr ""
+msgstr "מתחם SIP"
 
 #. Voicemail general options
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:241
 msgid "Voicemail general options"
-msgstr ""
+msgstr "הגדרות כלליות עבור התא קולי"
 
 #. From Email address of server
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:242
 msgid "From Email address of server"
-msgstr ""
+msgstr "שדה דואר אלקטרוני מאת (של השרת)"
 
 #. Voice Mail boxes
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:243
 msgid "Voice Mail boxes"
-msgstr ""
+msgstr "תאים קוליים"
 
 #. Email contains attachment
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:244
 msgid "Email contains attachment"
-msgstr ""
+msgstr "מצורף תוכן ההודעה"
 
 #. Email
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:245
 msgid "Email"
-msgstr ""
+msgstr "דואר אלקטרוני"
 
 #. Display Name
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:246
 msgid "Display Name"
-msgstr ""
+msgstr "שם תצוגה"
 
 #. Password
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:247
 msgid "Password"
-msgstr ""
+msgstr "סיסמה"
 
 #. zone
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:248
 msgid "zone"
-msgstr ""
+msgstr "אזור"
 
 #. Voice Zone settings
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:249
 msgid "Voice Zone settings"
-msgstr ""
+msgstr "הגדרות אזוריות עבור הקול"
 
 #. Message Format
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:250
 msgid "Message Format"
-msgstr ""
+msgstr "תבנית ההודעה"

diff --git a/po/he/base.po b/po/he/base.po
index ccc15d5..6d3475a 100644 (file)
--- a/po/he/base.po
+++ b/po/he/base.po
@@ -1,12 +1,15 @@
 msgid ""
 msgstr ""
-"Content-Type: text/plain; charset=UTF-8\n"
 "Project-Id-Version: PACKAGE VERSION\n"
-"Last-Translator: Automatically generated\n"
+"PO-Revision-Date: 2011-07-14 13:20+0200\n"
+"Last-Translator: zstorch <zstorch@gmail.com>\n"
 "Language-Team: none\n"
+"Language: he\n"
 "MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.4\n"
 
 msgid "(%d minute window, %d second interval)"
 msgstr ""
@@ -2439,31 +2442,31 @@ msgid "none"
 msgstr ""
 
 msgid "off"
-msgstr ""
+msgstr "כבוי"
 
 msgid "routed"
-msgstr ""
+msgstr "מנותב"
 
 msgid "static"
-msgstr ""
+msgstr "סטטי"
 
 msgid "tagged"
-msgstr ""
+msgstr "מתויג"
 
 msgid "unlimited"
-msgstr ""
+msgstr "ללא הגבלה"
 
 msgid "unspecified"
-msgstr ""
+msgstr "לא מוגדר"
 
 msgid "unspecified -or- create:"
-msgstr ""
+msgstr "לא מוגדר -או- יצר"
 
 msgid "untagged"
-msgstr ""
+msgstr "לא מתויג"
 
 msgid "yes"
-msgstr ""
+msgstr "כן"
 
 msgid "« Back"
-msgstr ""
+msgstr "<< אחורה"

diff --git a/po/ja/base.po b/po/ja/base.po
index fbbe285..7266453 100644 (file)
--- a/po/ja/base.po
+++ b/po/ja/base.po
@@ -3,13 +3,15 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-06-10 03:40+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2011-07-13 08:54+0200\n"
+"Last-Translator: Kentaro <kentaro.matsuyama@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.1.1\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.4\n"
 
 msgid "(%d minute window, %d second interval)"
 msgstr "(%d 分幅, %d 秒間隔)"
@@ -1778,17 +1780,15 @@ msgid ""
 "You might loose access to this router if you are connected via this "
 "interface."
 msgstr ""
-"本当にこのインターフェースを削除しますか？ 削除はまだ完了していません。\n"
-"このインターフェースを介してルーターにアクセスしている場合、ルーターに接続"
-"できなくなる可能性があります。"
+"本当にこのインターフェースを削除しますか？ 削除すると元に戻すことはできません!\n"
+"このインターフェースを介してルーターにアクセスしている場合、ルーターに接続できなくなる可能性があります。"
 
 msgid ""
 "Really delete this wireless network? The deletion cannot be undone!\n"
 "You might loose access to this router if you are connected via this network."
 msgstr ""
-"本当にこの無線ネットワークを削除しますか？ 削除はまだ完了していません。\n"
-"このネットワークを介してルーターにアクセスしている場合、ルーターに接続"
-"できなくなる可能性があります。"
+"本当にこの無線ネットワークを削除しますか？ 削除すると元に戻すことはできません!\n"
+"このネットワークを介してルーターにアクセスしている場合、ルーターに接続できなくなる可能性があります。"
 
 msgid ""
 "Really shutdown interface \"%s\" ?\n"

diff --git a/po/zh_CN/firewall.po b/po/zh_CN/firewall.po
index 3b31761..bd1b222 100644 (file)
--- a/po/zh_CN/firewall.po
+++ b/po/zh_CN/firewall.po
@@ -3,13 +3,15 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-03-30 17:00+0200\n"
-"PO-Revision-Date: 2011-05-16 18:13+0700\n"
-"Last-Translator: Our Teammates\n"
+"PO-Revision-Date: 2011-07-17 10:01+0200\n"
+"Last-Translator: phantasm131 <phantasm131@gmail.com>\n"
 "Language-Team: QQ Group 75543259 <axishero@foxmail.com>\n"
+"Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.1.0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.4\n"
 
 msgid "(optional)"
 msgstr "（可选）"
@@ -27,7 +29,7 @@ msgid "Advanced Settings"
 msgstr "高级设置"
 
 msgid "Advanced rules let you customize the firewall to your needs. Only new connections will be matched. Packets belonging to already open connections are automatically allowed to pass the firewall."
-msgstr "é«\98级è§\84å\88\99å\8f¯ä»¥è®©ä½ è\87ªå·±æ\8c\89ç\85§è\87ªå·±ç\9a\84é\9c\80è¦\81æ\9d¥ç®¡ç\90\86é\98²ç\81«å¢\99ã\80\82æ­¤è§\84å\88\99å\8fªé\99\90å\88¶æ\96°å»ºç«\8bç\9a\84è¿\9eæ\8e¥ï¼\8c对äº\8eå\8e\9fæ\9d¥ç\9a\84è¿\9eæ\8e¥ä¼\9aè\87ªå\8a¨è®¾ä¸ºå\85\81许。"
+msgstr "é«\98级è§\84å\88\99å\85\81许æ\8c\89é\9c\80å®\9aå\88¶é\98²ç\81«å¢\99ã\80\82æ­¤è§\84å\88\99å\8fªé\99\90å\88¶æ\96°å»ºç«\8bç\9a\84è¿\9eæ\8e¥ï¼\8c对äº\8e已建ç«\8bé\93¾è·¯ç\9a\84æ\95°æ\8d®å\8c\85ä¼\9aè\87ªå\8a¨å\85\81许é\80\9aè¿\87。"
 
 msgid "Allow forward from <em>source zones</em>:"
 msgstr "允许从<em>source zones</em>转发"
@@ -261,13 +263,13 @@ msgid "Zones"
 msgstr "区域"
 
 msgid "accept"
-msgstr "同意"
+msgstr "接受"
 
 msgid "any"
 msgstr "任何"
 
 msgid "drop"
-msgstr "阻止"
+msgstr "丢弃"
 
 msgid "reject"
 msgstr "拒绝"

diff --git a/po/zh_CN/openvpn.po b/po/zh_CN/openvpn.po
index d007daa..cc04dbd 100644 (file)
--- a/po/zh_CN/openvpn.po
+++ b/po/zh_CN/openvpn.po
@@ -3,13 +3,15 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-05-19 19:35+0200\n"
-"PO-Revision-Date: 2011-04-22 01:14-0800\n"
-"Last-Translator: Our Teammates\n"
+"PO-Revision-Date: 2011-07-16 19:23+0200\n"
+"Last-Translator: codeblue <amplatzer@gmail.com>\n"
 "Language-Team: QQ Group 75543259 <axishero@foxmail.com>\n"
+"Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.1.1\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.4\n"
 
 #. OpenVPN
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:1
@@ -29,7 +31,7 @@ msgstr "高级配置 »"
 #. Enabled
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:6
 msgid "Enabled"
-msgstr "打开"
+msgstr "启用"
 
 #. Started
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:7
@@ -194,12 +196,12 @@ msgstr "TCP/UDP 端口 # 同时针对本地和远程"
 #. TCP/UDP port # for local (default=1194)
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:43
 msgid "TCP/UDP port # for local (default=1194)"
-msgstr "TCP/UDP 端口 # 本地l (默认值=1194)"
+msgstr "TCP/UDP 端口 # 本地 (默认 1194)"
 
 #. TCP/UDP port # for remote (default=1194)
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:44
 msgid "TCP/UDP port # for remote (default=1194)"
-msgstr "TCP/UDP 端口  # for 远程 (默认值=1194)"
+msgstr "TCP/UDP 端口 # 远程 (默认 1194)"
 
 #. Bind to local address and port
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:45
@@ -219,7 +221,7 @@ msgstr "tun/tap 设备"
 #. Type of used device
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:48
 msgid "Type of used device"
-msgstr "已用设备的类型"
+msgstr "使用设备类型"
 
 #. Use tun/tap device node
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:49
@@ -289,7 +291,7 @@ msgstr "不自动添加路由"
 #. Don't pull options from server
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:62
 msgid "Don't pull options from server"
-msgstr "Don't pull options from server"
+msgstr "不从服务器获取设置参数"
 
 #. Automatically redirect default route
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:63
@@ -354,27 +356,28 @@ msgstr "重映射SIGUSR1信号"
 #. Keep tun/tap device open on restart
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:75
 msgid "Keep tun/tap device open on restart"
-msgstr "系统重启时自动打开 tun/tap 设备"
+msgstr "服务重启时自动打开 tun/tap 设备"
 
 #. Keep remote IP address on restart
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:76
 msgid "Keep remote IP address on restart"
-msgstr "系统重启时保存远程IP地址"
+msgstr "服务重启时保持远程IP地址"
 
 #. Keep local IP address on restart
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:77
 msgid "Keep local IP address on restart"
-msgstr "系统重启时保存本地IP地址"
+msgstr "服务重启时保持本地IP地址"
 
 #. Don't re-read key on restart
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:78
 msgid "Don't re-read key on restart"
-msgstr "系统重启时不重密钥值"
+msgstr "服务重启时不重读密钥值"
 
 #. TOS passthrough (applies to IPv4 only)
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:79
+#, fuzzy
 msgid "TOS passthrough (applies to IPv4 only)"
-msgstr "TOS passthrough (applies to IPv4 only)"
+msgstr "TOS 穿透 (applies to IPv4 only)"
 
 #. Set tun/tap device MTU
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:80
@@ -394,7 +397,7 @@ msgstr "设置TCP/UDP的MTU值"
 #. Enable Path MTU discovery
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:83
 msgid "Enable Path MTU discovery"
-msgstr "å\85\81许路径MTU发现"
+msgstr "å\90¯ç\94¨路径MTU发现"
 
 #. Empirically measure MTU
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:84
@@ -454,7 +457,7 @@ msgstr "TUN/TAP关闭前关闭命令行及脚本"
 #. Run up/down scripts for all restarts
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:95
 msgid "Run up/down scripts for all restarts"
-msgstr "每次重启时运行脚本的开和关"
+msgstr "每次重启都执行启动/关闭脚本"
 
 #. Set UID to user
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:96
@@ -554,7 +557,7 @@ msgstr "特殊的压力测试模式"
 #. Use fast LZO compression
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:115
 msgid "Use fast LZO compression"
-msgstr "利用快速的LZO压缩"
+msgstr "使用快速LZO压缩"
 
 #. Don't use adaptive lzo compression
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:116
@@ -563,8 +566,9 @@ msgstr "不用自适应的lzo压缩"
 
 #. Enable management interface on <em>IP</em> <em>port</em>
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:117
+#, fuzzy
 msgid "Enable management interface on <em>IP</em> <em>port</em>"
-msgstr "å\85\81许<em>IP</em> <em>端å\8f£</em>ç\9a\84接口管理"
+msgstr "å\9c¨<em>IP</em> <em>port</em>ä¸\8aå\90¯ç\94¨å\8f¯接口管理"
 
 #. Management interface will connect as a TCP client
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:118
@@ -724,20 +728,22 @@ msgstr "以脚本的方式验证客户端虚拟地址"
 #. Allowed maximum of new connections
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:149
 msgid "Allowed maximum of new connections"
-msgstr "允许的最大连接数"
+msgstr "允许最大新建连接数"
 
 #. Allowed maximum of connected clients
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:150
 msgid "Allowed maximum of connected clients"
-msgstr "允许最大的已客户端连接数"
+msgstr "允许最大已连接客户端数"
 
 #. Allowed maximum of internal
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:151
+#, fuzzy
 msgid "Allowed maximum of internal"
 msgstr "Allowed maximum of internal"
 
 #. Proxy incoming HTTPS sessions
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:152
+#, fuzzy
 msgid "Proxy incoming HTTPS sessions"
 msgstr "在代理中引入HTTPs会话"
 
@@ -769,7 +775,7 @@ msgstr "断开连接时向客户端发送通知"
 #. Enable Static Key encryption mode (non-TLS)
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:158
 msgid "Enable Static Key encryption mode (non-TLS)"
-msgstr "允许静态密码加密模式(non-TLS)"
+msgstr "允许静态密钥加密模式"
 
 #. HMAC authentication for packets
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:159
@@ -848,6 +854,7 @@ msgstr "信任证书的目录(CAs and CRLs)"
 
 #. Diffie Hellman parameters
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:174
+#, fuzzy
 msgid "Diffie Hellman parameters"
 msgstr "Diffie Hellman parameters"
 

diff --git a/po/zh_CN/tinyproxy.po b/po/zh_CN/tinyproxy.po
index 84f3518..e0c18f9 100644 (file)
--- a/po/zh_CN/tinyproxy.po
+++ b/po/zh_CN/tinyproxy.po
@@ -1,11 +1,15 @@
 msgid ""
 msgstr ""
-"Content-Type: text/plain; charset=UTF-8\n"
 "Project-Id-Version: PACKAGE VERSION\n"
-"Last-Translator: Automatically generated\n"
+"PO-Revision-Date: 2011-07-16 18:32+0200\n"
+"Last-Translator: codeblue <amplatzer@gmail.com>\n"
 "Language-Team: none\n"
+"Language: zh_CN\n"
 "MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.4\n"
 
 msgid ""
 "<em>Via proxy</em> routes requests to the given target via the specifed "
@@ -13,163 +17,164 @@ msgid ""
 "target"
 msgstr ""
 
+#, fuzzy
 msgid ""
 "Adds an \"X-Tinyproxy\" HTTP header with the client IP address to forwarded "
 "requests"
-msgstr ""
+msgstr "在转发的数据包的中添加一个包含客户端IP的\"X-Tinyproxy\" HTTP头部信息"
 
 msgid "Allowed clients"
-msgstr ""
+msgstr "授权客户端"
 
 msgid "Allowed connect ports"
 msgstr ""
 
 msgid "Bind address"
-msgstr ""
+msgstr "绑定地址"
 
 msgid ""
 "By default, basic POSIX expressions are used for filtering. Enable this to "
 "activate extended regular expressions"
-msgstr ""
+msgstr "默认情况下，使用基本的POSIX表达式作为滤规则。启用这个以使用正规表达式代替之。"
 
 msgid ""
 "By default, filter strings are treated as case-insensitive. Enable this to "
 "make the matching case-sensitive"
-msgstr ""
+msgstr "默认情况下，过滤规则是不区分大小写的。启用它则转为区分大小写。"
 
 msgid ""
 "By default, filtering is done based on domain names. Enable this to match "
 "against URLs instead"
-msgstr ""
+msgstr "默认情况下，过滤器只匹配域名。启用它以匹配URL。"
 
 msgid ""
 "By default, the filter rules act as blacklist. Enable this option to only "
 "allow matched URLs or domain names"
-msgstr ""
+msgstr "默认情况下，过滤规则将以黑名单形式匹配。启用它将仅允许过滤规则里的URL或域名。"
 
 msgid ""
 "Can be either an IP address or range, a domain name or \".\" for any host "
 "without domain"
-msgstr ""
+msgstr "可以是IP地址或者范围，也可以是域名或者以\".\"代表任意主机"
 
 msgid "Connection timeout"
-msgstr ""
+msgstr "连接超时时间"
 
 msgid "Default deny"
-msgstr ""
+msgstr "默认拒绝"
 
 msgid "Enable Tinyproxy server"
-msgstr ""
+msgstr "启用Tinyproxy"
 
 msgid "Error page"
-msgstr ""
+msgstr "错误页面"
 
 msgid "Filter by RegExp"
-msgstr ""
+msgstr "正则表达式过滤器"
 
 msgid "Filter by URLs"
-msgstr ""
+msgstr "基于URL的过滤器"
 
 msgid "Filter case-sensitive"
-msgstr ""
+msgstr "过滤器大小写敏感"
 
 msgid "Filter file"
-msgstr ""
+msgstr "过滤器文件"
 
 msgid "Filtering and ACLs"
-msgstr ""
+msgstr "过滤规则和访问控制列表"
 
 msgid "General settings"
-msgstr ""
+msgstr "基本设置"
 
 msgid "Group"
-msgstr ""
+msgstr "运行组"
 
 msgid "HTML template file to serve for stat host requests"
 msgstr ""
 
 msgid "HTML template file to serve when HTTP errors occur"
-msgstr ""
+msgstr "HTTP出错页面HTML模板"
 
 msgid "Header whitelist"
 msgstr ""
 
 msgid ""
 "List of IP addresses or ranges which are allowed to use the proxy server"
-msgstr ""
+msgstr "允许访问代理服务器的IP或IP段列表"
 
 msgid ""
 "List of allowed ports for the CONNECT method. A single value \"0\" allows "
 "all ports"
-msgstr ""
+msgstr "允许CONNECT方法连接的端口列表,0代表所有端口。"
 
 msgid "Listen address"
-msgstr ""
+msgstr "服务地址"
 
 msgid "Listen port"
-msgstr ""
+msgstr "服务端口"
 
 msgid "Log file"
-msgstr ""
+msgstr "日志文件"
 
 msgid "Log file to use for dumping messages"
 msgstr ""
 
 msgid "Log level"
-msgstr ""
+msgstr "记录等级"
 
 msgid "Logging verbosity of the Tinyproxy process"
 msgstr ""
 
 msgid "Max. clients"
-msgstr ""
+msgstr "最大客户端数"
 
 msgid "Max. requests per server"
-msgstr ""
+msgstr "单进程最大请求数"
 
 msgid "Max. spare servers"
-msgstr ""
+msgstr "最多备用服务器"
 
 msgid "Maximum allowed number of concurrently connected clients"
-msgstr ""
+msgstr "允许同时连接的最大客户端数量"
 
 msgid ""
 "Maximum allowed number of requests per process. If it is exeeded, the "
 "process is restarted. Zero means unlimited."
-msgstr ""
+msgstr "单个进程允许的最多请求数，超过这个值，进程将重启。0表示不限制。"
 
 msgid "Maximum number of prepared idle processes"
-msgstr ""
+msgstr "备用进程数的最大值"
 
 msgid "Maximum number of seconds an inactive connection is held open"
 msgstr ""
 
 msgid "Min. spare servers"
-msgstr ""
+msgstr "最少备用服务器"
 
 msgid "Minimum number of prepared idle processes"
-msgstr ""
+msgstr "备用进程数的最小值"
 
 msgid "Number of idle processes to start when launching Tinyproxy"
-msgstr ""
+msgstr "启动Tinyproxy时开启的进程数"
 
 msgid "Plaintext file with URLs or domains to filter. One entry per line"
-msgstr ""
+msgstr "用于过滤器的文本，包含URL或者域名，每行一条。"
 
 msgid "Policy"
-msgstr ""
+msgstr "策略"
 
 msgid "Privacy settings"
-msgstr ""
+msgstr "策略设置"
 
 msgid "Reject access"
-msgstr ""
+msgstr "拒绝访问"
 
 msgid "Server Settings"
-msgstr ""
+msgstr "服务器设置"
 
 msgid "Server limits"
-msgstr ""
+msgstr "服务器限制"
 
 msgid ""
 "Specifies HTTP header names which are allowed to pass-through, all others "
@@ -184,39 +189,39 @@ msgstr ""
 
 msgid ""
 "Specifies the address Tinyproxy binds to for outbound forwarded requests"
-msgstr ""
+msgstr "指定服务器向外转发请求时所使用的地址"
 
 msgid "Specifies the addresses Tinyproxy is listening on for requests"
-msgstr ""
+msgstr "指定服务器接收代理请求所使用的地址"
 
 msgid "Specifies the group name the Tinyproxy process is running as"
-msgstr ""
+msgstr "指定Tinyproxy进程所属组"
 
 msgid ""
 "Specifies the upstream proxy to use for accessing the target host. Format is "
 "<code>address:port</code>"
-msgstr ""
+msgstr "指定上级代理. 格式 <code>IP地址:端口</code>"
 
 msgid "Specifies the user name the Tinyproxy process is running as"
-msgstr ""
+msgstr "指定Tinyproxy进程所属用户"
 
 msgid "Start spare servers"
 msgstr ""
 
 msgid "Statistics page"
-msgstr ""
+msgstr "统计页面"
 
 msgid "Target host"
-msgstr ""
+msgstr "目标主机"
 
 msgid "Tinyproxy"
-msgstr ""
+msgstr "Tinyproxy"
 
 msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
-msgstr ""
+msgstr "Tinyproxy是一个轻量级无缓存机制的高速HTTP(S)代理服务器"
 
 msgid "Upstream Proxies"
-msgstr ""
+msgstr "上级代理"
 
 msgid ""
 "Upstream proxy rules define proxy servers to use when accessing certain IP "
@@ -224,19 +229,19 @@ msgid ""
 msgstr ""
 
 msgid "Use syslog"
-msgstr ""
+msgstr "使用系统日志服务"
 
 msgid "User"
-msgstr ""
+msgstr "运行用户"
 
 msgid "Via hostname"
 msgstr ""
 
 msgid "Via proxy"
-msgstr ""
+msgstr "通过代理"
 
 msgid "Writes log messages to syslog instead of a log file"
-msgstr ""
+msgstr "将日志写入系统日志以代替指定的日志文件"
 
 msgid "X-Tinyproxy header"
 msgstr ""