- tor-commits - lists.torproject.org

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

10 Jan '12

commit 98107ff8c8e0ea6c5534f18a14e01dae0d277fe4 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 10 19:45:14 2012 +0000 Update translations for vidalia --- ca/vidalia_ca.po | 37 +++++++++++++++++++------------------ 1 files changed, 19 insertions(+), 18 deletions(-) diff --git a/ca/vidalia_ca.po b/ca/vidalia_ca.po index b348bf3..babab87 100755 --- a/ca/vidalia_ca.po +++ b/ca/vidalia_ca.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-09-07 14:40+0000\n" -"PO-Revision-Date: 2012-01-10 19:12+0000\n" +"PO-Revision-Date: 2012-01-10 19:16+0000\n" "Last-Translator: Gerard Farràs Ballabriga <>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -2984,26 +2984,27 @@ msgstr "" msgctxt "ServerPage" msgid "Show help topic on bandwidth rate limits" msgstr "" +"Mostra el tema d'ajuda sobre els límits en la velocitat d'amplada de banda" msgctxt "ServerPage" msgid "Average Rate" -msgstr "" +msgstr "Velocitat mitjana" msgctxt "ServerPage" msgid "Long-term average bandwidth limit" -msgstr "" +msgstr "Límit d'amplada de banda mitjana a llarg plaç" msgctxt "ServerPage" msgid "KB/s" -msgstr "" +msgstr "KB/s" msgctxt "ServerPage" msgid "Maximum Rate" -msgstr "" +msgstr "Velocitat màxima" msgctxt "ServerPage" msgid "Peak bandwidth rate limit" -msgstr "" +msgstr "Pic en l'amplada de banda" msgctxt "ServerPage" msgid "" @@ -3013,27 +3014,27 @@ msgstr "" msgctxt "ServerPage" msgid "Bandwidth Limits" -msgstr "" +msgstr "Límits d'amplada de banda" msgctxt "ServerPage" msgid "Ports 6660 - 6669 and 6697" -msgstr "" +msgstr "Ports 6660 - 6669 i 6697" msgctxt "ServerPage" msgid "Internet Relay Chat (IRC)" -msgstr "" +msgstr "Internet Relay Chat (IRC)" msgctxt "ServerPage" msgid "Ports 110, 143, 993 and 995" -msgstr "" +msgstr "Ports 110, 143, 993 i 995" msgctxt "ServerPage" msgid "Retrieve Mail (POP, IMAP)" -msgstr "" +msgstr "Recupera el correu (POP,IMAP)" msgctxt "ServerPage" msgid "Ports unspecified by other checkboxes" -msgstr "" +msgstr "Ports no especificats per d'altres opcions" msgctxt "ServerPage" msgid "Misc Other Services" @@ -3041,27 +3042,27 @@ msgstr "" msgctxt "ServerPage" msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888" -msgstr "" +msgstr "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 i 8888" msgctxt "ServerPage" msgid "Instant Messaging (IM)" -msgstr "" +msgstr "Instant Messaging (IM)" msgctxt "ServerPage" msgid "Port 443" -msgstr "" +msgstr "Port 443" msgctxt "ServerPage" msgid "Secure Websites (SSL)" -msgstr "" +msgstr "Secure Websites (SSL)" msgctxt "ServerPage" msgid "Port 80" -msgstr "" +msgstr "Port 80" msgctxt "ServerPage" msgid "Websites" -msgstr "" +msgstr "Llocs web" msgctxt "ServerPage" msgid "Show help topic on exit policies"

1 0

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

10 Jan '12

commit a2805136314786a17693998a73f2756e0f18327a Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 10 19:15:23 2012 +0000 Update translations for vidalia --- ca/vidalia_ca.po | 394 ++++++++++++++++++++++++++++-------------------------- 1 files changed, 207 insertions(+), 187 deletions(-) diff --git a/ca/vidalia_ca.po b/ca/vidalia_ca.po index 85462dc..b348bf3 100755 --- a/ca/vidalia_ca.po +++ b/ca/vidalia_ca.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-09-07 14:40+0000\n" -"PO-Revision-Date: 2012-01-10 18:41+0000\n" +"PO-Revision-Date: 2012-01-10 19:12+0000\n" "Last-Translator: Gerard Farràs Ballabriga <>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -713,203 +713,203 @@ msgstr "" msgctxt "CountryInfo" msgid "Guinea-Bissau" -msgstr "" +msgstr "Guinea Bissau" msgctxt "CountryInfo" msgid "Guyana" -msgstr "" +msgstr "Guaiana" msgctxt "CountryInfo" msgid "Hong Kong" -msgstr "" +msgstr "Hong Kong" msgctxt "CountryInfo" msgid "Haiti" -msgstr "" +msgstr "Haití" msgctxt "CountryInfo" msgid "Honduras" -msgstr "" +msgstr "Hondures" msgctxt "CountryInfo" msgid "Israel" -msgstr "" +msgstr "Israel" msgctxt "CountryInfo" msgid "Italy" -msgstr "" +msgstr "Itàlia" msgctxt "CountryInfo" msgid "Jamaica" -msgstr "" +msgstr "Jamaica" msgctxt "CountryInfo" msgid "Japan" -msgstr "" +msgstr "Japó" msgctxt "CountryInfo" msgid "Jordan" -msgstr "" +msgstr "Jordània" msgctxt "CountryInfo" msgid "Kazakhstan" -msgstr "" +msgstr "Casaquistan" msgctxt "CountryInfo" msgid "Kenya" -msgstr "" +msgstr "Kènia" msgctxt "CountryInfo" msgid "Kiribati" -msgstr "" +msgstr "Kiribati" msgctxt "CountryInfo" msgid "Kuwait" -msgstr "" +msgstr "Kuwait" msgctxt "CountryInfo" msgid "Kyrgyzstan" -msgstr "" +msgstr "Quirguisistan" msgctxt "CountryInfo" msgid "Laos" -msgstr "" +msgstr "Laos" msgctxt "CountryInfo" msgid "Latvia" -msgstr "" +msgstr "Letònia" msgctxt "CountryInfo" msgid "Lebanon" -msgstr "" +msgstr "Líban" msgctxt "CountryInfo" msgid "Lesotho" -msgstr "" +msgstr "Lesotho" msgctxt "CountryInfo" msgid "Liberia" -msgstr "" +msgstr "Libèria" msgctxt "CountryInfo" msgid "Liechtenstein" -msgstr "" +msgstr "Liechtenstein" msgctxt "CountryInfo" msgid "Lithuania" -msgstr "" +msgstr "Lituània" msgctxt "CountryInfo" msgid "Luxembourg" -msgstr "" +msgstr "Luxemburg" msgctxt "CountryInfo" msgid "Macedonia" -msgstr "" +msgstr "Macedònia" msgctxt "CountryInfo" msgid "Madagascar" -msgstr "" +msgstr "Madagascar" msgctxt "CountryInfo" msgid "Malawi" -msgstr "" +msgstr "Malawi" msgctxt "CountryInfo" msgid "Malaysia" -msgstr "" +msgstr "Malàisia" msgctxt "CountryInfo" msgid "Mali" -msgstr "" +msgstr "Mali" msgctxt "CountryInfo" msgid "Malta" -msgstr "" +msgstr "Malta" msgctxt "CountryInfo" msgid "Marshall Islands" -msgstr "" +msgstr "Illes Marshall" msgctxt "CountryInfo" msgid "Mauritania" -msgstr "" +msgstr "Mauritània" msgctxt "CountryInfo" msgid "Mauritius" -msgstr "" +msgstr "Maurici" msgctxt "CountryInfo" msgid "Micronesia" -msgstr "" +msgstr "Micronèsia" msgctxt "CountryInfo" msgid "Moldova" -msgstr "" +msgstr "Moldàvia" msgctxt "CountryInfo" msgid "Monaco" -msgstr "" +msgstr "Mònaco" msgctxt "CountryInfo" msgid "Mongolia" -msgstr "" +msgstr "Mongòlia" msgctxt "CountryInfo" msgid "Montenegro" -msgstr "" +msgstr "Montenegro" msgctxt "CountryInfo" msgid "Morocco" -msgstr "" +msgstr "Marroc" msgctxt "CountryInfo" msgid "Mozambique" -msgstr "" +msgstr "Moçambic" msgctxt "CountryInfo" msgid "Namibia" -msgstr "" +msgstr "Namíbia" msgctxt "CountryInfo" msgid "Nauru" -msgstr "" +msgstr "Naüru" msgctxt "CountryInfo" msgid "Nepal" -msgstr "" +msgstr "Nepal" msgctxt "CountryInfo" msgid "Netherlands" -msgstr "" +msgstr "Holanda" msgctxt "CountryInfo" msgid "New Zealand" -msgstr "" +msgstr "Nova Zelanda" msgctxt "CountryInfo" msgid "Nicaragua" -msgstr "" +msgstr "Nicaràgua" msgctxt "CountryInfo" msgid "Niger" -msgstr "" +msgstr "Níger" msgctxt "CountryInfo" msgid "Nigeria" -msgstr "" +msgstr "Nigèria" msgctxt "CountryInfo" msgid "Norway" -msgstr "" +msgstr "Noruega" msgctxt "CountryInfo" msgid "Oman" -msgstr "" +msgstr "Oman" msgctxt "CountryInfo" msgid "Pakistan" -msgstr "" +msgstr "Paquistan" msgctxt "CountryInfo" msgid "Palau" @@ -1113,59 +1113,59 @@ msgstr "" msgctxt "CountryInfo" msgid "Ukraine" -msgstr "" +msgstr "Ucraïna" msgctxt "CountryInfo" msgid "United Arab Emirates" -msgstr "" +msgstr "Emirats Àrabs Units" msgctxt "CountryInfo" msgid "United Kingdom" -msgstr "" +msgstr "Regne Unit" msgctxt "CountryInfo" msgid "United States" -msgstr "" +msgstr "Estats Units" msgctxt "CountryInfo" msgid "Uruguay" -msgstr "" +msgstr "Uruguai" msgctxt "CountryInfo" msgid "Uzbekistan" -msgstr "" +msgstr "Usbequistan" msgctxt "CountryInfo" msgid "Vanuatu" -msgstr "" +msgstr "Vanuatu" msgctxt "CountryInfo" msgid "Vatican" -msgstr "" +msgstr "Vaticà" msgctxt "CountryInfo" msgid "Venezuela" -msgstr "" +msgstr "Veneçuela" msgctxt "CountryInfo" msgid "Vietnam" -msgstr "" +msgstr "Vietnam" msgctxt "CountryInfo" msgid "Western Sahara" -msgstr "" +msgstr "Sahara occidental" msgctxt "CountryInfo" msgid "Yemen" -msgstr "" +msgstr "Iemen" msgctxt "CountryInfo" msgid "Zambia" -msgstr "" +msgstr "Zàmbia" msgctxt "CountryInfo" msgid "Zimbabwe" -msgstr "" +msgstr "Zimbàue" msgctxt "CountryInfo" msgid "Zaire" @@ -1173,99 +1173,99 @@ msgstr "" msgctxt "CountryInfo" msgid "Albania" -msgstr "" +msgstr "Albània" msgctxt "CountryInfo" msgid "Algeria" -msgstr "" +msgstr "Algèria" msgctxt "CountryInfo" msgid "Austria" -msgstr "" +msgstr "Àustria" msgctxt "CountryInfo" msgid "Bahrain" -msgstr "" +msgstr "Bahrain" msgctxt "CountryInfo" msgid "Benin" -msgstr "" +msgstr "Benin" msgctxt "CountryInfo" msgid "Ethiopia" -msgstr "" +msgstr "Etiopia" msgctxt "CountryInfo" msgid "Fiji" -msgstr "" +msgstr "Fiji" msgctxt "CountryInfo" msgid "Finland" -msgstr "" +msgstr "Finlàndia" msgctxt "CountryInfo" msgid "Greece" -msgstr "" +msgstr "Grècia" msgctxt "CountryInfo" msgid "Guam" -msgstr "" +msgstr "Guam" msgctxt "CountryInfo" msgid "Hungary" -msgstr "" +msgstr "Hongria" msgctxt "CountryInfo" msgid "Iceland" -msgstr "" +msgstr "Islàndia" msgctxt "CountryInfo" msgid "India" -msgstr "" +msgstr "Índia" msgctxt "CountryInfo" msgid "Indonesia" -msgstr "" +msgstr "Indonèsia" msgctxt "CountryInfo" msgid "Iran" -msgstr "" +msgstr "Iran" msgctxt "CountryInfo" msgid "Iraq" -msgstr "" +msgstr "Iraq" msgctxt "CountryInfo" msgid "Ireland" -msgstr "" +msgstr "Irlanda" msgctxt "CountryInfo" msgid "Korea, North" -msgstr "" +msgstr "Corea del Nord" msgctxt "CountryInfo" msgid "Korea, South" -msgstr "" +msgstr "Corea del Sud" msgctxt "CountryInfo" msgid "Libya" -msgstr "" +msgstr "Líbia" msgctxt "CountryInfo" msgid "Maldives" -msgstr "" +msgstr "Maldives" msgctxt "CountryInfo" msgid "Mexico" -msgstr "" +msgstr "Mèxic" msgctxt "CountryInfo" msgid "Myanmar" -msgstr "" +msgstr "Mianmar" msgctxt "CountryInfo" msgid "Taiwan" -msgstr "" +msgstr "Taiwan" msgctxt "CrashReportDialog" msgid "Submit a Crash Report" @@ -1322,11 +1322,11 @@ msgstr "Executables (*.exe)" msgctxt "GeneralPage" msgid "Select Path to Tor" -msgstr "" +msgstr "Seleccioneu la ruta del Tor" msgctxt "GeneralPage" msgid "Select Proxy Executable" -msgstr "" +msgstr "Seleccioneu l'executable per al servidor intermediari" msgctxt "GeneralPage" msgid "You must specify the name of your Tor executable." @@ -1358,7 +1358,7 @@ msgstr "Arranca l'aplicació de proxy quan arranqui el Tor" msgctxt "GeneralPage" msgid "Proxy Application Arguments:" -msgstr "" +msgstr "Paràmetres per a l'aplicació del servidor intermediari" msgctxt "GeneralPage" msgid "Software Updates" @@ -1366,39 +1366,39 @@ msgstr "Actualitzacions de programari" msgctxt "GeneralPage" msgid "Check for new software updates automatically" -msgstr "" +msgstr "Reviseu de forma automàtica les actualitzacions de nou programari" msgctxt "GeneralPage" msgid "Check Now" -msgstr "" +msgstr "Revisau ara" msgctxt "GraphFrame" msgid "%1 KB/s" -msgstr "" +msgstr "%1 KB/s" msgctxt "GraphFrame" msgid "%1 KB" -msgstr "" +msgstr "%1 KB" msgctxt "GraphFrame" msgid "%1 MB" -msgstr "" +msgstr "%1 MB" msgctxt "GraphFrame" msgid "%1 GB" -msgstr "" +msgstr "%1 GB" msgctxt "GraphFrame" msgid "Recv:" -msgstr "" +msgstr "Rebuts:" msgctxt "GraphFrame" msgid "Sent:" -msgstr "" +msgstr "Enviats:" msgctxt "HelpBrowser" msgid "Supplied XML file is not a valid Contents document." -msgstr "" +msgstr "El fitxer XML proporcionat no és un document vàlid de Continguts." msgctxt "HelpBrowser" msgid "Search reached end of document" @@ -1973,7 +1973,7 @@ msgstr "Configuració del relaying" msgctxt "MainWindow" msgid "Set up a relay and help the network grow" -msgstr "" +msgstr "Establiu un relay i ajudeu la xarxa a créixer" msgctxt "MainWindow" msgid "View the Network" @@ -1989,7 +1989,7 @@ msgstr "Utilitza una nova Identitat" msgctxt "MainWindow" msgid "Make subsequent connections appear new" -msgstr "" +msgstr "Fés que les connexions següents semblin noves" msgctxt "MainWindow" msgid "View recent bandwidth usage" @@ -2057,39 +2057,44 @@ msgstr "" msgctxt "MainWindow" msgid "Potentially Unsafe Connection" -msgstr "" +msgstr "Connexió potencialment insegura" msgctxt "MainWindow" msgid "" "Tor has automatically closed your connection in order to protect your " "anonymity." msgstr "" +"El Tor ha tancat de manera automàtica la seva connexió per tal d'assegurar " +"la seva anonimitat." msgctxt "MainWindow" msgid "Update Failed" -msgstr "" +msgstr "Actualització fallida" msgctxt "MainWindow" msgid "Your software is up to date" -msgstr "" +msgstr "El seu programari està actualitzat" msgctxt "MainWindow" msgid "" "There are no new Tor software packages available for your computer at this " "time." msgstr "" +"No hi ha nous paquets de programari del Tor disponibles pel seu ordinador en" +" aquest moment." msgctxt "MainWindow" msgid "Installation Failed" -msgstr "" +msgstr "Instal·lació fallida" msgctxt "MainWindow" msgid "Vidalia was unable to install your software updates." msgstr "" +"Vidalia ha estat incapaç d'instal·lar les actualitzacions de programari." msgctxt "MainWindow" msgid "The following error occurred:" -msgstr "" +msgstr "Ha succeït el següent error:" msgctxt "MainWindow" msgid "" @@ -2100,7 +2105,7 @@ msgstr "" msgctxt "MainWindow" msgid "failed (%1)" -msgstr "" +msgstr "fallit (%1)" msgctxt "MainWindow" msgid "" @@ -2125,6 +2130,9 @@ msgid "" "\n" "Please check the message log for recent warning or error messages." msgstr "" +"Vidalia ha detectat que el programari Tor ha abortat inesperadament.\n" +"\n" +"Si us plau, reviseu el fitxer de registre per a avisos recents o missatges d'error." msgctxt "MainWindow" msgid "(probably Telnet)" @@ -2142,15 +2150,15 @@ msgstr "" msgctxt "MessageLog" msgid "Error Setting Filter" -msgstr "" +msgstr "Error establint filtre" msgctxt "MessageLog" msgid "Vidalia was unable to register for Tor's log events." -msgstr "" +msgstr "Vidalia ha estat incapaç d'enregistrar els esdeveniments del Tor" msgctxt "MessageLog" msgid "Error Opening Log File" -msgstr "" +msgstr "Error mentre s'obrir el fitxer de registre" msgctxt "MessageLog" msgid "Vidalia was unable to open the specified log file." @@ -2174,11 +2182,11 @@ msgstr "" msgctxt "MessageLog" msgid "Text Files (*.txt)" -msgstr "" +msgstr "Fitxers de text (*.txt)" msgctxt "MessageLog" msgid "Vidalia" -msgstr "" +msgstr "Vidalia" msgctxt "MessageLog" msgid "Find in Message Log" @@ -2186,11 +2194,11 @@ msgstr "" msgctxt "MessageLog" msgid "Find:" -msgstr "" +msgstr "Cerca:" msgctxt "MessageLog" msgid "Not Found" -msgstr "" +msgstr "No ha estat trobat" msgctxt "MessageLog" msgid "Search found 0 matches." @@ -2206,19 +2214,19 @@ msgstr "" msgctxt "MessageLog" msgid "Set message filters" -msgstr "" +msgstr "Estableix filtres de missatge" msgctxt "MessageLog" msgid "History Size..." -msgstr "" +msgstr "Mida de la història" msgctxt "MessageLog" msgid "Set maximum number of messages to display" -msgstr "" +msgstr "Estableix el nombre màxim de missatges a mostrar" msgctxt "MessageLog" msgid "Clear" -msgstr "" +msgstr "Neteja" msgctxt "MessageLog" msgid "Clear all messages from the Message Log (Ctrl+E)" @@ -2226,51 +2234,51 @@ msgstr "" msgctxt "MessageLog" msgid "Ctrl+E" -msgstr "" +msgstr "Ctrl+E" msgctxt "MessageLog" msgid "Copy" -msgstr "" +msgstr "Copia" msgctxt "MessageLog" msgid "Copy the selected messages to the clipboard (Ctrl+C)" -msgstr "" +msgstr "Copia els missatges seleccionats en el porta-retalls (Ctrl+C)" msgctxt "MessageLog" msgid "Ctrl+C" -msgstr "" +msgstr "Ctrl+C" msgctxt "MessageLog" msgid "Select All" -msgstr "" +msgstr "Selecciona-ho tot" msgctxt "MessageLog" msgid "Select all messages (Ctrl+A)" -msgstr "" +msgstr "Selecciona tots els missatges (Ctrl+A)" msgctxt "MessageLog" msgid "Ctrl+A" -msgstr "" +msgstr "Ctrl+A" msgctxt "MessageLog" msgid "Save All" -msgstr "" +msgstr "Desa-ho tot" msgctxt "MessageLog" msgid "Save all messages to a file" -msgstr "" +msgstr "Desa tots els missatges en el fitxer" msgctxt "MessageLog" msgid "Save Selected" -msgstr "" +msgstr "Desa els seleccionats" msgctxt "MessageLog" msgid "Save selected messages to a file" -msgstr "" +msgstr "Desa els missatges seleccionats en el fitxer" msgctxt "MessageLog" msgid "Settings" -msgstr "" +msgstr "Preferències" msgctxt "MessageLog" msgid "Adjust Message Log Settings" @@ -2278,11 +2286,11 @@ msgstr "" msgctxt "MessageLog" msgid "Ctrl+T" -msgstr "" +msgstr "Ctrl+T" msgctxt "MessageLog" msgid "Help" -msgstr "" +msgstr "Ajuda" msgctxt "MessageLog" msgid "Show the help browser" @@ -2461,59 +2469,59 @@ msgstr "" msgctxt "NetViewer" msgid "Ctrl+R" -msgstr "" +msgstr "Ctrl+R" msgctxt "NetViewer" msgid "Help" -msgstr "" +msgstr "Ajuda" msgctxt "NetViewer" msgid "Show the network map help" -msgstr "" +msgstr "Mostra l'ajuda del mapa de la xarxa" msgctxt "NetViewer" msgid "Show network map help" -msgstr "" +msgstr "Mostra l'ajuda del mapa de la xarxa" msgctxt "NetViewer" msgid "F1" -msgstr "" +msgstr "F1" msgctxt "NetViewer" msgid "Close" -msgstr "" +msgstr "Tanca" msgctxt "NetViewer" msgid "Close the network map" -msgstr "" +msgstr "Tanca el mapa de xarxa" msgctxt "NetViewer" msgid "Esc" -msgstr "" +msgstr "Esc" msgctxt "NetViewer" msgid "Zoom In" -msgstr "" +msgstr "Augmenta" msgctxt "NetViewer" msgid "Zoom in on the network map" -msgstr "" +msgstr "Augmenta el mapa de la xarxa" msgctxt "NetViewer" msgid "+" -msgstr "" +msgstr "+" msgctxt "NetViewer" msgid "Zoom Out" -msgstr "" +msgstr "Allunya't" msgctxt "NetViewer" msgid "Zoom out on the network map" -msgstr "" +msgstr "Allunya't del mapa de la xarxa" msgctxt "NetViewer" msgid "-" -msgstr "" +msgstr "-" msgctxt "NetViewer" msgid "Zoom To Fit" @@ -2525,7 +2533,7 @@ msgstr "" msgctxt "NetViewer" msgid "Ctrl+Z" -msgstr "" +msgstr "Ctrl+Z" msgctxt "NetViewer" msgid "Relay Not Found" @@ -2537,71 +2545,78 @@ msgstr "" msgctxt "NetViewer" msgid "Unknown" -msgstr "" +msgstr "Desconegut" msgctxt "NetViewer" msgid "Full Screen" -msgstr "" +msgstr "Pantalla completa" msgctxt "NetViewer" msgid "View the network map as a full screen window" -msgstr "" +msgstr "Visualitza el mapa de xarxa com una finestra a mida completa" msgctxt "NetViewer" msgid "Ctrl+F" -msgstr "" +msgstr "Ctrl+F" msgctxt "NetworkPage" msgid "Invalid Bridge" -msgstr "" +msgstr "Pont invàlid" msgctxt "NetworkPage" msgid "The specified bridge identifier is not valid." -msgstr "" +msgstr "L'identificador especificat de pont no és vàlid." msgctxt "NetworkPage" msgid "Copy (Ctrl+C)" -msgstr "" +msgstr "Copia (Ctrl+C)" msgctxt "NetworkPage" msgid "" "You must specify both an IP address or hostname and a port number to " "configure Tor to use a proxy to access the Internet." msgstr "" +"Heu d'especificar tant una adreça IP o domini com un número de port per a " +"configurar el Tor per tal que pugui utilitzar un servidor intermediari per a" +" accedir a Internet." msgctxt "NetworkPage" msgid "" "You must specify one or more ports to which your firewall allows you to " "connect." msgstr "" +"Heu d'especificar un o més ports del vostre tallafocs per tal que us permeti" +" connectar-vos." msgctxt "NetworkPage" msgid "'%1' is not a valid port number." -msgstr "" +msgstr "%1' no és un número de port vàlid." msgctxt "NetworkPage" msgid "Check if your local network requires a proxy to access the Internet" msgstr "" +"Reviseu si la vostra xarxa local requereix un servidor intermediari per a " +"accedir a Internet" msgctxt "NetworkPage" msgid "I use a proxy to access the Internet" -msgstr "" +msgstr "Jo utilitzo un servidor intermediari per a accedir a Internet" msgctxt "NetworkPage" msgid "Proxy Settings" -msgstr "" +msgstr "Preferències del servidor intermediari" msgctxt "NetworkPage" msgid "Username:" -msgstr "" +msgstr "Nom d'usuari:" msgctxt "NetworkPage" msgid "Password:" -msgstr "" +msgstr "Contrasenya:" msgctxt "NetworkPage" msgid "Port:" -msgstr "" +msgstr "Port:" msgctxt "NetworkPage" msgid "Check to only connect to relays using ports allowed by your firewall" @@ -2609,19 +2624,19 @@ msgstr "" msgctxt "NetworkPage" msgid "My firewall only lets me connect to certain ports" -msgstr "" +msgstr "El meu tallafocs només em permet connectar-me en ports concrets" msgctxt "NetworkPage" msgid "Firewall Settings" -msgstr "" +msgstr "Preferències del tallafocs" msgctxt "NetworkPage" msgid "Allowed Ports:" -msgstr "" +msgstr "Ports permesos:" msgctxt "NetworkPage" msgid "80, 443" -msgstr "" +msgstr "80, 443" msgctxt "NetworkPage" msgid "" @@ -2631,41 +2646,43 @@ msgstr "" msgctxt "NetworkPage" msgid "My ISP blocks connections to the Tor network" -msgstr "" +msgstr "El meu ISP bloca les connexions a la xarxa Tor" msgctxt "NetworkPage" msgid "Bridge Settings" -msgstr "" +msgstr "Preferències del pont" msgctxt "NetworkPage" msgid "Add a Bridge:" -msgstr "" +msgstr "Afegeix un pont:" msgctxt "NetworkPage" msgid "Remove the selected bridges from the list" -msgstr "" +msgstr "Suprimiu els ponts seleccionats de la llista" msgctxt "NetworkPage" msgid "Copy the selected bridges to the clipboard" -msgstr "" +msgstr "Copia els ponts seleccionats en el porta-retalls" msgctxt "NetworkPage" msgid "Find Bridges Now" -msgstr "" +msgstr "Afegeix nous ponts" msgctxt "NetworkPage" msgid "<a href=\"bridges.finding\">How else can I find bridges?</a>" -msgstr "" +msgstr "<a href=\"bridges.finding\">Com més puc trobar ponts?</a>" msgctxt "NetworkPage" msgid "<a href=\"bridges.finding\">How can I find bridges?</a>" -msgstr "" +msgstr "<a href=\"bridges.finding\">Com puc trobar ponts?</a>" msgctxt "NetworkPage" msgid "" "No new bridges are currently available. You can either wait a while and try " "again, or try another method of finding new bridges." msgstr "" +"Ara mateix, no hi ha ponts disponibles. Podeu esperar-vos una estona i " +"torna-ho a intentar o provar un mètode alternatiu per a trobar nous ponts." msgctxt "NetworkPage" msgid "Click Help to see other methods of finding new bridges." @@ -2893,15 +2910,15 @@ msgstr "" msgctxt "ServerPage" msgid "Test" -msgstr "" +msgstr "Test" msgctxt "ServerPage" msgid "Show help topic on port forwarding" -msgstr "" +msgstr "Mostra el tema d'ajuda sobre el reenviament de ports" msgctxt "ServerPage" msgid "Directory Port:" -msgstr "" +msgstr "Directori de ports" msgctxt "ServerPage" msgid "Directory Port Number" @@ -2909,53 +2926,56 @@ msgstr "" msgctxt "ServerPage" msgid "Contact Info:" -msgstr "" +msgstr "Informació de contacte:" msgctxt "ServerPage" msgid "Name of your relay" -msgstr "" +msgstr "Nom del seu repetidor" msgctxt "ServerPage" msgid "Port on which users and other relays can communicate with your relay" msgstr "" +"Port en el qual usuaris i d'altres repetidors podran comunicar-se amb el seu" msgctxt "ServerPage" msgid "Nickname:" -msgstr "" +msgstr "Sobrenom:" msgctxt "ServerPage" msgid "Basic Settings" -msgstr "" +msgstr "Preferències bàsiques" msgctxt "ServerPage" msgid "" "For Internet connections with fast download speed but slow upload, please " "list your upload speed here." msgstr "" +"Per a connexions a Internet amb descàrrega ràpida però càrrega lenta, si us " +"plau, llisteu la seva velocitat aquí." msgctxt "ServerPage" msgid "Cable/DSL 256 Kbps" -msgstr "" +msgstr "Cable/DSL 256 Kbps" msgctxt "ServerPage" msgid "Cable/DSL 512 Kbps" -msgstr "" +msgstr "Cable/DSL 512 Kbps" msgctxt "ServerPage" msgid "Cable/DSL 768 Kbps" -msgstr "" +msgstr "Cable/DSL 768 Kbps" msgctxt "ServerPage" msgid "T1/Cable/DSL 1.5 Mbps" -msgstr "" +msgstr "T1/Cable/DSL 1,5 Mbps" msgctxt "ServerPage" msgid "> 1.5 Mbps" -msgstr "" +msgstr "> 1.5 Mbps" msgctxt "ServerPage" msgid "Custom" -msgstr "" +msgstr "Personalitzat" msgctxt "ServerPage" msgid "Select the entry that most closely resembles your Internet connection"

1 0

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

10 Jan '12

commit c508e059d2f75328c6987ef66fa0889eb3c2dc51 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 10 18:45:16 2012 +0000 Update translations for vidalia --- ca/vidalia_ca.po | 156 ++++++++++++++++++++++++++++++----------------------- 1 files changed, 88 insertions(+), 68 deletions(-) diff --git a/ca/vidalia_ca.po b/ca/vidalia_ca.po index 0f97df3..85462dc 100755 --- a/ca/vidalia_ca.po +++ b/ca/vidalia_ca.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-09-07 14:40+0000\n" -"PO-Revision-Date: 2012-01-10 18:12+0000\n" +"PO-Revision-Date: 2012-01-10 18:41+0000\n" "Last-Translator: Gerard Farràs Ballabriga <>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -49,7 +49,7 @@ msgstr "" msgctxt "AdvancedPage" msgid "Select Tor Configuration File" -msgstr "" +msgstr "Selecciona el fitxer de configuració del Tor" msgctxt "AdvancedPage" msgid "File Not Found" @@ -65,23 +65,23 @@ msgstr "Creació de fitxer fallida" msgctxt "AdvancedPage" msgid "Unable to create %1 [%2]" -msgstr "" +msgstr "Incapaç de crear %1 [%2]" msgctxt "AdvancedPage" msgid "Select a Directory to Use for Tor Data" -msgstr "" +msgstr "Selecciona el directori per a utilitzar les dades del Tor" msgctxt "AdvancedPage" msgid "Unable to remove Tor Service" -msgstr "" +msgstr "Incapaç de suprimir el servei del Tor" msgctxt "AdvancedPage" msgid "Unable to install Tor Service" -msgstr "" +msgstr "Incapaç d'instal·lar el servei del Tor" msgctxt "AdvancedPage" msgid "Vidalia was unable to install the Tor service." -msgstr "" +msgstr "Vidalia ha estat incapaç d'instal·lar el servei del Tor." msgctxt "AdvancedPage" msgid "Authentication:" @@ -93,7 +93,7 @@ msgstr "Adreça:" msgctxt "AdvancedPage" msgid "None" -msgstr "" +msgstr "Cap" msgctxt "AdvancedPage" msgid "Cookie" @@ -121,7 +121,7 @@ msgstr "Arranca el Tor amb el fitxer de configuració especificat (torrc)" msgctxt "AdvancedPage" msgid "Select path to your configuration file" -msgstr "" +msgstr "Seleccioneu la ruta del vostre fitxer de configuració" msgctxt "AdvancedPage" msgid "Browse" @@ -133,11 +133,13 @@ msgstr "Directori de dades" msgctxt "AdvancedPage" msgid "Store data for the Tor software in the following directory" -msgstr "" +msgstr "Emmagatzema les dades per al programari Tor en la carpeta següent" msgctxt "AdvancedPage" msgid "Select the directory used to store data for the Tor software" msgstr "" +"Seleccioneu el directori utilitzat per a emmagatzemar la informació del " +"programari Tor" msgctxt "AdvancedPage" msgid "Tor Control" @@ -205,6 +207,9 @@ msgid "" "\n" "You may need to remove it manually." msgstr "" +"Vidalia ha estat incapaç de suprimir el servei del Tor.\n" +"\n" +"Haureu de suprimirlo manualment." msgctxt "AppearancePage" msgid "Language" @@ -212,7 +217,7 @@ msgstr "Llengua" msgctxt "AppearancePage" msgid "Choose the language used in Vidalia" -msgstr "" +msgstr "Escolliu l'idioma utilitzat a Vidalia" msgctxt "AppearancePage" msgid "Style" @@ -220,11 +225,12 @@ msgstr "Estil" msgctxt "AppearancePage" msgid "Choose Vidalia's interface style" -msgstr "" +msgstr "Escolliu l'estil per a la interfície de Vidalia" msgctxt "AppearancePage" msgid "Vidalia was unable to load the selected language translation." msgstr "" +"Vidalia ha estat incapaç de carregar el fitxer de llengua especificat." msgctxt "BandwidthGraph" msgid "Since:" @@ -248,11 +254,11 @@ msgstr "Reinicia" msgctxt "BandwidthGraph" msgid "Receive Rate" -msgstr "" +msgstr "Velocitat de recepció" msgctxt "BandwidthGraph" msgid "Send Rate" -msgstr "" +msgstr "Velocitat de tramesa" msgctxt "BandwidthGraph" msgid "Always on Top" @@ -264,7 +270,7 @@ msgstr "Estil" msgctxt "BandwidthGraph" msgid "Changes the transparency of the Bandwidth Graph" -msgstr "" +msgstr "Canvis en la transparència del gràfic d'amplada de banda" msgctxt "BandwidthGraph" msgid "100" @@ -284,135 +290,136 @@ msgstr "Cancel·la" msgctxt "BridgeDownloader" msgid "Starting HTTPS bridge request..." -msgstr "" +msgstr "Està fent la petició per al pont HTTPS...." msgctxt "BridgeDownloader" msgid "Connecting to %1:%2..." -msgstr "" +msgstr "S'està connectant al %1:%2...." msgctxt "BridgeDownloader" msgid "Sending an HTTPS request for bridges..." -msgstr "" +msgstr "S'està trametent una petició HTTPS pels ponts..." msgctxt "BridgeDownloader" msgid "Downloading a list of bridges..." -msgstr "" +msgstr "S'està descarregant un llistat dels ponts..." msgctxt "BridgeDownloaderProgressDialog" msgid "Downloading Bridges" -msgstr "" +msgstr "S'estan descarregant els ponts" msgctxt "BridgeDownloaderProgressDialog" msgid "Unable to download bridges: %1" -msgstr "" +msgstr "Incapaç de descarregar els ponts: %1" msgctxt "BridgeDownloaderProgressDialog" msgid "Retrying bridge request..." -msgstr "" +msgstr "S'està reintentant una petició per a pont...." msgctxt "BridgeUsageDialog" msgid "Country" -msgstr "" +msgstr "País" msgctxt "BridgeUsageDialog" msgid "# Clients" -msgstr "" +msgstr "# Clients" msgctxt "BridgeUsageDialog" msgid "Clients from the following countries have used your relay since %1" msgstr "" +"Clients des dels països següents que han utilitzat el vostre relay des de %1" msgctxt "BridgeUsageDialog" msgid "Bridge Usage Summary" -msgstr "" +msgstr "Sumari d'ús de ponts" msgctxt "BridgeUsageDialog" msgid "Client Summary" -msgstr "" +msgstr "Sumari de client" msgctxt "Circuit" msgid "New" -msgstr "" +msgstr "Nou" msgctxt "Circuit" msgid "Open" -msgstr "" +msgstr "Obre" msgctxt "Circuit" msgid "Building" -msgstr "" +msgstr "S'està construïnt" msgctxt "Circuit" msgid "Failed" -msgstr "" +msgstr "Fallit" msgctxt "Circuit" msgid "Closed" -msgstr "" +msgstr "Tancat" msgctxt "Circuit" msgid "Unknown" -msgstr "" +msgstr "Desconegut" msgctxt "CircuitItem" msgid "<Path Empty>" -msgstr "" +msgstr "<Ruta buida>" msgctxt "CircuitListWidget" msgid "Connection" -msgstr "" +msgstr "Connexió" msgctxt "CircuitListWidget" msgid "Status" -msgstr "" +msgstr "Estat" msgctxt "CircuitListWidget" msgid "Zoom to Circuit" -msgstr "" +msgstr "Apropa el circuit" msgctxt "CircuitListWidget" msgid "Close Circuit (Del)" -msgstr "" +msgstr "Tanca el circuit (Del)" msgctxt "CircuitListWidget" msgid "Close Stream (Del)" -msgstr "" +msgstr "Tanca el flux (Del)" msgctxt "ConfigDialog" msgid "General" -msgstr "" +msgstr "General" msgctxt "ConfigDialog" msgid "Network" -msgstr "" +msgstr "Xarxa" msgctxt "ConfigDialog" msgid "Sharing" -msgstr "" +msgstr "S'està compartint" msgctxt "ConfigDialog" msgid "Services" -msgstr "" +msgstr "Serveis" msgctxt "ConfigDialog" msgid "Appearance" -msgstr "" +msgstr "Aparença" msgctxt "ConfigDialog" msgid "Advanced" -msgstr "" +msgstr "Avançat" msgctxt "ConfigDialog" msgid "Help" -msgstr "" +msgstr "Ajuda" msgctxt "ConfigDialog" msgid "Error Saving Settings" -msgstr "" +msgstr "Error mentre es desaven les preferències" msgctxt "ConfigDialog" msgid "Vidalia was unable to save your %1 settings." -msgstr "" +msgstr "Vidalia ha estat incapaç de desar les vostres %1 preferències." msgctxt "ConfigDialog" msgid "Error Applying Settings" @@ -1908,54 +1915,61 @@ msgstr "Vidalia ha estat incapaç d'autenticar-se amb el programari Tor. (%1)" msgctxt "MainWindow" msgid "Please check your control port authentication settings." msgstr "" +"Si us plau, reviseu el paràmetre amb el port de control d'autenticació." msgctxt "MainWindow" msgid "Tor Update Available" -msgstr "" +msgstr "Actualització de Tor disponible" msgctxt "MainWindow" msgid "" "The currently installed version of Tor is out of date or no longer " "recommended. Please visit the Tor website to download the latest version." msgstr "" +"La versió actual del Tor està desactualitzada i ja no està recomanada. Si us" +" plau, visiteu el lloc web del Tor per a descarregar la darrera versió." msgctxt "MainWindow" msgid "Tor website: %1" -msgstr "" +msgstr "Lloc web del Tor: %1" msgctxt "MainWindow" msgid "" "All subsequent connections will appear to be different than your old " "connections." msgstr "" +"Totes les connexions següents apareixeran diferents que les seves antigues " +"connexions." msgctxt "MainWindow" msgid "Failed to Create New Identity" -msgstr "" +msgstr "Creació de Nova Identitat fallida" msgctxt "MainWindow" msgid "Port Forwarding Failed" -msgstr "" +msgstr "Reenviament de ports fallit" msgctxt "MainWindow" msgid "Vidalia was unable to configure automatic port forwarding." msgstr "" +"Vidalia ha estat incapaç de configurar automàticament el reenviament de " +"ports." msgctxt "MainWindow" msgid "Vidalia Control Panel" -msgstr "" +msgstr "Panell de control de Vidalia" msgctxt "MainWindow" msgid "Status" -msgstr "" +msgstr "Estat" msgctxt "MainWindow" msgid "Vidalia Shortcuts" -msgstr "" +msgstr "Dreceres de Vidalia" msgctxt "MainWindow" msgid "Setup Relaying" -msgstr "" +msgstr "Configuració del relaying" msgctxt "MainWindow" msgid "Set up a relay and help the network grow" @@ -1963,15 +1977,15 @@ msgstr "" msgctxt "MainWindow" msgid "View the Network" -msgstr "" +msgstr "Visualitza la xarxa" msgctxt "MainWindow" msgid "View a map of the Tor network" -msgstr "" +msgstr "Visualitza un mapa de la xarxa Tor" msgctxt "MainWindow" msgid "Use a New Identity" -msgstr "" +msgstr "Utilitza una nova Identitat" msgctxt "MainWindow" msgid "Make subsequent connections appear new" @@ -1979,43 +1993,43 @@ msgstr "" msgctxt "MainWindow" msgid "View recent bandwidth usage" -msgstr "" +msgstr "Visualitza l'ús recent de l'amplada de banda" msgctxt "MainWindow" msgid "View log message history" -msgstr "" +msgstr "Visualitza l'historial de missatges de registre" msgctxt "MainWindow" msgid "View help documentation" -msgstr "" +msgstr "Visualitza la documentació d'ajuda" msgctxt "MainWindow" msgid "Configure Vidalia" -msgstr "" +msgstr "Configura Vidalia" msgctxt "MainWindow" msgid "View version and license information" -msgstr "" +msgstr "Visualitza la versió i informació de llicència" msgctxt "MainWindow" msgid "Exit Vidalia" -msgstr "" +msgstr "Surt de Vidalia" msgctxt "MainWindow" msgid "Show this window on startup" -msgstr "" +msgstr "Mostra aquesta finestra en l'arrancada" msgctxt "MainWindow" msgid "Hide" -msgstr "" +msgstr "Oculta" msgctxt "MainWindow" msgid "Hide this window" -msgstr "" +msgstr "Oculta aquesta finestra" msgctxt "MainWindow" msgid "Password Reset Failed" -msgstr "" +msgstr "Reinicialització de la contrasenya fallida" msgctxt "MainWindow" msgid "" @@ -2023,17 +2037,23 @@ msgid "" "the Tor software. Please check your Task Manager to ensure there are no " "other Tor processes running." msgstr "" +"Vidalia ha intentat reinicialitzar la contrasenya de control del Tor, però " +"no ha etat capaç de reinicialitzar el programari Tor. Si us plau, reviseu el" +" Gestor de Tasques per a assegurar-vos que no hi ha d'altres processos Tor " +"executant-se." msgctxt "MainWindow" msgid "" "The currently installed version of Tor is out of date or no longer " "recommended." msgstr "" +"La versió instal·lada del Tor està desactualitzada i ja no està recomanada." msgctxt "MainWindow" msgid "" "Would you like to check if a newer package is available for installation?" msgstr "" +"Desitgeu revisar si un paquet més nou està disponible per a ser instal·lat?" msgctxt "MainWindow" msgid "Potentially Unsafe Connection"

1 0

[metrics-lib/master] Fix indentation.
by karsten＠torproject.org 10 Jan '12

10 Jan '12

commit 64ed56619822504c643a34c23f739556e7e83898 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Jan 10 19:35:06 2012 +0100 Fix indentation. --- .../torproject/descriptor/impl/ParseHelper.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/org/torproject/descriptor/impl/ParseHelper.java b/src/org/torproject/descriptor/impl/ParseHelper.java index 1f03517..3f80ddb 100644 --- a/src/org/torproject/descriptor/impl/ParseHelper.java +++ b/src/org/torproject/descriptor/impl/ParseHelper.java @@ -15,7 +15,7 @@ import org.apache.commons.codec.binary.Hex; public class ParseHelper { private static Pattern ipv4Pattern = - Pattern.compile("^[0-9\\.]{7,15}$"); + Pattern.compile("^[0-9\\.]{7,15}$"); public static String parseIpv4Address(String line, String address) throws DescriptorParseException { boolean isValid = true;

1 0

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

10 Jan '12

commit dbb636f0777a1d248d5ce5663548eddca439531b Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 10 18:15:16 2012 +0000 Update translations for vidalia --- ca/vidalia_ca.po | 193 +++++++++++++++++++++++++++++------------------------- 1 files changed, 103 insertions(+), 90 deletions(-) diff --git a/ca/vidalia_ca.po b/ca/vidalia_ca.po index a2f3cbe..0f97df3 100755 --- a/ca/vidalia_ca.po +++ b/ca/vidalia_ca.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-09-07 14:40+0000\n" -"PO-Revision-Date: 2012-01-10 17:43+0000\n" +"PO-Revision-Date: 2012-01-10 18:12+0000\n" "Last-Translator: Gerard Farràs Ballabriga <>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -454,7 +454,7 @@ msgstr "" msgctxt "ControlSocket" msgid "Error sending control command. [%1]" -msgstr "" +msgstr "Error en la tramesa de la comanda de control. [%1]" msgctxt "ControlSocket" msgid "Socket disconnected while attempting to read a line of data." @@ -466,31 +466,31 @@ msgstr "" msgctxt "CountryInfo" msgid "Afghanistan" -msgstr "" +msgstr "Afganistan" msgctxt "CountryInfo" msgid "Andorra" -msgstr "" +msgstr "Andorra" msgctxt "CountryInfo" msgid "Angola" -msgstr "" +msgstr "Angola" msgctxt "CountryInfo" msgid "Antigua & Barbuda" -msgstr "" +msgstr "Antigua i Barbuda" msgctxt "CountryInfo" msgid "Argentina" -msgstr "" +msgstr "Argentina" msgctxt "CountryInfo" msgid "Armenia" -msgstr "" +msgstr "Armènia" msgctxt "CountryInfo" msgid "Australia" -msgstr "" +msgstr "Austràlia" msgctxt "CountryInfo" msgid "Azerbaijan" @@ -514,7 +514,7 @@ msgstr "" msgctxt "CountryInfo" msgid "Belgium" -msgstr "" +msgstr "Bèlgica" msgctxt "CountryInfo" msgid "Belize" @@ -526,7 +526,7 @@ msgstr "" msgctxt "CountryInfo" msgid "Bolivia" -msgstr "" +msgstr "Bolívia" msgctxt "CountryInfo" msgid "Bosnia & Herzegovina" @@ -538,7 +538,7 @@ msgstr "" msgctxt "CountryInfo" msgid "Brazil" -msgstr "" +msgstr "Brasil" msgctxt "CountryInfo" msgid "Brunei Darussalam" @@ -546,7 +546,7 @@ msgstr "" msgctxt "CountryInfo" msgid "Bulgaria" -msgstr "" +msgstr "Bulgària" msgctxt "CountryInfo" msgid "Burkina Faso" @@ -562,11 +562,11 @@ msgstr "" msgctxt "CountryInfo" msgid "Cameroon" -msgstr "" +msgstr "Camerun" msgctxt "CountryInfo" msgid "Canada" -msgstr "" +msgstr "Canadà" msgctxt "CountryInfo" msgid "Cape Verde" @@ -582,15 +582,15 @@ msgstr "" msgctxt "CountryInfo" msgid "Chile" -msgstr "" +msgstr "Xile" msgctxt "CountryInfo" msgid "China" -msgstr "" +msgstr "Xina" msgctxt "CountryInfo" msgid "Colombia" -msgstr "" +msgstr "Colòmbia" msgctxt "CountryInfo" msgid "Comoros" @@ -606,7 +606,7 @@ msgstr "" msgctxt "CountryInfo" msgid "Costa Rica" -msgstr "" +msgstr "Costa Rica" msgctxt "CountryInfo" msgid "Cote dâIvoire" @@ -614,7 +614,7 @@ msgstr "" msgctxt "CountryInfo" msgid "Croatia" -msgstr "" +msgstr "Croàcia" msgctxt "CountryInfo" msgid "Cuba" @@ -1311,7 +1311,7 @@ msgstr "" msgctxt "GeneralPage" msgid "Executables (*.exe)" -msgstr "" +msgstr "Executables (*.exe)" msgctxt "GeneralPage" msgid "Select Path to Tor" @@ -1323,31 +1323,31 @@ msgstr "" msgctxt "GeneralPage" msgid "You must specify the name of your Tor executable." -msgstr "" +msgstr "Heu d'especificar el nom de l'executable del Tor" msgctxt "GeneralPage" msgid "Start Vidalia when my system starts" -msgstr "" +msgstr "Executa Vidalia quan el sistema arranqui" msgctxt "GeneralPage" msgid "Browse" -msgstr "" +msgstr "Navega" msgctxt "GeneralPage" msgid "Start the Tor software when Vidalia starts" -msgstr "" +msgstr "Executa el Tor quan arranqui Vidalia" msgctxt "GeneralPage" msgid "Tor" -msgstr "" +msgstr "Tor" msgctxt "GeneralPage" msgid "Proxy Application (optional)" -msgstr "" +msgstr "Aplicació de proxy (opcional)" msgctxt "GeneralPage" msgid "Start a proxy application when Tor starts" -msgstr "" +msgstr "Arranca l'aplicació de proxy quan arranqui el Tor" msgctxt "GeneralPage" msgid "Proxy Application Arguments:" @@ -1355,7 +1355,7 @@ msgstr "" msgctxt "GeneralPage" msgid "Software Updates" -msgstr "" +msgstr "Actualitzacions de programari" msgctxt "GeneralPage" msgid "Check for new software updates automatically" @@ -1395,43 +1395,43 @@ msgstr "" msgctxt "HelpBrowser" msgid "Search reached end of document" -msgstr "" +msgstr "La recerca ha arribat al final del document" msgctxt "HelpBrowser" msgid "Search reached start of document" -msgstr "" +msgstr "La recerca ha arribat a l'inici del document" msgctxt "HelpBrowser" msgid "Text not found in document" -msgstr "" +msgstr "El text no ha estat trobat en el document" msgctxt "HelpBrowser" msgid "Found %1 results" -msgstr "" +msgstr "S'han trobat %1 resultats" msgctxt "HelpBrowser" msgid "Vidalia Help" -msgstr "" +msgstr "Ajuda de Vidalia" msgctxt "HelpBrowser" msgid "Back" -msgstr "" +msgstr "Enrera" msgctxt "HelpBrowser" msgid "Move to previous page (Backspace)" -msgstr "" +msgstr "Mou a la pàgina prèvia (Backspace)" msgctxt "HelpBrowser" msgid "Backspace" -msgstr "" +msgstr "Retrocés" msgctxt "HelpBrowser" msgid "Forward" -msgstr "" +msgstr "Avança" msgctxt "HelpBrowser" msgid "Move to next page (Shift+Backspace)" -msgstr "" +msgstr "Mou a la pàgina següent (Shift+Backspace)" msgctxt "HelpBrowser" msgid "Shift+Backspace" @@ -1439,87 +1439,87 @@ msgstr "" msgctxt "HelpBrowser" msgid "Home" -msgstr "" +msgstr "Inici" msgctxt "HelpBrowser" msgid "Move to the Home page (Ctrl+H)" -msgstr "" +msgstr "Vés a la pàgina d'inici (Ctrl+H)" msgctxt "HelpBrowser" msgid "Ctrl+H" -msgstr "" +msgstr "Ctrl+H" msgctxt "HelpBrowser" msgid "Find" -msgstr "" +msgstr "Cerca" msgctxt "HelpBrowser" msgid "Search for a word or phrase on current page (Ctrl+F)" -msgstr "" +msgstr "Cerca per una paraula o frase en la pàgina actual (Ctrl+F)" msgctxt "HelpBrowser" msgid "Ctrl+F" -msgstr "" +msgstr "Ctrl+F" msgctxt "HelpBrowser" msgid "Close" -msgstr "" +msgstr "Tanca" msgctxt "HelpBrowser" msgid "Close Vidalia Help" -msgstr "" +msgstr "Tanca l'ajuda de Vidalia" msgctxt "HelpBrowser" msgid "Esc" -msgstr "" +msgstr "Esc" msgctxt "HelpBrowser" msgid "Find:" -msgstr "" +msgstr "Cerca:" msgctxt "HelpBrowser" msgid "Find Previous" -msgstr "" +msgstr "Cerca anterior" msgctxt "HelpBrowser" msgid "Find Next" -msgstr "" +msgstr "Cerca següent" msgctxt "HelpBrowser" msgid "Case sensitive" -msgstr "" +msgstr "Distingeix majúscules i minúscules" msgctxt "HelpBrowser" msgid "Whole words only" -msgstr "" +msgstr "Només paraules senceres" msgctxt "HelpBrowser" msgid "Help Topics" -msgstr "" +msgstr "Temes d'ajuda" msgctxt "HelpBrowser" msgid "Contents" -msgstr "" +msgstr "Continguts" msgctxt "HelpBrowser" msgid "Search" -msgstr "" +msgstr "Recerca" msgctxt "HelpBrowser" msgid "Searching for:" -msgstr "" +msgstr "Recerca per:" msgctxt "HelpBrowser" msgid "Found Documents" -msgstr "" +msgstr "Documents trobats" msgctxt "HelpBrowser" msgid "Error Loading Help Contents:" -msgstr "" +msgstr "Error mentre carregava els continguts d'ajuda" msgctxt "HelpTextBrowser" msgid "Opening External Link" -msgstr "" +msgstr "S'està obrint un enllaç extern" msgctxt "HelpTextBrowser" msgid "" @@ -1527,36 +1527,42 @@ msgid "" "browser is not currently configured to use Tor then the request will not be " "anonymous." msgstr "" +"Vidalia pot obrir l'enllaç que heu seleccionat en el seu navegador per " +"defecte. Si el vostre navegador no està actualment configurat per a " +"utilitzar el Tor, llavors la petició no podrà ser anònima" msgctxt "HelpTextBrowser" msgid "Do you want Vidalia to open the link in your Web browser?" -msgstr "" +msgstr "Desitgeu que Vidalia obri l'enllaç en el seu navegador web ?" msgctxt "HelpTextBrowser" msgid "Unable to Open Link" -msgstr "" +msgstr "Incapaç d'obrir l'enllaç" msgctxt "HelpTextBrowser" msgid "" "Vidalia was unable to open the selected link in your Web browser. You can " "still copy the URL and paste it into your browser." msgstr "" +"Vidalia ha estat incapaç d'obrir l'enllaç que heu seleccionat en el seu " +"navegador Web. De totes maneres, encara podeu copiar la URL i enganxar-la en" +" el vostre navegador web." msgctxt "HelpTextBrowser" msgid "Error opening help file:" -msgstr "" +msgstr "Error mentre s'obria el fitxer d'ajuda:" msgctxt "LicenseDialog" msgid "License Information" -msgstr "" +msgstr "Informació de la llicència" msgctxt "LicenseDialog" msgid "License" -msgstr "" +msgstr "Llicència" msgctxt "LicenseDialog" msgid "Credits" -msgstr "" +msgstr "Crèdits" msgctxt "LogEvent" msgid "Debug" @@ -1564,7 +1570,7 @@ msgstr "" msgctxt "LogEvent" msgid "Info" -msgstr "" +msgstr "Informació" msgctxt "LogEvent" msgid "Notice" @@ -1572,15 +1578,15 @@ msgstr "" msgctxt "LogEvent" msgid "Warning" -msgstr "" +msgstr "Avís" msgctxt "LogEvent" msgid "Error" -msgstr "" +msgstr "Error" msgctxt "LogEvent" msgid "Unknown" -msgstr "" +msgstr "Desconegut" msgctxt "LogTreeItem" msgid "Debug" @@ -1608,15 +1614,15 @@ msgstr "" msgctxt "MainWindow" msgid "Start Tor" -msgstr "" +msgstr "Arranca el Tor" msgctxt "MainWindow" msgid "Exit" -msgstr "" +msgstr "Surt" msgctxt "MainWindow" msgid "Bandwidth Graph" -msgstr "" +msgstr "Gràfica de l'amplada de banda" msgctxt "MainWindow" msgid "Message Log" @@ -1808,89 +1814,96 @@ msgstr "" msgctxt "MainWindow" msgid "Starting the Tor software" -msgstr "" +msgstr "S'està arrancant el programari Tor" msgctxt "MainWindow" msgid "Starting Tor" -msgstr "" +msgstr "S'està arrancant el Tor" msgctxt "MainWindow" msgid "Error Starting Tor" -msgstr "" +msgstr "Error mentre s'arrancava el Tor" msgctxt "MainWindow" msgid "" "Vidalia was unable to start Tor. Check your settings to ensure the correct " "name and location of your Tor executable is specified." msgstr "" +"Vidalia ha estat incapaç d'arrancar el Tor. Reviseu les vostres preferències" +" per a assegurar-vos que el nom és correcte i la ubicació de l'executable " +"del Tor està especificada." msgctxt "MainWindow" msgid "Connecting to Tor" -msgstr "" +msgstr "S'està connectant al Tor" msgctxt "MainWindow" msgid "Connection Error" -msgstr "" +msgstr "Error en la connexió" msgctxt "MainWindow" msgid "Relaying is Enabled" -msgstr "" +msgstr "El relaying està habilitat" msgctxt "MainWindow" msgid "Error Shutting Down" -msgstr "" +msgstr "Error mentre es tancava" msgctxt "MainWindow" msgid "Vidalia was unable to stop the Tor software." -msgstr "" +msgstr "Vidalia ha estat incapaç d'aturar el Tor." msgctxt "MainWindow" msgid "Unexpected Error" -msgstr "" +msgstr "Error imprevist" msgctxt "MainWindow" msgid "Authenticating to Tor" -msgstr "" +msgstr "S'està autenticant el Tor" msgctxt "MainWindow" msgid "Cookie Authentication Required" -msgstr "" +msgstr "Es requereix l'autenticació amb galetes" msgctxt "MainWindow" msgid "" "The Tor software requires Vidalia to send the contents of an authentication " "cookie, but Vidalia was unable to find one." msgstr "" +"El programari Tor requereix Vidalia per a trametre els continguts d'una " +"galeta d'autenticació, però Vidalia ha estat incapaç de trobar-ne cap." msgctxt "MainWindow" msgid "Would you like to browse for the file 'control_auth_cookie' yourself?" -msgstr "" +msgstr "Desitgeu navegar pel fitxer 'control_auth_cookie' vós mateix?" msgctxt "MainWindow" msgid "Data Directory" -msgstr "" +msgstr "Carpeta de dades" msgctxt "MainWindow" msgid "Control Cookie (control_auth_cookie)" -msgstr "" +msgstr "Control de galetes (control_auth_cookie)" msgctxt "MainWindow" msgid "Error Registering for Events" -msgstr "" +msgstr "Error mentre s'enregistraven els esdeveniments" msgctxt "MainWindow" msgid "" "Vidalia was unable to register for some events. Many of Vidalia's features " "may be unavailable." msgstr "" +"Vidalia ha estat incapaç d'entregistrar diversos esdeveniments. Moltes de " +"les característiques de Vidalia podrien no estar disponibles." msgctxt "MainWindow" msgid "Authentication Error" -msgstr "" +msgstr "Error d'autenticació" msgctxt "MainWindow" msgid "Vidalia was unable to authenticate to the Tor software. (%1)" -msgstr "" +msgstr "Vidalia ha estat incapaç d'autenticar-se amb el programari Tor. (%1)" msgctxt "MainWindow" msgid "Please check your control port authentication settings."

1 0

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

10 Jan '12

commit 3e741afac71143beddc8bbb0bcb676838b366c09 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 10 17:45:14 2012 +0000 Update translations for vidalia --- ca/vidalia_ca.po | 77 ++++++++++++++++++++++++++++-------------------------- 1 files changed, 40 insertions(+), 37 deletions(-) diff --git a/ca/vidalia_ca.po b/ca/vidalia_ca.po index 7804812..a2f3cbe 100755 --- a/ca/vidalia_ca.po +++ b/ca/vidalia_ca.po @@ -1,12 +1,13 @@ # # Translators: +# Gerard Farràs Ballabriga <>, 2012. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-09-07 14:40+0000\n" -"PO-Revision-Date: 2010-12-05 20:03+0000\n" -"Last-Translator: \n" +"PO-Revision-Date: 2012-01-10 17:43+0000\n" +"Last-Translator: Gerard Farràs Ballabriga <>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -17,32 +18,34 @@ msgstr "" msgctxt "AboutDialog" msgid "About Vidalia" -msgstr "" +msgstr "Quant a Vidalia" msgctxt "AboutDialog" msgid "License" -msgstr "" +msgstr "Llicència" msgctxt "AboutDialog" msgid "Vidalia 0.2.0" -msgstr "" +msgstr "Vidalia 0.2.0" msgctxt "AboutDialog" msgid "Tor 0.2.0.32" -msgstr "" +msgstr "Tor 0.2.0.32" msgctxt "AboutDialog" msgid "Qt 4.4.2" -msgstr "" +msgstr "Qt 4.4.2" msgctxt "AdvancedPage" msgid "'%1' is not a valid IP address." -msgstr "" +msgstr "%1 no és una adreça ip vàlida." msgctxt "AdvancedPage" msgid "" "You selected 'Password' authentication, but did not specify a password." msgstr "" +"Heu seleccionat autenticació amb 'Contrasenya', però no n'heu especificat " +"cap." msgctxt "AdvancedPage" msgid "Select Tor Configuration File" @@ -50,15 +53,15 @@ msgstr "" msgctxt "AdvancedPage" msgid "File Not Found" -msgstr "" +msgstr "Fitxer no trobat" msgctxt "AdvancedPage" msgid "%1 does not exist. Would you like to create it?" -msgstr "" +msgstr "%1 no existeix. El desitgeu crear ?" msgctxt "AdvancedPage" msgid "Failed to Create File" -msgstr "" +msgstr "Creació de fitxer fallida" msgctxt "AdvancedPage" msgid "Unable to create %1 [%2]" @@ -82,11 +85,11 @@ msgstr "" msgctxt "AdvancedPage" msgid "Authentication:" -msgstr "" +msgstr "Autenticació:" msgctxt "AdvancedPage" msgid "Address:" -msgstr "" +msgstr "Adreça:" msgctxt "AdvancedPage" msgid "None" @@ -94,27 +97,27 @@ msgstr "" msgctxt "AdvancedPage" msgid "Cookie" -msgstr "" +msgstr "Galeta" msgctxt "AdvancedPage" msgid "Password" -msgstr "" +msgstr "Contrasenya" msgctxt "AdvancedPage" msgid "Randomly Generate" -msgstr "" +msgstr "Generació aleatòria" msgctxt "AdvancedPage" msgid ":" -msgstr "" +msgstr ":" msgctxt "AdvancedPage" msgid "Tor Configuration File" -msgstr "" +msgstr "Fitxer de configuració del Tor" msgctxt "AdvancedPage" msgid "Start the Tor software with the specified configuration file (torrc)" -msgstr "" +msgstr "Arranca el Tor amb el fitxer de configuració especificat (torrc)" msgctxt "AdvancedPage" msgid "Select path to your configuration file" @@ -122,11 +125,11 @@ msgstr "" msgctxt "AdvancedPage" msgid "Browse" -msgstr "" +msgstr "Navega" msgctxt "AdvancedPage" msgid "Data Directory" -msgstr "" +msgstr "Directori de dades" msgctxt "AdvancedPage" msgid "Store data for the Tor software in the following directory" @@ -205,7 +208,7 @@ msgstr "" msgctxt "AppearancePage" msgid "Language" -msgstr "" +msgstr "Llengua" msgctxt "AppearancePage" msgid "Choose the language used in Vidalia" @@ -213,7 +216,7 @@ msgstr "" msgctxt "AppearancePage" msgid "Style" -msgstr "" +msgstr "Estil" msgctxt "AppearancePage" msgid "Choose Vidalia's interface style" @@ -225,23 +228,23 @@ msgstr "" msgctxt "BandwidthGraph" msgid "Since:" -msgstr "" +msgstr "Des de:" msgctxt "BandwidthGraph" msgid "Hide Settings" -msgstr "" +msgstr "Oculta les preferències" msgctxt "BandwidthGraph" msgid "Show Settings" -msgstr "" +msgstr "Mostra les preferències" msgctxt "BandwidthGraph" msgid "Tor Bandwidth Usage" -msgstr "" +msgstr "Ús de l'amplada de banda del Tor" msgctxt "BandwidthGraph" msgid "Reset" -msgstr "" +msgstr "Reinicia" msgctxt "BandwidthGraph" msgid "Receive Rate" @@ -253,11 +256,11 @@ msgstr "" msgctxt "BandwidthGraph" msgid "Always on Top" -msgstr "" +msgstr "Sempre visible" msgctxt "BandwidthGraph" msgid "Style" -msgstr "" +msgstr "Estil" msgctxt "BandwidthGraph" msgid "Changes the transparency of the Bandwidth Graph" @@ -265,19 +268,19 @@ msgstr "" msgctxt "BandwidthGraph" msgid "100" -msgstr "" +msgstr "100" msgctxt "BandwidthGraph" msgid "% Opaque" -msgstr "" +msgstr "% d'opacitat" msgctxt "BandwidthGraph" msgid "Save" -msgstr "" +msgstr "Desa" msgctxt "BandwidthGraph" msgid "Cancel" -msgstr "" +msgstr "Cancel·la" msgctxt "BridgeDownloader" msgid "Starting HTTPS bridge request..." @@ -421,7 +424,7 @@ msgstr "" msgctxt "ConfigDialog" msgid "Settings" -msgstr "" +msgstr "Preferències" msgctxt "ControlConnection" msgid "Vidalia was unable to connect to Tor. (%1)" @@ -433,11 +436,11 @@ msgstr "" msgctxt "ControlPasswordInputDialog" msgid "Password Required" -msgstr "" +msgstr "Contrasenya requerida" msgctxt "ControlPasswordInputDialog" msgid "Remember my password" -msgstr "" +msgstr "Recorda la meva contrasenya" msgctxt "ControlPasswordInputDialog" msgid ""

1 0

[tor/master] Test for broken counter-mode at runtime
by nickm＠torproject.org 10 Jan '12

10 Jan '12

commit d29a3907338bd012ce5707e0e052747da87b3ba4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jan 9 17:40:11 2012 -0500 Test for broken counter-mode at runtime To solve bug 4779, we want to avoid OpenSSL 1.0.0's counter mode. But Fedora (and maybe others) lie about the actual OpenSSL version, so we can't trust the header to tell us if it's safe. Instead, let's do a run-time test to see whether it's safe, and if not, use our built-in version. fermenthor contributed a pretty essential fixup to this patch. Thanks! --- changes/aes_ctr_test | 5 ++ src/common/aes.c | 141 +++++++++++++++++++++++++++++++++--------------- src/common/aes.h | 1 + src/common/crypto.c | 1 + src/test/test_crypto.c | 1 + 5 files changed, 106 insertions(+), 43 deletions(-) diff --git a/changes/aes_ctr_test b/changes/aes_ctr_test new file mode 100644 index 0000000..8b5af45 --- /dev/null +++ b/changes/aes_ctr_test @@ -0,0 +1,5 @@ + o Minor bugfixes + - Test for the OpenSSL 1.0.0 counter mode bug at runtime, not compile + time. This is necessary because OpenSSL has been hacked to mis-report + its version on a few distributions. + Bugfix on Tor 0.2.3.11-alpha. diff --git a/src/common/aes.c b/src/common/aes.c index 5791e66..f6288e8 100644 --- a/src/common/aes.c +++ b/src/common/aes.c @@ -18,10 +18,10 @@ #include <openssl/evp.h> #include <openssl/engine.h> #include "crypto.h" -#if OPENSSL_VERSION_NUMBER >= OPENSSL_V(1,0,0,'a') +#if OPENSSL_VERSION_NUMBER >= OPENSSL_V_SERIES(1,0,0) /* See comments about which counter mode implementation to use below. */ #include <openssl/modes.h> -#define USE_OPENSSL_CTR +#define CAN_USE_OPENSSL_CTR #endif #include "compat.h" #include "aes.h" @@ -62,7 +62,7 @@ struct aes_cnt_cipher { AES_KEY aes; } key; -#if !defined(WORDS_BIGENDIAN) && !defined(USE_OPENSSL_CTR) +#if !defined(WORDS_BIGENDIAN) #define USING_COUNTER_VARS /** These four values, together, implement a 128-bit counter, with * counter0 as the low-order word and counter3 as the high-order word. */ @@ -84,11 +84,7 @@ struct aes_cnt_cipher { /** The encrypted value of ctr_buf. */ uint8_t buf[16]; /** Our current stream position within buf. */ -#ifdef USE_OPENSSL_CTR unsigned int pos; -#else - uint8_t pos; -#endif /** True iff we're using the evp implementation of this cipher. */ uint8_t using_evp; @@ -98,6 +94,11 @@ struct aes_cnt_cipher { * we're testing it or because we have hardware acceleration configured */ static int should_use_EVP = 0; +#ifdef CAN_USE_OPENSSL_CTR +/**DOCDOC*/ +static int should_use_openssl_CTR = 0; +#endif + /** Check whether we should use the EVP interface for AES. If force_val * is nonnegative, we use use EVP iff it is true. Otherwise, we use EVP * if there is an engine enabled for aes-ecb. */ @@ -128,7 +129,50 @@ evaluate_evp_for_aes(int force_val) return 0; } -#ifndef USE_OPENSSL_CTR +/**DOCDOC*/ +int +evaluate_ctr_for_aes(void) +{ +#ifdef CAN_USE_OPENSSL_CTR + /* Result of encrypting an all-zero block with an all-zero 128-bit AES key. + * This should be the same as encrypting an all-zero block with an all-zero + * 128-bit AES key in counter mode, starting at position 0 of the stream. + */ + static const unsigned char encrypt_zero[] = + "\x66\xe9\x4b\xd4\xef\x8a\x2c\x3b\x88\x4c\xfa\x59\xca\x34\x2b\x2e"; + unsigned char zero[16]; + unsigned char output[16]; + unsigned char ivec[16]; + unsigned char ivec_tmp[16]; + unsigned int pos, i; + AES_KEY key; + memset(zero, 0, sizeof(zero)); + memset(ivec, 0, sizeof(ivec)); + AES_set_encrypt_key(zero, 128, &key); + + pos = 0; + /* Encrypting a block one byte at a time should make the error manifest + * itself for known bogus openssl versions. */ + for (i=0; i<16; ++i) + AES_ctr128_encrypt(&zero[i], &output[i], 1, &key, ivec, ivec_tmp, &pos); + + if (memcmp(output, encrypt_zero, 16)) { + /* Counter mode is buggy */ + log_notice(LD_CRYPTO, "This OpenSSL has a buggy version of counter mode; " + "not using it."); + } else { + /* Counter mode is okay */ + log_notice(LD_CRYPTO, "This OpenSSL has a good implementation of counter " + "mode; using it."); + should_use_openssl_CTR = 1; + } +#else + log_notice(LD_CRYPTO, "This version of OpenSSL has a slow implementation of " + "counter mode; not using it."); +#endif + return 0; +} + #if !defined(USING_COUNTER_VARS) #define COUNTER(c, n) ((c)->ctr_buf.buf32[3-(n)]) #else @@ -157,7 +201,6 @@ _aes_fill_buf(aes_cnt_cipher_t *cipher) AES_encrypt(cipher->ctr_buf.buf, cipher->buf, &cipher->key.aes); } } -#endif /** * Return a newly allocated counter-mode AES128 cipher implementation. @@ -203,11 +246,12 @@ aes_set_key(aes_cnt_cipher_t *cipher, const char *key, int key_bits) cipher->pos = 0; -#ifdef USE_OPENSSL_CTR - memset(cipher->buf, 0, sizeof(cipher->buf)); -#else - _aes_fill_buf(cipher); +#ifdef CAN_USE_OPENSSL_CTR + if (should_use_openssl_CTR) + memset(cipher->buf, 0, sizeof(cipher->buf)); + else #endif + _aes_fill_buf(cipher); } /** Release storage held by cipher @@ -232,7 +276,7 @@ aes_free_cipher(aes_cnt_cipher_t *cipher) #define UPDATE_CTR_BUF(c, n) #endif -#ifdef USE_OPENSSL_CTR +#ifdef CAN_USE_OPENSSL_CTR /* Helper function to use EVP with openssl's counter-mode wrapper. */ static void evp_block128_fn(const uint8_t in[16], uint8_t out[16], @@ -252,29 +296,34 @@ void aes_crypt(aes_cnt_cipher_t *cipher, const char *input, size_t len, char *output) { -#ifdef USE_OPENSSL_CTR - if (cipher->using_evp) { - /* In openssl 1.0.0, there's an if'd out EVP_aes_128_ctr in evp.h. If - * it weren't disabled, it might be better just to use that. - */ - CRYPTO_ctr128_encrypt((const unsigned char *)input, - (unsigned char *)output, - len, - &cipher->key.evp, - cipher->ctr_buf.buf, - cipher->buf, - &cipher->pos, - evp_block128_fn); - } else { - AES_ctr128_encrypt((const unsigned char *)input, - (unsigned char *)output, - len, - &cipher->key.aes, - cipher->ctr_buf.buf, - cipher->buf, - &cipher->pos); +#ifdef CAN_USE_OPENSSL_CTR + if (should_use_openssl_CTR) { + if (cipher->using_evp) { + /* In openssl 1.0.0, there's an if'd out EVP_aes_128_ctr in evp.h. If + * it weren't disabled, it might be better just to use that. + */ + CRYPTO_ctr128_encrypt((const unsigned char *)input, + (unsigned char *)output, + len, + &cipher->key.evp, + cipher->ctr_buf.buf, + cipher->buf, + &cipher->pos, + evp_block128_fn); + } else { + AES_ctr128_encrypt((const unsigned char *)input, + (unsigned char *)output, + len, + &cipher->key.aes, + cipher->ctr_buf.buf, + cipher->buf, + &cipher->pos); + } + return; } -#else + else +#endif + { int c = cipher->pos; if (PREDICT_UNLIKELY(!len)) return; @@ -297,7 +346,7 @@ aes_crypt(aes_cnt_cipher_t *cipher, const char *input, size_t len, UPDATE_CTR_BUF(cipher, 0); _aes_fill_buf(cipher); } -#endif + } } /** Encrypt len bytes from input, storing the results in place. @@ -307,9 +356,14 @@ aes_crypt(aes_cnt_cipher_t *cipher, const char *input, size_t len, void aes_crypt_inplace(aes_cnt_cipher_t *cipher, char *data, size_t len) { -#ifdef USE_OPENSSL_CTR - aes_crypt(cipher, data, len, data); -#else +#ifdef CAN_USE_OPENSSL_CTR + if (should_use_openssl_CTR) { + aes_crypt(cipher, data, len, data); + return; + } + else +#endif + { int c = cipher->pos; if (PREDICT_UNLIKELY(!len)) return; @@ -332,7 +386,7 @@ aes_crypt_inplace(aes_cnt_cipher_t *cipher, char *data, size_t len) UPDATE_CTR_BUF(cipher, 0); _aes_fill_buf(cipher); } -#endif + } } /** Reset the 128-bit counter of cipher to the 16-bit big-endian value @@ -349,8 +403,9 @@ aes_set_iv(aes_cnt_cipher_t *cipher, const char *iv) cipher->pos = 0; memcpy(cipher->ctr_buf.buf, iv, 16); -#ifndef USE_OPENSSL_CTR - _aes_fill_buf(cipher); +#ifdef CAN_USE_OPENSSL_CTR + if (!should_use_openssl_CTR) #endif + _aes_fill_buf(cipher); } diff --git a/src/common/aes.h b/src/common/aes.h index 221e846..f7f0319 100644 --- a/src/common/aes.h +++ b/src/common/aes.h @@ -25,6 +25,7 @@ void aes_crypt_inplace(aes_cnt_cipher_t *cipher, char *data, size_t len); void aes_set_iv(aes_cnt_cipher_t *cipher, const char *iv); int evaluate_evp_for_aes(int force_value); +int evaluate_ctr_for_aes(void); #endif diff --git a/src/common/crypto.c b/src/common/crypto.c index 35d6dfa..364b6a7 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -281,6 +281,7 @@ crypto_global_init(int useAccel, const char *accelName, const char *accelDir) } evaluate_evp_for_aes(-1); + evaluate_ctr_for_aes(); return crypto_seed_rng(1); } diff --git a/src/test/test_crypto.c b/src/test/test_crypto.c index cad8c2f..2adbcc9 100644 --- a/src/test/test_crypto.c +++ b/src/test/test_crypto.c @@ -105,6 +105,7 @@ test_crypto_aes(void *arg) int use_evp = !strcmp(arg,"evp"); evaluate_evp_for_aes(use_evp); + evaluate_ctr_for_aes(); data1 = tor_malloc(1024); data2 = tor_malloc(1024);

1 0

[tor/master] Clean up indentation in aes.c
by nickm＠torproject.org 10 Jan '12

10 Jan '12

commit cc5c14b7327924e7136f8709d69cf23761ab7a44 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 10 10:07:33 2012 -0500 Clean up indentation in aes.c --- src/common/aes.c | 76 +++++++++++++++++++++++++++--------------------------- 1 files changed, 38 insertions(+), 38 deletions(-) diff --git a/src/common/aes.c b/src/common/aes.c index f6288e8..3c315dc 100644 --- a/src/common/aes.c +++ b/src/common/aes.c @@ -324,28 +324,28 @@ aes_crypt(aes_cnt_cipher_t *cipher, const char *input, size_t len, else #endif { - int c = cipher->pos; - if (PREDICT_UNLIKELY(!len)) return; - - while (1) { - do { - if (len-- == 0) { cipher->pos = c; return; } - *(output++) = *(input++) ^ cipher->buf[c]; - } while (++c != 16); - cipher->pos = c = 0; - if (PREDICT_UNLIKELY(! ++COUNTER(cipher, 0))) { - if (PREDICT_UNLIKELY(! ++COUNTER(cipher, 1))) { - if (PREDICT_UNLIKELY(! ++COUNTER(cipher, 2))) { - ++COUNTER(cipher, 3); - UPDATE_CTR_BUF(cipher, 3); + int c = cipher->pos; + if (PREDICT_UNLIKELY(!len)) return; + + while (1) { + do { + if (len-- == 0) { cipher->pos = c; return; } + *(output++) = *(input++) ^ cipher->buf[c]; + } while (++c != 16); + cipher->pos = c = 0; + if (PREDICT_UNLIKELY(! ++COUNTER(cipher, 0))) { + if (PREDICT_UNLIKELY(! ++COUNTER(cipher, 1))) { + if (PREDICT_UNLIKELY(! ++COUNTER(cipher, 2))) { + ++COUNTER(cipher, 3); + UPDATE_CTR_BUF(cipher, 3); + } + UPDATE_CTR_BUF(cipher, 2); } - UPDATE_CTR_BUF(cipher, 2); + UPDATE_CTR_BUF(cipher, 1); } - UPDATE_CTR_BUF(cipher, 1); + UPDATE_CTR_BUF(cipher, 0); + _aes_fill_buf(cipher); } - UPDATE_CTR_BUF(cipher, 0); - _aes_fill_buf(cipher); - } } } @@ -364,28 +364,28 @@ aes_crypt_inplace(aes_cnt_cipher_t *cipher, char *data, size_t len) else #endif { - int c = cipher->pos; - if (PREDICT_UNLIKELY(!len)) return; - - while (1) { - do { - if (len-- == 0) { cipher->pos = c; return; } - *(data++) ^= cipher->buf[c]; - } while (++c != 16); - cipher->pos = c = 0; - if (PREDICT_UNLIKELY(! ++COUNTER(cipher, 0))) { - if (PREDICT_UNLIKELY(! ++COUNTER(cipher, 1))) { - if (PREDICT_UNLIKELY(! ++COUNTER(cipher, 2))) { - ++COUNTER(cipher, 3); - UPDATE_CTR_BUF(cipher, 3); + int c = cipher->pos; + if (PREDICT_UNLIKELY(!len)) return; + + while (1) { + do { + if (len-- == 0) { cipher->pos = c; return; } + *(data++) ^= cipher->buf[c]; + } while (++c != 16); + cipher->pos = c = 0; + if (PREDICT_UNLIKELY(! ++COUNTER(cipher, 0))) { + if (PREDICT_UNLIKELY(! ++COUNTER(cipher, 1))) { + if (PREDICT_UNLIKELY(! ++COUNTER(cipher, 2))) { + ++COUNTER(cipher, 3); + UPDATE_CTR_BUF(cipher, 3); + } + UPDATE_CTR_BUF(cipher, 2); } - UPDATE_CTR_BUF(cipher, 2); + UPDATE_CTR_BUF(cipher, 1); } - UPDATE_CTR_BUF(cipher, 1); + UPDATE_CTR_BUF(cipher, 0); + _aes_fill_buf(cipher); } - UPDATE_CTR_BUF(cipher, 0); - _aes_fill_buf(cipher); - } } }

1 0

[tor/master] Add missing documentation for counter-mode checks
by nickm＠torproject.org 10 Jan '12

10 Jan '12

commit dca3c9fff87227b8119afe804ce0ae8ed840b1f8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 10 11:13:45 2012 -0500 Add missing documentation for counter-mode checks --- src/common/aes.c | 17 ++++++++++++----- 1 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/common/aes.c b/src/common/aes.c index 3c315dc..da7220f 100644 --- a/src/common/aes.c +++ b/src/common/aes.c @@ -47,8 +47,8 @@ * OpenSSL pre-1.0 (by about 10%!). But OpenSSL 1.0.0 added a counter mode * implementation faster than the one here (by about 7%). So we pick which * one to used based on the Openssl version above. (OpenSSL 1.0.0a fixed a - * critical bug in that counter mode implementation, so we actually require - * that one.) + * critical bug in that counter mode implementation, so we need to test to + * make sure that we have a fixed version.) */ /*======================================================================*/ @@ -90,12 +90,13 @@ struct aes_cnt_cipher { uint8_t using_evp; }; -/** True if we should prefer the EVP implementation for AES, either because +/** True iff we should prefer the EVP implementation for AES, either because * we're testing it or because we have hardware acceleration configured */ static int should_use_EVP = 0; #ifdef CAN_USE_OPENSSL_CTR -/**DOCDOC*/ +/** True iff we have tested the counter-mode implementation and found that it + * doesn't have the counter-mode bug from OpenSSL 1.0.0. */ static int should_use_openssl_CTR = 0; #endif @@ -129,7 +130,13 @@ evaluate_evp_for_aes(int force_val) return 0; } -/**DOCDOC*/ +/** Test the OpenSSL counter mode implementation to see whether it has the + * counter-mode bug from OpenSSL 1.0.0. If the implementation works, then + * we will use it for future encryption/decryption operations. + * + * We can't just look at the OpenSSL version, since some distributions update + * their OpenSSL packages without changing the version number. + **/ int evaluate_ctr_for_aes(void) {

1 0

[tor/master] We no longer need to detect openssl without RAND_poll()
by nickm＠torproject.org 10 Jan '12

10 Jan '12

commit 5741aef3dc0dc245ab930c21b277a5a829c9970d Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 5 15:08:05 2012 -0500 We no longer need to detect openssl without RAND_poll() We require openssl 0.9.7 or later, and RAND_poll() was first added in openssl 0.9.6. --- changes/readable_ssl_versions | 2 ++ src/common/crypto.c | 10 +--------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/changes/readable_ssl_versions b/changes/readable_ssl_versions index 8c8e06c..f34998c 100644 --- a/changes/readable_ssl_versions +++ b/changes/readable_ssl_versions @@ -1,4 +1,6 @@ o Code simplification and refactoring: - Use macros to indicate OpenSSL versions, so we don't need to worry about accidental hexadecimal bit shifts. + - Remove some workaround code for OpenSSL 0.9.6, which is no longer + supported. diff --git a/src/common/crypto.c b/src/common/crypto.c index aa8ceed..35d6dfa 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -2360,12 +2360,6 @@ crypto_dh_free(crypto_dh_env_t *dh) * work for us too. */ #define ADD_ENTROPY 32 -/** True iff we should use OpenSSL's RAND_poll function to add entropy to its - * pool. - * - * Use RAND_poll if OpenSSL is 0.9.6 release or later. */ -#define HAVE_RAND_POLL (OPENSSL_VERSION_NUMBER >= OPENSSL_V_NOPATCH(0,9,6)) - /** True iff it's safe to use RAND_poll after setup. * * Versions of OpenSSL prior to 0.9.7k and 0.9.8c had a bug where RAND_poll @@ -2409,8 +2403,7 @@ crypto_seed_rng(int startup) size_t n; #endif -#if HAVE_RAND_POLL - /* OpenSSL 0.9.6 adds a RAND_poll function that knows about more kinds of + /* OpenSSL has a RAND_poll function that knows about more kinds of * entropy than we do. We'll try calling that, *and* calling our own entropy * functions. If one succeeds, we'll accept the RNG as seeded. */ if (startup || RAND_POLL_IS_SAFE) { @@ -2418,7 +2411,6 @@ crypto_seed_rng(int startup) if (rand_poll_status == 0) log_warn(LD_CRYPTO, "RAND_poll() failed."); } -#endif #ifdef MS_WINDOWS if (!provider_set) {

1 0