commit 22454dedd213589cb5a0251552520eebede2ef6f
Author: Translation commit bot <translation(a)torproject.org>
Date: Tue Jun 3 14:45:25 2014 +0000
Update translations for liveusb-creator_completed
---
it/it.po | 183 ++++++++++++++++++++++++++++++++------------------------------
1 file changed, 94 insertions(+), 89 deletions(-)
diff --git a/it/it.po b/it/it.po
index 30a531f..74fd603 100644
--- a/it/it.po
+++ b/it/it.po
@@ -21,9 +21,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-16 18:47+0200\n"
-"PO-Revision-Date: 2014-05-20 15:41+0000\n"
-"Last-Translator: Paolo Stivanin <paolostivanin(a)gmail.com>\n"
+"POT-Creation-Date: 2014-05-28 16:00+0200\n"
+"PO-Revision-Date: 2014-06-03 14:44+0000\n"
+"Last-Translator: Random_R\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/torproject/language/it/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -36,22 +36,22 @@ msgstr ""
msgid "%(distribution)s Installer"
msgstr "Installatore di %(distribution)s"
-#: ../liveusb/gui.py:808
+#: ../liveusb/gui.py:794
#, python-format
msgid "%(filename)s selected"
msgstr "%(filename)s selezionato/i"
-#: ../liveusb/gui.py:439
+#: ../liveusb/gui.py:425
#, python-format
msgid "%(size)s %(label)s"
msgstr "%(size)s %(label)s"
-#: ../liveusb/gui.py:445
+#: ../liveusb/gui.py:431
#, python-format
msgid "%(vendor)s %(model)s (%(details)s) - %(device)s"
msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
-#: ../liveusb/creator.py:1021
+#: ../liveusb/creator.py:1046
#, python-format
msgid "%s already bootable"
msgstr "%s è già avviabile"
@@ -108,16 +108,16 @@ msgid ""
"persist after a reboot."
msgstr "Allocando spazio extra sulla chiavetta USB per un overlay permanente, sarà possibile memorizzare dati ed effettuare modifiche permanenti al sistema operativo live. In caso contrario, non sarà possibile salvare dati da mantenere dopo un riavvio."
-#: ../liveusb/creator.py:1125 ../liveusb/creator.py:1388
+#: ../liveusb/creator.py:1150 ../liveusb/creator.py:1413
#, python-format
msgid "Calculating the SHA1 of %s"
msgstr "Calcolo SHA1 di %s"
-#: ../liveusb/creator.py:1336
+#: ../liveusb/creator.py:1361
msgid "Cannot find"
msgstr "Impossibile trovare"
-#: ../liveusb/creator.py:543
+#: ../liveusb/creator.py:551
#, python-format
msgid "Cannot find device %s"
msgstr "Impossibile trovare il dispositivo %s"
@@ -136,12 +136,12 @@ msgid ""
"Upgrade"
msgstr "Clonare\n&&\nAggiornare"
-#: ../liveusb/creator.py:399
+#: ../liveusb/creator.py:407
#, python-format
msgid "Creating %sMB persistent overlay"
msgstr "Creazione overlay persistente %s MB"
-#: ../liveusb/gui.py:567
+#: ../liveusb/gui.py:553
msgid ""
"Device is not yet mounted, so we cannot determine the amount of free space."
msgstr "Il dispositivo non è stato ancora montato, quindi non è possibile determinare lo spazio disponibile."
@@ -151,11 +151,11 @@ msgstr "Il dispositivo non è stato ancora montato, quindi non è possibile dete
msgid "Download %(distribution)s"
msgstr "Scaricare %(distribution)s"
-#: ../liveusb/gui.py:782
+#: ../liveusb/gui.py:768
msgid "Download complete!"
msgstr "Download completo!"
-#: ../liveusb/gui.py:786
+#: ../liveusb/gui.py:772
msgid "Download failed: "
msgstr "Download fallito:"
@@ -164,45 +164,45 @@ msgstr "Download fallito:"
msgid "Downloading %s..."
msgstr "Download di %s in corso"
-#: ../liveusb/creator.py:1121
+#: ../liveusb/creator.py:1146
msgid "Drive is a loopback, skipping MBR reset"
msgstr "Il drive è una unità di loopback, operazione di reset del MBR ignorata"
-#: ../liveusb/creator.py:814
+#: ../liveusb/creator.py:822
#, python-format
msgid "Entering unmount_device for '%(device)s'"
msgstr "Inserire unmount_device per '%(device)s'"
-#: ../liveusb/creator.py:1201
+#: ../liveusb/creator.py:1226
msgid "Error probing device"
msgstr "Errore durante la rilevazione della periferica"
-#: ../liveusb/gui.py:227
+#: ../liveusb/gui.py:211
msgid ""
"Error: Cannot set the label or obtain the UUID of your device. Unable to "
"continue."
msgstr "Errore: impossibile impostare l'etichetta o ottenere l'UUID del dispositivo. Impossibile continuare."
-#: ../liveusb/creator.py:375
+#: ../liveusb/creator.py:383
msgid ""
"Error: The SHA1 of your Live CD is invalid. You can run this program with "
"the --noverify argument to bypass this verification check."
msgstr "Errore: lo SHA1 del Live CD non è valido. È possibile eseguire il programma con l'opzione --noverify per non eseguire la verifica."
-#: ../liveusb/creator.py:144
+#: ../liveusb/creator.py:146
msgid "Extracting live image to the target device..."
msgstr "Estrazione dell'immagine live nel dispositivo di destinazione..."
-#: ../liveusb/creator.py:1064
+#: ../liveusb/creator.py:1089
#, python-format
msgid "Formatting %(device)s as FAT32"
msgstr "Formattazione %(device)s con filesystem FAT32"
-#: ../liveusb/creator.py:139
+#: ../liveusb/creator.py:141
msgid "ISO MD5 checksum passed"
msgstr "Verifica ISO MD5 completata correttamente"
-#: ../liveusb/creator.py:137
+#: ../liveusb/creator.py:139
msgid "ISO MD5 checksum verification failed"
msgstr "Verifica ISO MD5 fallita"
@@ -216,70 +216,70 @@ msgstr "Se non si ha selezionato un Live ISO esistente, verrà scaricata la rele
msgid "Install Tails"
msgstr "Installare Tails"
-#: ../liveusb/gui.py:630
+#: ../liveusb/gui.py:616
msgid "Installation complete!"
msgstr "Installazione completata!"
-#: ../liveusb/gui.py:279
+#: ../liveusb/gui.py:265
#, python-format
msgid "Installation complete! (%s)"
msgstr "Installazione completata! (%s)"
-#: ../liveusb/gui.py:631
+#: ../liveusb/gui.py:617
msgid "Installation was completed. Press OK to close this program."
msgstr "L'installazione è stata completata. Premere OK per chiudere il programma."
-#: ../liveusb/creator.py:917 ../liveusb/creator.py:1242
+#: ../liveusb/creator.py:942 ../liveusb/creator.py:1267
msgid "Installing bootloader..."
msgstr "Installazione bootloader..."
-#: ../liveusb/gui.py:284
+#: ../liveusb/gui.py:270
msgid "LiveUSB creation failed!"
msgstr "Creazione di LiveUSB fallita!"
-#: ../liveusb/creator.py:1337
+#: ../liveusb/creator.py:1362
msgid ""
"Make sure to extract the entire liveusb-creator zip file before running this"
" program."
msgstr "Accertarsi di aver estratto il file zip liveusb-creator prima di eseguire il programma"
-#: ../liveusb/creator.py:1213
+#: ../liveusb/creator.py:1238
msgid ""
"Make sure your USB key is plugged in and formatted with the FAT filesystem"
msgstr "Assicurarsi che il pendrive USB sia collegato e formattato con filesystem FAT"
-#: ../liveusb/creator.py:836
+#: ../liveusb/creator.py:844
#, python-format
msgid "Mount %s exists after unmounting"
msgstr "Mount %s esiste dopo l'operazione di unmount"
-#: ../liveusb/gui.py:573
+#: ../liveusb/gui.py:559
#, python-format
msgid "No free space on device %(device)s"
msgstr "Spazio insufficiente sulla periferica %(device)s"
-#: ../liveusb/creator.py:803
+#: ../liveusb/creator.py:811
msgid "No mount points found"
msgstr "Nessun punto di mount definito"
-#: ../liveusb/creator.py:392
+#: ../liveusb/creator.py:400
msgid "Not enough free space on device."
msgstr "Spazio libero sul dispositivo insufficiente."
-#: ../liveusb/gui.py:554
+#: ../liveusb/gui.py:540
msgid "Partition is FAT16; Restricting overlay size to 2G"
msgstr "La partizione è in FAT16; restrizione della dimensione dell'overlay a 2G"
-#: ../liveusb/gui.py:550
+#: ../liveusb/gui.py:536
msgid "Partition is FAT32; Restricting overlay size to 4G"
msgstr "La partizione è FAT32; restrizione della dimensione dell'overlay a 4G"
-#: ../liveusb/creator.py:225 ../liveusb/creator.py:843
+#: ../liveusb/creator.py:227 ../liveusb/creator.py:851
#, python-format
msgid "Partitioning device %(device)s"
msgstr "Partizionamento dispositivo %(device)s"
-#: ../liveusb/gui.py:621
+#: ../liveusb/gui.py:607
msgid "Persistent Storage"
msgstr "Persistenza Dati"
@@ -287,53 +287,53 @@ msgstr "Persistenza Dati"
msgid "Persistent Storage (0 MB)"
msgstr "Archiviazione Permanente (0 MB)"
-#: ../liveusb/gui.py:702 ../liveusb/gui.py:731
+#: ../liveusb/gui.py:688 ../liveusb/gui.py:717
msgid "Please confirm your device selection"
msgstr "Confermare il dispositivo selezionato"
-#: ../liveusb/gui.py:467
+#: ../liveusb/gui.py:453
msgid "Refreshing releases..."
msgstr "Ricaricamento delle release in corso..."
-#: ../liveusb/gui.py:472
+#: ../liveusb/gui.py:458
msgid "Releases updated!"
msgstr "Release aggiornate!"
-#: ../liveusb/creator.py:940 ../liveusb/creator.py:1260
+#: ../liveusb/creator.py:965 ../liveusb/creator.py:1285
#, python-format
msgid "Removing %(file)s"
msgstr "Cancellazione %(file)s in corso"
-#: ../liveusb/creator.py:470
+#: ../liveusb/creator.py:478
msgid "Removing existing Live OS"
msgstr "Il Live OS esistente è in fase di cancellazione"
-#: ../liveusb/creator.py:1115
+#: ../liveusb/creator.py:1140
#, python-format
msgid "Resetting Master Boot Record of %s"
msgstr "Reset del Master Boot Record di %s in corso"
-#: ../liveusb/gui.py:793
+#: ../liveusb/gui.py:779
msgid "Select Live ISO"
msgstr "Selezionare Live ISO"
-#: ../liveusb/creator.py:181
+#: ../liveusb/creator.py:183
msgid "Setting up OLPC boot file..."
msgstr "Configurazione del file di boot OLPC..."
-#: ../liveusb/creator.py:717
+#: ../liveusb/creator.py:725
#, python-format
msgid ""
"Some partitions of the target device %(device)s are mounted. They will be "
"unmounted before starting the installation process."
msgstr "Alcune partizioni del dispositivo di destinazione %(device)s sono montate. Verranno smontate prima di iniziare il processo di installazione."
-#: ../liveusb/creator.py:130
+#: ../liveusb/creator.py:132
msgid ""
"Source type does not support verification of ISO MD5 checksum, skipping"
msgstr "La verifica MD5 sul file ISO selezionato non è supportata. L'operazione verrà ignorata."
-#: ../liveusb/creator.py:1149
+#: ../liveusb/creator.py:1174
msgid "Synchronizing data on disk..."
msgstr "Sincronizzazione dati sul disco..."
@@ -341,19 +341,19 @@ msgstr "Sincronizzazione dati sul disco..."
msgid "Target Device"
msgstr "Dispositivo di destinazione"
-#: ../liveusb/gui.py:667
+#: ../liveusb/gui.py:653
msgid ""
"The Master Boot Record on your device is blank. Pressing 'Install Tails' "
"again will reset the MBR on this device."
msgstr "Il Master Boot Record sul dispositivo è vuoto. Premendo \"Installa Tails\" di nuovo, il MBR su questo dispositivo verrà resettato."
-#: ../liveusb/gui.py:796
+#: ../liveusb/gui.py:782
msgid ""
"The selected file is unreadable. Please fix its permissions or select "
"another file."
msgstr "Il file selezionato è illeggibile. Si prega di modificarne i permessi o selezionare un altro file."
-#: ../liveusb/creator.py:336
+#: ../liveusb/creator.py:344
#, python-format
msgid ""
"There was a problem executing the following command: `%(command)s`.\n"
@@ -391,87 +391,87 @@ msgstr "Questa è la barra di progresso che indicherà a che punto si è con il
msgid "This is the status console, where all messages get written to."
msgstr "Questa è la console di stato, dove vengono scritti tutti i messaggi."
-#: ../liveusb/creator.py:880
+#: ../liveusb/creator.py:905
msgid "Trying to continue anyway."
msgstr "Tentativo di continuare comunque."
-#: ../liveusb/creator.py:912
+#: ../liveusb/creator.py:937
#, python-format
msgid "Unable to change volume label: %(message)s"
msgstr "Impossibile cambiare l'etichetta di volume: %(message)s"
-#: ../liveusb/creator.py:479 ../liveusb/creator.py:490
+#: ../liveusb/creator.py:487 ../liveusb/creator.py:498
#, python-format
msgid "Unable to chmod %(file)s: %(message)s"
msgstr "Impossibile completare il comando chmod %(file)s: %(message)s"
-#: ../liveusb/creator.py:460
+#: ../liveusb/creator.py:468
#, python-format
msgid "Unable to copy %(infile)s to %(outfile)s: %(message)s"
msgstr "Impossibile effettuare la copia da %(infile)s a %(outfile)s: %(message)s"
-#: ../liveusb/gui.py:418
+#: ../liveusb/gui.py:404
msgid "Unable to find any USB drive"
msgstr "Nessuna periferica USB trovata"
-#: ../liveusb/creator.py:1203
+#: ../liveusb/creator.py:1228
msgid "Unable to find any supported device"
msgstr "Nessun dispositivo supportato trovato"
-#: ../liveusb/creator.py:1041
+#: ../liveusb/creator.py:1066
msgid "Unable to find partition"
msgstr "Impossibile trovare la partizione"
-#: ../liveusb/creator.py:1283
+#: ../liveusb/creator.py:1308
msgid ""
"Unable to get Win32_LogicalDisk; win32com query did not return any results"
msgstr "Impossibile trovare Win32_LogicalDisk; win32com non ha restituito nessun risultato"
-#: ../liveusb/gui.py:695
+#: ../liveusb/gui.py:681
msgid "Unable to mount device"
msgstr "Impossibile montare il dispositivo"
-#: ../liveusb/creator.py:791
+#: ../liveusb/creator.py:799
#, python-format
msgid "Unable to mount device: %(message)s"
msgstr "Impossibile eseguire il mount del dispositivo: %(message)s"
-#: ../liveusb/creator.py:495
+#: ../liveusb/creator.py:503
#, python-format
msgid "Unable to remove directory from previous LiveOS: %(message)s"
msgstr "Impossibile rimuovere la directory della precendente LiveOS: %(message)s"
-#: ../liveusb/creator.py:483
+#: ../liveusb/creator.py:491
#, python-format
msgid "Unable to remove file from previous LiveOS: %(message)s"
msgstr "Impossibile rimuovere il file della precedente LiveOS: %(message)s"
-#: ../liveusb/creator.py:1118
+#: ../liveusb/creator.py:1143
msgid ""
"Unable to reset MBR. You may not have the `syslinux` package installed."
msgstr "Impossibile effettuare il reset del MBR. Probabilmente il pacchetto \"syslinux\" non è installato installato."
-#: ../liveusb/gui.py:802
+#: ../liveusb/gui.py:788
msgid ""
"Unable to use the selected file. You may have better luck if you move your "
"ISO to the root of your drive (ie: C:\\)"
msgstr "Impossibile aprire il file selezionato. Provare a spostare il file ISO sulla root del disco (ie: C:\\)"
-#: ../liveusb/creator.py:698
+#: ../liveusb/creator.py:706
#, python-format
msgid "Unable to write on %(device)s, skipping."
msgstr "Impossibile scrivere su %(device)s, operazione ignorata."
-#: ../liveusb/creator.py:381
+#: ../liveusb/creator.py:389
msgid "Unknown ISO, skipping checksum verification"
msgstr "Immagine ISO sconosciuta: la verifica del checksum non verrà eseguita"
-#: ../liveusb/creator.py:787
+#: ../liveusb/creator.py:795
#, python-format
msgid "Unknown dbus exception while trying to mount device: %(message)s"
msgstr "Eccezione dbus sconosciuta durante il mount del dispositivo: %(message)s"
-#: ../liveusb/creator.py:766 ../liveusb/creator.py:891
+#: ../liveusb/creator.py:774 ../liveusb/creator.py:916
msgid "Unknown filesystem. Your device may need to be reformatted."
msgstr "Filesystem sconosciuto. Potrebbe essere necessario formattare il disco di nuovo."
@@ -480,40 +480,45 @@ msgstr "Filesystem sconosciuto. Potrebbe essere necessario formattare il disco d
msgid "Unknown release: %s"
msgstr "Release sconosciuta: %s"
-#: ../liveusb/creator.py:828
+#: ../liveusb/creator.py:836
#, python-format
msgid "Unmounting '%(udi)s' on '%(device)s'"
msgstr "Smontaggio di '%(udi)s' su '%(device)s'"
-#: ../liveusb/creator.py:824
+#: ../liveusb/creator.py:832
#, python-format
msgid "Unmounting mounted filesystems on '%(device)s'"
msgstr "Smontaggio dei filesystem montati su '%(device)s'"
-#: ../liveusb/creator.py:877
+#: ../liveusb/creator.py:902
#, python-format
msgid "Unsupported device '%(device)s', please report a bug."
msgstr "Dispositivo '%(device)s' non supportato, si prega di segnalare l'errore."
-#: ../liveusb/creator.py:771 ../liveusb/creator.py:894
+#: ../liveusb/creator.py:779 ../liveusb/creator.py:919
#, python-format
msgid "Unsupported filesystem: %s"
msgstr "Filesystem non supportato: %s"
-#: ../liveusb/creator.py:769
+#: ../liveusb/creator.py:777
#, python-format
msgid ""
"Unsupported filesystem: %s\n"
"In case you are trying to upgrade a manually installed Tails system (that is, if it was installed without this installer), this option is not supported: you need to install it anew to start with, e.g. by choosing the \"Clone & Install\" action instead."
msgstr "Filesystem non supportato: %s\nNel caso si stia aggiornando un sistema Tails installato manualmente (cioè se è stato installato senza l'installatore), questa opzione non è supportata: sarà prima necessario reinstallarlo in modo differente, es. scegliendo l'azione \"Clona & Installa\"."
-#: ../liveusb/creator.py:1216
+#: ../liveusb/creator.py:1241
#, python-format
msgid ""
"Unsupported filesystem: %s\n"
"Please backup and format your USB key with the FAT filesystem."
msgstr "Filesystem non supportato: %s\nEseguire un backup e formattare il pendrive USB con il filesystem FAT."
+#: ../liveusb/creator.py:877
+#, python-format
+msgid "Updating properties of system partition %(system_partition)s"
+msgstr "Aggiornamento proprietà della partizione di sistema %(system_partition)s"
+
#: ../liveusb/launcher_ui.py:163
msgid "Upgrade from ISO"
msgstr "Aggiornare da ISO"
@@ -522,54 +527,54 @@ msgstr "Aggiornare da ISO"
msgid "Use existing Live system ISO"
msgstr "Usare sistema Live ISO esistente"
-#: ../liveusb/creator.py:132
+#: ../liveusb/creator.py:134
msgid "Verifying ISO MD5 checksum"
msgstr "Verifica del checksum MD5 del file ISO"
-#: ../liveusb/creator.py:355
+#: ../liveusb/creator.py:363
msgid "Verifying SHA1 checksum of LiveCD image..."
msgstr "Verifica SHA1 dell'immagine LiveCD in corso..."
-#: ../liveusb/creator.py:359
+#: ../liveusb/creator.py:367
msgid "Verifying SHA256 checksum of LiveCD image..."
msgstr "Verifica SHA256 dell'immagine LiveCD in corso..."
-#: ../liveusb/creator.py:888 ../liveusb/creator.py:1209
+#: ../liveusb/creator.py:913 ../liveusb/creator.py:1234
msgid "Verifying filesystem..."
msgstr "Verifica del filesystem in corso..."
-#: ../liveusb/gui.py:729
+#: ../liveusb/gui.py:715
msgid ""
"Warning: Creating a new persistent overlay will delete your existing one."
msgstr "Attenzione: la creazione di un overlay persistente eliminerà l'overlay esistente."
-#: ../liveusb/gui.py:681
+#: ../liveusb/gui.py:667
msgid ""
"Warning: The Master Boot Record on your device does not match your system's "
"syslinux MBR. If you have trouble booting this stick, try running the "
"liveusb-creator with the --reset-mbr option."
msgstr "Attenzione: il Master Boot Record del disco non corrisponde al MBR del tuo sistema. Se il problema persiste, provare ad eseguire il boot da liveusb-creator specificando l'opzione --reset-mbr."
-#: ../liveusb/gui.py:392
+#: ../liveusb/gui.py:378
msgid ""
"Warning: This tool needs to be run as an Administrator. To do this, right "
"click on the icon and open the Properties. Under the Compatibility tab, "
"check the \"Run this program as an administrator\" box."
msgstr "Attenzione: questo programma necessita dei permessi di amministratore. Per poterlo aprire, fai click destro sull'icona, quindi su \"Proprietà\". Sotto la scheda Compatibilità, click sulla box \"Apri questo programma come Administrator\""
-#: ../liveusb/creator.py:151
+#: ../liveusb/creator.py:153
#, python-format
msgid "Wrote to device at %(speed)d MB/sec"
msgstr "Scrittura eseguita a %(speed)d MB/sec"
-#: ../liveusb/gui.py:703
+#: ../liveusb/gui.py:689
#, python-format
msgid ""
"You are going to install Tails on the %(size)s %(vendor)s %(model)s device "
"(%(device)s). All data on the selected device will be lost. Continue?"
msgstr "Si sta per installare Tails sul dispositivo %(size)s %(vendor)s %(model)s (%(device)s). Tutti i dati sul dispositivo selezionato verranno persi. Continuare?"
-#: ../liveusb/gui.py:719
+#: ../liveusb/gui.py:705
#, python-format
msgid ""
"You are going to upgrade Tails on the %(parent_size)s %(vendor)s %(model)s "
@@ -577,17 +582,17 @@ msgid ""
"unchanged. Continue?"
msgstr "Si sta per aggiornare Tails sul dispositivo %(parent_size)s %(vendor)s %(model)s (%(device)s). Qualsiasi volume persistente su questo dispositivo non subirà modifiche. Continuare?"
-#: ../liveusb/creator.py:605
+#: ../liveusb/creator.py:613
msgid ""
"You are using an old version of syslinux-extlinux that does not support the "
"ext4 filesystem"
msgstr "La versione di syslinux-extlinux in uso non supporta il filesystem ext4"
-#: ../liveusb/gui.py:787
+#: ../liveusb/gui.py:773
msgid "You can try again to resume your download"
msgstr "È possibile tentare di ripristinare il download"
-#: ../liveusb/creator.py:91
+#: ../liveusb/creator.py:93
msgid "You must run this application as root"
msgstr "Per eseguire questa applicazione sono necessari i privilegi di root"
commit f57a4ce77a8a5e3ca417e4af6cd4744a2844be7a
Author: Karsten Loesing <karsten.loesing(a)gmx.net>
Date: Tue Jun 3 10:46:55 2014 +0200
Announce EOL of relay-search.
---
website/web/WEB-INF/relay-search.jsp | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/website/web/WEB-INF/relay-search.jsp b/website/web/WEB-INF/relay-search.jsp
index 90fdd86..e6eb630 100644
--- a/website/web/WEB-INF/relay-search.jsp
+++ b/website/web/WEB-INF/relay-search.jsp
@@ -13,6 +13,11 @@
<%@ include file="banner.jsp"%>
<div class="main-column">
<h2>Tor Metrics Portal: Relay Search</h2>
+ <p><font color="red"><b>Notice:</b> This service will be shut down
+ after June 10, 2014. Possible alternatives are
+ <a href="https://atlas.torproject.org">Atlas</a> and
+ <a href="https://globe.torproject.org">Globe</a>.
+ </font></p>
<p>Search for a relay in the relay descriptor archive by typing
(part of) a <b>nickname</b>, <b>$-prefixed fingerprint</b>, or <b>IP
address</b> and optionally a <b>month (yyyy-mm)</b> or up to three
commit ba6d150a75a3eceb9d817b4e6fb8c62aa37fb5be
Author: Karsten Loesing <karsten.loesing(a)gmx.net>
Date: Tue Jun 3 09:52:59 2014 +0200
Add link to CollecTor to data page.
---
website/web/WEB-INF/data.jsp | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/website/web/WEB-INF/data.jsp b/website/web/WEB-INF/data.jsp
index 37e49bd..0981201 100644
--- a/website/web/WEB-INF/data.jsp
+++ b/website/web/WEB-INF/data.jsp
@@ -15,6 +15,12 @@
<div class="main-column">
<h2>Tor Metrics Portal: Data</h2>
<br>
+ <p><font color="red"><b>Notice:</b> The files linked on this site
+ are now available on:
+ <a href="https://collector.torproject.org/">https://collector.torproject.org/</a>.
+ This page will be automatically redirected there after August 3,
+ 2014.</font>
+ </p>
<p>One of the main goals of the Tor Metrics Project is to make all
gathered data available to the public. This approach enables
privacy researchers to perform their own analyses using real data
commit 9fe40cd6d1a7ae94ddbe273ce8c841beac097ddb
Author: Karsten Loesing <karsten.loesing(a)gmx.net>
Date: Tue Jun 3 09:58:47 2014 +0200
Change consensus-health page to simple redirect.
---
.../metrics/web/status/ConsensusHealthServlet.java | 5 ++--
website/web/WEB-INF/banner.jsp | 6 +----
website/web/WEB-INF/consensus-health.jsp | 26 --------------------
website/web/WEB-INF/error.jsp | 1 -
website/web/WEB-INF/status.jsp | 6 ++---
website/web/robots.txt | 1 -
6 files changed, 5 insertions(+), 40 deletions(-)
diff --git a/website/src/org/torproject/metrics/web/status/ConsensusHealthServlet.java b/website/src/org/torproject/metrics/web/status/ConsensusHealthServlet.java
index 3bed511..3c74acd 100644
--- a/website/src/org/torproject/metrics/web/status/ConsensusHealthServlet.java
+++ b/website/src/org/torproject/metrics/web/status/ConsensusHealthServlet.java
@@ -16,9 +16,8 @@ public class ConsensusHealthServlet extends HttpServlet {
public void doGet(HttpServletRequest request,
HttpServletResponse response) throws IOException, ServletException {
- /* Forward the request to the JSP that does all the hard work. */
- request.getRequestDispatcher("WEB-INF/consensus-health.jsp").forward(
- request, response);
+ /* Forward to the actual consensus-health service. */
+ response.sendRedirect("https://consensus-health.torproject.org");
}
}
diff --git a/website/web/WEB-INF/banner.jsp b/website/web/WEB-INF/banner.jsp
index 0633351..ef0798c 100644
--- a/website/web/WEB-INF/banner.jsp
+++ b/website/web/WEB-INF/banner.jsp
@@ -36,8 +36,7 @@
</font>
<%} else if (currentPage.endsWith("status.jsp") ||
currentPage.endsWith("exonerator.jsp") ||
- currentPage.endsWith("relay-search.jsp") ||
- currentPage.endsWith("consensus-health.jsp")) {
+ currentPage.endsWith("relay-search.jsp")) {
%><br>
<font size="2">
<a <%if (currentPage.endsWith("exonerator.jsp")){
@@ -46,9 +45,6 @@
<a <%if (currentPage.endsWith("relay-search.jsp")){
%>class="current"<%} else {%>href="/relay-search.html"<%}
%>>Relay Search</a>
- <a <%if (currentPage.endsWith("consensus-health.jsp")){
- %>class="current"<%} else {%>href="/consensus-health.html"<%}
- %>>Consensus Health</a>
</font>
<%} else if (currentPage.endsWith("research.jsp") ||
currentPage.endsWith("data.jsp") ||
diff --git a/website/web/WEB-INF/consensus-health.jsp b/website/web/WEB-INF/consensus-health.jsp
deleted file mode 100644
index d802b65..0000000
--- a/website/web/WEB-INF/consensus-health.jsp
+++ /dev/null
@@ -1,26 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
- <title>Tor Metrics Portal: Consensus health</title>
- <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
- <link href="/css/stylesheet-ltr.css" type="text/css" rel="stylesheet">
- <link href="/images/favicon.ico" type="image/x-icon" rel="shortcut icon">
-</head>
-<body>
- <div class="center">
- <%@ include file="banner.jsp"%>
- <div class="main-column" style="margin:5; Padding:0;">
- <h2>Tor Metrics Portal: Consensus Health</h2>
- <br>
- <p>This page shows statistics about the current consensus and votes to
- facilitate debugging of the directory consensus process.</p>
- <br>
- <p><font color="red"><b>Notice:</b> This service has moved to:
- <a href="https://consensus-health.torproject.org/">https://consensus-health.torproject.org/</a></font></p>
- </div>
- </div>
- <div class="bottom" id="bottom">
- <%@ include file="footer.jsp"%>
- </div>
-</body>
-</html>
diff --git a/website/web/WEB-INF/error.jsp b/website/web/WEB-INF/error.jsp
index 28065e9..3a65ed6 100644
--- a/website/web/WEB-INF/error.jsp
+++ b/website/web/WEB-INF/error.jsp
@@ -59,7 +59,6 @@ Maybe you find what you're looking for on our sitemap:
<ul>
<li><a href="exonerator.html">ExoneraTor</a></li>
<li><a href="relay-search.html">Relay Search</a></li>
-<li><a href="consensus-health.html">Consensus Health</a></li>
</ul></li>
</ul>
</p>
diff --git a/website/web/WEB-INF/status.jsp b/website/web/WEB-INF/status.jsp
index d6b565e..504d9f4 100644
--- a/website/web/WEB-INF/status.jsp
+++ b/website/web/WEB-INF/status.jsp
@@ -16,11 +16,9 @@
used to analyze the Tor network status from a few years ago until
an hour ago. There are currently two applications for this data:
The <a href="exonerator.html">ExoneraTor</a> tells you whether
- some IP address was a Tor relay at a given time, the
+ some IP address was a Tor relay at a given time, and the
<a href="relay-search.html">Relay Search</a> lets you search the
- descriptor archive for a relay, and the
- <a href="consensus-health.html">Consensus Health</a> summarizes
- information about the latest network consensus voting process.
+ descriptor archive for a relay.
</div>
</div>
<div class="bottom" id="bottom">
diff --git a/website/web/robots.txt b/website/web/robots.txt
index c59aca1..99c6c29 100644
--- a/website/web/robots.txt
+++ b/website/web/robots.txt
@@ -1,5 +1,4 @@
User-agent: *
Disallow: /relay.html
Disallow: /csv/
-Disallow: /consensus-health.html
commit b8f93d6199c07c81eb54fbba4a04f3c1b03a3473
Author: Karsten Loesing <karsten.loesing(a)gmx.net>
Date: Tue Jun 3 10:03:56 2014 +0200
Change exonerator page to simple redirect.
---
.../metrics/web/status/ExoneraTorServlet.java | 5 +--
website/web/WEB-INF/banner.jsp | 4 --
website/web/WEB-INF/error.jsp | 1 -
website/web/WEB-INF/exonerator.jsp | 45 --------------------
website/web/WEB-INF/status.jsp | 6 +--
5 files changed, 5 insertions(+), 56 deletions(-)
diff --git a/website/src/org/torproject/metrics/web/status/ExoneraTorServlet.java b/website/src/org/torproject/metrics/web/status/ExoneraTorServlet.java
index 30a2ff8..980a2ba 100644
--- a/website/src/org/torproject/metrics/web/status/ExoneraTorServlet.java
+++ b/website/src/org/torproject/metrics/web/status/ExoneraTorServlet.java
@@ -16,9 +16,8 @@ public class ExoneraTorServlet extends HttpServlet {
public void doGet(HttpServletRequest request,
HttpServletResponse response) throws IOException, ServletException {
- /* Forward the request to the JSP that does all the hard work. */
- request.getRequestDispatcher("WEB-INF/exonerator.jsp").forward(
- request, response);
+ /* Forward to the actual ExoneraTor service. */
+ response.sendRedirect("https://exonerator.torproject.org");
}
}
diff --git a/website/web/WEB-INF/banner.jsp b/website/web/WEB-INF/banner.jsp
index ef0798c..5f6a43f 100644
--- a/website/web/WEB-INF/banner.jsp
+++ b/website/web/WEB-INF/banner.jsp
@@ -35,13 +35,9 @@
%>>Performance</a>
</font>
<%} else if (currentPage.endsWith("status.jsp") ||
- currentPage.endsWith("exonerator.jsp") ||
currentPage.endsWith("relay-search.jsp")) {
%><br>
<font size="2">
- <a <%if (currentPage.endsWith("exonerator.jsp")){
- %>class="current"<%} else {%>href="/exonerator.html"<%}
- %>>ExoneraTor</a>
<a <%if (currentPage.endsWith("relay-search.jsp")){
%>class="current"<%} else {%>href="/relay-search.html"<%}
%>>Relay Search</a>
diff --git a/website/web/WEB-INF/error.jsp b/website/web/WEB-INF/error.jsp
index 3a65ed6..1626035 100644
--- a/website/web/WEB-INF/error.jsp
+++ b/website/web/WEB-INF/error.jsp
@@ -57,7 +57,6 @@ Maybe you find what you're looking for on our sitemap:
</ul></li>
<li><a href="status.html">Status</a>
<ul>
-<li><a href="exonerator.html">ExoneraTor</a></li>
<li><a href="relay-search.html">Relay Search</a></li>
</ul></li>
</ul>
diff --git a/website/web/WEB-INF/exonerator.jsp b/website/web/WEB-INF/exonerator.jsp
deleted file mode 100644
index 0eefe99..0000000
--- a/website/web/WEB-INF/exonerator.jsp
+++ /dev/null
@@ -1,45 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
- <title>Tor Metrics Portal: ExoneraTor</title>
- <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
- <link href="/css/stylesheet-ltr.css" type="text/css" rel="stylesheet">
- <link href="/images/favicon.ico" type="image/x-icon" rel="shortcut icon">
-</head>
-<body>
- <div class="center">
- <%@ include file="banner.jsp"%>
- <div class="main-column" style="margin:5; Padding:0;">
- <h2>ExoneraTor</h2>
- <h3>or: a website that tells you whether a given IP address was a Tor
- relay</h3>
- <br>
- <p>Just because you see an Internet connection from a particular IP
- address does not mean you know <i>who</i> originated the traffic. Tor
- anonymizes Internet traffic by "<a href="https://www.torproject.org/about/overview#thesolution">onion
- routing</a>," sending packets through a series of encrypted hops
- before they reach their destination. Therefore, if you see traffic
- from a Tor node, you may be seeing traffic that originated from
- someone using Tor, rather than from the node operator itself. The Tor
- Project and Tor node operators have no records of the traffic that
- passes over the network, but we do maintain current and historical
- records of which IP addresses are part of the Tor network.</p>
- <br>
- <p>ExoneraTor tells you whether there was a Tor relay running on a
- given IP address at a given time. ExoneraTor can further indicate
- whether this relay permitted exiting to a given server and/or TCP
- port. ExoneraTor learns these facts by parsing the public relay lists
- and relay descriptors that are collected from the Tor directory
- authorities and the exit lists collected by TorDNSEL. By inputting an
- IP address and time, you can determine whether that IP was then a part
- of the Tor network.</p>
- <br>
- <p><font color="red"><b>Notice:</b> This service has moved to:
- <a href="https://exonerator.torproject.org/">https://exonerator.torproject.org/</a></font></p>
- </div>
- </div>
- <div class="bottom" id="bottom">
- <%@ include file="footer.jsp"%>
- </div>
-</body>
-</html>
diff --git a/website/web/WEB-INF/status.jsp b/website/web/WEB-INF/status.jsp
index 504d9f4..0187c82 100644
--- a/website/web/WEB-INF/status.jsp
+++ b/website/web/WEB-INF/status.jsp
@@ -14,9 +14,9 @@
<br>
<p>The network data collected by the Tor Metrics Project can be
used to analyze the Tor network status from a few years ago until
- an hour ago. There are currently two applications for this data:
- The <a href="exonerator.html">ExoneraTor</a> tells you whether
- some IP address was a Tor relay at a given time, and the
+ an hour ago. There is currently one application for this data
+ available on this site:
+ The
<a href="relay-search.html">Relay Search</a> lets you search the
descriptor archive for a relay.
</div>
commit f96381e6543e4ebcd45d239a980a80983784b124
Author: Karsten Loesing <karsten.loesing(a)gmx.net>
Date: Tue Jun 3 09:26:54 2014 +0200
Start new homepage dubbed CollecTor.
From now on we're going to provide Tor network data ourselves, rather than
relying on metrics-web to do that for us.
---
web/css/style.css | 38 +++++++++++++++++++++
web/index.html | 95 +++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 133 insertions(+)
diff --git a/web/css/style.css b/web/css/style.css
new file mode 100644
index 0000000..9978a5d
--- /dev/null
+++ b/web/css/style.css
@@ -0,0 +1,38 @@
+body { font-family: "Open Sans","lucida grande","Segoe UI",arial,verdana,
+ "lucida sans unicode",tahoma,sans-serif; background: #fafafa;
+ font-size: 13px; line-height: 22px; color: #222; }
+h1 { font-size: 20px; font-weight: normal; text-align: center; }
+h3 { color: #7D4698; position: relative }
+a { color: #7D4698; text-decoration: none; font-weight: bold; }
+ul { list-style: none; padding: 0; margin: 0; }
+p { margin: 0; padding: 10px; }
+a[name] { padding: 0; margin: 0; }
+.box { max-width: 850px; width: 100%; margin: 0 auto 30px auto;
+ padding-bottom: 30px; background: white; border: 1px solid #eee; }
+.box > * { margin-left: 30px; margin-right: 30px; }
+.box h3 a { visibility: hidden; }
+.box:hover h3 a { visibility: visible; }
+.api-request { border-bottom: 1px solid #eee; position: relative }
+.request-url, .request-type, .request-response { padding: 8px 10px;
+ vertical-align: middle }
+.request-type { color: #57145F; display: inline-block; }
+.request-url { color: #333; font-size: 18px; }
+.request-response { position: absolute; color: #666; right: 0; }
+h3 .request-response { padding: 0 !important; }
+.api-urls>li:last-child { border-bottom: 0; }
+.required-true, .required-false, .typeof { display: inline-block;
+ vertical-align: middle; padding: 5px 10px; }
+.required-true { color: #1d7508; }
+.required-false { color: #aaa; }
+.properties { margin-top: 10px; margin-bottom: 10px;
+ border: 1px solid #eee; }
+.properties li { padding: 5px 0; }
+.properties li ul { border: 1px solid #eee; margin: 10px 10px 10px 40px;
+ background: white; }
+.properties .properties { margin-left: 10px; }
+.properties li:nth-child(even) { background: #fafafa; }
+.properties p { padding: 10px 15px; }
+.properties b { padding: 5px 10px; display: inline-block;
+ vertical-align: middle; }
+.api-urls{ margin-top: 30px; margin-bottom: 30px; }
+
diff --git a/web/index.html b/web/index.html
new file mode 100644
index 0000000..c687798
--- /dev/null
+++ b/web/index.html
@@ -0,0 +1,95 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<title>CollecTor — your friendly data-collecting service in the Tor
+network</title>
+<link href="css/style.css" type="text/css" rel="stylesheet">
+<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
+<link href="favicon.ico" type="image/x-icon" rel="shortcut icon">
+</head>
+<body>
+
+<div class="box">
+
+<h1>CollecTor — your friendly data-collecting service in the Tor
+network</h1>
+
+<p>
+Welcome to CollecTor, your friendly data-collecting service in the Tor
+network.
+CollecTor fetches data from various nodes and services in the public Tor
+network and makes it available to the world.
+If you're doing research on the Tor network, or if you're developing an
+application that uses Tor network data, this is your place to start.
+</p>
+
+</div> <!-- box -->
+
+<div class="box">
+
+<a name="archive"></a>
+<h3>Archive of monthly tarballs <a href="#archive">#</a></h3>
+
+<p>
+We have over 10 years of Tor network data available for download in
+monthly tarballs.
+The latest tarballs are updated every few days.
+So, if you want to fetch data covering an extended period of time, monthly
+tarballs are for you.
+Note that tarballs can decompress to 20 times the compressed size or even
+more.
+</p>
+
+<p>
+Monthly tarballs can be browsed and downloaded here:
+</p>
+
+<pre>
+ <a href="archive/">https://collector.torproject.org/archive/</a>
+</pre>
+
+</div> <!-- box -->
+
+<div class="box">
+
+<a name="recent"></a>
+<h3>The latest 72 hours <a href="#recent">#</a></h3>
+
+<p>
+If you're only interested in recently published data, we also have data
+from the last 72 hours available for you.
+In contrast to monthly tarballs, this data set is updated every hour.
+If you have already bootstrapped your application with monthly tarballs
+and want to stay up-to-date, or if you just want to take a peak at the
+latest data, this is your data set.
+</p>
+
+<p>
+The latest 72 hours of data are also available here:
+</p>
+
+<pre>
+ <a href="recent/">https://collector.torproject.org/recent/</a>
+</pre>
+
+</div> <!-- box -->
+
+<div class="box">
+
+<a name="next"></a>
+<h3>What's next? <a href="#next">#</a></h3>
+
+<p>
+Do you need support?
+If you have any questions or feedback about the Tor network data provided
+here, we'd like to hear from you!
+Please send mail to the
+<a href="mailto:tor-dev@lists.torproject.org">Tor development mailing
+list</a>.
+</p>
+
+</div>
+
+</body>
+</html>
+