From f384c820b7e243d29564e0b62147b31e8e4557e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <mcihar@suse.cz>
Date: Mon, 9 Apr 2012 21:07:27 +0200
Subject: [PATCH 1/4] Fix format string

---
 po/de.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/po/de.po b/po/de.po
index cb4fd72740..ebd293253d 100644
--- a/po/de.po
+++ b/po/de.po
@@ -12495,7 +12495,7 @@ msgid ""
 msgstr ""
 "Der Cache ist derzeit zu %s%% fragmentiert. 100%% Fragmentierung bedeuten "
 "dass der Abfrage-Cache ein abwechselndes Muster von freien und belegten "
-"Blöcke ist. Dieser Wert sollte unter 20% liegen."
+"Blöcke ist. Dieser Wert sollte unter 20%% liegen."
 
 #: po/advisory_rules.php:95
 msgid "Query cache low memory prunes"

From 591d1518fe190b48de98d4638b44634b64fd82d0 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Wed, 11 Apr 2012 12:34:31 -0400
Subject: [PATCH 2/4] 3.4.11-rc1

---
 Documentation.html         | 4 ++--
 README                     | 4 ++--
 libraries/Config.class.php | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Documentation.html b/Documentation.html
index affe1992a9..77dd1f664d 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -9,7 +9,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78
     <link rel="icon" href="./favicon.ico" type="image/x-icon" />
     <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" />
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title>phpMyAdmin 3.4.11-dev - Documentation</title>
+    <title>phpMyAdmin 3.4.11-rc1 - Documentation</title>
     <link rel="stylesheet" type="text/css" href="docs.css" />
 </head>
 
@@ -17,7 +17,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78
 <div id="header">
     <h1>
         <a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a>
-        3.4.11-dev
+        3.4.11-rc1
         Documentation
     </h1>
 </div>
diff --git a/README b/README
index aa9c279500..d949d52cb2 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
 phpMyAdmin - Readme
 ===================
 
-Version 3.4.11-dev
+Version 3.4.11-rc1
 
 A set of PHP-scripts to manage MySQL over the web.
 
@@ -13,7 +13,7 @@ Copyright
 Copyright (C) 1998-2000
     Tobias Ratschiller <tobias_at_ratschiller.com>
 
-Copyright (C) 2001-2011
+Copyright (C) 2001-2012
     Marc Delisle <marc_at_infomarc.info>
     Olivier Müller <om_at_omnis.ch>
     Robin Johnson <robbat2_at_users.sourceforge.net>
diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index f6d6c63dfa..87f1b4b1f4 100644
--- a/libraries/Config.class.php
+++ b/libraries/Config.class.php
@@ -96,7 +96,7 @@ class PMA_Config
      */
     function checkSystem()
     {
-        $this->set('PMA_VERSION', '3.4.11-dev');
+        $this->set('PMA_VERSION', '3.4.11-rc1');
         /**
          * @deprecated
          */

From 3345d64a6f9152e44837e8ec281824d2769ae274 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Sat, 14 Apr 2012 07:35:22 -0400
Subject: [PATCH 3/4] 3.4.11 release

---
 ChangeLog                  | 2 +-
 Documentation.html         | 4 ++--
 README                     | 2 +-
 libraries/Config.class.php | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 579db3d0a1..f7d873a5c7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
 phpMyAdmin - ChangeLog
 ======================
 
-3.4.11.0 (not yet released)
+3.4.11.0 (2012-04-14)
 - bug #3486970 [import] Exception on XML import
 - bug #3488777 [navi] $cfg['ShowTooltipAliasTB'] and blank names in navigation
 - bug #3512565 [navi] Fixed missing word "Rows" in table list tooltip after click
diff --git a/Documentation.html b/Documentation.html
index 77dd1f664d..30568fc3c7 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -9,7 +9,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78
     <link rel="icon" href="./favicon.ico" type="image/x-icon" />
     <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" />
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title>phpMyAdmin 3.4.11-rc1 - Documentation</title>
+    <title>phpMyAdmin 3.4.11 - Documentation</title>
     <link rel="stylesheet" type="text/css" href="docs.css" />
 </head>
 
@@ -17,7 +17,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78
 <div id="header">
     <h1>
         <a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a>
-        3.4.11-rc1
+        3.4.11
         Documentation
     </h1>
 </div>
diff --git a/README b/README
index d949d52cb2..b6ff898fb0 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
 phpMyAdmin - Readme
 ===================
 
-Version 3.4.11-rc1
+Version 3.4.11
 
 A set of PHP-scripts to manage MySQL over the web.
 
diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index 87f1b4b1f4..8f815b83b5 100644
--- a/libraries/Config.class.php
+++ b/libraries/Config.class.php
@@ -96,7 +96,7 @@ class PMA_Config
      */
     function checkSystem()
     {
-        $this->set('PMA_VERSION', '3.4.11-rc1');
+        $this->set('PMA_VERSION', '3.4.11');
         /**
          * @deprecated
          */

From ea17cef3425b7a4576e61a955ddbfdc8d7627453 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Sat, 14 Apr 2012 07:38:03 -0400
Subject: [PATCH 4/4] Fix merge conflicts

---
 ChangeLog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index ae3fff7661..7acf5a3e23 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -76,7 +76,7 @@ phpMyAdmin - ChangeLog
 - bug #3497151 [interface] Duplicate inline query edit box
 - bug #3504567 [mime] Description of the transformation missing in the tooltip 
 
-3.4.11.0 (not yet released)
+3.4.11.0 (2012-04-14)
 - bug #3486970 [import] Exception on XML import
 - bug #3488777 [navi] $cfg['ShowTooltipAliasTB'] and blank names in navigation