Fix merge conflict

Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-02-04 11:30:41 -05:00 · 2015-02-04 11:30:41 -05:00 · b83cdcd4ae
commit b83cdcd4ae
parent a9729f46cb ad84a3fe28
2 changed files with 2 additions and 1 deletions
--- a/1
+++ b/1
@ -32,6 +32,7 @@ phpMyAdmin - ChangeLog
 + rfe #1260 Setting LoginCookieValidity > session.gc_maxlifetime
 + rfe       Transformation for JSON
 - bug       Fix isCanvasSupported for new window
+ rfe #1600 Clarify the "Inline" link

 4.3.9.0 (not yet released)
 - bug #4728 Incorrect headings in routine editor
--- a/libraries/Util.class.php
+++ b/libraries/Util.class.php
@ -1272,7 +1272,7 @@ class PMA_Util
                $inline_edit_link = ' ['
                    . self::linkOrButton(
                        '#',
-                        _pgettext('Inline edit query', 'Inline'),
+                        _pgettext('Inline edit query', 'Edit inline'),
                        array('class' => 'inline_edit_sql')
                    )
                    . ']';