June 2014 - tor-commits - lists.torproject.org

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 11 Jun '14

11 Jun '14

commit 143f0974c67c09d272724b3da13147c347354e24 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jun 11 10:15:02 2014 +0000 Update translations for bridgedb --- ar/LC_MESSAGES/bridgedb.po | 139 ++++++++++++++++++++++++++------------------ 1 file changed, 82 insertions(+), 57 deletions(-) diff --git a/ar/LC_MESSAGES/bridgedb.po b/ar/LC_MESSAGES/bridgedb.po index 2c35a50..e66b399 100644 --- a/ar/LC_MESSAGES/bridgedb.po +++ b/ar/LC_MESSAGES/bridgedb.po @@ -5,6 +5,7 @@ # Translators: # Ahmad Gharbeia <gharbeia(a)gmail.com>, 2014 # allamiro <allamiro(a)gmail.com>, 2011 +# reve99 <elfeky.m(a)gmail.com>, 2014 # محمد الحرقان <malham1(a)gmail.com>, 2011 # Sherief Alaa <sheriefalaa.w(a)gmail.com>, 2013-2014 # Sherief Alaa <sheriefalaa.w(a)gmail.com>, 2013 @@ -13,9 +14,9 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" -"POT-Creation-Date: 2014-05-16 18:39+0000\n" -"PO-Revision-Date: 2014-05-30 18:01+0000\n" -"Last-Translator: Sherief Alaa <sheriefalaa.w(a)gmail.com>\n" +"POT-Creation-Date: 2014-06-06 21:46+0000\n" +"PO-Revision-Date: 2014-06-11 10:10+0000\n" +"Last-Translator: reve99 <elfeky.m(a)gmail.com>\n" "Language-Team: Arabic (http://www.transifex.com/projects/p/torproject/language/ar/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -26,19 +27,16 @@ msgstr "" #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in #. any string (regardless of capitalization and/or punctuation): -#. "bridge" -#. "bridges" #. "BridgeDB" #. "pluggable transport" #. "pluggable transports" #. "obfs2" #. "obfs3" #. "scramblesuit" -#. "fte" +#. "fteproxy" #. "Tor" #. "Tor Browser" -#. "TBB" -#: lib/bridgedb/HTTPServer.py:124 +#: lib/bridgedb/HTTPServer.py:121 msgid "Sorry! Something went wrong with your request." msgstr "عذراً! حدث خطأ في طلبك." @@ -55,46 +53,51 @@ msgstr "الـ bridges الخاصة بك:" msgid "" "You have exceeded the rate limit. Please slow down! The minimum time between\n" "emails is %s hours. All further emails during this time period will be ignored." -msgstr "" +msgstr "لقد تخطيت حد المعدل.رجاءا اﻹبطاء\nاقل وقت ممكن بين رسائل البريد هو %s ساعات\nكل رسائل البريد خلال هذه الفتره سيتم تجاهلها" #: lib/bridgedb/strings.py:25 msgid "" "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)" -msgstr "" +msgstr "اﻷوامر :(combine COMMANDs لتحديد عدت اختيارات معا)" -#: lib/bridgedb/strings.py:27 +#. TRANSLATORS: Please DO NOT translate the word "BridgeDB". +#: lib/bridgedb/strings.py:28 msgid "Welcome to BridgeDB!" -msgstr "" +msgstr "اهلا في BridgeDB" #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE". -#: lib/bridgedb/strings.py:29 +#: lib/bridgedb/strings.py:30 msgid "Currently supported transport TYPEs:" -msgstr "" +msgstr "وسائل النقل المتاحه حاليا :" -#: lib/bridgedb/strings.py:30 +#: lib/bridgedb/strings.py:31 #, python-format msgid "Hey, %s!" msgstr "" -#: lib/bridgedb/strings.py:31 +#: lib/bridgedb/strings.py:32 msgid "Hello, friend!" -msgstr "" +msgstr "مرحبا ,صديقي" -#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100 +#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100 msgid "Public Keys" -msgstr "" +msgstr "مفاتيح عامه" #. TRANSLATORS: This string will end up saying something like: #. "This email was generated with rainbows, unicorns, and sparkles #. for alice(a)example.com on Friday, 09 May, 2014 at 18:59:39." -#: lib/bridgedb/strings.py:36 +#: lib/bridgedb/strings.py:37 #, python-format msgid "" "This email was generated with rainbows, unicorns, and sparkles\n" "for %s on %s at %s." msgstr "" -#: lib/bridgedb/strings.py:42 +#. TRANSLATORS: Please DO NOT translate "BridgeDB". +#. TRANSLATORS: Please DO NOT translate "Pluggable Transports". +#. TRANSLATORS: Please DO NOT translate "Tor". +#. TRANSLATORS: Please DO NOT translate "Tor Network". +#: lib/bridgedb/strings.py:47 #, python-format msgid "" "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n" @@ -104,14 +107,20 @@ msgid "" "\n" msgstr "" -#: lib/bridgedb/strings.py:48 +#. TRANSLATORS: Please DO NOT translate "Pluggable Transports". +#: lib/bridgedb/strings.py:54 msgid "" "Some bridges with IPv6 addresses are also available, though some Pluggable\n" "Transports aren't IPv6 compatible.\n" "\n" msgstr "" -#: lib/bridgedb/strings.py:52 +#. TRANSLATORS: Please DO NOT translate "BridgeDB". +#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring, +#. regular, or unexciting". Like vanilla ice cream. It refers to bridges +#. which do not have Pluggable Transports, and only speak the regular, +#. boring Tor protocol. Translate it as you see fit. Have fun with it. +#: lib/bridgedb/strings.py:63 #, python-format msgid "" "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n" @@ -120,20 +129,20 @@ msgid "" "\n" msgstr "" -#: lib/bridgedb/strings.py:65 +#: lib/bridgedb/strings.py:76 msgid "What are bridges?" msgstr "ما هي bridges؟" -#: lib/bridgedb/strings.py:66 +#: lib/bridgedb/strings.py:77 #, python-format msgid "%s Bridges %s are Tor relays that help you circumvent censorship." msgstr "" -#: lib/bridgedb/strings.py:71 +#: lib/bridgedb/strings.py:82 msgid "I need an alternative way of getting bridges!" msgstr "أحتاج إلى وسيلة بديلة للحصول على bridges!" -#: lib/bridgedb/strings.py:72 +#: lib/bridgedb/strings.py:83 #, python-format msgid "" "Another way to get bridges is to send an email to %s. Please note that you must\n" @@ -141,75 +150,83 @@ msgid "" "%s or %s." msgstr "" -#: lib/bridgedb/strings.py:79 +#: lib/bridgedb/strings.py:90 msgid "My bridges don't work! I need help!" msgstr "bridges لا تعمل! أنا بحاجة إلى مساعدة!" -#: lib/bridgedb/strings.py:80 +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:92 #, python-format msgid "If your Tor doesn't work, you should email %s." msgstr "" -#: lib/bridgedb/strings.py:81 +#. TRANSLATORS: Please DO NOT translate "Pluggable Transports". +#. TRANSLATORS: Please DO NOT translate "Tor Browser". +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:96 msgid "" "Try including as much info about your case as you can, including the list of\n" "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n" "and any messages which Tor gave out, etc." msgstr "" -#: lib/bridgedb/strings.py:88 +#: lib/bridgedb/strings.py:103 msgid "Here are your bridge lines:" msgstr "" -#: lib/bridgedb/strings.py:89 +#: lib/bridgedb/strings.py:104 msgid "Get Bridges!" msgstr "" -#: lib/bridgedb/strings.py:93 +#: lib/bridgedb/strings.py:108 msgid "Please select options for bridge type:" msgstr "" -#: lib/bridgedb/strings.py:94 +#: lib/bridgedb/strings.py:109 msgid "Do you need IPv6 addresses?" msgstr "" -#: lib/bridgedb/strings.py:95 +#: lib/bridgedb/strings.py:110 #, python-format msgid "Do you need a %s?" msgstr "" -#: lib/bridgedb/strings.py:99 +#: lib/bridgedb/strings.py:114 msgid "Your browser is not displaying images properly." msgstr "" -#: lib/bridgedb/strings.py:100 +#: lib/bridgedb/strings.py:115 msgid "Enter the characters from the image above..." msgstr "" -#: lib/bridgedb/strings.py:104 +#: lib/bridgedb/strings.py:119 msgid "How to start using your bridges" msgstr "" -#: lib/bridgedb/strings.py:105 +#. TRANSLATORS: Please DO NOT translate "Tor Browser". +#: lib/bridgedb/strings.py:121 #, python-format msgid "" "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n" "Browser download page %s to start Tor Browser." msgstr "" -#: lib/bridgedb/strings.py:108 +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:125 msgid "" "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n" "the wizard until it asks:" msgstr "" -#: lib/bridgedb/strings.py:111 +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:129 msgid "" "Does your Internet Service Provider (ISP) block or otherwise censor connections\n" "to the Tor network?" msgstr "" -#: lib/bridgedb/strings.py:114 +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:133 msgid "" "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n" "paste the bridge lines into the text input box. Finally, click 'Connect', and\n" @@ -217,24 +234,29 @@ msgid "" "button in the 'Tor Network Settings' wizard for further assistance." msgstr "" -#: lib/bridgedb/strings.py:122 +#: lib/bridgedb/strings.py:141 msgid "Displays this message." msgstr "" -#: lib/bridgedb/strings.py:123 +#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the +#. same non-Pluggable Transport bridges described above as being +#. "plain-ol'-vanilla" bridges. +#: lib/bridgedb/strings.py:145 msgid "Request vanilla bridges." msgstr "" -#: lib/bridgedb/strings.py:124 +#: lib/bridgedb/strings.py:146 msgid "Request IPv6 bridges." msgstr "" #. TRANSLATORS: Please DO NOT translate the word the word "TYPE". -#: lib/bridgedb/strings.py:126 +#: lib/bridgedb/strings.py:148 msgid "Request a Pluggable Transport by TYPE." msgstr "" -#: lib/bridgedb/strings.py:127 +#. TRANSLATORS: Please DO NOT translate "BridgeDB". +#. TRANSLATORS: Please DO NOT translate "GnuPG". +#: lib/bridgedb/strings.py:151 msgid "Get a copy of BridgeDB's public GnuPG key." msgstr "" @@ -254,15 +276,19 @@ msgstr "" msgid "Contact" msgstr "" -#: lib/bridgedb/templates/bridges.html:65 +#. TRANSLATORS: Please translate this into some silly way to say +#. "There was a problem!" in your language. For example, +#. for Italian, you might translate this into "Mama mia!", +#. or for French: "Sacrebleu!". :) +#: lib/bridgedb/templates/bridges.html:66 msgid "Uh oh, spaghettios!" msgstr "" -#: lib/bridgedb/templates/bridges.html:70 +#: lib/bridgedb/templates/bridges.html:72 msgid "There currently aren't any bridges available..." msgstr "" -#: lib/bridgedb/templates/bridges.html:71 +#: lib/bridgedb/templates/bridges.html:73 #, python-format msgid "" " Perhaps you should try %s going back %s and choosing a different bridge " @@ -303,28 +329,27 @@ msgstr "" #. beginning of words are present in your final translation. Thanks! #. (These are used to insert HTML5 underlining tags, to mark accesskeys #. for disabled users.) -#. TRANSLATORS: Please do NOT translate the word "bridges"! -#: lib/bridgedb/templates/options.html:39 +#: lib/bridgedb/templates/options.html:38 #, python-format msgid "%sJ%sust give me bridges!" msgstr "" -#: lib/bridgedb/templates/options.html:53 +#: lib/bridgedb/templates/options.html:52 msgid "Advanced Options" msgstr "" -#: lib/bridgedb/templates/options.html:89 +#: lib/bridgedb/templates/options.html:88 msgid "No" msgstr "لا" -#: lib/bridgedb/templates/options.html:90 +#: lib/bridgedb/templates/options.html:89 msgid "none" msgstr "" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses." -#: lib/bridgedb/templates/options.html:131 +#: lib/bridgedb/templates/options.html:130 #, python-format msgid "%sY%ses!" msgstr "" @@ -332,7 +357,7 @@ msgstr "" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! #. TRANSLATORS: Please do NOT translate the word "bridge"! -#: lib/bridgedb/templates/options.html:155 +#: lib/bridgedb/templates/options.html:154 #, python-format msgid "%sG%set Bridges" msgstr ""

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 11 Jun '14

11 Jun '14

commit cc0587531eb6173fee96cbcf90fe251e84833ea8 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jun 11 08:15:21 2014 +0000 Update translations for liveusb-creator --- zh_CN/zh_CN.po | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/zh_CN/zh_CN.po b/zh_CN/zh_CN.po index dc8093a..9ff096e 100644 --- a/zh_CN/zh_CN.po +++ b/zh_CN/zh_CN.po @@ -3,19 +3,20 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# simabull tsai, 2013 +# Wu Ming Shi, 2013 # kwh <14alpaca(a)gmail.com>, 2013 +# leungsookfan <leung.sookfan(a)riseup.net>, 2014 # xtoaster <zhazhenzhong(a)gmail.com>, 2012 -# SanyaChang <408070986(a)qq.com>, 2013 -# Y.F Yang <yfdyh000(a)gmail.com>, 2013-2014 +# Sanya chang <408070986(a)qq.com>, 2013 +# YF <yfdyh000(a)gmail.com>, 2013-2014 # 甘露 <rhythm.gan(a)gmail.com>, 2009 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-05-28 16:00+0200\n" -"PO-Revision-Date: 2014-05-29 09:11+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2014-06-11 08:10+0000\n" +"Last-Translator: leungsookfan <leung.sookfan(a)riseup.net>\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -509,7 +510,7 @@ msgstr "不支持的文件系统：%s\n请备份并用 FAT 文件系统格式化 #: ../liveusb/creator.py:877 #, python-format msgid "Updating properties of system partition %(system_partition)s" -msgstr "" +msgstr "更新系统分区属性 %(system_partition)s" #: ../liveusb/launcher_ui.py:163 msgid "Upgrade from ISO"

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 11 Jun '14

11 Jun '14

commit 7d86cc918530912448c5b78d3b5b4ded2306f385 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jun 11 08:15:03 2014 +0000 Update translations for bridgedb --- zh_CN/LC_MESSAGES/bridgedb.po | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/zh_CN/LC_MESSAGES/bridgedb.po b/zh_CN/LC_MESSAGES/bridgedb.po index d37f579..d3874e7 100644 --- a/zh_CN/LC_MESSAGES/bridgedb.po +++ b/zh_CN/LC_MESSAGES/bridgedb.po @@ -14,7 +14,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2014-06-06 21:46+0000\n" -"PO-Revision-Date: 2014-06-11 07:44+0000\n" +"PO-Revision-Date: 2014-06-11 08:10+0000\n" "Last-Translator: leungsookfan <leung.sookfan(a)riseup.net>\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n" @@ -80,7 +80,7 @@ msgstr "你好，朋友！" #: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100 msgid "Public Keys" -msgstr "" +msgstr "公共密匙" #. TRANSLATORS: This string will end up saying something like: #. "This email was generated with rainbows, unicorns, and sparkles @@ -90,7 +90,7 @@ msgstr "" msgid "" "This email was generated with rainbows, unicorns, and sparkles\n" "for %s on %s at %s." -msgstr "" +msgstr "这封邮件用在for %s %s 为 %s 生成。" #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". @@ -104,7 +104,7 @@ msgid "" "difficult for anyone watching your internet traffic to determine that you are\n" "using Tor.\n" "\n" -msgstr "" +msgstr "BridgeDB 能用 %s几种类型的Pluggable Transports%s 为你提供bridges（网桥），\n以隐蔽你对Tor网络的直接连接。\n这样网络审查者就更难看出你是在使用Tor。\n" #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". #: lib/bridgedb/strings.py:54 @@ -112,7 +112,7 @@ msgid "" "Some bridges with IPv6 addresses are also available, though some Pluggable\n" "Transports aren't IPv6 compatible.\n" "\n" -msgstr "" +msgstr "一些使用IPv6地址的bridges（网桥）也能使用，但是\nPluggable Transports并不兼容IPv6。\n" #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring, @@ -126,7 +126,7 @@ msgid "" "Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n" "help to circumvent internet censorship in many cases.\n" "\n" -msgstr "" +msgstr "此外，BridgeDB 有很多 %s 没有Pluggable Transports的普通bridges（网桥）%s。\n虽然没那么有意思，但是这些普通网桥依然可以在很多情况下\n帮助绕过审查。\n" #: lib/bridgedb/strings.py:76 msgid "What are bridges?" @@ -331,11 +331,11 @@ msgstr "然后 %s 向你的Tor浏览器添加bridges（网桥）%s 。" #: lib/bridgedb/templates/options.html:38 #, python-format msgid "%sJ%sust give me bridges!" -msgstr "" +msgstr " %s给%s我bridges（网桥）！ " #: lib/bridgedb/templates/options.html:52 msgid "Advanced Options" -msgstr "" +msgstr "高级选项" #: lib/bridgedb/templates/options.html:88 msgid "No" @@ -343,7 +343,7 @@ msgstr "否" #: lib/bridgedb/templates/options.html:89 msgid "none" -msgstr "" +msgstr "无" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! @@ -351,7 +351,7 @@ msgstr "" #: lib/bridgedb/templates/options.html:130 #, python-format msgid "%sY%ses!" -msgstr "" +msgstr "%s是%s！" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! @@ -359,4 +359,4 @@ msgstr "" #: lib/bridgedb/templates/options.html:154 #, python-format msgid "%sG%set Bridges" -msgstr "" +msgstr "%s获%s取Bridges（网桥）"

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 11 Jun '14

11 Jun '14

commit 669372ee3d7d6099af32bef4372306c1b4ccd103 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jun 11 07:45:03 2014 +0000 Update translations for bridgedb --- zh_CN/LC_MESSAGES/bridgedb.po | 66 ++++++++++++++++++++--------------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/zh_CN/LC_MESSAGES/bridgedb.po b/zh_CN/LC_MESSAGES/bridgedb.po index 6e402c7..d37f579 100644 --- a/zh_CN/LC_MESSAGES/bridgedb.po +++ b/zh_CN/LC_MESSAGES/bridgedb.po @@ -14,7 +14,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2014-06-06 21:46+0000\n" -"PO-Revision-Date: 2014-06-11 07:13+0000\n" +"PO-Revision-Date: 2014-06-11 07:44+0000\n" "Last-Translator: leungsookfan <leung.sookfan(a)riseup.net>\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n" @@ -135,7 +135,7 @@ msgstr "什么是网桥中继？" #: lib/bridgedb/strings.py:77 #, python-format msgid "%s Bridges %s are Tor relays that help you circumvent censorship." -msgstr "" +msgstr "%s Bridges %s 是帮助你绕过审查或封锁的 Tor relay（中继点）。" #: lib/bridgedb/strings.py:82 msgid "I need an alternative way of getting bridges!" @@ -147,7 +147,7 @@ msgid "" "Another way to get bridges is to send an email to %s. Please note that you must\n" "send the email using an address from one of the following email providers:\n" "%s or %s." -msgstr "" +msgstr "获得 bridges（网桥）的另一种方法是向 %s 发送一封邮件。注意：您只能使用以下邮件服务商提供的邮件地址发送：%s 或 %s 。" #: lib/bridgedb/strings.py:90 msgid "My bridges don't work! I need help!" @@ -157,7 +157,7 @@ msgstr "网桥无法正常运行，我需要帮助！" #: lib/bridgedb/strings.py:92 #, python-format msgid "If your Tor doesn't work, you should email %s." -msgstr "" +msgstr "如果你的 Tor 无法正常运行，请发邮件至 %s。" #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". #. TRANSLATORS: Please DO NOT translate "Tor Browser". @@ -167,40 +167,40 @@ msgid "" "Try including as much info about your case as you can, including the list of\n" "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n" "and any messages which Tor gave out, etc." -msgstr "" +msgstr "请尽量描述你的情况，包括你尝试过的bridges和Pluggable Transports，你的Tor浏览器版本，还有任何Tor显示过的信息等等。" #: lib/bridgedb/strings.py:103 msgid "Here are your bridge lines:" -msgstr "" +msgstr "这里是你的Bridge lines：" #: lib/bridgedb/strings.py:104 msgid "Get Bridges!" -msgstr "" +msgstr "获得Bridges！" #: lib/bridgedb/strings.py:108 msgid "Please select options for bridge type:" -msgstr "" +msgstr "请选择bridge类型。" #: lib/bridgedb/strings.py:109 msgid "Do you need IPv6 addresses?" -msgstr "" +msgstr "您需要IPv6地址吗？" #: lib/bridgedb/strings.py:110 #, python-format msgid "Do you need a %s?" -msgstr "" +msgstr "你需要一个 %s 吗？" #: lib/bridgedb/strings.py:114 msgid "Your browser is not displaying images properly." -msgstr "" +msgstr "您的浏览器未能正确显示图片。" #: lib/bridgedb/strings.py:115 msgid "Enter the characters from the image above..." -msgstr "" +msgstr "输入图片里的文字……" #: lib/bridgedb/strings.py:119 msgid "How to start using your bridges" -msgstr "" +msgstr "如何开始使用你的bridges（网桥）。" #. TRANSLATORS: Please DO NOT translate "Tor Browser". #: lib/bridgedb/strings.py:121 @@ -208,21 +208,21 @@ msgstr "" msgid "" "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n" "Browser download page %s to start Tor Browser." -msgstr "" +msgstr "要将bridges（网桥）输入Tor浏览器，请先根据 %s Tor 浏览器下载页面 %s 的说明来启动Tor 浏览器。" #. TRANSLATORS: Please DO NOT translate "Tor". #: lib/bridgedb/strings.py:125 msgid "" "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n" "the wizard until it asks:" -msgstr "" +msgstr "当“Tor 网络设置” 弹出时，点击“配置” 然后根据向导操作，您会被问到：" #. TRANSLATORS: Please DO NOT translate "Tor". #: lib/bridgedb/strings.py:129 msgid "" "Does your Internet Service Provider (ISP) block or otherwise censor connections\n" "to the Tor network?" -msgstr "" +msgstr "你的网络提供商（ISP）是否有封锁或者审查到 Tor 网络的连接？" #. TRANSLATORS: Please DO NOT translate "Tor". #: lib/bridgedb/strings.py:133 @@ -231,33 +231,33 @@ msgid "" "paste the bridge lines into the text input box. Finally, click 'Connect', and\n" "you should be good to go! If you experience trouble, try clicking the 'Help'\n" "button in the 'Tor Network Settings' wizard for further assistance." -msgstr "" +msgstr "选择“是”然后点击”下一步“。要配置新的bridges（网桥），将您获得的bridge lines（网桥地址）复制到文本输入框。最后，点击”连接“，您应该就能顺利浏览。如果你遇到问题，请试试点击“Tor网络设置”里的“帮助”按钮获取支持。" #: lib/bridgedb/strings.py:141 msgid "Displays this message." -msgstr "" +msgstr "显示这条信息。" #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the #. same non-Pluggable Transport bridges described above as being #. "plain-ol'-vanilla" bridges. #: lib/bridgedb/strings.py:145 msgid "Request vanilla bridges." -msgstr "" +msgstr "请求vanilla bridges（网桥）。" #: lib/bridgedb/strings.py:146 msgid "Request IPv6 bridges." -msgstr "" +msgstr "请求IPv6 bridges（网桥）。" #. TRANSLATORS: Please DO NOT translate the word the word "TYPE". #: lib/bridgedb/strings.py:148 msgid "Request a Pluggable Transport by TYPE." -msgstr "" +msgstr "根据TYPE 请求Pluggable Transport。" #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: Please DO NOT translate "GnuPG". #: lib/bridgedb/strings.py:151 msgid "Get a copy of BridgeDB's public GnuPG key." -msgstr "" +msgstr "获取BridgeDB的公共GnuPG密匙。" #: lib/bridgedb/templates/base.html:91 msgid "Report a Bug" @@ -265,15 +265,15 @@ msgstr "报告缺陷" #: lib/bridgedb/templates/base.html:93 msgid "Source Code" -msgstr "" +msgstr "源代码" #: lib/bridgedb/templates/base.html:96 msgid "Changelog" -msgstr "" +msgstr "更改日志" #: lib/bridgedb/templates/base.html:98 msgid "Contact" -msgstr "" +msgstr "联系方式" #. TRANSLATORS: Please translate this into some silly way to say #. "There was a problem!" in your language. For example, @@ -281,33 +281,33 @@ msgstr "" #. or for French: "Sacrebleu!". :) #: lib/bridgedb/templates/bridges.html:66 msgid "Uh oh, spaghettios!" -msgstr "" +msgstr "哎哟哟！" #: lib/bridgedb/templates/bridges.html:72 msgid "There currently aren't any bridges available..." -msgstr "" +msgstr "现在没有可用的bridge（网桥）。" #: lib/bridgedb/templates/bridges.html:73 #, python-format msgid "" " Perhaps you should try %s going back %s and choosing a different bridge " "type!" -msgstr "" +msgstr "你或许可以尝试 %s 后退 %s 然后选择不同类型的bridge（网桥）。" #: lib/bridgedb/templates/index.html:11 #, python-format msgid "Step %s1%s" -msgstr "" +msgstr "第 %s 1 %s 步" #: lib/bridgedb/templates/index.html:13 #, python-format msgid "Download %s Tor Browser %s" -msgstr "" +msgstr "下载 %s Tor 浏览器 %s" #: lib/bridgedb/templates/index.html:25 #, python-format msgid "Step %s2%s" -msgstr "" +msgstr "第 %s 2 %s 步" #: lib/bridgedb/templates/index.html:27 #, python-format @@ -317,12 +317,12 @@ msgstr "获取 %s bridges %s" #: lib/bridgedb/templates/index.html:36 #, python-format msgid "Step %s3%s" -msgstr "" +msgstr "第 %s 3 %s 步" #: lib/bridgedb/templates/index.html:38 #, python-format msgid "Now %s add the bridges to Tor Browser %s" -msgstr "" +msgstr "然后 %s 向你的Tor浏览器添加bridges（网桥）%s 。" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks!

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 11 Jun '14

11 Jun '14

commit 09c4efae255f05e5fa1233b758d526096ac3f8c9 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jun 11 07:15:02 2014 +0000 Update translations for bridgedb --- zh_CN/LC_MESSAGES/bridgedb.po | 147 ++++++++++++++++++++++++----------------- 1 file changed, 86 insertions(+), 61 deletions(-) diff --git a/zh_CN/LC_MESSAGES/bridgedb.po b/zh_CN/LC_MESSAGES/bridgedb.po index da393bb..6e402c7 100644 --- a/zh_CN/LC_MESSAGES/bridgedb.po +++ b/zh_CN/LC_MESSAGES/bridgedb.po @@ -3,18 +3,19 @@ # This file is distributed under the same license as the BridgeDB project. # # Translators: -# simabull tsai, 2013 -# simabull tsai, 2013 -# simabull tsai, 2013 +# Wu Ming Shi, 2013 +# Wu Ming Shi, 2013 +# Wu Ming Shi, 2013 # Christopher Meng <cickumqt(a)gmail.com>, 2012 # hanl <iamh4n(a)gmail.com>, 2011 +# leungsookfan <leung.sookfan(a)riseup.net>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" -"POT-Creation-Date: 2014-05-16 18:39+0000\n" -"PO-Revision-Date: 2014-05-17 14:36+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"POT-Creation-Date: 2014-06-06 21:46+0000\n" +"PO-Revision-Date: 2014-06-11 07:13+0000\n" +"Last-Translator: leungsookfan <leung.sookfan(a)riseup.net>\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -25,21 +26,18 @@ msgstr "" #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in #. any string (regardless of capitalization and/or punctuation): -#. "bridge" -#. "bridges" #. "BridgeDB" #. "pluggable transport" #. "pluggable transports" #. "obfs2" #. "obfs3" #. "scramblesuit" -#. "fte" +#. "fteproxy" #. "Tor" #. "Tor Browser" -#. "TBB" -#: lib/bridgedb/HTTPServer.py:124 +#: lib/bridgedb/HTTPServer.py:121 msgid "Sorry! Something went wrong with your request." -msgstr "" +msgstr "抱歉，您的请求出了点问题。" #: lib/bridgedb/strings.py:18 msgid "[This is an automated message; please do not reply.]" @@ -47,53 +45,58 @@ msgstr "[这是一封自动生成的邮件，请勿回复]" #: lib/bridgedb/strings.py:20 msgid "Here are your bridges:" -msgstr "" +msgstr "这些是你的网桥（bridges）：" #: lib/bridgedb/strings.py:22 #, python-format msgid "" "You have exceeded the rate limit. Please slow down! The minimum time between\n" "emails is %s hours. All further emails during this time period will be ignored." -msgstr "" +msgstr "您已超出了发送频率的限制，请慢慢来！两封邮件之间需要最少 %s 小时的间隔。在间隔期间发出的所有邮件将被忽略。" #: lib/bridgedb/strings.py:25 msgid "" "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)" msgstr "" -#: lib/bridgedb/strings.py:27 +#. TRANSLATORS: Please DO NOT translate the word "BridgeDB". +#: lib/bridgedb/strings.py:28 msgid "Welcome to BridgeDB!" -msgstr "" +msgstr "欢迎来到BridgeDB！" #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE". -#: lib/bridgedb/strings.py:29 +#: lib/bridgedb/strings.py:30 msgid "Currently supported transport TYPEs:" -msgstr "" +msgstr "支持的 transport TYPEs：" -#: lib/bridgedb/strings.py:30 +#: lib/bridgedb/strings.py:31 #, python-format msgid "Hey, %s!" -msgstr "" +msgstr "嘿，%s！" -#: lib/bridgedb/strings.py:31 +#: lib/bridgedb/strings.py:32 msgid "Hello, friend!" -msgstr "" +msgstr "你好，朋友！" -#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100 +#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100 msgid "Public Keys" msgstr "" #. TRANSLATORS: This string will end up saying something like: #. "This email was generated with rainbows, unicorns, and sparkles #. for alice(a)example.com on Friday, 09 May, 2014 at 18:59:39." -#: lib/bridgedb/strings.py:36 +#: lib/bridgedb/strings.py:37 #, python-format msgid "" "This email was generated with rainbows, unicorns, and sparkles\n" "for %s on %s at %s." msgstr "" -#: lib/bridgedb/strings.py:42 +#. TRANSLATORS: Please DO NOT translate "BridgeDB". +#. TRANSLATORS: Please DO NOT translate "Pluggable Transports". +#. TRANSLATORS: Please DO NOT translate "Tor". +#. TRANSLATORS: Please DO NOT translate "Tor Network". +#: lib/bridgedb/strings.py:47 #, python-format msgid "" "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n" @@ -103,14 +106,20 @@ msgid "" "\n" msgstr "" -#: lib/bridgedb/strings.py:48 +#. TRANSLATORS: Please DO NOT translate "Pluggable Transports". +#: lib/bridgedb/strings.py:54 msgid "" "Some bridges with IPv6 addresses are also available, though some Pluggable\n" "Transports aren't IPv6 compatible.\n" "\n" msgstr "" -#: lib/bridgedb/strings.py:52 +#. TRANSLATORS: Please DO NOT translate "BridgeDB". +#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring, +#. regular, or unexciting". Like vanilla ice cream. It refers to bridges +#. which do not have Pluggable Transports, and only speak the regular, +#. boring Tor protocol. Translate it as you see fit. Have fun with it. +#: lib/bridgedb/strings.py:63 #, python-format msgid "" "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n" @@ -119,20 +128,20 @@ msgid "" "\n" msgstr "" -#: lib/bridgedb/strings.py:65 +#: lib/bridgedb/strings.py:76 msgid "What are bridges?" msgstr "什么是网桥中继？" -#: lib/bridgedb/strings.py:66 +#: lib/bridgedb/strings.py:77 #, python-format msgid "%s Bridges %s are Tor relays that help you circumvent censorship." msgstr "" -#: lib/bridgedb/strings.py:71 +#: lib/bridgedb/strings.py:82 msgid "I need an alternative way of getting bridges!" msgstr "需要使用其他获取方式获取网桥！" -#: lib/bridgedb/strings.py:72 +#: lib/bridgedb/strings.py:83 #, python-format msgid "" "Another way to get bridges is to send an email to %s. Please note that you must\n" @@ -140,75 +149,83 @@ msgid "" "%s or %s." msgstr "" -#: lib/bridgedb/strings.py:79 +#: lib/bridgedb/strings.py:90 msgid "My bridges don't work! I need help!" msgstr "网桥无法正常运行，我需要帮助！" -#: lib/bridgedb/strings.py:80 +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:92 #, python-format msgid "If your Tor doesn't work, you should email %s." msgstr "" -#: lib/bridgedb/strings.py:81 +#. TRANSLATORS: Please DO NOT translate "Pluggable Transports". +#. TRANSLATORS: Please DO NOT translate "Tor Browser". +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:96 msgid "" "Try including as much info about your case as you can, including the list of\n" "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n" "and any messages which Tor gave out, etc." msgstr "" -#: lib/bridgedb/strings.py:88 +#: lib/bridgedb/strings.py:103 msgid "Here are your bridge lines:" msgstr "" -#: lib/bridgedb/strings.py:89 +#: lib/bridgedb/strings.py:104 msgid "Get Bridges!" msgstr "" -#: lib/bridgedb/strings.py:93 +#: lib/bridgedb/strings.py:108 msgid "Please select options for bridge type:" msgstr "" -#: lib/bridgedb/strings.py:94 +#: lib/bridgedb/strings.py:109 msgid "Do you need IPv6 addresses?" msgstr "" -#: lib/bridgedb/strings.py:95 +#: lib/bridgedb/strings.py:110 #, python-format msgid "Do you need a %s?" msgstr "" -#: lib/bridgedb/strings.py:99 +#: lib/bridgedb/strings.py:114 msgid "Your browser is not displaying images properly." msgstr "" -#: lib/bridgedb/strings.py:100 +#: lib/bridgedb/strings.py:115 msgid "Enter the characters from the image above..." msgstr "" -#: lib/bridgedb/strings.py:104 +#: lib/bridgedb/strings.py:119 msgid "How to start using your bridges" msgstr "" -#: lib/bridgedb/strings.py:105 +#. TRANSLATORS: Please DO NOT translate "Tor Browser". +#: lib/bridgedb/strings.py:121 #, python-format msgid "" "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n" "Browser download page %s to start Tor Browser." msgstr "" -#: lib/bridgedb/strings.py:108 +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:125 msgid "" "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n" "the wizard until it asks:" msgstr "" -#: lib/bridgedb/strings.py:111 +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:129 msgid "" "Does your Internet Service Provider (ISP) block or otherwise censor connections\n" "to the Tor network?" msgstr "" -#: lib/bridgedb/strings.py:114 +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:133 msgid "" "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n" "paste the bridge lines into the text input box. Finally, click 'Connect', and\n" @@ -216,24 +233,29 @@ msgid "" "button in the 'Tor Network Settings' wizard for further assistance." msgstr "" -#: lib/bridgedb/strings.py:122 +#: lib/bridgedb/strings.py:141 msgid "Displays this message." msgstr "" -#: lib/bridgedb/strings.py:123 +#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the +#. same non-Pluggable Transport bridges described above as being +#. "plain-ol'-vanilla" bridges. +#: lib/bridgedb/strings.py:145 msgid "Request vanilla bridges." msgstr "" -#: lib/bridgedb/strings.py:124 +#: lib/bridgedb/strings.py:146 msgid "Request IPv6 bridges." msgstr "" #. TRANSLATORS: Please DO NOT translate the word the word "TYPE". -#: lib/bridgedb/strings.py:126 +#: lib/bridgedb/strings.py:148 msgid "Request a Pluggable Transport by TYPE." msgstr "" -#: lib/bridgedb/strings.py:127 +#. TRANSLATORS: Please DO NOT translate "BridgeDB". +#. TRANSLATORS: Please DO NOT translate "GnuPG". +#: lib/bridgedb/strings.py:151 msgid "Get a copy of BridgeDB's public GnuPG key." msgstr "" @@ -253,15 +275,19 @@ msgstr "" msgid "Contact" msgstr "" -#: lib/bridgedb/templates/bridges.html:65 +#. TRANSLATORS: Please translate this into some silly way to say +#. "There was a problem!" in your language. For example, +#. for Italian, you might translate this into "Mama mia!", +#. or for French: "Sacrebleu!". :) +#: lib/bridgedb/templates/bridges.html:66 msgid "Uh oh, spaghettios!" msgstr "" -#: lib/bridgedb/templates/bridges.html:70 +#: lib/bridgedb/templates/bridges.html:72 msgid "There currently aren't any bridges available..." msgstr "" -#: lib/bridgedb/templates/bridges.html:71 +#: lib/bridgedb/templates/bridges.html:73 #, python-format msgid "" " Perhaps you should try %s going back %s and choosing a different bridge " @@ -302,28 +328,27 @@ msgstr "" #. beginning of words are present in your final translation. Thanks! #. (These are used to insert HTML5 underlining tags, to mark accesskeys #. for disabled users.) -#. TRANSLATORS: Please do NOT translate the word "bridges"! -#: lib/bridgedb/templates/options.html:39 +#: lib/bridgedb/templates/options.html:38 #, python-format msgid "%sJ%sust give me bridges!" msgstr "" -#: lib/bridgedb/templates/options.html:53 +#: lib/bridgedb/templates/options.html:52 msgid "Advanced Options" msgstr "" -#: lib/bridgedb/templates/options.html:89 +#: lib/bridgedb/templates/options.html:88 msgid "No" msgstr "否" -#: lib/bridgedb/templates/options.html:90 +#: lib/bridgedb/templates/options.html:89 msgid "none" msgstr "" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses." -#: lib/bridgedb/templates/options.html:131 +#: lib/bridgedb/templates/options.html:130 #, python-format msgid "%sY%ses!" msgstr "" @@ -331,7 +356,7 @@ msgstr "" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! #. TRANSLATORS: Please do NOT translate the word "bridge"! -#: lib/bridgedb/templates/options.html:155 +#: lib/bridgedb/templates/options.html:154 #, python-format msgid "%sG%set Bridges" msgstr ""

1 0

[torbrowser/master] Unrecommend TBB 3.6 and 3.6.1.
by mikeperry＠torproject.org 11 Jun '14

11 Jun '14

commit 8d09830148702e9f22fce29484ad724e306699c4 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Jun 10 18:10:03 2014 -0700 Unrecommend TBB 3.6 and 3.6.1. --- build-scripts/recommended-versions | 6 ------ 1 file changed, 6 deletions(-) diff --git a/build-scripts/recommended-versions b/build-scripts/recommended-versions index 252dd5d..4e3cfa1 100644 --- a/build-scripts/recommended-versions +++ b/build-scripts/recommended-versions @@ -1,10 +1,4 @@ [ -"3.6-Linux", -"3.6-MacOS", -"3.6-Windows", -"3.6.1-Linux", -"3.6.1-MacOS", -"3.6.1-Windows", "3.6.2-Linux", "3.6.2-MacOS", "3.6.2-Windows"

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
by nickm＠torproject.org 11 Jun '14

11 Jun '14

commit ab774a8500a6f4302296ff4c6ea23ba5c64eaa52 Merge: 8d9602c 555c43c Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 10 21:07:57 2014 -0400 Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 src/config/geoip |22394 +++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 15384 insertions(+), 7010 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'karsten/geoip6-jun2014' into maint-0.2.4
by nickm＠torproject.org 11 Jun '14

11 Jun '14

commit 3bc28c4c04584d599c933491f3b2d11f2cef1aaf Merge: ab774a8 40579cb Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 10 21:08:12 2014 -0400 Merge remote-tracking branch 'karsten/geoip6-jun2014' into maint-0.2.4 changes/geoip6-june2014 | 2 + src/config/geoip6 | 2115 ++++++++++++++++++++++++++++++++--------------- 2 files changed, 1437 insertions(+), 680 deletions(-)

1 0

[tor/master] Fix changes file for geoip
by nickm＠torproject.org 11 Jun '14

11 Jun '14

commit f5ce580babc5ca8466da02c53669a58bde8f5445 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 10 21:08:44 2014 -0400 Fix changes file for geoip --- changes/geoip6-june2014 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changes/geoip6-june2014 b/changes/geoip6-june2014 index f7b2ea4..1a33e6f 100644 --- a/changes/geoip6-june2014 +++ b/changes/geoip6-june2014 @@ -1,2 +1,2 @@ o Minor features: - - Update geoip6 to the June 4 2014 Maxmind GeoLite2 Country database. + - Update geoip and geoip6 to the June 4 2014 Maxmind GeoLite2 Country database.

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.4'
by nickm＠torproject.org 11 Jun '14

11 Jun '14

commit 173a1afc5819f1fcabfa34bab5714d61088cc29f Merge: 55c7a55 f5ce580 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 10 21:09:27 2014 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' changes/geoip6-june2014 | 2 + src/config/geoip |22394 ++++++++++++++++++++++++++++++++--------------- src/config/geoip6 | 2115 +++-- 3 files changed, 16821 insertions(+), 7690 deletions(-)

1 0