- tor-commits - lists.torproject.org

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 27 Jan '12

27 Jan '12

commit b47a663cd162249d7e91451a7bc93eefb49d265b Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jan 27 06:45:15 2012 +0000 Update translations for vidalia --- fa/vidalia_fa.po | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/fa/vidalia_fa.po b/fa/vidalia_fa.po index 3efcc70..e9dc897 100644 --- a/fa/vidalia_fa.po +++ b/fa/vidalia_fa.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-09-07 14:40+0000\n" -"PO-Revision-Date: 2012-01-25 22:41+0000\n" +"PO-Revision-Date: 2012-01-27 06:43+0000\n" "Last-Translator: Ardeshir <ardeshir(a)redteam.io>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -1812,43 +1812,43 @@ msgstr "ناشناخته" msgctxt "MainWindow" msgid "Tor is not running" -msgstr "تُر درحال اجرا نمی باشد" +msgstr "تور درحال اجرا نمی‌باشد" msgctxt "MainWindow" msgid "Tor is shutting down" -msgstr "تُر درحال بسته شدن میباشد" +msgstr "تور درحال بسته شدن است" msgctxt "MainWindow" msgid "Stop Tor Now" -msgstr "متوقف کردن تُر حالا" +msgstr "همین حالا تور را متوقف کن" msgctxt "MainWindow" msgid "Stop Tor" -msgstr "متوقف کردن تُر" +msgstr "تور را متوقف کن" msgctxt "MainWindow" msgid "Starting the Tor software" -msgstr "راه اندازی نرم افزار تُر" +msgstr "راه اندازی نرم افزار تور" msgctxt "MainWindow" msgid "Starting Tor" -msgstr "راه اندازی تُر" +msgstr "راه اندازی تور" msgctxt "MainWindow" msgid "Error Starting Tor" -msgstr "خطا در راه‌اندازی تُر" +msgstr "خطا در راه‌اندازی تور" msgctxt "MainWindow" msgid "" "Vidalia was unable to start Tor. Check your settings to ensure the correct " "name and location of your Tor executable is specified." msgstr "" -"ویدالیا نتوانست تُر را راه‌اندازی کند. تنظیمات خود را دوباره بررسی کنید تا " -"مطمئن شوید مسیر فایل اجرایی تر را درست مشخص کرده‌اید." +"ویدالیا نتوانست تور را راه‌اندازی کند. تنظیمات خود را دوباره بررسی کنید تا " +"مطمین شوید مسیر فایل اجرایی تر را درست مشخص کرده‌اید." msgctxt "MainWindow" msgid "Connecting to Tor" -msgstr "اتصال به تُر" +msgstr "اتصال به تور" msgctxt "MainWindow" msgid "Connection Error" @@ -1864,7 +1864,7 @@ msgstr "خطا بسته شدن" msgctxt "MainWindow" msgid "Vidalia was unable to stop the Tor software." -msgstr "ویدالیا نتوانست نرم افزار تُر را متوقف کند." +msgstr "ویدالیا نتوانست نرم افزار تور را متوقف کند." msgctxt "MainWindow" msgid "Unexpected Error" @@ -1872,11 +1872,11 @@ msgstr "خطای غیرمنتظره" msgctxt "MainWindow" msgid "Authenticating to Tor" -msgstr "احرازهویت در تُر" +msgstr "احرازهویت در تور" msgctxt "MainWindow" msgid "Cookie Authentication Required" -msgstr "نیاز به کوکی احراز هویت" +msgstr "احراز هویت کوکی موردنیاز است" msgctxt "MainWindow" msgid ""

1 0

r25353: {} bastards are still bastards in real name environments. (projects/presentations/images)
by Andrew Lewman 26 Jan '12

26 Jan '12

Author: phobos Date: 2012-01-26 21:01:33 +0000 (Thu, 26 Jan 2012) New Revision: 25353 Added: projects/presentations/images/2012-01-23-googleplus-realname-bastards-are-bastards-online.png Log: bastards are still bastards in real name environments. Added: projects/presentations/images/2012-01-23-googleplus-realname-bastards-are-bastards-online.png =================================================================== (Binary files differ) Property changes on: projects/presentations/images/2012-01-23-googleplus-realname-bastards-are-bastards-online.png ___________________________________________________________________ Added: svn:mime-type + image/png

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 26 Jan '12

26 Jan '12

commit 4f20a17a27de19ea754264bfeb025f8e5190d2b0 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jan 26 18:15:21 2012 +0000 Update translations for vidalia_help --- de/config.po | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/de/config.po b/de/config.po index 31cd3f5..16e7cc6 100644 --- a/de/config.po +++ b/de/config.po @@ -1,5 +1,6 @@ # # Translators: +# <libertine(a)posteo.de>, 2012. # Nils <gibsorter(a)gmx.de>, 2011. # runasand <runa.sandvik(a)gmail.com>, 2011. msgid "" @@ -7,8 +8,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 16:58+0200\n" -"PO-Revision-Date: 2011-12-25 09:01+0000\n" -"Last-Translator: Nils <gibsorter(a)gmx.de>\n" +"PO-Revision-Date: 2012-01-26 18:06+0000\n" +"Last-Translator: libertine <libertine(a)posteo.de>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -185,6 +186,11 @@ msgid "" "href=\"bridges.html#finding\">finding bridge relays</a> for more information" " on how to learn new bridge relay addresses and fingerprints." msgstr "" +"Wenn Verbindungen zu normalen Tor relays geblockt sind, musst du eine bridge" +" relay Adresse in Erfahrung bringen und diese hier hinzufügen. Siehe auch " +"das Hilfe-Topic <a href=\"bridges.html#finding\">bridge relays finden</a> um" +" mehr Information zu neuen bridge relay Adressen und Fingerabdrücken zu " +"bekommen." #. type: Content of: <html><body> #: en/config.html:100

1 0

[translation/orbot] Update translations for orbot
by translation＠torproject.org 26 Jan '12

26 Jan '12

commit 6b5246c0557535ec440259d3e7267784534b225e Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jan 26 18:15:03 2012 +0000 Update translations for orbot --- values-de/strings.xml | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/values-de/strings.xml b/values-de/strings.xml index f3f3b99..3918ecb 100644 --- a/values-de/strings.xml +++ b/values-de/strings.xml @@ -188,16 +188,16 @@ Besuchen Sie https://guardianproject.info/apps/orbot oder senden Sie eine E-Mail <string name="libevent_version">LibEvent v1.4.13: http://www.monkey.org/~provos/libevent/</string> <string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string> <string name="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string> - <string name="openssl_version"></string> + <string name="openssl_version">OpenSSL v1.0.0f: http://www.openssl.org</string> <string name="hidden_service_request">Eine Anwendungen möchte den Port für versteckte Dienste %S öffnen. Dies ist sicher wenn Sie der Anwendung vertrauen.</string> <string name="found_existing_tor_process">existierender Tor Prozess gefunden...</string> <string name="something_bad_happened">Etwasist schief gelaufen. Bitte Log prüfen</string> <string name="hidden_service_on">Verstckte Dienste auf:</string> <string name="unable_to_read_hidden_service_name">Kann den Namen des versteckten Dienstes nicht lesen</string> <string name="unable_to_start_tor">Kann Tor nicht starten:</string> - <string name="pref_use_sys_iptables_title"></string> - <string name="pref_use_sys_iptables_summary"></string> - <string name="error_installing_binares"></string> - <string name="pref_use_persistent_notifications"></string> - <string name="pref_use_persistent_notifications_title"></string> + <string name="pref_use_sys_iptables_title">Benutze die Standard (default) Iptables</string> + <string name="pref_use_sys_iptables_summary">Benutze den mitgelieferten Iptables-Binary anstatt des mit Orbot mitgelieferten.</string> + <string name="error_installing_binares">Die Tor-Binarys konnten nicht installiert oder aktualisiert werden.</string> + <string name="pref_use_persistent_notifications">Behalte das Icon immer in der Benutzerleiste (Toolbar) wenn Orbot verbunden ist.</string> + <string name="pref_use_persistent_notifications_title">Immer-eingeschaltet Benachrichtigungen</string> </resources>

1 0

[translation/orbot] Update translations for orbot
by translation＠torproject.org 26 Jan '12

26 Jan '12

commit 08e422db7c07fda678bae8ee6995940961a9a364 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jan 26 14:15:03 2012 +0000 Update translations for orbot --- values-nl/strings.xml | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/values-nl/strings.xml b/values-nl/strings.xml index 49c99f5..9daf30a 100644 --- a/values-nl/strings.xml +++ b/values-nl/strings.xml @@ -197,6 +197,6 @@ Bezoek onze website op https://guardianproject.info/apps/orbot of stuur een emai <string name="pref_use_sys_iptables_title">Gebruik standaard iptables</string> <string name="pref_use_sys_iptables_summary">gebruik de ingebouwde iptables binary in plaats van de in Orbot geïntegreerde.</string> <string name="error_installing_binares">De Tor binaries konden niet worden geïnstalleerd of geüpgraded.</string> - <string name="pref_use_persistent_notifications"></string> - <string name="pref_use_persistent_notifications_title"></string> + <string name="pref_use_persistent_notifications">Houd icoon in toolbar zolang Orbot verbonden is</string> + <string name="pref_use_persistent_notifications_title">Meldingen altijd aan</string> </resources>

1 0

[metrics-lib/master] Fiddle around with the download logic some more.
by karsten＠torproject.org 26 Jan '12

26 Jan '12

commit 9b6c7c517e22a3dd775397ad0500a7f73a172be4 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Jan 26 13:49:17 2012 +0100 Fiddle around with the download logic some more. --- .../descriptor/impl/DownloadCoordinatorImpl.java | 34 +++++++++++++------- 1 files changed, 22 insertions(+), 12 deletions(-) diff --git a/src/org/torproject/descriptor/impl/DownloadCoordinatorImpl.java b/src/org/torproject/descriptor/impl/DownloadCoordinatorImpl.java index 03e7997..c10f468 100644 --- a/src/org/torproject/descriptor/impl/DownloadCoordinatorImpl.java +++ b/src/org/torproject/descriptor/impl/DownloadCoordinatorImpl.java @@ -8,6 +8,8 @@ import java.util.Iterator; import java.util.Map; import java.util.Set; import java.util.SortedMap; +import java.util.SortedSet; +import java.util.TreeSet; import org.torproject.descriptor.Descriptor; import org.torproject.descriptor.DescriptorRequest; @@ -23,6 +25,7 @@ public class DownloadCoordinatorImpl implements DownloadCoordinator { return this.descriptorQueue; } + private SortedSet<String> runningDirectories; private SortedMap<String, DirectoryDownloader> directoryAuthorities; private SortedMap<String, DirectoryDownloader> directoryMirrors; private boolean downloadConsensusFromAllAuthorities; @@ -41,6 +44,9 @@ public class DownloadCoordinatorImpl implements DownloadCoordinator { long globalTimeoutMillis) { this.directoryAuthorities = directoryAuthorities; this.directoryMirrors = directoryMirrors; + this.runningDirectories = new TreeSet<String>(); + this.runningDirectories.addAll(directoryAuthorities.keySet()); + this.runningDirectories.addAll(directoryMirrors.keySet()); this.missingConsensus = downloadConsensus; this.downloadConsensusFromAllAuthorities = downloadConsensusFromAllAuthorities; @@ -189,6 +195,9 @@ public class DownloadCoordinatorImpl implements DownloadCoordinator { public synchronized void deliverResponse( DescriptorRequestImpl response) { String nickname = response.getDirectoryNickname(); + if (response.getException() != null) { + this.runningDirectories.remove(nickname); + } if (response.getDescriptorType().equals("consensus")) { this.requestingConsensuses.remove(nickname); if (response.getResponseCode() == 200) { @@ -238,21 +247,22 @@ public class DownloadCoordinatorImpl implements DownloadCoordinator { if ((this.missingConsensus || this.downloadConsensusFromAllAuthorities) && (!this.requestedConsensuses.containsAll( - this.directoryAuthorities.keySet()) || + this.runningDirectories) || !this.requestingConsensuses.isEmpty())) { doneDownloading = false; } - if (!this.missingVotes.isEmpty()) { - if (!this.requestingVotes.isEmpty() || - !this.requestedVotes.keySet().containsAll( - this.directoryAuthorities.keySet())) { - doneDownloading = false; - } else { - for (String missingVote : this.missingVotes) { - for (Set<String> reqVotes : this.requestedVotes.values()) { - if (!reqVotes.contains(missingVote)) { - doneDownloading = false; - } + if (!this.requestingVotes.isEmpty()) { + doneDownloading = false; + } else if (!this.requestedVotes.keySet().containsAll( + this.runningDirectories)) { + doneDownloading = false; + } else if (!this.missingVotes.isEmpty()) { + for (String missingVote : this.missingVotes) { + for (String runningDirectory : this.runningDirectories) { + Set<String> reqVotes = this.requestedVotes.get( + runningDirectory); + if (!reqVotes.contains(missingVote)) { + doneDownloading = false; } } }

1 0

[translation/orbot] Update translations for orbot
by translation＠torproject.org 26 Jan '12

26 Jan '12

commit 376fae8cd246c63de1b7b9bd7d430c9f4db8b844 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jan 26 09:45:08 2012 +0000 Update translations for orbot --- values-ar/strings.xml | 2 ++ values-ca/strings.xml | 2 ++ values-de/strings.xml | 2 ++ values-el/strings.xml | 2 ++ values-es/strings.xml | 2 ++ values-eu/strings.xml | 2 ++ values-fa/strings.xml | 2 ++ values-fr/strings.xml | 2 ++ values-hu/strings.xml | 2 ++ values-it/strings.xml | 2 ++ values-mk/strings.xml | 2 ++ values-nb/strings.xml | 2 ++ values-nl/strings.xml | 2 ++ values-pl/strings.xml | 2 ++ values-pt/strings.xml | 2 ++ values-ru/strings.xml | 2 ++ values-sv/strings.xml | 2 ++ values-zh/strings.xml | 2 ++ values/strings.xml | 4 +++- 19 files changed, 39 insertions(+), 1 deletions(-) diff --git a/values-ar/strings.xml b/values-ar/strings.xml index b1c2d7d..fff1c52 100644 --- a/values-ar/strings.xml +++ b/values-ar/strings.xml @@ -197,4 +197,6 @@ <string name="pref_use_sys_iptables_title"></string> <string name="pref_use_sys_iptables_summary"></string> <string name="error_installing_binares"></string> + <string name="pref_use_persistent_notifications"></string> + <string name="pref_use_persistent_notifications_title"></string> </resources> diff --git a/values-ca/strings.xml b/values-ca/strings.xml index 39c6268..3d9e1d7 100644 --- a/values-ca/strings.xml +++ b/values-ca/strings.xml @@ -197,4 +197,6 @@ Visita\'ns a https://guardianproject.info/apps/orbot o envia\'ns un correu elect <string name="pref_use_sys_iptables_title"></string> <string name="pref_use_sys_iptables_summary"></string> <string name="error_installing_binares"></string> + <string name="pref_use_persistent_notifications"></string> + <string name="pref_use_persistent_notifications_title"></string> </resources> diff --git a/values-de/strings.xml b/values-de/strings.xml index 6ae2765..f3f3b99 100644 --- a/values-de/strings.xml +++ b/values-de/strings.xml @@ -198,4 +198,6 @@ Besuchen Sie https://guardianproject.info/apps/orbot oder senden Sie eine E-Mail <string name="pref_use_sys_iptables_title"></string> <string name="pref_use_sys_iptables_summary"></string> <string name="error_installing_binares"></string> + <string name="pref_use_persistent_notifications"></string> + <string name="pref_use_persistent_notifications_title"></string> </resources> diff --git a/values-el/strings.xml b/values-el/strings.xml index f44522d..5903f37 100644 --- a/values-el/strings.xml +++ b/values-el/strings.xml @@ -187,4 +187,6 @@ <string name="pref_use_sys_iptables_title"></string> <string name="pref_use_sys_iptables_summary"></string> <string name="error_installing_binares"></string> + <string name="pref_use_persistent_notifications"></string> + <string name="pref_use_persistent_notifications_title"></string> </resources> diff --git a/values-es/strings.xml b/values-es/strings.xml index 77d9710..b8ae420 100644 --- a/values-es/strings.xml +++ b/values-es/strings.xml @@ -197,4 +197,6 @@ Visítenos en https://guardianproject.info/apps/orbot o envíenos un correo elec <string name="pref_use_sys_iptables_title"></string> <string name="pref_use_sys_iptables_summary"></string> <string name="error_installing_binares"></string> + <string name="pref_use_persistent_notifications"></string> + <string name="pref_use_persistent_notifications_title"></string> </resources> diff --git a/values-eu/strings.xml b/values-eu/strings.xml index d02f3d6..8d9dbd2 100644 --- a/values-eu/strings.xml +++ b/values-eu/strings.xml @@ -187,4 +187,6 @@ <string name="pref_use_sys_iptables_title"></string> <string name="pref_use_sys_iptables_summary"></string> <string name="error_installing_binares"></string> + <string name="pref_use_persistent_notifications"></string> + <string name="pref_use_persistent_notifications_title"></string> </resources> diff --git a/values-fa/strings.xml b/values-fa/strings.xml index 5cd9c6d..8c4299a 100644 --- a/values-fa/strings.xml +++ b/values-fa/strings.xml @@ -187,4 +187,6 @@ <string name="pref_use_sys_iptables_title"></string> <string name="pref_use_sys_iptables_summary"></string> <string name="error_installing_binares"></string> + <string name="pref_use_persistent_notifications"></string> + <string name="pref_use_persistent_notifications_title"></string> </resources> diff --git a/values-fr/strings.xml b/values-fr/strings.xml index 71385df..06312ac 100644 --- a/values-fr/strings.xml +++ b/values-fr/strings.xml @@ -192,4 +192,6 @@ <string name="pref_use_sys_iptables_title"></string> <string name="pref_use_sys_iptables_summary"></string> <string name="error_installing_binares"></string> + <string name="pref_use_persistent_notifications"></string> + <string name="pref_use_persistent_notifications_title"></string> </resources> diff --git a/values-hu/strings.xml b/values-hu/strings.xml index 8bb5d72..8687bbe 100644 --- a/values-hu/strings.xml +++ b/values-hu/strings.xml @@ -191,4 +191,6 @@ <string name="pref_use_sys_iptables_title">Alapértelmezett Iptables használata</string> <string name="pref_use_sys_iptables_summary">a beépített iptables bináris használata az Orbot-tal együtt szállított helyett</string> <string name="error_installing_binares">A Tor binárisok nem telepíthetők, vagy frissíthetők.</string> + <string name="pref_use_persistent_notifications"></string> + <string name="pref_use_persistent_notifications_title"></string> </resources> diff --git a/values-it/strings.xml b/values-it/strings.xml index ff13966..e3a949a 100644 --- a/values-it/strings.xml +++ b/values-it/strings.xml @@ -192,4 +192,6 @@ Visita il nostro sito web https://guardianproject.info/apps/orbot o invia una ma <string name="pref_use_sys_iptables_title"></string> <string name="pref_use_sys_iptables_summary"></string> <string name="error_installing_binares"></string> + <string name="pref_use_persistent_notifications"></string> + <string name="pref_use_persistent_notifications_title"></string> </resources> diff --git a/values-mk/strings.xml b/values-mk/strings.xml index 62283a1..e49c4b6 100644 --- a/values-mk/strings.xml +++ b/values-mk/strings.xml @@ -191,4 +191,6 @@ <string name="pref_use_sys_iptables_title"></string> <string name="pref_use_sys_iptables_summary"></string> <string name="error_installing_binares"></string> + <string name="pref_use_persistent_notifications"></string> + <string name="pref_use_persistent_notifications_title"></string> </resources> diff --git a/values-nb/strings.xml b/values-nb/strings.xml index 55ef32c..9b6ccbf 100644 --- a/values-nb/strings.xml +++ b/values-nb/strings.xml @@ -187,4 +187,6 @@ <string name="pref_use_sys_iptables_title"></string> <string name="pref_use_sys_iptables_summary"></string> <string name="error_installing_binares"></string> + <string name="pref_use_persistent_notifications"></string> + <string name="pref_use_persistent_notifications_title"></string> </resources> diff --git a/values-nl/strings.xml b/values-nl/strings.xml index 0ab07a0..49c99f5 100644 --- a/values-nl/strings.xml +++ b/values-nl/strings.xml @@ -197,4 +197,6 @@ Bezoek onze website op https://guardianproject.info/apps/orbot of stuur een emai <string name="pref_use_sys_iptables_title">Gebruik standaard iptables</string> <string name="pref_use_sys_iptables_summary">gebruik de ingebouwde iptables binary in plaats van de in Orbot geïntegreerde.</string> <string name="error_installing_binares">De Tor binaries konden niet worden geïnstalleerd of geüpgraded.</string> + <string name="pref_use_persistent_notifications"></string> + <string name="pref_use_persistent_notifications_title"></string> </resources> diff --git a/values-pl/strings.xml b/values-pl/strings.xml index c08a1c6..44473f6 100644 --- a/values-pl/strings.xml +++ b/values-pl/strings.xml @@ -191,4 +191,6 @@ <string name="pref_use_sys_iptables_title"></string> <string name="pref_use_sys_iptables_summary"></string> <string name="error_installing_binares"></string> + <string name="pref_use_persistent_notifications"></string> + <string name="pref_use_persistent_notifications_title"></string> </resources> diff --git a/values-pt/strings.xml b/values-pt/strings.xml index dea597c..fc97af9 100644 --- a/values-pt/strings.xml +++ b/values-pt/strings.xml @@ -187,4 +187,6 @@ <string name="pref_use_sys_iptables_title"></string> <string name="pref_use_sys_iptables_summary"></string> <string name="error_installing_binares"></string> + <string name="pref_use_persistent_notifications"></string> + <string name="pref_use_persistent_notifications_title"></string> </resources> diff --git a/values-ru/strings.xml b/values-ru/strings.xml index c11deda..7e339cd 100644 --- a/values-ru/strings.xml +++ b/values-ru/strings.xml @@ -191,4 +191,6 @@ <string name="pref_use_sys_iptables_title"></string> <string name="pref_use_sys_iptables_summary"></string> <string name="error_installing_binares"></string> + <string name="pref_use_persistent_notifications"></string> + <string name="pref_use_persistent_notifications_title"></string> </resources> diff --git a/values-sv/strings.xml b/values-sv/strings.xml index dcd60a2..f8bc878 100644 --- a/values-sv/strings.xml +++ b/values-sv/strings.xml @@ -187,4 +187,6 @@ <string name="pref_use_sys_iptables_title"></string> <string name="pref_use_sys_iptables_summary"></string> <string name="error_installing_binares"></string> + <string name="pref_use_persistent_notifications"></string> + <string name="pref_use_persistent_notifications_title"></string> </resources> diff --git a/values-zh/strings.xml b/values-zh/strings.xml index 1ae662f..62704fb 100644 --- a/values-zh/strings.xml +++ b/values-zh/strings.xml @@ -190,4 +190,6 @@ <string name="pref_use_sys_iptables_title"></string> <string name="pref_use_sys_iptables_summary"></string> <string name="error_installing_binares"></string> + <string name="pref_use_persistent_notifications"></string> + <string name="pref_use_persistent_notifications_title"></string> </resources> diff --git a/values/strings.xml b/values/strings.xml index 3aca1ee..144db09 100644 --- a/values/strings.xml +++ b/values/strings.xml @@ -177,7 +177,7 @@ <string name="the_tor_license">The Tor License</string> <string name="https_torproject_org">https://torproject.org</string> <string name="third_party_software">3rd-Party-Software: </string> - <string name="tor_version">Tor v0.2.3.10-alpha: https://www.torproject.org</string> + <string name="tor_version">Tor v0.2.3.10: https://www.torproject.org</string> <string name="libevent_version">LibEvent v1.4.13: http://www.monkey.org/~provos/libevent/</string> <string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string> <string name="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string> @@ -191,4 +191,6 @@ <string name="pref_use_sys_iptables_title">Use Default Iptables</string> <string name="pref_use_sys_iptables_summary">use the built-in iptables binary instead of the one bundled with Orbot</string> <string name="error_installing_binares">The Tor binaries were not able to be installed or upgraded.</string> + <string name="pref_use_persistent_notifications">Always keep the icon in toolbar when Orbot is connected</string> + <string name="pref_use_persistent_notifications_title">Always-On Notifications</string> </resources>

1 0

[orbot/master] removed whisper binary
by n8fr8＠torproject.org 26 Jan '12

26 Jan '12

commit 24b9b673d0aca48c58a8d1671b9802b26c9f0460 Author: Nathan Freitas <nathan(a)freitas.net> Date: Wed Jan 25 20:09:53 2012 -0500 removed whisper binary --- .classpath | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/.classpath b/.classpath index 9a448b2..b4c22c4 100644 --- a/.classpath +++ b/.classpath @@ -4,6 +4,5 @@ <classpathentry kind="src" path="gen"/> <classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/> <classpathentry kind="lib" path="libs/jtorctrl.jar"/> - <classpathentry kind="lib" path="libs/whispercore.jar"/> <classpathentry kind="output" path="bin/classes"/> </classpath>

1 0

[orbot/master] added support back in for SDK4/Android 1.6
by n8fr8＠torproject.org 26 Jan '12

26 Jan '12

commit b1a02fb26d440ee149237d1e3d53abebe3f603db Author: Nathan Freitas <nathan(a)freitas.net> Date: Wed Jan 25 20:10:42 2012 -0500 added support back in for SDK4/Android 1.6 --- AndroidManifest.xml | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index d072a76..36978bb 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,13 +1,14 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.torproject.android" - android:versionName="0.2.3.10-orbot-1.0.7-RC6" - android:versionCode="29" + android:versionName="0.2.3.10-alpha-orbot-1.0.7-beta-20110125" + android:versionCode="30" android:installLocation="auto" > <uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/> + <uses-sdk android:minSdkVersion="4"/> <application android:theme="@style/DefaultTheme" android:icon="@drawable/icon" android:label="@string/app_name" android:debuggable="false"> @@ -61,6 +62,5 @@ </application> - <uses-sdk android:minSdkVersion="8"/> </manifest>

1 0

[orbot/master] updated version
by n8fr8＠torproject.org 26 Jan '12

26 Jan '12

commit e4bedd19cfdf757421e643a77be446ee2f7101ac Author: Nathan Freitas <nathan(a)freitas.net> Date: Wed Jan 25 20:11:35 2012 -0500 updated version --- AndroidManifest.xml | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 36978bb..3055147 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.torproject.android" - android:versionName="0.2.3.10-alpha-orbot-1.0.7-beta-20110125" - android:versionCode="30" + android:versionName="0.2.3.10-alpha-orbot-1.0.7-RC7" + android:versionCode="31" android:installLocation="auto" > <uses-permission android:name="android.permission.INTERNET" />

1 0