diff --git a/js/messages.php b/js/messages.php
index 72d5f04ea3..f75c8662f8 100644
--- a/js/messages.php
+++ b/js/messages.php
@@ -293,9 +293,9 @@ echo "if ($.datepicker) {\n";
 /* l10n: Display text for calendar close link */
 PMA_printJsValue("$.datepicker.regional['']['closeText']", __('Done'));
 /* l10n: Display text for previous month link in calendar */
-PMA_printJsValue("$.datepicker.regional['']['prevText']", __('Prev'));
+PMA_printJsValue("$.datepicker.regional['']['prevText']", _pgettext('Previous month', 'Prev'));
 /* l10n: Display text for next month link in calendar */
-PMA_printJsValue("$.datepicker.regional['']['nextText']", __('Next'));
+PMA_printJsValue("$.datepicker.regional['']['nextText']", _pgettext('Next month', 'Next'));
 /* l10n: Display text for current month link in calendar */
 PMA_printJsValue("$.datepicker.regional['']['currentText']", __('Today'));
 PMA_printJsValue("$.datepicker.regional['']['monthNames']",
diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index 6912e38795..12917edb4a 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -2250,11 +2250,11 @@ function PMA_listNavigator($count, $pos, $_url_params, $script, $frame, $max_cou
             if ($GLOBALS['cfg']['NavigationBarIconic']) {
                 $caption1 = '<<';
                 $caption2 = ' < ';
-                $title1   = ' title="' . __('Begin') . '"';
-                $title2   = ' title="' . __('Previous') . '"';
+                $title1   = ' title="' . _pgettext('First page', 'Begin') . '"';
+                $title2   = ' title="' . _pgettext('Previous page', 'Previous') . '"';
             } else {
-                $caption1 = __('Begin') . ' <<';
-                $caption2 = __('Previous') . ' <';
+                $caption1 = _pgettext('First page', 'Begin') . ' <<';
+                $caption2 = _pgettext('Previous page', 'Previous') . ' <';
                 $title1   = '';
                 $title2   = '';
             } // end if... else...
@@ -2280,11 +2280,11 @@ function PMA_listNavigator($count, $pos, $_url_params, $script, $frame, $max_cou
             if ($GLOBALS['cfg']['NavigationBarIconic']) {
                 $caption3 = ' > ';
                 $caption4 = '>>';
-                $title3   = ' title="' . __('Next') . '"';
-                $title4   = ' title="' . __('End') . '"';
+                $title3   = ' title="' . _pgettext('Next page', 'Next') . '"';
+                $title4   = ' title="' . _pgettext('Last page', 'End') . '"';
             } else {
-                $caption3 = '> ' . __('Next');
-                $caption4 = '>> ' . __('End');
+                $caption3 = '> ' . _pgettext('Next page', 'Next');
+                $caption4 = '>> ' . _pgettext('Last page', 'End');
                 $title3   = '';
                 $title4   = '';
             } // end if... else...
diff --git a/server_binlog.php b/server_binlog.php
index 1b5545290a..e3ac8f45de 100644
--- a/server_binlog.php
+++ b/server_binlog.php
@@ -132,9 +132,9 @@ if ($pos > 0) {
 
     echo '<a href="./server_binlog.php' . PMA_generate_common_url($this_url_params) . '"';
     if ($GLOBALS['cfg']['NavigationBarIconic']) {
-        echo ' title="' . __('Previous') . '">';
+        echo ' title="' . _pgettext('Previous page', 'Previous') . '">';
     } else {
-        echo '>' . __('Previous');
+        echo '>' . _pgettext('Previous page', 'Previous');
     } // end if... else...
     echo ' &lt; </a> - ';
 }
@@ -167,9 +167,9 @@ if ($num_rows >= $GLOBALS['cfg']['MaxRows']) {
     $this_url_params['pos'] = $pos + $GLOBALS['cfg']['MaxRows'];
     echo ' - <a href="./server_binlog.php' . PMA_generate_common_url($this_url_params) . '"';
     if ($GLOBALS['cfg']['NavigationBarIconic']) {
-        echo ' title="' . __('Next') . '">';
+        echo ' title="' . _pgettext('Next page', 'Next') . '">';
     } else {
-        echo '>' . __('Next');
+        echo '>' . _pgettext('Next page', 'Next');
     } // end if... else...
     echo ' &gt; </a>';
 }