- tor-commits - lists.torproject.org

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 11 Aug '12

11 Aug '12

commit bc60bcbad136adcddcf257bb7a1d2a99889e892f Author: Translation commit bot <translation(a)torproject.org> Date: Sat Aug 11 22:45:34 2012 +0000 Update translations for https_everywhere_completed --- da/https-everywhere.properties | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/da/https-everywhere.properties b/da/https-everywhere.properties index 8f3f430..08e6b07 100644 --- a/da/https-everywhere.properties +++ b/da/https-everywhere.properties @@ -1,2 +1,5 @@ https-everywhere.menu.globalEnable = Aktivér HTTPS Overalt https-everywhere.menu.globalDisable = Deaktivér HTTPS Overalt +https-everywhere.menu.enableDisable = Aktivér / Deaktivér regler +https-everywhere.menu.noRules = (Der er ikke opsat regler for denne side) +https-everywhere.menu.unknownRules = (Regler for denne side ukendt)

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 11 Aug '12

11 Aug '12

commit ff69de66b5466e738a6e7d149370ad6cf2443b4b Author: Translation commit bot <translation(a)torproject.org> Date: Sat Aug 11 22:45:30 2012 +0000 Update translations for https_everywhere --- da/https-everywhere.properties | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/da/https-everywhere.properties b/da/https-everywhere.properties index db93346..08e6b07 100644 --- a/da/https-everywhere.properties +++ b/da/https-everywhere.properties @@ -1,5 +1,5 @@ https-everywhere.menu.globalEnable = Aktivér HTTPS Overalt https-everywhere.menu.globalDisable = Deaktivér HTTPS Overalt -# https-everywhere.menu.enableDisable = Enable / Disable Rules -# https-everywhere.menu.noRules = (No Rules for This Page) -# https-everywhere.menu.unknownRules = (Rules for This Page Unknown) +https-everywhere.menu.enableDisable = Aktivér / Deaktivér regler +https-everywhere.menu.noRules = (Der er ikke opsat regler for denne side) +https-everywhere.menu.unknownRules = (Regler for denne side ukendt)

1 0

[translation/vidalia_alpha] Update translations for vidalia_alpha
by translation＠torproject.org 11 Aug '12

11 Aug '12

commit 2cbb3d44c6b82889621cf43bdfdaf508eaf2c08e Author: Translation commit bot <translation(a)torproject.org> Date: Sat Aug 11 22:45:11 2012 +0000 Update translations for vidalia_alpha --- da/vidalia_da.po | 87 +++++++++++++++++++++++++++-------------------------- 1 files changed, 44 insertions(+), 43 deletions(-) diff --git a/da/vidalia_da.po b/da/vidalia_da.po index b6fc36a..ccd55f0 100644 --- a/da/vidalia_da.po +++ b/da/vidalia_da.po @@ -2,14 +2,15 @@ # Translators: # <3xm(a)detfalskested.dk>, 2012. # Simon Grønkjær <zimi.grnkjr(a)gmail.com>, 2012. +# Steen Hulthin Rasmussen <steenhulthin(a)gmail.com>, 2012. # <theoliver(a)live.co.uk>, 2011. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:46+0000\n" -"PO-Revision-Date: 2012-06-04 14:00+0000\n" -"Last-Translator: Simon Grønkjær <zimi.grnkjr(a)gmail.com>\n" +"PO-Revision-Date: 2012-08-11 22:45+0000\n" +"Last-Translator: Steen Hulthin Rasmussen <steenhulthin(a)gmail.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -105,7 +106,7 @@ msgstr "Password" msgctxt "AdvancedPage" msgid "Randomly Generate" -msgstr "Tilfældigt Generer" +msgstr "Generer tilfældigt " msgctxt "AdvancedPage" msgid ":" @@ -678,7 +679,7 @@ msgstr "Cuba" msgctxt "CountryInfo" msgid "Cyprus" -msgstr "Kypern" +msgstr "Cypern" msgctxt "CountryInfo" msgid "Czech Republic" @@ -1014,159 +1015,159 @@ msgstr "Rwanda" msgctxt "CountryInfo" msgid "Saint Kitts & Nevis" -msgstr "" +msgstr "Saint Kitts og Nevis" msgctxt "CountryInfo" msgid "Saint Lucia" -msgstr "" +msgstr "Saint Lucia" msgctxt "CountryInfo" msgid "Saint Vincent & the Grenadines" -msgstr "" +msgstr "Saint Vincent og Grenadinerne" msgctxt "CountryInfo" msgid "Samoa" -msgstr "" +msgstr "Samoa" msgctxt "CountryInfo" msgid "San Marino" -msgstr "" +msgstr "San Marino" msgctxt "CountryInfo" msgid "Sao Tome & Principe" -msgstr "" +msgstr "São Tomé og Príncipe" msgctxt "CountryInfo" msgid "Saudi Arabia" -msgstr "" +msgstr "Saudi-Arabien" msgctxt "CountryInfo" msgid "Senegal" -msgstr "" +msgstr "Senegal" msgctxt "CountryInfo" msgid "Serbia" -msgstr "" +msgstr "Serbien" msgctxt "CountryInfo" msgid "Seychelles" -msgstr "" +msgstr "Seychellerne" msgctxt "CountryInfo" msgid "Sierra Leone" -msgstr "" +msgstr "Sierra Leone" msgctxt "CountryInfo" msgid "Singapore" -msgstr "" +msgstr "Singapore" msgctxt "CountryInfo" msgid "Slovakia" -msgstr "" +msgstr "Slovakiet" msgctxt "CountryInfo" msgid "Slovenia" -msgstr "" +msgstr "Slovenien" msgctxt "CountryInfo" msgid "Solomon Islands" -msgstr "" +msgstr "Salomonøerne" msgctxt "CountryInfo" msgid "Somalia" -msgstr "" +msgstr "Somalia" msgctxt "CountryInfo" msgid "South Africa" -msgstr "" +msgstr "Sydafrika" msgctxt "CountryInfo" msgid "Spain" -msgstr "" +msgstr "Spanien" msgctxt "CountryInfo" msgid "Sri Lanka" -msgstr "" +msgstr "Sri Lanka" msgctxt "CountryInfo" msgid "Sudan" -msgstr "" +msgstr "Sudan" msgctxt "CountryInfo" msgid "Suriname" -msgstr "" +msgstr "Surinam" msgctxt "CountryInfo" msgid "Swaziland" -msgstr "" +msgstr "Swaziland" msgctxt "CountryInfo" msgid "Sweden" -msgstr "" +msgstr "Sverige" msgctxt "CountryInfo" msgid "Switzerland" -msgstr "" +msgstr "Schweiz" msgctxt "CountryInfo" msgid "Syria" -msgstr "" +msgstr "Syrien" msgctxt "CountryInfo" msgid "Tajikistan" -msgstr "" +msgstr "Tadsjikistan" msgctxt "CountryInfo" msgid "Tanzania" -msgstr "" +msgstr "Tanzania" msgctxt "CountryInfo" msgid "Thailand" -msgstr "" +msgstr "Thailand" msgctxt "CountryInfo" msgid "Timor-Leste (East Timor)" -msgstr "" +msgstr "Østtimor (Timor-Leste)" msgctxt "CountryInfo" msgid "Togo" -msgstr "" +msgstr "Togo" msgctxt "CountryInfo" msgid "Tonga" -msgstr "" +msgstr "Tonga" msgctxt "CountryInfo" msgid "Trinidad & Tobago" -msgstr "" +msgstr "Trinidad og Tobago" msgctxt "CountryInfo" msgid "Tunisia" -msgstr "" +msgstr "Tunesien" msgctxt "CountryInfo" msgid "Turkey" -msgstr "" +msgstr "Tyrkiet" msgctxt "CountryInfo" msgid "Turkmenistan" -msgstr "" +msgstr "Turkmenistan" msgctxt "CountryInfo" msgid "Tuvalu" -msgstr "" +msgstr "Tuvalu" msgctxt "CountryInfo" msgid "Uganda" -msgstr "" +msgstr "Uganda" msgctxt "CountryInfo" msgid "Ukraine" -msgstr "" +msgstr "Ukraine" msgctxt "CountryInfo" msgid "United Arab Emirates" -msgstr "" +msgstr "Forenede Arabiske Emirater" msgctxt "CountryInfo" msgid "United Kingdom"

1 0

[vidalia/master] Improve router loading
by chiiph＠torproject.org 11 Aug '12

11 Aug '12

commit b00f51dc295bcd84420c57351bdcb4b822cd353e Author: Tomás Touceda <chiiph(a)torproject.org> Date: Sat Aug 11 19:27:44 2012 -0300 Improve router loading --- changes/bug6482 | 4 ++++ src/vidalia/network/NetViewer.cpp | 7 +++++++ 2 files changed, 11 insertions(+), 0 deletions(-) diff --git a/changes/bug6482 b/changes/bug6482 new file mode 100644 index 0000000..e276064 --- /dev/null +++ b/changes/bug6482 @@ -0,0 +1,4 @@ + o Do not wait too much to try reloading the router list if the ns/all command + returned empty. Fixes bug 6483. + o Stop trying to load router information if torControl is not connected + anymore. Fixes bug 6482. diff --git a/src/vidalia/network/NetViewer.cpp b/src/vidalia/network/NetViewer.cpp index 1d48b96..d9782ff 100644 --- a/src/vidalia/network/NetViewer.cpp +++ b/src/vidalia/network/NetViewer.cpp @@ -312,12 +312,19 @@ void NetViewer::loadNetworkStatus() { NetworkStatus networkStatus = _torControl->getNetworkStatus(); + if (networkStatus.isEmpty()) { + _refreshTimer.setInterval(2000); + } else { + _refreshTimer.setInterval(60*60*1000); + } bool usingMicrodescriptors = _torControl->useMicrodescriptors(); foreach(RouterStatus rs, networkStatus) { if (!rs.isRunning()) continue; + if (not _torControl->isConnected()) + return; RouterDescriptor rd = _torControl->getRouterDescriptor(rs.id()); if(usingMicrodescriptors) {

1 0

[webstats/master] Handle edge case when initializing webstats processor.
by runa＠torproject.org 11 Aug '12

11 Aug '12

commit 6d4363afc261d99ede9d4bc1bba59dd5dfab4a1b Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Aug 9 11:03:16 2012 +0200 Handle edge case when initializing webstats processor. Previously, we'd break without a stats/full/ directory. There are edge cases when we don't have such a directory yet. --- src/org/torproject/webstats/Main.java | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/src/org/torproject/webstats/Main.java b/src/org/torproject/webstats/Main.java index 7f1afe1..1aa02d4 100644 --- a/src/org/torproject/webstats/Main.java +++ b/src/org/torproject/webstats/Main.java @@ -500,7 +500,9 @@ public class Main { while (!fileNames.isEmpty()) { String fileName = fileNames.pop(); File fileOrDirectory = new File(fileName); - if (fileOrDirectory.isDirectory()) { + if (!fileOrDirectory.exists()) { + continue; + } else if (fileOrDirectory.isDirectory()) { for (File file : fileOrDirectory.listFiles()) { fileNames.add(fileName + "/" + file.getName()); }

1 0

[webstats/master] Stop truncating files when merging new lines into them.
by runa＠torproject.org 11 Aug '12

11 Aug '12

commit 4096c6aeae0ad61e6b3d7df5ded0171a1c68e83f Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Aug 9 11:05:32 2012 +0200 Stop truncating files when merging new lines into them. When merging newly sanitized lines into an existing file, we stopped as soon as the existing file ran out of lines. We must also add the remaining new sanitized lines. --- src/org/torproject/webstats/Main.java | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/src/org/torproject/webstats/Main.java b/src/org/torproject/webstats/Main.java index 1aa02d4..3be2c92 100644 --- a/src/org/torproject/webstats/Main.java +++ b/src/org/torproject/webstats/Main.java @@ -367,6 +367,9 @@ public class Main { } bw.write(line + "\n"); } + while (cachedLinesListPosition < totalCachedLines) { + bw.write(cachedLinesList.get(cachedLinesListPosition++) + "\n"); + } br.close(); bw.close(); } catch (IOException e) {

1 0

[flashproxy/master] Uniformity of code between flashproxy-client and flashproxy-reg-http.
by dcf＠torproject.org 11 Aug '12

11 Aug '12

commit 343a47e303bafde772e20a637a8ddefffcf85872 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Jul 28 10:15:04 2012 -0700 Uniformity of code between flashproxy-client and flashproxy-reg-http. --- flashproxy-client | 4 ++-- flashproxy-reg-http | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/flashproxy-client b/flashproxy-client index ad60057..0dfe8c7 100755 --- a/flashproxy-client +++ b/flashproxy-client @@ -1,5 +1,6 @@ #!/usr/bin/env python +import BaseHTTPServer import array import base64 import cStringIO @@ -16,7 +17,6 @@ import time import traceback import urllib import xml.sax.saxutils -import BaseHTTPServer try: from hashlib import sha1 @@ -123,7 +123,7 @@ def parse_addr_spec(spec, defhost = None, defport = None): af = 0 host = host or defhost port = port or defport - if not (host and port): + if not port: raise ValueError("Bad address specification \"%s\"" % spec) return host, int(port) diff --git a/flashproxy-reg-http b/flashproxy-reg-http index 209f77e..ac45a30 100755 --- a/flashproxy-reg-http +++ b/flashproxy-reg-http @@ -2,19 +2,19 @@ import getopt import httplib -import socket import re +import socket import sys import urllib -DEFAULT_REMOTE_ADDR = "" +DEFAULT_REMOTE_ADDRESS = "" DEFAULT_REMOTE_PORT = 9000 DEFAULT_FACILITATOR_HOST = "tor-facilitator.bamsoftware.com" DEFAULT_FACILITATOR_PORT = 9002 class options(object): - facilitator_addr = None remote_addr = None + facilitator_addr = None def usage(f = sys.stdout): print >> f, """\ @@ -27,7 +27,7 @@ facilitator address is "%(fac_addr)s". """ % { "progname": sys.argv[0], "fac_addr": format_addr((DEFAULT_FACILITATOR_HOST, DEFAULT_FACILITATOR_PORT)), - "remote_addr": format_addr((DEFAULT_REMOTE_ADDR, DEFAULT_REMOTE_PORT)), + "remote_addr": format_addr((DEFAULT_REMOTE_ADDRESS, DEFAULT_REMOTE_PORT)), } def parse_addr_spec(spec, defhost = None, defport = None): @@ -81,12 +81,12 @@ def format_addr(addr): return u"%s:%d" % (host, port) options.facilitator_addr = (DEFAULT_FACILITATOR_HOST, DEFAULT_FACILITATOR_PORT) -options.remote_addr = (DEFAULT_REMOTE_ADDR, DEFAULT_REMOTE_PORT) +options.remote_addr = (DEFAULT_REMOTE_ADDRESS, DEFAULT_REMOTE_PORT) opts, args = getopt.gnu_getopt(sys.argv[1:], "a:h", ["address=", "help"]) for o, a in opts: if o == "-a" or o == "--address": - options.remote_addr = parse_addr_spec(a, DEFAULT_REMOTE_ADDR, DEFAULT_REMOTE_PORT) + options.remote_addr = parse_addr_spec(a, DEFAULT_REMOTE_ADDRESS, DEFAULT_REMOTE_PORT) elif o == "-h" or o == "--help": usage() sys.exit()

1 0

[torbrowser/master] Linux: we need to build Qt with webkit, otherwise the build fails
by erinn＠torproject.org 11 Aug '12

11 Aug '12

commit 5ef69661951c6e59e0fc23c1447fef7c87be8e4b Author: Erinn Clark <erinn(a)torproject.org> Date: Sat Aug 11 08:51:27 2012 +0100 Linux: we need to build Qt with webkit, otherwise the build fails --- build-scripts/linux-alpha.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build-scripts/linux-alpha.mk b/build-scripts/linux-alpha.mk index 8427a10..871ca36 100644 --- a/build-scripts/linux-alpha.mk +++ b/build-scripts/linux-alpha.mk @@ -55,7 +55,7 @@ build-openssl: build-zlib $(OPENSSL_DIR) cd $(OPENSSL_DIR) && make install_sw touch $(STAMP_DIR)/build-openssl -QT_BUILD_PREFS=-system-zlib -confirm-license -opensource -openssl-linked -no-webkit -no-qt3support -fast -release -nomake demos -nomake examples +QT_BUILD_PREFS=-system-zlib -confirm-license -opensource -openssl-linked -no-qt3support -fast -release -nomake demos -nomake examples QT_OPTS=$(QT_BUILD_PREFS) -prefix $(BUILT_DIR) -I $(BUILT_DIR)/include -I $(BUILT_DIR)/include/openssl/ -L$(BUILT_DIR)/lib build-qt: build-zlib build-openssl $(QT_DIR) cd $(QT_DIR) && ./configure $(QT_OPTS)

1 0

[torbrowser/maint-2.3] add OBFS_COMPRESSED_NAME so obfsproxy bundles will have the right name
by erinn＠torproject.org 11 Aug '12

11 Aug '12

commit 1d65c8816a62234c2f2851d97586bad9c83e50ed Author: Erinn Clark <erinn(a)torproject.org> Date: Sat Aug 11 08:52:06 2012 +0100 add OBFS_COMPRESSED_NAME so obfsproxy bundles will have the right name --- build-scripts/linux-alpha.mk | 3 ++- build-scripts/osx-alpha.mk | 1 + build-scripts/windows-alpha.mk | 1 + 3 files changed, 4 insertions(+), 1 deletions(-) diff --git a/build-scripts/linux-alpha.mk b/build-scripts/linux-alpha.mk index 871ca36..dca4b99 100644 --- a/build-scripts/linux-alpha.mk +++ b/build-scripts/linux-alpha.mk @@ -145,7 +145,8 @@ VERSION=$(RELEASE_VER)-$(BUILD_NUM)-dev DEFAULT_COMPRESSED_BASENAME=tor-browser-gnu-linux-$(ARCH_TYPE)-$(VERSION)- OBFS_COMPRESSED_BASENAME=tor-obfsproxy-browser-gnu-linux-$(ARCH_TYPE)-$(VERSION)- IM_COMPRESSED_BASENAME=tor-im-browser-gnu-linux-$(VERSION)- -DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME)$(VERSION) +OBFS_COMPRESSED_NAME=$(OBFS_COMPRESSED_BASENAME) +DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME) IM_COMPRESSED_NAME=$(IM_COMPRESSED_BASENAME)$(VERSION) ifeq ($(USE_PIDGIN),1) diff --git a/build-scripts/osx-alpha.mk b/build-scripts/osx-alpha.mk index c6376fd..69b6708 100644 --- a/build-scripts/osx-alpha.mk +++ b/build-scripts/osx-alpha.mk @@ -177,6 +177,7 @@ VERSION=$(RELEASE_VER)-$(BUILD_NUM) DEFAULT_COMPRESSED_BASENAME=TorBrowser-$(VERSION)-osx-$(ARCH_TYPE)- OBFS_COMPRESSED_BASENAME=TorBrowser-Obfsproxy-$(VERSION)-osx-$(ARCH_TYPE)- IM_COMPRESSED_BASENAME=TorBrowser-IM-$(VERSION)- +OBFS_COMPRESSED_NAME=$(OBFS_COMPRESSED_BASENAME) DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME) IM_COMPRESSED_NAME=$(IM_COMPRESSED_BASENAME)$(VERSION) diff --git a/build-scripts/windows-alpha.mk b/build-scripts/windows-alpha.mk index 5847a34..0505ab2 100644 --- a/build-scripts/windows-alpha.mk +++ b/build-scripts/windows-alpha.mk @@ -156,6 +156,7 @@ VERSION=$(RELEASE_VER)-$(BUILD_NUM) DEFAULT_COMPRESSED_BASENAME=tor-browser-$(VERSION) OBFS_COMPRESSED_BASENAME=tor-obfsproxy-browser-$(VERSION) IM_COMPRESSED_BASENAME=tor-im-browser-$(VERSION) +OBFS_COMPRESSED_NAME=$(OBFS_COMPRESSED_BASENAME) DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME) IM_COMPRESSED_NAME=$(IM_COMPRESSED_BASENAME)$(VERSION)

1 0

[torbrowser/maint-2.3] Linux: we need to build Qt with webkit, otherwise the build fails
by erinn＠torproject.org 11 Aug '12

11 Aug '12

commit 5ef69661951c6e59e0fc23c1447fef7c87be8e4b Author: Erinn Clark <erinn(a)torproject.org> Date: Sat Aug 11 08:51:27 2012 +0100 Linux: we need to build Qt with webkit, otherwise the build fails --- build-scripts/linux-alpha.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build-scripts/linux-alpha.mk b/build-scripts/linux-alpha.mk index 8427a10..871ca36 100644 --- a/build-scripts/linux-alpha.mk +++ b/build-scripts/linux-alpha.mk @@ -55,7 +55,7 @@ build-openssl: build-zlib $(OPENSSL_DIR) cd $(OPENSSL_DIR) && make install_sw touch $(STAMP_DIR)/build-openssl -QT_BUILD_PREFS=-system-zlib -confirm-license -opensource -openssl-linked -no-webkit -no-qt3support -fast -release -nomake demos -nomake examples +QT_BUILD_PREFS=-system-zlib -confirm-license -opensource -openssl-linked -no-qt3support -fast -release -nomake demos -nomake examples QT_OPTS=$(QT_BUILD_PREFS) -prefix $(BUILT_DIR) -I $(BUILT_DIR)/include -I $(BUILT_DIR)/include/openssl/ -L$(BUILT_DIR)/lib build-qt: build-zlib build-openssl $(QT_DIR) cd $(QT_DIR) && ./configure $(QT_OPTS)

1 0