Merge branch 'master' of github.com:phpmyadmin/phpmyadmin

phpmyadmin · Jul 14, 2015 · 86e1510 · 86e1510
2 parents e70d2cf + c7a4d17
commit 86e1510
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -85,6 +85,7 @@ phpMyAdmin - ChangeLog
 - bug #4975 Move/Copy/Rename operations on Table/Db fail on Drizzle server
 - bug #4826 Two inline edit windows
 - bug #4979 Problem when import *.ods file
+- bug       Add missing head tag
 
 4.4.11.0 (2015-07-06)
 - bug       Missing selected/entered values when editing active options in visual query builder

diff --git a/libraries/Header.class.php b/libraries/Header.class.php
@@ -609,6 +609,7 @@ private function _getHtmlStart()
         $retval .= /*overload*/mb_strtolower(PMA_USR_BROWSER_AGENT) . " ";
         $retval .= /*overload*/mb_strtolower(PMA_USR_BROWSER_AGENT)
             . intval(PMA_USR_BROWSER_VER) . "'>";
+        $retval .= '<head>';
 
         return $retval;
     }

diff --git a/po/bn.po b/po/bn.po
@@ -4,16 +4,16 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 4.5.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2015-07-12 11:07-0400\n"
-"PO-Revision-Date: 2014-11-05 10:27+0200\n"
+"PO-Revision-Date: 2015-07-14 11:09+0200\n"
 "Last-Translator: Michal Čihař <michal@cihar.com>\n"
-"Language-Team: Bengali <https://hosted.weblate.org/projects/phpmyadmin/"
-"master/bn/>\n"
+"Language-Team: Bengali "
+"<https://hosted.weblate.org/projects/phpmyadmin/master/bn/>\n"
 "Language: bn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 2.0-dev\n"
+"X-Generator: Weblate 2.4-dev\n"
 
 #: changelog.php:37 license.php:28
 #, php-format
@@ -7562,6 +7562,7 @@ msgid "Connect without password"
 msgstr "পাসওর্য়াডহীন সংযোগ কর"
 
 #: libraries/config/messages.inc.php:668
+#, fuzzy
 msgid ""
 "You can use MySQL wildcard characters (% and _), escape them if you want to "
 "use their literal instances, i.e. use [kbd]'my\\_db'[/kbd] and not "
@@ -7570,8 +7571,8 @@ msgstr ""
 "আপনি MySQL wildcard অক্ষর (% and _)ব্যবহার করতে পারেন, ওগুলো escape করেন যদি "
 "এগুলো আক্ষরিকভাবে ব্যবহার করতে চান, যেমন [kbd]'my\\_db'[/kbd] এবং  "
 "[kbd]'my_db'[/kbd]'টি নয়। এই অপশন ব্যবহার করে ডাটাবেইজের তালিকা গুছানো যাবে, "
-"শুধু ওগুলোর নাম দেন এবং শেষে[kbd]*[/kbd] ব্যবহার করুন alphabetical ভাবে সাজানোর "
-"জন্য।"
+"শুধু ওগুলোর নাম দেন এবং শেষে[kbd]*[/kbd] ব্যবহার করুন alphabetical ভাবে "
+"সাজানোর জন্য।"
 
 #: libraries/config/messages.inc.php:672
 msgid "Show only listed databases"