date:20160107

[tor-commits] [translation/torbutton-aboutdialogdtd] Update translations for torbutton-aboutdialogdtd

2016-01-07 Thread translation

commit 63dee135a13f8e45ec00b2b7511a441179d81dcf
Author: Translation commit bot 
Date:   Fri Jan 8 00:45:59 2016 +

Update translations for torbutton-aboutdialogdtd
---
 zh_TW/aboutdialog.dtd |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/zh_TW/aboutdialog.dtd b/zh_TW/aboutdialog.dtd
index e56..913ce22 100644
--- a/zh_TW/aboutdialog.dtd
+++ b/zh_TW/aboutdialog.dtd
@@ -1,19 +1,19 @@
 
 
 
-
+
 
-
+
 
 
 
 
-
+
 
 
 
 
-
+
 
 
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/torbutton-abouttorproperties] Update translations for torbutton-abouttorproperties

2016-01-07 Thread translation

commit fe0482431a56b9caa9e24b0e3363a3f380e64c28
Author: Translation commit bot 
Date:   Fri Jan 8 01:16:49 2016 +

Update translations for torbutton-abouttorproperties
---
 zh_TW/abouttor.properties |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/zh_TW/abouttor.properties b/zh_TW/abouttor.properties
index 7f9cfaa..1e6d825 100644
--- a/zh_TW/abouttor.properties
+++ b/zh_TW/abouttor.properties
@@ -21,11 +21,11 @@ aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
 aboutTor.searchDC.search.link=https://search.disconnect.me/
 
 aboutTor.donationBanner.lp.who=â Laura Poitras
-aboutTor.donationBanner.lp.quote=æ²æ Tor åå¶ä»èªç±è»ä»¶å å¯å·¥å
·ï¼æå¾·è¯Â·å²è«¾ç»å°±ä¸è½èæè¯ç¹«ãTor 
æ¯ä¸å¯æç¼ºçæ±è¥¿ï¼å®éè¦å¤§å®¶çå±åæ´å©ã
+aboutTor.donationBanner.lp.quote=æ²ææ´è¥è·¯ç±åå¶ä»èªç±è»é«å 
å¯å·¥å
·ï¼æå¾·è¯Â·å²è«¾ç»å°±ä¸è½èæè¯ç¹«ãæ´è¥è·¯ç±æ¯ä¸å¯æç¼ºçå·¥å
·ï¼å®éè¦å¤§å®¶çå±åæ¯æèè²¢ç»ã
 aboutTor.donationBanner.lp.speciality=å¥§æ¯å¡ç²çç´éçãç¬¬åå
¬æ°ãè£½ä½äºº
 
 aboutTor.donationBanner.cd.who=â Cory Doctorow
-aboutTor.donationBanner.cd.quote=é±ç§åå¿åå°æåæ¯åäººé½å¾éè¦ã
+aboutTor.donationBanner.cd.quote=é±ç§åå¿åæ§å°æåæ¯åäººé½å¾éè¦ã
 aboutTor.donationBanner.cd.speciality= Novelist, technology activist, 
co-editor of Boing Boing
 
 aboutTor.donationBanner.rd.who=â Roger Dingledine

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/abouttor-homepage] Update translations for abouttor-homepage

2016-01-07 Thread translation

commit 5420fb6a2c9cc0a381e75d55b8d8bdbf25f86ba0
Author: Translation commit bot 
Date:   Fri Jan 8 01:15:45 2016 +

Update translations for abouttor-homepage
---
 zh_TW/aboutTor.dtd |   32 
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/zh_TW/aboutTor.dtd b/zh_TW/aboutTor.dtd
index d33dbee..cb7e61a 100644
--- a/zh_TW/aboutTor.dtd
+++ b/zh_TW/aboutTor.dtd
@@ -4,19 +4,19 @@
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-
+
 
-
+
 
-
+
 
-
+
 
-
-
-
-
-
+
+
+
+
+
 
 
 
@@ -27,17 +27,17 @@
 https://duckduckgo.com/html/;>
 https://search.disconnect.me/searchTerms/search?ses=Googlelocation_option=TWsource=tor;>
 
-
-
-
+
+
+
 
-
-
+
+
 
 https://www.torproject.org/download/download.html.en#warning;>
 
-
-
+
+
 https://www.torproject.org/docs/tor-doc-relay.html.en;>
 
 https://www.torproject.org/getinvolved/volunteer.html.en;>

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/torbutton-abouttbupdatedtd] Update translations for torbutton-abouttbupdatedtd

2016-01-07 Thread translation

commit 8d6177ecb7aee3b2f198ed41225d574cdcbdf931
Author: Translation commit bot 
Date:   Fri Jan 8 00:46:56 2016 +

Update translations for torbutton-abouttbupdatedtd
---
 zh_TW/abouttbupdate.dtd |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/zh_TW/abouttbupdate.dtd b/zh_TW/abouttbupdate.dtd
index 3e57766..6be3de8 100644
--- a/zh_TW/abouttbupdate.dtd
+++ b/zh_TW/abouttbupdate.dtd
@@ -1,6 +1,6 @@
-
-
-
-
+
+
+
+
 
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/abouttor-homepage_completed] Update translations for abouttor-homepage_completed

2016-01-07 Thread translation

commit 06418ddb1e3070a3cc4f07c0cf164d62acd60e2a
Author: Translation commit bot 
Date:   Fri Jan 8 01:16:11 2016 +

Update translations for abouttor-homepage_completed
---
 zh_TW/aboutTor.dtd |   32 
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/zh_TW/aboutTor.dtd b/zh_TW/aboutTor.dtd
index cd8e6c5..cb7e61a 100644
--- a/zh_TW/aboutTor.dtd
+++ b/zh_TW/aboutTor.dtd
@@ -4,19 +4,19 @@
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-
+
 
-
+
 
-
+
 
-
+
 
-
-
-
-
-
+
+
+
+
+
 
 
 
@@ -27,17 +27,17 @@
 https://duckduckgo.com/html/;>
 https://search.disconnect.me/searchTerms/search?ses=Googlelocation_option=TWsource=tor;>
 
-
-
-
+
+
+
 
-
-
+
+
 
 https://www.torproject.org/download/download.html.en#warning;>
 
-
-
+
+
 https://www.torproject.org/docs/tor-doc-relay.html.en;>
 
 https://www.torproject.org/getinvolved/volunteer.html.en;>

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties

2016-01-07 Thread translation

commit 89ba900b2e53500dc41b5ea333b3e537f7dc1637
Author: Translation commit bot 
Date:   Fri Jan 8 01:16:30 2016 +

Update translations for torbutton-torbuttonproperties
---
 zh_TW/torbutton.properties |   30 +++---
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/zh_TW/torbutton.properties b/zh_TW/torbutton.properties
index 23caf54..7a072ec 100644
--- a/zh_TW/torbutton.properties
+++ b/zh_TW/torbutton.properties
@@ -1,5 +1,5 @@
-torbutton.button.tooltip.disabled = åç¨ Tor
-torbutton.button.tooltip.enabled = åç¨ Tor
+torbutton.button.tooltip.disabled = åç¨æ´è¥è·¯ç±
+torbutton.button.tooltip.enabled = åç¨æ´è¥è·¯ç±
 torbutton.circuit_display.internet = ç¶²éç¶²è·¯
 torbutton.circuit_display.ip_unknown = æªç¥IP
 torbutton.circuit_display.onion_site = æ´è¥ç¶²ç«
@@ -8,21 +8,21 @@ torbutton.circuit_display.relay = ä¸ç¹¼ç«
 torbutton.circuit_display.tor_bridge = æ©æ¥å¨
 torbutton.circuit_display.unknown_country = æªç¥åå®¶
 torbutton.content_sizer.margin_tooltip = Tor Browser adds this margin to make 
the width and height of your window less distinctive, and thus reduces the 
ability of people to track you online.
-torbutton.panel.tooltip.disabled = æä¸ä¸ä»¥åç¨ Tor
-torbutton.panel.tooltip.enabled = æä¸ä¸ä»¥åç¨ Tor
+torbutton.panel.tooltip.disabled = æä¸ä¸ä»¥åç¨æ´è¥è·¯ç±
+torbutton.panel.tooltip.enabled = æä¸ä¸ä»¥åç¨æ´è¥è·¯ç±
 torbutton.panel.plugins.disabled = æä¸ä¸ä»¥åç¨å¤æç¨å¼
 torbutton.panel.plugins.enabled = æä¸ä¸ä»¥åç¨å¤æç¨å¼
-torbutton.panel.label.disabled = Tor å·²åç¨
-torbutton.panel.label.enabled = Tor å·²åç¨
-extensions.torbut...@torproject.org.description = Torbutton 
æä¾ä¸åæéä¾éç½® Tor è¨å®åå¿«éãè¼é¬å°æ¸
é¤ç§äººçè¦½è³æã
-torbutton.popup.history.warning = Torbutton å°éå¾å¨ä¸å Tor çæ
å·²è¼å¥çé ç±¤æ´»åã\n\néæ¯çºäºè§£æ±º Firefox é¯èª¤ 409737 å 
417869ã\n\nå¦ææ¤å½åºä¼¼ä¹ç¡ç·£ç¡æç¼çï¼æ¨çé 
ç±¤ä¹ä¸è©¦åå¨èæ¯éæ°è¼å
¥å®æ¬èº«ï¼éå·²è¢«å°éã\n\nè¦å¨æ¤ Tor çæä¸éæ°è¼å¥é 
ç±¤ï¼é»æç¶²åä½ç½®æ¹å¡ä¸ç 'enter'ã\n
-torbutton.popup.plugin.warning = Torbutton å·²é»æ¢ç´æ¥ Tor å¤éç¨å¼å
§å®¹çè¼å¥ã\n\nä½¿ç¨å¦åæ°æªä¾ä»£æ¿ã\n\n
-torbutton.popup.confirm_ca_certs = Torbutton æ³¨æäºé : 
çä¾æ¨æ²æèªè¨çæèææ¬å®ä½ãæª¢æ¥æèææ¬å®ä½æ¸
å®æ¯è¼æ¢çæä½ä¸ææ¸æ¢ Tor 
åæãæ¨æ³è¦åç¨æèææ¬å®ä½æèéé¢å? 
(å¦ææ¨ä¸çè§£éä¸é»ï¼å®æ¯å®å¨çï¼è«æä¸ä¸ãç¢ºå®ã)
-torbutton.popup.ff3.warning = è¦å!\n\nFirefox 3 ä¸ç Torbutton 
å·²ç¥éé Tor ææ´©æ¼æ¨çæåå livemarksã\n\næ¨å¸æç¹¼çºå?
-torbutton.popup.toggle.warning = æ¨éè¦åæ Tor 
æéæ°ååä¾ä½¿æ¨çè¨å®çæã
-torbutton.popup.test.success = Tor ä»£çä¼ºæå¨æ¸¬è©¦æå!
-torbutton.popup.test.failure = Tor ä»£çä¼ºæå¨æ¸¬è©¦å¤±æ! 
è«æª¢æ¥æ¨çä»£çä¼ºæå¨å Polipo è¨å®ã
-torbutton.popup.test.confirm_toggle = æè¿ç Tor 
ä»£çä¼ºæå¨æ¸¬è©¦ç¡æ³ä½¿ç¨ Torã\n\næ¨ç¢ºå®è¦åç¨å?\n\næ³¨æ: 
è¥æ¨å·²è§£æ±ºåé¡ï¼æ¨å¯ä»¥å¨ Torbutton 
ä»£çä¼ºæå¨åå¥½è¨å®è¦çªä¸éæ°å·è¡æ¸¬è©¦ï¼ä¾æ¶é¤æ¤è¦åã
+torbutton.panel.label.disabled = æ´è¥è·¯ç±å·²åç¨
+torbutton.panel.label.enabled = æ´è¥è·¯ç±å·²åç¨
+extensions.torbut...@torproject.org.description = Torbutton 
æä¾ä¸åæéä¾éç½®æ´è¥è·¯ç±è¨å®åå¿«éãè¼é¬å°æ¸
é¤ç§äººçè¦½è³æã
+torbutton.popup.history.warning = Torbutton å°éå¾å¨ä¸åæ´è¥è·¯ç±çæ
å·²è¼å¥çé ç±¤æ´»åã\n\néæ¯çºäºè§£æ±º Firefox é¯èª¤ 409737 å 
417869ã\n\nå¦ææ¤å½åºä¼¼ä¹ç¡ç·£ç¡æç¼çï¼æ¯èµ·å æ¼æ¨çå
¶ä¸ä¸åé ç±¤è©¦åå¨èæ¯èªè¡éæ°è¼å
¥èè¢«å°éã\n\nè¦å¨æ¤æ´è¥è·¯ç±çæä¸éæ°è¼å¥é 
ç±¤ï¼é»æç¶²åä½ç½®æ¹å¡ä¸ç 'enter'ã\n
+torbutton.popup.plugin.warning = Torbutton 
å·²é»æ¢ç´æ¥æ´è¥è·¯ç±å¤æç¨å¼å§å®¹çè¼å
¥ã\n\nè«ä½¿ç¨å¦åæ°æªä¾ä»£æ¿ã\n
+torbutton.popup.confirm_ca_certs = Torbutton æ³¨æäºé 
ï¼çä¾æ¨æ²æèªè¨çæèææ¬å®ä½ãæª¢æ¥æèææ¬å®ä½æ¸
å®æ¯è¼èæçæä½ï¼ä¸æéä½æ´è¥è·¯ç±åææéçåæéåº¦ãæ¨æ³è¦åç¨æèææ¬å®ä½æèéé¢å?
 (å¦ææ¨ä¸æ¸æ¥éæ¯ä»éº¼ï¼å¯ä»¥æ¾å¿å°æä¸ä¸ãç¢ºå®ã)
+torbutton.popup.ff3.warning = è¦åï¼\n\nFirefox 3 ä¸ç Torbutton 
æå·²ç¥çæ¼æ´ï¼æééæ´è¥è·¯ç±æ´©æ¼æ¨çæåå livemarks 
ä¹ç¸éè³è¨ã\n\næ¨å¸æç¹¼çºå?
+torbutton.popup.toggle.warning = æ¨éè¦åææ´è¥è·¯ç±çæ
æéæ°ååä¾ä½¿æ¨çè¨å®å¼çæã
+torbutton.popup.test.success = æ´è¥è·¯ç±ä»£çä¼ºæå¨æ¸¬è©¦æåï¼
+torbutton.popup.test.failure =

[tor-commits] [translation/torbutton-abouttbupdatedtd] Update translations for torbutton-abouttbupdatedtd

2016-01-07 Thread translation

commit 302295ad3409f2bef3c49f151fe37e732c70d07e
Author: Translation commit bot 
Date:   Fri Jan 8 01:17:33 2016 +

Update translations for torbutton-abouttbupdatedtd
---
 zh_TW/abouttbupdate.dtd |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zh_TW/abouttbupdate.dtd b/zh_TW/abouttbupdate.dtd
index 6be3de8..10b1788 100644
--- a/zh_TW/abouttbupdate.dtd
+++ b/zh_TW/abouttbupdate.dtd
@@ -3,4 +3,4 @@
 
 
 
-
+

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/torbutton-abouttbupdatedtd_completed] Update translations for torbutton-abouttbupdatedtd_completed

2016-01-07 Thread translation

commit afe9cfc33879e35ac82ce48a5562fdf266b69cfc
Author: Translation commit bot 
Date:   Fri Jan 8 01:17:40 2016 +

Update translations for torbutton-abouttbupdatedtd_completed
---
 zh_TW/abouttbupdate.dtd |6 ++
 1 file changed, 6 insertions(+)

diff --git a/zh_TW/abouttbupdate.dtd b/zh_TW/abouttbupdate.dtd
new file mode 100644
index 000..10b1788
--- /dev/null
+++ b/zh_TW/abouttbupdate.dtd
@@ -0,0 +1,6 @@
+
+
+
+
+
+

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [webwml/master] Add new TBB version

2016-01-07 Thread gk

commit cb1272b4d9c05c16558dce154090f33df15bea13
Author: Georg Koppen 
Date:   Thu Jan 7 08:46:33 2016 +

Add new TBB version
---
 include/versions.wmi   |   12 ++--
 projects/torbrowser/RecommendedTBBVersions |4 
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/include/versions.wmi b/include/versions.wmi
index 287c49d..f073126 100644
--- a/include/versions.wmi
+++ b/include/versions.wmi
@@ -18,10 +18,10 @@
 0.2.3.25
 0.2.4.17-rc
 
-5.0.6
+5.0.7
 5.5a5
 
-5.0.6
+5.0.7
 5.5a5
 0.2.4.19
 libevent-2.0.21-stable, zlib-1.2.8, 
openssl-1.0.1e
@@ -31,8 +31,8 @@
 3.2
 1.3.21
 
-5.0.6
-5.0.6
+5.0.7
+5.0.7
 5.5a5
 5.5a5
 0.2.4.19
@@ -40,8 +40,8 @@
 24.2.0esr
 1.5.2
 
-5.0.6
-5.0.6
+5.0.7
+5.0.7
 5.5a5
 0.2.4.19
 24.2.0esr
diff --git a/projects/torbrowser/RecommendedTBBVersions 
b/projects/torbrowser/RecommendedTBBVersions
index b0a53b2..e77f912 100644
--- a/projects/torbrowser/RecommendedTBBVersions
+++ b/projects/torbrowser/RecommendedTBBVersions
@@ -3,6 +3,10 @@
 "5.0.6-Linux",
 "5.0.6-MacOS",
 "5.0.6-Windows",
+"5.0.7",
+"5.0.7-Linux",
+"5.0.7-MacOS",
+"5.0.7-Windows",
 "5.5a5",
 "5.5a5-Linux",
 "5.5a5-MacOS",

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/bridgedb] Update translations for bridgedb

2016-01-07 Thread translation

commit 64ffa09f74785887de5915c7f1e34534b96eafef
Author: Translation commit bot 
Date:   Thu Jan 7 11:15:03 2016 +

Update translations for bridgedb
---
 ko/LC_MESSAGES/bridgedb.po |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/ko/LC_MESSAGES/bridgedb.po b/ko/LC_MESSAGES/bridgedb.po
index c1790f9..4022c54 100644
--- a/ko/LC_MESSAGES/bridgedb.po
+++ b/ko/LC_MESSAGES/bridgedb.po
@@ -19,7 +19,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB=bridgedb-reported,msgid=isis,sysrqb=isis'\n"
 "POT-Creation-Date: 2015-07-25 03:40+\n"
-"PO-Revision-Date: 2016-01-07 01:33+\n"
+"PO-Revision-Date: 2016-01-07 11:06+\n"
 "Last-Translator: sangmin lee \n"
 "Language-Team: Korean 
(http://www.transifex.com/otf/torproject/language/ko/)\n"
 "MIME-Version: 1.0\n"
@@ -89,7 +89,7 @@ msgstr "QR ì½ëë¥¼ ë¶ë¬ ì¤ë ì¤ ì¤ë¥ê° ìê¸´ ê² 
ê°ìµëë¤."
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
-msgstr ""
+msgstr "ì´ QRì½ëë ë¹ì ì ë¸ë¦¿ì§ íì í¬í¨íê³  ììµëë¤. 
ë¸ë¦¿ì§ íì ë¤ë¥¸ ê¸°ê¸°ë¡ ë³µì¬íë ¤ë©´ QRì½ë ë¦¬ëë¡ 
ì¤ìºíì¸ì."
 
 #: bridgedb/https/templates/bridges.html:131
 msgid "There currently aren't any bridges available..."
@@ -130,7 +130,7 @@ msgstr "%s3%së²ì§¸ ë¨ê³ "
 #: bridgedb/https/templates/index.html:38
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
-msgstr "ì´ì  %së ê·¸ ë¸ë¦¿ì§ë¥¼ Tor ë¸ë¼ì°ì  %sì ëí©ëë¤."
+msgstr "ì´ì  %s ê·¸ ë¸ë¦¿ì§ë¥¼ Tor ë¸ë¼ì°ì ì ëí©ëë¤ %s"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
@@ -139,7 +139,7 @@ msgstr "ì´ì  %së ê·¸ ë¸ë¦¿ì§ë¥¼ Tor ë¸ë¼ì°ì  
%sì ëí©ëë¤."
 #: bridgedb/https/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
-msgstr ""
+msgstr "%sê·¸%së¥ ë¸ë¦¿ì§ ì£¼ì¸ì!"
 
 #: bridgedb/https/templates/options.html:51
 msgid "Advanced Options"
@@ -187,7 +187,7 @@ msgstr "ìë ì íì ì´ê³¼íììµëë¤. ìëë¥¼ 
ë®ì¶ì¸ì! ì´ë©
 #: bridgedb/strings.py:50
 msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr ""
+msgstr "COMMANDs: (COMMANDsë¥¼ ìì´ì ì¬ë¬ ìµìì ëìì êµ¬ì²´í 
íì¸ì)"
 
 #. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
 #: bridgedb/strings.py:53
@@ -220,7 +220,7 @@ msgstr "ê³µê° í¤"
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
-msgstr ""
+msgstr "ì´ ì´ë©ì¼ì %së¥¼ ìí´ %sì %sìì\në¬´ì§ê°, ì ëì½ 
ê·¸ë¦¬ê³  ë°ì§ì´ë¡ ìì±ëììµëë¤."
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/torcheck] Update translations for torcheck

2016-01-07 Thread translation

commit d6d1b5f3a5fb15c9aeabcf51910ab588e1a6c228
Author: Translation commit bot 
Date:   Thu Jan 7 11:15:12 2016 +

Update translations for torcheck
---
 ko/torcheck.po |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ko/torcheck.po b/ko/torcheck.po
index f3e1e9d..896254f 100644
--- a/ko/torcheck.po
+++ b/ko/torcheck.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "POT-Creation-Date: 2012-02-16 20:28+PDT\n"
-"PO-Revision-Date: 2016-01-07 01:40+\n"
+"PO-Revision-Date: 2016-01-07 10:49+\n"
 "Last-Translator: sangmin lee \n"
 "Language-Team: Korean 
(http://www.transifex.com/otf/torproject/language/ko/)\n"
 "MIME-Version: 1.0\n"
@@ -65,7 +65,7 @@ msgid "Are you using Tor?"
 msgstr "ì§ê¸ Torë¥¼ ì¬ì©íê³  ê³ì ê°ì?"
 
 msgid "This page is also available in the following languages:"
-msgstr "ì´ íì´ì§ë ë¤ë¥¸ ì¸ì´ë¡ë ë§ëë³´ì¤ ì ììµëë¤."
+msgstr "ì´ íì´ì§ë ë¤ì ì¸ì´ë¡ë ë§ëë³´ì¤ ì ììµëë¤:"
 
 msgid "For more information about this exit relay, see:"
 msgstr "ì¶êµ¬ ì¤ê³ ìë² ëí ì ë³´ë¥¼ ë ì»ê³  ì¶ì¼ì ê°ì?"
@@ -103,7 +103,7 @@ msgid "However, it does not appear to be Tor Browser."
 msgstr "ê·¸ë¬ë Tor ë¸ë¼ì°ì ê° ìë ê² ê°ìµëë¤."
 
 msgid "Run a Relay"
-msgstr "ì¤ì°ìë² ì¤í"
+msgstr "ì¤ê³ìë² ì¤í"
 
 msgid "Stay Anonymous"
 msgstr "ìµëªì¼ë¡"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tails-misc] Update translations for tails-misc

2016-01-07 Thread translation

commit 49c1240f7e8fb19959ab6e7f61899fa319fd4645
Author: Translation commit bot 
Date:   Thu Jan 7 12:45:43 2016 +

Update translations for tails-misc
---
 bg.po |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/bg.po b/bg.po
index 0555ed1..cd5f799 100644
--- a/bg.po
+++ b/bg.po
@@ -11,14 +11,14 @@
 # alexdimitrov , 2013
 # Mal Malakov , 2015
 # Maxi , 2015
-# Tsvetan Nikolov , 2015
+# Tsvetan Nikolov , 2015-2016
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-01-04 11:56+0100\n"
-"PO-Revision-Date: 2016-01-06 09:25+\n"
-"Last-Translator: carolyn \n"
+"PO-Revision-Date: 2016-01-07 12:24+\n"
+"Last-Translator: Tsvetan Nikolov \n"
 "Language-Team: Bulgarian 
(http://www.transifex.com/otf/torproject/language/bg/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -390,7 +390,7 @@ msgstr ""
 
 #: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:79
 msgid "Learn more"
-msgstr ""
+msgstr "ÐÐ°ÑÑÐµÑÐµ Ð¿Ð¾Ð²ÐµÑÐµ"
 
 #: config/chroot_local-includes/usr/local/bin/tor-browser:29
 msgid "Tor is not ready"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/whisperback] Update translations for whisperback

2016-01-07 Thread translation

commit 4477267cefbb84298e1aeead1ebab6abb954121d
Author: Translation commit bot 
Date:   Fri Jan 8 03:15:10 2016 +

Update translations for whisperback
---
 zh_TW/zh_TW.po |   49 -
 1 file changed, 24 insertions(+), 25 deletions(-)

diff --git a/zh_TW/zh_TW.po b/zh_TW/zh_TW.po
index 3939246..94a6565 100644
--- a/zh_TW/zh_TW.po
+++ b/zh_TW/zh_TW.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-03-17 17:40+0100\n"
-"PO-Revision-Date: 2015-11-12 00:28+\n"
+"POT-Creation-Date: 2015-12-16 19:54+0100\n"
+"PO-Revision-Date: 2016-01-08 02:58+\n"
 "Last-Translator: danfong \n"
 "Language-Team: Chinese (Taiwan) 
(http://www.transifex.com/otf/torproject/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
@@ -20,17 +20,17 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. XXX use a better exception
-#: ../whisperBack/whisperback.py:63
+#: ../whisperBack/whisperback.py:56
 #, python-format
 msgid "Invalid contact email: %s"
 msgstr "ä¸æ£ç¢ºçè¯çµ¡ä¿¡ç®±: %s"
 
-#: ../whisperBack/whisperback.py:80
+#: ../whisperBack/whisperback.py:73
 #, python-format
 msgid "Invalid contact OpenPGP key: %s"
 msgstr "ä¸æ£ç¢ºçé£ç¥ OpenPGP éé°: %s"
 
-#: ../whisperBack/whisperback.py:82
+#: ../whisperBack/whisperback.py:75
 msgid "Invalid contact OpenPGP public key block"
 msgstr "ä¸æ£ç¢ºçè¯çµ¡ OpenPGP å¬ééé°å¡"
 
@@ -41,40 +41,40 @@ msgid ""
 "/etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py"
 msgstr "%s è®æ¸ç¡æ³å¨ä»¥ä¸ä»»ä½è¨å®æªä¸è¢«æ¾å° 
/etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py"
 
-#: ../whisperBack/gui.py:154
+#: ../whisperBack/gui.py:148
 msgid "Unable to load a valid configuration."
 msgstr "ç¡æ³è¼å¥ææçè¨å®ã"
 
-#: ../whisperBack/gui.py:220
+#: ../whisperBack/gui.py:214
 msgid "Sending mail..."
 msgstr "æ£å¨å³ééµä»¶..."
 
-#: ../whisperBack/gui.py:221
+#: ../whisperBack/gui.py:215
 msgid "Sending mail"
 msgstr "æ£å¨å³ééµä»¶"
 
 #. pylint: disable=C0301
-#: ../whisperBack/gui.py:223
+#: ../whisperBack/gui.py:217
 msgid "This could take a while..."
 msgstr "éå¯è½éè¦ä¸æ®µæé..."
 
-#: ../whisperBack/gui.py:237
+#: ../whisperBack/gui.py:232
 msgid "The contact email adress doesn't seem valid."
 msgstr "è¯çµ¡é»åéµä»¶ä½åä¼¼ä¹ä¸æ£ç¢ºã"
 
-#: ../whisperBack/gui.py:254
+#: ../whisperBack/gui.py:249
 msgid "Unable to send the mail: SMTP error."
 msgstr "ç¡æ³å³ééµä»¶: SMTP é¯èª¤ã"
 
-#: ../whisperBack/gui.py:256
+#: ../whisperBack/gui.py:251
 msgid "Unable to connect to the server."
 msgstr "ç¡æ³é£ç·å°ä¼ºæå¨ã"
 
-#: ../whisperBack/gui.py:258
+#: ../whisperBack/gui.py:253
 msgid "Unable to create or to send the mail."
 msgstr "ç¡æ³å»ºç«æå³ééµä»¶ã"
 
-#: ../whisperBack/gui.py:261
+#: ../whisperBack/gui.py:256
 msgid ""
 "\n"
 "\n"
@@ -83,21 +83,20 @@ msgid ""
 "If it does not work, you will be offered to save the bug report."
 msgstr "\n\nç¡æ³å³éé¯èª¤å 
±åï¼ä¼¼ä¹æ¯ç¶²è·¯åé¡ãè«è©¦èéæ°é£ç·å°ç¶²è·¯ä¸¦åæ¬¡æä¸ä¸ãå³éãæéã\n\nå¦æéæ¯ä¸è¡ï¼æ¨éè¦å²åé¯èª¤å
 ±åã"
 
-#: ../whisperBack/gui.py:274
+#: ../whisperBack/gui.py:269
 msgid "Your message has been sent."
 msgstr "æ¨çè¨æ¯å·²è¢«å³éã"
 
-#: ../whisperBack/gui.py:281
+#: ../whisperBack/gui.py:276
 msgid "An error occured during encryption."
 msgstr "å å¯æéç¼çé¯èª¤ã"
 
-#: ../whisperBack/gui.py:301
+#: ../whisperBack/gui.py:296
 #, python-format
 msgid "Unable to save %s."
 msgstr "ç¡æ³å²å %sã"
 
-#. XXX: fix string
-#: ../whisperBack/gui.py:325
+#: ../whisperBack/gui.py:319
 #, python-format
 msgid ""
 "The bug report could not be sent, likely due to network problems.\n"
@@ -107,27 +106,27 @@ msgid ""
 "Do you want to save the bug report to a file?"
 msgstr "é¯èª¤å 
±åç¡æ³è¢«å³éï¼ä¼¼ä¹æ¯ç¶²è·¯åé¡ã\n\nè®éè¾¦æ³çºæ¨å¯ä»¥å°é¯èª¤å
 ±åå²åå¨ USB é¨èº«ç¢çæªæ¡ä¸ï¼ä¸¦åè©¦ä½¿ç¨å
¶ä»ç³»çµ±å¾æ¨çé»åéµä»¶å¸³èå°å®å¯çµ¦æå %s 
ãè«æ³¨æéæ¨£ä¸ä¾æ¨çé¯èª¤å 
±åå°ä¸æè¢«å¿åé¤éæ¨èªå·±æ¡åé²ä¸æ¥çè¡å (ä¾å¦:ä½¿ç¨ 
Tor ç¨å®å³ä¸çé»åéµä»¶å¸³è)ã\n\næ¨æ³å°é¯èª¤å 
±åå²åææªæ¡å?"
 
-#: ../whisperBack/gui.py:389 ../data/whisperback.ui.h:21
+#: ../whisperBack/gui.py:379 ../data/whisperback.ui.h:21
 msgid "WhisperBack"
 msgstr "WhisperBack"
 
-#: ../whisperBack/gui.py:390 ../data/whisperback.ui.h:2
+#: ../whisperBack/gui.py:380 ../data/whisperback.ui.h:2
 msgid "Send feedback in an encrypted mail."
 msgstr "ä½¿ç¨å å¯éçéµä»¶ä¾å³éæè¦åæã"
 
-#: ../whisperBack/gui.py:393
+#: ../whisperBack/gui.py:383
 msgid "Copyright Â© 2009-2012 Tails developpers (ta...@boum.org)"
 msgstr "Copyright Â© 2009-2012 Tails éç¼äººå¡ (ta...@boum.org)"
 
-#:

[tor-commits] [translation/whisperback_completed] Update translations for whisperback_completed

2016-01-07 Thread translation

commit b2c10e992c1563713a3cd6e8cc2403d3ce8347e8
Author: Translation commit bot 
Date:   Fri Jan 8 03:15:15 2016 +

Update translations for whisperback_completed
---
 zh_TW/zh_TW.po |   49 -
 1 file changed, 24 insertions(+), 25 deletions(-)

diff --git a/zh_TW/zh_TW.po b/zh_TW/zh_TW.po
index 3939246..94a6565 100644
--- a/zh_TW/zh_TW.po
+++ b/zh_TW/zh_TW.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-03-17 17:40+0100\n"
-"PO-Revision-Date: 2015-11-12 00:28+\n"
+"POT-Creation-Date: 2015-12-16 19:54+0100\n"
+"PO-Revision-Date: 2016-01-08 02:58+\n"
 "Last-Translator: danfong \n"
 "Language-Team: Chinese (Taiwan) 
(http://www.transifex.com/otf/torproject/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
@@ -20,17 +20,17 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. XXX use a better exception
-#: ../whisperBack/whisperback.py:63
+#: ../whisperBack/whisperback.py:56
 #, python-format
 msgid "Invalid contact email: %s"
 msgstr "ä¸æ£ç¢ºçè¯çµ¡ä¿¡ç®±: %s"
 
-#: ../whisperBack/whisperback.py:80
+#: ../whisperBack/whisperback.py:73
 #, python-format
 msgid "Invalid contact OpenPGP key: %s"
 msgstr "ä¸æ£ç¢ºçé£ç¥ OpenPGP éé°: %s"
 
-#: ../whisperBack/whisperback.py:82
+#: ../whisperBack/whisperback.py:75
 msgid "Invalid contact OpenPGP public key block"
 msgstr "ä¸æ£ç¢ºçè¯çµ¡ OpenPGP å¬ééé°å¡"
 
@@ -41,40 +41,40 @@ msgid ""
 "/etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py"
 msgstr "%s è®æ¸ç¡æ³å¨ä»¥ä¸ä»»ä½è¨å®æªä¸è¢«æ¾å° 
/etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py"
 
-#: ../whisperBack/gui.py:154
+#: ../whisperBack/gui.py:148
 msgid "Unable to load a valid configuration."
 msgstr "ç¡æ³è¼å¥ææçè¨å®ã"
 
-#: ../whisperBack/gui.py:220
+#: ../whisperBack/gui.py:214
 msgid "Sending mail..."
 msgstr "æ£å¨å³ééµä»¶..."
 
-#: ../whisperBack/gui.py:221
+#: ../whisperBack/gui.py:215
 msgid "Sending mail"
 msgstr "æ£å¨å³ééµä»¶"
 
 #. pylint: disable=C0301
-#: ../whisperBack/gui.py:223
+#: ../whisperBack/gui.py:217
 msgid "This could take a while..."
 msgstr "éå¯è½éè¦ä¸æ®µæé..."
 
-#: ../whisperBack/gui.py:237
+#: ../whisperBack/gui.py:232
 msgid "The contact email adress doesn't seem valid."
 msgstr "è¯çµ¡é»åéµä»¶ä½åä¼¼ä¹ä¸æ£ç¢ºã"
 
-#: ../whisperBack/gui.py:254
+#: ../whisperBack/gui.py:249
 msgid "Unable to send the mail: SMTP error."
 msgstr "ç¡æ³å³ééµä»¶: SMTP é¯èª¤ã"
 
-#: ../whisperBack/gui.py:256
+#: ../whisperBack/gui.py:251
 msgid "Unable to connect to the server."
 msgstr "ç¡æ³é£ç·å°ä¼ºæå¨ã"
 
-#: ../whisperBack/gui.py:258
+#: ../whisperBack/gui.py:253
 msgid "Unable to create or to send the mail."
 msgstr "ç¡æ³å»ºç«æå³ééµä»¶ã"
 
-#: ../whisperBack/gui.py:261
+#: ../whisperBack/gui.py:256
 msgid ""
 "\n"
 "\n"
@@ -83,21 +83,20 @@ msgid ""
 "If it does not work, you will be offered to save the bug report."
 msgstr "\n\nç¡æ³å³éé¯èª¤å 
±åï¼ä¼¼ä¹æ¯ç¶²è·¯åé¡ãè«è©¦èéæ°é£ç·å°ç¶²è·¯ä¸¦åæ¬¡æä¸ä¸ãå³éãæéã\n\nå¦æéæ¯ä¸è¡ï¼æ¨éè¦å²åé¯èª¤å
 ±åã"
 
-#: ../whisperBack/gui.py:274
+#: ../whisperBack/gui.py:269
 msgid "Your message has been sent."
 msgstr "æ¨çè¨æ¯å·²è¢«å³éã"
 
-#: ../whisperBack/gui.py:281
+#: ../whisperBack/gui.py:276
 msgid "An error occured during encryption."
 msgstr "å å¯æéç¼çé¯èª¤ã"
 
-#: ../whisperBack/gui.py:301
+#: ../whisperBack/gui.py:296
 #, python-format
 msgid "Unable to save %s."
 msgstr "ç¡æ³å²å %sã"
 
-#. XXX: fix string
-#: ../whisperBack/gui.py:325
+#: ../whisperBack/gui.py:319
 #, python-format
 msgid ""
 "The bug report could not be sent, likely due to network problems.\n"
@@ -107,27 +106,27 @@ msgid ""
 "Do you want to save the bug report to a file?"
 msgstr "é¯èª¤å 
±åç¡æ³è¢«å³éï¼ä¼¼ä¹æ¯ç¶²è·¯åé¡ã\n\nè®éè¾¦æ³çºæ¨å¯ä»¥å°é¯èª¤å
 ±åå²åå¨ USB é¨èº«ç¢çæªæ¡ä¸ï¼ä¸¦åè©¦ä½¿ç¨å
¶ä»ç³»çµ±å¾æ¨çé»åéµä»¶å¸³èå°å®å¯çµ¦æå %s 
ãè«æ³¨æéæ¨£ä¸ä¾æ¨çé¯èª¤å 
±åå°ä¸æè¢«å¿åé¤éæ¨èªå·±æ¡åé²ä¸æ¥çè¡å (ä¾å¦:ä½¿ç¨ 
Tor ç¨å®å³ä¸çé»åéµä»¶å¸³è)ã\n\næ¨æ³å°é¯èª¤å 
±åå²åææªæ¡å?"
 
-#: ../whisperBack/gui.py:389 ../data/whisperback.ui.h:21
+#: ../whisperBack/gui.py:379 ../data/whisperback.ui.h:21
 msgid "WhisperBack"
 msgstr "WhisperBack"
 
-#: ../whisperBack/gui.py:390 ../data/whisperback.ui.h:2
+#: ../whisperBack/gui.py:380 ../data/whisperback.ui.h:2
 msgid "Send feedback in an encrypted mail."
 msgstr "ä½¿ç¨å å¯éçéµä»¶ä¾å³éæè¦åæã"
 
-#: ../whisperBack/gui.py:393
+#: ../whisperBack/gui.py:383
 msgid "Copyright Â© 2009-2012 Tails developpers (ta...@boum.org)"
 msgstr "Copyright Â© 2009-2012 Tails éç¼äººå¡ (ta...@boum.org)"
 
-#:

[tor-commits] [translation/tor-messenger-accountsproperties] Update translations for tor-messenger-accountsproperties

2016-01-07 Thread translation

commit 4a9b41e77d0120bd78268dc5518129374c4b50ff
Author: Translation commit bot 
Date:   Fri Jan 8 03:16:20 2016 +

Update translations for tor-messenger-accountsproperties
---
 zh_TW/accounts.properties |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/zh_TW/accounts.properties b/zh_TW/accounts.properties
index 051ba0d..3a1e157 100644
--- a/zh_TW/accounts.properties
+++ b/zh_TW/accounts.properties
@@ -4,6 +4,6 @@
 
 # LOCALIZATION NOTE (passwordPromptTitle, passwordPromptText):
 # %S is replaced with the name of the account
-passwordPromptTitle=Password for %S
-passwordPromptText=Please enter your password for %S in order to connect it.
-passwordPromptSaveCheckbox=Use Password Manager to remember this password.
+passwordPromptTitle=%S çå¯ç¢¼
+passwordPromptText=è«è¼¸å¥ %S çå¯ç¢¼ä»¥ååé£ç·ã
+passwordPromptSaveCheckbox=è®å¯ç¢¼ç®¡çå¡è¨ä½æ¤å¯ç¢¼ã

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tails-misc] Update translations for tails-misc

2016-01-07 Thread translation

commit ad845141050a7c61e942a4c8ca7f36c77281153b
Author: Translation commit bot 
Date:   Fri Jan 8 03:15:49 2016 +

Update translations for tails-misc
---
 zh_TW.po |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zh_TW.po b/zh_TW.po
index 729473e..04b3a02 100644
--- a/zh_TW.po
+++ b/zh_TW.po
@@ -17,7 +17,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-01-04 11:56+0100\n"
-"PO-Revision-Date: 2016-01-06 09:25+\n"
+"PO-Revision-Date: 2016-01-08 02:58+\n"
 "Last-Translator: carolyn \n"
 "Language-Team: Chinese (Taiwan) 
(http://www.transifex.com/otf/torproject/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tor-messenger-authproperties] Update translations for tor-messenger-authproperties

2016-01-07 Thread translation

commit 1fe5975e501d98c0ef5d164dfc0a73ecf48fb067
Author: Translation commit bot 
Date:   Fri Jan 8 03:16:39 2016 +

Update translations for tor-messenger-authproperties
---
 zh_TW/auth.properties |   18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/zh_TW/auth.properties b/zh_TW/auth.properties
index f2a1878..bdabd91 100644
--- a/zh_TW/auth.properties
+++ b/zh_TW/auth.properties
@@ -1,12 +1,12 @@
-auth.title=Verify %S's identity
-auth.yourFingerprint=Fingerprint for you, %S:\n%S
-auth.theirFingerprint=Purported fingerprint for %S:\n%S
-auth.help=Verifying a contact's identity helps ensure that the person you are 
talking to is who they claim to be.
-auth.helpTitle=Verification help
-auth.question=This is the question asked by your contact:\n\n%S\n\nEnter 
secret answer here (case sensitive):
-auth.secret=Enter secret here:
-auth.error=An error occurred while verifying your contact's identity.
-auth.success=Verifying your contact's identity completed successfully.
+auth.title=é©è %S çèº«ä»½
+auth.yourFingerprint=æ¨çç¹å¾µå¼ï¼%S : %s
+auth.theirFingerprint=%S ææä¾çç¹å¾µå¼ï¼ %S
+auth.help=é©èé£çµ¡äººçèº«ä»½å¯ä»¥è®æ¨ç¢ºå®å°æ¹èº«ä»½ççå¯¦æ§ã
+auth.helpTitle=é©èèªªæ
+auth.question=ä»¥ä¸æ¯å°æ¹å°æ¨æåºçåé¡ï¼\n\n$S\n\nè«å¨æ¤è¼¸å
¥è©²åé¡ççæ¡ (å¤§å°å¯«è¦çºä¸å)ï¼
+auth.secret=è«å¨æ¤è¼¸å¥ç§å¯ï¼
+auth.error=å°æ¹èº«ä»½çé©èç¼çé¯èª¤ã
+auth.success=å°æ¹çèº«ä»½é©èæåã
 auth.successThem=Your contact has successfully verified your identity. You may 
want to verify their identity as well by asking your own question.
 auth.fail=Failed to verify your contact's identity.
 auth.done=å®æ

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tor-messenger-accountsproperties_completed] Update translations for tor-messenger-accountsproperties_completed

2016-01-07 Thread translation

commit d7fa0ecf29cb557ce9f0abf98934df5f50ae2dde
Author: Translation commit bot 
Date:   Fri Jan 8 03:16:24 2016 +

Update translations for tor-messenger-accountsproperties_completed
---
 zh_TW/accounts.properties |9 +
 1 file changed, 9 insertions(+)

diff --git a/zh_TW/accounts.properties b/zh_TW/accounts.properties
new file mode 100644
index 000..3a1e157
--- /dev/null
+++ b/zh_TW/accounts.properties
@@ -0,0 +1,9 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# LOCALIZATION NOTE (passwordPromptTitle, passwordPromptText):
+# %S is replaced with the name of the account
+passwordPromptTitle=%S çå¯ç¢¼
+passwordPromptText=è«è¼¸å¥ %S çå¯ç¢¼ä»¥ååé£ç·ã
+passwordPromptSaveCheckbox=è®å¯ç¢¼ç®¡çå¡è¨ä½æ¤å¯ç¢¼ã

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tor-messenger-authdtd_completed] Update translations for tor-messenger-authdtd_completed

2016-01-07 Thread translation

commit 5fc249711ba2fcd7f5cf9965e3448ca488e2b4cb
Author: Translation commit bot 
Date:   Fri Jan 8 03:16:34 2016 +

Update translations for tor-messenger-authdtd_completed
---
 zh_TW/auth.dtd |   21 +
 1 file changed, 21 insertions(+)

diff --git a/zh_TW/auth.dtd b/zh_TW/auth.dtd
new file mode 100644
index 000..6deac85
--- /dev/null
+++ b/zh_TW/auth.dtd
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tor-messenger-imtooltipproperties_completed] Update translations for tor-messenger-imtooltipproperties_completed

2016-01-07 Thread translation

commit aaa7a6467eb73b3e09a9bdde1b0a32c781131ca6
Author: Translation commit bot 
Date:   Fri Jan 8 03:47:21 2016 +

Update translations for tor-messenger-imtooltipproperties_completed
---
 zh_TW/imtooltip.properties |7 +++
 1 file changed, 7 insertions(+)

diff --git a/zh_TW/imtooltip.properties b/zh_TW/imtooltip.properties
new file mode 100644
index 000..613a0cd
--- /dev/null
+++ b/zh_TW/imtooltip.properties
@@ -0,0 +1,7 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+buddy.username=ä½¿ç¨èåç¨±
+buddy.account=å¸³è
+contact.tags=æ¨ç±¤

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tor-messenger-facebookproperties] Update translations for tor-messenger-facebookproperties

2016-01-07 Thread translation

commit 0800bdd750bee371f425d163999ec13d30ed7120
Author: Translation commit bot 
Date:   Fri Jan 8 03:47:01 2016 +

Update translations for tor-messenger-facebookproperties
---
 zh_TW/facebook.properties |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/zh_TW/facebook.properties b/zh_TW/facebook.properties
index aaf7cdc..3297ea5 100644
--- a/zh_TW/facebook.properties
+++ b/zh_TW/facebook.properties
@@ -2,6 +2,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-connection.error.useUsernameNotEmailAddress=Please use your Facebook username, 
not an email address
+connection.error.useUsernameNotEmailAddress=è«è¼¸å¥æ¨çèæ¸ä½¿ç¨è
åç¨±ï¼ä¸æ¯é»åéµä»¶ä½å
 
-facebook.chat.name=Facebook Chat
+facebook.chat.name=èæ¸èå¤©

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tor-messenger-conversationsproperties] Update translations for tor-messenger-conversationsproperties

2016-01-07 Thread translation

commit d50b40d1a371245d3b826bb1bc2d0bd71db94845
Author: Translation commit bot 
Date:   Fri Jan 8 03:46:52 2016 +

Update translations for tor-messenger-conversationsproperties
---
 zh_TW/conversations.properties |   36 ++--
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/zh_TW/conversations.properties b/zh_TW/conversations.properties
index 1a5564a..2b536eb 100644
--- a/zh_TW/conversations.properties
+++ b/zh_TW/conversations.properties
@@ -5,67 +5,67 @@
 # LOCALIZATION NOTE (targetChanged):
 #  %1$S is the new conversation title (display name of the new target),
 #  %2$S is the protocol name used for the new target.
-targetChanged=The conversation will continue with %1$S, using %2$S.
+targetChanged=å°ä½¿ç¨ %2$S ç¹¼çºè %1$S äº¤è«ã
 
 # LOCALIZATION NOTE (statusChanged):
 #  %1$S is the display name of the contact.
 #  %2$S is the new status type (a value from status.properties).
-statusChanged=%1$S is now %2$S.
+statusChanged=%1$S ç¾å¨æ¯ %2$S.
 # LOCALIZATION NOTE (statusChangedWithStatusText):
 #  %1$S is the display name of the contact.
 #  %2$S is the new status type (a value from status.properties).
 #  %3$S is the status text (eg. "I'm currently away from the computer").
-statusChangedWithStatusText=%1$S is now %2$S: %3$S.
+statusChangedWithStatusText=%1$S ç¾å¨æ¯ %2$S: %3$S.
 # LOCALIZATION NOTE (statusChangedFromUnknown[WithStatusText]):
 #  special case of the previous 2 strings for when the status was
 #  previously unknown. These 2 strings should not mislead the user
 #  into thinking the person's status has just changed.
-statusChangedFromUnknown=%1$S is %2$S.
-statusChangedFromUnknownWithStatusText=%1$S is %2$S: %3$S.
+statusChangedFromUnknown=%1$S å°±æ¯ %2$S.
+statusChangedFromUnknownWithStatusText=%1$S å°±æ¯ %2$S: %3$S.
 # LOCALIZATION NOTE (statusKnown[WithStatusText]):
 # special case of the previous 2 strings for when an account has just
 # been reconnected, so the status is now known. These 2 strings should not
 # mislead the user into thinking the person's status has just changed.
-statusKnown=Your account has been reconnected (%1$S is %2$S).
-statusKnownWithStatusText=Your account has been reconnected (%1$S is %2$S: 
%3$S).
+statusKnown=æ¨çå¸³èå·²ç¶éæ°é£ä¸ç· ((%1$S å°±æ¯ %2$S)ã
+statusKnownWithStatusText=æ¨çå¸³èå·²ç¶éæ°é£ä¸ç· (%1$S å°±æ¯ %2$S: 
%3$S)ã
 # LOCALIZATION NOTE (statusUnknown):
 #  %S is the display name of the contact.
-statusUnknown=Your account is disconnected (the status of %S is no longer 
known).
+statusUnknown=æ¨çå¸³èå·²ç¶æ·ç· (%S ççæç®åæªç¥)ã
 
-accountDisconnected=Your account is disconnected.
-accountReconnected=Your account has been reconnected.
+accountDisconnected=æ¨çå¸³èå·²ç¶æ·ç·ã
+accountReconnected=æ¨çå¸³èå·²ç¶éæ°é£ä¸ç·ã
 
 # LOCALIZATION NOTE (autoReply):
 #  %S is replaced by the text of a message that was sent as an automatic reply.
-autoReply=Auto-reply - %S
+autoReply=èªååè¦ - %S
 
 # LOCALIZATION NOTE (noTopic):
 # Displayed instead of the topic when no topic is set.
-noTopic=No topic message for this room.
+noTopic=æ¤èå¤©å®¤æ²æè¨è«ä¸»é¡ã
 
 # LOCALIZATION NOTE (topicSet):
 #  %1$S is the conversation name, %2$S is the topic.
-topicSet=The topic for %1$S is: %2$S.
+topicSet=%1$S çè¨è«ä¸»é¡æ¯ï¼ %2$S
 # LOCALIZATION NOTE (topicNotSet):
 #  %S is the conversation name.
-topicNotSet=There is no topic for %S.
+topicNotSet=%S æ²æä¸»é¡ã
 # LOCALIZATION NOTE (topicChanged):
 #  %1$S is the user who changed the topic, %2$S is the new topic.
-topicChanged=%1$S has changed the topic to: %2$S.
+topicChanged=%1$S ä»¥å°ä¸»é¡æ´æ¹çºï¼%2$S
 # LOCALIZATION NOTE (topicCleared):
 #  %1$S is the user who cleared the topic.
-topicCleared=%1$S has cleared the topic.
+topicCleared=%1$S å·²ç¶æ¸é¤ä¸»é¡ã
 
 # LOCALIZATION NOTE (nickSet):
 #   This is displayed as a system message when a participant changes his/her
 #   nickname in a conversation.
 #   %1$S is the old nick.
 #   %2$S is the new nick.
-nickSet=%1$S is now known as %2$S.
+nickSet=%1$S ç¾å¨æ¹åçº %2$S.
 # LOCALIZATION NOTE (nickSet.you):
 #   This is displayed as a system message when your nickname is changed.
 #   %S is your new nick.
-nickSet.you=You are now known as %S.
+nickSet.you=æ¨ç¾å¨çåç¨±æ¯ %Sã
 
 # LOCALIZATION NOTE (messenger.conversations.selections.ellipsis):
 #  ellipsis is used when copying a part of a message to show that the message 
was cut

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tor-messenger-fingerdtd] Update translations for tor-messenger-fingerdtd

2016-01-07 Thread translation

commit f26e2aaff1036b08d4be705e1420368e5953b314
Author: Translation commit bot 
Date:   Fri Jan 8 03:47:11 2016 +

Update translations for tor-messenger-fingerdtd
---
 zh_TW/finger.dtd |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zh_TW/finger.dtd b/zh_TW/finger.dtd
index 3ea42c6..c1cec49 100644
--- a/zh_TW/finger.dtd
+++ b/zh_TW/finger.dtd
@@ -3,7 +3,7 @@
 
 
 
-
+
 
 
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tails-greeter] Update translations for tails-greeter

2016-01-07 Thread translation

commit c13ad0d587c9212766ea204538827a58f567b14e
Author: Translation commit bot 
Date:   Fri Jan 8 02:15:26 2016 +

Update translations for tails-greeter
---
 zh_TW/zh_TW.po |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zh_TW/zh_TW.po b/zh_TW/zh_TW.po
index f1b14ff..b45d69e 100644
--- a/zh_TW/zh_TW.po
+++ b/zh_TW/zh_TW.po
@@ -14,7 +14,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-22 13:38+\n"
+"PO-Revision-Date: 2016-01-08 02:15+\n"
 "Last-Translator: Wen-Gan Li \n"
 "Language-Team: Chinese (Taiwan) 
(http://www.transifex.com/otf/torproject/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tails-greeter_completed] Update translations for tails-greeter_completed

2016-01-07 Thread translation

commit ebda168fd00d0a5621e3de14db7e5eef07fa1c72
Author: Translation commit bot 
Date:   Fri Jan 8 02:15:33 2016 +

Update translations for tails-greeter_completed
---
 zh_TW/zh_TW.po |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zh_TW/zh_TW.po b/zh_TW/zh_TW.po
index f1b14ff..b45d69e 100644
--- a/zh_TW/zh_TW.po
+++ b/zh_TW/zh_TW.po
@@ -14,7 +14,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-22 13:38+\n"
+"PO-Revision-Date: 2016-01-08 02:15+\n"
 "Last-Translator: Wen-Gan Li \n"
 "Language-Team: Chinese (Taiwan) 
(http://www.transifex.com/otf/torproject/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/torbutton-abouttorproperties] Update translations for torbutton-abouttorproperties

2016-01-07 Thread translation

commit 5f1520d0ae8dd24ffb9ace23a1e6c0bdaa749e5e
Author: Translation commit bot 
Date:   Fri Jan 8 02:46:12 2016 +

Update translations for torbutton-abouttorproperties
---
 zh_TW/abouttor.properties |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/zh_TW/abouttor.properties b/zh_TW/abouttor.properties
index 1e6d825..e545adc 100644
--- a/zh_TW/abouttor.properties
+++ b/zh_TW/abouttor.properties
@@ -29,5 +29,5 @@ 
aboutTor.donationBanner.cd.quote=é±ç§åå¿åæ§å°æåæ¯åäººé½å¾é
 aboutTor.donationBanner.cd.speciality= Novelist, technology activist, 
co-editor of Boing Boing
 
 aboutTor.donationBanner.rd.who=â Roger Dingledine
-aboutTor.donationBanner.rd.quote=Please help the strongest privacy tool in the 
world become more sustainable!
-aboutTor.donationBanner.rd.speciality=Founder, Acting Executive Director of 
the Tor Project
+aboutTor.donationBanner.rd.quote=è«å¹«å©ä¸çä¸æå¼·æçé±ç§ä¿è·è»é«ç¹¼çºæé·èå£¯ï¼
+aboutTor.donationBanner.rd.speciality=æ´è¥è·¯ç±è¨ç«çåµç«è
èå·è¡é·

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tor-launcher-network-settings_completed] Update translations for tor-launcher-network-settings_completed

2016-01-07 Thread translation

commit 58dc326976fe331cb6bd5b0eb5c75f224f3a0b76
Author: Translation commit bot 
Date:   Fri Jan 8 02:45:43 2016 +

Update translations for tor-launcher-network-settings_completed
---
 zh_TW/network-settings.dtd |   28 ++--
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/zh_TW/network-settings.dtd b/zh_TW/network-settings.dtd
index 424bc39..40d1a29 100644
--- a/zh_TW/network-settings.dtd
+++ b/zh_TW/network-settings.dtd
@@ -47,22 +47,22 @@
 
 
 
-
-
-
-
-
-
-
+
+
+
+
+
+
+
 
-
-
-
-
+
+
+
+
 
 https://bridges.torproject.org;>
 
-
-https://www.riseup.net, 
https://mail.google.com, æè https://mail.yahoo.com;>
+
+https://www.riseup.net, 
https://mail.google.com æè https://mail.yahoo.com;>
 
-
+

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings

2016-01-07 Thread translation

commit 994ac69a82398dd9010497b526ee55f43ef5c637
Author: Translation commit bot 
Date:   Fri Jan 8 02:45:39 2016 +

Update translations for tor-launcher-network-settings
---
 zh_TW/network-settings.dtd |   28 ++--
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/zh_TW/network-settings.dtd b/zh_TW/network-settings.dtd
index 424bc39..40d1a29 100644
--- a/zh_TW/network-settings.dtd
+++ b/zh_TW/network-settings.dtd
@@ -47,22 +47,22 @@
 
 
 
-
-
-
-
-
-
-
+
+
+
+
+
+
+
 
-
-
-
-
+
+
+
+
 
 https://bridges.torproject.org;>
 
-
-https://www.riseup.net, 
https://mail.google.com, æè https://mail.yahoo.com;>
+
+https://www.riseup.net, 
https://mail.google.com æè https://mail.yahoo.com;>
 
-
+

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/bridgedb] Update translations for bridgedb

2016-01-07 Thread translation

commit be74b3e6beebd3b4f4e9a8a628bccb915a35d8c4
Author: Translation commit bot 
Date:   Fri Jan 8 03:45:03 2016 +

Update translations for bridgedb
---
 zh_TW/LC_MESSAGES/bridgedb.po |  350 +
 1 file changed, 176 insertions(+), 174 deletions(-)

diff --git a/zh_TW/LC_MESSAGES/bridgedb.po b/zh_TW/LC_MESSAGES/bridgedb.po
index 7603f05..7acc4d6 100644
--- a/zh_TW/LC_MESSAGES/bridgedb.po
+++ b/zh_TW/LC_MESSAGES/bridgedb.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the BridgeDB project.
 # 
 # Translators:
+# AgustÃn Wu , 2016
 # danfong , 2014
 # LNDDYL, 2014
 # Werkt , 2015
@@ -10,14 +11,15 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB=bridgedb-reported,msgid=isis,sysrqb=isis'POT-Creation-Date:
 2015-03-19 22:13+\n"
-"PO-Revision-Date: 2015-09-14 08:08+\n"
-"Last-Translator: Werkt \n"
+"Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB=bridgedb-reported,msgid=isis,sysrqb=isis'\n"
+"POT-Creation-Date: 2015-07-25 03:40+\n"
+"PO-Revision-Date: 2016-01-08 03:44+\n"
+"Last-Translator: AgustÃn Wu \n"
 "Language-Team: Chinese (Taiwan) 
(http://www.transifex.com/otf/torproject/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
+"Generated-By: Babel 1.3\n"
 "Language: zh_TW\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
@@ -32,57 +34,182 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
 msgid "Sorry! Something went wrong with your request."
-msgstr "æ±æ!æ¨çè«æ±ç¼çé¯èª¤ã"
+msgstr "æ±æï¼æ¨çè«æ±ç¼çé¯èª¤ã"
 
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr "åå ±é¯èª¤"
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr "åå§ç¨å¼ç¢¼"
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr "è®æ´è¨é"
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr "è¯çµ¡è³è¨"
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "é¸æå¨é¨"
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "åºç¤º QRCode"
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "æ¨çæ©æ¥ç QRCode"
+
+#. 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!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr "æåé¡!"
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr "ææ QRCode æä¼¼ä¹ç¼çé¯èª¤"
+
+#: bridgedb/https/templates/bridges.html:73
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr "éå QRCode 
éææ¨çæ©æ¥è³è¨ãå¨è¡åè£ç½®ä¸ææä»¥ç²å¾æ¨çæ©æ¥è³è¨"
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr "ç®åæ²æä»»ä½æ©å¨æ¥å¯ç¨."
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr " ä¹è¨±æ¨æåè©¦ %s åå° %sï¼ç¶å¾é¸æä¸åçæ©æ¥é¡å!"
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "æ¥é© %s1%s"
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "ä¸è¼ %s æ´è¥è·¯ç±çè¦½å¨ %s"
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "æ¥é© %s2%s"
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "åå¾ %s æ©æ¥ %s"
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "æ¥é© %s3%s"
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "ç¾å¨ %s å°æ©æ¥å å¥å° Tor çè¦½å¨ %s"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"

[tor-commits] [translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties

2016-01-07 Thread translation

commit aa9cd7f122d9185036386bc57d5a27f05156ac2a
Author: Translation commit bot 
Date:   Fri Jan 8 02:16:12 2016 +

Update translations for torbutton-torbuttonproperties
---
 zh_TW/torbutton.properties |   28 ++--
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/zh_TW/torbutton.properties b/zh_TW/torbutton.properties
index 1ce047f..ca3aa76 100644
--- a/zh_TW/torbutton.properties
+++ b/zh_TW/torbutton.properties
@@ -1,13 +1,13 @@
 torbutton.button.tooltip.disabled = åç¨æ´è¥è·¯ç±
 torbutton.button.tooltip.enabled = åç¨æ´è¥è·¯ç±
 torbutton.circuit_display.internet = ç¶²éç¶²è·¯
-torbutton.circuit_display.ip_unknown = æªç¥IP
+torbutton.circuit_display.ip_unknown = æªç¥ç IP
 torbutton.circuit_display.onion_site = æ´è¥ç¶²ç«
 torbutton.circuit_display.this_browser = æ¤çè¦½å¨
-torbutton.circuit_display.relay = ä¸ç¹¼ç«
+torbutton.circuit_display.relay = ä¸ç¹¼ç«å°
 torbutton.circuit_display.tor_bridge = æ©æ¥å¨
-torbutton.circuit_display.unknown_country = æªç¥åå®¶
-torbutton.content_sizer.margin_tooltip = Tor Browser adds this margin to make 
the width and height of your window less distinctive, and thus reduces the 
ability of people to track you online.
+torbutton.circuit_display.unknown_country = æªç¥çåå®¶
+torbutton.content_sizer.margin_tooltip = 
æ´è¥è·¯ç±çè¦½å¨ç¹æå°è¦çªéæ¡çå¯¬åº¦åé«åº¦éæ°è¨ç½®ï¼ä»¥ä¾¿è®æ¨ççè¦½å¨çæ

è³è¨çèµ·ä¾æ´çºæ®éï¼å¦æ¤å¯ä»¥æ¸å°æ¨çç¶²è·¯æ´»åè¢«èå¥ä¸¦è¿½è¹¤çå¯è½æ§ã
 torbutton.panel.tooltip.disabled = æä¸ä¸ä»¥åç¨æ´è¥è·¯ç±
 torbutton.panel.tooltip.enabled = æä¸ä¸ä»¥åç¨æ´è¥è·¯ç±
 torbutton.panel.plugins.disabled = æä¸ä¸ä»¥åç¨å¤æç¨å¼
@@ -52,27 +52,27 @@ torbutton.title.prompt_torbrowser = éè¦ç Torbutton 
è³è¨
 torbutton.popup.prompt_torbrowser = Torbutton 
ç¾å¨ä»¥ä¸åçæ¹å¼éä½ï¼æ¨åä¹ä¸è½å°å
¶ééã\n\næååäºéæ¨£çè®æ´ï¼å 
çºè¥å¨åä¸åçè¦½å¨ä¸ï¼ä½¿ç¨æ´è¥è·¯ç±é 
è¨ªç¶²ç«ï¼ååæä¸ç¶éæ´è¥è·¯ç±é è¨ªå¶ä»ç¶²ç«ï¼å°ææå®å
¨ä¸ççæ
®ãç®åä»æå¤ªå¤æåç¡æ³ä¿®å¾©çç¨å¼é¯èª¤åå¨ã\n\nå¦ææ¨å¸æç¹¼çºæ£å¸¸ä½¿ç¨ç«çç¸çè¦½å¨ï¼æ¨æè§£é¤å®è£
 Torbutton 
ä¸¦ä¸è¼æ´è¥è·¯ç±çè¦½å¨å¥ä»¶ãæ´è¥è·¯ç±çè¦½å¨çé±ç§æ§ä¹åªæ¼æ®éçç«çç¸çè¦½å¨ï¼å³ä½¿ç¶ç«çç¸çè¦½å¨è
 Torbutton ä¸èµ·ä½¿ç¨æä¹æ¯ã\n\nè¦ç§»é¤ Torbuttonï¼è«åå¾ å·¥å· 
-> éå åä»¶ -> æ´åå¥ä»¶ ç¶å¾æä¸ä¸ Torbutton æéç 
ãç§»é¤ãæéã
 torbutton.popup.short_torbrowser = éè¦ç Torbutton è³è¨ï¼\n\nTorbutton 
ç¾å¨æ°¸é åç¨ã\n\næä¸ä¸ Torbutton ç²åæ´å¤è³è¨ã
 
-torbutton.popup.confirm_plugins = å¦ Flash 
çå¤æç¨å¼å¯è½æå±å®³æ¨çé±ç§åå¿åæ§ã\n\nå®åéå¯ä»¥ç¹é
 Torï¼æç¤ºæ¨ç®åæå¨çä½ç½®å IP 
ä½åã\n\næ¨ç¢ºå®è¦åç¨å¤æç¨å¼å?\n
+torbutton.popup.confirm_plugins = è«¸å¦ Flash 
ççè¦½å¨å¤æç¨å¼å¯è½æå±å®³æ¨çé±ç§åå¿åæ§ã\n\nå®åéå¯ä»¥ç¹éæ´è¥è·¯ç±ï¼éé²åºæ¨ç®åæå¨çä½ç½®å
 IP ä½åã\n\næ¨ç¢ºå®è¦åç¨å¤æç¨å¼åï¼\n
 torbutton.popup.never_ask_again = ä¸è¦ååæ
-torbutton.popup.confirm_newnym = Torçè¦½å¨å°ééææè¦çªååé 
ãææç¶²ç«çæè©±é½å°ä¸å¤±ã\n\nç¾å¨éæ°ååTorçè¦½å¨ä¾éæ°è¨ç½®æ¨çèº«ä»½ï¼\n\n
+torbutton.popup.confirm_newnym = 
æ´è¥è·¯ç±çè¦½å¨å°ééææè¦çªååé ãææå·²ç»å¥çæ
ä¸çç¶²ç«è³è¨é½å°è¢«æ¸
é¤ã\n\nç¾å¨éæ°ååæ´è¥è·¯ç±çè¦½å¨ä¾éæ°è¨ç½®æ¨çèº«ä»½ï¼\n\n
 
-torbutton.slider_notification = ç¾å¨ç¶ è²æ´è¥é¸å®æä¸åå®å
¨æ»åå¨ï¼å¯è®æ¨èª¿æ´æ¨çå®å¨ç´å¥ãå¿«ä¾ççå§ï¼
+torbutton.slider_notification = ç¶ è²çæ´è¥é¸å®è£¡ç¾å¨æä¸åå®å
¨æ»åå¨ï¼å¯è®æ¨èª¿æ´æ¨çå®å¨çç´ãå¿«ä¾ççå§ï¼
 torbutton.slider_notification_button = æéå®å¨æ§è¨ç½®
 
-torbutton.maximize_warning = Maximizing Tor Browser can allow websites to 
determine your monitor size, which can be used to track you. We recommend that 
you leave Tor Browser windows in their original default size.
+torbutton.maximize_warning = 
è¥å°æ´è¥è·¯ç±çè¦½å¨è¦çªæå¤§åï¼å¯è½æè®æé 
è¨ªçç¶²ç«è½å¤ 
å¾ç¥æ¨çè¢å¹å°ºå¯¸ï¼æ¤èå¯è½è¢«å©ç¨ä¾èå¥ä¸¦è¿½è¹¤æ¨çç¶²è·¯æ´»åãå
 æ¤æåå»ºè°æ¨è®æ´è¥è·¯ç±çè¦½å¨è¦çªä¿æåå§çå¤§å°ã
 
 # Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=æ¤ç¶²ç« (%S) è©¦åè§£å£ç¸® HTML5 
ç«å¸å½±åè³æï¼å¯è½è¢«ç¨ä¾æ¨èæ¨çé»è¦ã\n\nTor Browser 
æ¯å¦åè¨±æ¤ç¶²ç«è§£å£ç¸® HTML5 ç«å¸å½±åè³æ?
+canvas.siteprompt=æ¤ç¶²ç« (%S) è©¦åä½¿ç¨ HTML 5 
ç«å¸å½±åè³æï¼æ¤åè½å¯è½è¢«ç¨ä¾æ¨è¨èå¥æ¨çé»è
¦ã\n\næ¯å¦è¦å

[tor-commits] [translation/tor-launcher-network-settings_completed] Update translations for tor-launcher-network-settings_completed

2016-01-07 Thread translation

commit 61f2f6c082f6964a94dc29ed5949d3cb38349464
Author: Translation commit bot 
Date:   Fri Jan 8 02:15:56 2016 +

Update translations for tor-launcher-network-settings_completed
---
 zh_TW/network-settings.dtd |   42 --
 1 file changed, 24 insertions(+), 18 deletions(-)

diff --git a/zh_TW/network-settings.dtd b/zh_TW/network-settings.dtd
index 7abb064..424bc39 100644
--- a/zh_TW/network-settings.dtd
+++ b/zh_TW/network-settings.dtd
@@ -1,42 +1,48 @@
-
+
+
+
+
+
 
 
 
-
+
 
 
 
 
-
-
-
+
+
+
 
-
-
+
+
 
 
+
 
 
 
 
-
-
-
+
+
+
+
 
 
 
-
-
+
+
 
 
 
-
-
-
+
+
+
 
-
-
-
+
+
+
 
 
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings

2016-01-07 Thread translation

commit f834fecd1c84e0cc073f89fec9d9926f80c71403
Author: Translation commit bot 
Date:   Fri Jan 8 02:15:51 2016 +

Update translations for tor-launcher-network-settings
---
 zh_TW/network-settings.dtd |   44 ++--
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/zh_TW/network-settings.dtd b/zh_TW/network-settings.dtd
index d02b3f1..424bc39 100644
--- a/zh_TW/network-settings.dtd
+++ b/zh_TW/network-settings.dtd
@@ -1,48 +1,48 @@
-
+
 
 
-
-
+
+
 
 
 
-
+
 
 
 
 
-
-
-
+
+
+
 
-
-
+
+
 
 
-
+
 
 
 
 
-
-
-
-
+
+
+
+
 
 
 
-
-
+
+
 
 
 
-
-
-
+
+
+
 
-
-
-
+
+
+
 
 
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tor-messenger-authdtd] Update translations for tor-messenger-authdtd

2016-01-07 Thread translation

commit 74824885b0cc3b8233c608364b38b5a68eaaa1a3
Author: Translation commit bot 
Date:   Fri Jan 8 03:16:29 2016 +

Update translations for tor-messenger-authdtd
---
 zh_TW/auth.dtd |   36 ++--
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/zh_TW/auth.dtd b/zh_TW/auth.dtd
index d8b5450..6deac85 100644
--- a/zh_TW/auth.dtd
+++ b/zh_TW/auth.dtd
@@ -1,21 +1,21 @@
-
+
 
-
-
+
+
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/bridgedb_completed] Update translations for bridgedb_completed

2016-01-07 Thread translation

commit 6f85ca43fa0bbc3548ec18a7d1b9eaaadc899519
Author: Translation commit bot 
Date:   Fri Jan 8 04:15:09 2016 +

Update translations for bridgedb_completed
---
 zh_TW/LC_MESSAGES/bridgedb.po |   42 -
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/zh_TW/LC_MESSAGES/bridgedb.po b/zh_TW/LC_MESSAGES/bridgedb.po
index 7acc4d6..7563cb5 100644
--- a/zh_TW/LC_MESSAGES/bridgedb.po
+++ b/zh_TW/LC_MESSAGES/bridgedb.po
@@ -13,7 +13,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB=bridgedb-reported,msgid=isis,sysrqb=isis'\n"
 "POT-Creation-Date: 2015-07-25 03:40+\n"
-"PO-Revision-Date: 2016-01-08 03:44+\n"
+"PO-Revision-Date: 2016-01-08 03:53+\n"
 "Last-Translator: AgustÃn Wu \n"
 "Language-Team: Chinese (Taiwan) 
(http://www.transifex.com/otf/torproject/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
@@ -236,7 +236,7 @@ msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
-msgstr "æäºå·æ IPv6 ä½åçæ©æ¥ä¹å¯ç¨ï¼éç¶æäº 
Pluggable\nTransports è IPv6 ä¸ç¸å®¹ã\n\n"
+msgstr "æäºå·æ IPv6 ä½åçæ©æ¥å¨ä¹å¯ä½¿ç¨ï¼éç¶æäº 
Pluggable\nTransports è IPv6 ä¸ç¸å®¹ã\n\n"
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
@@ -250,20 +250,20 @@ 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 "æ¤å¤ï¼BridgeDB ææ®éçæ©æ¥ %sï¼æ²æä»»ä½\nPluggable 
Transports %sï¼éä¹è¨±è½èµ·ä¾ä¸é
·ï¼ä½å®\nä»æå©æ¼è¦é¿å¨è¨±å¤ææ³ä¸çç¶²è·¯å¯©æ¥ã\n"
+msgstr "æ¤å¤ï¼BridgeDB ææ®éçæ©æ¥å¨ %sï¼æ²æä»»ä½\nPluggable 
Transports %sï¼éä¹è¨±è½èµ·ä¾ä¸é
·ï¼ä½å®\nä»æå©æ¼è¦é¿å¨è¨±å¤ææ³ä¸çç¶²è·¯å¯©æ¥ã\n"
 
 #: bridgedb/strings.py:101
 msgid "What are bridges?"
-msgstr "ä»éº¼æ¯æ©æ¥?"
+msgstr "ä»éº¼æ¯æ©æ¥å¨ï¼"
 
 #: bridgedb/strings.py:102
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
-msgstr "%s æ©æ¥ %s æ¯ Tor ä¸ç¹¼ï¼å¯å¹«æ¨è¦é¿å¯©æ¥ã"
+msgstr "%s æ©æ¥å¨ %s 
æ¯æ´è¥è·¯ç±çä¸ç¹¼çµé»ï¼å¯å¹«æ¨è¦é¿å¯©æ¥ã"
 
 #: bridgedb/strings.py:107
 msgid "I need an alternative way of getting bridges!"
-msgstr "æéè¦ä½¿ç¨å¶ä»æ¹å¼åå¾æ©æ¥!"
+msgstr "æéè¦ä½¿ç¨å¶ä»æ¹å¼åå¾æ©æ¥å¨ï¼"
 
 #: bridgedb/strings.py:108
 #, python-format
@@ -275,13 +275,13 @@ msgstr 
"å¦ä¸ç¨®åå¾æ©æ¥çæ¹å¼çºç¼éé»åéµä»¶è³ %sãè«æ³¨æï¼
 
 #: bridgedb/strings.py:115
 msgid "My bridges don't work! I need help!"
-msgstr "æ©æ¥ç¡æ³æ£å¸¸å·è¡ï¼æéè¦å¹«å©!"
+msgstr "æ©æ¥å¨ç¡æ³æ£å¸¸å·è¡ï¼æéè¦å¹«å©ï¼"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:117
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
-msgstr "å¦ææ¨ç Tor ç¡æ³éä½ï¼æ¨æè©²ç¼éé»åéµä»¶çµ¦ %sã"
+msgstr "å¦ææ¨çæ´è¥è·¯ç±ç¡æ³éä½ï¼æ¨æè©²ç¼éé»åéµä»¶çµ¦ 
%sã"
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
@@ -291,28 +291,28 @@ 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 "è©¦èåå«æéæ¨ææ³çç¡å¯è½å¤çè³è¨ï¼å
å«æ¨åè©¦ä½¿ç¨éç \næ©æ¥å Pluggable Transports æ¸å®ï¼æ¨ç Tor 
çè¦½å¨çæ¬ï¼ \nä»¥å Tor çµ¦åºçä»»ä½è¨æ¯ã"
+msgstr "è©¦èåå«æéæ¨ææ³çç¡å¯è½å¤çè³è¨ï¼å
å«æ¨åè©¦ä½¿ç¨éç \næ©æ¥å Pluggable Transports æ¸
å®ï¼æ¨çæ´è¥è·¯ç±çè¦½å¨çæ¬ï¼ 
\nä»¥åæ´è¥è·¯ç±çµ¦åºçä»»ä½è¨æ¯ã"
 
 #: bridgedb/strings.py:128
 msgid "Here are your bridge lines:"
-msgstr "éè£¡æ¯æ¨çæ©æ¥ç·è·¯:"
+msgstr "éè£¡æ¯æ¨çæ©æ¥ç·è·¯ï¼"
 
 #: bridgedb/strings.py:129
 msgid "Get Bridges!"
-msgstr "åå¾æ©æ¥!"
+msgstr "åå¾æ©æ¥å¨ï¼"
 
 #: bridgedb/strings.py:133
 msgid "Please select options for bridge type:"
-msgstr "è«é¸ææ©æ¥é¡åçé¸é :"
+msgstr "è«é¸ææ©æ¥å¨é¡åçé¸é ï¼"
 
 #: bridgedb/strings.py:134
 msgid "Do you need IPv6 addresses?"
-msgstr "æ¨éè¦ IPv6 ä½åå?"
+msgstr "æ¨éè¦ IPv6 ä½ååï¼"
 
 #: bridgedb/strings.py:135
 #, python-format
 msgid "Do you need a %s?"
-msgstr "æ¨éè¦ %s å?"
+msgstr "æ¨éè¦ %s åï¼"
 
 #: bridgedb/strings.py:139
 msgid "Your browser is not displaying images properly."
@@ -320,11 +320,11 @@ msgstr "æ¨ççè¦½å¨ä¸è½æ£ç¢ºé¡¯ç¤ºååã"
 
 #:

[tor-commits] [translation/bridgedb] Update translations for bridgedb

2016-01-07 Thread translation

commit f2102e8ad56f83fd7d4559dbf47e4c4032f88a63
Author: Translation commit bot 
Date:   Fri Jan 8 04:15:03 2016 +

Update translations for bridgedb
---
 zh_TW/LC_MESSAGES/bridgedb.po |   42 -
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/zh_TW/LC_MESSAGES/bridgedb.po b/zh_TW/LC_MESSAGES/bridgedb.po
index 7acc4d6..7563cb5 100644
--- a/zh_TW/LC_MESSAGES/bridgedb.po
+++ b/zh_TW/LC_MESSAGES/bridgedb.po
@@ -13,7 +13,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB=bridgedb-reported,msgid=isis,sysrqb=isis'\n"
 "POT-Creation-Date: 2015-07-25 03:40+\n"
-"PO-Revision-Date: 2016-01-08 03:44+\n"
+"PO-Revision-Date: 2016-01-08 03:53+\n"
 "Last-Translator: AgustÃn Wu \n"
 "Language-Team: Chinese (Taiwan) 
(http://www.transifex.com/otf/torproject/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
@@ -236,7 +236,7 @@ msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
-msgstr "æäºå·æ IPv6 ä½åçæ©æ¥ä¹å¯ç¨ï¼éç¶æäº 
Pluggable\nTransports è IPv6 ä¸ç¸å®¹ã\n\n"
+msgstr "æäºå·æ IPv6 ä½åçæ©æ¥å¨ä¹å¯ä½¿ç¨ï¼éç¶æäº 
Pluggable\nTransports è IPv6 ä¸ç¸å®¹ã\n\n"
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
@@ -250,20 +250,20 @@ 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 "æ¤å¤ï¼BridgeDB ææ®éçæ©æ¥ %sï¼æ²æä»»ä½\nPluggable 
Transports %sï¼éä¹è¨±è½èµ·ä¾ä¸é
·ï¼ä½å®\nä»æå©æ¼è¦é¿å¨è¨±å¤ææ³ä¸çç¶²è·¯å¯©æ¥ã\n"
+msgstr "æ¤å¤ï¼BridgeDB ææ®éçæ©æ¥å¨ %sï¼æ²æä»»ä½\nPluggable 
Transports %sï¼éä¹è¨±è½èµ·ä¾ä¸é
·ï¼ä½å®\nä»æå©æ¼è¦é¿å¨è¨±å¤ææ³ä¸çç¶²è·¯å¯©æ¥ã\n"
 
 #: bridgedb/strings.py:101
 msgid "What are bridges?"
-msgstr "ä»éº¼æ¯æ©æ¥?"
+msgstr "ä»éº¼æ¯æ©æ¥å¨ï¼"
 
 #: bridgedb/strings.py:102
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
-msgstr "%s æ©æ¥ %s æ¯ Tor ä¸ç¹¼ï¼å¯å¹«æ¨è¦é¿å¯©æ¥ã"
+msgstr "%s æ©æ¥å¨ %s 
æ¯æ´è¥è·¯ç±çä¸ç¹¼çµé»ï¼å¯å¹«æ¨è¦é¿å¯©æ¥ã"
 
 #: bridgedb/strings.py:107
 msgid "I need an alternative way of getting bridges!"
-msgstr "æéè¦ä½¿ç¨å¶ä»æ¹å¼åå¾æ©æ¥!"
+msgstr "æéè¦ä½¿ç¨å¶ä»æ¹å¼åå¾æ©æ¥å¨ï¼"
 
 #: bridgedb/strings.py:108
 #, python-format
@@ -275,13 +275,13 @@ msgstr 
"å¦ä¸ç¨®åå¾æ©æ¥çæ¹å¼çºç¼éé»åéµä»¶è³ %sãè«æ³¨æï¼
 
 #: bridgedb/strings.py:115
 msgid "My bridges don't work! I need help!"
-msgstr "æ©æ¥ç¡æ³æ£å¸¸å·è¡ï¼æéè¦å¹«å©!"
+msgstr "æ©æ¥å¨ç¡æ³æ£å¸¸å·è¡ï¼æéè¦å¹«å©ï¼"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:117
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
-msgstr "å¦ææ¨ç Tor ç¡æ³éä½ï¼æ¨æè©²ç¼éé»åéµä»¶çµ¦ %sã"
+msgstr "å¦ææ¨çæ´è¥è·¯ç±ç¡æ³éä½ï¼æ¨æè©²ç¼éé»åéµä»¶çµ¦ 
%sã"
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
@@ -291,28 +291,28 @@ 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 "è©¦èåå«æéæ¨ææ³çç¡å¯è½å¤çè³è¨ï¼å
å«æ¨åè©¦ä½¿ç¨éç \næ©æ¥å Pluggable Transports æ¸å®ï¼æ¨ç Tor 
çè¦½å¨çæ¬ï¼ \nä»¥å Tor çµ¦åºçä»»ä½è¨æ¯ã"
+msgstr "è©¦èåå«æéæ¨ææ³çç¡å¯è½å¤çè³è¨ï¼å
å«æ¨åè©¦ä½¿ç¨éç \næ©æ¥å Pluggable Transports æ¸
å®ï¼æ¨çæ´è¥è·¯ç±çè¦½å¨çæ¬ï¼ 
\nä»¥åæ´è¥è·¯ç±çµ¦åºçä»»ä½è¨æ¯ã"
 
 #: bridgedb/strings.py:128
 msgid "Here are your bridge lines:"
-msgstr "éè£¡æ¯æ¨çæ©æ¥ç·è·¯:"
+msgstr "éè£¡æ¯æ¨çæ©æ¥ç·è·¯ï¼"
 
 #: bridgedb/strings.py:129
 msgid "Get Bridges!"
-msgstr "åå¾æ©æ¥!"
+msgstr "åå¾æ©æ¥å¨ï¼"
 
 #: bridgedb/strings.py:133
 msgid "Please select options for bridge type:"
-msgstr "è«é¸ææ©æ¥é¡åçé¸é :"
+msgstr "è«é¸ææ©æ¥å¨é¡åçé¸é ï¼"
 
 #: bridgedb/strings.py:134
 msgid "Do you need IPv6 addresses?"
-msgstr "æ¨éè¦ IPv6 ä½åå?"
+msgstr "æ¨éè¦ IPv6 ä½ååï¼"
 
 #: bridgedb/strings.py:135
 #, python-format
 msgid "Do you need a %s?"
-msgstr "æ¨éè¦ %s å?"
+msgstr "æ¨éè¦ %s åï¼"
 
 #: bridgedb/strings.py:139
 msgid "Your browser is not displaying images properly."
@@ -320,11 +320,11 @@ msgstr "æ¨ççè¦½å¨ä¸è½æ£ç¢ºé¡¯ç¤ºååã"
 
 #:

[tor-commits] [tor/master] Merge branch 'maint-0.2.5' into maint-0.2.6

2016-01-07 Thread nickm

commit 400df18688e3b657852a9007151aaf26febe29a6
Merge: 1adc2bf ae22313
Author: Nick Mathewson 
Date:   Thu Jan 7 09:14:05 2016 -0800

Merge branch 'maint-0.2.5' into maint-0.2.6

 changes/geoip-january2016 |4 +
 src/config/geoip  | 1734 +++--
 src/config/geoip6 |  881 +--
 3 files changed, 2016 insertions(+), 603 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.2.4' into maint-0.2.5

2016-01-07 Thread nickm

commit ae223138fbdd28ef452191c3a489e25e9a9b22c7
Merge: c3d11b1 1496056
Author: Nick Mathewson 
Date:   Thu Jan 7 09:13:54 2016 -0800

Merge branch 'maint-0.2.4' into maint-0.2.5

 changes/geoip-january2016 |4 +
 src/config/geoip  | 1734 +++--
 src/config/geoip6 |  881 +--
 3 files changed, 2016 insertions(+), 603 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [metrics-web/master] Use a temporary table to speed up merging client stats.

2016-01-07 Thread karsten

commit 44acfe50b92983e4285569bb88b997af78a56da9
Author: Karsten Loesing 
Date:   Wed Jan 6 14:20:40 2016 +0100

Use a temporary table to speed up merging client stats.
---
 modules/clients/init-userstats.sql |   59 +---
 1 file changed, 34 insertions(+), 25 deletions(-)

diff --git a/modules/clients/init-userstats.sql 
b/modules/clients/init-userstats.sql
index 00b7938..ea6edec 100644
--- a/modules/clients/init-userstats.sql
+++ b/modules/clients/init-userstats.sql
@@ -184,21 +184,28 @@ DECLARE
 BEGIN
   RAISE NOTICE '% Starting to merge.', timeofday();
 
-  -- TODO Maybe we'll have to materialize a merged_part table that only
-  -- contains dates IN (SELECT DISTINCT DATE(stats_start) FROM imported)
-  -- and use that in the query below.
+  RAISE NOTICE '% Creating temporary merged_part table.', timeofday();
+
+  -- Materialize a temporary merged_part table that only contains dates of
+  -- newly imported rows for the query below.
+  CREATE TEMPORARY TABLE merged_part AS
+SELECT * FROM merged
+WHERE DATE(merged.stats_start) IN (
+  SELECT DISTINCT DATE(stats_start) FROM imported);
+
+  RAISE NOTICE '% Joining imported and merged_part tables.', timeofday();
 
   -- Loop over results from a query that joins new entries in the imported
-  -- table with existing entries in the merged table.
+  -- table with existing entries in the merged_part table.
   FOR cur IN SELECT DISTINCT
 
 -- Select id, interval start and end, and value of the existing entry
--- in merged; all these fields may be null if the imported entry is
--- not adjacent to an existing one.
-merged.id AS merged_id,
-merged.stats_start AS merged_start,
-merged.stats_end AS merged_end,
-merged.val AS merged_val,
+-- in merged_part; all these fields may be null if the imported entry
+-- is not adjacent to an existing one.
+merged_part.id AS merged_id,
+merged_part.stats_start AS merged_start,
+merged_part.stats_end AS merged_end,
+merged_part.val AS merged_val,
 
 -- Select interval start and end and value of the newly imported
 -- entry.
@@ -216,33 +223,35 @@ BEGIN
 imported.version AS version
 
 -- Select these columns from all entries in the imported table, plus
--- do an outer join on the merged table to find adjacent entries that
--- we might want to merge the new entries with.  It's possible that we
--- handle the same imported entry twice, if it starts directly after
--- one existing entry and ends directly before another existing entry.
-FROM imported LEFT JOIN merged
+-- do an outer join on the merged_part table to find adjacent entries
+-- that we might want to merge the new entries with.  It's possible
+-- that we handle the same imported entry twice, if it starts directly
+-- after one existing entry and ends directly before another existing
+-- entry.
+FROM imported LEFT JOIN merged_part
 
 -- First two join conditions are to find adjacent intervals.  In fact,
 -- we also include overlapping intervals here, so that we can skip the
 -- overlapping entry in the imported table.
-ON imported.stats_end >= merged.stats_start AND
-   imported.stats_start <= merged.stats_end AND
+ON imported.stats_end >= merged_part.stats_start AND
+   imported.stats_start <= merged_part.stats_end AND
 
-- Further join conditions are same date, fingerprint, node, etc.,
-- so that we don't merge entries that don't belong together.
-   DATE(imported.stats_start) = DATE(merged.stats_start) AND
-   imported.fingerprint = merged.fingerprint AND
-   imported.node = merged.node AND
-   imported.metric = merged.metric AND
-   imported.country = merged.country AND
-   imported.transport = merged.transport AND
-   imported.version = merged.version
+   DATE(imported.stats_start) = DATE(merged_part.stats_start) AND
+   imported.fingerprint = merged_part.fingerprint AND
+   imported.node = merged_part.node AND
+   imported.metric = merged_part.metric AND
+   imported.country = merged_part.country AND
+   imported.transport = merged_part.transport AND
+   imported.version = merged_part.version
 
 -- Ordering is key, or our approach to merge subsequent entries is
 -- going to break.
 ORDER BY imported.fingerprint, imported.node, imported.metric,
  imported.country, imported.transport, imported.version,
- imported.stats_start, merged.stats_start, imported.stats_end
+ imported.stats_start, merged_part.stats_start,
+ imported.stats_end
 
   -- Now go through the results one by one.
   LOOP

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [metrics-web/master] Cache previously parsed/formatted dates.

2016-01-07 Thread karsten

commit c0f4c764084cbc4bf7fbc909d33cbb30e8aca1ef
Author: Karsten Loesing 
Date:   Wed Jan 6 14:16:26 2016 +0100

Cache previously parsed/formatted dates.

We're parsing a lot of date/hour timestamps when reading previously
written computed network fractions, and it's easy to cache previously
parsed dates to reduce computation overhead.  Similarly, we can cache
previously formatted dates and re-use them later.
---
 .../metrics/hidserv/ComputedNetworkFractions.java  |   49 +---
 1 file changed, 42 insertions(+), 7 deletions(-)

diff --git 
a/modules/hidserv/src/org/torproject/metrics/hidserv/ComputedNetworkFractions.java
 
b/modules/hidserv/src/org/torproject/metrics/hidserv/ComputedNetworkFractions.java
index 1fe0020..cda6b67 100644
--- 
a/modules/hidserv/src/org/torproject/metrics/hidserv/ComputedNetworkFractions.java
+++ 
b/modules/hidserv/src/org/torproject/metrics/hidserv/ComputedNetworkFractions.java
@@ -1,5 +1,9 @@
 package org.torproject.metrics.hidserv;
 
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
 /* Computed fraction of hidden-service activity that a single relay is
  * assumed to observe in the network.  These fractions are computed from
  * status entries and bandwidth weights in a network status consensus. */
@@ -70,17 +74,32 @@ public class ComputedNetworkFractions implements Document {
 (int) this.validAfterMillis;
   }
 
+  private static Map previouslyFormattedDates =
+  Collections.synchronizedMap(new HashMap());
+
   /* Return a string representation of this object, consisting of two
* strings: the first string contains fingerprint and valid-after date,
* the second string contains the concatenation of all other
* attributes. */
   @Override
   public String[] format() {
+long validAfterDateMillis = (this.validAfterMillis
+/ DateTimeHelper.ONE_DAY) * DateTimeHelper.ONE_DAY;
+String validAfterDate;
+if (previouslyFormattedDates.containsKey(validAfterDateMillis)) {
+  validAfterDate = previouslyFormattedDates.get(validAfterDateMillis);
+} else {
+  validAfterDate = DateTimeHelper.format(validAfterDateMillis,
+  DateTimeHelper.ISO_DATE_FORMAT);
+  previouslyFormattedDates.put(validAfterDateMillis, validAfterDate);
+}
+long validAfterHourMillis = this.validAfterMillis
+% DateTimeHelper.ONE_DAY;
+String validAfterHour = String.format("%02d",
+validAfterHourMillis / DateTimeHelper.ONE_HOUR);
 String first = String.format("%s,%s", this.fingerprint,
-DateTimeHelper.format(this.validAfterMillis,
-DateTimeHelper.ISO_DATE_FORMAT));
-String second = DateTimeHelper.format(this.validAfterMillis,
-DateTimeHelper.ISO_HOUR_FORMAT)
+validAfterDate);
+String second = validAfterHour
 + (this.fractionRendRelayedCells == 0.0 ? ","
 : String.format(",%f", this.fractionRendRelayedCells))
 + (this.fractionDirOnionsSeen == 0.0 ? ","
@@ -93,6 +112,9 @@ public class ComputedNetworkFractions implements Document {
   ComputedNetworkFractions() {
   }
 
+  private static Map previouslyParsedDates =
+  Collections.synchronizedMap(new HashMap());
+
   /* Initialize this fractions object using the two provided strings that
* have been produced by the format method earlier.  Return whether this
* operation was successful. */
@@ -116,12 +138,25 @@ public class ComputedNetworkFractions implements Document 
{
   + "Skipping.%n");
   return false;
 }
-long validAfterMillis = DateTimeHelper.parse(firstParts[1] + " "
-+ secondParts[0], DateTimeHelper.ISO_DATE_HOUR_FORMAT);
-if (validAfterMillis == DateTimeHelper.NO_TIME_AVAILABLE) {
+String validAfterDate = firstParts[1],
+validAfterHour = secondParts[0];
+long validAfterDateMillis;
+if (previouslyParsedDates.containsKey(validAfterDate)) {
+  validAfterDateMillis = previouslyParsedDates.get(validAfterDate);
+} else {
+  validAfterDateMillis = DateTimeHelper.parse(validAfterDate,
+  DateTimeHelper.ISO_DATE_FORMAT);
+  previouslyParsedDates.put(validAfterDate, validAfterDateMillis);
+}
+long validAfterTimeMillis = Long.parseLong(validAfterHour)
+* DateTimeHelper.ONE_HOUR;
+if (validAfterDateMillis == DateTimeHelper.NO_TIME_AVAILABLE ||
+validAfterTimeMillis < 0L ||
+validAfterTimeMillis >= DateTimeHelper.ONE_DAY) {
   System.err.printf("Invalid date/hour format.  Skipping.%n");
   return false;
 }
+long validAfterMillis = validAfterDateMillis + validAfterTimeMillis;
 try {
   double fractionRendRelayedCells = secondParts[1].equals("")
   ? 0.0 : Double.parseDouble(secondParts[1]);



___
tor-commits mailing list
tor-commits@lists.torproject.org

[tor-commits] [tor/master] Try to fix windows test build (#18012)

2016-01-07 Thread nickm

commit b5ce3329581b29c61e81f69a5768d7ec0d4e30bf
Author: Nick Mathewson 
Date:   Thu Jan 7 09:25:44 2016 -0800

Try to fix windows test build (#18012)
---
 src/test/test_util.c |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/test_util.c b/src/test/test_util.c
index bf789c5..fd711a2 100644
--- a/src/test/test_util.c
+++ b/src/test/test_util.c
@@ -4676,7 +4676,7 @@ test_util_pwdb(void *arg)
 #ifdef _WIN32
 #define UTIL_TEST_NO_WIN(n, f) { #n, NULL, TT_SKIP, NULL, NULL }
 #define UTIL_TEST_WIN_ONLY(n, f) UTIL_TEST(n, (f))
-#define UTIL_LEGACY_NO_WIN(n) UTIL_NO_WIN(n)
+#define UTIL_LEGACY_NO_WIN(n) UTIL_TEST_NO_WIN(n)
 #else
 #define UTIL_TEST_NO_WIN(n, f) UTIL_TEST(n, (f))
 #define UTIL_TEST_WIN_ONLY(n, f) { #n, NULL, TT_SKIP, NULL, NULL }

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.2.5] Update dannenberg's V3 authority identity fingerprint

2016-01-07 Thread nickm

commit 11f63d26acb8ca872d894fb1423b380dc1f8dc2e
Author: teor (Tim Wilson-Brown) 
Date:   Mon Dec 21 10:40:10 2015 +1100

Update dannenberg's V3 authority identity fingerprint

This new identity key was changed on 18 November 2015.
---
 changes/bug17906 |4 
 src/or/config.c  |2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/changes/bug17906 b/changes/bug17906
new file mode 100644
index 000..fff76d1
--- /dev/null
+++ b/changes/bug17906
@@ -0,0 +1,4 @@
+  o Minor features (authorities):
+- Update the V3 identity key for dannenberg, it was changed on
+  18 November 2015.
+  Closes task #17906. Patch by "teor".
diff --git a/src/or/config.c b/src/or/config.c
index fde88ad..1610cad 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -800,7 +800,7 @@ add_default_trusted_dir_authorities(dirinfo_type_t type)
   "v3ident=ED03BB616EB2F60BEC80151114BB25CEF515B226 "
   "131.188.40.189:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281",
 "dannenberg orport=443 no-v2 "
-  "v3ident=585769C78764D58426B8B52B6651A5A71137189A "
+  "v3ident=0232AF901C31A04EE9848595AF9BB7620D4C5B2E "
   "193.23.244.244:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123",
 "urras orport=80 no-v2 v3ident=80550987E1D626E3EBA5E5E75A458DE0626D088C "
   "208.83.223.34:443 0AD3 FA88 4D18 F89E EA2D 89C0 1937 9E0E 7FD9 4417",



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.2.4] Update dannenberg's V3 authority identity fingerprint

2016-01-07 Thread nickm

commit 11f63d26acb8ca872d894fb1423b380dc1f8dc2e
Author: teor (Tim Wilson-Brown) 
Date:   Mon Dec 21 10:40:10 2015 +1100

Update dannenberg's V3 authority identity fingerprint

This new identity key was changed on 18 November 2015.
---
 changes/bug17906 |4 
 src/or/config.c  |2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/changes/bug17906 b/changes/bug17906
new file mode 100644
index 000..fff76d1
--- /dev/null
+++ b/changes/bug17906
@@ -0,0 +1,4 @@
+  o Minor features (authorities):
+- Update the V3 identity key for dannenberg, it was changed on
+  18 November 2015.
+  Closes task #17906. Patch by "teor".
diff --git a/src/or/config.c b/src/or/config.c
index fde88ad..1610cad 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -800,7 +800,7 @@ add_default_trusted_dir_authorities(dirinfo_type_t type)
   "v3ident=ED03BB616EB2F60BEC80151114BB25CEF515B226 "
   "131.188.40.189:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281",
 "dannenberg orport=443 no-v2 "
-  "v3ident=585769C78764D58426B8B52B6651A5A71137189A "
+  "v3ident=0232AF901C31A04EE9848595AF9BB7620D4C5B2E "
   "193.23.244.244:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123",
 "urras orport=80 no-v2 v3ident=80550987E1D626E3EBA5E5E75A458DE0626D088C "
   "208.83.223.34:443 0AD3 FA88 4D18 F89E EA2D 89C0 1937 9E0E 7FD9 4417",

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.2.7] Merge branch 'maint-0.2.5' into maint-0.2.6

2016-01-07 Thread nickm

commit c7b0cd9c2f52ca289515833060ac0b8461da2225
Merge: 400df18 9ca3295
Author: Nick Mathewson 
Date:   Thu Jan 7 09:41:36 2016 -0800

Merge branch 'maint-0.2.5' into maint-0.2.6

 changes/bug17906 |4 
 src/or/config.c  |2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --cc src/or/config.c
index fca350c,60d3d7f..7444af6
--- a/src/or/config.c
+++ b/src/or/config.c
@@@ -865,10 -862,9 +865,10 @@@ add_default_trusted_dir_authorities(dir
"v3ident=ED03BB616EB2F60BEC80151114BB25CEF515B226 "
"131.188.40.189:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281",
  "dannenberg orport=443 "
-   "v3ident=585769C78764D58426B8B52B6651A5A71137189A "
+   "v3ident=0232AF901C31A04EE9848595AF9BB7620D4C5B2E "
"193.23.244.244:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123",
 -"urras orport=80 v3ident=80550987E1D626E3EBA5E5E75A458DE0626D088C "
 +"urras orport=80 "
 +  "v3ident=80550987E1D626E3EBA5E5E75A458DE0626D088C "
"208.83.223.34:443 0AD3 FA88 4D18 F89E EA2D 89C0 1937 9E0E 7FD9 4417",
  "maatuska orport=80 "
"v3ident=49015F787433103580E3B66A1707A00E60F2D15B "



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.2.5] Merge branch 'maint-0.2.4' into maint-0.2.5

2016-01-07 Thread nickm

commit 9ca329581af71c9aa6890b63c29c6a51ac37e408
Merge: ae22313 11f63d2
Author: Nick Mathewson 
Date:   Thu Jan 7 09:40:23 2016 -0800

Merge branch 'maint-0.2.4' into maint-0.2.5

Conflicts:
src/or/config.c

 changes/bug17906 |4 
 src/or/config.c  |2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --cc src/or/config.c
index 2a7237d,1610cad..60d3d7f
--- a/src/or/config.c
+++ b/src/or/config.c
@@@ -856,23 -794,23 +856,23 @@@ add_default_trusted_dir_authorities(dir
"86.59.21.38:80 847B 1F85 0344 D787 6491 A548 92F9 0493 4E4E B85D",
  "dizum orport=443 v3ident=E8A9C45EDE6D711294FADF8E7951F4DE6CA56B58 "
"194.109.206.212:80 7EA6 EAD6 FD83 083C 538F 4403 8BBF A077 587D D755",
 -"Tonga orport=443 bridge no-v2 82.94.251.203:80 "
 +"Tonga orport=443 bridge 82.94.251.203:80 "
"4A0C CD2D DC79 9508 3D73 F5D6 6710 0C8A 5831 F16D",
 -"gabelmoo orport=443 no-v2 "
 +"gabelmoo orport=443 "
"v3ident=ED03BB616EB2F60BEC80151114BB25CEF515B226 "
"131.188.40.189:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281",
 -"dannenberg orport=443 no-v2 "
 +"dannenberg orport=443 "
-   "v3ident=585769C78764D58426B8B52B6651A5A71137189A "
+   "v3ident=0232AF901C31A04EE9848595AF9BB7620D4C5B2E "
"193.23.244.244:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123",
 -"urras orport=80 no-v2 v3ident=80550987E1D626E3EBA5E5E75A458DE0626D088C "
 +"urras orport=80 v3ident=80550987E1D626E3EBA5E5E75A458DE0626D088C "
"208.83.223.34:443 0AD3 FA88 4D18 F89E EA2D 89C0 1937 9E0E 7FD9 4417",
 -"maatuska orport=80 no-v2 "
 +"maatuska orport=80 "
"v3ident=49015F787433103580E3B66A1707A00E60F2D15B "
"171.25.193.9:443 BD6A 8292 55CB 08E6 6FBE 7D37 4836 3586 E46B 3810",
 -"Faravahar orport=443 no-v2 "
 +"Faravahar orport=443 "
"v3ident=EFCBE720AB3A82B99F9E953CD5BF50F7EEFC7B97 "
"154.35.175.225:80 CF6D 0AAF B385 BE71 B8E1 11FC 5CFF 4B47 9237 33BC",
 -"longclaw orport=443 no-v2 "
 +"longclaw orport=443 "
"v3ident=23D15D965BC35114467363C165C4F724B64B4F66 "
"199.254.238.52:80 74A9 1064 6BCE EFBC D2E8 74FC 1DC9 9743 0F96 8145",
  NULL

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.2.7'

2016-01-07 Thread nickm

commit 55232e32c73b114dbe8de643ff0f352e252457ac
Merge: b5ce332 b34c5c6
Author: Nick Mathewson 
Date:   Thu Jan 7 09:43:24 2016 -0800

Merge branch 'maint-0.2.7'

 changes/bug17906 |4 
 src/or/config.c  |2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --cc src/or/config.c
index ff25a79,3b35b5a..c1db844
--- a/src/or/config.c
+++ b/src/or/config.c
@@@ -914,10 -873,9 +914,10 @@@ static const char *default_authorities[
  "82.94.251.203:80 4A0C CD2D DC79 9508 3D73 F5D6 6710 0C8A 5831 F16D",
"gabelmoo orport=443 "
  "v3ident=ED03BB616EB2F60BEC80151114BB25CEF515B226 "
 +"ipv6=[2001:638:a000:4140:::189]:443 "
  "131.188.40.189:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281",
"dannenberg orport=443 "
- "v3ident=585769C78764D58426B8B52B6651A5A71137189A "
+ "v3ident=0232AF901C31A04EE9848595AF9BB7620D4C5B2E "
  "193.23.244.244:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123",
"urras orport=80 "
  "v3ident=80550987E1D626E3EBA5E5E75A458DE0626D088C "

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.2.4' into maint-0.2.5

2016-01-07 Thread nickm

commit 9ca329581af71c9aa6890b63c29c6a51ac37e408
Merge: ae22313 11f63d2
Author: Nick Mathewson 
Date:   Thu Jan 7 09:40:23 2016 -0800

Merge branch 'maint-0.2.4' into maint-0.2.5

Conflicts:
src/or/config.c

 changes/bug17906 |4 
 src/or/config.c  |2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --cc src/or/config.c
index 2a7237d,1610cad..60d3d7f
--- a/src/or/config.c
+++ b/src/or/config.c
@@@ -856,23 -794,23 +856,23 @@@ add_default_trusted_dir_authorities(dir
"86.59.21.38:80 847B 1F85 0344 D787 6491 A548 92F9 0493 4E4E B85D",
  "dizum orport=443 v3ident=E8A9C45EDE6D711294FADF8E7951F4DE6CA56B58 "
"194.109.206.212:80 7EA6 EAD6 FD83 083C 538F 4403 8BBF A077 587D D755",
 -"Tonga orport=443 bridge no-v2 82.94.251.203:80 "
 +"Tonga orport=443 bridge 82.94.251.203:80 "
"4A0C CD2D DC79 9508 3D73 F5D6 6710 0C8A 5831 F16D",
 -"gabelmoo orport=443 no-v2 "
 +"gabelmoo orport=443 "
"v3ident=ED03BB616EB2F60BEC80151114BB25CEF515B226 "
"131.188.40.189:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281",
 -"dannenberg orport=443 no-v2 "
 +"dannenberg orport=443 "
-   "v3ident=585769C78764D58426B8B52B6651A5A71137189A "
+   "v3ident=0232AF901C31A04EE9848595AF9BB7620D4C5B2E "
"193.23.244.244:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123",
 -"urras orport=80 no-v2 v3ident=80550987E1D626E3EBA5E5E75A458DE0626D088C "
 +"urras orport=80 v3ident=80550987E1D626E3EBA5E5E75A458DE0626D088C "
"208.83.223.34:443 0AD3 FA88 4D18 F89E EA2D 89C0 1937 9E0E 7FD9 4417",
 -"maatuska orport=80 no-v2 "
 +"maatuska orport=80 "
"v3ident=49015F787433103580E3B66A1707A00E60F2D15B "
"171.25.193.9:443 BD6A 8292 55CB 08E6 6FBE 7D37 4836 3586 E46B 3810",
 -"Faravahar orport=443 no-v2 "
 +"Faravahar orport=443 "
"v3ident=EFCBE720AB3A82B99F9E953CD5BF50F7EEFC7B97 "
"154.35.175.225:80 CF6D 0AAF B385 BE71 B8E1 11FC 5CFF 4B47 9237 33BC",
 -"longclaw orport=443 no-v2 "
 +"longclaw orport=443 "
"v3ident=23D15D965BC35114467363C165C4F724B64B4F66 "
"199.254.238.52:80 74A9 1064 6BCE EFBC D2E8 74FC 1DC9 9743 0F96 8145",
  NULL



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties

2016-01-07 Thread translation

commit 5e591e753d702832de3f534a915b88dd85cfbcfd
Author: Translation commit bot 
Date:   Fri Jan 8 01:45:54 2016 +

Update translations for torbutton-torbuttonproperties
---
 zh_TW/torbutton.properties |   38 +++---
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/zh_TW/torbutton.properties b/zh_TW/torbutton.properties
index 7a072ec..1ce047f 100644
--- a/zh_TW/torbutton.properties
+++ b/zh_TW/torbutton.properties
@@ -23,34 +23,34 @@ torbutton.popup.toggle.warning = 
æ¨éè¦åææ´è¥è·¯ç±çææéæ°å
 torbutton.popup.test.success = æ´è¥è·¯ç±ä»£çä¼ºæå¨æ¸¬è©¦æåï¼
 torbutton.popup.test.failure = 
æ´è¥è·¯ç±ä»£çä¼ºæå¨æ¸¬è©¦å¤±æï¼è«æª¢æ¥æ¨çä»£çä¼ºæå¨å 
Polipo çè¨å®ã
 torbutton.popup.test.confirm_toggle = 
æè¿çæ´è¥è·¯ç±ä»£çä¼ºæå¨æ¸¬è©¦å¤±æï¼ç¡æ³ä½¿ç¨æ´è¥è·¯ç±ã\n\næ¨ç¢ºå®è¦åç¨åï¼\n\næ³¨æï¼è¥æ¨å·²è§£æ±ºåé¡ï¼æ¨å¯ä»¥å¨
 Torbutton 
ä»£çä¼ºæå¨åå¥½è¨å®è¦çªä¸éæ°å·è¡æ¸¬è©¦ï¼ä»¥ä¾¿æ¶é¤æ¤è¦åã
-torbutton.popup.test.ff3_notice = æä¸ä¸ãç¢ºå®ãå¾éå§æ¸¬è©¦ Tor 
ä»£çä¼ºæå¨è¨å®ãæ¤æ¸¬è©¦å°å¨èæ¯éä½ãè«èå¿çåã
-torbutton.panel.label.verified = Tor é©èå®æ
-torbutton.popup.test.auto_failed = èªå Tor 
ä»£çä¼ºæå¨è¨å®ç¡æ³ä½¿ç¨ Torã\n\næ¨ç¢ºå®ççè¦åç¨å?
+torbutton.popup.test.ff3_notice = 
æä¸ä¸ãç¢ºå®ãå¾éå§æ¸¬è©¦æ´è¥è·¯ç±ä»£çä¼ºæå¨è¨å®ãæ¤æ¸¬è©¦å°å¨èæ¯éä½ãè«èå¿çåã
+torbutton.panel.label.verified = æ´è¥è·¯ç±é©èå®æ
+torbutton.popup.test.auto_failed = 
æ´è¥è·¯ç±ä»£çä¼ºæå¨çèªåæ¸¬è©¦å¤±æï¼ç¡æ³ä½¿ç¨æ´è¥è·¯ç±ã\n\næ¨ç¢ºå®ççè¦åç¨åï¼
 torbutton.prefs.recommended = (å»ºè°ä½¿ç¨)
 torbutton.prefs.optional = (é¸ç¨)
 torbutton.prefs.crucial = (éè¦)
-torbutton.popup.external.title = ä¸è¼å¤é¨æªæ¡é¡å?
-torbutton.popup.external.app = Tor 
çè¦½å¨ç¡æ³é¡¯ç¤ºéåæªæ¡ãæ¨å°éè¦ä½¿ç¨å
¶ä»æç¨ç¨å¼å°å®éåã\n\n
-torbutton.popup.external.note = 
æäºæªæ¡é¡åå¯è½å°è´æç¨ç¨å¼ä¸ä½¿ç¨ Tor é£ç·å°ç¶²è·¯ã\n\n
-torbutton.popup.external.suggest = çºäºå®å
¨ï¼æ¨æè©²åªå¨é¢ç·æéåå·²ä¸è¼çæªæ¡ï¼ææ¯ä½¿ç¨å Tails 
ç Tor Live CDã\n
+torbutton.popup.external.title = ä¸è¼å¤é¨æªæ¡é¡åï¼
+torbutton.popup.external.app = 
æ´è¥è·¯ç±çè¦½å¨ç¡æ³é¡¯ç¤ºéåæªæ¡ï¼æ¨å°éè¦ä½¿ç¨å
¶ä»æç¨ç¨å¼å°å®éåã\n\n
+torbutton.popup.external.note = 
æäºæªæ¡é¡åå¯è½æä½¿æç¨ç¨å¼ä¸ç¶éæ´è¥è·¯ç±èç´æ¥é£ä¸ç¶²éç¶²è·¯ã\n\n
+torbutton.popup.external.suggest = çºäºå®å
¨èµ·è¦ï¼æ¨æè©²åªå¨é¢ç·çæ
ææéåå·²ä¸è¼çæªæ¡ï¼ææ¯ä½¿ç¨å Tails ç Tor Live CD 
ä¹é¡çå·¥å·ã\n
 torbutton.popup.launch = ä¸è¼æªæ¡
 torbutton.popup.cancel = åæ¶
 torbutton.popup.dontask = å¾ç¾å¨éå§èªåä¸è¼æªæ¡
-torbutton.popup.test.no_http_proxy = Tor ä»£çä¼ºæå¨æ¸¬è©¦: æ¬æ© HTTP 
ä»£çä¼ºæå¨ç¡æ³é£ç·ãPolipo å¯æ£å¸¸å·è¡å?
-torbutton.popup.captcha.title = é¿å Google çé©èç¢¼?
-torbutton.popup.captcha.ask = Torbutton åµæ¸¬å° Google 
é©èç¢¼ãæ¨è¦çºéæ¬¡æ¥è©¢èè¢«éæ°å°åå°å¶ä»çæå°å¼æå?
-torbutton.popup.captcha.always = å¾ç¾å¨éå§å§çµå·è¡éååä½
+torbutton.popup.test.no_http_proxy = 
æ´è¥è·¯ç±ä»£çä¼ºæå¨æ¸¬è©¦ï¼ç¡æ³é£æ¥ä¸æ¬å°ç«¯ç HTTP 
ä»£çä¼ºæå¨ãPolipo å¯æ£å¸¸å·è¡å?
+torbutton.popup.captcha.title = é¿å Google çé©èç¢¼ï¼
+torbutton.popup.captcha.ask = Torbutton åµæ¸¬å° Google 
é©èç¢¼ãæ¨æ¯å¦æ³è¦å°éæ¬¡çæ¥è©¢éæ°å°åå°å
¶ä»çæå°å¼æï¼
+torbutton.popup.captcha.always = å¾ç¾å¨éå§ç¸½æ¯å·è¡éååä½
 torbutton.popup.redirect = éæ°å°å
 torbutton.popup.no_redirect = ä¸è¦éæ°å°å
-torbutton.popup.prompted_language = çºäºçµ¦æ¨æ´å¤çé±ç§ï¼Torbutton 
å¯ä»¥è«æ±è±æçæ¬çç¶²é ãéå¯è½æå°è´åæ¬æ¯èªé¡¯ç¤ºçç¶²é 
æ¹æä»¥è±æé¡¯ç¤ºã\n\næ¨è¦ä½¿ç¨è±æç¶²é 
ä¾ç²å¾æ´å¥½çé±ç§å?
-torbutton.popup.no_newnym = Torbutton ä¸è½å®å¨å°çµ¦ä½ 
ä¸åæ°çèº«ä»½ãå®ç¡æ³åå Tor æ§å¶é£æ¥å ã\n\næ¨æ£å¨å·è¡ 
Tor çè¦½å¨å¥ä»¶å?
-torbutton.popup.use_tbb = çä¾ï¼æ¨æ£ä»¥ Firefox ä½¿ç¨ 
Torbuttonï¼éä¸åä¸åå»ºè°ä½¿ç¨çå®å
¨è¨å®ã\n\nç¸åï¼æåå»ºè°æ¨èç±ç¼éé»åéµä»¶å° 
get...@torproject.org æå¨ä¸åç¶²åä¸è¼å®åå¾ææ°ç Tor 
çè¦½å¨å¥ä»¶:
-torbutton.popup.pref_error = Torbutton ç¡æ³æ´æ° Tor 
çè¦½å¨è¨å®æªç®éä¸çåå¥½è¨å®ã
-torbutton.popup.permission_denied = è«éè¨ Tor 
çè¦½å¨ç®éçä½¿ç¨æ¬éï¼æå°å¶è¤è£½å°æ°çä½ç½®ã
-torbutton.popup.device_full = ç£ç¢ç©ºéå¯è½å·²æ»¿ãè«éæ¾ç©ºéæå° 
Tor çè¦½å¨ç§»è³æ°çè£ç½®ã
+torbutton.popup.prompted_language =

[tor-commits] [translation/bridgedb_completed] Update translations for bridgedb_completed

2016-01-07 Thread translation

commit 2a1c8548bcdaa87f2d6a6c12e08ca173f53324d0
Author: Translation commit bot 
Date:   Fri Jan 8 03:45:08 2016 +

Update translations for bridgedb_completed
---
 zh_TW/LC_MESSAGES/bridgedb.po |  350 +
 1 file changed, 176 insertions(+), 174 deletions(-)

diff --git a/zh_TW/LC_MESSAGES/bridgedb.po b/zh_TW/LC_MESSAGES/bridgedb.po
index 7603f05..7acc4d6 100644
--- a/zh_TW/LC_MESSAGES/bridgedb.po
+++ b/zh_TW/LC_MESSAGES/bridgedb.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the BridgeDB project.
 # 
 # Translators:
+# AgustÃn Wu , 2016
 # danfong , 2014
 # LNDDYL, 2014
 # Werkt , 2015
@@ -10,14 +11,15 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB=bridgedb-reported,msgid=isis,sysrqb=isis'POT-Creation-Date:
 2015-03-19 22:13+\n"
-"PO-Revision-Date: 2015-09-14 08:08+\n"
-"Last-Translator: Werkt \n"
+"Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB=bridgedb-reported,msgid=isis,sysrqb=isis'\n"
+"POT-Creation-Date: 2015-07-25 03:40+\n"
+"PO-Revision-Date: 2016-01-08 03:44+\n"
+"Last-Translator: AgustÃn Wu \n"
 "Language-Team: Chinese (Taiwan) 
(http://www.transifex.com/otf/torproject/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
+"Generated-By: Babel 1.3\n"
 "Language: zh_TW\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
@@ -32,57 +34,182 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
 msgid "Sorry! Something went wrong with your request."
-msgstr "æ±æ!æ¨çè«æ±ç¼çé¯èª¤ã"
+msgstr "æ±æï¼æ¨çè«æ±ç¼çé¯èª¤ã"
 
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr "åå ±é¯èª¤"
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr "åå§ç¨å¼ç¢¼"
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr "è®æ´è¨é"
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr "è¯çµ¡è³è¨"
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "é¸æå¨é¨"
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "åºç¤º QRCode"
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "æ¨çæ©æ¥ç QRCode"
+
+#. 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!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr "æåé¡!"
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr "ææ QRCode æä¼¼ä¹ç¼çé¯èª¤"
+
+#: bridgedb/https/templates/bridges.html:73
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr "éå QRCode 
éææ¨çæ©æ¥è³è¨ãå¨è¡åè£ç½®ä¸ææä»¥ç²å¾æ¨çæ©æ¥è³è¨"
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr "ç®åæ²æä»»ä½æ©å¨æ¥å¯ç¨."
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr " ä¹è¨±æ¨æåè©¦ %s åå° %sï¼ç¶å¾é¸æä¸åçæ©æ¥é¡å!"
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "æ¥é© %s1%s"
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "ä¸è¼ %s æ´è¥è·¯ç±çè¦½å¨ %s"
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "æ¥é© %s2%s"
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "åå¾ %s æ©æ¥ %s"
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "æ¥é© %s3%s"
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "ç¾å¨ %s å°æ©æ¥å å¥å° Tor çè¦½å¨ %s"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me

[tor-commits] [translation/https_everywhere] Update translations for https_everywhere

2016-01-07 Thread translation

commit 459db11e589ae3133bfccdafccb241534d8638b0
Author: Translation commit bot 
Date:   Fri Jan 8 03:45:22 2016 +

Update translations for https_everywhere
---
 zh_TW/https-everywhere.dtd |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/zh_TW/https-everywhere.dtd b/zh_TW/https-everywhere.dtd
index 7c37f3f..fa740b2 100644
--- a/zh_TW/https-everywhere.dtd
+++ b/zh_TW/https-everywhere.dtd
@@ -9,7 +9,7 @@
 
 
 
-
+
 
 
 
@@ -36,7 +36,7 @@
 
 
 
-
+
 
 
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tor-messenger-facebookproperties_completed] Update translations for tor-messenger-facebookproperties_completed

2016-01-07 Thread translation

commit ae710f756bbb3482c60c7f31d9babced812976f1
Author: Translation commit bot 
Date:   Fri Jan 8 03:47:06 2016 +

Update translations for tor-messenger-facebookproperties_completed
---
 zh_TW/facebook.properties |7 +++
 1 file changed, 7 insertions(+)

diff --git a/zh_TW/facebook.properties b/zh_TW/facebook.properties
new file mode 100644
index 000..3297ea5
--- /dev/null
+++ b/zh_TW/facebook.properties
@@ -0,0 +1,7 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+connection.error.useUsernameNotEmailAddress=è«è¼¸å¥æ¨çèæ¸ä½¿ç¨è
åç¨±ï¼ä¸æ¯é»åéµä»¶ä½å
+
+facebook.chat.name=èæ¸èå¤©

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tor-messenger-conversationsproperties_completed] Update translations for tor-messenger-conversationsproperties_completed

2016-01-07 Thread translation

commit 1e2c35bbca4c30564f164176537a88d7c895348b
Author: Translation commit bot 
Date:   Fri Jan 8 03:46:56 2016 +

Update translations for tor-messenger-conversationsproperties_completed
---
 zh_TW/conversations.properties |   80 
 1 file changed, 80 insertions(+)

diff --git a/zh_TW/conversations.properties b/zh_TW/conversations.properties
new file mode 100644
index 000..2b536eb
--- /dev/null
+++ b/zh_TW/conversations.properties
@@ -0,0 +1,80 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# LOCALIZATION NOTE (targetChanged):
+#  %1$S is the new conversation title (display name of the new target),
+#  %2$S is the protocol name used for the new target.
+targetChanged=å°ä½¿ç¨ %2$S ç¹¼çºè %1$S äº¤è«ã
+
+# LOCALIZATION NOTE (statusChanged):
+#  %1$S is the display name of the contact.
+#  %2$S is the new status type (a value from status.properties).
+statusChanged=%1$S ç¾å¨æ¯ %2$S.
+# LOCALIZATION NOTE (statusChangedWithStatusText):
+#  %1$S is the display name of the contact.
+#  %2$S is the new status type (a value from status.properties).
+#  %3$S is the status text (eg. "I'm currently away from the computer").
+statusChangedWithStatusText=%1$S ç¾å¨æ¯ %2$S: %3$S.
+# LOCALIZATION NOTE (statusChangedFromUnknown[WithStatusText]):
+#  special case of the previous 2 strings for when the status was
+#  previously unknown. These 2 strings should not mislead the user
+#  into thinking the person's status has just changed.
+statusChangedFromUnknown=%1$S å°±æ¯ %2$S.
+statusChangedFromUnknownWithStatusText=%1$S å°±æ¯ %2$S: %3$S.
+# LOCALIZATION NOTE (statusKnown[WithStatusText]):
+# special case of the previous 2 strings for when an account has just
+# been reconnected, so the status is now known. These 2 strings should not
+# mislead the user into thinking the person's status has just changed.
+statusKnown=æ¨çå¸³èå·²ç¶éæ°é£ä¸ç· ((%1$S å°±æ¯ %2$S)ã
+statusKnownWithStatusText=æ¨çå¸³èå·²ç¶éæ°é£ä¸ç· (%1$S å°±æ¯ %2$S: 
%3$S)ã
+# LOCALIZATION NOTE (statusUnknown):
+#  %S is the display name of the contact.
+statusUnknown=æ¨çå¸³èå·²ç¶æ·ç· (%S ççæç®åæªç¥)ã
+
+accountDisconnected=æ¨çå¸³èå·²ç¶æ·ç·ã
+accountReconnected=æ¨çå¸³èå·²ç¶éæ°é£ä¸ç·ã
+
+# LOCALIZATION NOTE (autoReply):
+#  %S is replaced by the text of a message that was sent as an automatic reply.
+autoReply=èªååè¦ - %S
+
+# LOCALIZATION NOTE (noTopic):
+# Displayed instead of the topic when no topic is set.
+noTopic=æ¤èå¤©å®¤æ²æè¨è«ä¸»é¡ã
+
+# LOCALIZATION NOTE (topicSet):
+#  %1$S is the conversation name, %2$S is the topic.
+topicSet=%1$S çè¨è«ä¸»é¡æ¯ï¼ %2$S
+# LOCALIZATION NOTE (topicNotSet):
+#  %S is the conversation name.
+topicNotSet=%S æ²æä¸»é¡ã
+# LOCALIZATION NOTE (topicChanged):
+#  %1$S is the user who changed the topic, %2$S is the new topic.
+topicChanged=%1$S ä»¥å°ä¸»é¡æ´æ¹çºï¼%2$S
+# LOCALIZATION NOTE (topicCleared):
+#  %1$S is the user who cleared the topic.
+topicCleared=%1$S å·²ç¶æ¸é¤ä¸»é¡ã
+
+# LOCALIZATION NOTE (nickSet):
+#   This is displayed as a system message when a participant changes his/her
+#   nickname in a conversation.
+#   %1$S is the old nick.
+#   %2$S is the new nick.
+nickSet=%1$S ç¾å¨æ¹åçº %2$S.
+# LOCALIZATION NOTE (nickSet.you):
+#   This is displayed as a system message when your nickname is changed.
+#   %S is your new nick.
+nickSet.you=æ¨ç¾å¨çåç¨±æ¯ %Sã
+
+# LOCALIZATION NOTE (messenger.conversations.selections.ellipsis):
+#  ellipsis is used when copying a part of a message to show that the message 
was cut
+messenger.conversations.selections.ellipsis=[â¦]
+
+# LOCALIZATION NOTE 
(messenger.conversations.selections.{system,content,action}MessagesTemplate):
+#  These 3 templates are used to format selected messages before copying them.
+#  Do not translate the texts between % characters, but feel free to adjust
+#  whitespace and separators to make them fit your locale.
+messenger.conversations.selections.systemMessagesTemplate=%time% - %message%
+messenger.conversations.selections.contentMessagesTemplate=%time% - %sender%: 
%message%
+messenger.conversations.selections.actionMessagesTemplate=%time% * %sender% 
%message%

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tor-messenger-imtooltipproperties] Update translations for tor-messenger-imtooltipproperties

2016-01-07 Thread translation

commit 1177f5cac3539988f7db878deb19093813a31412
Author: Translation commit bot 
Date:   Fri Jan 8 03:47:16 2016 +

Update translations for tor-messenger-imtooltipproperties
---
 zh_TW/imtooltip.properties |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/zh_TW/imtooltip.properties b/zh_TW/imtooltip.properties
index 9e4de88..613a0cd 100644
--- a/zh_TW/imtooltip.properties
+++ b/zh_TW/imtooltip.properties
@@ -2,6 +2,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-buddy.username=ç¨æ·å
-buddy.account=Account
-contact.tags=Tags
+buddy.username=ä½¿ç¨èåç¨±
+buddy.account=å¸³è
+contact.tags=æ¨ç±¤

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tor-messenger-contactsproperties] Update translations for tor-messenger-contactsproperties

2016-01-07 Thread translation

commit a71c55138f1fa972b68d1c52c718d3be30e016b0
Author: Translation commit bot 
Date:   Fri Jan 8 03:46:42 2016 +

Update translations for tor-messenger-contactsproperties
---
 zh_TW/contacts.properties |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zh_TW/contacts.properties b/zh_TW/contacts.properties
index 33af79c..01b8505 100644
--- a/zh_TW/contacts.properties
+++ b/zh_TW/contacts.properties
@@ -5,4 +5,4 @@
 # LOCALIZATION NOTE (defaultGroup):
 # This is the name of the group that will automatically be created when adding 
a
 # buddy without specifying a group.
-defaultGroup=Contacts
+defaultGroup=é£çµ¡äºº

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tor-messenger-commandsproperties] Update translations for tor-messenger-commandsproperties

2016-01-07 Thread translation

commit 14dbf5b60bdb199eb775e1a1d32e5ca60c13f636
Author: Translation commit bot 
Date:   Fri Jan 8 03:46:36 2016 +

Update translations for tor-messenger-commandsproperties
---
 zh_TW/commands.properties |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/zh_TW/commands.properties b/zh_TW/commands.properties
index e531a97..3f30b61 100644
--- a/zh_TW/commands.properties
+++ b/zh_TW/commands.properties
@@ -20,8 +20,8 @@ helpHelpString=help name: show the help message for 
the name com
 #  %2$S is replaced with the localized version of that status type
 #   (one of the 5 strings below).
 statusCommand=%1$S status message: set the status to %2$S with an 
optional status message.
-back=available
-away=away
-busy=unavailable
-dnd=unavailable
-offline=offline
+back=å¯ç¨
+away=é¢é
+busy=ä¸å¯ç¨
+dnd=ä¸å¯ç¨
+offline=é¢ç·

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tor-messenger-authproperties] Update translations for tor-messenger-authproperties

2016-01-07 Thread translation

commit 034ffde4c83c56a01a2a40016d48b494f0f24cd8
Author: Translation commit bot 
Date:   Fri Jan 8 03:46:26 2016 +

Update translations for tor-messenger-authproperties
---
 zh_TW/auth.properties |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/zh_TW/auth.properties b/zh_TW/auth.properties
index bdabd91..c99a150 100644
--- a/zh_TW/auth.properties
+++ b/zh_TW/auth.properties
@@ -7,6 +7,6 @@ 
auth.question=ä»¥ä¸æ¯å°æ¹å°æ¨æåºçåé¡ï¼\n\n$S\n\nè«å¨æ¤è¼¸å¥
 auth.secret=è«å¨æ¤è¼¸å¥ç§å¯ï¼
 auth.error=å°æ¹èº«ä»½çé©èç¼çé¯èª¤ã
 auth.success=å°æ¹çèº«ä»½é©èæåã
-auth.successThem=Your contact has successfully verified your identity. You may 
want to verify their identity as well by asking your own question.
-auth.fail=Failed to verify your contact's identity.
+auth.successThem=å°æ¹å·²ç¶æåå°é©èæ¨çèº«ä»½ãç¾å¨æ¨å¯ä»¥å°å°æ¹æåä»¥é©èä»çèº«ä»½ã
+auth.fail=æ¨çèº«ä»½é©èå¤±æã
 auth.done=å®æ

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/https_everywhere_completed] Update translations for https_everywhere_completed

2016-01-07 Thread translation

commit f823cac530cc0dc63942215bc4a0c0f5fc0441d8
Author: Translation commit bot 
Date:   Fri Jan 8 03:45:28 2016 +

Update translations for https_everywhere_completed
---
 zh_TW/https-everywhere.dtd |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/zh_TW/https-everywhere.dtd b/zh_TW/https-everywhere.dtd
index 7c37f3f..fa740b2 100644
--- a/zh_TW/https-everywhere.dtd
+++ b/zh_TW/https-everywhere.dtd
@@ -9,7 +9,7 @@
 
 
 
-
+
 
 
 
@@ -36,7 +36,7 @@
 
 
 
-
+
 
 
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tor-messenger-contactsproperties_completed] Update translations for tor-messenger-contactsproperties_completed

2016-01-07 Thread translation

commit 4516fdf66e8c815ab2e4ab2dab8b0ec734e0ed76
Author: Translation commit bot 
Date:   Fri Jan 8 03:46:47 2016 +

Update translations for tor-messenger-contactsproperties_completed
---
 zh_TW/contacts.properties |8 
 1 file changed, 8 insertions(+)

diff --git a/zh_TW/contacts.properties b/zh_TW/contacts.properties
new file mode 100644
index 000..01b8505
--- /dev/null
+++ b/zh_TW/contacts.properties
@@ -0,0 +1,8 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# LOCALIZATION NOTE (defaultGroup):
+# This is the name of the group that will automatically be created when adding 
a
+# buddy without specifying a group.
+defaultGroup=é£çµ¡äºº

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/mat-gui] Update translations for mat-gui

2016-01-07 Thread translation

commit f144cd7fc909cd82f46b7d05742728e3a36420bf
Author: Translation commit bot 
Date:   Thu Jan 7 20:16:38 2016 +

Update translations for mat-gui
---
 tr.po |  130 -
 1 file changed, 65 insertions(+), 65 deletions(-)

diff --git a/tr.po b/tr.po
index c3cddb4..63948d5 100644
--- a/tr.po
+++ b/tr.po
@@ -6,15 +6,15 @@
 # GÃ¼ven ALBAYRAK , 2014
 # Kaya Zeren , 2015
 # Ozancan KarataÅ , 2015
-# Volkan Gezer , 2015
+# Volkan Gezer , 2015-2016
 # Yasin Ãzel , 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 15:03+0100\n"
-"PO-Revision-Date: 2015-12-17 14:14+\n"
-"Last-Translator: Ozancan KarataÅ \n"
+"POT-Creation-Date: 2016-01-03 20:54+0100\n"
+"PO-Revision-Date: 2016-01-07 20:07+\n"
+"Last-Translator: Volkan Gezer \n"
 "Language-Team: Turkish 
(http://www.transifex.com/otf/torproject/language/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,171 +22,171 @@ msgstr ""
 "Language: tr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: mat-gui:64 mat-gui:415 mat-gui:438
+#: mat-gui:66 mat-gui:422 mat-gui:445
 msgid "Ready"
 msgstr "HazÄ±r"
 
-#: mat-gui:133
+#: mat-gui:136
 msgid "Choose files"
 msgstr "DosyalarÄ± seÃ§in"
 
-#: mat-gui:141
-msgid "All files"
-msgstr "TÃ¼m dosyalar"
-
-#: mat-gui:147
+#: mat-gui:144
 msgid "Supported files"
 msgstr "Desteklenen dosyalar"
 
-#: mat-gui:164 mat-gui:359 mat-gui:410 mat-gui:434 mat-gui:436
-#: data/mat.glade:480
+#: mat-gui:151
+msgid "All files"
+msgstr "TÃ¼m dosyalar"
+
+#: mat-gui:167 mat-gui:366 mat-gui:417 mat-gui:441 mat-gui:443
+#: data/mat.glade:200
 msgid "Clean"
 msgstr "Temizle"
 
-#: mat-gui:165
+#: mat-gui:168
 msgid "No metadata found"
 msgstr "Ãstveri bulunamadÄ±"
 
-#: mat-gui:167 mat-gui:412
+#: mat-gui:170 mat-gui:419
 msgid "Dirty"
 msgstr "Kirli"
 
-#: mat-gui:172
+#: mat-gui:176
 #, python-format
 msgid "%s's metadata"
 msgstr "%s Ã¼stverisi"
 
-#: mat-gui:183
+#: mat-gui:187
 msgid "Trash your meta, keep your data"
 msgstr "Ãstveriyi Ã§Ã¶pe at, verileri sakla"
 
-#: mat-gui:188
+#: mat-gui:192
 msgid "Website"
 msgstr "Web sitesi"
 
-#: mat-gui:214
+#: mat-gui:219
 msgid "Preferences"
 msgstr "Ayarlar"
 
-#: mat-gui:227
+#: mat-gui:232
 msgid "Reduce PDF quality"
 msgstr "PDF kalitesini dÃ¼ÅÃ¼r"
 
-#: mat-gui:230
+#: mat-gui:235
 msgid "Reduce the produced PDF size and quality"
 msgstr "OluÅturulan PDF dosyasÄ±nÄ±n boyutunu ve kalitesini dÃ¼ÅÃ¼r"
 
-#: mat-gui:233
+#: mat-gui:238
 msgid "Add unsupported file to archives"
 msgstr "Desteklenmeyen dosyalarÄ± arÅive ekle"
 
-#: mat-gui:236
+#: mat-gui:241
 msgid "Add non-supported (and so non-anonymised) file to output archive"
 msgstr "Desteklenmeyen (ve anonimleÅtirilmemiÅ) dosyalarÄ± Ã§Ä±kÄ±Å 
arÅivine ekle"
 
-#: mat-gui:275
+#: mat-gui:280
 msgid "Unknown"
 msgstr "Bilinmeyen"
 
-#: mat-gui:318
+#: mat-gui:325
 msgid "Not-supported"
 msgstr "Desteklenmeyen"
 
-#: mat-gui:332
+#: mat-gui:339
 msgid "Harmless fileformat"
 msgstr "ZararsÄ±z dosya biÃ§imi"
 
-#: mat-gui:334
+#: mat-gui:341
 msgid "Cant read file"
-msgstr "Dosya okunamaz"
+msgstr "Dosya okunamÄ±yor"
 
-#: mat-gui:336
+#: mat-gui:343
 msgid "Fileformat not supported"
 msgstr "Dosya biÃ§imi desteklenmiyor"
 
-#: mat-gui:339
+#: mat-gui:346
 msgid "These files can not be processed:"
 msgstr "Bu dosyalar iÅlenemez:"
 
-#: mat-gui:344 mat-gui:373 data/mat.glade:519
+#: mat-gui:351 mat-gui:380 data/mat.glade:239
 msgid "Filename"
 msgstr "Dosya AdÄ±"
 
-#: mat-gui:346
+#: mat-gui:353
 msgid "Reason"
 msgstr "Neden"
 
-#: mat-gui:358
+#: mat-gui:365
 msgid "Non-supported files in archive"
 msgstr "ArÅivdeki desteklenmeyen dosyalar"
 
-#: mat-gui:372
+#: mat-gui:379
 msgid "Include"
 msgstr "Kat"
 
-#: mat-gui:390
+#: mat-gui:397
 #, python-format
 msgid "MAT is not able to clean the following files, found in the %s archive"
 msgstr "MAT %s arÅivinde bulunan Åu dosyalarÄ± temizleyemedi"
 
-#: mat-gui:406
+#: mat-gui:413
 #, python-format
 msgid "Checking %s"
 msgstr "%s denetleniyor"
 
-#: mat-gui:421
+#: mat-gui:428
 #, python-format
 msgid "Cleaning %s"
 msgstr "%s temizleniyor"
 
-#: data/mat.glade:26 data/mat.glade:196
+#: data/mat.glade:46
+msgid "_File"
+msgstr "_Dosya"
+
+#: data/mat.glade:95
+msgid "_Edit"
+msgstr "DÃ¼_zenle"
+
+#: data/mat.glade:141
+msgid "_Help"
+msgstr "_YardÄ±m"
+
+#: data/mat.glade:187
+msgid "Add"
+msgstr "Ekle"
+
+#: data/mat.glade:256
+msgid "State"
+msgstr "Durum"
+
+#: data/mat.glade:294 data/mat.glade:467
 msgid "Metadata"
 msgstr "Ãst veri"
 
-#: data/mat.glade:85
+#: data/mat.glade:354
 msgid "Name"
 msgstr "Ad"
 
-#: data/mat.glade:99
+#:

[tor-commits] [translation/abouttor-homepage] Update translations for abouttor-homepage

2016-01-07 Thread translation

commit 3a6a4616004e499e226f615cca2a0e6152f5cdc6
Author: Translation commit bot 
Date:   Thu Jan 7 20:17:19 2016 +

Update translations for abouttor-homepage
---
 tr/aboutTor.dtd |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tr/aboutTor.dtd b/tr/aboutTor.dtd
index b359035..6546f6d 100644
--- a/tr/aboutTor.dtd
+++ b/tr/aboutTor.dtd
@@ -13,7 +13,7 @@
 
 
 
-
+
 
 
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tails-misc_completed] Update translations for tails-misc_completed

2016-01-07 Thread translation

commit 0696b446a9be4bceb9b8499eb02597829e4c2ca0
Author: Translation commit bot 
Date:   Thu Jan 7 20:17:14 2016 +

Update translations for tails-misc_completed
---
 tr.po |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tr.po b/tr.po
index a38f3e5..86d111b 100644
--- a/tr.po
+++ b/tr.po
@@ -18,15 +18,15 @@
 # Tails_developers , 2014
 # Tails_developers , 2014
 # Ãmit TÃ¼rk , 2013
-# Volkan Gezer , 2013-2015
+# Volkan Gezer , 2013-2016
 # Yasin Ãzel , 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-01-04 11:56+0100\n"
-"PO-Revision-Date: 2016-01-06 10:56+\n"
-"Last-Translator: Ozancan KarataÅ \n"
+"PO-Revision-Date: 2016-01-07 20:15+\n"
+"Last-Translator: Volkan Gezer \n"
 "Language-Team: Turkish 
(http://www.transifex.com/otf/torproject/language/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -40,7 +40,7 @@ msgstr "Tor hazÄ±r"
 
 #: 
config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready.sh:40
 msgid "You can now access the Internet."
-msgstr "ArtÄ±k Internet'e eriÅebilirsiniz."
+msgstr "ArtÄ±k Ä°nternet'e eriÅebilirsiniz."
 
 #: config/chroot_local-includes/etc/whisperback/config.py:65
 #, python-format
@@ -425,7 +425,7 @@ msgid ""
 "Network activity within the Unsafe Browser is not anonymous.\\nOnly "
 "use the Unsafe Browser if necessary, for example\\nif you have to login or "
 "register to activate your Internet connection."
-msgstr "GÃ¼vensiz TarayÄ±cÄ± ile aÄ etkinlikleriniz anonim 
deÄildir.\\nGÃ¼vensiz TarayÄ±cÄ±yÄ± yalnÄ±zca kullanmanÄ±z gerekiyorsa, 
Ã¶rneÄin\\nInternet baÄlantÄ±nÄ±zÄ± etkinleÅtirmek iÃ§in kaydolmanÄ±z ya da 
oturum aÃ§manÄ±z gerekiyorsa kullanÄ±n."
+msgstr "GÃ¼vensiz TarayÄ±cÄ± ile aÄ etkinlikleriniz anonim 
deÄildir.\\nGÃ¼vensiz TarayÄ±cÄ±yÄ± yalnÄ±zca kullanmanÄ±z gerekiyorsa, 
Ã¶rneÄin\\nÄ°nternet baÄlantÄ±nÄ±zÄ± etkinleÅtirmek iÃ§in kaydolmanÄ±z ya da 
oturum aÃ§manÄ±z gerekiyorsa kullanÄ±n."
 
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:47
 msgid "Starting the Unsafe Browser..."

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/abouttor-homepage_completed] Update translations for abouttor-homepage_completed

2016-01-07 Thread translation

commit 3eec19b2192909986688abbcff581bd40b6d8fb9
Author: Translation commit bot 
Date:   Thu Jan 7 20:17:24 2016 +

Update translations for abouttor-homepage_completed
---
 tr/aboutTor.dtd |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tr/aboutTor.dtd b/tr/aboutTor.dtd
index b359035..6546f6d 100644
--- a/tr/aboutTor.dtd
+++ b/tr/aboutTor.dtd
@@ -13,7 +13,7 @@
 
 
 
-
+
 
 
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tails-greeter] Update translations for tails-greeter

2016-01-07 Thread translation

commit 3c6596f07725834076f4e1205d8b96e399dac062
Author: Translation commit bot 
Date:   Thu Jan 7 20:16:11 2016 +

Update translations for tails-greeter
---
 tr/tr.po |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tr/tr.po b/tr/tr.po
index 805795b..52e1f12 100644
--- a/tr/tr.po
+++ b/tr/tr.po
@@ -13,14 +13,14 @@
 # sgtpepper , 2013
 # tim.tanurhan , 2014
 # tim.tanurhan , 2014
-# Volkan Gezer , 2014
+# Volkan Gezer , 2014,2016
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+\n"
-"Last-Translator: carolyn \n"
+"PO-Revision-Date: 2016-01-07 20:01+\n"
+"Last-Translator: Volkan Gezer \n"
 "Language-Team: Turkish 
(http://www.transifex.com/otf/torproject/language/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -38,7 +38,7 @@ msgstr "Oturum aÃ§"
 
 #: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
 msgid "Welcome to Tails"
-msgstr "Tails'e hoÅ geldiniz"
+msgstr "Tails'e HoÅ Geldiniz"
 
 #: ../glade/persistencewindow.glade.h:4
 msgid "Use persistence?"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tails-greeter_completed] Update translations for tails-greeter_completed

2016-01-07 Thread translation

commit f6f7c79c4c737613b7030bac942ce5b4b0a24ed1
Author: Translation commit bot 
Date:   Thu Jan 7 20:16:18 2016 +

Update translations for tails-greeter_completed
---
 tr/tr.po |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tr/tr.po b/tr/tr.po
index 805795b..52e1f12 100644
--- a/tr/tr.po
+++ b/tr/tr.po
@@ -13,14 +13,14 @@
 # sgtpepper , 2013
 # tim.tanurhan , 2014
 # tim.tanurhan , 2014
-# Volkan Gezer , 2014
+# Volkan Gezer , 2014,2016
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+\n"
-"Last-Translator: carolyn \n"
+"PO-Revision-Date: 2016-01-07 20:01+\n"
+"Last-Translator: Volkan Gezer \n"
 "Language-Team: Turkish 
(http://www.transifex.com/otf/torproject/language/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -38,7 +38,7 @@ msgstr "Oturum aÃ§"
 
 #: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
 msgid "Welcome to Tails"
-msgstr "Tails'e hoÅ geldiniz"
+msgstr "Tails'e HoÅ Geldiniz"
 
 #: ../glade/persistencewindow.glade.h:4
 msgid "Use persistence?"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings

2016-01-07 Thread translation

commit c675a2f028c6f1a0dad3963d94c52a94cf697a1e
Author: Translation commit bot 
Date:   Thu Jan 7 20:17:01 2016 +

Update translations for tor-launcher-network-settings
---
 tr/network-settings.dtd |   14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/tr/network-settings.dtd b/tr/network-settings.dtd
index c37d65d..0b05f9c 100644
--- a/tr/network-settings.dtd
+++ b/tr/network-settings.dtd
@@ -12,7 +12,7 @@
 
 
 
-
+
 
 
 
@@ -22,11 +22,11 @@
 
 
 
-
+
 
 
-
-
+
+
 
 
 
@@ -36,7 +36,7 @@
 
 
 
-
+
 
 
 
@@ -48,7 +48,7 @@
 
 
 
-
+
 
 
 
@@ -57,7 +57,7 @@
 
 
 
-
+
 
 
 https://bridges.torproject.org adresini ziyaret edin">

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torspec/master] Update Proposal #247 based on discussion and community review.

2016-01-07 Thread nickm

commit e95002e05a18761ca74aebe144b04f658fba9a89
Author: Mike Perry 
Date:   Wed Sep 9 02:38:14 2015 +0300

Update Proposal #247 based on discussion and community review.

The following changes were made:

* Randomize second and third guard layers.

* Fold in my comments about using disjoint sets ("buckets") for the
  third level guard.

* Make the paremeter discussion subsection its own section, and include 
tables
  with far more detail for the Sybil success rates.

* Changed the default parameters based on these tables, and based on my own
  intuition about Tor's performance properties.

* Move the load balancing, torrc, and other performance considerations to
  their own section (Section 5).

* Move "3.2. Distinguishing new HS circuits from normal HS circuits" to
  section 4.1.

* Fold in some of "3.3. Circuit nodes can now be linked to specific hidden
  services" into 4.1. Some of it I just removed, though, because I did not 
find
  it credible.

* Added Roger's concerns about guard linkability to Section 4.2.

* Added a denial of service subsection to Section 4.3.

* Try to make a coherent threat model and specify its assumptions

* Put the rotation period in a separate subsection from the number of guards

* Switch to using min(X,X) and max(X,X) for the distribution for the
  second and third layer guard lifespans, respectively. Add a subsection
  describing this distribution (3.2.3)

* Include python functions for the min and max probability distributions.

* Mention that third nodes can probe to see if they are one of the current
  RPs.

* Provide CDF for rotation functions for Sybil runtime expecations.

* Add s7r's DoS points.

* Add notes from Thursday dev meeting discussion.

* Address Aaron's mailinglist comments (except for the CDF).

* Add discussion items from the dev meeting.
---
 proposals/247-hs-guard-discovery.txt |  777 --
 1 file changed, 639 insertions(+), 138 deletions(-)

diff --git a/proposals/247-hs-guard-discovery.txt 
b/proposals/247-hs-guard-discovery.txt
index f6ead25..0d9cd96 100644
--- a/proposals/247-hs-guard-discovery.txt
+++ b/proposals/247-hs-guard-discovery.txt
@@ -1,6 +1,6 @@
 Filename: 247-hs-guard-discovery.txt
 Title: Defending Against Guard Discovery Attacks using Vanguards
-Author: George Kadianakis
+Authors: George Kadianakis and Mike Perry
 Created: 2015-07-10
 Status: Draft
 
@@ -11,211 +11,712 @@ Status: Draft
   provides an attack vector for a guard discovery attack since anyone
   can force an HS to construct a 3-hop circuit to a relay (#9001).
 
-  Following the guard discovery attack with a compromise or coercion
-  of the guard node can lead to the deanonymization of a hidden
-  service.
+  Following the guard discovery attack with a compromise and/or
+  coercion of the guard node can lead to the deanonymization of a
+  hidden service.
 
 1. Overview
 
-  This document tries to make the above guard discovery + coersion
+  This document tries to make the above guard discovery + compromise
   attack harder to launch. It introduces an optional configuration
   option which makes the hidden service also pin the second and third
   hops of its circuits for a longer duration.
 
   With this new path selection, we force the adversary to perform a
-  Sybil attack and two coercion attacks before succeeding.  This is
+  Sybil attack and two compromise attacks before succeeding. This is
   an improvement over the current state where the Sybil attack is
-  trivial to pull off, and only a single coercion attack is required.
+  trivial to pull off, and only a single compromise attack is required.
 
-  With this new path selection, an attacker is forced to do a
-  coercion attack before learning the guard node of a hidden
-  service. This increases the uncertainty of the attacker, since he
-  will need to perform a coercion attack before he learns the
-  identity of the guard node and whether he can compromise
-  it. Coercion attacks are costly and potentially detectable, so an
-  attacker will have to think twice before beginning a chain of
-  coercion attacks that he might not be able to complete.
+  With this new path selection, an attacker is forced to do a one or
+  more node compromise attacks before learning the guard node of a hidden
+  service. This increases the uncertainty of the attacker, since
+  compromise attacks are costly and potentially detectable, so an
+  attacker will have to think twice before beginning a chain of node
+  compromise attacks that he might not be able to complete.
 
 1.1. Visuals
 
   Here is how a hidden service rendezvous circuit currently looks like:
 
--> middle_1 -> middle_A
--> middle_2 -> middle_B
-

[tor-commits] [translation/torcheck] Update translations for torcheck

2016-01-07 Thread translation

commit 5c76af74623b1a82b7f65567709c2ecc62fc225f
Author: Translation commit bot 
Date:   Thu Jan 7 20:45:16 2016 +

Update translations for torcheck
---
 tr/torcheck.po |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tr/torcheck.po b/tr/torcheck.po
index 39df138..9689dde 100644
--- a/tr/torcheck.po
+++ b/tr/torcheck.po
@@ -17,7 +17,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "POT-Creation-Date: 2012-02-16 20:28+PDT\n"
-"PO-Revision-Date: 2016-01-07 20:08+\n"
+"PO-Revision-Date: 2016-01-07 20:17+\n"
 "Last-Translator: Volkan Gezer \n"
 "Language-Team: Turkish 
(http://www.transifex.com/otf/torproject/language/tr/)\n"
 "MIME-Version: 1.0\n"
@@ -34,7 +34,7 @@ msgid ""
 "Please refer to the https://www.torproject.org/\;>Tor website "
 "for further information about using Tor safely.  You are now free to browse "
 "the Internet anonymously."
-msgstr "LÃ¼tfen Tor'u gÃ¼venli olarak kullanmak hakkÄ±nda daha ayrÄ±ntÄ±lÄ± 
bilgi almak iÃ§in https://www.torproject.org/\;>Tor web sitesine 
bakÄ±n. ArtÄ±k Internet'te anonim olarak Ã¶zgÃ¼rce dolaÅabilirsiniz."
+msgstr "LÃ¼tfen Tor'u gÃ¼venli olarak kullanmak hakkÄ±nda daha ayrÄ±ntÄ±lÄ± 
bilgi almak iÃ§in https://www.torproject.org/\;>Tor web sitesine 
bakÄ±n. ArtÄ±k Ä°nternet'te anonim olarak Ã¶zgÃ¼rce dolaÅabilirsiniz."
 
 msgid "There is a security update available for Tor Browser."
 msgstr "Tor Browser iÃ§in bir gÃ¼venlik gÃ¼ncellemesi kullanÄ±labilir."

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/bridgedb_completed] Update translations for bridgedb_completed

2016-01-07 Thread translation

commit 9c8134af0d7bc486f7d96cb7835698aec5dff6f1
Author: Translation commit bot 
Date:   Thu Jan 7 20:45:08 2016 +

Update translations for bridgedb_completed
---
 tr/LC_MESSAGES/bridgedb.po |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tr/LC_MESSAGES/bridgedb.po b/tr/LC_MESSAGES/bridgedb.po
index 23e2737..56066a2 100644
--- a/tr/LC_MESSAGES/bridgedb.po
+++ b/tr/LC_MESSAGES/bridgedb.po
@@ -27,7 +27,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB=bridgedb-reported,msgid=isis,sysrqb=isis'\n"
 "POT-Creation-Date: 2015-07-25 03:40+\n"
-"PO-Revision-Date: 2016-01-07 20:14+\n"
+"PO-Revision-Date: 2016-01-07 20:18+\n"
 "Last-Translator: Volkan Gezer \n"
 "Language-Team: Turkish 
(http://www.transifex.com/otf/torproject/language/tr/)\n"
 "MIME-Version: 1.0\n"
@@ -242,7 +242,7 @@ msgid ""
 "difficult for anyone watching your internet traffic to determine that you 
are\n"
 "using Tor.\n"
 "\n"
-msgstr "BridgeDB, Ã§eÅitli %stipte TakÄ±labilir AktarÄ±mlar%s iÃ§eren 
kÃ¶prÃ¼ler saÄlayabilir.\nBÃ¶ylece Tor AÄÄ± Ã¼zerine yaptÄ±ÄÄ±nÄ±z 
baÄlantÄ±lar karÄ±ÅtÄ±rÄ±larak, Internet trafiÄinizi\nizleyen birinin Tor 
kullandÄ±ÄÄ±nÄ±zÄ± anlamasÄ± zorlaÅtÄ±rÄ±labilir.\n\n"
+msgstr "BridgeDB, Ã§eÅitli %stipte TakÄ±labilir AktarÄ±mlar%s iÃ§eren 
kÃ¶prÃ¼ler saÄlayabilir.\nBÃ¶ylece Tor AÄÄ± Ã¼zerine yaptÄ±ÄÄ±nÄ±z 
baÄlantÄ±lar karÄ±ÅtÄ±rÄ±larak, Ä°nternet trafiÄinizi\nizleyen birinin Tor 
kullandÄ±ÄÄ±nÄ±zÄ± anlamasÄ± zorlaÅtÄ±rÄ±labilir.\n\n"
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #: bridgedb/strings.py:79
@@ -264,7 +264,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 "Ek olarak BridgeDB %s hiÃ§bir TakÄ±labilir AktarÄ±mÄ± kullanmayan %s 
birÃ§ok eski, sÄ±radan\nve Ã¶zelliksiz kÃ¶prÃ¼ye sahiptir. KulaÄa iyi 
gelmeyebilir ancak bu kÃ¶prÃ¼ler hala pek Ã§ok\ndurumda Internet 
kÄ±sÄ±tlamalarÄ±nÄ± aÅmaya yardÄ±m edebilirler.\n\n"
+msgstr "Ek olarak BridgeDB %s hiÃ§bir TakÄ±labilir AktarÄ±mÄ± kullanmayan %s 
birÃ§ok eski, sÄ±radan\nve Ã¶zelliksiz kÃ¶prÃ¼ye sahiptir. KulaÄa iyi 
gelmeyebilir ancak bu kÃ¶prÃ¼ler hala pek Ã§ok\ndurumda Ä°nternet 
kÄ±sÄ±tlamalarÄ±nÄ± aÅmaya yardÄ±m edebilirler.\n\n"
 
 #: bridgedb/strings.py:101
 msgid "What are bridges?"
@@ -361,7 +361,7 @@ msgstr "'Tor AÄ AyarlarÄ±' penceresi aÃ§Ä±ldÄ±ÄÄ±nda, 
'Ayarla' Ã¼zerine tÄ±kla
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor 
connections\n"
 "to the Tor network?"
-msgstr "Internet Servis SaÄlayÄ±cÄ±nÄ±z (ISS) Tor aÄÄ±na olan 
baÄlantÄ±larÄ± engelliyor\nya da baÅka Åekillerde bir sansÃ¼r uyguluyor mu?"
+msgstr "Ä°nternet Servis SaÄlayÄ±cÄ±nÄ±z (ISS) Tor aÄÄ±na olan 
baÄlantÄ±larÄ± engelliyor\nya da baÅka Åekillerde bir sansÃ¼r uyguluyor mu?"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:159

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/torcheck_completed] Update translations for torcheck_completed

2016-01-07 Thread translation

commit 32a63c45ba6466e2624599f6ea22a8ac02c024cf
Author: Translation commit bot 
Date:   Thu Jan 7 20:45:22 2016 +

Update translations for torcheck_completed
---
 tr/torcheck.po |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tr/torcheck.po b/tr/torcheck.po
index 39df138..9689dde 100644
--- a/tr/torcheck.po
+++ b/tr/torcheck.po
@@ -17,7 +17,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "POT-Creation-Date: 2012-02-16 20:28+PDT\n"
-"PO-Revision-Date: 2016-01-07 20:08+\n"
+"PO-Revision-Date: 2016-01-07 20:17+\n"
 "Last-Translator: Volkan Gezer \n"
 "Language-Team: Turkish 
(http://www.transifex.com/otf/torproject/language/tr/)\n"
 "MIME-Version: 1.0\n"
@@ -34,7 +34,7 @@ msgid ""
 "Please refer to the https://www.torproject.org/\;>Tor website "
 "for further information about using Tor safely.  You are now free to browse "
 "the Internet anonymously."
-msgstr "LÃ¼tfen Tor'u gÃ¼venli olarak kullanmak hakkÄ±nda daha ayrÄ±ntÄ±lÄ± 
bilgi almak iÃ§in https://www.torproject.org/\;>Tor web sitesine 
bakÄ±n. ArtÄ±k Internet'te anonim olarak Ã¶zgÃ¼rce dolaÅabilirsiniz."
+msgstr "LÃ¼tfen Tor'u gÃ¼venli olarak kullanmak hakkÄ±nda daha ayrÄ±ntÄ±lÄ± 
bilgi almak iÃ§in https://www.torproject.org/\;>Tor web sitesine 
bakÄ±n. ArtÄ±k Ä°nternet'te anonim olarak Ã¶zgÃ¼rce dolaÅabilirsiniz."
 
 msgid "There is a security update available for Tor Browser."
 msgstr "Tor Browser iÃ§in bir gÃ¼venlik gÃ¼ncellemesi kullanÄ±labilir."

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/bridgedb] Update translations for bridgedb

2016-01-07 Thread translation

commit 0a58418ccb35742b790416ca4470bfa8189f796e
Author: Translation commit bot 
Date:   Thu Jan 7 20:45:03 2016 +

Update translations for bridgedb
---
 tr/LC_MESSAGES/bridgedb.po |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tr/LC_MESSAGES/bridgedb.po b/tr/LC_MESSAGES/bridgedb.po
index 23e2737..56066a2 100644
--- a/tr/LC_MESSAGES/bridgedb.po
+++ b/tr/LC_MESSAGES/bridgedb.po
@@ -27,7 +27,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB=bridgedb-reported,msgid=isis,sysrqb=isis'\n"
 "POT-Creation-Date: 2015-07-25 03:40+\n"
-"PO-Revision-Date: 2016-01-07 20:14+\n"
+"PO-Revision-Date: 2016-01-07 20:18+\n"
 "Last-Translator: Volkan Gezer \n"
 "Language-Team: Turkish 
(http://www.transifex.com/otf/torproject/language/tr/)\n"
 "MIME-Version: 1.0\n"
@@ -242,7 +242,7 @@ msgid ""
 "difficult for anyone watching your internet traffic to determine that you 
are\n"
 "using Tor.\n"
 "\n"
-msgstr "BridgeDB, Ã§eÅitli %stipte TakÄ±labilir AktarÄ±mlar%s iÃ§eren 
kÃ¶prÃ¼ler saÄlayabilir.\nBÃ¶ylece Tor AÄÄ± Ã¼zerine yaptÄ±ÄÄ±nÄ±z 
baÄlantÄ±lar karÄ±ÅtÄ±rÄ±larak, Internet trafiÄinizi\nizleyen birinin Tor 
kullandÄ±ÄÄ±nÄ±zÄ± anlamasÄ± zorlaÅtÄ±rÄ±labilir.\n\n"
+msgstr "BridgeDB, Ã§eÅitli %stipte TakÄ±labilir AktarÄ±mlar%s iÃ§eren 
kÃ¶prÃ¼ler saÄlayabilir.\nBÃ¶ylece Tor AÄÄ± Ã¼zerine yaptÄ±ÄÄ±nÄ±z 
baÄlantÄ±lar karÄ±ÅtÄ±rÄ±larak, Ä°nternet trafiÄinizi\nizleyen birinin Tor 
kullandÄ±ÄÄ±nÄ±zÄ± anlamasÄ± zorlaÅtÄ±rÄ±labilir.\n\n"
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #: bridgedb/strings.py:79
@@ -264,7 +264,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 "Ek olarak BridgeDB %s hiÃ§bir TakÄ±labilir AktarÄ±mÄ± kullanmayan %s 
birÃ§ok eski, sÄ±radan\nve Ã¶zelliksiz kÃ¶prÃ¼ye sahiptir. KulaÄa iyi 
gelmeyebilir ancak bu kÃ¶prÃ¼ler hala pek Ã§ok\ndurumda Internet 
kÄ±sÄ±tlamalarÄ±nÄ± aÅmaya yardÄ±m edebilirler.\n\n"
+msgstr "Ek olarak BridgeDB %s hiÃ§bir TakÄ±labilir AktarÄ±mÄ± kullanmayan %s 
birÃ§ok eski, sÄ±radan\nve Ã¶zelliksiz kÃ¶prÃ¼ye sahiptir. KulaÄa iyi 
gelmeyebilir ancak bu kÃ¶prÃ¼ler hala pek Ã§ok\ndurumda Ä°nternet 
kÄ±sÄ±tlamalarÄ±nÄ± aÅmaya yardÄ±m edebilirler.\n\n"
 
 #: bridgedb/strings.py:101
 msgid "What are bridges?"
@@ -361,7 +361,7 @@ msgstr "'Tor AÄ AyarlarÄ±' penceresi aÃ§Ä±ldÄ±ÄÄ±nda, 
'Ayarla' Ã¼zerine tÄ±kla
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor 
connections\n"
 "to the Tor network?"
-msgstr "Internet Servis SaÄlayÄ±cÄ±nÄ±z (ISS) Tor aÄÄ±na olan 
baÄlantÄ±larÄ± engelliyor\nya da baÅka Åekillerde bir sansÃ¼r uyguluyor mu?"
+msgstr "Ä°nternet Servis SaÄlayÄ±cÄ±nÄ±z (ISS) Tor aÄÄ±na olan 
baÄlantÄ±larÄ± engelliyor\nya da baÅka Åekillerde bir sansÃ¼r uyguluyor mu?"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:159

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/https_everywhere_completed] Update translations for https_everywhere_completed

2016-01-07 Thread translation

commit a96312f2003f9e0d867d6f15f6088141182a3d06
Author: Translation commit bot 
Date:   Thu Jan 7 20:45:40 2016 +

Update translations for https_everywhere_completed
---
 tr/https-everywhere.properties |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tr/https-everywhere.properties b/tr/https-everywhere.properties
index 7666fa4..4e96550 100644
--- a/tr/https-everywhere.properties
+++ b/tr/https-everywhere.properties
@@ -1,6 +1,6 @@
 https-everywhere.menu.globalEnable = HTTPS Everywhere'i EtkinleÅtir
-https-everywhere.menu.globalDisable = HTTPS Everywhere'i EtkisizleÅtir
-https-everywhere.menu.enableDisable = KurallarÄ± EtkinleÅtir / EtkisizleÅtir
+https-everywhere.menu.globalDisable = HTTPS Everywhere'i Devre DÄ±ÅÄ± BÄ±rak
+https-everywhere.menu.enableDisable = KurallarÄ± EtkinleÅtir / Devre DÄ±ÅÄ± 
BÄ±rak
 https-everywhere.menu.noRules = (Bu Sayfa iÃ§in Kural Yok)
 https-everywhere.menu.unknownRules = (Bu SayfanÄ±n KurallarÄ± Bilinmiyor)
 https-everywhere.toolbar.hint = HTTPS Everywhere kullanÄ±lÄ±yor. Adres 
Ã§ubuÄundaki simgeye tÄ±klayarak istediÄiniz siteler iÃ§in aÃ§Ä±p 
kapatabilirsiniz.

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Fix a comment typo in main.c

2016-01-07 Thread nickm

commit ce5406b71aa504a84f4012b8442342496bc71aa9
Author: teor (Tim Wilson-Brown) 
Date:   Sun Jan 3 17:33:31 2016 +1100

Fix a comment typo in main.c
---
 src/or/main.c |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/or/main.c b/src/or/main.c
index c8b1283..0ab8f10 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -1301,7 +1301,7 @@ static periodic_event_item_t periodic_events[] = {
 /* These are pointers to members of periodic_events[] that are used to
  * implement particular callbacks.  We keep them separate here so that we
  * can access them by name.  We also keep them inside periodic_events[]
- * so that we can implement "reset all timers" in a reasaonable way. */
+ * so that we can implement "reset all timers" in a reasonable way. */
 static periodic_event_item_t *check_descriptor_event=NULL;
 static periodic_event_item_t *fetch_networkstatus_event=NULL;
 static periodic_event_item_t *launch_descriptor_fetches_event=NULL;



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge remote-tracking branch 'teor/comments-20151213'

2016-01-07 Thread nickm

commit 8d6aafbb4a7f4f9748b88f5ce16675900559149e
Merge: be841f7 ce5406b
Author: Nick Mathewson 
Date:   Thu Jan 7 12:50:10 2016 -0800

Merge remote-tracking branch 'teor/comments-20151213'

 src/common/address.c |2 +-
 src/or/main.c|2 +-
 src/or/or.h  |4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Use memset_s or explicit_bzero when available.

2016-01-07 Thread nickm

commit 3783046f3b519533fc721472f38ccf437d2d12a5
Author: Nick Mathewson 
Date:   Thu Jan 7 12:53:24 2016 -0800

Use memset_s or explicit_bzero when available.
---
 changes/7419|7 +++
 configure.ac|2 ++
 src/common/crypto.c |8 
 3 files changed, 17 insertions(+)

diff --git a/changes/7419 b/changes/7419
new file mode 100644
index 000..b792e8f
--- /dev/null
+++ b/changes/7419
@@ -0,0 +1,7 @@
+  o Minor enhancement (security):
+- Use explicit_bzero when present
+  from .
+- Use memset_s when present
+  from 
+
+625538405474972d627b26d7a250ea36 (:
diff --git a/configure.ac b/configure.ac
index 7dfab58..b62b4d3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -381,6 +381,7 @@ AC_CHECK_FUNCS(
 backtrace_symbols_fd \
 clock_gettime \
eventfd \
+   explicit_bzero \
timingsafe_memcmp \
 flock \
 ftime \
@@ -399,6 +400,7 @@ AC_CHECK_FUNCS(
 localtime_r \
 lround \
 memmem \
+memset_s \
pipe \
pipe2 \
 prctl \
diff --git a/src/common/crypto.c b/src/common/crypto.c
index bcb06e0..e62cc0a 100644
--- a/src/common/crypto.c
+++ b/src/common/crypto.c
@@ -2970,7 +2970,15 @@ memwipe(void *mem, uint8_t byte, size_t sz)
* ...or maybe not.  In practice, there are pure-asm implementations of
* OPENSSL_cleanse() on most platforms, which ought to do the job.
**/
+
+#ifdef HAVE_EXPLICIT_BZERO
+  explicit_bzero(mem, sz);
+#elif HAVE_MEMSET_S
+  memset_s( mem, sz, 0, sz );
+#else
   OPENSSL_cleanse(mem, sz);
+#endif
+
   /* Just in case some caller of memwipe() is relying on getting a buffer
* filled with a particular value, fill the buffer.
*

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.2.7] Merge branch 'maint-0.2.4' into maint-0.2.5

2016-01-07 Thread nickm

commit ae223138fbdd28ef452191c3a489e25e9a9b22c7
Merge: c3d11b1 1496056
Author: Nick Mathewson 
Date:   Thu Jan 7 09:13:54 2016 -0800

Merge branch 'maint-0.2.4' into maint-0.2.5

 changes/geoip-january2016 |4 +
 src/config/geoip  | 1734 +++--
 src/config/geoip6 |  881 +--
 3 files changed, 2016 insertions(+), 603 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/torcheck_completed] Update translations for torcheck_completed

2016-01-07 Thread translation

commit d54cae85fc966cb591b9818e726159be6e0b9567
Author: Translation commit bot 
Date:   Thu Jan 7 20:15:34 2016 +

Update translations for torcheck_completed
---
 tr/torcheck.po |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tr/torcheck.po b/tr/torcheck.po
index 2cd6ba3..39df138 100644
--- a/tr/torcheck.po
+++ b/tr/torcheck.po
@@ -12,13 +12,13 @@
 # monolifed, 2014
 # monolifed, 2014
 # Ozancan KarataÅ , 2015
-# Volkan Gezer , 2013-2015
+# Volkan Gezer , 2013-2016
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "POT-Creation-Date: 2012-02-16 20:28+PDT\n"
-"PO-Revision-Date: 2015-10-18 15:34+\n"
-"Last-Translator: Ozancan KarataÅ \n"
+"PO-Revision-Date: 2016-01-07 20:08+\n"
+"Last-Translator: Volkan Gezer \n"
 "Language-Team: Turkish 
(http://www.transifex.com/otf/torproject/language/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -89,7 +89,7 @@ msgid "Short User Manual"
 msgstr "KÄ±sa KullanÄ±cÄ± KÄ±lavuzu"
 
 msgid "Donate to Support Tor"
-msgstr "Tor'u BaÄÄ±Å Yaparak Destekleyin"
+msgstr "Tor'a BaÄÄ±Å Yaparak Destek Olun"
 
 msgid "Tor Q Site"
 msgstr "Tor Soru-YanÄ±t Sitesi"
@@ -101,7 +101,7 @@ msgid "JavaScript is enabled."
 msgstr "JavaScript etkinleÅtirildi."
 
 msgid "JavaScript is disabled."
-msgstr "JavaScript etkisizleÅtirildi."
+msgstr "JavaScript devre dÄ±ÅÄ± bÄ±rakÄ±ldÄ±."
 
 msgid "However, it does not appear to be Tor Browser."
 msgstr "Ancak bu, Tor Browser gibi gÃ¶rÃ¼nmÃ¼yor."

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/torcheck] Update translations for torcheck

2016-01-07 Thread translation

commit e4979112933c8260bc2c01c3b75839c9d15dc17e
Author: Translation commit bot 
Date:   Thu Jan 7 20:15:26 2016 +

Update translations for torcheck
---
 tr/torcheck.po |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tr/torcheck.po b/tr/torcheck.po
index 2cd6ba3..39df138 100644
--- a/tr/torcheck.po
+++ b/tr/torcheck.po
@@ -12,13 +12,13 @@
 # monolifed, 2014
 # monolifed, 2014
 # Ozancan KarataÅ , 2015
-# Volkan Gezer , 2013-2015
+# Volkan Gezer , 2013-2016
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "POT-Creation-Date: 2012-02-16 20:28+PDT\n"
-"PO-Revision-Date: 2015-10-18 15:34+\n"
-"Last-Translator: Ozancan KarataÅ \n"
+"PO-Revision-Date: 2016-01-07 20:08+\n"
+"Last-Translator: Volkan Gezer \n"
 "Language-Team: Turkish 
(http://www.transifex.com/otf/torproject/language/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -89,7 +89,7 @@ msgid "Short User Manual"
 msgstr "KÄ±sa KullanÄ±cÄ± KÄ±lavuzu"
 
 msgid "Donate to Support Tor"
-msgstr "Tor'u BaÄÄ±Å Yaparak Destekleyin"
+msgstr "Tor'a BaÄÄ±Å Yaparak Destek Olun"
 
 msgid "Tor Q Site"
 msgstr "Tor Soru-YanÄ±t Sitesi"
@@ -101,7 +101,7 @@ msgid "JavaScript is enabled."
 msgstr "JavaScript etkinleÅtirildi."
 
 msgid "JavaScript is disabled."
-msgstr "JavaScript etkisizleÅtirildi."
+msgstr "JavaScript devre dÄ±ÅÄ± bÄ±rakÄ±ldÄ±."
 
 msgid "However, it does not appear to be Tor Browser."
 msgstr "Ancak bu, Tor Browser gibi gÃ¶rÃ¼nmÃ¼yor."

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tor_animation_completed] Update translations for tor_animation_completed

2016-01-07 Thread translation

commit 7118d5e464638815e2eccaaa6cfd0c654b27ca15
Author: Translation commit bot 
Date:   Thu Jan 7 20:17:48 2016 +

Update translations for tor_animation_completed
---
 tr.srt |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tr.srt b/tr.srt
index 231dd8e..a361df2 100644
--- a/tr.srt
+++ b/tr.srt
@@ -1,6 +1,6 @@
 1
 00:00:00,660 --> 00:00:02,780
-Internet kullanmaya Ã§ok alÄ±ÅtÄ±k.
+Ä°nternet kullanmaya Ã§ok alÄ±ÅtÄ±k.
 
 2
 00:00:03,120 --> 00:00:07,700

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tor-launcher-properties_completed] Update translations for tor-launcher-properties_completed

2016-01-07 Thread translation

commit ef2a91af82c23cbec0f457725a7667e15387941a
Author: Translation commit bot 
Date:   Thu Jan 7 20:16:55 2016 +

Update translations for tor-launcher-properties_completed
---
 tr/torlauncher.properties |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tr/torlauncher.properties b/tr/torlauncher.properties
index c7dac75..cbf467d 100644
--- a/tr/torlauncher.properties
+++ b/tr/torlauncher.properties
@@ -21,7 +21,7 @@ torlauncher.failed_to_get_settings=Tor ayarlarÄ± 
alÄ±namadÄ±.\n\n%S
 torlauncher.failed_to_save_settings=Tor ayarlarÄ± kaydedilemedi.\n\n%S
 torlauncher.ensure_tor_is_running=LÃ¼tfen Tor'un Ã§alÄ±ÅtÄ±ÄÄ±ndan emin olun.
 
-torlauncher.error_proxy_addr_missing=Internet'e bir vekil sunucu Ã¼zerinden 
baÄlanmak iÃ§in bir IP adresi ya da sunucu adÄ± ile baÄlantÄ± noktasÄ± 
numarasÄ±nÄ±n yazÄ±lmasÄ± gereklidir.
+torlauncher.error_proxy_addr_missing=Ä°nternet'e bir vekil sunucu Ã¼zerinden 
baÄlanmak iÃ§in bir IP adresi ya da sunucu adÄ± ile baÄlantÄ± noktasÄ± 
numarasÄ±nÄ±n yazÄ±lmasÄ± gereklidir.
 torlauncher.error_proxy_type_missing=Vekil sunucu tipini seÃ§melisiniz.
 torlauncher.error_bridges_missing=Bir ya da birkaÃ§ kÃ¶prÃ¼ belirtmelisiniz.
 torlauncher.error_default_bridges_type_missing=SaÄlanan kÃ¶prÃ¼ler iÃ§in bir 
aktarÄ±m tipi seÃ§melisiniz.

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tails-misc] Update translations for tails-misc

2016-01-07 Thread translation

commit 16873b7dd2a4a37fdfedd892f2a522ea80285fae
Author: Translation commit bot 
Date:   Thu Jan 7 20:17:10 2016 +

Update translations for tails-misc
---
 tr.po |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tr.po b/tr.po
index a38f3e5..86d111b 100644
--- a/tr.po
+++ b/tr.po
@@ -18,15 +18,15 @@
 # Tails_developers , 2014
 # Tails_developers , 2014
 # Ãmit TÃ¼rk , 2013
-# Volkan Gezer , 2013-2015
+# Volkan Gezer , 2013-2016
 # Yasin Ãzel , 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-01-04 11:56+0100\n"
-"PO-Revision-Date: 2016-01-06 10:56+\n"
-"Last-Translator: Ozancan KarataÅ \n"
+"PO-Revision-Date: 2016-01-07 20:15+\n"
+"Last-Translator: Volkan Gezer \n"
 "Language-Team: Turkish 
(http://www.transifex.com/otf/torproject/language/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -40,7 +40,7 @@ msgstr "Tor hazÄ±r"
 
 #: 
config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready.sh:40
 msgid "You can now access the Internet."
-msgstr "ArtÄ±k Internet'e eriÅebilirsiniz."
+msgstr "ArtÄ±k Ä°nternet'e eriÅebilirsiniz."
 
 #: config/chroot_local-includes/etc/whisperback/config.py:65
 #, python-format
@@ -425,7 +425,7 @@ msgid ""
 "Network activity within the Unsafe Browser is not anonymous.\\nOnly "
 "use the Unsafe Browser if necessary, for example\\nif you have to login or "
 "register to activate your Internet connection."
-msgstr "GÃ¼vensiz TarayÄ±cÄ± ile aÄ etkinlikleriniz anonim 
deÄildir.\\nGÃ¼vensiz TarayÄ±cÄ±yÄ± yalnÄ±zca kullanmanÄ±z gerekiyorsa, 
Ã¶rneÄin\\nInternet baÄlantÄ±nÄ±zÄ± etkinleÅtirmek iÃ§in kaydolmanÄ±z ya da 
oturum aÃ§manÄ±z gerekiyorsa kullanÄ±n."
+msgstr "GÃ¼vensiz TarayÄ±cÄ± ile aÄ etkinlikleriniz anonim 
deÄildir.\\nGÃ¼vensiz TarayÄ±cÄ±yÄ± yalnÄ±zca kullanmanÄ±z gerekiyorsa, 
Ã¶rneÄin\\nÄ°nternet baÄlantÄ±nÄ±zÄ± etkinleÅtirmek iÃ§in kaydolmanÄ±z ya da 
oturum aÃ§manÄ±z gerekiyorsa kullanÄ±n."
 
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:47
 msgid "Starting the Unsafe Browser..."

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/https_everywhere] Update translations for https_everywhere

2016-01-07 Thread translation

commit 25aae5f15b239d8daad3867f9c82f4f4029451de
Author: Translation commit bot 
Date:   Thu Jan 7 20:45:33 2016 +

Update translations for https_everywhere
---
 tr/https-everywhere.properties |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tr/https-everywhere.properties b/tr/https-everywhere.properties
index 7666fa4..4e96550 100644
--- a/tr/https-everywhere.properties
+++ b/tr/https-everywhere.properties
@@ -1,6 +1,6 @@
 https-everywhere.menu.globalEnable = HTTPS Everywhere'i EtkinleÅtir
-https-everywhere.menu.globalDisable = HTTPS Everywhere'i EtkisizleÅtir
-https-everywhere.menu.enableDisable = KurallarÄ± EtkinleÅtir / EtkisizleÅtir
+https-everywhere.menu.globalDisable = HTTPS Everywhere'i Devre DÄ±ÅÄ± BÄ±rak
+https-everywhere.menu.enableDisable = KurallarÄ± EtkinleÅtir / Devre DÄ±ÅÄ± 
BÄ±rak
 https-everywhere.menu.noRules = (Bu Sayfa iÃ§in Kural Yok)
 https-everywhere.menu.unknownRules = (Bu SayfanÄ±n KurallarÄ± Bilinmiyor)
 https-everywhere.toolbar.hint = HTTPS Everywhere kullanÄ±lÄ±yor. Adres 
Ã§ubuÄundaki simgeye tÄ±klayarak istediÄiniz siteler iÃ§in aÃ§Ä±p 
kapatabilirsiniz.

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Compatibility defines should be used for LibreSSL.

2016-01-07 Thread nickm

commit be841f77aaa818f445d5b9a5e2eca6aa7ce4f0b6
Author: dana koch 
Date:   Thu Dec 24 18:54:29 2015 -0800

Compatibility defines should be used for LibreSSL.

LibreSSL doesn't use OpenSSL_version (it uses the older SSLeay_version
API), but it reports a major version number as 2 in
OPENSSL_VERSION_NUMBER. Instead of fudging the version check, for now,
let's just check if we're using LibreSSL by checking the version number
macro exists, and use compatibility defines unconditionally when we
detect LibreSSL.
---
 src/common/compat_openssl.h |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/common/compat_openssl.h b/src/common/compat_openssl.h
index 3fcd684..5825ff7 100644
--- a/src/common/compat_openssl.h
+++ b/src/common/compat_openssl.h
@@ -19,7 +19,8 @@
 #error "We require OpenSSL >= 1.0.0"
 #endif
 
-#if OPENSSL_VERSION_NUMBER < OPENSSL_V_SERIES(1,1,0)
+#if OPENSSL_VERSION_NUMBER < OPENSSL_V_SERIES(1,1,0) || \
+   defined(LIBRESSL_VERSION_NUMBER)
 #define OPENSSL_VERSION SSLEAY_VERSION
 #define OpenSSL_version(v) SSLeay_version(v)
 #define OpenSSL_version_num() SSLeay()

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Fix typos in microdesc_t and node_t comments

2016-01-07 Thread nickm

commit 3a24364a6920ebe17c564cc432e0422ce78fbaed
Author: teor (Tim Wilson-Brown) 
Date:   Tue Dec 15 07:50:07 2015 +1100

Fix typos in microdesc_t and node_t comments
---
 src/or/or.h |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/or/or.h b/src/or/or.h
index 89c5398..6b5bd86 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -2333,7 +2333,7 @@ typedef struct microdesc_t {
   curve25519_public_key_t *onion_curve25519_pkey;
   /** Ed25519 identity key, if included. */
   ed25519_public_key_t *ed25519_identity_pkey;
-  /** As routerinfo_t.ipv6_add */
+  /** As routerinfo_t.ipv6_addr */
   tor_addr_t ipv6_addr;
   /** As routerinfo_t.ipv6_orport */
   uint16_t ipv6_orport;
@@ -2351,7 +2351,7 @@ typedef struct microdesc_t {
  * Specifically, a node_t is a Tor router as we are using it: a router that
  * we are considering for circuits, connections, and so on.  A node_t is a
  * thin wrapper around the routerstatus, routerinfo, and microdesc for a
- * single wrapper, and provides a consistent interface for all of them.
+ * single router, and provides a consistent interface for all of them.
  *
  * Also, a node_t has mutable state.  While a routerinfo, a routerstatus,
  * and a microdesc have[*] only the information read from a router



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Fix a typo in the comment for tor_addr_port_split

2016-01-07 Thread nickm

commit 1949908d134bb3764b0049be64f170f473f22fd8
Author: teor (Tim Wilson-Brown) 
Date:   Sun Dec 13 11:44:21 2015 +1100

Fix a typo in the comment for tor_addr_port_split
---
 src/common/address.c |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common/address.c b/src/common/address.c
index 69a8098..061bb7e 100644
--- a/src/common/address.c
+++ b/src/common/address.c
@@ -1784,7 +1784,7 @@ tor_addr_port_parse(int severity, const char *addrport,
 }
 
 /** Given an address of the form "host[:port]", try to divide it into its host
- * ane port portions, setting *address_out to a newly allocated string
+ * and port portions, setting *address_out to a newly allocated string
  * holding the address portion and *port_out to the port (or 0 if no
  * port is given).  Return 0 on success, -1 on failure. */
 int



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.4] Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4

2016-01-07 Thread nickm

commit cb8c5c023f0e349f30fd6a539437d76358b8b87a
Merge: efae1bc e5907e9
Author: Nick Mathewson 
Date:   Thu Jun 25 11:42:31 2015 -0400

Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4

 changes/geoip-june2015 |3 +
 src/config/geoip   |14347 +++-
 2 files changed, 6999 insertions(+), 7351 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.5] Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5

2016-01-07 Thread nickm

commit 6c7720ed49623f649aa6280606c129ee153b04ed
Merge: 3a5d4d6 efae1bc
Author: Nick Mathewson 
Date:   Mon Apr 27 14:16:55 2015 -0400

Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5

 changes/geoip-april2015  |3 +
 changes/geoip6-april2015 |2 +
 src/config/geoip |10061 --
 src/config/geoip6| 1268 --
 4 files changed, 4465 insertions(+), 6869 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.5] Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5

2016-01-07 Thread nickm

commit 809217e6f3665e20718a406871585fa932dd4578
Merge: 01bb260 8b3e0b7
Author: Nick Mathewson 
Date:   Thu Sep 24 10:06:00 2015 -0400

Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5

 changes/geoip-september2015 |3 +
 src/config/geoip| 3977 ---
 src/config/geoip6   | 2594 
 3 files changed, 4505 insertions(+), 2069 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.5] Merge branch 'maint-0.2.4' into maint-0.2.5

2016-01-07 Thread nickm

commit 432852577000ab5eb07ae3ca961a36e5f6e796ba
Merge: e8e89fd b0867fe
Author: Nick Mathewson 
Date:   Tue Dec 8 09:38:48 2015 -0500

Merge branch 'maint-0.2.4' into maint-0.2.5

 changes/bug17781 |3 +++
 src/or/connection_edge.c |2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Mark all object files built based on micro-revision.i as depending on it

2016-01-07 Thread nickm

commit 263f6d11fdbb665b026e3dc2d8e7260475c3ff4b
Author: Nick Mathewson 
Date:   Sat Dec 26 13:43:13 2015 -0500

Mark all object files built based on micro-revision.i as depending on it

Fixes make -j for some users; fixes bug 17826.

Bugfix on 0.2.5.1, when we started building testing versions of all
the object files.
---
 changes/17826 |5 +
 src/common/include.am |5 -
 src/or/include.am |5 -
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/changes/17826 b/changes/17826
new file mode 100644
index 000..7d0a17a
--- /dev/null
+++ b/changes/17826
@@ -0,0 +1,5 @@
+  o Minor bugfixes (build):
+- Mark all object files that include micro-revision.i as depending on
+  it, so as to make our build more reliable with parallel builds.
+  Fixes bug 17826; bugfix on 0.2.5.1-alpha.
+  
diff --git a/src/common/include.am b/src/common/include.am
index 2fc92e2..d82c093 100644
--- a/src/common/include.am
+++ b/src/common/include.am
@@ -78,7 +78,10 @@ LIBOR_A_SOURCES = \
   $(threads_impl_source)   \
   $(readpassphrase_source)
 
-src/common/log.o: micro-revision.i
+src/common/src_common_libor_testing_a-log.o \
+  src/common/src_common_libor_testing_a-log.obj \
+  src/common/log.o \
+  src/common/log.obj : micro-revision.i
 
 LIBOR_CRYPTO_A_SOURCES = \
   src/common/aes.c \
diff --git a/src/or/include.am b/src/or/include.am
index dab0048..14ad05b 100644
--- a/src/or/include.am
+++ b/src/or/include.am
@@ -93,7 +93,10 @@ src_or_libtor_testing_a_SOURCES = $(LIBTOR_A_SOURCES)
 src_or_tor_SOURCES = src/or/tor_main.c
 AM_CPPFLAGS += -I$(srcdir)/src/or -Isrc/or
 
-src/or/tor_main.o: micro-revision.i
+src/or/tor_main.o \
+  src/or/tor_main.obj \
+  src/or/src_or_tor_cov-tor_main.o \
+  src/or/src_or_tor_cov-tor_main.obj : micro-revision.i
 
 AM_CPPFLAGS += -DSHARE_DATADIR="\"$(datadir)\""\
-DLOCALSTATEDIR="\"$(localstatedir)\""  \



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.6] Merge branch 'maint-0.2.5' into maint-0.2.6

2016-01-07 Thread nickm

commit 400df18688e3b657852a9007151aaf26febe29a6
Merge: 1adc2bf ae22313
Author: Nick Mathewson 
Date:   Thu Jan 7 09:14:05 2016 -0800

Merge branch 'maint-0.2.5' into maint-0.2.6

 changes/geoip-january2016 |4 +
 src/config/geoip  | 1734 +++--
 src/config/geoip6 |  881 +--
 3 files changed, 2016 insertions(+), 603 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.7] Merge branch 'maint-0.2.5' into maint-0.2.6

2016-01-07 Thread nickm

commit c7b0cd9c2f52ca289515833060ac0b8461da2225
Merge: 400df18 9ca3295
Author: Nick Mathewson 
Date:   Thu Jan 7 09:41:36 2016 -0800

Merge branch 'maint-0.2.5' into maint-0.2.6

 changes/bug17906 |4 
 src/or/config.c  |2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --cc src/or/config.c
index fca350c,60d3d7f..7444af6
--- a/src/or/config.c
+++ b/src/or/config.c
@@@ -865,10 -862,9 +865,10 @@@ add_default_trusted_dir_authorities(dir
"v3ident=ED03BB616EB2F60BEC80151114BB25CEF515B226 "
"131.188.40.189:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281",
  "dannenberg orport=443 "
-   "v3ident=585769C78764D58426B8B52B6651A5A71137189A "
+   "v3ident=0232AF901C31A04EE9848595AF9BB7620D4C5B2E "
"193.23.244.244:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123",
 -"urras orport=80 v3ident=80550987E1D626E3EBA5E5E75A458DE0626D088C "
 +"urras orport=80 "
 +  "v3ident=80550987E1D626E3EBA5E5E75A458DE0626D088C "
"208.83.223.34:443 0AD3 FA88 4D18 F89E EA2D 89C0 1937 9E0E 7FD9 4417",
  "maatuska orport=80 "
"v3ident=49015F787433103580E3B66A1707A00E60F2D15B "



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.7] Merge branch 'maint-0.2.6' into maint-0.2.7

2016-01-07 Thread nickm

commit d9b11d05e85503bbea8724a1770e23849c56a17e
Merge: d0c209c 400df18
Author: Nick Mathewson 
Date:   Thu Jan 7 09:14:15 2016 -0800

Merge branch 'maint-0.2.6' into maint-0.2.7

 changes/geoip-january2016 |4 +
 src/config/geoip  | 1734 +++--
 src/config/geoip6 |  881 +--
 3 files changed, 2016 insertions(+), 603 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.7] Merge branch 'maint-0.2.4' into maint-0.2.5

2016-01-07 Thread nickm

commit ae223138fbdd28ef452191c3a489e25e9a9b22c7
Merge: c3d11b1 1496056
Author: Nick Mathewson 
Date:   Thu Jan 7 09:13:54 2016 -0800

Merge branch 'maint-0.2.4' into maint-0.2.5

 changes/geoip-january2016 |4 +
 src/config/geoip  | 1734 +++--
 src/config/geoip6 |  881 +--
 3 files changed, 2016 insertions(+), 603 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.6] Merge branch 'bug17772_024' into maint-0.2.4

2016-01-07 Thread nickm

commit 35deb4d442da38d7dcfb235665da50f3a4f7c293
Merge: b0867fe 5138f5c
Author: Nick Mathewson 
Date:   Tue Dec 8 10:18:31 2015 -0500

Merge branch 'bug17772_024' into maint-0.2.4

 changes/bug17772|7 +++
 src/or/routerlist.c |   10 --
 2 files changed, 15 insertions(+), 2 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.6] Merge branch 'maint-0.2.5' into maint-0.2.6

2016-01-07 Thread nickm

commit 1adc2bf66fedb1768c5013dcf5f4778fae453217
Merge: b53ff86 c3d11b1
Author: Nick Mathewson 
Date:   Tue Dec 8 10:20:21 2015 -0500

Merge branch 'maint-0.2.5' into maint-0.2.6

 changes/bug17772|7 +++
 src/or/routerlist.c |   10 --
 2 files changed, 15 insertions(+), 2 deletions(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.7] Merge branch 'maint-0.2.4' into maint-0.2.5

2016-01-07 Thread nickm

commit 9ca329581af71c9aa6890b63c29c6a51ac37e408
Merge: ae22313 11f63d2
Author: Nick Mathewson 
Date:   Thu Jan 7 09:40:23 2016 -0800

Merge branch 'maint-0.2.4' into maint-0.2.5

Conflicts:
src/or/config.c

 changes/bug17906 |4 
 src/or/config.c  |2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --cc src/or/config.c
index 2a7237d,1610cad..60d3d7f
--- a/src/or/config.c
+++ b/src/or/config.c
@@@ -856,23 -794,23 +856,23 @@@ add_default_trusted_dir_authorities(dir
"86.59.21.38:80 847B 1F85 0344 D787 6491 A548 92F9 0493 4E4E B85D",
  "dizum orport=443 v3ident=E8A9C45EDE6D711294FADF8E7951F4DE6CA56B58 "
"194.109.206.212:80 7EA6 EAD6 FD83 083C 538F 4403 8BBF A077 587D D755",
 -"Tonga orport=443 bridge no-v2 82.94.251.203:80 "
 +"Tonga orport=443 bridge 82.94.251.203:80 "
"4A0C CD2D DC79 9508 3D73 F5D6 6710 0C8A 5831 F16D",
 -"gabelmoo orport=443 no-v2 "
 +"gabelmoo orport=443 "
"v3ident=ED03BB616EB2F60BEC80151114BB25CEF515B226 "
"131.188.40.189:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281",
 -"dannenberg orport=443 no-v2 "
 +"dannenberg orport=443 "
-   "v3ident=585769C78764D58426B8B52B6651A5A71137189A "
+   "v3ident=0232AF901C31A04EE9848595AF9BB7620D4C5B2E "
"193.23.244.244:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123",
 -"urras orport=80 no-v2 v3ident=80550987E1D626E3EBA5E5E75A458DE0626D088C "
 +"urras orport=80 v3ident=80550987E1D626E3EBA5E5E75A458DE0626D088C "
"208.83.223.34:443 0AD3 FA88 4D18 F89E EA2D 89C0 1937 9E0E 7FD9 4417",
 -"maatuska orport=80 no-v2 "
 +"maatuska orport=80 "
"v3ident=49015F787433103580E3B66A1707A00E60F2D15B "
"171.25.193.9:443 BD6A 8292 55CB 08E6 6FBE 7D37 4836 3586 E46B 3810",
 -"Faravahar orport=443 no-v2 "
 +"Faravahar orport=443 "
"v3ident=EFCBE720AB3A82B99F9E953CD5BF50F7EEFC7B97 "
"154.35.175.225:80 CF6D 0AAF B385 BE71 B8E1 11FC 5CFF 4B47 9237 33BC",
 -"longclaw orport=443 no-v2 "
 +"longclaw orport=443 "
"v3ident=23D15D965BC35114467363C165C4F724B64B4F66 "
"199.254.238.52:80 74A9 1064 6BCE EFBC D2E8 74FC 1DC9 9743 0F96 8145",
  NULL



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.7] Remove extraneous #endif in configure.ac

2016-01-07 Thread nickm

commit d0c209c51d856ee78cca1e4ee337d10155a93916
Author: Nick Mathewson 
Date:   Tue Dec 22 20:37:02 2015 -0500

Remove extraneous #endif in configure.ac

This will fix the detection of struct in6_addr.s6_addr32 and others

Found and fixed by cypherpunks; bug 17923; bugfix on f948caad7b5bd
---
 changes/bug17923 |4 
 configure.ac |1 -
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/changes/bug17923 b/changes/bug17923
new file mode 100644
index 000..48026a5
--- /dev/null
+++ b/changes/bug17923
@@ -0,0 +1,4 @@
+  o Minor bugfixes:
+- Add an #endif to configure.ac so that we correctly detect
+  the presence of in6_addr.s6_addr32. Fixes bug 17923; bugfix on
+  0.2.0.13-alpha.
diff --git a/configure.ac b/configure.ac
index 2f75568..bf6d7f6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1130,7 +1130,6 @@ AC_CHECK_MEMBERS([struct in6_addr.s6_addr32, struct 
in6_addr.s6_addr16, struct s
 #include 
 #include 
 #endif
-#endif
 ])
 
 AC_CHECK_TYPES([rlim_t], , ,



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.6] Merge branch 'maint-0.2.6' into release-0.2.6

2016-01-07 Thread nickm

commit 1f6b918466100c019114eada95f3ff9610256953
Merge: 6ba5480 c7b0cd9
Author: Nick Mathewson 
Date:   Thu Jan 7 09:47:57 2016 -0800

Merge branch 'maint-0.2.6' into release-0.2.6

 changes/bug17354   |4 +
 changes/bug17772   |7 +
 changes/bug17781   |3 +
 changes/bug17906   |4 +
 changes/geoip-december2015 |4 +
 changes/geoip-january2016  |4 +
 changes/geoip-october2015  |3 +
 src/config/geoip   |13046 +++-
 src/config/geoip6  | 3780 +++--
 src/or/config.c|2 +-
 src/or/main.c  |1 +
 src/or/routerlist.c|   10 +-
 12 files changed, 12399 insertions(+), 4469 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.4] Fix a compilation warning introduced by clang 3.6

2016-01-07 Thread nickm

commit b0867fec964a8692e9c605da82b3a3393eeaf451
Author: Nick Mathewson 
Date:   Tue Dec 8 09:37:05 2015 -0500

Fix a compilation warning introduced by clang 3.6

There was a dead check when we made sure that an array member of a
struct was non-NULL.  Tor has been doing this check since at least
0.2.3, maybe earlier.

Fixes bug 17781.
---
 changes/bug17781 |3 +++
 src/or/connection_edge.c |2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/changes/bug17781 b/changes/bug17781
new file mode 100644
index 000..01ed231
--- /dev/null
+++ b/changes/bug17781
@@ -0,0 +1,3 @@
+  o Compilation fixes:
+- Fix a compilation warning with Clang 3.6: Do not check the
+  presence of an address which can never be NULL. Fixes bug 17781.
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index 895c0f7..39f8af6 100644
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -748,7 +748,7 @@ connection_ap_fail_onehop(const char *failed_digest,
   /* we don't know the digest; have to compare addr:port */
   tor_addr_t addr;
   if (!build_state || !build_state->chosen_exit ||
-  !entry_conn->socks_request || !entry_conn->socks_request->address)
+  !entry_conn->socks_request)
 continue;
   if (tor_addr_parse(, entry_conn->socks_request->address)<0 ||
   !tor_addr_eq(_state->chosen_exit->addr, ) ||



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.4] Merge branch 'maint-0.2.4' into release-0.2.4

2016-01-07 Thread nickm

commit 7bb4422a93eb347a944a25e1451c882e3060d5cb
Merge: a378b22 11f63d2
Author: Nick Mathewson 
Date:   Thu Jan 7 09:47:36 2016 -0800

Merge branch 'maint-0.2.4' into release-0.2.4

 changes/bug17772|7 +
 changes/bug17781|3 +
 changes/bug17906|4 +
 changes/geoip-december2015  |4 +
 changes/geoip-january2016   |4 +
 changes/geoip-july2015  |3 +
 changes/geoip-june2015  |3 +
 changes/geoip-october2015   |3 +
 changes/geoip-september2015 |3 +
 changes/geoip6-june2015 |3 +
 src/config/geoip|28651 +++
 src/config/geoip6   | 6441 --
 src/or/config.c |2 +-
 src/or/connection_edge.c|2 +-
 src/or/routerlist.c |   10 +-
 15 files changed, 23690 insertions(+), 11453 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.4] Merge remote-tracking branch 'karsten/geoip6-jun2015' into maint-0.2.4

2016-01-07 Thread nickm

commit fde4199e1caa094965da0904955ad34748db1e30
Merge: cb8c5c0 08e14e1
Author: Nick Mathewson 
Date:   Thu Jun 25 11:42:47 2015 -0400

Merge remote-tracking branch 'karsten/geoip6-jun2015' into maint-0.2.4

 changes/geoip6-june2015 |3 +
 src/config/geoip6   | 2282 ---
 2 files changed, 1561 insertions(+), 724 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

1 2 >

1 - 100 of 118 matches

Mail list logo