tor-commits April 2014

tor-commits@lists.torproject.org

22 participants
2020 discussions

[onionoo/master] Don't alter NodeStatus in DetailsDocumentWriter.
by karsten＠torproject.org 25 Apr '14

25 Apr '14

commit 51d883ba06bed1342311c8d8b78a8e6aea70f043 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Apr 21 11:12:08 2014 +0200 Don't alter NodeStatus in DetailsDocumentWriter. The following two things went wrong when splitting up NodeDataWriter into two classes in e152b67: - Writing exit addresses to details documents doesn't require adding these addresses to the NodeStatus instance only to filter out known OR addresses. That's something we can also do in DetailsDocumentWriter. - Writing details documents is not the right place to learn the latest contact line of a relay to update our NodeStatus. This is something we can do when parsing the relay descriptor in NodeDetailsStatusUpdater. These are no bugs, but things that make it harder to refactor DetailsDocumentWriter. --- .../torproject/onionoo/DetailsDocumentWriter.java | 33 +++++++------------- .../onionoo/NodeDetailsStatusUpdater.java | 18 ++++++++--- 2 files changed, 26 insertions(+), 25 deletions(-) diff --git a/src/org/torproject/onionoo/DetailsDocumentWriter.java b/src/org/torproject/onionoo/DetailsDocumentWriter.java index 1682d7d..950a332 100644 --- a/src/org/torproject/onionoo/DetailsDocumentWriter.java +++ b/src/org/torproject/onionoo/DetailsDocumentWriter.java @@ -244,25 +244,29 @@ public class DetailsDocumentWriter implements DescriptorListener, /* Add exit addresses if at least one of them is distinct from the * onion-routing addresses. */ - if (exitListEntries.containsKey(fingerprint)) { + SortedSet<String> exitAddresses = new TreeSet<String>(); + if (this.exitListEntries.containsKey(fingerprint)) { for (ExitListEntry exitListEntry : - exitListEntries.get(fingerprint)) { - entry.addExitAddress(exitListEntry.getExitAddress()); + this.exitListEntries.get(fingerprint)) { + String exitAddress = exitListEntry.getExitAddress(); + if (exitAddress.length() > 0 && + !entry.getAddress().equals(exitAddress) && + !entry.getOrAddresses().contains(exitAddress)) { + exitAddresses.add(exitAddress); + } } } - if (!entry.getExitAddresses().isEmpty()) { + if (!exitAddresses.isEmpty()) { sb.append(",\n\"exit_addresses\":["); int written = 0; - for (String exitAddress : entry.getExitAddresses()) { + for (String exitAddress : exitAddresses) { sb.append((written++ > 0 ? "," : "") + "\"" + exitAddress.toLowerCase() + "\""); } sb.append("]"); } - /* Append descriptor-specific part from details status file, and - * update contact in node status. */ - /* TODO Updating the contact here seems like a pretty bad hack. */ + /* Append descriptor-specific part from details status file. */ DetailsStatus detailsStatus = this.documentStore.retrieve( DetailsStatus.class, false, fingerprint); if (detailsStatus != null && @@ -275,18 +279,9 @@ public class DetailsDocumentWriter implements DescriptorListener, if (line.startsWith("\"desc_published\":")) { continue; } - if (line.startsWith("\"contact\":")) { - int start = "\"contact\":\"".length(), - end = line.length() - 1; - if (line.endsWith(",")) { - end--; - } - contact = unescapeJSON(line.substring(start, end)); - } sb.append("\n" + line); } s.close(); - entry.setContact(contact); } /* Finish details string. */ @@ -364,10 +359,6 @@ public class DetailsDocumentWriter implements DescriptorListener, return StringEscapeUtils.escapeJavaScript(s).replaceAll("\\\\'", "'"); } - private static String unescapeJSON(String s) { - return StringEscapeUtils.unescapeJavaScript(s.replaceAll("'", "\\'")); - } - public String getStatsString() { /* TODO Add statistics string. */ return null; diff --git a/src/org/torproject/onionoo/NodeDetailsStatusUpdater.java b/src/org/torproject/onionoo/NodeDetailsStatusUpdater.java index 4d32b2c..4cfdd33 100644 --- a/src/org/torproject/onionoo/NodeDetailsStatusUpdater.java +++ b/src/org/torproject/onionoo/NodeDetailsStatusUpdater.java @@ -37,6 +37,8 @@ public class NodeDetailsStatusUpdater implements DescriptorListener, private SortedMap<String, NodeStatus> knownNodes = new TreeMap<String, NodeStatus>(); + private Map<String, String> contacts = new HashMap<String, String>(); + private SortedMap<String, NodeStatus> relays; private SortedMap<String, NodeStatus> bridges; @@ -99,8 +101,8 @@ public class NodeDetailsStatusUpdater implements DescriptorListener, Logger.printStatusTime("Started reverse domain name lookups"); this.lookUpCitiesAndASes(); Logger.printStatusTime("Looked up cities and ASes"); - this.setRunningBits(); - Logger.printStatusTime("Set running bits"); + this.setRunningBitsAndContacts(); + Logger.printStatusTime("Set running bits and contacts"); this.calculatePathSelectionProbabilities(); Logger.printStatusTime("Calculated path selection probabilities"); this.finishReverseDomainNameLookups(); @@ -209,8 +211,10 @@ public class NodeDetailsStatusUpdater implements DescriptorListener, } } - private void setRunningBits() { - for (NodeStatus node : this.knownNodes.values()) { + private void setRunningBitsAndContacts() { + for (Map.Entry<String, NodeStatus> e : this.knownNodes.entrySet()) { + String fingerprint = e.getKey(); + NodeStatus node = e.getValue(); if (node.isRelay() && node.getRelayFlags().contains("Running") && node.getLastSeenMillis() == this.relaysLastValidAfterMillis) { node.setRunning(true); @@ -219,6 +223,9 @@ public class NodeDetailsStatusUpdater implements DescriptorListener, node.getLastSeenMillis() == this.bridgesLastPublishedMillis) { node.setRunning(true); } + if (this.contacts.containsKey(fingerprint)) { + node.setContact(this.contacts.get(fingerprint)); + } } } @@ -363,6 +370,9 @@ public class NodeDetailsStatusUpdater implements DescriptorListener, detailsStatus = new DetailsStatus(); detailsStatus.setDocumentString(sb.toString()); this.documentStore.store(detailsStatus, fingerprint); + if (descriptor.getContact() != null) { + this.contacts.put(fingerprint, descriptor.getContact()); + } } private void processBridgeServerDescriptor(

1 0

[translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd
by translation＠torproject.org 25 Apr '14

25 Apr '14

commit 9f774801e67a06abb1cbb7d98bfd3c834e2b97bc Author: Translation commit bot <translation(a)torproject.org> Date: Fri Apr 25 08:45:51 2014 +0000 Update translations for torbutton-torbuttondtd --- bg/torbutton.dtd | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/bg/torbutton.dtd b/bg/torbutton.dtd index afde60e..89d1566 100644 --- a/bg/torbutton.dtd +++ b/bg/torbutton.dtd @@ -1,34 +1,34 @@ -<!ENTITY torbutton.prefs.title "Torbutton Preferences"> +<!ENTITY torbutton.prefs.title "Torbutton Предпочитания"> <!ENTITY torbutton.prefs.tor_settings "Прокси настройки"> -<!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox"> -<!ENTITY torbutton.prefs.use_privoxy "Use Privoxy"> -<!ENTITY torbutton.prefs.use_polipo "Use Polipo"> -<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings"> -<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:"> +<!ENTITY torbutton.prefs.recommended_settings "Използвай препоръчителните прокси настройки за моята версия на Firefox"> +<!ENTITY torbutton.prefs.use_privoxy "Използвай Privoxy"> +<!ENTITY torbutton.prefs.use_polipo "Използвай Polipo"> +<!ENTITY torbutton.prefs.custom_settings "Използвай различни прокси настройки"> +<!ENTITY torbutton.prefs.proxy.host.http "HTTP Прокси:"> +<!ENTITY torbutton.prefs.proxy.host.https "SSL Прокси:"> +<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Прокси:"> +<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Прокси:"> +<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Хост:"> <!ENTITY torbutton.prefs.proxy.port "Порт:"> -<!ENTITY torbutton.about.title "About Torbutton"> -<!ENTITY torbutton.about.version "Version:"> -<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing."> +<!ENTITY torbutton.about.title "Относно Torbutton"> +<!ENTITY torbutton.about.version "Версия:"> +<!ENTITY torbutton.about.summary "Защитава анонимността ви в Tor"> <!ENTITY torbutton.about.code "Code Contributors:"> -<!ENTITY torbutton.about.maintainer "Maintainer:"> +<!ENTITY torbutton.about.maintainer "Отговорник:"> <!ENTITY torbutton.about.security_review "Security Review:"> -<!ENTITY torbutton.about.donate "If you like using Tor, you might consider"> -<!ENTITY torbutton.about.make_donation "making a donation."> +<!ENTITY torbutton.about.donate "Ако ви харесва Tor,вие може да обмислите"> +<!ENTITY torbutton.about.make_donation "дарение."> <!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings."> -<!ENTITY torbutton.pref_connection.more_info "More information"> +<!ENTITY torbutton.pref_connection.more_info "Повече информация"> <!ENTITY torbutton.pref_connection_more_info.title "Помощ"> <!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled. If you would like to change your non-Tor proxy settings, please disable Torbutton and return here. If you would like to change your Tor settings, please use the Torbutton preference window."> <!ENTITY torbutton.context_menu.new_identity "Нова самоличност"> <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.toggle "Toggle Tor status"> <!ENTITY torbutton.context_menu.toggle.key "T"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> +<!ENTITY torbutton.context_menu.preferences "Предпочитания..."> <!ENTITY torbutton.context_menu.preferences.key "P"> -<!ENTITY torbutton.context_menu.about "About Torbutton..."> +<!ENTITY torbutton.context_menu.about "Относно Torbutton..."> <!ENTITY torbutton.context_menu.about.key "A"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> <!ENTITY torbutton.context_menu.networksettings.key "S">

1 0

[translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties
by translation＠torproject.org 25 Apr '14

25 Apr '14

commit 032ed4f26078f63aecd45c9570017ae85a6afee8 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Apr 25 08:45:49 2014 +0000 Update translations for torbutton-torbuttonproperties --- bg/torbutton.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bg/torbutton.properties b/bg/torbutton.properties index 6ac8574..c9b4ee9 100644 --- a/bg/torbutton.properties +++ b/bg/torbutton.properties @@ -25,9 +25,9 @@ torbutton.popup.external.title = Download an external file type? torbutton.popup.external.app = Tor Browser cannot display this file. You will need to open it with another application.\n\n torbutton.popup.external.note = Some types of files can cause applications to connect to the Internet without using Tor.\n\n torbutton.popup.external.suggest = To be safe, you should only open downloaded files while offline, or use a Tor Live CD such as Tails.\n -torbutton.popup.launch = Download file +torbutton.popup.launch = Свали файл torbutton.popup.cancel = Отказ -torbutton.popup.dontask = Automatically download files from now on +torbutton.popup.dontask = Автоматично сваляй файлове отсега torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly? torbutton.popup.captcha.title = Avoid Google Captchas? torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?

1 0

[translation/torbirdy] Update translations for torbirdy
by translation＠torproject.org 25 Apr '14

25 Apr '14

commit 22e4cdebc8ad82ea6bf530f134c817d61b347b8d Author: Translation commit bot <translation(a)torproject.org> Date: Fri Apr 25 08:45:26 2014 +0000 Update translations for torbirdy --- bg/torbirdy.dtd | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/bg/torbirdy.dtd b/bg/torbirdy.dtd index 5db448a..90f660b 100644 --- a/bg/torbirdy.dtd +++ b/bg/torbirdy.dtd @@ -1,14 +1,14 @@ -<!ENTITY torbirdy.accountprefs.title "Account Configuration"> -<!ENTITY torbirdy.accountprefs.startup.label "Check for new messages at startup"> +<!ENTITY torbirdy.accountprefs.title "Настройване на Акаунт"> +<!ENTITY torbirdy.accountprefs.startup.label "Провери за нови съобщения при стартиране"> <!ENTITY torbirdy.accountprefs.startup.key "C"> -<!ENTITY torbirdy.accountprefs.minutes.label "Check for new messages every"> +<!ENTITY torbirdy.accountprefs.minutes.label "Провери за нови съобщения на всеки"> <!ENTITY torbirdy.accountprefs.minutes.key "d"> -<!ENTITY torbirdy.accountprefs.minutes.trail.label "minutes"> +<!ENTITY torbirdy.accountprefs.minutes.trail.label "минути"> <!ENTITY torbirdy.accountprefs.cancel.button "Отказ"> <!ENTITY torbirdy.accountprefs.save.button "Запиши"> <!ENTITY torbirdy.accountprefs.save.key "S"> -<!ENTITY torbirdy.prefs.title "TorBirdy Preferences"> +<!ENTITY torbirdy.prefs.title "TorBirdy Предпочитания"> <!ENTITY torbirdy.prefs.save.button "Запиши"> <!ENTITY torbirdy.prefs.save.key "s"> <!ENTITY torbirdy.prefs.cancel.button "Отказ"> @@ -16,23 +16,23 @@ <!ENTITY torbirdy.prefs.extra2.key "d"> <!ENTITY torbirdy.prefs.testproxy.button "Test Proxy Settings"> <!ENTITY torbirdy.prefs.testproxy.key "n"> -<!ENTITY torbirdy.prefs.proxy.label "Proxy"> +<!ENTITY torbirdy.prefs.proxy.label "Прокси"> <!ENTITY torbirdy.prefs.privacy.label "Privacy"> <!ENTITY torbirdy.prefs.enigmail.label "Enigmail"> <!ENTITY torbirdy.prefs.security.label "Security"> -<!ENTITY torbirdy.prefs.recommended.text "Use the recommended proxy settings for TorBirdy (Tor)"> +<!ENTITY torbirdy.prefs.recommended.text "Използвай препоръчителните настройки за прокси в TorBirdy (Tor)"> <!ENTITY torbirdy.prefs.recommended.key "r"> <!ENTITY torbirdy.prefs.anonservice.text "Choose an anonymization service"> <!ENTITY torbirdy.prefs.anonservice.key "a"> <!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings"> <!ENTITY torbirdy.prefs.customsettings.key "c"> -<!ENTITY torbirdy.prefs.socks_host.label "SOCKS Host: "> +<!ENTITY torbirdy.prefs.socks_host.label "SOCKS Host:"> <!ENTITY torbirdy.prefs.socks_host.key "h"> -<!ENTITY torbirdy.prefs.socks_port.label "Port: "> +<!ENTITY torbirdy.prefs.socks_port.label "Порт"> <!ENTITY torbirdy.prefs.socks_port.key "p"> <!ENTITY torbirdy.prefs.torification.label "Transparent Torification (warning: requires custom transproxy or Tor router)"> <!ENTITY torbirdy.prefs.torification.key "t"> -<!ENTITY torbirdy.prefs.global "Global"> +<!ENTITY torbirdy.prefs.global "Глобални"> <!ENTITY torbirdy.prefs.imap.label "Enable push email support for IMAP accounts [default: disabled]"> <!ENTITY torbirdy.prefs.imap.key "p"> <!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled]">

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 25 Apr '14

25 Apr '14

commit 1cbfb9dd68198376a38fabb84e7affc19ba1923e Author: Translation commit bot <translation(a)torproject.org> Date: Fri Apr 25 08:15:38 2014 +0000 Update translations for tails-misc --- bg.po | 54 +++++++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/bg.po b/bg.po index 3cfbc5a..cfc05c0 100644 --- a/bg.po +++ b/bg.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-03-23 08:55+0100\n" -"PO-Revision-Date: 2014-04-25 07:45+0000\n" +"PO-Revision-Date: 2014-04-25 08:10+0000\n" "Last-Translator: Bavarian <mr.cyberpower(a)gmail.com>\n" "Language-Team: Bulgarian (http://www.transifex.com/projects/p/torproject/language/bg/)\n" "MIME-Version: 1.0\n" @@ -21,7 +21,7 @@ msgstr "" #: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready-notification.sh:43 msgid "Tor is ready" -msgstr "" +msgstr "Tor е готов" #: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready-notification.sh:44 msgid "You can now access the Internet." @@ -200,15 +200,15 @@ msgstr "" #: config/chroot_local-includes/usr/local/bin/iceweasel:12 msgid "Tor is not ready" -msgstr "" +msgstr "Tor не е готов" #: config/chroot_local-includes/usr/local/bin/iceweasel:13 msgid "Tor is not ready. Start Tor Browser anyway?" -msgstr "" +msgstr "Tor не е готов.Да стартирам ли Tor Браузър въпреки всичко?" #: config/chroot_local-includes/usr/local/bin/iceweasel:14 msgid "Start Tor Browser" -msgstr "" +msgstr "Стартирай Tor Браузър" #: config/chroot_local-includes/usr/local/bin/iceweasel:15 msgid "Cancel" @@ -297,7 +297,7 @@ msgstr "" #: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:29 #, sh-format msgid "Network card ${nic} disabled" -msgstr "" +msgstr "Мрежовата карта ${nic} е забранена" #: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:30 #, sh-format @@ -391,52 +391,52 @@ msgid "" "Network activity within the Unsafe Browser is <b>not anonymous</b>. Only use" " the Unsafe Browser if necessary, for example if you have to login or " "register to activate your Internet connection." -msgstr "" +msgstr "Мрежовата активност в Несигурният Браузър <b>не е анонимна<b>.Използвайте Несигурният Браузър само при необходимост,например ако ви се налага логване или регистриране за активация на вашата Интернет връзка." #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:71 msgid "_Launch" -msgstr "" +msgstr "_Стартиране" #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:72 msgid "_Exit" -msgstr "" +msgstr "_Изход" #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:82 msgid "Starting the Unsafe Browser..." -msgstr "" +msgstr "Стартриране на Несигурният Браузър..." #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:83 msgid "This may take a while, so please be patient." -msgstr "" +msgstr "Това може да отнеме време,моля имайте търпение." #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:101 msgid "Failed to setup chroot." -msgstr "" +msgstr "Не можа да се установи chroot." #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:175 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1 msgid "Unsafe Browser" -msgstr "" +msgstr "Несигурен Браузър" #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:215 msgid "Shutting down the Unsafe Browser..." -msgstr "" +msgstr "Изключване на Несигурният Браузър..." #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:216 msgid "" "This may take a while, and you may not restart the Unsafe Browser until it " "is properly shut down." -msgstr "" +msgstr "Това може да отнеме време,моля не рестартирайте Несигурният Браузър преди той да е правилно изключен." #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:228 msgid "Failed to restart Tor." -msgstr "" +msgstr "Не можа да се рестартира Tor." #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:236 msgid "" "Another Unsafe Browser is currently running, or being cleaned up. Please " "retry in a while." -msgstr "" +msgstr "Друг Несигурен Браузър работи или се почиства в момента.Моля опитайте по-късно." #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:249 msgid "" @@ -446,7 +446,7 @@ msgstr "" #: config/chroot_local-includes/usr/share/tails/truecrypt-wrapper.disabled:11 msgid "TrueCrypt will soon be removed from Tails" -msgstr "" +msgstr "TrueCrypt скоро ще бъде премахната от Tails" #: config/chroot_local-includes/usr/share/tails/truecrypt-wrapper.disabled:12 msgid "" @@ -456,12 +456,12 @@ msgstr "" #: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1 msgid "Report an error" -msgstr "" +msgstr "Докладвай за грешка" #: ../config/chroot_local-includes/etc/skel/Desktop/tails-documentation.desktop.in.h:1 #: ../config/chroot_local-includes/usr/share/applications/tails-documentation.desktop.in.h:1 msgid "Tails documentation" -msgstr "" +msgstr "Tails документация" #: ../config/chroot_local-includes/usr/share/applications/tails-documentation.desktop.in.h:2 msgid "Learn how to use Tails" @@ -473,7 +473,7 @@ msgstr "" #: ../config/chroot_local-includes/usr/share/applications/i2p.desktop.in.h:2 msgid "i2p" -msgstr "" +msgstr "i2p" #: ../config/chroot_local-includes/usr/share/applications/i2p.desktop.in.h:3 msgid "Anonymous overlay network" @@ -481,19 +481,19 @@ msgstr "" #: ../config/chroot_local-includes/usr/share/applications/tails-reboot.desktop.in.h:1 msgid "Reboot" -msgstr "" +msgstr "Рестартиране" #: ../config/chroot_local-includes/usr/share/applications/tails-reboot.desktop.in.h:2 msgid "Immediately reboot computer" -msgstr "" +msgstr "Незабавно рестартиране на компютъра" #: ../config/chroot_local-includes/usr/share/applications/tails-shutdown.desktop.in.h:1 msgid "Power Off" -msgstr "" +msgstr "Изключване" #: ../config/chroot_local-includes/usr/share/applications/tails-shutdown.desktop.in.h:2 msgid "Immediately shut down computer" -msgstr "" +msgstr "Незабавно изключване на компютъра" #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:2 msgid "Browse the World Wide Web without anonymity" @@ -501,8 +501,8 @@ msgstr "" #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:3 msgid "Unsafe Web Browser" -msgstr "" +msgstr "Несигурен Уеб Браузър" #: ../config/chroot_local-includes/usr/share/desktop-directories/Tails.directory.in.h:2 msgid "Tails specific tools" -msgstr "" +msgstr "Специфични за Tails инструменти"

1 0

[translation/mat-gui] Update translations for mat-gui
by translation＠torproject.org 25 Apr '14

25 Apr '14

commit 7fba97983f2ae8340b7e6dd8e4b8747c965c0973 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Apr 25 08:15:27 2014 +0000 Update translations for mat-gui --- bg.po | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/bg.po b/bg.po index 710b393..21e173f 100644 --- a/bg.po +++ b/bg.po @@ -3,6 +3,8 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Translators: +# Bavarian <mr.cyberpower(a)gmail.com>, 2014 # paya4ko <iliev2012(a)gmail.com>, 2013 # alexdimitrov <kvikmen(a)gmail.com>, 2013 msgid "" @@ -10,8 +12,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-01-19 14:48+0000\n" -"PO-Revision-Date: 2014-01-21 09:26+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2014-04-25 08:10+0000\n" +"Last-Translator: Bavarian <mr.cyberpower(a)gmail.com>\n" "Language-Team: Bulgarian (http://www.transifex.com/projects/p/torproject/language/bg/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -37,7 +39,7 @@ msgstr "Поддържани файлове" #: mat-gui:157 msgid "No metadata found" -msgstr "" +msgstr "Няма намерени метаданни" #: mat-gui:158 mat-gui:398 mat-gui:420 msgid "Clean" @@ -66,15 +68,15 @@ msgstr "Настройки" #: mat-gui:220 msgid "Reduce PDF quality" -msgstr "" +msgstr "Намалете качеството на PDF" #: mat-gui:223 msgid "Reduce the produced PDF size and quality" -msgstr "" +msgstr "Намалете качеството и размера на създадения PDF" #: mat-gui:226 msgid "Add unsupported file to archives" -msgstr "" +msgstr "Добавете неподдържан файл към архивите" #: mat-gui:229 msgid "Add non-supported (and so non-anonymised) file to output archive" @@ -90,15 +92,15 @@ msgstr "Неподдържани" #: mat-gui:324 msgid "Harmless fileformat" -msgstr "" +msgstr "Безвреден файлов формат" #: mat-gui:326 msgid "Fileformat not supported" -msgstr "" +msgstr "Неподдържан файлов формат" #: mat-gui:329 msgid "These files can not be processed:" -msgstr "" +msgstr "Следните файлове не могат да бъдат обработени:" #: mat-gui:334 mat-gui:363 data/mat.ui:292 msgid "Filename" @@ -106,11 +108,11 @@ msgstr "Име на файл" #: mat-gui:336 msgid "Reason" -msgstr "" +msgstr "Причина" #: mat-gui:348 msgid "Non-supported files in archive" -msgstr "" +msgstr "Неподдържани файлове в архива" #: mat-gui:349 data/mat.ui:227 msgid "Scour" @@ -123,7 +125,7 @@ msgstr "" #: mat-gui:378 #, python-format msgid "MAT is not able to clean the following files, found in the %s archive" -msgstr "" +msgstr "МАТ не можа да почисти следните файлове намерени в %s архива" #: mat-gui:394 #, python-format @@ -137,11 +139,11 @@ msgstr "Изчистване %s" #: data/mat.ui:63 msgid "_File" -msgstr "" +msgstr "_Файл" #: data/mat.ui:99 msgid "_Edit" -msgstr "" +msgstr "_Редактирай" #: data/mat.ui:118 data/mat.ui:253 msgid "Clear" @@ -149,11 +151,11 @@ msgstr "Изчисти" #: data/mat.ui:134 msgid "_Process" -msgstr "" +msgstr "_Процес" #: data/mat.ui:168 msgid "_Help" -msgstr "" +msgstr "_Помощ" #: data/mat.ui:214 msgid "Add" @@ -169,7 +171,7 @@ msgstr "Състояние" #: data/mat.ui:347 data/mat.ui:499 msgid "Metadata" -msgstr "" +msgstr "Метаданни" #: data/mat.ui:376 msgid "Name"

1 0

[tor-browser-bundle/master] Bug 11556: Fix broken bundling due to HTTPS-E 3.5.
by gk＠torproject.org 25 Apr '14

25 Apr '14

commit ffe165972b6290df94d969675b9f2660cf2eedbb Author: Georg Koppen <gk(a)torproject.org> Date: Fri Apr 25 09:03:02 2014 +0000 Bug 11556: Fix broken bundling due to HTTPS-E 3.5. Starting with version 3.5 HTTPS-Everywhere uses Python 2.7 for assembling its rules in a SQLite database. This caused our bundling step to be broken on all platforms: On Linux (Ubuntu 10.04) there is no Python 2.7 available via the package management and the Windows and OS X bundling descriptors missed some necessary packages. --- gitian/descriptors/linux/gitian-bundle.yml | 10 ++++++++++ gitian/descriptors/linux/gitian-utils.yml | 24 +++++++++++++++++++++--- gitian/descriptors/mac/gitian-bundle.yml | 3 +++ gitian/descriptors/windows/gitian-bundle.yml | 5 ++++- gitian/fetch-inputs.sh | 6 ++++-- gitian/gpg/LXML.gpg | Bin 0 -> 1450 bytes gitian/mkbundle-linux.sh | 9 +++++++-- gitian/versions | 6 ++++-- gitian/versions.alpha | 6 ++++-- gitian/versions.beta | 6 ++++-- gitian/versions.nightly | 6 ++++-- 11 files changed, 65 insertions(+), 16 deletions(-) diff --git a/gitian/descriptors/linux/gitian-bundle.yml b/gitian/descriptors/linux/gitian-bundle.yml index 39a7747..c16589a 100644 --- a/gitian/descriptors/linux/gitian-bundle.yml +++ b/gitian/descriptors/linux/gitian-bundle.yml @@ -13,6 +13,8 @@ packages: - "python" - "rnv" - "xz-utils" +- "libxslt1.1" +- "sqlite3" reference_datetime: "2000-01-01 00:00:00" remotes: - "url": "https://git.torproject.org/tor-launcher.git" @@ -29,6 +31,10 @@ files: - "tor-linux64-gbuilt.zip" - "pluggable-transports-linux32-gbuilt.zip" - "pluggable-transports-linux64-gbuilt.zip" +- "python-linux32-utils.zip" +- "python-linux64-utils.zip" +- "lxml-linux32-utils.zip" +- "lxml-linux64-utils.zip" - "torrc-defaults-appendix-linux" - "bridge_prefs.js" - "relativelink-src.zip" @@ -57,6 +63,10 @@ script: | mkdir -p tor-browser/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org mkdir -p tor-browser/Data/Browser/Caches mkdir -p tor-browser/Docs/sources/ + # Preparing Python for HTTPS-Everywhere. + unzip -d $INSTDIR python-linux$GBUILD_BITS-utils.zip + export PATH=$INSTDIR/python/bin:$PATH + unzip -d $INSTDIR/python/lib/python2.7 lxml-linux$GBUILD_BITS-utils.zip # cd tor-launcher make clean diff --git a/gitian/descriptors/linux/gitian-utils.yml b/gitian/descriptors/linux/gitian-utils.yml index c4052f7..427e69b 100644 --- a/gitian/descriptors/linux/gitian-utils.yml +++ b/gitian/descriptors/linux/gitian-utils.yml @@ -15,6 +15,11 @@ packages: - "faketime" - "libtool" - "hardening-wrapper" +# These packages are needed for Python due to HTTPS-Everywhere >= 3.5. +- "libsqlite3-dev" +- "zlib1g-dev" +- "libxml2-dev" +- "libxslt-dev" reference_datetime: "2000-01-01 00:00:00" remotes: - "url": "https://github.com/libevent/libevent.git" @@ -24,6 +29,7 @@ files: - "dzip.sh" - "openssl.tar.gz" - "python.tar.bz2" +- "lxml.tar.gz" script: | INSTDIR="$HOME/install" source versions @@ -66,15 +72,27 @@ script: | cd .. # Building Python - # Fx 24 ESR does not work with Python < 2.7 anymore. But 10.04 does only ship - # with Python 2.6. Thus, we compile 2.7 ourselves... + # Fx 24 ESR and HTTPS Everywhere >= 3.5 do not work with Python < 2.7 anymore. + # But 10.04 does only ship with Python 2.6. Thus, we compile 2.7 ourselves... tar xjf python.tar.bz2 cd Python-* ./configure make $MAKEOPTS altinstall prefix=$INSTDIR/python exec-prefix=$INSTDIR/python cd .. - # Grabbing the results + # Building the Python lxml module + tar xzf lxml.tar.gz + cd lxml-* + # Make sure we use our freshly built python binary here. Otherwise bad things + # may happen when we do so in the bundle step assembling the HTTPS-Everywhere + # rules. + $INSTDIR/python/bin/python2.7 setup.py build + cd build/lib* + ~/build/dzip.sh lxml-$LXML_VER-linux$GBUILD_BITS-utils.zip lxml + cp *-utils.zip $OUTDIR + cd ../../../ + + # Grabbing the remaining results cd $INSTDIR ~/build/dzip.sh openssl-$OPENSSL_VER-linux$GBUILD_BITS-utils.zip openssl # TODO: It is not guaranteed we have a X.X.XX-style version. diff --git a/gitian/descriptors/mac/gitian-bundle.yml b/gitian/descriptors/mac/gitian-bundle.yml index b7ecf3a..263ca57 100644 --- a/gitian/descriptors/mac/gitian-bundle.yml +++ b/gitian/descriptors/mac/gitian-bundle.yml @@ -15,6 +15,9 @@ packages: - "cmake" - "zlib1g-dev" - "libbz2-dev" +# Both packages are needed for assembling the HTTPS-Everywhere rules since 3.5. +- "python-lxml" +- "sqlite3" reference_datetime: "2000-01-01 00:00:00" remotes: - "url": "https://git.torproject.org/tor-launcher.git" diff --git a/gitian/descriptors/windows/gitian-bundle.yml b/gitian/descriptors/windows/gitian-bundle.yml index fddb611..457fa7b 100644 --- a/gitian/descriptors/windows/gitian-bundle.yml +++ b/gitian/descriptors/windows/gitian-bundle.yml @@ -8,11 +8,14 @@ packages: - "git-core" - "unzip" - "zip" -# This is needed for compiling the StartTorBrowserBundle.exe. +# This package is needed for compiling the StartTorBrowserBundle.exe. - "mingw-w64" - "nsis" - "faketime" - "python" +# Both packages are needed for assembling the HTTPS-Everywhere rules since 3.5. +- "python-lxml" +- "sqlite3" reference_datetime: "2000-01-01 00:00:00" remotes: - "url": "https://github.com/moba/tbb-windows-installer.git" diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index 6b8ae99..f80348e 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -133,11 +133,12 @@ do fi done -for i in BINUTILS GCC PYTHON PYCRYPTO M2CRYPTO PYTHON_MSI GMP +for i in BINUTILS GCC PYTHON PYCRYPTO M2CRYPTO PYTHON_MSI GMP LXML do PACKAGE="${i}_PACKAGE" URL="${i}_URL" - if [ "${i}" == "PYTHON" -o "${i}" == "PYCRYPTO" -o "${i}" == "M2CRYPTO" -o "${i}" == "PYTHON_MSI" ]; then + if [ "${i}" == "PYTHON" -o "${i}" == "PYCRYPTO" -o "${i}" == "M2CRYPTO" -o \ + "${i}" == "PYTHON_MSI" -o "${i}" == "LXML" ]; then SUFFIX="asc" else SUFFIX="sig" @@ -275,6 +276,7 @@ ln -sf "$M2CRYPTO_PACKAGE" m2crypto.tar.gz ln -sf "$PY2EXE_PACKAGE" py2exe.exe ln -sf "$SETUPTOOLS_PACKAGE" setuptools.tar.gz ln -sf "$GMP_PACKAGE" gmp.tar.bz2 +ln -sf "$LXML_PACKAGE" lxml.tar.gz # Fetch latest gitian-builder itself # XXX - this is broken if a non-standard inputs dir is selected using the command line flag. diff --git a/gitian/gpg/LXML.gpg b/gitian/gpg/LXML.gpg new file mode 100644 index 0000000..fd5f415 Binary files /dev/null and b/gitian/gpg/LXML.gpg differ diff --git a/gitian/mkbundle-linux.sh b/gitian/mkbundle-linux.sh index b21d9b4..1328a9c 100755 --- a/gitian/mkbundle-linux.sh +++ b/gitian/mkbundle-linux.sh @@ -93,8 +93,9 @@ if [ ! -f inputs/openssl-$OPENSSL_VER-linux32-utils.zip -o \ ! -f inputs/libevent-${LIBEVENT_TAG_ORIG:8:6}-linux32-utils.zip -o \ ! -f inputs/libevent-${LIBEVENT_TAG_ORIG:8:6}-linux64-utils.zip -o \ ! -f inputs/python-$PYTHON_VER-linux32-utils.zip -o \ - ! -f inputs/python-$PYTHON_VER-linux64-utils.zip ]; - + ! -f inputs/python-$PYTHON_VER-linux64-utils.zip -o \ + ! -f inputs/lxml-$LXML_VER-linux32-utils.zip -o \ + ! -f inputs/lxml-$LXML_VER-linux64-utils.zip ]; then echo echo "****** Starting Utilities Component of Linux Bundle (1/5 for Linux) ******" @@ -116,6 +117,8 @@ then ln -sf libevent-${LIBEVENT_TAG_ORIG:8:6}-linux64-utils.zip libevent-linux64-utils.zip ln -sf python-$PYTHON_VER-linux32-utils.zip python-linux32-utils.zip ln -sf python-$PYTHON_VER-linux64-utils.zip python-linux64-utils.zip + ln -sf lxml-$LXML_VER-linux32-utils.zip lxml-linux32-utils.zip + ln -sf lxml-$LXML_VER-linux64-utils.zip lxml-linux64-utils.zip cd .. #cp -a result/tor-linux-res.yml $GITIAN_DIR/inputs/ else @@ -132,6 +135,8 @@ else ln -sf libevent-${LIBEVENT_TAG_ORIG:8:6}-linux64-utils.zip libevent-linux64-utils.zip ln -sf python-$PYTHON_VER-linux32-utils.zip python-linux32-utils.zip ln -sf python-$PYTHON_VER-linux64-utils.zip python-linux64-utils.zip + ln -sf lxml-$LXML_VER-linux32-utils.zip lxml-linux32-utils.zip + ln -sf lxml-$LXML_VER-linux64-utils.zip lxml-linux64-utils.zip cd .. fi diff --git a/gitian/versions b/gitian/versions index 97c6d33..a9c372c 100755 --- a/gitian/versions +++ b/gitian/versions @@ -9,8 +9,7 @@ TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-1-build1 TOR_TAG=tor-0.2.4.21 TORLAUNCHER_TAG=0.2.4.4 TORBUTTON_TAG=1.6.7.0 -# XXX: 3.5 requires python2.7, see #11556 -HTTPSE_TAG=3.4.5 +HTTPSE_TAG=3.5 NSIS_TAG=v0.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable @@ -37,6 +36,7 @@ TWISTED_VER=13.1.0 M2CRYPTO_VER=0.21.1 PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4 +LXML_VER=3.3.5 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz @@ -59,6 +59,7 @@ TWISTED_PACKAGE=Twisted-${TWISTED_VER}.tar.bz2 M2CRYPTO_PACKAGE=M2Crypto-${M2CRYPTO_VER}.tar.gz PY2EXE_PACKAGE=py2exe-${PY2EXE_VER}.win32-py2.7.exe SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz +LXML_PACKAGE=lxml-${LXML_VER}.tar.gz # Hashes for packages with weak sigs or no sigs OPENSSL_HASH=53cb818c3b90e507a8348f4f5eaedb05d8bfe5358aabb508b7263cc670c3e028 @@ -98,3 +99,4 @@ TWISTED_URL=https://pypi.python.org/packages/source/T/Twisted/${TWISTED_PAC… M2CRYPTO_URL=https://pypi.python.org/packages/source/M/M2Crypto/${M2CRYPTO_… PY2EXE_URL=http://softlayer-dal.dl.sourceforge.net/project/py2exe/py2exe/${… SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUP… +LXML_URL=https://pypi.python.org/packages/source/l/lxml/${LXML_PACKAGE} diff --git a/gitian/versions.alpha b/gitian/versions.alpha index ddfa06b..9c5fa02 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -10,8 +10,7 @@ TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-1-build2 TOR_TAG=tor-0.2.5.3-alpha TORLAUNCHER_TAG=0.2.5.3 TORBUTTON_TAG=1.6.8.1 -# XXX: 3.5 requires python2.7, see #11556 -HTTPSE_TAG=3.4.5 +HTTPSE_TAG=3.5 NSIS_TAG=v0.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable @@ -38,6 +37,7 @@ TWISTED_VER=13.1.0 M2CRYPTO_VER=0.21.1 PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4 +LXML_VER=3.3.5 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz @@ -60,6 +60,7 @@ TWISTED_PACKAGE=Twisted-${TWISTED_VER}.tar.bz2 M2CRYPTO_PACKAGE=M2Crypto-${M2CRYPTO_VER}.tar.gz PY2EXE_PACKAGE=py2exe-${PY2EXE_VER}.win32-py2.7.exe SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz +LXML_PACKAGE=lxml-${LXML_VER}.tar.gz # Hashes for packages with weak sigs or no sigs OPENSSL_HASH=53cb818c3b90e507a8348f4f5eaedb05d8bfe5358aabb508b7263cc670c3e028 @@ -99,3 +100,4 @@ TWISTED_URL=https://pypi.python.org/packages/source/T/Twisted/${TWISTED_PAC… M2CRYPTO_URL=https://pypi.python.org/packages/source/M/M2Crypto/${M2CRYPTO_… PY2EXE_URL=http://softlayer-dal.dl.sourceforge.net/project/py2exe/py2exe/${… SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUP… +LXML_URL=https://pypi.python.org/packages/source/l/lxml/${LXML_PACKAGE} diff --git a/gitian/versions.beta b/gitian/versions.beta index 7933efd..f6c24a2 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -10,8 +10,7 @@ TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-1-build1 TOR_TAG=tor-0.2.4.21 TORLAUNCHER_TAG=0.2.5.3 TORBUTTON_TAG=1.6.8.1 -# XXX: 3.5 requires python2.7, see #11556 -HTTPSE_TAG=3.4.5 +HTTPSE_TAG=3.5 NSIS_TAG=v0.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable @@ -38,6 +37,7 @@ TWISTED_VER=13.1.0 M2CRYPTO_VER=0.21.1 PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4 +LXML_VER=3.3.5 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz @@ -60,6 +60,7 @@ TWISTED_PACKAGE=Twisted-${TWISTED_VER}.tar.bz2 M2CRYPTO_PACKAGE=M2Crypto-${M2CRYPTO_VER}.tar.gz PY2EXE_PACKAGE=py2exe-${PY2EXE_VER}.win32-py2.7.exe SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz +LXML_PACKAGE=lxml-${LXML_VER}.tar.gz # Hashes for packages with weak sigs or no sigs OPENSSL_HASH=53cb818c3b90e507a8348f4f5eaedb05d8bfe5358aabb508b7263cc670c3e028 @@ -99,3 +100,4 @@ TWISTED_URL=https://pypi.python.org/packages/source/T/Twisted/${TWISTED_PAC… M2CRYPTO_URL=https://pypi.python.org/packages/source/M/M2Crypto/${M2CRYPTO_… PY2EXE_URL=http://softlayer-dal.dl.sourceforge.net/project/py2exe/py2exe/${… SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUP… +LXML_URL=https://pypi.python.org/packages/source/l/lxml/${LXML_PACKAGE} diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 1596918..c8a8d7c 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -10,8 +10,7 @@ TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-1 TOR_TAG=master TORLAUNCHER_TAG=master TORBUTTON_TAG=master -# XXX: Master and 3.5 require python2.7, see #11556 -HTTPSE_TAG=3.4.5 +HTTPSE_TAG=master NSIS_TAG=master ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable @@ -39,6 +38,7 @@ TWISTED_VER=13.1.0 M2CRYPTO_VER=0.21.1 PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4 +LXML_VER=3.3.5 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz @@ -61,6 +61,7 @@ TWISTED_PACKAGE=Twisted-${TWISTED_VER}.tar.bz2 M2CRYPTO_PACKAGE=M2Crypto-${M2CRYPTO_VER}.tar.gz PY2EXE_PACKAGE=py2exe-${PY2EXE_VER}.win32-py2.7.exe SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz +LXML_PACKAGE=lxml-${LXML_VER}.tar.gz # Hashes for packages with weak sigs or no sigs OPENSSL_HASH=53cb818c3b90e507a8348f4f5eaedb05d8bfe5358aabb508b7263cc670c3e028 @@ -100,3 +101,4 @@ TWISTED_URL=https://pypi.python.org/packages/source/T/Twisted/${TWISTED_PAC… M2CRYPTO_URL=https://pypi.python.org/packages/source/M/M2Crypto/${M2CRYPTO_… PY2EXE_URL=http://softlayer-dal.dl.sourceforge.net/project/py2exe/py2exe/${… SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUP… +LXML_URL=https://pypi.python.org/packages/source/l/lxml/${LXML_PACKAGE}

1 0

[onionoo/master] Simplify giving out details documents.
by karsten＠torproject.org 25 Apr '14

25 Apr '14

commit 49b0373bde03ec546869db95c2ac8c3f16ca4129 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Apr 25 09:48:46 2014 +0200 Simplify giving out details documents. Now that details documents don't contain "version" or "desc_published" lines anymore, and after bulk-editing broken JSON files on the server ("hibernating":True), we can simplify the code for returning details documents. --- src/org/torproject/onionoo/ResponseBuilder.java | 25 +++++++---------------- 1 file changed, 7 insertions(+), 18 deletions(-) diff --git a/src/org/torproject/onionoo/ResponseBuilder.java b/src/org/torproject/onionoo/ResponseBuilder.java index f76d078..c4f3f07 100644 --- a/src/org/torproject/onionoo/ResponseBuilder.java +++ b/src/org/torproject/onionoo/ResponseBuilder.java @@ -146,24 +146,16 @@ public class ResponseBuilder { detailsDocument.getDocumentString() != null) { StringBuilder sb = new StringBuilder(); Scanner s = new Scanner(detailsDocument.getDocumentString()); - sb.append("{"); - if (s.hasNextLine()) { - /* Skip version line. */ - s.nextLine(); - } boolean includeLine = true; while (s.hasNextLine()) { String line = s.nextLine(); - if (line.equals("}")) { - sb.append("}\n"); + if (line.equals("{")) { + /* Omit newline after opening bracket. */ + sb.append("{"); + } else if (line.equals("}")) { + /* Omit newline after closing bracket. */ + sb.append("}"); break; - } else if (line.startsWith("\"desc_published\":")) { - continue; - } else if (line.startsWith("\"hibernating\":True")) { - /* TODO This workaround saves us from bulk-editing all details - * files in out/details/ and status/details/. May take this out - * when all/most of those files with invalid JSON are gone. */ - sb.append(line.replaceAll("T", "t") + "\n"); } else if (this.fields != null) { if (line.startsWith("\"")) { includeLine = false; @@ -182,11 +174,8 @@ public class ResponseBuilder { } s.close(); String detailsLines = sb.toString(); - if (detailsLines.length() > 1) { - detailsLines = detailsLines.substring(0, - detailsLines.length() - 1); - } if (detailsLines.endsWith(",\n}")) { + /* Fix broken JSON if we omitted lines above. */ detailsLines = detailsLines.substring(0, detailsLines.length() - 3) + "\n}"; }

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 25 Apr '14

25 Apr '14

commit ae376573747da3bec4b28f38bd3007d2cd953d5e Author: Translation commit bot <translation(a)torproject.org> Date: Fri Apr 25 07:45:35 2014 +0000 Update translations for tails-misc --- bg.po | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/bg.po b/bg.po index 95f2cb9..3cfbc5a 100644 --- a/bg.po +++ b/bg.po @@ -3,14 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Bavarian <mr.cyberpower(a)gmail.com>, 2014 # alexdimitrov <kvikmen(a)gmail.com>, 2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-03-23 08:55+0100\n" -"PO-Revision-Date: 2014-04-04 08:50+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2014-04-25 07:45+0000\n" +"Last-Translator: Bavarian <mr.cyberpower(a)gmail.com>\n" "Language-Team: Bulgarian (http://www.transifex.com/projects/p/torproject/language/bg/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -243,13 +244,13 @@ msgstr "" #: config/chroot_local-includes/usr/local/bin/tails-about:20 msgid "About Tails" -msgstr "" +msgstr "Относно Tails" #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:118 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:124 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:128 msgid "Your additional software" -msgstr "" +msgstr "Вашият допълнителен софтуер" #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:119 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:129 @@ -261,21 +262,21 @@ msgstr "" #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:125 msgid "The upgrade was successful." -msgstr "" +msgstr "Обновяването бе успешно." #: config/chroot_local-includes/usr/local/bin/tails-htp-notify-user:52 msgid "Synchronizing the system's clock" -msgstr "" +msgstr "Синхронизиране на системния часовник" #: config/chroot_local-includes/usr/local/bin/tails-htp-notify-user:53 msgid "" "Tor needs an accurate clock to work properly, especially for Hidden " "Services. Please wait..." -msgstr "" +msgstr "Tor се нуждае от точен часовник за да работи правилно,специално за Тайните Услуги.Моля изчакайте..." #: config/chroot_local-includes/usr/local/bin/tails-htp-notify-user:87 msgid "Failed to synchronize the clock!" -msgstr "" +msgstr "Неуспешно синхронизиране на часовника!" #: config/chroot_local-includes/usr/local/sbin/tails-restricted-network-detector:38 msgid "Network connection blocked?" @@ -318,22 +319,22 @@ msgstr "" #: config/chroot_local-includes/usr/local/bin/tails-start-i2p:62 msgid "Starting I2P..." -msgstr "" +msgstr "Стартиране на I2P..." #: config/chroot_local-includes/usr/local/bin/tails-start-i2p:63 msgid "The I2P router console will be opened on start." -msgstr "" +msgstr "I2P рутер конзолата ще се отвори при стартиране." #: config/chroot_local-includes/usr/local/bin/tails-start-i2p:82 #: config/chroot_local-includes/usr/local/bin/tails-start-i2p:124 msgid "I2P failed to start" -msgstr "" +msgstr "I2P не можа да се стартира" #: config/chroot_local-includes/usr/local/bin/tails-start-i2p:83 msgid "" "Make sure that you have a working Internet connection, then try to start I2P" " again." -msgstr "" +msgstr "Проверете вашата интернет връзка и след това се опитайте да стартирате I2P отново." #: config/chroot_local-includes/usr/local/bin/tails-start-i2p:125 msgid "" @@ -344,7 +345,7 @@ msgstr "" #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:19 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57 msgid "error:" -msgstr "" +msgstr "грешка:" #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:20 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58 @@ -366,7 +367,7 @@ msgstr "" #: config/chroot_local-includes/usr/local/bin/tails-virt-notify-user:53 msgid "Warning: virtual machine detected!" -msgstr "" +msgstr "Внимание: открита е виртуална машина!" #: config/chroot_local-includes/usr/local/bin/tails-virt-notify-user:55 msgid "" @@ -383,7 +384,7 @@ msgstr "" #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:68 msgid "Do you really want to launch the Unsafe Browser?" -msgstr "" +msgstr "Наистина ли искате да стартирате Несигурен Браузър?" #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:70 msgid ""

1 0

[tor/master] Bump version to 0.2.5.4-alpha.
by nickm＠torproject.org 25 Apr '14

25 Apr '14

commit b54669bc007adcbe826ec6a531c1719979c06f0b Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Apr 25 02:07:53 2014 -0400 Bump version to 0.2.5.4-alpha. Probably releasing within ~22 hours, pending testing --- configure.ac | 2 +- contrib/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 4831b4e..30feda6 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ dnl Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson dnl Copyright (c) 2007-2013, The Tor Project, Inc. dnl See LICENSE for licensing information -AC_INIT([tor],[0.2.5.3-alpha-dev]) +AC_INIT([tor],[0.2.5.4-alpha]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE diff --git a/contrib/tor-mingw.nsi.in b/contrib/tor-mingw.nsi.in index d14ff79..1d9274a 100644 --- a/contrib/tor-mingw.nsi.in +++ b/contrib/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.2.5.3-alpha-dev" +!define VERSION "0.2.5.4-alpha" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index ba59e3b..c865d56 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -241,7 +241,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.5.3-alpha-dev" +#define VERSION "0.2.5.4-alpha"

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits April 2014