diff --git a/.travis.yml b/.travis.yml
index 68e7de7112..1a6e28d341 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -74,9 +74,9 @@ matrix:
       before_install:
         - brew update
         - brew tap homebrew/php
-        - brew install gettext php71 mariadb
+        - brew install gettext php72 mariadb
         - brew link --force gettext
-        - sed -i -e 's/^memory_limit = .*/memory_limit = -1/' /usr/local/etc/php/7.1/php.ini
+        - sed -i -e 's/^memory_limit = .*/memory_limit = -1/' /usr/local/etc/php/7.2/php.ini
         - curl https://getcomposer.org/installer | php
         - ln -s "`pwd`/composer.phar" /usr/local/bin/composer
         - mysql.server start
diff --git a/composer.json b/composer.json
index 04859859ae..65be479480 100644
--- a/composer.json
+++ b/composer.json
@@ -47,7 +47,7 @@
         "ext-ctype": "*",
         "ext-hash": "*",
         "phpmyadmin/sql-parser": "^4.2.3",
-        "phpmyadmin/motranslator": "^3.4",
+        "phpmyadmin/motranslator": "^4.0",
         "phpmyadmin/shapefile": "^2.0",
         "phpseclib/phpseclib": "^2.0",
         "google/recaptcha": "^1.1",
diff --git a/js/makegrid.js b/js/makegrid.js
index a0764b5cfe..38c5607b1e 100644
--- a/js/makegrid.js
+++ b/js/makegrid.js
@@ -998,6 +998,16 @@ function PMA_makegrid (t, enableResize, enableReorder, enableVisib, enableGridEd
                             if (typeof data !== 'undefined' && data.success === true) {
                                 $td.data('original_data', data.value);
                                 $(g.cEdit).find('.edit_box').val(data.value);
+                                $editArea.append('<textarea rows="15"></textarea>');
+                                $editArea.find('textarea').val(data.value);
+                                $editArea.on('keyup', 'textarea', function () {
+                                    $(g.cEdit).find('.edit_box').val($(this).val());
+                                });
+                                $(g.cEdit).on('keyup', '.edit_box', function () {
+                                    $editArea.find('textarea').val($(this).val());
+                                });
+                                $editArea.append('<div class="cell_edit_hint">' + g.cellEditHint + '</div>');
+                                $editArea.show();
                             } else {
                                 PMA_ajaxShowMessage(data.error, false);
                             }
diff --git a/libraries/classes/Language.php b/libraries/classes/Language.php
index 91bcef2631..93080f3a45 100644
--- a/libraries/classes/Language.php
+++ b/libraries/classes/Language.php
@@ -173,6 +173,10 @@ class Language
         _setlocale(0, $this->code);
         _bindtextdomain('phpmyadmin', LOCALE_PATH);
         _textdomain('phpmyadmin');
+        // Set PHP locale as well
+        if (function_exists('setlocale')) {
+            setlocale(0, $this->code);
+        }
 
         /* Text direction for language */
         if ($this->isRTL()) {