Strange error
authorMarcelo Poli <mpoli@lt24.zzn.com>
Fri, 20 Sep 2013 15:46:20 -0300
changeset 1535 d855516267a19c82eacbaa5fa5244c254be2ca1f
parent 1534 8b01306ee6cff4b001216db8a6fc7de0fb90e3f1
child 1536 d32ac0fcb0ac2fe08022b968e04d807c01cae94c
push id1
push usersledru@mozilla.com
push dateThu, 04 Dec 2014 21:47:06 +0000
Strange error
browser/chrome/browser/devtools/styleeditor.dtd
browser/chrome/browser/sanitize.dtd
--- a/browser/chrome/browser/devtools/styleeditor.dtd
+++ b/browser/chrome/browser/devtools/styleeditor.dtd
@@ -17,26 +17,17 @@
 <!ENTITY importButton.label         "Importar…">
 <!ENTITY importButton.tooltip       "Importar y adjuntar al documento una hoja de estilo existente">
 <!ENTITY importButton.accesskey     "I">
 
 <!ENTITY visibilityToggle.tooltip   "Alternar visibilidad de la hoja de estilo">
 
 <!ENTITY saveButton.label           "Guardar">
 <!ENTITY saveButton.tooltip         "Guardar esta hoja de estilo en un archivo">
-<<<<<<< local
 <!ENTITY saveButton.accesskey       "G">
-<!ENTITY saveButton.commandkey      "s">
-
-<!-- LOCALICATION NOTE  (scoped.label): This is shown in a stylesheets list item
-     when the stylesheet uses the scoped attribute on the <style> element. -->
-<!ENTITY scoped.label               "Ámbito.">
-=======
-<!ENTITY saveButton.accesskey       "s">
->>>>>>> other
 
 <!ENTITY editorTextbox.placeholder  "Ingrese CSS aquí.">
 
 <!-- LOCALICATION NOTE  (noStyleSheet.label): This is shown when a page has no
      stylesheet. -->
 <!ENTITY noStyleSheet.label         "Esta página no tiene hoja de estilo.">
 
 <!-- LOCALICATION NOTE  (noStyleSheet-tip-start.label): This is the start of a
--- a/browser/chrome/browser/sanitize.dtd
+++ b/browser/chrome/browser/sanitize.dtd
@@ -28,23 +28,17 @@ that require it.  -->
      480169 -->
 <!ENTITY detailsProgressiveDisclosure.label     "Detalles">
 <!ENTITY detailsProgressiveDisclosure.accesskey "e">
 
 <!ENTITY historySection.label         "Historial">
 <!ENTITY dataSection.label            "Datos">
 
 <!ENTITY itemHistoryAndDownloads.label     "Historial de descargas y navegación">
-<<<<<<< local
-<!ENTITY itemHistoryAndDownloads.accesskey "H">
-<!ENTITY itemBrowsingHistory.label         "Historial de navegación">
-<!ENTITY itemBrowsingHistory.accesskey     "H">
-=======
-<!ENTITY itemHistoryAndDownloads.accesskey "B">
->>>>>>> other
+<!ENTITY itemHistoryAndDownloads.accesskey "d">
 <!ENTITY itemFormSearchHistory.label       "Historial de búsquedas y formularios">
 <!ENTITY itemFormSearchHistory.accesskey   "F">
 <!ENTITY itemPasswords.label               "Contraseñas guardadas">
 <!ENTITY itemPasswords.accesskey           "P">
 <!ENTITY itemCookies.label                 "Cookies">
 <!ENTITY itemCookies.accesskey             "C">
 <!ENTITY itemCache.label                   "Caché">
 <!ENTITY itemCache.accesskey               "A">