From 24a038552d0499d504aaa19caf2e136ef86fe9d0 Mon Sep 17 00:00:00 2001
From: zz <tczzjin@gmail.com>
Date: Mon, 2 Mar 2015 04:29:20 +0100
Subject: [PATCH 1/2] Translated using Weblate (Chinese (China))

Currently translated at 82.8% (2469 of 2980 strings)

[CI skip]
---
 po/zh_CN.po | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 8b7d639bc8..4e259973c6 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -4,8 +4,8 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 4.3.5-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2015-01-01 08:24-0500\n"
-"PO-Revision-Date: 2015-02-27 06:18+0200\n"
-"Last-Translator: Rex Lee <duguying2008@gmail.com>\n"
+"PO-Revision-Date: 2015-03-02 04:29+0200\n"
+"Last-Translator: zz <tczzjin@gmail.com>\n"
 "Language-Team: Chinese (China) "
 "<https://hosted.weblate.org/projects/phpmyadmin/4-3/zh_CN/>\n"
 "Language: zh_CN\n"
@@ -31,7 +31,7 @@ msgid "Click to sort."
 msgstr "点击以排序。"
 
 #: db_central_columns.php:125
-#, fuzzy, php-format
+#, php-format
 #| msgid "Showing row(s) %1$s - %2$s"
 msgid "Showing rows %1$s - %2$s."
 msgstr "正在显示第 %1$s - %2$s 行"
@@ -252,7 +252,7 @@ msgid "Database %1$s has been copied to %2$s."
 msgstr "已将数据库 %1$s 复制至 %2$s。"
 
 #: db_operations.php:266
-#, fuzzy, php-format
+#, php-format
 #| msgid ""
 #| "The phpMyAdmin configuration storage has been deactivated. To find out "
 #| "why click %shere%s."

From 8b5f4f4a8b61b6862bf732aed830b67239950bf6 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Mon, 2 Mar 2015 12:23:03 -0500
Subject: [PATCH 2/2] 4.3.12-dev

Signed-off-by: Marc Delisle <marc@infomarc.info>
---
 ChangeLog                  | 4 +++-
 README                     | 2 +-
 doc/conf.py                | 2 +-
 libraries/Config.class.php | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 105e2d8f28..7fbb351cce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,9 @@
 phpMyAdmin - ChangeLog
 ======================
 
-4.3.11.0 (not yet released)
+4.3.12.0 (not yet released)
+
+4.3.11.0 (2015-03-02)
 - bug #4774 SQL links are completely wrong
 - bug #4768 MariaDB: version mismatch
 - bug #4777 Some images are missing in Designer for original theme
diff --git a/README b/README
index aa5b760375..fe1077eacc 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
 phpMyAdmin - Readme
 ===================
 
-Version 4.3.11-dev
+Version 4.3.12-dev
 
 A set of PHP-scripts to manage MySQL over the web.
 
diff --git a/doc/conf.py b/doc/conf.py
index 57f3331410..b0c8cfd870 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -51,7 +51,7 @@ copyright = u'2012 - 2014, The phpMyAdmin devel team'
 # built documents.
 #
 # The short X.Y version.
-version = '4.3.11-dev'
+version = '4.3.12-dev'
 # The full version, including alpha/beta/rc tags.
 release = version
 
diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index 4b349a9721..45746e6546 100644
--- a/libraries/Config.class.php
+++ b/libraries/Config.class.php
@@ -114,7 +114,7 @@ class PMA_Config
      */
     function checkSystem()
     {
-        $this->set('PMA_VERSION', '4.3.11-dev');
+        $this->set('PMA_VERSION', '4.3.12-dev');
         /**
          * @deprecated
          */