- tor-commits - lists.torproject.org

[metrics-db/master] Add @type annotations to relay descriptors.
by karsten＠torproject.org 16 May '12

16 May '12

commit 442489f142fc60a783a524e7480d229a836214a0 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri May 11 15:24:18 2012 +0200 Add @type annotations to relay descriptors. --- src/org/torproject/ernie/db/ArchiveWriter.java | 26 ++++++++++++++++++----- 1 files changed, 20 insertions(+), 6 deletions(-) diff --git a/src/org/torproject/ernie/db/ArchiveWriter.java b/src/org/torproject/ernie/db/ArchiveWriter.java index 9d9e4de..0cc983a 100644 --- a/src/org/torproject/ernie/db/ArchiveWriter.java +++ b/src/org/torproject/ernie/db/ArchiveWriter.java @@ -31,7 +31,8 @@ public class ArchiveWriter { DescriptorSourceFactory.createDescriptorParser(); } - private boolean store(byte[] data, String filename) { + private boolean store(byte[] typeAnnotation, byte[] data, + String filename) { try { File file = new File(filename); if (!file.exists()) { @@ -45,6 +46,9 @@ public class ArchiveWriter { file.getParentFile().mkdirs(); BufferedOutputStream bos = new BufferedOutputStream( new FileOutputStream(file)); + if (data.length > 0 && data[0] != '@') { + bos.write(typeAnnotation, 0, typeAnnotation.length); + } bos.write(data, 0, data.length); bos.close(); return true; @@ -59,17 +63,21 @@ public class ArchiveWriter { return false; } + private static final byte[] CONSENSUS_ANNOTATION = + "@type network-status-consensus-3 1.0\n".getBytes(); public void storeConsensus(byte[] data, long validAfter) { SimpleDateFormat printFormat = new SimpleDateFormat( "yyyy/MM/dd/yyyy-MM-dd-HH-mm-ss"); printFormat.setTimeZone(TimeZone.getTimeZone("UTC")); String filename = outputDirectory + "/consensus/" + printFormat.format(new Date(validAfter)) + "-consensus"; - if (this.store(data, filename)) { + if (this.store(CONSENSUS_ANNOTATION, data, filename)) { this.storedConsensuses++; } } + private static final byte[] VOTE_ANNOTATION = + "@type network-status-vote-3 1.0\n".getBytes(); public void storeVote(byte[] data, long validAfter, String fingerprint, String digest) { SimpleDateFormat printFormat = new SimpleDateFormat( @@ -78,11 +86,13 @@ public class ArchiveWriter { String filename = outputDirectory + "/vote/" + printFormat.format(new Date(validAfter)) + "-vote-" + fingerprint + "-" + digest; - if (this.store(data, filename)) { + if (this.store(VOTE_ANNOTATION, data, filename)) { this.storedVotes++; } } + private static final byte[] CERTIFICATE_ANNOTATION = + "@type dir-key-certificate-3 1.0\n".getBytes(); public void storeCertificate(byte[] data, String fingerprint, long published) { SimpleDateFormat printFormat = new SimpleDateFormat( @@ -90,11 +100,13 @@ public class ArchiveWriter { printFormat.setTimeZone(TimeZone.getTimeZone("UTC")); String filename = outputDirectory + "/certs/" + fingerprint + "-" + printFormat.format(new Date(published)); - if (this.store(data, filename)) { + if (this.store(CERTIFICATE_ANNOTATION, data, filename)) { this.storedCerts++; } } + private static final byte[] SERVER_DESCRIPTOR_ANNOTATION = + "@type server-descriptor 1.0\n".getBytes(); public void storeServerDescriptor(byte[] data, String digest, long published) { SimpleDateFormat printFormat = new SimpleDateFormat("yyyy/MM/"); @@ -103,11 +115,13 @@ public class ArchiveWriter { + printFormat.format(new Date(published)) + digest.substring(0, 1) + "/" + digest.substring(1, 2) + "/" + digest; - if (this.store(data, filename)) { + if (this.store(SERVER_DESCRIPTOR_ANNOTATION, data, filename)) { this.storedServerDescriptors++; } } + private static final byte[] EXTRA_INFO_ANNOTATION = + "@type extra-info 1.0\n".getBytes(); public void storeExtraInfoDescriptor(byte[] data, String extraInfoDigest, long published) { SimpleDateFormat descriptorFormat = new SimpleDateFormat("yyyy/MM/"); @@ -117,7 +131,7 @@ public class ArchiveWriter { + extraInfoDigest.substring(0, 1) + "/" + extraInfoDigest.substring(1, 2) + "/" + extraInfoDigest; - if (this.store(data, filename)) { + if (this.store(EXTRA_INFO_ANNOTATION, data, filename)) { this.storedExtraInfoDescriptors++; } }

1 0

[metrics-db/master] Handle @type annotations when reading descriptors.
by karsten＠torproject.org 16 May '12

16 May '12

commit 65c525c2ac7f2f4a751615a3cab901b52ce99b6f Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri May 11 16:17:09 2012 +0200 Handle @type annotations when reading descriptors. --- .../torproject/ernie/db/RelayDescriptorParser.java | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/src/org/torproject/ernie/db/RelayDescriptorParser.java b/src/org/torproject/ernie/db/RelayDescriptorParser.java index f3e90f2..be54656 100644 --- a/src/org/torproject/ernie/db/RelayDescriptorParser.java +++ b/src/org/torproject/ernie/db/RelayDescriptorParser.java @@ -69,7 +69,10 @@ public class RelayDescriptorParser { * anyway. */ BufferedReader br = new BufferedReader(new StringReader(new String( data, "US-ASCII"))); - String line = br.readLine(); + String line; + do { + line = br.readLine(); + } while (line != null && line.startsWith("@")); if (line == null) { this.logger.fine("We were given an empty descriptor for " + "parsing. Ignoring."); @@ -227,6 +230,15 @@ public class RelayDescriptorParser { String sigToken = "\nrouter-signature\n"; String digest = null; int start = ascii.indexOf(startToken); + if (start > 0) { + /* Do not confuse "extra-info " in "@type extra-info 1.0" with + * "extra-info 0000...". TODO This is a hack that should be + * solved by using metrics-lib some day. */ + start = ascii.indexOf("\n" + startToken); + if (start > 0) { + start++; + } + } int sig = ascii.indexOf(sigToken) + sigToken.length(); if (start >= 0 || sig >= 0 || sig > start) { byte[] forDigest = new byte[sig - start];

1 0

[metrics-db/master] Remove PostgreSQL dependency.
by karsten＠torproject.org 16 May '12

16 May '12

commit c7cc99d5bc4d979192d948b07f9ff4a2c8d3ac6e Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri May 11 15:38:35 2012 +0200 Remove PostgreSQL dependency. --- LICENSE | 31 ------------------------------- build.xml | 1 - lib/postgresql-8.4-701.jdbc4.jar | Bin 510170 -> 0 bytes 3 files changed, 0 insertions(+), 32 deletions(-) diff --git a/LICENSE b/LICENSE index 55fcf4a..19d7eca 100644 --- a/LICENSE +++ b/LICENSE @@ -235,34 +235,3 @@ under this license: See the License for the specific language governing permissions and limitations under the License. --------------------------------------------------------------------------- - -The PostgreSQL JDBC Interface binary is distributed under this license: - -Copyright (c) 1997-2008, PostgreSQL Global Development Group -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - -1. Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. -2. Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. -3. Neither the name of the PostgreSQL Global Development Group nor the names - of its contributors may be used to endorse or promote products derived - from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE -LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -POSSIBILITY OF SUCH DAMAGE. - diff --git a/build.xml b/build.xml index f7cadef..07d1488 100644 --- a/build.xml +++ b/build.xml @@ -8,7 +8,6 @@ <pathelement path="${classes}"/> <pathelement location="lib/commons-codec-1.4.jar"/> <pathelement location="lib/commons-compress-1.0.jar"/> - <pathelement location="lib/postgresql-8.4-701.jdbc4.jar"/> <pathelement location="lib/junit-4.8.2.jar"/> <pathelement location="lib/descriptor.jar"/> </path> diff --git a/lib/postgresql-8.4-701.jdbc4.jar b/lib/postgresql-8.4-701.jdbc4.jar deleted file mode 100644 index e21beec..0000000 Binary files a/lib/postgresql-8.4-701.jdbc4.jar and /dev/null differ

1 0

[metrics-db/master] ernie-howto.html is long gone.
by karsten＠torproject.org 16 May '12

16 May '12

commit bdfb9ef79c95ee268af27334dbb8bc83a0665e95 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri May 11 15:39:28 2012 +0200 ernie-howto.html is long gone. --- README | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/README b/README index 93315ee..97a7a7b 100644 --- a/README +++ b/README @@ -3,5 +3,5 @@ ERNIE is the Enhanced R-based tor Network Intelligence Engine -------------------------------------------------------------------------- -Please find documentation on ERNIE in website/ernie-howto.html and doc/ . +Please find documentation in doc/ .

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 16 May '12

16 May '12

commit 7e3aeb750e38729d888dc98f4508f5ccbfbb427c Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 16 09:45:06 2012 +0000 Update translations for gettor --- he/gettor.po | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/he/gettor.po b/he/gettor.po index e88dfbb..261958b 100644 --- a/he/gettor.po +++ b/he/gettor.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-11-13 22:01+0100\n" -"PO-Revision-Date: 2012-05-16 09:13+0000\n" +"PO-Revision-Date: 2012-05-16 09:17+0000\n" "Last-Translator: Elifelet <arab.with.nargila(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -147,7 +147,7 @@ msgstr "" msgid "" "Sending this text in an email to GetTor will cause it to send you \n" "the Tor Browser Bundle in a number of 1,4MB attachments." -msgstr "" +msgstr "שליחת הטקסט הזה לטור יגרום לך לקבל במייל את חבילת הדפדפן של טור במספר קבצים של 1.4 מגה בייט." #: lib/gettor/i18n.py:105 msgid "" @@ -366,7 +366,7 @@ msgstr "" msgid "" "Note that this package is rather large and needs your email provider to \n" "allow for attachments of about 30MB in size." -msgstr "" +msgstr "שים לב שהקובץ הזו דיי גדול ולכן אתה זקוק לספק כתובת מייל שמאפשר לך לקבל קבצים בגדלים של 30 מגה בייט בערך." #: lib/gettor/i18n.py:232 msgid ""

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 16 May '12

16 May '12

commit 11f777b8ca49eba9a36f6bad31eeaaabe6b84c6b Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 16 09:15:21 2012 +0000 Update translations for vidalia --- he/vidalia_he.po | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/he/vidalia_he.po b/he/vidalia_he.po index d07dda7..96db051 100644 --- a/he/vidalia_he.po +++ b/he/vidalia_he.po @@ -1,6 +1,7 @@ # # Translators: # Amichay P. K. <am1chay.p.k(a)gmail.com>, 2011. +# <arab.with.nargila(a)gmail.com>, 2012. # runasand <runa.sandvik(a)gmail.com>, 2011. # Something Another <roeyjobsyud(a)gmail.com>, 2012. # <static.172(a)gmail.com>, 2012. @@ -9,8 +10,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:52+0000\n" -"PO-Revision-Date: 2012-03-22 08:51+0000\n" -"Last-Translator: static172 <static.172(a)gmail.com>\n" +"PO-Revision-Date: 2012-05-16 08:59+0000\n" +"Last-Translator: Elifelet <arab.with.nargila(a)gmail.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -3337,7 +3338,7 @@ msgstr "" msgctxt "StatusEventWidget" msgid "Invalid Destination Hostname" -msgstr "" +msgstr "כתובת שרת לא תקפה" msgctxt "StatusEventWidget" msgid "" @@ -3348,7 +3349,7 @@ msgstr "" msgctxt "StatusEventWidget" msgid "External IP Address Changed" -msgstr "" +msgstr "כתובת ה-IP החיצונית שונתה" msgctxt "StatusEventWidget" msgid "" @@ -3535,7 +3536,7 @@ msgstr "הדבק" msgctxt "TorrcDialog" msgid "Undo" -msgstr "" +msgstr "בטל" msgctxt "TorrcDialog" msgid "Redo" @@ -3795,7 +3796,7 @@ msgstr "כשלון בפתחיחת קובץ יומן '%1': %2" msgctxt "Vidalia" msgid "Value required for parameter :" -msgstr "" +msgstr "נחוץ ערך עבור הפרמטר:" msgctxt "Vidalia" msgid "Invalid language code specified:"

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 16 May '12

16 May '12

commit d36439446cdd1828e7b547148ae82efa314d3984 Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 16 09:15:04 2012 +0000 Update translations for gettor --- he/gettor.po | 37 ++++++++++++++++++++++++------------- 1 files changed, 24 insertions(+), 13 deletions(-) diff --git a/he/gettor.po b/he/gettor.po index 24b7417..e88dfbb 100644 --- a/he/gettor.po +++ b/he/gettor.po @@ -3,14 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# <arab.with.nargila(a)gmail.com>, 2012. # Jacob Appelbaum <jacob(a)appelbaum.net>, 2009. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2011-09-10 01:52-0400\n" -"PO-Revision-Date: 2010-11-30 05:01+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"POT-Creation-Date: 2011-11-13 22:01+0100\n" +"PO-Revision-Date: 2012-05-16 09:13+0000\n" +"Last-Translator: Elifelet <arab.with.nargila(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,11 +21,11 @@ msgstr "" #: lib/gettor/i18n.py:27 msgid "Hello, This is the \"GetTor\" robot." -msgstr "" +msgstr "שלום, זהו הרובוט של \"GetTor\"." #: lib/gettor/i18n.py:29 msgid "Thank you for your request." -msgstr "" +msgstr "תודה רבה לך על בקשתך." #: lib/gettor/i18n.py:31 msgid "" @@ -45,12 +46,12 @@ msgid "" "(We apologize if you didn't ask for this mail. Since your email is from\n" "a service that doesn't use DKIM, we're sending a short explanation,\n" "and then we'll ignore this email address for the next day or so.)" -msgstr "" +msgstr "(אנו מתנצלים אם לא ביקשת את המייל הזה. מאחר וכתובת המייל שלך היא משרות שלא מקבל DKIM אנו שולחים הסבר קצר ואז אנו נתעלם מכתובת המייל הזה למשך יום)" #: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130 msgid "" "If you have any questions or it doesn't work, you can contact a\n" -"human at this support email address: community-support(a)lists.torproject.org" +"human at this support email address: help(a)rt.torproject.org" msgstr "" #: lib/gettor/i18n.py:46 @@ -64,7 +65,7 @@ msgid "" " linux-i386\n" " linux-x86_64\n" " source" -msgstr "" +msgstr "אני אשלך לך את החבילה של טור אם תוכל/י לומר לי איזו שפה את/ה רוצה?\nאנא בחר/י אחת משפות החבילות:\n\n windows\n macos-i386\n macos-ppc\n linux-i386\n linux-x86_64\n source" #: lib/gettor/i18n.py:56 msgid "" @@ -118,13 +119,13 @@ msgstr "" #: lib/gettor/i18n.py:87 msgid "If you select no language, you will receive the English version." -msgstr "" +msgstr "אם לא בחרת שפה, אתה תקבל את הגירסה האנגלית." #: lib/gettor/i18n.py:89 msgid "" "SMALLER SIZED PACKAGES\n" "======================" -msgstr "" +msgstr "חבילות בגודל קטן יותר\n==============" #: lib/gettor/i18n.py:92 msgid "" @@ -193,7 +194,7 @@ msgstr "" msgid "" "SUPPORT\n" "=======" -msgstr "" +msgstr "תמיכה\n====" #: lib/gettor/i18n.py:133 msgid "" @@ -302,7 +303,7 @@ msgstr "" msgid "" "UNPACKING THE FILES\n" "===================" -msgstr "" +msgstr "פותח את הקבצים\n===========" #: lib/gettor/i18n.py:196 msgid "" @@ -441,4 +442,14 @@ msgstr "" msgid "ANSWER:" msgstr "" - +#: lib/gettor/i18n.py:274 +#, python-format +msgid "" +"Sorry, but the package you requested (%s) is too large for your \n" +"provider to accept as an attachment. Try using another provider that allows \n" +"for larger email attachments. Or try one of the following mirrors:\n" +"\n" +" https://www.oignon.net/dist/torbrowser/\n" +" https://tor.beme-it.de/dist/torbrowser/\n" +" https://www.torservers.net/mirrors/torproject.org/dist/torbrowser/" +msgstr ""

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 16 May '12

16 May '12

commit e9a3344f12bcf5aaafa3a2ce6b32815346e2cd66 Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 16 08:45:32 2012 +0000 Update translations for https_everywhere_completed --- zh-CN/https-everywhere.dtd | 31 +++++++++++++++++++------------ zh-CN/https-everywhere.properties | 4 ++-- 2 files changed, 21 insertions(+), 14 deletions(-) diff --git a/zh-CN/https-everywhere.dtd b/zh-CN/https-everywhere.dtd index 7623bd7..9a0ec08 100644 --- a/zh-CN/https-everywhere.dtd +++ b/zh-CN/https-everywhere.dtd @@ -8,23 +8,30 @@ <!ENTITY https-everywhere.about.contribute "如果你喜欢HTTPS Everywhere , 你可以考虑"> <!ENTITY https-everywhere.about.donate_tor "捐款给 Tor"> <!ENTITY https-everywhere.about.tor_lang_code "en"> -<!ENTITY https-everywhere.about.donate_eff "捐款给电子前锋基金会"> +<!ENTITY https-everywhere.about.donate_eff "捐款给电子前锋基金会(EFF)"> -<!ENTITY https-everywhere.menu.about "关於HTTPS Everywhere"> +<!ENTITY https-everywhere.menu.about "有关HTTPS Everywhere"> <!ENTITY https-everywhere.menu.observatory "SSL 观测站Observatory 使用偏好"> -<!ENTITY https-everywhere.menu.globalEnable "开啓全HTTPS Everywhere"> -<!ENTITY https-everywhere.menu.globalDisable "关闭全HTTPS Everywhere"> +<!ENTITY https-everywhere.menu.globalEnable "启用HTTPS Everywhere"> +<!ENTITY https-everywhere.menu.globalDisable "禁用HTTPS Everywhere"> <!ENTITY https-everywhere.prefs.title "HTTPS Everywhere 使用偏好"> -<!ENTITY https-everywhere.prefs.enable_all "开啓全部功能"> -<!ENTITY https-everywhere.prefs.disable_all "关闭全部功能"> +<!ENTITY https-everywhere.prefs.enable_all "启用全部"> +<!ENTITY https-everywhere.prefs.disable_all "禁用全部"> <!ENTITY https-everywhere.prefs.reset_defaults "重设为预设功能"> -<!ENTITY https-everywhere.prefs.search "搜寻"> +<!ENTITY https-everywhere.prefs.search "搜索"> <!ENTITY https-everywhere.prefs.site "站点"> <!ENTITY https-everywhere.prefs.notes "附注"> -<!ENTITY https-everywhere.prefs.list_caption "应使用那些 HTTPS 网域名称转址规则？"> -<!ENTITY https-everywhere.prefs.enabled "功能已开啓"> -<!ENTITY https-everywhere.prefs.ruleset_howto "你可以学习如何设定你自己的规则(以增加对其他网站的支援）"> +<!ENTITY https-everywhere.prefs.list_caption "应该启用哪些HTTPS重定向规则？"> +<!ENTITY https-everywhere.prefs.enabled "功能已开启"> +<!ENTITY https-everywhere.prefs.ruleset_howto "你可以学习如何编写你自己的规则(以增加对其他网站的支持）"> <!ENTITY https-everywhere.prefs.here_link "点击这里"> -<!ENTITY https-everywhere.prefs.toggle "Toggle"> -<!ENTITY https-everywhere.prefs.reset_default "Reset to Default"> +<!ENTITY https-everywhere.prefs.toggle "选项"> +<!ENTITY https-everywhere.prefs.reset_default "重设至默认"> +<!ENTITY https-everywhere.prefs.view_xml_source "查看XML格式的原始代码"> + +<!ENTITY https-everywhere.source.downloading "下载中"> +<!ENTITY https-everywhere.source.filename "文件名"> +<!ENTITY https-everywhere.source.unable_to_download "无法下载原始代码"> + + diff --git a/zh-CN/https-everywhere.properties b/zh-CN/https-everywhere.properties index 767040a..feb5d10 100644 --- a/zh-CN/https-everywhere.properties +++ b/zh-CN/https-everywhere.properties @@ -1,2 +1,2 @@ -https-everywhere.menu.globalEnable = 开啓全HTTPS Everywhere -https-everywhere.menu.globalDisable = 关闭全HTTPS Everywhere +https-everywhere.menu.globalEnable = 开启HTTPS Everywhere +https-everywhere.menu.globalDisable = 关闭HTTPS Everywhere

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 16 May '12

16 May '12

commit 778b2c6d120647b4d944b7af4a65492a6861fc77 Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 16 08:45:29 2012 +0000 Update translations for https_everywhere --- zh-CN/https-everywhere.dtd | 32 ++++++++++++++++---------------- zh-CN/https-everywhere.properties | 4 ++-- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/zh-CN/https-everywhere.dtd b/zh-CN/https-everywhere.dtd index 0f292ae..9a0ec08 100644 --- a/zh-CN/https-everywhere.dtd +++ b/zh-CN/https-everywhere.dtd @@ -8,30 +8,30 @@ <!ENTITY https-everywhere.about.contribute "如果你喜欢HTTPS Everywhere , 你可以考虑"> <!ENTITY https-everywhere.about.donate_tor "捐款给 Tor"> <!ENTITY https-everywhere.about.tor_lang_code "en"> -<!ENTITY https-everywhere.about.donate_eff "捐款给电子前锋基金会"> +<!ENTITY https-everywhere.about.donate_eff "捐款给电子前锋基金会(EFF)"> -<!ENTITY https-everywhere.menu.about "关於HTTPS Everywhere"> +<!ENTITY https-everywhere.menu.about "有关HTTPS Everywhere"> <!ENTITY https-everywhere.menu.observatory "SSL 观测站Observatory 使用偏好"> -<!ENTITY https-everywhere.menu.globalEnable "开啓全HTTPS Everywhere"> -<!ENTITY https-everywhere.menu.globalDisable "关闭全HTTPS Everywhere"> +<!ENTITY https-everywhere.menu.globalEnable "启用HTTPS Everywhere"> +<!ENTITY https-everywhere.menu.globalDisable "禁用HTTPS Everywhere"> <!ENTITY https-everywhere.prefs.title "HTTPS Everywhere 使用偏好"> -<!ENTITY https-everywhere.prefs.enable_all "开啓全部功能"> -<!ENTITY https-everywhere.prefs.disable_all "关闭全部功能"> +<!ENTITY https-everywhere.prefs.enable_all "启用全部"> +<!ENTITY https-everywhere.prefs.disable_all "禁用全部"> <!ENTITY https-everywhere.prefs.reset_defaults "重设为预设功能"> -<!ENTITY https-everywhere.prefs.search "搜寻"> +<!ENTITY https-everywhere.prefs.search "搜索"> <!ENTITY https-everywhere.prefs.site "站点"> <!ENTITY https-everywhere.prefs.notes "附注"> -<!ENTITY https-everywhere.prefs.list_caption "应使用那些 HTTPS 网域名称转址规则？"> -<!ENTITY https-everywhere.prefs.enabled "功能已开啓"> -<!ENTITY https-everywhere.prefs.ruleset_howto "你可以学习如何设定你自己的规则(以增加对其他网站的支援）"> +<!ENTITY https-everywhere.prefs.list_caption "应该启用哪些HTTPS重定向规则？"> +<!ENTITY https-everywhere.prefs.enabled "功能已开启"> +<!ENTITY https-everywhere.prefs.ruleset_howto "你可以学习如何编写你自己的规则(以增加对其他网站的支持）"> <!ENTITY https-everywhere.prefs.here_link "点击这里"> -<!ENTITY https-everywhere.prefs.toggle "Toggle"> -<!ENTITY https-everywhere.prefs.reset_default "Reset to Default"> -<!ENTITY https-everywhere.prefs.view_xml_source ""> +<!ENTITY https-everywhere.prefs.toggle "选项"> +<!ENTITY https-everywhere.prefs.reset_default "重设至默认"> +<!ENTITY https-everywhere.prefs.view_xml_source "查看XML格式的原始代码"> -<!ENTITY https-everywhere.source.downloading ""> -<!ENTITY https-everywhere.source.filename ""> -<!ENTITY https-everywhere.source.unable_to_download ""> +<!ENTITY https-everywhere.source.downloading "下载中"> +<!ENTITY https-everywhere.source.filename "文件名"> +<!ENTITY https-everywhere.source.unable_to_download "无法下载原始代码"> diff --git a/zh-CN/https-everywhere.properties b/zh-CN/https-everywhere.properties index 767040a..feb5d10 100644 --- a/zh-CN/https-everywhere.properties +++ b/zh-CN/https-everywhere.properties @@ -1,2 +1,2 @@ -https-everywhere.menu.globalEnable = 开啓全HTTPS Everywhere -https-everywhere.menu.globalDisable = 关闭全HTTPS Everywhere +https-everywhere.menu.globalEnable = 开启HTTPS Everywhere +https-everywhere.menu.globalDisable = 关闭HTTPS Everywhere

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 16 May '12

16 May '12

commit ceea96f6d00975063ad9ceca67f617aae8954a98 Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 16 08:15:30 2012 +0000 Update translations for https_everywhere_completed --- zh-CN/ssl-observatory.dtd | 37 ++++++++++++++++++++----------------- 1 files changed, 20 insertions(+), 17 deletions(-) diff --git a/zh-CN/ssl-observatory.dtd b/zh-CN/ssl-observatory.dtd index bc48431..7fff378 100644 --- a/zh-CN/ssl-observatory.dtd +++ b/zh-CN/ssl-observatory.dtd @@ -1,9 +1,9 @@  -<!ENTITY ssl-observatory.popup.details "详情与隐私权资讯"> +<!ENTITY ssl-observatory.popup.details "详情与隐私权信息"> <!ENTITY ssl-observatory.popup.later "等会再问我"> <!ENTITY ssl-observatory.popup.no "不了"> -<!ENTITY ssl-observatory.popup.text "HTTPS Everywhere 能够将你所收到的数字证书寄送给观测站，以侦测针对你的浏览器所发布的攻击，你要开啓这个功能吗？"> +<!ENTITY ssl-observatory.popup.text "HTTPS Everywhere 能将你接收到的数字证书提交并检查，从而侦测出对你浏览器的攻击，你要开启这个功能吗？">  <!ENTITY ssl-observatory.popup.title -"HTTPS Everywhere 是否应该使用SSL 观测站？"> +"是否允许HTTPS Everywhere进行SSL证书检测？"> <!ENTITY ssl-observatory.popup.yes "是">  <!ENTITY ssl-observatory.prefs.adv_priv_opts1 -"除非你所使用的是一个侵入性非常高的公司网路，开啓这个功能是安全的"> +"除非你所使用的是一个侵入性非常高的公司网路，开启这个功能是安全的"> <!ENTITY ssl-observatory.prefs.adv_priv_opts2 -"除非你使用的公司网路内含秘密的内部网路伺服器名称，开啓这个功能是安全的"> +"除非你使用的公司网络中包含私密的内网服务器域名，开启这个功能是安全的"> <!ENTITY ssl-observatory.prefs.alt_roots -"送出并且检查非标准根证书管理中心认证的数字证书"> +"提交并检查由非标准根CA所签名的证书"> <!ENTITY ssl-observatory.prefs.alt_roots_tooltip -"开啓这个功能选项是安全的，而且是有好处的，除非你使用的是一个侵入性高的公司网路，或是会以传输层安全代理服务器(TLS proxy)和私人根证书管理中心来监测你的浏览行为的卡巴斯基反病毒软件(Kaspersky antivirus software)。如果在这样的网路上开啓这个功能，由於其所产生的独特数字证书，这个选项可能会公开透过这种代理服务器 (proxy) 造访过的 https// 网域名称，因此我们原则上将这个功能关闭。"> +"开启这个选项是安全的（且有好处的），除非你使用的是一个侵入性高的公司网路，或是通过一个本地TLS代理服务器和私有根证书管理中心来监测你的浏览行为的卡巴斯基反病毒软件。如果在这样的网路上开启这个功能，由於其所产生的独特数字证书，这个选项可能会公开透过这种代理服务器 (proxy) 造访过的 https// 网域名称，因此我们原则上将这个功能关闭。"> -<!ENTITY ssl-observatory.prefs.anonymous "检查为了匿名性而使用 Tor 的数字证书"> +<!ENTITY ssl-observatory.prefs.anonymous "通过Tor网络进行数字证书的检查，以保护匿名性"> <!ENTITY ssl-observatory.prefs.anonymous_unavailable -"检查为了匿名性而使用 TOR 的数字证书 (需要有 Torbutton)"> +"通过Tor网络进行数字证书的检查，以保护匿名性 (需要有 Torbutton)"> <!ENTITY ssl-observatory.prefs.anonymous_tooltip -"安装这个选项需要 Tor 和 Torbutton"> +"使用这个选项需要预先安装Tor和Torbutton"> <!ENTITY ssl-observatory.prefs.asn -"当你看到新的数字证书，告知观测站你连接网路所使用的互联网服务提供商 (ISP)"> +"当你看到新的数字证书，告知观测站你当前使用的互联网服务提供商 (ISP)"> <!ENTITY ssl-observatory.prefs.asn_tooltip "这个动作会抓取你的网路的自动系统号码("Autonomous System number")，并将之送出。这会有助於我们找到对於 HTTPS 发动攻击的源头，并判断我们是否在伊朗或叙利亚等攻击容易发生的地方的网路已经观测过相同或类似的攻击"> @@ -55,13 +55,13 @@ Mouseover the options for further details:">--> "举例而言，当你造访 https://www.something.com, 观测站所收到的数字证书会显示某人造访了, 但不会显示谁造访了这个站点，或他们浏览了哪些特定的分页移动滑鼠到功能选项键以了解更多详情:"> -<!ENTITY ssl-observatory.prefs.hide "隐藏进阶功能选项"> +<!ENTITY ssl-observatory.prefs.hide "隐藏高级选项"> <!ENTITY ssl-observatory.prefs.nonanon -"在没有 Tor 的情形下检查数字证书"> +"在没有 Tor 网络的情况下依然检查数字证书"> <!ENTITY ssl-observatory.prefs.nonanon_tooltip -"我们会仅可能确保资料的匿名性，但这个选项的安全性较低"> +"我们会尽可能确保资料的匿名性，但这个选项的安全性较低"> <!ENTITY ssl-observatory.prefs.priv_dns "送出并检查非公开域名系统网域名称的数字证书"> @@ -77,7 +77,10 @@ Mouseover the options for further details:">--> <!ENTITY ssl-observatory.warning.title "EFF 的 SSL 观测站所发布的警告"> <!ENTITY ssl-observatory.warning.showcert "显示数字证书链"> <!ENTITY ssl-observatory.warning.okay "我了解"> -<!ENTITY ssl-observatory.warning.text "EFF 的 SSL观测站已针对这个站点发布了一个有关 HTTPS 数字证书的警告"> -<!ENTITY ssl-observatory.warning.defense "如果你已登入这个站点，建议你在取得安全的连结之後更改你在这个网站的密码"> - +<!ENTITY ssl-observatory.warning.text "EFF 的 SSL观测站对该HTTPS数字证书发布了警告"> +<!ENTITY ssl-observatory.warning.defense "如果你已登录过该站点，一旦下次你有一个安全的连接时，你可能会需要更改该站点的密码"> +<!ENTITY ssl-observatory.prefs.self_signed +"提交并检查自签名证书"> +<!ENTITY ssl-observatory.prefs.self_signed_tooltip +"建议：在自签名的嵌入式设备中，加密问题特别常见。">

1 0