Merge branch 'develop'

README.md

@@ -39,7 +39,7 @@ Supported operating systems:
 
 * **Mac OS X**
 
-  1. Install [Python 2.7](https://www.python.org)
+  1. Install [Python 2.7](https://www.python.org) and [Homebrew](https://brew.sh)
   2. Download and execute the [DMG package](https://github.com/FPGAwars/icestudio/releases)
 
 <img src="./doc/images/main.png" width="700" align="center">
@@ -102,10 +102,10 @@ npm run dist
 |:----------:|:------------------------------------------:|
 | English    | ![Progress](http://progressed.io/bar/100)  |
 | Spanish    | ![Progress](http://progressed.io/bar/100)  |
-| French     | ![Progress](http://progressed.io/bar/100)  |
-| Basque     | ![Progress](http://progressed.io/bar/97)   |
-| Galician   | ![Progress](http://progressed.io/bar/93)   |
-| Catalan    | ![Progress](http://progressed.io/bar/93)   |
+| French     | ![Progress](http://progressed.io/bar/95)   |
+| Basque     | ![Progress](http://progressed.io/bar/93)   |
+| Galician   | ![Progress](http://progressed.io/bar/89)   |
+| Catalan    | ![Progress](http://progressed.io/bar/89)   |
 
 **Contribute!**
 
@@ -115,7 +115,7 @@ Add or update the [app translations](https://github.com/FPGAwars/icestudio/tree/
 
 ## Troubleshooting
 
-If you get this error `npm ERR! peerinvalid The package [email protected] does not satisfy its siblings' peerDependencies requirements!`, execute:
+If you get this error `npm ERR! peerinvalid The package [email protected] does not satisfy its siblings' peerDependencies requirements!`, try to update your **[nodejs](https://github.com/nodejs/node)** or execute:
 
 ```bash
 npm update -g

app/bower.json

@@ -2,8 +2,8 @@
   "name": "icestudio",
   "description": "Experimental graphic editor for open FPGAs",
   "main": "index.html",
-  "authors": [
-    "Jesús Arroyo Torrens <[email protected]>",
+  "author": "Jesús Arroyo Torrens <[email protected]>",
+  "contributors": [
     "Tom Calvo <[email protected]>"
   ],
   "license": "GPL-2.0",
@@ -34,7 +34,7 @@
     "async": "^1.5.2",
     "svg-pan-zoom": "~3.4.0",
     "alertify-js": "^1.8.0",
-    "jquery-resize": "*",
+    "jquery-resize": "v1.1",
     "angular-gettext": "https://github.com/Jesus89/angular-gettext.git#master"
   }
 }

app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "icestudio",
-  "version": "0.3.0",
+  "version": "0.3.1-rc",
   "description": "Experimental graphic editor for open FPGAs",
   "author": "Jesús Arroyo Torrens <[email protected]>",
   "repository": "https://github.com/FPGAwars/icestudio",
@@ -27,28 +27,28 @@
   },
   "dependencies": {
     "adm-zip": "^0.4.7",
-    "angular-gettext-tools": "~2.3.3",
+    "angular-gettext-tools": "2.3.5",
     "copy-paste": "^1.3.0",
+    "extract-zip": "^1.6.5",
     "fs-extra": "^1.0.0",
-    "getos": "^2.8.4",
-    "glob": "^7.1.1",
+    "getos": "^3.0.1",
+    "glob": "^7.1.2",
     "is-online": "^5.2.0",
-    "jquery": "^3.1.1",
+    "jquery": "^3.2.1",
     "node-lang-info": "^0.2.1",
-    "os": "^0.1.1",
-    "path": "^0.12.7",
     "rmdir": "^1.2.0",
-    "rsyncwrapper": "^2.0.0",
+    "rsyncwrapper": "^2.0.1",
     "sha1": "^1.1.1",
     "ssh-exec": "^2.0.0",
-    "sudo-prompt": "^6.2.0",
-    "svgo": "~0.7.1",
-    "tarball-extract": "~0.0.6"
+    "sudo-prompt": "^7.1.0",
+    "svgo": "~0.7.2",
+    "temporary": "0.0.8"
   },
   "readme": "../README.md",
   "keywords": [
     "FPGA",
     "open",
+    "editor",
     "hardware"
   ]
 }