Migrating aurora to beta for Firefox 16 CALENDAR_1_8_BUILD1 CALENDAR_1_8_RELEASE CALENDAR_1_8b1_BUILD1 CALENDAR_1_8b1_RELEASE FENNEC_16_0b2_BUILD1 FENNEC_16_0b2_BUILD2 FENNEC_16_0b2_RELEASE FENNEC_16_0b3_BUILD1 FENNEC_16_0b3_RELEASE FENNEC_16_0b4_BUILD1 FENNEC_16_0b4_RELEASE FENNEC_16_0b5_BUILD1 FENNEC_16_0b5_RELEASE FENNEC_16_0b6_BUILD1 FENNEC_16_0b6_RELEASE FENNEC_17_0b1_BUILD1 FENNEC_17_0b1_BUILD2 FENNEC_17_0b1_RELEASE FENNEC_17_0b2_BUILD1 FENNEC_17_0b2_BUILD2 FENNEC_17_0b2_RELEASE FENNEC_17_0b3_BUILD1 FENNEC_17_0b3_RELEASE FENNEC_17_0b4_BUILD1 FENNEC_17_0b4_RELEASE FENNEC_17_0b5_BUILD1 FENNEC_17_0b5_RELEASE FENNEC_17_0b6_BUILD1 FENNEC_17_0b6_BUILD2 FENNEC_17_0b6_RELEASE FENNEC_17_0b7_BUILD1 FENNEC_17_0b7_RELEASE FENNEC_18_0b1_BUILD1 FENNEC_18_0b1_RELEASE FENNEC_18_0b2_BUILD1 FENNEC_18_0b2_RELEASE FENNEC_18_0b3_BUILD1 FENNEC_18_0b3_RELEASE FENNEC_18_0b4_BUILD1 FENNEC_18_0b4_BUILD2 FENNEC_18_0b4_RELEASE FENNEC_18_0b5_BUILD1 FENNEC_18_0b5_RELEASE FENNEC_18_0b6_BUILD1 FENNEC_18_0b6_RELEASE FENNEC_18_0b7_BUILD1 FENNEC_18_0b7_RELEASE FENNEC_19_0b1_BUILD1 FENNEC_19_0b1_BUILD2 FENNEC_19_0b1_RELEASE FENNEC_19_0b2_BUILD1 FENNEC_19_0b2_RELEASE FENNEC_19_0b3_BUILD1 FENNEC_19_0b3_RELEASE FENNEC_19_0b4_BUILD1 FENNEC_19_0b4_RELEASE FENNEC_19_0b5_BUILD1 FENNEC_19_0b5_BUILD2 FENNEC_19_0b5_RELEASE FENNEC_19_0b6_BUILD1 FENNEC_19_0b6_RELEASE FENNEC_20_0b1_BUILD1 FENNEC_20_0b1_BUILD2 FENNEC_20_0b1_BUILD3 FENNEC_20_0b1_RELEASE FENNEC_20_0b2_BUILD1 FENNEC_20_0b2_BUILD2 FENNEC_20_0b2_RELEASE FENNEC_20_0b3_BUILD1 FENNEC_20_0b3_RELEASE FENNEC_20_0b4_BUILD1 FENNEC_20_0b4_RELEASE FENNEC_20_0b5_BUILD1 FENNEC_20_0b5_RELEASE FENNEC_20_0b6_BUILD1 FENNEC_20_0b6_RELEASE FENNEC_20_0b7_BUILD1 FENNEC_20_0b7_RELEASE FENNEC_21_0b1_BUILD1 FENNEC_21_0b1_RELEASE FENNEC_21_0b2_BUILD1 FENNEC_21_0b2_BUILD2 FENNEC_21_0b2_RELEASE FENNEC_21_0b3_BUILD1 FENNEC_21_0b3_RELEASE FENNEC_21_0b4_BUILD1 FENNEC_21_0b4_RELEASE FENNEC_21_0b6_BUILD1 FENNEC_21_0b6_RELEASE FENNEC_21_0b7_BUILD1 FENNEC_21_0b7_RELEASE FENNEC_21_0b8_BUILD1 FENNEC_21_0b8_RELEASE FENNEC_22_0b1_BUILD1 FENNEC_22_0b1_RELEASE FENNEC_22_0b2_BUILD1 FENNEC_22_0b2_RELEASE FENNEC_22_0b3_BUILD1 FENNEC_22_0b3_RELEASE FENNEC_22_0b4_BUILD1 FENNEC_22_0b4_RELEASE FENNEC_22_0b5_BUILD1 FENNEC_22_0b5_RELEASE FENNEC_22_0b6_BUILD1 FENNEC_22_0b6_RELEASE FENNEC_23_0b10_BUILD1 FENNEC_23_0b10_RELEASE FENNEC_23_0b1_BUILD1 FENNEC_23_0b1_RELEASE FENNEC_23_0b2_BUILD1 FENNEC_23_0b2_RELEASE FENNEC_23_0b4_BUILD1 FENNEC_23_0b4_RELEASE FENNEC_23_0b6_BUILD1 FENNEC_23_0b6_RELEASE FENNEC_23_0b8_BUILD1 FENNEC_23_0b8_BUILD2 FENNEC_23_0b8_RELEASE FENNEC_24_0b10_BUILD1 FENNEC_24_0b10_BUILD2 FENNEC_24_0b10_RELEASE FENNEC_24_0b1_BUILD1 FENNEC_24_0b1_BUILD2 FENNEC_24_0b1_BUILD3 FENNEC_24_0b1_RELEASE FENNEC_24_0b2_BUILD1 FENNEC_24_0b2_RELEASE FENNEC_24_0b4_BUILD1 FENNEC_24_0b4_RELEASE FENNEC_24_0b6_BUILD1 FENNEC_24_0b6_RELEASE FENNEC_24_0b8_BUILD1 FENNEC_24_0b8_RELEASE FENNEC_25_0b10_BUILD1 FENNEC_25_0b10_RELEASE FENNEC_25_0b1_BUILD1 FENNEC_25_0b1_BUILD2 FENNEC_25_0b1_RELEASE FENNEC_25_0b2_BUILD1 FENNEC_25_0b2_RELEASE FENNEC_25_0b4_BUILD1 FENNEC_25_0b4_RELEASE FENNEC_25_0b6_BUILD1 FENNEC_25_0b6_RELEASE FENNEC_25_0b8_BUILD1 FENNEC_25_0b8_RELEASE FENNEC_26_0b10_BUILD1 FENNEC_26_0b10_RELEASE FENNEC_26_0b1_BUILD1 FENNEC_26_0b1_RELEASE FENNEC_26_0b2_BUILD1 FENNEC_26_0b2_RELEASE FENNEC_26_0b4_BUILD1 FENNEC_26_0b4_RELEASE FENNEC_26_0b6_BUILD1 FENNEC_26_0b6_RELEASE FENNEC_26_0b8_BUILD1 FENNEC_26_0b8_RELEASE FENNEC_27_0b10_BUILD1 FENNEC_27_0b10_RELEASE FENNEC_27_0b1_BUILD1 FENNEC_27_0b1_RELEASE FENNEC_27_0b2_BUILD1 FENNEC_27_0b2_RELEASE FENNEC_27_0b4_BUILD1 FENNEC_27_0b4_RELEASE FENNEC_27_0b6_BUILD1 FENNEC_27_0b6_RELEASE FENNEC_27_0b8_BUILD1 FENNEC_27_0b8_RELEASE FENNEC_27_0b9_BUILD1 FENNEC_27_0b9_RELEASE FENNEC_28_0b10_BUILD1 FENNEC_28_0b10_RELEASE FENNEC_28_0b1_BUILD1 FENNEC_28_0b1_RELEASE FENNEC_28_0b2_BUILD1 FENNEC_28_0b2_RELEASE FENNEC_28_0b4_BUILD1 FENNEC_28_0b4_RELEASE FENNEC_28_0b6_BUILD1 FENNEC_28_0b6_RELEASE FENNEC_28_0b8_BUILD1 FENNEC_28_0b8_RELEASE FENNEC_29_0b10_BUILD1 FENNEC_29_0b10_RELEASE FENNEC_29_0b1_BUILD2 FENNEC_29_0b1_RELEASE FENNEC_29_0b2_BUILD1 FENNEC_29_0b2_RELEASE FENNEC_29_0b3_BUILD1 FENNEC_29_0b3_RELEASE FENNEC_29_0b4_BUILD1 FENNEC_29_0b4_RELEASE FENNEC_29_0b5_BUILD1 FENNEC_29_0b5_RELEASE FENNEC_29_0b6_BUILD1 FENNEC_29_0b6_RELEASE FENNEC_29_0b8_BUILD1 FENNEC_29_0b8_RELEASE FIREFOX_16_0b2_BUILD1 FIREFOX_16_0b2_RELEASE FIREFOX_16_0b3_BUILD1 FIREFOX_16_0b3_RELEASE FIREFOX_16_0b4_BUILD1 FIREFOX_16_0b4_RELEASE FIREFOX_16_0b5_BUILD1 FIREFOX_16_0b5_RELEASE FIREFOX_16_0b6_BUILD1 FIREFOX_16_0b6_RELEASE SEAMONKEY_2_13b1_BUILD1 SEAMONKEY_2_13b1_RELEASE SEAMONKEY_2_13b2_BUILD1 SEAMONKEY_2_13b2_RELEASE SEAMONKEY_2_13b3_BUILD1 SEAMONKEY_2_13b3_RELEASE SEAMONKEY_2_13b4_BUILD1 SEAMONKEY_2_13b4_RELEASE SEAMONKEY_2_13b5_BUILD1 SEAMONKEY_2_13b5_RELEASE SEAMONKEY_2_13b6_BUILD1 SEAMONKEY_2_13b6_RELEASE THUNDERBIRD_16_0b2_BUILD1 THUNDERBIRD_16_0b2_RELEASE THUNDERBIRD_16_0b3_BUILD1 THUNDERBIRD_16_0b3_RELEASE THUNDERBIRD_16_0b4_BUILD1 THUNDERBIRD_16_0b4_RELEASE
authorAxel Hecht <axel@pike.org>
Mon, 27 Aug 2012 21:48:41 +0200
changeset 1159 03c68802bdc4227a60a2863f3fd79608a80eda51
parent 1158 20bc1de564ec7af25199432aa40a6272f8b3e200 (diff)
parent 1134 e9536de177aac459cc644ec2b491fcd3ba374c33 (current diff)
child 1163 e721a84e33f36998a897d8763078df642c2cd6a2
child 1165 28b451ac603501e68ba3ed426d298de5a18b6179
child 1167 7b3ca0afd47212d7abb7751c5a0f3af7d4e0d499
child 1168 6bf38178037eb8158a09a4a53e9db69cdaa8d0d2
child 1169 76c54ad51c57f6fd1fafdc28de3ab4f42a027dbb
child 1170 c32b9ef921f20e13c92a27e6b16c5e35f3e753ab
child 1171 26835d24c2b393881c3c7d3ff519a860a8c4f9bb
child 1173 af5a917910033fb4be554dd7f980514647cc5c9f
child 1174 79fc1faa65082877ed30e503c791c6d36736d16e
child 1175 cbda40e91caf12612c8977dd0b4fb5026cd2079a
child 1176 0ddd5644538288df27bc837d640e49ece87c6f9f
child 1178 01dfa438d89c88744733de4e791ae201fd2768ad
child 1179 6bff56e59192acd5f56048072a0a46f424a8aaf4
child 1180 2e288c6f442cf05464c371d84d75c27e54b0b8cf
child 1182 4c96ca1b34907341961858974c881aebb9f453d1
child 1183 49276f3fbf62f5f40f108cb18f1284dfbfdf0f65
child 1184 2e1474febc0ba843c215a304a4ee64017c89cd63
child 1185 b43cdbe105f36fb58aab752cf20e312ad0df9b91
child 1189 e5d10979ac8590eb7e8b6466e7b2fefbf544f575
child 1190 7ba26999197cac471de4c7b6d768e652b8e90831
child 1191 cfb320c9e6dee26da4ffb87483130621631252d7
child 1192 82289caa1a6a97c20eb3cbfcc7e1deca3a717b46
child 1194 326cace360ee7d7bcee63d00bedc2a469f334233
child 1202 3d1959df7c08f76f73e36431bb46c992f5bef5f9
child 1208 6b31721f419e9dabd3cbc8d2e85a5b100c8db603
child 1211 92052a7c86b3131aefcb342965ccae6313a8ff47
child 1213 4ef1849fd596b15eeafec4d865ddec8b56cd7fa1
child 1216 f2113774d4fb1952ca1f67adbb8e3a1f3e986c60
child 1222 b93764564ee61643b7794348e6ccb7b4890f1b5f
child 1227 4a1219d9b427ec9b5b5b9405567a51b9fc75db1d
child 1231 c92ec550a6fe281be284a35050bdd360ae56d940
child 1238 3ef388a59661c71cd15867f9c6dad3b00ccc091b
child 1239 f7281977cb81458886e978b019145fe7c7eca819
child 1248 9ab90582c2631bf2b7362abc0dcfed30a132bd41
child 1253 6869759b8a9a6da33fc3556420827778dd393764
child 1259 43a9c8416141735e0a251f836948c9d393f7b836
child 1264 8ccfed8eb42f7b7f1f90800bd676fd607fcd0107
child 1267 0425de75c84be2a94b91ea45f56938cd971a4658
child 1268 171ca3b3861523adfba558b50c2ad1476c1ad950
child 1272 96f59cf79001dae90b74f1d89af64edff0a5ef3e
child 1274 727c97fd9508c1d1d53f68b1bef44955311b46a7
child 1283 102e96a572f46e2c5c8706964ed0867a375eacc3
child 1286 7f83cc13fcdd69124566b86a390ed19a6cb0aabf
child 1293 241827f0c9250d627332c8c4e18f7189bbdabcee
child 1296 5debc610258da3028c07e5699b52df4f3e130c12
child 1300 cabddd9e216dae707b90bf7eb9c049b1a5e40f42
child 1304 808d59e212f0c3ff637e98c4eab7a92dba6c8a41
child 1306 2afb45ffb30ac7919c4fdea9a06c2964e4194c7c
child 1309 b0308120bef81c73f868fd6cb33739edcacf544a
child 1323 723c2f415369794537531628ab3592f0754e27fe
child 1325 956bfafc1a3f71ee08e164dec7cb7b9c4de32564
child 1326 9b90b39280ea70e2f283e7a1fb0ea72a99f00df9
child 1330 eb568aa7d0e7a5b3c11d79529ef1cf6efb853dec
child 1331 c305f48a87a0c59aa037f1f167a063c122cff613
child 1335 4732235577ae40eabb9b6f813bfc1e5efb254200
child 1337 96c0e3510bfa0a8fdcbd4f88f49eac60dd10f4c1
child 1340 b24c6120cfae5a58fbe9eb259ee18d9c77a9b4b7
child 1344 36ea22a2359254ef587547186f276212ef8c7bef
child 1348 4a92a3c33987eb90822ff42c72452438e72b857b
child 1359 346c3f839c164eb400d804bfc8737d7e740f24f0
child 1365 ef21c3795b89d2d98f52fc6b717c655165a1e079
child 1373 9cc0b68f5f11730f903dd5a5eeb89eb4d2226662
child 1375 b6e199d102e56be293d550013199c04d46d74507
child 1379 0f8d65d89628080243ced5500151e9895229229b
child 1385 b9d13c049c818e563c6e24eb3b90ccdcc9636e9a
child 1389 21dd26c6682a628ca6e732d03a529c8f6b534e2d
child 1392 5d3864f06e3ef43e8893abf46bd7414fb676e02e
child 1405 702a677f2926daf2a0efa179f0f6c30921fcee4f
child 1408 9593fb138dd932dc19a64fec6d1193d3e56e6583
child 1411 d50ce0f8222465fe09c106b7da12dfb45c838c73
child 1413 b8acfa7efaa70efcd35516ec407c23db5055c0c9
child 1416 095f1538ba76f7fbf02dde1659d603843bc46fdd
child 1418 0faa237f882b230c1291504e637c232287bf41eb
child 1432 2f58bcd903607cdece01ac0ab8948b540c2f4259
child 1434 f29326bba5bb73045e83b4645591e513bf31a961
child 1440 98bc5d00f0f72aeb31125650bbee56a43dc40743
child 1443 6599c613e58b9cbabda567b91dbc46c5c9763692
child 1448 d1b55eeb4615b0cfae7dd10af175a8ebf7a315be
child 1450 78d58ee925048a33f37bc14a132eef561a76bb8b
child 1453 77db63b6143d56a70bf5f56962c9ba20f5d65d59
child 1465 5e791def2e3a55551a22f4da17528b02a36bbef3
child 1468 5a72bed13e06bcd98f4db5a207e57d8bc26d555f
child 1469 8944ef6bf36e2b70c17b9d5ccf52a9f41dafbc42
child 1470 b215f11d2717bb3ebab385f933ea85cffcecf8e3
child 1479 3d721b53803cbe29a8e8924c02e013f6c973e959
child 1485 033ce836e9c832aae41965e601751fd5a08dadec
child 1489 94df5ed58a6be1b3d5c5fa7536ba9d0b4ee9466e
child 1493 3938bc166aa98657d4cc05daffd617388a647059
child 1496 59c1819a8f7577dfddde3775b6afdb7ec0c51228
child 1505 24aff9be8a036aa0d24355e04304185235d3cc74
child 1507 dbff96512a586e425d1e783472a1d060d1c44b4d
child 1508 4f897d99758a327ce4ca408b2db73bf61b1e3f90
child 1512 849e9048f652d074fde48123dac949d9c4e9b39f
child 1514 74b460bbaecaaf2fb52d17a1f5923deb13cb5107
child 1516 cc9ffd9b17140d6b6a35e83fd4a1fde946f7ddda
child 1523 5b58a999923de84195185952be7035d3d3982634
child 1538 3c68ad166b22fd022deb5ba172ca86f6053a72ca
child 1541 44b8f7e21480652f87190f9282a3a2c24a2a5285
child 1546 4b4ac0101f46cd1335f5145c99716ef4cdaa3c84
child 1549 799e3a9a919844ce422d04bf7578af97e7bb2499
child 1553 09eca137363847ca07fca83ffe4e2f06edefdfe2
child 1556 36c58cd130cbe2cb89dd69ed218e30c931d26e75
child 1573 516fb72be906718bb1c6dccd00774e7f81a58237
child 1574 3ef1ac4ff739b3d63fd633b3791d6b831c988fe8
child 1578 1b26e3135c23384be4acbaaaa2cd0fd1af037773
child 1581 a3853776ed07f0b8f7df1461f0b980da47e4abce
child 1586 1e64745c84901000681018d6f29276f9ca5ecbb6
child 1591 4fd2733da4228127ebdf6fa0844c02ed4b7662a7
child 1593 7b0ceefedf9adfb5a35379f6fcc99b62e4192e15
child 1606 ee661d3aaa160a25e0e83cf7921ea6d14d454699
child 1609 284f26058a5a7f19c3753faef74754d6332ef6ad
child 1614 cd0d729c59eefc6d27c9f5826e33c526f71b8bf4
child 1616 ec361e46f5164ba48befdf6fddd612cb790dccfd
child 1622 5a602892c090f09fb5e6dcf7043da546568b9cc8
child 1629 4f992d9160521bbd5f8112e8aa2b8484f9937f77
child 1646 d73042a26c9697d981da3a81ee9076d45b5b0778
child 1649 8a16c54c0072d1d1e57a80242495272021de3970
child 1652 eedf23ddeb0c6a8521ef1aefb34a0100d55cd5ab
child 1654 8947d4221dad5e90ff87427b573db1b1419939e1
child 1660 cb8390468d5a5a507086955b8fcbb88a27f97c99
child 1661 b9da52af52aa9c90eb4408f37c30cd3274b7344d
child 1670 c44b6333e5d28ee0c0ab1c4849d032767ecd1802
child 1676 d5cf3944d57ed955cfd15ebb4426f22af3335984
push id1
push usersledru@mozilla.com
push dateThu, 04 Dec 2014 21:47:06 +0000
Migrating aurora to beta for Firefox 16
browser/chrome/browser/browser.dtd
dom/chrome/dom/dom.properties
mail/chrome/messenger/preferences/advanced.dtd
mobile/android/base/android_strings.dtd
mobile/android/base/sync_strings.dtd
toolkit/chrome/mozapps/plugins/plugins.dtd
--- a/browser/chrome/browser/aboutSessionRestore.dtd
+++ b/browser/chrome/browser/aboutSessionRestore.dtd
@@ -1,23 +1,24 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!ENTITY restorepage.tabtitle       "Restaurar sesión previa">
+
 <!-- LOCALIZATION NOTE: The title is intended to be apologetic and disarming, expressing dismay
      and regret that we are unable to restore the session for the user -->
 <!ENTITY restorepage.errorTitle     "Bueno, esto es vergonzoso.">
 <!ENTITY restorepage.problemDesc    "&brandShortName; tiene problemas recuperando sus ventanas y pestañas. Ésto es causado usualmente por una página web abierta recientemente.">
 <!ENTITY restorepage.tryThis        "Puede intentar:">
 <!ENTITY restorepage.restoreSome    "Eliminar una o más pestañas que piense que puedan estar causando el problema">
 <!ENTITY restorepage.startNew       "Iniciar una sesión de navegación completamente nueva">
 
 <!ENTITY restorepage.tryagainButton "Restaurar">
 <!ENTITY restorepage.restore.access "R">
-<!ENTITY restorepage.cancelButton   "Iniciar nueva sesión">
-<!ENTITY restorepage.cancel.access  "s">
+<!ENTITY restorepage.closeButton    "Cerrar">
+<!ENTITY restorepage.close.access   "C">
 
 <!ENTITY restorepage.restoreHeader  "Restaurar">
 <!ENTITY restorepage.listHeader     "Ventanas y pestañas">
 <!-- LOCALIZATION NOTE: &#37;S will be replaced with a number. -->
 <!ENTITY restorepage.windowLabel    "Ventana &#37;S">
 
--- a/browser/chrome/browser/browser.dtd
+++ b/browser/chrome/browser/browser.dtd
@@ -110,16 +110,17 @@ These should match what Safari and other
 
 <!ENTITY closeWindow.label "Cerrar ventana">
 <!ENTITY closeWindow.accesskey "C">
 
 <!ENTITY bookmarksMenu.label "Marcadores">
 <!ENTITY bookmarksMenu.accesskey "M">
 <!ENTITY bookmarkThisPageCmd.label "Marcar esta página">
 <!ENTITY bookmarkThisPageCmd.commandkey "d">
+<!ENTITY sharePageCmd.commandkey "l">
 <!ENTITY subscribeToPageMenupopup.label "Suscribirse a esta página">
 <!ENTITY subscribeToPageMenuitem.label "Suscribirse a esta página…">
 <!ENTITY addCurPagesCmd.label "Marcar todas las pestañas…">
 <!ENTITY showAllBookmarks2.label "Mostrar todos los marcadores">
 <!ENTITY unsortedBookmarksCmd.label "Marcadores sin ordenar">
 <!ENTITY bookmarksToolbarChevron.tooltip "Mostrar más marcadores">
 
 <!ENTITY backCmd.label "Atrás">
@@ -233,22 +234,22 @@ These should match what Safari and other
 <!ENTITY scratchpad.accesskey         "B">
 <!ENTITY scratchpad.keycode           "VK_F4">
 <!ENTITY scratchpad.keytext           "F4">
 
 <!ENTITY inspectCloseButton.tooltiptext "Cerrar Inspector">
 
 <!ENTITY devToolbarCloseButton.tooltiptext "Cerrar barra de desarrolladores">
 <!ENTITY devToolbarMenu.label "Barra de desarrolladores">
-<!ENTITY devToolbarMenu.accesskey "o">
-<!ENTITY devToolbar.commandkey "v">
+<!ENTITY devToolbarMenu.accesskey          "r">
+<!ENTITY devToolbar.keycode                "VK_F2">
+<!ENTITY devToolbar.keytext                "F2">
 
 <!ENTITY webConsoleButton.label "Consola web">
 <!ENTITY inspectorButton.label "Inspector">
-<!ENTITY scriptsButton.label "Scripts">
 
 <!ENTITY inspectorHTMLCopyInner.label       "Copiar InnerHTML">
 <!ENTITY inspectorHTMLCopyInner.accesskey   "I">
 
 <!ENTITY inspectorHTMLCopyOuter.label       "Copiar OuterHTML">
 <!ENTITY inspectorHTMLCopyOuter.accesskey   "O">
 
 <!ENTITY inspectorHTMLDelete.label          "Borrar nodo">
@@ -435,43 +436,41 @@ These should match what Safari and other
 <!ENTITY setDesktopBackgroundCmd.accesskey "s">
 <!ENTITY bookmarkPageCmd2.label       "Marcar esta página">
 <!ENTITY bookmarkPageCmd2.accesskey   "M">
 
 <!ENTITY bookmarkThisLinkCmd.label      "Marcar este enlace">
 <!ENTITY bookmarkThisLinkCmd.accesskey  "l">
 <!ENTITY bookmarkThisFrameCmd.label      "Marcar este marco…">
 <!ENTITY bookmarkThisFrameCmd.accesskey  "r">
-<!ENTITY sendPageCmd.label "Enviar página…">
-<!ENTITY sendPageCmd.accesskey "E">
 <!ENTITY savePageCmd.label "Guardar página como…">
 <!ENTITY savePageCmd.accesskey "a">
 <!-- alternate for content area context menu -->
 <!ENTITY savePageCmd.accesskey2 "P">
 <!ENTITY savePageCmd.commandkey "s">
 <!ENTITY saveFrameCmd.label "Guardar marco como…">
 <!ENTITY saveFrameCmd.accesskey "m">
 <!ENTITY printFrameCmd.label          "Imprimir marco…">
 <!ENTITY printFrameCmd.accesskey      "I">
 <!ENTITY saveLinkCmd.label "Guardar enlace como…">
 <!ENTITY saveLinkCmd.accesskey "l">
-<!ENTITY sendLinkCmd.label "Enviar enlace…">
-<!ENTITY sendLinkCmd.accesskey "v">
+<!ENTITY emailPageCmd.label           "Email enlace…">
+<!ENTITY emailPageCmd.accesskey       "E">
 <!ENTITY saveImageCmd.label "Guardar imagen como…">
 <!ENTITY saveImageCmd.accesskey "u">
 <!ENTITY saveVideoCmd.label           "Guardar video como…">
 <!ENTITY saveVideoCmd.accesskey       "u">
 <!ENTITY saveAudioCmd.label           "Guardar audio como…">
 <!ENTITY saveAudioCmd.accesskey       "u">
-<!ENTITY sendImageCmd.label "Enviar imagen…">
-<!ENTITY sendImageCmd.accesskey "n">
-<!ENTITY sendVideoCmd.label           "Enviar video…">
-<!ENTITY sendVideoCmd.accesskey       "n">
-<!ENTITY sendAudioCmd.label           "Enviar audio…">
-<!ENTITY sendAudioCmd.accesskey       "n">
+<!ENTITY emailImageCmd.label          "Email imagen…">
+<!ENTITY emailImageCmd.accesskey      "a">
+<!ENTITY emailVideoCmd.label          "Email video…">
+<!ENTITY emailVideoCmd.accesskey      "a">
+<!ENTITY emailAudioCmd.label          "Email audio…">
+<!ENTITY emailAudioCmd.accesskey      "a">
 <!ENTITY copyLinkCmd.label "Copiar dirección del enlace">
 <!ENTITY copyLinkCmd.accesskey "C">
 <!ENTITY copyImageCmd.label "Copiar dirección de la imagen">
 <!ENTITY copyImageCmd.accesskey "o">
 <!ENTITY copyImageContentsCmd.label "Copiar imagen">
 <!ENTITY copyImageContentsCmd.accesskey "i">
 <!ENTITY copyVideoURLCmd.label        "Copiar dirección del video">
 <!ENTITY copyVideoURLCmd.accesskey    "o">
@@ -639,8 +638,15 @@ The word "toolbar" is appended automatic
 located in front of the breadcrumbs display in the inspector toolbar. The button
 doesn't display any label, but exposes a label to screen-readers with "aria-label".
 -->
 <!ENTITY markupButton.arialabel          "Markup">
 <!-- LOCALIZATION NOTE (markupButton.accesskey): The key bound to the Markup panel's
 toolbar button -->
 <!ENTITY markupButton.accesskey          "M">
 
+<!ENTITY socialToolbar.title        "Botón de barra social">
+<!ENTITY social.notLoggedIn.label   "No ingresado">
+
+<!ENTITY social.sharePopup.undo.label     "Descompartir">
+<!ENTITY social.sharePopup.undo.accesskey "D">
+<!ENTITY social.sharePopup.ok.label       "Aceptar">
+<!ENTITY social.sharePopup.ok.accesskey   "A">
--- a/browser/chrome/browser/browser.properties
+++ b/browser/chrome/browser/browser.properties
@@ -308,16 +308,17 @@ addKeywordTitleAutoFill=Buscar %S
 # TabView
 # LOCALIZATION NOTE (tabview.title): %S is the application name.
 tabview.title=%S - Agrupar pestañas
 # LOCALIZATION NOTE (tabview.moveToUnnamedGroup.label): Semi-colon list of plural forms.
 # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # #1 is the page title of the first tab in the unnamed group, 
 # #2 is the number of remaining tabs.
 tabview.moveToUnnamedGroup.label=#1 y 1 más;#1 y #2 más
+
 extensions.{972ce4c6-7e08-4474-a285-3208198ce6fd}.name=Predeterminado
 extensions.{972ce4c6-7e08-4474-a285-3208198ce6fd}.description=El tema predeterminado.
 
 # safeModeRestart
 safeModeRestartPromptTitle=Reiniciar con los complementos deshabilitados
 safeModeRestartPromptMessage=¿Seguro desea deshabilitar todos los complementos y reiniciar?
 safeModeRestartButton=Reiniciar
 
@@ -352,18 +353,23 @@ telemetryYesButtonAccessKey = S
 telemetryNoButtonLabel = No
 telemetryNoButtonAccessKey = N
 
 # Webapps notification popup
 webapps.install = Instalar
 webapps.install.accesskey = I
 #LOCALIZATION NOTE (webapps.requestInstall) %1$S is the web app name, %2$S is the site from which the web app is installed
 webapps.requestInstall = ¿Desea instalar "%1$S" desde este sitio (%2$S)?
+webapps.install.success = Aplicación instalada
 
 # Telemetry opt-out prompt for Aurora and Nightly
 # LOCALIZATION NOTE (telemetryOptOutPrompt): %1$S and %3$S will be replaced by
 # brandFullName, and %2$S by the value of the toolkit.telemetry.server_owner preference.
 telemetryOptOutPrompt = %1$S envía información acerca del rendimiento, hardware, uso y personalizaciones hacia %2$S para ayudar a mejorar %3$S.
 
 # LOCALIZATION NOTE (fullscreen.entered): displayed when we enter HTML5 fullscreen mode, %S is the domain name of the focused website (e.g. mozilla.com).
 fullscreen.entered=%S ahora está en pantalla completa.
 # LOCALIZATION NOTE (fullscreen.rememberDecision): displayed when we enter HTML5 fullscreen mode, %S is the domain name of the focused website (e.g. mozilla.com).
 fullscreen.rememberDecision=Recordar la decisión para %S
+
+social.shareButton.tooltip=Compartir ésto
+social.shareButton.sharedtooltip=Ha compartido ésto
+social.pageShared.label=Página compartida
--- a/browser/chrome/browser/devtools/debugger.properties
+++ b/browser/chrome/browser/devtools/debugger.properties
@@ -50,16 +50,32 @@ pauseTooltip=Clic para pausar
 # LOCALIZATION NOTE (resumeLabel): The label that is displayed on the pause
 # button when the debugger is in a paused state.
 resumeTooltip=Clic para continuar
 
 # LOCALIZATION NOTE (emptyStackText): The text that is displayed in the stack
 # frames list when there are no frames to display.
 emptyStackText=No hay pilas para mostrar.
 
+# LOCALIZATION NOTE (emptyBreakpointsText): The text that is displayed in the
+# breakpoints list when there are no breakpoints to display.
+emptyBreakpointsText=No breakpoints to display.
+
+# LOCALIZATION NOTE (breakpointMenuItem): The text for all the elements that
+# are displayed in the breakpoints menu item popup.
+breakpointMenuItem.enableSelf=Enable breakpoint
+breakpointMenuItem.disableSelf=Disable breakpoint
+breakpointMenuItem.deleteSelf=Remove breakpoint
+breakpointMenuItem.enableOthers=Enable others
+breakpointMenuItem.disableOthers=Disable others
+breakpointMenuItem.deleteOthers=Remove others
+breakpointMenuItem.enableAll=Enable all breakpoints
+breakpointMenuItem.disableAll=Disable all breakpoints
+breakpointMenuItem.deleteAll=Remove all breakpoints
+
 # LOCALIZATION NOTE (loadingText): The text that is displayed in the script
 # editor when the laoding process has started but there is no file to display
 # yet.
 loadingText=Cargando\u2026
 
 # LOCALIZATION NOTE (loadingError):
 # This is the error message that is displayed on failed attempts to load an
 # external resource file.
--- a/browser/chrome/browser/devtools/gcli.properties
+++ b/browser/chrome/browser/devtools/gcli.properties
@@ -15,16 +15,25 @@
 # or command parameter when no description has been provided.
 canonDescNone=(Sin descripción)
 
 # LOCALIZATION NOTE (cliEvalJavascript): The special '{' command allows entry
 # of JavaScript like traditional developer tool command lines. This describes
 # the '{' command.
 cliEvalJavascript=Ingrese JavaScript directamente
 
+# LOCALIZATION NOTE (cliUnusedArg): When the command line has more arguments
+# than the current command can understand this is the error message shown to
+# the user.
+cliUnusedArg=Demasiados argumentos
+
+# LOCALIZATION NOTE (cliOptions): The title of the dialog which displays the
+# options that are available to the current command.
+cliOptions=Opciones disponibles
+
 # LOCALIZATION NOTE (fieldSelectionSelect): When a command has a parameter
 # that has a number of pre-defined options the user interface presents these
 # in a drop-down menu, where the first 'option' is an indicator that a
 # selection should be made. This string describes that first option.
 fieldSelectionSelect=Seleccione %S…
 
 # LOCALIZATION NOTE (fieldArrayAdd): When a command has a parameter that can
 # be repeated a number of times (e.g. like the 'cat a.txt b.txt' command) the
@@ -33,16 +42,21 @@ fieldSelectionSelect=Seleccione %S…
 fieldArrayAdd=Agregar
 
 # LOCALIZATION NOTE (fieldArrayDel): When a command has a parameter that can
 # be repeated a number of times (e.g. like the 'cat a.txt b.txt' command) the
 # user interface presents buttons to add and remove arguments. This string is
 # used to remove arguments.
 fieldArrayDel=Borrar
 
+# LOCALIZATION NOTE (fieldMenuMore): When the menu has displayed all the
+# matches that it should (i.e. about 10 items) then we display this to alert
+# the user that more matches are available.
+fieldMenuMore=Más coincidencias, siga tipeando
+
 # LOCALIZATION NOTE (jstypeParseScope): The command line provides completion
 # for JavaScript commands, however there are times when the scope of what
 # we're completing against can't be used. This error message is displayed when
 # this happens.
 jstypeParseScope=Alcance perdido
 
 # LOCALIZATION NOTE (jstypeParseMissing): When the command line is doing
 # JavaScript completion, sometimes the property to be completed does not
@@ -132,16 +146,38 @@ helpManDescription=Descripción
 # LOCALIZATION NOTE (helpManParameters): A heading shown above the parameters
 # in a help page for a command in the console.
 helpManParameters=Parámetros
 
 # LOCALIZATION NOTE (helpManNone): Some text shown under the parameters
 # heading in a help page for a command which has no parameters.
 helpManNone=Ninguno
 
+# LOCALIZATION NOTE (helpListAll): The heading shown in response to the 'help'
+# command when used without a filter, just above the list of known commands.
+helpListAll=Comandos disponibles:
+
+# LOCALIZATION NOTE (helpListPrefix): The heading shown in response to the
+# 'help <search>' command (i.e. with a search string), just above the list of
+# matching commands.
+helpListPrefix=Comandos que comienzan con '%1$S':
+
+# LOCALIZATION NOTE (helpListNone): The heading shown in response to the 'help
+# <search>' command (i.e. with a search string), when there are no matching
+# commands.
+helpListNone=Ningun comando comienza con '%1$S'
+
+# LOCALIZATION NOTE (helpManRequired): When the 'help x' command wants to show
+# the manual for the 'x' command it needs to be able to describe the
+# parameters as either required or optional. See also 'helpManOptional'.
+helpManRequired=requerido
+
+# LOCALIZATION NOTE (helpManOptional): See description of 'helpManRequired'
+helpManOptional=opcional
+
 # LOCALIZATION NOTE (subCommands): Text shown as part of the output of the
 # 'help' command when the command in question has sub-commands, before a list
 # of the matching sub-commands
 subCommands=Subcomandos
 
 # LOCALIZATION NOTE (subCommandsNone): Text shown as part of the output of the
 # 'help' command when the command in question should have sub-commands but in
 # fact has none
--- a/browser/chrome/browser/devtools/gclicommands.properties
+++ b/browser/chrome/browser/devtools/gclicommands.properties
@@ -75,16 +75,34 @@ screenshotDelayManual=El tiempo a espera
 # a dialog when the user is using this command.
 screenshotFullPageDesc=¿Página completa? (verdadero/falso)
 
 # LOCALIZATION NOTE (screenshotFullscreenManual) A fuller description of the
 # 'fullscreen' parameter to the 'screenshot' command, displayed when the user
 # asks for help on what it does.
 screenshotFullPageManual=Verdadero si la captura debería incluír partes de la página que está fuera de los límites visibles actualmente.
 
+# LOCALIZATION NOTE (restartFirefoxDesc) A very short description of the
+# 'restart' command. This string is designed to be shown in a menu alongside the
+# command name, which is why it should be as short as possible.
+restartFirefoxDesc=Reiniciar Firefox
+
+# LOCALIZATION NOTE (restartFirefoxNocacheDesc) A very short string to
+# describe the 'nocache' parameter to the 'restart' command, which is
+# displayed in a dialog when the user is using this command.
+restartFirefoxNocacheDesc=Deshabilita cargar contenido de caché al reiniciar
+
+# LOCALIZATION NOTE (restartFirefoxRequestCancelled) A string dispalyed to the
+# user when a scheduled restart has been aborted by the user.
+restartFirefoxRequestCancelled=Pedido de reinicio cancelado por el usuario.
+
+# LOCALIZATION NOTE (restartFirefoxRestarting) A string dispalyed to the
+# user when a restart has been initiated without a delay.
+restartFirefoxRestarting=Reiniciando Firefox...
+
 # LOCALIZATION NOTE (inspectDesc) A very short description of the 'inspect'
 # command. See inspectManual for a fuller description of what it does. This
 # string is designed to be shown in a menu alongside the command name, which
 # is why it should be as short as possible.
 inspectDesc=Inspeccionar un nodo
 
 # LOCALIZATION NOTE (inspectManual) A fuller description of the 'inspect'
 # command, displayed when the user asks for help on what it does.
@@ -298,38 +316,542 @@ breakdelBreakidDesc=Index of breakpoint
 # LOCALIZATION NOTE (breakdelRemoved) Used in the output of the 'break del'
 # command to explain that a breakpoint was removed.
 breakdelRemoved=Breakpoint removed
 
 # LOCALIZATION NOTE (breakNotFound) Used in the output of the 'break del'
 # command to explain that the breakpoint was not found.
 breakNotFound=Breakpoint was not found
 
+# LOCALIZATION NOTE (dbgDesc) A very short string used to describe the
+# function of the dbg command.
+dbgDesc=Administrar depurador
+
+# LOCALIZATION NOTE (dbgManual) A longer description describing the
+# set of commands that control the debugger.
+dbgManual=Commands to interrupt or resume the main thread, step in, out and over lines of code
+
+# LOCALIZATION NOTE (dbgInterrupt) A very short string used to describe the
+# function of the dbg interrupt command.
+dbgInterrupt=Pauses the main thread
+
+# LOCALIZATION NOTE (dbgContinue) A very short string used to describe the
+# function of the dbg continue command.
+dbgContinue=Resumes the main thread, and continues execution following a breakpoint, until the next breakpoint or the termination of the script.
+
+# LOCALIZATION NOTE (dbgStepDesc) A very short string used to describe the
+# function of the dbg step command.
+dbgStepDesc=Manage stepping
+
+# LOCALIZATION NOTE (dbgStepManual) A longer description describing the
+# set of commands that control stepping.
+dbgStepManual=Commands to step in, out and over lines of code
+
+# LOCALIZATION NOTE (dbgStepOverDesc) A very short string used to describe the
+# function of the dbg step over command.
+dbgStepOverDesc=Executes the current statement and then stops at the next statement. If the current statement is a function call then the debugger executes the whole function, and it stops at the next statement after the function call
+
+# LOCALIZATION NOTE (dbgStepInDesc) A very short string used to describe the
+# function of the dbg step over command.
+dbgStepInDesc=Executes the current statement and then stops at the next statement. If the current statement is a function call, then the debugger steps into that function, otherwise it stops at the next statement
+
+# LOCALIZATION NOTE (dbgStepOutDesc) A very short string used to describe the
+# function of the dbg step over command.
+dbgStepOutDesc=Steps out of the current function and up one level if the function is nested. If in the main body, the script is executed to the end, or to the next breakpoint. The skipped statements are executed, but not stepped through
+
 # LOCALIZATION NOTE (consolecloseDesc) A very short description of the
 # 'console close' command. This string is designed to be shown in a menu
 # alongside the command name, which is why it should be as short as possible.
 consolecloseDesc=Cerrar la consola
 
 # LOCALIZATION NOTE (consoleopenDesc) A very short description of the
 # 'console open' command. This string is designed to be shown in a menu
 # alongside the command name, which is why it should be as short as possible.
 consoleopenDesc=Abrir la consola
 
 # LOCALIZATION NOTE (editDesc) A very short description of the 'edit'
-# command. See editManual for a fuller description of what it does. This
+# command. See editManual2 for a fuller description of what it does. This
 # string is designed to be shown in a menu alongside the command name, which
 # is why it should be as short as possible.
 editDesc=Tweak a page resource
 
-# LOCALIZATION NOTE (editManual) A fuller description of the 'edit' command,
+# LOCALIZATION NOTE (editManual2) A fuller description of the 'edit' command,
 # displayed when the user asks for help on what it does.
-editManual=Editar uno de los recursos que es parte de esta página (¿o quizás algún recurso web genérico?)
+editManual2=Editar uno de los recursos que es parte de esta página
 
 # LOCALIZATION NOTE (editResourceDesc) A very short string to describe the
 # 'resource' parameter to the 'edit' command, which is displayed in a dialog
 # when the user is using this command.
 editResourceDesc=URL a editar
 
 # LOCALIZATION NOTE (editLineToJumpToDesc) A very short string to describe the
 # 'line' parameter to the 'edit' command, which is displayed in a dialog
 # when the user is using this command.
 editLineToJumpToDesc=Línea a la cual ir
 
+# LOCALIZATION NOTE (resizePageDesc) A very short string to describe the
+# 'resizepage' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+resizePageDesc=Resize the page
+
+# LOCALIZATION NOTE (resizePageArgWidthDesc) A very short string to describe the
+# 'width' parameter to the 'resizepage' command, which is displayed in a dialog
+# when the user is using this command.
+resizePageArgWidthDesc=Ancho en pixeles
+
+# LOCALIZATION NOTE (resizePageArgWidthDesc) A very short string to describe the
+# 'height' parameter to the 'resizepage' command, which is displayed in a dialog
+# when the user is using this command.
+resizePageArgHeightDesc=Altura en pixeles
+
+# LOCALIZATION NOTE (resizeModeOnDesc) A very short string to describe the
+# 'resizeon ' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+resizeModeOnDesc=Enter Responsive Design Mode
+
+# LOCALIZATION NOTE (resizeModeOffDesc) A very short string to describe the
+# 'resize off' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+resizeModeOffDesc=Exit Responsive Design Mode
+
+# LOCALIZATION NOTE (resizeModeToggleDesc) A very short string to describe the
+# 'resize toggle' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+resizeModeToggleDesc=Toggle Responsive Design Mode
+
+# LOCALIZATION NOTE (resizeModeToDesc) A very short string to describe the
+# 'resize to' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+resizeModeToDesc=Alterar tamaño de página
+
+# LOCALIZATION NOTE (resizeModeDesc) A very short string to describe the
+# 'resize' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+resizeModeDesc=Control Responsive Design Mode
+
+# LOCALIZATION NOTE (resizeModeManual) A fuller description of the 'resize'
+# command, displayed when the user asks for help on what it does.
+resizeModeManual=Responsive websites respond to their environment, so they look good on a mobile display, a cinema display and everything in-between. Responsive Design Mode allows you to easily test a variety of page sizes in Firefox without needing to resize your whole browser.
+
+# LOCALIZATION NOTE (cmdDesc) A very short description of the 'cmd'
+# command. This string is designed to be shown in a menu alongside the command
+# name, which is why it should be as short as possible.
+cmdDesc=Manipular los comandos
+
+# LOCALIZATION NOTE (cmdRefreshDesc) A very short description of the 'cmd refresh'
+# command. This string is designed to be shown in a menu alongside the command
+# name, which is why it should be as short as possible.
+cmdRefreshDesc=Releer directorio mozcmd
+
+# LOCALIZATION NOTE (addonDesc) A very short description of the 'addon'
+# command. This string is designed to be shown in a menu alongside the command
+# name, which is why it should be as short as possible.
+addonDesc=Manipular complementos
+
+# LOCALIZATION NOTE (addonListDesc) A very short description of the 'addon list'
+# command. This string is designed to be shown in a menu alongside the command
+# name, which is why it should be as short as possible.
+addonListDesc=Listar complementos instalados
+
+# LOCALIZATION NOTE (addonListTypeDesc) A very short description of the
+# 'addon list <type>' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+addonListTypeDesc=Seleccionar un tipo de complemento
+
+# LOCALIZATION NOTE (addonListDictionaryHeading, addonListExtensionHeading,
+# addonListLocaleHeading, addonListPluginHeading, addonListThemeHeading,
+# addonListUnknownHeading) Used in the output of the 'addon list' command as the
+# first line of output.
+addonListDictionaryHeading=Los siguientes diccionarios están actualmente instalados:
+addonListExtensionHeading=Las siguientes extensiones están actualmente instaladas:
+addonListLocaleHeading=Los siguientes idiomas están actualmente instalados:
+addonListPluginHeading=Los siguientes plugins están actualmente instalados:
+addonListThemeHeading=Los siguientes temas están actualmente instalados:
+addonListAllHeading=Los siguientes complementos están actualmente instalados:
+addonListUnknownHeading=Los siguientes complementos del tipo seleccionado están actualmente instalados:
+
+# LOCALIZATION NOTE (addonNameDesc) A very short description of the
+# name parameter of numerous addon commands. This string is designed to be shown
+# in a menu alongside the command name, which is why it should be as short as
+# possible.
+addonNameDesc=Nombre del complemento
+
+# LOCALIZATION NOTE (addonNoneOfType) Used in the output of the 'addon list'
+# command when a search for addons of a particular type were not found.
+addonNoneOfType=No hay complementos instalados de ese tipo.
+
+# LOCALIZATION NOTE (addonEnableDesc) A very short description of the
+# 'addon enable <type>' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+addonEnableDesc=Habilitar el complemento especificado
+
+# LOCALIZATION NOTE (addonAlreadyEnabled) Used in the output of the
+# 'addon enable' command when an attempt is made to enable an addon is already
+# enabled.
+addonAlreadyEnabled=%S ya está habilitado.
+
+# LOCALIZATION NOTE (addonEnabled) Used in the output of the 'addon enable'
+# command when an addon is enabled.
+addonEnabled=%S habilitado.
+
+# LOCALIZATION NOTE (addonDisableDesc) A very short description of the
+# 'addon disable <type>' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+addonDisableDesc=Deshabilitar el complemento especificado
+
+# LOCALIZATION NOTE (addonAlreadyDisabled) Used in the output of the
+# 'addon disable' command when an attempt is made to disable an addon is already
+# disabled.
+addonAlreadyDisabled=%S ya está deshabilitado.
+
+# LOCALIZATION NOTE (addonDisabled) Used in the output of the 'addon disable'
+# command when an addon is disabled.
+addonDisabled=%S deshabilitado.
+
+# LOCALIZATION NOTE (exportDesc) A very short description of the 'export'
+# command. This string is designed to be shown in a menu alongside the command
+# name, which is why it should be as short as possible.
+exportDesc=Exportar recursos
+
+# LOCALIZATION NOTE (exportHtmlDesc) A very short description of the 'export
+# html' command. This string is designed to be shown in a menu alongside the
+# command name, which is why it should be as short as possible.
+exportHtmlDesc=Exportar HTML de la página
+
+# LOCALIZATION NOTE (pagemodDesc) A very short description of the 'pagemod'
+# command. This string is designed to be shown in a menu alongside the command
+# name, which is why it should be as short as possible.
+pagemodDesc=Hacer cambios en la página
+
+# LOCALIZATION NOTE (pagemodReplaceDesc) A very short description of the
+# 'pagemod replace' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+pagemodReplaceDesc=Buscar y reemplazar en elementos de página
+
+# LOCALIZATION NOTE (pagemodReplaceSearchDesc) A very short string to describe
+# the 'search' parameter to the 'pagemod replace' command, which is displayed in
+# a dialog when the user is using this command.
+pagemodReplaceSearchDesc=Qué buscar
+
+# LOCALIZATION NOTE (pagemodReplaceReplaceDesc) A very short string to describe
+# the 'replace' parameter to the 'pagemod replace' command, which is displayed in
+# a dialog when the user is using this command.
+pagemodReplaceReplaceDesc=Cadena de reemplazo
+
+# LOCALIZATION NOTE (pagemodReplaceIgnoreCaseDesc) A very short string to
+# describe the 'ignoreCase' parameter to the 'pagemod replace' command, which is
+# displayed in a dialog when the user is using this command.
+pagemodReplaceIgnoreCaseDesc=Perform case-insensitive search
+
+# LOCALIZATION NOTE (pagemodReplaceRootDesc) A very short string to describe the
+# 'root' parameter to the 'pagemod replace' command, which is displayed in
+# a dialog when the user is using this command.
+pagemodReplaceRootDesc=CSS selector to root of search
+
+# LOCALIZATION NOTE (pagemodReplaceSelectorDesc) A very short string to describe
+# the 'selector' parameter to the 'pagemod replace' command, which is displayed
+# in a dialog when the user is using this command.
+pagemodReplaceSelectorDesc=CSS selector to match in search
+
+# LOCALIZATION NOTE (pagemodReplaceAttributesDesc) A very short string to
+# describe the 'attributes' parameter to the 'pagemod replace' command, which is
+# displayed in a dialog when the user is using this command.
+pagemodReplaceAttributesDesc=Attribute match regexp
+
+# LOCALIZATION NOTE (pagemodReplaceAttrOnlyDesc) A very short string to describe
+# the 'attrOnly' parameter to the 'pagemod replace' command, which is displayed
+# in a dialog when the user is using this command.
+pagemodReplaceAttrOnlyDesc=Restringir búsqueda a atributos
+
+# LOCALIZATION NOTE (pagemodReplaceContentOnlyDesc) A very short string to
+# describe the 'contentOnly' parameter to the 'pagemod replace' command, which
+# is displayed in a dialog when the user is using this command.
+pagemodReplaceContentOnlyDesc=Restringir búsqueda a nodos de texto
+
+# LOCALIZATION NOTE (pagemodReplaceResultMatchedElements) A string displayed as
+# the result of the 'pagemod replace' command.
+pagemodReplaceResult=Elements matched by selector: %1$S. Replaces in text nodes: %2$S. Replaces in attributes: %3$S.
+
+# LOCALIZATION NOTE (pagemodRemoveDesc) A very short description of the
+# 'pagemod remove' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+pagemodRemoveDesc=Eliminar elemetos y atributos de la página
+
+# LOCALIZATION NOTE (pagemodRemoveElementDesc) A very short description of the
+# 'pagemod remove element' command. This string is designed to be shown in
+# a menu alongside the command name, which is why it should be as short as
+# possible.
+pagemodRemoveElementDesc=Eliminar elementos de la página
+
+# LOCALIZATION NOTE (pagemodRemoveElementSearchDesc) A very short string to
+# describe the 'search' parameter to the 'pagemod remove element' command, which
+# is displayed in a dialog when the user is using this command.
+pagemodRemoveElementSearchDesc=CSS selector specifying elements to remove
+
+# LOCALIZATION NOTE (pagemodRemoveElementRootDesc) A very short string to
+# describe the 'root' parameter to the 'pagemod remove element' command, which
+# is displayed in a dialog when the user is using this command.
+pagemodRemoveElementRootDesc=CSS selector specifying root of search
+
+# LOCALIZATION NOTE (pagemodRemoveElementStripOnlyDesc) A very short string to
+# describe the 'stripOnly' parameter to the 'pagemod remove element' command,
+# which is displayed in a dialog when the user is using this command.
+pagemodRemoveElementStripOnlyDesc=Eliminar elemento pero mantener contenido
+
+# LOCALIZATION NOTE (pagemodRemoveElementIfEmptyOnlyDesc) A very short string to
+# describe the 'ifEmptyOnly' parameter to the 'pagemod remove element' command,
+# which is displayed in a dialog when the user is using this command.
+pagemodRemoveElementIfEmptyOnlyDesc=Eliminar solamente elementos vacíos
+
+# LOCALIZATION NOTE (pagemodRemoveElementResultMatchedAndRemovedElements)
+# A string displayed as the result of the 'pagemod remove element' command.
+pagemodRemoveElementResultMatchedAndRemovedElements=Elements matched by selector: %1$S. Elements removed: %2$S.
+
+# LOCALIZATION NOTE (pagemodRemoveAttributeDesc) A very short description of the
+# 'pagemod remove attribute' command. This string is designed to be shown in
+# a menu alongside the command name, which is why it should be as short as
+# possible.
+pagemodRemoveAttributeDesc=Remove matching atributes
+
+# LOCALIZATION NOTE (pagemodRemoveAttributeSearchAttributesDesc) A very short
+# string to describe the 'searchAttributes' parameter to the 'pagemod remove
+# attribute' command, which is displayed in a dialog when the user is using this
+# command.
+pagemodRemoveAttributeSearchAttributesDesc=Regexp specifying attributes to remove
+
+# LOCALIZATION NOTE (pagemodRemoveAttributeSearchElementsDesc) A very short
+# string to describe the 'searchElements' parameter to the 'pagemod remove
+# attribute' command, which is displayed in a dialog when the user is using this
+# command.
+pagemodRemoveAttributeSearchElementsDesc=CSS selector of elements to include
+
+# LOCALIZATION NOTE (pagemodRemoveAttributeRootDesc) A very short string to
+# describe the 'root' parameter to the 'pagemod remove attribute' command, which
+# is displayed in a dialog when the user is using this command.
+pagemodRemoveAttributeRootDesc=CSS selector of root of search
+
+# LOCALIZATION NOTE (pagemodRemoveAttributeIgnoreCaseDesc) A very short string
+# to describe the 'ignoreCase' parameter to the 'pagemod remove attribute'
+# command, which is displayed in a dialog when the user is using this command.
+pagemodRemoveAttributeIgnoreCaseDesc=Perform case-insensitive search
+
+# LOCALIZATION NOTE (pagemodRemoveAttributeResult) A string displayed as the
+# result of the 'pagemod remove attribute' command.
+pagemodRemoveAttributeResult=Elements matched by selector: %1$S. Attributes removed: %2$S.
+
+# LOCALIZATION NOTE (cookieDesc) A very short description of the 'cookie'
+# command. See cookieManual for a fuller description of what it does. This
+# string is designed to be shown in a menu alongside the command name, which
+# is why it should be as short as possible.
+cookieDesc=Mostrar y alterar cookies
+
+# LOCALIZATION NOTE (cookieManual) A fuller description of the 'cookie'
+# command, displayed when the user asks for help on what it does.
+cookieManual=Comandos para listar, crear, borrar y alterar cookies para el dominio actual.
+
+# LOCALIZATION NOTE (cookieListDesc) A very short description of the
+# 'cookie list' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+cookieListDesc=Mostrar cookies
+
+# LOCALIZATION NOTE (cookieListManual) A fuller description of the 'cookie list'
+# command, displayed when the user asks for help on what it does.
+cookieListManual=Mostrar una lista de cookies relevantes a la página actual.
+
+# LOCALIZATION NOTE (cookieListOutKey) A heading used in the output from the
+# 'cookie list' command above a list of cookie keys
+cookieListOutKey=Clave
+
+# LOCALIZATION NOTE (cookieListOutValue) A heading used in the output from the
+# 'cookie list' command above a list of cookie values
+cookieListOutValue=Valor
+
+# LOCALIZATION NOTE (cookieListOutActions) A heading used in the output from the
+# 'cookie list' command above a list of actions to take on cookies
+cookieListOutActions=Acciones
+
+# LOCALIZATION NOTE (cookieListOutEdit) A title used in the output from the
+# 'cookie list' command on a button which can be used to edit cookie values
+cookieListOutEdit=Editar
+
+# LOCALIZATION NOTE (cookieListOutRemove) A title used in the output from the
+# 'cookie list' command on a button which can be used to remove cookies
+cookieListOutRemove=Eliminar
+
+# LOCALIZATION NOTE (cookieRemoveDesc) A very short description of the
+# 'cookie remove' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+cookieRemoveDesc=Eliminar cookie
+
+# LOCALIZATION NOTE (cookieRemoveManual) A fuller description of the 'cookie remove'
+# command, displayed when the user asks for help on what it does.
+cookieRemoveManual=Remove a cookie, given its key
+
+# LOCALIZATION NOTE (cookieRemoveKeyDesc) A very short string to describe the
+# 'key' parameter to the 'cookie remove' command, which is displayed in a dialog
+# when the user is using this command.
+cookieRemoveKeyDesc=The key of the cookie to remove
+
+# LOCALIZATION NOTE (cookieSetDesc) A very short description of the
+# 'cookie set' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+cookieSetDesc=Set a cookie
+
+# LOCALIZATION NOTE (cookieSetManual) A fuller description of the 'cookie set'
+# command, displayed when the user asks for help on what it does.
+cookieSetManual=Set a cookie by specifying a key name, it's value and optionally one or more of the following attributes: expires (max-age in seconds or the expires date in GMTString format), path, domain, secure
+
+# LOCALIZATION NOTE (cookieSetKeyDesc) A very short string to describe the
+# 'key' parameter to the 'cookie set' command, which is displayed in a dialog
+# when the user is using this command.
+cookieSetKeyDesc=The key of the cookie to set
+
+# LOCALIZATION NOTE (cookieSetValueDesc) A very short string to describe the
+# 'value' parameter to the 'cookie set' command, which is displayed in a dialog
+# when the user is using this command.
+cookieSetValueDesc=The value of the cookie to set
+
+# LOCALIZATION NOTE (cookieSetOptionsDesc) The title of a set of options to
+# the 'cookie set' command, displayed as a heading to the list of option.
+cookieSetOptionsDesc=Opciones
+
+# LOCALIZATION NOTE (cookieSetPathDesc) A very short string to describe the
+# 'path' parameter to the 'cookie set' command, which is displayed in a dialog
+# when the user is using this command.
+cookieSetPathDesc=The path of the cookie to set
+
+# LOCALIZATION NOTE (cookieSetDomainDesc) A very short string to describe the
+# 'domain' parameter to the 'cookie set' command, which is displayed in a dialog
+# when the user is using this command.
+cookieSetDomainDesc=The domain of the cookie to set
+
+# LOCALIZATION NOTE (cookieSetSecureDesc) A very short string to describe the
+# 'secure' parameter to the 'cookie set' command, which is displayed in a dialog
+# when the user is using this command.
+cookieSetSecureDesc=Sólo se transmite sobre https
+
+# LOCALIZATION NOTE (jsbDesc) A very short description of the
+# 'jsb' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+jsbDesc=Embellecedor de Javascript
+
+# LOCALIZATION NOTE (jsbUrlDesc) A very short description of the
+# 'jsb <url>' parameter. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+jsbUrlDesc=URL del archivo JS a embellecer
+
+# LOCALIZATION NOTE (jsbIndentSizeDesc) A very short description of the
+# 'jsb <indentSize>' parameter. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+jsbIndentSizeDesc=Tamaño de sangría en caracteres
+
+# LOCALIZATION NOTE (jsbIndentSizeManual) A fuller description of the
+# 'jsb <indentChar>' parameter, displayed when the user asks for help on what it
+# does.
+jsbIndentSizeManual=Número de caracteres con los que indentar cada línea
+
+# LOCALIZATION NOTE (jsbIndentCharDesc) A very short description of the
+# 'jsb <indentChar>' parameter. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+jsbIndentCharDesc=Caracteres usados para indentar cada línea
+
+# LOCALIZATION NOTE (jsbIndentCharManual) A fuller description of the
+# 'jsb <indentChar>' parameter, displayed when the user asks for help on what it
+# does.
+jsbIndentCharManual=Caracteres usados para indentar cada línea. Posibles opciones son espacio o tab.
+
+# LOCALIZATION NOTE (jsbPreserveNewlinesDesc) A very short description of the
+# 'jsb <jsbPreserveNewlines>' parameter. This string is designed to be shown
+# in a menu alongside the command name, which is why it should be as short as
+# possible.
+jsbPreserveNewlinesDesc=¿Mantener saltos de línea existentes?
+
+# LOCALIZATION NOTE (jsbPreserveNewlinesManual) A fuller description of the
+# 'jsb <jsbPreserveNewlines>' parameter, displayed when the user asks for help
+# on what it does.
+jsbPreserveNewlinesManual=Se deberían mantener los saltos de línea existentes
+
+# LOCALIZATION NOTE (jsbPreserveMaxNewlinesDesc) A very short description of the
+# 'jsb <preserveMaxNewlines>' parameter. This string is designed to be shown
+# in a menu alongside the command name, which is why it should be as short as
+# possible.
+jsbPreserveMaxNewlinesDesc=Cantidad máxima de saltos de línea consecutivos
+
+# LOCALIZATION NOTE (jsbPreserveMaxNewlinesManual) A fuller description of the
+# 'jsb <preserveMaxNewlines>' parameter, displayed when the user asks for help
+# on what it does.
+jsbPreserveMaxNewlinesManual=El numero máximo de saltos de línea consecutivos a preservar
+
+# LOCALIZATION NOTE (jsbJslintHappyDesc) A very short description of the
+# 'jsb <jslintHappy>' parameter. This string is designed to be shown
+# in a menu alongside the command name, which is why it should be as short as
+# possible.
+jsbJslintHappyDesc=¿Forzar modo jslint-stricter?
+
+# LOCALIZATION NOTE (jsbJslintHappyManual) A fuller description of the
+# 'jsb <jslintHappy>' parameter, displayed when the user asks for help
+# on what it does.
+jsbJslintHappyManual=Al establecerlo a true, el modo jslint-stricter es forzado
+
+# LOCALIZATION NOTE (jsbBraceStyleDesc) A very short description of the
+# 'jsb <braceStyle>' parameter. This string is designed to be shown
+# in a menu alongside the command name, which is why it should be as short as
+# possible.
+jsbBraceStyleDesc=Collapse, expand, end-expand, expand-strict
+
+# LOCALIZATION NOTE (jsbBraceStyleManual) A fuller description of the
+# 'jsb <braceStyle>' parameter, displayed when the user asks for help
+# on what it does.
+jsbBraceStyleManual=The coding style of braces. Either collapse, expand, end-expand or expand-strict
+
+# LOCALIZATION NOTE (jsbSpaceBeforeConditionalDesc) A very short description of
+# the 'jsb <spaceBeforeConditional>' parameter. This string is designed to be
+# shown in a menu alongside the command name, which is why it should be as short
+# as possible.
+jsbSpaceBeforeConditionalDesc=¿Espacio antes de sentencias if?
+
+# LOCALIZATION NOTE (jsbSpaceBeforeConditionalManual) A fuller description of
+# the 'jsb <spaceBeforeConditional>' parameter, displayed when the user asks for
+# help on what it does.
+jsbSpaceBeforeConditionalManual=¿Se debería agregar un espacio antes de sentencias condicionales?
+
+# LOCALIZATION NOTE (jsbUnescapeStringsDesc) A very short description of the
+# 'jsb <unescapeStrings>' parameter. This string is designed to be shown
+# in a menu alongside the command name, which is why it should be as short as
+# possible.
+jsbUnescapeStringsDesc=Unescape \\xNN characters?
+
+# LOCALIZATION NOTE (jsbUnescapeStringsManual) A fuller description of the
+# 'jsb <unescapeStrings>' parameter, displayed when the user asks for help
+# on what it does.
+jsbUnescapeStringsManual=Should printable characters in strings encoded in \\xNN notation be unescaped?
+
+# LOCALIZATION NOTE (jsbInvalidURL) Displayed when an invalid URL is passed to
+# the jsb command.
+jsbInvalidURL=Ingrese una URL válida
+
+# LOCALIZATION NOTE (calllogDesc) A very short description of the
+# 'calllog' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+calllogDesc=Commands to manipulate function call logging
+
+# LOCALIZATION NOTE (calllogStartDesc) A very short description of the
+# 'calllog start' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+calllogStartDesc=Start logging function calls to the console
+
+# LOCALIZATION NOTE (calllogStartReply) A string displayed as the result of
+# the 'calllog start' command.
+calllogStartReply=Call logging started.
+
+# LOCALIZATION NOTE (calllogStopDesc) A very short description of the
+# 'calllog stop' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+calllogStopDesc=Stop function call logging
+
+# LOCALIZATION NOTE (calllogStopNoLogging) A string displayed as the result of
+# the 'calllog stop' command when there is nothing to stop.
+calllogStopNoLogging=No call logging is currently active
+
+# LOCALIZATION NOTE (calllogStopReply) A string displayed as the result of
+# the 'calllog stop' command when there are logging actions to stop.
+calllogStopReply=Stopped call logging. Active contexts: %1$S.
+
--- a/browser/chrome/browser/devtools/scratchpad.dtd
+++ b/browser/chrome/browser/devtools/scratchpad.dtd
@@ -28,16 +28,19 @@
 <!ENTITY newWindowCmd.label           "Nueva ventana">
 <!ENTITY newWindowCmd.accesskey       "N">
 <!ENTITY newWindowCmd.commandkey      "n">
 
 <!ENTITY openFileCmd.label            "Abrir archivo…">
 <!ENTITY openFileCmd.accesskey        "b">
 <!ENTITY openFileCmd.commandkey       "o">
 
+<!ENTITY openRecentMenu.label         "Abrir reciente">
+<!ENTITY openRecentMenu.accesskey     "r">
+
 <!ENTITY saveFileCmd.label            "Guardar">
 <!ENTITY saveFileCmd.accesskey        "G">
 <!ENTITY saveFileCmd.commandkey       "s">
 
 <!ENTITY saveFileAsCmd.label          "Guardar como…">
 <!ENTITY saveFileAsCmd.accesskey      "o">
 
 <!ENTITY closeCmd.label               "Cerrar">
--- a/browser/chrome/browser/devtools/scratchpad.properties
+++ b/browser/chrome/browser/devtools/scratchpad.properties
@@ -29,16 +29,20 @@ browserWindow.unavailable=Borrador no puede encontrar ninguna ventana de navegador en la que ejecutar el código.
 # LOCALIZATION NOTE  (openFile.title): This is the file picker title, when you
 # open a file from Scratchpad.
 openFile.title=Abrir archivo
 
 # LOCALIZATION NOTE  (openFile.failed): This is the message displayed when file
 # open fails.
 openFile.failed=No se pudo escribir el archivo.
 
+# LOCALIZATION NOTE (clearRecentMenuItems.label): This is the label for the
+# menuitem in the 'Open Recent'-menu which clears all recent files.
+clearRecentMenuItems.label=Limpiar ítems
+
 # LOCALIZATION NOTE  (saveFileAs): This is the file picker title, when you save
 # a file in Scratchpad.
 saveFileAs=Guardar archivo como
 
 # LOCALIZATION NOTE  (saveFile.failed): This is the message displayed when file
 # save fails.
 saveFile.failed=Falló la operación de guardar el archivo.
 
--- a/browser/chrome/browser/devtools/webconsole.properties
+++ b/browser/chrome/browser/devtools/webconsole.properties
@@ -144,16 +144,21 @@ webConsolePositionBelow=Debajo
 # LOCALIZATION NOTE (webConsolePositionWindow): When this option is selected the
 # Web Console interface is displayed in a floating panel.
 webConsolePositionWindow=Ventana
 
 # LOCALIZATION NOTE (webConsoleWindowTitleAndURL): The Web Console floating
 # panel title, followed by the web page URL.
 webConsoleWindowTitleAndURL=Consola web - %S
 
+# LOCALIZATION NOTE (webConsoleMixedContentWarning): Message displayed after a
+# URL in the Web Console that has been flagged for Mixed Content (i.e. http
+# content in an https page)
+webConsoleMixedContentWarning=Contenido mezclado
+
 # LOCALIZATION NOTE (scratchpad.linkText):
 # The text used in the right hand side of the web console command line when
 # Javascript is being entered, to indicate how to jump into scratchpad mode
 scratchpad.linkText=May+ENTER - Abrir en borrador
 
 # LOCALIZATION NOTE (gcliterm.instanceLabel): The console displays
 # objects using their type (from the constructor function) in this descriptive
 # string
--- a/browser/pdfviewer/chrome.properties
+++ b/browser/pdfviewer/chrome.properties
@@ -1,3 +1,4 @@
 # Chrome notification bar messages and buttons
 unsupported_feature=Este documento PDF puede que no se muestre correctamente.
 open_with_different_viewer=Abrir con un visor diferente
+open_with_different_viewer.accessKey=o
--- a/browser/pdfviewer/viewer.properties
+++ b/browser/pdfviewer/viewer.properties
@@ -73,20 +73,19 @@ rendering_error=Ocurrió un error al dibujar la página.
 
 # Predefined zoom values
 page_scale_width=Ancho de página
 page_scale_fit=Ajustar página
 page_scale_auto=Zoom automático
 page_scale_actual=Tamaño real
 
 # Loading indicator messages
-# LOCALIZATION NOTE (error_line): "{{[percent}}" will be replaced with a percentage
-loading=Cargando… {{percent}}%
 loading_error_indicator=Error
 loading_error=Ocurrió un error al cargar el PDF.
 
 # LOCALIZATION NOTE (text_annotation_type): This is used as a tooltip.
 # "{{[type}}" will be replaced with an annotation type from a list defined in
 # the PDF spec (32000-1:2008 Table 169 – Annotation types).
 # Some common types are e.g.: "Check", "Text", "Comment", "Note"
 text_annotation_type=[{{type}} Anotación]
 request_password=PDF protegido por contraseña:
 
+printing_not_supported=Advertencia: La impresión no está totalmente soportada por este navegador.
--- a/browser/webapprt/webapp.properties
+++ b/browser/webapprt/webapp.properties
@@ -18,8 +18,17 @@ hideApplicationCmdMac.label=Ocultar %S
 
 # LOCALIZATION NOTE (geolocation.title): %S will be replaced with the name of
 # the webapp.
 geolocation.title=%S - Compartir ubicación
 geolocation.description=¿Desea compartir su ubicación?
 geolocation.sharelocation=Compartir ubicación
 geolocation.dontshare=No compartir
 geolocation.remember=Recordar mi selección
+
+# LOCALIZATION NOTE (webapps.install.title): %S will be replaced with the name
+# of the webapp being installed.
+webapps.install.title=Instalar %S
+# LOCALIZATION NOTE (webapps.install.description): %S will be replaced with the
+# name of the webapp being installed.
+webapps.install.description=¿Desea instalar %S?
+webapps.install.install=Instalar splicación
+webapps.install.dontinstall=No instalar
--- a/calendar/chrome/calendar/calendar-event-dialog.dtd
+++ b/calendar/chrome/calendar/calendar-event-dialog.dtd
@@ -1,52 +1,11 @@
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is OEone Calendar Code, released October 31st, 2001.
-   -
-   - The Initial Developer of the Original Code is
-   - OEone Corporation.
-   - Portions created by the Initial Developer are Copyright (C) 2006
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Cédric Corazza <cedric.corazza@wanadoo.fr>
-   -   Michael Buettner <michael.buettner@sun.com>
-   -   Philipp Kewisch <mozilla@kewis.ch>
-   -   Stefan Sitter <ssitter@gmail.com>
-   -   Martin Schroeder <mschroeder@mozilla.x-home.org>
-   -   Hubert Gajewski <hubert@hubertgajewski.com>, Aviary.pl
-   -   Fred Jendrzejewski <fred.jen@web.de>
-   -   Simon Vaillancourt <simon.at.orcl@gmail.com>   
-   -   Gianfranco Balza <bv1578@gmail.com> 
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the LGPL or the GPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!ENTITY event.title.label                  "Editar Ítem" >
 
 <!ENTITY event.dialog.keepDurationButton.tooltip  "Mantener la duración al cambiar la fecha final">
 <!ENTITY event.dialog.keepDurationButton.accesskey "M">
 
 <!ENTITY newevent.from.label                "De" >
 <!ENTITY newevent.to.label                  "Para" >
@@ -216,16 +175,26 @@
 <!ENTITY event.repeat.label                               "Repetir:" >
 <!ENTITY event.repeat.accesskey                           "R">
 <!ENTITY event.reminder.label                             "Recordar:" >
 <!ENTITY event.reminder.accesskey                         "c">
 <!ENTITY event.description.label                          "Descripción:" >
 <!ENTITY event.description.accesskey                      "p">
 <!ENTITY event.attachments.label                          "Adjuntos:" >
 <!ENTITY event.attachments.accesskey                      "j" >
+
+<!-- LOCALIZATION NOTE - These 4 strings are not in production yet,
+   but I want to land Filelink support for Lightning soon. The attach
+   button will become a dropdown button that allows to attach links
+   as usual, but also files via the Filelink providers. -->
+<!ENTITY event.attachments.menubutton.label               "Adjuntar">
+<!ENTITY event.attachments.menubutton.accesskey           "A">
+<!ENTITY event.attachments.url.label                      "Página web…">
+<!ENTITY event.attachments.url.accesskey                  "w">
+
 <!ENTITY event.attachments.popup.remove.label             "Eliminar" >
 <!ENTITY event.attachments.popup.remove.accesskey         "r" >
 <!ENTITY event.attachments.popup.open.label               "Abrir" >
 <!ENTITY event.attachments.popup.open.accesskey           "A" >
 <!ENTITY event.attachments.popup.removeAll.label          "Eliminar todo" >
 <!ENTITY event.attachments.popup.removeAll.accesskey      "E" >
 <!ENTITY event.attachments.popup.attachPage.label         "Adjuntar página web…" >
 <!ENTITY event.attachments.popup.attachPage.accesskey     "w" >
--- a/calendar/chrome/calendar/calendar-event-dialog.properties
+++ b/calendar/chrome/calendar/calendar-event-dialog.properties
@@ -1,46 +1,11 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is Sun event dialog code.
-#
-# The Initial Developer of the Original Code is Sun Microsystems.
-# Portions created by the Initial Developer are Copyright (C) 2006
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Michael Büttner <michael.buettner@sun.com>
-#   Philipp Kewisch <mozilla@kewis.ch>
-#   Hubert Gajewski <hubert@hubertgajewski.com>, Aviary.pl
-#   Martin Schoeder <mschroeder@mozilla.x-home.org>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 # LOCALIZATION NOTE (dailyEveryNth):
 # Edit recurrence window -> Recurrence pattern -> Daily repeat rules
 # #1 - number
 # e.g. "every 4 days"
 dailyEveryNth=cada día;cada #1 días
 repeatDetailsRuleDaily4=cada día de la semana
 
@@ -125,16 +90,17 @@ monthlyRuleNthOfEveryNounclass2=%1$S de 
 # This string allows to change the order of the elements "ordinal" and
 # "weekday" (or to insert a word between them) for the argument %1$S of the
 # string monthlyRuleNthOfEveryNounclass...
 # Without changing this string, the order is that one required from most
 # languages: ordinal + weekday (e.g. "'the first' 'Monday' of every 2 months").
 # %1$S - ordinal with article
 # %2$S - weekday noun
 # e.g. "'the first' 'Monday'"
+# DONT_TRANSLATE: Make sure there are no extra words in this property, just variables.
 ordinalWeekdayOrder=%1$S %2$S
 
 # LOCALIZATION NOTE (monthlyEveryOfEveryNounclass...):
 # Edit recurrence window -> Recurrence pattern -> Monthly repeat rules
 # Translate these strings according to noun class/gender of weekday (%1$S) 
 # set in 'repeadDetailsDay...Nounclass' strings.
 # Nounclass1 <-> Masculine gender; Nounclass2 <-> Feminine gender.
 # Add others strings with suffix 3, 4,... for others noun classes if your
@@ -336,16 +302,17 @@ emailSubjectReply=Re: %1$S
 
 # Link Location Dialog
 specifyLinkLocation=Especifique la dirección de enlace
 enterLinkLocation=Ingrese una página web o ubicación del documento.
 
 summaryDueTaskLabel=Vencimiento:
 
 # Attach File Dialog
+attachViaFilelink=Archivo usando %1$S
 selectAFile=Seleccione archivo(s) a adjuntar
 removeCalendarsTitle=Eliminar adjuntos
 removeCalendarsText=¿Desea eliminar %1$S adjunto(s)?
 
 # Recurrence Dialog Widget Order
 # LOCALIZATION NOTE: You can change the order of below params
 # Edit recurrence window -> Recurrence pattern -> Repeat monthly
 # %1$S - ordinal, %2$S - weekday
--- a/calendar/chrome/lightning/lightning.dtd
+++ b/calendar/chrome/lightning/lightning.dtd
@@ -1,57 +1,19 @@
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is calendar views.
-   -
-   - The Initial Developer of the Original Code is
-   - Oracle Corporation.
-   - Portions created by the Initial Developer are Copyright (C) 2005
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Mike Shaver <shaver@mozilla.org>
-   -   Simon Paquet <bugzilla@babylonsounds.com>
-   -   Matthew Willis <mattwillis@mac.com>
-   -   Philipp Kewisch <mozilla@kewis.ch>
-   -   Martin Schroeder <mschroeder@mozilla.x-home.org>
-   -   Berend Cornelius <berend.cornelius@sun.com>
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the GPL or the LGPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!-- WARNING! This file contains UTF-8 encoded characters!
    - If this ==> … <== doesn't look like an ellipsis (three dots in a row),
    - your editor isn't using UTF-8 encoding and may munge up the document!
   -->
 
 <!-- Tools menu -->
-<!ENTITY lightning.taskLabel "Lightning">
+<!ENTITY lightning.preferencesLabel "Calendar">
 
 <!-- New menu popup in File menu -->
 <!ENTITY lightning.menupopup.new.event.label    "Evento…">
 <!ENTITY lightning.menupopup.new.event.accesskey "E">
 <!ENTITY lightning.menupopup.new.task.label     "Tarea…">
 <!ENTITY lightning.menupopup.new.task.accesskey "T">
 <!ENTITY lightning.menupopup.new.calendar.label "Calendario…">
 <!ENTITY lightning.menupopup.new.calendar.accesskey "n">
--- a/dom/chrome/accessibility/AccessFu.properties
+++ b/dom/chrome/accessibility/AccessFu.properties
@@ -102,8 +102,12 @@ tabReload      =      recargando
 # Object states
 stateChecked     =    checked
 stateNotChecked  =    not checked
 stateExpanded    =    expandido
 stateCollapsed   =    colapsado
 stateUnavailable =    no disponible
 stateRequired    =    requerido
 stateTraversed   =    visitado
+
+# App modes
+editingMode    =      editando
+navigationMode =      navegando
--- a/dom/chrome/accessibility/mac/accessible.properties
+++ b/dom/chrome/accessibility/mac/accessible.properties
@@ -20,9 +20,15 @@ cycle   =       Cycle
 # (Mac Only)
 # The Role Description for AXWebArea (the web widget). Like in Safari.
 htmlContent = Contenido HTML
 # The Role Description for the Tab button.
 tab     =       tab
 # The Role Description for definition list dl, dt and dd
 term    =       término
 definition =    definición
-
+# The Role Description for WAI-ARIA Landmarks
+search  =       búsqueda
+banner  =       banner
+navigation =    navegación
+complementary = complementario
+content =       contenido
+main    =       principal
--- a/dom/chrome/dom/dom.properties
+++ b/dom/chrome/dom/dom.properties
@@ -35,16 +35,24 @@ FormValidationCheckboxMissing=Marque est
 FormValidationRadioMissing=Seleccione una de estas opciones.
 FormValidationFileMissing=Seleccione un archivo.
 FormValidationSelectMissing=Seleccione un ítem de la lista.
 FormValidationInvalidEmail=Ingrese una dirección de correo electrónico.
 FormValidationInvalidURL=Ingrese una URL.
 FormValidationPatternMismatch=Please match the requested format.
 # LOCALIZATION NOTE (FormValidationPatternMismatchWithTitle): %S is the (possibly truncated) title attribute value.
 FormValidationPatternMismatchWithTitle=Please match the requested format: %S.
+# LOCALIZATION NOTE (FormValidationRangeOverflow): %S can be a number or a date.
+FormValidationRangeOverflow=Seleccione un valor que sea menor que %S.
+# LOCALIZATION NOTE (FormValidationRangeUnderflow): %S can be a number or a date.
+FormValidationRangeUnderflow=Seleccione un valor que sea mayor que %S.
+# LOCALIZATION NOTE (FormValidationStepMismatch): both %S can be a number or a date.
+FormValidationStepMismatch=Seleccione un valor válido. Los dos valores más cercanos son %S y %S.
+# LOCALIZATION NOTE (FormValidationStepMismatchWitoutMax): %S can be a number or a date. This is called instead of FormValidationStepMismatch when the second value isn't valid because it's higher than the maximum allowed value.
+FormValidationStepMismatchWithoutMax=Seleccione un valor válido. El valor más cercano es %S.
 GetAttributeNodeWarning=El uso de getAttributeNode() es obsoleto. Use getAttribute() en su lugar.
 SetAttributeNodeWarning=El uso de setAttributeNode() es obsoleto. Use setAttribute() en su lugar.
 GetAttributeNodeNSWarning=El uso de getAttributeNodeNS() es obsoleto. Use getAttributeNS() en su lugar.
 SetAttributeNodeNSWarning=El uso de setAttributeNodeNS() es obsoleto. Use setAttributeNS() en su lugar.
 RemoveAttributeNodeWarning=El uso de removeAttributeNode() es obsoleto. Use removeAttribute() en su lugar.
 CreateAttributeWarning=El uso de document.createAttribute() es obsoleto. Use element.setAttribute() en su lugar.
 CreateAttributeNSWarning=El uso de document.createAttributeNS() es obsoleto. Use element.setAttributeNS() en su lugar.
 SpecifiedWarning=El uso de attributes' specified attribute es obsoleto. Siempre devuelve verdadero.
@@ -121,11 +129,8 @@ MozBlobBuilderWarning=El uso de MozBlobB
 DOMExceptionCodeWarning=El uso del atributo de código DOMException es obsoleto. Use name en su lugar.
 # LOCALIZATION NOTE: Do not translate "__exposedProps__"
 NoExposedPropsWarning=Exponer objetos JS del chrome al contexto sin __exposedProps__ es inseguro y obsoleto. Vea https://developer.mozilla.org/en/XPConnect_wrappers para más información
 # LOCALIZATION NOTE: Do not translate "Mutation Event" and "MutationObserver"
 MutationEventWarning=El uso de Mutation Event es obsoleto. Use MutationObserver en su lugar.
 # LOCALIZATION NOTE: Do not translate "Blob", "mozSlice", or "slice"
 MozSliceWarning=El uso de mozSlice en el objeto Blob object es obsoleto.  Use slice en su lugar.
 OnuploadprogressWarning=El uso del atributo onuploadprogress de XMLHttpRequest es obsoleto.
-# LOCALIZATION NOTE: Do not translate "java" or "Packages".
-JavaPackagesWarning=El uso de los objetos DOM 'java' y 'Packages' para acceder la funcionalidad de Java es obsoleto. El soporte será eliminado pronto.
-
--- a/dom/chrome/layout/HtmlForm.properties
+++ b/dom/chrome/layout/HtmlForm.properties
@@ -12,9 +12,9 @@ MediaUpload=Subir medios
 # input field. The space needs be escaped in the property file to avoid 
 # trimming.
 IsIndexPromptWithSpace=Este es un índice en el que se pueden ejecutar búsquedas. Ingrese términos a buscar:\u0020
 ForgotPostWarning=El formulario contiene enctype=%S, pero no contiene method=post.  Enviando normalmente con method=GET y sin enctype.
 ForgotFileEnctypeWarning=El formulario contiene un ingreso de archivo, pero le falta method=POST y enctype=multipart/form-data.  El archivo no será enviado.
 # LOCALIZATION NOTE (DefaultFormSubject): %S will be replaced with brandShortName
 DefaultFormSubject=Formulario enviado desde %S
 CannotEncodeAllUnicode=Un formulario fue enviado en la codificación %S que no puede codificar todos los caracteres Unicode, así que el ingreso del usuario puede llegar corrupto. Para evitar este problema, la página debería ser cambiada para que el formulario se envíe con la codificación UTF-8, ya sea cambiando la codificación de la página a UTF-8 o especificando accept-charset=utf-8 en el elemento form.
-
+AllSupportedTypes=Todos los tipos soportados
new file mode 100644
--- /dev/null
+++ b/dom/chrome/security/csp.properties
@@ -0,0 +1,106 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# CSP Warnings:
+# LOCALIZATION NOTE (directiveViolated):
+# %1$S is the directive that has been violated.
+directiveViolated = Directiva %1$S violada
+# LOCALIZATION NOTE (directiveViolatedWithURI):
+# %1$S is the directive that has been violated.
+# %2$S is the URI of the resource which violated the directive.
+directiveViolatedWithURI = Directiva %1$S violada por %2$S
+# LOCALIZATION NOTE (triedToSendReport):
+# %1$S is the URI we attempted to send a report to.
+triedToSendReport = Se trató de enviar informe a URI inválido: "%1$S"
+# LOCALIZATION NOTE (errorWas):
+# %1$S is the error resulting from attempting to send the report
+errorWas = el error fue: "%1$S"
+# LOCALIZATION NOTE (couldNotParseReportURI):
+# %1$S is the report URI that could not be parsed
+couldNotParseReportURI = couldn't parse report URI: %1$S
+# LOCALIZATION NOTE (couldNotProcessUnknownDirective):
+# %1$S is the unknown directive
+couldNotProcessUnknownDirective = No se puede procesar directiva desconocida '%1$S'
+# LOCALIZATION NOTE (doNotUnderstandOption):
+# %1$S is the option that could not be understood
+doNotUnderstandOption = no se entiende la opción '%1$S'.  Se ingnora.
+# LOCALIZATION NOTE (notETLDPlus1):
+# %1$S is the ETLD of the report URI that could not be used
+notETLDPlus1 = can't use report URI from non-matching eTLD+1: %1$S
+# LOCALIZATION NOTE (notSameScheme):
+# %1$S is the report URI that could not be used
+notSameScheme = can't use report URI with different scheme from originating document: %1$S
+# LOCALIZATION NOTE (notSamePort):
+# %1$S is the report URI that could not be used
+notSamePort = can't use report URI with different port from originating document: %1$S
+# LOCALIZATION NOTE (pageCannotSendReportsTo):
+# %1$S is the URI of the page with the policy
+# %2$S is the report URI that could not be used
+pageCannotSendReportsTo = la página en %1$S no puede enviar informes a %2$S
+allowOrDefaultSrcRequired = directiva 'allow' o 'default-src' requerida pero no está presente.  Revirtiendo a "default-src 'none'"
+# LOCALIZATION NOTE (failedToParseUnrecognizedSource):
+# %1$S is the CSP Source that could not be parsed
+failedToParseUnrecognizedSource = Failed to parse unrecoginzied source %1$S
+# LOCALIZATION NOTE (reportPostRedirect):
+# %1$S is the specified report URI before redirect
+reportPostRedirect = Post of violation report to %1$S failed, as a redirect occurred
+
+# CSP Errors:
+policyURINotAlone = la directiva policy-uri solamente puede aparecer sola
+noParentRequest = The policy-uri cannot be fetched without a parent request and a CSP.
+# LOCALIZATION NOTE (policyURIParseError):
+# %1$S is the URI that could not be parsed
+policyURIParseError = could not parse URI in policy URI: %1$S
+# LOCALIZATION NOTE (nonMatchingHost):
+# %1$S is the URI host that does not match
+nonMatchingHost = can't fetch policy uri from non-matching hostname: %1$S
+# LOCALIZATION NOTE (nonMatchingPort):
+# %1$S is the URI port that does not match
+nonMatchingPort = can't fetch policy uri from non-matching port: %1$S
+# LOCALIZATION NOTE (nonMatchingScheme):
+# %1$S is the URI scheme that does not match
+nonMatchingScheme = can't fetch policy uri from non-matching scheme: %1$S
+# LOCALIZATION NOTE (errorFetchingPolicy):
+# %1$S is the error that caused fetching to fail
+errorFetchingPolicy = Error fetching policy-uri: %1$S
+cspSourceNotURI = El argumento provisto no es nsIURI
+argumentIsNotString = El argumento provisto no es una cadena
+selfDataNotProvided = Can't use 'self' if self data is not provided
+# LOCALIZATION NOTE (uriWithoutScheme):
+# %1$S is the URI without a scheme
+uriWithoutScheme = can't parse a URI without a scheme: %1$S
+selfKeywordNoSelfData = self keyword used, but no self data specified
+# LOCALIZATION NOTE (couldntParseInvalidSource):
+# %1$S is the source that could not be parsed
+couldntParseInvalidSource = Couldn't parse invalid source %1$S
+# LOCALIZATION NOTE (hostSourceWithoutData):
+# %1$S is the source
+hostSourceWithoutData = Can't create host-only source %1$S without 'self' data
+# LOCALIZATION NOTE (sourceWithoutData):
+# %1$S is the source
+sourceWithoutData = Can't create source %1$S without 'self' data
+# LOCALIZATION NOTE (couldntParseInvalidHost):
+# %1$S is the host that's invalid
+couldntParseInvalidHost = Couldn't parse invalid host %1$S
+# LOCALIZATION NOTE (couldntParseScheme):
+# %1$S is the string source
+couldntParseScheme = Couldn't parse scheme in %1$S
+# LOCALIZATION NOTE (couldntParsePort):
+# %1$S is the string source
+couldntParsePort = Couldn't parse port in %1$S
+# LOCALIZATION NOTE (notIntersectPort):
+# %1$S is one source we tried to intersect
+# %2$S is the other
+notIntersectPort = Could not intersect %1$S with %2$S due to port problems.
+# LOCALIZATION NOTE (notIntersectScheme):
+# %1$S is one source we tried to intersect
+# %2$S is the other
+notIntersectScheme = Could not intersect %1$S with %2$S due to scheme problems.
+# LOCALIZATION NOTE (intersectingSourceWithUndefinedHost):
+# %1$S is the source
+intersectingSourceWithUndefinedHost = intersecting source with undefined host: %1$S
+# LOCALIZATION NOTE (intersectingSourcesWithUndefinedHosts):
+# %1$S is the first source
+# %2$S is the second source
+intersectingSourcesWithUndefinedHosts = intersecting two sources with undefined hosts: %1$S and %2$S
deleted file mode 100644
--- a/mail/chrome/messenger/addressbook/abCardViewOverlay.dtd
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<!-- Box Headings -->
-<!ENTITY contact.heading "Contacto">
-<!ENTITY home.heading "Casa">
-<!ENTITY other.heading "Otros">
-<!ENTITY phone.heading "Teléfono">
-<!ENTITY work.heading "Trabajo">
-<!-- Special Box Headings, for mailing lists -->
-<!ENTITY description.heading "Descripción">
-<!ENTITY addresses.heading "Direcciones">
-<!-- For Map It! -->
-<!ENTITY mapItButton.label "Obtener mapa">
-<!ENTITY mapIt.tooltip "Obtener de la web un mapa de esta dirección">
new file mode 100644
--- /dev/null
+++ b/mail/chrome/messenger/cloudfile/Box/auth.dtd
@@ -0,0 +1,5 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this file,
+   - You can obtain one at http://mozilla.org/MPL/2.0/.  -->
+
+<!ENTITY auth.title   "Autenticación en Box">
rename from mail/chrome/messenger/cloudfile/Dropbox/management.dtd
rename to mail/chrome/messenger/cloudfile/Box/management.dtd
--- a/mail/chrome/messenger/cloudfile/Dropbox/management.dtd
+++ b/mail/chrome/messenger/cloudfile/Box/management.dtd
@@ -1,4 +1,5 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this file,
    - You can obtain one at http://mozilla.org/MPL/2.0/.  -->
-<!ENTITY dropboxMgmt.viewSettings "Ver configuración de mi cuenta en dropbox.com">
+
+<!ENTITY boxMgmt.viewSettings "Ver configuración de mi cuenta en box.com">
rename from mail/chrome/messenger/cloudfile/Dropbox/settings.dtd
rename to mail/chrome/messenger/cloudfile/Box/settings.dtd
--- a/mail/chrome/messenger/cloudfile/Dropbox/settings.dtd
+++ b/mail/chrome/messenger/cloudfile/Box/settings.dtd
@@ -1,4 +1,5 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this file,
    - You can obtain one at http://mozilla.org/MPL/2.0/.  -->
-<!ENTITY dropboxSettings.learnMore "Conocer más…">
+
+<!ENTITY boxSettings.needAnAccount "Obtener una cuenta de Box…">
\ No newline at end of file
new file mode 100644
--- /dev/null
+++ b/mail/chrome/messenger/cloudfile/YouSendIt/fileExceeds2GB.dtd
@@ -0,0 +1,6 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this file,
+   - You can obtain one at http://mozilla.org/MPL/2.0/.  -->
+<!ENTITY fileExceeds2GB.title   "YouSendIt">
+<!ENTITY fileExceeds2GB.cancel "OK">
+<!ENTITY fileExceeds2GB.description "Sending files over 2GB is not supported.">
new file mode 100644
--- /dev/null
+++ b/mail/chrome/messenger/cloudfile/YouSendIt/fileExceedsLimit.dtd
@@ -0,0 +1,13 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this file,
+   - You can obtain one at http://mozilla.org/MPL/2.0/.  -->
+<!ENTITY fileExceedsLimit.title   "YouSendIt">
+<!ENTITY fileExceedsLimit.thatsBigFile   "Sending files larger than 50 MB">
+<!ENTITY fileExceedsLimit.thatsBigFile2   "is a premium feature.">
+<!ENTITY fileExceedsLimit.accept "Upgrade">
+<!ENTITY fileExceedsLimit.cancel "Cancel">
+<!ENTITY fileExceedsLimit.style "width: 40em; min-height: 20em;">
+<!ENTITY fileExceedsLimit.proIncludes "Upgrade now to send this file plus:">
+<!ENTITY fileExceedsLimit.pros1 "Send files and folders up to 2GB">
+<!ENTITY fileExceedsLimit.pros2 "Store unlimited files online">
+<!ENTITY fileExceedsLimit.pros3 "Access and share files from anywhere">
new file mode 100644
--- /dev/null
+++ b/mail/chrome/messenger/cloudfile/YouSendIt/fileExceedsQuota.dtd
@@ -0,0 +1,11 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this file,
+   - You can obtain one at http://mozilla.org/MPL/2.0/.  -->
+<!ENTITY fileExceedsQuota.title   "YouSendIt">
+<!ENTITY fileExceedsQuota.storageLimitReached   "Storage limit reached">
+<!ENTITY fileExceedsQuota.accept "Upgrade">
+<!ENTITY fileExceedsQuota.cancel "Cancel">
+<!ENTITY fileExceedsQuota.description "You have reached your account storage limit of 2GB.">
+<!ENTITY fileExceedsQuota.description1 "Your current storage usage is #XXX GB.">
+<!ENTITY fileExceedsQuota.description2 "Upgrade today to Pro Plus account and get more storage.">
+<!ENTITY fileExceedsQuota.description3 "You can also choose to delete files in your account to create more space.">
new file mode 100644
--- /dev/null
+++ b/mail/chrome/messenger/junkLog.dtd
@@ -0,0 +1,10 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!ENTITY adaptiveJunkLog.title "Registro de correo basura adaptivo">
+<!ENTITY adaptiveJunkLogInfo.label "Control de actividad del registro del correo basura adaptivo.">
+<!ENTITY clearLog.label "Limpiar el registro">
+<!ENTITY clearLog.accesskey "L">
+<!ENTITY closeLog.label "Cerrar">
+<!ENTITY closeLog.accesskey "C">
--- a/mail/chrome/messenger/messenger.dtd
+++ b/mail/chrome/messenger/messenger.dtd
@@ -577,16 +577,18 @@ you can use these alternative items. Oth
 <!ENTITY addressBookButton.tooltip "Ir a la libreta de direcciones">
 <!ENTITY chatButton.tooltip "Mostrar la pestaña de chat">
 <!ENTITY tagButton.tooltip "Etiquetar mensajes">
 <!ENTITY compactButton.tooltip "Eliminar mensajes borrados de la carpeta actual">
 
 <!-- Tags Menu Popup -->
 <!ENTITY addNewTag.label "Nueva etiqueta…">
 <!ENTITY addNewTag.accesskey "N">
+<!ENTITY manageTags.label "Administrar etiquetas…">
+<!ENTITY manageTags.accesskey "m">
 
 <!-- Folder Pane -->
 <!ENTITY folderColumn.label "Nombre">
 <!ENTITY folderSizeColumn.label "Tamaño">
 
 <!-- Folder Pane Context Menu -->
 <!ENTITY folderContextGetMessages.label "Recibir mensajes de la cuenta">
 <!ENTITY folderContextGetMessages.accesskey "j">
--- a/mail/chrome/messenger/messengercompose/composeMsgs.properties
+++ b/mail/chrome/messenger/messengercompose/composeMsgs.properties
@@ -360,16 +360,17 @@ bigFileHideNotification.check=Nunca notificarme de ésto de nuevo.
 cloudFileUploadingTooltip=Subiendo a %S…
 # LOCALIZATION NOTE(cloudFileUploadedTooltip): Do not translate the string
 # %S. %S is the display name for the cloud account the attachment was uploaded
 # to.
 cloudFileUploadedTooltip=Subido a %S
 cloudFileUploadingNotification=Su archivo está siendo enlazado. Aparecerá en el cuerpo del mensaje cuando esté listo.;Sus archivos están siendo enlazados. Aparecerán en el cuerpo del mensaje cuando estén listos.
 cloudFileUploadingCancel.label=Cancelar
 cloudFileUploadingCancel.accesskey=c
+cloudFilePrivacyNotification=Enlace completo. Tenga en cuenta que los adjuntos enlazados puede ser accesibles por personas que puedan ver o adivinar los enlaces.
 
 ## LOCALIZATION NOTE(smtpEnterPasswordPrompt): Do not translate the
 ## word $S. Place the word $S where the host name should appear.
 smtpEnterPasswordPrompt=Ingrese su contraseña para %S:
 ## LOCALIZATION NOTE(smtpEnterPasswordPromptWithUsername): Do not translate the
 ## words %1$S and %2$S. Place the word %1$S where the host name should appear,
 ## and %2$S where the user name should appear.
 smtpEnterPasswordPromptWithUsername=Ingrese su contraseña para %2$S en %1$S:
@@ -392,16 +393,21 @@ errorCloudFileUpload.title=Error de subi
 ## %1$S is the name of the online storage service that uploading failed against.
 ## %2$S is the name of the file that failed to upload.
 errorCloudFileUpload.message=No se puede subir %2$S a %1$S.
 errorCloudFileQuota.title=Quota Error
 ## LOCALIZATION NOTE(errorCloudFileQuota.message):
 ## %1$S is the name of the online storage service being uploaded to.
 ## %2$S is the name of the file that could not be uploaded due to exceeding the storage limit.
 errorCloudFileQuota.message=Uploading %2$S to %1$S would exceed your space quota.
+errorCloudFileNameLimit.title=Error en nombre de archivo
+## LOCALIZATION NOTE(errorCloudFileNameLimit.message):
+## %1$S is the name of the online storage service being uploaded to.
+## %2$S is the name of the file that could not be uploaded due to the excess file name length
+errorCloudFileNameLimit.message=Subir %2$S a %1$S tiene más de 120 en el nombre. Renombre el archivo para que tenga 120 caracteres o menos en su nombre y súbalo de nuevo.
 errorCloudFileLimit.title=Error de tamaño de archivo
 ## LOCALIZATION NOTE(errorCloudFileLimit.message):
 ## %1$S is the name of the online storage service being uploaded to.
 ## %2$S is the name of the file that could not be uploaded due to size restrictions.
 errorCloudFileLimit.message=%2$S excede el tamaño máximo para %1$S.
 errorCloudFileOther.title=Error desconocido
 ## LOCALIZATION NOTE(errorCloudFileOther.message):
 ## %1$S is the name of the online storage service that cannot be communicated with.
--- a/mail/chrome/messenger/offline.properties
+++ b/mail/chrome/messenger/offline.properties
@@ -1,21 +1,25 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 # Download Messages Prompt
 downloadMessagesWindowTitle1=Descargar mensajes
 downloadMessagesLabel1=¿Quiere descargar los mensajes para usar sin conexión antes de desconectarse?
 downloadMessagesCheckboxLabel1=Preguntarme siempre al desconectar
+downloadMessagesNow=Descargar ahora
  
 # Send Messages Prompt
 sendMessagesWindowTitle1=Mensajes no enviados
 sendMessagesLabel2=¿Quiere enviar los mensajes aún no enviados?
 sendMessagesCheckboxLabel1=Preguntarme siempre que pase a modo con conexión
+sendMessagesNow=Enviar ahora
+
+processMessagesLater=Más tarde
 
 # GetMessages While Offline Prompt 
 getMessagesOfflineWindowTitle1=Obtener mensajes
 getMessagesOfflineLabel1=En este momento se encuentra en modo Sin conexión.\n¿Quiere conectarse para bajar sus nuevos mensajes?
  
 # Send Messages Offline Prompt
 sendMessagesOfflineWindowTitle1=Mensajes No Enviados
 sendMessagesOfflineLabel1=En este momento se encuentra en modo Sin conexión.\n¿Quiere conectarse para bajar sus nuevos mensajes?
new file mode 100644
--- /dev/null
+++ b/mail/chrome/messenger/pgpmime.properties
@@ -0,0 +1,13 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+#
+# The following are used by the pgpmime content type handler
+#
+
+# LOCALIZATION NOTE(pgpMimeNeedsAddon): The text can contain HTML tags.
+# %S is the url to Enigmail on AMO supplied from preferences.
+pgpMimeNeedsAddon=Éste es un mensaje cifrado con OpenPGP.<br>Para descifrar este correo, necesita instalar un <a href="%S">complemento de OpenPGP</a>.
+
+
--- a/mail/chrome/messenger/preferences/advanced.dtd
+++ b/mail/chrome/messenger/preferences/advanced.dtd
@@ -10,27 +10,34 @@
 
 <!-- General Settings -->
 
 <!ENTITY submitTelemetry.label         "Enviar datos de rendimiento">
 <!ENTITY submitTelemetry.accesskey     "r">
 <!ENTITY telemetryInfoLink.label       "Más información sobre Telemetry">
 <!ENTITY enableGlodaSearch.label       "Habilitar indexado y búsqueda global">
 <!ENTITY enableGlodaSearch.accesskey   "i">
+
+<!ENTITY scrolling.label               "Desplazamiento">
+<!ENTITY useAutoScroll.label           "Usar autodesplazamiento">
+<!ENTITY useAutoScroll.accesskey       "U">
+<!ENTITY useSmoothScrolling.label      "Usar desplazamiento suave">
+<!ENTITY useSmoothScrolling.accesskey  "m">
+
 <!ENTITY systemIntegration.label       "Integración con el sistema">
 <!ENTITY alwaysCheckDefault.label          "Siempre verificar si &brandShortName; es el cliente de correo predeterminado al iniciar">
 <!ENTITY alwaysCheckDefault.accesskey      "l">
 <!ENTITY searchIntegration.label       "Permitir que &searchIntegration.engineName; busque mensajes">
 <!ENTITY searchIntegration.accesskey   "S">
 <!ENTITY checkNow.label             "Verificar ahora">
 <!ENTITY checkNow.accesskey         "V">
 <!ENTITY configEditDesc.label          "Configuración avanzada">
 <!ENTITY configEdit.label              "Editor de configuración…">
 <!ENTITY configEdit.accesskey          "g">
-<!ENTITY returnReceiptsInfo.label      "Determinar cómo &brandShortName; maneja los acuses de recibo">
+<!ENTITY returnReceiptsInfo.label      "Determine cómo &brandShortName; maneja los acuses de recibo">
 <!ENTITY showReturnReceipts.label      "Acuses de recibo…">
 <!ENTITY showReturnReceipts.accesskey  "r">
 
 <!-- Display and Reading Settings -->
 <!ENTITY reading.caption                "Lectura">
 <!ENTITY display.caption                "Apariencia">
 <!ENTITY showCondensedAddresses.label  "Mostrar solamente el nombre para las personas de mi libreta de direcciones">
 <!ENTITY showCondensedAddresses.accesskey "p">
@@ -80,19 +87,19 @@
 <!ENTITY proxiesConfigure.label        "Configurar cómo &brandShortName; se conectará a Internet.">
 <!ENTITY connectionsInfo.caption       "Conexión">
 <!ENTITY offlineInfo.caption           "Sin conexión">
 <!ENTITY offlineInfo.label             "Configurar las opciones 'Sin conexión'">
 <!ENTITY showOffline.label             "Sin conexión…">
 <!ENTITY showOffline.accesskey         "S">
 
 <!ENTITY Diskspace "Espacio en disco">
-<!ENTITY offlineCompact.label "Compactar carpetas cuando se recuperen más de">
-<!ENTITY offlineCompact.accesskey "e">
-<!ENTITY mb.label "MB">
+<!ENTITY offlineCompactFolders.label     "Compactar carpetas cuando se recuperen más de">
+<!ENTITY offlineCompactFolders.accesskey "e">
+<!ENTITY offlineCompactFoldersMB.label   "MB en total">
 
 <!-- LOCALIZATION NOTE:
   The entities useCacheBefore.label and useCacheAfter.label appear on a single
   line in preferences as follows:
 
   &useCacheBefore.label  [ textbox for cache size in MB ]   &useCacheAfter.label;
 -->
 <!ENTITY useCacheBefore.label            "Usar hasta">
--- a/mail/chrome/messenger/preferences/fonts.dtd
+++ b/mail/chrome/messenger/preferences/fonts.dtd
@@ -30,17 +30,17 @@
 <!ENTITY  font.langGroup.trad-chinese             "Chino tradicional (Taiwan)">
 <!ENTITY  font.langGroup.simpl-chinese            "Chino simplificado">
 <!ENTITY  font.langGroup.trad-chinese-hk          "Chino tradicional (Hong Kong)">
 <!ENTITY  font.langGroup.korean                   "Coreano">
 <!ENTITY  font.langGroup.cyrillic                 "Cirílico">
 <!ENTITY  font.langGroup.baltic                   "Báltico">
 <!ENTITY  font.langGroup.el                       "Griego">
 <!ENTITY  font.langGroup.turkish                  "Turco">
-<!ENTITY  font.langGroup.unicode                  "Otros idiomas">
+<!ENTITY  font.langGroup.unicode1                 "Unicode">
 <!ENTITY  font.langGroup.user-def                 "Definido por el usuario">
 <!ENTITY  font.langGroup.thai                     "Thai">
 <!ENTITY  font.langGroup.hebrew                   "Hebreo">
 <!ENTITY  font.langGroup.arabic                   "Árabe">
 <!ENTITY  font.langGroup.devanagari               "Devanagari">
 <!ENTITY  font.langGroup.tamil                    "Tamil">
 <!ENTITY  font.langGroup.armenian                 "Armenio">
 <!ENTITY  font.langGroup.bengali                  "Bengalí">
deleted file mode 100644
--- a/mail/chrome/messenger/preferences/junkLog.dtd
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<!ENTITY adaptiveJunkLog.title "Registro de correo basura adaptivo">
-<!ENTITY adaptiveJunkLogInfo.label "Control de actividad del registro del correo basura adaptivo.">
-<!ENTITY clearLog.label "Limpiar el registro">
-<!ENTITY clearLog.accesskey "L">
-<!ENTITY closeLog.label "Cerrar">
-<!ENTITY closeLog.accesskey "C">
--- a/mobile/android/base/android_strings.dtd
+++ b/mobile/android/base/android_strings.dtd
@@ -49,16 +49,17 @@
 <!ENTITY forward "Adelante">
 <!ENTITY menu "Menú">
 <!ENTITY back "Atrás">
 <!ENTITY stop "Detener">
 <!ENTITY site_security "Seguridad del sitio">
 
 <!ENTITY close_tab "Cerrar pestaña">
 <!ENTITY new_tab "Nueva pestaña">
+<!ENTITY one_tab "1 pestaña">
 <!-- Localization note (num_tabs) : Number of tabs is always more than one. 
      We can't use android plural forms, sadly. See bug #753859. -->
 <!ENTITY num_tabs "&#037;d pestañas">
 <!ENTITY new_tab_opened "Nueva pestaña abierta">
 
 <!ENTITY settings "Configuración">
 <!ENTITY settings_title "Configuración">
 <!ENTITY pref_category_general "General">
@@ -81,35 +82,37 @@
 <!ENTITY pref_text_size "Tamaño de texto">
 <!ENTITY pref_font_size_tiny "Muy chico">
 <!ENTITY pref_font_size_small "Chico">
 <!ENTITY pref_font_size_medium "Mediano">
 <!ENTITY pref_font_size_large "Grande">
 <!ENTITY pref_font_size_xlarge "Extra grande">
 <!ENTITY pref_use_master_password "Usar contraseña maestra">
 <!ENTITY pref_sync "Sync">
+<!ENTITY pref_search_suggestions "Mostrar sugerencias de búsqueda">
 <!ENTITY pref_import_android "Importar desde Android">
 <!ENTITY pref_private_data_history "Historial de navegación y descargas">
 <!ENTITY pref_private_data_formdata "Historial de navegación y búsqueda">
 <!ENTITY pref_private_data_cookies "Cookies">
 <!ENTITY pref_private_data_passwords "Contraseñas guardadas">
 <!ENTITY pref_private_data_cache "Caché">
 <!ENTITY pref_private_data_sessions "Ingresos activos">
 <!ENTITY pref_private_data_offlineApps "Datos de sitios sin conexión">
 <!ENTITY pref_private_data_siteSettings "Preferencias del sitio">
-<!ENTITY pref_search_suggestions "Mostrar sugerencias de búsqueda">
 
 <!ENTITY quit "Salir">
 
 <!ENTITY addons "Complementos">
 <!ENTITY downloads "Descargas">
+<!ENTITY apps "Aplicaciones">
 <!ENTITY char_encoding "Codificación de caracteres">
 
 <!ENTITY share "Compartir">
 <!ENTITY share_title "Compartir vía">
+<!ENTITY share_image_failed "No se puede compartir esta imagen">
 <!ENTITY save_as_pdf "Guardar como PDF">
 <!ENTITY find_in_page "Buscar en la página">
 <!ENTITY desktop_mode "Pedir versión de escritorio">
 
 <!-- Localization note (find_text, find_prev, find_next, find_close) : These strings are used
      as alternate text for accessibility. They are not visible in the UI. -->
 <!ENTITY find_text "Buscar en la página">
 <!ENTITY find_prev "Anterior">
@@ -135,19 +138,20 @@
 <!ENTITY bookmark_edit_location "Dirección">
 <!ENTITY bookmark_edit_keyword "Palabra clave">
 
 <!ENTITY site_settings_title        "Borrar configuración del sitio">
 <!ENTITY site_settings_cancel       "Cancelar">
 <!ENTITY site_settings_clear        "Borrar">
 <!ENTITY site_settings_no_settings  "No hay configuración que borrar.">
 
-<!ENTITY add_to_reading_list "Agregar a la lista de lectura">
+<!ENTITY reading_list "Lista de lectura">
 <!ENTITY reading_list_added "Página agregada a la lista de lectura">
 <!ENTITY reading_list_removed "Página eliminada de la lista de lectura">
+<!ENTITY reading_list_failed "Falló agregar la página a la lista de lectura">
 <!ENTITY reader_mode "Modo lector">
 
 <!ENTITY masterpassword_create_title "Crear contraseña maestra">
 <!ENTITY masterpassword_remove_title "Eliminar contraseña maestra">
 <!ENTITY masterpassword_password "Contraseña">
 <!ENTITY masterpassword_confirm "Confirmar contraseña">
 
 <!ENTITY button_ok "Aceptar">
@@ -191,8 +195,10 @@ just addresses the organization to follo
 <!ENTITY bookmarkhistory_import_both "Importando marcadores e historial
                                       desde Android">
 <!ENTITY bookmarkhistory_import_bookmarks "Importando marcadores
                                            desde Android">
 <!ENTITY bookmarkhistory_import_history "Importando historial
                                          desde Android">
 <!ENTITY bookmarkhistory_import_wait "Esperá...">
 
+<!ENTITY webapp_generic_name "Aplicación"
+>
--- a/mobile/android/base/sync_strings.dtd
+++ b/mobile/android/base/sync_strings.dtd
@@ -36,17 +36,19 @@
 <!ENTITY sync.input.server.label 'URL del servidor'>
   
 <!-- Setup Fail -->
 <!ENTITY sync.title.fail.label 'No se puede configurar &syncBrand.shortName.label;'>
 <!ENTITY sync.subtitle.fail.label '&syncBrand.fullName.label; no se pudo conectar al servidor. ¿Querés probar de nuevo?'>
 <!ENTITY sync.button.tryagain.label 'Intentar nuevamente'>
 <!ENTITY sync.button.manual.label 'Configuración manual'>
 <!ENTITY sync.subtitle.nointernet.label 'No hay conexión a internet disponible.'>
- 
+<!ENTITY sync.subtitle.failaccount.label 'Falló la creación de la cuenta en tu dispositivo.'>
+<!ENTITY sync.subtitle.failmultiple.label '¿Tenés más de un Firefox instalado? Actualmente &syncBrand.fullName.label; solamente soporta una instalación de Firefox a la vez. Desinstalá las otras instancias para usar &syncBrand.shortName.label;.'>
+
 <!-- Setup Success -->
 <!ENTITY sync.title.success.label 'Configuración completa'>
 <!ENTITY sync.subtitle.success.label1 'Tus datos ahora están siendo descargados en segundo plano. Podés ir a Opciones para administrar tu cuenta o comenzar a navegar con &brandShortName;.'>
 <!ENTITY sync.settings.label 'Opciones'>
 <!ENTITY sync.subtitle.manage.label1 'Tu cuenta de &syncBrand.fullName.label; ya está configurada. Andá a opciones para administrar tu cuenta o iniciá &brandShortName;.'>
  
 <!-- Pair Device -->
 <!ENTITY sync.pair.tryagain.label 'Intentá de nuevo.'>
@@ -73,10 +75,20 @@
 <!ENTITY bookmarks.folder.desktop.label 'Marcadores de escritorio'>
 <!ENTITY bookmarks.folder.mobile.label 'Marcadores de celular'>
 <!ENTITY bookmarks.folder.readinglist.label 'Lista de lectura'>
 
 <!-- Notification strings -->
 <!ENTITY sync.notification.oneaccount.label 'Solamente se soporta una cuenta de  &syncBrand.fullName.label;.'>
 
 <!-- Incorrect settings and changing credentials. -->
+<!ENTITY sync.invalidcreds.label 'Nombre de cuenta o contraseña incorrecta.'>
+<!ENTITY sync.invalidserver.label 'Ingresá una URL de servidor válida'>
+<!ENTITY sync.verifying.label 'Verificando…'>
 <!ENTITY sync.new.recoverykey.status.incorrect 'Clave de recuperación incorrecta. Intentá nuevamente.'>
 
+<!-- Send tab to device. -->
+<!ENTITY sync.title.send.tab.label 'Enviar pestaña a dispositivos'>
+<!ENTITY sync.button.send.label 'Enviar'>
+<!ENTITY sync.button.set.up.sync.label 'Configurar &syncBrand.shortName.label;'>
+<!ENTITY sync.title.redirect.to.set.up.sync.label 'Configurar &syncBrand.shortName.label; para enviar pestañas'>
+<!ENTITY sync.text.redirect.to.set.up.sync.label 'Configurar &syncBrand.fullName.label; en tu dispositivo para enviar pestañas a otros dispositivos.'>
+<!ENTITY sync.text.tab.sent.label '¡Tu pestaña fue enviada!'>
--- a/mobile/android/chrome/aboutAddons.dtd
+++ b/mobile/android/chrome/aboutAddons.dtd
@@ -4,9 +4,9 @@
 
 <!ENTITY aboutAddons.title                      "Administrador de complementos">
 <!ENTITY aboutAddons.header2                    "Tus complementos">
 <!ENTITY aboutAddons.options                    "Opciones">
 
 <!ENTITY addonAction.enable                     "Habilitar">
 <!ENTITY addonAction.disable                    "Deshabilitar">
 <!ENTITY addonAction.uninstall                  "Desinstalar">
-<!ENTITY addonAction.cancel                     "Cancelar">
+<!ENTITY addonAction.undo                       "Deshacer">
--- a/mobile/android/chrome/aboutAddons.properties
+++ b/mobile/android/chrome/aboutAddons.properties
@@ -9,8 +9,10 @@ addonAction.cancel=Cancelar
 addonAction.options=Opciones
 
 addonsSearchEngine.description=Búsqueda integrada
 
 addonType.extension=Extensión
 addonType.theme=Tema
 addonType.locale=Idioma
 addonType.search=Buscador
+
+addonStatus.uninstalled=%S se desinstalará después de reiniciar.
new file mode 100644
--- /dev/null
+++ b/mobile/android/chrome/aboutReader.properties
@@ -0,0 +1,13 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+aboutReader.loading=Cargando...
+aboutReader.loadError=Falló la carga del artículo desde la página
+
+aboutReader.textTitle=Texto
+aboutReader.marginTitle=Márgenes
+
+aboutReader.colorSchemeLight=Claro
+aboutReader.colorSchemeDark=Oscuro
+aboutReader.colorSchemeSepia=Sepia
--- a/mobile/android/chrome/browser.properties
+++ b/mobile/android/chrome/browser.properties
@@ -208,16 +208,17 @@ selectionHelper.textCopied=Texto copiado
 
 # Context menu
 contextmenu.openInNewTab=Abrir enlace en nueva pestaña
 contextmenu.share=Compartir
 contextmenu.shareLink=Compartir enlace
 contextmenu.bookmarkLink=Marcar enlace
 contextmenu.changeInputMethod=Seleccionar método de entrada
 contextmenu.fullScreen=Pantalla completa
+contextmenu.shareImage=Compartir imagen
 contextmenu.saveImage=Guardar imagen
 contextmenu.addSearchEngine=Agregar buscador
 
 contextmenu.copy=Copiar
 contextmenu.copyAll=Copiar todo
 contextmenu.selectAll=Seleccionar todo
 contextmenu.paste=Pegar
 
@@ -260,8 +261,13 @@ masterPassword.incorrect=Contraseña incorrecta
 # Debugger
 # LOCALIZATION NOTE (remoteIncomingPromptTitle): The title displayed on the
 # dialog that prompts the user to allow the incoming connection.
 remoteIncomingPromptTitle=Conexión entrante
 # LOCALIZATION NOTE (remoteIncomingPromptMessage): The message displayed on the
 # dialog that prompts the user to allow the incoming connection.
 remoteIncomingPromptMessage=Se detectó un pedido entrante para permitir depuración remota. ¡Un cliente remoto puede tomar el control completo de tu navegador! ¿Permitir conexión?
 remoteIncomingPromptDisable=Deshabilitar
+
+# Helper apps
+helperapps.openWithApp2=Abrir con aplicación %S
+helperapps.openWithList2=Abrir con una alicación
+
--- a/security/manager/chrome/pipnss/pipnss.properties
+++ b/security/manager/chrome/pipnss/pipnss.properties
@@ -307,16 +307,17 @@ SSLConnectionErrorPrefix=Un error ha ocu
 
 certErrorIntro=Un error ocurrió durante una conexión a %S porque usa un certificado de seguridad no válido.
 
 certErrorTrust_SelfSigned=El certificado no es confiable porque es auto firmado.
 certErrorTrust_UnknownIssuer=El certificado no es confiable porque el emisor del certificado es desconocido.
 certErrorTrust_MissingChain=El certificado no es confiable porque no se provee cadena de emisor.
 certErrorTrust_CaInvalid=El certificado no es confiable porque fue emitido por una CA no válida.
 certErrorTrust_Issuer=El certificado no es confiable porque el certificado del emisor no es confiable.
+certErrorTrust_SignatureAlgorithmDisabled=El certificado no es confiable porque fue firmado usando un algoritmo que fue deshabilitado porque no es seguro.
 certErrorTrust_ExpiredIssuer=El certificado no es confiable porque el certificado del emisor ha expirado.
 certErrorTrust_Untrusted=El certificado no viene de una fuente confiable.
 
 certErrorMismatch=El certificado no es válido para el dominio %S.
 # LOCALIZATION NOTE (certErrorMismatchSingle2): Do not translate <a id="cert_domain_link" title="%1$S">%1$S</a>
 certErrorMismatchSingle2=El certificado solamente es válido para <a id="cert_domain_link" title="%1$S">%1$S</a>.
 certErrorMismatchMultiple=El certificado solamente es válido para los siguientes nombres:
 certErrorMismatchNoNames=El certificado no es válido para ningún nombre de servidor.
@@ -350,16 +351,17 @@ NSSInitProblemX=No se puede inicializar el componente de seguridad de la aplicación. La causa más frecuente son problemas con los archivos del directorio del perfil de su aplicación. Verifique que este directorio no tiene restricciones de lectura/escritura y su disco rígido no está lleno o cerca de llenarse. Se recomienda que salga de la aplicación y corrija el problema. Si continúa usando esta sesión, podría ver un comportamiento incorrecto de la aplicación al acceder a las características de seguridad.
 ProfileSwitchSocketsStillActive=La operación no se puede completar por una falla interna. Una comunicación de red segura no se ha limpiado correctamente.
 ProfileSwitchCryptoUIActive=Esta operación es imposible en el momento actual. Complete la operación que solicita su atención en una de las otras ventanas abiertas.
 VerifyExpired=<Expirado>
 VerifyRevoked=<Revocado>
 VerifyNotTrusted=<No confiable>
 VerifyIssuerNotTrusted=<Emisor no confiable>
 VerifyIssuerUnknown=<Emisor desconocido>
 VerifyInvalidCA=<CA no válido>
+VerifyDisabledAlgorithm=<Algoritmo de firma inseguro>
 VerifyUnknown=<Desconocido>
 CertUser=Su certificado
 CertCA=CA (Autoridad de certificados)
 CertSSL=Servidor SSL
 CertEmail=Peer S/MIME
 CertUnknown=Desconocido
 CertNoNickname=(no nickname)
 CertNoEmailAddress=(sin dirección de correo)
--- a/security/manager/chrome/pippki/pippki.properties
+++ b/security/manager/chrome/pippki/pippki.properties
@@ -1,44 +1,12 @@
 #
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 SignedBy=Firmado por %S
 CertPassPrompt=Por favor ingrese la contraseña Personal de Seguridad para el dispositivo de seguridad de claves privadas del Administrador Personal de Seguridad.
 
 #These are for dialogs
 #Download Cert dialog
 newCAMessage1=¿Desea confiar en "%S" para los siguientes propósitos?
 unnamedCA=Autoridad de Certificación (sin nombre)
@@ -86,16 +54,17 @@ resetPreferences=Use este botón para reestablecer las opciones de seguridad de %S' a sus valores originales.
 #Cert verification
 certVerified=El certificado ha sido verifiicado para los usos siguientes:
 certNotVerified_CertRevoked=No se pudo verificar este certificado porque ha sido revocado.
 certNotVerified_CertExpired=No se pudo verificar este certificado porque ha expirado
 certNotVerified_CertNotTrusted=No se pudo verificar este certificado porque se desconfía de él.
 certNotVerified_IssuerNotTrusted=No se pudo verificar este certificado porque se desconfía del expeditor
 certNotVerified_IssuerUnknown=No se pudo verificar este certificado porque el expeditor es desconocido.
 certNotVerified_CAInvalid=No se pudo verificar este certificado porque el certifcado de la CA no es válido.
+certNotVerified_AlgorithmDisabled=No se pudo verificar este certificado porque fue firmado usando un algoritmo que fue deshabilitado porque no es seguro.
 certNotVerified_Unknown=No se pudo verificar este certificado por razones desconocidas.
 
 #Client auth
 clientAuthMessage1=Organización: "%S"
 clientAuthMessage2=Expedido bajo: "%S"
 
 #Page Info
 pageInfo_SiteNotVerified=No se ha verificado la identidad del sitio web.
@@ -203,17 +172,17 @@ writeFileUnknownError=Error desconocido
 
 #Add Security Exception dialog
 addExceptionBrandedWarning2=Va a modificar la forma en que %S identifica este sitio.
 addExceptionInvalidHeader=Este sitio intenta identificarse con información inválida.
 addExceptionDomainMismatchShort=Sitio erróneo
 addExceptionDomainMismatchLong=El certificado pertenece a un sitio diferente, que podría indicar un robo de identidad.
 addExceptionExpiredShort=Información desactualizada
 addExceptionExpiredLong=El certificado no es actualmente válido. Es imposible verificar si esta identidad fue informada como robada o perdida.
-addExceptionUnverifiedShort=Identidad desconocida
-addExceptionUnverifiedLong=El certificado no es confiable porque no ha sido verificado por una autoridad reconocida.
+addExceptionUnverifiedOrBadSignatureShort=Identidad desconocida
+addExceptionUnverifiedOrBadSignatureLong=El certificado no es confiable porque no ha sido verificado por una autoridad reconocida usando una firma segura.
 addExceptionValidShort=Certificado válido
 addExceptionValidLong=Este sitio provee información válida y verificada.  No hay necesidad de agregar una excepción.
 addExceptionCheckingShort=Verificando información
 addExceptionCheckingLong=Intentando identificar el sitio…
 addExceptionNoCertShort=Sin información disponible
 addExceptionNoCertLong=No se puede obtener el estado de identificación para el sitio en cuestión.
 addExceptionConnectionFailed=Fallo en la conexión
--- a/suite/chrome/common/dataman/dataman.properties
+++ b/suite/chrome/common/dataman/dataman.properties
@@ -1,44 +1,11 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is KaiRo's data manager.
-#
-# The Initial Developer of the Original Code is
-# Robert Kaiser <kairo@kairo.at>.
-# Portions created by the Initial Developer are Copyright (C) 2010
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#  Robert Kaiser <kairo@kairo.at> (original author)
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 # cookies
 cookies.expireAtEndOfSession=Al finalizar la sesión
 
 cookies.secureOnly.httponly=Solamente conexiones cifradas y sin acceso a script
 cookies.secureOnly.all=Solamente conexiones cifradas
 cookies.anyConnection.httponly=Cualquier tipo de conexión, sin acceso a scripts
 cookies.anyConnection.all=Cualquier tipo de conexión
@@ -48,16 +15,17 @@ cookies.deleteSelectedTitle=Eliminar coo
 cookies.deleteSelectedYes=Elimina&r
 
 # permissions
 perm.allowXULXBL.label=Usar XUL/XBL Markup
 perm.cookie.label=Establecer cookies
 perm.geo.label=Compartir ubicación
 perm.image.label=Cargar imágenes
 perm.install.label=Instalar complementos
+perm.offline-app.label=Aplicaciones web sin conexión
 perm.object.label=Ejecutar plugins
 perm.password.label=Guardar contraseñas
 perm.plugins.label=Activar plugins
 perm.popup.label=Abrir ventanas emergentes
 perm.script.label=Ejecutar scripts
 perm.stylesheet.label=Cargar hojas de estilo
 
 perm.type.default=Seleccione un tipo
--- a/suite/chrome/common/permissions/permissionsManager.properties
+++ b/suite/chrome/common/permissions/permissionsManager.properties
@@ -2,15 +2,18 @@ installpermissionstext=Puede especificar qué sitios tendrán permitido instalar extensiones y actualizaciones. Escriba la dirección exacta del sitio que quiera autorizar y después haga clic en Permitir.
 installpermissionstitle=Sitios autorizados - Instalación de software
 installpermissionshelp=advanced_pref_installation
 popuppermissionstext=Puede especificar qué sitios tendrán permitido abrir ventanas emergentes. Escriba la dirección exacta del sitio que quiera habilitar y haga clic en Permitir.
 popuppermissionstitle=Sitios autorizados - Ventanas emergentes
 popuppermissionshelp=pop_up_blocking
 imagepermissionstext=Puede especificar qué sitios web pueden cargar imágenes. Ingrese la dirección exacta del sitio que desee administrar y luego haga clic en Bloquear o Permitir.
 imagepermissionstitle=Excepciones - Imágenes
 imagepermissionshelp=images-help-managing
+offline-apppermissionstext=Puede especificar que sitios web tienen permiso de guardar datos para usar sin conexión. Ingrese la dirección exacta del sitio web que quiere administrar y haga clic en Bloquear o Permitir.
+offline-apppermissionstitle=Datos sin conexión
+offline-apppermissionshelp=offline_apps
 
 can=Permitir
 canSession=Permitir por esta sesión
 cannot=Bloquear
 
 alertInvalidTitle=Se ingresó un sitio web inválido
 alertInvalid=El sitio web %S no es correcto.
new file mode 100644
--- /dev/null
+++ b/suite/chrome/common/pref/pref-offlineapps.dtd
@@ -0,0 +1,17 @@
+<!-- extracted from content/pref-offlineapps.xul -->
+
+<!--LOCALIZATION NOTE : FILE Offline Apps prefs dialog -->
+<!ENTITY pref.offlineapps.title             "Aplicaciones web sin conexión">
+<!ENTITY pref.offlineCache.caption          "Contenido web y datos de usuario sin conexión">
+
+<!ENTITY clearOfflineAppCache.label         "Limpiar">
+<!ENTITY clearOfflineAppCache.accesskey     "L">
+
+<!ENTITY offlineNotify.label                "Informarme cuando un sitio web pida guardar datos para usar sin conexión.">
+<!ENTITY offlineNotify.accesskey            "n">
+<!ENTITY offlineNotifyPermissions.label     "Administrar permisos">
+<!ENTITY offlineNotifyPermissions.accesskey "p">
+
+<!ENTITY offlineAppsList.label              "Los siguientes sitios web tienen permitido guardar datos para uso sin conexión:">
+<!ENTITY offlineAppsListRemove.label        "Limpiar datos…">
+<!ENTITY offlineAppsListRemove.accesskey    "d">
--- a/suite/chrome/common/pref/pref-scripts.dtd
+++ b/suite/chrome/common/pref/pref-scripts.dtd
@@ -1,8 +1,12 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
 <!-- extracted from content/pref-scripts.xul -->
 
 <!--LOCALIZATION NOTE : FILE The 'Scripts & Plugins' preferences dialog -->
 <!ENTITY pref.scripts.title              "Scripts y plugins">
 
 <!ENTITY navigator.label                 "Navegador">
 <!ENTITY navigator.accesskey             "N">
 
@@ -12,15 +16,18 @@
 <!ENTITY allowScripts.accesskey          "s">
 <!ENTITY allowWindowMoveResize.label     "Mover o cambiar tamaño de ventanas existentes">
 <!ENTITY allowWindowFlip.label           "Subir o bajar las ventanas">
 <!ENTITY allowWindowStatusChange.label   "Cambiar el texto de la barra de estado">
 <!ENTITY allowWindowImageSrcChange.label "Cambiar imágenes">
 <!ENTITY allowContextmenuDisable.label   "Deshabilitar o reemplazar menús contextuales">
 <!ENTITY allowHideStatusBar.label        "Ocultar la barra de estado">
 
-<!ENTITY enablePlugin.label              "Habilitar plugins para">
+<!ENTITY enablePlugins.label             "Habilitar plugins para">
 <!ENTITY enablePluginForSuite.label      "Suite">
 <!ENTITY enablePluginForSuite.accesskey  "u">
 
-<!ENTITY whenPluginsRequired.label       "Cuando se necesiten plugins adicionales">
-<!ENTITY displayNotification.label       "Mostrar una barra de notificación en la parte superior del área de contenidos">
-<!ENTITY displayNotification.accesskey   "d">
+<!ENTITY whenPageRequiresPlugins.label   "Cuando una página necesite plugins">
+<!ENTITY activateAllPlugins.label        "Activar todos los plugins por defecto">
+<!ENTITY activateAllPlugins.accesskey    "d">
+<!ENTITY warnPluginsRequired.label       "Avisarme si se necesitan instalar plugins adicionales">
+<!ENTITY warnPluginsRequired.accesskey   "v">
+
--- a/suite/chrome/common/pref/preferences.dtd
+++ b/suite/chrome/common/pref/preferences.dtd
@@ -1,8 +1,12 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
 <!--LOCALIZATION NOTE (.label): Preferences categories that appear on the left of the preferences dialog -->
 <!ENTITY prefWindow.title "Preferencias">
 <!ENTITY categoryHeader "Categoría">
 <!ENTITY appear.label "Apariencia">
 <!ENTITY content.label "Contenido">
 <!ENTITY fonts.label "Tipografía">
 <!ENTITY colors.label "Colores">
 <!ENTITY navigator.label "Navegador">
@@ -21,16 +25,17 @@
 <!ENTITY masterpass.label "Contraseña maestra">
 <!ENTITY ssl.label "SSL">
 <!ENTITY certs.label "Certificados">
 <!ENTITY validation.label "Validación">
 <!ENTITY sync.label "Sync">
 <!ENTITY advance.label "Avanzadas">
 <!ENTITY down.label "Descargar">
 <!ENTITY cache.label "Caché">
+<!ENTITY offlineApps.label "Aplicaciones sin conexión">
 <!ENTITY proxies.label "Proxies">
 <!ENTITY httpnetworking.label "Red HTTP">
 <!ENTITY smart.label "Instalación de software">
 <!ENTITY download.label "Descargas">
 <!ENTITY keynav.label "Navegación por teclado">
 <!ENTITY findAsYouType.label "Buscar al tipear">
 <!ENTITY search.label "Búsqueda en Internet">
 <!ENTITY policies.label "Políticas de seguridad">
--- a/suite/chrome/common/pref/prefutilities.properties
+++ b/suite/chrome/common/pref/prefutilities.properties
@@ -1,11 +1,29 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 cachefolder=Seleccionar carpeta de caché
 #LOCALIZATION NOTE (%1$S) is the size and (%2$S) is the unit of disk space.
 cacheSizeInfo=El caché está usando actualmente %1$S %2$S de espacio en disco.
+
+# Offline apps
+appCacheSizeInfo=Su caché de apliaciones está usando actualmente %1$S %2$S de espacio en disco.
+offlineAppRemoveTitle=Eliminar datos de sitios web sin conexión
+offlineAppRemovePrompt=Después de eliminar estos datos, %S no estará disponible sin conexión.  ¿Seguro desea eliminar este sitio web sin conexión?
+offlineAppRemoveConfirm=Eliminar datos sin conexión
+
+# LOCALIZATION NOTE: The next string is for the disk usage of the
+# offline application
+#   e.g. offlineAppUsage : "50.23 MB"
+#   %1$S = size (in bytes or megabytes, ...)
+#   %2$S = unit of measure (bytes, KB, MB, ...)
+offlineAppUsage=%1$S %2$S
+
 choosehomepage=Seleccionar página de inicio
 downloadfolder=Seleccionar una carpeta de descargas
 desktopFolderName=Escritorio
 downloadsFolderName=Descargas
 choosesound=Seleccionar un sonido
 
 SoundFiles=Sonidos
 
--- a/suite/chrome/mailnews/addressbook/abCardOverlay.dtd
+++ b/suite/chrome/mailnews/addressbook/abCardOverlay.dtd
@@ -1,44 +1,11 @@
-<!-- ***** BEGIN LICENSE BLOCK *****
- Version: MPL 1.1/GPL 2.0/LGPL 2.1
-
- The contents of this file are subject to the Mozilla Public License Version
- 1.1 (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
- http://www.mozilla.org/MPL/
-
- Software distributed under the License is distributed on an "AS IS" basis,
- WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- for the specific language governing rights and limitations under the
- License.
-
- The Original Code is Mozilla Communicator client code, released
- March 31, 1998.
-
- The Initial Developer of the Original Code is
- Netscape Communications Corporation.
- Portions created by the Initial Developer are Copyright (C) 1998-1999
- the Initial Developer. All Rights Reserved.
-
- Contributor(s):
-
- Alternatively, the contents of this file may be used under the terms of
- either the GNU General Public License Version 2 or later (the "GPL"), or
- the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- in which case the provisions of the GPL or the LGPL are applicable instead
- of those above. If you wish to allow use of your version of this file only
- under the terms of either the GPL or the LGPL, and not to allow others to
- use your version of this file under the terms of the MPL, indicate your
- decision by deleting the provisions above and replace them with the notice
- and other provisions required by the GPL or the LGPL. If you do not delete
- the provisions above, a recipient may use your version of this file under
- the terms of any one of the MPL, the GPL or the LGPL.
-
- ***** END LICENSE BLOCK ***** -->
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!ENTITY Contact.tab                     "Contacto">
 <!ENTITY Contact.accesskey               "C">
 <!ENTITY Name.box                        "Nombre ">
 
 <!-- LOCALIZATION NOTE:
  NameField1, NameField2, PhoneticField1, PhoneticField2
  those fields are either LN or FN depends on the target country.
@@ -59,16 +26,18 @@
 <!ENTITY NameField1.label               "Nombre:">
 <!ENTITY NameField1.accesskey           "N">
 <!ENTITY NameField2.label               "Apellidos:">
 <!ENTITY NameField2.accesskey           "l">
 <!ENTITY PhoneticField1.label           "Nombre fonético:">
 <!ENTITY PhoneticField2.label           "Nombre fonético:">
 <!ENTITY DisplayName.label              "Mostrado:">
 <!ENTITY DisplayName.accesskey          "d">
+<!ENTITY preferDisplayName.label        "Siempre preferir ese nombre sobre el encabezado del mensaje">
+<!ENTITY preferDisplayName.accesskey    "S">
 <!ENTITY NickName.label                 "Apodo:">
 <!ENTITY NickName.accesskey             "A">
 
 <!ENTITY PrimaryEmail.label             "Correo electrónico:">
 <!ENTITY PrimaryEmail.accesskey         "e">
 <!ENTITY SecondEmail.label              "Otro correo electrónico:">
 <!ENTITY SecondEmail.accesskey          "i">
 <!ENTITY PreferMailFormat.label         "Prefiere recibir el mensaje formateado como:">
deleted file mode 100644
--- a/suite/chrome/mailnews/addressbook/abCardViewOverlay.dtd
+++ /dev/null
@@ -1,50 +0,0 @@
-<!-- ***** BEGIN LICENSE BLOCK *****
- Version: MPL 1.1/GPL 2.0/LGPL 2.1
-
- The contents of this file are subject to the Mozilla Public License Version
- 1.1 (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
- http://www.mozilla.org/MPL/
-
- Software distributed under the License is distributed on an "AS IS" basis,
- WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- for the specific language governing rights and limitations under the
- License.
-
- The Original Code is Mozilla Communicator client code, released
- March 31, 1998.
-
- The Initial Developer of the Original Code is
- Netscape Communications Corporation.
- Portions created by the Initial Developer are Copyright (C) 1998-1999
- the Initial Developer. All Rights Reserved.
-
- Contributor(s):
-
- Alternatively, the contents of this file may be used under the terms of
- either of the GNU General Public License Version 2 or later (the "GPL"),
- or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- in which case the provisions of the GPL or the LGPL are applicable instead
- of those above. If you wish to allow use of your version of this file only
- under the terms of either the GPL or the LGPL, and not to allow others to
- use your version of this file under the terms of the MPL, indicate your
- decision by deleting the provisions above and replace them with the notice
- and other provisions required by the GPL or the LGPL. If you do not delete
- the provisions above, a recipient may use your version of this file under
- the terms of any one of the MPL, the GPL or the LGPL.
-
- ***** END LICENSE BLOCK ***** -->
-
-<!-- Box Headings -->
-<!ENTITY contact.heading             "Contacto">
-<!ENTITY home.heading                "Casa">
-<!ENTITY other.heading               "Otros">
-<!ENTITY phone.heading               "Teléfono">
-<!ENTITY work.heading                "Trabajo">
-<!-- Special Box Headings, for mailing lists -->
-<!ENTITY description.heading         "Descripción">
-<!ENTITY addresses.heading           "Direcciones">
-<!-- For Map It! -->
-<!ENTITY mapItButton.label           "Obtener mapa">
-<!ENTITY mapIt.tooltip               "Obtener de la web un mapa de esta dirección">
-
--- a/suite/chrome/mailnews/addressbook/abMainWindow.dtd
+++ b/suite/chrome/mailnews/addressbook/abMainWindow.dtd
@@ -1,44 +1,11 @@
-<!-- ***** BEGIN LICENSE BLOCK *****
- Version: MPL 1.1/GPL 2.0/LGPL 2.1
-
- The contents of this file are subject to the Mozilla Public License Version
- 1.1 (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
- http://www.mozilla.org/MPL/
-
- Software distributed under the License is distributed on an "AS IS" basis,
- WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- for the specific language governing rights and limitations under the
- License.
-
- The Original Code is Mozilla Communicator client code, released
- March 31, 1998.
-
- The Initial Developer of the Original Code is
- Netscape Communications Corporation.
- Portions created by the Initial Developer are Copyright (C) 1998-1999
- the Initial Developer. All Rights Reserved.
-
- Contributor(s):
-
- Alternatively, the contents of this file may be used under the terms of
- either of the GNU General Public License Version 2 or later (the "GPL"),
- or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- in which case the provisions of the GPL or the LGPL are applicable instead
- of those above. If you wish to allow use of your version of this file only
- under the terms of either the GPL or the LGPL, and not to allow others to
- use your version of this file under the terms of the MPL, indicate your
- decision by deleting the provisions above and replace them with the notice
- and other provisions required by the GPL or the LGPL. If you do not delete
- the provisions above, a recipient may use your version of this file under
- the terms of any one of the MPL, the GPL or the LGPL.
-
- ***** END LICENSE BLOCK ***** -->
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!-- Title -->
 <!ENTITY addressbookWindow.title                        "Libreta de direcciones">
 
 <!-- Menus:  the . means that the menu item isn't implemented yet -->
 
 <!-- File Menu -->
 <!ENTITY newContact.label                               "Contacto…">
@@ -52,17 +19,16 @@
 <!ENTITY newLDAPDirectoryCmd.label                      "Directorio LDAP…">
 <!-- LOCALIZATION NOTE (newLDAPDirectoryCmd.accesskey) : DONT_TRANSLATE -->
 <!ENTITY newLDAPDirectoryCmd.accesskey                  "D">
 <!ENTITY newIM.label                                    "MI">
 <!ENTITY printContactViewCmd.label                      "Imprimir contacto…">
 <!ENTITY printContactViewCmd.accesskey                  "p">
 <!ENTITY printPreviewContactViewCmd.label               "Imprimir la previsualización del contacto">
 <!ENTITY printPreviewContactViewCmd.accesskey           "v">
-<!-- LOCALIZATION NOTE (printCardViewCmd.key) : DONT_TRANSLATE -->  
 <!ENTITY printContactViewCmd.key                        "P">
 <!ENTITY printAddressBook.label                         "Imprimir libreta de direcciones…"> 
 <!ENTITY printAddressBook.accesskey                     "a"> 
 <!ENTITY printPreviewAddressBook.label                  "Vista preliminar de la libreta de direcciones"> 
 <!ENTITY printPreviewAddressBook.accesskey              "b">
 
 <!-- Edit Menu -->
 <!ENTITY deleteAbCmd.label                              "Borrar libreta de direcciones">  
@@ -76,20 +42,22 @@
 <!ENTITY propertiesCmd.label                            "Propiedades…">
 <!-- LOCALIZATION NOTE (propertiesCmd.accesskey) : DONT_TRANSLATE -->  
 <!ENTITY propertiesCmd.accesskey                        "i">  
 <!ENTITY propertiesCmd.key                              "i">  
 
 <!-- View Menu -->
 <!ENTITY showAbToolbarCmd.label                         "Barra de herramientas de la libreta de direcciones"> 
 <!ENTITY showAbToolbarCmd.accesskey                     "o">  
-
-<!ENTITY showCardPane.label                             "Resumen de las tarjetas">
-<!ENTITY showCardPane.accesskey                         "R">
-  
+<!ENTITY layoutMenu.label                               "Disposición">
+<!ENTITY layoutMenu.accesskey                           "D">
+<!ENTITY showDirectoryPane.label                        "Vista de guía">
+<!ENTITY showDirectoryPane.accesskey                    "g">
+<!ENTITY showContactPane2.label                         "Vista de contactos">
+<!ENTITY showContactPane2.accesskey                     "c">
 <!ENTITY menu_ShowNameAs.label                          "Mostrar nombre como"> 
 <!ENTITY menu_ShowNameAs.accesskey                      "s"> 
 <!ENTITY firstLastCmd.label                             "Nombre Apellido">  
 <!ENTITY firstLastCmd.accesskey                         "N"> 
 <!ENTITY lastFirstCmd.label                             "Apellidos, nombre">  
 <!ENTITY lastFirstCmd.accesskey                         "l"> 
 <!ENTITY displayNameCmd.label                           "Nombre mostrado">  
 <!ENTITY displayNameCmd.accesskey                       "d"> 
@@ -125,14 +93,28 @@
 <!ENTITY newIM.tooltip                                  "Enviar un mensaje o conversación instantáneos"> 
 <!ENTITY deleteItemButton.tooltip                       "Borrar el ítem seleccionado">
 <!ENTITY throbber.tooltip                               "Ir a la página web de &vendorShortName;">
 <!ENTITY advancedButton.tooltip                         "Búsqueda avanzada de direcciones">
 
 <!-- Dir Tree header -->
 <!ENTITY dirTreeHeader.label                            "Libretas de direcciones">
 
+<!-- Card Summary Pane -->
+<!-- Box Headings -->
+<!ENTITY contact.heading                                "Contacto">
+<!ENTITY home.heading                                   "Casa">
+<!ENTITY other.heading                                  "Otros">
+<!ENTITY phone.heading                                  "Teléfono">
+<!ENTITY work.heading                                   "Trabajo">
+<!-- Special Box Headings, for mailing lists -->
+<!ENTITY description.heading                            "Descripción">
+<!ENTITY addresses.heading                              "Direcciones">
+<!-- For Map It! -->
+<!ENTITY mapItButton.label                              "Obtener mapa">
+<!ENTITY mapIt.tooltip                                  "Mostrar un mapa de esta dirección desde la web">
+
 <!-- Status Bar -->  
 <!ENTITY statusText.label                               "">
 
 <!-- LOCALIZATION NOTE (hideSwapFnLnUI) : DONT_TRANSLATE -->
 <!-- Swap FN/LN UI  Set to "false" to show swap fn/ln UI -->
 <!ENTITY  hideSwapFnLnUI                                "true">
--- a/suite/chrome/mailnews/compose/messengercompose.dtd
+++ b/suite/chrome/mailnews/compose/messengercompose.dtd
@@ -1,8 +1,12 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
 <!--LOCALIZATION NOTE messengercompose.dtd Main UI for message composition -->
 <!ENTITY msgComposeWindow.title "Redactar: (sin asunto)">
 
 <!ENTITY fromAddr.label "De:">
 <!ENTITY fromAddr.accesskey "D">
 <!ENTITY subject.label  "Asunto:">
 <!ENTITY subject.accesskey "s">
 <!ENTITY attachments.label "Adjuntos:">
@@ -74,16 +78,19 @@
 <!ENTITY normalPriorityCmd.accesskey "N">
 <!ENTITY highPriorityCmd.label "Alta">
 <!ENTITY highPriorityCmd.accesskey "A">
 <!ENTITY highestPriorityCmd.label "La más alta">
 <!ENTITY highestPriorityCmd.accesskey "L">
 
 <!ENTITY returnReceiptMenu.label "Acuse de recibo">
 <!ENTITY returnReceiptMenu.accesskey "A">
+<!ENTITY dsnMenu.label "Notificación de estado de entrega">
+<!ENTITY dsnMenu.accesskey "N">
+
 <!ENTITY outputFormatMenu.label "Acuse de recibo">
 <!ENTITY outputFormatMenu.accesskey  "A">
 <!ENTITY autoFormatCmd.label "Formato">
 <!ENTITY autoFormatCmd.accesskey "a">
 <!ENTITY plainTextFormatCmd.label "Sólo texto sin formato">
 <!ENTITY plainTextFormatCmd.accesskey "S">
 <!ENTITY htmlFormatCmd.label "Sólo texto enriquecido (HTML)">
 <!ENTITY htmlFormatCmd.accesskey "r">
--- a/suite/chrome/mailnews/junkLog.dtd
+++ b/suite/chrome/mailnews/junkLog.dtd
@@ -1,45 +1,10 @@
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Mozilla Communicator.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 2002
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Seth Spitzer <sspitzer@netscape.com>
-   -   Mark Banner <mark@standard8.demon.co.uk>
-   -   Scott MacGregor <mscott@mozilla.org> (original Thunderbird parts)
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the LGPL or the GPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<!ENTITY junkLog.title "Registro del correo basura">
-<!ENTITY junkLogInfo.label "Control de actividad del registro del correo basura.">
+<!ENTITY adaptiveJunkLog.title "Registro de correo basura adaptivo">
+<!ENTITY adaptiveJunkLogInfo.label "Control de actividad del registro del correo basura adaptivo.">
 <!ENTITY clearLog.label "Limpiar el registro">
 <!ENTITY clearLog.accesskey "L">
 <!ENTITY closeLog.label "Cerrar">
 <!ENTITY closeLog.accesskey "C">
--- a/suite/chrome/mailnews/messenger.dtd
+++ b/suite/chrome/mailnews/messenger.dtd
@@ -1,47 +1,11 @@
-<!-- ***** BEGIN LICENSE BLOCK *****
- Version: MPL 1.1/GPL 2.0/LGPL 2.1
-
- The contents of this file are subject to the Mozilla Public License Version
- 1.1 (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
- http://www.mozilla.org/MPL/
-
- Software distributed under the License is distributed on an "AS IS" basis,
- WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- for the specific language governing rights and limitations under the
- License.
-
- The Original Code is Mozilla Communicator client code, released
- March 31, 1998.
-
- The Initial Developer of the Original Code is
- Netscape Communications Corporation.
- Portions created by the Initial Developer are Copyright (C) 1998-1999
- the Initial Developer. All Rights Reserved.
-
- Contributor(s):
-    Karsten Düsterloh <mnyromyr@tprac.de>
-    Jeremy Morton <bugzilla@game-point.net>
-    Ian Neal <iann_bugzilla@blueyonder.co.uk>
-
- Alternatively, the contents of this file may be used under the terms of
- either of the GNU General Public License Version 2 or later (the "GPL"),
- or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- in which case the provisions of the GPL or the LGPL are applicable instead
- of those above. If you wish to allow use of your version of this file only
- under the terms of either the GPL or the LGPL, and not to allow others to
- use your version of this file under the terms of the MPL, indicate your
- decision by deleting the provisions above and replace them with the notice
- and other provisions required by the GPL or the LGPL. If you do not delete
- the provisions above, a recipient may use your version of this file under
- the terms of any one of the MPL, the GPL or the LGPL.
-
- ***** END LICENSE BLOCK ***** -->
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!ENTITY messengerWindow.title "Correo y noticias">
 <!ENTITY titleModifier.label "&brandShortName;">
 <!ENTITY titleSeparator.label " - ">
 
 <!-- tabmail -->
 <!ENTITY tabmailClose.label "Cerrar pestaña">
 <!ENTITY tabmailClose.tooltip "Cerrar pestaña">
@@ -571,11 +535,12 @@
 <!ENTITY remoteContentMessage.label "Para proteger su privacidad, &brandShortName; bloqueó el contenido remoto de este mensaje.">
 <!ENTITY loadRemoteContentButton.label "Mostrar contenido remoto">
 
 <!-- Phishing Bar -->
 <!ENTITY phishingBarMessage.label "&brandShortName; piensa que este mensaje puede ser un intento de fraude.">
 <!ENTITY removePhishingBarButton.label "No es fraude">
 
 <!-- MDN Bar -->
-<!ENTITY mdnBarMessage.label "El emisor de este mensaje ha solicitado ser notificado cuando sea leído. ¿Desea notificar al emisor?">
 <!ENTITY mdnBarIgnoreButton.label "Ignorar pedido">
+<!ENTITY mdnBarIgnoreButton.accesskey "I">
 <!ENTITY mdnBarSendButton.label "Enviar acuse">
+<!ENTITY mdnBarSendButton.accesskey "E">
--- a/suite/chrome/mailnews/messenger.properties
+++ b/suite/chrome/mailnews/messenger.properties
@@ -1,46 +1,11 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Seth Spitzer <sspitzer@netscape.com>
-#   Lorenzo Colitti <lorenzo@colitti.com>
-#   Karsten Düsterloh <mnyromyr@tprac.de>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either of the GNU General Public License Version 2 or later (the "GPL"),
-# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 # The following are used by the messenger application
 renameFolder=Renombrar carpeta…
 compactFolder=Compactar esta carpeta
 removeAccount=Borrar cuenta…
 removeFolder=Borrar carpeta
 newFolderMenuItem=Carpeta…
 newSubfolderMenuItem=Subcarpeta…
@@ -409,16 +374,21 @@ errorOpenMessageForMessageIdMessage=Mens
 confirmPhishingTitle=Alerta de estafa por correo electrónico
 #LOCALIZATION NOTE %1$S is the brand name, %2$S is the host name of the url being visited
 confirmPhishingUrl1=¡%1$S piensa que este sitio es sospechoso! Puede estar intentando imitar la página web que este intentando visitar. La mayoría de lo sitios legítimos usan nombres en lugar de números. ¿Está seguro de querer visitar %2$S?
 confirmPhishingUrl2=¡%1$S piensa que este sitio es sospechoso! Puede estar intentando imitar la página web que quiere visitar. ¿Está seguro que quiere visitar la página %2$S?
 
 #LOCALIZATION NOTE %1$S is the e-mail address of the person we will allow remote content for
 alwaysLoadRemoteContentForSender=Haga clic aquí si siempre quiere cargar el contenido remoto de %1$S.
 
+#LOCALIZATION NOTE(mdnBarMessageNormal) %1$S is the name of the sender
+mdnBarMessageNormal=%1$S ha pedido ser notificado cuando usted lea este mensaje.
+#LOCALIZATION NOTE(mdnBarMessageAddressDiffers) %1$S is the name of the sender, %2$S is the address(es) to send return receipt to
+mdnBarMessageAddressDiffers=%1$S ha pedido ser notificado en %2$S cuando usted lea este mensaje.
+
 # Strings for growl notifications on Mac OS X
 growlNotification=Correo nuevo
 
 # mailCommands.js
 emptyJunkTitle=Confirmar
 emptyJunkMessage=¿Está seguro de querer borrar todos los mensajes y subcarpetas de la carpeta Basura de forma permanente?
 emptyJunkDontAsk=No preguntar nuevamente.
 emptyTrashTitle=Confirmar
--- a/suite/chrome/mailnews/msgHdrViewPopup.dtd
+++ b/suite/chrome/mailnews/msgHdrViewPopup.dtd
@@ -1,48 +1,19 @@
-<!-- ***** BEGIN LICENSE BLOCK *****
- Version: MPL 1.1/GPL 2.0/LGPL 2.1
-
- The contents of this file are subject to the Mozilla Public License Version
- 1.1 (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
- http://www.mozilla.org/MPL/
-
- Software distributed under the License is distributed on an "AS IS" basis,
- WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- for the specific language governing rights and limitations under the
- License.
-
- The Original Code is Mozilla Communicator client code, released
- March 31, 1998.
-
- The Initial Developer of the Original Code is
- Netscape Communications Corporation.
- Portions created by the Initial Developer are Copyright (C) 1998-1999
- the Initial Developer. All Rights Reserved.
-
- Contributor(s):
-
- Alternatively, the contents of this file may be used under the terms of
- either of the GNU General Public License Version 2 or later (the "GPL"),
- or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- in which case the provisions of the GPL or the LGPL are applicable instead
- of those above. If you wish to allow use of your version of this file only
- under the terms of either the GPL or the LGPL, and not to allow others to
- use your version of this file under the terms of the MPL, indicate your
- decision by deleting the provisions above and replace them with the notice
- and other provisions required by the GPL or the LGPL. If you do not delete
- the provisions above, a recipient may use your version of this file under
- the terms of any one of the MPL, the GPL or the LGPL.
-
- ***** END LICENSE BLOCK ***** -->
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!-- Message Header View Popup -->
 <!ENTITY AddToAddressBook.label            "Agregar a la libreta de direcciones…">
 <!ENTITY AddToAddressBook.accesskey        "b">
+<!ENTITY EditContact.label                 "Editar contacto…">
+<!ENTITY EditContact.accesskey             "E">
+<!ENTITY ViewContact.label                 "Ver contacto">
+<!ENTITY ViewContact.accesskey             "V">
 <!ENTITY SendMailTo.label                  "Redactar mensaje a…">
 <!ENTITY SendMailTo.accesskey              "s">
 <!ENTITY CopyEmailAddress.label            "Copiar dirección de correo electrónico">
 <!ENTITY CopyEmailAddress.accesskey        "C">
 <!ENTITY CreateFilterFrom.label            "Crear filtro desde…">
 <!ENTITY CreateFilterFrom.accesskey        "f">
 <!ENTITY openInBrowser.label               "Abrir en navegador">
 <!ENTITY openInBrowser.accesskey           "o">
new file mode 100644
--- /dev/null
+++ b/suite/chrome/mailnews/pgpmime.properties
@@ -0,0 +1,13 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+#
+# The following are used by the pgpmime content type handler
+#
+
+# LOCALIZATION NOTE(pgpMimeNeedsAddon): The text can contain HTML tags.
+# %S is the url to Enigmail on AMO supplied from preferences.
+pgpMimeNeedsAddon=Éste es un mensaje cifrado con OpenPGP.<br>Para descifrar este correo, necesita instalar un <a href="%S">complemento de OpenPGP</a>.
+
+
--- a/suite/chrome/mailnews/pref/pref-offline.dtd
+++ b/suite/chrome/mailnews/pref/pref-offline.dtd
@@ -24,11 +24,11 @@
 <!ENTITY radioNotDownload.accesskey       "o">
 <!ENTITY radioAskDownload                 "Preguntarme">
 <!ENTITY radioAskDownload.accesskey       "r">
 <!ENTITY mailConnections.caption          "Conexiones de correo">
 <!ENTITY mailnewsTimeout.label            "Tiempo de conexión excedido:">
 <!ENTITY mailnewsTimeout.accesskey        "m">
 <!ENTITY mailnewsTimeoutSeconds.label     "segundos">
 <!ENTITY Diskspace                        "Espacio en disco">
-<!ENTITY offlineCompact.label             "Compactar carpetas cuando se recuperen más de">
-<!ENTITY offlineCompact.accesskey         "C">
-<!ENTITY mb.label                         "MB">
+<!ENTITY offlineCompactFolders.label     "Compactar carpetas cuando se recuperen más de">
+<!ENTITY offlineCompactFolders.accesskey "C">
+<!ENTITY offlineCompactFoldersMB.label   "MB en total">
--- a/toolkit/chrome/global/aboutSupport.dtd
+++ b/toolkit/chrome/global/aboutSupport.dtd
@@ -46,14 +46,18 @@ variant of aboutSupport.showDir.label. -
 <!ENTITY aboutSupport.modifiedPrefsName "Nombre">
 <!ENTITY aboutSupport.modifiedPrefsValue "Valor">
 
 <!ENTITY aboutSupport.graphicsTitle "Gráficos">
 
 <!ENTITY aboutSupport.jsTitle "JavaScript">
 <!ENTITY aboutSupport.jsIncrementalGC "GC incremental">
 
+<!ENTITY aboutSupport.a11yTitle "Accesibilidad">
+<!ENTITY aboutSupport.a11yActivated "Activada">
+<!ENTITY aboutSupport.a11yForceDisabled "Impedir accesibilidad">
+
 <!ENTITY aboutSupport.libraryVersionsTitle "Versiones de libs">
 
 <!ENTITY aboutSupport.installationHistoryTitle "Historial de instalación">
 <!ENTITY aboutSupport.updateHistoryTitle "Historial de actualizaciones">
 
 <!ENTITY aboutSupport.copyToClipboard.label "Copiar todo al portapapeles">
--- a/toolkit/chrome/global/console.dtd
+++ b/toolkit/chrome/global/console.dtd
@@ -17,16 +17,18 @@
 <!ENTITY messages.label "Mensajes">
 <!ENTITY messages.accesskey "M">
 <!ENTITY clear.label "Limpiar">
 <!ENTITY clear.accesskey "L">
 <!ENTITY codeEval.label     "Código:">
 <!ENTITY codeEval.accesskey "o">
 <!ENTITY evaluate.label "Evaluar ">
 <!ENTITY evaluate.accesskey "v">
+<!ENTITY filter.label       "Filtrar">
+<!ENTITY filter.accesskey   "F">
 
 <!ENTITY copyCmd.label "Copiar">
 <!ENTITY copyCmd.accesskey "C">
 <!ENTITY copyCmd.commandkey "C">
 <!ENTITY sortFirst.label "Ordenado primero > último">
 <!ENTITY sortFirst.accesskey "p">
 <!ENTITY sortLast.label "Ordenado último > primero">
 <!ENTITY sortLast.accesskey "l">
--- a/toolkit/chrome/mozapps/downloads/unknownContentType.dtd
+++ b/toolkit/chrome/mozapps/downloads/unknownContentType.dtd
@@ -1,15 +1,13 @@
-<!-- -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
--->
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<!ENTITY intro.label "Ha decidido abrir">
+<!ENTITY  intro2.label                "Ha decidido abrir:">
 <!ENTITY from.label "desde:">
 <!ENTITY actionQuestion.label "¿Qué debería hacer &brandShortName; con este archivo?">
 
 <!ENTITY openWith.label "Abrir con">
 <!ENTITY openWith.accesskey "o">
 <!ENTITY other.label "Otro…">
 
 <!ENTITY saveFile.label "Guardar archivo">
--- a/toolkit/chrome/mozapps/plugins/plugins.dtd
+++ b/toolkit/chrome/mozapps/plugins/plugins.dtd
@@ -14,30 +14,33 @@
 
 <!ENTITY pluginWizard.installPluginsPage.title "Instalando plugins">
 <!ENTITY pluginWizard.installPluginsPage.description.label "&brandShortName; está instalando plugins…">
 
 <!ENTITY pluginWizard.finalPage.description.label "&brandShortName; terminó de instalar los plugins faltantes:">
 
 <!ENTITY pluginWizard.finalPage.moreInfo.label "Ver más información sobre plugins o buscar manualmente los plugins faltantes.">
 <!ENTITY pluginWizard.finalPage.restart.label "&brandShortName; necesita reiniciarse para que funcionen los plugins.">
-
+  
 <!-- LOCALIZATION NOTE (unsupportedPlatform.pre): Mobile only. Flash (the only plugin available on mobile)
      is not supported on some devices. Include a trailing space as needed. -->
 <!ENTITY unsupportedPlatform.pre                             "Lo sentimos, pero &brandShortName; no puede reproducir Flash en este dispositivo. ">
 <!-- LOCALIZATION NOTE (unsupportedPlatform.learnMore): Mobile only. This text is used to link to a SUMO page explaining why Flash is not
      supported on this device. Use the unicode ellipsis char, \u2026, or use "..." if \u2026 doesn't suit traditions in your locale. -->
 <!ENTITY unsupportedPlatform.learnMore                       "Conocer más…">
 <!-- LOCALIZATION NOTE (unsupportedPlatform.post): Mobile only. Include text here if needed for your locale. -->
 <!ENTITY unsupportedPlatform.post                            "">
 
 <!ENTITY missingPlugin                                       "Se necesita un plugin para mostrar este contenido.">
 <!-- LOCALIZATION NOTE (tapToPlayPlugin): Mobile (used for touch interfaces) only has one type of plugin possible. -->
 <!ENTITY tapToPlayPlugin                                     "Pulsá aquí para activar el plugin.">
 <!ENTITY clickToPlayPlugin                                   "Clic aquí para activar el plugin.">
+<!ENTITY clickToPlayPluginVulnerableUpdateAvailable          "Clic aquí para activar plugin vulnerable.">
+<!ENTITY clickToPlayPluginVulnerableNoUpdate                 "Clic aquí para activar plugin vulnerable (no hay actualización disponible).">
+<!ENTITY checkForUpdates                                     "Buscar actualizaciones…">
 <!ENTITY disabledPlugin                                      "Este plugin ha sido deshabilitado.">
 <!ENTITY blockedPlugin.label                                 "Este plugin ha sido bloqueado para su protección.">
 
 <!ENTITY installPlugin                                       "Instalar plugin…">
 <!ENTITY managePlugins                                       "Administrar plugins…">
 
 <!-- LOCALIZATION NOTE (reloadPlugin.pre): include a trailing space as needed -->
 <!-- LOCALIZATION NOTE (reloadPlugin.middle): avoid leading/trailing spaces, this text is a link -->
--- a/toolkit/chrome/passwordmgr/passwordManager.dtd
+++ b/toolkit/chrome/passwordmgr/passwordManager.dtd
@@ -23,8 +23,10 @@
 <!ENTITY      filter.accesskey                "S">
 
 <!ENTITY      windowClose.key                 "w">
 <!ENTITY      focusSearch1.key                "f">
 <!ENTITY      focusSearch2.key                "k">
 
 <!ENTITY      copyPasswordCmd.label           "Copiar contraseña">
 <!ENTITY      copyPasswordCmd.accesskey       "C">
+
+<!ENTITY      copyUsernameCmd.label           "Copiar nombre de usuario">