Updating trunk
authorMarcelo Poli <mpoli@lt24.zzn.com>
Sat, 20 Feb 2010 15:47:30 -0300
changeset 205 eb3ee4041c34e7d2891ef7b2d21ea0f917b1bd68
parent 204 a340e5b9daa56048baaa17612c1e4a6129a52a27
child 206 9fa51d3f128594dc1b8b0e6d598a5a1ff803f5bf
push id1
push usersledru@mozilla.com
push dateThu, 04 Dec 2014 21:47:06 +0000
Updating trunk
security/manager/chrome/pipnss/nsserrors.properties
suite/chrome/common/pref/pref-history.dtd
suite/chrome/common/unix/platformCommunicatorOverlay.dtd
toolkit/chrome/global/filepicker.properties
--- a/security/manager/chrome/pipnss/nsserrors.properties
+++ b/security/manager/chrome/pipnss/nsserrors.properties
@@ -104,16 +104,17 @@ SSL_ERROR_CERTIFICATE_UNOBTAINABLE_ALERT
 SSL_ERROR_UNRECOGNIZED_NAME_ALERT=SSL peer has no certificate for the requested DNS name.
 SSL_ERROR_BAD_CERT_STATUS_RESPONSE_ALERT=SSL peer was unable to get an OCSP response for its certificate.
 SSL_ERROR_BAD_CERT_HASH_VALUE_ALERT=SSL peer reported bad certificate hash value.
 SSL_ERROR_RX_UNEXPECTED_NEW_SESSION_TICKET=SSL received an unexpected New Session Ticket handshake message.                             
 SSL_ERROR_RX_MALFORMED_NEW_SESSION_TICKET=SSL received a malformed New Session Ticket handshake message.                                
 SSL_ERROR_DECOMPRESSION_FAILURE=SSL recibió un registro comprimido que no pudo descomprimirse.                                        
 SSL_ERROR_RENEGOTIATION_NOT_ALLOWED=Renegotiación no permitida en este tipo de socket SSL.                                                    
 SSL_ERROR_UNSAFE_NEGOTIATION=Peer attempted old style (potentially vulnerable) handshake.
+SSL_ERROR_RX_UNEXPECTED_UNCOMPRESSED_RECORD=SSL recibió un registro no comprimido inesperado.
 SEC_ERROR_IO=An I/O error occurred during security authorization.
 SEC_ERROR_LIBRARY_FAILURE=security library failure.
 SEC_ERROR_BAD_DATA=security library: received bad data.
 SEC_ERROR_OUTPUT_LEN=security library: output length error.
 SEC_ERROR_INPUT_LEN=security library has experienced an input length error.
 SEC_ERROR_INVALID_ARGS=security library: invalid arguments.
 SEC_ERROR_INVALID_ALGORITHM=security library: invalid algorithm.
 SEC_ERROR_INVALID_AVA=security library: invalid AVA.
--- a/suite/chrome/common/pref/pref-history.dtd
+++ b/suite/chrome/common/pref/pref-history.dtd
@@ -1,21 +1,14 @@
 <!ENTITY  pref.history.title                "Historial">
 
 <!ENTITY  pref.history.caption              "Historial de navegación">
 <!ENTITY  historyPages.label                "Historial es una lista de las páginas visitadas previamente.">
-<!ENTITY  expireDaysMin1.label              "Siempre recordar las páginas visitadas por al menos">
-<!ENTITY  expireDaysMin1.accesskey          "a">
-<!ENTITY  expireDaysMin2.label              "días">
-<!ENTITY  expireDays1.label                 "Recordar las páginas visitadas hasta">
-<!ENTITY  expireDays1.accesskey             "e">
-<!ENTITY  expireDays2.label                 "días">
-<!ENTITY  expireSites1.label                "Recordar hasta">
-<!ENTITY  expireSites1.accesskey            "R">
-<!ENTITY  expireSites2.label                "páginas visitadas">
+<!ENTITY  enableHistory.label               "Recordar páginas visitadas">
+<!ENTITY  enableHistory.accesskey           "R">
 <!ENTITY  clearHistory.label                "Borrar Historial">
 <!ENTITY  clearHistory.accesskey            "s">
 
 <!ENTITY  locationBarHistory.caption        "Historial de la barra de navegación">
 <!ENTITY  clearLocationBar.label            "Borrar el listado de sitios guardados en el menú de la barra de navegación.">
 <!ENTITY  clearLocationBarButton.label      "Borrar barra de navegación">
 <!ENTITY  clearLocationBarButton.accesskey  "B">
 <!ENTITY  formfillHistory.caption           "Historial de formularios y búsquedas">
--- a/suite/chrome/common/unix/platformCommunicatorOverlay.dtd
+++ b/suite/chrome/common/unix/platformCommunicatorOverlay.dtd
@@ -22,12 +22,8 @@
 <!ENTITY openHelpCmd.label              "Contenido de la ayuda">
 <!ENTITY openHelpCmd.accesskey          "C">
 <!ENTITY openHelpCmd.key                "VK_F1">
 
 <!-- Key labels, for mousewheel prefs -->
 <!ENTITY ctrlKey.label                  "Ctrl">
 <!ENTITY altKey.label                   "Alt">
 <!ENTITY shiftKey.label                 "May">
-
-<!-- Copy Image Location (regression fix for bug 469481) -->
-<!ENTITY copyImageURLCmd.label          "Copiar dirección de la imagen">
-<!ENTITY copyImageURLCmd.accesskey      "i">
--- a/toolkit/chrome/global/filepicker.properties
+++ b/toolkit/chrome/global/filepicker.properties
@@ -1,21 +1,16 @@
 # LOCALIZATION NOTE FILE
 # --do not localize the extensions, only the titles
 allTitle = Todos los archivos
-allFilter = *
 htmlTitle = Archivos HTML
-htmlFilter = *.html; *.htm; *.shtml; *.xhtml
 textTitle = Archivos de Texto
-textFilter = *.txt; *.text
 imageTitle = Archivos de imágenes
 xmlTitle = Archivos XML
-xmlFilter = *.xml
 xulTitle = Archivos XUL
-xulFilter = *.xul
 appsTitle = Aplicaciones
 
 dirTextInputLabel = Nombre de directorio:
 dirTextInputAccesskey=N
 
 confirmTitle = Confirmar
 confirmFileReplacing = %S ya existe.¿Desea reemplazarlo?
 openButtonLabel = Abrir