tor-commits January 2016

tor-commits@lists.torproject.org

19 participants
1449 discussions

[translation/tails-persistence-setup_completed] Update translations for tails-persistence-setup_completed
by translation＠torproject.org 13 Jan '16

13 Jan '16

commit a2e93f8a3325ea58c994e6b4fea2a31b98d713cb Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jan 13 19:15:27 2016 +0000 Update translations for tails-persistence-setup_completed --- hu/hu.po | 53 +++++++++++++++++++++++++++-------------------------- 1 file changed, 27 insertions(+), 26 deletions(-) diff --git a/hu/hu.po b/hu/hu.po index 2e4bed3..dec9102 100644 --- a/hu/hu.po +++ b/hu/hu.po @@ -13,8 +13,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" -"POT-Creation-Date: 2015-12-14 21:35+0100\n" -"PO-Revision-Date: 2015-12-15 09:27+0000\n" +"POT-Creation-Date: 2015-12-16 17:55+0100\n" +"PO-Revision-Date: 2016-01-13 19:12+0000\n" "Last-Translator: carolyn <carolyn(a)anhalt.org>\n" "Language-Team: Hungarian (http://www.transifex.com/otf/torproject/language/hu/)\n" "MIME-Version: 1.0\n" @@ -128,71 +128,71 @@ msgid "" "Symlink into $HOME every file or directory found in the `dotfiles' directory" msgstr "Symlink a $HOME könyvtárban minden fájlra és könyvtárra található a `dotfiles' könyvtárban" -#: ../lib/Tails/Persistence/Setup.pm:227 +#: ../lib/Tails/Persistence/Setup.pm:230 msgid "Setup Tails persistent volume" msgstr "Tails persistent kötet telepítése" -#: ../lib/Tails/Persistence/Setup.pm:307 ../lib/Tails/Persistence/Setup.pm:451 +#: ../lib/Tails/Persistence/Setup.pm:311 ../lib/Tails/Persistence/Setup.pm:458 msgid "Error" msgstr "Hiba" -#: ../lib/Tails/Persistence/Setup.pm:338 +#: ../lib/Tails/Persistence/Setup.pm:343 #, perl-format msgid "Device %s already has a persistent volume." msgstr "Az eszköz %s már rendelkezik persistent kötettel." -#: ../lib/Tails/Persistence/Setup.pm:346 +#: ../lib/Tails/Persistence/Setup.pm:351 #, perl-format msgid "Device %s has not enough unallocated space." msgstr "Az eszköz %s nem rendelkezik elég lefoglalatlan szabad hellyel." -#: ../lib/Tails/Persistence/Setup.pm:354 ../lib/Tails/Persistence/Setup.pm:368 +#: ../lib/Tails/Persistence/Setup.pm:359 ../lib/Tails/Persistence/Setup.pm:373 #, perl-format msgid "Device %s has no persistent volume." msgstr "Az eszköz %s nem tartalmaz persistent kötetet." -#: ../lib/Tails/Persistence/Setup.pm:360 +#: ../lib/Tails/Persistence/Setup.pm:365 msgid "" "Cannot delete the persistent volume while in use. You should restart Tails " "without persistence." msgstr "Nem lehet a persistent kötetet törölni amíg használatban van. Lehet újra kellene indítanod a Tails-t persistence kötet nélkül." -#: ../lib/Tails/Persistence/Setup.pm:379 +#: ../lib/Tails/Persistence/Setup.pm:384 msgid "Persistence volume is not unlocked." msgstr "A persistence kötet zárolva van." -#: ../lib/Tails/Persistence/Setup.pm:384 +#: ../lib/Tails/Persistence/Setup.pm:389 msgid "Persistence volume is not mounted." msgstr "A persistence kötet nincs csatolva." -#: ../lib/Tails/Persistence/Setup.pm:389 +#: ../lib/Tails/Persistence/Setup.pm:394 msgid "Persistence volume is not readable. Permissions or ownership problems?" msgstr "A persistence kötet nem olvasható. Jogosultság vagy tulajdonos problémák?" -#: ../lib/Tails/Persistence/Setup.pm:394 +#: ../lib/Tails/Persistence/Setup.pm:399 msgid "Persistence volume is not writable. Maybe it was mounted read-only?" msgstr "A persistence kötet nem írható. Talán olvasható-ként volt csatolva?" -#: ../lib/Tails/Persistence/Setup.pm:403 +#: ../lib/Tails/Persistence/Setup.pm:408 #, perl-format msgid "Tails is running from non-USB / non-SDIO device %s." msgstr "Tails nem USB vagy SDIO eszközről %s fut." -#: ../lib/Tails/Persistence/Setup.pm:409 +#: ../lib/Tails/Persistence/Setup.pm:414 #, perl-format msgid "Device %s is optical." msgstr "Az eszköz %s optikai." -#: ../lib/Tails/Persistence/Setup.pm:416 +#: ../lib/Tails/Persistence/Setup.pm:421 #, perl-format msgid "Device %s was not created using Tails Installer." msgstr "Az eszközöd (%s) nem a Tails telepítővel volt létrehozva." -#: ../lib/Tails/Persistence/Setup.pm:676 +#: ../lib/Tails/Persistence/Setup.pm:667 msgid "Persistence wizard - Finished" msgstr "Persistence varázsló - Befejezve" -#: ../lib/Tails/Persistence/Setup.pm:679 +#: ../lib/Tails/Persistence/Setup.pm:670 msgid "" "Any changes you have made will only take effect after restarting Tails.\n" "\n" @@ -244,32 +244,33 @@ msgstr "A jelszó nem lehet üres" msgid "Passphrases do not match" msgstr "A jelszavak nem egyeznek" -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:262 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:274 #: ../lib/Tails/Persistence/Step/Configure.pm:129 +#: ../lib/Tails/Persistence/Step/Delete.pm:95 msgid "Failed" msgstr "Sikertelen" -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:271 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:283 msgid "Mounting Tails persistence partition." msgstr "Tails persistence partíció csatolása." -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:274 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:286 msgid "The Tails persistence partition will be mounted." msgstr "A Tails persistence partíció csatolva lesz." -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:283 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:295 msgid "Correcting permissions of the persistent volume." msgstr "Hozzáférési jogosultságok javítása a persistent köteten." -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:286 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:298 msgid "The permissions of the persistent volume will be corrected." msgstr "A hozzáférési jogosultságok javítva lettek a persistent köteten." -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:308 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:320 msgid "Creating..." msgstr "Létrehozás..." -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:311 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:323 msgid "Creating the persistent volume..." msgstr "Persistence kötet létrehozása..." @@ -319,10 +320,10 @@ msgstr "A persistent kötet %s (%s), itt %s %s eszközön törölve lesz. msgid "Delete" msgstr "Törlés" -#: ../lib/Tails/Persistence/Step/Delete.pm:101 +#: ../lib/Tails/Persistence/Step/Delete.pm:111 msgid "Deleting..." msgstr "Törlés..." -#: ../lib/Tails/Persistence/Step/Delete.pm:104 +#: ../lib/Tails/Persistence/Step/Delete.pm:114 msgid "Deleting the persistent volume..." msgstr "Az állandó kötet törlése..."

1 0

[translation/tails-persistence-setup] Update translations for tails-persistence-setup
by translation＠torproject.org 13 Jan '16

13 Jan '16

commit c6220381bf16d798b21d72ffdfe9b020c3586a4b Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jan 13 19:15:21 2016 +0000 Update translations for tails-persistence-setup --- hu/hu.po | 53 +++++++++++++++++++++++++++-------------------------- 1 file changed, 27 insertions(+), 26 deletions(-) diff --git a/hu/hu.po b/hu/hu.po index 2e4bed3..dec9102 100644 --- a/hu/hu.po +++ b/hu/hu.po @@ -13,8 +13,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" -"POT-Creation-Date: 2015-12-14 21:35+0100\n" -"PO-Revision-Date: 2015-12-15 09:27+0000\n" +"POT-Creation-Date: 2015-12-16 17:55+0100\n" +"PO-Revision-Date: 2016-01-13 19:12+0000\n" "Last-Translator: carolyn <carolyn(a)anhalt.org>\n" "Language-Team: Hungarian (http://www.transifex.com/otf/torproject/language/hu/)\n" "MIME-Version: 1.0\n" @@ -128,71 +128,71 @@ msgid "" "Symlink into $HOME every file or directory found in the `dotfiles' directory" msgstr "Symlink a $HOME könyvtárban minden fájlra és könyvtárra található a `dotfiles' könyvtárban" -#: ../lib/Tails/Persistence/Setup.pm:227 +#: ../lib/Tails/Persistence/Setup.pm:230 msgid "Setup Tails persistent volume" msgstr "Tails persistent kötet telepítése" -#: ../lib/Tails/Persistence/Setup.pm:307 ../lib/Tails/Persistence/Setup.pm:451 +#: ../lib/Tails/Persistence/Setup.pm:311 ../lib/Tails/Persistence/Setup.pm:458 msgid "Error" msgstr "Hiba" -#: ../lib/Tails/Persistence/Setup.pm:338 +#: ../lib/Tails/Persistence/Setup.pm:343 #, perl-format msgid "Device %s already has a persistent volume." msgstr "Az eszköz %s már rendelkezik persistent kötettel." -#: ../lib/Tails/Persistence/Setup.pm:346 +#: ../lib/Tails/Persistence/Setup.pm:351 #, perl-format msgid "Device %s has not enough unallocated space." msgstr "Az eszköz %s nem rendelkezik elég lefoglalatlan szabad hellyel." -#: ../lib/Tails/Persistence/Setup.pm:354 ../lib/Tails/Persistence/Setup.pm:368 +#: ../lib/Tails/Persistence/Setup.pm:359 ../lib/Tails/Persistence/Setup.pm:373 #, perl-format msgid "Device %s has no persistent volume." msgstr "Az eszköz %s nem tartalmaz persistent kötetet." -#: ../lib/Tails/Persistence/Setup.pm:360 +#: ../lib/Tails/Persistence/Setup.pm:365 msgid "" "Cannot delete the persistent volume while in use. You should restart Tails " "without persistence." msgstr "Nem lehet a persistent kötetet törölni amíg használatban van. Lehet újra kellene indítanod a Tails-t persistence kötet nélkül." -#: ../lib/Tails/Persistence/Setup.pm:379 +#: ../lib/Tails/Persistence/Setup.pm:384 msgid "Persistence volume is not unlocked." msgstr "A persistence kötet zárolva van." -#: ../lib/Tails/Persistence/Setup.pm:384 +#: ../lib/Tails/Persistence/Setup.pm:389 msgid "Persistence volume is not mounted." msgstr "A persistence kötet nincs csatolva." -#: ../lib/Tails/Persistence/Setup.pm:389 +#: ../lib/Tails/Persistence/Setup.pm:394 msgid "Persistence volume is not readable. Permissions or ownership problems?" msgstr "A persistence kötet nem olvasható. Jogosultság vagy tulajdonos problémák?" -#: ../lib/Tails/Persistence/Setup.pm:394 +#: ../lib/Tails/Persistence/Setup.pm:399 msgid "Persistence volume is not writable. Maybe it was mounted read-only?" msgstr "A persistence kötet nem írható. Talán olvasható-ként volt csatolva?" -#: ../lib/Tails/Persistence/Setup.pm:403 +#: ../lib/Tails/Persistence/Setup.pm:408 #, perl-format msgid "Tails is running from non-USB / non-SDIO device %s." msgstr "Tails nem USB vagy SDIO eszközről %s fut." -#: ../lib/Tails/Persistence/Setup.pm:409 +#: ../lib/Tails/Persistence/Setup.pm:414 #, perl-format msgid "Device %s is optical." msgstr "Az eszköz %s optikai." -#: ../lib/Tails/Persistence/Setup.pm:416 +#: ../lib/Tails/Persistence/Setup.pm:421 #, perl-format msgid "Device %s was not created using Tails Installer." msgstr "Az eszközöd (%s) nem a Tails telepítővel volt létrehozva." -#: ../lib/Tails/Persistence/Setup.pm:676 +#: ../lib/Tails/Persistence/Setup.pm:667 msgid "Persistence wizard - Finished" msgstr "Persistence varázsló - Befejezve" -#: ../lib/Tails/Persistence/Setup.pm:679 +#: ../lib/Tails/Persistence/Setup.pm:670 msgid "" "Any changes you have made will only take effect after restarting Tails.\n" "\n" @@ -244,32 +244,33 @@ msgstr "A jelszó nem lehet üres" msgid "Passphrases do not match" msgstr "A jelszavak nem egyeznek" -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:262 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:274 #: ../lib/Tails/Persistence/Step/Configure.pm:129 +#: ../lib/Tails/Persistence/Step/Delete.pm:95 msgid "Failed" msgstr "Sikertelen" -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:271 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:283 msgid "Mounting Tails persistence partition." msgstr "Tails persistence partíció csatolása." -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:274 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:286 msgid "The Tails persistence partition will be mounted." msgstr "A Tails persistence partíció csatolva lesz." -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:283 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:295 msgid "Correcting permissions of the persistent volume." msgstr "Hozzáférési jogosultságok javítása a persistent köteten." -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:286 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:298 msgid "The permissions of the persistent volume will be corrected." msgstr "A hozzáférési jogosultságok javítva lettek a persistent köteten." -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:308 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:320 msgid "Creating..." msgstr "Létrehozás..." -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:311 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:323 msgid "Creating the persistent volume..." msgstr "Persistence kötet létrehozása..." @@ -319,10 +320,10 @@ msgstr "A persistent kötet %s (%s), itt %s %s eszközön törölve lesz. msgid "Delete" msgstr "Törlés" -#: ../lib/Tails/Persistence/Step/Delete.pm:101 +#: ../lib/Tails/Persistence/Step/Delete.pm:111 msgid "Deleting..." msgstr "Törlés..." -#: ../lib/Tails/Persistence/Step/Delete.pm:104 +#: ../lib/Tails/Persistence/Step/Delete.pm:114 msgid "Deleting the persistent volume..." msgstr "Az állandó kötet törlése..."

1 0

[translation/tails-perl5lib] Update translations for tails-perl5lib
by translation＠torproject.org 13 Jan '16

13 Jan '16

commit 14cdd3b14e06ad8f2e245f43fb0e48496cfbd7b4 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jan 13 18:16:04 2016 +0000 Update translations for tails-perl5lib --- pt_BR.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pt_BR.po b/pt_BR.po index 7638210..eabf6aa 100644 --- a/pt_BR.po +++ b/pt_BR.po @@ -3,14 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Communia <ameaneantie(a)riseup.net>, 2016 # Maxmalinha <vitoraugusto2508(a)gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2016-01-11 15:40+0100\n" -"PO-Revision-Date: 2016-01-12 08:13+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2016-01-13 18:01+0000\n" +"Last-Translator: Communia <ameaneantie(a)riseup.net>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/otf/torproject/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,7 +21,7 @@ msgstr "" #: ../lib/Tails/RunningSystem.pm:159 msgid "Error" -msgstr "" +msgstr "Erro" #: ../lib/Tails/RunningSystem.pm:161 msgid ""

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 13 Jan '16

13 Jan '16

commit 0393865de2ee3c4f48e2dcd8867f69a3fa77d18b Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jan 13 18:15:46 2016 +0000 Update translations for tails-misc --- pt_BR.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pt_BR.po b/pt_BR.po index 9f4d994..4a797cf 100644 --- a/pt_BR.po +++ b/pt_BR.po @@ -19,8 +19,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-01-04 11:56+0100\n" -"PO-Revision-Date: 2016-01-06 09:25+0000\n" +"POT-Creation-Date: 2016-01-11 21:00+0100\n" +"PO-Revision-Date: 2016-01-13 18:01+0000\n" "Last-Translator: carolyn <carolyn(a)anhalt.org>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/otf/torproject/language/pt_BR/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tails-persistence-setup_completed] Update translations for tails-persistence-setup_completed
by translation＠torproject.org 13 Jan '16

13 Jan '16

commit df60e9652d528beea68cd8594b19d25254ebd53d Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jan 13 18:15:25 2016 +0000 Update translations for tails-persistence-setup_completed --- pt_BR/pt_BR.po | 53 +++++++++++++++++++++++++++-------------------------- 1 file changed, 27 insertions(+), 26 deletions(-) diff --git a/pt_BR/pt_BR.po b/pt_BR/pt_BR.po index 2a81585..ae82b5d 100644 --- a/pt_BR/pt_BR.po +++ b/pt_BR/pt_BR.po @@ -19,8 +19,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" -"POT-Creation-Date: 2015-12-14 21:35+0100\n" -"PO-Revision-Date: 2015-12-16 22:43+0000\n" +"POT-Creation-Date: 2015-12-16 17:55+0100\n" +"PO-Revision-Date: 2016-01-13 18:01+0000\n" "Last-Translator: Communia <ameaneantie(a)riseup.net>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/otf/torproject/language/pt_BR/)\n" "MIME-Version: 1.0\n" @@ -134,71 +134,71 @@ msgid "" "Symlink into $HOME every file or directory found in the `dotfiles' directory" msgstr "Criar um link em $HOME para todos os arquivos ou diretórios encontrados no diretório `dotfiles`" -#: ../lib/Tails/Persistence/Setup.pm:227 +#: ../lib/Tails/Persistence/Setup.pm:230 msgid "Setup Tails persistent volume" msgstr "Configurar o volume persistente do Tails" -#: ../lib/Tails/Persistence/Setup.pm:307 ../lib/Tails/Persistence/Setup.pm:451 +#: ../lib/Tails/Persistence/Setup.pm:311 ../lib/Tails/Persistence/Setup.pm:458 msgid "Error" msgstr "Erro" -#: ../lib/Tails/Persistence/Setup.pm:338 +#: ../lib/Tails/Persistence/Setup.pm:343 #, perl-format msgid "Device %s already has a persistent volume." msgstr "O dispositivo %s já possui um volume persistente." -#: ../lib/Tails/Persistence/Setup.pm:346 +#: ../lib/Tails/Persistence/Setup.pm:351 #, perl-format msgid "Device %s has not enough unallocated space." msgstr "O dispositivo %s não possui espaço livre suficiente." -#: ../lib/Tails/Persistence/Setup.pm:354 ../lib/Tails/Persistence/Setup.pm:368 +#: ../lib/Tails/Persistence/Setup.pm:359 ../lib/Tails/Persistence/Setup.pm:373 #, perl-format msgid "Device %s has no persistent volume." msgstr "O dispositivo %s não possui nenhum volume persistente." -#: ../lib/Tails/Persistence/Setup.pm:360 +#: ../lib/Tails/Persistence/Setup.pm:365 msgid "" "Cannot delete the persistent volume while in use. You should restart Tails " "without persistence." msgstr "Não é possível suprimir o volume persistente durante o seu uso. Reinicie Tails sem o volume persistente." -#: ../lib/Tails/Persistence/Setup.pm:379 +#: ../lib/Tails/Persistence/Setup.pm:384 msgid "Persistence volume is not unlocked." msgstr "O volume persistente não foi desbloqueado." -#: ../lib/Tails/Persistence/Setup.pm:384 +#: ../lib/Tails/Persistence/Setup.pm:389 msgid "Persistence volume is not mounted." msgstr "O volume persistente não foi montado." -#: ../lib/Tails/Persistence/Setup.pm:389 +#: ../lib/Tails/Persistence/Setup.pm:394 msgid "Persistence volume is not readable. Permissions or ownership problems?" msgstr "O volume persistente é ilegível. Há problemas de permissão ou de propriedade?" -#: ../lib/Tails/Persistence/Setup.pm:394 +#: ../lib/Tails/Persistence/Setup.pm:399 msgid "Persistence volume is not writable. Maybe it was mounted read-only?" msgstr "O volume persistente não é gravável. É possível que ele tenha sido montado com a opção \"somente leitura\"?" -#: ../lib/Tails/Persistence/Setup.pm:403 +#: ../lib/Tails/Persistence/Setup.pm:408 #, perl-format msgid "Tails is running from non-USB / non-SDIO device %s." msgstr "O Tails está sendo executado em um dispositivo que não é USB /SDIO %s." -#: ../lib/Tails/Persistence/Setup.pm:409 +#: ../lib/Tails/Persistence/Setup.pm:414 #, perl-format msgid "Device %s is optical." msgstr "O dispositivo %s é óptico." -#: ../lib/Tails/Persistence/Setup.pm:416 +#: ../lib/Tails/Persistence/Setup.pm:421 #, perl-format msgid "Device %s was not created using Tails Installer." msgstr "O dispositivo %s não foi criado usando o Instalador Tails." -#: ../lib/Tails/Persistence/Setup.pm:676 +#: ../lib/Tails/Persistence/Setup.pm:667 msgid "Persistence wizard - Finished" msgstr "Assistente do volume persistente - Terminou" -#: ../lib/Tails/Persistence/Setup.pm:679 +#: ../lib/Tails/Persistence/Setup.pm:670 msgid "" "Any changes you have made will only take effect after restarting Tails.\n" "\n" @@ -250,32 +250,33 @@ msgstr "As frases secretas não podem ser vazias" msgid "Passphrases do not match" msgstr "As frases secretas não correspondem" -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:262 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:274 #: ../lib/Tails/Persistence/Step/Configure.pm:129 +#: ../lib/Tails/Persistence/Step/Delete.pm:95 msgid "Failed" msgstr "Falhou" -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:271 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:283 msgid "Mounting Tails persistence partition." msgstr "Montando a partição do volume persistente do Tails." -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:274 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:286 msgid "The Tails persistence partition will be mounted." msgstr "A partição do volume persistente do Tails será montada." -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:283 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:295 msgid "Correcting permissions of the persistent volume." msgstr "Corrigindo as permissões do volume persistente." -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:286 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:298 msgid "The permissions of the persistent volume will be corrected." msgstr "As permissões do volume persistente serão corrigidas." -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:308 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:320 msgid "Creating..." msgstr "Criando..." -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:311 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:323 msgid "Creating the persistent volume..." msgstr "Criando o volume persistente..." @@ -325,10 +326,10 @@ msgstr "O volume persistente %s (%s), no dispositivo %s %s, será suprimi msgid "Delete" msgstr "Suprimir" -#: ../lib/Tails/Persistence/Step/Delete.pm:101 +#: ../lib/Tails/Persistence/Step/Delete.pm:111 msgid "Deleting..." msgstr "Suprimindo..." -#: ../lib/Tails/Persistence/Step/Delete.pm:104 +#: ../lib/Tails/Persistence/Step/Delete.pm:114 msgid "Deleting the persistent volume..." msgstr "Suprimindo o volume persistente..."

1 0

[translation/tails-persistence-setup] Update translations for tails-persistence-setup
by translation＠torproject.org 13 Jan '16

13 Jan '16

commit f5238fc953cb74cf12ae8e6330740e0177679f71 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jan 13 18:15:21 2016 +0000 Update translations for tails-persistence-setup --- pt_BR/pt_BR.po | 53 +++++++++++++++++++++++++++-------------------------- 1 file changed, 27 insertions(+), 26 deletions(-) diff --git a/pt_BR/pt_BR.po b/pt_BR/pt_BR.po index 2a81585..ae82b5d 100644 --- a/pt_BR/pt_BR.po +++ b/pt_BR/pt_BR.po @@ -19,8 +19,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" -"POT-Creation-Date: 2015-12-14 21:35+0100\n" -"PO-Revision-Date: 2015-12-16 22:43+0000\n" +"POT-Creation-Date: 2015-12-16 17:55+0100\n" +"PO-Revision-Date: 2016-01-13 18:01+0000\n" "Last-Translator: Communia <ameaneantie(a)riseup.net>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/otf/torproject/language/pt_BR/)\n" "MIME-Version: 1.0\n" @@ -134,71 +134,71 @@ msgid "" "Symlink into $HOME every file or directory found in the `dotfiles' directory" msgstr "Criar um link em $HOME para todos os arquivos ou diretórios encontrados no diretório `dotfiles`" -#: ../lib/Tails/Persistence/Setup.pm:227 +#: ../lib/Tails/Persistence/Setup.pm:230 msgid "Setup Tails persistent volume" msgstr "Configurar o volume persistente do Tails" -#: ../lib/Tails/Persistence/Setup.pm:307 ../lib/Tails/Persistence/Setup.pm:451 +#: ../lib/Tails/Persistence/Setup.pm:311 ../lib/Tails/Persistence/Setup.pm:458 msgid "Error" msgstr "Erro" -#: ../lib/Tails/Persistence/Setup.pm:338 +#: ../lib/Tails/Persistence/Setup.pm:343 #, perl-format msgid "Device %s already has a persistent volume." msgstr "O dispositivo %s já possui um volume persistente." -#: ../lib/Tails/Persistence/Setup.pm:346 +#: ../lib/Tails/Persistence/Setup.pm:351 #, perl-format msgid "Device %s has not enough unallocated space." msgstr "O dispositivo %s não possui espaço livre suficiente." -#: ../lib/Tails/Persistence/Setup.pm:354 ../lib/Tails/Persistence/Setup.pm:368 +#: ../lib/Tails/Persistence/Setup.pm:359 ../lib/Tails/Persistence/Setup.pm:373 #, perl-format msgid "Device %s has no persistent volume." msgstr "O dispositivo %s não possui nenhum volume persistente." -#: ../lib/Tails/Persistence/Setup.pm:360 +#: ../lib/Tails/Persistence/Setup.pm:365 msgid "" "Cannot delete the persistent volume while in use. You should restart Tails " "without persistence." msgstr "Não é possível suprimir o volume persistente durante o seu uso. Reinicie Tails sem o volume persistente." -#: ../lib/Tails/Persistence/Setup.pm:379 +#: ../lib/Tails/Persistence/Setup.pm:384 msgid "Persistence volume is not unlocked." msgstr "O volume persistente não foi desbloqueado." -#: ../lib/Tails/Persistence/Setup.pm:384 +#: ../lib/Tails/Persistence/Setup.pm:389 msgid "Persistence volume is not mounted." msgstr "O volume persistente não foi montado." -#: ../lib/Tails/Persistence/Setup.pm:389 +#: ../lib/Tails/Persistence/Setup.pm:394 msgid "Persistence volume is not readable. Permissions or ownership problems?" msgstr "O volume persistente é ilegível. Há problemas de permissão ou de propriedade?" -#: ../lib/Tails/Persistence/Setup.pm:394 +#: ../lib/Tails/Persistence/Setup.pm:399 msgid "Persistence volume is not writable. Maybe it was mounted read-only?" msgstr "O volume persistente não é gravável. É possível que ele tenha sido montado com a opção \"somente leitura\"?" -#: ../lib/Tails/Persistence/Setup.pm:403 +#: ../lib/Tails/Persistence/Setup.pm:408 #, perl-format msgid "Tails is running from non-USB / non-SDIO device %s." msgstr "O Tails está sendo executado em um dispositivo que não é USB /SDIO %s." -#: ../lib/Tails/Persistence/Setup.pm:409 +#: ../lib/Tails/Persistence/Setup.pm:414 #, perl-format msgid "Device %s is optical." msgstr "O dispositivo %s é óptico." -#: ../lib/Tails/Persistence/Setup.pm:416 +#: ../lib/Tails/Persistence/Setup.pm:421 #, perl-format msgid "Device %s was not created using Tails Installer." msgstr "O dispositivo %s não foi criado usando o Instalador Tails." -#: ../lib/Tails/Persistence/Setup.pm:676 +#: ../lib/Tails/Persistence/Setup.pm:667 msgid "Persistence wizard - Finished" msgstr "Assistente do volume persistente - Terminou" -#: ../lib/Tails/Persistence/Setup.pm:679 +#: ../lib/Tails/Persistence/Setup.pm:670 msgid "" "Any changes you have made will only take effect after restarting Tails.\n" "\n" @@ -250,32 +250,33 @@ msgstr "As frases secretas não podem ser vazias" msgid "Passphrases do not match" msgstr "As frases secretas não correspondem" -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:262 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:274 #: ../lib/Tails/Persistence/Step/Configure.pm:129 +#: ../lib/Tails/Persistence/Step/Delete.pm:95 msgid "Failed" msgstr "Falhou" -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:271 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:283 msgid "Mounting Tails persistence partition." msgstr "Montando a partição do volume persistente do Tails." -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:274 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:286 msgid "The Tails persistence partition will be mounted." msgstr "A partição do volume persistente do Tails será montada." -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:283 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:295 msgid "Correcting permissions of the persistent volume." msgstr "Corrigindo as permissões do volume persistente." -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:286 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:298 msgid "The permissions of the persistent volume will be corrected." msgstr "As permissões do volume persistente serão corrigidas." -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:308 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:320 msgid "Creating..." msgstr "Criando..." -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:311 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:323 msgid "Creating the persistent volume..." msgstr "Criando o volume persistente..." @@ -325,10 +326,10 @@ msgstr "O volume persistente %s (%s), no dispositivo %s %s, será suprimi msgid "Delete" msgstr "Suprimir" -#: ../lib/Tails/Persistence/Step/Delete.pm:101 +#: ../lib/Tails/Persistence/Step/Delete.pm:111 msgid "Deleting..." msgstr "Suprimindo..." -#: ../lib/Tails/Persistence/Step/Delete.pm:104 +#: ../lib/Tails/Persistence/Step/Delete.pm:114 msgid "Deleting the persistent volume..." msgstr "Suprimindo o volume persistente..."

1 0

[translation/torbutton-abouttorproperties_completed] Update translations for torbutton-abouttorproperties_completed
by translation＠torproject.org 13 Jan '16

13 Jan '16

commit 9e65a6cad894bfc2fefa2ac8fc41add2731349ba Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jan 13 16:16:11 2016 +0000 Update translations for torbutton-abouttorproperties_completed --- zh_CN/abouttor.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/zh_CN/abouttor.properties b/zh_CN/abouttor.properties index e974862..39dbd19 100644 --- a/zh_CN/abouttor.properties +++ b/zh_CN/abouttor.properties @@ -2,19 +2,19 @@ # See LICENSE for licensing information. # vim: set sw=2 sts=2 ts=8 et: -aboutTor.searchSP.privacy=使用<a href="%2$S">开始页</a><a href="%1$S">安全地</a>进行搜索。 +aboutTor.searchSP.privacy=使用<a href="%2$S">Startpage</a><a href="%1$S">安全</a>搜索。 # The following string is a link which replaces %1$S above. aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.ht… # The following string is a link which replaces %2$S above. aboutTor.searchSP.search.link=https://startpage.com/ -aboutTor.searchDDG.privacy=使用<a href="%2$S">DuckDuckGo</a><a href="%1$S">安全地</a>进行搜索。 +aboutTor.searchDDG.privacy=使用<a href="%2$S">DuckDuckGo</a><a href="%1$S">安全</a>搜索。 # The following string is a link which replaces %1$S above. aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html # The following string is a link which replaces %2$S above. aboutTor.searchDDG.search.link=https://duckduckgo.com/ -aboutTor.searchDC.privacy=使用<a href="%2$S">Disconnect.me</a><a href="%1$S">安全地</a>进行搜索。 +aboutTor.searchDC.privacy=使用<a href="%2$S">Disconnect.me</a><a href="%1$S">安全</a>搜索。 # The following string is a link which replaces %1$S above. aboutTor.searchDC.privacy.link=https://disconnect.me/privacy # The following string is a link which replaces %2$S above.

1 0

[translation/torbutton-abouttorproperties] Update translations for torbutton-abouttorproperties
by translation＠torproject.org 13 Jan '16

13 Jan '16

commit 870bbdf91dae5ef7425b0b886aa6bba42ed02efe Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jan 13 16:16:04 2016 +0000 Update translations for torbutton-abouttorproperties --- zh_CN/abouttor.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/zh_CN/abouttor.properties b/zh_CN/abouttor.properties index e974862..39dbd19 100644 --- a/zh_CN/abouttor.properties +++ b/zh_CN/abouttor.properties @@ -2,19 +2,19 @@ # See LICENSE for licensing information. # vim: set sw=2 sts=2 ts=8 et: -aboutTor.searchSP.privacy=使用<a href="%2$S">开始页</a><a href="%1$S">安全地</a>进行搜索。 +aboutTor.searchSP.privacy=使用<a href="%2$S">Startpage</a><a href="%1$S">安全</a>搜索。 # The following string is a link which replaces %1$S above. aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.ht… # The following string is a link which replaces %2$S above. aboutTor.searchSP.search.link=https://startpage.com/ -aboutTor.searchDDG.privacy=使用<a href="%2$S">DuckDuckGo</a><a href="%1$S">安全地</a>进行搜索。 +aboutTor.searchDDG.privacy=使用<a href="%2$S">DuckDuckGo</a><a href="%1$S">安全</a>搜索。 # The following string is a link which replaces %1$S above. aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html # The following string is a link which replaces %2$S above. aboutTor.searchDDG.search.link=https://duckduckgo.com/ -aboutTor.searchDC.privacy=使用<a href="%2$S">Disconnect.me</a><a href="%1$S">安全地</a>进行搜索。 +aboutTor.searchDC.privacy=使用<a href="%2$S">Disconnect.me</a><a href="%1$S">安全</a>搜索。 # The following string is a link which replaces %1$S above. aboutTor.searchDC.privacy.link=https://disconnect.me/privacy # The following string is a link which replaces %2$S above.

1 0

[orbot/master] 15.1.0-BETA-2
by n8fr8＠torproject.org 13 Jan '16

13 Jan '16

commit a0b092856146e49b9c5056fc6f6adb070d76e0ef Author: Nathan Freitas <nathan(a)freitas.net> Date: Wed Jan 13 09:46:54 2016 -0500 15.1.0-BETA-2 --- AndroidManifest.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index e4f7df8..c7a6598 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="15.1.0-BETA-1" - android:versionCode="15100011" + android:versionName="15.1.0-BETA-2" + android:versionCode="15100012" android:installLocation="auto" >

1 0

[orbot/master] fixes for settings processing and QRCode scanning of bridges
by n8fr8＠torproject.org 13 Jan '16

13 Jan '16

commit 8f7165ce5764fe873efaa35c27a2b1f3c41f33b4 Author: Nathan Freitas <nathan(a)freitas.net> Date: Tue Jan 12 23:57:37 2016 -0500 fixes for settings processing and QRCode scanning of bridges - support new JSON array form bridges.torproject.org - only enable TransProxy and DNSPort settings if the user enables transproxy --- src/org/torproject/android/OrbotMainActivity.java | 27 ++++-- .../android/service/TorResourceInstaller.java | 6 +- src/org/torproject/android/service/TorService.java | 94 ++++++-------------- .../android/service/TorServiceConstants.java | 2 +- 4 files changed, 55 insertions(+), 74 deletions(-) diff --git a/src/org/torproject/android/OrbotMainActivity.java b/src/org/torproject/android/OrbotMainActivity.java index 0b292d2..3e64e5f 100644 --- a/src/org/torproject/android/OrbotMainActivity.java +++ b/src/org/torproject/android/OrbotMainActivity.java @@ -56,6 +56,8 @@ import android.widget.ToggleButton; import com.google.zxing.integration.android.IntentIntegrator; import com.google.zxing.integration.android.IntentResult; +import org.json.JSONArray; +import org.json.JSONObject; import org.torproject.android.service.TorService; import org.torproject.android.service.TorServiceConstants; import org.torproject.android.service.TorServiceUtils; @@ -263,11 +265,11 @@ public class OrbotMainActivity extends Activity boolean useVPN = Prefs.useVpn(); mBtnVPN.setChecked(useVPN); - /** + //auto start VPN if VPN is enabled if (useVPN) { startActivity(new Intent(OrbotMainActivity.this,VPNEnableActivity.class)); - }*/ + } mBtnVPN.setOnClickListener(new View.OnClickListener () { @@ -827,16 +829,31 @@ public class OrbotMainActivity extends Activity if (results != null && results.length() > 0) { try { - results = URLDecoder.decode(results, "UTF-8"); int urlIdx = results.indexOf("://"); if (urlIdx!=-1) + { + results = URLDecoder.decode(results, "UTF-8"); results = results.substring(urlIdx+3); + setNewBridges(results); + } + else + { + JSONArray bridgeJson = new JSONArray(results); + StringBuffer bridgeLines = new StringBuffer(); + + for (int i = 0; i < bridgeJson.length(); i++) + { + String bridgeLine = bridgeJson.getString(i); + bridgeLines.append(bridgeLine).append("\n"); + } + + setNewBridges(bridgeLines.toString()); + } - setNewBridges(results); - } catch (UnsupportedEncodingException e) { + } catch (Exception e) { Log.e(TAG,"unsupported",e); } } diff --git a/src/org/torproject/android/service/TorResourceInstaller.java b/src/org/torproject/android/service/TorResourceInstaller.java index 97e691c..1fad991 100644 --- a/src/org/torproject/android/service/TorResourceInstaller.java +++ b/src/org/torproject/android/service/TorResourceInstaller.java @@ -132,6 +132,8 @@ public class TorResourceInstaller implements TorServiceConstants { shell.add(new SimpleCommand(COMMAND_RM_FORCE + outFile.getAbsolutePath())).waitForFinish(); streamToFile(is,outFile, false, true); setExecutable(outFile); + + installGeoIP(); return true; } @@ -196,14 +198,14 @@ public class TorResourceInstaller implements TorServiceConstants { * Extract the Tor binary from the APK file using ZIP */ - public boolean installGeoIP () throws IOException, FileNotFoundException + private boolean installGeoIP () throws IOException, FileNotFoundException { InputStream is; File outFile; - is = context.getResources().openRawResource(R.raw.geoip); outFile = new File(installFolder, GEOIP_ASSET_KEY); + is = context.getResources().openRawResource(R.raw.geoip); streamToFile(is, outFile, false, true); is = context.getResources().openRawResource(R.raw.geoip6); diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index a1c0bfe..ca92dbb 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -621,8 +621,8 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon fileControlPort = new File(OrbotApp.appBinHome, "control.txt"); extraLines.append(TORRC_CONTROLPORT_FILE_KEY).append(' ').append(fileControlPort.getCanonicalPath()).append('\n'); - extraLines.append("RunAsDaemon 1").append('\n'); - extraLines.append("AvoidDiskWrites 1").append('\n'); +// extraLines.append("RunAsDaemon 1").append('\n'); + // extraLines.append("AvoidDiskWrites 1").append('\n'); String socksPortPref = prefs.getString(OrbotConstants.PREF_SOCKS, String.valueOf(TorServiceConstants.SOCKS_PROXY_PORT_DEFAULT)); @@ -634,18 +634,26 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon extraLines.append("TestSocks 0").append('\n'); extraLines.append("WarnUnsafeSocks 1").append('\n'); - extraLines.append("TransPort ").append("auto").append('\n'); - extraLines.append("DNSPort ").append(TorServiceConstants.TOR_DNS_PORT_DEFAULT).append("\n"); - - if (Prefs.transparentTethering()) + if (Prefs.useTransparentProxying()) { - extraLines.append("TransListenAddress 0.0.0.0").append('\n'); - extraLines.append("DNSListenAddress 0.0.0.0").append('\n'); - } - extraLines.append("VirtualAddrNetwork 10.192.0.0/10").append('\n'); - extraLines.append("AutomapHostsOnResolve 1").append('\n'); + String transPort = prefs.getString("pref_transport", TorServiceConstants.TOR_TRANSPROXY_PORT_DEFAULT+""); + String dnsPort = prefs.getString("pref_dnsport", TorServiceConstants.TOR_DNS_PORT_DEFAULT+""); + + extraLines.append("TransPort ").append(transPort).append('\n'); + extraLines.append("DNSPort ").append(dnsPort).append("\n"); + + if (Prefs.transparentTethering()) + { + extraLines.append("TransListenAddress 0.0.0.0").append('\n'); + extraLines.append("DNSListenAddress 0.0.0.0").append('\n'); + } + extraLines.append("VirtualAddrNetwork 10.192.0.0/10").append('\n'); + extraLines.append("AutomapHostsOnResolve 1").append('\n'); + + } + extraLines.append("DisableNetwork 0").append('\n'); if (Prefs.useDebugLogging()) @@ -654,7 +662,6 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon extraLines.append("Log info syslog").append('\n'); extraLines.append("SafeLogging 0").append('\n'); - //extraLines.append("Log debug stdout").append('\n'); } processSettingsImpl(extraLines); @@ -1936,17 +1943,6 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon logNotice(getString(R.string.updating_settings_in_tor_service)); SharedPreferences prefs = TorServiceUtils.getSharedPrefs(getApplicationContext()); - - /* - String socksConfig = prefs.getString(TorConstants.PREF_SOCKS, TorServiceConstants.PORT_SOCKS_DEFAULT); - - enableSocks (socksConfig,false); - - String transPort = prefs.getString("pref_transport", TorServiceConstants.TOR_TRANSPROXY_PORT_DEFAULT+""); - String dnsPort = prefs.getString("pref_dnsport", TorServiceConstants.TOR_DNS_PORT_DEFAULT+""); - - enableTransProxyAndDNSPorts(transPort, dnsPort); - */ boolean useBridges = Prefs.bridgesEnabled(); @@ -2034,11 +2030,11 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon for (String bridgeConfigLine : bridgeListLines) { - if (bridgeConfigLine != null && bridgeConfigLine.length() > 0) + if (!TextUtils.isEmpty(bridgeConfigLine)) { extraLines.append("Bridge "); - bridgeConfigLine = bridgeConfigLine.replace('�', ' '); + //bridgeConfigLine = bridgeConfigLine.replace('�', ' '); StringTokenizer st = new StringTokenizer (bridgeConfigLine," "); while (st.hasMoreTokens()) @@ -2093,15 +2089,13 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon if (entranceNodes.length() > 0 || exitNodes.length() > 0 || excludeNodes.length() > 0) { - if (enableGeoIP ()) - { //only apply GeoIP if you need it - File fileGeoIP = new File(OrbotApp.appBinHome, GEOIP_ASSET_KEY); - File fileGeoIP6 = new File(OrbotApp.appBinHome, GEOIP6_ASSET_KEY); - - extraLines.append("GeoIPFile" + ' ' + fileGeoIP.getCanonicalPath()).append('\n'); - extraLines.append("GeoIPv6File" + ' ' + fileGeoIP6.getCanonicalPath()).append('\n'); - } - + //only apply GeoIP if you need it + File fileGeoIP = new File(OrbotApp.appBinHome, GEOIP_ASSET_KEY); + File fileGeoIP6 = new File(OrbotApp.appBinHome, GEOIP6_ASSET_KEY); + + extraLines.append("GeoIPFile" + ' ' + fileGeoIP.getCanonicalPath()).append('\n'); + extraLines.append("GeoIPv6File" + ' ' + fileGeoIP6.getCanonicalPath()).append('\n'); + } if (!TextUtils.isEmpty(entranceNodes)) @@ -2354,9 +2348,6 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon { try { - - enableGeoIP (); - File fileGeoIP = new File(OrbotApp.appBinHome, GEOIP_ASSET_KEY); File fileGeoIP6 = new File(OrbotApp.appBinHome, GEOIP6_ASSET_KEY); @@ -2369,8 +2360,6 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon conn.setConf("DisableNetwork","1"); conn.setConf("DisableNetwork","0"); - - } catch (IOException ioe) @@ -2379,34 +2368,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon } } } - - - - } - - private boolean enableGeoIP () - { - File fileGeoIP = new File(OrbotApp.appBinHome, GEOIP_ASSET_KEY); - File fileGeoIP6 = new File(OrbotApp.appBinHome, GEOIP6_ASSET_KEY); - - try - { - if ((!fileGeoIP.exists())) - { - TorResourceInstaller installer = new TorResourceInstaller(this, OrbotApp.appBinHome); - boolean success = installer.installGeoIP(); - - } - - return true; - - } - catch (Exception e) - { - showToolbarNotification (getString(R.string.error_installing_binares),ERROR_NOTIFY_ID,R.drawable.ic_stat_notifyerr); - return false; - } } } diff --git a/src/org/torproject/android/service/TorServiceConstants.java b/src/org/torproject/android/service/TorServiceConstants.java index 2e2002d..c21b227 100644 --- a/src/org/torproject/android/service/TorServiceConstants.java +++ b/src/org/torproject/android/service/TorServiceConstants.java @@ -150,7 +150,7 @@ public interface TorServiceConstants { public final static String PDNSD_ASSET_KEY = "pdnsd"; //EXIT COUNTRY CODES - public final static String[] COUNTRY_CODES = {"DE","AT","SE","CH","IS","CA","US","FR","BG","AU","BR","CZ","DK","FI","GB","HU","NL","JP","HK","RO","RU","SG","SK","CN"}; + public final static String[] COUNTRY_CODES = {"DE","AT","SE","CH","IS","CA","US","ES","FR","BG","PL","AU","BR","CZ","DK","FI","GB","HU","NL","JP","RO","RU","SG","SK"}; }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits January 2016