[tor-commits] [tor-launcher/master] Add a script to pull in localizations from transifex.
commit cf337dd73caa09df836b35496e54b56496038d5d Author: Mike Perry Date: Tue May 28 17:27:54 2013 -0700 Add a script to pull in localizations from transifex. --- localization/import-translations.sh | 31 +++ 1 file changed, 31 insertions(+) diff --git a/localization/import-translations.sh b/localization/import-translations.sh new file mode 100755 index 000..bd05bc5 --- /dev/null +++ b/localization/import-translations.sh @@ -0,0 +1,31 @@ +#!/bin/sh + +BUNDLE_LOCALES="de es fa fr it ko nl pl pt ru vi zh-CN" + +if [ -d translations ]; +then + cd translations + git fetch origin + cd .. +else + git clone https://git.torproject.org/translation.git +fi + +cd translation +for i in $BUNDLE_LOCALES +do + UL="`echo $i|tr - _`" + mkdir -p ../../src/chrome/locale/$i/ + + git checkout tor-launcher-network-settings + git merge origin/tor-launcher-network-settings + cp $UL/network-settings.dtd ../../src/chrome/locale/$i/ + + git checkout tor-launcher-progress + git merge origin/tor-launcher-progress + cp $UL/progress.dtd ../../src/chrome/locale/$i/ + + git checkout tor-launcher-properties + git merge origin/tor-launcher-properties + cp $UL/torlauncher.properties ../../src/chrome/locale/$i/ +done ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser/tor-browser-17.0.6esr-2] fixup! Rebrand Firefox to TorBrowser
commit e80a10003c78f5b1ed1fda8c02b3063e3e66aa63 Author: Mike Perry Date: Fri May 24 19:31:58 2013 -0700 fixup! Rebrand Firefox to TorBrowser Add icons to the git repo. --- browser/branding/official/background.png | Bin 113268 -> 32171 bytes browser/branding/official/default16.png| Bin 972 -> 988 bytes browser/branding/official/default24.png| Bin 1849 -> 1918 bytes browser/branding/official/default256.png | Bin 76949 -> 48898 bytes browser/branding/official/default32.png| Bin 2912 -> 2775 bytes browser/branding/official/default48.png| Bin 5640 -> 5402 bytes browser/branding/official/document.icns| Bin 189894 -> 195435 bytes browser/branding/official/document.ico | Bin 295606 -> 54601 bytes browser/branding/official/firefox.icns | Bin 289528 -> 242224 bytes browser/branding/official/firefox.ico | Bin 295606 -> 75112 bytes browser/branding/official/mozicon128.png | Bin 25121 -> 19033 bytes browser/branding/official/wizHeader.bmp| Bin 25820 -> 34254 bytes browser/branding/official/wizHeaderRTL.bmp | Bin 25820 -> 34254 bytes browser/branding/official/wizWatermark.bmp | Bin 154544 -> 206038 bytes 14 files changed, 0 insertions(+), 0 deletions(-) diff --git a/browser/branding/official/background.png b/browser/branding/official/background.png index 5e20353..7dafb9f 100644 Binary files a/browser/branding/official/background.png and b/browser/branding/official/background.png differ diff --git a/browser/branding/official/default16.png b/browser/branding/official/default16.png index 0822f73..59e34b3 100644 Binary files a/browser/branding/official/default16.png and b/browser/branding/official/default16.png differ diff --git a/browser/branding/official/default24.png b/browser/branding/official/default24.png index c6aab1c..8c0f58b 100644 Binary files a/browser/branding/official/default24.png and b/browser/branding/official/default24.png differ diff --git a/browser/branding/official/default256.png b/browser/branding/official/default256.png index 0be7473..3d440fb 100644 Binary files a/browser/branding/official/default256.png and b/browser/branding/official/default256.png differ diff --git a/browser/branding/official/default32.png b/browser/branding/official/default32.png index 0c4f681..7ab63b7 100644 Binary files a/browser/branding/official/default32.png and b/browser/branding/official/default32.png differ diff --git a/browser/branding/official/default48.png b/browser/branding/official/default48.png index b982cf9..5f445ae 100644 Binary files a/browser/branding/official/default48.png and b/browser/branding/official/default48.png differ diff --git a/browser/branding/official/document.icns b/browser/branding/official/document.icns index 75de3a6..476c7d6 100644 Binary files a/browser/branding/official/document.icns and b/browser/branding/official/document.icns differ diff --git a/browser/branding/official/document.ico b/browser/branding/official/document.ico index cb14c61..311340e 100644 Binary files a/browser/branding/official/document.ico and b/browser/branding/official/document.ico differ diff --git a/browser/branding/official/firefox.icns b/browser/branding/official/firefox.icns index baeadcd..481914f 100644 Binary files a/browser/branding/official/firefox.icns and b/browser/branding/official/firefox.icns differ diff --git a/browser/branding/official/firefox.ico b/browser/branding/official/firefox.ico index 25461ec..01fb0ef 100644 Binary files a/browser/branding/official/firefox.ico and b/browser/branding/official/firefox.ico differ diff --git a/browser/branding/official/mozicon128.png b/browser/branding/official/mozicon128.png index f82ea67..8fc3530 100644 Binary files a/browser/branding/official/mozicon128.png and b/browser/branding/official/mozicon128.png differ diff --git a/browser/branding/official/wizHeader.bmp b/browser/branding/official/wizHeader.bmp index 026f412..a754d2d 100644 Binary files a/browser/branding/official/wizHeader.bmp and b/browser/branding/official/wizHeader.bmp differ diff --git a/browser/branding/official/wizHeaderRTL.bmp b/browser/branding/official/wizHeaderRTL.bmp index 55d2c1a..c944205 100644 Binary files a/browser/branding/official/wizHeaderRTL.bmp and b/browser/branding/official/wizHeaderRTL.bmp differ diff --git a/browser/branding/official/wizWatermark.bmp b/browser/branding/official/wizWatermark.bmp index 0abfbb7..9e523b5 100644 Binary files a/browser/branding/official/wizWatermark.bmp and b/browser/branding/official/wizWatermark.bmp differ ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] r26198: {website} Remove 'ideally' modifier on sentence about writing tests, a (website/trunk/about/en)
Author: mikeperry Date: 2013-05-28 22:39:35 + (Tue, 28 May 2013) New Revision: 26198 Modified: website/trunk/about/en/jobs-lead-automation.wml Log: Remove 'ideally' modifier on sentence about writing tests, as it is actually a requirement. Modified: website/trunk/about/en/jobs-lead-automation.wml === --- website/trunk/about/en/jobs-lead-automation.wml 2013-05-27 00:57:31 UTC (rev 26197) +++ website/trunk/about/en/jobs-lead-automation.wml 2013-05-28 22:39:35 UTC (rev 26198) @@ -19,7 +19,7 @@ This is a contract position. Candidates are expected to be capable of taking the lead in selecting, deploying, and maintaining multiple automation systems in -several different programming languages. Ideally, they would also be capable +several different programming languages. Candidates should also be capable of reproducing bugs and writing new reproduction test cases for one or more of the testing frameworks. Eventually, we hope to add additional staff to assist in this project, but to start, you will be expected to prioritize your own ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/orbot_completed] Update translations for orbot_completed
commit 0542c78cfe47b269af658c43f7f56b4d920a2f20 Author: Translation commit bot Date: Tue May 28 21:15:15 2013 + Update translations for orbot_completed --- values-de/strings.xml | 36 ++-- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/values-de/strings.xml b/values-de/strings.xml index b4a0801..f4d40dc 100644 --- a/values-de/strings.xml +++ b/values-de/strings.xml @@ -9,7 +9,7 @@ Tor Proxydienst Orbot startet... Verbunden mit dem Tor-Netzwerk - \"Orbot ist deaktiviert + Orbot ist deaktiviert Orbot wird beendet Starte Tor-Software... abgeschlossen. @@ -78,7 +78,7 @@ https://duckduckgo.com/android/latest.apk Firefox mir Proxy Mobile-Add-On (extra Installation im Anschluss) https://guardianproject.info/releases/proxymob-latest.xpi - Twitter unterstützt den http proxy \"localhost:8118\" + Twitter unterstützt den HTTP-Proxy \"localhost:8118\" https://guardianproject.info/2012/05/02/orbot-your-twitter/ Proxy-Einstellungen Wenn das Android-App, das Sie benutzen, die Verwendung von HTTP- oder SOCKS-Proxys unterstützt, können Sie es so konfigurieren, dass es sich mit Orbot verbindet und Tor verwendet.\n\n\nDie Host-Einstellungen sind 127.0.0.1 oder \"localhost\". Die Port-Einstellungen sind 8118 für HTTP und 9050 für SOCKS. Sie sollten versuchen, SOCKS4A oder SOCKS5 zu verwenden.\n\n\n\nErfahren Sie mehr über die Verwendung von Proxys unter Android in den FAQ unter http://tinyurl.com/proxyandroid\n @@ -105,10 +105,10 @@ Apps, die Orbot unterstützen Gibberbot: Sichere Chat App mit inoffizieller Verschlüsselung - https://market.android.com/details?id=info.guardianproject.otr.app.im + https://guardianproject.info/releases/gibberbot-latest.apk ORWEB (Nur Android 1.x) - Ein für Privatsphäre & Orbot entworfener Browser - market://search?q=pname:nfo.guardianproject.browser - Finde alle Guardian Project Apss im Google Play Store + https://guardianproject.info/releases/orweb-latest.xpi + Finde alle Guardian Project Apps im Google Play Store https://play.google.com/store/search?q=guardianproject
[tor-commits] [translation/orbot] Update translations for orbot
commit 85c4ce54589157d05c005cc9fb8f70b5d45ffbec Author: Translation commit bot Date: Tue May 28 21:15:10 2013 + Update translations for orbot --- values-de/strings.xml | 36 ++-- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/values-de/strings.xml b/values-de/strings.xml index b4a0801..f4d40dc 100644 --- a/values-de/strings.xml +++ b/values-de/strings.xml @@ -9,7 +9,7 @@ Tor Proxydienst Orbot startet... Verbunden mit dem Tor-Netzwerk - \"Orbot ist deaktiviert + Orbot ist deaktiviert Orbot wird beendet Starte Tor-Software... abgeschlossen. @@ -78,7 +78,7 @@ https://duckduckgo.com/android/latest.apk Firefox mir Proxy Mobile-Add-On (extra Installation im Anschluss) https://guardianproject.info/releases/proxymob-latest.xpi - Twitter unterstützt den http proxy \"localhost:8118\" + Twitter unterstützt den HTTP-Proxy \"localhost:8118\" https://guardianproject.info/2012/05/02/orbot-your-twitter/ Proxy-Einstellungen Wenn das Android-App, das Sie benutzen, die Verwendung von HTTP- oder SOCKS-Proxys unterstützt, können Sie es so konfigurieren, dass es sich mit Orbot verbindet und Tor verwendet.\n\n\nDie Host-Einstellungen sind 127.0.0.1 oder \"localhost\". Die Port-Einstellungen sind 8118 für HTTP und 9050 für SOCKS. Sie sollten versuchen, SOCKS4A oder SOCKS5 zu verwenden.\n\n\n\nErfahren Sie mehr über die Verwendung von Proxys unter Android in den FAQ unter http://tinyurl.com/proxyandroid\n @@ -105,10 +105,10 @@ Apps, die Orbot unterstützen Gibberbot: Sichere Chat App mit inoffizieller Verschlüsselung - https://market.android.com/details?id=info.guardianproject.otr.app.im + https://guardianproject.info/releases/gibberbot-latest.apk ORWEB (Nur Android 1.x) - Ein für Privatsphäre & Orbot entworfener Browser - market://search?q=pname:nfo.guardianproject.browser - Finde alle Guardian Project Apss im Google Play Store + https://guardianproject.info/releases/orweb-latest.xpi + Finde alle Guardian Project Apps im Google Play Store https://play.google.com/store/search?q=guardianproject
[tor-commits] [translation/orbot_completed] Update translations for orbot_completed
commit a1397326da136831f126ac4a3a7f05a6e0cece48 Author: Translation commit bot Date: Tue May 28 20:45:14 2013 + Update translations for orbot_completed --- values-de/strings.xml | 50 - 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/values-de/strings.xml b/values-de/strings.xml index f760cb5..b4a0801 100644 --- a/values-de/strings.xml +++ b/values-de/strings.xml @@ -34,7 +34,7 @@ Ãberprüfen Beenden - Zum Starten gedrückt halten - - Transparenter Proxy (benötigt Administratorrechte) + Transparenter Proxy (benötigt Root-Rechte) Transparenter Proxy Anwendungen automatisch durch Tor leiten Alles durch Tor leiten @@ -58,16 +58,16 @@ Abbrechen Nähere Informationen zu Orbot - Orbot ist eine quelloffene Anwendung die Tor, LibEvent und Privoxy enthält. Es stellt einen lokalen HTTP Proxy (8118) und einen SOCKS Proxy (9050) zum Tor-Netzwerk zur Verfügung. Orbot hat auf einem System mit Administrationsrechten auch die Fähigkeit, jeglichen Internetverkehr über das Tor-Netzwerk abzuwickeln. + Orbot ist eine quelloffene Anwendung, die Tor, LibEvent und Privoxy enthält. Es stellt einen lokalen HTTP Proxy (8118) und einen SOCKS Proxy (9050) zum Tor-Netzwerk zur Verfügung. Orbot hat auf einem System mit Root-Rechten auch die Fähigkeit, jeglichen Internetverkehr über das Tor-Netzwerk abzuwickeln. Berechtigung erteilt Orbot Rechte - Exzellent! Wir haben festgestellt, dass Sie Orbot Administrator-Rechte eingeräumt haben. Wir werden diese Macht weise nutzen. - Obwohl es nicht nötig ist, kann Orbot ein mächtigeres Tool werden, wenn Sie ihm Administrator-Rechte einräumen. Drücken Sie auf den Kopf unten, um Orbot diese Superkräfte einzuräumen. - Falls Sie keinen Administrator-Zugriff haben oder nicht wissen was das ist, achten Sie darauf, dass Sie Anwendungen verwenden, die Orbot nutzen können. - Ich habe verstanden und möchte ohne Administrator-Rechte weitermachen. - Orbot Administrator-Rechte einräumen + Exzellent! Wir haben festgestellt, dass Sie Orbot Root-Rechte eingeräumt haben. Wir werden diese Macht weise nutzen. + Obwohl es nicht nötig ist, kann Orbot ein mächtigeres Tool werden, wenn Sie ihm Root-Rechte einräumen. Drücken Sie auf den Kopf unten, um Orbot diese Superkräfte einzuräumen. + Falls Sie keinen Root-Zugriff haben oder nicht wissen, was das ist, achten Sie darauf, dass Sie Anwendungen verwenden, die Orbot nutzen können. + Ich habe verstanden und möchte ohne Root-Rechte weitermachen. + Orbot Root-Rechte einräumen Torification konfigurieren - Orbot gibt Ihnen die Wahl, den Datenverkehr aller Apps durch Tor zu leiten ODER die Wahl für alle Apps einzeln zu treffen. + Orbot gibt Ihnen die Wahl, den Datenverkehr aller Apps durch Tor zu leiten ODER einzelne Apps auszuwählen. Den Verkehr aller Apps durch Tor leiten Apps einzeln wählen Apps, für die Orbot aktiviert ist @@ -99,11 +99,11 @@ Die reine Installation von Orbot wird Ihren Datenverkehr nicht anonymisieren. Tor muss korrekt konfiguriert sein, damit ihr Gerät Tor erfolgreich verwenden kann. Rechte - Sie können Orbot wahlweise \'Administrator\'-Rechte geben, um erweiterte Optionen wie die Nutzung von transparenten Proxys zu ermöglichen. + Sie können Orbot wahlweise \'Root\'-Rechte geben, um erweiterte Optionen wie die Nutzung von transparenten Proxys zu ermöglichen. Wenn Sie dies nicht möchten, dann verwenden Sie bitte Apps, die mit Orbot zusammen arbeiten können. Ihr Gerät läuft im Standard-Modus und unterstützt keine Administrator-Rechte. In diesem Fall müssen Sie Apps verwenden, die von Haus aus mit Orbot zusammenarbeiten oder die HTTP bzw. SOCKS Proxy Einstellungen ermöglichen.\n - Apps die Orbot unterstützt + Apps, die Orbot unterstützen Gibberbot: Sichere Chat App mit inoffizieller Verschlüsselung https://market.android.com/details?id=info.guardianproject.otr.app.im ORWEB (Nur Android 1.x) - Ein für Privatsphäre & Orbot entworfener Browser @@ -116,24 +116,24 @@ https://addons.mozilla.org/mobile/downloads/latest/251558/type:attachment/addon-251558-latest.xpi?src=addon-detail--> Benutze transparenten Proxy - Dies ermöglicht Ihnen Apps, automatisch das Tor Netzwerk zu verwenden ohne dies konfigurieren zu müssen. + Dies ermöglicht Ihren Apps automatisch das Tor Netzwerk zu verwenden ohne dies konfigurieren zu müssen. (Klicken Sie dieses Kästchen an wenn Sie nicht wissen wovon wir reden) Nichts Tor Anbindung Aktiviere transparenten Proxy für Wifi und angebunde USB-Geräte (benötigt einen Neustart) - Administrator-Rechte anfordern + Root-Rechte anfordern Apps auswählen - Wählen Sie die Apps die Tor benutzen sollen + Wählen Sie die Apps, die Tor benutzen sollen Knoten-Konfiguration Dies sind erweiterte Einstellungen, die Ihre Anonymität be
[tor-commits] [translation/orbot] Update translations for orbot
commit 4a02e1fdd991b4af84952ddc092bb52488d4d33f Author: Translation commit bot Date: Tue May 28 20:45:10 2013 + Update translations for orbot --- values-de/strings.xml | 50 - 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/values-de/strings.xml b/values-de/strings.xml index f760cb5..b4a0801 100644 --- a/values-de/strings.xml +++ b/values-de/strings.xml @@ -34,7 +34,7 @@ Ãberprüfen Beenden - Zum Starten gedrückt halten - - Transparenter Proxy (benötigt Administratorrechte) + Transparenter Proxy (benötigt Root-Rechte) Transparenter Proxy Anwendungen automatisch durch Tor leiten Alles durch Tor leiten @@ -58,16 +58,16 @@ Abbrechen Nähere Informationen zu Orbot - Orbot ist eine quelloffene Anwendung die Tor, LibEvent und Privoxy enthält. Es stellt einen lokalen HTTP Proxy (8118) und einen SOCKS Proxy (9050) zum Tor-Netzwerk zur Verfügung. Orbot hat auf einem System mit Administrationsrechten auch die Fähigkeit, jeglichen Internetverkehr über das Tor-Netzwerk abzuwickeln. + Orbot ist eine quelloffene Anwendung, die Tor, LibEvent und Privoxy enthält. Es stellt einen lokalen HTTP Proxy (8118) und einen SOCKS Proxy (9050) zum Tor-Netzwerk zur Verfügung. Orbot hat auf einem System mit Root-Rechten auch die Fähigkeit, jeglichen Internetverkehr über das Tor-Netzwerk abzuwickeln. Berechtigung erteilt Orbot Rechte - Exzellent! Wir haben festgestellt, dass Sie Orbot Administrator-Rechte eingeräumt haben. Wir werden diese Macht weise nutzen. - Obwohl es nicht nötig ist, kann Orbot ein mächtigeres Tool werden, wenn Sie ihm Administrator-Rechte einräumen. Drücken Sie auf den Kopf unten, um Orbot diese Superkräfte einzuräumen. - Falls Sie keinen Administrator-Zugriff haben oder nicht wissen was das ist, achten Sie darauf, dass Sie Anwendungen verwenden, die Orbot nutzen können. - Ich habe verstanden und möchte ohne Administrator-Rechte weitermachen. - Orbot Administrator-Rechte einräumen + Exzellent! Wir haben festgestellt, dass Sie Orbot Root-Rechte eingeräumt haben. Wir werden diese Macht weise nutzen. + Obwohl es nicht nötig ist, kann Orbot ein mächtigeres Tool werden, wenn Sie ihm Root-Rechte einräumen. Drücken Sie auf den Kopf unten, um Orbot diese Superkräfte einzuräumen. + Falls Sie keinen Root-Zugriff haben oder nicht wissen, was das ist, achten Sie darauf, dass Sie Anwendungen verwenden, die Orbot nutzen können. + Ich habe verstanden und möchte ohne Root-Rechte weitermachen. + Orbot Root-Rechte einräumen Torification konfigurieren - Orbot gibt Ihnen die Wahl, den Datenverkehr aller Apps durch Tor zu leiten ODER die Wahl für alle Apps einzeln zu treffen. + Orbot gibt Ihnen die Wahl, den Datenverkehr aller Apps durch Tor zu leiten ODER einzelne Apps auszuwählen. Den Verkehr aller Apps durch Tor leiten Apps einzeln wählen Apps, für die Orbot aktiviert ist @@ -99,11 +99,11 @@ Die reine Installation von Orbot wird Ihren Datenverkehr nicht anonymisieren. Tor muss korrekt konfiguriert sein, damit ihr Gerät Tor erfolgreich verwenden kann. Rechte - Sie können Orbot wahlweise \'Administrator\'-Rechte geben, um erweiterte Optionen wie die Nutzung von transparenten Proxys zu ermöglichen. + Sie können Orbot wahlweise \'Root\'-Rechte geben, um erweiterte Optionen wie die Nutzung von transparenten Proxys zu ermöglichen. Wenn Sie dies nicht möchten, dann verwenden Sie bitte Apps, die mit Orbot zusammen arbeiten können. Ihr Gerät läuft im Standard-Modus und unterstützt keine Administrator-Rechte. In diesem Fall müssen Sie Apps verwenden, die von Haus aus mit Orbot zusammenarbeiten oder die HTTP bzw. SOCKS Proxy Einstellungen ermöglichen.\n - Apps die Orbot unterstützt + Apps, die Orbot unterstützen Gibberbot: Sichere Chat App mit inoffizieller Verschlüsselung https://market.android.com/details?id=info.guardianproject.otr.app.im ORWEB (Nur Android 1.x) - Ein für Privatsphäre & Orbot entworfener Browser @@ -116,24 +116,24 @@ https://addons.mozilla.org/mobile/downloads/latest/251558/type:attachment/addon-251558-latest.xpi?src=addon-detail--> Benutze transparenten Proxy - Dies ermöglicht Ihnen Apps, automatisch das Tor Netzwerk zu verwenden ohne dies konfigurieren zu müssen. + Dies ermöglicht Ihren Apps automatisch das Tor Netzwerk zu verwenden ohne dies konfigurieren zu müssen. (Klicken Sie dieses Kästchen an wenn Sie nicht wissen wovon wir reden) Nichts Tor Anbindung Aktiviere transparenten Proxy für Wifi und angebunde USB-Geräte (benötigt einen Neustart) - Administrator-Rechte anfordern + Root-Rechte anfordern Apps auswählen - Wählen Sie die Apps die Tor benutzen sollen + Wählen Sie die Apps, die Tor benutzen sollen Knoten-Konfiguration Dies sind erweiterte Einstellungen, die Ihre Anonymität beeinträcht
[tor-commits] [tor/master] Start correctly when not in testing mode.
commit 97d1caadfdf63043e23c7c3fd45465859e1340e2 Author: Nick Mathewson Date: Tue May 28 16:13:06 2013 -0400 Start correctly when not in testing mode. You can't use != to compare arbitary members of or_options_t. (Also, generate a better error message to say which Testing* option was set.) Fix for bug 8992. Bugfix on b0d4ca49. Bug not in any released Tor. --- src/or/config.c | 16 +--- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index 8734763..2cdf5b2 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -3212,13 +3212,15 @@ options_validate(or_options_t *old_options, or_options_t *options, "ignore you."); } -#define CHECK_DEFAULT(arg) \ - STMT_BEGIN if (default_options->arg != options->arg && \ - !options->TestingTorNetwork && \ - !options->UsingTestNetworkDefaults_) { \ -REJECT("Testing* options may only be changed in testing Tor " \ - "networks!"); \ - } STMT_END +#define CHECK_DEFAULT(arg) \ + STMT_BEGIN\ +if (!options->TestingTorNetwork && \ +!options->UsingTestNetworkDefaults_ && \ +!config_is_same(&options_format,options,\ +default_options,#arg)) {\ + REJECT(#arg " may only be changed in testing Tor "\ + "networks!"); \ +} STMT_END CHECK_DEFAULT(TestingV3AuthInitialVotingInterval); CHECK_DEFAULT(TestingV3AuthInitialVoteDelay); CHECK_DEFAULT(TestingV3AuthInitialDistDelay); ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/orbot] Update translations for orbot
commit b0c6999b21e4f23124a938751f187e803f307ca8 Author: Translation commit bot Date: Tue May 28 16:45:11 2013 + Update translations for orbot --- values-nb/strings.xml |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/values-nb/strings.xml b/values-nb/strings.xml index af9438f..436acdb 100644 --- a/values-nb/strings.xml +++ b/values-nb/strings.xml @@ -25,8 +25,8 @@ Stopp About Wizard - Last ned - Last opp + Nedlasting + Opplasting Hjelp Avslutt Om ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/orbot_completed] Update translations for orbot_completed
commit 165b79f9943fb96c85963a5c292d349132280d61 Author: Translation commit bot Date: Tue May 28 16:45:16 2013 + Update translations for orbot_completed --- values-nb/strings.xml |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/values-nb/strings.xml b/values-nb/strings.xml index af9438f..436acdb 100644 --- a/values-nb/strings.xml +++ b/values-nb/strings.xml @@ -25,8 +25,8 @@ Stopp About Wizard - Last ned - Last opp + Nedlasting + Opplasting Hjelp Avslutt Om ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Try harder to document default_options correctly.
commit 3795f6a78b84ffcbe9bf464d5e569ae3c718d03e Author: Karsten Loesing Date: Sat May 25 07:33:37 2013 +0200 Try harder to document default_options correctly. --- src/or/config.c | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index d85ba4c..bb59675 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -2315,11 +2315,11 @@ compute_publishserverdescriptor(or_options_t *options) * */ #define RECOMMENDED_MIN_CIRCUIT_BUILD_TIMEOUT (10) -/** Return 0 if every setting in options is reasonable, does not - * differ from default_options unless in testing Tor networks, and - * is a permissible transition from old_options. Else return -1. - * Should have no side effects, except for normalizing the contents of - * options. +/** Return 0 if every setting in options is reasonable, is a + * permissible transition from old_options, and none of the + * testing-only settings differ from default_options unless in + * testing mode. Else return -1. Should have no side effects, except for + * normalizing the contents of options. * * On error, tor_strdup an error explanation into *msg. * ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge remote-tracking branch 'karsten/task-6752-3'
commit d3125a3e404f4967d9100d793b01dcbed6eeadc2 Merge: e7134c2 3795f6a Author: Nick Mathewson Date: Tue May 28 10:59:35 2013 -0400 Merge remote-tracking branch 'karsten/task-6752-3' changes/bug6752|5 ++ doc/tor.1.txt | 61 src/common/container.c | 19 +++ src/common/container.h |1 + src/or/config.c| 147 src/or/confparse.c | 54 ++ src/or/confparse.h |3 + src/or/directory.c | 88 + src/or/main.c |8 +-- src/or/microdesc.c |2 +- src/or/networkstatus.c |4 +- src/or/or.h| 53 ++--- src/or/routerlist.c| 19 ++- 13 files changed, 338 insertions(+), 126 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Lower dir fetch retry schedules in testing networks.
commit 1293835440dd4debf6fbfc66e755d9b9384aa362 Author: Karsten Loesing Date: Thu May 16 12:08:48 2013 +0200 Lower dir fetch retry schedules in testing networks. Also lower maximum interval without directory requests, and raise maximum download tries. Implements #6752. --- changes/bug6752|5 ++ doc/tor.1.txt | 61 ++ src/common/container.c | 19 ++ src/common/container.h |1 + src/or/config.c| 163 src/or/confparse.c | 56 + src/or/confparse.h |3 + src/or/directory.c | 80 +++- src/or/main.c |8 +-- src/or/microdesc.c |2 +- src/or/networkstatus.c |4 +- src/or/or.h| 53 +--- src/or/routerlist.c| 19 ++ 13 files changed, 375 insertions(+), 99 deletions(-) diff --git a/changes/bug6752 b/changes/bug6752 new file mode 100644 index 000..8d620d5 --- /dev/null +++ b/changes/bug6752 @@ -0,0 +1,5 @@ + o Minor features: + - Lower directory fetch retry schedules and maximum interval without + directory requests, and raise maximum download tries in testing + networks. Implements #6752. + diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 0a6f8f5..5785b38 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -2005,6 +2005,17 @@ The following options are used for running a testing Tor network. TestingV3AuthInitialDistDelay 20 seconds TestingAuthDirTimeToLearnReachability 0 minutes TestingEstimatedDescriptorPropagationTime 0 minutes + TestingServerDownloadSchedule 0, 0, 0, 5, 10, 15, 20, 30, 60 + TestingClientDownloadSchedule 0, 0, 5, 10, 15, 20, 30, 60 + TestingServerConsensusDownloadSchedule 0, 0, 5, 10, 15, 20, 30, 60 + TestingClientConsensusDownloadSchedule 0, 0, 5, 10, 15, 20, 30, 60 + TestingBridgeDownloadSchedule 60, 30, 30, 60 + TestingClientMaxIntervalWithoutRequest 5 seconds + TestingDirConnectionMaxStall 30 seconds + TestingConsensusMaxDownloadTries 80 + TestingDescriptorMaxDownloadTries 80 + TestingMicrodescMaxDownloadTries 80 + TestingCertMaxDownloadTries 80 **TestingV3AuthInitialVotingInterval** __N__ **minutes**|**hours**:: Like V3AuthVotingInterval, but for initial voting interval before the first @@ -2035,6 +2046,56 @@ The following options are used for running a testing Tor network. Minimum value for the Fast flag. Overrides the ordinary minimum taken from the consensus when TestingTorNetwork is set. (Default: 0.) +**TestingServerDownloadSchedule** __N__,__N__,__...__:: +Schedule for when servers should download things in general. Changing this +requires that **TestingTorNetwork** is set. (Default: 0, 0, 0, 60, 60, 120, +300, 900, 2147483647) + +**TestingClientDownloadSchedule** __N__,__N__,__...__:: +Schedule for when clients should download things in general. Changing this +requires that **TestingTorNetwork** is set. (Default: 0, 0, 60, 300, 600, +2147483647) + +**TestingServerConsensusDownloadSchedule** __N__,__N__,__...__:: +Schedule for when servers should download consensuses. Changing this +requires that **TestingTorNetwork** is set. (Default: 0, 0, 60, 300, 600, +1800, 1800, 1800, 1800, 1800, 3600, 7200) + +**TestingClientConsensusDownloadSchedule** __N__,__N__,__...__:: +Schedule for when clients should download consensuses. Changing this +requires that **TestingTorNetwork** is set. (Default: 0, 0, 60, 300, 600, +1800, 3600, 3600, 3600, 10800, 21600, 43200) + +**TestingBridgeDownloadSchedule** __N__,__N__,__...__:: +Schedule for when clients should download bridge descriptors. Changing this +requires that **TestingTorNetwork** is set. (Default: 3600, 900, 900, 3600) + +**TestingClientMaxIntervalWithoutRequest** __N__ **seconds**|**minutes**:: +When directory clients have only a few descriptors to request, they batch +them until they have more, or until this amount of time has passed. +Changing this requires that **TestingTorNetwork** is set. (Default: 10 +minutes) + +**TestingDirConnectionMaxStall** __N__ **seconds**|**minutes**:: +Let a directory connection stall this long before expiring it. +Changing this requires that **TestingTorNetwork** is set. (Default: +5 minutes) + +**TestingConsensusMaxDownloadTries** __NUM__:: +Try this often to download a consensus before giving up. Changing +this requires that **TestingTorNetwork** is set. (Default: 8) + +**TestingDescriptorMaxDownloadTries** __NUM__:: +Try this often to download a router descriptor before giving up. +Changing this requires that **TestingTorNetwork** is set. (Default: 8) + +**TestingMicrodescMaxDownloadTries** __NUM__:: +Try this often to download a microdesc descriptor before giving up. +Changing this requires that **TestingTorNetwork** is set. (Defaul
[tor-commits] [tor/master] Tweak #6752 patch based on comments by nickm.
commit b0d4ca4990d50f45a4e0e2805ff471f7408c3007 Author: Karsten Loesing Date: Fri May 24 09:48:15 2013 +0200 Tweak #6752 patch based on comments by nickm. --- src/common/container.c |4 +- src/or/config.c| 142 +--- src/or/confparse.c |4 +- src/or/directory.c | 14 +++-- 4 files changed, 50 insertions(+), 114 deletions(-) diff --git a/src/common/container.c b/src/common/container.c index 03c65b7..476dc82 100644 --- a/src/common/container.c +++ b/src/common/container.c @@ -243,8 +243,8 @@ smartlist_strings_eq(const smartlist_t *sl1, const smartlist_t *sl2) return 1; } -/** Return true iff the two lists contain the same ints in the same order, - * or if they are both NULL. */ +/** Return true iff the two lists contain the same int pointer values in + * the same order, or if they are both NULL. */ int smartlist_ints_eq(const smartlist_t *sl1, const smartlist_t *sl2) { diff --git a/src/or/config.c b/src/or/config.c index 5809937..d85ba4c 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -2315,8 +2315,9 @@ compute_publishserverdescriptor(or_options_t *options) * */ #define RECOMMENDED_MIN_CIRCUIT_BUILD_TIMEOUT (10) -/** Return 0 if every setting in options is reasonable, and a - * permissible transition from old_options. Else return -1. +/** Return 0 if every setting in options is reasonable, does not + * differ from default_options unless in testing Tor networks, and + * is a permissible transition from old_options. Else return -1. * Should have no side effects, except for normalizing the contents of * options. * @@ -3211,33 +3212,43 @@ options_validate(or_options_t *old_options, or_options_t *options, "ignore you."); } - if (default_options->TestingV3AuthInitialVotingInterval != - options->TestingV3AuthInitialVotingInterval && - !options->TestingTorNetwork && !options->UsingTestNetworkDefaults_) { -REJECT("TestingV3AuthInitialVotingInterval may only be changed in testing " - "Tor networks!"); - } else if (options->TestingV3AuthInitialVotingInterval < MIN_VOTE_INTERVAL) { +#define CHECK_DEFAULT(arg) \ + STMT_BEGIN if (default_options->arg != options->arg && \ + !options->TestingTorNetwork && \ + !options->UsingTestNetworkDefaults_) { \ +REJECT("Testing* options may only be changed in testing Tor " \ + "networks!"); \ + } STMT_END + CHECK_DEFAULT(TestingV3AuthInitialVotingInterval); + CHECK_DEFAULT(TestingV3AuthInitialVoteDelay); + CHECK_DEFAULT(TestingV3AuthInitialDistDelay); + CHECK_DEFAULT(TestingAuthDirTimeToLearnReachability); + CHECK_DEFAULT(TestingEstimatedDescriptorPropagationTime); + CHECK_DEFAULT(TestingServerDownloadSchedule); + CHECK_DEFAULT(TestingClientDownloadSchedule); + CHECK_DEFAULT(TestingServerConsensusDownloadSchedule); + CHECK_DEFAULT(TestingClientConsensusDownloadSchedule); + CHECK_DEFAULT(TestingBridgeDownloadSchedule); + CHECK_DEFAULT(TestingClientMaxIntervalWithoutRequest); + CHECK_DEFAULT(TestingDirConnectionMaxStall); + CHECK_DEFAULT(TestingConsensusMaxDownloadTries); + CHECK_DEFAULT(TestingDescriptorMaxDownloadTries); + CHECK_DEFAULT(TestingMicrodescMaxDownloadTries); + CHECK_DEFAULT(TestingCertMaxDownloadTries); +#undef CHECK_DEFAULT + + if (options->TestingV3AuthInitialVotingInterval < MIN_VOTE_INTERVAL) { REJECT("TestingV3AuthInitialVotingInterval is insanely low."); } else if (((30*60) % options->TestingV3AuthInitialVotingInterval) != 0) { REJECT("TestingV3AuthInitialVotingInterval does not divide evenly into " "30 minutes."); } - if (default_options->TestingV3AuthInitialVoteDelay != - options->TestingV3AuthInitialVoteDelay && - !options->TestingTorNetwork && !options->UsingTestNetworkDefaults_) { -REJECT("TestingV3AuthInitialVoteDelay may only be changed in testing " - "Tor networks!"); - } else if (options->TestingV3AuthInitialVoteDelay < MIN_VOTE_SECONDS) { + if (options->TestingV3AuthInitialVoteDelay < MIN_VOTE_SECONDS) { REJECT("TestingV3AuthInitialVoteDelay is way too low."); } - if (default_options->TestingV3AuthInitialDistDelay != - options->TestingV3AuthInitialDistDelay && - !options->TestingTorNetwork && !options->UsingTestNetworkDefaults_) { -REJECT("TestingV3AuthInitialDistDelay may only be changed in testing " - "Tor networks!"); - } else if (options->TestingV3AuthInitialDistDelay < MIN_DIST_SECONDS) { + if (options->TestingV3AuthInitialDistDelay < MIN_DIST_SECONDS) { REJECT("TestingV3AuthInitialDistDelay is way too low."); } @@ -3248,124 +3259,49 @@ options_validate(or_options_t *old_options, or_options_t *options, "must be less than half TestingV3AuthInitialVotingInterval"); } - if (default_options->TestingAuthDirTimeToLearnReachability != - options->TestingAuthDirTimeToLearnReachability && - !options->Testing
[tor-commits] [translation/gettor] Update translations for gettor
commit ae03d86b6b47116366d9e38da39b2c1bb9ad0ab6 Author: Translation commit bot Date: Tue May 28 14:15:07 2013 + Update translations for gettor --- pt_BR/gettor.po |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pt_BR/gettor.po b/pt_BR/gettor.po index 64b4363..0e0f6e8 100644 --- a/pt_BR/gettor.po +++ b/pt_BR/gettor.po @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"; "POT-Creation-Date: 2013-01-19 13:40+0100\n" -"PO-Revision-Date: 2013-05-28 13:40+\n" +"PO-Revision-Date: 2013-05-28 13:50+\n" "Last-Translator: Communia \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/torproject/language/pt_BR/)\n" "MIME-Version: 1.0\n" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/gettor_completed] Update translations for gettor_completed
commit de5fdd501046354d937ee6e8dbaf7fbd1d971dd1 Author: Translation commit bot Date: Tue May 28 14:15:12 2013 + Update translations for gettor_completed --- pt_BR/gettor.po |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pt_BR/gettor.po b/pt_BR/gettor.po index 64b4363..0e0f6e8 100644 --- a/pt_BR/gettor.po +++ b/pt_BR/gettor.po @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"; "POT-Creation-Date: 2013-01-19 13:40+0100\n" -"PO-Revision-Date: 2013-05-28 13:40+\n" +"PO-Revision-Date: 2013-05-28 13:50+\n" "Last-Translator: Communia \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/torproject/language/pt_BR/)\n" "MIME-Version: 1.0\n" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/gettor_completed] Update translations for gettor_completed
commit 1bb683580d0c41c126c71d66b6abea3d95ba18bc Author: Translation commit bot Date: Tue May 28 13:45:10 2013 + Update translations for gettor_completed --- pt_BR/gettor.po |8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pt_BR/gettor.po b/pt_BR/gettor.po index 8f989fc..64b4363 100644 --- a/pt_BR/gettor.po +++ b/pt_BR/gettor.po @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"; "POT-Creation-Date: 2013-01-19 13:40+0100\n" -"PO-Revision-Date: 2013-05-28 13:11+\n" +"PO-Revision-Date: 2013-05-28 13:40+\n" "Last-Translator: Communia \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/torproject/language/pt_BR/)\n" "MIME-Version: 1.0\n" @@ -160,7 +160,7 @@ msgstr "Enviando esta mensagem em um e-mail para GetTor, você receberá um paco msgid "" "After having received all parts, you need to re-assemble them to \n" "one package again. This is done as follows:" -msgstr "Após ter recebido todas as partes, você precisa remontá-las para um\npacote novamente. Isso é feito da seguinte forma:\n\n" +msgstr "Após ter recebido todos arquivos, você precisa reuni-los em um unico\npacote novamente. Isso é feito da seguinte forma:\n\n" #: lib/gettor/i18n.py:113 msgid "1.) Save all received attachments into one folder on your disk." @@ -191,11 +191,11 @@ msgid "" "5.) After unpacking is finished, you should find a newly created \n" "\".exe\" file in your destination folder. Simply doubleclick\n" "that and Tor Browser Bundle should start within a few seconds." -msgstr "5.) Após a descompactação terminar, você deve encontrar um arquivo\n\".exe\" recém-criado na sua pasta de destino. Dê um clique duplo e\no pacote Tor Browser deverá iniciar em poucos segundos." +msgstr "5.) Após a descompactação terminar, procure o arquivo\n\".exe\" recém-criado na sua pasta de destino. Dê um clique duplo e\no pacote Tor Browser deverá iniciar em poucos segundos." #: lib/gettor/i18n.py:130 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!" -msgstr "6.) à isso. Você terminou. Obrigado pelo uso do Tor e divirta-se!" +msgstr "6.) à isso. Você terminou. Obrigado por utilizar do Tor, e divirta-se!" #: lib/gettor/i18n.py:132 msgid "" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/gettor] Update translations for gettor
commit ce5588150b1c8e37a9c22cd8fc038ebdd0fa6939 Author: Translation commit bot Date: Tue May 28 13:45:06 2013 + Update translations for gettor --- pt_BR/gettor.po |8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pt_BR/gettor.po b/pt_BR/gettor.po index 8f989fc..64b4363 100644 --- a/pt_BR/gettor.po +++ b/pt_BR/gettor.po @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"; "POT-Creation-Date: 2013-01-19 13:40+0100\n" -"PO-Revision-Date: 2013-05-28 13:11+\n" +"PO-Revision-Date: 2013-05-28 13:40+\n" "Last-Translator: Communia \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/torproject/language/pt_BR/)\n" "MIME-Version: 1.0\n" @@ -160,7 +160,7 @@ msgstr "Enviando esta mensagem em um e-mail para GetTor, você receberá um paco msgid "" "After having received all parts, you need to re-assemble them to \n" "one package again. This is done as follows:" -msgstr "Após ter recebido todas as partes, você precisa remontá-las para um\npacote novamente. Isso é feito da seguinte forma:\n\n" +msgstr "Após ter recebido todos arquivos, você precisa reuni-los em um unico\npacote novamente. Isso é feito da seguinte forma:\n\n" #: lib/gettor/i18n.py:113 msgid "1.) Save all received attachments into one folder on your disk." @@ -191,11 +191,11 @@ msgid "" "5.) After unpacking is finished, you should find a newly created \n" "\".exe\" file in your destination folder. Simply doubleclick\n" "that and Tor Browser Bundle should start within a few seconds." -msgstr "5.) Após a descompactação terminar, você deve encontrar um arquivo\n\".exe\" recém-criado na sua pasta de destino. Dê um clique duplo e\no pacote Tor Browser deverá iniciar em poucos segundos." +msgstr "5.) Após a descompactação terminar, procure o arquivo\n\".exe\" recém-criado na sua pasta de destino. Dê um clique duplo e\no pacote Tor Browser deverá iniciar em poucos segundos." #: lib/gettor/i18n.py:130 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!" -msgstr "6.) à isso. Você terminou. Obrigado pelo uso do Tor e divirta-se!" +msgstr "6.) à isso. Você terminou. Obrigado por utilizar do Tor, e divirta-se!" #: lib/gettor/i18n.py:132 msgid "" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/gettor] Update translations for gettor
commit 8349764b66cdff92d52e148477a212f07c1fc466 Author: Translation commit bot Date: Tue May 28 13:15:07 2013 + Update translations for gettor --- pt_BR/gettor.po |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pt_BR/gettor.po b/pt_BR/gettor.po index f815992..8f989fc 100644 --- a/pt_BR/gettor.po +++ b/pt_BR/gettor.po @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"; "POT-Creation-Date: 2013-01-19 13:40+0100\n" -"PO-Revision-Date: 2013-05-28 12:40+\n" +"PO-Revision-Date: 2013-05-28 13:11+\n" "Last-Translator: Communia \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/torproject/language/pt_BR/)\n" "MIME-Version: 1.0\n" @@ -122,7 +122,7 @@ msgid "" "gettor...@torproject.org: Polish\n" "gettor...@torproject.org: Russian\n" "gettor...@torproject.org: Chinese" -msgstr "gettor...@torproject.org: Arábico\n gettor...@torproject.org: Alemão\ngettor...@torproject.org: Inglês\ngettor...@torproject.org: Espanhol\n gettor...@torproject.org: Persa (Irã)\ngettor...@torproject.org: Francês\ngettor...@torproject.org: Italiano\n gettor...@torproject.org: Holandês\ngettor...@torproject.org: Polonês\ngettor...@torproject.org: Russo\n gettor...@torproject.org: Chinês" +msgstr "gettor...@torproject.org: Ãrabe\n gettor...@torproject.org: Alemão\ngettor...@torproject.org: Inglês\ngettor...@torproject.org: Espanhol\n gettor...@torproject.org: Persa (Irã)\ngettor...@torproject.org: Francês\ngettor...@torproject.org: Italiano\n gettor...@torproject.org: Holandês\ngettor...@torproject.org: Polonês\ngettor...@torproject.org: Russo\n gettor...@torproject.org: Chinês" #: lib/gettor/i18n.py:92 msgid "If you select no language, you will receive the English version." @@ -154,7 +154,7 @@ msgstr "Simplesmente inclua a palavra 'split' em uma nova linha sozinha (esta\np msgid "" "Sending this text in an email to GetTor will cause it to send you \n" "the Tor Browser Bundle in a number of 1,4MB attachments." -msgstr "Enviando este texto em um e-mail para GetTor fará com que lhe seja\nenviado o pacote Tor Browser em uma série de anexos de 1,4 MB.\n\n" +msgstr "Enviando esta mensagem em um e-mail para GetTor, você receberá um pacote Tor Browser em uma série de anexos de 1,4 MB.\n\n" #: lib/gettor/i18n.py:110 msgid "" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/gettor_completed] Update translations for gettor_completed
commit 88e3e0f609714de16b7cae6702e2d4911672e712 Author: Translation commit bot Date: Tue May 28 13:15:11 2013 + Update translations for gettor_completed --- pt_BR/gettor.po |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pt_BR/gettor.po b/pt_BR/gettor.po index f815992..8f989fc 100644 --- a/pt_BR/gettor.po +++ b/pt_BR/gettor.po @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"; "POT-Creation-Date: 2013-01-19 13:40+0100\n" -"PO-Revision-Date: 2013-05-28 12:40+\n" +"PO-Revision-Date: 2013-05-28 13:11+\n" "Last-Translator: Communia \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/torproject/language/pt_BR/)\n" "MIME-Version: 1.0\n" @@ -122,7 +122,7 @@ msgid "" "gettor...@torproject.org: Polish\n" "gettor...@torproject.org: Russian\n" "gettor...@torproject.org: Chinese" -msgstr "gettor...@torproject.org: Arábico\n gettor...@torproject.org: Alemão\ngettor...@torproject.org: Inglês\ngettor...@torproject.org: Espanhol\n gettor...@torproject.org: Persa (Irã)\ngettor...@torproject.org: Francês\ngettor...@torproject.org: Italiano\n gettor...@torproject.org: Holandês\ngettor...@torproject.org: Polonês\ngettor...@torproject.org: Russo\n gettor...@torproject.org: Chinês" +msgstr "gettor...@torproject.org: Ãrabe\n gettor...@torproject.org: Alemão\ngettor...@torproject.org: Inglês\ngettor...@torproject.org: Espanhol\n gettor...@torproject.org: Persa (Irã)\ngettor...@torproject.org: Francês\ngettor...@torproject.org: Italiano\n gettor...@torproject.org: Holandês\ngettor...@torproject.org: Polonês\ngettor...@torproject.org: Russo\n gettor...@torproject.org: Chinês" #: lib/gettor/i18n.py:92 msgid "If you select no language, you will receive the English version." @@ -154,7 +154,7 @@ msgstr "Simplesmente inclua a palavra 'split' em uma nova linha sozinha (esta\np msgid "" "Sending this text in an email to GetTor will cause it to send you \n" "the Tor Browser Bundle in a number of 1,4MB attachments." -msgstr "Enviando este texto em um e-mail para GetTor fará com que lhe seja\nenviado o pacote Tor Browser em uma série de anexos de 1,4 MB.\n\n" +msgstr "Enviando esta mensagem em um e-mail para GetTor, você receberá um pacote Tor Browser em uma série de anexos de 1,4 MB.\n\n" #: lib/gettor/i18n.py:110 msgid "" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/gettor] Update translations for gettor
commit 8543acab7950970f13a49f5e921805b94d553431 Author: Translation commit bot Date: Tue May 28 12:45:06 2013 + Update translations for gettor --- pt_BR/gettor.po |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pt_BR/gettor.po b/pt_BR/gettor.po index 0f46a3f..f815992 100644 --- a/pt_BR/gettor.po +++ b/pt_BR/gettor.po @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"; "POT-Creation-Date: 2013-01-19 13:40+0100\n" -"PO-Revision-Date: 2013-05-27 08:10+\n" +"PO-Revision-Date: 2013-05-28 12:40+\n" "Last-Translator: Communia \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/torproject/language/pt_BR/)\n" "MIME-Version: 1.0\n" @@ -48,7 +48,7 @@ msgid "" "(We apologize if you didn't ask for this mail. Since your email is from\n" "a service that doesn't use DKIM, we're sending a short explanation,\n" "and then we'll ignore this email address for the next day or so.)" -msgstr "(Pedimos desculpas se você não teve resposta para este e-mail. Desde\nque seu e-mail é de um serviço que não usou o DKIM, nós estamos\nenviando uma breve explicação, e depois iremos ignorar este endereço de e-mail a partir de amanhã ou logo.)" +msgstr "(Desculpamo-nos caso você não tenha pedido uma conta e-mail. Como a sua mensagem provém de um serviço que não utiliza DKIM, enviamos-lhe uma breve explicação, e em seguida iremos ignorar este endereço e-mail). " #: lib/gettor/i18n.py:43 lib/gettor/i18n.py:135 msgid "" @@ -107,7 +107,7 @@ msgstr "Lista de localidades suportadas:" #: lib/gettor/i18n.py:78 msgid "Here is a list of all available languages:" -msgstr "Aqui está uma lista de todos os idiomas disponÃveis:" +msgstr "Aqui estão listados todos os idiomas disponÃveis:" #: lib/gettor/i18n.py:80 msgid "" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/gettor_completed] Update translations for gettor_completed
commit 486b12bb33a0d96ceccb7421ac6374f64384ccad Author: Translation commit bot Date: Tue May 28 12:45:11 2013 + Update translations for gettor_completed --- pt_BR/gettor.po |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pt_BR/gettor.po b/pt_BR/gettor.po index 0f46a3f..f815992 100644 --- a/pt_BR/gettor.po +++ b/pt_BR/gettor.po @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"; "POT-Creation-Date: 2013-01-19 13:40+0100\n" -"PO-Revision-Date: 2013-05-27 08:10+\n" +"PO-Revision-Date: 2013-05-28 12:40+\n" "Last-Translator: Communia \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/torproject/language/pt_BR/)\n" "MIME-Version: 1.0\n" @@ -48,7 +48,7 @@ msgid "" "(We apologize if you didn't ask for this mail. Since your email is from\n" "a service that doesn't use DKIM, we're sending a short explanation,\n" "and then we'll ignore this email address for the next day or so.)" -msgstr "(Pedimos desculpas se você não teve resposta para este e-mail. Desde\nque seu e-mail é de um serviço que não usou o DKIM, nós estamos\nenviando uma breve explicação, e depois iremos ignorar este endereço de e-mail a partir de amanhã ou logo.)" +msgstr "(Desculpamo-nos caso você não tenha pedido uma conta e-mail. Como a sua mensagem provém de um serviço que não utiliza DKIM, enviamos-lhe uma breve explicação, e em seguida iremos ignorar este endereço e-mail). " #: lib/gettor/i18n.py:43 lib/gettor/i18n.py:135 msgid "" @@ -107,7 +107,7 @@ msgstr "Lista de localidades suportadas:" #: lib/gettor/i18n.py:78 msgid "Here is a list of all available languages:" -msgstr "Aqui está uma lista de todos os idiomas disponÃveis:" +msgstr "Aqui estão listados todos os idiomas disponÃveis:" #: lib/gettor/i18n.py:80 msgid "" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/vidalia_help_completed] Update translations for vidalia_help_completed
commit 0c2613a67aeee261aa6ac984fe6e16233a6705c5 Author: Translation commit bot Date: Tue May 28 11:15:46 2013 + Update translations for vidalia_help_completed --- uk/index.po | 48 1 file changed, 48 insertions(+) diff --git a/uk/index.po b/uk/index.po new file mode 100644 index 000..ee8bc5d --- /dev/null +++ b/uk/index.po @@ -0,0 +1,48 @@ +# +# Translators: +# jonny_nut , 2011 +# muhozhrun , 2013 +msgid "" +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:59+0200\n" +"PO-Revision-Date: 2013-05-28 10:50+\n" +"Last-Translator: muhozhrun \n" +"Language-Team: Ukrainian (http://www.transifex.com/projects/p/torproject/language/uk/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: uk\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" + +#. type: Content of: +#: en/index.html:16 +msgid "Vidalia Help" +msgstr "ÐовÑдка Vidalia" + +#. type: Content of: +#: en/index.html:20 +msgid "" +"Select a help topic from the tree on the left or click on the Search button " +"above the list of topics to search through all available help topics." +msgstr "ÐибеÑÑÑÑ ÑоздÑл допомоги з деÑева лÑвоÑÑÑ Ð°Ð±Ð¾ наÑиÑнÑÑÑ ÐºÐ½Ð¾Ð¿ÐºÑ \"ÐоÑÑк\", Ñка Ð·Ð½Ð°Ñ Ð¾Ð´Ð¸ÑÑÑÑ Ð½Ð°Ð´ ÑпиÑком ÑоздÑлÑв, Ð´Ð»Ñ Ð¿Ð¾ÑÑÐºÑ Ñ Ð²ÑÑÑ Ð´Ð¾ÑÑÑÐ¿Ð½Ð¸Ñ ÑоздÑÐ»Ð°Ñ Ð²ÑдÑазÑ. \"" + +#. type: Content of: +#: en/index.html:25 +msgid "" +"You can use the Find button on the toolbar above to search within a " +"particular help topic." +msgstr "Ðи можеÑе ÑкоÑиÑÑаÑиÑÑ ÐºÐ½Ð¾Ð¿ÐºÐ¾Ñ ÐнайÑи, Ñо Ð·Ð½Ð°Ñ Ð¾Ð´Ð¸ÑÑÑÑ Ð²Ð³Ð¾ÑÑ Ð½Ð° Ð¿Ð°Ð½ÐµÐ»Ñ ÑнÑÑÑÑменÑÑв, Ñоб знайÑи ÑекÑÑ Ñ ÐºÐ¾Ð½ÐºÑеÑÐ½Ð¾Ð¼Ñ ÑоздÑлÑ." + +#. type: Content of: +#: en/index.html:30 +msgid "The Home button above will bring you back to this home page." +msgstr "Ðнопка ÐÐ¾Ð´Ð¾Ð¼Ñ Ð¿Ð¾Ð²ÐµÑне Ð²Ð°Ñ Ð½Ð° ÑÑ Ð´Ð¾Ð¼Ð°ÑÐ½Ñ ÑÑоÑÑнкÑ." + +#. type: Content of: +#: en/index.html:34 +msgid "" +"See the Helpful Links topic for some places you " +"can visit to find additional help and information about Vidalia and Tor." +msgstr "У ÑоздÑÐ»Ñ ÐоÑиÑÐ½Ñ Ð¿Ð¾ÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð·Ð½Ð°Ñ Ð¾Ð´ÑÑÑÑÑ Ð´ÐµÑÐºÑ Ð¼ÑÑÑÑ, вÑдвÑдавÑи ÑкÑ, можна знайÑи додаÑÐºÐ¾Ð²Ñ Ð´Ð¾Ð¿Ð¾Ð¼ÑÐ¶Ð½Ñ ÑнÑоÑмаÑÑÑ Ð¿Ñо Vidalia Ñ Tor." ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/vidalia_help] Update translations for vidalia_help
commit cf1e4f126ac83cd2b6a19ab154c06978595a380a Author: Translation commit bot Date: Tue May 28 11:15:35 2013 + Update translations for vidalia_help --- uk/index.po |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/uk/index.po b/uk/index.po index 611..ee8bc5d 100644 --- a/uk/index.po +++ b/uk/index.po @@ -7,7 +7,7 @@ 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:59+0200\n" -"PO-Revision-Date: 2013-05-28 10:40+\n" +"PO-Revision-Date: 2013-05-28 10:50+\n" "Last-Translator: muhozhrun \n" "Language-Team: Ukrainian (http://www.transifex.com/projects/p/torproject/language/uk/)\n" "MIME-Version: 1.0\n" @@ -45,4 +45,4 @@ msgstr "Ðнопка ÐÐ¾Ð´Ð¾Ð¼Ñ Ð¿Ð¾Ð²ÐµÑне Ð²Ð°Ñ Ð½Ð° ÑÑ Ð´Ð¾Ð¼ msgid "" "See the Helpful Links topic for some places you " "can visit to find additional help and information about Vidalia and Tor." -msgstr "" +msgstr "У ÑоздÑÐ»Ñ ÐоÑиÑÐ½Ñ Ð¿Ð¾ÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð·Ð½Ð°Ñ Ð¾Ð´ÑÑÑÑÑ Ð´ÐµÑÐºÑ Ð¼ÑÑÑÑ, вÑдвÑдавÑи ÑкÑ, можна знайÑи додаÑÐºÐ¾Ð²Ñ Ð´Ð¾Ð¿Ð¾Ð¼ÑÐ¶Ð½Ñ ÑнÑоÑмаÑÑÑ Ð¿Ñо Vidalia Ñ Tor." ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/vidalia_help] Update translations for vidalia_help
commit e078fa3ceb7f0d32d184c72be99ea5ece16097dc Author: Translation commit bot Date: Tue May 28 10:45:34 2013 + Update translations for vidalia_help --- uk/index.po | 11 ++- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/uk/index.po b/uk/index.po index f2a405e..611 100644 --- a/uk/index.po +++ b/uk/index.po @@ -1,13 +1,14 @@ # # Translators: # jonny_nut , 2011 +# muhozhrun , 2013 msgid "" 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:59+0200\n" -"PO-Revision-Date: 2013-05-22 12:42+\n" -"Last-Translator: runasand \n" +"PO-Revision-Date: 2013-05-28 10:40+\n" +"Last-Translator: muhozhrun \n" "Language-Team: Ukrainian (http://www.transifex.com/projects/p/torproject/language/uk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -25,19 +26,19 @@ msgstr "ÐовÑдка Vidalia" msgid "" "Select a help topic from the tree on the left or click on the Search button " "above the list of topics to search through all available help topics." -msgstr "ÐибеÑÑÑÑ ÑоздÑл довÑдки з деÑева злÑва або наÑиÑнÑÑÑ Ð½Ð° ÐºÐ½Ð¾Ð¿ÐºÑ ÐоÑÑк виÑе пеÑелÑк Ñем Ð´Ð»Ñ Ð¿Ð¾ÑÑÐºÑ ÑеÑез ÑÑÑ Ð´Ð¾ÑÑÑÐ¿Ð½Ñ Ñеми допомоги." +msgstr "ÐибеÑÑÑÑ ÑоздÑл допомоги з деÑева лÑвоÑÑÑ Ð°Ð±Ð¾ наÑиÑнÑÑÑ ÐºÐ½Ð¾Ð¿ÐºÑ \"ÐоÑÑк\", Ñка Ð·Ð½Ð°Ñ Ð¾Ð´Ð¸ÑÑÑÑ Ð½Ð°Ð´ ÑпиÑком ÑоздÑлÑв, Ð´Ð»Ñ Ð¿Ð¾ÑÑÐºÑ Ñ Ð²ÑÑÑ Ð´Ð¾ÑÑÑÐ¿Ð½Ð¸Ñ ÑоздÑÐ»Ð°Ñ Ð²ÑдÑазÑ. \"" #. type: Content of: #: en/index.html:25 msgid "" "You can use the Find button on the toolbar above to search within a " "particular help topic." -msgstr "" +msgstr "Ðи можеÑе ÑкоÑиÑÑаÑиÑÑ ÐºÐ½Ð¾Ð¿ÐºÐ¾Ñ ÐнайÑи, Ñо Ð·Ð½Ð°Ñ Ð¾Ð´Ð¸ÑÑÑÑ Ð²Ð³Ð¾ÑÑ Ð½Ð° Ð¿Ð°Ð½ÐµÐ»Ñ ÑнÑÑÑÑменÑÑв, Ñоб знайÑи ÑекÑÑ Ñ ÐºÐ¾Ð½ÐºÑеÑÐ½Ð¾Ð¼Ñ ÑоздÑлÑ." #. type: Content of: #: en/index.html:30 msgid "The Home button above will bring you back to this home page." -msgstr "" +msgstr "Ðнопка ÐÐ¾Ð´Ð¾Ð¼Ñ Ð¿Ð¾Ð²ÐµÑне Ð²Ð°Ñ Ð½Ð° ÑÑ Ð´Ð¾Ð¼Ð°ÑÐ½Ñ ÑÑоÑÑнкÑ." #. type: Content of: #: en/index.html:34 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits