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

2015-08-16 Thread translation 
commit 54630bfebebbdc6494253a82e6990832019697fd
Author: Translation commit bot translat...@torproject.org
Date:   Sun Aug 16 07:45:49 2015 +

Update translations for torbutton-torbuttonproperties
---
 uk/torbutton.properties |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/uk/torbutton.properties b/uk/torbutton.properties
index 4cafe6a..51713a0 100644
--- a/uk/torbutton.properties
+++ b/uk/torbutton.properties
@@ -7,7 +7,7 @@ torbutton.circuit_display.this_browser = Цей браузер
 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.content_sizer.margin_tooltip = Tor Browser додає ці поля 
для того, щоб зробити висоту і ширину вікна 
менш відмінною, що зменшує можливість 
відстежувати вас.
 torbutton.panel.tooltip.disabled = Натисніть аби 
увімкнути Tor
 torbutton.panel.tooltip.enabled = Натисніть аби вимкнути 
Tor
 torbutton.panel.plugins.disabled = Натисніть аби 
увімкнути розширення
@@ -56,10 +56,10 @@ torbutton.popup.confirm_plugins = Плагіни, такі 
як Flash, можу
 torbutton.popup.never_ask_again = Більше ніколи не 
запитувати
 torbutton.popup.confirm_newnym = Tor Browser закриє всі вікна і 
вкладки. Всі сеанси на веб-сайтах буде 
втрачено.\n\nПерезапустити Tor Browser, щоб 
змінити вашу особистість?
 
-torbutton.slider_notification = The green onion menu now has a security slider 
which lets you adjust your security level. Check it out!
+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 = Роблячи Tor Browser на весь 
екран дає можливість веб-сайтам дізнатися 
розмір вашого екрану, що може бути 
використано для відстежування. Ми 
рекомендуємо залишити розмір вікна за 
замовченням.
 
 # Canvas permission prompt. Strings are kept here for ease of translation.
 canvas.siteprompt=Цей веб-сайт (%S) спробував 
видобути дані зображення канви HTML5, які 
можна використати для унікальної 
ідентифікації вашого комп'ютера.\n\nСлід 
браузеру Tor дозволити цьому веб-сайту 
видобування даних зображення канви HTML5?
@@ -74,5 +74,5 @@ canvas.neverAccessKey=е
 # LOCALIZATION NOTE: %S is the application name.
 profileProblemTitle=Проблема профайла %S
 profileReadOnly=Ви не можете виконати %S з файлової 
системи, доступної тільки для читання. Будь 
ласка, скопіюйте %S в інше місце перед 
спробую запустити знову.
-profileReadOnlyMac=You cannot run %S from a read-only file system.  Please 
copy %S to your Desktop or Applications folder before trying to use it.
-profileAccessDenied=%S does not have permission to access the profile. Please 
adjust your file system permissions and try again.
+profileReadOnlyMac=Ви не можете виконати %S з 
файлової системи, доступної тільки для 
читання. Будь ласка, скопіюйте %S до Desktop або 
Applications директорію перед спробую запустити 
знову.
+profileAccessDenied=%S не має дозволу на доступ до 
профілю. Будь ласка, змініть налаштування 
вашої файлової системи і спробуйте знову.

___
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

2015-08-16 Thread translation 
commit d39ef94c8ed4c8240b6339b737309a8dcfe5f3b3
Author: Translation commit bot translat...@torproject.org
Date:   Sun Aug 16 07:46:06 2015 +

Update translations for torbutton-abouttorproperties
---
 uk/abouttor.properties |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/uk/abouttor.properties b/uk/abouttor.properties
index d607324..d3dd005 100644
--- a/uk/abouttor.properties
+++ b/uk/abouttor.properties
@@ -2,19 +2,19 @@
 # See LICENSE for licensing information.
 # vim: set sw=2 sts=2 ts=8 et:
 
-aboutTor.searchSP.privacy=Search a href=%1$Ssecurely/a with a 
href=%2$SStartpage/a.
+aboutTor.searchSP.privacy=Шукати a href=%1$Sбезпечно/a 
за допомогою a href=%2$SStartpage/a.
 # The following string is a link which replaces %1$S above.
 aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
 # The following string is a link which replaces %2$S above.
 aboutTor.searchSP.search.link=https://startpage.com/
 
-aboutTor.searchDDG.privacy=Search a href=%1$Ssecurely/a with a 
href=%2$SDuckDuckGo/a.
+aboutTor.searchDDG.privacy=Шукати a href=%1$Sбезпечно/a 
за допомогою a href=%2$SDuckDuckGo/a.
 # The following string is a link which replaces %1$S above.
 aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
 # The following string is a link which replaces %2$S above.
 aboutTor.searchDDG.search.link=https://duckduckgo.com/
 
-aboutTor.searchDC.privacy=Search a href=%1$Ssecurely/a with a 
href=%2$SDisconnect.me/a.
+aboutTor.searchDC.privacy=Шукати a href=%1$Sбезпечно/a 
за допомогою a href=%2$SDisconnect.me/a.
 # The following string is a link which replaces %1$S above.
 aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
 # The following string is a link which replaces %2$S above.

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

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

2015-08-16 Thread translation 
commit 566fcbd9ace339bb4aa3e22fece2b10dfd77aa46
Author: Translation commit bot translat...@torproject.org
Date:   Sun Aug 16 07:46:00 2015 +

Update translations for tor_animation
---
 uk.srt |   20 ++--
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/uk.srt b/uk.srt
index 371d779..721100a 100644
--- a/uk.srt
+++ b/uk.srt
@@ -22,7 +22,7 @@
 6
 00:00:14,920 -- 00:00:17,740
 Саме в цей момент,
-якщо хтось намагається знайти тебе,
+якщо хтось намагається знайти Вас,
 
 7
 00:00:18,060 -- 00:00:22,480
@@ -60,27 +60,27 @@
 
 14
 00:00:41,560 -- 00:00:44,760
-Tor secures your connection
-with three layers of encryption
+Tor убезпечує Ваше з'єднання
+за допомогою трьох шарів шифрування
 
 15
 00:00:44,940 -- 00:00:49,760
-and passes it through three voluntarily
-operated servers around the world,
+та передає його за допомогою трьох 
серверів,
+які розташовані по всьому світу,
 
 16
 00:00:50,280 -- 00:00:53,520
-which enables us to communicate
-anonymously over the Internet.
+що надає нам можливість спілкуватись
+анонімно за допомогою Інтернет.
 
 17
 00:00:56,560 -- 00:00:58,280
-Tor also protects our data
+Також Tor захищає нашу інформацію
 
 18
 00:00:58,400 -- 00:01:01,900
-against corporate or government targeted
-and mass surveillance.
+від корпорацій або влади,
+які намагаються тотально слідкувати.
 
 19
 00:01:02,880 -- 00:01:07,340

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

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

2015-08-16 Thread translation 
commit 7ce581a632273bb35c8579fbcf5db2d820dac420
Author: Translation commit bot translat...@torproject.org
Date:   Sun Aug 16 07:46:10 2015 +

Update translations for torbutton-abouttorproperties_completed
---
 uk/abouttor.properties |  166 ++--
 1 file changed, 18 insertions(+), 148 deletions(-)

diff --git a/uk/abouttor.properties b/uk/abouttor.properties
index 6fdf373..d3dd005 100644
--- a/uk/abouttor.properties
+++ b/uk/abouttor.properties
@@ -1,151 +1,21 @@
-!DOCTYPE html PUBLIC -//W3C//DTD XHTML 1.0 Transitional//EN
-http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd;
-html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'
-head
-titletorbutton - розширення  Firefox для безпечного 
перегляду веб-сторінок при використанні 
Tor/title
-meta name='generator' content='cgit v0.10.2'/
-meta name='generator' content='cgit v0.10.2'/
-link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/
-link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/
-link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/
-/head
-body
-div id='cgit'table id='header'
-tr
-td class='logo' rowspan='2'a href='/'img src='/static/logo.jpg' alt='cgit 
logo'//a/td
-td class='logo' rowspan='2'a href='/'img src='/static/logo.jpg' alt='cgit 
logo'//a/td
-select name='h' onchange='this.form.submit();'
-option value='gsoc2009-koryk'gsoc2009-koryk/option
-option value='gsoc2009-koryk'gsoc2009-koryk/option
-option value='gsoc2009-koryk'gsoc2009-koryk/option
-option value='gsoc2009-koryk'gsoc2009-koryk/option
-option value='gsoc2009-koryk'gsoc2009-koryk/option
-option value='gsoc2009-koryk'gsoc2009-koryk/option
-option value='gsoc2009-koryk'gsoc2009-koryk/option
-option value='gsoc2009-koryk'gsoc2009-koryk/option
-/select input type='submit' name='' value='switch'//form/td/tr
-trtd class='sub'розширення Firefox для безпечного 
перегляду веб-сторінок при використанні 
Tor/tdtd class='sub right'The Tor Project/td/tr/table
-table class='tabs'trtd
-a href='/torbutton.git/'підсумок/aa 
href='/torbutton.git/refs/'refs/aa 
href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'лог/aa 
class='active' 
href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'дерево/aa
 
href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'commit/aa
 
href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'diff/a/tdtd
 class='form'form class='right' method='get' 
action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'
-select name='h' onchange='this.form.submit();'
-option value='gsoc2009-koryk'gsoc2009-koryk/option
-option value='gsoc2009-koryk'gsoc2009-koryk/option
-option value='gsoc2009-koryk'gsoc2009-koryk/option
-option value='gsoc2009-koryk'gsoc2009-koryk/option
-/select
-input class='txt' type='text' size='10' name='q' value=''/
-input class='txt' type='text' size='10' name='q' value=''/
-/form
-/td/tr/table
-div id='cgit'table id='header'
-table class='tabs'trtd
-trtd class='sub'розширення Firefox для безпечного 
перегляду веб-сторінок при використанні 
Tor/tdtd class='sub right'The Tor Project/td/tr/table
-a href='/torbutton.git/'підсумок/aa 
href='/torbutton.git/refs/'refs/aa 
href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'лог/aa 
class='active' 
href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'дерево/aa
 
href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'commit/aa
 
href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'diff/a/tdtd
 class='form'form class='right' method='get' 
action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'
-a href='/torbutton.git/'підсумок/aa 
href='/torbutton.git/refs/'refs/aa 
href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'лог/aa 
class='active' 
href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'дерево/aa
 
href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'commit/aa
 
href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'diff/a/tdtd
 class='form'form class='right' method='get' 
action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'
-a href='/torbutton.git/'підсумок/aa 
href='/torbutton.git/refs/'refs/aa 
href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'лог/aa 
class='active' 
href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'дерево/aa
 
href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'commit/aa
 
href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'diff/a/tdtd
 class='form'form class='right' method='get' 
action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'
-a href='/torbutton.git/'підсумок/aa

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

2015-08-16 Thread translation 
commit dda23b9db766670ab48e3ad9ace0fcd253a952ba
Author: Translation commit bot translat...@torproject.org
Date:   Sun Aug 16 08:15:59 2015 +

Update translations for tor_animation
---
 uk.srt |   24 
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/uk.srt b/uk.srt
index 721100a..5334608 100644
--- a/uk.srt
+++ b/uk.srt
@@ -84,33 +84,33 @@ Tor убезпечує Ваше з'єднання
 
 19
 00:01:02,880 -- 00:01:07,340
-Perhaps you live in a repressive country
-which tries to control and surveil the Internet.
+Можливо, ви живете у тоталітарній країні,
+яка намагається контролювати та 
слідкувати за користувачами Інтернет.
 
 20
 00:01:07,900 -- 00:01:11,800
-Or perhaps you don't want big corporations
-taking advantage of your personal information.
+Або ви не хочете, щоб великі корпорації
+оперували Вашою персональною інформацією.
 
 21
 00:01:12,880 -- 00:01:15,640
-Tor makes all of its users
-to look the same
+Tor робить усіх користувачів
+однаковими,
 
 22
 00:01:15,920 -- 00:01:18,800
-which confuses the observer
-and makes you anonymous.
+що бентежить шпигунів
+та робить Вас анонімним.
 
 23
 00:01:19,500 -- 00:01:22,980
-So, the more people use the Tor network,
-the stronger it gets
+Таким чином, чим більше людей використовує 
Tor,
+тим простіше стає
 
 24
 00:01:23,140 -- 00:01:27,800
-as it's easier to hide in a crowd
-of people who look exactly the same.
+сховатися у натовпі
+людей, які виглядають так само.
 
 25
 00:01:28,700 -- 00:01:31,240

___
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

2015-08-16 Thread translation 
commit a0739515ab176b479a6b87edee4d6dba9a8bf8e3
Author: Translation commit bot translat...@torproject.org
Date:   Sun Aug 16 12:16:17 2015 +

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

diff --git a/uk/auth.dtd b/uk/auth.dtd
new file mode 100644
index 000..ef6eb61
--- /dev/null
+++ b/uk/auth.dtd
@@ -0,0 +1,22 @@
+!ENTITY authDialog.title Перевка ідентичності 
контакту
+!ENTITY authDialog.authenticate Перевірити
+!ENTITY authDialog.cancel Відміна
+!ENTITY authDialog.help Допомога
+!ENTITY authDialog.yes Так
+!ENTITY authDialog.no Ні
+!ENTITY authDialog.verified Я перевірив, що це 
правильний відбиток пальців.
+!ENTITY authDialog.yourFingerprint Ваші відбитки пальців
+!ENTITY authDialog.theirFingerprint Їх цільові відбитки 
пальців
+!ENTITY authDialog.manualVerification Посібник по 
перевірці через відбитки пальців
+!ENTITY authDialog.questionAndAnswer Питання та відповідь
+!ENTITY authDialog.sharedSecret Поширений секрет
+!ENTITY authDialog.manualInstruction Щоб підтвердити свої 
відбитки, зв'яжіться з вашим приятелем  за 
допомогою іншого перевіреного каналу, 
наприклад, по телефону або за допомогою 
GPG-зашифрованого електронного листа.
+Кожен з вас повинен розповісти про свої 
відбитки іншому. Якщо все збігається, ви 
повинні вказати в діалоговому вікні нижче, 
що ви перевірили відбитки пальців.
+!ENTITY authDialog.choose Виберіть
+!ENTITY authDialog.how Як би ви хотіли засвідчити 
вашу особу?
+!ENTITY authDialog.qaInstruction Щоб перевірити свою 
особистість, виберіть питання, відповідь 
на яке відоме тільки вам і вашому контакту. 
Введіть це питання і відповідь, а потім 
зачекайте поки ваш контакт відповість. 
Якщо відповіді не збігаються, то ви, скоріш 
за все розмовляєте з самозванцем.
+!ENTITY authDialog.secretInstruction Щоб перевірити свою 
особистість, виберіть питання, відповідь 
на яке відоме тільки вам і вашому контакту. 
Введіть відповідь, а потім зачекайте поки 
ваш контакт відповість. Якщо відповіді не 
збігаються, то ви, скоріш за все 
розмовляєте з самозванцем.
+!ENTITY authDialog.question Введіть питання тут:
+!ENTITY authDialog.answer Введіть секретну відповідь 
тут (з урахуванням регістру):
+!ENTITY authDialog.secret введіть відповідь тут:
+!ENTITY authDialog.waiting Очікування контакту ...
\ 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-authproperties] Update translations for tor-messenger-authproperties

2015-08-16 Thread translation 
commit 6bbb3f65cc1734c01d160c2a6fb3296a3bcd2c6b
Author: Translation commit bot translat...@torproject.org
Date:   Sun Aug 16 13:16:14 2015 +

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

diff --git a/uk/auth.properties b/uk/auth.properties
index 28e535d..b05eec9 100644
--- a/uk/auth.properties
+++ b/uk/auth.properties
@@ -1,12 +1,12 @@
 auth.title=Перевірити особистість %S
-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.yourFingerprint=Відбитки для Вас, %S:\n%S
+auth.theirFingerprint=Очікувані відбитки від %S:\n%S
+auth.help=Перевірка особистості допомагає 
упевнитись, що людина, з якою ви 
розмовляєте, я тим, за кого вона себе видає.
+auth.helpTitle=Допомога у перевірці
+auth.question=Це питання, яке поставив ваш 
співрозмовник:\n%S\n\nВведіть відповідь 
(чутливо до регістру):
 auth.secret=введіть відповідь тут:
 auth.error=Виникла помилка при перевірці 
особистості вашого співрозмовника.
-auth.success=Verifying your contact's identity completed successfully.
-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=Done
+auth.success=Перевірка особистості вашого 
співрозмовника пройшла успішно.
+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/tor-messenger-authproperties_completed] Update translations for tor-messenger-authproperties_completed

2015-08-16 Thread translation 
commit 14d64f4e1ed75e707bbd7ccd170bb4340ba0d5e8
Author: Translation commit bot translat...@torproject.org
Date:   Sun Aug 16 13:16:19 2015 +

Update translations for tor-messenger-authproperties_completed
---
 uk/auth.properties |   12 
 1 file changed, 12 insertions(+)

diff --git a/uk/auth.properties b/uk/auth.properties
new file mode 100644
index 000..b05eec9
--- /dev/null
+++ b/uk/auth.properties
@@ -0,0 +1,12 @@
+auth.title=Перевірити особистість %S
+auth.yourFingerprint=Відбитки для Вас, %S:\n%S
+auth.theirFingerprint=Очікувані відбитки від %S:\n%S
+auth.help=Перевірка особистості допомагає 
упевнитись, що людина, з якою ви 
розмовляєте, я тим, за кого вона себе видає.
+auth.helpTitle=Допомога у перевірці
+auth.question=Це питання, яке поставив ваш 
співрозмовник:\n%S\n\nВведіть відповідь 
(чутливо до регістру):
+auth.secret=введіть відповідь тут:
+auth.error=Виникла помилка при перевірці 
особистості вашого співрозмовника.
+auth.success=Перевірка особистості вашого 
співрозмовника пройшла успішно.
+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] [metrics-web/master] Create new clients module from metrics-task #8462.

2015-08-16 Thread karsten 
commit 14840ed2db075bbc1d0991b974becc3826a50969
Author: Karsten Loesing karsten.loes...@gmx.net
Date:   Fri Aug 14 13:46:12 2015 +0200

Create new clients module from metrics-task #8462.
---
 detector/.gitignore|2 -
 detector/country_info.py   |  252 -
 detector/detector.py   |  437 ---
 detector/detector.sh   |6 -
 modules/clients/.gitignore |2 +
 modules/clients/build.xml  |   44 ++
 modules/clients/country_info.py|  252 +
 modules/clients/detector.py|  437 +++
 modules/clients/init-userstats.sql |  575 
 modules/clients/merge-clients.R|   19 +
 .../src/org/torproject/metrics/clients/Main.java   |  465 
 modules/clients/test-userstats.sql |  478 
 modules/clients/userstats-detector.R   |   18 +
 shared/bin/80-run-clients-stats.sh |   30 +
 shared/bin/99-copy-stats-files.sh  |1 +
 15 files changed, 2321 insertions(+), 697 deletions(-)

diff --git a/detector/.gitignore b/detector/.gitignore
deleted file mode 100644
index 29a7166..000
--- a/detector/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.csv
-
diff --git a/detector/country_info.py b/detector/country_info.py
deleted file mode 100644
index e23728e..000
--- a/detector/country_info.py
+++ /dev/null
@@ -1,252 +0,0 @@
-# -*- coding: utf-8 -*-
-
-countries = {
-ad : Andorra,
-ae : the United Arab Emirates,
-af : Afghanistan,
-ag : Antigua and Barbuda,
-ai : Anguilla,
-al : Albania,
-am : Armenia,
-an : the Netherlands Antilles,
-ao : Angola,
-aq : Antarctica,
-ar : Argentina,
-as : American Samoa,
-at : Austria,
-au : Australia,
-aw : Aruba,
-ax : the Aland Islands,
-az : Azerbaijan,
-ba : Bosnia and Herzegovina,
-bb : Barbados,
-bd : Bangladesh,
-be : Belgium,
-bf : Burkina Faso,
-bg : Bulgaria,
-bh : Bahrain,
-bi : Burundi,
-bj : Benin,
-bl : Saint Bartelemey,
-bm : Bermuda,
-bn : Brunei,
-bo : Bolivia,
-br : Brazil,
-bs : the Bahamas,
-bt : Bhutan,
-bv : the Bouvet Island,
-bw : Botswana,
-by : Belarus,
-bz : Belize,
-ca : Canada,
-cc : the Cocos (Keeling) Islands,
-cd : the Democratic Republic of the Congo,
-cf : Central African Republic,
-cg : Congo,
-ch : Switzerland,
-ci :  uCôte d'Ivoire,
-ck : the Cook Islands,
-cl : Chile,
-cm : Cameroon,
-cn : China,
-co : Colombia,
-cr : Costa Rica,
-cu : Cuba,
-cv : Cape Verde,
-cx : the Christmas Island,
-cy : Cyprus,
-cz : the Czech Republic,
-de : Germany,
-dj : Djibouti,
-dk : Denmark,
-dm : Dominica,
-do : the Dominican Republic,
-dz : Algeria,
-ec : Ecuador,
-ee : Estonia,
-eg : Egypt,
-eh : the Western Sahara,
-er : Eritrea,
-es : Spain,
-et : Ethiopia,
-fi : Finland,
-fj : Fiji,
-fk : the Falkland Islands (Malvinas),
-fm : the Federated States of Micronesia,
-fo : the Faroe Islands,
-fr : France,
-fx : Metropolitan France,
-ga : Gabon,
-gb : the United Kingdom,
-gd : Grenada,
-ge : Georgia,
-gf : French Guiana,
-gg : Guernsey,
-gh : Ghana,
-gi : Gibraltar,
-gl : Greenland,
-gm : Gambia,
-gn : Guinea,
-gp : Guadeloupe,
-gq : Equatorial Guinea,
-gr : Greece,
-gs : South Georgia and the South Sandwich Islands,
-gt : Guatemala,
-gu : Guam,
-gw : Guinea-Bissau,
-gy : Guyana,
-hk : Hong Kong,
-hm : Heard Island and McDonald Islands,
-hn : Honduras,
-hr : Croatia,
-ht : Haiti,
-hu : Hungary,
-id : Indonesia,
-ie : Ireland,
-il : Israel,
-im : the Isle of Man,
-in : India,
-io : the British Indian Ocean Territory,
-iq : Iraq,
-ir : Iran,
-is : Iceland,
-it : Italy,
-je : Jersey,
-jm : Jamaica,
-jo : Jordan,
-jp : Japan,
-ke : Kenya,
-kg : Kyrgyzstan,
-kh : Cambodia,
-ki : Kiribati,
-km : Comoros,
-kn : Saint Kitts and Nevis,
-kp : North Korea,
-kr : the Republic of Korea,
-kw : Kuwait,
-ky : the Cayman Islands,
-kz : Kazakhstan,
-la : Laos,
-lb : Lebanon,
-lc : Saint Lucia,
-li : Liechtenstein,
-lk : Sri Lanka,
-lr : Liberia,
-ls : Lesotho,
-lt : Lithuania,
-lu : Luxembourg,
-lv : Latvia,
-ly : Libya,
-ma : Morocco,
-mc : Monaco,
-md : the Republic of Moldova,
-me : Montenegro,
-mf : Saint Martin,
-mg : Madagascar,
-mh : the Marshall Islands,
-mk : Macedonia,
-ml : Mali,
-mm : Burma,
-mn : Mongolia,
-mo : Macau,
-

[tor-commits] [metrics-web/master] Make script output slightly more useful.

2015-08-16 Thread karsten 
commit b56869067a9a0160d3038ae6f055be664b7dfdb4
Author: Karsten Loesing karsten.loes...@gmx.net
Date:   Sat Aug 15 10:44:42 2015 +0200

Make script output slightly more useful.
---
 run-web.sh |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/run-web.sh b/run-web.sh
index 5ee88d8..bd0bb5c 100755
--- a/run-web.sh
+++ b/run-web.sh
@@ -1,3 +1,6 @@
 #!/bin/sh
-for i in $(ls shared/bin/[0-9]* | sort); do ./$i; done
+for i in $(ls shared/bin/[0-9]* | sort); do
+  echo `date` Running $i.
+  ./$i
+done
 



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

[tor-commits] [metrics-web/master] Update paths.

2015-08-16 Thread karsten 
commit fca73868aaf07d5e8be3336d4e8f320c728b6701
Author: Karsten Loesing karsten.loes...@gmx.net
Date:   Sat Aug 15 13:38:26 2015 +0200

Update paths.
---
 .gitignore |2 +-
 modules/legacy/config.template |6 +++---
 website/build.xml  |2 +-
 website/etc/web.xml|4 ++--
 website/rserve/Rserv.conf  |2 +-
 website/rserve/graphs.R|   38 +++---
 website/rserve/tables.R|4 ++--
 7 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/.gitignore b/.gitignore
index aebf570..0323a32 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,7 +3,7 @@
 .project
 
 # Generated web archive
-ernie.war
+website/metrics.war
 
 # Compiled class files
 classes/
diff --git a/modules/legacy/config.template b/modules/legacy/config.template
index 8a7bc96..ce779d9 100644
--- a/modules/legacy/config.template
+++ b/modules/legacy/config.template
@@ -2,7 +2,7 @@
 #ImportDirectoryArchives 0
 #
 ## Relative path to directory to import directory archives from
-#DirectoryArchivesDirectory 
/srv/metrics.torproject.org/web/shared/in/recent/relay-descriptors/
+#DirectoryArchivesDirectory 
/srv/metrics.torproject.org/metrics/shared/in/recent/relay-descriptors/
 #
 ## Keep a history of imported directory archive files to know which files
 ## have been imported before. This history can be useful when importing
@@ -14,7 +14,7 @@
 #ImportSanitizedBridges 0
 #
 ## Relative path to directory to import sanitized bridges from
-#SanitizedBridgesDirectory 
/srv/metrics.torproject.org/web/shared/in/recent/bridge-descriptors/
+#SanitizedBridgesDirectory 
/srv/metrics.torproject.org/metrics/shared/in/recent/bridge-descriptors/
 #
 ## Keep a history of imported sanitized bridge descriptors. This history
 ## can be useful when importing from a changing data source to avoid
@@ -43,5 +43,5 @@
 #ImportWriteTorperfStats 0
 #
 ## Relative path to directory to import torperf results from
-#TorperfDirectory /srv/metrics.torproject.org/web/shared/in/recent/torperf/
+#TorperfDirectory /srv/metrics.torproject.org/metrics/shared/in/recent/torperf/
 #
diff --git a/website/build.xml b/website/build.xml
index 6cc4294..52f1780 100644
--- a/website/build.xml
+++ b/website/build.xml
@@ -29,7 +29,7 @@
   !-- Create a .war file for deployment. --
   target name=war
   depends=compile
-war destfile=ernie.war
+war destfile=metrics.war
  webxml=etc/web.xml
   fileset dir=web/
   lib dir=lib
diff --git a/website/etc/web.xml b/website/etc/web.xml
index 70580e3..e32f26b 100644
--- a/website/etc/web.xml
+++ b/website/etc/web.xml
@@ -164,7 +164,7 @@
 init-param
   param-namestatsDir/param-name
   param-value
-/srv/metrics.torproject.org/web/shared/stats/
+/srv/metrics.torproject.org/metrics/shared/stats/
   /param-value
 /init-param
   /servlet
@@ -330,7 +330,7 @@
   context-param
 param-namecachedGraphsDir/param-name
 param-value
-  /srv/metrics.torproject.org/web/rserve/graphs/
+  /srv/metrics.torproject.org/metrics/website/rserve/graphs/
 /param-value
   /context-param
 
diff --git a/website/rserve/Rserv.conf b/website/rserve/Rserv.conf
index a23af49..1fb3039 100644
--- a/website/rserve/Rserv.conf
+++ b/website/rserve/Rserv.conf
@@ -1,2 +1,2 @@
-workdir /srv/metrics.torproject.org/web/rserve/workdir
+workdir /srv/metrics.torproject.org/metrics/website/rserve/workdir
 source rserve-init.R
diff --git a/website/rserve/graphs.R b/website/rserve/graphs.R
index 63946fe..0e8e0a3 100644
--- a/website/rserve/graphs.R
+++ b/website/rserve/graphs.R
@@ -268,7 +268,7 @@ date_breaks - function(days) {
 
 plot_networksize - function(start, end, path) {
   end - min(end, as.character(Sys.Date() - 2))
-  s - read.csv(paste(/srv/metrics.torproject.org/web/shared/stats/,
+  s - read.csv(paste(/srv/metrics.torproject.org/metrics/shared/stats/,
 servers.csv, sep = ), stringsAsFactors = FALSE)
   s - s[s$date = start  s$date = end  s$flag == '' 
  s$country == ''  s$version == ''  s$platform == '' 
@@ -302,7 +302,7 @@ plot_networksize - function(start, end, path) {
 
 plot_cloudbridges - function(start, end, path) {
   end - min(end, as.character(Sys.Date() - 2))
-  s - read.csv(paste(/srv/metrics.torproject.org/web/shared/stats/,
+  s - read.csv(paste(/srv/metrics.torproject.org/metrics/shared/stats/,
 servers.csv, sep = ), stringsAsFactors = FALSE)
   s - s[s$date = start  s$date = end  s$flag == '' 
  s$country == ''  s$version == ''  s$platform == '' 
@@ -332,7 +332,7 @@ plot_cloudbridges - function(start, end, path) {
 
 plot_relaycountries - function(start, end, country, path) {
   end - min(end, as.character(Sys.Date() - 2))
-  s - read.csv(paste(/srv/metrics.torproject.org/web/shared/stats/,
+  s - read.csv(paste(/srv/metrics.torproject.org/metrics/shared/stats/,
 servers.csv, sep = ), stringsAsFactors = FALSE)
   s -

[tor-commits] [metrics-web/master] Use metrics-lib's DescriptorCollector rather than rsync.

2015-08-16 Thread karsten 
commit 6a2425042dcc2e61152ea6bd6a93216842a4aed7
Author: Karsten Loesing karsten.loes...@gmx.net
Date:   Sun Aug 9 15:45:17 2015 +0200

Use metrics-lib's DescriptorCollector rather than rsync.
---
 deps/metrics-lib   |2 +-
 .../src/org/torproject/metrics/advbwdist/Main.java |5 ++-
 modules/collectdescs/build.xml |   42 
 .../org/torproject/metrics/collectdescs/Main.java  |   27 +
 .../src/org/torproject/metrics/hidserv/Main.java   |4 +-
 modules/legacy/config.template |6 +--
 shared/bin/01-collectdescs.sh  |5 +++
 shared/bin/01-rsync-descriptors.sh |3 --
 8 files changed, 83 insertions(+), 11 deletions(-)

diff --git a/deps/metrics-lib b/deps/metrics-lib
index bd18dd0..1960762 16
--- a/deps/metrics-lib
+++ b/deps/metrics-lib
@@ -1 +1 @@
-Subproject commit bd18dd0d2f788d1d4ee7acbac5032e97264bb855
+Subproject commit 1960762ca3ad515a22b90fdd3a1f4c68a3fa9588
diff --git a/modules/advbwdist/src/org/torproject/metrics/advbwdist/Main.java 
b/modules/advbwdist/src/org/torproject/metrics/advbwdist/Main.java
index 09eaab0..9ac2bbb 100644
--- a/modules/advbwdist/src/org/torproject/metrics/advbwdist/Main.java
+++ b/modules/advbwdist/src/org/torproject/metrics/advbwdist/Main.java
@@ -28,7 +28,8 @@ public class Main {
 DescriptorReader descriptorReader =
 DescriptorSourceFactory.createDescriptorReader();
 descriptorReader.addDirectory(
-new File(../../shared/in/relay-descriptors/server-descriptors));
+new File(../../shared/in/recent/relay-descriptors/
++ server-descriptors));
 IteratorDescriptorFile descriptorFiles =
 descriptorReader.readDescriptors();
 MapString, Long serverDescriptors =
@@ -52,7 +53,7 @@ public class Main {
 /* Parse consensuses, keeping a parse history. */
 descriptorReader = DescriptorSourceFactory.createDescriptorReader();
 descriptorReader.addDirectory(
-new File(../../shared/in/relay-descriptors/consensuses));
+new File(../../shared/in/recent/relay-descriptors/consensuses));
 descriptorReader.setExcludeFiles(
 new File(status/parsed-consensuses));
 descriptorFiles = descriptorReader.readDescriptors();
diff --git a/modules/collectdescs/build.xml b/modules/collectdescs/build.xml
new file mode 100644
index 000..bcbea76
--- /dev/null
+++ b/modules/collectdescs/build.xml
@@ -0,0 +1,42 @@
+project default=run name=collectdescs basedir=.
+
+  property name=sources value=src/
+  property name=classes value=classes/
+  path id=classpath
+pathelement path=${classes}/
+fileset dir=/usr/share/java
+  include name=commons-compress-1.4.1.jar/
+  include name=commons-lang-2.6.jar/
+/fileset
+fileset dir=../../deps/metrics-lib
+  include name=descriptor.jar/
+/fileset
+  /path
+
+  target name=metrics-lib
+ant dir=../../deps/metrics-lib/
+  /target
+
+  target name=compile depends=metrics-lib
+mkdir dir=${classes}/
+javac destdir=${classes}
+   srcdir=${sources}
+   source=1.6
+   target=1.6
+   debug=true
+   deprecation=true
+   optimize=false
+   failonerror=true
+   includeantruntime=false
+  classpath refid=classpath/
+/javac
+  /target
+
+  target name=run depends=compile
+java fork=true
+  classname=org.torproject.metrics.collectdescs.Main
+  classpath refid=classpath/
+/java
+  /target
+/project
+
diff --git 
a/modules/collectdescs/src/org/torproject/metrics/collectdescs/Main.java 
b/modules/collectdescs/src/org/torproject/metrics/collectdescs/Main.java
new file mode 100644
index 000..c95df18
--- /dev/null
+++ b/modules/collectdescs/src/org/torproject/metrics/collectdescs/Main.java
@@ -0,0 +1,27 @@
+/* Copyright 2015 The Tor Project
+ * See LICENSE for licensing information */
+package org.torproject.metrics.collectdescs;
+
+import java.io.File;
+
+import org.torproject.descriptor.DescriptorCollector;
+import org.torproject.descriptor.DescriptorSourceFactory;
+
+public class Main {
+  public static void main(String[] args) {
+/* Fetch recent descriptors from CollecTor. */
+DescriptorCollector collector =
+DescriptorSourceFactory.createDescriptorCollector();
+collector.collectDescriptors(
+https://collector.torproject.org;, new String[] {
+/recent/bridge-descriptors/extra-infos/,
+/recent/bridge-descriptors/server-descriptors/,
+/recent/bridge-descriptors/statuses/,
+/recent/exit-lists/,
+/recent/relay-descriptors/consensuses/,
+/recent/relay-descriptors/extra-infos/,
+/recent/relay-descriptors/server-descriptors/,
+/recent/torperf/ }, 0L, new File(../../shared/in), true);
+  }
+}
+
diff --git a/modules/hidserv/src/org/torproject/metrics/hidserv/Main.java

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

2015-08-16 Thread translation 
commit b2ab967bbabcc54934e1157dc2d4061e2baa575f
Author: Translation commit bot translat...@torproject.org
Date:   Sun Aug 16 12:16:51 2015 +

Update translations for tor-messenger-prefsdtd_completed
---
 uk/prefs.dtd |   13 +
 1 file changed, 13 insertions(+)

diff --git a/uk/prefs.dtd b/uk/prefs.dtd
new file mode 100644
index 000..51dae84
--- /dev/null
+++ b/uk/prefs.dtd
@@ -0,0 +1,13 @@
+!ENTITY prefs.otrPreferences Налаштування OTR
+!ENTITY prefs.otrSettings Опції OTR
+!ENTITY prefs.requireEncryption Вимагає шифрування
+!ENTITY prefs.otrKeys Мої приватні ключі
+!ENTITY prefs.keyForAccount Ключ для облікового 
запису:
+!ENTITY prefs.fingerprint Відбитки пальців:
+!ENTITY prefs.knownFingers Відомі відбитки пальців
+!ENTITY prefs.introFingers Керувати списком 
відбитків, які ви бачили.
+!ENTITY prefs.showFingers Вид
+!ENTITY prefs.introSettings Ці налаштування 
застосовуються до усіх один-на-один 
розмов.
+!ENTITY prefs.verifyNudge Завжди вимагати перевірки 
особистості ваших контактів
+!ENTITY prefs.emptyAccountList Немає налаштованих 
облікових записів
+!ENTITY prefs.generate Генерувати
\ 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-prefsdtd] Update translations for tor-messenger-prefsdtd

2015-08-16 Thread translation 
commit 76114edfd57834dd1f908ab6fbc273aeae3d22ff
Author: Translation commit bot translat...@torproject.org
Date:   Sun Aug 16 12:16:43 2015 +

Update translations for tor-messenger-prefsdtd
---
 uk/prefs.dtd |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/uk/prefs.dtd b/uk/prefs.dtd
index 4a2e4ab..51dae84 100644
--- a/uk/prefs.dtd
+++ b/uk/prefs.dtd
@@ -5,9 +5,9 @@
 !ENTITY prefs.keyForAccount Ключ для облікового 
запису:
 !ENTITY prefs.fingerprint Відбитки пальців:
 !ENTITY prefs.knownFingers Відомі відбитки пальців
-!ENTITY prefs.introFingers Manage the list of fingerprints you've seen.
+!ENTITY prefs.introFingers Керувати списком 
відбитків, які ви бачили.
 !ENTITY prefs.showFingers Вид
-!ENTITY prefs.introSettings These settings apply to all one-to-one 
conversations.
-!ENTITY prefs.verifyNudge Always nudge to verify your contact's identity
+!ENTITY prefs.introSettings Ці налаштування 
застосовуються до усіх один-на-один 
розмов.
+!ENTITY prefs.verifyNudge Завжди вимагати перевірки 
особистості ваших контактів
 !ENTITY prefs.emptyAccountList Немає налаштованих 
облікових записів
 !ENTITY prefs.generate Генерувати
\ 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-authdtd] Update translations for tor-messenger-authdtd

2015-08-16 Thread translation 
commit 60d25551e0efadbebe7ab77202b19595bc3df88c
Author: Translation commit bot translat...@torproject.org
Date:   Sun Aug 16 12:16:13 2015 +

Update translations for tor-messenger-authdtd
---
 uk/auth.dtd |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/uk/auth.dtd b/uk/auth.dtd
index 1d85719..ef6eb61 100644
--- a/uk/auth.dtd
+++ b/uk/auth.dtd
@@ -6,10 +6,10 @@
 !ENTITY authDialog.no Ні
 !ENTITY authDialog.verified Я перевірив, що це 
правильний відбиток пальців.
 !ENTITY authDialog.yourFingerprint Ваші відбитки пальців
-!ENTITY authDialog.theirFingerprint Their purported fingerprint
+!ENTITY authDialog.theirFingerprint Їх цільові відбитки 
пальців
 !ENTITY authDialog.manualVerification Посібник по 
перевірці через відбитки пальців
 !ENTITY authDialog.questionAndAnswer Питання та відповідь
-!ENTITY authDialog.sharedSecret Shared secret
+!ENTITY authDialog.sharedSecret Поширений секрет
 !ENTITY authDialog.manualInstruction Щоб підтвердити свої 
відбитки, зв'яжіться з вашим приятелем  за 
допомогою іншого перевіреного каналу, 
наприклад, по телефону або за допомогою 
GPG-зашифрованого електронного листа.
 Кожен з вас повинен розповісти про свої 
відбитки іншому. Якщо все збігається, ви 
повинні вказати в діалоговому вікні нижче, 
що ви перевірили відбитки пальців.
 !ENTITY authDialog.choose Виберіть

___
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

2015-08-16 Thread translation 
commit a08b77fc7dc119414824f42d585e469fe79dbaca
Author: Translation commit bot translat...@torproject.org
Date:   Sun Aug 16 12:16:31 2015 +

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

diff --git a/uk/finger.dtd b/uk/finger.dtd
index 46b4fc5..d22513d 100644
--- a/uk/finger.dtd
+++ b/uk/finger.dtd
@@ -7,4 +7,4 @@
 !ENTITY finger.protocol Protocol
 !ENTITY finger.verify Перевірити
 !ENTITY finger.remove Remove
-!ENTITY finger.intro Manage the list of fingerprints you've seen.
\ No newline at end of file
+!ENTITY finger.intro Керувати списком відбитків, 
які ви бачили.
\ 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_animation] Update translations for tor_animation

2015-08-16 Thread translation 
commit 8ade519c89252caf593523fbb3596bb33990fb18
Author: Translation commit bot translat...@torproject.org
Date:   Sun Aug 16 12:15:59 2015 +

Update translations for tor_animation
---
 uk.srt |   35 +--
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/uk.srt b/uk.srt
index 5334608..4236e8d 100644
--- a/uk.srt
+++ b/uk.srt
@@ -114,52 +114,51 @@ Tor робить усіх користувачів
 
 25
 00:01:28,700 -- 00:01:31,240
-You can bypass the censorship
-without being worried about
+Ви можете обійти цензуру таким чином,
 
 26
 00:01:31,400 -- 00:01:34,100
-the censor knowing what you do
-on the Internet.
+що цензор не буде знати,
+що ви робите в Інтернет.
 
 27
 00:01:36,540 -- 00:01:39,440
-The ads won't follow you
-everywhere for months,
+Реклама не буде переслідувати вас
+усюди місяцями,
 
 28
 00:01:39,640 -- 00:01:41,300
-starting when you first
-clicked on a product.
+після того, як ви вперше
+поцікавились яким-небудь продуктом.
 
 29
 00:01:43,880 -- 00:01:47,380
-By using Tor, the sites you visit
-won't even know who you are,
+Завдяки Tor, веб-сайти, які ви відвідуєте
+не будуть знати хто ви,
 
 30
 00:01:47,540 -- 00:01:49,760
-from what part of the world
-you're visiting them,
+з якої ви частини світу
+відвідуєте їх,
 
 31
 00:01:49,920 -- 00:01:51,920
-unless you login and tell them so.
+доки ви не залогінетесь і не скажете про це 
самі.
 
 32
 00:01:54,200 -- 00:01:55,840
-By downloading and using Tor,
+Завантажуючи і використовуючи Tor
 
 33
 00:01:56,200 -- 00:01:58,560
-you can protect the people
-who need anonymity,
+ви захищаєте людей,
+яким потрібна анонімність:
 
 34
 00:01:58,880 -- 00:02:01,640
-like activists, journalists and bloggers.
+активісти, журналісти та блоггери.
 
 35
 00:02:02,000 -- 00:02:07,000
-Download and use Tor! Or run a relay!
+Завантажте та почніть використовувати Tor! 
Або створіть протест!’
 

___
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

2015-08-16 Thread translation 
commit d870049b6222041b799c61da448e7b934a2345cf
Author: Translation commit bot translat...@torproject.org
Date:   Sun Aug 16 12:46:28 2015 +

Update translations for tor-messenger-fingerdtd
---
 uk/finger.dtd |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/uk/finger.dtd b/uk/finger.dtd
index d22513d..ed8a5ff 100644
--- a/uk/finger.dtd
+++ b/uk/finger.dtd
@@ -1,10 +1,10 @@
 !ENTITY finger.title Відомі відбитки пальців
-!ENTITY finger.screenName Screenname
+!ENTITY finger.screenName Ім'я користувача
 !ENTITY finger.status Статус
-!ENTITY finger.verified Verified
-!ENTITY finger.fingerprint Fingerprint
+!ENTITY finger.verified Перевірений
+!ENTITY finger.fingerprint Відбиток
 !ENTITY finger.account Обліковий запис
-!ENTITY finger.protocol Protocol
+!ENTITY finger.protocol Протокол
 !ENTITY finger.verify Перевірити
-!ENTITY finger.remove Remove
+!ENTITY finger.remove Видалити
 !ENTITY finger.intro Керувати списком відбитків, 
які ви бачили.
\ 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-conversationsproperties] Update translations for tor-messenger-conversationsproperties

2015-08-16 Thread translation 
commit b29a5d6845445b986cbccba2115b9e0d9985f861
Author: Translation commit bot translat...@torproject.org
Date:   Sun Aug 16 12:46:18 2015 +

Update translations for tor-messenger-conversationsproperties
---
 uk/conversations.properties |   20 ++--
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/uk/conversations.properties b/uk/conversations.properties
index 07cc3a8..eea2b1f 100644
--- a/uk/conversations.properties
+++ b/uk/conversations.properties
@@ -5,7 +5,7 @@
 # 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=Розмова буде продовжена з %1$S, 
використовуючи %2$S.
 
 # LOCALIZATION NOTE (statusChanged):
 #  %1$S is the display name of the contact.
@@ -26,14 +26,14 @@ statusChangedFromUnknownWithStatusText=%1$S є %2$S: %3$S.
 # 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.
@@ -41,17 +41,17 @@ 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 очистив тему.

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

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

2015-08-16 Thread translation 
commit 1c8b1e6d8520a694add4a0b214afc68a55a7f2e5
Author: Translation commit bot translat...@torproject.org
Date:   Sun Aug 16 12:46:50 2015 +

Update translations for tor-messenger-privdtd
---
 uk/priv.dtd |2 ++
 1 file changed, 2 insertions(+)

diff --git a/uk/priv.dtd b/uk/priv.dtd
new file mode 100644
index 000..da247eb
--- /dev/null
+++ b/uk/priv.dtd
@@ -0,0 +1,2 @@
+!ENTITY privDialog.title Generating private key
+!ENTITY privDialog.done Готово
\ 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-conversationsproperties_completed] Update translations for tor-messenger-conversationsproperties_completed

2015-08-16 Thread translation 
commit 4cb83eec96d194dcec4b95126f763b71e1268577
Author: Translation commit bot translat...@torproject.org
Date:   Sun Aug 16 12:46:22 2015 +

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

diff --git a/uk/conversations.properties b/uk/conversations.properties
new file mode 100644
index 000..eea2b1f
--- /dev/null
+++ b/uk/conversations.properties
@@ -0,0 +1,69 @@
+# 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=Розмова буде продовжена з %1$S, 
використовуючи %2$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 (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-authproperties] Update translations for tor-messenger-authproperties

2015-08-16 Thread translation 
commit cec4d24179fafea9671d18dae2500e012601200e
Author: Translation commit bot translat...@torproject.org
Date:   Sun Aug 16 12:46:09 2015 +

Update translations for tor-messenger-authproperties
---
 uk/auth.properties |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/uk/auth.properties b/uk/auth.properties
index 5b9543d..28e535d 100644
--- a/uk/auth.properties
+++ b/uk/auth.properties
@@ -5,7 +5,7 @@ auth.help=Verifying a contact's identity helps ensure that the 
person you are ta
 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=введіть відповідь тут:
-auth.error=An error occurred while verifying your contact's identity.
+auth.error=Виникла помилка при перевірці 
особистості вашого співрозмовника.
 auth.success=Verifying your contact's identity completed successfully.
 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.

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

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

2015-08-16 Thread translation 
commit 1e42ea00446809e55614e61e6ca90ac5d854d353
Author: Translation commit bot translat...@torproject.org
Date:   Sun Aug 16 12:46:41 2015 +

Update translations for tor-messenger-loggerproperties
---
 uk/logger.properties |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/uk/logger.properties b/uk/logger.properties
index 2228c50..fb5afcb 100644
--- a/uk/logger.properties
+++ b/uk/logger.properties
@@ -4,4 +4,4 @@
 
 # LOCALIZATION NOTE (badLogfile):
 #  %S is the filename of the log file.
-badLogfile=Empty or corrupt log file: %S
+badLogfile=Пустий або пошкоджений файл журналу: 
%S

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

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

2015-08-16 Thread translation 
commit fe5262559bb2816ad97837c317053c1c64d82d20
Author: Translation commit bot translat...@torproject.org
Date:   Sun Aug 16 12:46:44 2015 +

Update translations for tor-messenger-loggerproperties_completed
---
 uk/logger.properties |7 +++
 1 file changed, 7 insertions(+)

diff --git a/uk/logger.properties b/uk/logger.properties
new file mode 100644
index 000..fb5afcb
--- /dev/null
+++ b/uk/logger.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/.
+
+# LOCALIZATION NOTE (badLogfile):
+#  %S is the filename of the log file.
+badLogfile=Пустий або пошкоджений файл журналу: 
%S

___
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_completed] Update translations for tor-messenger-fingerdtd_completed

2015-08-16 Thread translation 
commit 34834f229ebb3f28f2b3b108cc484f57896c6b79
Author: Translation commit bot translat...@torproject.org
Date:   Sun Aug 16 12:46:31 2015 +

Update translations for tor-messenger-fingerdtd_completed
---
 uk/finger.dtd |   10 ++
 1 file changed, 10 insertions(+)

diff --git a/uk/finger.dtd b/uk/finger.dtd
new file mode 100644
index 000..ed8a5ff
--- /dev/null
+++ b/uk/finger.dtd
@@ -0,0 +1,10 @@
+!ENTITY finger.title Відомі відбитки пальців
+!ENTITY finger.screenName Ім'я користувача
+!ENTITY finger.status Статус
+!ENTITY finger.verified Перевірений
+!ENTITY finger.fingerprint Відбиток
+!ENTITY finger.account Обліковий запис
+!ENTITY finger.protocol Протокол
+!ENTITY finger.verify Перевірити
+!ENTITY finger.remove Видалити
+!ENTITY finger.intro Керувати списком відбитків, 
які ви бачили.
\ 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] [globe/master] Merge branch 'trac-16828'

2015-08-16 Thread isis 
commit 37d0a57e9d59eaafd32ffe10f6ced023759e9a94
Merge: ddc034a 1c81a61
Author: Isis Lovecruft i...@torproject.org
Date:   Mon Aug 17 01:24:33 2015 +

Merge branch 'trac-16828'

 src/js/application/app.js  |   50 
 src/js/components/AlertBoxComponent.js |2 +-
 src/js/components/BandwidthStatsComponent.js   |8 ++--
 src/js/components/LoadingIndicatorComponent.js |2 +-
 src/js/controllers/ApplicationController.js|   24 ++--
 src/js/controllers/Top10Controller.js  |2 +-
 src/js/helpers/dataTablesRenderer.js   |8 ++--
 src/js/helpers/formatter.js|   28 ++---
 src/js/helpers/handlebarsHelper.js |   38 +-
 src/js/helpers/util.js |   48 +++
 src/js/mixins/ContentReadyTriggerableMixin.js  |2 +-
 src/js/mixins/PeriodsMixin.js  |   16 
 src/js/models/OnionooBandwidthHistory.js   |8 ++--
 src/js/models/OnionooClientsHistory.js |8 ++--
 src/js/models/OnionooDetail.js |   50 
 src/js/models/OnionooUptimeHistory.js  |8 ++--
 src/js/models/OnionooWeightsHistory.js |6 +--
 src/js/models/TemporaryStore.js|   10 ++---
 src/js/routes/BridgeDetailRoute.js |8 ++--
 src/js/routes/RelayDetailRoute.js  |   12 +++---
 src/js/routes/StaticRoutes.js  |6 +--
 src/js/routes/SummarySearchRoute.js|   18 -
 src/js/routes/Top10Route.js|6 +--
 src/js/views/DetailViews.js|8 ++--
 src/js/views/HistoryGraphView.js   |   40 +--
 src/js/views/SummariesView.js  |   36 -
 26 files changed, 226 insertions(+), 226 deletions(-)

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

[tor-commits] [globe/master] Fix word spacing and capitalization in search result summary

2015-08-16 Thread isis 
commit 6db3d02ec21321c79221e6510bbb627caf09efc0
Author: Chaoyi Zha summermontr...@gmail.com
Date:   Sun Aug 16 01:19:38 2015 -0400

Fix word spacing and capitalization in search result summary

Signed-off-by: Isis Lovecruft i...@torproject.org
---
 src/js/templates/summarySearch.hbs |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/js/templates/summarySearch.hbs 
b/src/js/templates/summarySearch.hbs
index 7b2eba8..3128412 100644
--- a/src/js/templates/summarySearch.hbs
+++ b/src/js/templates/summarySearch.hbs
@@ -7,13 +7,13 @@
 {{ bind-attr class=:tabbed-item 
relaysActive:tabbed-active }}
 {{ action activateSummaries 'relays'}}
 div {{ bind-attr class=:indicator 
relays.length:indicator-important }}{{ controller.relays.length }}/div
-spanRelays/span
+span relays/span
 /div
 div
 {{ bind-attr class=:tabbed-item 
bridgesActive:tabbed-active }}
 {{ action activateSummaries 'bridges'}}
 div {{ bind-attr class=:indicator 
bridges.length:indicator-important }}{{ controller.bridges.length }}/div
-spanBridges/span
+span bridges/span
 /div
 /h3
 
@@ -25,4 +25,4 @@
 {{/view}}
 /div
 /div
-/div
\ No newline at end of file
+/div



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

[tor-commits] [globe/master] Merge branch 'trac-16827'

2015-08-16 Thread isis 
commit ddc034a7a2d64a9aa995279b18be710f186dc6a4
Merge: 01f90b1 6db3d02
Author: Isis Lovecruft i...@torproject.org
Date:   Mon Aug 17 01:10:14 2015 +

Merge branch 'trac-16827'

 src/js/templates/summarySearch.hbs |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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

[tor-commits] [globe/master] Fix JavaScript styling issues and add some consistency

2015-08-16 Thread isis 
commit 1c81a61715b0fc7a2dbe3116fbba919e2a956c61
Author: Chaoyi Zha summermontr...@gmail.com
Date:   Sun Aug 16 02:15:39 2015 -0400

Fix JavaScript styling issues and add some consistency

Signed-off-by: Isis Lovecruft i...@torproject.org
---
 src/js/application/app.js  |   50 
 src/js/components/AlertBoxComponent.js |2 +-
 src/js/components/BandwidthStatsComponent.js   |8 ++--
 src/js/components/LoadingIndicatorComponent.js |2 +-
 src/js/controllers/ApplicationController.js|   24 ++--
 src/js/controllers/Top10Controller.js  |2 +-
 src/js/helpers/dataTablesRenderer.js   |8 ++--
 src/js/helpers/formatter.js|   28 ++---
 src/js/helpers/handlebarsHelper.js |   38 +-
 src/js/helpers/util.js |   48 +++
 src/js/mixins/ContentReadyTriggerableMixin.js  |2 +-
 src/js/mixins/PeriodsMixin.js  |   16 
 src/js/models/OnionooBandwidthHistory.js   |8 ++--
 src/js/models/OnionooClientsHistory.js |8 ++--
 src/js/models/OnionooDetail.js |   50 
 src/js/models/OnionooUptimeHistory.js  |8 ++--
 src/js/models/OnionooWeightsHistory.js |6 +--
 src/js/models/TemporaryStore.js|   10 ++---
 src/js/routes/BridgeDetailRoute.js |8 ++--
 src/js/routes/RelayDetailRoute.js  |   12 +++---
 src/js/routes/StaticRoutes.js  |6 +--
 src/js/routes/SummarySearchRoute.js|   18 -
 src/js/routes/Top10Route.js|6 +--
 src/js/views/DetailViews.js|8 ++--
 src/js/views/HistoryGraphView.js   |   40 +--
 src/js/views/SummariesView.js  |   36 -
 26 files changed, 226 insertions(+), 226 deletions(-)

diff --git a/src/js/application/app.js b/src/js/application/app.js
index 6fa6ce2..8ec4aa5 100644
--- a/src/js/application/app.js
+++ b/src/js/application/app.js
@@ -5,7 +5,7 @@
 var GLOBE = Ember.Application.create();
 
 // @if NODE_ENV == 'TESTING'
-if($.isFunction(window.prepareForTesting)){
+if ($.isFunction(window.prepareForTesting)) {
 prepareForTesting(GLOBE);
 }
 // @endif
@@ -37,14 +37,14 @@ GLOBE = GLOBE.reopen({
 }),
 
 // Event that observes GLOBE.title and changes the document title
-titleChanged: function(){
+titleChanged: function() {
 
 var title = this.get('title');
 var suffix = GLOBE.static.titleSuffix + ' ' + GLOBE.static.version;
 
-if(title.length){
+if (title.length) {
 $(document).attr('title', title + ' | ' + suffix);
-}else{
+} else {
 $(document).attr('title', suffix);
 }
 
@@ -57,8 +57,8 @@ GLOBE = GLOBE.reopen({
  * @param {String} msg Alert message
  * @return {void}
  */
-setAlert: function(location, type, msg){
-if(this.get('alert').hasOwnProperty(location)){
+setAlert: function(location, type, msg) {
+if (this.get('alert').hasOwnProperty(location)) {
 this.set('alert.' + location, Em.Object.create({
 type: type,
 msg: msg
@@ -70,8 +70,8 @@ GLOBE = GLOBE.reopen({
  * @param {String} location Alert storage location
  * @return {void}
  */
-clearAlert: function(location){
-if(this.get('alert').hasOwnProperty(location)){
+clearAlert: function(location) {
+if (this.get('alert').hasOwnProperty(location)) {
 this.set('alert.' + location, null);
 }
 }
@@ -80,7 +80,7 @@ GLOBE = GLOBE.reopen({
 GLOBE.static = {
 browser: {
 // check if the current browser is firefox
-isFirefox: function(){
+isFirefox: function() {
 // @see http://stackoverflow.com/a/9851769
 return typeof InstallTrigger !== 'undefined';
 }
@@ -444,8 +444,8 @@ GLOBE.static.messages.specifyYourSearch = 'To avoid too 
many requests, we limit
 
 
 // fill flag array
-for(var icon in GLOBE.static.icons){
-if(GLOBE.static.icons.hasOwnProperty(icon)){
+for (var icon in GLOBE.static.icons) {
+if (GLOBE.static.icons.hasOwnProperty(icon)) {
 GLOBE.static.iconsArray.push({
 key: icon,
 value: GLOBE.static.icons[icon]
@@ -454,8 +454,8 @@ for(var icon in GLOBE.static.icons){
 }
 
 // fill countries array
-for(var country in GLOBE.static.countries){
-if(GLOBE.static.countries.hasOwnProperty(country)){
+for (var country in GLOBE.static.countries) {
+if (GLOBE.static.countries.hasOwnProperty(country)) {
 GLOBE.static.countriesArray.push({
 key: country,
 value: GLOBE.static.countries[country]
@@ -463,7 +463,7 @@ for(var country in GLOBE.static.countries){
 }
 }
 // sort by country names

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

2015-08-16 Thread translation 
commit 1f1e7b9d2a3906b007f297fb9913d8b21022d90a
Author: Translation commit bot translat...@torproject.org
Date:   Sun Aug 16 19:15:09 2015 +

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 785f4de..d2b7ac3 100644
--- a/tr/LC_MESSAGES/bridgedb.po
+++ b/tr/LC_MESSAGES/bridgedb.po
@@ -26,7 +26,7 @@ msgid 
 msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDBkeywords=bridgedb-reported,msgidcc=isis,sysrqbowner=isis'POT-Creation-Date:
 2015-03-19 22:13+\n
-PO-Revision-Date: 2015-08-02 14:03+\n
+PO-Revision-Date: 2015-08-16 18:54+\n
 Last-Translator: Ozancan Karataş ozancankarata...@outlook.com\n
 Language-Team: Turkish 
(http://www.transifex.com/otf/torproject/language/tr/)\n
 MIME-Version: 1.0\n
@@ -64,7 +64,7 @@ msgstr İşte köprüleriniz:
 msgid 
 You have exceeded the rate limit. Please slow down! The minimum time 
between\n
 emails is %s hours. All further emails during this time period will be 
ignored.
-msgstr E-posta kotanızı aştınız. Lütfen yavaşlayın! E-postalar 
arasındaki minimum zaman %s saattir.\nBu süre içinde göndereceğiniz diğer 
e-postalarınız yok sayılacaktır.
+msgstr E-posta sınırınızı aştınız. Lütfen yavaşlayın! E-postalar 
arasındaki en az zaman %s saattir.\nBu süre içinde göndereceğiniz diğer 
e-postalarınız yok sayılacaktır.
 
 #: lib/bridgedb/strings.py:25
 msgid 
@@ -74,12 +74,12 @@ msgstr KOMUTlar: (birden fazla seçeneğı aynı anda 
belirtmek için KOMUTlar
 #. TRANSLATORS: Please DO NOT translate the word BridgeDB.
 #: lib/bridgedb/strings.py:28
 msgid Welcome to BridgeDB!
-msgstr BridgeDB yazılımına hoş geldiniz!
+msgstr BridgeDB'ye hoş geldiniz!
 
 #. TRANSLATORS: Please DO NOT translate the words transport or TYPE.
 #: lib/bridgedb/strings.py:30
 msgid Currently supported transport TYPEs:
-msgstr Şu an desteklenen aktarım TYPEleri:
+msgstr Şu an desteklenen aktarım TİPleri:
 
 #: lib/bridgedb/strings.py:31
 #, python-format

___
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

2015-08-16 Thread translation 
commit 08e1ff4b7269119ce70a33bea43d7c048d981a95
Author: Translation commit bot translat...@torproject.org
Date:   Sun Aug 16 19:15:04 2015 +

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 785f4de..d2b7ac3 100644
--- a/tr/LC_MESSAGES/bridgedb.po
+++ b/tr/LC_MESSAGES/bridgedb.po
@@ -26,7 +26,7 @@ msgid 
 msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDBkeywords=bridgedb-reported,msgidcc=isis,sysrqbowner=isis'POT-Creation-Date:
 2015-03-19 22:13+\n
-PO-Revision-Date: 2015-08-02 14:03+\n
+PO-Revision-Date: 2015-08-16 18:54+\n
 Last-Translator: Ozancan Karataş ozancankarata...@outlook.com\n
 Language-Team: Turkish 
(http://www.transifex.com/otf/torproject/language/tr/)\n
 MIME-Version: 1.0\n
@@ -64,7 +64,7 @@ msgstr İşte köprüleriniz:
 msgid 
 You have exceeded the rate limit. Please slow down! The minimum time 
between\n
 emails is %s hours. All further emails during this time period will be 
ignored.
-msgstr E-posta kotanızı aştınız. Lütfen yavaşlayın! E-postalar 
arasındaki minimum zaman %s saattir.\nBu süre içinde göndereceğiniz diğer 
e-postalarınız yok sayılacaktır.
+msgstr E-posta sınırınızı aştınız. Lütfen yavaşlayın! E-postalar 
arasındaki en az zaman %s saattir.\nBu süre içinde göndereceğiniz diğer 
e-postalarınız yok sayılacaktır.
 
 #: lib/bridgedb/strings.py:25
 msgid 
@@ -74,12 +74,12 @@ msgstr KOMUTlar: (birden fazla seçeneğı aynı anda 
belirtmek için KOMUTlar
 #. TRANSLATORS: Please DO NOT translate the word BridgeDB.
 #: lib/bridgedb/strings.py:28
 msgid Welcome to BridgeDB!
-msgstr BridgeDB yazılımına hoş geldiniz!
+msgstr BridgeDB'ye hoş geldiniz!
 
 #. TRANSLATORS: Please DO NOT translate the words transport or TYPE.
 #: lib/bridgedb/strings.py:30
 msgid Currently supported transport TYPEs:
-msgstr Şu an desteklenen aktarım TYPEleri:
+msgstr Şu an desteklenen aktarım TİPleri:
 
 #: lib/bridgedb/strings.py:31
 #, python-format

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

[tor-commits] [tor-browser-bundle/maint-5.0] Bump versions for 5.0.1.

2015-08-16 Thread mikeperry 
commit 1eaebdd5a59a1ba22e3001aecc4329720a5255a2
Author: Mike Perry mikeperry-...@torproject.org
Date:   Sun Aug 16 14:06:53 2015 -0700

Bump versions for 5.0.1.
---
 Bundle-Data/Docs/ChangeLog.txt|4 
 gitian/versions   |2 +-
 tools/update-responses/config.yml |7 ---
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt
index 10fc5a1..5795e76 100644
--- a/Bundle-Data/Docs/ChangeLog.txt
+++ b/Bundle-Data/Docs/ChangeLog.txt
@@ -1,3 +1,7 @@
+Tor Browser 5.0.1 -- August 18 2015
+ * All Platforms
+   * Bug 16771: Fix crash on some websites due to blob URIs
+
 Tor Browser 5.5a1 -- August 11 2015
  * All Platforms
* Update Firefox to 38.2.0esr
diff --git a/gitian/versions b/gitian/versions
index 6b6f290..98238c6 100755
--- a/gitian/versions
+++ b/gitian/versions
@@ -8,7 +8,7 @@ FIREFOX_VERSION=38.2.0esr
 
 TORBROWSER_UPDATE_CHANNEL=release
 
-TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.0-1-build2
+TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.0-1-build3
 TOR_TAG=tor-0.2.6.10
 TORLAUNCHER_TAG=0.2.7.7
 TORBUTTON_TAG=1.9.3.2
diff --git a/tools/update-responses/config.yml 
b/tools/update-responses/config.yml
index 4d2e7cb..fd0e1ee 100644
--- a/tools/update-responses/config.yml
+++ b/tools/update-responses/config.yml
@@ -10,14 +10,15 @@ build_targets:
 osx64: Darwin_x86_64-gcc3
 channels:
 alpha: 5.5a1
-release: 5.0
+release: 5.0.1
 versions:
-5.0:
+5.0.1:
 platformVersion: 38.2.0
 detailsURL: https://www.torproject.org/projects/torbrowser.html.en
-download_url: https://www.torproject.org/dist/torbrowser/5.0
+download_url: https://www.torproject.org/dist/torbrowser/5.0.1
 incremental_from:
   - 4.5.3
+  - 5.0
 migrate_archs:
   osx32: osx64
 osx32:

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

[tor-commits] [tor-browser/tor-browser-38.2.0esr-5.0-1] fixup! Bug #15502. Isolate blob, mediasource mediastream URLs to first party

2015-08-16 Thread mikeperry 
commit 52e988762c262920f52a7f4b9b89c64f04da3c4c
Author: Arthur Edelstein arthuredelst...@gmail.com
Date:   Wed Aug 12 12:26:34 2015 -0700

fixup! Bug #15502. Isolate blob, mediasource  mediastream URLs to first 
party
---
 dom/base/nsHostObjectProtocolHandler.cpp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dom/base/nsHostObjectProtocolHandler.cpp 
b/dom/base/nsHostObjectProtocolHandler.cpp
index 429938b..114b45c 100644
--- a/dom/base/nsHostObjectProtocolHandler.cpp
+++ b/dom/base/nsHostObjectProtocolHandler.cpp
@@ -351,7 +351,7 @@ nsHostObjectProtocolHandler::RemoveDataEntry(const 
nsACString aUri,
 {
   if (gDataTable) {
 DataInfo* info = GetDataInfo(aUri);
-if (info-mFirstPartyHost == aIsolationKey) {
+if (info  info-mFirstPartyHost == aIsolationKey) {
   nsCString uriIgnoringRef;
   int32_t hashPos = aUri.FindChar('#');
   if (hashPos  0) {

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

[tor-commits] [tor-browser/tor-browser-38.2.0esr-5.5-1] fixup! Bug #15502. Isolate blob, mediasource mediastream URLs to first party

2015-08-16 Thread mikeperry 
commit b5ded517ea69201328825c95785200cb1c5bb829
Author: Arthur Edelstein arthuredelst...@gmail.com
Date:   Wed Aug 12 12:26:34 2015 -0700

fixup! Bug #15502. Isolate blob, mediasource  mediastream URLs to first 
party
---
 dom/base/nsHostObjectProtocolHandler.cpp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dom/base/nsHostObjectProtocolHandler.cpp 
b/dom/base/nsHostObjectProtocolHandler.cpp
index 429938b..114b45c 100644
--- a/dom/base/nsHostObjectProtocolHandler.cpp
+++ b/dom/base/nsHostObjectProtocolHandler.cpp
@@ -351,7 +351,7 @@ nsHostObjectProtocolHandler::RemoveDataEntry(const 
nsACString aUri,
 {
   if (gDataTable) {
 DataInfo* info = GetDataInfo(aUri);
-if (info-mFirstPartyHost == aIsolationKey) {
+if (info  info-mFirstPartyHost == aIsolationKey) {
   nsCString uriIgnoringRef;
   int32_t hashPos = aUri.FindChar('#');
   if (hashPos  0) {

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