From 866376e1da2e0c24c1c7e8577b81f6b872896f77 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Thu, 27 Mar 2014 08:04:34 -0400
Subject: [PATCH 1/2] 4.1.13-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 ae1c94f36a..f50de1a347 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,9 @@
 phpMyAdmin - ChangeLog
 ======================
 
-4.1.12.0 (not yet released)
+4.1.13.0 (not yet released)
+
+4.1.12.0 (2014-03-27)
 - bug #4334 Add event : datepicker won't open
 - bug #4338 Fix missing value error while executing SQL query
 - TCPDF library is now optional dependency
diff --git a/README b/README
index 1b4a67ddcb..cf8615a053 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
 phpMyAdmin - Readme
 ===================
 
-Version 4.1.12-dev
+Version 4.1.13-dev
 
 A set of PHP-scripts to manage MySQL over the web.
 
diff --git a/doc/conf.py b/doc/conf.py
index 7eb3cef154..8d81dd1f0f 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -49,7 +49,7 @@ copyright = u'2012 - 2014, The phpMyAdmin devel team'
 # built documents.
 #
 # The short X.Y version.
-version = '4.1.12-dev'
+version = '4.1.13-dev'
 # The full version, including alpha/beta/rc tags.
 release = version
 
diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index e79ad9f10c..1587773fc5 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.1.12-dev');
+        $this->set('PMA_VERSION', '4.1.13-dev');
         /**
          * @deprecated
          */

From 6c4aef59b01f879d137d9ba7a96023c480329343 Mon Sep 17 00:00:00 2001
From: Giovanni Sora <g.sora@tiscali.it>
Date: Thu, 27 Mar 2014 09:45:45 +0100
Subject: [PATCH 2/2] Translated using Weblate (Interlingua)

Currently translated at 42.0% (1156 of 2749)
---
 po/ia.po | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/po/ia.po b/po/ia.po
index 235a0bb0b5..f9a05a0553 100644
--- a/po/ia.po
+++ b/po/ia.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 4.1.6-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2014-01-19 08:19-0500\n"
-"PO-Revision-Date: 2014-03-25 11:53+0200\n"
+"PO-Revision-Date: 2014-03-27 09:45+0200\n"
 "Last-Translator: Giovanni Sora <g.sora@tiscali.it>\n"
 "Language-Team: Interlingua "
 "<https://l10n.cihar.com/projects/phpmyadmin/4-1/ia/>\n"
@@ -6912,6 +6912,9 @@ msgid ""
 "to the PHP timeout limit. <i>(This might be a good way to import large "
 "files, however it can break transactions.)</i>"
 msgstr ""
+"Permitte le interruption de un importation quando le script releva que il es "
+"proxime al limite de expiration. <i> (Isto poterea esser un bon modo de "
+"importar grande files, totevia il pote interrumper transactiones.) </i>"
 
 #: libraries/display_import.lib.php:303
 msgid ""
@@ -8295,6 +8298,8 @@ msgid ""
 "Display comments <i>(includes info such as export timestamp, PHP version, "
 "and server version)</i>"
 msgstr ""
+"Monstra  commentos <i>(include como le timbro horari de exportation, version "
+"de PHP, e version de servitor)</i>"
 
 #: libraries/plugins/export/ExportSql.class.php:100
 msgid "Additional custom header comment (\\n splits lines):"