manual edit after merge of old en-US coversion
authorAxel Hecht <axel@pike.org>
Mon, 16 Sep 2013 15:42:44 +0200
changeset 1 2e3342d517e8
parent 0 36b72a2d27d1
child 2 0c7aaafde8dd
push id1
push useraxel@mozilla.com
push date2013-09-19 14:01 +0000
manual edit after merge of old en-US coversion
gaia-central
--- a/gaia-central
+++ b/gaia-central
@@ -20927,75 +20927,75 @@ 330c37405509284e237906dc016acabbaf21d790
 267046e12bc9a876c5bf2c5b7ed31650c46a7043 9cf1cec13cc1a13aa3e8c613618506f5b77187b4
 019263c947c7f7a592ba1a9624c22957f88d54df 9454fa3057d16496ef1b6e62ece9d48ac9be9c2a
 edddbcfb57567b991567be8ed821a15d053d7550 9cf1cec13cc1a13aa3e8c613618506f5b77187b4
 c83ddd104a144972f10e15ef9f28be8d3e0d4353 9cf1cec13cc1a13aa3e8c613618506f5b77187b4
 d9de1b095aba062884a52c10f1f254124070a47a 9cf1cec13cc1a13aa3e8c613618506f5b77187b4
 d756eb910d134ae6be79cf1e9cb5e5ddc1749834 9cf1cec13cc1a13aa3e8c613618506f5b77187b4
 eebd2402281a5a4925b3c651ce35a4b4910f1e1e 9454fa3057d16496ef1b6e62ece9d48ac9be9c2a
 28c168b24460fee5b665fdd07aad34eaa94ce978 b873984355a38109091e2ff20a0723ed6853e742
-e5f745c8317f3db548f3095c30eb9494b40e17d4 4af36780fb5d4a44945eb0135880f19b99b86d21
+e5f745c8317f3db548f3095c30eb9494b40e17d4 cfb28f851111b857a740d6d1809901ce5937b845
 5a2aa872c58eb569f18d0c13e875fefc43c50513 9454fa3057d16496ef1b6e62ece9d48ac9be9c2a
-2cd0bcf4ab00291fcf1201148d2c94551b7a4b62 4af36780fb5d4a44945eb0135880f19b99b86d21
+2cd0bcf4ab00291fcf1201148d2c94551b7a4b62 cfb28f851111b857a740d6d1809901ce5937b845
 d497ac5b98118f32fa83aec337333a78982dd3e9 67e4882ce2e34000b006f49aea5925e0f9afb386
 c57e348473fcccca2eeef7b964f0984244507334 67e4882ce2e34000b006f49aea5925e0f9afb386
-a7ba8a801011b78544913f485c8968e9605ef465 4af36780fb5d4a44945eb0135880f19b99b86d21
-658c5fa993b5026b382f1c4d99018cffb7f4afe3 4af36780fb5d4a44945eb0135880f19b99b86d21
-293dc3236cfa45a43b8353971c1511924abeec3c 4af36780fb5d4a44945eb0135880f19b99b86d21
+a7ba8a801011b78544913f485c8968e9605ef465 cfb28f851111b857a740d6d1809901ce5937b845
+658c5fa993b5026b382f1c4d99018cffb7f4afe3 cfb28f851111b857a740d6d1809901ce5937b845
+293dc3236cfa45a43b8353971c1511924abeec3c cfb28f851111b857a740d6d1809901ce5937b845
 60c1ad6435533c316967ff8cf4ad9930c9c0af49 8fca2fc3fc54817f3d9b07a5975278dcb8ad7758
-f0be225d0cd9a39f836a5992a121b89ac64b3a0a 4af36780fb5d4a44945eb0135880f19b99b86d21
-e8f63cae5aff3b61c0a49a9209ae971092ddee22 4af36780fb5d4a44945eb0135880f19b99b86d21
+f0be225d0cd9a39f836a5992a121b89ac64b3a0a cfb28f851111b857a740d6d1809901ce5937b845
+e8f63cae5aff3b61c0a49a9209ae971092ddee22 cfb28f851111b857a740d6d1809901ce5937b845
 eaa43bfe016f65916b0bf1efade813fd99b9d5e0 9454fa3057d16496ef1b6e62ece9d48ac9be9c2a
-9aaf903e349757a1e0b89daecf5c1ac527e9a1a5 4af36780fb5d4a44945eb0135880f19b99b86d21
-bb61eb10b38726305bc033cc23e1024b489dc8c8 4af36780fb5d4a44945eb0135880f19b99b86d21
-629beaf543a9c608983873cbed673e36a5a7d94f 4af36780fb5d4a44945eb0135880f19b99b86d21
-669f81b5350d3f4788fbb9778b31ee4cec366e13 4af36780fb5d4a44945eb0135880f19b99b86d21
-eff0b3c7b166fe6603fb9e9f81a0798c73c5bdbd 4af36780fb5d4a44945eb0135880f19b99b86d21
+9aaf903e349757a1e0b89daecf5c1ac527e9a1a5 cfb28f851111b857a740d6d1809901ce5937b845
+bb61eb10b38726305bc033cc23e1024b489dc8c8 cfb28f851111b857a740d6d1809901ce5937b845
+629beaf543a9c608983873cbed673e36a5a7d94f cfb28f851111b857a740d6d1809901ce5937b845
+669f81b5350d3f4788fbb9778b31ee4cec366e13 cfb28f851111b857a740d6d1809901ce5937b845
+eff0b3c7b166fe6603fb9e9f81a0798c73c5bdbd cfb28f851111b857a740d6d1809901ce5937b845
 d44bbcb0be724dc083a632ac85b3f3a1e496d91f 9cf1cec13cc1a13aa3e8c613618506f5b77187b4
-1f00bab62f430f0141d91e708fcf5720fb426dc6 4af36780fb5d4a44945eb0135880f19b99b86d21
-3b555972f1517462075aa08f68a648559ebfe4ff 4af36780fb5d4a44945eb0135880f19b99b86d21
+1f00bab62f430f0141d91e708fcf5720fb426dc6 cfb28f851111b857a740d6d1809901ce5937b845
+3b555972f1517462075aa08f68a648559ebfe4ff cfb28f851111b857a740d6d1809901ce5937b845
 65d6578023365fe06e7a38c4178feea614fea9ca 51edbef984bfc242b4a0155d1a607209712d9a0a
-b719122ab4ab2dccd75ff8fb91a0cf05d0d5e6ee 4af36780fb5d4a44945eb0135880f19b99b86d21
+b719122ab4ab2dccd75ff8fb91a0cf05d0d5e6ee cfb28f851111b857a740d6d1809901ce5937b845
 40c702bb95064b2a38d10e867d3ecf22d706a1e0 9454fa3057d16496ef1b6e62ece9d48ac9be9c2a
-4be7104e4a58b2fb67943c948f432f99e5135d68 4af36780fb5d4a44945eb0135880f19b99b86d21
-a183b055417d036b01e177750ab2ec6162d6fcd7 4af36780fb5d4a44945eb0135880f19b99b86d21
+4be7104e4a58b2fb67943c948f432f99e5135d68 cfb28f851111b857a740d6d1809901ce5937b845
+a183b055417d036b01e177750ab2ec6162d6fcd7 cfb28f851111b857a740d6d1809901ce5937b845
 58b06bdcef60729c18fc495cacd6895eabb3ba23 8fca2fc3fc54817f3d9b07a5975278dcb8ad7758
-a5c9673e89d2360550de1a1e67cc5de6fb235c61 4af36780fb5d4a44945eb0135880f19b99b86d21
-fed0729dcc818f1999fade9eedef75327594b2bf 4af36780fb5d4a44945eb0135880f19b99b86d21
-51f0fc860b27607e880b6b541bc0de1e58ab1a33 4af36780fb5d4a44945eb0135880f19b99b86d21
-3c8e096aaafa27ba11cf652dabf4c3f6e2e8ff71 4af36780fb5d4a44945eb0135880f19b99b86d21
-7b2d5f3d3709ce0c9f89ae3f9959e7e12168a9c1 4af36780fb5d4a44945eb0135880f19b99b86d21
-ce45a15d0dc13271d97c487ca8d125b8ce7d4747 4af36780fb5d4a44945eb0135880f19b99b86d21
-578a478b0d2e117a5267c45b67c639ee0a207997 4af36780fb5d4a44945eb0135880f19b99b86d21
-f8e3e98f399add6083c2b0a3150256d2cea4d81a 4af36780fb5d4a44945eb0135880f19b99b86d21
-494afc8ede23b753808dadd527fe9b458b4135e4 4af36780fb5d4a44945eb0135880f19b99b86d21
+a5c9673e89d2360550de1a1e67cc5de6fb235c61 cfb28f851111b857a740d6d1809901ce5937b845
+fed0729dcc818f1999fade9eedef75327594b2bf cfb28f851111b857a740d6d1809901ce5937b845
+51f0fc860b27607e880b6b541bc0de1e58ab1a33 cfb28f851111b857a740d6d1809901ce5937b845
+3c8e096aaafa27ba11cf652dabf4c3f6e2e8ff71 cfb28f851111b857a740d6d1809901ce5937b845
+7b2d5f3d3709ce0c9f89ae3f9959e7e12168a9c1 cfb28f851111b857a740d6d1809901ce5937b845
+ce45a15d0dc13271d97c487ca8d125b8ce7d4747 cfb28f851111b857a740d6d1809901ce5937b845
+578a478b0d2e117a5267c45b67c639ee0a207997 cfb28f851111b857a740d6d1809901ce5937b845
+f8e3e98f399add6083c2b0a3150256d2cea4d81a cfb28f851111b857a740d6d1809901ce5937b845
+494afc8ede23b753808dadd527fe9b458b4135e4 cfb28f851111b857a740d6d1809901ce5937b845
 7acd6ff00f4f837b02393eafbb5eae1cc946eaae 4e3464697685687285ffb01c98c5fb322d8d5de7
 9c7126d7e45cc5a1785f38f52b00b40c374fddf9 4e3464697685687285ffb01c98c5fb322d8d5de7
-066e5566c0aedff3a2541b19cf21e2103aa87d62 4af36780fb5d4a44945eb0135880f19b99b86d21
+066e5566c0aedff3a2541b19cf21e2103aa87d62 cfb28f851111b857a740d6d1809901ce5937b845
 791bac19d979e47ab1099c018931f43d5adda385 c36fd917405bc2edf8d42189c7c95e342142689e
-85926fc45269b42f669d55ed7a37295228ab7594 4af36780fb5d4a44945eb0135880f19b99b86d21
-dd0b6823240c08ececb31bb9b75fac94cd6da781 4af36780fb5d4a44945eb0135880f19b99b86d21
+85926fc45269b42f669d55ed7a37295228ab7594 cfb28f851111b857a740d6d1809901ce5937b845
+dd0b6823240c08ececb31bb9b75fac94cd6da781 cfb28f851111b857a740d6d1809901ce5937b845
 7126d60dce1ba88e0f04b5fb88c830f3d4602690 f3292db377d41ad801363da9c74180aefb1d12c2
-e98efe63bc8b7cfeaa782bbaf6746d34d0772209 4af36780fb5d4a44945eb0135880f19b99b86d21
-1c0ba0d28cad1da17094344d7948cd4b967ccf49 4af36780fb5d4a44945eb0135880f19b99b86d21
-81394884de67452aa9d6d55abbd41d9f685983f6 4af36780fb5d4a44945eb0135880f19b99b86d21
-633dd1faba9b41755ce7c54099f75c320aeb221c 4af36780fb5d4a44945eb0135880f19b99b86d21
-6fdc32e512ef250db390f843a5b765f1c90f4745 4af36780fb5d4a44945eb0135880f19b99b86d21
-639421f0dc5e5554ca4484db7e473d047a3c1c8c 4af36780fb5d4a44945eb0135880f19b99b86d21
-b0d3052513341e467a178ce82b372aba9783fe91 4af36780fb5d4a44945eb0135880f19b99b86d21
-ec025372cf1172640d2236f3189ba2a8358e2448 4af36780fb5d4a44945eb0135880f19b99b86d21
-78d803e8450bd288095d4a2e36754c2b09985409 4af36780fb5d4a44945eb0135880f19b99b86d21
+e98efe63bc8b7cfeaa782bbaf6746d34d0772209 cfb28f851111b857a740d6d1809901ce5937b845
+1c0ba0d28cad1da17094344d7948cd4b967ccf49 cfb28f851111b857a740d6d1809901ce5937b845
+81394884de67452aa9d6d55abbd41d9f685983f6 cfb28f851111b857a740d6d1809901ce5937b845
+633dd1faba9b41755ce7c54099f75c320aeb221c cfb28f851111b857a740d6d1809901ce5937b845
+6fdc32e512ef250db390f843a5b765f1c90f4745 cfb28f851111b857a740d6d1809901ce5937b845
+639421f0dc5e5554ca4484db7e473d047a3c1c8c cfb28f851111b857a740d6d1809901ce5937b845
+b0d3052513341e467a178ce82b372aba9783fe91 cfb28f851111b857a740d6d1809901ce5937b845
+ec025372cf1172640d2236f3189ba2a8358e2448 cfb28f851111b857a740d6d1809901ce5937b845
+78d803e8450bd288095d4a2e36754c2b09985409 cfb28f851111b857a740d6d1809901ce5937b845
 3d2e7e418c7eb418709aea71dedaa2ca8ba08c5a f26c54fd3d74693e9b52a7fcbc67d3553056e26a
-a0b4f5cf54c823be0f3d348283fbde150062d7c6 4af36780fb5d4a44945eb0135880f19b99b86d21
-c9a6ee3df84fa19a576be77a6c8c4247e341a94f 4af36780fb5d4a44945eb0135880f19b99b86d21
-e3077da93a799afe7c4b34508632b9eb71b71182 4af36780fb5d4a44945eb0135880f19b99b86d21
-dec92b33adc37e788c4f2c073841e496096340b5 4af36780fb5d4a44945eb0135880f19b99b86d21
-5ee261f9920114188c1becf2b710e86d0cb661ea 4af36780fb5d4a44945eb0135880f19b99b86d21
-61d1b4037b74bcbcfddfed9151fb9c67e4e01805 4af36780fb5d4a44945eb0135880f19b99b86d21
-712c0877849082e7e86cfc4b8ca056faf5a9a9ff 4af36780fb5d4a44945eb0135880f19b99b86d21
-0bb4ced54eaf3efe56966a15d5c7e70b8c84c91d 4af36780fb5d4a44945eb0135880f19b99b86d21
-ffe6be3d548bdcc9dba7c955e67ec4545479af50 4af36780fb5d4a44945eb0135880f19b99b86d21
-c1cbca10956cf32db9a1de47c20bfe4b04608ca6 4af36780fb5d4a44945eb0135880f19b99b86d21
-5754f47f19c80ec630ef273235e46e411e4ddb42 4af36780fb5d4a44945eb0135880f19b99b86d21
-65a55ae637d858ef9e0966cdc5aa5889d95d6101 4af36780fb5d4a44945eb0135880f19b99b86d21
-059e663866801aa0c2101a111e1602cbe37bef03 4af36780fb5d4a44945eb0135880f19b99b86d21
-0807328838388aa9014089d3fd08aadc971641cf 4af36780fb5d4a44945eb0135880f19b99b86d21
-28ab56156acd7bf828476f31f54dd40d3a2a7cd1 4af36780fb5d4a44945eb0135880f19b99b86d21
+a0b4f5cf54c823be0f3d348283fbde150062d7c6 cfb28f851111b857a740d6d1809901ce5937b845
+c9a6ee3df84fa19a576be77a6c8c4247e341a94f cfb28f851111b857a740d6d1809901ce5937b845
+e3077da93a799afe7c4b34508632b9eb71b71182 cfb28f851111b857a740d6d1809901ce5937b845
+dec92b33adc37e788c4f2c073841e496096340b5 cfb28f851111b857a740d6d1809901ce5937b845
+5ee261f9920114188c1becf2b710e86d0cb661ea cfb28f851111b857a740d6d1809901ce5937b845
+61d1b4037b74bcbcfddfed9151fb9c67e4e01805 cfb28f851111b857a740d6d1809901ce5937b845
+712c0877849082e7e86cfc4b8ca056faf5a9a9ff cfb28f851111b857a740d6d1809901ce5937b845
+0bb4ced54eaf3efe56966a15d5c7e70b8c84c91d cfb28f851111b857a740d6d1809901ce5937b845
+ffe6be3d548bdcc9dba7c955e67ec4545479af50 cfb28f851111b857a740d6d1809901ce5937b845
+c1cbca10956cf32db9a1de47c20bfe4b04608ca6 cfb28f851111b857a740d6d1809901ce5937b845
+5754f47f19c80ec630ef273235e46e411e4ddb42 cfb28f851111b857a740d6d1809901ce5937b845
+65a55ae637d858ef9e0966cdc5aa5889d95d6101 cfb28f851111b857a740d6d1809901ce5937b845
+059e663866801aa0c2101a111e1602cbe37bef03 cfb28f851111b857a740d6d1809901ce5937b845
+0807328838388aa9014089d3fd08aadc971641cf cfb28f851111b857a740d6d1809901ce5937b845
+28ab56156acd7bf828476f31f54dd40d3a2a7cd1 cfb28f851111b857a740d6d1809901ce5937b845