From a8731f94f2ecb92f27978d7ab142c8c65e0fd285 Mon Sep 17 00:00:00 2001 From: Stefan Malzner Date: Wed, 18 Oct 2017 14:57:51 +0200 Subject: Update vars --- .travis.yml | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index b98db62a9..b0080a51a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,22 +13,29 @@ script: node_js: - '7' -os: osx +matrix: + include: + - os: linux + sudo: required + - os: osx + osx_image: xcode8.3 -osx_image: xcode8.3 +before_install: +- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then apt install libx11-dev libxext-dev libxss-dev + libxkbfile-dev; fi cache: yarn notifications: email: false slack: - secure: 0rWztugXppPLIqup6cJ0QplJqtZ4XYzN+qgdyY2ARyPbJkjihfp0qWOiEZfNWIuUCxX2bZXODaEb1Jod6mNfiCQdIs3pW8EUD/cVSDul8jBwXSTwTyAAz4pLejXu3ckHVIiXlAriLC6qqedh2Rl9oAH6JumRmuyb0UTAG0O3Btm3lGM3Cwo3JKt0Zpvly2nBlUI1waSiG11QSx5olq+EDiYvMCzW5mpulwRwnXaOdoIWGBFqnYTFoeS/rLi5IE56yvrYODJPl1e0VhW8Zn4WXiVG+qjlREkDFm4qg2u1SQhZQHRBgveRjSxSAblcG5h58NlkijMKBASWMpj2DjAfiDkGMYoRu1IVyHcFlAI8a+wcR6HlQzVsu4e6EFMyzx33vVVUWovwO+BcxVpME25BZn96eC8P6XE2ruOHahKstEt310dieZZRE/gteBokGh3utA2DV6002GSFYlwqqJ9q/5c5wyhD6cefxYSpzivOqCoiUAq3HW1Nahb4l+EVikTydFkLY0et3f/eV/kD/9yJfZJcttVSTL5Gv6gK4ROjPTJ/UPUkqsVBUdxVrnXiXL8SBESFsRHdHnSHMTkHh74dCrbyqot4pW38yLOmVATCEukm4Cd5N5wOUTGRA0nKon7/pCWoJg0wIH8N9FEtZbrNrD2FrkQbVgCJLXrC9jFpr34= + secure: YvaNZUBghprsoVNWkYdId/SLr/2CY44jIn2Yd9yCfPWsdX1mC/A3LM/ym+kOIxfUvnUmaYZEeyC22Z3fd8lBWkeXumT+zDfPOyj9IIMqevkXk0tc/c9ySfPvH3E9ZEoqKFhERHEigGuQ+/jDIGrL0uHoyyWG7gBhcGZzcZ2UBiB2DjPB3PTfbOlrH3xInYaUVndGpDq5AJNg8ZfW4r7JnYejyMGd4WbynpV6phYAYYVCZx0sHhfVEmcCGs1i+RL7kqPYN877QeCdLc2TEDnYLkdzejGAHY6nHrDOzXmUyKk/xWs/D9upmsh48hNGOdlARUPpif3HGaPls1KEscaIUsg9E3q4Nsw/Wa9V7X+dactoM/WwJttm4pCDpRmjkzM2Fipd8sZkslm9ou98iBLOW7t7VPYKy7MwlnSFiXSGE2du3kkLTvujBANWC7vP2haKIWpofLjALMpMTupNmVeR5VmESPpeZ10Yg0X9DkhYBJkcq0m16gO+nuxqIoGuaK3q6xSPP6pXCEEOLz4hotVpg3teUYL+rPnDEhvgwjHaBBRhhl5/vkTgJaqYuvmPIlaD6cOIqmToReaPYc54nEkygn02REQY1yeAoQSmkH6Ko6KFQum8hFBMt1R/qndksBcV+T9ZOKdSbOLoZ+ZZzUsS8SheVna5ITRcsWNIV0cbAk4= deploy: provider: s3 - access_key_id: AKIAI6ZWIP2OWZUCXIGA + access_key_id: AKIAIBXD77AXW62WB2NA secret_access_key: - secure: NSST9RjAG6v57MQgFKXckah7k2TMcbozpMN7IAdBmyIvwDlRN6ELAMCynknXDSLE6b6LKyhsQ/i6ykSuZxVoHzRyY9z28lJhLkGqCeABqSAhcwQ6gWxetFXGqIV7o/oxTVMS3cDrUdkfUPCQRUgMO1ew0oV7e4HfqIiDYQMMWJY/HGr/LUgNqolrSLGB2GI38/I1nrhPHm3gwa/xYgKUNsO6plPS/YzC6oF/edstM8oO51Lfpq6+XmDMTUl9qq8GkUaRE4BwdGPG97FOA6Y4ONCeJ3xURkElwcfWab7oW3Mox7hj0Z8vot10cieIWEQjpRP+zO5O2NwUzFRH25FuQf4bbvgH4iWXpLan+qnJ9Ow6cl0lg4+8ESemwDCnKtTGb3ujagTH0S4KqBlwJ6sXFb9U2Diut4cEIT4k3rainjk+8ugIssuJq2TWfB40X49ymPw5BPjJfq2T4fOjx8OKzrBHQ1X6KJd8RhfEoLD3V5eToO5/l13uYOBrjSfyo6afvvUIraVNijSlnqYxPmJYnrLWZUUsTiHZFwSF+x2ffcYKs/tep9zqkZpyV4GhH17HcfuQpx4FUIXqMFmGLRj2uN7FweSVdfbsODhgpIwlpV7gMKONeSmEiFcCMwcRik1UK9off7TE6ZJPzX21BJ8QGM5j7Ot2tif2eGvAv+hUaXc= + secure: TMb/wV1jj8/BeePShLimb9abrkgQAxYb/0KgWHmpTO6rZ2BYnXQovXDONK7mLDb7QOFo5ZPLjmsw+GQ5EsOqbTfNHa/+PYvwaEdNhWuhlKTmych15y1hHrVc1Eub6SejYBXIyEr6TEGDK5W6+VeRbIgiPF2gJrWBW6H6fMShfEPrJ9B25rFovND8v9LjGXp6roly726/U7d63+gDfOMIGhd/nXHqig5qZGEsOkgihmFqquFwyhj5LNHFMsX3QW8Q0fkXOScVtVFM/YSfMc1uVDP05FIfxXf393rbOJmUGzcWxNzl3XUTxMUPVYvBPKbeLVWkpjFsaBujOCDWmwmrBNwh2G8XlS8s3MGCU5mufj788NaN385HXU6xrIlKDuKkV5yilwtSaP9+IUQfzwAF4IX9W6B+pawujwnAPnOPJj4vdukoJLB2MJaNJw+EXG+8INUrcBL6TQvNZMREg3NcguJXy22RZPP3zIB2ZcyB3hoEiYIofBEFZL4e4TMTGvqG11zH2hVnz4i/DKBSpaQ6EZ3i2zhHZusrr6nIrIAzsXuL8mKV2XMHYbEuUbgd5/qiFOTV7b1dYCn1FCsmXbdjtdWizaB6PBnBDky2Z7qu/91YmPxd2rU/QsdMU/rJSKv69i85jlq5B1oqL6ieh8YWDvSQyRAcAuXVyhx19w1z5qc= bucket: franz-travis region: eu-central-1 local_dir: out @@ -40,6 +47,6 @@ deploy: env: global: - - secure: izVSi10ahT32qqS+Bl0NcKwX2BoCOIJWa2wX3itw9kJvIS4k34OhnzIDhLCa6MEjDdE9eg8jcA9qHmE05qbirLDec623K5Z73zJ+QyD0QTEs7WKNm9C+lc3THtu4NkvIMF4fVS+6uMBpclkuiG5SMOg2bhlSwtccvCrNP/+9pwUUX215S1M53OjGiQNkconWLDMceL9DHnBZT2Q4QHq55w8EKfNnxFHE996TVTLcoLBt8dUp6VCdcmzCGYiWpkD7q5rApX5iy5d9v2dETcvr329/Qgdi5jFj9g6Fvl9h+uE/BpUNnIyWst1r5S7sSTR6pFt5HzJv30T4bmFGz+z2+v/x4Sdrqez4Aa9onGjDNNau8pez1gtopf8vwpKNp8cnRTnRGdMMPRc+7lswfY8Cwa50NV/fxZqbzokBlmTr/t1d3vaxaeHM56c/9POKdwD/I8RYGONc2jDzAmeAJ1gi6Nt6PixTZhhIRc/221mJ3lTlewKPbRZF42/+L0zF/yNxYMQ25mUU+gTkeQ5+XDsZXAD0bOzMSnZ58cAj7qKftu4VrKpB+DmwWwKplLLwnKEzYqUiAnJt+S9yO8S+XFGdhDJqtbuOOlOeA7h/wYPKxanp2dzemU5WffeIrt7lDlFQra1cLUritOqk132daaWwpnDOccwGYTpwmazTvbjSDEU= - - secure: ZOcObe290rPRqlt8v+l7rWvVcKx+0AxVBHMwxu/S9V/PNV3U6yHUZUe6Ur5Y5MAW7WCFLCaKUa3kgyf0g2A1SnTdlwdQ+6t4Y7FyKjHx+AjR0E8WTTl782h0CVqPlGgjeJOpcy1p8yQAppugDvQ6Ov442Yf9f1QhXOWwCB/DTI7WzJPTqq35W5oFRZm5skhyrhZxFujX4OcC+pN7INwWF+u1mh7C0XbzmrlGvl0TK048u4IqFJkBeGOdrRzg0y6eV+tLDk6Ah+O1F5OeOFkHEQhwFpXjcNZ8zDjf3R2xS28+4oCLq2Iin/xKVUlDRg/qG5cXxKPvFteecnor6S65GU80ppYDSdhUhaJMdB1wZGuCogzKJ1s2DmmUv2TE633l+1NXebnQ/nfpVqNr54YqkxDyIA0WaDSAwo496xujdGZfja5Nxv2Ssm8WAfDAgajLYyhSpw7jaIIEw8Ov11XC+BnILU+4CQEKthSyBvEjVO8DtxOl9mOHYy+XTgi67nNi5xv3u1/kUOz1r3VHMyEAKJf1pBpFoOM5S9fpUWeS7rsXh+0mUsoKMDf38SLnQpFMvrygRY9gxAUrYfwupvKUug+p8HkTURo1W3k5oqwZIW12IAxbus7i6uTk4gdnx9fFF/Ljz4irkPPhhuVikT7zF1hvvHQjyhbwvIPQcHu+Ufg= - - secure: dNpyF1AwYIj08pUwT40oSWStGOq9L5pYCuNhQnqIpj6sKgOXg+tkLC2N6mtH93TjeF2OXnTcumjikgNrB+amZhecsiHW94WkRH/mstfuU33GlUX+cAvjt0XPxLtH7YaJTM7xQwQ0dSFS5I0ptSEC57cOoF0MoAWY8ZpDtBR8EDGTfvX+nbVA2un0swWOhfJBLKFe3hv4ODYMi3KelyGmSB0n8DSHpcRpDsFzUNvPuUdxbOebKi46S6SLNWXsl0m9ft3RZLF45HM3qmB+Su5PSgibL/h4fKNMIe2YUpfoXdPbVMh5mlTYoFoLB3Xdi//HabcKoNHLE4aJNkW6RXgy7ZAQJRuXiBPPFktqAgBGnkAFrrS3dtb6b4qfxqoPeXoGMi5ctAVEPBiMaqwZsAIyffokYZyRUX3Qy7dtXCXR1C92WxQc9/Vnv3IJkjpXC4tK68uzady4E+BozoWtGgcZE/w68U/melFeoyLvIPMO93KwciaTIsx5Ck9MGBC8QOEqpH0L2dKntsrihoKB4hCQhGJmx5y2ash0UUWMA2eS7L+Wfp0vU6RbIkgEqHTkb70VuP7pTNYWasBPx+/k1xAJqi6nsGmB2BjC03VQToWfHaLgOVs2tbeolvMKzAdItg668tDGIsXfbKjxwkbexuBkhNKNiUmYd3Ub5Ki4cwg2ObU= + - secure: BbImFf84jiAKMYhjwXKupKBjEvdftFcD1jnClY1IjY7l17Wk38XVwhLuI0dNSKC0cEC+acHqJEIyvr0qXcPDBnOhTyaDFtIeExQ9lCksxK/MHVFq6UGN5ogEggUZUkcf88Sk3CpaIiQCmPzifZmTbqEYxdcmeDhfthRvoSWYy/xV0hZyeIvXP4YNXdLrqh8bzBzv9FlDWtfV4UoHLPg69P2pWrR6WXvQiMpy1OKpJnShoaS5RjIGK/o4Qo+XswBPpUWxfH06yijCNeqljQvYJyRHnsbwUJY/+3EJwoxSGs2v6Ca5MPjLC4+GeLJOou6IbITA1yO4/tTVs5kr8dD31f75qYF4yAtLDjR6E+HRHguRHV6g3G8xNS9lv2MuV2lLtnSifHuMOtJWDXj2wFqlhUmMbBaA/Y3GHaIWji+ARZ1/b6c/vX2u3Pfw7rc4usOyQo2wwIeDfkz7fbed9QwanaMjNvrQN46/wF/IIpSAR99h5vtjU08yPqOiEbJAvrufjUykW6mAUiJCcBk2aKwbJl7f7kEIwhLVfnxy6ywPwvYQgelMpq0rmeWdN9KV9QFM8PQXOZ+um5eG56SJ4cENAqDiiEYwf4gAqiEXTPsqRUryj6LuiGs0NbYodP6Kk5shiw3BNsFpqtKxBlNZxrH3/cSCtYzemDdFCvKS/8rf+7w= + - secure: K9rF36hqDZMZw2cl7R7HqnurWX6YSgHtjK+u9rfaxzi2K87f30mSsYFWSh02X8WA9hZ1Ev5A1qOzMkCsKRCGirrJpAcgXTi0nMq/qJZiKHqmchoC0TrsBTIG35t3ldfhGgyEQeFp/xDV2GoiLsGPPTiK6or+9ydvwxr2YLHmjCyDoWKlPVzwebnqynALRF1keVPnLM6erH+UYRxbF9elCo+3Xif5wTZo3/maZ8RTNy+ofDPT2GhsFXkIwo0eaI2aWHxqyppt4tTzXbL7+kdhnXCkm6hzPlh7VKFBjLV5khkbDnotYLlQjwdzq1mG9cjWnUZbu3JoRf7uM36MJ/n3bcYc2+95+JFDw5sFFeCVlXyiJsMjP1c8k3PPEZ/qqamg9DBvpYg4F4FoHR929eeNSp3AdN8lK5OoEOFlcizsvQ0v/17laV1/kkbVpwy0PzStbDlbu3G4i4ru3z+RiFycar1pl0j6jJeCSWthENq+TwrwNstG7PQnEKmIq7WGQEai/AnIK7x1fEis1754KubR+QGgBxg6qnR9Wrb3Zxwvy1NhygC6P9qP/M5cYdc7L49t9es3xFTtdqle07xufPH/aQxl6MhKYKVY6nAlYTOxjqGTZErUXFA+rdRotHIzX8G8tWc4CwBYu2YvAc8ua02YbeXCuyOuPDVWwEQdzQu2VUc= + - secure: R5I0YyyLhvjNNZ3QbhSVntIyfs6tSWqSMKPX50aQX0pop5mhElZGiUgrjHmybNrEWhtPY74FdtVzY7SZBRJ0z9djwPmY1hxjHvl8JOdVtyvo2B4Mo6yiJ30UzjOVCDI+xx8iqv0XzyMHaWDX11L+YarufGXSsRXDvURzOQkeBQ6XPomHOXdTqwDBKrbQflk1xAG4nnfZl8hZ+wQVuZigrfHpmeJx25D2D8JxwcJam/VhmvG23IKOamgE4Roi0xvsewT19AFAj6/z94YgT24O7UMEYxfQ947FJZImENt4qBTIEHQybmL4uXMxohPhpMNVcJL9yIfjQJVIuIDVRd9cW4ESlxxXLHdK0ZMSnKb6jSIEvoT3jQDwl5LSqopRnryHsNLhe/sN9b6qbL4BqPM1L41PUe64Q4U8fZzu0ZfNge4urqewSr9IKZpOlPK3k1A9e8rp/2bSHmpIEC9nFu+BJVCIMNm3m6ur3Nf4UGBWNxHLeh9GG6xa1MnWpktUrRT2SlADMi3ffV0OlCINMRGyCE7g7itnGm4d2nOxuQtxC+CC1TDaS1sww/N5Xth5aoIzDsd9FI4dR4FtrbBtBOwKdr+Ag3LYYHLjqRItYiuWHFZ/eZ/CcBg2ial9Rj+JJuVLhf6fC/29x0cGTKz2Pb4hlGqs/bV0XegotQ7muBrICaI= -- cgit v1.2.3-54-g00ecf From 8225f135f70b4348c35e7cb2d6d9a71f8e90cdf6 Mon Sep 17 00:00:00 2001 From: Stefan Malzner Date: Wed, 18 Oct 2017 15:47:17 +0200 Subject: reset encrypted env vars --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index b0080a51a..417fbd249 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,7 +35,7 @@ deploy: provider: s3 access_key_id: AKIAIBXD77AXW62WB2NA secret_access_key: - secure: TMb/wV1jj8/BeePShLimb9abrkgQAxYb/0KgWHmpTO6rZ2BYnXQovXDONK7mLDb7QOFo5ZPLjmsw+GQ5EsOqbTfNHa/+PYvwaEdNhWuhlKTmych15y1hHrVc1Eub6SejYBXIyEr6TEGDK5W6+VeRbIgiPF2gJrWBW6H6fMShfEPrJ9B25rFovND8v9LjGXp6roly726/U7d63+gDfOMIGhd/nXHqig5qZGEsOkgihmFqquFwyhj5LNHFMsX3QW8Q0fkXOScVtVFM/YSfMc1uVDP05FIfxXf393rbOJmUGzcWxNzl3XUTxMUPVYvBPKbeLVWkpjFsaBujOCDWmwmrBNwh2G8XlS8s3MGCU5mufj788NaN385HXU6xrIlKDuKkV5yilwtSaP9+IUQfzwAF4IX9W6B+pawujwnAPnOPJj4vdukoJLB2MJaNJw+EXG+8INUrcBL6TQvNZMREg3NcguJXy22RZPP3zIB2ZcyB3hoEiYIofBEFZL4e4TMTGvqG11zH2hVnz4i/DKBSpaQ6EZ3i2zhHZusrr6nIrIAzsXuL8mKV2XMHYbEuUbgd5/qiFOTV7b1dYCn1FCsmXbdjtdWizaB6PBnBDky2Z7qu/91YmPxd2rU/QsdMU/rJSKv69i85jlq5B1oqL6ieh8YWDvSQyRAcAuXVyhx19w1z5qc= + secure: rOHS2plE+WXVJuTDt8sy8jTo877HRA7XbiNwFwfkhiZ5qYP90QFnbEkVOvsXrarDSAx9LrAPetcq4bitI+/8zlOfxA5++rw+dLpim3GJF9nhqlaFZtC0+LazbJt0Ra5oDymVT9KsdmGWpDIWwGdngZ5mgN0CZv2Xo9fKCk/Ro6qONIUo6rRUpE5hfQR2F218o8mcFcGsSh0da/keHI/ahCkvKwgSr9gZMsmreoT8OpYj5wAnPAgOiN5NnRNzROwgb6fDdLqtzArM7hvIyE56d303fpg78nyYfc+BKuXAU3yfP4KHL5RplZt7n9DqXbO0MAiJnGHGCPCLbGSF2vsqZ+axlcfzms9qYVZuub904NDkMyrB27J9EMZwvMJVo5QjoNAJ4spoZ2meu0gj9Ub5dSxPy+ihaD/VAP3Gf7m98WS16jlzq8VLSw2560NezCjirnEDKLDrBmrpa+k3go04ZFfcA9T7dGAFDADRwzue2t4IXXITIrAilh+jf6a7kATXPFc8Rl5gsjmO0ItgnObrVht0v33G9csknmnpFn/i3MVHmZtdesR97zfoQlM2Rc6qCrqNhB7oL4A38l1h11BXcGQI2q4UJwWJ+6PYlhJOUQSbONMZAv3reVTvnKLacavzTDVZKZyNNhq9NnbBFgLrKRm1BFpE5V9xzbaHm0m60dI= bucket: franz-travis region: eu-central-1 local_dir: out @@ -47,6 +47,6 @@ deploy: env: global: - - secure: BbImFf84jiAKMYhjwXKupKBjEvdftFcD1jnClY1IjY7l17Wk38XVwhLuI0dNSKC0cEC+acHqJEIyvr0qXcPDBnOhTyaDFtIeExQ9lCksxK/MHVFq6UGN5ogEggUZUkcf88Sk3CpaIiQCmPzifZmTbqEYxdcmeDhfthRvoSWYy/xV0hZyeIvXP4YNXdLrqh8bzBzv9FlDWtfV4UoHLPg69P2pWrR6WXvQiMpy1OKpJnShoaS5RjIGK/o4Qo+XswBPpUWxfH06yijCNeqljQvYJyRHnsbwUJY/+3EJwoxSGs2v6Ca5MPjLC4+GeLJOou6IbITA1yO4/tTVs5kr8dD31f75qYF4yAtLDjR6E+HRHguRHV6g3G8xNS9lv2MuV2lLtnSifHuMOtJWDXj2wFqlhUmMbBaA/Y3GHaIWji+ARZ1/b6c/vX2u3Pfw7rc4usOyQo2wwIeDfkz7fbed9QwanaMjNvrQN46/wF/IIpSAR99h5vtjU08yPqOiEbJAvrufjUykW6mAUiJCcBk2aKwbJl7f7kEIwhLVfnxy6ywPwvYQgelMpq0rmeWdN9KV9QFM8PQXOZ+um5eG56SJ4cENAqDiiEYwf4gAqiEXTPsqRUryj6LuiGs0NbYodP6Kk5shiw3BNsFpqtKxBlNZxrH3/cSCtYzemDdFCvKS/8rf+7w= - - secure: K9rF36hqDZMZw2cl7R7HqnurWX6YSgHtjK+u9rfaxzi2K87f30mSsYFWSh02X8WA9hZ1Ev5A1qOzMkCsKRCGirrJpAcgXTi0nMq/qJZiKHqmchoC0TrsBTIG35t3ldfhGgyEQeFp/xDV2GoiLsGPPTiK6or+9ydvwxr2YLHmjCyDoWKlPVzwebnqynALRF1keVPnLM6erH+UYRxbF9elCo+3Xif5wTZo3/maZ8RTNy+ofDPT2GhsFXkIwo0eaI2aWHxqyppt4tTzXbL7+kdhnXCkm6hzPlh7VKFBjLV5khkbDnotYLlQjwdzq1mG9cjWnUZbu3JoRf7uM36MJ/n3bcYc2+95+JFDw5sFFeCVlXyiJsMjP1c8k3PPEZ/qqamg9DBvpYg4F4FoHR929eeNSp3AdN8lK5OoEOFlcizsvQ0v/17laV1/kkbVpwy0PzStbDlbu3G4i4ru3z+RiFycar1pl0j6jJeCSWthENq+TwrwNstG7PQnEKmIq7WGQEai/AnIK7x1fEis1754KubR+QGgBxg6qnR9Wrb3Zxwvy1NhygC6P9qP/M5cYdc7L49t9es3xFTtdqle07xufPH/aQxl6MhKYKVY6nAlYTOxjqGTZErUXFA+rdRotHIzX8G8tWc4CwBYu2YvAc8ua02YbeXCuyOuPDVWwEQdzQu2VUc= - - secure: R5I0YyyLhvjNNZ3QbhSVntIyfs6tSWqSMKPX50aQX0pop5mhElZGiUgrjHmybNrEWhtPY74FdtVzY7SZBRJ0z9djwPmY1hxjHvl8JOdVtyvo2B4Mo6yiJ30UzjOVCDI+xx8iqv0XzyMHaWDX11L+YarufGXSsRXDvURzOQkeBQ6XPomHOXdTqwDBKrbQflk1xAG4nnfZl8hZ+wQVuZigrfHpmeJx25D2D8JxwcJam/VhmvG23IKOamgE4Roi0xvsewT19AFAj6/z94YgT24O7UMEYxfQ947FJZImENt4qBTIEHQybmL4uXMxohPhpMNVcJL9yIfjQJVIuIDVRd9cW4ESlxxXLHdK0ZMSnKb6jSIEvoT3jQDwl5LSqopRnryHsNLhe/sN9b6qbL4BqPM1L41PUe64Q4U8fZzu0ZfNge4urqewSr9IKZpOlPK3k1A9e8rp/2bSHmpIEC9nFu+BJVCIMNm3m6ur3Nf4UGBWNxHLeh9GG6xa1MnWpktUrRT2SlADMi3ffV0OlCINMRGyCE7g7itnGm4d2nOxuQtxC+CC1TDaS1sww/N5Xth5aoIzDsd9FI4dR4FtrbBtBOwKdr+Ag3LYYHLjqRItYiuWHFZ/eZ/CcBg2ial9Rj+JJuVLhf6fC/29x0cGTKz2Pb4hlGqs/bV0XegotQ7muBrICaI= + - secure: nt4TlEsaqvoiHutHRDnrdVtQYTrdMpXLYwOzU1CPECjwHexPwdhri5Pa2bkIgi6lXoT2BVhaHsCWQ+50wic9ISZ7+3wjkaY3bwGvabmIFMlHUrYMIbcRYwOWZlprYIPse9IhEwSMg8qUJgAQD4uADfv8dWI3WQC3gTUsA3kxWzKbq07AQhR2azanCVZ4nvYK1HJLXhxf4r0p6LRyC94joPx/6UKBCdiUZqTHBr+9dg7HJ0Bzk8/VWuYO0PTUXxbRq0IMCUBeEgmwdB1zxMt/acumpciFk2p6aEwwkFAJ4I1FCnWe9lUNYlFmJs2Cn+4wtGlooibxWukquQY8M9+1qZKjDp/H2tY77vgRKpJ/2s9nLigy2spGR92Qk0rmnI2LwWAwKrsqsbxYZU3P9h0JllfV1jkdHJu3Yztg+kv7Kg9FnN4giE/jhZRWj0poJB3bZGVgrw+jNXl5WT544992+tUuf3W378eaKiqrtN9z6EjsbmcmRzYDpE3kkgloRA/TsFTbHNdIkUGhVGGxYa2lgFeXv5XtKdQMZW0ALySIQgvm19E6Dxfigid3IkfsPT9jv0RYQ2BTYFWb4rTnpYrMJ7H3VjcTgOGd+vpLA+ql/rzlWE+EF1tLSNQIOa8BZ94ndJzKg9cyFyNRsL1hoNMjqjKT1S48jCaXymZyNE/V/5Q= + - secure: Yhb98CKzC81ePmFt4FH3/7ea/SXzN8M1qh5wSFy0gAsAc1r2RJHGsJdDZhlAIVxjn9CGBqkUoe2usHeQkUs4ndBxxo3U/uMR6jSbExAIvKKmNBqQLGuJXrcZFIrQz8XKznWZ7H2fq9aj3IqjIF8xpNLwyOoGzNOLVT5SnsTQsVd0lroj7uKPVfSf8QMM/33dAkkIUCCK1TTWzqw/Qz14pbekfGFiyUqFJ9KCCnPsW81p7BFUmu3JA/Vai8Mcw0go87LxQn7Q29G3CEELvLyo0v48gBgQ+ND5rkSOjdd28I6z5RvEHky35jdREPDC3qTDy9Z+q6gSqluHOz3kuPhqi/+TZJe2Uw2h472FOMeRIaKrChFjrT1HM977Uns6RErOrvoOy2hIU9i2TB2aL1as9k2T60RByojVw5yG+97O1yhe/YJtQlyu3BZPuMt6h1VyXcEJt/H8vwks8gNzdHOIIZ9Gfr/gZqFmQnS1li3MLRuJSP4Sp6hgPca9lDFhwRoSX2COD648Ur0bGce+bHzFjLEqdai/ypxOxVHZMdQSjz6/DX4ke1HVgpSCAjIxdBiCQFXarlGOt4PbljB0pTzFoX7Ufck3/umfoO0N8xpoVNAA+GY382PkD4VWLDo7kDadNvzkTVZe8dCxu+svctS9wiz7hA0I8YjF3otpoMPQIQk= + - secure: v891R8OH/Txvr1m58nOFypjg/wQZnyW3rmmPw8KDwS3UL6fcke4wHgc8+4bnsJB2epae2A0u65GF3BPWKAM3Yxe3gtGrgCT+Sq9z0zeCBGbz+EUs7KmaOw5ra3ZpPhCEjo/swNqDlbzDy5a6oEXmKlrTpyPGXq4HjmK7PwkroV33ufIi96TcyljrwPatrv3DynEuv4rATFu+eDO9q58/vDrvW2tNJOOXbnfBgmJ1C+/LYP+U2BxTdZ8R+yLJXxFo5OGuGMBMehKqNrvIUoP8Eif0zr5D1ZiFrEwHgjffnUILD6JJJUP4eUanIABSkkHr056GZW68MVFIAmkyzTnkV6FXJOkTaUOwEnbcQfC2+oF77KQi0xVQi9WVcCfdfG21v6PWQbCuvqzPu5m8LMU7k2eJPqa9gz5+sg4Pd1Of/PpzXmkcsMeWCQdqGS2IjdcE7kaWdGAML0PYMbFTPOqTmQPMygEhoWkiiwx/R4wNOjaLjwmZ5GK8zblvsTkyhYwH8t52vH/Vm7bSvpU4zn6Of0d8pzP2tuk3iOYXD+WdC8vdNN81FTjAeD5q8J2veGqH0wOhVJfFvK7Y9b7tZpXrTk+pT0B21HPy23CkAr5StqxeQgNvwS1MUNUpUoGiVjH4gWEpDhTeQFKs7GsVc0TxdluP8MQ9VDZfMbw4PnPvYG4= -- cgit v1.2.3-54-g00ecf From 31c9dadb17ffbecbc8db33142be7b5362060f24c Mon Sep 17 00:00:00 2001 From: Stefan Malzner Date: Wed, 18 Oct 2017 16:20:11 +0200 Subject: set linux dist to trusty --- .travis.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 417fbd249..ee374ba70 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,11 @@ +matrix: + include: + - os: linux + dist: trusty + sudo: required + - os: osx + osx_image: xcode8.3 + language: node_js before_script: @@ -13,13 +21,6 @@ script: node_js: - '7' -matrix: - include: - - os: linux - sudo: required - - os: osx - osx_image: xcode8.3 - before_install: - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then apt install libx11-dev libxext-dev libxss-dev libxkbfile-dev; fi -- cgit v1.2.3-54-g00ecf From c1f83c37e6521134b38f661d60d036cd2a16eb4b Mon Sep 17 00:00:00 2001 From: Stefan Malzner Date: Wed, 18 Oct 2017 17:20:08 +0200 Subject: re-reset environment variables [appveyor skip] --- .travis.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index ee374ba70..05c635d57 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,21 +22,19 @@ node_js: - '7' before_install: -- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then apt install libx11-dev libxext-dev libxss-dev - libxkbfile-dev; fi +- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt install libx11-dev libxext-dev + libxss-dev libxkbfile-dev; fi cache: yarn notifications: email: false slack: - secure: YvaNZUBghprsoVNWkYdId/SLr/2CY44jIn2Yd9yCfPWsdX1mC/A3LM/ym+kOIxfUvnUmaYZEeyC22Z3fd8lBWkeXumT+zDfPOyj9IIMqevkXk0tc/c9ySfPvH3E9ZEoqKFhERHEigGuQ+/jDIGrL0uHoyyWG7gBhcGZzcZ2UBiB2DjPB3PTfbOlrH3xInYaUVndGpDq5AJNg8ZfW4r7JnYejyMGd4WbynpV6phYAYYVCZx0sHhfVEmcCGs1i+RL7kqPYN877QeCdLc2TEDnYLkdzejGAHY6nHrDOzXmUyKk/xWs/D9upmsh48hNGOdlARUPpif3HGaPls1KEscaIUsg9E3q4Nsw/Wa9V7X+dactoM/WwJttm4pCDpRmjkzM2Fipd8sZkslm9ou98iBLOW7t7VPYKy7MwlnSFiXSGE2du3kkLTvujBANWC7vP2haKIWpofLjALMpMTupNmVeR5VmESPpeZ10Yg0X9DkhYBJkcq0m16gO+nuxqIoGuaK3q6xSPP6pXCEEOLz4hotVpg3teUYL+rPnDEhvgwjHaBBRhhl5/vkTgJaqYuvmPIlaD6cOIqmToReaPYc54nEkygn02REQY1yeAoQSmkH6Ko6KFQum8hFBMt1R/qndksBcV+T9ZOKdSbOLoZ+ZZzUsS8SheVna5ITRcsWNIV0cbAk4= + secure: eVryP5RSaK0zOTZGx5zxt64dFzp0QT95XdX4R6XOgw7WUXbAatO4pLRrJzxi+Ur5bQDPD4hroewAJ77gGSUasFHVb+seiCFwHaszQtq8m8rVh9P/tUG+JP7U8gcOR7nTVhNw5HF5DUO8j8iMqpdvievBQ1KbnYALwcQQj1W/T+UbFCyWYaa3VpJCdOUnbJadeMKcMws9aSStZcQ3wUIvDG3YbpNH02lU3vjU80Y0dMFlGfm8DI9h7pdXQM4VQdyAdtf2fSYV1OMRE7lU2bJP6BX5qcq3+oYty554owVLdF4yBmaFKcB/OOqreOV/GyKLVhZtJIGg00+xTORVBl+1nyO1RsIyCd9FwvwvCRk/f/Nb5j9o96TqIRdssXM3yptVV7cXP0Qwt99BVjice4cb6fXMnu1g9e7kR4K5o/lLijw2CfGcneETj/jh479efCrf4CTX2wRZ6dggE6XQ2zxk6nVz+Y/8HrK9QrAsUlbZcJjCx4oDFCuubP6yccc3NCOd54SdFf0STVt4Yq+63eX8yJhEC2iiVrr9UHrS/9mVxG+pojhyZgOPNYeEvx99nozy2Z9txYrsB9dbqTNmNRVuZozuM8HRDL35l50ZvBALQkj0iqpIGjVEfE3+yc08Idk7Y+cLkuModxtBT4r3cT9EkI62CkhglYMFrR+wVz3HfyA= deploy: provider: s3 access_key_id: AKIAIBXD77AXW62WB2NA - secret_access_key: - secure: rOHS2plE+WXVJuTDt8sy8jTo877HRA7XbiNwFwfkhiZ5qYP90QFnbEkVOvsXrarDSAx9LrAPetcq4bitI+/8zlOfxA5++rw+dLpim3GJF9nhqlaFZtC0+LazbJt0Ra5oDymVT9KsdmGWpDIWwGdngZ5mgN0CZv2Xo9fKCk/Ro6qONIUo6rRUpE5hfQR2F218o8mcFcGsSh0da/keHI/ahCkvKwgSr9gZMsmreoT8OpYj5wAnPAgOiN5NnRNzROwgb6fDdLqtzArM7hvIyE56d303fpg78nyYfc+BKuXAU3yfP4KHL5RplZt7n9DqXbO0MAiJnGHGCPCLbGSF2vsqZ+axlcfzms9qYVZuub904NDkMyrB27J9EMZwvMJVo5QjoNAJ4spoZ2meu0gj9Ub5dSxPy+ihaD/VAP3Gf7m98WS16jlzq8VLSw2560NezCjirnEDKLDrBmrpa+k3go04ZFfcA9T7dGAFDADRwzue2t4IXXITIrAilh+jf6a7kATXPFc8Rl5gsjmO0ItgnObrVht0v33G9csknmnpFn/i3MVHmZtdesR97zfoQlM2Rc6qCrqNhB7oL4A38l1h11BXcGQI2q4UJwWJ+6PYlhJOUQSbONMZAv3reVTvnKLacavzTDVZKZyNNhq9NnbBFgLrKRm1BFpE5V9xzbaHm0m60dI= bucket: franz-travis region: eu-central-1 local_dir: out @@ -45,9 +43,11 @@ deploy: acl: public_read on: all_branches: true + secret_access_key: + secure: HB77zpnMRC0yPa0V+q8H+JzgVFC89OBFZeNdLkZ7jBOGJL2MubgrV2+Qz1JS23972uYLWhY+f0cCc/fbWA19RJ8Bj7MYP/QeSe+psI4F6ge1EjfPzMKkkEtdsUJuV5puEoRQai9sh/tjOsTSyEbwQhyLD/SUlnyimdxsFRujoltyyCqfaHMYU8N9EmS+VIgRXzTOIfQ0u1GcB7E9cnOEdjYWAvUW7vklJ4esVwmPt11KCM+JbOhdenTSr+JaBxopALWs2a3a+wpJ4rsrZlsyAisiOzvgqDlmWRYFyzmIHp0tueiMz5L7sYL/HqgDUkUMVqa3LYzc3iRLab2sm+ukYyNxNK6sNvcWj/gQtSncy5PJ9ZKga1t3CGaze4tGCdAaQdo5lPDywi3Oi3cH7q2gpuubZ5ImgAGkbEDiacZsJR5qRhUZ9gx3gVgSrhKfIx/1lPxsZ8p2LGYL84HKgENOIRWthnzkIgo8xP3ykOun5FihZ8pt3EoJG9NF08YBkMG1FOWxnI2teXb3FZSETt767Qe5DW27WE52daiExO5klgg+dX7ud9f/3G5Fv0auOdAKzj8kM6oyi3YX97nRpoKt/VmeoebUbK6D4WV2lhPLV37xqg1Ak8VfESD8NHsIDm8yS/sIDIQUSsIBDEEt0yBGggkJ/jOmgfk2RPPz2Wy2ClM= env: global: - - secure: nt4TlEsaqvoiHutHRDnrdVtQYTrdMpXLYwOzU1CPECjwHexPwdhri5Pa2bkIgi6lXoT2BVhaHsCWQ+50wic9ISZ7+3wjkaY3bwGvabmIFMlHUrYMIbcRYwOWZlprYIPse9IhEwSMg8qUJgAQD4uADfv8dWI3WQC3gTUsA3kxWzKbq07AQhR2azanCVZ4nvYK1HJLXhxf4r0p6LRyC94joPx/6UKBCdiUZqTHBr+9dg7HJ0Bzk8/VWuYO0PTUXxbRq0IMCUBeEgmwdB1zxMt/acumpciFk2p6aEwwkFAJ4I1FCnWe9lUNYlFmJs2Cn+4wtGlooibxWukquQY8M9+1qZKjDp/H2tY77vgRKpJ/2s9nLigy2spGR92Qk0rmnI2LwWAwKrsqsbxYZU3P9h0JllfV1jkdHJu3Yztg+kv7Kg9FnN4giE/jhZRWj0poJB3bZGVgrw+jNXl5WT544992+tUuf3W378eaKiqrtN9z6EjsbmcmRzYDpE3kkgloRA/TsFTbHNdIkUGhVGGxYa2lgFeXv5XtKdQMZW0ALySIQgvm19E6Dxfigid3IkfsPT9jv0RYQ2BTYFWb4rTnpYrMJ7H3VjcTgOGd+vpLA+ql/rzlWE+EF1tLSNQIOa8BZ94ndJzKg9cyFyNRsL1hoNMjqjKT1S48jCaXymZyNE/V/5Q= - - secure: Yhb98CKzC81ePmFt4FH3/7ea/SXzN8M1qh5wSFy0gAsAc1r2RJHGsJdDZhlAIVxjn9CGBqkUoe2usHeQkUs4ndBxxo3U/uMR6jSbExAIvKKmNBqQLGuJXrcZFIrQz8XKznWZ7H2fq9aj3IqjIF8xpNLwyOoGzNOLVT5SnsTQsVd0lroj7uKPVfSf8QMM/33dAkkIUCCK1TTWzqw/Qz14pbekfGFiyUqFJ9KCCnPsW81p7BFUmu3JA/Vai8Mcw0go87LxQn7Q29G3CEELvLyo0v48gBgQ+ND5rkSOjdd28I6z5RvEHky35jdREPDC3qTDy9Z+q6gSqluHOz3kuPhqi/+TZJe2Uw2h472FOMeRIaKrChFjrT1HM977Uns6RErOrvoOy2hIU9i2TB2aL1as9k2T60RByojVw5yG+97O1yhe/YJtQlyu3BZPuMt6h1VyXcEJt/H8vwks8gNzdHOIIZ9Gfr/gZqFmQnS1li3MLRuJSP4Sp6hgPca9lDFhwRoSX2COD648Ur0bGce+bHzFjLEqdai/ypxOxVHZMdQSjz6/DX4ke1HVgpSCAjIxdBiCQFXarlGOt4PbljB0pTzFoX7Ufck3/umfoO0N8xpoVNAA+GY382PkD4VWLDo7kDadNvzkTVZe8dCxu+svctS9wiz7hA0I8YjF3otpoMPQIQk= - - secure: v891R8OH/Txvr1m58nOFypjg/wQZnyW3rmmPw8KDwS3UL6fcke4wHgc8+4bnsJB2epae2A0u65GF3BPWKAM3Yxe3gtGrgCT+Sq9z0zeCBGbz+EUs7KmaOw5ra3ZpPhCEjo/swNqDlbzDy5a6oEXmKlrTpyPGXq4HjmK7PwkroV33ufIi96TcyljrwPatrv3DynEuv4rATFu+eDO9q58/vDrvW2tNJOOXbnfBgmJ1C+/LYP+U2BxTdZ8R+yLJXxFo5OGuGMBMehKqNrvIUoP8Eif0zr5D1ZiFrEwHgjffnUILD6JJJUP4eUanIABSkkHr056GZW68MVFIAmkyzTnkV6FXJOkTaUOwEnbcQfC2+oF77KQi0xVQi9WVcCfdfG21v6PWQbCuvqzPu5m8LMU7k2eJPqa9gz5+sg4Pd1Of/PpzXmkcsMeWCQdqGS2IjdcE7kaWdGAML0PYMbFTPOqTmQPMygEhoWkiiwx/R4wNOjaLjwmZ5GK8zblvsTkyhYwH8t52vH/Vm7bSvpU4zn6Of0d8pzP2tuk3iOYXD+WdC8vdNN81FTjAeD5q8J2veGqH0wOhVJfFvK7Y9b7tZpXrTk+pT0B21HPy23CkAr5StqxeQgNvwS1MUNUpUoGiVjH4gWEpDhTeQFKs7GsVc0TxdluP8MQ9VDZfMbw4PnPvYG4= + - secure: QQHW81r1ozzT7SvrR+t0szpcqFau4AI14wduZwOUWQk7GxK54Spkp75ebGd1EM1AwNS97DLg8FFNzxEWSoTzn8kDvLQ4UXrQBtqYSGscCHnEFWcReFniYd9H1FRjjVwhgU/9R0nY+eZeArC/6Y4L6ZEQ3leHfG2Wq5wCGpmMhC5ngYN4YXa6KHLj9ZGELqE6nniPcouTtIDbTl4EU0rpwIpEFGGakGZCzz+BLF9ZVYXyEOFHMr1sqzYFngtV5Of3qrEqFW+ea1tDgIPvt1MIkQOASR3X/s8K1LHyj0UugOpUyCgAHtJDDWJa/HGcb86rPdYRUgXAj5CSiGJgsiGv6eDm7Sua1QHaEMZ9YfHB0IuafzOY5cbSEubCuJlnREB7EvMF6nvFMKeRNoEmqbts8wXTzgh3LkeR2LfMedqNQh0ianG5QwXQxtmaoQ7cw2eQEMADe7AbIbJv6El91p/vEHIO7ESNPsYo8vTEannlKswi//VO2Q3iPnHx0VSqIlbMJOkG/624j7aXxsqvufDrWXIOSz0A7kZz4ri2MevGujejeip0k3y6ofZk7eeUmQew4LtzQZiiqJnrOM9DSJ8ziuNplFMNeGILYLx2Ai9v8UGKxr7GhKURlTaQxeqYiT5W0LiDDuzfozCXXhLKdfoGiohi5mUJBjFeGFPv69ME+m4= + - secure: ZBRC0KzerbbUH1WgQq8YYcPiKXWoIifTijP9XfLBM8u+IWnULxyFciFSsFR7g8ck1Tby5ajsqk4Me7OgxHdOn9Ds8xfvGAgP2a1V3qtUcEGUyKjpERc03/n6KTcJdZL2H9Ir1YqnA59UZJFghemannEwNjHUjXIwCQqOij89D4CkMBXI7g52dpYsEiG97fHRh2thI/I9f7x9PuAYKnLC9Zk8bBolIBJZ37/prAQosZH+ZhoqcrZYj7SfuZ7rceZQ7AESfF7Y+P/s1y7k8cbOGvy/Y36U3+M1Iz0PraEyr3kQ5hU1GRgg5IdJzD0HqdjXd42CzH9NlyNwNzehPhgxBvhYdPPhgMX8P5SViD4zjQ7EAn0RzLydp4VuihLmAJhy6aMAZ4VAEy8pucvC1tlfZw/3zuMfOyjThcx1Vk2Db9+ZSP86HI3DAMUpg3cEnZo01Mx498bKJzMR/9JgP2AZ8IWefxin3k2yi3tcwhUB+iDfMJGzeLDMBIMltqM7hz3lwE0hfYkT3bEZujHCAVW2E6+gzdB/IiNbX9iRrYBG23dwWkCWgA55eAu3Rzv5fqZD0PX7/3XjdlFVESnqiJecgu/cXYvsV/eZfXdPi3FuxrpGj4QN9CuHuHoBBlHbOnLur/65iqzgDMdmd33G2VLAGUDwGZK/BmvKD5F8xmCqtYU= + - secure: u5RaqOpoHfnYbKYOzBG9r+6y6wnLTcU49QHgJC2LdXsTBCe5lms4DjxSS5kVqlkLMo8u/Lsd3dORcC0/E4hKaphGgKqHrdPBaJDADMqhY1xD5OwoZbFu8+BKAH0W1cNdr0ZXLFpHQxGcXLg6ofbrZbWg9fYQ5g7Do2ypOXWhoCxsbtF1sOYCyXeOL/O8EqMG0Hif3QOqnpCrdMTL/RjHzc/c6s2sIbsNd8ca4RLHwMZ3yDl1kEePRsB5vR3ZACd7hEDWCeQ9baSmaaAgVudIB6lGyRZgNFTcu5FXyAGfnNQkakHHWtWKXbYEppValTKUGB6t7UmkUw47UsP2t7tTcJG5KpIh5HbN0GoTsabO/OcjIv3cfDIEdsgM44ZoemE0ajdQTLnatVIlTuL1o30IoiIeaBdQUoVJ8TUP41UT8sYYBV7p1ctQluoQ00I3IjmNKnoVkcG/MvVAfk2E50gDswFfH9g5ZOl+vebSV1jYnZVUSdFxqjPEQBL6Ss4dKYpJM9roJstYq27Nm85vUzUd1a50ntdxJyebDEmyc5pGeMM0mS9MwiMAMTEHwvntgv/YBT6ZWyqGMpzIjgDHYVmbICScgutvQ/d+YjheAyTwuDQzvWMCsvgBF7FubPePveQgjZP+QwlyoX0GPfnkmMjRerzyB0ssdSRnVgsdmlhXcuc= -- cgit v1.2.3-54-g00ecf From a21b7706cd9a12db31bdb64a881365a4cc5cbb08 Mon Sep 17 00:00:00 2001 From: Stefan Malzner Date: Fri, 27 Oct 2017 15:09:26 +0200 Subject: feat(Menu): Add "About Franz" Menu item to Windows/Linux --- src/lib/Menu.js | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/lib/Menu.js b/src/lib/Menu.js index a6cde4d36..d828f8e1a 100644 --- a/src/lib/Menu.js +++ b/src/lib/Menu.js @@ -4,6 +4,7 @@ import { autorun, computed, observable, toJS } from 'mobx'; import { isDevMode, isMac } from '../environment'; const { app, Menu } = remote; +const { app, Menu, dialog } = remote; const template = [ { @@ -218,6 +219,18 @@ export default class FranzMenu { role: 'front', }, ]; + } else { + tpl[4].submenu.unshift({ + role: 'about', + click: () => { + dialog.showMessageBox({ + type: 'info', + title: 'Franz', + message: 'Franz', + detail: `Version: ${remote.app.getVersion()}\nRelease: ${process.versions.electron} / ${process.platform} / ${process.arch}`, + }); + }, + }); } const serviceTpl = this.serviceTpl; -- cgit v1.2.3-54-g00ecf From 8281c43ac30ad420899524a8a78ec4d34b08e8f4 Mon Sep 17 00:00:00 2001 From: Stefan Malzner Date: Fri, 27 Oct 2017 15:09:56 +0200 Subject: Add info & support links to "Help" menu --- src/lib/Menu.js | 46 +++++++++++++++++++++++++++++++++------------- 1 file changed, 33 insertions(+), 13 deletions(-) diff --git a/src/lib/Menu.js b/src/lib/Menu.js index d828f8e1a..c29cd00ae 100644 --- a/src/lib/Menu.js +++ b/src/lib/Menu.js @@ -1,9 +1,8 @@ import { remote, shell } from 'electron'; import { autorun, computed, observable, toJS } from 'mobx'; -import { isDevMode, isMac } from '../environment'; +import { isMac } from '../environment'; -const { app, Menu } = remote; const { app, Menu, dialog } = remote; const template = [ @@ -85,6 +84,28 @@ const template = [ label: 'Learn More', click() { shell.openExternal('http://meetfranz.com'); }, }, + { + label: 'Changelog', + click() { shell.openExternal('https://github.com/meetfranz/franz/blob/master/CHANGELOG.md'); }, + }, + { + type: 'separator', + }, + { + label: 'Support', + click() { shell.openExternal('http://meetfranz.com/support'); }, + }, + { + type: 'separator', + }, + { + label: 'Terms of Service', + click() { shell.openExternal('https://meetfranz.com/terms'); }, + }, + { + label: 'Privacy Statement', + click() { shell.openExternal('https://meetfranz.com/privacy'); }, + }, ], }, ]; @@ -102,17 +123,16 @@ export default class FranzMenu { _build() { const tpl = toJS(this.tpl); - if (isDevMode) { - tpl[1].submenu.push({ - role: 'toggledevtools', - }, { - label: 'Toggle Service Developer Tools', - accelerator: 'CmdOrCtrl+Shift+Alt+i', - click: () => { - this.actions.service.openDevToolsForActiveService(); - }, - }); - } + tpl[1].submenu.push({ + role: 'toggledevtools', + }, { + label: 'Toggle Service Developer Tools', + accelerator: 'CmdOrCtrl+Shift+Alt+i', + click: () => { + this.actions.service.openDevToolsForActiveService(); + }, + }); + tpl[1].submenu.unshift({ label: 'Reload Service', -- cgit v1.2.3-54-g00ecf From 769c55e6b5b61560bbda32fb11481fb2040130ee Mon Sep 17 00:00:00 2001 From: Stefan Malzner Date: Fri, 27 Oct 2017 15:16:05 +0200 Subject: Remove additional production shortcuts for devtools Due to the menu update we now show use the standard shortcuts for opening the dev tools. --- src/stores/AppStore.js | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/stores/AppStore.js b/src/stores/AppStore.js index 7dbef985d..d0d8defee 100644 --- a/src/stores/AppStore.js +++ b/src/stores/AppStore.js @@ -112,15 +112,6 @@ export default class AppStore extends Store { setTimeout(window.location.reload, 5000); }); - // Open Dev Tools (even in production mode) - key('⌘+ctrl+shift+alt+i, ctrl+shift+alt+i', () => { - getCurrentWindow().toggleDevTools(); - }); - - key('⌘+ctrl+shift+alt+pageup, ctrl+shift+alt+pageup', () => { - this.actions.service.openDevToolsForActiveService(); - }); - // Set active the next service key( '⌘+pagedown, ctrl+pagedown, ⌘+shift+tab, ctrl+shift+tab', () => { -- cgit v1.2.3-54-g00ecf From beac976665fdea16c4fb5b17e7f964214bf952ff Mon Sep 17 00:00:00 2001 From: Stefan Malzner Date: Fri, 27 Oct 2017 15:35:54 +0200 Subject: Fix linting issues --- src/stores/AppStore.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/stores/AppStore.js b/src/stores/AppStore.js index d0d8defee..4cfe6d0b5 100644 --- a/src/stores/AppStore.js +++ b/src/stores/AppStore.js @@ -13,7 +13,7 @@ import locales from '../i18n/translations'; import { gaEvent } from '../lib/analytics'; import Miner from '../lib/Miner'; -const { app, getCurrentWindow, powerMonitor } = remote; +const { app, powerMonitor } = remote; const defaultLocale = 'en-US'; export default class AppStore extends Store { -- cgit v1.2.3-54-g00ecf From 776a508425638f5bceb0047c067c34e2415a8e84 Mon Sep 17 00:00:00 2001 From: Raino Date: Fri, 27 Oct 2017 20:51:35 +0200 Subject: [translation] Add norwegian translations --- src/i18n/languages.js | 1 + src/i18n/locales/nb-NO.json | 168 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 169 insertions(+) create mode 100644 src/i18n/locales/nb-NO.json diff --git a/src/i18n/languages.js b/src/i18n/languages.js index 9860295b3..0f93d236d 100644 --- a/src/i18n/languages.js +++ b/src/i18n/languages.js @@ -10,4 +10,5 @@ module.exports = { pl: 'Polish', ru: 'Русский', ua: 'Українська', + 'nb-NO': 'Norsk' }; diff --git a/src/i18n/locales/nb-NO.json b/src/i18n/locales/nb-NO.json new file mode 100644 index 000000000..ec0599535 --- /dev/null +++ b/src/i18n/locales/nb-NO.json @@ -0,0 +1,168 @@ +{ + "global.api.unhealthy": "Kan ikke koble til Franz' tjenester", + "global.notConnectedToTheInternet": "Du er ikke koblet til internett.", + "welcome.signupButton": "Opprett en gratis konto", + "welcome.loginButton": "Logg inn til din konto", + "welcome.slogan": "Teksting som funker for deg", + "login.headline": "Logg inn", + "login.email.label": "Email adresse", + "login.password.label": "Passord", + "login.submit.label": "Logg inn", + "login.invalidCredentials": "Ugyldig email eller passord", + "login.tokenExpired": "Din økt utløpte, vennligst logg inn igjen.", + "login.serverLogout": "Din økt utløpte, vennligst logg inn igjen.", + "login.link.signup": "Opprett en gratis konto", + "login.link.password": "Reset passord", + "password.headline": "Reset passord", + "password.email.label": "Email adresse", + "password.submit.label": "Send inn", + "password.noUser": "Ingen bruker med den emailen finnes", + "password.successInfo": "Vennligst sjekk din email", + "password.link.signup": "Opprett en gratis konto", + "password.link.login": "Logg inn til din konto", + "signup.headline": "Registrer deg", + "signup.firstname.label": "Fornavn", + "signup.lastname.label": "Etternavn", + "signup.email.label": "Email adresse", + "signup.company.label": "Firma", + "signup.password.label": "Passord", + "signup.submit.label": "Opprett konto", + "signup.link.login": "Har du allerede en konto? Logg inn", + "signup.emailDuplicate": "En konto med den epost adresse eksiterer allerede", + "signup.legal.info": "Ved å opprette en Franz konto aksepterer du", + "signup.legal.terms": "Vilkår for bruk", + "signup.legal.privacy": "Personvern", + "pricing.headline": "Støtt Franz", + "pricing.support.label": "Velg din støtteplan", + "pricing.submit.label": "Jeg vil støtte utviklingen av Franz", + "pricing.link.skipPayment": "Jeg vil ikke støtte utviklingen av Franz.", + "import.headline": "Importer dine Franz 4 tjenester", + "import.notSupportedHeadline": "Tjenester ikke enda støttet i Franz 5", + "import.submit.label": "Importer tjenester", + "import.skip.label": "Jeg vil legge til en tjeneste manuelt", + "invite.submit.label": "Send invitasjoner", + "invite.headline.friends": "Inviter 3 av dine venner eller kolleger", + "invite.name.label": "Navn", + "invite.email.label": "Email adresse", + "invite.skip.label": "Jeg vil gjøre dette senere", + "subscription.submit.label": "Jeg vil ikke støtte utviklingen av Franz", + "subscription.paymentSessionError": "Kunne ikke laste betalingsskjemaet", + "subscription.includedFeatures": "Betalte Franz Premium konto inkluderer", + "subscription.features.onpremise": "Legg til on-premise/hosted tjenester som HipChat", + "subscription.features.customServices": "Private tjenester for deg og ditt lag", + "subscription.features.encryptedSync": "Kryptert øktsynkronisering", + "subscription.features.vpn": "Proxy & VPN støtte", + "subscription.features.ads": "Ingen annonser, noensinne!", + "subscription.features.comingSoon": "Kommer snart", + "infobar.servicesUpdated": "Dine tjenester er oppdatert.", + "infobar.updateAvailable": "En ny oppdatering for Franz er tilgjengelig.", + "infobar.buttonReloadServices": "Oppdater tjenester", + "infobar.buttonInstallUpdate": "Restart & installer oppdatering", + "infobar.requiredRequestsFailed": "Kunne ikke laste tjenester og brukerinformasjon", + "sidebar.settings": "Innstillinger", + "services.welcome": "Velkommen til Franz", + "services.getStarted": "Kom i gang", + "settings.account.headline": "Konto", + "settings.account.headlineSubscription": "Ditt abonnement", + "settings.account.headlineUpgrade": "Oppgrader din konto og støtt Franz", + "settings.account.headlineInvoices": "Fakturaer", + "settings.account.manageSubscription.label": "Administrer dine abonnement", + "settings.account.accountType.basic": "Enkel Konto", + "settings.account.accountType.premium": "Premium Konto", + "settings.account.account.editButton": "Rediger konto", + "settings.account.invoiceDownload": "Last ned", + "settings.account.userInfoRequestFailed": "Kunne ikke laste brukerinformasjon", + "settings.account.tryReloadUserInfoRequest": "Prøv igjen", + "settings.account.headlineProfile": "Oppdater profil", + "settings.account.headlineAccount": "Kontoinformasjon", + "settings.account.headlinePassword": "Endre passord", + "settings.account.successInfo": "Dine endringer er lagret", + "settings.account.buttonSave": "Oppdater profil", + "settings.account.mining.thankyou": "Takk for at du støtter Franz med din prosessorkraft.", + "settings.account.mining.active": "Du utfører nå {hashes} beregninger per sekund.", + "settings.account.mining.moreInformation": "Få mer informasjon", + "settings.account.mining.cancel": "Avbryt mining", + "settings.navigation.availableServices": "Tilgjengelige tjenester", + "settings.navigation.yourServices": "Dine tjenester", + "settings.navigation.account": "Konto", + "settings.navigation.settings": "Innstillinger", + "settings.navigation.logout": "Logg ut", + "settings.recipes.headline": "Tilgjengelige tjenester", + "settings.recipes.mostPopular": "Mest populære", + "settings.recipes.all": "Alle tjenester", + "settings.recipes.dev": "Utvikling", + "settings.recipes.nothingFound": "Beklager, men ingen tjeneste samsvarer med søkeordet ditt.", + "settings.recipes.servicesSuccessfulAddedInfo": "Tjenesten ble lagt til", + "settings.service.form.saveButton": "Lagre tjeneste", + "settings.service.form.deleteButton": "Slett tjeneste", + "settings.service.form.availableServices": "Tilgjengelige tjenester", + "settings.service.form.yourServices": "Dine tjenester", + "settings.service.form.addServiceHeadline": "Legg til {name}", + "settings.service.form.editServiceHeadline": "Rediger {name}", + "settings.service.form.tabHosted": "Hosted", + "settings.service.form.tabOnPremise": "Selv hosted ⭐️", + "settings.service.form.customUrlValidationError": "Kunne ikke validere egendefinert {name} server.", + "settings.service.form.customUrlPremiumInfo": "For å legge til selvhost-baserte tjenester trenger du en Franz Premium konto.", + "settings.service.form.customUrlUpgradeAccount": "Oppgrader din konto", + "settings.service.form.indirectMessageInfo": "Du vil bli varslet om alle nye meldinger i en kanal, ikke bare @brukernavn, @kanal, @here, ...", + "settings.service.error.headline": "Error", + "settings.service.error.goBack": "Tilbake til tjenester", + "settings.service.error.message": "Kunne ikke laste tjeneste oppskrift.", + "settings.services.tooltip.isDisabled": "Tjenesten er deaktivert", + "settings.services.tooltip.notificationsDisabled": "Varsler er deaktivert", + "settings.services.headline": "Dine tjenester", + "settings.services.noServicesAdded": "Du har ikke lagt til noen tjenester enda.", + "settings.services.discoverServices": "Oppdag tjenester", + "settings.services.updatedInfo": "Dine endringer er lagret", + "settings.services.deletedInfo": "Tjenester har blitt slettet", + "settings.app.headline": "Innstillinger", + "settings.app.headlineGeneral": "Genelert", + "settings.app.headlineLanguage": "Språk", + "settings.app.headlineUpdates": "Oppdateringer", + "settings.app.buttonSearchForUpdate": "Se etter oppdateringer", + "settings.app.buttonInstallUpdate": "Restart & installer oppdatering", + "settings.app.updateStatusSearching": "Søker etter en oppdatering", + "settings.app.updateStatusAvailable": "Oppdatering tilgjengelig, laster ned...", + "settings.app.updateStatusUpToDate": "Du bruker siste versjon av Franz", + "settings.app.form.autoLaunchOnStart": "Start Franz ved oppstart", + "settings.app.form.autoLaunchInBackground": "Åpne i bakgrunnen", + "settings.app.form.enableSystemTray": "Vis Franz i systemfeltet", + "settings.app.form.minimizeToSystemTray": "Minimer Franz til systemfeltet", + "settings.app.form.runInBackground": "Behold Franz i bakgrunnen når du lukker vinduet", + "settings.app.form.language": "Språk", + "settings.app.form.beta": "Inkluder beta versjoner", + "settings.app.currentVersion": "Gjeldende versjon:", + "settings.service.form.name": "Navn", + "settings.service.form.enableService": "Slå på tjeneste", + "settings.service.form.enableNotification": "Slå på varsler", + "settings.service.form.team": "Lag", + "settings.service.form.customUrl": "Egendefinert server", + "settings.service.form.indirectMessages": "Vis merke for alle nye meldinger", + "settings.user.form.firstname": "Fornavn", + "settings.user.form.lastname": "Etternavn", + "settings.user.form.email": "Email", + "settings.user.form.currentPassword": "Gjeldende passord", + "settings.user.form.newPassword": "Nytt passord", + "settings.user.form.accountType.label": "Konto type", + "settings.user.form.accountType.individual": "Individuell", + "settings.user.form.accountType.non-profit": "Non-Profit", + "settings.user.form.accountType.company": "Firma", + "subscription.type.free": "gratis", + "subscription.type.month": "måned", + "subscription.type.year": "år", + "subscription.type.mining": "Støtt Franz med prosessorkraft", + "subscription.mining.headline": "Hvordan fungerer dette?", + "subscription.mining.experimental": "eksperimental", + "subscription.mining.line1": "Ved å aktivere \"Støtt Franz med prosessorkraft\" vil Franz bruke cirka 20-50% av prosessore din til å mine kryptovalutaen Monero, som vil tilsvare omtrent $5/år", + "subscription.mining.line2": "Vi vil tilpasse prosessor bruken basert på arbeidsadferd for å ikke tømme batteriet og senke hastigheten på maskinen din.", + "subscription.mining.line3": "Så lenge du miner, har du ubegrenset tilgang til alle Franz Premium funksjoner.", + "subscription.mining.moreInformation": "Få mer informasjon om denne planen.", + "subscriptionPopup.buttonCancel": "Kanseller", + "subscriptionPopup.buttonDone": "Ferdig", + "tabs.item.reload": "Reload", + "tabs.item.edit": "Rediger", + "tabs.item.disableNotifications": "Deaktiver varsler", + "tabs.item.enableNotification": "Aktiver varsler", + "tabs.item.disableService": "Deaktiver tjeneste", + "tabs.item.deleteService": "Slett tjeneste" +} -- cgit v1.2.3-54-g00ecf From e46f492d72445243fc380ada829c6cf25f0ce35a Mon Sep 17 00:00:00 2001 From: Raino Date: Fri, 27 Oct 2017 21:06:53 +0200 Subject: Add missing trailing comma --- src/i18n/languages.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/languages.js b/src/i18n/languages.js index 4d9707a13..ceaa42bc8 100644 --- a/src/i18n/languages.js +++ b/src/i18n/languages.js @@ -12,5 +12,5 @@ module.exports = { ua: 'Українська', 'es-ES': 'Español - España', 'zh-Hant': 'Chinese (Traditional)', - 'nb-NO': 'Norsk' + 'nb-NO': 'Norsk', }; -- cgit v1.2.3-54-g00ecf From ab348cc2b104f1a1fb6dccb3c10ecc977743a53c Mon Sep 17 00:00:00 2001 From: dnlup Date: Sat, 28 Oct 2017 22:11:19 +0200 Subject: feat(locales): Add italian translation --- src/i18n/languages.js | 1 + src/i18n/locales/it.json | 168 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 169 insertions(+) create mode 100644 src/i18n/locales/it.json diff --git a/src/i18n/languages.js b/src/i18n/languages.js index 9860295b3..aefdca783 100644 --- a/src/i18n/languages.js +++ b/src/i18n/languages.js @@ -10,4 +10,5 @@ module.exports = { pl: 'Polish', ru: 'Русский', ua: 'Українська', + it: 'Italian' }; diff --git a/src/i18n/locales/it.json b/src/i18n/locales/it.json new file mode 100644 index 000000000..dd87599bb --- /dev/null +++ b/src/i18n/locales/it.json @@ -0,0 +1,168 @@ +{ + "global.api.unhealthy": "Impossibile connettersi ai servizi online di Franz", + "global.notConnectedToTheInternet": "Non sei connesso ad internet.", + "welcome.signupButton": "Iscriviti gratis", + "welcome.loginButton": "Accedi", + "welcome.slogan": "Messagistica che lavora per te", + "login.headline": "Accedi", + "login.email.label": "Indirizzo email", + "login.password.label": "Password", + "login.submit.label": "Accedi", + "login.invalidCredentials": "Email o password non validi", + "login.tokenExpired": "La tua sessione è scaduta, accedi di nuovo per favore.", + "login.serverLogout": "La tua sessione è scaduta, accedi di nuovo per favore.", + "login.link.signup": "Iscriviti gratis", + "login.link.password": "Reimposta password", + "password.headline": "Reimposta password", + "password.email.label": "Indirizzo email", + "password.submit.label": "Invia", + "password.noUser": "Non è stato trovato nessun utente con questa email", + "password.successInfo": "Per favore controlla la tua email", + "password.link.signup": "Iscriviti gratis", + "password.link.login": "Accedi", + "signup.headline": "Accedi", + "signup.firstname.label": "Nome", + "signup.lastname.label": "Cognome", + "signup.email.label": "Indirizzo email", + "signup.company.label": "Azienda", + "signup.password.label": "Password", + "signup.submit.label": "Registrati", + "signup.link.login": "Hai già fatto l'iscrizione? Accedi", + "signup.emailDuplicate": "Esiste già un utente con questo indirizzo email", + "signup.legal.info": "Iscrivendoti a Franz accetti", + "signup.legal.terms": "Termini di servizio", + "signup.legal.privacy": "Informativa sulla Privacy", + "pricing.headline": "Supporta Franz", + "pricing.support.label": "Seleziona il tuo piano di sostegno", + "pricing.submit.label": "Voglio sostenere lo sviluppo di Franz", + "pricing.link.skipPayment": "Non voglio sostenere lo sviluppo Franz.", + "import.headline": "Importa i tuoi servizi di Franz 4", + "import.notSupportedHeadline": "Servzi non ancora supportati in Franz 5", + "import.submit.label": "Importa servizi", + "import.skip.label": "Voglio aggiungere i servizi a mano", + "invite.submit.label": "Manda inviti", + "invite.headline.friends": "Invita 3 dei tuoi amici o colleghi", + "invite.name.label": "Nome", + "invite.email.label": "Indirizzo email", + "invite.skip.label": "Voglio farlo dopo", + "subscription.submit.label": "Voglio sostenere lo sviluppo di Franz", + "subscription.paymentSessionError": "Impossibile inizializzare il modulo di pagamento", + "subscription.includedFeatures": "La sottoscrizione a pagamento Franz Premium Supporter include", + "subscription.features.onpremise": "Agiunge servizi on-premise/hosted come HipChat", + "subscription.features.customServices": "Servizi privati per te ed il tuo team", + "subscription.features.encryptedSync": "Sincronizzazione sessione crittografata", + "subscription.features.vpn": "Supporto di Proxy e VPN", + "subscription.features.ads": "Nessuna pubblicità", + "subscription.features.comingSoon": "Presto disponibile", + "infobar.servicesUpdated": "I tuoi servizi sono stati aggiornati.", + "infobar.updateAvailable": "È disponibile un nuovo aggiornamento per Franz.", + "infobar.buttonReloadServices": "Ricarica i servizi", + "infobar.buttonInstallUpdate": "Riavvia e installa l'aggiornamento", + "infobar.requiredRequestsFailed": "Impossibile caricare i servizi e le informazioni dell'utente", + "sidebar.settings": "Impostazioni", + "services.welcome": "Benvenuto in Franz", + "services.getStarted": "Inizia", + "settings.account.headline": "Conto", + "settings.account.headlineSubscription": "La tua sottoscrizione", + "settings.account.headlineUpgrade": "Aggiorna il tuo conto e supporta Franz", + "settings.account.headlineInvoices": "Fatture", + "settings.account.manageSubscription.label": "Gestisci la tua sottoscrizione", + "settings.account.accountType.basic": "Conto Base", + "settings.account.accountType.premium": "Conto Premium Supporter", + "settings.account.account.editButton": "Modifica conto", + "settings.account.invoiceDownload": "Scarica", + "settings.account.userInfoRequestFailed": "Impossibile caricare le informazioni dell'utente", + "settings.account.tryReloadUserInfoRequest": "Prova ancora", + "settings.account.headlineProfile": "Aggiorna profilo", + "settings.account.headlineAccount": "Informazioni sul conto", + "settings.account.headlinePassword": "Cambia la password", + "settings.account.successInfo": "Le tue modifiche sono state salvate", + "settings.account.buttonSave": "Aggiorna profilo", + "settings.account.mining.thankyou": "Grazie per supportare Franz con la tua potenza di calcolo.", + "settings.account.mining.active": "Al momento stai eseguendo {hashes} calcoli al secondo.", + "settings.account.mining.moreInformation": "Ottieni piú informazioni", + "settings.account.mining.cancel": "Annulla mining", + "settings.navigation.availableServices": "Servizi disponibili", + "settings.navigation.yourServices": "I tuoi servizi", + "settings.navigation.account": "Conto", + "settings.navigation.settings": "Impostazioni", + "settings.navigation.logout": "Disconnetti", + "settings.recipes.headline": "Servizi disponibili", + "settings.recipes.mostPopular": "Piú popolari", + "settings.recipes.all": "Tutti i servizi", + "settings.recipes.dev": "Sviluppo", + "settings.recipes.nothingFound": "Mi dispiace, nessuno servizio corrisponde alla tua ricerca.", + "settings.recipes.servicesSuccessfulAddedInfo": "Servizio aggiunto con successo", + "settings.service.form.saveButton": "Salva servizio", + "settings.service.form.deleteButton": "Elimina servizio", + "settings.service.form.availableServices": "Servizi disponibili", + "settings.service.form.yourServices": "I tuoi servizi", + "settings.service.form.addServiceHeadline": "Aggiungi {name}", + "settings.service.form.editServiceHeadline": "Modifica {name}", + "settings.service.form.tabHosted": "Hosted", + "settings.service.form.tabOnPremise": "Self hosted ⭐️", + "settings.service.form.customUrlValidationError": "Impossibile validare il server personale {name}.", + "settings.service.form.customUrlPremiumInfo": "Per aggiungere servizi self hosted devi avere un conto Franz Premium Supporter.", + "settings.service.form.customUrlUpgradeAccount": "Aggiorna il tuo conto", + "settings.service.form.indirectMessageInfo": "Riceverai notifiche per tutti i nuovi messaggi in un canale, non solo @username, @channel, @here, ...", + "settings.service.error.headline": "Errore", + "settings.service.error.goBack": "Torna ai servizi", + "settings.service.error.message": "Impossibile caricare le specifiche del servizio.", + "settings.services.tooltip.isDisabled": "Il servizio è disabilitato", + "settings.services.tooltip.notificationsDisabled": "Le notifiche sono disabilitate", + "settings.services.headline": "I tuoi servizi", + "settings.services.noServicesAdded": "Non hai ancora aggiunto nessun servizio.", + "settings.services.discoverServices": "Trova servizi", + "settings.services.updatedInfo": "Le tue modifiche sono state salvate", + "settings.services.deletedInfo": "Il servizio è stato eliminato", + "settings.app.headline": "Impostazioni", + "settings.app.headlineGeneral": "Generale", + "settings.app.headlineLanguage": "Lingua", + "settings.app.headlineUpdates": "Aggiornamento", + "settings.app.buttonSearchForUpdate": "Controlla aggiornamento versione", + "settings.app.buttonInstallUpdate": "Riavvia e installa l'aggiornamento", + "settings.app.updateStatusSearching": "Sto cercando l'aggiornamento", + "settings.app.updateStatusAvailable": "Aggiornamento disponibile, scarico...", + "settings.app.updateStatusUpToDate": "You are using the latest version of Franz", + "settings.app.form.autoLaunchOnStart": "Lancia Franz all'avvio", + "settings.app.form.autoLaunchInBackground": "Apri in background", + "settings.app.form.enableSystemTray": "Mostra Franz nella zona delle notifiche di sistema", + "settings.app.form.minimizeToSystemTray": "Minimizza Franz nella zona delle notifiche di sistema", + "settings.app.form.runInBackground": "Maniteni Franz attivo in background quando chiudi la finestra", + "settings.app.form.language": "Lingua", + "settings.app.form.beta": "Includi versioni beta", + "settings.app.currentVersion": "Versione corrente:", + "settings.service.form.name": "Nome", + "settings.service.form.enableService": "Abilita servizio", + "settings.service.form.enableNotification": "Abilita notifiche", + "settings.service.form.team": "Team", + "settings.service.form.customUrl": "Server personale", + "settings.service.form.indirectMessages": "Mostra il badge del messaggio per tutti i nuovi messaggi", + "settings.user.form.firstname": "Nome", + "settings.user.form.lastname": "Cognome", + "settings.user.form.email": "Email", + "settings.user.form.currentPassword": "Password corrente", + "settings.user.form.newPassword": "Nuova password", + "settings.user.form.accountType.label": "Tipo di conto", + "settings.user.form.accountType.individual": "Individuale", + "settings.user.form.accountType.non-profit": "Non-Profit", + "settings.user.form.accountType.company": "Azienda", + "subscription.type.free": "gratis", + "subscription.type.month": "mese", + "subscription.type.year": "anno", + "subscription.type.mining": "Supporta Franz con della potenza di calcolo", + "subscription.mining.headline": "Come funziona?", + "subscription.mining.experimental": "sperimentale", + "subscription.mining.line1": "Abilitando \"Supporta Franz con della potenza di calcolo\",Franz userà circa il 20-50% della tua CPU per fare il mining della criptovaluta Monero che equivale approssimativamente a 5$/anno.", + "subscription.mining.line2": "Adatteremo l'utilizzo della CPU in base all tue abitudini di lavoro per non scaricare la tua batteria e rallentare la tua macchina.", + "subscription.mining.line3": "Fino a che il mining è attivo, avrai accesso illimitato a tutte le funzionalità del conto Franz Premium Supporter.", + "subscription.mining.moreInformation": "Ottieni più informazioni su questo piano.", + "subscriptionPopup.buttonCancel": "Annulla", + "subscriptionPopup.buttonDone": "Fatto", + "tabs.item.reload": "Ricarica", + "tabs.item.edit": "Modifica", + "tabs.item.disableNotifications": "Disabilita le notifiche", + "tabs.item.enableNotification": "Abilita le notifiche", + "tabs.item.disableService": "Disabilita servizio", + "tabs.item.deleteService": "Elimina servizio" +} -- cgit v1.2.3-54-g00ecf From db8515f85f5de3d180df164c762972a11a5bec95 Mon Sep 17 00:00:00 2001 From: dnlup Date: Sat, 28 Oct 2017 22:50:55 +0200 Subject: fix(lint): Fix missing trailing comma Add missing trailing comma after `it` value in franz/src/i18n/languages.js. --- src/i18n/languages.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/languages.js b/src/i18n/languages.js index aefdca783..83f075c47 100644 --- a/src/i18n/languages.js +++ b/src/i18n/languages.js @@ -10,5 +10,5 @@ module.exports = { pl: 'Polish', ru: 'Русский', ua: 'Українська', - it: 'Italian' + it: 'Italian', }; -- cgit v1.2.3-54-g00ecf From 032bab130a3f6145b0351760bea6e04e9d1e87bc Mon Sep 17 00:00:00 2001 From: Danny Qiu Date: Sun, 29 Oct 2017 18:52:54 -0400 Subject: Reset setting status when navigating away from services screen --- src/actions/service.js | 1 + src/containers/settings/ServicesScreen.js | 2 ++ src/stores/ServicesStore.js | 5 +++++ 3 files changed, 8 insertions(+) diff --git a/src/actions/service.js b/src/actions/service.js index cdd4bbf16..ea6ea5acc 100644 --- a/src/actions/service.js +++ b/src/actions/service.js @@ -63,6 +63,7 @@ export default { needle: PropTypes.string.isRequired, }, resetFilter: {}, + resetStatus: {}, reorder: { oldIndex: PropTypes.number.isRequired, newIndex: PropTypes.number.isRequired, diff --git a/src/containers/settings/ServicesScreen.js b/src/containers/settings/ServicesScreen.js index d0580041f..8cfe5efbf 100644 --- a/src/containers/settings/ServicesScreen.js +++ b/src/containers/settings/ServicesScreen.js @@ -18,6 +18,7 @@ export default class ServicesScreen extends Component { componentWillUnmount() { this.props.actions.service.resetFilter(); + this.props.actions.service.resetStatus(); } deleteService() { @@ -70,6 +71,7 @@ ServicesScreen.wrappedComponent.propTypes = { toggleService: PropTypes.func.isRequired, filter: PropTypes.func.isRequired, resetFilter: PropTypes.func.isRequired, + resetStatus: PropTypes.func.isRequired, }).isRequired, }).isRequired, }; diff --git a/src/stores/ServicesStore.js b/src/stores/ServicesStore.js index 4510146e0..64e6bb42b 100644 --- a/src/stores/ServicesStore.js +++ b/src/stores/ServicesStore.js @@ -41,6 +41,7 @@ export default class ServicesStore extends Store { this.actions.service.openWindow.listen(this._openWindow.bind(this)); this.actions.service.filter.listen(this._filter.bind(this)); this.actions.service.resetFilter.listen(this._resetFilter.bind(this)); + this.actions.service.resetStatus.listen(this._resetStatus.bind(this)); this.actions.service.reload.listen(this._reload.bind(this)); this.actions.service.reloadActive.listen(this._reloadActive.bind(this)); this.actions.service.reloadAll.listen(this._reloadAll.bind(this)); @@ -338,6 +339,10 @@ export default class ServicesStore extends Store { this.filterNeedle = null; } + @action _resetStatus() { + this.actionStatus = []; + } + @action _reload({ serviceId }) { const service = this.one(serviceId); service.resetMessageCount(); -- cgit v1.2.3-54-g00ecf