From 8960d2df910507a1a0872fe9deacb691b387527e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Olivier=20M=C3=BCller?= <om@omnis.ch>
Date: Thu, 30 Aug 2001 06:59:39 +0000
Subject: [PATCH]         * lib.inc.php3: now calls show_table_navigation()
 even if           $SelectNumRows is = 1.         * lang/*: added
 $strFullStrings and $strCuttedStrings

---
 ChangeLog                          | 5 +++++
 lang/brazilian_portuguese.inc.php3 | 2 ++
 lang/bulgarian-win1251.inc.php3    | 2 ++
 lang/catala.inc.php3               | 2 ++
 lang/chinese_big5.inc.php3         | 2 ++
 lang/chinese_gb.inc.php3           | 2 ++
 lang/czech-iso.inc.php3            | 2 ++
 lang/czech-win1250.inc.php3        | 2 ++
 lang/danish.inc.php3               | 2 ++
 lang/dutch.inc.php3                | 2 ++
 lang/english.inc.php3              | 2 ++
 lang/french.inc.php3               | 2 ++
 lang/galician.inc.php3             | 2 ++
 lang/german.inc.php3               | 2 ++
 lang/italian.inc.php3              | 2 ++
 lang/japanese.inc.php3             | 2 ++
 lang/korean.inc.php3               | 2 ++
 lang/norwegian.inc.php3            | 2 ++
 lang/polish.inc.php3               | 2 ++
 lang/portuguese.inc.php3           | 2 ++
 lang/romanian.inc.php3             | 2 ++
 lang/russian-koi8.inc.php3         | 2 ++
 lang/russian-win1251.inc.php3      | 2 ++
 lang/slovak-iso.inc.php3           | 2 ++
 lang/spanish.inc.php3              | 2 ++
 lang/swedish.inc.php3              | 2 ++
 lang/thai.inc.php3                 | 2 ++
 lib.inc.php3                       | 8 ++++----
 28 files changed, 61 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f14d278ea..9310dd0a4 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,11 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2001-08-30  Olivier Müller  <om@omnis.ch>
+	* lib.inc.php3: now calls show_table_navigation() even if
+	  $SelectNumRows is = 1.
+	* lang/*: added $strFullStrings and $strCuttedStrings
+
 2001-08-30  Loïc Chapeaux  <lolo@phpheaven.net>
 	* lib.inc.php3: fits to coding standards.
 
diff --git a/lang/brazilian_portuguese.inc.php3 b/lang/brazilian_portuguese.inc.php3
index fe5173c78..f5bb8861a 100644
--- a/lang/brazilian_portuguese.inc.php3
+++ b/lang/brazilian_portuguese.inc.php3
@@ -305,4 +305,6 @@ $strTables = '%s table(s)';  //to translate
 $strUseBackquotes = 'Use backquotes with tables and fields\' names';
 $strServerChoice = 'Server Choice';//to translate 
 $strPmaDocumentation = 'phpMyAdmin Documentation';//to translate 
+$strFullStrings = 'Full Strings';//to translate
+$strCuttedStrings = 'Cutted Strings';//to translate
 ?>
diff --git a/lang/bulgarian-win1251.inc.php3 b/lang/bulgarian-win1251.inc.php3
index c1cab64cf..a9cc94f00 100644
--- a/lang/bulgarian-win1251.inc.php3
+++ b/lang/bulgarian-win1251.inc.php3
@@ -305,4 +305,6 @@ $strTables = '%s table(s)';  //to translate
 $strUseBackquotes = 'Use backquotes with tables and fields\' names';
 $strServerChoice = 'Server Choice';//to translate 
 $strPmaDocumentation = 'phpMyAdmin Documentation';//to translate 
+$strFullStrings = 'Full Strings';//to translate
+$strCuttedStrings = 'Cutted Strings';//to translate
 ?>
diff --git a/lang/catala.inc.php3 b/lang/catala.inc.php3
index 1d5c61736..c5a38209d 100644
--- a/lang/catala.inc.php3
+++ b/lang/catala.inc.php3
@@ -300,4 +300,6 @@ $strTables = '%s table(s)';  //to translate
 $strUseBackquotes = 'Use backquotes with tables and fields\' names';
 $strServerChoice = 'Server Choice';//to translate 
 $strPmaDocumentation = 'phpMyAdmin Documentation';//to translate 
+$strFullStrings = 'Full Strings';//to translate
+$strCuttedStrings = 'Cutted Strings';//to translate
 ?>
diff --git a/lang/chinese_big5.inc.php3 b/lang/chinese_big5.inc.php3
index 5f25ee5aa..51ba54f41 100644
--- a/lang/chinese_big5.inc.php3
+++ b/lang/chinese_big5.inc.php3
@@ -301,4 +301,6 @@ $strTables = '%s table(s)';  //to translate
 $strUseBackquotes = ' Use backquotes with tables and fields names ';  //to translate
 $strServerChoice = 'Server Choice';//to translate 
 $strPmaDocumentation = 'phpMyAdmin Documentation';//to translate 
+$strFullStrings = 'Full Strings';//to translate
+$strCuttedStrings = 'Cutted Strings';//to translate
 ?>
diff --git a/lang/chinese_gb.inc.php3 b/lang/chinese_gb.inc.php3
index a2d4047c2..d049859ab 100644
--- a/lang/chinese_gb.inc.php3
+++ b/lang/chinese_gb.inc.php3
@@ -305,4 +305,6 @@ $strTables = '%s table(s)';  //to translate
 $strUseBackquotes = 'Use backquotes with tables and fields\' names';
 $strServerChoice = 'Server Choice';//to translate 
 $strPmaDocumentation = 'phpMyAdmin Documentation';//to translate 
+$strFullStrings = 'Full Strings';//to translate
+$strCuttedStrings = 'Cutted Strings';//to translate
 ?>
diff --git a/lang/czech-iso.inc.php3 b/lang/czech-iso.inc.php3
index 9c10a0a0c..29c4810f6 100644
--- a/lang/czech-iso.inc.php3
+++ b/lang/czech-iso.inc.php3
@@ -300,4 +300,6 @@ $strTables = '%s table(s)';  //to translate
 $strUseBackquotes = 'Use backquotes with tables and fields\' names';
 $strServerChoice = 'Server Choice';//to translate 
 $strPmaDocumentation = 'phpMyAdmin Documentation';//to translate 
+$strFullStrings = 'Full Strings';//to translate
+$strCuttedStrings = 'Cutted Strings';//to translate
 ?>
diff --git a/lang/czech-win1250.inc.php3 b/lang/czech-win1250.inc.php3
index d1ed5d2b1..6d7bdabe3 100644
--- a/lang/czech-win1250.inc.php3
+++ b/lang/czech-win1250.inc.php3
@@ -301,4 +301,6 @@ $strTables = '%s table(s)';  //to translate
 $strUseBackquotes = 'Use backquotes with tables and fields\' names';
 $strServerChoice = 'Server Choice';//to translate 
 $strPmaDocumentation = 'phpMyAdmin Documentation';//to translate 
+$strFullStrings = 'Full Strings';//to translate
+$strCuttedStrings = 'Cutted Strings';//to translate
 ?>
diff --git a/lang/danish.inc.php3 b/lang/danish.inc.php3
index 4bb96eba5..347ec3cd6 100644
--- a/lang/danish.inc.php3
+++ b/lang/danish.inc.php3
@@ -300,4 +300,6 @@ $strTables = '%s table(s)';  //to translate
 $strUseBackquotes = 'Use backquotes with tables and fields\' names';
 $strServerChoice = 'Server Choice';//to translate 
 $strPmaDocumentation = 'phpMyAdmin Documentation';//to translate 
+$strFullStrings = 'Full Strings';//to translate
+$strCuttedStrings = 'Cutted Strings';//to translate
 ?>
diff --git a/lang/dutch.inc.php3 b/lang/dutch.inc.php3
index 591cdf3c2..e0ca12619 100644
--- a/lang/dutch.inc.php3
+++ b/lang/dutch.inc.php3
@@ -300,4 +300,6 @@ $strGzip = '"gzipped"';
 $strNoDropDatabases = '"DROP DATABASE" statements are disabled.';
 $strOffSet = 'offset';
 $strUseBackquotes = 'Use backquotes with tables and fields\' names';
+$strFullStrings = 'Full Strings';//to translate
+$strCuttedStrings = 'Cutted Strings';//to translate
 ?>
diff --git a/lang/english.inc.php3 b/lang/english.inc.php3
index 59f934bee..49ee8b0df 100644
--- a/lang/english.inc.php3
+++ b/lang/english.inc.php3
@@ -298,4 +298,6 @@ $strWelcome = 'Welcome to ';
 $strWrongUser = 'Wrong username/password. Access denied.';
 
 $strYes = 'Yes';
+$strFullStrings = 'Full Strings';//to translate
+$strCuttedStrings = 'Cutted Strings';//to translate
 ?>
diff --git a/lang/french.inc.php3 b/lang/french.inc.php3
index 48d64f8da..0f8a1c471 100644
--- a/lang/french.inc.php3
+++ b/lang/french.inc.php3
@@ -298,4 +298,6 @@ $strWelcome = 'Bienvenue 
 $strWrongUser = 'Erreur d\'utilisateur/mot de passe. Accès refusé';
 
 $strYes = 'Oui';
+$strFullStrings = 'Full Strings';//to translate
+$strCuttedStrings = 'Cutted Strings';//to translate
 ?>
diff --git a/lang/galician.inc.php3 b/lang/galician.inc.php3
index 62e72cb1a..aa5ec0477 100644
--- a/lang/galician.inc.php3
+++ b/lang/galician.inc.php3
@@ -299,4 +299,6 @@ $strSort = 'Sort'; // To translate
 $strStrucExcelCSV = 'CSV for Ms Excel data'; // To translate
 $strTables = '%s table(s)'; // To translate
 $strUpdateQuery = 'Update Query'; // To translate
+$strFullStrings = 'Full Strings';//to translate
+$strCuttedStrings = 'Cutted Strings';//to translate
 ?>
diff --git a/lang/german.inc.php3 b/lang/german.inc.php3
index b922163f7..65c42b859 100644
--- a/lang/german.inc.php3
+++ b/lang/german.inc.php3
@@ -299,4 +299,6 @@ $strWrongUser = 'Falscher Benutzername/Passwort. Zugriff verweigert.';
 
 $strYes = 'Ja';
 
+$strFullStrings = 'Full Strings';//to translate
+$strCuttedStrings = 'Cutted Strings';//to translate
 ?>
diff --git a/lang/italian.inc.php3 b/lang/italian.inc.php3
index 1ffb9bd55..19411eb94 100644
--- a/lang/italian.inc.php3
+++ b/lang/italian.inc.php3
@@ -300,4 +300,6 @@ $strTables = '%s table(s)';  //to translate
 $strUseBackquotes = 'Use backquotes with tables and fields\' names';
 $strServerChoice = 'Server Choice';//to translate 
 $strPmaDocumentation = 'phpMyAdmin Documentation';//to translate 
+$strFullStrings = 'Full Strings';//to translate
+$strCuttedStrings = 'Cutted Strings';//to translate
 ?>
diff --git a/lang/japanese.inc.php3 b/lang/japanese.inc.php3
index ee9fd310f..fafee0a45 100644
--- a/lang/japanese.inc.php3
+++ b/lang/japanese.inc.php3
@@ -304,4 +304,6 @@ $strTables = '%s table(s)';  //to translate
 $strUseBackquotes = 'Use backquotes with tables and fields\' names';
 $strServerChoice = 'Server Choice';//to translate 
 $strPmaDocumentation = 'phpMyAdmin Documentation';//to translate 
+$strFullStrings = 'Full Strings';//to translate
+$strCuttedStrings = 'Cutted Strings';//to translate
 ?>
diff --git a/lang/korean.inc.php3 b/lang/korean.inc.php3
index 162a08178..d8489b434 100644
--- a/lang/korean.inc.php3
+++ b/lang/korean.inc.php3
@@ -304,4 +304,6 @@ $strTables = '%s table(s)';  //to translate
 $strUseBackquotes = 'Use backquotes with tables and fields\' names';
 $strServerChoice = 'Server Choice';//to translate 
 $strPmaDocumentation = 'phpMyAdmin Documentation';//to translate 
+$strFullStrings = 'Full Strings';//to translate
+$strCuttedStrings = 'Cutted Strings';//to translate
 ?>
diff --git a/lang/norwegian.inc.php3 b/lang/norwegian.inc.php3
index a12a0a4c4..48befe4e6 100644
--- a/lang/norwegian.inc.php3
+++ b/lang/norwegian.inc.php3
@@ -304,4 +304,6 @@ $strTables = '%s table(s)';  //to translate
 $strUseBackquotes = 'Use backquotes with tables and fields\' names';
 $strServerChoice = 'Server Choice';//to translate 
 $strPmaDocumentation = 'phpMyAdmin Documentation';//to translate 
+$strFullStrings = 'Full Strings';//to translate
+$strCuttedStrings = 'Cutted Strings';//to translate
 ?>
diff --git a/lang/polish.inc.php3 b/lang/polish.inc.php3
index c83275528..efaf44043 100644
--- a/lang/polish.inc.php3
+++ b/lang/polish.inc.php3
@@ -299,4 +299,6 @@ $strYes = 'Tak';
 // To translate
 $strServerChoice = 'Server Choice';//to translate 
 $strPmaDocumentation = 'phpMyAdmin Documentation';//to translate 
+$strFullStrings = 'Full Strings';//to translate
+$strCuttedStrings = 'Cutted Strings';//to translate
 ?>
diff --git a/lang/portuguese.inc.php3 b/lang/portuguese.inc.php3
index 9d9ac1b8c..ec800832c 100644
--- a/lang/portuguese.inc.php3
+++ b/lang/portuguese.inc.php3
@@ -304,4 +304,6 @@ $strTables = '%s table(s)';  //to translate
 $strUseBackquotes = 'Use backquotes with tables and fields\' names';
 $strServerChoice = 'Server Choice';//to translate 
 $strPmaDocumentation = 'phpMyAdmin Documentation';//to translate 
+$strFullStrings = 'Full Strings';//to translate
+$strCuttedStrings = 'Cutted Strings';//to translate
 ?>
diff --git a/lang/romanian.inc.php3 b/lang/romanian.inc.php3
index 4d4876b6f..7267c1e79 100644
--- a/lang/romanian.inc.php3
+++ b/lang/romanian.inc.php3
@@ -298,4 +298,6 @@ $strWelcome = 'Bun venit la ';
 $strWrongUser = 'Nume de utilizator/Parola incorecta. Accesul interzis.';
 
 $strYes = 'Da';
+$strFullStrings = 'Full Strings';//to translate
+$strCuttedStrings = 'Cutted Strings';//to translate
 ?>
diff --git a/lang/russian-koi8.inc.php3 b/lang/russian-koi8.inc.php3
index 82e19d175..15479e529 100644
--- a/lang/russian-koi8.inc.php3
+++ b/lang/russian-koi8.inc.php3
@@ -300,4 +300,6 @@ $strStrucExcelCSV = 'CSV for Ms Excel data';
 $strTables = '%s table(s)';  //to translate
 $strServerChoice = 'Server Choice';//to translate 
 $strPmaDocumentation = 'phpMyAdmin Documentation';//to translate 
+$strFullStrings = 'Full Strings';//to translate
+$strCuttedStrings = 'Cutted Strings';//to translate
 ?>
diff --git a/lang/russian-win1251.inc.php3 b/lang/russian-win1251.inc.php3
index 5177defe0..22b308019 100644
--- a/lang/russian-win1251.inc.php3
+++ b/lang/russian-win1251.inc.php3
@@ -300,4 +300,6 @@ $strStrucExcelCSV = 'CSV for Ms Excel data';
 $strTables = '%s table(s)';  //to translate
 $strServerChoice = 'Server Choice';//to translate 
 $strPmaDocumentation = 'phpMyAdmin Documentation';//to translate 
+$strFullStrings = 'Full Strings';//to translate
+$strCuttedStrings = 'Cutted Strings';//to translate
 ?>
diff --git a/lang/slovak-iso.inc.php3 b/lang/slovak-iso.inc.php3
index 22acb6a83..2d72831ff 100644
--- a/lang/slovak-iso.inc.php3
+++ b/lang/slovak-iso.inc.php3
@@ -301,4 +301,6 @@ $strStrucExcelCSV = 'CSV for Ms Excel data';
 $strTables = '%s table(s)';  //to translate
 $strServerChoice = 'Server Choice';//to translate 
 $strPmaDocumentation = 'phpMyAdmin Documentation';//to translate 
+$strFullStrings = 'Full Strings';//to translate
+$strCuttedStrings = 'Cutted Strings';//to translate
 ?>
diff --git a/lang/spanish.inc.php3 b/lang/spanish.inc.php3
index 70c981f0d..2af8e89c6 100644
--- a/lang/spanish.inc.php3
+++ b/lang/spanish.inc.php3
@@ -300,4 +300,6 @@ $strBzip = '"bzipped"';  //to translate
 $strGzip = '"gzipped"';  //to translate
 $strOffSet = 'offset';  //to translate
 $strStrucExcelCSV = 'CSV for Ms Excel data';
+$strFullStrings = 'Full Strings';//to translate
+$strCuttedStrings = 'Cutted Strings';//to translate
 ?>
diff --git a/lang/swedish.inc.php3 b/lang/swedish.inc.php3
index d0ba8cb28..45e4704a4 100644
--- a/lang/swedish.inc.php3
+++ b/lang/swedish.inc.php3
@@ -298,4 +298,6 @@ $strWelcome = 'V
 $strWrongUser = 'Fel användarnamn/lösenord. Åtkomst nekad.';
 
 $strYes = 'Ja';
+$strFullStrings = 'Full Strings';//to translate
+$strCuttedStrings = 'Cutted Strings';//to translate
 ?>
diff --git a/lang/thai.inc.php3 b/lang/thai.inc.php3
index 2b0943fc3..e302aa974 100644
--- a/lang/thai.inc.php3
+++ b/lang/thai.inc.php3
@@ -305,4 +305,6 @@ $strTables = '%s table(s)';  //to translate
 $strUseBackquotes = 'Use backquotes with tables and fields\' names';
 $strServerChoice = 'Server Choice';//to translate 
 $strPmaDocumentation = 'phpMyAdmin Documentation';//to translate 
+$strFullStrings = 'Full Strings';//to translate
+$strCuttedStrings = 'Cutted Strings';//to translate
 ?>
diff --git a/lib.inc.php3 b/lib.inc.php3
index 54d1b514f..53ac00968 100755
--- a/lib.inc.php3
+++ b/lib.inc.php3
@@ -980,8 +980,8 @@ var errorMsg2 = '<?php echo(str_replace('\'', '\\\'', $GLOBALS['strNotValidNumbe
             $table = $field->table;
         }
         mysql_field_seek($dt_result, 0);
-        if (!$is_simple
-            && (!isset($SelectNumRows) || $SelectNumRows > 1)) {
+        if (!$is_simple) {
+            // && (!isset($SelectNumRows) || $SelectNumRows > 1)) {
             show_table_navigation($pos_next, $pos_prev, $dt_result);
         } else {
             echo "\n" . '<br /><br />' . "\n";
@@ -1253,8 +1253,8 @@ var errorMsg2 = '<?php echo(str_replace('\'', '\\\'', $GLOBALS['strNotValidNumbe
 
         <?php
         echo "\n";
-        if (!$is_simple
-            && (!isset($SelectNumRows) || $SelectNumRows > 1)) {
+        if (!$is_simple) {
+            // && (!isset($SelectNumRows) || $SelectNumRows > 1)) {
             show_table_navigation($pos_next, $pos_prev, $dt_result);
         } else {
             echo "\n" . '<br />' . "\n";