March 2016 - tor-commits - lists.torproject.org

[translation/tor-launcher-progress] Update translations for tor-launcher-progress
by translation＠torproject.org 05 Mar '16

05 Mar '16

commit c7a60ce74e37ba2c9d05837f4375c3860a8b92c5 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Mar 5 10:15:58 2016 +0000 Update translations for tor-launcher-progress --- hr_HR/progress.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hr_HR/progress.dtd b/hr_HR/progress.dtd index 405b87e..f3a11aa 100644 --- a/hr_HR/progress.dtd +++ b/hr_HR/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Otvori Postavke"> <!ENTITY torprogress.heading "Spajanje na Tor mrežu"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> +<!ENTITY torprogress.pleaseWait "Molimo pričekajte dok ne ustanovimo vezu s Tor mrežom.  Ovo bi moglo potrajati nekoliko minuta.">

1 0

[translation/mat-gui_completed] Update translations for mat-gui_completed
by translation＠torproject.org 05 Mar '16

05 Mar '16

commit 4a1d9fe263a00277a10243cf7da80a46e148dccf Author: Translation commit bot <translation(a)torproject.org> Date: Sat Mar 5 10:15:51 2016 +0000 Update translations for mat-gui_completed --- hr_HR.po | 109 +++++++++++++++++++++++++++++++++------------------------------ 1 file changed, 57 insertions(+), 52 deletions(-) diff --git a/hr_HR.po b/hr_HR.po index 6cee680..0b0c0e2 100644 --- a/hr_HR.po +++ b/hr_HR.po @@ -4,15 +4,16 @@ # # Translators: # Ana B, 2013 -# skiddiep <lyricaltumor(a)gmail.com>, 2015 +# Igor <lyricaltumor(a)gmail.com>, 2016 +# Igor <lyricaltumor(a)gmail.com>, 2015 # Tea Horvatic <teahorvatic(a)yahoo.co.uk>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-12-31 04:53+0100\n" -"PO-Revision-Date: 2015-08-12 12:22+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"POT-Creation-Date: 2016-02-10 23:06+0100\n" +"PO-Revision-Date: 2016-03-05 09:59+0000\n" +"Last-Translator: Igor <lyricaltumor(a)gmail.com>\n" "Language-Team: Croatian (Croatia) (http://www.transifex.com/otf/torproject/language/hr_HR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,167 +21,171 @@ msgstr "" "Language: hr_HR\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" -#: mat-gui:62 mat-gui:407 mat-gui:430 +#: mat-gui:66 mat-gui:422 mat-gui:445 msgid "Ready" msgstr "Spremno" -#: mat-gui:129 +#: mat-gui:136 msgid "Choose files" msgstr "Odaberite datoteke" -#: mat-gui:137 -msgid "All files" -msgstr "Sve datoteke" - -#: mat-gui:143 +#: mat-gui:144 msgid "Supported files" msgstr "Podržane datoteke" -#: mat-gui:160 mat-gui:353 mat-gui:402 mat-gui:426 mat-gui:428 -#: data/mat.glade:172 +#: mat-gui:151 +msgid "All files" +msgstr "Sve datoteke" + +#: mat-gui:167 mat-gui:366 mat-gui:417 mat-gui:441 mat-gui:443 +#: data/mat.glade:200 msgid "Clean" msgstr "Čisto" -#: mat-gui:161 +#: mat-gui:168 msgid "No metadata found" msgstr "Metapodaci nisu pronađeni" -#: mat-gui:163 mat-gui:404 +#: mat-gui:170 mat-gui:419 msgid "Dirty" msgstr "Prljavo" -#: mat-gui:168 +#: mat-gui:176 #, python-format msgid "%s's metadata" msgstr " metapodaci %s" -#: mat-gui:179 +#: mat-gui:187 msgid "Trash your meta, keep your data" msgstr "Odbaci meta, ostavi podatke" -#: mat-gui:184 +#: mat-gui:192 msgid "Website" msgstr "Web stranica" -#: mat-gui:210 +#: mat-gui:219 msgid "Preferences" msgstr "Preference" -#: mat-gui:223 +#: mat-gui:232 msgid "Reduce PDF quality" msgstr "Smanji PDF kvalitetu" -#: mat-gui:226 +#: mat-gui:235 msgid "Reduce the produced PDF size and quality" msgstr "Smanji PDF veličinu i kvalitetu" -#: mat-gui:229 -msgid "Add unsupported file to archives" -msgstr "Dodaj nepodržane datoteke u arhive" +#: mat-gui:238 +msgid "Remove unsupported file from archives" +msgstr "Ukloni nepodržanu datoteku iz arhive" -#: mat-gui:232 -msgid "Add non-supported (and so non-anonymised) file to output archive" -msgstr "Dodaj nepodržane (i neanonimizirane) datoteke u izlazni arhiv" +#: mat-gui:241 +msgid "Remove non-supported (and so non-anonymised) file from output archive" +msgstr "Ukloni nepodržanu (i tako neanonimnu) datoteku iz izlazne arhive" -#: mat-gui:271 +#: mat-gui:280 msgid "Unknown" msgstr "Nepoznato" -#: mat-gui:314 +#: mat-gui:325 msgid "Not-supported" msgstr "Nije podržano" -#: mat-gui:328 +#: mat-gui:339 msgid "Harmless fileformat" msgstr "Bezopasan format datoteke" -#: mat-gui:330 +#: mat-gui:341 +msgid "Cant read file" +msgstr "Nemogu pročitati datoteku" + +#: mat-gui:343 msgid "Fileformat not supported" msgstr "Format datoteke nije podržan" -#: mat-gui:333 +#: mat-gui:346 msgid "These files can not be processed:" msgstr "Ove datoteke se ne mogu obraditi:" -#: mat-gui:338 mat-gui:367 data/mat.glade:211 +#: mat-gui:351 mat-gui:380 data/mat.glade:239 msgid "Filename" msgstr "Ime datoteke" -#: mat-gui:340 +#: mat-gui:353 msgid "Reason" msgstr "Razlog" -#: mat-gui:352 +#: mat-gui:365 msgid "Non-supported files in archive" msgstr "Nepodržane datoteke u arhivi" -#: mat-gui:366 +#: mat-gui:379 msgid "Include" msgstr "Uključi" -#: mat-gui:382 +#: mat-gui:397 #, python-format msgid "MAT is not able to clean the following files, found in the %s archive" msgstr "MAT ne može očistiti sljedeće datoteke pronađene u %s arhivi" -#: mat-gui:398 +#: mat-gui:413 #, python-format msgid "Checking %s" msgstr "Provjeravam %s" -#: mat-gui:413 +#: mat-gui:428 #, python-format msgid "Cleaning %s" msgstr "Čistim %s" -#: data/mat.glade:33 +#: data/mat.glade:46 msgid "_File" msgstr "_Datoteka" -#: data/mat.glade:82 +#: data/mat.glade:95 msgid "_Edit" msgstr "_Uredi" -#: data/mat.glade:115 +#: data/mat.glade:141 msgid "_Help" msgstr "_Pomoć" -#: data/mat.glade:159 +#: data/mat.glade:187 msgid "Add" msgstr "Dodaj" -#: data/mat.glade:228 +#: data/mat.glade:256 msgid "State" msgstr "Stanje" -#: data/mat.glade:274 data/mat.glade:417 +#: data/mat.glade:294 data/mat.glade:467 msgid "Metadata" msgstr "Metapodaci" -#: data/mat.glade:306 +#: data/mat.glade:354 msgid "Name" msgstr "Ime" -#: data/mat.glade:320 +#: data/mat.glade:368 msgid "Content" msgstr "Sadržaj" -#: data/mat.glade:374 +#: data/mat.glade:398 msgid "Supported formats" msgstr "Podržani formati" -#: data/mat.glade:406 +#: data/mat.glade:456 msgid "Support" msgstr "Podrška" -#: data/mat.glade:428 +#: data/mat.glade:478 msgid "Method" msgstr "Metoda" -#: data/mat.glade:439 +#: data/mat.glade:489 msgid "Remaining" msgstr "Preostalo" -#: data/mat.glade:468 +#: data/mat.glade:518 msgid "Fileformat" msgstr "Format datoteke"

1 0

[translation/mat-gui] Update translations for mat-gui
by translation＠torproject.org 05 Mar '16

05 Mar '16

commit f1efbf318eb6720181da38d2d12bd72e74c15f26 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Mar 5 10:15:46 2016 +0000 Update translations for mat-gui --- hr_HR.po | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/hr_HR.po b/hr_HR.po index 0ed5da4..0b0c0e2 100644 --- a/hr_HR.po +++ b/hr_HR.po @@ -4,15 +4,16 @@ # # Translators: # Ana B, 2013 -# skiddiep <lyricaltumor(a)gmail.com>, 2015 +# Igor <lyricaltumor(a)gmail.com>, 2016 +# Igor <lyricaltumor(a)gmail.com>, 2015 # Tea Horvatic <teahorvatic(a)yahoo.co.uk>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-02-10 23:06+0100\n" -"PO-Revision-Date: 2016-02-11 09:31+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2016-03-05 09:59+0000\n" +"Last-Translator: Igor <lyricaltumor(a)gmail.com>\n" "Language-Team: Croatian (Croatia) (http://www.transifex.com/otf/torproject/language/hr_HR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -76,11 +77,11 @@ msgstr "Smanji PDF veličinu i kvalitetu" #: mat-gui:238 msgid "Remove unsupported file from archives" -msgstr "" +msgstr "Ukloni nepodržanu datoteku iz arhive" #: mat-gui:241 msgid "Remove non-supported (and so non-anonymised) file from output archive" -msgstr "" +msgstr "Ukloni nepodržanu (i tako neanonimnu) datoteku iz izlazne arhive" #: mat-gui:280 msgid "Unknown" @@ -96,7 +97,7 @@ msgstr "Bezopasan format datoteke" #: mat-gui:341 msgid "Cant read file" -msgstr "" +msgstr "Nemogu pročitati datoteku" #: mat-gui:343 msgid "Fileformat not supported"

1 0

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

05 Mar '16

commit 1bc3c5c75cbc1a4d8cae0375434f98746907c037 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Mar 5 10:15:34 2016 +0000 Update translations for tails-persistence-setup_completed --- hr_HR/hr_HR.po | 97 +++++++++++++++++++++++++++++----------------------------- 1 file changed, 49 insertions(+), 48 deletions(-) diff --git a/hr_HR/hr_HR.po b/hr_HR/hr_HR.po index c983b6b..3083613 100644 --- a/hr_HR/hr_HR.po +++ b/hr_HR/hr_HR.po @@ -4,14 +4,14 @@ # # Translators: # Ana B, 2013 -# skiddiep <lyricaltumor(a)gmail.com>, 2014-2015 +# Igor <lyricaltumor(a)gmail.com>, 2014-2015 # Neven Lovrić <neven(a)lovric.net>, 2014-2015 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: 2016-01-25 17:34+0100\n" +"PO-Revision-Date: 2016-03-05 09:52+0000\n" "Last-Translator: carolyn <carolyn(a)anhalt.org>\n" "Language-Team: Croatian (Croatia) (http://www.transifex.com/otf/torproject/language/hr_HR/)\n" "MIME-Version: 1.0\n" @@ -53,69 +53,69 @@ msgid "Pidgin profiles and OTR keyring" msgstr "Pidgin profili i OTR prsten ključeva" #: ../lib/Tails/Persistence/Configuration/Presets.pm:88 +msgid "Icedove" +msgstr "Icedove" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:90 +msgid "Icedove profiles and locally stored email" +msgstr "Icedove profili i lokalno pohranjen email" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:98 msgid "GNOME Keyring" msgstr "GNOME prsten ključeva" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:90 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:100 msgid "Secrets stored by GNOME Keyring" msgstr "Tajne spremljene od strane GNOME prstena ključeva" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:98 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:108 msgid "Network Connections" msgstr "Mrežne veze" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:100 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:110 msgid "Configuration of network devices and connections" msgstr "Postavke mrežnih uređaja i veza" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:108 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:118 msgid "Browser bookmarks" msgstr "Oznake preglednika" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:110 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:120 msgid "Bookmarks saved in the Tor Browser" msgstr "Oznake spremljene u Tor Pregledniku" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:118 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:128 msgid "Printers" msgstr "Pisači" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:120 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:130 msgid "Printers configuration" msgstr "Postavke pisača" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:128 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:138 msgid "Bitcoin client" msgstr "Bitcoin klijent" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:130 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:140 msgid "Electrum's bitcoin wallet and configuration" msgstr "Electrum bitcoin lisnica i postavke" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:138 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:148 msgid "APT Packages" msgstr "APT paketi" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:140 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:150 msgid "Packages downloaded by APT" msgstr "Paketi preuzeti od strane APT‑a" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:148 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:158 msgid "APT Lists" msgstr "APT popisi" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:150 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:160 msgid "Lists downloaded by APT" msgstr "Popisi preuzeti od strane APT‑a" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:158 -msgid "Icedove" -msgstr "Icedove" - -#: ../lib/Tails/Persistence/Configuration/Presets.pm:160 -msgid "Icedove profiles and locally stored email" -msgstr "Icedove profili i lokalno pohranjen email" - #: ../lib/Tails/Persistence/Configuration/Presets.pm:168 msgid "Dotfiles" msgstr "Dotfiles" @@ -125,71 +125,71 @@ msgid "" "Symlink into $HOME every file or directory found in the `dotfiles' directory" msgstr "Simbolički poveži svaku datoteku ili direktorij pronađen u 'dotfiles' direktoriju u $HOME" -#: ../lib/Tails/Persistence/Setup.pm:227 +#: ../lib/Tails/Persistence/Setup.pm:230 msgid "Setup Tails persistent volume" msgstr "Postavi Tails trajni pogon" -#: ../lib/Tails/Persistence/Setup.pm:307 ../lib/Tails/Persistence/Setup.pm:451 +#: ../lib/Tails/Persistence/Setup.pm:312 ../lib/Tails/Persistence/Setup.pm:459 msgid "Error" msgstr "Greška" -#: ../lib/Tails/Persistence/Setup.pm:338 +#: ../lib/Tails/Persistence/Setup.pm:344 #, perl-format msgid "Device %s already has a persistent volume." msgstr "Uređaj %s već ima trajni pogon." -#: ../lib/Tails/Persistence/Setup.pm:346 +#: ../lib/Tails/Persistence/Setup.pm:352 #, perl-format msgid "Device %s has not enough unallocated space." msgstr "Uređaj %s nema dovoljno nedodjeljenog prostora." -#: ../lib/Tails/Persistence/Setup.pm:354 ../lib/Tails/Persistence/Setup.pm:368 +#: ../lib/Tails/Persistence/Setup.pm:360 ../lib/Tails/Persistence/Setup.pm:374 #, perl-format msgid "Device %s has no persistent volume." msgstr "Uređaj %s nema trajni pogon." -#: ../lib/Tails/Persistence/Setup.pm:360 +#: ../lib/Tails/Persistence/Setup.pm:366 msgid "" "Cannot delete the persistent volume while in use. You should restart Tails " "without persistence." msgstr "Nije moguće izbirsati trajni pogon dok se koristi. Trebali bi ponovno pokrenuti Tails bez trajnosti." -#: ../lib/Tails/Persistence/Setup.pm:379 +#: ../lib/Tails/Persistence/Setup.pm:385 msgid "Persistence volume is not unlocked." msgstr "Trajni pogon nije otključan." -#: ../lib/Tails/Persistence/Setup.pm:384 +#: ../lib/Tails/Persistence/Setup.pm:390 msgid "Persistence volume is not mounted." msgstr "Trajni pogon nije postavljen." -#: ../lib/Tails/Persistence/Setup.pm:389 +#: ../lib/Tails/Persistence/Setup.pm:395 msgid "Persistence volume is not readable. Permissions or ownership problems?" msgstr "Trajni pogon nije čitljiv. Problemi s dozvolama ili vlasništvom?" -#: ../lib/Tails/Persistence/Setup.pm:394 +#: ../lib/Tails/Persistence/Setup.pm:400 msgid "Persistence volume is not writable. Maybe it was mounted read-only?" msgstr "Ne može se pisati po trajnom pogonu. Možda je postavljen samo za čitanje?" -#: ../lib/Tails/Persistence/Setup.pm:403 +#: ../lib/Tails/Persistence/Setup.pm:409 #, perl-format msgid "Tails is running from non-USB / non-SDIO device %s." msgstr "Tails je pokrenut s ne‑USB / ne‑SDIO uređaja %s." -#: ../lib/Tails/Persistence/Setup.pm:409 +#: ../lib/Tails/Persistence/Setup.pm:415 #, perl-format msgid "Device %s is optical." msgstr "Uređaj %s je optički." -#: ../lib/Tails/Persistence/Setup.pm:416 +#: ../lib/Tails/Persistence/Setup.pm:422 #, perl-format msgid "Device %s was not created using Tails Installer." msgstr "Uređaj %s nije stvoren Tails-ovim instalerom." -#: ../lib/Tails/Persistence/Setup.pm:676 +#: ../lib/Tails/Persistence/Setup.pm:668 msgid "Persistence wizard - Finished" msgstr "Čarobnjak trajnosti - Gotov" -#: ../lib/Tails/Persistence/Setup.pm:679 +#: ../lib/Tails/Persistence/Setup.pm:671 msgid "" "Any changes you have made will only take effect after restarting Tails.\n" "\n" @@ -241,32 +241,33 @@ msgstr "Lozinka ne može biti prazna" msgid "Passphrases do not match" msgstr "Lozinke se ne podudaraju" -#: ../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 "Neuspjelo" -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:271 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:283 msgid "Mounting Tails persistence partition." msgstr "Postavljam Tails-ovu trajnu particiju." -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:274 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:286 msgid "The Tails persistence partition will be mounted." msgstr "Tails-ova trajna particija će biti postavljena." -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:283 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:295 msgid "Correcting permissions of the persistent volume." msgstr "Ispravljam dozvole trajnog pogona." -#: ../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 "Dozvole trajnog pogona će biti ispravljene." -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:308 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:320 msgid "Creating..." msgstr "Stvaram…" -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:311 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:323 msgid "Creating the persistent volume..." msgstr "Stvaram trajni pogon…" @@ -316,10 +317,10 @@ msgstr "Trajni pogon %s (%s) na uređaju <b>%s %s</b> će biti izbrisan." msgid "Delete" msgstr "Izbriši" -#: ../lib/Tails/Persistence/Step/Delete.pm:101 +#: ../lib/Tails/Persistence/Step/Delete.pm:111 msgid "Deleting..." msgstr "Brišem…" -#: ../lib/Tails/Persistence/Step/Delete.pm:104 +#: ../lib/Tails/Persistence/Step/Delete.pm:114 msgid "Deleting the persistent volume..." msgstr "Brišem trajni pogon…"

1 0

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

05 Mar '16

commit a6f68e627a6ee03e00375245aa94a8f4849f10f5 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Mar 5 10:15:30 2016 +0000 Update translations for tails-persistence-setup --- hr_HR/hr_HR.po | 97 +++++++++++++++++++++++++++++----------------------------- 1 file changed, 49 insertions(+), 48 deletions(-) diff --git a/hr_HR/hr_HR.po b/hr_HR/hr_HR.po index c983b6b..3083613 100644 --- a/hr_HR/hr_HR.po +++ b/hr_HR/hr_HR.po @@ -4,14 +4,14 @@ # # Translators: # Ana B, 2013 -# skiddiep <lyricaltumor(a)gmail.com>, 2014-2015 +# Igor <lyricaltumor(a)gmail.com>, 2014-2015 # Neven Lovrić <neven(a)lovric.net>, 2014-2015 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: 2016-01-25 17:34+0100\n" +"PO-Revision-Date: 2016-03-05 09:52+0000\n" "Last-Translator: carolyn <carolyn(a)anhalt.org>\n" "Language-Team: Croatian (Croatia) (http://www.transifex.com/otf/torproject/language/hr_HR/)\n" "MIME-Version: 1.0\n" @@ -53,69 +53,69 @@ msgid "Pidgin profiles and OTR keyring" msgstr "Pidgin profili i OTR prsten ključeva" #: ../lib/Tails/Persistence/Configuration/Presets.pm:88 +msgid "Icedove" +msgstr "Icedove" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:90 +msgid "Icedove profiles and locally stored email" +msgstr "Icedove profili i lokalno pohranjen email" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:98 msgid "GNOME Keyring" msgstr "GNOME prsten ključeva" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:90 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:100 msgid "Secrets stored by GNOME Keyring" msgstr "Tajne spremljene od strane GNOME prstena ključeva" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:98 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:108 msgid "Network Connections" msgstr "Mrežne veze" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:100 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:110 msgid "Configuration of network devices and connections" msgstr "Postavke mrežnih uređaja i veza" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:108 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:118 msgid "Browser bookmarks" msgstr "Oznake preglednika" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:110 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:120 msgid "Bookmarks saved in the Tor Browser" msgstr "Oznake spremljene u Tor Pregledniku" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:118 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:128 msgid "Printers" msgstr "Pisači" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:120 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:130 msgid "Printers configuration" msgstr "Postavke pisača" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:128 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:138 msgid "Bitcoin client" msgstr "Bitcoin klijent" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:130 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:140 msgid "Electrum's bitcoin wallet and configuration" msgstr "Electrum bitcoin lisnica i postavke" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:138 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:148 msgid "APT Packages" msgstr "APT paketi" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:140 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:150 msgid "Packages downloaded by APT" msgstr "Paketi preuzeti od strane APT‑a" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:148 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:158 msgid "APT Lists" msgstr "APT popisi" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:150 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:160 msgid "Lists downloaded by APT" msgstr "Popisi preuzeti od strane APT‑a" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:158 -msgid "Icedove" -msgstr "Icedove" - -#: ../lib/Tails/Persistence/Configuration/Presets.pm:160 -msgid "Icedove profiles and locally stored email" -msgstr "Icedove profili i lokalno pohranjen email" - #: ../lib/Tails/Persistence/Configuration/Presets.pm:168 msgid "Dotfiles" msgstr "Dotfiles" @@ -125,71 +125,71 @@ msgid "" "Symlink into $HOME every file or directory found in the `dotfiles' directory" msgstr "Simbolički poveži svaku datoteku ili direktorij pronađen u 'dotfiles' direktoriju u $HOME" -#: ../lib/Tails/Persistence/Setup.pm:227 +#: ../lib/Tails/Persistence/Setup.pm:230 msgid "Setup Tails persistent volume" msgstr "Postavi Tails trajni pogon" -#: ../lib/Tails/Persistence/Setup.pm:307 ../lib/Tails/Persistence/Setup.pm:451 +#: ../lib/Tails/Persistence/Setup.pm:312 ../lib/Tails/Persistence/Setup.pm:459 msgid "Error" msgstr "Greška" -#: ../lib/Tails/Persistence/Setup.pm:338 +#: ../lib/Tails/Persistence/Setup.pm:344 #, perl-format msgid "Device %s already has a persistent volume." msgstr "Uređaj %s već ima trajni pogon." -#: ../lib/Tails/Persistence/Setup.pm:346 +#: ../lib/Tails/Persistence/Setup.pm:352 #, perl-format msgid "Device %s has not enough unallocated space." msgstr "Uređaj %s nema dovoljno nedodjeljenog prostora." -#: ../lib/Tails/Persistence/Setup.pm:354 ../lib/Tails/Persistence/Setup.pm:368 +#: ../lib/Tails/Persistence/Setup.pm:360 ../lib/Tails/Persistence/Setup.pm:374 #, perl-format msgid "Device %s has no persistent volume." msgstr "Uređaj %s nema trajni pogon." -#: ../lib/Tails/Persistence/Setup.pm:360 +#: ../lib/Tails/Persistence/Setup.pm:366 msgid "" "Cannot delete the persistent volume while in use. You should restart Tails " "without persistence." msgstr "Nije moguće izbirsati trajni pogon dok se koristi. Trebali bi ponovno pokrenuti Tails bez trajnosti." -#: ../lib/Tails/Persistence/Setup.pm:379 +#: ../lib/Tails/Persistence/Setup.pm:385 msgid "Persistence volume is not unlocked." msgstr "Trajni pogon nije otključan." -#: ../lib/Tails/Persistence/Setup.pm:384 +#: ../lib/Tails/Persistence/Setup.pm:390 msgid "Persistence volume is not mounted." msgstr "Trajni pogon nije postavljen." -#: ../lib/Tails/Persistence/Setup.pm:389 +#: ../lib/Tails/Persistence/Setup.pm:395 msgid "Persistence volume is not readable. Permissions or ownership problems?" msgstr "Trajni pogon nije čitljiv. Problemi s dozvolama ili vlasništvom?" -#: ../lib/Tails/Persistence/Setup.pm:394 +#: ../lib/Tails/Persistence/Setup.pm:400 msgid "Persistence volume is not writable. Maybe it was mounted read-only?" msgstr "Ne može se pisati po trajnom pogonu. Možda je postavljen samo za čitanje?" -#: ../lib/Tails/Persistence/Setup.pm:403 +#: ../lib/Tails/Persistence/Setup.pm:409 #, perl-format msgid "Tails is running from non-USB / non-SDIO device %s." msgstr "Tails je pokrenut s ne‑USB / ne‑SDIO uređaja %s." -#: ../lib/Tails/Persistence/Setup.pm:409 +#: ../lib/Tails/Persistence/Setup.pm:415 #, perl-format msgid "Device %s is optical." msgstr "Uređaj %s je optički." -#: ../lib/Tails/Persistence/Setup.pm:416 +#: ../lib/Tails/Persistence/Setup.pm:422 #, perl-format msgid "Device %s was not created using Tails Installer." msgstr "Uređaj %s nije stvoren Tails-ovim instalerom." -#: ../lib/Tails/Persistence/Setup.pm:676 +#: ../lib/Tails/Persistence/Setup.pm:668 msgid "Persistence wizard - Finished" msgstr "Čarobnjak trajnosti - Gotov" -#: ../lib/Tails/Persistence/Setup.pm:679 +#: ../lib/Tails/Persistence/Setup.pm:671 msgid "" "Any changes you have made will only take effect after restarting Tails.\n" "\n" @@ -241,32 +241,33 @@ msgstr "Lozinka ne može biti prazna" msgid "Passphrases do not match" msgstr "Lozinke se ne podudaraju" -#: ../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 "Neuspjelo" -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:271 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:283 msgid "Mounting Tails persistence partition." msgstr "Postavljam Tails-ovu trajnu particiju." -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:274 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:286 msgid "The Tails persistence partition will be mounted." msgstr "Tails-ova trajna particija će biti postavljena." -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:283 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:295 msgid "Correcting permissions of the persistent volume." msgstr "Ispravljam dozvole trajnog pogona." -#: ../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 "Dozvole trajnog pogona će biti ispravljene." -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:308 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:320 msgid "Creating..." msgstr "Stvaram…" -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:311 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:323 msgid "Creating the persistent volume..." msgstr "Stvaram trajni pogon…" @@ -316,10 +317,10 @@ msgstr "Trajni pogon %s (%s) na uređaju <b>%s %s</b> će biti izbrisan." msgid "Delete" msgstr "Izbriši" -#: ../lib/Tails/Persistence/Step/Delete.pm:101 +#: ../lib/Tails/Persistence/Step/Delete.pm:111 msgid "Deleting..." msgstr "Brišem…" -#: ../lib/Tails/Persistence/Step/Delete.pm:104 +#: ../lib/Tails/Persistence/Step/Delete.pm:114 msgid "Deleting the persistent volume..." msgstr "Brišem trajni pogon…"

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 05 Mar '16

05 Mar '16

commit 1dd8db86bb89ac5eb19ad971c1e5d2885e5c5f79 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Mar 5 10:15:23 2016 +0000 Update translations for https_everywhere_completed --- hr_HR/https-everywhere.dtd | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/hr_HR/https-everywhere.dtd b/hr_HR/https-everywhere.dtd index 11a4e07..cd77471 100644 --- a/hr_HR/https-everywhere.dtd +++ b/hr_HR/https-everywhere.dtd @@ -3,14 +3,18 @@ <!ENTITY https-everywhere.about.ext_description "Enkriptirajte web! Automatski koristite HTTPS sigurnost na mnogim stranicama."> <!ENTITY https-everywhere.about.version "Inačica"> <!ENTITY https-everywhere.about.created_by "Autori"> +<!ENTITY https-everywhere.about.and ", i"> <!ENTITY https-everywhere.about.librarians "Autori biblioteke skupova pravila"> <!ENTITY https-everywhere.about.thanks "Zahvala"> +<!ENTITY https-everywhere.about.many_contributors "Puno, puno kontributora, uključujući"> +<!ENTITY https-everywhere.about.noscript "Također, dijelovi HTTPS Everywhere su zasnovani na kodu iz NoScript-a, autora Giorgio Maone i ostalih. Zahvalni smo im za odličan rad!"> <!ENTITY https-everywhere.about.contribute "Ako Vam se sviđa HTTPS Everywhere, mogli biste razmotriti"> <!ENTITY https-everywhere.about.donate_tor "doniranje Tor-u"> <!ENTITY https-everywhere.about.tor_lang_code "en"> <!ENTITY https-everywhere.about.or "ili"> <!ENTITY https-everywhere.about.donate_eff "doniranje EFF-u"> +<!ENTITY https-everywhere.menu.donate_eff_imperative "Donirajte EFF-u"> <!ENTITY https-everywhere.menu.about "O proširenju HTTPS Everywhere"> <!ENTITY https-everywhere.menu.observatory " Podešavanje SSL Opservatorija"> <!ENTITY https-everywhere.menu.globalEnable "Omogući HTTPS Everywhere"> @@ -34,19 +38,19 @@ <!ENTITY https-everywhere.prefs.reset_default "Vrati na početno"> <!ENTITY https-everywhere.prefs.view_xml_source "Prikaži izvorni XML kod"> -<!ENTITY https-everywhere.source.downloading "Preuzimanje"> -<!ENTITY https-everywhere.source.filename "Ime datoteke"> -<!ENTITY https-everywhere.source.unable_to_download "Nije moguće preuzeti izvorni kod."> +<!ENTITY https-everywhere.chrome.stable_rules "Pravila stabilnosti"> +<!ENTITY https-everywhere.chrome.stable_rules_description "Prisili enkriptirane veze ovim stranicama:"> +<!ENTITY https-everywhere.chrome.experimental_rules "Eksperimentalna pravila"> +<!ENTITY https-everywhere.chrome.experimental_rules_description "Može prouzročiti upozorenja i kvarove. Onemogućeno pod zadano."> +<!ENTITY https-everywhere.chrome.add_rule "Dodaj pravilo za ovu stranicu"> +<!ENTITY https-everywhere.chrome.add_new_rule "Dodaj novo pravilo za ovu stranicu"> +<!ENTITY https-everywhere.chrome.always_https_for_host "Uvjek koristi https za ovog domaćina"> +<!ENTITY https-everywhere.chrome.host "Domaćin:"> +<!ENTITY https-everywhere.chrome.show_advanced "Pokaži napredno"> +<!ENTITY https-everywhere.chrome.hide_advanced "Sakrij napredno"> +<!ENTITY https-everywhere.chrome.rule_name "Ime pravila"> +<!ENTITY https-everywhere.chrome.regex "Uspoređujem regex"> +<!ENTITY https-everywhere.chrome.redirect_to "Preumsjeri na"> +<!ENTITY https-everywhere.chrome.status_cancel_button "Otkaži"> -<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 obavijest"> -<!ENTITY https-everywhere.popup.paragraph1 "Ups. Koristili ste stabilnu verziju HTTPS Everywhere, ali smo Vas možda slučajno prebacili na razvojnu verziju u našoj zadnjoj distribuciji."> -<!ENTITY https-everywhere.popup.paragraph2 "Želite li se vratiti na stabilno?"> -<!ENTITY https-everywhere.popup.paragraph3 "Bilo bi nam drago kad biste nastavili koristiti razvojnu verziju i pomogli učiniti HTTPS Everywhere boljim! Možete -naići na nekoliko bugova tu i tamo, koje možete prijaviti na https-everywhere(a)eff.org. Oprostite na -neugodnosti, i hvala Vam što koristite HTTPS Everywhere."> -<!ENTITY https-everywhere.popup.keep "Ostani na razvojnoj verziji"> -<!ENTITY https-everywhere.popup.revert "Preuzmi posljednju stabilnu verziju"> -<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere testovi setova pravila"> -<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Otkaži"> -<!ENTITY https-everywhere.ruleset-tests.status_start_button "Početak">

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 05 Mar '16

05 Mar '16

commit f2f11d24d349a270dc0b46f6d90aa7e9c0116e25 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Mar 5 10:15:17 2016 +0000 Update translations for https_everywhere --- hr_HR/https-everywhere.dtd | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/hr_HR/https-everywhere.dtd b/hr_HR/https-everywhere.dtd index 7d00f68..cd77471 100644 --- a/hr_HR/https-everywhere.dtd +++ b/hr_HR/https-everywhere.dtd @@ -3,18 +3,18 @@ <!ENTITY https-everywhere.about.ext_description "Enkriptirajte web! Automatski koristite HTTPS sigurnost na mnogim stranicama."> <!ENTITY https-everywhere.about.version "Inačica"> <!ENTITY https-everywhere.about.created_by "Autori"> -<!ENTITY https-everywhere.about.and ", and"> +<!ENTITY https-everywhere.about.and ", i"> <!ENTITY https-everywhere.about.librarians "Autori biblioteke skupova pravila"> <!ENTITY https-everywhere.about.thanks "Zahvala"> -<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including"> -<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others. We are grateful for their excellent work!"> +<!ENTITY https-everywhere.about.many_contributors "Puno, puno kontributora, uključujući"> +<!ENTITY https-everywhere.about.noscript "Također, dijelovi HTTPS Everywhere su zasnovani na kodu iz NoScript-a, autora Giorgio Maone i ostalih. Zahvalni smo im za odličan rad!"> <!ENTITY https-everywhere.about.contribute "Ako Vam se sviđa HTTPS Everywhere, mogli biste razmotriti"> <!ENTITY https-everywhere.about.donate_tor "doniranje Tor-u"> <!ENTITY https-everywhere.about.tor_lang_code "en"> <!ENTITY https-everywhere.about.or "ili"> <!ENTITY https-everywhere.about.donate_eff "doniranje EFF-u"> -<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF"> +<!ENTITY https-everywhere.menu.donate_eff_imperative "Donirajte EFF-u"> <!ENTITY https-everywhere.menu.about "O proširenju HTTPS Everywhere"> <!ENTITY https-everywhere.menu.observatory " Podešavanje SSL Opservatorija"> <!ENTITY https-everywhere.menu.globalEnable "Omogući HTTPS Everywhere"> @@ -38,19 +38,19 @@ <!ENTITY https-everywhere.prefs.reset_default "Vrati na početno"> <!ENTITY https-everywhere.prefs.view_xml_source "Prikaži izvorni XML kod"> -<!ENTITY https-everywhere.chrome.stable_rules "Stable rules"> -<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:"> -<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules"> -<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default."> -<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site"> -<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site"> -<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host"> -<!ENTITY https-everywhere.chrome.host "Host:"> -<!ENTITY https-everywhere.chrome.show_advanced "Show advanced"> -<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced"> -<!ENTITY https-everywhere.chrome.rule_name "Rule name"> -<!ENTITY https-everywhere.chrome.regex "Matching regex"> -<!ENTITY https-everywhere.chrome.redirect_to "Redirect to"> -<!ENTITY https-everywhere.chrome.status_cancel_button "Cancel"> +<!ENTITY https-everywhere.chrome.stable_rules "Pravila stabilnosti"> +<!ENTITY https-everywhere.chrome.stable_rules_description "Prisili enkriptirane veze ovim stranicama:"> +<!ENTITY https-everywhere.chrome.experimental_rules "Eksperimentalna pravila"> +<!ENTITY https-everywhere.chrome.experimental_rules_description "Može prouzročiti upozorenja i kvarove. Onemogućeno pod zadano."> +<!ENTITY https-everywhere.chrome.add_rule "Dodaj pravilo za ovu stranicu"> +<!ENTITY https-everywhere.chrome.add_new_rule "Dodaj novo pravilo za ovu stranicu"> +<!ENTITY https-everywhere.chrome.always_https_for_host "Uvjek koristi https za ovog domaćina"> +<!ENTITY https-everywhere.chrome.host "Domaćin:"> +<!ENTITY https-everywhere.chrome.show_advanced "Pokaži napredno"> +<!ENTITY https-everywhere.chrome.hide_advanced "Sakrij napredno"> +<!ENTITY https-everywhere.chrome.rule_name "Ime pravila"> +<!ENTITY https-everywhere.chrome.regex "Uspoređujem regex"> +<!ENTITY https-everywhere.chrome.redirect_to "Preumsjeri na"> +<!ENTITY https-everywhere.chrome.status_cancel_button "Otkaži">

1 0

[translation/tor-launcher-network-settings_completed] Update translations for tor-launcher-network-settings_completed
by translation＠torproject.org 05 Mar '16

05 Mar '16

commit cc10b63f0818f017d7e7b7fa4100895084337714 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Mar 5 08:45:46 2016 +0000 Update translations for tor-launcher-network-settings_completed --- hu/network-settings.dtd | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/hu/network-settings.dtd b/hu/network-settings.dtd index afdfafc..68d90eb 100644 --- a/hu/network-settings.dtd +++ b/hu/network-settings.dtd @@ -13,26 +13,32 @@ <!ENTITY torSettings.firstQuestion "A következők közül melyik illik jobban a szituációhoz?"> <!ENTITY torSettings.configurePrompt1 "Ennek a számítógépnek a forgalma cenzorált vagy proxizott."> -<!ENTITY torSettings.configurePrompt2 "Szükségem van híd vagy helyi proxy beállítására."> +<!ENTITY torSettings.configurePrompt2 "A Tor  hálózathoz való csatlakozás előtt be kell állítanom a hálózati hidat vagy a helyi proxyt."> <!ENTITY torSettings.configure "Beállít"> -<!ENTITY torSettings.connectPrompt2 "Szeretnék közvetlenül kapcsolódni a Tor hálózathoz."> +<!ENTITY torSettings.connectPrompt2 "Közvetlen kapcsolatot szeretnék létesíteni a Tor hálózattal."> <!ENTITY torSettings.connectPrompt3 "A legtöbb esetben ez működni fog."> <!ENTITY torSettings.connect "Csatlakozás"> <!ENTITY torSettings.proxyPageTitle "Helyi proxybeállítások"> <!ENTITY torSettings.proxyQuestion "Ez a számítgép helyi proxyn keresztül éri el az Internetet? ">  -<!ENTITY torSettings.proxyHelp "Ha nem biztos ennek a kérdésnek a megválaszolásában, kattintson az Internet beállításokra a másik böngészőjében, és tekintse meg, hog van-e benne beállítva helyiproxy."> +<!ENTITY torSettings.proxyExplanation1 "A helyi proxy a legtöbb esetben nem kell, de vállalati, iskolai vagy egyetemi hálózat esetén elfordulhat, hogy szükséges beállítani."> +<!ENTITY torSettings.proxyExplanation2 "Ha nem vagy biztos benne, hogyan válaszolj erre a kérdésre, akkor nézd meg egy másik böngésző vagy a rendszer hálózati beállításait, hogy szükséges-e proxyt beállítani."> <!ENTITY torSettings.enterProxy "Adja meg a proxy beállításokat."> <!ENTITY torSettings.bridgePageTitle "Tor hidak konfigurálása"> <!ENTITY torSettings.bridgeQuestion "Az internet szolgáltatód (ISP) blokkolja vagy cenzúrázza a kapcsolatot a Tor hálózathoz?"> -<!ENTITY torSettings.bridgeHelp "Ha nem vagy biztos a válaszban, válaszd a Nem-et.  Ha az Igen-t választod neked kell konfigurálni a Tor bridges amik nem listázott átjátszók és nehezebbé teszik a Tor hálózat kapcsolódásának a blokkolását."> +<!ENTITY torSettings.bridgeExplanation1 "Ha nem vagy biztos benne, hogyan válaszolj erre a kérdésre, válaszd a Nem lehetőséget (ha hálózati híd nélkül nem tudsz kapcsolódni a Tor hálózathoz, akkor később is hozzáadhatsz egyet)."> +<!ENTITY torSettings.bridgeExplanation2 " Ha az Igen-t választod neked kell konfigurálni a Tor Hidak-et, maleyek nem listázott csomópontok, így lehetővé nehezebbé teszik a Tor hálózathoz kapcsolódás blokkolását."> <!ENTITY torSettings.bridgeSettingsPrompt "Használhatod a szolgáltatott bridge címeket vagy beszerezhetsz egyedi bridge címeket.">  <!ENTITY torsettings.startingTor "Várakozás a Tor indulására..."> <!ENTITY torsettings.restartTor "Tor újraindítása"> +<!ENTITY torsettings.reconfigTor "Újrakonfigurál"> + +<!ENTITY torsettings.discardSettings.prompt "Beállított Tor Hidakat, vagy megadott egy helyi proxy-t.  A közvetlen kapcsolódáshoz ezeket a beállításokat el kell távolítania."> +<!ENTITY torsettings.discardSettings.proceed "Beállítások eltávolítása és Csatlakozás"> <!ENTITY torsettings.optional "Opcionális"> @@ -50,6 +56,7 @@ <!ENTITY torsettings.firewall.allowedPorts "Engedélyezett portok:"> <!ENTITY torsettings.useBridges.checkbox "Az internet szolgáltatóm (ISP) blokkolja a Tor hálózathoz való csatlakozásokat"> <!ENTITY torsettings.useBridges.default "Csatlakozás a szolgáltatott bridge címekkel."> +<!ENTITY torsettings.useBridges.note "Minden híd más megoldást használ a cenzorálás elkerülésére.  Ha egyik nem működik, próbálkozzon újra egy másikkal."> <!ENTITY torsettings.useBridges.type "Átvitel típusa:"> <!ENTITY torsettings.useBridges.custom "Addj meg egyedi bridge címeket"> <!ENTITY torsettings.useBridges.label "Addj meg egy vagy több bridge relay címet (soronként egy)">

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 05 Mar '16

05 Mar '16

commit 01caf7cdf0423a7f92e1e4b6bc85290a3e7ad426 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Mar 5 08:45:41 2016 +0000 Update translations for tor-launcher-network-settings --- hu/network-settings.dtd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hu/network-settings.dtd b/hu/network-settings.dtd index 5d1c3a9..68d90eb 100644 --- a/hu/network-settings.dtd +++ b/hu/network-settings.dtd @@ -28,7 +28,7 @@ <!ENTITY torSettings.bridgePageTitle "Tor hidak konfigurálása"> <!ENTITY torSettings.bridgeQuestion "Az internet szolgáltatód (ISP) blokkolja vagy cenzúrázza a kapcsolatot a Tor hálózathoz?"> <!ENTITY torSettings.bridgeExplanation1 "Ha nem vagy biztos benne, hogyan válaszolj erre a kérdésre, válaszd a Nem lehetőséget (ha hálózati híd nélkül nem tudsz kapcsolódni a Tor hálózathoz, akkor később is hozzáadhatsz egyet)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> +<!ENTITY torSettings.bridgeExplanation2 " Ha az Igen-t választod neked kell konfigurálni a Tor Hidak-et, maleyek nem listázott csomópontok, így lehetővé nehezebbé teszik a Tor hálózathoz kapcsolódás blokkolását."> <!ENTITY torSettings.bridgeSettingsPrompt "Használhatod a szolgáltatott bridge címeket vagy beszerezhetsz egyedi bridge címeket.">  @@ -37,7 +37,7 @@ <!ENTITY torsettings.restartTor "Tor újraindítása"> <!ENTITY torsettings.reconfigTor "Újrakonfigurál"> -<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed."> +<!ENTITY torsettings.discardSettings.prompt "Beállított Tor Hidakat, vagy megadott egy helyi proxy-t.  A közvetlen kapcsolódáshoz ezeket a beállításokat el kell távolítania."> <!ENTITY torsettings.discardSettings.proceed "Beállítások eltávolítása és Csatlakozás"> <!ENTITY torsettings.optional "Opcionális"> @@ -56,7 +56,7 @@ <!ENTITY torsettings.firewall.allowedPorts "Engedélyezett portok:"> <!ENTITY torsettings.useBridges.checkbox "Az internet szolgáltatóm (ISP) blokkolja a Tor hálózathoz való csatlakozásokat"> <!ENTITY torsettings.useBridges.default "Csatlakozás a szolgáltatott bridge címekkel."> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> +<!ENTITY torsettings.useBridges.note "Minden híd más megoldást használ a cenzorálás elkerülésére.  Ha egyik nem működik, próbálkozzon újra egy másikkal."> <!ENTITY torsettings.useBridges.type "Átvitel típusa:"> <!ENTITY torsettings.useBridges.custom "Addj meg egyedi bridge címeket"> <!ENTITY torsettings.useBridges.label "Addj meg egy vagy több bridge relay címet (soronként egy)">

1 0

[tordnsel/master] -funbox-strict-fields
by arlo＠torproject.org 04 Mar '16

04 Mar '16

commit bb1f4552d73638e59579dc14be3c881162303a57 Author: David Kaloper <david(a)numm.org> Date: Wed Sep 4 05:37:53 2013 +0200 -funbox-strict-fields --- src/TorDNSEL/DNS/Internals.hs | 94 +++++++++++++------------- src/TorDNSEL/DNS/Server/Internals.hs | 6 +- src/TorDNSEL/Directory/Internals.hs | 24 +++---- src/TorDNSEL/Document.hs | 10 +-- src/TorDNSEL/NetworkState/Storage/Internals.hs | 8 +-- src/TorDNSEL/NetworkState/Types.hs | 16 ++--- src/TorDNSEL/Socks/Internals.hs | 14 ++-- src/TorDNSEL/Statistics/Internals.hs | 2 +- src/TorDNSEL/TorControl/Internals.hs | 20 +++--- tordnsel.cabal | 2 +- 10 files changed, 98 insertions(+), 98 deletions(-) diff --git a/src/TorDNSEL/DNS/Internals.hs b/src/TorDNSEL/DNS/Internals.hs index b80b170..0eed2be 100644 --- a/src/TorDNSEL/DNS/Internals.hs +++ b/src/TorDNSEL/DNS/Internals.hs @@ -178,8 +178,8 @@ unsafeDecodeMessage pkt = runGet (getPacket pkt) (L.fromChunks [unPacket pkt]) -- | A value representing the current name compression targets and current -- offset (in bytes) into the datagram we're serializing. data PutState = PutState - { psTargets :: {-# UNPACK #-} !TargetMap - , psCurOff :: {-# UNPACK #-} !Offset } + { psTargets :: !TargetMap + , psCurOff :: !Offset } -- | The initial state before we start writing a datagram. initialPutState :: PutState @@ -213,7 +213,7 @@ type Offset = Int -- | A tree of labels used as compression targets. The top level represents -- top-level domain names, the second level second-level and so on. Making this -- a newtype triggers a bug in GHC 6.6. -data TargetMap = TargetMap {-# UNPACK #-} !(Map Label (Offset, TargetMap)) +data TargetMap = TargetMap !(Map Label (Offset, TargetMap)) deriving Show -- | The empty target map. @@ -265,33 +265,33 @@ compressNameStatefully name = do -- | A DNS message containing the header, question, and possibly answers. data Message = Message { -- | A message identifier set by the originator. - msgID :: {-# UNPACK #-} !Word16, + msgID :: !Word16, -- | Is this message a response? - msgQR :: {-# UNPACK #-} !Bool, + msgQR :: !Bool, -- | The kind of query in this message. - msgOpCode :: {-# UNPACK #-} !OpCode, + msgOpCode :: !OpCode, -- | Is the name server an authority for this domain name? - msgAA :: {-# UNPACK #-} !Bool, + msgAA :: !Bool, -- | Is this a truncated response? - msgTC :: {-# UNPACK #-} !Bool, + msgTC :: !Bool, -- | Does the originator desire the query to be pursued recursively? - msgRD :: {-# UNPACK #-} !Bool, + msgRD :: !Bool, -- | Does the name server support recursive queries? - msgRA :: {-# UNPACK #-} !Bool, + msgRA :: !Bool, -- | Has the data in this response been verified by the name server? - msgAD :: {-# UNPACK #-} !Bool, + msgAD :: !Bool, -- | Is non-verified data acceptable to the resolver sending this query? - msgCD :: {-# UNPACK #-} !Bool, + msgCD :: !Bool, -- | Response code set by the name server. - msgRCode :: {-# UNPACK #-} !RCode, + msgRCode :: !RCode, -- | The first question set by the originator. - msgQuestion :: {-# UNPACK #-} !Question, + msgQuestion :: !Question, -- | Answers to the question set by the name server. - msgAnswers :: {-# UNPACK #-} ![ResourceRecord], + msgAnswers :: ![ResourceRecord], -- | Authority records set by the name server. - msgAuthority :: {-# UNPACK #-} ![ResourceRecord], + msgAuthority :: ![ResourceRecord], -- | Additional records set by the name server. - msgAdditional :: {-# UNPACK #-} ![ResourceRecord] } + msgAdditional :: ![ResourceRecord] } deriving (Eq, Show) instance NFData Message where @@ -357,11 +357,11 @@ instance BinaryPacket Message where -- | A question to the name server. data Question = Question { -- | The domain name this question is about. - qName :: {-# UNPACK #-} !DomainName, + qName :: !DomainName, -- | The type of this question. We only support 'A' and *. - qType :: {-# UNPACK #-} !Type, + qType :: !Type, -- | The class of this question. We only support 'IN'. - qClass :: {-# UNPACK #-} !Class } + qClass :: !Class } deriving (Eq, Show) instance NFData Question where @@ -382,57 +382,57 @@ data ResourceRecord -- | A record containing an IPv4 address. = A { -- | The domain name to which this record pertains. - rrName :: {-# UNPACK #-} !DomainName, + rrName :: !DomainName, -- | A time interval, in seconds, that the answer may be cached. - rrTTL :: {-# UNPACK #-} !Word32, + rrTTL :: !Word32, -- | An IPv4 address. - aAddr :: {-# UNPACK #-} !HostAddress } + aAddr :: !HostAddress } -- | An authoritative name server record. | NS { -- | The domain name to which this record pertains. - rrName :: {-# UNPACK #-} !DomainName, + rrName :: !DomainName, -- | A time interval, in seconds, that the answer may be cached. - rrTTL :: {-# UNPACK #-} !Word32, + rrTTL :: !Word32, -- | The host that should be authoritative for this zone. - nsDName :: {-# UNPACK #-} !DomainName } + nsDName :: !DomainName } -- | A start of zone of authority record. | SOA { -- | The domain name to which this record pertains. - rrName :: {-# UNPACK #-} !DomainName, + rrName :: !DomainName, -- | A time interval, in seconds, that the answer may be cached. - rrTTL :: {-# UNPACK #-} !Word32, + rrTTL :: !Word32, -- | The name server that was the original source of data for this zone. - soaMName :: {-# UNPACK #-} !DomainName, + soaMName :: !DomainName, -- | A name specifying the email address of the person responsible for -- this zone. - soaRName :: {-# UNPACK #-} !DomainName, + soaRName :: !DomainName, -- | The version number of the original copy of this zone. - soaSerial :: {-# UNPACK #-} !Word32, + soaSerial :: !Word32, -- | The number of seconds before the zone should be refreshed. - soaRefresh :: {-# UNPACK #-} !Word32, + soaRefresh :: !Word32, -- | The number of seconds before a failed refresh should be retried. - soaRetry :: {-# UNPACK #-} !Word32, + soaRetry :: !Word32, -- | The number of seconds that can elapse before the zone is no longer -- authoritative. - soaExpire :: {-# UNPACK #-} !Word32, + soaExpire :: !Word32, -- | The default TTL of records that do not contain a TTL, and the TTL of -- negative responses. - soaMinimum :: {-# UNPACK #-} !Word32 } + soaMinimum :: !Word32 } -- | An unsupported record. | UnsupportedResourceRecord { -- | The domain name to which this record pertains. - rrName :: {-# UNPACK #-} !DomainName, + rrName :: !DomainName, -- | A time interval, in seconds, that the answer may be cached. - rrTTL :: {-# UNPACK #-} !Word32, + rrTTL :: !Word32, -- | The 'Type' of this record. - rrType :: {-# UNPACK #-} !Type, + rrType :: !Type, -- | The 'Class' of this record. - rrClass :: {-# UNPACK #-} !Class, + rrClass :: !Class, -- | An opaque 'ByteString' containing the resource data. - rrData :: {-# UNPACK #-} !ByteString } + rrData :: !ByteString } deriving (Eq, Show) instance NFData ResourceRecord where @@ -581,11 +581,11 @@ instance NFData OpCode where -- | The TYPE or QTYPE values that appear in resource records or questions, -- respectively. data Type - = TA -- ^ An IPv4 host address. - | TNS -- ^ An authoritative name server. - | TSOA -- ^ A start of zone of authority. - | TAny -- ^ A request for all records. - | UnsupportedType {-# UNPACK #-} !Word16 -- ^ Any other type. + = TA -- ^ An IPv4 host address. + | TNS -- ^ An authoritative name server. + | TSOA -- ^ A start of zone of authority. + | TAny -- ^ A request for all records. + | UnsupportedType !Word16 -- ^ Any other type. deriving (Eq, Show) instance NFData Type where @@ -609,8 +609,8 @@ instance Binary Type where -- | The CLASS or QCLASS values that appear in resource records or questions, -- respectively. data Class - = IN -- ^ The Internet. We only support this class. - | UnsupportedClass {-# UNPACK #-} !Word16 -- ^ Any other class. + = IN -- ^ The Internet. We only support this class. + | UnsupportedClass !Word16 -- ^ Any other class. deriving (Eq, Show) -- XXX support * diff --git a/src/TorDNSEL/DNS/Server/Internals.hs b/src/TorDNSEL/DNS/Server/Internals.hs index 8ab3637..268ca8d 100644 --- a/src/TorDNSEL/DNS/Server/Internals.hs +++ b/src/TorDNSEL/DNS/Server/Internals.hs @@ -218,11 +218,11 @@ data ExitListQuery -- <https://gitweb.torproject.org/tordnsel.git/tree/doc/torel-design.txt> = IPPort { -- | The address of the candidate exit node. - queryAddr :: {-# UNPACK #-} !HostAddress, + queryAddr :: !HostAddress, -- | The destination address. - destAddr :: {-# UNPACK #-} !HostAddress, + destAddr :: !HostAddress, -- | The destination port. - destPort :: {-# UNPACK #-} !Port + destPort :: !Port } deriving Eq instance Show ExitListQuery where diff --git a/src/TorDNSEL/Directory/Internals.hs b/src/TorDNSEL/Directory/Internals.hs index 154b30c..d7f8303 100644 --- a/src/TorDNSEL/Directory/Internals.hs +++ b/src/TorDNSEL/Directory/Internals.hs @@ -78,13 +78,13 @@ import TorDNSEL.Util -- | A router descriptor. data Descriptor = Desc { -- | The IPv4 address at which this router accepts connections. - descListenAddr :: {-# UNPACK #-} !HostAddress, + descListenAddr :: !HostAddress, -- | The time when this descriptor was generated. - descPublished :: {-# UNPACK #-} !POSIXTime, + descPublished :: !POSIXTime, -- | This router's identifier. - descRouterID :: {-# UNPACK #-} !RouterID, + descRouterID :: !RouterID, -- | This router's exit policy. - descExitPolicy :: {-# UNPACK #-} !ExitPolicy } + descExitPolicy :: !ExitPolicy } instance Show Descriptor where showsPrec _ d = cat (descRouterID d) ' ' (inet_htoa $ descListenAddr d) ' ' @@ -124,11 +124,11 @@ parseDescriptors = parseSubDocs (B.pack "router") parseDescriptor -- | A router status entry. data RouterStatus = RS { -- | This router's identifier. - rsRouterID :: {-# UNPACK #-} !RouterID, + rsRouterID :: !RouterID, -- | When this router's most recent descriptor was published. - rsPublished :: {-# UNPACK #-} !UTCTime, + rsPublished :: !UTCTime, -- | Is this router running? - rsIsRunning :: {-# UNPACK #-} !Bool } + rsIsRunning :: !Bool } deriving Show -- | Parse a router status entry. Return the result or 'throwError' in the @@ -226,15 +226,15 @@ instance Hash ExitPolicy where -- port range pattern. data Rule = Rule { -- | Whether an exit connection is allowed. - ruleType :: {-# UNPACK #-} !RuleType, + ruleType :: !RuleType, -- | The IPv4 address part of the pattern. - ruleAddress :: {-# UNPACK #-} !HostAddress, + ruleAddress :: !HostAddress, -- | The IPv4 address mask part of the pattern. - ruleMask :: {-# UNPACK #-} !HostAddress, + ruleMask :: !HostAddress, -- | The first port in the pattern's port range. - ruleBeginPort :: {-# UNPACK #-} !Port, + ruleBeginPort :: !Port, -- | The last port in the pattern's port range. - ruleEndPort :: {-# UNPACK #-} !Port + ruleEndPort :: !Port } deriving (Eq, Ord) instance Show Rule where diff --git a/src/TorDNSEL/Document.hs b/src/TorDNSEL/Document.hs index 50c986c..f4285c1 100644 --- a/src/TorDNSEL/Document.hs +++ b/src/TorDNSEL/Document.hs @@ -41,15 +41,15 @@ type Document = [Item] -- | An item consisting of a keyword, possibly arguments, and zero or more -- objects. data Item = Item - { iKey :: {-# UNPACK #-} !ByteString -- ^ Keyword - , iArg :: {-# UNPACK #-} !(Maybe ByteString) -- ^ Arguments - , iObj :: {-# UNPACK #-} ![Object] -- ^ Objects + { iKey :: !ByteString -- ^ Keyword + , iArg :: !(Maybe ByteString) -- ^ Arguments + , iObj :: ![Object] -- ^ Objects } deriving Show -- | An object consisting of a keyword and a block of base64-encoded data. data Object = Object - { objKey :: {-# UNPACK #-} !ByteString -- ^ Keyword - , objData :: {-# UNPACK #-} !ByteString -- ^ Base64-encoded data + { objKey :: !ByteString -- ^ Keyword + , objData :: !ByteString -- ^ Base64-encoded data } deriving Show -- | Parse a 'Document' from a list of lines. diff --git a/src/TorDNSEL/NetworkState/Storage/Internals.hs b/src/TorDNSEL/NetworkState/Storage/Internals.hs index 79481f6..0f79cf8 100644 --- a/src/TorDNSEL/NetworkState/Storage/Internals.hs +++ b/src/TorDNSEL/NetworkState/Storage/Internals.hs @@ -185,15 +185,15 @@ terminateStorageManager mbWait (StorageManager tellStorageManager tid) = -- same as Tor uses for storing router descriptors. data ExitAddress = ExitAddress { -- | The identity of the exit node we tested through. - eaRouterID :: {-# UNPACK #-} !RouterID, + eaRouterID :: !RouterID, -- | The current descriptor published time when the test was initiated. We -- don't perform another test until a newer descriptor arrives. - eaPublished :: {-# UNPACK #-} !UTCTime, + eaPublished :: !UTCTime, -- | When we last received a network status update for this router. This -- helps us decide when to discard a router. - eaLastStatus :: {-# UNPACK #-} !UTCTime, + eaLastStatus :: !UTCTime, -- | A map from exit address to when the address was last seen. - eaAddresses :: {-# UNPACK #-} !(Map HostAddress UTCTime) + eaAddresses :: !(Map HostAddress UTCTime) } deriving Eq instance Show ExitAddress where diff --git a/src/TorDNSEL/NetworkState/Types.hs b/src/TorDNSEL/NetworkState/Types.hs index 547ab85..25e809e 100644 --- a/src/TorDNSEL/NetworkState/Types.hs +++ b/src/TorDNSEL/NetworkState/Types.hs @@ -24,27 +24,27 @@ import TorDNSEL.Directory -- | A Tor router. data Router = Router { -- | This router's descriptor, if we have it yet. - rtrDescriptor :: {-# UNPACK #-} !(Maybe Descriptor), + rtrDescriptor :: !(Maybe Descriptor), -- | This router's exit test results, if one has been completed. - rtrTestResults :: {-# UNPACK #-} !(Maybe TestResults), + rtrTestResults :: !(Maybe TestResults), -- | Whether we think this router is running. - rtrIsRunning :: {-# UNPACK #-} !Bool, + rtrIsRunning :: !Bool, -- | The last time we received a router status entry for this router. - rtrLastStatus :: {-# UNPACK #-} !UTCTime } + rtrLastStatus :: !UTCTime } -- | The results of exit tests. data TestResults = TestResults { -- | The descriptor's published time when the last exit test was initiated. - tstPublished :: {-# UNPACK #-} !UTCTime, + tstPublished :: !UTCTime, -- | A map from exit address to when the address was last seen. - tstAddresses :: {-# UNPACK #-} !(Map HostAddress UTCTime) } + tstAddresses :: !(Map HostAddress UTCTime) } -- | Our current view of the Tor network. data NetworkState = NetworkState { -- | A map from listen address to routers. - nsAddrs :: {-# UNPACK #-} !(Map HostAddress (Set RouterID)), + nsAddrs :: !(Map HostAddress (Set RouterID)), -- | All the routers we know about. - nsRouters :: {-# UNPACK #-} !(Map RouterID Router) } + nsRouters :: !(Map RouterID Router) } -- | The empty network state. emptyNetworkState :: NetworkState diff --git a/src/TorDNSEL/Socks/Internals.hs b/src/TorDNSEL/Socks/Internals.hs index f514c44..c5ce474 100644 --- a/src/TorDNSEL/Socks/Internals.hs +++ b/src/TorDNSEL/Socks/Internals.hs @@ -78,11 +78,11 @@ withSocksConnection handle addr port io = (`E.finally` hClose handle) $ do -- | A Socks4a request. data Request = Request { -- | The Socks4 command code (with Tor extensions). - soCommand :: {-# UNPACK #-} !Command, + soCommand :: !Command, -- | The requested destination: either an IPv4 address or a domain name. - soReqDest :: {-# UNPACK #-} !Address, + soReqDest :: !Address, -- | The requested destination port. - soReqPort :: {-# UNPACK #-} !Port } + soReqPort :: !Port } -- A Socks4a command (with Tor extensions). data Command @@ -92,9 +92,9 @@ data Command -- | A Socks4 response. data Response = Response - { soResult :: {-# UNPACK #-} !Result -- ^ The result code. - , soRespAddr :: {-# UNPACK #-} !HostAddress -- ^ The destination address. - , soRespPort :: {-# UNPACK #-} !Port -- ^ The destination port. + { soResult :: !Result -- ^ The result code. + , soRespAddr :: !HostAddress -- ^ The destination address. + , soRespPort :: !Port -- ^ The destination port. } instance NFData Response where @@ -166,7 +166,7 @@ decodeResponse resp = do -- | A Socks error. data SocksError - = SocksError {-# UNPACK #-} !Result -- ^ A known Socks error code. + = SocksError !Result -- ^ A known Socks error code. | SocksProtocolError -- ^ The response doesn't follow the Socks protocol. deriving Typeable diff --git a/src/TorDNSEL/Statistics/Internals.hs b/src/TorDNSEL/Statistics/Internals.hs index cc0f799..bb390eb 100644 --- a/src/TorDNSEL/Statistics/Internals.hs +++ b/src/TorDNSEL/Statistics/Internals.hs @@ -42,7 +42,7 @@ import TorDNSEL.Util -- sent. data Stats = Stats { bytesRecv, bytesSent, dgramsRecv, positives - , negatives, others :: {-# UNPACK #-} !Integer } + , negatives, others :: !Integer } -- | The current statistics state. statsState :: MVar Stats diff --git a/src/TorDNSEL/TorControl/Internals.hs b/src/TorDNSEL/TorControl/Internals.hs index 2ea2e16..95fbbd0 100644 --- a/src/TorDNSEL/TorControl/Internals.hs +++ b/src/TorDNSEL/TorControl/Internals.hs @@ -256,21 +256,21 @@ protocolInfo (Conn _ _ protInfo _) = protInfo -- | A command to send to Tor. data Command = Command { -- | A command keyword. - comKey :: {-# UNPACK #-} !ByteString, + comKey :: !ByteString, -- | Command arguments. - comArgs :: {-# UNPACK #-} ![ByteString], + comArgs :: ![ByteString], -- | A list of lines sent in the data section. - comData :: {-# UNPACK #-} ![ByteString] + comData :: ![ByteString] } deriving Show -- | A reply sent by Tor in response to a command. data Reply = Reply { -- | A reply code. - repCode :: {-# UNPACK #-} !(Char, Char, Char) + repCode :: !(Char, Char, Char) -- | Reply text. - , repText :: {-# UNPACK #-} !ByteString + , repText :: !ByteString -- | A list of lines from the data section. - , repData :: {-# UNPACK #-} ![ByteString] + , repData :: ![ByteString] } deriving Show -- | Authenticate with Tor. Throw a 'TorControlError' if authenticating fails @@ -652,8 +652,8 @@ boolVar var = ConfVar getc (setc setConf') (setc resetConf') where -- | An asynchronous event handler. data EventHandler = EventHandler - { evCode :: {-# UNPACK #-} !ByteString -- ^ The event code. - , evHandler :: {-# UNPACK #-} !([Reply] -> IO ()) -- ^ The event handler. + { evCode :: !ByteString -- ^ The event code. + , evHandler :: !([Reply] -> IO ()) -- ^ The event handler. } -- | Register a set of handlers for asynchronous events. This deregisters any @@ -828,8 +828,8 @@ startIOManager handle = do -- | Reply types in a single sequence of replies. data ReplyType - = MidReply {-# UNPACK #-} !Reply -- ^ A reply preceding other replies. - | LastReply {-# UNPACK #-} !Reply -- ^ The last reply. + = MidReply !Reply -- ^ A reply preceding other replies. + | LastReply !Reply -- ^ The last reply. deriving Show -- | Start a thread that reads replies from @handle@ and passes them to diff --git a/tordnsel.cabal b/tordnsel.cabal index 4f0b11f..3173943 100644 --- a/tordnsel.cabal +++ b/tordnsel.cabal @@ -59,7 +59,7 @@ Other-Modules: TorDNSEL.Config HS-Source-Dirs: src Includes: sys/types.h, unistd.h, sysexits.h, netinet/in.h, openssl/rand.h Extra-Libraries: crypto -GHC-Options: -O2 -Wall -Werror +GHC-Options: -O2 -funbox-strict-fields -Wall -Werror CPP-Options: -DVERSION="0.1.1-dev" Extensions: FlexibleContexts FlexibleInstances

1 0