Merge branch 'master' into staging.

7 files changed, 364 insertions, 337 deletions

diff --git a/pkgs/applications/networking/browsers/firefox-bin/sources.nix b/pkgs/applications/networking/browsers/firefox-bin/sources.nix
index dbb93b690198..db69301044ad 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/sources.nix
@@ -4,185 +4,183 @@
 # ruby generate_source.rb > source.nix
 
 {
-  version = "34.0.5";
+  version = "35.0";
   sources = [
-    { locale = "ach"; arch = "linux-i686"; sha1 = "2122f58004eec918c2a6f30e6d8a35fcee793f8d"; }
-    { locale = "ach"; arch = "linux-x86_64"; sha1 = "c304799de726df6c6c99aa4d7b2cc2ae552b92c1"; }
-    { locale = "af"; arch = "linux-i686"; sha1 = "1e367d63ab86049ba4f3f4121fd3a9531a9cd00f"; }
-    { locale = "af"; arch = "linux-x86_64"; sha1 = "1e2d3e17bed3aac9e53493f25d1e9a22a70f2710"; }
-    { locale = "an"; arch = "linux-i686"; sha1 = "cba77e9401b2ce16030cc46e7083c0a87c244165"; }
-    { locale = "an"; arch = "linux-x86_64"; sha1 = "adc7bb9a86596332c37a3cab118942c4953ec7e9"; }
-    { locale = "ar"; arch = "linux-i686"; sha1 = "59a85dcbc756752ff2ba07ffb12fecf10beb2bf9"; }
-    { locale = "ar"; arch = "linux-x86_64"; sha1 = "0c9b4c4ef3d39e3e44885359e1a85e03c47b57e3"; }
-    { locale = "as"; arch = "linux-i686"; sha1 = "69633541cad0a8fbf1798d4b47047adc2ac23cf3"; }
-    { locale = "as"; arch = "linux-x86_64"; sha1 = "b628ace403803425ab5f8e485f1107ace00e36a4"; }
-    { locale = "ast"; arch = "linux-i686"; sha1 = "adefb5324db5cb21ed46c2edee4b476e451d39d5"; }
-    { locale = "ast"; arch = "linux-x86_64"; sha1 = "734cbe739065246084cc452ca60e79248b3abada"; }
-    { locale = "az"; arch = "linux-i686"; sha1 = "12a7a57784563982df4fa9c7da1e0ff830afe81f"; }
-    { locale = "az"; arch = "linux-x86_64"; sha1 = "b8713205b616a81cea2675e477ef29db576f1ab0"; }
-    { locale = "be"; arch = "linux-i686"; sha1 = "cb60c04c2abab2ad59d6e19a08a425744f0135a9"; }
-    { locale = "be"; arch = "linux-x86_64"; sha1 = "b1bd0faf18a2f1cb7617d7c1946d586ec7db2fd1"; }
-    { locale = "bg"; arch = "linux-i686"; sha1 = "c260de634b14ed00a2396f09871fa726c5b24d09"; }
-    { locale = "bg"; arch = "linux-x86_64"; sha1 = "0a723d9d1b5abadb8250b9be5e6af8b7615231c4"; }
-    { locale = "bn-BD"; arch = "linux-i686"; sha1 = "292e7f58b2ca6b603949cc22965de0e568811dfb"; }
-    { locale = "bn-BD"; arch = "linux-x86_64"; sha1 = "c6f8afcd2e2269c5092dce8779e6068fd2e09540"; }
-    { locale = "bn-IN"; arch = "linux-i686"; sha1 = "3d93fbcb16a6161740cdee5c91fb2b9e6d5de77a"; }
-    { locale = "bn-IN"; arch = "linux-x86_64"; sha1 = "570cb383c4dcd09f90a02aa6898504295cad25e6"; }
-    { locale = "br"; arch = "linux-i686"; sha1 = "92fb316eae04d94320dd623d22d7b8c2a76018f6"; }
-    { locale = "br"; arch = "linux-x86_64"; sha1 = "a7410ed0ec67ae9746f652177664c292b727fdfc"; }
-    { locale = "bs"; arch = "linux-i686"; sha1 = "7f08e9920875f59b6df051acc68d1bb508615396"; }
-    { locale = "bs"; arch = "linux-x86_64"; sha1 = "654d90383abc26272d017b914627516b3aa33147"; }
-    { locale = "ca"; arch = "linux-i686"; sha1 = "645133ed542917fa32518279b375cf9dc4149dd7"; }
-    { locale = "ca"; arch = "linux-x86_64"; sha1 = "3eaff9df7e51971f9c1e37028430f0159ddcda9c"; }
-    { locale = "cs"; arch = "linux-i686"; sha1 = "4b283d1393fe06c80f412848b146295519e1957d"; }
-    { locale = "cs"; arch = "linux-x86_64"; sha1 = "5830a2bc46234d1adac6127fd470223ff750f5e7"; }
-    { locale = "csb"; arch = "linux-i686"; sha1 = "36c7bd7ccafdd5225d6f6dcde6928e4ca9aff603"; }
-    { locale = "csb"; arch = "linux-x86_64"; sha1 = "e5070bc33436df13e68e9ce63f091b1f60a96b5d"; }
-    { locale = "cy"; arch = "linux-i686"; sha1 = "7f6e35e997082406036864fb1cfc4bfd9380d156"; }
-    { locale = "cy"; arch = "linux-x86_64"; sha1 = "2c2ac492181ccdf10ae88c6cf1ec14a9d81c6019"; }
-    { locale = "da"; arch = "linux-i686"; sha1 = "cf2be147f015d40d0eecc1f00326856b06acdedd"; }
-    { locale = "da"; arch = "linux-x86_64"; sha1 = "01804683989d0731826d7dda67d6d7a46fb8de48"; }
-    { locale = "de"; arch = "linux-i686"; sha1 = "be8909ee0a9cf86869479c9173ea20f27d6e841a"; }
-    { locale = "de"; arch = "linux-x86_64"; sha1 = "377f54230cbe9d8dfd6242043fc8e9e43e392688"; }
-    { locale = "dsb"; arch = "linux-i686"; sha1 = "d50f0fca6b2036aca565a694bf70112121acc009"; }
-    { locale = "dsb"; arch = "linux-x86_64"; sha1 = "f532c3ac7f45682aa916f5cde32c5921a83fe9cf"; }
-    { locale = "el"; arch = "linux-i686"; sha1 = "2cf025815a5b9d7c1b7f353a592b700377797ff2"; }
-    { locale = "el"; arch = "linux-x86_64"; sha1 = "2a3c3b79072d6196cfcd00d4ffe546415e5c3c2b"; }
-    { locale = "en-GB"; arch = "linux-i686"; sha1 = "c638ac1b0f94d7afdf52b580108d9d9f0fbb4642"; }
-    { locale = "en-GB"; arch = "linux-x86_64"; sha1 = "3a89c58a1a391268de63de380f379cf47956873c"; }
-    { locale = "en-US"; arch = "linux-i686"; sha1 = "9f83d949c426b798268a038c1173bad1efb8076f"; }
-    { locale = "en-US"; arch = "linux-x86_64"; sha1 = "e9f99d0fd1fadd62ba44606f0fe67cc829b64da3"; }
-    { locale = "en-ZA"; arch = "linux-i686"; sha1 = "a84f15bb02673c849721290858de31ca9697448f"; }
-    { locale = "en-ZA"; arch = "linux-x86_64"; sha1 = "28984e2a5d91f27247eb40db48f3055a24e77f3c"; }
-    { locale = "eo"; arch = "linux-i686"; sha1 = "9951a09c2132d468ff1b8c647af195ddb3ecb050"; }
-    { locale = "eo"; arch = "linux-x86_64"; sha1 = "ec90facdeced4b969547a8193dc9f196a13a5c0c"; }
-    { locale = "es-AR"; arch = "linux-i686"; sha1 = "a4df107f065e950fe2702871fb10d1d7ddc704dc"; }
-    { locale = "es-AR"; arch = "linux-x86_64"; sha1 = "6cd0464702921be32a70eb5b68be45f5f6a65ff4"; }
-    { locale = "es-CL"; arch = "linux-i686"; sha1 = "21325f12a6ed59c471a86a8273efd76fdc9dc3bd"; }
-    { locale = "es-CL"; arch = "linux-x86_64"; sha1 = "b6660728d8ac2ba89a9bb522a8fd7552c7b0fd84"; }
-    { locale = "es-ES"; arch = "linux-i686"; sha1 = "00b2c86d3f7f6431760e2bdf6228090b46703b21"; }
-    { locale = "es-ES"; arch = "linux-x86_64"; sha1 = "d75ee1d75eb8c1d7f43fd082575cdb9d5657a719"; }
-    { locale = "es-MX"; arch = "linux-i686"; sha1 = "6e7d188ae57eeb457a5af93cef77a3e0fd3e4138"; }
-    { locale = "es-MX"; arch = "linux-x86_64"; sha1 = "905ae336894a4d7efdfd5890c43579fcbc4f63e6"; }
-    { locale = "et"; arch = "linux-i686"; sha1 = "49f5495d4fe4166f46f3d2cc784b0adadad40973"; }
-    { locale = "et"; arch = "linux-x86_64"; sha1 = "80706f89b23dd019718888c2308596ec63c0cd6c"; }
-    { locale = "eu"; arch = "linux-i686"; sha1 = "2531d3d157aee3c20616fd94606668cc78ce71f5"; }
-    { locale = "eu"; arch = "linux-x86_64"; sha1 = "6c84eab337a4b43d604f34e7ea2b563500a52f37"; }
-    { locale = "fa"; arch = "linux-i686"; sha1 = "61fe70954eca24f1d7fa8908f6cfaab1b4abfad2"; }
-    { locale = "fa"; arch = "linux-x86_64"; sha1 = "f43b28a2b0af9ba18da35c69824370cec628d056"; }
-    { locale = "ff"; arch = "linux-i686"; sha1 = "2c1f4c5a2f3639328af873e59afd6c6a479f69ae"; }
-    { locale = "ff"; arch = "linux-x86_64"; sha1 = "8737e7d4263e66fafbf372568587173e58816f6a"; }
-    { locale = "fi"; arch = "linux-i686"; sha1 = "3a5b5171449e3629b0e22d08a9bf9a5bb0428a19"; }
-    { locale = "fi"; arch = "linux-x86_64"; sha1 = "1c901117715d8ac9d869bd79d7ffda778562b4bd"; }
-    { locale = "fr"; arch = "linux-i686"; sha1 = "3962280160df7f786cc26275025976df9c267174"; }
-    { locale = "fr"; arch = "linux-x86_64"; sha1 = "cc2f1f433b88b5f73e5c7e4683d85e5275720734"; }
-    { locale = "fy-NL"; arch = "linux-i686"; sha1 = "ed2b578e76aa9e56a85d3a02a3d9d6d25e07d624"; }
-    { locale = "fy-NL"; arch = "linux-x86_64"; sha1 = "110741b45050dbc896424a6e9cf32b9f8555d657"; }
-    { locale = "ga-IE"; arch = "linux-i686"; sha1 = "32fa55c45a7fbd57a7823135e87c288d463440ee"; }
-    { locale = "ga-IE"; arch = "linux-x86_64"; sha1 = "4d0c00130026b892cfc259d8ffb6c57338e8398d"; }
-    { locale = "gd"; arch = "linux-i686"; sha1 = "2fbafdbe1218eb34ec48a5d92904c0bd07b23690"; }
-    { locale = "gd"; arch = "linux-x86_64"; sha1 = "90810697ad8206eced9e4c4330c9242c4f3baafa"; }
-    { locale = "gl"; arch = "linux-i686"; sha1 = "2be76249fc1afde7ed156beb5df2d2eef50a485e"; }
-    { locale = "gl"; arch = "linux-x86_64"; sha1 = "d400c5692a767b14dabce47303aa195bc17af3c5"; }
-    { locale = "gu-IN"; arch = "linux-i686"; sha1 = "15704df5ff619aa6818521904d557eea65165206"; }
-    { locale = "gu-IN"; arch = "linux-x86_64"; sha1 = "c19923c4e9d5ae89bf9f1aa441b9f92d6f2fd02c"; }
-    { locale = "he"; arch = "linux-i686"; sha1 = "39694a4f966ad488ff77592dc490302449104df3"; }
-    { locale = "he"; arch = "linux-x86_64"; sha1 = "deb058d0798eadc5fe3920996421d86d446ca82e"; }
-    { locale = "hi-IN"; arch = "linux-i686"; sha1 = "8d28e60f8920001184dc20cc1f381f9474c9a6fd"; }
-    { locale = "hi-IN"; arch = "linux-x86_64"; sha1 = "3e9c18fc995fc013d3bd8bc87f8accc951599e79"; }
-    { locale = "hr"; arch = "linux-i686"; sha1 = "6ced9bd6614b921600cca7520c8698f265087a31"; }
-    { locale = "hr"; arch = "linux-x86_64"; sha1 = "8ef625b32212c387a367b8059c4d0bf62d5814da"; }
-    { locale = "hsb"; arch = "linux-i686"; sha1 = "49ecea386737f963db43f8c13c8d7e9b036523f3"; }
-    { locale = "hsb"; arch = "linux-x86_64"; sha1 = "7aba537cb8ffc7b7106dba4b378024c5a0356652"; }
-    { locale = "hu"; arch = "linux-i686"; sha1 = "1d406c76c8846b4ec81e62a958d662b582f75357"; }
-    { locale = "hu"; arch = "linux-x86_64"; sha1 = "4f582fd196573f5ab1c93dc6652a2e86617a0be7"; }
-    { locale = "hy-AM"; arch = "linux-i686"; sha1 = "d71daf124c8a16d4bd1d9d17df47cf10d5a5137c"; }
-    { locale = "hy-AM"; arch = "linux-x86_64"; sha1 = "b8f124244441a6ce474860731452760e92e575c4"; }
-    { locale = "id"; arch = "linux-i686"; sha1 = "8e4c0ec82aaeee6fdcf7541f6fd0bab8811ec5ae"; }
-    { locale = "id"; arch = "linux-x86_64"; sha1 = "3b6a5ff08f1c7f81c0da50fa7d2ed17e7d7da645"; }
-    { locale = "is"; arch = "linux-i686"; sha1 = "0aa678cd3b58706ac7d9a36399abcc3a8f05a894"; }
-    { locale = "is"; arch = "linux-x86_64"; sha1 = "e2a815e45fd6c20b37085aea0b2fe6e23848fde7"; }
-    { locale = "it"; arch = "linux-i686"; sha1 = "8213e082043b61872df49709732d0f209956f858"; }
-    { locale = "it"; arch = "linux-x86_64"; sha1 = "f411672ad5fb62ddc6cc2f9e89fea611de0d6356"; }
-    { locale = "ja"; arch = "linux-i686"; sha1 = "a540dd09786c0701a1ec22adbd1a19d6cbf0eb60"; }
-    { locale = "ja"; arch = "linux-x86_64"; sha1 = "decfa3a81bd81c0d04c62d1ff70858bcbfe505c2"; }
-    { locale = "kk"; arch = "linux-i686"; sha1 = "bfda7cdf57eafd6248bd5f32cf6ba84a3a05f202"; }
-    { locale = "kk"; arch = "linux-x86_64"; sha1 = "6a12ec04401251b9382a8b8b927f4684f7268971"; }
-    { locale = "km"; arch = "linux-i686"; sha1 = "06dc00c095690aa1eabd87d3dd425d3481349a09"; }
-    { locale = "km"; arch = "linux-x86_64"; sha1 = "901e1755688474d888ebcc524ca6912280fa5c11"; }
-    { locale = "kn"; arch = "linux-i686"; sha1 = "ccc86b5b46f3444f0a09b8d70ba804a9245e55f4"; }
-    { locale = "kn"; arch = "linux-x86_64"; sha1 = "b84394b314bd99a0bf856e0330d537f14dc624f1"; }
-    { locale = "ko"; arch = "linux-i686"; sha1 = "3e3d97975c5c67db99785ccca608ad170e870523"; }
-    { locale = "ko"; arch = "linux-x86_64"; sha1 = "1575641404e5b6239745eeae202ddbb5b8ede6d0"; }
-    { locale = "lij"; arch = "linux-i686"; sha1 = "4abdf303280a82ededf5cb2a8433f169a4d2959a"; }
-    { locale = "lij"; arch = "linux-x86_64"; sha1 = "974f1c26ee02e3eb20daf8cb7a991e83dbeb8c60"; }
-    { locale = "lt"; arch = "linux-i686"; sha1 = "18cdb106a6866bb1ce33c3712011602e2503799e"; }
-    { locale = "lt"; arch = "linux-x86_64"; sha1 = "fbf52dab19307bf8f8b7d84e32d7bcddfcb4693b"; }
-    { locale = "lv"; arch = "linux-i686"; sha1 = "a383ddf03d269575eee7b7fe44ae334aa8d648e9"; }
-    { locale = "lv"; arch = "linux-x86_64"; sha1 = "91f4b3cfbd5651e0227e2d9c40cbc1eda94e3413"; }
-    { locale = "mai"; arch = "linux-i686"; sha1 = "62318920bdcb6aa26fb31e2b80e861eeef0f4da6"; }
-    { locale = "mai"; arch = "linux-x86_64"; sha1 = "1811f361ed1b6d2864f0e7cc3950668ba8633288"; }
-    { locale = "mk"; arch = "linux-i686"; sha1 = "9b2f802e0543719a3fa13027b283af062278466e"; }
-    { locale = "mk"; arch = "linux-x86_64"; sha1 = "5b22cb28cfd1390dce8534674fcecb201f431ebd"; }
-    { locale = "ml"; arch = "linux-i686"; sha1 = "25862ddddd1d9f7ddcbff8780a39ab2609fdff74"; }
-    { locale = "ml"; arch = "linux-x86_64"; sha1 = "eb5fa58184b6bd10434c5371834eaf2ee343bb6e"; }
-    { locale = "mr"; arch = "linux-i686"; sha1 = "b4dc26f1d52da326046173765832c8e06eb27adb"; }
-    { locale = "mr"; arch = "linux-x86_64"; sha1 = "d8e5968afee45607b2874845f2782add083f3d0a"; }
-    { locale = "ms"; arch = "linux-i686"; sha1 = "fce3550b0e03cf6c78d55f1e89afe27bea3ed0fa"; }
-    { locale = "ms"; arch = "linux-x86_64"; sha1 = "7bc8f231ac82827d9095ce896cb16f60c92b1053"; }
-    { locale = "nb-NO"; arch = "linux-i686"; sha1 = "7d077713f9cf02833fa9e3ef69a5dac11d88f59e"; }
-    { locale = "nb-NO"; arch = "linux-x86_64"; sha1 = "642851c8ead7a0e673d9d8d0329a551cd9282337"; }
-    { locale = "nl"; arch = "linux-i686"; sha1 = "f0cd799d98840d8ca7825caac582035761347a94"; }
-    { locale = "nl"; arch = "linux-x86_64"; sha1 = "beaa7e385b655c82999dc38eb39af31e7e9de69a"; }
-    { locale = "nn-NO"; arch = "linux-i686"; sha1 = "04ed2d080ef687b0504f3d42bea97b2e56876795"; }
-    { locale = "nn-NO"; arch = "linux-x86_64"; sha1 = "857fbeef81cf00def5eaaa02effb1731eac15a1f"; }
-    { locale = "or"; arch = "linux-i686"; sha1 = "a208556246b7574d5e71eec8a56d8a2ab3c43767"; }
-    { locale = "or"; arch = "linux-x86_64"; sha1 = "f7b223bfe82d2ab7a0f2dba0b93e682ef5c833e3"; }
-    { locale = "pa-IN"; arch = "linux-i686"; sha1 = "b67c2aa36065ece0526a280cbe33adcb38a20843"; }
-    { locale = "pa-IN"; arch = "linux-x86_64"; sha1 = "73aef7a4e318625d18cade40090ec112667de295"; }
-    { locale = "pl"; arch = "linux-i686"; sha1 = "3446a41365fb0852684d0808d1fa85ddabcf0958"; }
-    { locale = "pl"; arch = "linux-x86_64"; sha1 = "0c1b1f1279e1639e71acdccaa4a687bf26aca19f"; }
-    { locale = "pt-BR"; arch = "linux-i686"; sha1 = "a3ec0b02796f67a798bbb895cf926f9bd7ccbe8d"; }
-    { locale = "pt-BR"; arch = "linux-x86_64"; sha1 = "e3b74fcb0ec26c440acedfe282a3ef0902a10d2b"; }
-    { locale = "pt-PT"; arch = "linux-i686"; sha1 = "0b942ec4a8fee50595a7b34e76636bfa83d2dfc0"; }
-    { locale = "pt-PT"; arch = "linux-x86_64"; sha1 = "d20698edd8193185342c2487433af4ea39fb6a3a"; }
-    { locale = "rm"; arch = "linux-i686"; sha1 = "442b8ac786b05e655b415a76427cca7ee0aa1abf"; }
-    { locale = "rm"; arch = "linux-x86_64"; sha1 = "250cb2a8e3fe869ae150de97b15e6d8f8fd30da3"; }
-    { locale = "ro"; arch = "linux-i686"; sha1 = "3a796ab446e77064ad3a094464c54d578b5ca910"; }
-    { locale = "ro"; arch = "linux-x86_64"; sha1 = "a512c2bd2cdd21f108ff1f77a747c606f28f8621"; }
-    { locale = "ru"; arch = "linux-i686"; sha1 = "2a907a348dd1f61e2ee8b6027e2085ee2e7e71bf"; }
-    { locale = "ru"; arch = "linux-x86_64"; sha1 = "228cad14512e25a445c1a5a92262ddf8fbb2f5c5"; }
-    { locale = "si"; arch = "linux-i686"; sha1 = "69ad63bfa75e1279bdcfe3d4127d83bb49b134b4"; }
-    { locale = "si"; arch = "linux-x86_64"; sha1 = "851e02e6ab551af88f41655cb3fe15883e536a62"; }
-    { locale = "sk"; arch = "linux-i686"; sha1 = "56c439e0dca6d75aa218e995187d10c0f88d3390"; }
-    { locale = "sk"; arch = "linux-x86_64"; sha1 = "43b69972b4e785069eba3ca7db1d8563f5ea76d8"; }
-    { locale = "sl"; arch = "linux-i686"; sha1 = "64bad6a92fa3eb1c98e2ce038e4fafdddb699690"; }
-    { locale = "sl"; arch = "linux-x86_64"; sha1 = "ace07b787362d893be563c9d59ec7e616f3a1d11"; }
-    { locale = "son"; arch = "linux-i686"; sha1 = "6a027929d81d9c36f62d0f092d4d7f1451713077"; }
-    { locale = "son"; arch = "linux-x86_64"; sha1 = "ebb4fd0f3dcabefd3d5e19a67d3e0e02a70918fa"; }
-    { locale = "sq"; arch = "linux-i686"; sha1 = "3048cc7c6837dbad7c654b37b44ee1c3a588633c"; }
-    { locale = "sq"; arch = "linux-x86_64"; sha1 = "d4ef1a51d0bf973fe4bfc614f8878f021ec46f5b"; }
-    { locale = "sr"; arch = "linux-i686"; sha1 = "d10e7c6619d2a2879eaab9d8c3a1a7f7458f60bb"; }
-    { locale = "sr"; arch = "linux-x86_64"; sha1 = "5b140de3d590ea84f91165396b7e154acc247172"; }
-    { locale = "sv-SE"; arch = "linux-i686"; sha1 = "57efc1f16710acd31a6db186673995f0713dba6f"; }
-    { locale = "sv-SE"; arch = "linux-x86_64"; sha1 = "d65d51b861eb62a5cdc99491f3c91dbb02638511"; }
-    { locale = "ta"; arch = "linux-i686"; sha1 = "aead4b55accc679c8fd49a099d12de95410bc480"; }
-    { locale = "ta"; arch = "linux-x86_64"; sha1 = "fcca6081e4fa248f86d77bc8d7aad658e82ef4c7"; }
-    { locale = "te"; arch = "linux-i686"; sha1 = "dbcdd1cc740d82f075c71bb6e3d087312ab7700d"; }
-    { locale = "te"; arch = "linux-x86_64"; sha1 = "901df9c92377dec49e66b17c7efd5a3d8f8ea5d5"; }
-    { locale = "th"; arch = "linux-i686"; sha1 = "a150db665c6a1e5ceb3d6a27896431890b5631c5"; }
-    { locale = "th"; arch = "linux-x86_64"; sha1 = "144489c6c53d1fdc32a42d2ebb6905946369c70a"; }
-    { locale = "tr"; arch = "linux-i686"; sha1 = "ccfc01ef15ee5345a2f0e07b1c4bcf8ac4459554"; }
-    { locale = "tr"; arch = "linux-x86_64"; sha1 = "563862e9a8b355b12c3dca36fc4d8c219707820a"; }
-    { locale = "uk"; arch = "linux-i686"; sha1 = "9885b14de8ca7d1a25adec103e245dc6d54c226d"; }
-    { locale = "uk"; arch = "linux-x86_64"; sha1 = "8d9d3e4a14d0288dc6d82cb652752712e0e4b577"; }
-    { locale = "vi"; arch = "linux-i686"; sha1 = "a70b8c7d9a7bbda992faf8f3762e55412b12a08d"; }
-    { locale = "vi"; arch = "linux-x86_64"; sha1 = "17661185644f68902eb946a3cd179c77f9681881"; }
-    { locale = "xh"; arch = "linux-i686"; sha1 = "1f1c9a8c1a614e5855d7303d808e661e54536de9"; }
-    { locale = "xh"; arch = "linux-x86_64"; sha1 = "17490957c9f3064ea5ea35562c0d669a557ea1ae"; }
-    { locale = "zh-CN"; arch = "linux-i686"; sha1 = "5140d26ab69f0645ae512d8a9d277ae6efc7dc45"; }
-    { locale = "zh-CN"; arch = "linux-x86_64"; sha1 = "cc09fcde7062e5bac4952b239354152855b8c52a"; }
-    { locale = "zh-TW"; arch = "linux-i686"; sha1 = "e923cb157faa256852ead1aef8e1c5e420e4fb27"; }
-    { locale = "zh-TW"; arch = "linux-x86_64"; sha1 = "d801a229474eaee5229137f2e69629abdf60e36b"; }
+    { locale = "ach"; arch = "linux-i686"; sha1 = "171c24f002bceacbe7a29ca807f3e13cab20cb09"; }
+    { locale = "ach"; arch = "linux-x86_64"; sha1 = "4b9936b23e3a14603a87fbc3ca3ffdf6cac51ab3"; }
+    { locale = "af"; arch = "linux-i686"; sha1 = "2ec4b773acddb8b7ca6edd77c87d7f6018eebe6a"; }
+    { locale = "af"; arch = "linux-x86_64"; sha1 = "3ff150a7956464802550de974901d77f8fdeaa2c"; }
+    { locale = "an"; arch = "linux-i686"; sha1 = "c87ab9f8d6ff800b8d4524fbb31f5eda93f04d0b"; }
+    { locale = "an"; arch = "linux-x86_64"; sha1 = "4424f5a5ee97ef17786242c0ed8fbd235892792c"; }
+    { locale = "ar"; arch = "linux-i686"; sha1 = "626055151dbd2b6324b9a78f0d52f908d851ef27"; }
+    { locale = "ar"; arch = "linux-x86_64"; sha1 = "46eb6f9a7d79ab0935e53f8adcbb39ef9eb23958"; }
+    { locale = "as"; arch = "linux-i686"; sha1 = "5bdb6329d9b87e844f54c76e6a1d3a01bb549a47"; }
+    { locale = "as"; arch = "linux-x86_64"; sha1 = "c3d9a75ed9624f55b28be6537e66d3d008f2f8e0"; }
+    { locale = "ast"; arch = "linux-i686"; sha1 = "afdef9abc432e29db0105359436feb799cf4b4d8"; }
+    { locale = "ast"; arch = "linux-x86_64"; sha1 = "6bc04d5d929b6e8c507080d7d9c6a38cdbd8cdfc"; }
+    { locale = "az"; arch = "linux-i686"; sha1 = "08c01dbc10d092dd1bed279b61a718494f306934"; }
+    { locale = "az"; arch = "linux-x86_64"; sha1 = "7cd459c801cb13a632bf8dbe0e935924731378be"; }
+    { locale = "be"; arch = "linux-i686"; sha1 = "1086d708700b1e78943aff8b5525fefdc57f6b4b"; }
+    { locale = "be"; arch = "linux-x86_64"; sha1 = "61ef1b7d3e7f10024a688940177906094504375e"; }
+    { locale = "bg"; arch = "linux-i686"; sha1 = "63c097425c56a2aebd6519013bd39719e22b8869"; }
+    { locale = "bg"; arch = "linux-x86_64"; sha1 = "d2f27d7c96ff11b03f44f7d1aee9b2f0b042946e"; }
+    { locale = "bn-BD"; arch = "linux-i686"; sha1 = "cf9368ef310017d68c06eb1cbb14e83656adb94f"; }
+    { locale = "bn-BD"; arch = "linux-x86_64"; sha1 = "c45797b2747cf9688250c3b9816b31333c76218c"; }
+    { locale = "bn-IN"; arch = "linux-i686"; sha1 = "a664464f41b2bc8cdcb6f9cbf2945da66743f923"; }
+    { locale = "bn-IN"; arch = "linux-x86_64"; sha1 = "4b17670ee1204fe6fc99ac60466b630a67fb377d"; }
+    { locale = "br"; arch = "linux-i686"; sha1 = "004c18d0270d0964b69b9d574ee0085f95f79d5f"; }
+    { locale = "br"; arch = "linux-x86_64"; sha1 = "974c674138cdfd4983ee89e11d9b8ea905318e07"; }
+    { locale = "bs"; arch = "linux-i686"; sha1 = "3c76d0e794a9f90313438a77cc71c4917e6d0963"; }
+    { locale = "bs"; arch = "linux-x86_64"; sha1 = "de062d16baa844bef4d46278b922e55c24446013"; }
+    { locale = "ca"; arch = "linux-i686"; sha1 = "1fc3fd7ff88fa47be3e63c6d18fb7ea0f96ea182"; }
+    { locale = "ca"; arch = "linux-x86_64"; sha1 = "034e54f38b3905afa9265adcd7028ecaeef0b0ea"; }
+    { locale = "cs"; arch = "linux-i686"; sha1 = "da6c2109d0749e3fb02d39608bfc097e0d4b7e94"; }
+    { locale = "cs"; arch = "linux-x86_64"; sha1 = "564dfbadd8a4da4d27a5980be2c037c38f798be3"; }
+    { locale = "cy"; arch = "linux-i686"; sha1 = "4e601b99d70c68884efa386cd7d9e73d27f58fcc"; }
+    { locale = "cy"; arch = "linux-x86_64"; sha1 = "6d8b101a0cf704501f737867ec139481457d4925"; }
+    { locale = "da"; arch = "linux-i686"; sha1 = "bf228d3a5a62fbdb1169029722fa0e3b5ed88b32"; }
+    { locale = "da"; arch = "linux-x86_64"; sha1 = "cdd695b5e0983c6602d9a351b3b132c4063c0b4b"; }
+    { locale = "de"; arch = "linux-i686"; sha1 = "117fc06f022e5508a0d15be0e1a7a3db4745c8d6"; }
+    { locale = "de"; arch = "linux-x86_64"; sha1 = "85d4ab75a06eefb41bcd16c9eb870f704cc41d69"; }
+    { locale = "dsb"; arch = "linux-i686"; sha1 = "8518aa683ae83d230067a72ed541e3d190933548"; }
+    { locale = "dsb"; arch = "linux-x86_64"; sha1 = "ed174cf13bd4ea448e4c86e1c05632728da2138e"; }
+    { locale = "el"; arch = "linux-i686"; sha1 = "3d78f1b8b814da0f9b64e06275a46675e52baee7"; }
+    { locale = "el"; arch = "linux-x86_64"; sha1 = "4ceca57c924cbd80dbd6578c0fbcfdc0dbedad36"; }
+    { locale = "en-GB"; arch = "linux-i686"; sha1 = "b96227ce0f152eb901ca9cdfa579634d943e8ee1"; }
+    { locale = "en-GB"; arch = "linux-x86_64"; sha1 = "d8ebb59b19d1bab937b53cd7af14a07537688218"; }
+    { locale = "en-US"; arch = "linux-i686"; sha1 = "80b63f903b0182f939436e8ec7a54b0c7bcfddad"; }
+    { locale = "en-US"; arch = "linux-x86_64"; sha1 = "1e5d88aa9fade0f39be239d4fc88a63be7fba1fb"; }
+    { locale = "en-ZA"; arch = "linux-i686"; sha1 = "f16c3e3d6904ee327002788e2374bf126c40d5b5"; }
+    { locale = "en-ZA"; arch = "linux-x86_64"; sha1 = "f4a411e5ab5ad73b524ef92c5ed465f25d9411e3"; }
+    { locale = "eo"; arch = "linux-i686"; sha1 = "dd9ba1358f4359ce0e686c9f04f2603398cc70e7"; }
+    { locale = "eo"; arch = "linux-x86_64"; sha1 = "e7c5a2688c9ec3cca5005caa25fa7d8d97044a3a"; }
+    { locale = "es-AR"; arch = "linux-i686"; sha1 = "7bf4fc268ef16dbac4bf1697aeb127b00f024b23"; }
+    { locale = "es-AR"; arch = "linux-x86_64"; sha1 = "de4b641021139e2a3a14db6ae9ccd0202d36380e"; }
+    { locale = "es-CL"; arch = "linux-i686"; sha1 = "afc1ee57a9eb78d53fdf9416fdde4ed519482810"; }
+    { locale = "es-CL"; arch = "linux-x86_64"; sha1 = "e91d0e394bf54562297dbfcf79cd2998d3824292"; }
+    { locale = "es-ES"; arch = "linux-i686"; sha1 = "c7c1f11f1767116b1a3f0ed7a72cbfe5ec72f4ad"; }
+    { locale = "es-ES"; arch = "linux-x86_64"; sha1 = "e02cf16977b0ad6b76e1f50b8dce6634e7688740"; }
+    { locale = "es-MX"; arch = "linux-i686"; sha1 = "8e5462e20a5f7916bb2db78d438573f7d0da9706"; }
+    { locale = "es-MX"; arch = "linux-x86_64"; sha1 = "7337351eb8bd38f010c805ce1e00d74b9379d8c1"; }
+    { locale = "et"; arch = "linux-i686"; sha1 = "ea958109c28d185d250a199d935285edb7099e8c"; }
+    { locale = "et"; arch = "linux-x86_64"; sha1 = "fa5fd96f8ebe24ec343c2bd834dce571153c0e73"; }
+    { locale = "eu"; arch = "linux-i686"; sha1 = "66b24e265d01d1775dab8edc4e6b3e2f2566ba22"; }
+    { locale = "eu"; arch = "linux-x86_64"; sha1 = "e8be6ebbd667459206c8f66bd069ded86784d8ab"; }
+    { locale = "fa"; arch = "linux-i686"; sha1 = "824ce366ab30abd33e9a7c2f5d57cfde4d60c00d"; }
+    { locale = "fa"; arch = "linux-x86_64"; sha1 = "12b4a0bfb18f893a0eecdec56a4eda02372396ce"; }
+    { locale = "ff"; arch = "linux-i686"; sha1 = "218082c202a7699a162901d9093f519811a5f378"; }
+    { locale = "ff"; arch = "linux-x86_64"; sha1 = "93d3acad0e144b884d3a1a30ac6336fca4e17e77"; }
+    { locale = "fi"; arch = "linux-i686"; sha1 = "c74d417d4f26061008a9cbd7c7f121fb1e656cfc"; }
+    { locale = "fi"; arch = "linux-x86_64"; sha1 = "e0da9d2c6cdd1b5c3b26bef6b3401e4fa6452e4b"; }
+    { locale = "fr"; arch = "linux-i686"; sha1 = "830599b504839b9995414982ba655331619609ec"; }
+    { locale = "fr"; arch = "linux-x86_64"; sha1 = "4a5c334689e844358e22aba8389849594b6a1891"; }
+    { locale = "fy-NL"; arch = "linux-i686"; sha1 = "1e9a7b2e57802850c1efb3046b4913499fad07d2"; }
+    { locale = "fy-NL"; arch = "linux-x86_64"; sha1 = "ae86e5252bd7b2a4422bc8c6f777ade07242176e"; }
+    { locale = "ga-IE"; arch = "linux-i686"; sha1 = "4c94ec105da0f91a2b87ba8013eb7b832c2fee12"; }
+    { locale = "ga-IE"; arch = "linux-x86_64"; sha1 = "dab8398e904f8392c01313314bbaf76bd0decd8f"; }
+    { locale = "gd"; arch = "linux-i686"; sha1 = "7d3c9ebcb0ee1aec567d0676c78038a35faf746f"; }
+    { locale = "gd"; arch = "linux-x86_64"; sha1 = "4b4c20766fe95c6dd69c8e29a2ffcea007940b74"; }
+    { locale = "gl"; arch = "linux-i686"; sha1 = "eb960637873424213035846cee85dc5cd3bcffaa"; }
+    { locale = "gl"; arch = "linux-x86_64"; sha1 = "c467354f5c4197880c42205c5385cfd62a115413"; }
+    { locale = "gu-IN"; arch = "linux-i686"; sha1 = "a25db0f49e9ca9b8238a321480cc6913195ab000"; }
+    { locale = "gu-IN"; arch = "linux-x86_64"; sha1 = "8241b15c08fa66e05da25a5d0ad5ffbc50cc6388"; }
+    { locale = "he"; arch = "linux-i686"; sha1 = "9c6e3df8063a8c4ee859dc0e58ac6f36c2f26659"; }
+    { locale = "he"; arch = "linux-x86_64"; sha1 = "ec00dfcaf552aa94322b2bcdec1ec8bfc6b5fb6a"; }
+    { locale = "hi-IN"; arch = "linux-i686"; sha1 = "5165b5ebfa7af89fa61d994ecf5d77087d455828"; }
+    { locale = "hi-IN"; arch = "linux-x86_64"; sha1 = "3c52f08951f65d45a5623bc3f88cf7c8e10140c1"; }
+    { locale = "hr"; arch = "linux-i686"; sha1 = "2b8e12856d5ac25ae101fd717713c46f02836567"; }
+    { locale = "hr"; arch = "linux-x86_64"; sha1 = "0e3848584959c4123d40da34d6ed25b749cebd15"; }
+    { locale = "hsb"; arch = "linux-i686"; sha1 = "9a290473f24f9f2347ab64a5851a1f14aed713f7"; }
+    { locale = "hsb"; arch = "linux-x86_64"; sha1 = "95a66e9f36b6984a341cd801297db84f4ed0c0f3"; }
+    { locale = "hu"; arch = "linux-i686"; sha1 = "bf1ba19941a5f51c32ac4ac58886165ac258d47e"; }
+    { locale = "hu"; arch = "linux-x86_64"; sha1 = "710cc727bad72b0f7e85ba84171983b5729e3ea7"; }
+    { locale = "hy-AM"; arch = "linux-i686"; sha1 = "914e85645210db9f3887751ca8dd68011dc35afc"; }
+    { locale = "hy-AM"; arch = "linux-x86_64"; sha1 = "1253e742d911defc9d4cc6334f9eefdc33ac594b"; }
+    { locale = "id"; arch = "linux-i686"; sha1 = "a3775040046ec7170fecc0a76f97a1c1ebf77097"; }
+    { locale = "id"; arch = "linux-x86_64"; sha1 = "ae66b28ea0ba09d4f6fa43efd13db774a3e196c7"; }
+    { locale = "is"; arch = "linux-i686"; sha1 = "6a36025b57fc9ffcf136d377d4b8b0da0ad70561"; }
+    { locale = "is"; arch = "linux-x86_64"; sha1 = "f2e31c725ee85e70be0aa04fe10463c0e93ab403"; }
+    { locale = "it"; arch = "linux-i686"; sha1 = "640db9133bd8dad4c0317f1ca47570aedbac6f05"; }
+    { locale = "it"; arch = "linux-x86_64"; sha1 = "ab4782eb61e9aab81b899b355416a7cac1434fc5"; }
+    { locale = "ja"; arch = "linux-i686"; sha1 = "3306c8a43d605d43a459915cbe537fd96d38fc1f"; }
+    { locale = "ja"; arch = "linux-x86_64"; sha1 = "49b7be7d6237cde197daa9dc6eed39f27eb8afda"; }
+    { locale = "kk"; arch = "linux-i686"; sha1 = "f8c201f166bd7a11b118bd16a9056e386c8a6fb1"; }
+    { locale = "kk"; arch = "linux-x86_64"; sha1 = "e4e970289b0370e1c7fac171e0c704f089a7daef"; }
+    { locale = "km"; arch = "linux-i686"; sha1 = "5f5e99bdd7d0581bdbf866ea4e11a7ceab11633e"; }
+    { locale = "km"; arch = "linux-x86_64"; sha1 = "a1c7adaf6986d96119f4ee5941b8e37eb7a5eb99"; }
+    { locale = "kn"; arch = "linux-i686"; sha1 = "cc54a5fd8b361bb64e74cb25c886b3f7acec564b"; }
+    { locale = "kn"; arch = "linux-x86_64"; sha1 = "72159be6e48f786ae3c3393ddac54f38d26a5b78"; }
+    { locale = "ko"; arch = "linux-i686"; sha1 = "e4ec61472d4abe31cbced6077edd091a5905f0da"; }
+    { locale = "ko"; arch = "linux-x86_64"; sha1 = "1f8297062d8898a288e11dfb8acfdaaa47add0ee"; }
+    { locale = "lij"; arch = "linux-i686"; sha1 = "78c3a4d2caf84ccf89cf8da4fc3ef183bc9cf70a"; }
+    { locale = "lij"; arch = "linux-x86_64"; sha1 = "ab9ac9e5f0e29e5380c09256f10eb69767ced505"; }
+    { locale = "lt"; arch = "linux-i686"; sha1 = "bb8f2a6ecba549fac49337a057e9a4db4129b79d"; }
+    { locale = "lt"; arch = "linux-x86_64"; sha1 = "fe5c477631d72f8ccee29177431d3dea0be9f180"; }
+    { locale = "lv"; arch = "linux-i686"; sha1 = "2c2d06266a4d98ec20bf2f5e52b9c3c0bb609c76"; }
+    { locale = "lv"; arch = "linux-x86_64"; sha1 = "8dfed7ad4f1783e6760221373358f231f4f0da0f"; }
+    { locale = "mai"; arch = "linux-i686"; sha1 = "757b62b448f83e9d69c66d1615da966107c931a3"; }
+    { locale = "mai"; arch = "linux-x86_64"; sha1 = "713c610d63083ea8021f01d321b930b0c847f780"; }
+    { locale = "mk"; arch = "linux-i686"; sha1 = "366089fb3c938ea35a5dffe7f7ca760054f567b0"; }
+    { locale = "mk"; arch = "linux-x86_64"; sha1 = "efdd56a4cc63066096446ad360549447647348de"; }
+    { locale = "ml"; arch = "linux-i686"; sha1 = "3c2e550f836f0cefcfb5c38411b1ac2f3a637bcf"; }
+    { locale = "ml"; arch = "linux-x86_64"; sha1 = "36a2ec196849c1f469e74b3053c3f12396b01504"; }
+    { locale = "mr"; arch = "linux-i686"; sha1 = "be2e5712afc9d4cc4c7f1934e596f7c1957544c2"; }
+    { locale = "mr"; arch = "linux-x86_64"; sha1 = "e73b9d865474ffa5acbeb231d4e685937be1975f"; }
+    { locale = "ms"; arch = "linux-i686"; sha1 = "4fbc2a641867d394f28a4742b5c5133731f546d5"; }
+    { locale = "ms"; arch = "linux-x86_64"; sha1 = "87631ece4d7b74baedd781d1f6b2a57b2eeda412"; }
+    { locale = "nb-NO"; arch = "linux-i686"; sha1 = "68f83785a6df96389cf76870d98090c786fdfc31"; }
+    { locale = "nb-NO"; arch = "linux-x86_64"; sha1 = "8e2d292250b23dd76e5661fe52de979d0c5d9205"; }
+    { locale = "nl"; arch = "linux-i686"; sha1 = "f0d738d05df36c876882f8c301331869d83f7294"; }
+    { locale = "nl"; arch = "linux-x86_64"; sha1 = "eea2560db78a13f0c04aad6825d328b8bc55eb08"; }
+    { locale = "nn-NO"; arch = "linux-i686"; sha1 = "c6034e46de8466295d0e359274b6a55d55d0184a"; }
+    { locale = "nn-NO"; arch = "linux-x86_64"; sha1 = "10ec7c2904189566a938325ea815723e0bb0b2cb"; }
+    { locale = "or"; arch = "linux-i686"; sha1 = "0df41d06162817cd34b1bb53515c90cfad3de511"; }
+    { locale = "or"; arch = "linux-x86_64"; sha1 = "3c12b50d07447911fc0f509ad00e385124bf7ec3"; }
+    { locale = "pa-IN"; arch = "linux-i686"; sha1 = "0ce146883573be7eb5daed17699230da82ada4cf"; }
+    { locale = "pa-IN"; arch = "linux-x86_64"; sha1 = "c01aa06a17bd8d621ed6aded5e74e71370e9e4c8"; }
+    { locale = "pl"; arch = "linux-i686"; sha1 = "2164863aa00224f593290194767f3996811e638a"; }
+    { locale = "pl"; arch = "linux-x86_64"; sha1 = "567697d04976120296727b8a3ea4c26b747a4588"; }
+    { locale = "pt-BR"; arch = "linux-i686"; sha1 = "9d157740a17808968351dc8adec6aa537cec0a44"; }
+    { locale = "pt-BR"; arch = "linux-x86_64"; sha1 = "d4bd135c4e13f82a8a2809e3e1d8e09cf7f80f42"; }
+    { locale = "pt-PT"; arch = "linux-i686"; sha1 = "3dbf64a4e9ed9900f2ac9581f89f0df723129a14"; }
+    { locale = "pt-PT"; arch = "linux-x86_64"; sha1 = "e3d930beb3fb127d9528b4ff296fbbeeebb14bb8"; }
+    { locale = "rm"; arch = "linux-i686"; sha1 = "a579c6c9a0564add3bda66a003318fe2947f69cc"; }
+    { locale = "rm"; arch = "linux-x86_64"; sha1 = "030cfc69fa37be23b88b70d4ac80e459efb5a059"; }
+    { locale = "ro"; arch = "linux-i686"; sha1 = "47d39cfef7f363504a626ac82f913e41742be0e8"; }
+    { locale = "ro"; arch = "linux-x86_64"; sha1 = "bc5d110d4ce4953d213bea29e1052b7ca1718410"; }
+    { locale = "ru"; arch = "linux-i686"; sha1 = "8944e82080ac7371dba99e3e602b7ad03e589655"; }
+    { locale = "ru"; arch = "linux-x86_64"; sha1 = "6c224dc91d8fd60056a6c72dc54de8c68a279b6d"; }
+    { locale = "si"; arch = "linux-i686"; sha1 = "baee23301b0d140248030b1fd68fc04e5c10f939"; }
+    { locale = "si"; arch = "linux-x86_64"; sha1 = "828160c350a4dd71f88b0d1f17c8692e6d4b14d1"; }
+    { locale = "sk"; arch = "linux-i686"; sha1 = "5ef8b1e005286bbf3e2e1f7eefa4addf8f3767d0"; }
+    { locale = "sk"; arch = "linux-x86_64"; sha1 = "30bcc039ccd95b1a0c488b1b805ae0a767856b16"; }
+    { locale = "sl"; arch = "linux-i686"; sha1 = "8352a59403334665bc88604e6a40581a3eb7aac0"; }
+    { locale = "sl"; arch = "linux-x86_64"; sha1 = "3e0939fe78cd88350748690598b786dd4e335855"; }
+    { locale = "son"; arch = "linux-i686"; sha1 = "09f0bb79c4c9c1a865a5e14c7e621c3fc2d416cc"; }
+    { locale = "son"; arch = "linux-x86_64"; sha1 = "86e4c2fb90a17b068a5c62843ab16803c1b101e9"; }
+    { locale = "sq"; arch = "linux-i686"; sha1 = "016fe63fcaa5a6a1335d27c4e7ad97dd5aaad9e4"; }
+    { locale = "sq"; arch = "linux-x86_64"; sha1 = "1c4d68de1b8a6d29dd9b9d3433ffb7859832c4ed"; }
+    { locale = "sr"; arch = "linux-i686"; sha1 = "011eaee136b1e34d0a0b2eeab2e0a53edecece88"; }
+    { locale = "sr"; arch = "linux-x86_64"; sha1 = "2d54163e9219d192908f162b338bbc7cce43569a"; }
+    { locale = "sv-SE"; arch = "linux-i686"; sha1 = "3616fdf8cb30580246243b42efcd11dc13ee0bc4"; }
+    { locale = "sv-SE"; arch = "linux-x86_64"; sha1 = "33139dfd37b085fe77b48a0b7f3f9ad6ce12bf05"; }
+    { locale = "ta"; arch = "linux-i686"; sha1 = "a043b01750615c594d0d079681e47c523601419e"; }
+    { locale = "ta"; arch = "linux-x86_64"; sha1 = "16650e9b5c34faa71fe597e5a86eac16a85b8a63"; }
+    { locale = "te"; arch = "linux-i686"; sha1 = "e565fe7184e4c1e60804c1258d241af4d8f989cc"; }
+    { locale = "te"; arch = "linux-x86_64"; sha1 = "e0cd4d67f800b86c7f84a816adfd4c94c4e4ec3c"; }
+    { locale = "th"; arch = "linux-i686"; sha1 = "069e3a10f95d0d5abd9f44548e482523ba688728"; }
+    { locale = "th"; arch = "linux-x86_64"; sha1 = "f8678da72a388623718a2ea0b9e8e7df735c87b4"; }
+    { locale = "tr"; arch = "linux-i686"; sha1 = "cef7ea6c46da2fb39802b5ed6d6626addd0842e1"; }
+    { locale = "tr"; arch = "linux-x86_64"; sha1 = "a1476e81269f11fd966b74ddadf009356d7d8811"; }
+    { locale = "uk"; arch = "linux-i686"; sha1 = "694d8dc5aa067ed1efbe6912f38ddcb501692741"; }
+    { locale = "uk"; arch = "linux-x86_64"; sha1 = "68e4329c7ffc622d5e98923348c0eebde3d0a05d"; }
+    { locale = "vi"; arch = "linux-i686"; sha1 = "421289cfe38233038c6b67c341779997cb0f7e91"; }
+    { locale = "vi"; arch = "linux-x86_64"; sha1 = "5d6b9ed16a8cefe6ec79716d43f9d984270da12d"; }
+    { locale = "xh"; arch = "linux-i686"; sha1 = "ac7648d08f55449fa4c7833edf3ac229290b3b56"; }
+    { locale = "xh"; arch = "linux-x86_64"; sha1 = "29bce5966c7ed1b806706855611329c857ce0c89"; }
+    { locale = "zh-CN"; arch = "linux-i686"; sha1 = "7f8867dc3839573234685355965490c600c3c73e"; }
+    { locale = "zh-CN"; arch = "linux-x86_64"; sha1 = "2f9df8cb2c6d5de83f4c77aa6938a16d93d70020"; }
+    { locale = "zh-TW"; arch = "linux-i686"; sha1 = "dd5abdc714ce34b3999e9f021b26131dfabcaece"; }
+    { locale = "zh-TW"; arch = "linux-x86_64"; sha1 = "b5f9f4b7cdce79b0627069318fc9a0bacd251980"; }
   ];
 }
diff --git a/pkgs/applications/networking/browsers/jumanji/default.nix b/pkgs/applications/networking/browsers/jumanji/default.nix
new file mode 100644
index 000000000000..ff4fea90bff1
--- /dev/null
+++ b/pkgs/applications/networking/browsers/jumanji/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchgit, pkgconfig, girara, gtk, webkitgtk, glib_networking, makeWrapper }:
+
+stdenv.mkDerivation rec {
+  name = "jumanji-${version}";
+  version = "20140622";
+
+  src = fetchgit {
+    url = git://pwmt.org/jumanji.git;
+    rev = "8f40487304a6a931487c411b25001f2bb5cf8d4f";
+    sha256 = "1hdk09rayyv2knxzn4n7d41dvh34gdk9ra75x7g9n985w13pkinv";
+  };
+
+  buildInputs = [ girara pkgconfig gtk webkitgtk makeWrapper ];
+
+  makeFlags = [ "PREFIX=$(out)" ];
+
+  preFixup=''
+    wrapProgram "$out/bin/jumanji" \
+     --prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Minimal web browser";
+    homepage = http://pwmt.org/projects/jumanji/;
+    platforms = platforms.all;
+    maintainers = [ maintainers.koral ];
+  };
+}
diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix
index e51c3f68d7f6..595272b900af 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix
@@ -4,117 +4,117 @@
 # ruby generate_source.rb > source.nix
 
 {
-  version = "31.3.0";
+  version = "31.4.0";
   sources = [
-    { locale = "ar"; arch = "linux-i686"; sha1 = "2579ce59d7c26bdd345732d6ab164fbf6e531b0a"; }
-    { locale = "ar"; arch = "linux-x86_64"; sha1 = "55b912f4424b06972cc9d3b14cab3eaa75abdff0"; }
-    { locale = "ast"; arch = "linux-i686"; sha1 = "101de138543ae46b667cc9800e45d30a59c31ea0"; }
-    { locale = "ast"; arch = "linux-x86_64"; sha1 = "0e290b8222ec3085d2848eb219fa2a950ab38f96"; }
-    { locale = "be"; arch = "linux-i686"; sha1 = "80db08139076f5e2810edd931af353bc3c9f6326"; }
-    { locale = "be"; arch = "linux-x86_64"; sha1 = "0569479306e0e5fbaa9b87d9f547eec875cdc673"; }
-    { locale = "bg"; arch = "linux-i686"; sha1 = "072900fc768486d525fa89ef4a289b3135ec7d1e"; }
-    { locale = "bg"; arch = "linux-x86_64"; sha1 = "b99da8534a06e89380b8a9c62e7ac848995cd648"; }
-    { locale = "bn-BD"; arch = "linux-i686"; sha1 = "89303e18aa4bc22b1cb91f4d990eb2e3896336e9"; }
-    { locale = "bn-BD"; arch = "linux-x86_64"; sha1 = "142a507fd977c81e18580acea9dc3e60fb6e6cca"; }
-    { locale = "br"; arch = "linux-i686"; sha1 = "987b861d55d333d552e22fd6ce4d5d8fa3031e95"; }
-    { locale = "br"; arch = "linux-x86_64"; sha1 = "8c088d8f374e4cab6477ed5e071861d3875513fb"; }
-    { locale = "ca"; arch = "linux-i686"; sha1 = "0517ffca37a556548a9b8ded4d7084df0ad70d53"; }
-    { locale = "ca"; arch = "linux-x86_64"; sha1 = "a617ae22a924d458ed633e5728f44838d0b42c64"; }
-    { locale = "cs"; arch = "linux-i686"; sha1 = "9ae7115dfc0c11528ec276d62925815f93f49dd0"; }
-    { locale = "cs"; arch = "linux-x86_64"; sha1 = "2155ef2017e5411a9279b66142306f5d5b9b2b0d"; }
-    { locale = "da"; arch = "linux-i686"; sha1 = "dfb5ee11a096128f53cebe016156e34aa762a5be"; }
-    { locale = "da"; arch = "linux-x86_64"; sha1 = "8549835e2c3a120aea39c274d7cb1c7f54035649"; }
-    { locale = "de"; arch = "linux-i686"; sha1 = "3032a8b87835781d919cab8862057a2612a52af3"; }
-    { locale = "de"; arch = "linux-x86_64"; sha1 = "6a9a99636cbfbff3950c5f31681ed2aefbb170b9"; }
-    { locale = "el"; arch = "linux-i686"; sha1 = "33bd8a4a7cdaab9937a7880f17c27177a667f1f5"; }
-    { locale = "el"; arch = "linux-x86_64"; sha1 = "e32d2382a8322cb65ed3b2b4d634cc818bf94d58"; }
-    { locale = "en-GB"; arch = "linux-i686"; sha1 = "2e85dcaa7450e2cd605ab41849693c6eb94aa4b8"; }
-    { locale = "en-GB"; arch = "linux-x86_64"; sha1 = "5a229b46fca9bfe736254bc9a65259c5722dac37"; }
-    { locale = "en-US"; arch = "linux-i686"; sha1 = "40d0e9a5530812d2ffc471f9c1e9c64ec39bc3aa"; }
-    { locale = "en-US"; arch = "linux-x86_64"; sha1 = "5dc64b9a0fa7e4df1ed232b56478d52986c3b4ad"; }
-    { locale = "es-AR"; arch = "linux-i686"; sha1 = "5b3cec2e5ddfd9a12eadc5ac270aba85acfe0051"; }
-    { locale = "es-AR"; arch = "linux-x86_64"; sha1 = "bceb273367d49b927f5de022009fdd27b707d4eb"; }
-    { locale = "es-ES"; arch = "linux-i686"; sha1 = "9911086185272ac2a5c6ee9b36170f1a7352b5a4"; }
-    { locale = "es-ES"; arch = "linux-x86_64"; sha1 = "df164ccdb2ec8ac50c663fe5771a63cb51b991a8"; }
-    { locale = "et"; arch = "linux-i686"; sha1 = "1e98b4c19dc16e52a65e66a0b518626924a098b1"; }
-    { locale = "et"; arch = "linux-x86_64"; sha1 = "2153b56a7336fdba78797025ebba8deb0c5796ed"; }
-    { locale = "eu"; arch = "linux-i686"; sha1 = "864ae993a8e87b09ba2ebfa5d12a8cc9b36c9c27"; }
-    { locale = "eu"; arch = "linux-x86_64"; sha1 = "ad4a01b18e2c9d38d048f9ee28a19c00dd1dc122"; }
-    { locale = "fi"; arch = "linux-i686"; sha1 = "d2ebe588dda618a29de4af0fbadbdd1daddd059c"; }
-    { locale = "fi"; arch = "linux-x86_64"; sha1 = "3c5eb0bb4dec968678c812eda5d723b50ca2f150"; }
-    { locale = "fr"; arch = "linux-i686"; sha1 = "c71f67ab5942cb49add9a044d6eeb69523f416c9"; }
-    { locale = "fr"; arch = "linux-x86_64"; sha1 = "60c5a7037de5439ffebc39980c87e5e1065e2d8c"; }
-    { locale = "fy-NL"; arch = "linux-i686"; sha1 = "09d4f2786ede2aff43250d4ed8f151f73c1cb983"; }
-    { locale = "fy-NL"; arch = "linux-x86_64"; sha1 = "839bea8234ccc71f9402487f022a3fcee13da341"; }
-    { locale = "ga-IE"; arch = "linux-i686"; sha1 = "07635c04802c1023a9c6ec6d66c2d9ed9c210800"; }
-    { locale = "ga-IE"; arch = "linux-x86_64"; sha1 = "ff584fe726ca1be184c453d2eec250577d7747b4"; }
-    { locale = "gd"; arch = "linux-i686"; sha1 = "3cbb34e8eba1ad0db2f25b51390b6b66efbdbd6b"; }
-    { locale = "gd"; arch = "linux-x86_64"; sha1 = "78703fbf8e9c7cf4db1522baaea837450972f568"; }
-    { locale = "gl"; arch = "linux-i686"; sha1 = "1aab34a16224d84c958aa65f4a0e8100a96003f4"; }
-    { locale = "gl"; arch = "linux-x86_64"; sha1 = "a8beb35a764b040a1d495e8e34623a884c1911c8"; }
-    { locale = "he"; arch = "linux-i686"; sha1 = "73fe49520af05bb79e20c202836fce347466c957"; }
-    { locale = "he"; arch = "linux-x86_64"; sha1 = "1780d0a0f342fc6c64e9365a548c13770f9d02f3"; }
-    { locale = "hr"; arch = "linux-i686"; sha1 = "f2c570b88fe3368fa30a53f42357a02b610acb36"; }
-    { locale = "hr"; arch = "linux-x86_64"; sha1 = "b3bb417879fd039222062f2df8f64811c1472cd6"; }
-    { locale = "hu"; arch = "linux-i686"; sha1 = "3369f82671a7e56ca24161ac2a1dd7cd0ae9ba85"; }
-    { locale = "hu"; arch = "linux-x86_64"; sha1 = "996b00fb13c2cfd826597eb817bdf8098b523f1b"; }
-    { locale = "hy-AM"; arch = "linux-i686"; sha1 = "c805817f9463d74bb73cad273d91c15d04ef1786"; }
-    { locale = "hy-AM"; arch = "linux-x86_64"; sha1 = "20abe54c61fa4760a507da630c1b919cfe36cf6a"; }
-    { locale = "id"; arch = "linux-i686"; sha1 = "76e1659be7d8fbfcd2a6b0bcefdc3988d59e81fa"; }
-    { locale = "id"; arch = "linux-x86_64"; sha1 = "cff15be3455dcf7ed714e8e69d34dc2ad016b60f"; }
-    { locale = "is"; arch = "linux-i686"; sha1 = "be8238cddd980bbd7de2a21541b260fd6689a8d7"; }
-    { locale = "is"; arch = "linux-x86_64"; sha1 = "1fcabd1b1b43ac25f7f5d2eca896ba7d5ea82102"; }
-    { locale = "it"; arch = "linux-i686"; sha1 = "df18fd291ffbb80323dfd823aa04692bcf6f251f"; }
-    { locale = "it"; arch = "linux-x86_64"; sha1 = "196fae349e7b06029e9738a12fb78f24ca691598"; }
-    { locale = "ja"; arch = "linux-i686"; sha1 = "a888ba62981b73d96ba39892a3372b36f0ffb2b3"; }
-    { locale = "ja"; arch = "linux-x86_64"; sha1 = "00e2be4b037a37429ee708d49c82af5ffafe8ca1"; }
-    { locale = "ko"; arch = "linux-i686"; sha1 = "634ea25e7246ff1c23a0d57bdf928372ca867cd6"; }
-    { locale = "ko"; arch = "linux-x86_64"; sha1 = "cfa4acb0970ab87f44e3bbfe46717d1664c63e99"; }
-    { locale = "lt"; arch = "linux-i686"; sha1 = "50d2764febdfb206c704cc0eb14e0679e42dffc3"; }
-    { locale = "lt"; arch = "linux-x86_64"; sha1 = "1a975a34ddcb0637957def46bd6cc3785a9630df"; }
-    { locale = "nb-NO"; arch = "linux-i686"; sha1 = "c0cf3563e2322724447d1c6730a7d4674c9bad7a"; }
-    { locale = "nb-NO"; arch = "linux-x86_64"; sha1 = "0c7267858bf95345dc09f9b03b56283e3198f8a4"; }
-    { locale = "nl"; arch = "linux-i686"; sha1 = "8c8db046ca1f21c11d00914613010836e0c5aefc"; }
-    { locale = "nl"; arch = "linux-x86_64"; sha1 = "acd50182d4e1f255ef70bf3d7dfc9ef963535def"; }
-    { locale = "nn-NO"; arch = "linux-i686"; sha1 = "ca1728b39e052bd9975d2b2ec8cffa6290098316"; }
-    { locale = "nn-NO"; arch = "linux-x86_64"; sha1 = "05a3bed8b8c0ccea66ceef02184f4ecd95e141f8"; }
-    { locale = "pa-IN"; arch = "linux-i686"; sha1 = "e0aa8fca5e1df6adf5b5bf41d9c8f2a195e5b598"; }
-    { locale = "pa-IN"; arch = "linux-x86_64"; sha1 = "fd4f63140ffc56095c7b66a3ff560409a43ad018"; }
-    { locale = "pl"; arch = "linux-i686"; sha1 = "9dc57337681fd57c5eb51240463e25543385d23d"; }
-    { locale = "pl"; arch = "linux-x86_64"; sha1 = "2c27721db5b96a8d488ce7a74e3ebf350f71f76a"; }
-    { locale = "pt-BR"; arch = "linux-i686"; sha1 = "c4d3e3f02375533bfb734155327832b4bcddbbe5"; }
-    { locale = "pt-BR"; arch = "linux-x86_64"; sha1 = "81d1cfacaf3f6a2830af0fceda7ac463867afa90"; }
-    { locale = "pt-PT"; arch = "linux-i686"; sha1 = "f59639147c77344d7fbe49c8c3320ec382ce261c"; }
-    { locale = "pt-PT"; arch = "linux-x86_64"; sha1 = "76d04ef5ac5ce644c04621adcc08059f4d509cdd"; }
-    { locale = "rm"; arch = "linux-i686"; sha1 = "a9d4485e9740572e1c5b8579a171c381797c3f97"; }
-    { locale = "rm"; arch = "linux-x86_64"; sha1 = "9d699390b577ec97842e75118ee6f0579c386fe0"; }
-    { locale = "ro"; arch = "linux-i686"; sha1 = "e03991f23cd9da6e5f14e37a4f84faee64f529b1"; }
-    { locale = "ro"; arch = "linux-x86_64"; sha1 = "7137b302ed8c1079ed8f7efa2eaaeaeeb900cc28"; }
-    { locale = "ru"; arch = "linux-i686"; sha1 = "7cc98ffeebf3f450c5f29b177eca3e127184c89d"; }
-    { locale = "ru"; arch = "linux-x86_64"; sha1 = "c087c970e9456d60265f7f9f6be83100b3990ef9"; }
-    { locale = "si"; arch = "linux-i686"; sha1 = "4197c63d5669be0cd6856d17883f5dbb9690438f"; }
-    { locale = "si"; arch = "linux-x86_64"; sha1 = "753e858aba8212d86ce9a6855dfaa2223d2ce3bd"; }
-    { locale = "sk"; arch = "linux-i686"; sha1 = "64ca38cce9a99b7cf281faf0c53e5b646cb8e7f7"; }
-    { locale = "sk"; arch = "linux-x86_64"; sha1 = "78e10824e31d2aee74d852d7b657dd3239cfbaa2"; }
-    { locale = "sl"; arch = "linux-i686"; sha1 = "6d38031ef73b82a11193fe2333ba7bfc31e0da49"; }
-    { locale = "sl"; arch = "linux-x86_64"; sha1 = "c1ba73354f662da9f541978b5611acc41ee60356"; }
-    { locale = "sq"; arch = "linux-i686"; sha1 = "3bc7482b81a754abc01e4c1face0aa4e65aa3ea6"; }
-    { locale = "sq"; arch = "linux-x86_64"; sha1 = "2463ac4d17d95c41e5bfebf31c3127e3404caa02"; }
-    { locale = "sr"; arch = "linux-i686"; sha1 = "28f762f06a526f93b9a3ff3bd5a52a1bd4c6b314"; }
-    { locale = "sr"; arch = "linux-x86_64"; sha1 = "69bbca2b8cea57a76cb3791029f0d55da8383594"; }
-    { locale = "sv-SE"; arch = "linux-i686"; sha1 = "ddbfd64533c198deeb3e56cb137af3707cc22912"; }
-    { locale = "sv-SE"; arch = "linux-x86_64"; sha1 = "992b3a896d619393a829b0b404f6c69bc6d11263"; }
-    { locale = "ta-LK"; arch = "linux-i686"; sha1 = "dcc7382a20d316eabd500c9d7cfaa84b9e406d43"; }
-    { locale = "ta-LK"; arch = "linux-x86_64"; sha1 = "4202e74f6cb4e7bb22ae08a5e28d02cac8dd4861"; }
-    { locale = "tr"; arch = "linux-i686"; sha1 = "1cb9db5a71df0990758a93728d1cccc229797aaa"; }
-    { locale = "tr"; arch = "linux-x86_64"; sha1 = "8406829869881ed3228f44531c32106f51ef8671"; }
-    { locale = "uk"; arch = "linux-i686"; sha1 = "e9d259c9872336d96e854208d08d0d09aeb98f47"; }
-    { locale = "uk"; arch = "linux-x86_64"; sha1 = "3a65b5a21c2310dcb243abbf1cfdc7ec097a6018"; }
-    { locale = "vi"; arch = "linux-i686"; sha1 = "60070b3d0488aa80aa331cfb0ea1f37301d074d4"; }
-    { locale = "vi"; arch = "linux-x86_64"; sha1 = "ffe662b33db700fe795972a08320370592de365b"; }
-    { locale = "zh-CN"; arch = "linux-i686"; sha1 = "9722b296495a4ac01bb80952df97a1f1a92eed27"; }
-    { locale = "zh-CN"; arch = "linux-x86_64"; sha1 = "014e0cd18afceeb662d7c2e9f4541e7a4ef0260a"; }
-    { locale = "zh-TW"; arch = "linux-i686"; sha1 = "f5174db5a7852d27bdfcca4b57fdf5ffd5294680"; }
-    { locale = "zh-TW"; arch = "linux-x86_64"; sha1 = "0014eea1f648f9ddcf977f56f7a82044b41c136e"; }
+    { locale = "ar"; arch = "linux-i686"; sha1 = "5e6592c5f0569fb56613ed34db895a2fa6c77f66"; }
+    { locale = "ar"; arch = "linux-x86_64"; sha1 = "7f270aebf5de8c2f4a988d87b37cbdf12542a86a"; }
+    { locale = "ast"; arch = "linux-i686"; sha1 = "611bbfb96b6f2b39c9a7b83311ba7f96e0294501"; }
+    { locale = "ast"; arch = "linux-x86_64"; sha1 = "5b8dbb29e1dfce40d0414b75a2e889e40ba62b1b"; }
+    { locale = "be"; arch = "linux-i686"; sha1 = "8aef167276d82e3243912f1773ce42bc5831d6a8"; }
+    { locale = "be"; arch = "linux-x86_64"; sha1 = "81448779fcdcace457e7b3e37262345df9b100ec"; }
+    { locale = "bg"; arch = "linux-i686"; sha1 = "4f82e7bfd24086e98721c6283156781a0a65e23f"; }
+    { locale = "bg"; arch = "linux-x86_64"; sha1 = "c3ddd6613f7591ff7d4aad1e39358f7107e56b5d"; }
+    { locale = "bn-BD"; arch = "linux-i686"; sha1 = "68340eea06073ddf2c64f2808d5136295962ebb5"; }
+    { locale = "bn-BD"; arch = "linux-x86_64"; sha1 = "c080fda6eb86414e3157a54befcd9bf7e5a87148"; }
+    { locale = "br"; arch = "linux-i686"; sha1 = "087a853427912f6aef3802851cf61d8c36aaad93"; }
+    { locale = "br"; arch = "linux-x86_64"; sha1 = "b574ee98d1771d4a4be77a5e1f7573d03329d497"; }
+    { locale = "ca"; arch = "linux-i686"; sha1 = "4e56ed5b93e8aede015b4ba3b86d0121f5225e21"; }
+    { locale = "ca"; arch = "linux-x86_64"; sha1 = "8ca5266e9ad8c1f24a9426cd41b4f9af764308b1"; }
+    { locale = "cs"; arch = "linux-i686"; sha1 = "3e612559375de82f227fbdfad847bef58392ed64"; }
+    { locale = "cs"; arch = "linux-x86_64"; sha1 = "3aeb7ca07b82258353b1085705e6f0f18c3a3813"; }
+    { locale = "da"; arch = "linux-i686"; sha1 = "7d09b5f73738ea9ea16c515434299df8654bbc1e"; }
+    { locale = "da"; arch = "linux-x86_64"; sha1 = "3c7b5dafca343afa0be3d107078c42d525149ab7"; }
+    { locale = "de"; arch = "linux-i686"; sha1 = "5273088e2ad5278fbec29a3d80ff81123807bdb1"; }
+    { locale = "de"; arch = "linux-x86_64"; sha1 = "d18893827828640ff83df8b3d340ed96312d4bfb"; }
+    { locale = "el"; arch = "linux-i686"; sha1 = "dc0f3ecb015568805634ee78f5ec314d2502ae63"; }
+    { locale = "el"; arch = "linux-x86_64"; sha1 = "ca7c336b9902c7f109c58e20d944c019cc3003dd"; }
+    { locale = "en-GB"; arch = "linux-i686"; sha1 = "a7164e94562e7c711e0a8ca98cb9994c75aa4538"; }
+    { locale = "en-GB"; arch = "linux-x86_64"; sha1 = "f53acad0af7a080e310b7a875b6cb6776d691fcd"; }
+    { locale = "en-US"; arch = "linux-i686"; sha1 = "7c31b23b0dfe89c17c0eef61cc605f2ea6a5fca3"; }
+    { locale = "en-US"; arch = "linux-x86_64"; sha1 = "f837d7d1916d687e4482abb87b74de90c4131b4d"; }
+    { locale = "es-AR"; arch = "linux-i686"; sha1 = "80d6ad181ba25b3b65eb9fd990f03a1aadd68a7b"; }
+    { locale = "es-AR"; arch = "linux-x86_64"; sha1 = "f40f6514a2357aecabdc34708bbc819fb6546a70"; }
+    { locale = "es-ES"; arch = "linux-i686"; sha1 = "7c0d9500321fe5c854ba7f1f11cd1cfcec895919"; }
+    { locale = "es-ES"; arch = "linux-x86_64"; sha1 = "afa2780e35a8fb95b26f43595c2e7729e7d37360"; }
+    { locale = "et"; arch = "linux-i686"; sha1 = "711bf1da10758f784e5c31b3673eb612604775b9"; }
+    { locale = "et"; arch = "linux-x86_64"; sha1 = "02ee282d0b54ad6490e742f7a3b29763bf1d0545"; }
+    { locale = "eu"; arch = "linux-i686"; sha1 = "940125468f0129138e20a048fe09d3d489bab478"; }
+    { locale = "eu"; arch = "linux-x86_64"; sha1 = "357a64c3b49e3d058ed715de24296fa6533dbe59"; }
+    { locale = "fi"; arch = "linux-i686"; sha1 = "abe4633376f244efffbd3faa7be4381a5dce0dcc"; }
+    { locale = "fi"; arch = "linux-x86_64"; sha1 = "f401ae0b0e51603249f6a7b925166bf287023dc7"; }
+    { locale = "fr"; arch = "linux-i686"; sha1 = "f563e7f6638da931c3e8b3b8055d8ea1923af204"; }
+    { locale = "fr"; arch = "linux-x86_64"; sha1 = "5ebfc7889ad5fa147c50e70a66b42238dc289ffd"; }
+    { locale = "fy-NL"; arch = "linux-i686"; sha1 = "a7c6c74459ac9ecae0b325765ae9fb3e2adab1c5"; }
+    { locale = "fy-NL"; arch = "linux-x86_64"; sha1 = "923de165c7eb693316d4a81ad13e32636c1de990"; }
+    { locale = "ga-IE"; arch = "linux-i686"; sha1 = "6685e21a2b20ebb35da479604dfbf719b0822c3e"; }
+    { locale = "ga-IE"; arch = "linux-x86_64"; sha1 = "35d4f00f26c3bc18c7a6ebcc6d6d2ccd0a4499d4"; }
+    { locale = "gd"; arch = "linux-i686"; sha1 = "7ad9d25363f3b98085758fb2815d4fbf0b898b28"; }
+    { locale = "gd"; arch = "linux-x86_64"; sha1 = "ddb0b68b311e51f602248924b4b49481a64ac175"; }
+    { locale = "gl"; arch = "linux-i686"; sha1 = "216df56d5dde4f27d0f14cfaafd7af08a2732bf2"; }
+    { locale = "gl"; arch = "linux-x86_64"; sha1 = "4c30c0ba4bbe22522565679b49b06d62673fbd74"; }
+    { locale = "he"; arch = "linux-i686"; sha1 = "7f67f2fe2166d207f7fa39feb85faae4595cbdbc"; }
+    { locale = "he"; arch = "linux-x86_64"; sha1 = "f5949cb31f01b11cb6a43a045798da64abea52af"; }
+    { locale = "hr"; arch = "linux-i686"; sha1 = "c6d784d2cd3f3baf6737dfd2d28c03f9b1c37623"; }
+    { locale = "hr"; arch = "linux-x86_64"; sha1 = "b5598bc5a19b45ee17cfd259f7da581735f90430"; }
+    { locale = "hu"; arch = "linux-i686"; sha1 = "21699446dbcc9e0fb53e06dafec8efdbf6ab484b"; }
+    { locale = "hu"; arch = "linux-x86_64"; sha1 = "e64a219956f4aa017ee742cc1768567052593282"; }
+    { locale = "hy-AM"; arch = "linux-i686"; sha1 = "a60b5d60e8436355ee24029a4398168108ce8aea"; }
+    { locale = "hy-AM"; arch = "linux-x86_64"; sha1 = "583af341312ea29b50a7eaa86d2c9758ce2f5735"; }
+    { locale = "id"; arch = "linux-i686"; sha1 = "2471ebfc64a84e8711d7bc26783a16d6300ada07"; }
+    { locale = "id"; arch = "linux-x86_64"; sha1 = "d67b28477e36501a03ce8fd79a23090d068a696e"; }
+    { locale = "is"; arch = "linux-i686"; sha1 = "f53018a38f84c7e4fc8d5a3ee952478d4a1c9ebe"; }
+    { locale = "is"; arch = "linux-x86_64"; sha1 = "f886bcdb98af1c217a837c10a5e0737cbd357ef0"; }
+    { locale = "it"; arch = "linux-i686"; sha1 = "000d8e56b62768aee6dba9cb14b733f78908e751"; }
+    { locale = "it"; arch = "linux-x86_64"; sha1 = "27ffbd773f977b67903a62b9131b1dcda27dd7f2"; }
+    { locale = "ja"; arch = "linux-i686"; sha1 = "cd743c00682001094d3a7decd8396b6ce9b1e67e"; }
+    { locale = "ja"; arch = "linux-x86_64"; sha1 = "64b8ba26bb1f85788321bd2ba38b4813859ebede"; }
+    { locale = "ko"; arch = "linux-i686"; sha1 = "445731309b578c262547f22364dfe1fd0eaf68d5"; }
+    { locale = "ko"; arch = "linux-x86_64"; sha1 = "9bc2efd19b17c0e09b55e6ae310e59147212d726"; }
+    { locale = "lt"; arch = "linux-i686"; sha1 = "35a275d39c2a780b86749891c14ee77ca36f03bf"; }
+    { locale = "lt"; arch = "linux-x86_64"; sha1 = "c70f2f57e1fd8c40da949a18314c30380728f7bd"; }
+    { locale = "nb-NO"; arch = "linux-i686"; sha1 = "c94ace97f23a6fce1e736bb334ddf6af3d5a0ff4"; }
+    { locale = "nb-NO"; arch = "linux-x86_64"; sha1 = "b00717ab99a47ef3477fecb79d55dc5817c60c1e"; }
+    { locale = "nl"; arch = "linux-i686"; sha1 = "a5864e976675278cb9fb7e65c1edb88f704557f1"; }
+    { locale = "nl"; arch = "linux-x86_64"; sha1 = "dba80bc2bc1ec67ba932525d05253803292bc9d8"; }
+    { locale = "nn-NO"; arch = "linux-i686"; sha1 = "161e1361b1ecc5f1ee31227b7e65705ab5355432"; }
+    { locale = "nn-NO"; arch = "linux-x86_64"; sha1 = "8051e55e5f7fbc42c7d75b5ad28834d11b699833"; }
+    { locale = "pa-IN"; arch = "linux-i686"; sha1 = "91c8812e39baaa1974d4d1c316c7c08022f3408f"; }
+    { locale = "pa-IN"; arch = "linux-x86_64"; sha1 = "948a679c843cee3f8da80f0a45b5416c7cc3b37c"; }
+    { locale = "pl"; arch = "linux-i686"; sha1 = "43005f6337f33171f745f2e493d8cf2a8371d143"; }
+    { locale = "pl"; arch = "linux-x86_64"; sha1 = "78fea3bc7e24eb96aefb2e52b01657437fc9dfd6"; }
+    { locale = "pt-BR"; arch = "linux-i686"; sha1 = "0a5b4e14446c0f8f44004178f873bb289176e1b6"; }
+    { locale = "pt-BR"; arch = "linux-x86_64"; sha1 = "727d4a82754118749ea48e4b7ab6d182570957ad"; }
+    { locale = "pt-PT"; arch = "linux-i686"; sha1 = "8b4418f18b3569991ff2aca4528e70dd49247d81"; }
+    { locale = "pt-PT"; arch = "linux-x86_64"; sha1 = "0ffbee08f3e43fde37913679037d59b68a47d49b"; }
+    { locale = "rm"; arch = "linux-i686"; sha1 = "79606026969e837b4b9a1be73b71b0b183757504"; }
+    { locale = "rm"; arch = "linux-x86_64"; sha1 = "0680dfa0417688e2ad6307b10f90c766db139789"; }
+    { locale = "ro"; arch = "linux-i686"; sha1 = "d06f4e7f748ffa8202bfc1dc0c4bc94894feb223"; }
+    { locale = "ro"; arch = "linux-x86_64"; sha1 = "a998af6413eec1123c9e4698ce217dc856c2bb4e"; }
+    { locale = "ru"; arch = "linux-i686"; sha1 = "062a1ba9c8a5c06972895ebb11e12d90a50c450d"; }
+    { locale = "ru"; arch = "linux-x86_64"; sha1 = "fd149bdbdc4a697cfab1d04b818b09718a3b945c"; }
+    { locale = "si"; arch = "linux-i686"; sha1 = "50105a554db09e57ad99aee5c3b9c9f35eef3431"; }
+    { locale = "si"; arch = "linux-x86_64"; sha1 = "ed360ef7cbf2ecc70b08922c27cdf3525c392137"; }
+    { locale = "sk"; arch = "linux-i686"; sha1 = "34dee72d71916209a3cad28e6adfa1b3270567c6"; }
+    { locale = "sk"; arch = "linux-x86_64"; sha1 = "cfe76d345c17ab8711a723779d263c3baa0016ff"; }
+    { locale = "sl"; arch = "linux-i686"; sha1 = "391a923ff56ba6adf15817b12eec4555ede578fe"; }
+    { locale = "sl"; arch = "linux-x86_64"; sha1 = "b6c3ad0b50610fd2470a2366c58a2e4947a96698"; }
+    { locale = "sq"; arch = "linux-i686"; sha1 = "f422d3adca0f15b70d53c9c9b9bae09d651ef535"; }
+    { locale = "sq"; arch = "linux-x86_64"; sha1 = "d3c8c82a0531a20480ac93dc6e0c981068a327fc"; }
+    { locale = "sr"; arch = "linux-i686"; sha1 = "9d7ab49903107da8cd9859d09ae62dea661130a9"; }
+    { locale = "sr"; arch = "linux-x86_64"; sha1 = "24f770326910db0ebd3d521b7573f57c4db2afdd"; }
+    { locale = "sv-SE"; arch = "linux-i686"; sha1 = "b93a538462e364202cf0a7ef9867f3bcaad5256d"; }
+    { locale = "sv-SE"; arch = "linux-x86_64"; sha1 = "b2c6c917b6575002f2f9f548ba1ae0aa3bd7a064"; }
+    { locale = "ta-LK"; arch = "linux-i686"; sha1 = "e0d34774514f264bb02a2c5db76270bc228e80a8"; }
+    { locale = "ta-LK"; arch = "linux-x86_64"; sha1 = "8119ba8f521da39af4d729fe52841c76e6a9c6f1"; }
+    { locale = "tr"; arch = "linux-i686"; sha1 = "76b9c748286ac40cb77b2dfe98e44b1ebadc6d9b"; }
+    { locale = "tr"; arch = "linux-x86_64"; sha1 = "779ed971dac93d55e45a63e0ff4d3f6118317116"; }
+    { locale = "uk"; arch = "linux-i686"; sha1 = "784a6432f04dc12f6abb405e4375540bb3c1bfac"; }
+    { locale = "uk"; arch = "linux-x86_64"; sha1 = "d6ec1ca2015c723d05e4f7a6e6006cb0f5f45667"; }
+    { locale = "vi"; arch = "linux-i686"; sha1 = "e494cb50a3c99b4e96794544b1a7948663d0ae28"; }
+    { locale = "vi"; arch = "linux-x86_64"; sha1 = "e9a8d6fb2b9328f7ea80c0d7be9943daaf37e71d"; }
+    { locale = "zh-CN"; arch = "linux-i686"; sha1 = "14624e631eb3bdfb9cde339dbf132e048f68f1c3"; }
+    { locale = "zh-CN"; arch = "linux-x86_64"; sha1 = "1197fa99680d978b10c41ccac7183117c264f375"; }
+    { locale = "zh-TW"; arch = "linux-i686"; sha1 = "78c73c73363b41b3ae36cea01cc64bc715602278"; }
+    { locale = "zh-TW"; arch = "linux-x86_64"; sha1 = "76faeef7919eb2fb594773502ee5202ed11b67e4"; }
   ];
 }
diff --git a/pkgs/applications/networking/sync/backintime/common.nix b/pkgs/applications/networking/sync/backintime/common.nix
index fa722747e5fb..e77fc5a522a4 100644
--- a/pkgs/applications/networking/sync/backintime/common.nix
+++ b/pkgs/applications/networking/sync/backintime/common.nix
@@ -1,20 +1,16 @@
-{stdenv, fetchurl, makeWrapper, gettext, python2, python2Packages }:
+{stdenv, fetchurl, makeWrapper, gettext, python3, python3Packages, rsync, cron, openssh, sshfsFuse, encfs }:
 
 stdenv.mkDerivation rec {
-  version = "1.0.36";
+  version = "1.1.0";
 
   name = "backintime-common-${version}";
 
   src = fetchurl {
-    url = "https://launchpad.net/backintime/1.0/${version}/+download/backintime-${version}.tar.gz";
-    md5 = "28630bc7bd5f663ba8fcfb9ca6a742d8";
+    url = "https://launchpad.net/backintime/1.1/${version}/+download/backintime-${version}.tar.gz";
+    md5 = "21e15538c38d0c440c1281457319c7f1";
   };
 
-  # because upstream tarball has no top-level directory.
-  # https://bugs.launchpad.net/backintime/+bug/1359076
-  sourceRoot = ".";
-
-  buildInputs = [ makeWrapper gettext python2 python2Packages.dbus ];
+  buildInputs = [ makeWrapper gettext python3 python3Packages.dbus python3Packages.keyring openssh cron rsync sshfsFuse encfs ];
 
   installFlags = [ "DEST=$(out)" ];
 
@@ -43,4 +39,4 @@ stdenv.mkDerivation rec {
       done by taking snapshots of a specified set of directories.
     '';
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/applications/networking/sync/backintime/gnome.nix b/pkgs/applications/networking/sync/backintime/gnome.nix
deleted file mode 100644
index 56d0f6c5481b..000000000000
--- a/pkgs/applications/networking/sync/backintime/gnome.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{stdenv, fetchurl, makeWrapper, gettext, python2, python2Packages, gnome2, pkgconfig, pygobject, glib, libtool, backintime-common }:
-
-stdenv.mkDerivation rec {
-  inherit (backintime-common) version src sourceRoot installFlags meta;
-
-  name = "backintime-gnome-${version}";
-
-  buildInputs = [ makeWrapper gettext python2 python2Packages.dbus backintime-common python2Packages.pygtk python2Packages.notify gnome2.gnome_python ];
-
-  preConfigure = "cd gnome";
-  configureFlags = [ "--no-check" ];
-
-  preFixup =
-      ''
-      # Make sure all Python files refer to $prefix/share/backintime
-      # instead of config.get_app_path() which returns the path of the
-      # 'common' module, not the path of the 'gnome' module.
-      filelist=$(mktemp)
-      find "$out/share/backintime/gnome" -name "*.py" -print0 > $filelist
-      while IFS="" read -r -d "" file <&9; do
-      substituteInPlace "$file" \
-         --replace "glade_file = os.path.join(config.get_app_path()," \
-                   "glade_file = os.path.join('$prefix/share/backintime'," \
-         --replace "glade_file = os.path.join(self.config.get_app_path()," \
-                   "glade_file = os.path.join('$prefix/share/backintime',"
-      done 9< "$filelist"
-      rm "$filelist"
-
-      substituteInPlace "$out/bin/backintime-gnome" \
-        --replace "=\"/usr/share" "=\"$prefix/share"
-
-      wrapProgram "$out/bin/backintime-gnome" \
-        --prefix PYTHONPATH : "${gnome2.gnome_python}/lib/python2.7/site-packages/gtk-2.0:${backintime-common}/share/backintime/common:$PYTHONPATH" \
-        --prefix PATH : "${backintime-common}/bin:$PATH"
-    '';
-
-}
diff --git a/pkgs/applications/networking/sync/backintime/qt4.nix b/pkgs/applications/networking/sync/backintime/qt4.nix
new file mode 100644
index 000000000000..67d521d272a9
--- /dev/null
+++ b/pkgs/applications/networking/sync/backintime/qt4.nix
@@ -0,0 +1,25 @@
+{stdenv, fetchurl, makeWrapper, gettext, pkgconfig, libtool, backintime-common, python3, python3Packages }:
+
+stdenv.mkDerivation rec {
+  inherit (backintime-common) version src installFlags meta;
+
+  name = "backintime-gnome-${version}";
+
+  buildInputs = [ makeWrapper gettext python3 python3Packages.pyqt4 backintime-common python3 ];
+
+  preConfigure = "cd qt4";
+  configureFlags = [  ];
+
+  dontAddPrefix = true;
+  
+  preFixup =
+      ''
+      substituteInPlace "$out/bin/backintime-qt4" \
+        --replace "=\"/usr/share" "=\"$prefix/share"
+
+      wrapProgram "$out/bin/backintime-qt4" \
+        --prefix PYTHONPATH : "${backintime-common}/share/backintime/common:$PYTHONPATH" \
+        --prefix PATH : "${backintime-common}/bin:$PATH"
+    '';
+
+}
diff --git a/pkgs/applications/networking/znc/modules.nix b/pkgs/applications/networking/znc/modules.nix
index 478900bae4c9..9836d1fbb3b3 100644
--- a/pkgs/applications/networking/znc/modules.nix
+++ b/pkgs/applications/networking/znc/modules.nix
@@ -53,4 +53,21 @@ in rec {
     };
   };
 
+  privmsg = zncDerivation rec {
+    name        = "znc-privmsg-c9f98690be";
+    module_name = "privmsg";
+
+    src = fetchgit {
+      url    = meta.repositories.git;
+      rev    = "c9f98690beb4e3a7681468d5421ff11dc8e1ee8b";
+      sha256 = "dfeb28878b12b98141ab204191288cb4c3f7df153a01391ebf6ed6a32007247f";
+    };
+
+    meta = {
+      description = "ZNC privmsg module";
+      homepage = https://github.com/kylef/znc-contrib;
+      repositories.git = https://github.com/kylef/znc-contrib.git;
+    };
+  };
+
 }