From 3f8dda693a90294c5ed776bd8470abe87b962e7f Mon Sep 17 00:00:00 2001
From: Etienne Trimaille <gustrimaille@yahoo.fr>
Date: Fri, 7 Feb 2020 12:23:25 +0100
Subject: [PATCH] release of 3.2.2

---
 CHANGELOG.md              | 8 ++++++++
 Makefile                  | 2 +-
 README.md                 | 4 +++-
 lizmap-locales            | 2 +-
 metadata.txt              | 8 +++++++-
 resources/ui/ui_lizmap.ui | 2 +-
 scripts/release.sh        | 3 +--
 7 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bb63774b..f273ca14 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # CHANGELOG
 
+## Version 3.2.2:
+
+* Fix bug about the new form with locate by layer #210
+* Refactor Edition panel to be editable
+* Refactor Attribute Table panel to be editable
+* Refactor Tooltip panel to be editable
+* Fix compulsory field in Filter by login
+
 ## Version 3.2.1
 
 * Remove experimental from 3.2.0
diff --git a/Makefile b/Makefile
index 4cc7eab4..3420117e 100644
--- a/Makefile
+++ b/Makefile
@@ -47,7 +47,7 @@
 # Edit the following to match your sources lists
 #################################################
 
-VERSION = "3.2.1"
+VERSION = "3.2.2"
 
 #Add iso code for any locales you want to support here (space separated)
 # default is no locales
diff --git a/README.md b/README.md
index a759dcad..88336353 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,11 @@
 ## [![logo](resources/icons/icon.png "3Liz")][3liz]Lizmap QGIS Plugin
 
-* Latest download link: https://plugins.qgis.org/plugins/lizmap/version/3.2.1/download/
+* Latest download link: https://plugins.qgis.org/plugins/lizmap/version/3.2.2/download/
 * All versions are available [here](https://plugins.qgis.org/plugins/lizmap/)
 * Do not use the link provided by GitHub by default.
 
+Banches :
+
 * The [dev](https://github.com/3liz/lizmap-plugin/tree/dev) branch is for the next release of [LWC](https://github.com/3liz/lizmap-web-client/). 
 * The [master](https://github.com/3liz/lizmap-plugin/tree/master) branch is for the actual released version on [qgis.org](https://plugins.qgis.org) and compatible with the current of [LWC](https://github.com/3liz/lizmap-web-client/). 
 
diff --git a/lizmap-locales b/lizmap-locales
index 4ff59c40..5ada7fa6 160000
--- a/lizmap-locales
+++ b/lizmap-locales
@@ -1 +1 @@
-Subproject commit 4ff59c4099a14e9544ae1b43dea908075d5368e8
+Subproject commit 5ada7fa6b820095f2d60a876c76aa361ab689a26
diff --git a/metadata.txt b/metadata.txt
index 2e2110f4..611f565b 100644
--- a/metadata.txt
+++ b/metadata.txt
@@ -7,11 +7,17 @@ description=Publish QGIS maps to the Web via Lizmap Web Client, by 3liz.com
 about=Publish QGIS maps to the Web via Lizmap Web Client, by 3liz.com. Documentation : https://docs.lizmap.com
 category=Web
 # set -beta for dev version
-version=3.2.1
+version=3.2.2
 ; end of mandatory metadata
 
 ; start of optional metadata
 changelog=
+  Version 3.2.2:
+  * Fix bug about the new form with locate by layer #210
+  * Refactor Edition panel to be editable
+  * Refactor Attribute Table panel to be editable
+  * Refactor Tooltip panel to be editable
+  * Fix compulsory field in Filter by login
   Version 3.2.1:
   * Remove experimental from 3.2.0
   * Refactor Locate by layer to be editable
diff --git a/resources/ui/ui_lizmap.ui b/resources/ui/ui_lizmap.ui
index 4d5b787c..51a7157f 100644
--- a/resources/ui/ui_lizmap.ui
+++ b/resources/ui/ui_lizmap.ui
@@ -2549,7 +2549,7 @@ This is different to the map maximum extent (defined in QGIS project properties,
                    <item>
                     <widget class="QPushButton" name="down_edition_layer">
                      <property name="text">
-                      <string>down</string>
+                      <string notr="true">down</string>
                      </property>
                     </widget>
                    </item>
diff --git a/scripts/release.sh b/scripts/release.sh
index 20ebfe5f..a1791dce 100755
--- a/scripts/release.sh
+++ b/scripts/release.sh
@@ -5,9 +5,8 @@ set -e
 METADATA=$(cat metadata.txt | grep "version=" |  cut -d '=' -f2)
 
 echo "Releasing version ${METADATA}"
-cd ..
 
-make docker_test
+# make docker_test
 
 git commit -am "release of ${METADATA}"
 git tag "${METADATA}"