diff --git a/checkin_notes b/checkin_notes index 902607e78b..43ca829781 100644 --- a/checkin_notes +++ b/checkin_notes @@ -6614,3 +6614,13 @@ David 28 July 2009 app_start.cpp sched/ handle_request.cpp + +David 28 July 2009 + - client: if an HTTP op fails within 30 sec of client startup, + don't skip the reference site check. + Instead, defer the reference site check until 30 secs after startup. + Also, if during this interval (when the check has been requested + but not started) return net status as LOOKUP_PENDING + + client/ + net_stats.cpp diff --git a/client/net_stats.cpp b/client/net_stats.cpp index 3e0c31c08c..6fa8364f83 100644 --- a/client/net_stats.cpp +++ b/client/net_stats.cpp @@ -135,7 +135,9 @@ int NET_STATUS::network_status() { if (gstate.http_ops->nops()) { last_comm_time = gstate.now; } - if (gstate.lookup_website_op.error_num == ERR_IN_PROGRESS) { + if (need_to_contact_reference_site) { + retval = NETWORK_STATUS_LOOKUP_PENDING; + } else if (gstate.lookup_website_op.error_num == ERR_IN_PROGRESS) { retval = NETWORK_STATUS_LOOKUP_PENDING; } else if (gstate.now - last_comm_time < 10) { retval = NETWORK_STATUS_ONLINE; @@ -176,24 +178,20 @@ void NET_STATUS::network_available() { // An HTTP operation failed; // it could be because there's no physical network connection. -// Find out for sure by trying to contact google +// Find out for sure by trying to contact a reference site // void NET_STATUS::got_http_error() { - if ((gstate.lookup_website_op.error_num != ERR_IN_PROGRESS) - && !need_physical_connection - && gstate.now > gstate.last_wakeup_time + 30 - // for 30 seconds after wakeup, the network system (DNS etc.) - // may still be coming up, so don't worry for now - && !config.dont_contact_ref_site - ) { - if (log_flags.network_status_debug) { - msg_printf(0, MSG_INFO, - "[network_status_debug] got http error and not still waking up" - ); - } - need_to_contact_reference_site = true; - show_ref_message = true; + if (gstate.lookup_website_op.error_num == ERR_IN_PROGRESS) return; + if (need_physical_connection) return; + if (config.dont_contact_ref_site) return; + + if (log_flags.network_status_debug) { + msg_printf(0, MSG_INFO, + "[network_status_debug] got HTTP error - checking ref site" + ); } + need_to_contact_reference_site = true; + show_ref_message = true; } void NET_STATUS::contact_reference_site() { @@ -253,6 +251,11 @@ void LOOKUP_WEBSITE_OP::handle_reply(int http_op_retval) { } void NET_STATUS::poll() { + // for 30 seconds after wakeup, the network system (DNS etc.) + // may still be coming up, so defer the reference site check; + // otherwise might show spurious "need connection" message + // + if (gstate.now < gstate.last_wakeup_time + 30) return; if (net_status.need_to_contact_reference_site && gstate.gui_http.state==GUI_HTTP_STATE_IDLE) { net_status.contact_reference_site(); } diff --git a/doc/versions.inc b/doc/versions.inc index ba1556a625..0ee28bf6b7 100644 --- a/doc/versions.inc +++ b/doc/versions.inc @@ -259,15 +259,16 @@ function is_dev($v) { //$url_base = "http://boincdl.ssl.berkeley.edu/dl/"; //$url_base = "http://mirror.worldcommunitygrid.org/mirror/"; -$url_base = "http://boincdl3.ssl.berkeley.edu/mirror/"; -//switch(rand(0,5)) { +switch(rand(0,3)) { + case 0: $url_base = "http://einstein.ligo.caltech.edu/download/boinc/dl/"; break; + case 1: $url_base = "http://boincdl3.ssl.berkeley.edu/mirror/"; break; + case 2: $url_base = "http://einstein.aei.mpg.de/download/boinc/dl/"; break; //case 0: $url_base = "http://boinc.berkeley.edu/dl/"; break; //case 1: $url_base = "http://morel.mit.edu/download/boinc/dl/"; break; //case 2: $url_base = "http://einstein.aei.mpg.de/download/boinc/dl/"; break; //case 3: $url_base = "http://einstein.astro.gla.ac.uk/download/boinc/dl/"; break; //case 4: $url_base = "http://albert.gravity.psu.edu/download/boinc/dl/"; break; - //case 5: $url_base = "http://einstein.ligo.caltech.edu/download/boinc/dl/"; break; //case 6: $url_base = "http://einstein.phys.uwm.edu/download/boinc/dl/"; break; -//} +} ?> diff --git a/html/languages/translations/es.po b/html/languages/translations/es.po index 19fce63e2f..f636b0b212 100644 --- a/html/languages/translations/es.po +++ b/html/languages/translations/es.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: BOINC translation team \n" "POT-Creation-Date: 2009-05-09 21:36 PDT\n" -"PO-Revision-Date: 2009-07-23 06:58-0700\n" +"PO-Revision-Date: 2009-07-28 12:41-0700\n" "Last-Translator: David M \n" "Language-Team: \n" "Language: es\n" @@ -698,7 +698,7 @@ msgstr "" " Por favor, modifique su texto e inténtelo de nuevo." msgid "Your profile submission was empty." -msgstr "" +msgstr "El envío de su perfil estaba vacío." msgid "Could not update the profile: database error" msgstr "No se pudo actualizar el perfil: error de la base de datos" @@ -729,14 +729,16 @@ msgstr "" "editar un perfil. Sentimos las molestias." msgid "Download BOINC add-on software" -msgstr "" +msgstr "Descarge extensiones para BOINC" msgid "You can download applications in several categories." -msgstr "" +msgstr "Usted puede descargar programas de varias categorías." msgid "" "These applications are not endorsed by %1 and you use them at your own risk." msgstr "" +"Estos programas no están aprobados por %1 y usted asume los riesgos de " +"usarlos." msgid "" "We do not provide instructions for installing these applications.\n" @@ -744,15 +746,20 @@ msgid "" "uninstalling the application. \n" "If this is not enough you should contact the author." msgstr "" +"Nosotros no proporcionamos instrucciones para instalar estos programas.\n" +"Sin embargo, el autor puede haber proporcionado ayuda para instalar o " +"desinstalar el programa. \n" +"Si esto no es suficiente deberá contactar con el autor." msgid "Instructions for installing and running BOINC are %1here%2." -msgstr "" +msgstr "Instrucciones para instalar y ejecutar BOINC están %1aquí%2." msgid "This list is managed centrally at %1the BOINC website%2." msgstr "" +"Esta lista es administrada centralmente desde %1el sitio web de BOINC%2." msgid "fll" -msgstr "" +msgstr "fll" msgid "Title" msgstr "Título" @@ -769,6 +776,8 @@ msgid "" "If you have a question or problem, please use the %1Questions & Answers%2 " "section of the message boards." msgstr "" +"Si tiene alguna pregunta o problema, por favor, use la sección %1Preguntas & " +"Respuestas%2 de los foros." msgid "Topic" msgstr "Tema" @@ -786,10 +795,10 @@ msgid "Forum search results" msgstr "Resultados de la búsqueda en el foro" msgid "No thread with id %1. Please check the link and try again." -msgstr "" +msgstr "No hay hilo con id %1. Por favor, pulse en el enlace y pruebe de nuevo." msgid "This forum is not visible to you." -msgstr "" +msgstr "Este foro no es visible para usted." # ######################################## # Forum thread @@ -797,41 +806,46 @@ msgid "This thread has been hidden for administrative purposes" msgstr "Este hilo está oculto por motivos administrativos" msgid "My question was answered" -msgstr "" +msgstr "Mi pregunta fue respondida." msgid "" "If your question has been adequately answered please click here to close it!" msgstr "" +"¡Si su pregunta ha sido respondida adecuadamente, por favor, pulse aquí para " +"cerrarla!" msgid "I've also got this question" -msgstr "" +msgstr "Yo también tengo esta pregunta" msgid "Add a new message to this thread" -msgstr "" +msgstr "Añadir un mensaje nuevo a este hilo" msgid "Unsubscribe" msgstr "Cancelar suscripción" msgid "You are subscribed to this thread. Click here to unsubscribe." msgstr "" +"Usted está suscrito a este hilo. Pulse aquí para cancelar la suscripción." msgid "Subscribe" -msgstr "Subscribirse" +msgstr "Suscribirse" msgid "Click to get email when there are new posts in this thread" msgstr "" +"Pulse para recibir correo electrónico cuando haya nuevos mensajes en este " +"hilo" msgid "Unhide" -msgstr "" +msgstr "Hacer visible" msgid "Unhide this thread" -msgstr "" +msgstr "Hacer visible este hilo" msgid "Hide" -msgstr "" +msgstr "Ocultar" msgid "Hide this thread" -msgstr "" +msgstr "Ocultar este hilo" msgid "Make unsticky" msgstr "" @@ -846,53 +860,54 @@ msgid "Make this thread sticky" msgstr "" msgid "Unlock" -msgstr "" +msgstr "Desbloquear" msgid "Unlock this thread" -msgstr "" +msgstr "Desbloquear este hilo" msgid "Lock" -msgstr "" +msgstr "Bloquear" msgid "Lock this thread" -msgstr "" +msgstr "Bloquear este hilo" msgid "Move" -msgstr "" +msgstr "Mover" msgid "Move this thread to a different forum" -msgstr "" +msgstr "Mover este hilo a un foro diferente" msgid "Edit title" -msgstr "" +msgstr "Editar título" msgid "Edit thread title" -msgstr "" +msgstr "Editar el título del hilo" msgid "Sort" -msgstr "" +msgstr "Clasificar" msgid "Already friends" -msgstr "" +msgstr "Ya amigos" +#, fuzzy msgid "You requested friendship with %1 on %2." -msgstr "" +msgstr "Tu pediste amistad con %1 en %2." msgid "This request is still pending confirmation." -msgstr "" +msgstr "Esta petición está todavía pendiente de confirmación." +#, fuzzy msgid "%1 is not accepting friendship requests from you" -msgstr "" +msgstr "%1 no está aceptando peticiones tuyas de amistad" msgid "You can't be friends with yourself" -msgstr "" +msgstr "No puedes hacerte amigo de ti mismo." msgid "No such user" msgstr "No existe dicho usuario" -#, fuzzy msgid "Add friend" -msgstr "Añadir como amigo" +msgstr "Añadir amigo" msgid "" "You have asked to add %1 as a friend. We will notify %2 and will ask him/her " @@ -903,86 +918,92 @@ msgid "Add an optional message here:" msgstr "" msgid "Database error" -msgstr "" +msgstr "Error de la base de datos" +#, fuzzy msgid "Friend request sent" -msgstr "" +msgstr "Petición de amigo enviada" msgid "We have notified %1 of your request." -msgstr "" +msgstr "Hemos notificado a %1 tu petición." msgid "Request not found" -msgstr "" +msgstr "Petición no encontrada" +#, fuzzy msgid "Friend request" -msgstr "" +msgstr "Petición de amigo" +#, fuzzy msgid "%1 has added you as a friend." -msgstr "" +msgstr "%1 te ha añadido como amigo." msgid "%1 says: %2" -msgstr "" +msgstr "%1 dice: %2" +#, fuzzy msgid "Accept friendship" -msgstr "" +msgstr "Aceptar amistad" msgid "Click accept if %1 is in fact a friend" -msgstr "" +msgstr "Pulse aceptar si %1 es realmente un amigo" +#, fuzzy msgid "Decline" -msgstr "" +msgstr "Declinar" msgid "Click decline if %1 is not a friend" -msgstr "" +msgstr "Pulse declinar si %1 no es un amigo" msgid "No request" msgstr "" msgid "Friendship confirmed" -msgstr "" +msgstr "Amistad confirmada" msgid "Your friendship with %1 has been confirmed." -msgstr "" +msgstr "Su amistad con %1 ha sido confirmada." msgid "Friendship declined" -msgstr "" +msgstr "Amistad declinada" msgid "You have declined friendship with %1" -msgstr "" +msgstr "Usted ha declinado la amistad con %1" msgid "Notification not found" -msgstr "" +msgstr "Notificación no encontrada" msgid "Friend confirmed" -msgstr "" +msgstr "Amigo confirmado" msgid "You are now friends with %1." -msgstr "" +msgstr "Ahora %1 y tu sois amigos." #, fuzzy msgid "Cancel friendship?" -msgstr "Cancelar amistad" +msgstr "¿Cancelar amistad?" msgid "Are you sure you want to cancel your friendship with %1?" msgstr "" msgid "Yes" -msgstr "" +msgstr "Sí" msgid "No" -msgstr "" +msgstr "No" msgid "Stay friends" msgstr "" msgid "Friendship cancelled" -msgstr "" +msgstr "Amistad cancelada" msgid "Your friendship with %1 has been cancelled." -msgstr "" +msgstr "Su amistad con %1 ha sido cancelada." +#, fuzzy msgid "Unknown action" -msgstr "" +msgstr "Acción desconocida" msgid "Welcome to %1" msgstr "Bienvenido a %1" @@ -1361,40 +1382,44 @@ msgid "" "Additionally you can get your individual statistics summed across all BOINC " "projects from several sites; see your %1home page%2." msgstr "" +"Adicionalmente usted podra acceder a sus estadísticas individuales sumadas " +"de todos sus projectos BOINC desde varios sitios web; mire su %1página de " +"incio%2." msgid "%1 participants may form %2teams%3" -msgstr "" +msgstr "%1 participantes pueden formar %2equipos%3" msgid "" "You may belong to only one team. You can join or quit a team at any time." msgstr "" +"Usted solo podrá pertenecer a un equipo. Usted puede unirse o salir de un " +"equipo en cualquier momento." msgid "Each team has a %1founder%2 who may:" -msgstr "" +msgstr "Cada equipo tiene un %1fundador%2 que puede:" msgid "access team members' email addresses" -msgstr "" +msgstr "acceder a las direcciones de e-mail de los miembros" msgid "edit the team's name and description" -msgstr "" +msgstr "editar el nombre y la descripción del equipo" msgid "remove members from the team" msgstr "quitar miembros del equipo" msgid "disband a team if it has no members" -msgstr "" +msgstr "dar de baja el equipo si no tiene miembros" msgid "To join a team, visit its team page and click %1Join this team%2." msgstr "" -"Para unirse a un equipo, visite la pagina del equipo y pulse en %1Unirse a " +"Para unirse a un equipo, visite la página del equipo y pulse en %1Unirse a " "este equipo%2" -#, fuzzy msgid "Find a team" msgstr "Encontrar un equipo" msgid "All teams" -msgstr "Todos los Equipos" +msgstr "Todos los equipos" msgid "%1 teams" msgstr "%1 equipos" @@ -1524,5 +1549,7 @@ msgstr "" #~ msgid "Yes, delete" #~ msgstr "Sí, borrar" +# ######################################## +# "Your account" page (home.php) #~ msgid "No such message." #~ msgstr "No existe dicho mensaje."