diff --git a/ChangeLog b/ChangeLog
index 83d21ef8d..d487f57d6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -24,6 +24,8 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
 - patch #2099962 [js] fix js error without frameset, thanks to Xuefer 
 - patch #2099972 [structure] Display None when there is no default value,
   thanks to Xuefer - xuefer
+- patch #2122883 [PDF schema] Option to display just the keys,
+  thanks to Samuel Sol Villar dos Santos - yohanleafheart
 
 3.0.1.0 (not yet released)
 
diff --git a/db_operations.php b/db_operations.php
index eee599081..3fdec290c 100644
--- a/db_operations.php
+++ b/db_operations.php
@@ -630,6 +630,8 @@ if ($cfgRelation['pdfwork'] && $num_tables > 0) { ?>
             </label><br />
         <input type="checkbox" name="with_doc" id="with_doc" checked="checked" />
         <label for="with_doc"><?php echo $strDataDict; ?></label><br />
+		<input type="checkbox" name="show_keys" id="show_keys" />
+        <label for="show_keys"><?php echo $strShowKeys; ?></label><br />
 
         <label for="orientation_opt"><?php echo $strShowDatadictAs; ?></label>
         <select name="orientation" id="orientation_opt">
diff --git a/lang/afrikaans-utf-8.inc.php b/lang/afrikaans-utf-8.inc.php
index 4065027e9..5a55bfe5a 100644
--- a/lang/afrikaans-utf-8.inc.php
+++ b/lang/afrikaans-utf-8.inc.php
@@ -1119,4 +1119,5 @@ $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
 $strLogServerHelp = 'You can enter hostname/IP address and port separated by space.';  //to translate
+$strShowKeys = 'Only show keys';  //to translate
 ?>
diff --git a/lang/albanian-utf-8.inc.php b/lang/albanian-utf-8.inc.php
index 9c6ed4a08..c519c91ab 100644
--- a/lang/albanian-utf-8.inc.php
+++ b/lang/albanian-utf-8.inc.php
@@ -1118,4 +1118,5 @@ $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
 $strLogServerHelp = 'You can enter hostname/IP address and port separated by space.';  //to translate
+$strShowKeys = 'Only show keys';  //to translate
 ?>
diff --git a/lang/arabic-utf-8.inc.php b/lang/arabic-utf-8.inc.php
index 2c1fba98f..b8084fafd 100644
--- a/lang/arabic-utf-8.inc.php
+++ b/lang/arabic-utf-8.inc.php
@@ -1120,4 +1120,5 @@ $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
 $strLogServerHelp = 'You can enter hostname/IP address and port separated by space.';  //to translate
+$strShowKeys = 'Only show keys';  //to translate
 ?>
diff --git a/lang/azerbaijani-utf-8.inc.php b/lang/azerbaijani-utf-8.inc.php
index c8d1685fc..590d17efe 100644
--- a/lang/azerbaijani-utf-8.inc.php
+++ b/lang/azerbaijani-utf-8.inc.php
@@ -1115,4 +1115,5 @@ $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
 $strLogServerHelp = 'You can enter hostname/IP address and port separated by space.';  //to translate
+$strShowKeys = 'Only show keys';  //to translate
 ?>
diff --git a/lang/bangla-utf-8.inc.php b/lang/bangla-utf-8.inc.php
index 5696bf7d4..0a11c7bf5 100644
--- a/lang/bangla-utf-8.inc.php
+++ b/lang/bangla-utf-8.inc.php
@@ -1094,4 +1094,5 @@ $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
 $strLogServerHelp = 'You can enter hostname/IP address and port separated by space.';  //to translate
+$strShowKeys = 'Only show keys';  //to translate
 ?>
diff --git a/lang/basque-utf-8.inc.php b/lang/basque-utf-8.inc.php
index cdd129e26..83d67a3b1 100644
--- a/lang/basque-utf-8.inc.php
+++ b/lang/basque-utf-8.inc.php
@@ -1112,4 +1112,5 @@ $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
 $strLogServerHelp = 'You can enter hostname/IP address and port separated by space.';  //to translate
+$strShowKeys = 'Only show keys';  //to translate
 ?>
diff --git a/lang/belarusian_cyrillic-utf-8.inc.php b/lang/belarusian_cyrillic-utf-8.inc.php
index a2033d4fa..f52e375dd 100644
--- a/lang/belarusian_cyrillic-utf-8.inc.php
+++ b/lang/belarusian_cyrillic-utf-8.inc.php
@@ -1095,4 +1095,5 @@ $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
 $strLogServerHelp = 'You can enter hostname/IP address and port separated by space.';  //to translate
+$strShowKeys = 'Only show keys';  //to translate
 ?>
diff --git a/lang/belarusian_latin-utf-8.inc.php b/lang/belarusian_latin-utf-8.inc.php
index 784512add..9699d5992 100644
--- a/lang/belarusian_latin-utf-8.inc.php
+++ b/lang/belarusian_latin-utf-8.inc.php
@@ -1103,4 +1103,5 @@ $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
 $strLogServerHelp = 'You can enter hostname/IP address and port separated by space.';  //to translate
+$strShowKeys = 'Only show keys';  //to translate
 ?>
diff --git a/lang/bosnian-utf-8.inc.php b/lang/bosnian-utf-8.inc.php
index f1eeae6d7..668f04380 100644
--- a/lang/bosnian-utf-8.inc.php
+++ b/lang/bosnian-utf-8.inc.php
@@ -1118,4 +1118,5 @@ $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
 $strLogServerHelp = 'You can enter hostname/IP address and port separated by space.';  //to translate
+$strShowKeys = 'Only show keys';  //to translate
 ?>
diff --git a/lang/brazilian_portuguese-utf-8.inc.php b/lang/brazilian_portuguese-utf-8.inc.php
index 8c7a6c270..5be9120a7 100644
--- a/lang/brazilian_portuguese-utf-8.inc.php
+++ b/lang/brazilian_portuguese-utf-8.inc.php
@@ -1092,4 +1092,5 @@ $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
 $strLogServerHelp = 'You can enter hostname/IP address and port separated by space.';  //to translate
+$strShowKeys = 'Only show keys';  //to translate
 ?>
diff --git a/lang/bulgarian-utf-8.inc.php b/lang/bulgarian-utf-8.inc.php
index 8921ff73c..1a72dfdde 100644
--- a/lang/bulgarian-utf-8.inc.php
+++ b/lang/bulgarian-utf-8.inc.php
@@ -1115,4 +1115,5 @@ $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
 $strLogServerHelp = 'You can enter hostname/IP address and port separated by space.';  //to translate
+$strShowKeys = 'Only show keys';  //to translate
 ?>
diff --git a/lang/catalan-utf-8.inc.php b/lang/catalan-utf-8.inc.php
index ea8d015aa..0458f8328 100644
--- a/lang/catalan-utf-8.inc.php
+++ b/lang/catalan-utf-8.inc.php
@@ -1090,4 +1090,5 @@ $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
 $strLogServerHelp = 'You can enter hostname/IP address and port separated by space.';  //to translate
+$strShowKeys = 'Only show keys';  //to translate
 ?>
diff --git a/lang/chinese_simplified-utf-8.inc.php b/lang/chinese_simplified-utf-8.inc.php
index 33e1e3784..97f010b8f 100644
--- a/lang/chinese_simplified-utf-8.inc.php
+++ b/lang/chinese_simplified-utf-8.inc.php
@@ -1120,4 +1120,5 @@ $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
 $strLogServerHelp = 'You can enter hostname/IP address and port separated by space.';  //to translate
+$strShowKeys = 'Only show keys';  //to translate
 ?>
diff --git a/lang/chinese_traditional-utf-8.inc.php b/lang/chinese_traditional-utf-8.inc.php
index dfe98568a..d58bdb652 100644
--- a/lang/chinese_traditional-utf-8.inc.php
+++ b/lang/chinese_traditional-utf-8.inc.php
@@ -1099,4 +1099,5 @@ $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
 $strLogServerHelp = 'You can enter hostname/IP address and port separated by space.';  //to translate
+$strShowKeys = 'Only show keys';  //to translate
 ?>
diff --git a/lang/croatian-utf-8.inc.php b/lang/croatian-utf-8.inc.php
index 9f504dcaf..578f50ec1 100644
--- a/lang/croatian-utf-8.inc.php
+++ b/lang/croatian-utf-8.inc.php
@@ -1093,4 +1093,5 @@ $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
 $strLogServerHelp = 'You can enter hostname/IP address and port separated by space.';  //to translate
+$strShowKeys = 'Only show keys';  //to translate
 ?>
diff --git a/lang/czech-utf-8.inc.php b/lang/czech-utf-8.inc.php
index aa1779675..f27584aac 100644
--- a/lang/czech-utf-8.inc.php
+++ b/lang/czech-utf-8.inc.php
@@ -1097,4 +1097,5 @@ $strPBXTRowFileGrowSize = 'Row file grow size';  //to translate
 $strPBXTTransactionBufferSizeDesc = 'The size of the global transaction log buffer (the engine allocates 2 buffers of this size). The default is 1MB.';  //to translate
 $strPBXTTransactionBufferSize = 'Transaction buffer size';  //to translate
 
+$strShowKeys = 'Only show keys';  //to translate
 ?>
diff --git a/lang/danish-utf-8.inc.php b/lang/danish-utf-8.inc.php
index affe94686..f2ae451dc 100644
--- a/lang/danish-utf-8.inc.php
+++ b/lang/danish-utf-8.inc.php
@@ -1094,4 +1094,5 @@ $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
 $strLogServerHelp = 'You can enter hostname/IP address and port separated by space.';  //to translate
+$strShowKeys = 'Only show keys';  //to translate
 ?>
diff --git a/lang/dutch-utf-8.inc.php b/lang/dutch-utf-8.inc.php
index 16747b6d7..7bfe6005e 100644
--- a/lang/dutch-utf-8.inc.php
+++ b/lang/dutch-utf-8.inc.php
@@ -1116,4 +1116,5 @@ $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
 $strLogServerHelp = 'You can enter hostname/IP address and port separated by space.';  //to translate
+$strShowKeys = 'Only show keys';  //to translate
 ?>
diff --git a/lang/english-utf-8.inc.php b/lang/english-utf-8.inc.php
index 7c1291856..680b5ba7e 100644
--- a/lang/english-utf-8.inc.php
+++ b/lang/english-utf-8.inc.php
@@ -792,6 +792,7 @@ $strShowingBookmark = 'Showing bookmark';
 $strShowingPhp = 'Showing as PHP code';
 $strShowingRecords = 'Showing rows';
 $strShowingSQL = 'Showing SQL query';
+$strShowKeys = 'Only show keys';
 $strShowOpenTables = 'Show open tables';
 $strShowPHPInfo = 'Show PHP information';
 $strShow = 'Show';
diff --git a/lang/estonian-utf-8.inc.php b/lang/estonian-utf-8.inc.php
index 0952579ad..5000c9dcc 100644
--- a/lang/estonian-utf-8.inc.php
+++ b/lang/estonian-utf-8.inc.php
@@ -1100,4 +1100,5 @@ $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
 $strLogServerHelp = 'You can enter hostname/IP address and port separated by space.';  //to translate
+$strShowKeys = 'Only show keys';  //to translate
 ?>
diff --git a/lang/finnish-utf-8.inc.php b/lang/finnish-utf-8.inc.php
index a7d41981d..dc969c39b 100644
--- a/lang/finnish-utf-8.inc.php
+++ b/lang/finnish-utf-8.inc.php
@@ -1094,4 +1094,5 @@ $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
 $strLogServerHelp = 'You can enter hostname/IP address and port separated by space.';  //to translate
+$strShowKeys = 'Only show keys';  //to translate
 ?>
diff --git a/lang/french-utf-8.inc.php b/lang/french-utf-8.inc.php
index 2a2fc5f14..4f2982665 100644
--- a/lang/french-utf-8.inc.php
+++ b/lang/french-utf-8.inc.php
@@ -1091,4 +1091,5 @@ $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
 $strLogServerHelp = 'You can enter hostname/IP address and port separated by space.';  //to translate
+$strShowKeys = 'Only show keys';  //to translate
 ?>
diff --git a/lang/galician-utf-8.inc.php b/lang/galician-utf-8.inc.php
index 26a8233b9..8052712f4 100644
--- a/lang/galician-utf-8.inc.php
+++ b/lang/galician-utf-8.inc.php
@@ -1093,4 +1093,5 @@ $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
 $strLogServerHelp = 'You can enter hostname/IP address and port separated by space.';  //to translate
+$strShowKeys = 'Only show keys';  //to translate
 ?>
diff --git a/lang/georgian-utf-8.inc.php b/lang/georgian-utf-8.inc.php
index b61902662..497fe3bd7 100644
--- a/lang/georgian-utf-8.inc.php
+++ b/lang/georgian-utf-8.inc.php
@@ -1120,4 +1120,5 @@ $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
 $strLogServerHelp = 'You can enter hostname/IP address and port separated by space.';  //to translate
+$strShowKeys = 'Only show keys';  //to translate
 ?>
diff --git a/lang/german-utf-8.inc.php b/lang/german-utf-8.inc.php
index 22af6a66e..72b1bac4c 100644
--- a/lang/german-utf-8.inc.php
+++ b/lang/german-utf-8.inc.php
@@ -1100,4 +1100,5 @@ $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
 $strLogServerHelp = 'You can enter hostname/IP address and port separated by space.';  //to translate
+$strShowKeys = 'Only show keys';  //to translate
 ?>
diff --git a/lang/greek-utf-8.inc.php b/lang/greek-utf-8.inc.php
index 1154f9888..85d31d636 100644
--- a/lang/greek-utf-8.inc.php
+++ b/lang/greek-utf-8.inc.php
@@ -1117,4 +1117,5 @@ $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
 $strLogServerHelp = 'You can enter hostname/IP address and port separated by space.';  //to translate
+$strShowKeys = 'Only show keys';  //to translate
 ?>
diff --git a/lang/hebrew-utf-8.inc.php b/lang/hebrew-utf-8.inc.php
index c57e35fd0..46649f8fc 100644
--- a/lang/hebrew-utf-8.inc.php
+++ b/lang/hebrew-utf-8.inc.php
@@ -1112,4 +1112,5 @@ $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
 $strLogServerHelp = 'You can enter hostname/IP address and port separated by space.';  //to translate
+$strShowKeys = 'Only show keys';  //to translate
 ?>
diff --git a/lang/hindi-utf-8.inc.php b/lang/hindi-utf-8.inc.php
index bffa342a8..de5251dfd 100644
--- a/lang/hindi-utf-8.inc.php
+++ b/lang/hindi-utf-8.inc.php
@@ -1120,4 +1120,5 @@ $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
 $strLogServerHelp = 'You can enter hostname/IP address and port separated by space.';  //to translate
+$strShowKeys = 'Only show keys';  //to translate
 ?>
diff --git a/lang/hungarian-utf-8.inc.php b/lang/hungarian-utf-8.inc.php
index 1dd04f2ad..90ac22d18 100644
--- a/lang/hungarian-utf-8.inc.php
+++ b/lang/hungarian-utf-8.inc.php
@@ -1103,4 +1103,5 @@ $strViewImage = 'View image';  //to translate
 $strViewVideo = 'View video';  //to translate
 
 $strLogServerHelp = 'You can enter hostname/IP address and port separated by space.';  //to translate
+$strShowKeys = 'Only show keys';  //to translate
 ?>
diff --git a/lang/indonesian-utf-8.inc.php b/lang/indonesian-utf-8.inc.php
index 86d0bf336..90ba11989 100644
--- a/lang/indonesian-utf-8.inc.php
+++ b/lang/indonesian-utf-8.inc.php
@@ -1110,4 +1110,5 @@ $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
 $strLogServerHelp = 'You can enter hostname/IP address and port separated by space.';  //to translate
+$strShowKeys = 'Only show keys';  //to translate
 ?>
diff --git a/lang/italian-utf-8.inc.php b/lang/italian-utf-8.inc.php
index 73f349987..eaa799098 100644
--- a/lang/italian-utf-8.inc.php
+++ b/lang/italian-utf-8.inc.php
@@ -1094,4 +1094,5 @@ $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
 $strLogServerHelp = 'You can enter hostname/IP address and port separated by space.';  //to translate
+$strShowKeys = 'Only show keys';  //to translate
 ?>
diff --git a/lang/japanese-utf-8.inc.php b/lang/japanese-utf-8.inc.php
index 45664db0f..46a2eb6f6 100644
--- a/lang/japanese-utf-8.inc.php
+++ b/lang/japanese-utf-8.inc.php
@@ -1111,4 +1111,5 @@ $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
 $strLogServerHelp = 'You can enter hostname/IP address and port separated by space.';  //to translate
+$strShowKeys = 'Only show keys';  //to translate
 ?>
diff --git a/lang/korean-utf-8.inc.php b/lang/korean-utf-8.inc.php
index bc14194b9..049487f97 100644
--- a/lang/korean-utf-8.inc.php
+++ b/lang/korean-utf-8.inc.php
@@ -1115,4 +1115,5 @@ $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
 $strLogServerHelp = 'You can enter hostname/IP address and port separated by space.';  //to translate
+$strShowKeys = 'Only show keys';  //to translate
 ?>
diff --git a/lang/latvian-utf-8.inc.php b/lang/latvian-utf-8.inc.php
index 9952dc589..2a6aa2579 100644
--- a/lang/latvian-utf-8.inc.php
+++ b/lang/latvian-utf-8.inc.php
@@ -1117,4 +1117,5 @@ $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
 $strLogServerHelp = 'You can enter hostname/IP address and port separated by space.';  //to translate
+$strShowKeys = 'Only show keys';  //to translate
 ?>
diff --git a/lang/lithuanian-utf-8.inc.php b/lang/lithuanian-utf-8.inc.php
index 208361c64..c2ac648b2 100644
--- a/lang/lithuanian-utf-8.inc.php
+++ b/lang/lithuanian-utf-8.inc.php
@@ -1110,4 +1110,5 @@ $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
 $strLogServerHelp = 'You can enter hostname/IP address and port separated by space.';  //to translate
+$strShowKeys = 'Only show keys';  //to translate
 ?>
diff --git a/lang/macedonian_cyrillic-utf-8.inc.php b/lang/macedonian_cyrillic-utf-8.inc.php
index 189916d12..ef4d51822 100644
--- a/lang/macedonian_cyrillic-utf-8.inc.php
+++ b/lang/macedonian_cyrillic-utf-8.inc.php
@@ -1095,4 +1095,5 @@ $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
 $strLogServerHelp = 'You can enter hostname/IP address and port separated by space.';  //to translate
+$strShowKeys = 'Only show keys';  //to translate
 ?>
diff --git a/lang/malay-utf-8.inc.php b/lang/malay-utf-8.inc.php
index 70e22fe2c..224671a83 100644
--- a/lang/malay-utf-8.inc.php
+++ b/lang/malay-utf-8.inc.php
@@ -1132,4 +1132,5 @@ $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
 $strLogServerHelp = 'You can enter hostname/IP address and port separated by space.';  //to translate
+$strShowKeys = 'Only show keys';  //to translate
 ?>
diff --git a/lang/mongolian-utf-8.inc.php b/lang/mongolian-utf-8.inc.php
index a398f8a1a..4414c862c 100644
--- a/lang/mongolian-utf-8.inc.php
+++ b/lang/mongolian-utf-8.inc.php
@@ -1115,4 +1115,5 @@ $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
 $strLogServerHelp = 'You can enter hostname/IP address and port separated by space.';  //to translate
+$strShowKeys = 'Only show keys';  //to translate
 ?>
diff --git a/lang/norwegian-utf-8.inc.php b/lang/norwegian-utf-8.inc.php
index d5817559a..e7ae21f91 100644
--- a/lang/norwegian-utf-8.inc.php
+++ b/lang/norwegian-utf-8.inc.php
@@ -1092,4 +1092,5 @@ $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
 $strLogServerHelp = 'You can enter hostname/IP address and port separated by space.';  //to translate
+$strShowKeys = 'Only show keys';  //to translate
 ?>
diff --git a/lang/persian-utf-8.inc.php b/lang/persian-utf-8.inc.php
index b0a4adde4..0ccee791f 100644
--- a/lang/persian-utf-8.inc.php
+++ b/lang/persian-utf-8.inc.php
@@ -1117,4 +1117,5 @@ $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
 $strLogServerHelp = 'You can enter hostname/IP address and port separated by space.';  //to translate
+$strShowKeys = 'Only show keys';  //to translate
 ?>
diff --git a/lang/polish-utf-8.inc.php b/lang/polish-utf-8.inc.php
index a7686de14..91ff8bdf8 100644
--- a/lang/polish-utf-8.inc.php
+++ b/lang/polish-utf-8.inc.php
@@ -1088,4 +1088,5 @@ $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
 $strLogServerHelp = 'You can enter hostname/IP address and port separated by space.';  //to translate
+$strShowKeys = 'Only show keys';  //to translate
 ?>
diff --git a/lang/portuguese-utf-8.inc.php b/lang/portuguese-utf-8.inc.php
index c96e48408..07ee4e05c 100644
--- a/lang/portuguese-utf-8.inc.php
+++ b/lang/portuguese-utf-8.inc.php
@@ -1121,4 +1121,5 @@ $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
 $strLogServerHelp = 'You can enter hostname/IP address and port separated by space.';  //to translate
+$strShowKeys = 'Only show keys';  //to translate
 ?>
diff --git a/lang/romanian-utf-8.inc.php b/lang/romanian-utf-8.inc.php
index 73b7b52bf..6bf220c55 100644
--- a/lang/romanian-utf-8.inc.php
+++ b/lang/romanian-utf-8.inc.php
@@ -1109,4 +1109,5 @@ $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
 $strLogServerHelp = 'You can enter hostname/IP address and port separated by space.';  //to translate
+$strShowKeys = 'Only show keys';  //to translate
 ?>
diff --git a/lang/russian-utf-8.inc.php b/lang/russian-utf-8.inc.php
index 833d1da1c..7543b0749 100644
--- a/lang/russian-utf-8.inc.php
+++ b/lang/russian-utf-8.inc.php
@@ -1096,4 +1096,5 @@ $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
 $strLogServerHelp = 'You can enter hostname/IP address and port separated by space.';  //to translate
+$strShowKeys = 'Only show keys';  //to translate
 ?>
diff --git a/lang/serbian_cyrillic-utf-8.inc.php b/lang/serbian_cyrillic-utf-8.inc.php
index 569759390..3b3cbc477 100644
--- a/lang/serbian_cyrillic-utf-8.inc.php
+++ b/lang/serbian_cyrillic-utf-8.inc.php
@@ -1094,4 +1094,5 @@ $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
 $strLogServerHelp = 'You can enter hostname/IP address and port separated by space.';  //to translate
+$strShowKeys = 'Only show keys';  //to translate
 ?>
diff --git a/lang/serbian_latin-utf-8.inc.php b/lang/serbian_latin-utf-8.inc.php
index fdbd2fd66..ac2d148b6 100644
--- a/lang/serbian_latin-utf-8.inc.php
+++ b/lang/serbian_latin-utf-8.inc.php
@@ -1094,4 +1094,5 @@ $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
 $strLogServerHelp = 'You can enter hostname/IP address and port separated by space.';  //to translate
+$strShowKeys = 'Only show keys';  //to translate
 ?>
diff --git a/lang/sinhala-utf-8.inc.php b/lang/sinhala-utf-8.inc.php
index e63c0ed10..92533bca8 100644
--- a/lang/sinhala-utf-8.inc.php
+++ b/lang/sinhala-utf-8.inc.php
@@ -1097,4 +1097,5 @@ $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
 $strLogServerHelp = 'You can enter hostname/IP address and port separated by space.';  //to translate
+$strShowKeys = 'Only show keys';  //to translate
 ?>
diff --git a/lang/slovak-utf-8.inc.php b/lang/slovak-utf-8.inc.php
index 573f3df28..af332c6fa 100644
--- a/lang/slovak-utf-8.inc.php
+++ b/lang/slovak-utf-8.inc.php
@@ -1095,4 +1095,5 @@ $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
 $strLogServerHelp = 'You can enter hostname/IP address and port separated by space.';  //to translate
+$strShowKeys = 'Only show keys';  //to translate
 ?>
diff --git a/lang/slovenian-utf-8.inc.php b/lang/slovenian-utf-8.inc.php
index 5a7748435..d8bf100c4 100644
--- a/lang/slovenian-utf-8.inc.php
+++ b/lang/slovenian-utf-8.inc.php
@@ -1114,4 +1114,5 @@ $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
 $strLogServerHelp = 'You can enter hostname/IP address and port separated by space.';  //to translate
+$strShowKeys = 'Only show keys';  //to translate
 ?>
diff --git a/lang/spanish-utf-8.inc.php b/lang/spanish-utf-8.inc.php
index 1d3846663..fda2393bc 100644
--- a/lang/spanish-utf-8.inc.php
+++ b/lang/spanish-utf-8.inc.php
@@ -1090,4 +1090,5 @@ $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
 $strLogServerHelp = 'You can enter hostname/IP address and port separated by space.';  //to translate
+$strShowKeys = 'Only show keys';  //to translate
 ?>
diff --git a/lang/swedish-utf-8.inc.php b/lang/swedish-utf-8.inc.php
index ff9d4422a..a69abccf0 100644
--- a/lang/swedish-utf-8.inc.php
+++ b/lang/swedish-utf-8.inc.php
@@ -1092,4 +1092,5 @@ $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
 $strLogServerHelp = 'You can enter hostname/IP address and port separated by space.';  //to translate
+$strShowKeys = 'Only show keys';  //to translate
 ?>
diff --git a/lang/tatarish-utf-8.inc.php b/lang/tatarish-utf-8.inc.php
index 6043f3764..8d38b0a5e 100644
--- a/lang/tatarish-utf-8.inc.php
+++ b/lang/tatarish-utf-8.inc.php
@@ -1106,4 +1106,5 @@ $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
 $strLogServerHelp = 'You can enter hostname/IP address and port separated by space.';  //to translate
+$strShowKeys = 'Only show keys';  //to translate
 ?>
diff --git a/lang/thai-utf-8.inc.php b/lang/thai-utf-8.inc.php
index 47851c5b1..4fe4b28b1 100644
--- a/lang/thai-utf-8.inc.php
+++ b/lang/thai-utf-8.inc.php
@@ -1116,4 +1116,5 @@ $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
 $strLogServerHelp = 'You can enter hostname/IP address and port separated by space.';  //to translate
+$strShowKeys = 'Only show keys';  //to translate
 ?>
diff --git a/lang/turkish-utf-8.inc.php b/lang/turkish-utf-8.inc.php
index 803fcdd9d..0eaeee7cd 100644
--- a/lang/turkish-utf-8.inc.php
+++ b/lang/turkish-utf-8.inc.php
@@ -1100,4 +1100,5 @@ $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
 $strLogServerHelp = 'You can enter hostname/IP address and port separated by space.';  //to translate
+$strShowKeys = 'Only show keys';  //to translate
 ?>
diff --git a/lang/ukrainian-utf-8.inc.php b/lang/ukrainian-utf-8.inc.php
index 12271ce06..ba303b5df 100644
--- a/lang/ukrainian-utf-8.inc.php
+++ b/lang/ukrainian-utf-8.inc.php
@@ -1114,4 +1114,5 @@ $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
 $strLogServerHelp = 'You can enter hostname/IP address and port separated by space.';  //to translate
+$strShowKeys = 'Only show keys';  //to translate
 ?>
diff --git a/pdf_schema.php b/pdf_schema.php
index b9c3e72a9..aa84f6bee 100644
--- a/pdf_schema.php
+++ b/pdf_schema.php
@@ -16,6 +16,7 @@ require_once './libraries/common.inc.php';
  */
 require_once './libraries/relation.lib.php';
 require_once './libraries/transformations.lib.php';
+require_once './libraries/Index.class.php';
 
 $cfgRelation = PMA_getRelationsParam();
 
@@ -616,7 +617,7 @@ class PMA_RT_Table {
      * @see PMA_PDF, PMA_RT_Table::PMA_RT_Table_setWidth,
           PMA_RT_Table::PMA_RT_Table_setHeight
      */
-    function __construct($table_name, $ff, &$same_wide_width)
+    function __construct($table_name, $ff, &$same_wide_width, $show_keys)
     {
         global $pdf, $pdf_page_number, $cfgRelation, $db;
 
@@ -627,9 +628,19 @@ class PMA_RT_Table {
             $pdf->PMA_PDF_die(sprintf($GLOBALS['strPdfInvalidTblName'], $table_name));
         }
         // load fields
-        while ($row = PMA_DBI_fetch_row($result)) {
-            $this->fields[] = $row[0];
-        }
+        //check to see if it will load all fields or only the foreign keys
+		if($show_keys){
+			$indexes = PMA_Index::getFromTable($this->table_name, $db);
+			$all_columns = array();
+			foreach($indexes as $index) {
+			   $all_columns = array_merge($all_columns, array_flip(array_keys($index->getColumns())));
+			}
+			$this->fields = array_keys($all_columns);
+		}else{
+	        while ($row = PMA_DBI_fetch_row($result)) {
+	            $this->fields[] = $row[0];
+	        }
+		}
         // height and width
         $this->PMA_RT_Table_setWidth($ff);
         $this->PMA_RT_Table_setHeight();
@@ -952,13 +963,14 @@ class PMA_RT {
      *                    everywhere, due to some problems printing with color
      * @param boolean $ Whether to draw grids or not
      * @param boolean $ Whether all tables should have the same width or not
+     * @param boolean $ Wheter to show all field or only the keys
      * @global object   The current PDF document
      * @global string   The current db name
      * @global array    The relations settings
      * @access private
      * @see PMA_PDF
      */
-    function __construct($which_rel, $show_info = 0, $change_color = 0, $show_grid = 0, $all_tab_same_wide = 0, $orientation = 'L', $paper = 'A4')
+    function __construct($which_rel, $show_info = 0, $change_color = 0, $show_grid = 0, $all_tab_same_wide = 0, $orientation = 'L', $paper = 'A4', $show_keys = 0)
     {
         global $pdf, $db, $cfgRelation, $with_doc;
 
@@ -1012,7 +1024,7 @@ class PMA_RT {
 
         foreach ($alltables AS $table) {
             if (!isset($this->tables[$table])) {
-                $this->tables[$table] = new PMA_RT_Table($table, $this->ff, $this->tablewidth);
+                $this->tables[$table] = new PMA_RT_Table($table, $this->ff, $this->tablewidth, $show_keys);
             }
 
             if ($this->same_wide) {
@@ -1376,8 +1388,9 @@ $all_tab_same_wide      = (isset($all_tab_same_wide) && $all_tab_same_wide == 'o
 $with_doc               = (isset($with_doc) && $with_doc == 'on') ? 1 : 0;
 $orientation            = (isset($orientation) && $orientation == 'P') ? 'P' : 'L';
 $paper                  = isset($paper) ? $paper : 'A4';
+$show_keys              = (isset($show_keys) && $show_keys == 'on') ? 1 : 0;
 PMA_DBI_select_db($db);
 
-$rt = new PMA_RT($pdf_page_number, $show_table_dimension, $show_color, $show_grid, $all_tab_same_wide, $orientation, $paper);
+$rt = new PMA_RT($pdf_page_number, $show_table_dimension, $show_color, $show_grid, $all_tab_same_wide, $orientation, $paper, $show_keys);
 
 ?>