diff --git a/js/sql.js b/js/sql.js
index 9a673b1cd..0d048343a 100644
--- a/js/sql.js
+++ b/js/sql.js
@@ -44,6 +44,17 @@ $(document).ready(function() {
         })
     })// end Paginate results table
 
+    //Paginate results with Page Selector
+    $("#pageselector").live('change', function(event) {
+        event.preventDefault();
+
+        //PMA_ajaxShowMessage();
+
+        $.get($(this).attr('href'), $(this).serialize() + '&ajax_request=true', function(data) {
+            $("#sqlqueryresults").html(data);
+        })
+    })// end Paginate results with Page Selector
+
     //Sort results table
     $("#table_results").find("a[title=Sort]").live('click', function(event) {
         event.preventDefault();
diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index 67ec98fc5..8a1876a86 100755
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -2235,8 +2235,7 @@ function PMA_pageselector($url, $rows, $pageNow = 1, $nbTotalPage = 1,
     $pageNowPlusRange = ($pageNow + $range);
 
     $gotopage = $prompt
-              . ' <select name="pos" onchange="goToUrl(this, \''
-              . $url . '\');">' . "\n";
+              . ' <select id="pageselector" name="pos" >' . "\n";
     if ($nbTotalPage < $showAll) {
         $pages = range(1, $nbTotalPage);
     } else {
diff --git a/po/af.po b/po/af.po
index 6791181fa..52fabddce 100755
--- a/po/af.po
+++ b/po/af.po
@@ -3,7 +3,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2010-07-03 21:45+0530\n"
+=======
+"POT-Creation-Date: 2010-07-03 09:00-0400\n"
+>>>>>>> origin/master
 "PO-Revision-Date: 2010-03-30 23:04+0200\n"
 "Last-Translator: Michal <michal@cihar.com>\n"
 "Language-Team: afrikaans <af@li.org>\n"
@@ -46,15 +50,26 @@ msgstr "Soek"
 #: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046
 #: libraries/Theme_Manager.class.php:311
 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719
+<<<<<<< HEAD
 #: libraries/common.lib.php:1344 libraries/common.lib.php:2301
 #: libraries/display_change_password.lib.php:82
 #: libraries/display_create_table.lib.php:62
+=======
+#: libraries/common.lib.php:1335 libraries/common.lib.php:2288
+#: libraries/display_change_password.lib.php:82
+#: libraries/display_create_table.lib.php:63
+>>>>>>> origin/master
 #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532
 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76
 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104
+<<<<<<< HEAD
 #: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480
 #: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782
+=======
+#: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477
+#: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782
+>>>>>>> origin/master
 #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328
 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142
 #: server_privileges.php:665 server_privileges.php:1641
@@ -64,8 +79,13 @@ msgstr "Soek"
 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171
 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265
 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561
+<<<<<<< HEAD
 #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560
 #: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512
+=======
+#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562
+#: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512
+>>>>>>> origin/master
 #: view_create.php:182 view_operations.php:101
 msgid "Go"
 msgstr "Gaan"
@@ -120,10 +140,17 @@ msgstr "Kolom name"
 #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245
 #: libraries/export/latex.php:360 libraries/export/odt.php:297
 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100
+<<<<<<< HEAD
 #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093
 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
 #: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321
+=======
+#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070
+#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
+#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
+#: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321
+>>>>>>> origin/master
 msgid "Type"
 msgstr "Tipe"
 
@@ -164,9 +191,15 @@ msgstr "Kommentaar"
 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322
 #: libraries/export/latex.php:430 libraries/export/odt.php:368
 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263
+<<<<<<< HEAD
 #: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596
 #: server_privileges.php:1911 server_privileges.php:1916
 #: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228
+=======
+#: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579
+#: server_privileges.php:1889 server_privileges.php:1894
+#: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228
+>>>>>>> origin/master
 #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342
 msgid "No"
 msgstr "Nee"
@@ -180,9 +213,15 @@ msgstr "Nee"
 #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106
 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262
 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344
+<<<<<<< HEAD
 #: server_databases.php:64 server_privileges.php:1582
 #: server_privileges.php:1596 server_privileges.php:1911
 #: server_privileges.php:1914 server_privileges.php:2210 sql.php:193
+=======
+#: server_databases.php:64 server_privileges.php:1565
+#: server_privileges.php:1579 server_privileges.php:1889
+#: server_privileges.php:1892 server_privileges.php:2187 sql.php:193
+>>>>>>> origin/master
 #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350
 #: tbl_tracking.php:335 tbl_tracking.php:340
 msgid "Yes"
@@ -234,7 +273,15 @@ msgstr "Hernoem tabel na"
 msgid "Command"
 msgstr "Kommentaar"
 
+<<<<<<< HEAD
 #: db_operations.php:466
+=======
+#: db_operations.php:429 tbl_change.php:1140
+msgid "and then"
+msgstr ""
+
+#: db_operations.php:455
+>>>>>>> origin/master
 #, fuzzy
 msgid "Copy database to"
 msgstr "Geen databasisse"
@@ -324,7 +371,11 @@ msgstr "Beskikbaar"
 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730
 #: server_collations.php:54 server_collations.php:66 server_databases.php:111
 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179
+<<<<<<< HEAD
 #: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326
+=======
+#: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326
+>>>>>>> origin/master
 msgid "Collation"
 msgstr ""
 
@@ -353,7 +404,11 @@ msgstr "Tabel"
 #: db_printview.php:105 libraries/db_structure.lib.php:56
 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146
 #: navigation.php:638 navigation.php:660 server_databases.php:122
+<<<<<<< HEAD
 #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775
+=======
+#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777
+>>>>>>> origin/master
 msgid "Rows"
 msgstr "Rye"
 
@@ -368,20 +423,32 @@ msgstr "in gebruik"
 
 #: db_printview.php:187 libraries/db_info.inc.php:88
 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433
+<<<<<<< HEAD
 #: tbl_structure.php:807
+=======
+#: tbl_structure.php:809
+>>>>>>> origin/master
 #, fuzzy
 msgid "Creation"
 msgstr "Skep"
 
 #: db_printview.php:196 libraries/db_info.inc.php:93
 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443
+<<<<<<< HEAD
 #: tbl_structure.php:815
+=======
+#: tbl_structure.php:817
+>>>>>>> origin/master
 msgid "Last update"
 msgstr ""
 
 #: db_printview.php:205 libraries/db_info.inc.php:98
 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453
+<<<<<<< HEAD
 #: tbl_structure.php:823
+=======
+#: tbl_structure.php:825
+>>>>>>> origin/master
 msgid "Last check"
 msgstr ""
 
@@ -446,7 +513,11 @@ msgstr "Del"
 
 #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553
 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779
+<<<<<<< HEAD
 #: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250
+=======
+#: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250
+>>>>>>> origin/master
 #: tbl_select.php:286
 msgid "Or"
 msgstr "Of"
@@ -664,9 +735,15 @@ msgstr "Met gekose:"
 msgid "Check All"
 msgstr "Kies Alles"
 
+<<<<<<< HEAD
 #: db_structure.php:529 libraries/display_tbl.lib.php:2077
 #: libraries/replication_gui.lib.php:36 server_databases.php:350
 #: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460
+=======
+#: db_structure.php:531 libraries/display_tbl.lib.php:2077
+#: libraries/replication_gui.lib.php:36 server_databases.php:350
+#: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462
+>>>>>>> origin/master
 msgid "Uncheck All"
 msgstr "Kies Niks"
 
@@ -1111,10 +1188,17 @@ msgid "Prev"
 msgstr "Vorige"
 
 #. l10n: Display text for next month link in calendar
+<<<<<<< HEAD
 #: js/messages.php:106 libraries/common.lib.php:2366
 #: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338
 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
 #: tbl_structure.php:799
+=======
+#: js/messages.php:77 libraries/common.lib.php:2353
+#: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338
+#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
+#: tbl_structure.php:801
+>>>>>>> origin/master
 msgid "Next"
 msgstr "Volgende"
 
@@ -1646,7 +1730,11 @@ msgstr "Wagwoord:"
 msgid "Server Choice"
 msgstr "Bediener Keuse"
 
+<<<<<<< HEAD
 #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63
+=======
+#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59
+>>>>>>> origin/master
 msgid "Cookies must be enabled past this point."
 msgstr "HTTP Koekies moet van nou af geaktifeer wees."
 
@@ -1726,7 +1814,11 @@ msgstr ""
 "Kan nie iconv, libiconv of recode_string funksie gebruik terwyl die extensie "
 "homself as gelaai rapporteer nie. Kyk na jou PHP opstelling."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:580
+=======
+#: libraries/common.inc.php:576
+>>>>>>> origin/master
 msgid ""
 "phpMyAdmin was unable to read your configuration file!<br />This might "
 "happen if PHP finds a parse error in it or PHP cannot find the file.<br /"
@@ -1742,12 +1834,20 @@ msgstr ""
 "quote of 'n kommapunt weg erens.<br />Indien jy 'n bladsy kry wat leeg is, "
 "is alles klopdisselboom."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:591
+=======
+#: libraries/common.inc.php:587
+>>>>>>> origin/master
 #, php-format
 msgid "Could not load default configuration from: %1$s"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:596
+=======
+#: libraries/common.inc.php:592
+>>>>>>> origin/master
 msgid ""
 "The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
 "configuration file!"
@@ -1755,27 +1855,47 @@ msgstr ""
 "Die <tt>$cfg['PmaAbsoluteUri']</tt> veranderlike MOET gestel wees in jou "
 "konfigurasie leer!"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:626
+=======
+#: libraries/common.inc.php:622
+>>>>>>> origin/master
 #, php-format
 msgid "Invalid server index: %s"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:633
+=======
+#: libraries/common.inc.php:629
+>>>>>>> origin/master
 #, php-format
 msgid "Invalid hostname for server %1$s. Please review your configuration."
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:642 libraries/header.inc.php:100
+=======
+#: libraries/common.inc.php:638 libraries/header.inc.php:96
+>>>>>>> origin/master
 #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47
 #: main.php:185 test/theme.php:57
 msgid "Server"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:820
 msgid "Invalid authentication method set in configuration:"
 msgstr ""
 
 #: libraries/common.inc.php:923
+=======
+#: libraries/common.inc.php:816
+msgid "Invalid authentication method set in configuration:"
+msgstr ""
+
+#: libraries/common.inc.php:919
+>>>>>>> origin/master
 #, php-format
 msgid "You should upgrade to %s %s or later."
 msgstr ""
@@ -2019,7 +2139,11 @@ msgid ""
 msgstr ""
 
 #: libraries/db_structure.lib.php:69 server_databases.php:142
+<<<<<<< HEAD
 #: tbl_printview.php:335 tbl_structure.php:680
+=======
+#: tbl_printview.php:335 tbl_structure.php:682
+>>>>>>> origin/master
 msgid "Overhead"
 msgstr "Overhead"
 
@@ -2046,22 +2170,36 @@ msgid "Change password"
 msgstr "Verander wagwoord"
 
 #: libraries/display_change_password.lib.php:35
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:348 server_privileges.php:808
+=======
+#: libraries/replication_gui.lib.php:348 server_privileges.php:807
+>>>>>>> origin/master
 msgid "No Password"
 msgstr "Geen Wagwoord"
 
 #: libraries/display_change_password.lib.php:41
 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63
 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:352 server_privileges.php:797
 #: server_privileges.php:801 server_privileges.php:812
 #: server_privileges.php:1555 server_synchronize.php:1175
+=======
+#: libraries/replication_gui.lib.php:352 server_privileges.php:796
+#: server_privileges.php:800 server_privileges.php:811
+#: server_privileges.php:1538 server_synchronize.php:1175
+>>>>>>> origin/master
 msgid "Password"
 msgstr "Wagwoord"
 
 #: libraries/display_change_password.lib.php:46
 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359
+<<<<<<< HEAD
 #: server_privileges.php:816 server_privileges.php:819
+=======
+#: server_privileges.php:815 server_privileges.php:818
+>>>>>>> origin/master
 msgid "Re-type"
 msgstr "Tik weer"
 
@@ -2074,12 +2212,20 @@ msgid "MySQL 4.0 compatible"
 msgstr ""
 
 #: libraries/display_change_password.lib.php:72
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:363 server_privileges.php:823
+=======
+#: libraries/replication_gui.lib.php:363 server_privileges.php:822
+>>>>>>> origin/master
 msgid "Generate Password"
 msgstr ""
 
 #: libraries/display_change_password.lib.php:75
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:366 server_privileges.php:826
+=======
+#: libraries/replication_gui.lib.php:366 server_privileges.php:825
+>>>>>>> origin/master
 #, fuzzy
 msgid "Generate"
 msgstr "Voortgebring deur"
@@ -2166,7 +2312,11 @@ msgid "remember template"
 msgstr ""
 
 #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552
+=======
+#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549
+>>>>>>> origin/master
 msgid "Character set of the file:"
 msgstr "Karakterstel van die leer:"
 
@@ -2219,7 +2369,11 @@ msgstr ""
 msgid "File to import"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527
+=======
+#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524
+>>>>>>> origin/master
 msgid "Location of the text file"
 msgstr "Soek die teksleer"
 
@@ -2227,12 +2381,20 @@ msgstr "Soek die teksleer"
 msgid "File uploads are not allowed on this server."
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536
+=======
+#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533
+>>>>>>> origin/master
 #: tbl_change.php:1025
 msgid "The directory you set for upload work cannot be reached"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539
+=======
+#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536
+>>>>>>> origin/master
 #: tbl_change.php:1028
 msgid "web server upload directory"
 msgstr ""
@@ -2361,7 +2523,11 @@ msgstr ""
 #: libraries/import/docsql.php:34 libraries/import/ldi.php:47
 #: libraries/import/ods.php:30 libraries/import/sql.php:20
 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26
+<<<<<<< HEAD
 #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751
+=======
+#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753
+>>>>>>> origin/master
 #, fuzzy
 msgid "Options"
 msgstr "Operasies"
@@ -2507,7 +2673,11 @@ msgstr ""
 
 #: libraries/engines/innodb.lib.php:194 server_databases.php:137
 #: server_databases.php:305 server_status.php:525 server_status.php:586
+<<<<<<< HEAD
 #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694
+=======
+#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696
+>>>>>>> origin/master
 #, fuzzy
 msgid "Total"
 msgstr "totaal"
@@ -2754,7 +2924,11 @@ msgid ""
 msgstr ""
 
 #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88
+<<<<<<< HEAD
 #: tbl_printview.php:375 tbl_structure.php:735
+=======
+#: tbl_printview.php:375 tbl_structure.php:737
+>>>>>>> origin/master
 msgid "Format"
 msgstr "Formaat"
 
@@ -2824,8 +2998,13 @@ msgstr ""
 #: libraries/export/latex.php:201 libraries/export/odt.php:48
 #: libraries/export/sql.php:106 libraries/export/sql.php:868
 #: libraries/export/texytext.php:27 server_databases.php:127
+<<<<<<< HEAD
 #: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316
 #: tbl_structure.php:663
+=======
+#: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316
+#: tbl_structure.php:665
+>>>>>>> origin/master
 msgid "Data"
 msgstr "Data"
 
@@ -2876,9 +3055,15 @@ msgstr ""
 #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57
 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177
 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:332 server_privileges.php:732
 #: server_privileges.php:735 server_privileges.php:791
 #: server_privileges.php:1554 server_privileges.php:2092
+=======
+#: libraries/replication_gui.lib.php:332 server_privileges.php:731
+#: server_privileges.php:734 server_privileges.php:790
+#: server_privileges.php:1537 server_privileges.php:2069
+>>>>>>> origin/master
 #: server_processlist.php:55 server_synchronize.php:1159
 msgid "Host"
 msgstr "Gasheer (host)"
@@ -3546,8 +3731,13 @@ msgstr ""
 
 #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59
 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:262 server_privileges.php:712
 #: server_privileges.php:715 server_privileges.php:722
+=======
+#: libraries/replication_gui.lib.php:262 server_privileges.php:711
+#: server_privileges.php:714 server_privileges.php:721
+>>>>>>> origin/master
 #: server_synchronize.php:1171
 msgid "User name"
 msgstr "Gebruiker naam"
@@ -3565,14 +3755,22 @@ msgstr ""
 msgid "Slave status"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448
+=======
+#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445
+>>>>>>> origin/master
 #: server_status.php:737 server_variables.php:52
 msgid "Variable"
 msgstr ""
 
 #: libraries/replication_gui.lib.php:118 server_status.php:738
 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138
+<<<<<<< HEAD
 #: tbl_structure.php:727
+=======
+#: tbl_structure.php:729
+>>>>>>> origin/master
 msgid "Value"
 msgstr "Waarde"
 
@@ -3590,11 +3788,16 @@ msgstr ""
 msgid "Add slave replication user"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:257 server_privileges.php:717
+=======
+#: libraries/replication_gui.lib.php:257 server_privileges.php:716
+>>>>>>> origin/master
 msgid "Any user"
 msgstr "Enige gebruiker"
 
 #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:349 server_privileges.php:718
 #: server_privileges.php:785 server_privileges.php:809
 #: server_privileges.php:1950 server_privileges.php:1980
@@ -3618,6 +3821,31 @@ msgid "Use Host Table"
 msgstr ""
 
 #: libraries/replication_gui.lib.php:334 server_privileges.php:793
+=======
+#: libraries/replication_gui.lib.php:349 server_privileges.php:717
+#: server_privileges.php:784 server_privileges.php:808
+#: server_privileges.php:1928 server_privileges.php:1958
+msgid "Use text field"
+msgstr ""
+
+#: libraries/replication_gui.lib.php:305 server_privileges.php:764
+msgid "Any host"
+msgstr "Enige gasheer (host)"
+
+#: libraries/replication_gui.lib.php:309 server_privileges.php:768
+msgid "Local"
+msgstr "Local"
+
+#: libraries/replication_gui.lib.php:315 server_privileges.php:773
+msgid "This Host"
+msgstr ""
+
+#: libraries/replication_gui.lib.php:321 server_privileges.php:779
+msgid "Use Host Table"
+msgstr ""
+
+#: libraries/replication_gui.lib.php:334 server_privileges.php:792
+>>>>>>> origin/master
 msgid ""
 "When Host table is used, this field is ignored and values stored in Host "
 "table are used instead."
@@ -7582,10 +7810,13 @@ msgstr ""
 msgid "Show insert query"
 msgstr ""
 
+<<<<<<< HEAD
 #: tbl_change.php:1140
 msgid "and then"
 msgstr ""
 
+=======
+>>>>>>> origin/master
 #: tbl_change.php:1144
 msgid "Go back to previous page"
 msgstr "Terug na vorige bladsy"
@@ -7783,6 +8014,7 @@ msgstr "Toets referential integrity:"
 msgid "Show tables"
 msgstr "Wys tabelle"
 
+<<<<<<< HEAD
 #: tbl_printview.php:309 tbl_structure.php:654
 msgid "Space usage"
 msgstr "Spasie verbruik"
@@ -7816,6 +8048,41 @@ msgid "Row length"
 msgstr "Ry lengte"
 
 #: tbl_printview.php:413 tbl_structure.php:791
+=======
+#: tbl_printview.php:309 tbl_structure.php:656
+msgid "Space usage"
+msgstr "Spasie verbruik"
+
+#: tbl_printview.php:313 tbl_structure.php:660
+msgid "Usage"
+msgstr "Gebruik"
+
+#: tbl_printview.php:340 tbl_structure.php:687
+msgid "Effective"
+msgstr "Effektief"
+
+#: tbl_printview.php:365 tbl_structure.php:725
+msgid "Row Statistics"
+msgstr "Ry Statistiek"
+
+#: tbl_printview.php:368 tbl_structure.php:728
+msgid "Statements"
+msgstr "Stellings"
+
+#: tbl_printview.php:379 tbl_structure.php:740
+msgid "static"
+msgstr ""
+
+#: tbl_printview.php:381 tbl_structure.php:742
+msgid "dynamic"
+msgstr "dinamies"
+
+#: tbl_printview.php:403 tbl_structure.php:785
+msgid "Row length"
+msgstr "Ry lengte"
+
+#: tbl_printview.php:413 tbl_structure.php:793
+>>>>>>> origin/master
 msgid " Row size "
 msgstr " Ry grootte "
 
diff --git a/po/ar.po b/po/ar.po
index 8261fd039..5da458799 100755
--- a/po/ar.po
+++ b/po/ar.po
@@ -3,7 +3,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2010-07-03 21:45+0530\n"
+=======
+"POT-Creation-Date: 2010-07-03 09:00-0400\n"
+>>>>>>> origin/master
 "PO-Revision-Date: 2010-05-29 14:16+0200\n"
 "Last-Translator: Ahmed <aa.mahdawy.10@gmail.com>\n"
 "Language-Team: arabic <ar@li.org>\n"
@@ -49,15 +53,26 @@ msgstr "ابحث"
 #: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046
 #: libraries/Theme_Manager.class.php:311
 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719
+<<<<<<< HEAD
 #: libraries/common.lib.php:1344 libraries/common.lib.php:2301
 #: libraries/display_change_password.lib.php:82
 #: libraries/display_create_table.lib.php:62
+=======
+#: libraries/common.lib.php:1335 libraries/common.lib.php:2288
+#: libraries/display_change_password.lib.php:82
+#: libraries/display_create_table.lib.php:63
+>>>>>>> origin/master
 #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532
 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76
 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104
+<<<<<<< HEAD
 #: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480
 #: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782
+=======
+#: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477
+#: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782
+>>>>>>> origin/master
 #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328
 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142
 #: server_privileges.php:665 server_privileges.php:1641
@@ -67,8 +82,13 @@ msgstr "ابحث"
 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171
 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265
 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561
+<<<<<<< HEAD
 #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560
 #: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512
+=======
+#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562
+#: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512
+>>>>>>> origin/master
 #: view_create.php:182 view_operations.php:101
 msgid "Go"
 msgstr "&nbsp;تنفيذ&nbsp;"
@@ -121,10 +141,17 @@ msgstr "اسم العمود"
 #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245
 #: libraries/export/latex.php:360 libraries/export/odt.php:297
 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100
+<<<<<<< HEAD
 #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093
 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
 #: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321
+=======
+#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070
+#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
+#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
+#: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321
+>>>>>>> origin/master
 msgid "Type"
 msgstr "النوع"
 
@@ -165,9 +192,15 @@ msgstr "تعليقات"
 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322
 #: libraries/export/latex.php:430 libraries/export/odt.php:368
 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263
+<<<<<<< HEAD
 #: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596
 #: server_privileges.php:1911 server_privileges.php:1916
 #: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228
+=======
+#: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579
+#: server_privileges.php:1889 server_privileges.php:1894
+#: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228
+>>>>>>> origin/master
 #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342
 msgid "No"
 msgstr "لا"
@@ -181,9 +214,15 @@ msgstr "لا"
 #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106
 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262
 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344
+<<<<<<< HEAD
 #: server_databases.php:64 server_privileges.php:1582
 #: server_privileges.php:1596 server_privileges.php:1911
 #: server_privileges.php:1914 server_privileges.php:2210 sql.php:193
+=======
+#: server_databases.php:64 server_privileges.php:1565
+#: server_privileges.php:1579 server_privileges.php:1889
+#: server_privileges.php:1892 server_privileges.php:2187 sql.php:193
+>>>>>>> origin/master
 #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350
 #: tbl_tracking.php:335 tbl_tracking.php:340
 msgid "Yes"
@@ -232,7 +271,15 @@ msgstr "أعد تسمية قاعدة البيانات ﺇﻠﻰ"
 msgid "Command"
 msgstr "أمر"
 
+<<<<<<< HEAD
 #: db_operations.php:466
+=======
+#: db_operations.php:429 tbl_change.php:1140
+msgid "and then"
+msgstr "وبعدها"
+
+#: db_operations.php:455
+>>>>>>> origin/master
 msgid "Copy database to"
 msgstr "إنسخ قاعدة البيانات إلى"
 
@@ -320,7 +367,11 @@ msgstr "فعل"
 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730
 #: server_collations.php:54 server_collations.php:66 server_databases.php:111
 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179
+<<<<<<< HEAD
 #: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326
+=======
+#: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326
+>>>>>>> origin/master
 msgid "Collation"
 msgstr "Collation"
 
@@ -349,7 +400,11 @@ msgstr "الجدول"
 #: db_printview.php:105 libraries/db_structure.lib.php:56
 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146
 #: navigation.php:638 navigation.php:660 server_databases.php:122
+<<<<<<< HEAD
 #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775
+=======
+#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777
+>>>>>>> origin/master
 msgid "Rows"
 msgstr "صفوف"
 
@@ -364,19 +419,31 @@ msgstr "قيد الإستعمال"
 
 #: db_printview.php:187 libraries/db_info.inc.php:88
 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433
+<<<<<<< HEAD
 #: tbl_structure.php:807
+=======
+#: tbl_structure.php:809
+>>>>>>> origin/master
 msgid "Creation"
 msgstr "الإنشاء"
 
 #: db_printview.php:196 libraries/db_info.inc.php:93
 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443
+<<<<<<< HEAD
 #: tbl_structure.php:815
+=======
+#: tbl_structure.php:817
+>>>>>>> origin/master
 msgid "Last update"
 msgstr "التحديث الأخير"
 
 #: db_printview.php:205 libraries/db_info.inc.php:98
 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453
+<<<<<<< HEAD
 #: tbl_structure.php:823
+=======
+#: tbl_structure.php:825
+>>>>>>> origin/master
 msgid "Last check"
 msgstr "التحقق الأخير"
 
@@ -441,7 +508,11 @@ msgstr "Del"
 
 #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553
 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779
+<<<<<<< HEAD
 #: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250
+=======
+#: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250
+>>>>>>> origin/master
 #: tbl_select.php:286
 msgid "Or"
 msgstr "أو"
@@ -659,9 +730,15 @@ msgstr ": على المحدد"
 msgid "Check All"
 msgstr "اختر الكل"
 
+<<<<<<< HEAD
 #: db_structure.php:529 libraries/display_tbl.lib.php:2077
 #: libraries/replication_gui.lib.php:36 server_databases.php:350
 #: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460
+=======
+#: db_structure.php:531 libraries/display_tbl.lib.php:2077
+#: libraries/replication_gui.lib.php:36 server_databases.php:350
+#: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462
+>>>>>>> origin/master
 msgid "Uncheck All"
 msgstr "إلغاء تحديد الكل"
 
@@ -1113,10 +1190,17 @@ msgid "Prev"
 msgstr "سابق"
 
 #. l10n: Display text for next month link in calendar
+<<<<<<< HEAD
 #: js/messages.php:106 libraries/common.lib.php:2366
 #: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338
 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
 #: tbl_structure.php:799
+=======
+#: js/messages.php:77 libraries/common.lib.php:2353
+#: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338
+#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
+#: tbl_structure.php:801
+>>>>>>> origin/master
 msgid "Next"
 msgstr "التالي"
 
@@ -1645,7 +1729,11 @@ msgstr "كلمة السر:"
 msgid "Server Choice"
 msgstr "اختيار الخادم"
 
+<<<<<<< HEAD
 #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63
+=======
+#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59
+>>>>>>> origin/master
 msgid "Cookies must be enabled past this point."
 msgstr "يجب تفعيل دعم الكوكيز في هذه المرحلة."
 
@@ -1725,7 +1813,11 @@ msgstr ""
 "لا يمكن استخدام iconv ولا libiconv ولا عملية recode_string في حين يحدد "
 "الامتداد أنه محمل. تأكد من إعدادات PHP."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:580
+=======
+#: libraries/common.inc.php:576
+>>>>>>> origin/master
 msgid ""
 "phpMyAdmin was unable to read your configuration file!<br />This might "
 "happen if PHP finds a parse error in it or PHP cannot find the file.<br /"
@@ -1740,12 +1832,20 @@ msgstr ""
 "تكون علامة التنصيص أو علامة الفاصلة المنقوطة ناقصة في مكان ما.<br />إن حصلت "
 "على صفحة فارغة، فكل شيء على ما يرام."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:591
+=======
+#: libraries/common.inc.php:587
+>>>>>>> origin/master
 #, php-format
 msgid "Could not load default configuration from: %1$s"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:596
+=======
+#: libraries/common.inc.php:592
+>>>>>>> origin/master
 msgid ""
 "The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
 "configuration file!"
@@ -1753,27 +1853,47 @@ msgstr ""
 "المتغير <span dir=\"ltr\"><tt>$cfg['PmaAbsoluteUri']</tt></span> يجب تعديله "
 "في ملف التعريف !"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:626
+=======
+#: libraries/common.inc.php:622
+>>>>>>> origin/master
 #, php-format
 msgid "Invalid server index: %s"
 msgstr "فهرس خادم غير صحيح: %s"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:633
+=======
+#: libraries/common.inc.php:629
+>>>>>>> origin/master
 #, php-format
 msgid "Invalid hostname for server %1$s. Please review your configuration."
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:642 libraries/header.inc.php:100
+=======
+#: libraries/common.inc.php:638 libraries/header.inc.php:96
+>>>>>>> origin/master
 #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47
 #: main.php:185 test/theme.php:57
 msgid "Server"
 msgstr "خادم"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:820
 msgid "Invalid authentication method set in configuration:"
 msgstr ""
 
 #: libraries/common.inc.php:923
+=======
+#: libraries/common.inc.php:816
+msgid "Invalid authentication method set in configuration:"
+msgstr ""
+
+#: libraries/common.inc.php:919
+>>>>>>> origin/master
 #, php-format
 msgid "You should upgrade to %s %s or later."
 msgstr "عليك التحديث إلى %s %s أو لاحقا."
@@ -2016,7 +2136,11 @@ msgid ""
 msgstr ""
 
 #: libraries/db_structure.lib.php:69 server_databases.php:142
+<<<<<<< HEAD
 #: tbl_printview.php:335 tbl_structure.php:680
+=======
+#: tbl_printview.php:335 tbl_structure.php:682
+>>>>>>> origin/master
 msgid "Overhead"
 msgstr "الفوقي"
 
@@ -2043,22 +2167,36 @@ msgid "Change password"
 msgstr "تغيير كلمة السر"
 
 #: libraries/display_change_password.lib.php:35
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:348 server_privileges.php:808
+=======
+#: libraries/replication_gui.lib.php:348 server_privileges.php:807
+>>>>>>> origin/master
 msgid "No Password"
 msgstr "لا كلمة سر"
 
 #: libraries/display_change_password.lib.php:41
 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63
 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:352 server_privileges.php:797
 #: server_privileges.php:801 server_privileges.php:812
 #: server_privileges.php:1555 server_synchronize.php:1175
+=======
+#: libraries/replication_gui.lib.php:352 server_privileges.php:796
+#: server_privileges.php:800 server_privileges.php:811
+#: server_privileges.php:1538 server_synchronize.php:1175
+>>>>>>> origin/master
 msgid "Password"
 msgstr "كلمة السر"
 
 #: libraries/display_change_password.lib.php:46
 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359
+<<<<<<< HEAD
 #: server_privileges.php:816 server_privileges.php:819
+=======
+#: server_privileges.php:815 server_privileges.php:818
+>>>>>>> origin/master
 msgid "Re-type"
 msgstr "أعد كتابة"
 
@@ -2071,12 +2209,20 @@ msgid "MySQL 4.0 compatible"
 msgstr ""
 
 #: libraries/display_change_password.lib.php:72
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:363 server_privileges.php:823
+=======
+#: libraries/replication_gui.lib.php:363 server_privileges.php:822
+>>>>>>> origin/master
 msgid "Generate Password"
 msgstr ""
 
 #: libraries/display_change_password.lib.php:75
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:366 server_privileges.php:826
+=======
+#: libraries/replication_gui.lib.php:366 server_privileges.php:825
+>>>>>>> origin/master
 msgid "Generate"
 msgstr "ولد"
 
@@ -2161,7 +2307,11 @@ msgid "remember template"
 msgstr "تذكر القالب"
 
 #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552
+=======
+#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549
+>>>>>>> origin/master
 msgid "Character set of the file:"
 msgstr "شيفرة أحرف الملف:"
 
@@ -2214,7 +2364,11 @@ msgstr ""
 msgid "File to import"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527
+=======
+#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524
+>>>>>>> origin/master
 msgid "Location of the text file"
 msgstr "مكان ملف نصي"
 
@@ -2222,12 +2376,20 @@ msgstr "مكان ملف نصي"
 msgid "File uploads are not allowed on this server."
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536
+=======
+#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533
+>>>>>>> origin/master
 #: tbl_change.php:1025
 msgid "The directory you set for upload work cannot be reached"
 msgstr "الدليل الذي حددته لتحميل عملك لا يمكن الوصول إليه."
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539
+=======
+#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536
+>>>>>>> origin/master
 #: tbl_change.php:1028
 msgid "web server upload directory"
 msgstr "دليل تحميل الملفات على خادم الشبكة"
@@ -2356,7 +2518,11 @@ msgstr "رتب حسب المفتاح"
 #: libraries/import/docsql.php:34 libraries/import/ldi.php:47
 #: libraries/import/ods.php:30 libraries/import/sql.php:20
 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26
+<<<<<<< HEAD
 #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751
+=======
+#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753
+>>>>>>> origin/master
 msgid "Options"
 msgstr "خيارات"
 
@@ -2499,7 +2665,11 @@ msgstr ""
 
 #: libraries/engines/innodb.lib.php:194 server_databases.php:137
 #: server_databases.php:305 server_status.php:525 server_status.php:586
+<<<<<<< HEAD
 #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694
+=======
+#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696
+>>>>>>> origin/master
 msgid "Total"
 msgstr "مجموع كلي"
 
@@ -2744,7 +2914,11 @@ msgid ""
 msgstr ""
 
 #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88
+<<<<<<< HEAD
 #: tbl_printview.php:375 tbl_structure.php:735
+=======
+#: tbl_printview.php:375 tbl_structure.php:737
+>>>>>>> origin/master
 msgid "Format"
 msgstr "صيغة"
 
@@ -2816,8 +2990,13 @@ msgstr ""
 #: libraries/export/latex.php:201 libraries/export/odt.php:48
 #: libraries/export/sql.php:106 libraries/export/sql.php:868
 #: libraries/export/texytext.php:27 server_databases.php:127
+<<<<<<< HEAD
 #: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316
 #: tbl_structure.php:663
+=======
+#: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316
+#: tbl_structure.php:665
+>>>>>>> origin/master
 msgid "Data"
 msgstr "بيانات"
 
@@ -2866,9 +3045,15 @@ msgstr "نوع MIME"
 #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57
 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177
 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:332 server_privileges.php:732
 #: server_privileges.php:735 server_privileges.php:791
 #: server_privileges.php:1554 server_privileges.php:2092
+=======
+#: libraries/replication_gui.lib.php:332 server_privileges.php:731
+#: server_privileges.php:734 server_privileges.php:790
+#: server_privileges.php:1537 server_privileges.php:2069
+>>>>>>> origin/master
 #: server_processlist.php:55 server_synchronize.php:1159
 msgid "Host"
 msgstr "المزود"
@@ -3530,8 +3715,13 @@ msgstr ""
 
 #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59
 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:262 server_privileges.php:712
 #: server_privileges.php:715 server_privileges.php:722
+=======
+#: libraries/replication_gui.lib.php:262 server_privileges.php:711
+#: server_privileges.php:714 server_privileges.php:721
+>>>>>>> origin/master
 #: server_synchronize.php:1171
 msgid "User name"
 msgstr "اسم المستخدم"
@@ -3548,14 +3738,22 @@ msgstr ""
 msgid "Slave status"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448
+=======
+#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445
+>>>>>>> origin/master
 #: server_status.php:737 server_variables.php:52
 msgid "Variable"
 msgstr "متغير"
 
 #: libraries/replication_gui.lib.php:118 server_status.php:738
 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138
+<<<<<<< HEAD
 #: tbl_structure.php:727
+=======
+#: tbl_structure.php:729
+>>>>>>> origin/master
 msgid "Value"
 msgstr "القيمة"
 
@@ -3573,11 +3771,16 @@ msgstr ""
 msgid "Add slave replication user"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:257 server_privileges.php:717
+=======
+#: libraries/replication_gui.lib.php:257 server_privileges.php:716
+>>>>>>> origin/master
 msgid "Any user"
 msgstr "أي مستخدم"
 
 #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:349 server_privileges.php:718
 #: server_privileges.php:785 server_privileges.php:809
 #: server_privileges.php:1950 server_privileges.php:1980
@@ -3601,6 +3804,31 @@ msgid "Use Host Table"
 msgstr "استخدم الجدول المضيف"
 
 #: libraries/replication_gui.lib.php:334 server_privileges.php:793
+=======
+#: libraries/replication_gui.lib.php:349 server_privileges.php:717
+#: server_privileges.php:784 server_privileges.php:808
+#: server_privileges.php:1928 server_privileges.php:1958
+msgid "Use text field"
+msgstr "استخدم حقل نص"
+
+#: libraries/replication_gui.lib.php:305 server_privileges.php:764
+msgid "Any host"
+msgstr "أي مزود"
+
+#: libraries/replication_gui.lib.php:309 server_privileges.php:768
+msgid "Local"
+msgstr "محلي"
+
+#: libraries/replication_gui.lib.php:315 server_privileges.php:773
+msgid "This Host"
+msgstr "هذا المضيف"
+
+#: libraries/replication_gui.lib.php:321 server_privileges.php:779
+msgid "Use Host Table"
+msgstr "استخدم الجدول المضيف"
+
+#: libraries/replication_gui.lib.php:334 server_privileges.php:792
+>>>>>>> origin/master
 msgid ""
 "When Host table is used, this field is ignored and values stored in Host "
 "table are used instead."
@@ -7581,10 +7809,13 @@ msgstr ""
 msgid "Show insert query"
 msgstr ""
 
+<<<<<<< HEAD
 #: tbl_change.php:1140
 msgid "and then"
 msgstr "وبعدها"
 
+=======
+>>>>>>> origin/master
 #: tbl_change.php:1144
 msgid "Go back to previous page"
 msgstr "الرجوع إلى الصفحة السابقة"
@@ -7778,6 +8009,7 @@ msgstr "تحديد التكامل المرجعي:"
 msgid "Show tables"
 msgstr "شاهد الجدول"
 
+<<<<<<< HEAD
 #: tbl_printview.php:309 tbl_structure.php:654
 msgid "Space usage"
 msgstr "المساحة المستغلة"
@@ -7811,6 +8043,41 @@ msgid "Row length"
 msgstr "طول الصف"
 
 #: tbl_printview.php:413 tbl_structure.php:791
+=======
+#: tbl_printview.php:309 tbl_structure.php:656
+msgid "Space usage"
+msgstr "المساحة المستغلة"
+
+#: tbl_printview.php:313 tbl_structure.php:660
+msgid "Usage"
+msgstr "المساحة"
+
+#: tbl_printview.php:340 tbl_structure.php:687
+msgid "Effective"
+msgstr "فعال"
+
+#: tbl_printview.php:365 tbl_structure.php:725
+msgid "Row Statistics"
+msgstr "إحصائيات"
+
+#: tbl_printview.php:368 tbl_structure.php:728
+msgid "Statements"
+msgstr "أوامر"
+
+#: tbl_printview.php:379 tbl_structure.php:740
+msgid "static"
+msgstr ""
+
+#: tbl_printview.php:381 tbl_structure.php:742
+msgid "dynamic"
+msgstr "ديناميكي"
+
+#: tbl_printview.php:403 tbl_structure.php:785
+msgid "Row length"
+msgstr "طول الصف"
+
+#: tbl_printview.php:413 tbl_structure.php:793
+>>>>>>> origin/master
 msgid " Row size "
 msgstr " مقاس الصف "
 
diff --git a/po/az.po b/po/az.po
index ad2e29973..1eed425b2 100755
--- a/po/az.po
+++ b/po/az.po
@@ -3,7 +3,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2010-07-03 21:45+0530\n"
+=======
+"POT-Creation-Date: 2010-07-03 09:00-0400\n"
+>>>>>>> origin/master
 "PO-Revision-Date: 2010-03-12 09:11+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: azerbaijani <az@li.org>\n"
@@ -45,15 +49,26 @@ msgstr "Axtarış"
 #: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046
 #: libraries/Theme_Manager.class.php:311
 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719
+<<<<<<< HEAD
 #: libraries/common.lib.php:1344 libraries/common.lib.php:2301
 #: libraries/display_change_password.lib.php:82
 #: libraries/display_create_table.lib.php:62
+=======
+#: libraries/common.lib.php:1335 libraries/common.lib.php:2288
+#: libraries/display_change_password.lib.php:82
+#: libraries/display_create_table.lib.php:63
+>>>>>>> origin/master
 #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532
 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76
 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104
+<<<<<<< HEAD
 #: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480
 #: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782
+=======
+#: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477
+#: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782
+>>>>>>> origin/master
 #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328
 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142
 #: server_privileges.php:665 server_privileges.php:1641
@@ -63,8 +78,13 @@ msgstr "Axtarış"
 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171
 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265
 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561
+<<<<<<< HEAD
 #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560
 #: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512
+=======
+#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562
+#: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512
+>>>>>>> origin/master
 #: view_create.php:182 view_operations.php:101
 msgid "Go"
 msgstr "Davam"
@@ -117,10 +137,17 @@ msgstr "Sütun adları"
 #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245
 #: libraries/export/latex.php:360 libraries/export/odt.php:297
 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100
+<<<<<<< HEAD
 #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093
 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
 #: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321
+=======
+#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070
+#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
+#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
+#: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321
+>>>>>>> origin/master
 msgid "Type"
 msgstr "Tip"
 
@@ -161,9 +188,15 @@ msgstr "Qısa İzahatlar"
 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322
 #: libraries/export/latex.php:430 libraries/export/odt.php:368
 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263
+<<<<<<< HEAD
 #: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596
 #: server_privileges.php:1911 server_privileges.php:1916
 #: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228
+=======
+#: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579
+#: server_privileges.php:1889 server_privileges.php:1894
+#: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228
+>>>>>>> origin/master
 #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342
 msgid "No"
 msgstr "Xeyir"
@@ -177,9 +210,15 @@ msgstr "Xeyir"
 #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106
 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262
 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344
+<<<<<<< HEAD
 #: server_databases.php:64 server_privileges.php:1582
 #: server_privileges.php:1596 server_privileges.php:1911
 #: server_privileges.php:1914 server_privileges.php:2210 sql.php:193
+=======
+#: server_databases.php:64 server_privileges.php:1565
+#: server_privileges.php:1579 server_privileges.php:1889
+#: server_privileges.php:1892 server_privileges.php:2187 sql.php:193
+>>>>>>> origin/master
 #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350
 #: tbl_tracking.php:335 tbl_tracking.php:340
 msgid "Yes"
@@ -230,7 +269,15 @@ msgstr "Cedveli yeniden adlandır"
 msgid "Command"
 msgstr "Komanda Tipi"
 
+<<<<<<< HEAD
 #: db_operations.php:466
+=======
+#: db_operations.php:429 tbl_change.php:1140
+msgid "and then"
+msgstr ""
+
+#: db_operations.php:455
+>>>>>>> origin/master
 #, fuzzy
 msgid "Copy database to"
 msgstr "Baza seçilmemişdir ve ya mövcud deyildir."
@@ -321,7 +368,11 @@ msgstr "Enabled"
 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730
 #: server_collations.php:54 server_collations.php:66 server_databases.php:111
 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179
+<<<<<<< HEAD
 #: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326
+=======
+#: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326
+>>>>>>> origin/master
 #, fuzzy
 msgid "Collation"
 msgstr "Quruluş"
@@ -351,7 +402,11 @@ msgstr "Cedvel"
 #: db_printview.php:105 libraries/db_structure.lib.php:56
 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146
 #: navigation.php:638 navigation.php:660 server_databases.php:122
+<<<<<<< HEAD
 #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775
+=======
+#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777
+>>>>>>> origin/master
 msgid "Rows"
 msgstr "Sıra sayı"
 
@@ -366,19 +421,31 @@ msgstr "istifadede"
 
 #: db_printview.php:187 libraries/db_info.inc.php:88
 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433
+<<<<<<< HEAD
 #: tbl_structure.php:807
+=======
+#: tbl_structure.php:809
+>>>>>>> origin/master
 msgid "Creation"
 msgstr "Quruluş"
 
 #: db_printview.php:196 libraries/db_info.inc.php:93
 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443
+<<<<<<< HEAD
 #: tbl_structure.php:815
+=======
+#: tbl_structure.php:817
+>>>>>>> origin/master
 msgid "Last update"
 msgstr "En son yenilenme"
 
 #: db_printview.php:205 libraries/db_info.inc.php:98
 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453
+<<<<<<< HEAD
 #: tbl_structure.php:823
+=======
+#: tbl_structure.php:825
+>>>>>>> origin/master
 msgid "Last check"
 msgstr "En son yoxlama"
 
@@ -443,7 +510,11 @@ msgstr "Del"
 
 #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553
 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779
+<<<<<<< HEAD
 #: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250
+=======
+#: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250
+>>>>>>> origin/master
 #: tbl_select.php:286
 msgid "Or"
 msgstr "ya da"
@@ -662,9 +733,15 @@ msgstr "Seçilenleri:"
 msgid "Check All"
 msgstr "Hamısını Seç"
 
+<<<<<<< HEAD
 #: db_structure.php:529 libraries/display_tbl.lib.php:2077
 #: libraries/replication_gui.lib.php:36 server_databases.php:350
 #: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460
+=======
+#: db_structure.php:531 libraries/display_tbl.lib.php:2077
+#: libraries/replication_gui.lib.php:36 server_databases.php:350
+#: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462
+>>>>>>> origin/master
 msgid "Uncheck All"
 msgstr "Heç Birini Seçme"
 
@@ -1119,10 +1196,17 @@ msgid "Prev"
 msgstr "Evvelki"
 
 #. l10n: Display text for next month link in calendar
+<<<<<<< HEAD
 #: js/messages.php:106 libraries/common.lib.php:2366
 #: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338
 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
 #: tbl_structure.php:799
+=======
+#: js/messages.php:77 libraries/common.lib.php:2353
+#: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338
+#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
+#: tbl_structure.php:801
+>>>>>>> origin/master
 msgid "Next"
 msgstr "Sonrakı"
 
@@ -1656,7 +1740,11 @@ msgstr "Parol:"
 msgid "Server Choice"
 msgstr "Quraşdırılmış Serverler"
 
+<<<<<<< HEAD
 #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63
+=======
+#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59
+>>>>>>> origin/master
 msgid "Cookies must be enabled past this point."
 msgstr "Sisteme girebilmeniz üçün çerez faylları (cookie-ler) aktiv olmalıdır."
 
@@ -1736,7 +1824,11 @@ msgstr ""
 "Can not use iconv nor libiconv nor recode_string function while extension "
 "reports to be loaded. Check your php configuration."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:580
+=======
+#: libraries/common.inc.php:576
+>>>>>>> origin/master
 msgid ""
 "phpMyAdmin was unable to read your configuration file!<br />This might "
 "happen if PHP finds a parse error in it or PHP cannot find the file.<br /"
@@ -1752,12 +1844,20 @@ msgstr ""
 "vergül eksikliyi vardır.<br />Eger boş sehife ile qarşılaşsanız, demek ki, "
 "her şey qaydasındadır."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:591
+=======
+#: libraries/common.inc.php:587
+>>>>>>> origin/master
 #, php-format
 msgid "Could not load default configuration from: %1$s"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:596
+=======
+#: libraries/common.inc.php:592
+>>>>>>> origin/master
 msgid ""
 "The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
 "configuration file!"
@@ -1765,27 +1865,47 @@ msgstr ""
 "<tt>$cfg['PmaAbsoluteUri']</tt> direktivi PMA konfiqurasiya faylınızda "
 "QURULMAMIŞDIR!"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:626
+=======
+#: libraries/common.inc.php:622
+>>>>>>> origin/master
 #, php-format
 msgid "Invalid server index: %s"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:633
+=======
+#: libraries/common.inc.php:629
+>>>>>>> origin/master
 #, php-format
 msgid "Invalid hostname for server %1$s. Please review your configuration."
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:642 libraries/header.inc.php:100
+=======
+#: libraries/common.inc.php:638 libraries/header.inc.php:96
+>>>>>>> origin/master
 #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47
 #: main.php:185 test/theme.php:57
 msgid "Server"
 msgstr "Server"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:820
 msgid "Invalid authentication method set in configuration:"
 msgstr ""
 
 #: libraries/common.inc.php:923
+=======
+#: libraries/common.inc.php:816
+msgid "Invalid authentication method set in configuration:"
+msgstr ""
+
+#: libraries/common.inc.php:919
+>>>>>>> origin/master
 #, php-format
 msgid "You should upgrade to %s %s or later."
 msgstr ""
@@ -2035,7 +2155,11 @@ msgid ""
 msgstr ""
 
 #: libraries/db_structure.lib.php:69 server_databases.php:142
+<<<<<<< HEAD
 #: tbl_printview.php:335 tbl_structure.php:680
+=======
+#: tbl_printview.php:335 tbl_structure.php:682
+>>>>>>> origin/master
 msgid "Overhead"
 msgstr "Aşma deyeri"
 
@@ -2062,22 +2186,36 @@ msgid "Change password"
 msgstr "Parolu Deyişdir"
 
 #: libraries/display_change_password.lib.php:35
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:348 server_privileges.php:808
+=======
+#: libraries/replication_gui.lib.php:348 server_privileges.php:807
+>>>>>>> origin/master
 msgid "No Password"
 msgstr "Parol Yoxdur"
 
 #: libraries/display_change_password.lib.php:41
 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63
 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:352 server_privileges.php:797
 #: server_privileges.php:801 server_privileges.php:812
 #: server_privileges.php:1555 server_synchronize.php:1175
+=======
+#: libraries/replication_gui.lib.php:352 server_privileges.php:796
+#: server_privileges.php:800 server_privileges.php:811
+#: server_privileges.php:1538 server_synchronize.php:1175
+>>>>>>> origin/master
 msgid "Password"
 msgstr "Parol"
 
 #: libraries/display_change_password.lib.php:46
 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359
+<<<<<<< HEAD
 #: server_privileges.php:816 server_privileges.php:819
+=======
+#: server_privileges.php:815 server_privileges.php:818
+>>>>>>> origin/master
 msgid "Re-type"
 msgstr "Re-type"
 
@@ -2090,12 +2228,20 @@ msgid "MySQL 4.0 compatible"
 msgstr ""
 
 #: libraries/display_change_password.lib.php:72
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:363 server_privileges.php:823
+=======
+#: libraries/replication_gui.lib.php:363 server_privileges.php:822
+>>>>>>> origin/master
 msgid "Generate Password"
 msgstr ""
 
 #: libraries/display_change_password.lib.php:75
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:366 server_privileges.php:826
+=======
+#: libraries/replication_gui.lib.php:366 server_privileges.php:825
+>>>>>>> origin/master
 #, fuzzy
 msgid "Generate"
 msgstr "Qurucu"
@@ -2182,7 +2328,11 @@ msgid "remember template"
 msgstr "nomenklaturanı unutma"
 
 #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552
+=======
+#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549
+>>>>>>> origin/master
 msgid "Character set of the file:"
 msgstr "Faylın Charset-i:"
 
@@ -2235,7 +2385,11 @@ msgstr ""
 msgid "File to import"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527
+=======
+#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524
+>>>>>>> origin/master
 msgid "Location of the text file"
 msgstr "tekst faylından yükleyerek"
 
@@ -2243,12 +2397,20 @@ msgstr "tekst faylından yükleyerek"
 msgid "File uploads are not allowed on this server."
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536
+=======
+#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533
+>>>>>>> origin/master
 #: tbl_change.php:1025
 msgid "The directory you set for upload work cannot be reached"
 msgstr "Upload işleri üçün te'yin etdiyiniz direktoriya tapılmadı"
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539
+=======
+#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536
+>>>>>>> origin/master
 #: tbl_change.php:1028
 msgid "web server upload directory"
 msgstr "web-server upload direktoriyası"
@@ -2377,7 +2539,11 @@ msgstr ""
 #: libraries/import/docsql.php:34 libraries/import/ldi.php:47
 #: libraries/import/ods.php:30 libraries/import/sql.php:20
 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26
+<<<<<<< HEAD
 #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751
+=======
+#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753
+>>>>>>> origin/master
 #, fuzzy
 msgid "Options"
 msgstr "Emeliyyatlar"
@@ -2524,7 +2690,11 @@ msgstr ""
 
 #: libraries/engines/innodb.lib.php:194 server_databases.php:137
 #: server_databases.php:305 server_status.php:525 server_status.php:586
+<<<<<<< HEAD
 #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694
+=======
+#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696
+>>>>>>> origin/master
 msgid "Total"
 msgstr "Cemi"
 
@@ -2771,7 +2941,11 @@ msgid ""
 msgstr ""
 
 #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88
+<<<<<<< HEAD
 #: tbl_printview.php:375 tbl_structure.php:735
+=======
+#: tbl_printview.php:375 tbl_structure.php:737
+>>>>>>> origin/master
 msgid "Format"
 msgstr "Format"
 
@@ -2843,8 +3017,13 @@ msgstr "Microsoft Word 2000"
 #: libraries/export/latex.php:201 libraries/export/odt.php:48
 #: libraries/export/sql.php:106 libraries/export/sql.php:868
 #: libraries/export/texytext.php:27 server_databases.php:127
+<<<<<<< HEAD
 #: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316
 #: tbl_structure.php:663
+=======
+#: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316
+#: tbl_structure.php:665
+>>>>>>> origin/master
 msgid "Data"
 msgstr "Me'lumat"
 
@@ -2893,9 +3072,15 @@ msgstr "MIME-tipi"
 #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57
 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177
 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:332 server_privileges.php:732
 #: server_privileges.php:735 server_privileges.php:791
 #: server_privileges.php:1554 server_privileges.php:2092
+=======
+#: libraries/replication_gui.lib.php:332 server_privileges.php:731
+#: server_privileges.php:734 server_privileges.php:790
+#: server_privileges.php:1537 server_privileges.php:2069
+>>>>>>> origin/master
 #: server_processlist.php:55 server_synchronize.php:1159
 msgid "Host"
 msgstr "Host"
@@ -3570,8 +3755,13 @@ msgstr ""
 
 #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59
 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:262 server_privileges.php:712
 #: server_privileges.php:715 server_privileges.php:722
+=======
+#: libraries/replication_gui.lib.php:262 server_privileges.php:711
+#: server_privileges.php:714 server_privileges.php:721
+>>>>>>> origin/master
 #: server_synchronize.php:1171
 msgid "User name"
 msgstr "İstifadeçi adı"
@@ -3589,14 +3779,22 @@ msgstr ""
 msgid "Slave status"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448
+=======
+#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445
+>>>>>>> origin/master
 #: server_status.php:737 server_variables.php:52
 msgid "Variable"
 msgstr "Deyişen"
 
 #: libraries/replication_gui.lib.php:118 server_status.php:738
 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138
+<<<<<<< HEAD
 #: tbl_structure.php:727
+=======
+#: tbl_structure.php:729
+>>>>>>> origin/master
 msgid "Value"
 msgstr "Deyer"
 
@@ -3615,11 +3813,16 @@ msgstr ""
 msgid "Add slave replication user"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:257 server_privileges.php:717
+=======
+#: libraries/replication_gui.lib.php:257 server_privileges.php:716
+>>>>>>> origin/master
 msgid "Any user"
 msgstr "Her hansı istifadeçi"
 
 #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:349 server_privileges.php:718
 #: server_privileges.php:785 server_privileges.php:809
 #: server_privileges.php:1950 server_privileges.php:1980
@@ -3643,6 +3846,31 @@ msgid "Use Host Table"
 msgstr "Use Host Table"
 
 #: libraries/replication_gui.lib.php:334 server_privileges.php:793
+=======
+#: libraries/replication_gui.lib.php:349 server_privileges.php:717
+#: server_privileges.php:784 server_privileges.php:808
+#: server_privileges.php:1928 server_privileges.php:1958
+msgid "Use text field"
+msgstr "Use text field"
+
+#: libraries/replication_gui.lib.php:305 server_privileges.php:764
+msgid "Any host"
+msgstr "Her hansı host"
+
+#: libraries/replication_gui.lib.php:309 server_privileges.php:768
+msgid "Local"
+msgstr "Yerli"
+
+#: libraries/replication_gui.lib.php:315 server_privileges.php:773
+msgid "This Host"
+msgstr "Bu Host"
+
+#: libraries/replication_gui.lib.php:321 server_privileges.php:779
+msgid "Use Host Table"
+msgstr "Use Host Table"
+
+#: libraries/replication_gui.lib.php:334 server_privileges.php:792
+>>>>>>> origin/master
 msgid ""
 "When Host table is used, this field is ignored and values stored in Host "
 "table are used instead."
@@ -7697,10 +7925,13 @@ msgstr ""
 msgid "Show insert query"
 msgstr ""
 
+<<<<<<< HEAD
 #: tbl_change.php:1140
 msgid "and then"
 msgstr ""
 
+=======
+>>>>>>> origin/master
 #: tbl_change.php:1144
 msgid "Go back to previous page"
 msgstr "Evvelki sehifeye qayıt"
@@ -7896,6 +8127,7 @@ msgstr "Check referential integrity:"
 msgid "Show tables"
 msgstr "Cedvelleri göster"
 
+<<<<<<< HEAD
 #: tbl_printview.php:309 tbl_structure.php:654
 msgid "Space usage"
 msgstr "Yer istifadesi"
@@ -7929,6 +8161,41 @@ msgid "Row length"
 msgstr "Sıra uzunluğu"
 
 #: tbl_printview.php:413 tbl_structure.php:791
+=======
+#: tbl_printview.php:309 tbl_structure.php:656
+msgid "Space usage"
+msgstr "Yer istifadesi"
+
+#: tbl_printview.php:313 tbl_structure.php:660
+msgid "Usage"
+msgstr "Miqdar"
+
+#: tbl_printview.php:340 tbl_structure.php:687
+msgid "Effective"
+msgstr "Effektiv"
+
+#: tbl_printview.php:365 tbl_structure.php:725
+msgid "Row Statistics"
+msgstr "Sıra Statistikası"
+
+#: tbl_printview.php:368 tbl_structure.php:728
+msgid "Statements"
+msgstr "Variantlar"
+
+#: tbl_printview.php:379 tbl_structure.php:740
+msgid "static"
+msgstr ""
+
+#: tbl_printview.php:381 tbl_structure.php:742
+msgid "dynamic"
+msgstr "dinamik"
+
+#: tbl_printview.php:403 tbl_structure.php:785
+msgid "Row length"
+msgstr "Sıra uzunluğu"
+
+#: tbl_printview.php:413 tbl_structure.php:793
+>>>>>>> origin/master
 msgid " Row size "
 msgstr " Sıra boyu "
 
diff --git a/po/be.po b/po/be.po
index bfe4c9d10..9b92d7da3 100755
--- a/po/be.po
+++ b/po/be.po
@@ -3,7 +3,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2010-07-03 21:45+0530\n"
+=======
+"POT-Creation-Date: 2010-07-03 09:00-0400\n"
+>>>>>>> origin/master
 "PO-Revision-Date: 2010-03-12 09:12+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: belarusian_cyrillic <be@li.org>\n"
@@ -48,15 +52,26 @@ msgstr "Пошук"
 #: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046
 #: libraries/Theme_Manager.class.php:311
 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719
+<<<<<<< HEAD
 #: libraries/common.lib.php:1344 libraries/common.lib.php:2301
 #: libraries/display_change_password.lib.php:82
 #: libraries/display_create_table.lib.php:62
+=======
+#: libraries/common.lib.php:1335 libraries/common.lib.php:2288
+#: libraries/display_change_password.lib.php:82
+#: libraries/display_create_table.lib.php:63
+>>>>>>> origin/master
 #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532
 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76
 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104
+<<<<<<< HEAD
 #: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480
 #: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782
+=======
+#: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477
+#: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782
+>>>>>>> origin/master
 #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328
 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142
 #: server_privileges.php:665 server_privileges.php:1641
@@ -66,8 +81,13 @@ msgstr "Пошук"
 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171
 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265
 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561
+<<<<<<< HEAD
 #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560
 #: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512
+=======
+#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562
+#: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512
+>>>>>>> origin/master
 #: view_create.php:182 view_operations.php:101
 msgid "Go"
 msgstr "Панеслася"
@@ -120,10 +140,17 @@ msgstr "Назвы калёнак"
 #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245
 #: libraries/export/latex.php:360 libraries/export/odt.php:297
 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100
+<<<<<<< HEAD
 #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093
 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
 #: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321
+=======
+#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070
+#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
+#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
+#: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321
+>>>>>>> origin/master
 msgid "Type"
 msgstr "Тып"
 
@@ -164,9 +191,15 @@ msgstr "Камэнтары"
 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322
 #: libraries/export/latex.php:430 libraries/export/odt.php:368
 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263
+<<<<<<< HEAD
 #: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596
 #: server_privileges.php:1911 server_privileges.php:1916
 #: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228
+=======
+#: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579
+#: server_privileges.php:1889 server_privileges.php:1894
+#: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228
+>>>>>>> origin/master
 #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342
 msgid "No"
 msgstr "Не"
@@ -180,9 +213,15 @@ msgstr "Не"
 #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106
 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262
 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344
+<<<<<<< HEAD
 #: server_databases.php:64 server_privileges.php:1582
 #: server_privileges.php:1596 server_privileges.php:1911
 #: server_privileges.php:1914 server_privileges.php:2210 sql.php:193
+=======
+#: server_databases.php:64 server_privileges.php:1565
+#: server_privileges.php:1579 server_privileges.php:1889
+#: server_privileges.php:1892 server_privileges.php:2187 sql.php:193
+>>>>>>> origin/master
 #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350
 #: tbl_tracking.php:335 tbl_tracking.php:340
 msgid "Yes"
@@ -231,7 +270,15 @@ msgstr "Перайменаваць базу дадзеных у"
 msgid "Command"
 msgstr "Каманда"
 
+<<<<<<< HEAD
 #: db_operations.php:466
+=======
+#: db_operations.php:429 tbl_change.php:1140
+msgid "and then"
+msgstr "і пасьля"
+
+#: db_operations.php:455
+>>>>>>> origin/master
 msgid "Copy database to"
 msgstr "Капіяваць базу дадзеных у"
 
@@ -321,7 +368,11 @@ msgstr "Уключана"
 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730
 #: server_collations.php:54 server_collations.php:66 server_databases.php:111
 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179
+<<<<<<< HEAD
 #: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326
+=======
+#: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326
+>>>>>>> origin/master
 msgid "Collation"
 msgstr "Супастаўленьне"
 
@@ -350,7 +401,11 @@ msgstr "Табліца"
 #: db_printview.php:105 libraries/db_structure.lib.php:56
 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146
 #: navigation.php:638 navigation.php:660 server_databases.php:122
+<<<<<<< HEAD
 #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775
+=======
+#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777
+>>>>>>> origin/master
 msgid "Rows"
 msgstr "Радкі"
 
@@ -365,19 +420,31 @@ msgstr "выкарыстоўваецца"
 
 #: db_printview.php:187 libraries/db_info.inc.php:88
 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433
+<<<<<<< HEAD
 #: tbl_structure.php:807
+=======
+#: tbl_structure.php:809
+>>>>>>> origin/master
 msgid "Creation"
 msgstr "Створаная"
 
 #: db_printview.php:196 libraries/db_info.inc.php:93
 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443
+<<<<<<< HEAD
 #: tbl_structure.php:815
+=======
+#: tbl_structure.php:817
+>>>>>>> origin/master
 msgid "Last update"
 msgstr "Апошняе абнаўленьне"
 
 #: db_printview.php:205 libraries/db_info.inc.php:98
 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453
+<<<<<<< HEAD
 #: tbl_structure.php:823
+=======
+#: tbl_structure.php:825
+>>>>>>> origin/master
 msgid "Last check"
 msgstr "Апошняя праверка"
 
@@ -442,7 +509,11 @@ msgstr "Выдаліць"
 
 #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553
 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779
+<<<<<<< HEAD
 #: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250
+=======
+#: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250
+>>>>>>> origin/master
 #: tbl_select.php:286
 msgid "Or"
 msgstr "Або"
@@ -664,9 +735,15 @@ msgstr "З адзначанымі:"
 msgid "Check All"
 msgstr "Адзначыць усё"
 
+<<<<<<< HEAD
 #: db_structure.php:529 libraries/display_tbl.lib.php:2077
 #: libraries/replication_gui.lib.php:36 server_databases.php:350
 #: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460
+=======
+#: db_structure.php:531 libraries/display_tbl.lib.php:2077
+#: libraries/replication_gui.lib.php:36 server_databases.php:350
+#: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462
+>>>>>>> origin/master
 msgid "Uncheck All"
 msgstr "Зьняць усе адзнакі"
 
@@ -1138,10 +1215,17 @@ msgid "Prev"
 msgstr "Папярэдняя старонка"
 
 #. l10n: Display text for next month link in calendar
+<<<<<<< HEAD
 #: js/messages.php:106 libraries/common.lib.php:2366
 #: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338
 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
 #: tbl_structure.php:799
+=======
+#: js/messages.php:77 libraries/common.lib.php:2353
+#: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338
+#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
+#: tbl_structure.php:801
+>>>>>>> origin/master
 msgid "Next"
 msgstr "Наступная старонка"
 
@@ -1691,7 +1775,11 @@ msgstr "Пароль:"
 msgid "Server Choice"
 msgstr "Выбар сэрвэра"
 
+<<<<<<< HEAD
 #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63
+=======
+#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59
+>>>>>>> origin/master
 msgid "Cookies must be enabled past this point."
 msgstr "Cookies мусяць быць уключанымі пасьля гэтага месца."
 
@@ -1774,7 +1862,11 @@ msgstr ""
 "час, як пашырэньне паведамляе, што яно загружанае. Праверце вашую "
 "канфігурацыю PHP."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:580
+=======
+#: libraries/common.inc.php:576
+>>>>>>> origin/master
 msgid ""
 "phpMyAdmin was unable to read your configuration file!<br />This might "
 "happen if PHP finds a parse error in it or PHP cannot find the file.<br /"
@@ -1790,13 +1882,21 @@ msgstr ""
 "пра памылкі. У большасьці выпадкаў, недзе прапушчаны апостраф або кропка з "
 "коскай.<br />Калі вы атрымаеце чыстую старонку, значыць, усё добра."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:591
+=======
+#: libraries/common.inc.php:587
+>>>>>>> origin/master
 #, fuzzy, php-format
 #| msgid "Could not load default configuration from: \"%1$s\""
 msgid "Could not load default configuration from: %1$s"
 msgstr "Немагчыма загрузіць канфігурацыю па змоўчаньні з: \"%1$s\""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:596
+=======
+#: libraries/common.inc.php:592
+>>>>>>> origin/master
 msgid ""
 "The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
 "configuration file!"
@@ -1804,29 +1904,49 @@ msgstr ""
 "Дырэктыва <tt>$cfg['PmaAbsoluteUri']</tt> ПАВІННА быць вызначаная ў вашым "
 "канфігурацыйным файле!"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:626
+=======
+#: libraries/common.inc.php:622
+>>>>>>> origin/master
 #, fuzzy, php-format
 #| msgid "Invalid server index: \"%s\""
 msgid "Invalid server index: %s"
 msgstr "Некарэктны індэкс сэрвэра: \"%s\""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:633
+=======
+#: libraries/common.inc.php:629
+>>>>>>> origin/master
 #, php-format
 msgid "Invalid hostname for server %1$s. Please review your configuration."
 msgstr ""
 "Няправільнае імя хосту для сэрвэра %1$s. Калі ласка, праверце канфігурыцыю."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:642 libraries/header.inc.php:100
+=======
+#: libraries/common.inc.php:638 libraries/header.inc.php:96
+>>>>>>> origin/master
 #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47
 #: main.php:185 test/theme.php:57
 msgid "Server"
 msgstr "Сэрвэр"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:820
 msgid "Invalid authentication method set in configuration:"
 msgstr "У канфігурацыі вызначаны некарэктны мэтад аўтэнтыфікацыі:"
 
 #: libraries/common.inc.php:923
+=======
+#: libraries/common.inc.php:816
+msgid "Invalid authentication method set in configuration:"
+msgstr "У канфігурацыі вызначаны некарэктны мэтад аўтэнтыфікацыі:"
+
+#: libraries/common.inc.php:919
+>>>>>>> origin/master
 #, php-format
 msgid "You should upgrade to %s %s or later."
 msgstr "Вам трэба абнавіць %s да вэрсіі %s ці пазьнейшай."
@@ -2075,7 +2195,11 @@ msgid ""
 msgstr "Значэньне можа быць прыблізным. Гл. FAQ 3.11"
 
 #: libraries/db_structure.lib.php:69 server_databases.php:142
+<<<<<<< HEAD
 #: tbl_printview.php:335 tbl_structure.php:680
+=======
+#: tbl_printview.php:335 tbl_structure.php:682
+>>>>>>> origin/master
 msgid "Overhead"
 msgstr "Выкарыстаньне рэсурсаў"
 
@@ -2104,22 +2228,36 @@ msgid "Change password"
 msgstr "Зьмяніць пароль"
 
 #: libraries/display_change_password.lib.php:35
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:348 server_privileges.php:808
+=======
+#: libraries/replication_gui.lib.php:348 server_privileges.php:807
+>>>>>>> origin/master
 msgid "No Password"
 msgstr "Без пароля"
 
 #: libraries/display_change_password.lib.php:41
 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63
 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:352 server_privileges.php:797
 #: server_privileges.php:801 server_privileges.php:812
 #: server_privileges.php:1555 server_synchronize.php:1175
+=======
+#: libraries/replication_gui.lib.php:352 server_privileges.php:796
+#: server_privileges.php:800 server_privileges.php:811
+#: server_privileges.php:1538 server_synchronize.php:1175
+>>>>>>> origin/master
 msgid "Password"
 msgstr "Пароль"
 
 #: libraries/display_change_password.lib.php:46
 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359
+<<<<<<< HEAD
 #: server_privileges.php:816 server_privileges.php:819
+=======
+#: server_privileges.php:815 server_privileges.php:818
+>>>>>>> origin/master
 msgid "Re-type"
 msgstr "Пацьверджаньне"
 
@@ -2134,12 +2272,20 @@ msgid "MySQL 4.0 compatible"
 msgstr "Сумяшчальнае з MySQL&nbsp;4.0"
 
 #: libraries/display_change_password.lib.php:72
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:363 server_privileges.php:823
+=======
+#: libraries/replication_gui.lib.php:363 server_privileges.php:822
+>>>>>>> origin/master
 msgid "Generate Password"
 msgstr "Згенэраваць пароль"
 
 #: libraries/display_change_password.lib.php:75
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:366 server_privileges.php:826
+=======
+#: libraries/replication_gui.lib.php:366 server_privileges.php:825
+>>>>>>> origin/master
 msgid "Generate"
 msgstr "Згенэраваць"
 
@@ -2229,7 +2375,11 @@ msgid "remember template"
 msgstr "запомніць шаблён"
 
 #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552
+=======
+#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549
+>>>>>>> origin/master
 msgid "Character set of the file:"
 msgstr "Кадыроўка файла:"
 
@@ -2282,7 +2432,11 @@ msgstr ""
 msgid "File to import"
 msgstr "Імпартаваць файл"
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527
+=======
+#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524
+>>>>>>> origin/master
 msgid "Location of the text file"
 msgstr "Месцазнаходжаньне тэкставага файла"
 
@@ -2290,12 +2444,20 @@ msgstr "Месцазнаходжаньне тэкставага файла"
 msgid "File uploads are not allowed on this server."
 msgstr "Загрузкі файлаў не дазволеныя на гэтым сэрвэры."
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536
+=======
+#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533
+>>>>>>> origin/master
 #: tbl_change.php:1025
 msgid "The directory you set for upload work cannot be reached"
 msgstr "Немагчыма адкрыць пазначаную вамі тэчку для загрузкі файлаў"
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539
+=======
+#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536
+>>>>>>> origin/master
 #: tbl_change.php:1028
 msgid "web server upload directory"
 msgstr "тэчка вэб-сэрвэра для загрузкі файлаў"
@@ -2431,7 +2593,11 @@ msgstr "Сартаваць па ключы"
 #: libraries/import/docsql.php:34 libraries/import/ldi.php:47
 #: libraries/import/ods.php:30 libraries/import/sql.php:20
 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26
+<<<<<<< HEAD
 #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751
+=======
+#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753
+>>>>>>> origin/master
 msgid "Options"
 msgstr "Налады"
 
@@ -2578,7 +2744,11 @@ msgstr "Выкарыстаньне пулу буфэру"
 
 #: libraries/engines/innodb.lib.php:194 server_databases.php:137
 #: server_databases.php:305 server_status.php:525 server_status.php:586
+<<<<<<< HEAD
 #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694
+=======
+#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696
+>>>>>>> origin/master
 msgid "Total"
 msgstr "Агулам"
 
@@ -2867,7 +3037,11 @@ msgstr ""
 "будуць перайменаваныя і ім будзе дадзены чарговы найвышэйшы нумар."
 
 #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88
+<<<<<<< HEAD
 #: tbl_printview.php:375 tbl_structure.php:735
+=======
+#: tbl_printview.php:375 tbl_structure.php:737
+>>>>>>> origin/master
 msgid "Format"
 msgstr "Фармат"
 
@@ -2939,8 +3113,13 @@ msgstr "Microsoft Word 2000"
 #: libraries/export/latex.php:201 libraries/export/odt.php:48
 #: libraries/export/sql.php:106 libraries/export/sql.php:868
 #: libraries/export/texytext.php:27 server_databases.php:127
+<<<<<<< HEAD
 #: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316
 #: tbl_structure.php:663
+=======
+#: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316
+#: tbl_structure.php:665
+>>>>>>> origin/master
 msgid "Data"
 msgstr "Дадзеныя"
 
@@ -2989,9 +3168,15 @@ msgstr "MIME-тып"
 #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57
 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177
 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:332 server_privileges.php:732
 #: server_privileges.php:735 server_privileges.php:791
 #: server_privileges.php:1554 server_privileges.php:2092
+=======
+#: libraries/replication_gui.lib.php:332 server_privileges.php:731
+#: server_privileges.php:734 server_privileges.php:790
+#: server_privileges.php:1537 server_privileges.php:2069
+>>>>>>> origin/master
 #: server_processlist.php:55 server_synchronize.php:1159
 msgid "Host"
 msgstr "Хост"
@@ -3665,8 +3850,13 @@ msgstr ""
 
 #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59
 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:262 server_privileges.php:712
 #: server_privileges.php:715 server_privileges.php:722
+=======
+#: libraries/replication_gui.lib.php:262 server_privileges.php:711
+#: server_privileges.php:714 server_privileges.php:721
+>>>>>>> origin/master
 #: server_synchronize.php:1171
 msgid "User name"
 msgstr "Імя карыстальніка"
@@ -3686,14 +3876,22 @@ msgstr "Паказаць стан залежных сэрвэраў"
 msgid "Slave status"
 msgstr "Паказаць стан залежных сэрвэраў"
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448
+=======
+#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445
+>>>>>>> origin/master
 #: server_status.php:737 server_variables.php:52
 msgid "Variable"
 msgstr "Зьменная"
 
 #: libraries/replication_gui.lib.php:118 server_status.php:738
 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138
+<<<<<<< HEAD
 #: tbl_structure.php:727
+=======
+#: tbl_structure.php:729
+>>>>>>> origin/master
 msgid "Value"
 msgstr "Значэньне"
 
@@ -3711,11 +3909,16 @@ msgstr ""
 msgid "Add slave replication user"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:257 server_privileges.php:717
+=======
+#: libraries/replication_gui.lib.php:257 server_privileges.php:716
+>>>>>>> origin/master
 msgid "Any user"
 msgstr "Любы карыстальнік"
 
 #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:349 server_privileges.php:718
 #: server_privileges.php:785 server_privileges.php:809
 #: server_privileges.php:1950 server_privileges.php:1980
@@ -3739,6 +3942,31 @@ msgid "Use Host Table"
 msgstr "Выкарыстоўваць табліцу хостаў"
 
 #: libraries/replication_gui.lib.php:334 server_privileges.php:793
+=======
+#: libraries/replication_gui.lib.php:349 server_privileges.php:717
+#: server_privileges.php:784 server_privileges.php:808
+#: server_privileges.php:1928 server_privileges.php:1958
+msgid "Use text field"
+msgstr "Выкарыстоўваць тэкставае поле"
+
+#: libraries/replication_gui.lib.php:305 server_privileges.php:764
+msgid "Any host"
+msgstr "Любы хост"
+
+#: libraries/replication_gui.lib.php:309 server_privileges.php:768
+msgid "Local"
+msgstr "Лякальны"
+
+#: libraries/replication_gui.lib.php:315 server_privileges.php:773
+msgid "This Host"
+msgstr "Гэты хост"
+
+#: libraries/replication_gui.lib.php:321 server_privileges.php:779
+msgid "Use Host Table"
+msgstr "Выкарыстоўваць табліцу хостаў"
+
+#: libraries/replication_gui.lib.php:334 server_privileges.php:792
+>>>>>>> origin/master
 msgid ""
 "When Host table is used, this field is ignored and values stored in Host "
 "table are used instead."
@@ -8010,10 +8238,13 @@ msgstr ""
 msgid "Show insert query"
 msgstr "У выглядзе SQL-запыту"
 
+<<<<<<< HEAD
 #: tbl_change.php:1140
 msgid "and then"
 msgstr "і пасьля"
 
+=======
+>>>>>>> origin/master
 #: tbl_change.php:1144
 msgid "Go back to previous page"
 msgstr "Перайсьці да папярэдняй старонкі"
@@ -8209,6 +8440,7 @@ msgstr "Праверыць цэласнасьць дадзеных:"
 msgid "Show tables"
 msgstr "Паказаць табліцы"
 
+<<<<<<< HEAD
 #: tbl_printview.php:309 tbl_structure.php:654
 msgid "Space usage"
 msgstr "Выкарыстаньне прасторы"
@@ -8242,6 +8474,41 @@ msgid "Row length"
 msgstr "Даўжыня радка"
 
 #: tbl_printview.php:413 tbl_structure.php:791
+=======
+#: tbl_printview.php:309 tbl_structure.php:656
+msgid "Space usage"
+msgstr "Выкарыстаньне прасторы"
+
+#: tbl_printview.php:313 tbl_structure.php:660
+msgid "Usage"
+msgstr "Выкарыстаньне"
+
+#: tbl_printview.php:340 tbl_structure.php:687
+msgid "Effective"
+msgstr "Эфэктыўнасьць"
+
+#: tbl_printview.php:365 tbl_structure.php:725
+msgid "Row Statistics"
+msgstr "Статыстыка радку"
+
+#: tbl_printview.php:368 tbl_structure.php:728
+msgid "Statements"
+msgstr "Выразы"
+
+#: tbl_printview.php:379 tbl_structure.php:740
+msgid "static"
+msgstr ""
+
+#: tbl_printview.php:381 tbl_structure.php:742
+msgid "dynamic"
+msgstr "дынамічны"
+
+#: tbl_printview.php:403 tbl_structure.php:785
+msgid "Row length"
+msgstr "Даўжыня радка"
+
+#: tbl_printview.php:413 tbl_structure.php:793
+>>>>>>> origin/master
 msgid " Row size "
 msgstr " Памер радка "
 
diff --git a/po/be@latin.po b/po/be@latin.po
index 92be41f31..249e2d1e1 100755
--- a/po/be@latin.po
+++ b/po/be@latin.po
@@ -3,7 +3,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2010-07-03 21:45+0530\n"
+=======
+"POT-Creation-Date: 2010-07-03 09:00-0400\n"
+>>>>>>> origin/master
 "PO-Revision-Date: 2010-03-30 23:09+0200\n"
 "Last-Translator: Michal <michal@cihar.com>\n"
 "Language-Team: belarusian_latin <be@latin@li.org>\n"
@@ -50,15 +54,26 @@ msgstr "Pošuk"
 #: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046
 #: libraries/Theme_Manager.class.php:311
 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719
+<<<<<<< HEAD
 #: libraries/common.lib.php:1344 libraries/common.lib.php:2301
 #: libraries/display_change_password.lib.php:82
 #: libraries/display_create_table.lib.php:62
+=======
+#: libraries/common.lib.php:1335 libraries/common.lib.php:2288
+#: libraries/display_change_password.lib.php:82
+#: libraries/display_create_table.lib.php:63
+>>>>>>> origin/master
 #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532
 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76
 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104
+<<<<<<< HEAD
 #: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480
 #: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782
+=======
+#: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477
+#: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782
+>>>>>>> origin/master
 #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328
 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142
 #: server_privileges.php:665 server_privileges.php:1641
@@ -68,8 +83,13 @@ msgstr "Pošuk"
 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171
 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265
 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561
+<<<<<<< HEAD
 #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560
 #: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512
+=======
+#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562
+#: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512
+>>>>>>> origin/master
 #: view_create.php:182 view_operations.php:101
 msgid "Go"
 msgstr "Paniesłasia"
@@ -122,10 +142,17 @@ msgstr "Nazvy kalonak"
 #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245
 #: libraries/export/latex.php:360 libraries/export/odt.php:297
 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100
+<<<<<<< HEAD
 #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093
 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
 #: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321
+=======
+#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070
+#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
+#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
+#: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321
+>>>>>>> origin/master
 msgid "Type"
 msgstr "Typ"
 
@@ -166,9 +193,15 @@ msgstr "Kamentary"
 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322
 #: libraries/export/latex.php:430 libraries/export/odt.php:368
 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263
+<<<<<<< HEAD
 #: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596
 #: server_privileges.php:1911 server_privileges.php:1916
 #: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228
+=======
+#: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579
+#: server_privileges.php:1889 server_privileges.php:1894
+#: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228
+>>>>>>> origin/master
 #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342
 msgid "No"
 msgstr "Nie"
@@ -182,9 +215,15 @@ msgstr "Nie"
 #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106
 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262
 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344
+<<<<<<< HEAD
 #: server_databases.php:64 server_privileges.php:1582
 #: server_privileges.php:1596 server_privileges.php:1911
 #: server_privileges.php:1914 server_privileges.php:2210 sql.php:193
+=======
+#: server_databases.php:64 server_privileges.php:1565
+#: server_privileges.php:1579 server_privileges.php:1889
+#: server_privileges.php:1892 server_privileges.php:2187 sql.php:193
+>>>>>>> origin/master
 #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350
 #: tbl_tracking.php:335 tbl_tracking.php:340
 msgid "Yes"
@@ -233,7 +272,15 @@ msgstr "Pierajmienavać bazu dadzienych u"
 msgid "Command"
 msgstr "Kamanda"
 
+<<<<<<< HEAD
 #: db_operations.php:466
+=======
+#: db_operations.php:429 tbl_change.php:1140
+msgid "and then"
+msgstr "i paśla"
+
+#: db_operations.php:455
+>>>>>>> origin/master
 msgid "Copy database to"
 msgstr "Kapijavać bazu dadzienych u"
 
@@ -321,7 +368,11 @@ msgstr ""
 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730
 #: server_collations.php:54 server_collations.php:66 server_databases.php:111
 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179
+<<<<<<< HEAD
 #: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326
+=======
+#: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326
+>>>>>>> origin/master
 msgid "Collation"
 msgstr "Supastaŭleńnie"
 
@@ -350,7 +401,11 @@ msgstr "Tablica"
 #: db_printview.php:105 libraries/db_structure.lib.php:56
 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146
 #: navigation.php:638 navigation.php:660 server_databases.php:122
+<<<<<<< HEAD
 #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775
+=======
+#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777
+>>>>>>> origin/master
 msgid "Rows"
 msgstr "Radki"
 
@@ -365,19 +420,31 @@ msgstr "vykarystoŭvajecca"
 
 #: db_printview.php:187 libraries/db_info.inc.php:88
 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433
+<<<<<<< HEAD
 #: tbl_structure.php:807
+=======
+#: tbl_structure.php:809
+>>>>>>> origin/master
 msgid "Creation"
 msgstr "Stvoranaja"
 
 #: db_printview.php:196 libraries/db_info.inc.php:93
 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443
+<<<<<<< HEAD
 #: tbl_structure.php:815
+=======
+#: tbl_structure.php:817
+>>>>>>> origin/master
 msgid "Last update"
 msgstr "Apošniaje abnaŭleńnie"
 
 #: db_printview.php:205 libraries/db_info.inc.php:98
 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453
+<<<<<<< HEAD
 #: tbl_structure.php:823
+=======
+#: tbl_structure.php:825
+>>>>>>> origin/master
 msgid "Last check"
 msgstr "Apošniaja pravierka"
 
@@ -443,7 +510,11 @@ msgstr "Vydalić"
 
 #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553
 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779
+<<<<<<< HEAD
 #: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250
+=======
+#: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250
+>>>>>>> origin/master
 #: tbl_select.php:286
 msgid "Or"
 msgstr "Abo"
@@ -665,9 +736,15 @@ msgstr "Z adznačanymi:"
 msgid "Check All"
 msgstr "Adznačyć usio"
 
+<<<<<<< HEAD
 #: db_structure.php:529 libraries/display_tbl.lib.php:2077
 #: libraries/replication_gui.lib.php:36 server_databases.php:350
 #: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460
+=======
+#: db_structure.php:531 libraries/display_tbl.lib.php:2077
+#: libraries/replication_gui.lib.php:36 server_databases.php:350
+#: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462
+>>>>>>> origin/master
 msgid "Uncheck All"
 msgstr "Źniać usie adznaki"
 
@@ -1134,10 +1211,17 @@ msgid "Prev"
 msgstr "Papiaredniaja staronka"
 
 #. l10n: Display text for next month link in calendar
+<<<<<<< HEAD
 #: js/messages.php:106 libraries/common.lib.php:2366
 #: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338
 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
 #: tbl_structure.php:799
+=======
+#: js/messages.php:77 libraries/common.lib.php:2353
+#: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338
+#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
+#: tbl_structure.php:801
+>>>>>>> origin/master
 msgid "Next"
 msgstr "Nastupnaja staronka"
 
@@ -1688,7 +1772,11 @@ msgstr "Parol:"
 msgid "Server Choice"
 msgstr "Vybar servera"
 
+<<<<<<< HEAD
 #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63
+=======
+#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59
+>>>>>>> origin/master
 msgid "Cookies must be enabled past this point."
 msgstr "Cookies musiać być uklučanymi paśla hetaha miesca."
 
@@ -1771,7 +1859,11 @@ msgstr ""
 "toj čas, jak pašyreńnie paviedamlaje, što jano zahružanaje. Praviercie "
 "vašuju kanfihuracyju PHP."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:580
+=======
+#: libraries/common.inc.php:576
+>>>>>>> origin/master
 msgid ""
 "phpMyAdmin was unable to read your configuration file!<br />This might "
 "happen if PHP finds a parse error in it or PHP cannot find the file.<br /"
@@ -1787,13 +1879,21 @@ msgstr ""
 "PHP pra pamyłki. U bolšaści vypadkaŭ, niedzie prapuščany apostraf abo kropka "
 "z koskaj. Kali vy atrymajecie čystuju staronku, značyć, usio dobra."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:591
+=======
+#: libraries/common.inc.php:587
+>>>>>>> origin/master
 #, fuzzy, php-format
 #| msgid "Could not load default configuration from: \"%1$s\""
 msgid "Could not load default configuration from: %1$s"
 msgstr "Niemahčyma zahruzić kanfihuracyju pa zmoŭčańni z: \"%1$s\""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:596
+=======
+#: libraries/common.inc.php:592
+>>>>>>> origin/master
 msgid ""
 "The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
 "configuration file!"
@@ -1801,30 +1901,50 @@ msgstr ""
 "Dyrektyva $cfg['PmaAbsoluteUri'] PAVINNA być vyznačanaja ŭ vašym "
 "kanfihuracyjnym fajle!"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:626
+=======
+#: libraries/common.inc.php:622
+>>>>>>> origin/master
 #, fuzzy, php-format
 #| msgid "Invalid server index: \"%s\""
 msgid "Invalid server index: %s"
 msgstr "Niekarektny indeks servera: \"%s\""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:633
+=======
+#: libraries/common.inc.php:629
+>>>>>>> origin/master
 #, php-format
 msgid "Invalid hostname for server %1$s. Please review your configuration."
 msgstr ""
 "Niapravilnaje imia chostu dla servera %1$s. Kali łaska, praviercie "
 "kanfihurycyju."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:642 libraries/header.inc.php:100
+=======
+#: libraries/common.inc.php:638 libraries/header.inc.php:96
+>>>>>>> origin/master
 #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47
 #: main.php:185 test/theme.php:57
 msgid "Server"
 msgstr "Server"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:820
 msgid "Invalid authentication method set in configuration:"
 msgstr "U kanfihuracyi vyznačany niekarektny metad aŭtentyfikacyi:"
 
 #: libraries/common.inc.php:923
+=======
+#: libraries/common.inc.php:816
+msgid "Invalid authentication method set in configuration:"
+msgstr "U kanfihuracyi vyznačany niekarektny metad aŭtentyfikacyi:"
+
+#: libraries/common.inc.php:919
+>>>>>>> origin/master
 #, php-format
 msgid "You should upgrade to %s %s or later."
 msgstr "Vam treba abnavić %s da versii %s ci paźniejšaj."
@@ -2072,7 +2192,11 @@ msgid ""
 msgstr "Značeńnie moža być prybliznym. Hł. FAQ 3.11"
 
 #: libraries/db_structure.lib.php:69 server_databases.php:142
+<<<<<<< HEAD
 #: tbl_printview.php:335 tbl_structure.php:680
+=======
+#: tbl_printview.php:335 tbl_structure.php:682
+>>>>>>> origin/master
 msgid "Overhead"
 msgstr "Vykarystańnie resursaŭ"
 
@@ -2101,22 +2225,36 @@ msgid "Change password"
 msgstr "Źmianić parol"
 
 #: libraries/display_change_password.lib.php:35
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:348 server_privileges.php:808
+=======
+#: libraries/replication_gui.lib.php:348 server_privileges.php:807
+>>>>>>> origin/master
 msgid "No Password"
 msgstr "Biez parola"
 
 #: libraries/display_change_password.lib.php:41
 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63
 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:352 server_privileges.php:797
 #: server_privileges.php:801 server_privileges.php:812
 #: server_privileges.php:1555 server_synchronize.php:1175
+=======
+#: libraries/replication_gui.lib.php:352 server_privileges.php:796
+#: server_privileges.php:800 server_privileges.php:811
+#: server_privileges.php:1538 server_synchronize.php:1175
+>>>>>>> origin/master
 msgid "Password"
 msgstr "Parol"
 
 #: libraries/display_change_password.lib.php:46
 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359
+<<<<<<< HEAD
 #: server_privileges.php:816 server_privileges.php:819
+=======
+#: server_privileges.php:815 server_privileges.php:818
+>>>>>>> origin/master
 msgid "Re-type"
 msgstr "Paćvierdžańnie"
 
@@ -2131,12 +2269,20 @@ msgid "MySQL 4.0 compatible"
 msgstr "Sumiaščalnaje z MySQL 4.0"
 
 #: libraries/display_change_password.lib.php:72
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:363 server_privileges.php:823
+=======
+#: libraries/replication_gui.lib.php:363 server_privileges.php:822
+>>>>>>> origin/master
 msgid "Generate Password"
 msgstr "Zgieneravać parol"
 
 #: libraries/display_change_password.lib.php:75
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:366 server_privileges.php:826
+=======
+#: libraries/replication_gui.lib.php:366 server_privileges.php:825
+>>>>>>> origin/master
 msgid "Generate"
 msgstr "Zgieneravać"
 
@@ -2226,7 +2372,11 @@ msgid "remember template"
 msgstr "zapomnić šablon"
 
 #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552
+=======
+#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549
+>>>>>>> origin/master
 msgid "Character set of the file:"
 msgstr "Kadyroŭka fajła:"
 
@@ -2279,7 +2429,11 @@ msgstr ""
 msgid "File to import"
 msgstr "Impartavać fajł"
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527
+=======
+#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524
+>>>>>>> origin/master
 msgid "Location of the text file"
 msgstr "Miescaznachodžańnie tekstavaha fajła"
 
@@ -2287,12 +2441,20 @@ msgstr "Miescaznachodžańnie tekstavaha fajła"
 msgid "File uploads are not allowed on this server."
 msgstr "Zahruzki fajłaŭ nie dazvolenyja na hetym servery."
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536
+=======
+#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533
+>>>>>>> origin/master
 #: tbl_change.php:1025
 msgid "The directory you set for upload work cannot be reached"
 msgstr "Niemahčyma adkryć paznačanuju vami tečku dla zahruzki fajłaŭ"
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539
+=======
+#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536
+>>>>>>> origin/master
 #: tbl_change.php:1028
 msgid "web server upload directory"
 msgstr "tečka web-servera dla zahruzki fajłaŭ"
@@ -2428,7 +2590,11 @@ msgstr "Sartavać pa klučy"
 #: libraries/import/docsql.php:34 libraries/import/ldi.php:47
 #: libraries/import/ods.php:30 libraries/import/sql.php:20
 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26
+<<<<<<< HEAD
 #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751
+=======
+#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753
+>>>>>>> origin/master
 msgid "Options"
 msgstr "Nałady"
 
@@ -2575,7 +2741,11 @@ msgstr "Vykarystańnie pułu buferu"
 
 #: libraries/engines/innodb.lib.php:194 server_databases.php:137
 #: server_databases.php:305 server_status.php:525 server_status.php:586
+<<<<<<< HEAD
 #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694
+=======
+#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696
+>>>>>>> origin/master
 msgid "Total"
 msgstr "Ahułam"
 
@@ -2868,7 +3038,11 @@ msgstr ""
 "pierajmienavanyja i im budzie dadzieny čarhovy najvyšejšy numar."
 
 #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88
+<<<<<<< HEAD
 #: tbl_printview.php:375 tbl_structure.php:735
+=======
+#: tbl_printview.php:375 tbl_structure.php:737
+>>>>>>> origin/master
 msgid "Format"
 msgstr "Farmat"
 
@@ -2940,8 +3114,13 @@ msgstr "Microsoft Word 2000"
 #: libraries/export/latex.php:201 libraries/export/odt.php:48
 #: libraries/export/sql.php:106 libraries/export/sql.php:868
 #: libraries/export/texytext.php:27 server_databases.php:127
+<<<<<<< HEAD
 #: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316
 #: tbl_structure.php:663
+=======
+#: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316
+#: tbl_structure.php:665
+>>>>>>> origin/master
 msgid "Data"
 msgstr "Dadzienyja"
 
@@ -2990,9 +3169,15 @@ msgstr "MIME-typ"
 #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57
 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177
 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:332 server_privileges.php:732
 #: server_privileges.php:735 server_privileges.php:791
 #: server_privileges.php:1554 server_privileges.php:2092
+=======
+#: libraries/replication_gui.lib.php:332 server_privileges.php:731
+#: server_privileges.php:734 server_privileges.php:790
+#: server_privileges.php:1537 server_privileges.php:2069
+>>>>>>> origin/master
 #: server_processlist.php:55 server_synchronize.php:1159
 msgid "Host"
 msgstr "Chost"
@@ -3657,8 +3842,13 @@ msgstr ""
 
 #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59
 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:262 server_privileges.php:712
 #: server_privileges.php:715 server_privileges.php:722
+=======
+#: libraries/replication_gui.lib.php:262 server_privileges.php:711
+#: server_privileges.php:714 server_privileges.php:721
+>>>>>>> origin/master
 #: server_synchronize.php:1171
 msgid "User name"
 msgstr "Imia karystalnika"
@@ -3675,14 +3865,22 @@ msgstr ""
 msgid "Slave status"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448
+=======
+#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445
+>>>>>>> origin/master
 #: server_status.php:737 server_variables.php:52
 msgid "Variable"
 msgstr "Źmiennaja"
 
 #: libraries/replication_gui.lib.php:118 server_status.php:738
 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138
+<<<<<<< HEAD
 #: tbl_structure.php:727
+=======
+#: tbl_structure.php:729
+>>>>>>> origin/master
 msgid "Value"
 msgstr "Značeńnie"
 
@@ -3700,11 +3898,16 @@ msgstr ""
 msgid "Add slave replication user"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:257 server_privileges.php:717
+=======
+#: libraries/replication_gui.lib.php:257 server_privileges.php:716
+>>>>>>> origin/master
 msgid "Any user"
 msgstr "Luby karystalnik"
 
 #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:349 server_privileges.php:718
 #: server_privileges.php:785 server_privileges.php:809
 #: server_privileges.php:1950 server_privileges.php:1980
@@ -3728,6 +3931,31 @@ msgid "Use Host Table"
 msgstr "Vykarystoŭvać tablicu chostaŭ"
 
 #: libraries/replication_gui.lib.php:334 server_privileges.php:793
+=======
+#: libraries/replication_gui.lib.php:349 server_privileges.php:717
+#: server_privileges.php:784 server_privileges.php:808
+#: server_privileges.php:1928 server_privileges.php:1958
+msgid "Use text field"
+msgstr "Vykarystoŭvać tekstavaje pole"
+
+#: libraries/replication_gui.lib.php:305 server_privileges.php:764
+msgid "Any host"
+msgstr "Luby chost"
+
+#: libraries/replication_gui.lib.php:309 server_privileges.php:768
+msgid "Local"
+msgstr "Lakalny"
+
+#: libraries/replication_gui.lib.php:315 server_privileges.php:773
+msgid "This Host"
+msgstr "Hety chost"
+
+#: libraries/replication_gui.lib.php:321 server_privileges.php:779
+msgid "Use Host Table"
+msgstr "Vykarystoŭvać tablicu chostaŭ"
+
+#: libraries/replication_gui.lib.php:334 server_privileges.php:792
+>>>>>>> origin/master
 msgid ""
 "When Host table is used, this field is ignored and values stored in Host "
 "table are used instead."
@@ -7935,10 +8163,13 @@ msgstr ""
 msgid "Show insert query"
 msgstr ""
 
+<<<<<<< HEAD
 #: tbl_change.php:1140
 msgid "and then"
 msgstr "i paśla"
 
+=======
+>>>>>>> origin/master
 #: tbl_change.php:1144
 msgid "Go back to previous page"
 msgstr "Pierajści da papiaredniaj staronki"
@@ -8133,6 +8364,7 @@ msgstr "Pravieryć cełasnaść dadzienych:"
 msgid "Show tables"
 msgstr "Pakazać tablicy"
 
+<<<<<<< HEAD
 #: tbl_printview.php:309 tbl_structure.php:654
 msgid "Space usage"
 msgstr "Vykarystańnie prastory"
@@ -8166,6 +8398,41 @@ msgid "Row length"
 msgstr "Daŭžynia radka"
 
 #: tbl_printview.php:413 tbl_structure.php:791
+=======
+#: tbl_printview.php:309 tbl_structure.php:656
+msgid "Space usage"
+msgstr "Vykarystańnie prastory"
+
+#: tbl_printview.php:313 tbl_structure.php:660
+msgid "Usage"
+msgstr "Vykarystańnie"
+
+#: tbl_printview.php:340 tbl_structure.php:687
+msgid "Effective"
+msgstr "Efektyŭnaść"
+
+#: tbl_printview.php:365 tbl_structure.php:725
+msgid "Row Statistics"
+msgstr "Statystyka radku"
+
+#: tbl_printview.php:368 tbl_structure.php:728
+msgid "Statements"
+msgstr "Vyrazy"
+
+#: tbl_printview.php:379 tbl_structure.php:740
+msgid "static"
+msgstr ""
+
+#: tbl_printview.php:381 tbl_structure.php:742
+msgid "dynamic"
+msgstr "dynamičny"
+
+#: tbl_printview.php:403 tbl_structure.php:785
+msgid "Row length"
+msgstr "Daŭžynia radka"
+
+#: tbl_printview.php:413 tbl_structure.php:793
+>>>>>>> origin/master
 msgid " Row size "
 msgstr " Pamier radka "
 
diff --git a/po/bg.po b/po/bg.po
index 62a9224e7..854606117 100755
--- a/po/bg.po
+++ b/po/bg.po
@@ -3,7 +3,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2010-07-03 21:45+0530\n"
+=======
+"POT-Creation-Date: 2010-07-03 09:00-0400\n"
+>>>>>>> origin/master
 "PO-Revision-Date: 2010-06-11 17:28+0200\n"
 "Last-Translator:  <stanprog@stanprog.com>\n"
 "Language-Team: bulgarian <bg@li.org>\n"
@@ -49,15 +53,26 @@ msgstr "Търсене"
 #: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046
 #: libraries/Theme_Manager.class.php:311
 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719
+<<<<<<< HEAD
 #: libraries/common.lib.php:1344 libraries/common.lib.php:2301
 #: libraries/display_change_password.lib.php:82
 #: libraries/display_create_table.lib.php:62
+=======
+#: libraries/common.lib.php:1335 libraries/common.lib.php:2288
+#: libraries/display_change_password.lib.php:82
+#: libraries/display_create_table.lib.php:63
+>>>>>>> origin/master
 #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532
 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76
 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104
+<<<<<<< HEAD
 #: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480
 #: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782
+=======
+#: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477
+#: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782
+>>>>>>> origin/master
 #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328
 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142
 #: server_privileges.php:665 server_privileges.php:1641
@@ -67,8 +82,13 @@ msgstr "Търсене"
 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171
 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265
 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561
+<<<<<<< HEAD
 #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560
 #: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512
+=======
+#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562
+#: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512
+>>>>>>> origin/master
 #: view_create.php:182 view_operations.php:101
 msgid "Go"
 msgstr "Изпълнение"
@@ -121,10 +141,17 @@ msgstr "Име на колона"
 #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245
 #: libraries/export/latex.php:360 libraries/export/odt.php:297
 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100
+<<<<<<< HEAD
 #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093
 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
 #: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321
+=======
+#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070
+#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
+#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
+#: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321
+>>>>>>> origin/master
 msgid "Type"
 msgstr "Тип"
 
@@ -165,9 +192,15 @@ msgstr "Коментари"
 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322
 #: libraries/export/latex.php:430 libraries/export/odt.php:368
 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263
+<<<<<<< HEAD
 #: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596
 #: server_privileges.php:1911 server_privileges.php:1916
 #: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228
+=======
+#: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579
+#: server_privileges.php:1889 server_privileges.php:1894
+#: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228
+>>>>>>> origin/master
 #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342
 msgid "No"
 msgstr "не"
@@ -181,9 +214,15 @@ msgstr "не"
 #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106
 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262
 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344
+<<<<<<< HEAD
 #: server_databases.php:64 server_privileges.php:1582
 #: server_privileges.php:1596 server_privileges.php:1911
 #: server_privileges.php:1914 server_privileges.php:2210 sql.php:193
+=======
+#: server_databases.php:64 server_privileges.php:1565
+#: server_privileges.php:1579 server_privileges.php:1889
+#: server_privileges.php:1892 server_privileges.php:2187 sql.php:193
+>>>>>>> origin/master
 #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350
 #: tbl_tracking.php:335 tbl_tracking.php:340
 msgid "Yes"
@@ -232,7 +271,15 @@ msgstr "Преименуване на базата от данни на"
 msgid "Command"
 msgstr "Команда"
 
+<<<<<<< HEAD
 #: db_operations.php:466
+=======
+#: db_operations.php:429 tbl_change.php:1140
+msgid "and then"
+msgstr "и след това"
+
+#: db_operations.php:455
+>>>>>>> origin/master
 msgid "Copy database to"
 msgstr "Копиране на базата от данни в"
 
@@ -321,7 +368,11 @@ msgstr "Позволено"
 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730
 #: server_collations.php:54 server_collations.php:66 server_databases.php:111
 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179
+<<<<<<< HEAD
 #: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326
+=======
+#: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326
+>>>>>>> origin/master
 msgid "Collation"
 msgstr "Колация"
 
@@ -350,7 +401,11 @@ msgstr "Таблица "
 #: db_printview.php:105 libraries/db_structure.lib.php:56
 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146
 #: navigation.php:638 navigation.php:660 server_databases.php:122
+<<<<<<< HEAD
 #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775
+=======
+#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777
+>>>>>>> origin/master
 msgid "Rows"
 msgstr "Редове"
 
@@ -365,19 +420,31 @@ msgstr "Заето"
 
 #: db_printview.php:187 libraries/db_info.inc.php:88
 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433
+<<<<<<< HEAD
 #: tbl_structure.php:807
+=======
+#: tbl_structure.php:809
+>>>>>>> origin/master
 msgid "Creation"
 msgstr "Дата на създаване"
 
 #: db_printview.php:196 libraries/db_info.inc.php:93
 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443
+<<<<<<< HEAD
 #: tbl_structure.php:815
+=======
+#: tbl_structure.php:817
+>>>>>>> origin/master
 msgid "Last update"
 msgstr "Последно обновление"
 
 #: db_printview.php:205 libraries/db_info.inc.php:98
 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453
+<<<<<<< HEAD
 #: tbl_structure.php:823
+=======
+#: tbl_structure.php:825
+>>>>>>> origin/master
 msgid "Last check"
 msgstr "Последна проверка"
 
@@ -442,7 +509,11 @@ msgstr "Изтрий"
 
 #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553
 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779
+<<<<<<< HEAD
 #: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250
+=======
+#: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250
+>>>>>>> origin/master
 #: tbl_select.php:286
 msgid "Or"
 msgstr "или"
@@ -660,9 +731,15 @@ msgstr "Когато има отметка:"
 msgid "Check All"
 msgstr "Маркиране на всичко"
 
+<<<<<<< HEAD
 #: db_structure.php:529 libraries/display_tbl.lib.php:2077
 #: libraries/replication_gui.lib.php:36 server_databases.php:350
 #: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460
+=======
+#: db_structure.php:531 libraries/display_tbl.lib.php:2077
+#: libraries/replication_gui.lib.php:36 server_databases.php:350
+#: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462
+>>>>>>> origin/master
 msgid "Uncheck All"
 msgstr "Размаркиране на всичко"
 
@@ -1124,10 +1201,17 @@ msgid "Prev"
 msgstr "Предишен"
 
 #. l10n: Display text for next month link in calendar
+<<<<<<< HEAD
 #: js/messages.php:106 libraries/common.lib.php:2366
 #: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338
 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
 #: tbl_structure.php:799
+=======
+#: js/messages.php:77 libraries/common.lib.php:2353
+#: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338
+#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
+#: tbl_structure.php:801
+>>>>>>> origin/master
 msgid "Next"
 msgstr "Следващ"
 
@@ -1667,7 +1751,11 @@ msgstr "Парола:"
 msgid "Server Choice"
 msgstr "Избор на сървър"
 
+<<<<<<< HEAD
 #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63
+=======
+#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59
+>>>>>>> origin/master
 msgid "Cookies must be enabled past this point."
 msgstr "Оттук нататък са необходими \"Cookies\"."
 
@@ -1749,7 +1837,11 @@ msgstr ""
 "докато протоколите за разширенията са заредени. Проверете конфигурацията на "
 "PHP."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:580
+=======
+#: libraries/common.inc.php:576
+>>>>>>> origin/master
 msgid ""
 "phpMyAdmin was unable to read your configuration file!<br />This might "
 "happen if PHP finds a parse error in it or PHP cannot find the file.<br /"
@@ -1765,13 +1857,21 @@ msgstr ""
 "част от случаите, някъде липсват кавички или точка и запетая.<br />Ако се "
 "изведе празна страница, всички е наред."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:591
+=======
+#: libraries/common.inc.php:587
+>>>>>>> origin/master
 #, fuzzy, php-format
 #| msgid "Could not load default configuration from: \"%1$s\""
 msgid "Could not load default configuration from: %1$s"
 msgstr "Конфигурацията по подразбиране не може да бъде заредена от: \"%1$s\""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:596
+=======
+#: libraries/common.inc.php:592
+>>>>>>> origin/master
 msgid ""
 "The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
 "configuration file!"
@@ -1779,27 +1879,47 @@ msgstr ""
 "На <tt>$cfg['PmaAbsoluteUri']</tt> ТРЯБВА да се зададе стойност в "
 "конфигурационния файл!"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:626
+=======
+#: libraries/common.inc.php:622
+>>>>>>> origin/master
 #, php-format
 msgid "Invalid server index: %s"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:633
+=======
+#: libraries/common.inc.php:629
+>>>>>>> origin/master
 #, php-format
 msgid "Invalid hostname for server %1$s. Please review your configuration."
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:642 libraries/header.inc.php:100
+=======
+#: libraries/common.inc.php:638 libraries/header.inc.php:96
+>>>>>>> origin/master
 #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47
 #: main.php:185 test/theme.php:57
 msgid "Server"
 msgstr "Сървър"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:820
 msgid "Invalid authentication method set in configuration:"
 msgstr ""
 
 #: libraries/common.inc.php:923
+=======
+#: libraries/common.inc.php:816
+msgid "Invalid authentication method set in configuration:"
+msgstr ""
+
+#: libraries/common.inc.php:919
+>>>>>>> origin/master
 #, php-format
 msgid "You should upgrade to %s %s or later."
 msgstr "Трябва да ъпгрейднете към %s %s или по-късно."
@@ -2047,7 +2167,11 @@ msgid ""
 msgstr "Може да има приблизителна стойност. Виж FAQ 3.11"
 
 #: libraries/db_structure.lib.php:69 server_databases.php:142
+<<<<<<< HEAD
 #: tbl_printview.php:335 tbl_structure.php:680
+=======
+#: tbl_printview.php:335 tbl_structure.php:682
+>>>>>>> origin/master
 msgid "Overhead"
 msgstr "Загубено място"
 
@@ -2074,22 +2198,36 @@ msgid "Change password"
 msgstr "Смяна на паролата"
 
 #: libraries/display_change_password.lib.php:35
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:348 server_privileges.php:808
+=======
+#: libraries/replication_gui.lib.php:348 server_privileges.php:807
+>>>>>>> origin/master
 msgid "No Password"
 msgstr "Без парола"
 
 #: libraries/display_change_password.lib.php:41
 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63
 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:352 server_privileges.php:797
 #: server_privileges.php:801 server_privileges.php:812
 #: server_privileges.php:1555 server_synchronize.php:1175
+=======
+#: libraries/replication_gui.lib.php:352 server_privileges.php:796
+#: server_privileges.php:800 server_privileges.php:811
+#: server_privileges.php:1538 server_synchronize.php:1175
+>>>>>>> origin/master
 msgid "Password"
 msgstr "Парола"
 
 #: libraries/display_change_password.lib.php:46
 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359
+<<<<<<< HEAD
 #: server_privileges.php:816 server_privileges.php:819
+=======
+#: server_privileges.php:815 server_privileges.php:818
+>>>>>>> origin/master
 msgid "Re-type"
 msgstr "Отново"
 
@@ -2104,12 +2242,20 @@ msgid "MySQL 4.0 compatible"
 msgstr "MySQL&nbsp;4.0 съвместимо"
 
 #: libraries/display_change_password.lib.php:72
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:363 server_privileges.php:823
+=======
+#: libraries/replication_gui.lib.php:363 server_privileges.php:822
+>>>>>>> origin/master
 msgid "Generate Password"
 msgstr "Генериране на парола"
 
 #: libraries/display_change_password.lib.php:75
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:366 server_privileges.php:826
+=======
+#: libraries/replication_gui.lib.php:366 server_privileges.php:825
+>>>>>>> origin/master
 msgid "Generate"
 msgstr "Генериране"
 
@@ -2193,7 +2339,11 @@ msgid "remember template"
 msgstr "запомняне на шаблона"
 
 #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552
+=======
+#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549
+>>>>>>> origin/master
 msgid "Character set of the file:"
 msgstr "Набор от знаци на файла:"
 
@@ -2246,7 +2396,11 @@ msgstr ""
 msgid "File to import"
 msgstr "Файл за импортиране"
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527
+=======
+#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524
+>>>>>>> origin/master
 msgid "Location of the text file"
 msgstr "Местоположение на текстовия файл"
 
@@ -2254,12 +2408,20 @@ msgstr "Местоположение на текстовия файл"
 msgid "File uploads are not allowed on this server."
 msgstr "На този сървър не е позволени качване на файлове."
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536
+=======
+#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533
+>>>>>>> origin/master
 #: tbl_change.php:1025
 msgid "The directory you set for upload work cannot be reached"
 msgstr "Директорията която сте указали за upload не може да бъде достигната"
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539
+=======
+#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536
+>>>>>>> origin/master
 #: tbl_change.php:1028
 msgid "web server upload directory"
 msgstr "директорията за upload на уеб сървъра"
@@ -2390,7 +2552,11 @@ msgstr "Сортиране по ключ"
 #: libraries/import/docsql.php:34 libraries/import/ldi.php:47
 #: libraries/import/ods.php:30 libraries/import/sql.php:20
 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26
+<<<<<<< HEAD
 #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751
+=======
+#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753
+>>>>>>> origin/master
 #, fuzzy
 msgid "Options"
 msgstr "Операции"
@@ -2536,7 +2702,11 @@ msgstr ""
 
 #: libraries/engines/innodb.lib.php:194 server_databases.php:137
 #: server_databases.php:305 server_status.php:525 server_status.php:586
+<<<<<<< HEAD
 #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694
+=======
+#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696
+>>>>>>> origin/master
 msgid "Total"
 msgstr "Общо"
 
@@ -2784,7 +2954,11 @@ msgid ""
 msgstr ""
 
 #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88
+<<<<<<< HEAD
 #: tbl_printview.php:375 tbl_structure.php:735
+=======
+#: tbl_printview.php:375 tbl_structure.php:737
+>>>>>>> origin/master
 msgid "Format"
 msgstr "Формат"
 
@@ -2856,8 +3030,13 @@ msgstr ""
 #: libraries/export/latex.php:201 libraries/export/odt.php:48
 #: libraries/export/sql.php:106 libraries/export/sql.php:868
 #: libraries/export/texytext.php:27 server_databases.php:127
+<<<<<<< HEAD
 #: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316
 #: tbl_structure.php:663
+=======
+#: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316
+#: tbl_structure.php:665
+>>>>>>> origin/master
 msgid "Data"
 msgstr "Данни"
 
@@ -2906,9 +3085,15 @@ msgstr "MIME-тип"
 #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57
 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177
 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:332 server_privileges.php:732
 #: server_privileges.php:735 server_privileges.php:791
 #: server_privileges.php:1554 server_privileges.php:2092
+=======
+#: libraries/replication_gui.lib.php:332 server_privileges.php:731
+#: server_privileges.php:734 server_privileges.php:790
+#: server_privileges.php:1537 server_privileges.php:2069
+>>>>>>> origin/master
 #: server_processlist.php:55 server_synchronize.php:1159
 msgid "Host"
 msgstr "Хост"
@@ -3580,8 +3765,13 @@ msgstr ""
 
 #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59
 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:262 server_privileges.php:712
 #: server_privileges.php:715 server_privileges.php:722
+=======
+#: libraries/replication_gui.lib.php:262 server_privileges.php:711
+#: server_privileges.php:714 server_privileges.php:721
+>>>>>>> origin/master
 #: server_synchronize.php:1171
 msgid "User name"
 msgstr "Потребителско име"
@@ -3599,14 +3789,22 @@ msgstr ""
 msgid "Slave status"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448
+=======
+#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445
+>>>>>>> origin/master
 #: server_status.php:737 server_variables.php:52
 msgid "Variable"
 msgstr "Променлива"
 
 #: libraries/replication_gui.lib.php:118 server_status.php:738
 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138
+<<<<<<< HEAD
 #: tbl_structure.php:727
+=======
+#: tbl_structure.php:729
+>>>>>>> origin/master
 msgid "Value"
 msgstr "Стойност"
 
@@ -3625,11 +3823,16 @@ msgstr ""
 msgid "Add slave replication user"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:257 server_privileges.php:717
+=======
+#: libraries/replication_gui.lib.php:257 server_privileges.php:716
+>>>>>>> origin/master
 msgid "Any user"
 msgstr "Всеки потребител"
 
 #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:349 server_privileges.php:718
 #: server_privileges.php:785 server_privileges.php:809
 #: server_privileges.php:1950 server_privileges.php:1980
@@ -3653,6 +3856,31 @@ msgid "Use Host Table"
 msgstr "Използвай таблица Host"
 
 #: libraries/replication_gui.lib.php:334 server_privileges.php:793
+=======
+#: libraries/replication_gui.lib.php:349 server_privileges.php:717
+#: server_privileges.php:784 server_privileges.php:808
+#: server_privileges.php:1928 server_privileges.php:1958
+msgid "Use text field"
+msgstr "Използвай текстовото поле"
+
+#: libraries/replication_gui.lib.php:305 server_privileges.php:764
+msgid "Any host"
+msgstr "Всеки хост"
+
+#: libraries/replication_gui.lib.php:309 server_privileges.php:768
+msgid "Local"
+msgstr "Локален"
+
+#: libraries/replication_gui.lib.php:315 server_privileges.php:773
+msgid "This Host"
+msgstr "Този Хост"
+
+#: libraries/replication_gui.lib.php:321 server_privileges.php:779
+msgid "Use Host Table"
+msgstr "Използвай таблица Host"
+
+#: libraries/replication_gui.lib.php:334 server_privileges.php:792
+>>>>>>> origin/master
 msgid ""
 "When Host table is used, this field is ignored and values stored in Host "
 "table are used instead."
@@ -7743,10 +7971,13 @@ msgstr ""
 msgid "Show insert query"
 msgstr ""
 
+<<<<<<< HEAD
 #: tbl_change.php:1140
 msgid "and then"
 msgstr "и след това"
 
+=======
+>>>>>>> origin/master
 #: tbl_change.php:1144
 msgid "Go back to previous page"
 msgstr "връщане обратно"
@@ -7946,6 +8177,7 @@ msgstr "Проверка на интегритета на връзките"
 msgid "Show tables"
 msgstr "Покажи таблиците"
 
+<<<<<<< HEAD
 #: tbl_printview.php:309 tbl_structure.php:654
 msgid "Space usage"
 msgstr "Използвано място"
@@ -7979,6 +8211,41 @@ msgid "Row length"
 msgstr "Дължина на реда"
 
 #: tbl_printview.php:413 tbl_structure.php:791
+=======
+#: tbl_printview.php:309 tbl_structure.php:656
+msgid "Space usage"
+msgstr "Използвано място"
+
+#: tbl_printview.php:313 tbl_structure.php:660
+msgid "Usage"
+msgstr "Използвани"
+
+#: tbl_printview.php:340 tbl_structure.php:687
+msgid "Effective"
+msgstr "Ефективни"
+
+#: tbl_printview.php:365 tbl_structure.php:725
+msgid "Row Statistics"
+msgstr "Статистика за редовете"
+
+#: tbl_printview.php:368 tbl_structure.php:728
+msgid "Statements"
+msgstr "Заявление"
+
+#: tbl_printview.php:379 tbl_structure.php:740
+msgid "static"
+msgstr ""
+
+#: tbl_printview.php:381 tbl_structure.php:742
+msgid "dynamic"
+msgstr "динамичен"
+
+#: tbl_printview.php:403 tbl_structure.php:785
+msgid "Row length"
+msgstr "Дължина на реда"
+
+#: tbl_printview.php:413 tbl_structure.php:793
+>>>>>>> origin/master
 msgid " Row size "
 msgstr " Размер на ред "
 
diff --git a/po/bn.po b/po/bn.po
index 1b97fc1f3..fd41b4544 100755
--- a/po/bn.po
+++ b/po/bn.po
@@ -3,7 +3,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2010-07-03 21:45+0530\n"
+=======
+"POT-Creation-Date: 2010-07-03 09:00-0400\n"
+>>>>>>> origin/master
 "PO-Revision-Date: 2010-03-12 09:11+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: bangla <bn@li.org>\n"
@@ -48,15 +52,26 @@ msgstr "খুঁজুন"
 #: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046
 #: libraries/Theme_Manager.class.php:311
 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719
+<<<<<<< HEAD
 #: libraries/common.lib.php:1344 libraries/common.lib.php:2301
 #: libraries/display_change_password.lib.php:82
 #: libraries/display_create_table.lib.php:62
+=======
+#: libraries/common.lib.php:1335 libraries/common.lib.php:2288
+#: libraries/display_change_password.lib.php:82
+#: libraries/display_create_table.lib.php:63
+>>>>>>> origin/master
 #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532
 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76
 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104
+<<<<<<< HEAD
 #: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480
 #: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782
+=======
+#: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477
+#: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782
+>>>>>>> origin/master
 #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328
 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142
 #: server_privileges.php:665 server_privileges.php:1641
@@ -66,8 +81,13 @@ msgstr "খুঁজুন"
 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171
 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265
 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561
+<<<<<<< HEAD
 #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560
 #: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512
+=======
+#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562
+#: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512
+>>>>>>> origin/master
 #: view_create.php:182 view_operations.php:101
 msgid "Go"
 msgstr "Go"
@@ -120,10 +140,17 @@ msgstr "কলামের নাম"
 #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245
 #: libraries/export/latex.php:360 libraries/export/odt.php:297
 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100
+<<<<<<< HEAD
 #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093
 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
 #: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321
+=======
+#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070
+#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
+#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
+#: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321
+>>>>>>> origin/master
 msgid "Type"
 msgstr "Type"
 
@@ -164,9 +191,15 @@ msgstr "মন্তব্যসমূহ"
 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322
 #: libraries/export/latex.php:430 libraries/export/odt.php:368
 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263
+<<<<<<< HEAD
 #: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596
 #: server_privileges.php:1911 server_privileges.php:1916
 #: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228
+=======
+#: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579
+#: server_privileges.php:1889 server_privileges.php:1894
+#: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228
+>>>>>>> origin/master
 #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342
 msgid "No"
 msgstr "না"
@@ -180,9 +213,15 @@ msgstr "না"
 #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106
 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262
 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344
+<<<<<<< HEAD
 #: server_databases.php:64 server_privileges.php:1582
 #: server_privileges.php:1596 server_privileges.php:1911
 #: server_privileges.php:1914 server_privileges.php:2210 sql.php:193
+=======
+#: server_databases.php:64 server_privileges.php:1565
+#: server_privileges.php:1579 server_privileges.php:1889
+#: server_privileges.php:1892 server_privileges.php:2187 sql.php:193
+>>>>>>> origin/master
 #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350
 #: tbl_tracking.php:335 tbl_tracking.php:340
 msgid "Yes"
@@ -231,7 +270,15 @@ msgstr "ডাটাবেজ রিনেম কর"
 msgid "Command"
 msgstr "নির্দেশ"
 
+<<<<<<< HEAD
 #: db_operations.php:466
+=======
+#: db_operations.php:429 tbl_change.php:1140
+msgid "and then"
+msgstr "এবং তারপর"
+
+#: db_operations.php:455
+>>>>>>> origin/master
 msgid "Copy database to"
 msgstr "ডাটাবেজ কপি করঃ"
 
@@ -320,7 +367,11 @@ msgstr "Enabled"
 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730
 #: server_collations.php:54 server_collations.php:66 server_databases.php:111
 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179
+<<<<<<< HEAD
 #: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326
+=======
+#: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326
+>>>>>>> origin/master
 msgid "Collation"
 msgstr "Collation"
 
@@ -349,7 +400,11 @@ msgstr "টেবিল"
 #: db_printview.php:105 libraries/db_structure.lib.php:56
 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146
 #: navigation.php:638 navigation.php:660 server_databases.php:122
+<<<<<<< HEAD
 #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775
+=======
+#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777
+>>>>>>> origin/master
 msgid "Rows"
 msgstr "Rows"
 
@@ -364,19 +419,31 @@ msgstr "in use"
 
 #: db_printview.php:187 libraries/db_info.inc.php:88
 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433
+<<<<<<< HEAD
 #: tbl_structure.php:807
+=======
+#: tbl_structure.php:809
+>>>>>>> origin/master
 msgid "Creation"
 msgstr "Creation"
 
 #: db_printview.php:196 libraries/db_info.inc.php:93
 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443
+<<<<<<< HEAD
 #: tbl_structure.php:815
+=======
+#: tbl_structure.php:817
+>>>>>>> origin/master
 msgid "Last update"
 msgstr "সর্বশেষ আপডেট"
 
 #: db_printview.php:205 libraries/db_info.inc.php:98
 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453
+<<<<<<< HEAD
 #: tbl_structure.php:823
+=======
+#: tbl_structure.php:825
+>>>>>>> origin/master
 msgid "Last check"
 msgstr "Last check"
 
@@ -441,7 +508,11 @@ msgstr "Del"
 
 #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553
 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779
+<<<<<<< HEAD
 #: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250
+=======
+#: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250
+>>>>>>> origin/master
 #: tbl_select.php:286
 msgid "Or"
 msgstr "অথবা"
@@ -659,9 +730,15 @@ msgstr "With selected:"
 msgid "Check All"
 msgstr "সব পরীক্ষা করুন"
 
+<<<<<<< HEAD
 #: db_structure.php:529 libraries/display_tbl.lib.php:2077
 #: libraries/replication_gui.lib.php:36 server_databases.php:350
 #: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460
+=======
+#: db_structure.php:531 libraries/display_tbl.lib.php:2077
+#: libraries/replication_gui.lib.php:36 server_databases.php:350
+#: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462
+>>>>>>> origin/master
 msgid "Uncheck All"
 msgstr "Uncheck All"
 
@@ -1129,10 +1206,17 @@ msgid "Prev"
 msgstr "পূর্ববর্তী"
 
 #. l10n: Display text for next month link in calendar
+<<<<<<< HEAD
 #: js/messages.php:106 libraries/common.lib.php:2366
 #: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338
 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
 #: tbl_structure.php:799
+=======
+#: js/messages.php:77 libraries/common.lib.php:2353
+#: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338
+#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
+#: tbl_structure.php:801
+>>>>>>> origin/master
 msgid "Next"
 msgstr "পরবর্তী"
 
@@ -1675,7 +1759,11 @@ msgstr "পাসওয়ার্ড"
 msgid "Server Choice"
 msgstr "Server Choice"
 
+<<<<<<< HEAD
 #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63
+=======
+#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59
+>>>>>>> origin/master
 msgid "Cookies must be enabled past this point."
 msgstr "Cookies must be enabled past this point."
 
@@ -1755,7 +1843,11 @@ msgstr ""
 "Couldn't use either the iconv, libiconv or recode_string functions, although "
 "the necessary extensions appear to be loaded. Check your PHP configuration."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:580
+=======
+#: libraries/common.inc.php:576
+>>>>>>> origin/master
 msgid ""
 "phpMyAdmin was unable to read your configuration file!<br />This might "
 "happen if PHP finds a parse error in it or PHP cannot find the file.<br /"
@@ -1771,13 +1863,21 @@ msgstr ""
 "semicolon is missing somewhere.<br />If you receive a blank page, everything "
 "is fine."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:591
+=======
+#: libraries/common.inc.php:587
+>>>>>>> origin/master
 #, fuzzy, php-format
 #| msgid "Could not load default configuration from: \"%1$s\""
 msgid "Could not load default configuration from: %1$s"
 msgstr "\"%1$s\" হতে ডিফল্ট কনফিগারেশন লোড করা যায়নি"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:596
+=======
+#: libraries/common.inc.php:592
+>>>>>>> origin/master
 msgid ""
 "The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
 "configuration file!"
@@ -1785,28 +1885,48 @@ msgstr ""
 "The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
 "configuration file!"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:626
+=======
+#: libraries/common.inc.php:622
+>>>>>>> origin/master
 #, fuzzy, php-format
 #| msgid "Invalid server index: \"%s\""
 msgid "Invalid server index: %s"
 msgstr "Invalid server index: \"%s\""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:633
+=======
+#: libraries/common.inc.php:629
+>>>>>>> origin/master
 #, php-format
 msgid "Invalid hostname for server %1$s. Please review your configuration."
 msgstr "Invalid hostname for server %1$s. Please review your configuration."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:642 libraries/header.inc.php:100
+=======
+#: libraries/common.inc.php:638 libraries/header.inc.php:96
+>>>>>>> origin/master
 #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47
 #: main.php:185 test/theme.php:57
 msgid "Server"
 msgstr "সার্ভার"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:820
 msgid "Invalid authentication method set in configuration:"
 msgstr "Invalid authentication method set in configuration:"
 
 #: libraries/common.inc.php:923
+=======
+#: libraries/common.inc.php:816
+msgid "Invalid authentication method set in configuration:"
+msgstr "Invalid authentication method set in configuration:"
+
+#: libraries/common.inc.php:919
+>>>>>>> origin/master
 #, php-format
 msgid "You should upgrade to %s %s or later."
 msgstr "You should upgrade to %s %s or later."
@@ -2057,7 +2177,11 @@ msgid ""
 msgstr "হয়ত আনুমানিক। FAQ ৩.১১ দেখ। "
 
 #: libraries/db_structure.lib.php:69 server_databases.php:142
+<<<<<<< HEAD
 #: tbl_printview.php:335 tbl_structure.php:680
+=======
+#: tbl_printview.php:335 tbl_structure.php:682
+>>>>>>> origin/master
 msgid "Overhead"
 msgstr "Overhead"
 
@@ -2084,22 +2208,36 @@ msgid "Change password"
 msgstr "পাসওয়ার্ড পরিবর্তন কর"
 
 #: libraries/display_change_password.lib.php:35
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:348 server_privileges.php:808
+=======
+#: libraries/replication_gui.lib.php:348 server_privileges.php:807
+>>>>>>> origin/master
 msgid "No Password"
 msgstr "কোন পাসওয়ার্ড নাই"
 
 #: libraries/display_change_password.lib.php:41
 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63
 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:352 server_privileges.php:797
 #: server_privileges.php:801 server_privileges.php:812
 #: server_privileges.php:1555 server_synchronize.php:1175
+=======
+#: libraries/replication_gui.lib.php:352 server_privileges.php:796
+#: server_privileges.php:800 server_privileges.php:811
+#: server_privileges.php:1538 server_synchronize.php:1175
+>>>>>>> origin/master
 msgid "Password"
 msgstr "পাসওয়ার্ড"
 
 #: libraries/display_change_password.lib.php:46
 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359
+<<<<<<< HEAD
 #: server_privileges.php:816 server_privileges.php:819
+=======
+#: server_privileges.php:815 server_privileges.php:818
+>>>>>>> origin/master
 msgid "Re-type"
 msgstr "Re-type"
 
@@ -2114,12 +2252,20 @@ msgid "MySQL 4.0 compatible"
 msgstr "MySQL&nbsp;4.0 compatible"
 
 #: libraries/display_change_password.lib.php:72
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:363 server_privileges.php:823
+=======
+#: libraries/replication_gui.lib.php:363 server_privileges.php:822
+>>>>>>> origin/master
 msgid "Generate Password"
 msgstr "পাসওয়ার্ড তৈরী কর"
 
 #: libraries/display_change_password.lib.php:75
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:366 server_privileges.php:826
+=======
+#: libraries/replication_gui.lib.php:366 server_privileges.php:825
+>>>>>>> origin/master
 msgid "Generate"
 msgstr "তৈরী কর"
 
@@ -2207,7 +2353,11 @@ msgid "remember template"
 msgstr "টেমপ্লেট মনে রাখ"
 
 #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552
+=======
+#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549
+>>>>>>> origin/master
 msgid "Character set of the file:"
 msgstr "ফাইল এর অক্ষরসমূহঃ"
 
@@ -2260,7 +2410,11 @@ msgstr ""
 msgid "File to import"
 msgstr "ইম্পোর্ট করার জন্য ফাইল"
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527
+=======
+#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524
+>>>>>>> origin/master
 msgid "Location of the text file"
 msgstr "Location of the text file"
 
@@ -2268,12 +2422,20 @@ msgstr "Location of the text file"
 msgid "File uploads are not allowed on this server."
 msgstr "File uploads are not allowed on this server."
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536
+=======
+#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533
+>>>>>>> origin/master
 #: tbl_change.php:1025
 msgid "The directory you set for upload work cannot be reached"
 msgstr "The directory you set for upload work cannot be reached"
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539
+=======
+#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536
+>>>>>>> origin/master
 #: tbl_change.php:1028
 msgid "web server upload directory"
 msgstr "web server upload directory"
@@ -2408,7 +2570,11 @@ msgstr "Sort by key"
 #: libraries/import/docsql.php:34 libraries/import/ldi.php:47
 #: libraries/import/ods.php:30 libraries/import/sql.php:20
 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26
+<<<<<<< HEAD
 #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751
+=======
+#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753
+>>>>>>> origin/master
 #, fuzzy
 msgid "Options"
 msgstr "Operations"
@@ -2557,7 +2723,11 @@ msgstr "Buffer Pool Usage"
 
 #: libraries/engines/innodb.lib.php:194 server_databases.php:137
 #: server_databases.php:305 server_status.php:525 server_status.php:586
+<<<<<<< HEAD
 #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694
+=======
+#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696
+>>>>>>> origin/master
 msgid "Total"
 msgstr "মোট"
 
@@ -2818,7 +2988,11 @@ msgid ""
 msgstr ""
 
 #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88
+<<<<<<< HEAD
 #: tbl_printview.php:375 tbl_structure.php:735
+=======
+#: tbl_printview.php:375 tbl_structure.php:737
+>>>>>>> origin/master
 msgid "Format"
 msgstr "ফরমেট"
 
@@ -2890,8 +3064,13 @@ msgstr "Microsoft Word 2000"
 #: libraries/export/latex.php:201 libraries/export/odt.php:48
 #: libraries/export/sql.php:106 libraries/export/sql.php:868
 #: libraries/export/texytext.php:27 server_databases.php:127
+<<<<<<< HEAD
 #: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316
 #: tbl_structure.php:663
+=======
+#: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316
+#: tbl_structure.php:665
+>>>>>>> origin/master
 msgid "Data"
 msgstr "ডাটা"
 
@@ -2940,9 +3119,15 @@ msgstr "মাইম এর ধরন"
 #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57
 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177
 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:332 server_privileges.php:732
 #: server_privileges.php:735 server_privileges.php:791
 #: server_privileges.php:1554 server_privileges.php:2092
+=======
+#: libraries/replication_gui.lib.php:332 server_privileges.php:731
+#: server_privileges.php:734 server_privileges.php:790
+#: server_privileges.php:1537 server_privileges.php:2069
+>>>>>>> origin/master
 #: server_processlist.php:55 server_synchronize.php:1159
 msgid "Host"
 msgstr "হোষ্ট"
@@ -3618,8 +3803,13 @@ msgstr ""
 
 #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59
 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:262 server_privileges.php:712
 #: server_privileges.php:715 server_privileges.php:722
+=======
+#: libraries/replication_gui.lib.php:262 server_privileges.php:711
+#: server_privileges.php:714 server_privileges.php:721
+>>>>>>> origin/master
 #: server_synchronize.php:1171
 msgid "User name"
 msgstr "ব্যাভারকারীর নাম"
@@ -3639,14 +3829,22 @@ msgstr "Show slave status"
 msgid "Slave status"
 msgstr "Show slave status"
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448
+=======
+#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445
+>>>>>>> origin/master
 #: server_status.php:737 server_variables.php:52
 msgid "Variable"
 msgstr "চলক"
 
 #: libraries/replication_gui.lib.php:118 server_status.php:738
 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138
+<<<<<<< HEAD
 #: tbl_structure.php:727
+=======
+#: tbl_structure.php:729
+>>>>>>> origin/master
 msgid "Value"
 msgstr "মান"
 
@@ -3664,11 +3862,16 @@ msgstr ""
 msgid "Add slave replication user"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:257 server_privileges.php:717
+=======
+#: libraries/replication_gui.lib.php:257 server_privileges.php:716
+>>>>>>> origin/master
 msgid "Any user"
 msgstr "যেকোন ব্যাবহারকারী"
 
 #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:349 server_privileges.php:718
 #: server_privileges.php:785 server_privileges.php:809
 #: server_privileges.php:1950 server_privileges.php:1980
@@ -3692,6 +3895,31 @@ msgid "Use Host Table"
 msgstr "Use Host Table"
 
 #: libraries/replication_gui.lib.php:334 server_privileges.php:793
+=======
+#: libraries/replication_gui.lib.php:349 server_privileges.php:717
+#: server_privileges.php:784 server_privileges.php:808
+#: server_privileges.php:1928 server_privileges.php:1958
+msgid "Use text field"
+msgstr "Use text field"
+
+#: libraries/replication_gui.lib.php:305 server_privileges.php:764
+msgid "Any host"
+msgstr "যেকোন হোষ্ট"
+
+#: libraries/replication_gui.lib.php:309 server_privileges.php:768
+msgid "Local"
+msgstr "লোকাল"
+
+#: libraries/replication_gui.lib.php:315 server_privileges.php:773
+msgid "This Host"
+msgstr "This Host"
+
+#: libraries/replication_gui.lib.php:321 server_privileges.php:779
+msgid "Use Host Table"
+msgstr "Use Host Table"
+
+#: libraries/replication_gui.lib.php:334 server_privileges.php:792
+>>>>>>> origin/master
 msgid ""
 "When Host table is used, this field is ignored and values stored in Host "
 "table are used instead."
@@ -7917,10 +8145,13 @@ msgstr ""
 msgid "Show insert query"
 msgstr ""
 
+<<<<<<< HEAD
 #: tbl_change.php:1140
 msgid "and then"
 msgstr "এবং তারপর"
 
+=======
+>>>>>>> origin/master
 #: tbl_change.php:1144
 msgid "Go back to previous page"
 msgstr "পূর্বের পাতায় ফিরে যাও"
@@ -8118,6 +8349,7 @@ msgstr "Check referential integrity:"
 msgid "Show tables"
 msgstr "Show tables"
 
+<<<<<<< HEAD
 #: tbl_printview.php:309 tbl_structure.php:654
 msgid "Space usage"
 msgstr "Space usage"
@@ -8151,6 +8383,41 @@ msgid "Row length"
 msgstr "সাড়ির দৈর্ঘ্য"
 
 #: tbl_printview.php:413 tbl_structure.php:791
+=======
+#: tbl_printview.php:309 tbl_structure.php:656
+msgid "Space usage"
+msgstr "Space usage"
+
+#: tbl_printview.php:313 tbl_structure.php:660
+msgid "Usage"
+msgstr "ব্যাবহার"
+
+#: tbl_printview.php:340 tbl_structure.php:687
+msgid "Effective"
+msgstr "Effective"
+
+#: tbl_printview.php:365 tbl_structure.php:725
+msgid "Row Statistics"
+msgstr "Row Statistics"
+
+#: tbl_printview.php:368 tbl_structure.php:728
+msgid "Statements"
+msgstr "Statements"
+
+#: tbl_printview.php:379 tbl_structure.php:740
+msgid "static"
+msgstr ""
+
+#: tbl_printview.php:381 tbl_structure.php:742
+msgid "dynamic"
+msgstr "ডায়নামিক"
+
+#: tbl_printview.php:403 tbl_structure.php:785
+msgid "Row length"
+msgstr "সাড়ির দৈর্ঘ্য"
+
+#: tbl_printview.php:413 tbl_structure.php:793
+>>>>>>> origin/master
 msgid " Row size "
 msgstr " সাড়ির আকার"
 
diff --git a/po/bs.po b/po/bs.po
index 8d4e5f4be..ba317f0fd 100755
--- a/po/bs.po
+++ b/po/bs.po
@@ -3,7 +3,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2010-07-03 21:45+0530\n"
+=======
+"POT-Creation-Date: 2010-07-03 09:00-0400\n"
+>>>>>>> origin/master
 "PO-Revision-Date: 2010-03-12 09:12+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: bosnian <bs@li.org>\n"
@@ -48,15 +52,26 @@ msgstr "Pretraživanje"
 #: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046
 #: libraries/Theme_Manager.class.php:311
 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719
+<<<<<<< HEAD
 #: libraries/common.lib.php:1344 libraries/common.lib.php:2301
 #: libraries/display_change_password.lib.php:82
 #: libraries/display_create_table.lib.php:62
+=======
+#: libraries/common.lib.php:1335 libraries/common.lib.php:2288
+#: libraries/display_change_password.lib.php:82
+#: libraries/display_create_table.lib.php:63
+>>>>>>> origin/master
 #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532
 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76
 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104
+<<<<<<< HEAD
 #: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480
 #: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782
+=======
+#: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477
+#: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782
+>>>>>>> origin/master
 #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328
 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142
 #: server_privileges.php:665 server_privileges.php:1641
@@ -66,8 +81,13 @@ msgstr "Pretraživanje"
 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171
 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265
 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561
+<<<<<<< HEAD
 #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560
 #: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512
+=======
+#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562
+#: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512
+>>>>>>> origin/master
 #: view_create.php:182 view_operations.php:101
 msgid "Go"
 msgstr "Kreni"
@@ -120,10 +140,17 @@ msgstr "Imena kolona"
 #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245
 #: libraries/export/latex.php:360 libraries/export/odt.php:297
 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100
+<<<<<<< HEAD
 #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093
 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
 #: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321
+=======
+#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070
+#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
+#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
+#: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321
+>>>>>>> origin/master
 msgid "Type"
 msgstr "Tip"
 
@@ -164,9 +191,15 @@ msgstr "Komentari"
 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322
 #: libraries/export/latex.php:430 libraries/export/odt.php:368
 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263
+<<<<<<< HEAD
 #: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596
 #: server_privileges.php:1911 server_privileges.php:1916
 #: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228
+=======
+#: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579
+#: server_privileges.php:1889 server_privileges.php:1894
+#: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228
+>>>>>>> origin/master
 #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342
 msgid "No"
 msgstr "Ne"
@@ -180,9 +213,15 @@ msgstr "Ne"
 #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106
 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262
 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344
+<<<<<<< HEAD
 #: server_databases.php:64 server_privileges.php:1582
 #: server_privileges.php:1596 server_privileges.php:1911
 #: server_privileges.php:1914 server_privileges.php:2210 sql.php:193
+=======
+#: server_databases.php:64 server_privileges.php:1565
+#: server_privileges.php:1579 server_privileges.php:1889
+#: server_privileges.php:1892 server_privileges.php:2187 sql.php:193
+>>>>>>> origin/master
 #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350
 #: tbl_tracking.php:335 tbl_tracking.php:340
 msgid "Yes"
@@ -233,7 +272,15 @@ msgstr "Promjeni ime tabele u "
 msgid "Command"
 msgstr "Naredba"
 
+<<<<<<< HEAD
 #: db_operations.php:466
+=======
+#: db_operations.php:429 tbl_change.php:1140
+msgid "and then"
+msgstr ""
+
+#: db_operations.php:455
+>>>>>>> origin/master
 #, fuzzy
 msgid "Copy database to"
 msgstr "Baza ne postoji"
@@ -324,7 +371,11 @@ msgstr "Omogućeno"
 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730
 #: server_collations.php:54 server_collations.php:66 server_databases.php:111
 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179
+<<<<<<< HEAD
 #: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326
+=======
+#: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326
+>>>>>>> origin/master
 msgid "Collation"
 msgstr "Sortiranje"
 
@@ -353,7 +404,11 @@ msgstr "Tabela"
 #: db_printview.php:105 libraries/db_structure.lib.php:56
 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146
 #: navigation.php:638 navigation.php:660 server_databases.php:122
+<<<<<<< HEAD
 #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775
+=======
+#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777
+>>>>>>> origin/master
 msgid "Rows"
 msgstr "Redova"
 
@@ -368,19 +423,31 @@ msgstr "se koristi"
 
 #: db_printview.php:187 libraries/db_info.inc.php:88
 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433
+<<<<<<< HEAD
 #: tbl_structure.php:807
+=======
+#: tbl_structure.php:809
+>>>>>>> origin/master
 msgid "Creation"
 msgstr "Napravljeno"
 
 #: db_printview.php:196 libraries/db_info.inc.php:93
 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443
+<<<<<<< HEAD
 #: tbl_structure.php:815
+=======
+#: tbl_structure.php:817
+>>>>>>> origin/master
 msgid "Last update"
 msgstr "Posljednja izmjena"
 
 #: db_printview.php:205 libraries/db_info.inc.php:98
 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453
+<<<<<<< HEAD
 #: tbl_structure.php:823
+=======
+#: tbl_structure.php:825
+>>>>>>> origin/master
 msgid "Last check"
 msgstr "Posljednja provjera"
 
@@ -445,7 +512,11 @@ msgstr "Del"
 
 #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553
 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779
+<<<<<<< HEAD
 #: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250
+=======
+#: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250
+>>>>>>> origin/master
 #: tbl_select.php:286
 msgid "Or"
 msgstr "ili"
@@ -664,9 +735,15 @@ msgstr "Označeno:"
 msgid "Check All"
 msgstr "Označi sve"
 
+<<<<<<< HEAD
 #: db_structure.php:529 libraries/display_tbl.lib.php:2077
 #: libraries/replication_gui.lib.php:36 server_databases.php:350
 #: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460
+=======
+#: db_structure.php:531 libraries/display_tbl.lib.php:2077
+#: libraries/replication_gui.lib.php:36 server_databases.php:350
+#: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462
+>>>>>>> origin/master
 msgid "Uncheck All"
 msgstr "nijedno"
 
@@ -1119,10 +1196,17 @@ msgid "Prev"
 msgstr "Prethodna"
 
 #. l10n: Display text for next month link in calendar
+<<<<<<< HEAD
 #: js/messages.php:106 libraries/common.lib.php:2366
 #: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338
 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
 #: tbl_structure.php:799
+=======
+#: js/messages.php:77 libraries/common.lib.php:2353
+#: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338
+#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
+#: tbl_structure.php:801
+>>>>>>> origin/master
 msgid "Next"
 msgstr "Slijedeći"
 
@@ -1660,7 +1744,11 @@ msgstr "Lozinka:"
 msgid "Server Choice"
 msgstr "Izbor servera"
 
+<<<<<<< HEAD
 #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63
+=======
+#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59
+>>>>>>> origin/master
 msgid "Cookies must be enabled past this point."
 msgstr "Kolačići (Cookies) moraju u ovom slučaju biti aktivirani."
 
@@ -1740,7 +1828,11 @@ msgstr ""
 "Ne mogu da koristim iconv ili libiconv ili recode_string funkcije iako "
 "ekstenzija prijavljuje da je učitana. Proverite vašu PHP konfiguraciju."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:580
+=======
+#: libraries/common.inc.php:576
+>>>>>>> origin/master
 msgid ""
 "phpMyAdmin was unable to read your configuration file!<br />This might "
 "happen if PHP finds a parse error in it or PHP cannot find the file.<br /"
@@ -1755,12 +1847,20 @@ msgstr ""
 "poruke o grešci koje dobijate. U većini slučajeve negde nedostaje navodnik "
 "ili tačka-zarez.<br />Ako dobijete praznu stranu, sve je u redu."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:591
+=======
+#: libraries/common.inc.php:587
+>>>>>>> origin/master
 #, php-format
 msgid "Could not load default configuration from: %1$s"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:596
+=======
+#: libraries/common.inc.php:592
+>>>>>>> origin/master
 msgid ""
 "The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
 "configuration file!"
@@ -1768,27 +1868,47 @@ msgstr ""
 "<tt>$cfg['PmaAbsoluteUri']</tt> direktiva MORA biti podješena u "
 "konfiguracionoj datoteci!"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:626
+=======
+#: libraries/common.inc.php:622
+>>>>>>> origin/master
 #, php-format
 msgid "Invalid server index: %s"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:633
+=======
+#: libraries/common.inc.php:629
+>>>>>>> origin/master
 #, php-format
 msgid "Invalid hostname for server %1$s. Please review your configuration."
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:642 libraries/header.inc.php:100
+=======
+#: libraries/common.inc.php:638 libraries/header.inc.php:96
+>>>>>>> origin/master
 #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47
 #: main.php:185 test/theme.php:57
 msgid "Server"
 msgstr "Server"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:820
 msgid "Invalid authentication method set in configuration:"
 msgstr ""
 
 #: libraries/common.inc.php:923
+=======
+#: libraries/common.inc.php:816
+msgid "Invalid authentication method set in configuration:"
+msgstr ""
+
+#: libraries/common.inc.php:919
+>>>>>>> origin/master
 #, php-format
 msgid "You should upgrade to %s %s or later."
 msgstr ""
@@ -2035,7 +2155,11 @@ msgid ""
 msgstr ""
 
 #: libraries/db_structure.lib.php:69 server_databases.php:142
+<<<<<<< HEAD
 #: tbl_printview.php:335 tbl_structure.php:680
+=======
+#: tbl_printview.php:335 tbl_structure.php:682
+>>>>>>> origin/master
 msgid "Overhead"
 msgstr "Prekoračenje"
 
@@ -2062,22 +2186,36 @@ msgid "Change password"
 msgstr "Promeni lozinku"
 
 #: libraries/display_change_password.lib.php:35
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:348 server_privileges.php:808
+=======
+#: libraries/replication_gui.lib.php:348 server_privileges.php:807
+>>>>>>> origin/master
 msgid "No Password"
 msgstr "Nema lozinke"
 
 #: libraries/display_change_password.lib.php:41
 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63
 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:352 server_privileges.php:797
 #: server_privileges.php:801 server_privileges.php:812
 #: server_privileges.php:1555 server_synchronize.php:1175
+=======
+#: libraries/replication_gui.lib.php:352 server_privileges.php:796
+#: server_privileges.php:800 server_privileges.php:811
+#: server_privileges.php:1538 server_synchronize.php:1175
+>>>>>>> origin/master
 msgid "Password"
 msgstr "Lozinka"
 
 #: libraries/display_change_password.lib.php:46
 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359
+<<<<<<< HEAD
 #: server_privileges.php:816 server_privileges.php:819
+=======
+#: server_privileges.php:815 server_privileges.php:818
+>>>>>>> origin/master
 msgid "Re-type"
 msgstr "Ponovite unos"
 
@@ -2090,12 +2228,20 @@ msgid "MySQL 4.0 compatible"
 msgstr ""
 
 #: libraries/display_change_password.lib.php:72
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:363 server_privileges.php:823
+=======
+#: libraries/replication_gui.lib.php:363 server_privileges.php:822
+>>>>>>> origin/master
 msgid "Generate Password"
 msgstr ""
 
 #: libraries/display_change_password.lib.php:75
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:366 server_privileges.php:826
+=======
+#: libraries/replication_gui.lib.php:366 server_privileges.php:825
+>>>>>>> origin/master
 #, fuzzy
 msgid "Generate"
 msgstr "Generirao"
@@ -2182,7 +2328,11 @@ msgid "remember template"
 msgstr "zapamti šablon"
 
 #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552
+=======
+#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549
+>>>>>>> origin/master
 msgid "Character set of the file:"
 msgstr "Karakter set datoteke:"
 
@@ -2235,7 +2385,11 @@ msgstr ""
 msgid "File to import"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527
+=======
+#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524
+>>>>>>> origin/master
 msgid "Location of the text file"
 msgstr "Lokacija tekstualne datoteke"
 
@@ -2243,12 +2397,20 @@ msgstr "Lokacija tekstualne datoteke"
 msgid "File uploads are not allowed on this server."
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536
+=======
+#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533
+>>>>>>> origin/master
 #: tbl_change.php:1025
 msgid "The directory you set for upload work cannot be reached"
 msgstr "Direkcija koju ste izabrali za slanje nije dostupna"
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539
+=======
+#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536
+>>>>>>> origin/master
 #: tbl_change.php:1028
 msgid "web server upload directory"
 msgstr "direkcija za slanje web servera "
@@ -2377,7 +2539,11 @@ msgstr ""
 #: libraries/import/docsql.php:34 libraries/import/ldi.php:47
 #: libraries/import/ods.php:30 libraries/import/sql.php:20
 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26
+<<<<<<< HEAD
 #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751
+=======
+#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753
+>>>>>>> origin/master
 #, fuzzy
 msgid "Options"
 msgstr "Operacije"
@@ -2524,7 +2690,11 @@ msgstr ""
 
 #: libraries/engines/innodb.lib.php:194 server_databases.php:137
 #: server_databases.php:305 server_status.php:525 server_status.php:586
+<<<<<<< HEAD
 #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694
+=======
+#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696
+>>>>>>> origin/master
 msgid "Total"
 msgstr "Ukupno"
 
@@ -2770,7 +2940,11 @@ msgid ""
 msgstr ""
 
 #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88
+<<<<<<< HEAD
 #: tbl_printview.php:375 tbl_structure.php:735
+=======
+#: tbl_printview.php:375 tbl_structure.php:737
+>>>>>>> origin/master
 msgid "Format"
 msgstr "Format"
 
@@ -2842,8 +3016,13 @@ msgstr ""
 #: libraries/export/latex.php:201 libraries/export/odt.php:48
 #: libraries/export/sql.php:106 libraries/export/sql.php:868
 #: libraries/export/texytext.php:27 server_databases.php:127
+<<<<<<< HEAD
 #: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316
 #: tbl_structure.php:663
+=======
+#: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316
+#: tbl_structure.php:665
+>>>>>>> origin/master
 msgid "Data"
 msgstr "Podaci"
 
@@ -2893,9 +3072,15 @@ msgstr "MIME-tipovi"
 #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57
 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177
 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:332 server_privileges.php:732
 #: server_privileges.php:735 server_privileges.php:791
 #: server_privileges.php:1554 server_privileges.php:2092
+=======
+#: libraries/replication_gui.lib.php:332 server_privileges.php:731
+#: server_privileges.php:734 server_privileges.php:790
+#: server_privileges.php:1537 server_privileges.php:2069
+>>>>>>> origin/master
 #: server_processlist.php:55 server_synchronize.php:1159
 msgid "Host"
 msgstr "Host"
@@ -3569,8 +3754,13 @@ msgstr ""
 
 #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59
 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:262 server_privileges.php:712
 #: server_privileges.php:715 server_privileges.php:722
+=======
+#: libraries/replication_gui.lib.php:262 server_privileges.php:711
+#: server_privileges.php:714 server_privileges.php:721
+>>>>>>> origin/master
 #: server_synchronize.php:1171
 msgid "User name"
 msgstr "Ime korisnika"
@@ -3588,14 +3778,22 @@ msgstr ""
 msgid "Slave status"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448
+=======
+#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445
+>>>>>>> origin/master
 #: server_status.php:737 server_variables.php:52
 msgid "Variable"
 msgstr "Promjenljiva"
 
 #: libraries/replication_gui.lib.php:118 server_status.php:738
 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138
+<<<<<<< HEAD
 #: tbl_structure.php:727
+=======
+#: tbl_structure.php:729
+>>>>>>> origin/master
 msgid "Value"
 msgstr "Vrijednost"
 
@@ -3614,11 +3812,16 @@ msgstr ""
 msgid "Add slave replication user"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:257 server_privileges.php:717
+=======
+#: libraries/replication_gui.lib.php:257 server_privileges.php:716
+>>>>>>> origin/master
 msgid "Any user"
 msgstr "Bilo koji korisnik"
 
 #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:349 server_privileges.php:718
 #: server_privileges.php:785 server_privileges.php:809
 #: server_privileges.php:1950 server_privileges.php:1980
@@ -3642,6 +3845,31 @@ msgid "Use Host Table"
 msgstr "Koristi tabelu hosta"
 
 #: libraries/replication_gui.lib.php:334 server_privileges.php:793
+=======
+#: libraries/replication_gui.lib.php:349 server_privileges.php:717
+#: server_privileges.php:784 server_privileges.php:808
+#: server_privileges.php:1928 server_privileges.php:1958
+msgid "Use text field"
+msgstr "Koristi tekst polje"
+
+#: libraries/replication_gui.lib.php:305 server_privileges.php:764
+msgid "Any host"
+msgstr "Bilo koji host"
+
+#: libraries/replication_gui.lib.php:309 server_privileges.php:768
+msgid "Local"
+msgstr "Lokalni"
+
+#: libraries/replication_gui.lib.php:315 server_privileges.php:773
+msgid "This Host"
+msgstr "Ovaj server"
+
+#: libraries/replication_gui.lib.php:321 server_privileges.php:779
+msgid "Use Host Table"
+msgstr "Koristi tabelu hosta"
+
+#: libraries/replication_gui.lib.php:334 server_privileges.php:792
+>>>>>>> origin/master
 msgid ""
 "When Host table is used, this field is ignored and values stored in Host "
 "table are used instead."
@@ -7690,10 +7918,13 @@ msgstr ""
 msgid "Show insert query"
 msgstr ""
 
+<<<<<<< HEAD
 #: tbl_change.php:1140
 msgid "and then"
 msgstr ""
 
+=======
+>>>>>>> origin/master
 #: tbl_change.php:1144
 msgid "Go back to previous page"
 msgstr "Nazad na prethodnu stranu"
@@ -7890,6 +8121,7 @@ msgstr "Proveri referencijalni integritet:"
 msgid "Show tables"
 msgstr "Prikaži tabele"
 
+<<<<<<< HEAD
 #: tbl_printview.php:309 tbl_structure.php:654
 msgid "Space usage"
 msgstr "Zauzeće"
@@ -7923,6 +8155,41 @@ msgid "Row length"
 msgstr "Dužina reda"
 
 #: tbl_printview.php:413 tbl_structure.php:791
+=======
+#: tbl_printview.php:309 tbl_structure.php:656
+msgid "Space usage"
+msgstr "Zauzeće"
+
+#: tbl_printview.php:313 tbl_structure.php:660
+msgid "Usage"
+msgstr "Zauzeće"
+
+#: tbl_printview.php:340 tbl_structure.php:687
+msgid "Effective"
+msgstr "Efektivne"
+
+#: tbl_printview.php:365 tbl_structure.php:725
+msgid "Row Statistics"
+msgstr "Statistike reda"
+
+#: tbl_printview.php:368 tbl_structure.php:728
+msgid "Statements"
+msgstr "Ime"
+
+#: tbl_printview.php:379 tbl_structure.php:740
+msgid "static"
+msgstr ""
+
+#: tbl_printview.php:381 tbl_structure.php:742
+msgid "dynamic"
+msgstr "dinamički"
+
+#: tbl_printview.php:403 tbl_structure.php:785
+msgid "Row length"
+msgstr "Dužina reda"
+
+#: tbl_printview.php:413 tbl_structure.php:793
+>>>>>>> origin/master
 msgid " Row size "
 msgstr "Veličina reda"
 
diff --git a/po/ca.po b/po/ca.po
index c0023c5f7..451dfdba7 100755
--- a/po/ca.po
+++ b/po/ca.po
@@ -3,7 +3,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2010-07-03 21:45+0530\n"
+=======
+"POT-Creation-Date: 2010-07-03 09:00-0400\n"
+>>>>>>> origin/master
 "PO-Revision-Date: 2010-03-12 09:13+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: catalan <ca@li.org>\n"
@@ -48,15 +52,26 @@ msgstr "Cerca"
 #: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046
 #: libraries/Theme_Manager.class.php:311
 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719
+<<<<<<< HEAD
 #: libraries/common.lib.php:1344 libraries/common.lib.php:2301
 #: libraries/display_change_password.lib.php:82
 #: libraries/display_create_table.lib.php:62
+=======
+#: libraries/common.lib.php:1335 libraries/common.lib.php:2288
+#: libraries/display_change_password.lib.php:82
+#: libraries/display_create_table.lib.php:63
+>>>>>>> origin/master
 #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532
 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76
 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104
+<<<<<<< HEAD
 #: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480
 #: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782
+=======
+#: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477
+#: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782
+>>>>>>> origin/master
 #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328
 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142
 #: server_privileges.php:665 server_privileges.php:1641
@@ -66,8 +81,13 @@ msgstr "Cerca"
 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171
 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265
 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561
+<<<<<<< HEAD
 #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560
 #: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512
+=======
+#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562
+#: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512
+>>>>>>> origin/master
 #: view_create.php:182 view_operations.php:101
 msgid "Go"
 msgstr "Executa"
@@ -120,10 +140,17 @@ msgstr "Nom de les columnes"
 #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245
 #: libraries/export/latex.php:360 libraries/export/odt.php:297
 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100
+<<<<<<< HEAD
 #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093
 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
 #: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321
+=======
+#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070
+#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
+#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
+#: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321
+>>>>>>> origin/master
 msgid "Type"
 msgstr "Tipus"
 
@@ -164,9 +191,15 @@ msgstr "Comentaris"
 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322
 #: libraries/export/latex.php:430 libraries/export/odt.php:368
 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263
+<<<<<<< HEAD
 #: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596
 #: server_privileges.php:1911 server_privileges.php:1916
 #: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228
+=======
+#: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579
+#: server_privileges.php:1889 server_privileges.php:1894
+#: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228
+>>>>>>> origin/master
 #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342
 msgid "No"
 msgstr "No"
@@ -180,9 +213,15 @@ msgstr "No"
 #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106
 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262
 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344
+<<<<<<< HEAD
 #: server_databases.php:64 server_privileges.php:1582
 #: server_privileges.php:1596 server_privileges.php:1911
 #: server_privileges.php:1914 server_privileges.php:2210 sql.php:193
+=======
+#: server_databases.php:64 server_privileges.php:1565
+#: server_privileges.php:1579 server_privileges.php:1889
+#: server_privileges.php:1892 server_privileges.php:2187 sql.php:193
+>>>>>>> origin/master
 #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350
 #: tbl_tracking.php:335 tbl_tracking.php:340
 msgid "Yes"
@@ -231,7 +270,15 @@ msgstr "Reanomena base de dades a"
 msgid "Command"
 msgstr "Ordre"
 
+<<<<<<< HEAD
 #: db_operations.php:466
+=======
+#: db_operations.php:429 tbl_change.php:1140
+msgid "and then"
+msgstr "i llavors"
+
+#: db_operations.php:455
+>>>>>>> origin/master
 msgid "Copy database to"
 msgstr "Còpia base de dades a"
 
@@ -319,7 +366,11 @@ msgstr "Activa"
 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730
 #: server_collations.php:54 server_collations.php:66 server_databases.php:111
 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179
+<<<<<<< HEAD
 #: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326
+=======
+#: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326
+>>>>>>> origin/master
 msgid "Collation"
 msgstr "Ordenació"
 
@@ -348,7 +399,11 @@ msgstr "Taula"
 #: db_printview.php:105 libraries/db_structure.lib.php:56
 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146
 #: navigation.php:638 navigation.php:660 server_databases.php:122
+<<<<<<< HEAD
 #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775
+=======
+#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777
+>>>>>>> origin/master
 msgid "Rows"
 msgstr "Fila"
 
@@ -363,19 +418,31 @@ msgstr "en ús"
 
 #: db_printview.php:187 libraries/db_info.inc.php:88
 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433
+<<<<<<< HEAD
 #: tbl_structure.php:807
+=======
+#: tbl_structure.php:809
+>>>>>>> origin/master
 msgid "Creation"
 msgstr "Creació"
 
 #: db_printview.php:196 libraries/db_info.inc.php:93
 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443
+<<<<<<< HEAD
 #: tbl_structure.php:815
+=======
+#: tbl_structure.php:817
+>>>>>>> origin/master
 msgid "Last update"
 msgstr "Darrera actualització"
 
 #: db_printview.php:205 libraries/db_info.inc.php:98
 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453
+<<<<<<< HEAD
 #: tbl_structure.php:823
+=======
+#: tbl_structure.php:825
+>>>>>>> origin/master
 msgid "Last check"
 msgstr "Darrera comprovació"
 
@@ -440,7 +507,11 @@ msgstr "Sup"
 
 #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553
 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779
+<<<<<<< HEAD
 #: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250
+=======
+#: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250
+>>>>>>> origin/master
 #: tbl_select.php:286
 msgid "Or"
 msgstr "O"
@@ -659,9 +730,15 @@ msgstr "Amb marca:"
 msgid "Check All"
 msgstr "Marcar-ho tot"
 
+<<<<<<< HEAD
 #: db_structure.php:529 libraries/display_tbl.lib.php:2077
 #: libraries/replication_gui.lib.php:36 server_databases.php:350
 #: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460
+=======
+#: db_structure.php:531 libraries/display_tbl.lib.php:2077
+#: libraries/replication_gui.lib.php:36 server_databases.php:350
+#: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462
+>>>>>>> origin/master
 msgid "Uncheck All"
 msgstr "Desmarcar tot"
 
@@ -1129,10 +1206,17 @@ msgid "Prev"
 msgstr "Anterior"
 
 #. l10n: Display text for next month link in calendar
+<<<<<<< HEAD
 #: js/messages.php:106 libraries/common.lib.php:2366
 #: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338
 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
 #: tbl_structure.php:799
+=======
+#: js/messages.php:77 libraries/common.lib.php:2353
+#: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338
+#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
+#: tbl_structure.php:801
+>>>>>>> origin/master
 msgid "Next"
 msgstr "Següent"
 
@@ -1682,7 +1766,11 @@ msgstr "Contrasenya:"
 msgid "Server Choice"
 msgstr "Elecció de Servidor"
 
+<<<<<<< HEAD
 #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63
+=======
+#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59
+>>>>>>> origin/master
 msgid "Cookies must be enabled past this point."
 msgstr ""
 "A partir d'aquest punt és necessari tenir les galetes (cookies) activades."
@@ -1765,7 +1853,11 @@ msgstr ""
 "No es pot utilitzar iconv ni libiconv ni la funció recode_string mentre es "
 "carrega l'extensió d'informes. Comprova la configuració de php."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:580
+=======
+#: libraries/common.inc.php:576
+>>>>>>> origin/master
 msgid ""
 "phpMyAdmin was unable to read your configuration file!<br />This might "
 "happen if PHP finds a parse error in it or PHP cannot find the file.<br /"
@@ -1781,13 +1873,21 @@ msgstr ""
 "ocasions una coma o punt i coma falta en algun lloc.<br />Si rebs una pàgina "
 "en blanc, tot està bé."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:591
+=======
+#: libraries/common.inc.php:587
+>>>>>>> origin/master
 #, fuzzy, php-format
 #| msgid "Could not load default configuration from: \"%1$s\""
 msgid "Could not load default configuration from: %1$s"
 msgstr "No es pot carregar la configuració per defecte des de: \"%1$s\""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:596
+=======
+#: libraries/common.inc.php:592
+>>>>>>> origin/master
 msgid ""
 "The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
 "configuration file!"
@@ -1795,29 +1895,49 @@ msgstr ""
 "La directiva <tt>$cfg['PmaAbsoluteUri']</tt> HA d'estar a l'arxiu de "
 "configuració!"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:626
+=======
+#: libraries/common.inc.php:622
+>>>>>>> origin/master
 #, fuzzy, php-format
 #| msgid "Invalid server index: \"%s\""
 msgid "Invalid server index: %s"
 msgstr "Index de servidor invàlid: \"%s\""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:633
+=======
+#: libraries/common.inc.php:629
+>>>>>>> origin/master
 #, php-format
 msgid "Invalid hostname for server %1$s. Please review your configuration."
 msgstr ""
 "Nom de host invàlid pel servidor %1$s. Si us plau, reviseu la configuració."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:642 libraries/header.inc.php:100
+=======
+#: libraries/common.inc.php:638 libraries/header.inc.php:96
+>>>>>>> origin/master
 #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47
 #: main.php:185 test/theme.php:57
 msgid "Server"
 msgstr "Servidor"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:820
 msgid "Invalid authentication method set in configuration:"
 msgstr "Mètode d'identificació incorrecte establert a la configuració:"
 
 #: libraries/common.inc.php:923
+=======
+#: libraries/common.inc.php:816
+msgid "Invalid authentication method set in configuration:"
+msgstr "Mètode d'identificació incorrecte establert a la configuració:"
+
+#: libraries/common.inc.php:919
+>>>>>>> origin/master
 #, php-format
 msgid "You should upgrade to %s %s or later."
 msgstr "Es necessari actualitzar a %s %s o posterior."
@@ -2064,7 +2184,11 @@ msgid ""
 msgstr "Pot ser aproximat. Veieu PFC (FAQ) 3.11"
 
 #: libraries/db_structure.lib.php:69 server_databases.php:142
+<<<<<<< HEAD
 #: tbl_printview.php:335 tbl_structure.php:680
+=======
+#: tbl_printview.php:335 tbl_structure.php:682
+>>>>>>> origin/master
 msgid "Overhead"
 msgstr "Defragmentat"
 
@@ -2093,22 +2217,36 @@ msgid "Change password"
 msgstr "Canvi de contrasenya"
 
 #: libraries/display_change_password.lib.php:35
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:348 server_privileges.php:808
+=======
+#: libraries/replication_gui.lib.php:348 server_privileges.php:807
+>>>>>>> origin/master
 msgid "No Password"
 msgstr "Sense contrasenya"
 
 #: libraries/display_change_password.lib.php:41
 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63
 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:352 server_privileges.php:797
 #: server_privileges.php:801 server_privileges.php:812
 #: server_privileges.php:1555 server_synchronize.php:1175
+=======
+#: libraries/replication_gui.lib.php:352 server_privileges.php:796
+#: server_privileges.php:800 server_privileges.php:811
+#: server_privileges.php:1538 server_synchronize.php:1175
+>>>>>>> origin/master
 msgid "Password"
 msgstr "Contrasenya"
 
 #: libraries/display_change_password.lib.php:46
 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359
+<<<<<<< HEAD
 #: server_privileges.php:816 server_privileges.php:819
+=======
+#: server_privileges.php:815 server_privileges.php:818
+>>>>>>> origin/master
 msgid "Re-type"
 msgstr "Reescriu"
 
@@ -2123,12 +2261,20 @@ msgid "MySQL 4.0 compatible"
 msgstr "Compatible amb MySQL&nbsp;4.0"
 
 #: libraries/display_change_password.lib.php:72
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:363 server_privileges.php:823
+=======
+#: libraries/replication_gui.lib.php:363 server_privileges.php:822
+>>>>>>> origin/master
 msgid "Generate Password"
 msgstr "Genera una Contrasenya"
 
 #: libraries/display_change_password.lib.php:75
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:366 server_privileges.php:826
+=======
+#: libraries/replication_gui.lib.php:366 server_privileges.php:825
+>>>>>>> origin/master
 msgid "Generate"
 msgstr "Genera"
 
@@ -2217,7 +2363,11 @@ msgid "remember template"
 msgstr "Recordar plantilla"
 
 #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552
+=======
+#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549
+>>>>>>> origin/master
 msgid "Character set of the file:"
 msgstr "Joc de caràcters de l'arxiu:"
 
@@ -2275,7 +2425,11 @@ msgstr ""
 msgid "File to import"
 msgstr "Arxiu a importar"
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527
+=======
+#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524
+>>>>>>> origin/master
 msgid "Location of the text file"
 msgstr "Ubicació de l'arxiu de text"
 
@@ -2283,12 +2437,20 @@ msgstr "Ubicació de l'arxiu de text"
 msgid "File uploads are not allowed on this server."
 msgstr "No es permet pujar arxius en aquest servidor."
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536
+=======
+#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533
+>>>>>>> origin/master
 #: tbl_change.php:1025
 msgid "The directory you set for upload work cannot be reached"
 msgstr "No està disponible el directori indicat per pujar arxius"
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539
+=======
+#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536
+>>>>>>> origin/master
 #: tbl_change.php:1028
 msgid "web server upload directory"
 msgstr "Directori de pujada d'arxius del servidor web"
@@ -2425,7 +2587,11 @@ msgstr "Classifica per la clau"
 #: libraries/import/docsql.php:34 libraries/import/ldi.php:47
 #: libraries/import/ods.php:30 libraries/import/sql.php:20
 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26
+<<<<<<< HEAD
 #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751
+=======
+#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753
+>>>>>>> origin/master
 msgid "Options"
 msgstr "Opcions"
 
@@ -2573,7 +2739,11 @@ msgstr "Ús del grup de memòries intermitges"
 
 #: libraries/engines/innodb.lib.php:194 server_databases.php:137
 #: server_databases.php:305 server_status.php:525 server_status.php:586
+<<<<<<< HEAD
 #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694
+=======
+#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696
+>>>>>>> origin/master
 msgid "Total"
 msgstr "Total"
 
@@ -2862,7 +3032,11 @@ msgstr ""
 "donarà el pròxim número més alt."
 
 #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88
+<<<<<<< HEAD
 #: tbl_printview.php:375 tbl_structure.php:735
+=======
+#: tbl_printview.php:375 tbl_structure.php:737
+>>>>>>> origin/master
 msgid "Format"
 msgstr "Format"
 
@@ -2936,8 +3110,13 @@ msgstr "Microsoft Word 2000"
 #: libraries/export/latex.php:201 libraries/export/odt.php:48
 #: libraries/export/sql.php:106 libraries/export/sql.php:868
 #: libraries/export/texytext.php:27 server_databases.php:127
+<<<<<<< HEAD
 #: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316
 #: tbl_structure.php:663
+=======
+#: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316
+#: tbl_structure.php:665
+>>>>>>> origin/master
 msgid "Data"
 msgstr "Dades"
 
@@ -2986,9 +3165,15 @@ msgstr "Tipus MIME"
 #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57
 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177
 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:332 server_privileges.php:732
 #: server_privileges.php:735 server_privileges.php:791
 #: server_privileges.php:1554 server_privileges.php:2092
+=======
+#: libraries/replication_gui.lib.php:332 server_privileges.php:731
+#: server_privileges.php:734 server_privileges.php:790
+#: server_privileges.php:1537 server_privileges.php:2069
+>>>>>>> origin/master
 #: server_processlist.php:55 server_synchronize.php:1159
 msgid "Host"
 msgstr "Servidor"
@@ -3662,8 +3847,13 @@ msgstr ""
 
 #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59
 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:262 server_privileges.php:712
 #: server_privileges.php:715 server_privileges.php:722
+=======
+#: libraries/replication_gui.lib.php:262 server_privileges.php:711
+#: server_privileges.php:714 server_privileges.php:721
+>>>>>>> origin/master
 #: server_synchronize.php:1171
 msgid "User name"
 msgstr "Nom d'usuari"
@@ -3680,14 +3870,22 @@ msgstr "Estat del mestre"
 msgid "Slave status"
 msgstr "Estat de l'esclau"
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448
+=======
+#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445
+>>>>>>> origin/master
 #: server_status.php:737 server_variables.php:52
 msgid "Variable"
 msgstr "Variable"
 
 #: libraries/replication_gui.lib.php:118 server_status.php:738
 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138
+<<<<<<< HEAD
 #: tbl_structure.php:727
+=======
+#: tbl_structure.php:729
+>>>>>>> origin/master
 msgid "Value"
 msgstr "Valor"
 
@@ -3707,11 +3905,16 @@ msgstr ""
 msgid "Add slave replication user"
 msgstr "Afegeix l'usuari esclau de replicació"
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:257 server_privileges.php:717
+=======
+#: libraries/replication_gui.lib.php:257 server_privileges.php:716
+>>>>>>> origin/master
 msgid "Any user"
 msgstr "Qualsevol usuari"
 
 #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:349 server_privileges.php:718
 #: server_privileges.php:785 server_privileges.php:809
 #: server_privileges.php:1950 server_privileges.php:1980
@@ -3735,6 +3938,31 @@ msgid "Use Host Table"
 msgstr "Utilitza la Taula de Hosts"
 
 #: libraries/replication_gui.lib.php:334 server_privileges.php:793
+=======
+#: libraries/replication_gui.lib.php:349 server_privileges.php:717
+#: server_privileges.php:784 server_privileges.php:808
+#: server_privileges.php:1928 server_privileges.php:1958
+msgid "Use text field"
+msgstr "Usa camp de text"
+
+#: libraries/replication_gui.lib.php:305 server_privileges.php:764
+msgid "Any host"
+msgstr "Qualsevol servidor"
+
+#: libraries/replication_gui.lib.php:309 server_privileges.php:768
+msgid "Local"
+msgstr "Local"
+
+#: libraries/replication_gui.lib.php:315 server_privileges.php:773
+msgid "This Host"
+msgstr "Aquest Host"
+
+#: libraries/replication_gui.lib.php:321 server_privileges.php:779
+msgid "Use Host Table"
+msgstr "Utilitza la Taula de Hosts"
+
+#: libraries/replication_gui.lib.php:334 server_privileges.php:792
+>>>>>>> origin/master
 msgid ""
 "When Host table is used, this field is ignored and values stored in Host "
 "table are used instead."
@@ -8199,10 +8427,13 @@ msgstr ""
 msgid "Show insert query"
 msgstr "Mostrant consulta SQL"
 
+<<<<<<< HEAD
 #: tbl_change.php:1140
 msgid "and then"
 msgstr "i llavors"
 
+=======
+>>>>>>> origin/master
 #: tbl_change.php:1144
 msgid "Go back to previous page"
 msgstr "Torna"
@@ -8399,6 +8630,7 @@ msgstr "Comprova la integritat referencial:"
 msgid "Show tables"
 msgstr "Mostra taules"
 
+<<<<<<< HEAD
 #: tbl_printview.php:309 tbl_structure.php:654
 msgid "Space usage"
 msgstr "Utilització d'espai"
@@ -8432,6 +8664,41 @@ msgid "Row length"
 msgstr "Tamany de fila"
 
 #: tbl_printview.php:413 tbl_structure.php:791
+=======
+#: tbl_printview.php:309 tbl_structure.php:656
+msgid "Space usage"
+msgstr "Utilització d'espai"
+
+#: tbl_printview.php:313 tbl_structure.php:660
+msgid "Usage"
+msgstr "Ús"
+
+#: tbl_printview.php:340 tbl_structure.php:687
+msgid "Effective"
+msgstr "Efectiu"
+
+#: tbl_printview.php:365 tbl_structure.php:725
+msgid "Row Statistics"
+msgstr "Estadística de files"
+
+#: tbl_printview.php:368 tbl_structure.php:728
+msgid "Statements"
+msgstr "Sentències"
+
+#: tbl_printview.php:379 tbl_structure.php:740
+msgid "static"
+msgstr "estàtic"
+
+#: tbl_printview.php:381 tbl_structure.php:742
+msgid "dynamic"
+msgstr "dinàmic"
+
+#: tbl_printview.php:403 tbl_structure.php:785
+msgid "Row length"
+msgstr "Tamany de fila"
+
+#: tbl_printview.php:413 tbl_structure.php:793
+>>>>>>> origin/master
 msgid " Row size "
 msgstr "Mida de fila "
 
diff --git a/po/cs.po b/po/cs.po
index 96a4fb184..b07bdc4fe 100755
--- a/po/cs.po
+++ b/po/cs.po
@@ -5,7 +5,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2010-07-03 21:45+0530\n"
+=======
+"POT-Creation-Date: 2010-07-03 09:00-0400\n"
+>>>>>>> origin/master
 "PO-Revision-Date: 2010-06-08 10:43+0200\n"
 "Last-Translator: Michal <michal@cihar.com>\n"
 "Language-Team: czech <cs@li.org>\n"
@@ -51,15 +55,26 @@ msgstr "Vyhledávání"
 #: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046
 #: libraries/Theme_Manager.class.php:311
 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719
+<<<<<<< HEAD
 #: libraries/common.lib.php:1344 libraries/common.lib.php:2301
 #: libraries/display_change_password.lib.php:82
 #: libraries/display_create_table.lib.php:62
+=======
+#: libraries/common.lib.php:1335 libraries/common.lib.php:2288
+#: libraries/display_change_password.lib.php:82
+#: libraries/display_create_table.lib.php:63
+>>>>>>> origin/master
 #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532
 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76
 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104
+<<<<<<< HEAD
 #: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480
 #: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782
+=======
+#: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477
+#: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782
+>>>>>>> origin/master
 #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328
 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142
 #: server_privileges.php:665 server_privileges.php:1641
@@ -69,8 +84,13 @@ msgstr "Vyhledávání"
 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171
 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265
 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561
+<<<<<<< HEAD
 #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560
 #: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512
+=======
+#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562
+#: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512
+>>>>>>> origin/master
 #: view_create.php:182 view_operations.php:101
 msgid "Go"
 msgstr "Proveď"
@@ -121,10 +141,17 @@ msgstr "Pole"
 #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245
 #: libraries/export/latex.php:360 libraries/export/odt.php:297
 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100
+<<<<<<< HEAD
 #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093
 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
 #: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321
+=======
+#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070
+#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
+#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
+#: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321
+>>>>>>> origin/master
 msgid "Type"
 msgstr "Typ"
 
@@ -165,9 +192,15 @@ msgstr "Komentáře"
 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322
 #: libraries/export/latex.php:430 libraries/export/odt.php:368
 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263
+<<<<<<< HEAD
 #: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596
 #: server_privileges.php:1911 server_privileges.php:1916
 #: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228
+=======
+#: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579
+#: server_privileges.php:1889 server_privileges.php:1894
+#: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228
+>>>>>>> origin/master
 #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342
 msgid "No"
 msgstr "Ne"
@@ -181,9 +214,15 @@ msgstr "Ne"
 #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106
 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262
 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344
+<<<<<<< HEAD
 #: server_databases.php:64 server_privileges.php:1582
 #: server_privileges.php:1596 server_privileges.php:1911
 #: server_privileges.php:1914 server_privileges.php:2210 sql.php:193
+=======
+#: server_databases.php:64 server_privileges.php:1565
+#: server_privileges.php:1579 server_privileges.php:1889
+#: server_privileges.php:1892 server_privileges.php:2187 sql.php:193
+>>>>>>> origin/master
 #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350
 #: tbl_tracking.php:335 tbl_tracking.php:340
 msgid "Yes"
@@ -232,7 +271,15 @@ msgstr "Přejmenovat databázi na"
 msgid "Command"
 msgstr "Příkaz"
 
+<<<<<<< HEAD
 #: db_operations.php:466
+=======
+#: db_operations.php:429 tbl_change.php:1140
+msgid "and then"
+msgstr "a poté"
+
+#: db_operations.php:455
+>>>>>>> origin/master
 msgid "Copy database to"
 msgstr "Zkopírovat databázi na"
 
@@ -314,7 +361,11 @@ msgstr "Zapnout"
 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730
 #: server_collations.php:54 server_collations.php:66 server_databases.php:111
 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179
+<<<<<<< HEAD
 #: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326
+=======
+#: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326
+>>>>>>> origin/master
 msgid "Collation"
 msgstr "Porovnávání"
 
@@ -343,7 +394,11 @@ msgstr "Tabulka"
 #: db_printview.php:105 libraries/db_structure.lib.php:56
 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146
 #: navigation.php:638 navigation.php:660 server_databases.php:122
+<<<<<<< HEAD
 #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775
+=======
+#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777
+>>>>>>> origin/master
 msgid "Rows"
 msgstr "Řádků"
 
@@ -358,19 +413,31 @@ msgstr "právě se používá"
 
 #: db_printview.php:187 libraries/db_info.inc.php:88
 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433
+<<<<<<< HEAD
 #: tbl_structure.php:807
+=======
+#: tbl_structure.php:809
+>>>>>>> origin/master
 msgid "Creation"
 msgstr "Vytvoření"
 
 #: db_printview.php:196 libraries/db_info.inc.php:93
 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443
+<<<<<<< HEAD
 #: tbl_structure.php:815
+=======
+#: tbl_structure.php:817
+>>>>>>> origin/master
 msgid "Last update"
 msgstr "Poslední změna"
 
 #: db_printview.php:205 libraries/db_info.inc.php:98
 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453
+<<<<<<< HEAD
 #: tbl_structure.php:823
+=======
+#: tbl_structure.php:825
+>>>>>>> origin/master
 msgid "Last check"
 msgstr "Poslední kontrola"
 
@@ -435,7 +502,11 @@ msgstr "smazat"
 
 #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553
 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779
+<<<<<<< HEAD
 #: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250
+=======
+#: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250
+>>>>>>> origin/master
 #: tbl_select.php:286
 msgid "Or"
 msgstr "nebo"
@@ -648,9 +719,15 @@ msgstr "Zaškrtnuté:"
 msgid "Check All"
 msgstr "Zaškrtnout vše"
 
+<<<<<<< HEAD
 #: db_structure.php:529 libraries/display_tbl.lib.php:2077
 #: libraries/replication_gui.lib.php:36 server_databases.php:350
 #: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460
+=======
+#: db_structure.php:531 libraries/display_tbl.lib.php:2077
+#: libraries/replication_gui.lib.php:36 server_databases.php:350
+#: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462
+>>>>>>> origin/master
 msgid "Uncheck All"
 msgstr "Odškrtnout vše"
 
@@ -1109,10 +1186,17 @@ msgid "Prev"
 msgstr "Předchozí"
 
 #. l10n: Display text for next month link in calendar
+<<<<<<< HEAD
 #: js/messages.php:106 libraries/common.lib.php:2366
 #: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338
 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
 #: tbl_structure.php:799
+=======
+#: js/messages.php:77 libraries/common.lib.php:2353
+#: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338
+#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
+#: tbl_structure.php:801
+>>>>>>> origin/master
 msgid "Next"
 msgstr "Další"
 
@@ -1616,7 +1700,11 @@ msgstr "Heslo:"
 msgid "Server Choice"
 msgstr "Server"
 
+<<<<<<< HEAD
 #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63
+=======
+#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59
+>>>>>>> origin/master
 msgid "Cookies must be enabled past this point."
 msgstr "Přihlášení vyžaduje povolené cookies."
 
@@ -1698,7 +1786,11 @@ msgstr ""
 "Nelze použít funkce iconv ani libiconv ani recode_string, přestože rozšíření "
 "jsou nahrána. Zkontrolujte nastavení PHP."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:580
+=======
+#: libraries/common.inc.php:576
+>>>>>>> origin/master
 msgid ""
 "phpMyAdmin was unable to read your configuration file!<br />This might "
 "happen if PHP finds a parse error in it or PHP cannot find the file.<br /"
@@ -1714,12 +1806,20 @@ msgstr ""
 "(nejčastěji se jedná o chybějící středník).<br />Pokud získáte prázdnou "
 "stránku, všechno je v pořádku."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:591
+=======
+#: libraries/common.inc.php:587
+>>>>>>> origin/master
 #, php-format
 msgid "Could not load default configuration from: %1$s"
 msgstr "Nepodařilo se nahrát výchozí konfiguraci ze souboru: %1$s"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:596
+=======
+#: libraries/common.inc.php:592
+>>>>>>> origin/master
 msgid ""
 "The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
 "configuration file!"
@@ -1727,27 +1827,47 @@ msgstr ""
 "Parametr <tt>$cfg['PmaAbsoluteUri']</tt> MUSÍ být nastaven v konfiguračním "
 "souboru!"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:626
+=======
+#: libraries/common.inc.php:622
+>>>>>>> origin/master
 #, php-format
 msgid "Invalid server index: %s"
 msgstr "Chybný index serveru: „%s“"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:633
+=======
+#: libraries/common.inc.php:629
+>>>>>>> origin/master
 #, php-format
 msgid "Invalid hostname for server %1$s. Please review your configuration."
 msgstr "Chybné jméno serveru pro server %1$s. Prosím zkontrolujte nastavení."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:642 libraries/header.inc.php:100
+=======
+#: libraries/common.inc.php:638 libraries/header.inc.php:96
+>>>>>>> origin/master
 #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47
 #: main.php:185 test/theme.php:57
 msgid "Server"
 msgstr "Server"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:820
 msgid "Invalid authentication method set in configuration:"
 msgstr "V konfiguraci máte špatnou autentizační metodu:"
 
 #: libraries/common.inc.php:923
+=======
+#: libraries/common.inc.php:816
+msgid "Invalid authentication method set in configuration:"
+msgstr "V konfiguraci máte špatnou autentizační metodu:"
+
+#: libraries/common.inc.php:919
+>>>>>>> origin/master
 #, php-format
 msgid "You should upgrade to %s %s or later."
 msgstr "Měli byste aktualizovat %s na verzi %s nebo vyšší."
@@ -1994,7 +2114,11 @@ msgstr ""
 "FAQ 3.11[/a]"
 
 #: libraries/db_structure.lib.php:69 server_databases.php:142
+<<<<<<< HEAD
 #: tbl_printview.php:335 tbl_structure.php:680
+=======
+#: tbl_printview.php:335 tbl_structure.php:682
+>>>>>>> origin/master
 msgid "Overhead"
 msgstr "Navíc"
 
@@ -2022,22 +2146,36 @@ msgid "Change password"
 msgstr "Změnit heslo"
 
 #: libraries/display_change_password.lib.php:35
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:348 server_privileges.php:808
+=======
+#: libraries/replication_gui.lib.php:348 server_privileges.php:807
+>>>>>>> origin/master
 msgid "No Password"
 msgstr "Žádné heslo"
 
 #: libraries/display_change_password.lib.php:41
 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63
 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:352 server_privileges.php:797
 #: server_privileges.php:801 server_privileges.php:812
 #: server_privileges.php:1555 server_synchronize.php:1175
+=======
+#: libraries/replication_gui.lib.php:352 server_privileges.php:796
+#: server_privileges.php:800 server_privileges.php:811
+#: server_privileges.php:1538 server_synchronize.php:1175
+>>>>>>> origin/master
 msgid "Password"
 msgstr "Heslo"
 
 #: libraries/display_change_password.lib.php:46
 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359
+<<<<<<< HEAD
 #: server_privileges.php:816 server_privileges.php:819
+=======
+#: server_privileges.php:815 server_privileges.php:818
+>>>>>>> origin/master
 msgid "Re-type"
 msgstr "Heslo znovu"
 
@@ -2050,12 +2188,20 @@ msgid "MySQL 4.0 compatible"
 msgstr "Kompatibilní s MySQL 4.0"
 
 #: libraries/display_change_password.lib.php:72
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:363 server_privileges.php:823
+=======
+#: libraries/replication_gui.lib.php:363 server_privileges.php:822
+>>>>>>> origin/master
 msgid "Generate Password"
 msgstr "Vytvořit heslo"
 
 #: libraries/display_change_password.lib.php:75
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:366 server_privileges.php:826
+=======
+#: libraries/replication_gui.lib.php:366 server_privileges.php:825
+>>>>>>> origin/master
 msgid "Generate"
 msgstr "Vytvořit"
 
@@ -2141,7 +2287,11 @@ msgid "remember template"
 msgstr "zapamatovat si hodnotu"
 
 #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552
+=======
+#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549
+>>>>>>> origin/master
 msgid "Character set of the file:"
 msgstr "Znaková sada souboru:"
 
@@ -2199,7 +2349,11 @@ msgstr ""
 msgid "File to import"
 msgstr "Soubor pro importování"
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527
+=======
+#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524
+>>>>>>> origin/master
 msgid "Location of the text file"
 msgstr "textový soubor"
 
@@ -2207,12 +2361,20 @@ msgstr "textový soubor"
 msgid "File uploads are not allowed on this server."
 msgstr "Upload souborů není na tomto serveru povolen."
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536
+=======
+#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533
+>>>>>>> origin/master
 #: tbl_change.php:1025
 msgid "The directory you set for upload work cannot be reached"
 msgstr "Adresář určený pro upload souborů nemohl být otevřen"
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539
+=======
+#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536
+>>>>>>> origin/master
 #: tbl_change.php:1028
 msgid "web server upload directory"
 msgstr "soubor z adresáře pro upload"
@@ -2346,7 +2508,11 @@ msgstr "Setřídit podle klíče"
 #: libraries/import/docsql.php:34 libraries/import/ldi.php:47
 #: libraries/import/ods.php:30 libraries/import/sql.php:20
 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26
+<<<<<<< HEAD
 #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751
+=======
+#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753
+>>>>>>> origin/master
 msgid "Options"
 msgstr "Nastavení"
 
@@ -2489,7 +2655,11 @@ msgstr "Využití vyrovnávací paměti"
 
 #: libraries/engines/innodb.lib.php:194 server_databases.php:137
 #: server_databases.php:305 server_status.php:525 server_status.php:586
+<<<<<<< HEAD
 #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694
+=======
+#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696
+>>>>>>> origin/master
 msgid "Total"
 msgstr "Celkem"
 
@@ -2773,7 +2943,11 @@ msgstr ""
 "soubory vymazány. Jinak jsou soubory přejmenovány a označeny vyšším číslem."
 
 #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88
+<<<<<<< HEAD
 #: tbl_printview.php:375 tbl_structure.php:735
+=======
+#: tbl_printview.php:375 tbl_structure.php:737
+>>>>>>> origin/master
 msgid "Format"
 msgstr "Formát"
 
@@ -2837,8 +3011,13 @@ msgstr "Microsoft Word 2000"
 #: libraries/export/latex.php:201 libraries/export/odt.php:48
 #: libraries/export/sql.php:106 libraries/export/sql.php:868
 #: libraries/export/texytext.php:27 server_databases.php:127
+<<<<<<< HEAD
 #: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316
 #: tbl_structure.php:663
+=======
+#: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316
+#: tbl_structure.php:665
+>>>>>>> origin/master
 msgid "Data"
 msgstr "Data"
 
@@ -2887,9 +3066,15 @@ msgstr "MIME typ"
 #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57
 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177
 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:332 server_privileges.php:732
 #: server_privileges.php:735 server_privileges.php:791
 #: server_privileges.php:1554 server_privileges.php:2092
+=======
+#: libraries/replication_gui.lib.php:332 server_privileges.php:731
+#: server_privileges.php:734 server_privileges.php:790
+#: server_privileges.php:1537 server_privileges.php:2069
+>>>>>>> origin/master
 #: server_processlist.php:55 server_synchronize.php:1159
 msgid "Host"
 msgstr "Počítač"
@@ -3558,8 +3743,13 @@ msgstr ""
 
 #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59
 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:262 server_privileges.php:712
 #: server_privileges.php:715 server_privileges.php:722
+=======
+#: libraries/replication_gui.lib.php:262 server_privileges.php:711
+#: server_privileges.php:714 server_privileges.php:721
+>>>>>>> origin/master
 #: server_synchronize.php:1171
 msgid "User name"
 msgstr "Jméno uživatele"
@@ -3576,14 +3766,22 @@ msgstr "Stav nadřízeného"
 msgid "Slave status"
 msgstr "Stav podřízeného"
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448
+=======
+#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445
+>>>>>>> origin/master
 #: server_status.php:737 server_variables.php:52
 msgid "Variable"
 msgstr "Proměnná"
 
 #: libraries/replication_gui.lib.php:118 server_status.php:738
 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138
+<<<<<<< HEAD
 #: tbl_structure.php:727
+=======
+#: tbl_structure.php:729
+>>>>>>> origin/master
 msgid "Value"
 msgstr "Hodnota"
 
@@ -3603,11 +3801,16 @@ msgstr ""
 msgid "Add slave replication user"
 msgstr "Přidat replikačního uživatele pro podřízený server"
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:257 server_privileges.php:717
+=======
+#: libraries/replication_gui.lib.php:257 server_privileges.php:716
+>>>>>>> origin/master
 msgid "Any user"
 msgstr "Jakýkoliv uživatel"
 
 #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:349 server_privileges.php:718
 #: server_privileges.php:785 server_privileges.php:809
 #: server_privileges.php:1950 server_privileges.php:1980
@@ -3631,6 +3834,31 @@ msgid "Use Host Table"
 msgstr "Použít tabulku Host"
 
 #: libraries/replication_gui.lib.php:334 server_privileges.php:793
+=======
+#: libraries/replication_gui.lib.php:349 server_privileges.php:717
+#: server_privileges.php:784 server_privileges.php:808
+#: server_privileges.php:1928 server_privileges.php:1958
+msgid "Use text field"
+msgstr "Použít textové pole"
+
+#: libraries/replication_gui.lib.php:305 server_privileges.php:764
+msgid "Any host"
+msgstr "Jakýkoliv počítač"
+
+#: libraries/replication_gui.lib.php:309 server_privileges.php:768
+msgid "Local"
+msgstr "Lokální"
+
+#: libraries/replication_gui.lib.php:315 server_privileges.php:773
+msgid "This Host"
+msgstr "Tento počítač"
+
+#: libraries/replication_gui.lib.php:321 server_privileges.php:779
+msgid "Use Host Table"
+msgstr "Použít tabulku Host"
+
+#: libraries/replication_gui.lib.php:334 server_privileges.php:792
+>>>>>>> origin/master
 msgid ""
 "When Host table is used, this field is ignored and values stored in Host "
 "table are used instead."
@@ -7909,10 +8137,13 @@ msgstr "Vložit jako nový řádek a ignorovat chyby"
 msgid "Show insert query"
 msgstr "Zobrazit dotaz pro vložení"
 
+<<<<<<< HEAD
 #: tbl_change.php:1140
 msgid "and then"
 msgstr "a poté"
 
+=======
+>>>>>>> origin/master
 #: tbl_change.php:1144
 msgid "Go back to previous page"
 msgstr "Návrat na předchozí stránku"
@@ -8105,6 +8336,7 @@ msgstr "Zkontrolovat integritu odkazů:"
 msgid "Show tables"
 msgstr "Zobrazit tabulky"
 
+<<<<<<< HEAD
 #: tbl_printview.php:309 tbl_structure.php:654
 msgid "Space usage"
 msgstr "Využití místa"
@@ -8138,6 +8370,41 @@ msgid "Row length"
 msgstr "Délka řádku"
 
 #: tbl_printview.php:413 tbl_structure.php:791
+=======
+#: tbl_printview.php:309 tbl_structure.php:656
+msgid "Space usage"
+msgstr "Využití místa"
+
+#: tbl_printview.php:313 tbl_structure.php:660
+msgid "Usage"
+msgstr "Používá"
+
+#: tbl_printview.php:340 tbl_structure.php:687
+msgid "Effective"
+msgstr "Efektivní"
+
+#: tbl_printview.php:365 tbl_structure.php:725
+msgid "Row Statistics"
+msgstr "Statistika řádků"
+
+#: tbl_printview.php:368 tbl_structure.php:728
+msgid "Statements"
+msgstr "Údaj"
+
+#: tbl_printview.php:379 tbl_structure.php:740
+msgid "static"
+msgstr "statický"
+
+#: tbl_printview.php:381 tbl_structure.php:742
+msgid "dynamic"
+msgstr "dynamický"
+
+#: tbl_printview.php:403 tbl_structure.php:785
+msgid "Row length"
+msgstr "Délka řádku"
+
+#: tbl_printview.php:413 tbl_structure.php:793
+>>>>>>> origin/master
 msgid " Row size "
 msgstr " Velikost řádku "
 
diff --git a/po/cy.po b/po/cy.po
index 25f068352..6a5b2f02f 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -6,7 +6,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2010-07-03 21:45+0530\n"
+=======
+"POT-Creation-Date: 2010-07-03 09:00-0400\n"
+>>>>>>> origin/master
 "PO-Revision-Date: 2010-06-07 20:23+0200\n"
 "Last-Translator:  <ardavies@tiscali.co.uk>\n"
 "Language-Team: Welsh <cy@li.org>\n"
@@ -52,15 +56,26 @@ msgstr "Chwilio"
 #: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046
 #: libraries/Theme_Manager.class.php:311
 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719
+<<<<<<< HEAD
 #: libraries/common.lib.php:1344 libraries/common.lib.php:2301
 #: libraries/display_change_password.lib.php:82
 #: libraries/display_create_table.lib.php:62
+=======
+#: libraries/common.lib.php:1335 libraries/common.lib.php:2288
+#: libraries/display_change_password.lib.php:82
+#: libraries/display_create_table.lib.php:63
+>>>>>>> origin/master
 #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532
 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76
 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104
+<<<<<<< HEAD
 #: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480
 #: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782
+=======
+#: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477
+#: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782
+>>>>>>> origin/master
 #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328
 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142
 #: server_privileges.php:665 server_privileges.php:1641
@@ -70,8 +85,13 @@ msgstr "Chwilio"
 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171
 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265
 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561
+<<<<<<< HEAD
 #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560
 #: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512
+=======
+#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562
+#: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512
+>>>>>>> origin/master
 #: view_create.php:182 view_operations.php:101
 msgid "Go"
 msgstr "Ewch"
@@ -122,10 +142,17 @@ msgstr "Colofn"
 #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245
 #: libraries/export/latex.php:360 libraries/export/odt.php:297
 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100
+<<<<<<< HEAD
 #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093
 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
 #: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321
+=======
+#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070
+#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
+#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
+#: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321
+>>>>>>> origin/master
 msgid "Type"
 msgstr "Math"
 
@@ -166,9 +193,15 @@ msgstr "Sylwadau"
 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322
 #: libraries/export/latex.php:430 libraries/export/odt.php:368
 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263
+<<<<<<< HEAD
 #: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596
 #: server_privileges.php:1911 server_privileges.php:1916
 #: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228
+=======
+#: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579
+#: server_privileges.php:1889 server_privileges.php:1894
+#: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228
+>>>>>>> origin/master
 #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342
 msgid "No"
 msgstr "Na"
@@ -182,9 +215,15 @@ msgstr "Na"
 #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106
 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262
 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344
+<<<<<<< HEAD
 #: server_databases.php:64 server_privileges.php:1582
 #: server_privileges.php:1596 server_privileges.php:1911
 #: server_privileges.php:1914 server_privileges.php:2210 sql.php:193
+=======
+#: server_databases.php:64 server_privileges.php:1565
+#: server_privileges.php:1579 server_privileges.php:1889
+#: server_privileges.php:1892 server_privileges.php:2187 sql.php:193
+>>>>>>> origin/master
 #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350
 #: tbl_tracking.php:335 tbl_tracking.php:340
 msgid "Yes"
@@ -233,7 +272,15 @@ msgstr "Ailenwch y gronfa ddata i"
 msgid "Command"
 msgstr "Gorchymyn"
 
+<<<<<<< HEAD
 #: db_operations.php:466
+=======
+#: db_operations.php:429 tbl_change.php:1140
+msgid "and then"
+msgstr "ac yna"
+
+#: db_operations.php:455
+>>>>>>> origin/master
 msgid "Copy database to"
 msgstr "Copïwch y gronfa ddata i"
 
@@ -315,7 +362,11 @@ msgstr "Galluogwch"
 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730
 #: server_collations.php:54 server_collations.php:66 server_databases.php:111
 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179
+<<<<<<< HEAD
 #: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326
+=======
+#: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326
+>>>>>>> origin/master
 msgid "Collation"
 msgstr "Coladiad"
 
@@ -344,7 +395,11 @@ msgstr "Tabl"
 #: db_printview.php:105 libraries/db_structure.lib.php:56
 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146
 #: navigation.php:638 navigation.php:660 server_databases.php:122
+<<<<<<< HEAD
 #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775
+=======
+#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777
+>>>>>>> origin/master
 msgid "Rows"
 msgstr "Rhesi"
 
@@ -359,19 +414,31 @@ msgstr "ar ddefnydd"
 
 #: db_printview.php:187 libraries/db_info.inc.php:88
 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433
+<<<<<<< HEAD
 #: tbl_structure.php:807
+=======
+#: tbl_structure.php:809
+>>>>>>> origin/master
 msgid "Creation"
 msgstr "Cread"
 
 #: db_printview.php:196 libraries/db_info.inc.php:93
 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443
+<<<<<<< HEAD
 #: tbl_structure.php:815
+=======
+#: tbl_structure.php:817
+>>>>>>> origin/master
 msgid "Last update"
 msgstr "Diweddariad diwethaf"
 
 #: db_printview.php:205 libraries/db_info.inc.php:98
 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453
+<<<<<<< HEAD
 #: tbl_structure.php:823
+=======
+#: tbl_structure.php:825
+>>>>>>> origin/master
 msgid "Last check"
 msgstr "Gwiriad diwethaf"
 
@@ -435,7 +502,11 @@ msgstr "Del"
 
 #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553
 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779
+<<<<<<< HEAD
 #: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250
+=======
+#: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250
+>>>>>>> origin/master
 #: tbl_select.php:286
 msgid "Or"
 msgstr "Or"
@@ -648,9 +719,15 @@ msgstr "Gyda'r dewis:"
 msgid "Check All"
 msgstr "Dewis Pob"
 
+<<<<<<< HEAD
 #: db_structure.php:529 libraries/display_tbl.lib.php:2077
 #: libraries/replication_gui.lib.php:36 server_databases.php:350
 #: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460
+=======
+#: db_structure.php:531 libraries/display_tbl.lib.php:2077
+#: libraries/replication_gui.lib.php:36 server_databases.php:350
+#: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462
+>>>>>>> origin/master
 msgid "Uncheck All"
 msgstr "Dad-ddewis Pob"
 
@@ -1104,10 +1181,17 @@ msgid "Prev"
 msgstr "Cynt"
 
 #. l10n: Display text for next month link in calendar
+<<<<<<< HEAD
 #: js/messages.php:106 libraries/common.lib.php:2366
 #: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338
 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
 #: tbl_structure.php:799
+=======
+#: js/messages.php:77 libraries/common.lib.php:2353
+#: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338
+#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
+#: tbl_structure.php:801
+>>>>>>> origin/master
 msgid "Next"
 msgstr "Nesaf"
 
@@ -1606,7 +1690,11 @@ msgstr "Cyfrinair:"
 msgid "Server Choice"
 msgstr "Dewis Gweinydd"
 
+<<<<<<< HEAD
 #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63
+=======
+#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59
+>>>>>>> origin/master
 msgid "Cookies must be enabled past this point."
 msgstr "Mae'n rhaid bod cwcis wedi'u galluogi heibio'r pwynt hwn."
 
@@ -1683,7 +1771,11 @@ msgid ""
 "necessary extensions appear to be loaded. Check your PHP configuration."
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:580
+=======
+#: libraries/common.inc.php:576
+>>>>>>> origin/master
 msgid ""
 "phpMyAdmin was unable to read your configuration file!<br />This might "
 "happen if PHP finds a parse error in it or PHP cannot find the file.<br /"
@@ -1693,39 +1785,67 @@ msgid ""
 "is fine."
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:591
+=======
+#: libraries/common.inc.php:587
+>>>>>>> origin/master
 #, php-format
 msgid "Could not load default configuration from: %1$s"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:596
+=======
+#: libraries/common.inc.php:592
+>>>>>>> origin/master
 msgid ""
 "The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
 "configuration file!"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:626
+=======
+#: libraries/common.inc.php:622
+>>>>>>> origin/master
 #, php-format
 msgid "Invalid server index: %s"
 msgstr "Indecs gweinydd annilys: %s"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:633
+=======
+#: libraries/common.inc.php:629
+>>>>>>> origin/master
 #, php-format
 msgid "Invalid hostname for server %1$s. Please review your configuration."
 msgstr ""
 "Enw gwesteiwr annilys ar gyfer gweinydd %1$s. Adolygwch eich ffurfwedd."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:642 libraries/header.inc.php:100
+=======
+#: libraries/common.inc.php:638 libraries/header.inc.php:96
+>>>>>>> origin/master
 #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47
 #: main.php:185 test/theme.php:57
 msgid "Server"
 msgstr "Gweinydd"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:820
 msgid "Invalid authentication method set in configuration:"
 msgstr ""
 
 #: libraries/common.inc.php:923
+=======
+#: libraries/common.inc.php:816
+msgid "Invalid authentication method set in configuration:"
+msgstr ""
+
+#: libraries/common.inc.php:919
+>>>>>>> origin/master
 #, php-format
 msgid "You should upgrade to %s %s or later."
 msgstr "Dylech uwchraddio i %s %s neu'n well."
@@ -1968,7 +2088,11 @@ msgid ""
 msgstr ""
 
 #: libraries/db_structure.lib.php:69 server_databases.php:142
+<<<<<<< HEAD
 #: tbl_printview.php:335 tbl_structure.php:680
+=======
+#: tbl_printview.php:335 tbl_structure.php:682
+>>>>>>> origin/master
 msgid "Overhead"
 msgstr "Gorbenion"
 
@@ -1995,22 +2119,36 @@ msgid "Change password"
 msgstr "Newid cyfrinair"
 
 #: libraries/display_change_password.lib.php:35
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:348 server_privileges.php:808
+=======
+#: libraries/replication_gui.lib.php:348 server_privileges.php:807
+>>>>>>> origin/master
 msgid "No Password"
 msgstr "Dim Cyfrinair"
 
 #: libraries/display_change_password.lib.php:41
 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63
 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:352 server_privileges.php:797
 #: server_privileges.php:801 server_privileges.php:812
 #: server_privileges.php:1555 server_synchronize.php:1175
+=======
+#: libraries/replication_gui.lib.php:352 server_privileges.php:796
+#: server_privileges.php:800 server_privileges.php:811
+#: server_privileges.php:1538 server_synchronize.php:1175
+>>>>>>> origin/master
 msgid "Password"
 msgstr "Cyfrinair"
 
 #: libraries/display_change_password.lib.php:46
 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359
+<<<<<<< HEAD
 #: server_privileges.php:816 server_privileges.php:819
+=======
+#: server_privileges.php:815 server_privileges.php:818
+>>>>>>> origin/master
 msgid "Re-type"
 msgstr "Ail-deipiwch"
 
@@ -2023,12 +2161,20 @@ msgid "MySQL 4.0 compatible"
 msgstr "MySQL 4.0-cytûn"
 
 #: libraries/display_change_password.lib.php:72
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:363 server_privileges.php:823
+=======
+#: libraries/replication_gui.lib.php:363 server_privileges.php:822
+>>>>>>> origin/master
 msgid "Generate Password"
 msgstr "Generadu Cyfrinair"
 
 #: libraries/display_change_password.lib.php:75
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:366 server_privileges.php:826
+=======
+#: libraries/replication_gui.lib.php:366 server_privileges.php:825
+>>>>>>> origin/master
 msgid "Generate"
 msgstr "Generadu"
 
@@ -2110,7 +2256,11 @@ msgid "remember template"
 msgstr "cofio templed"
 
 #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552
+=======
+#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549
+>>>>>>> origin/master
 msgid "Character set of the file:"
 msgstr "Set nodau'r ffeil:"
 
@@ -2165,7 +2315,11 @@ msgstr ""
 msgid "File to import"
 msgstr "Ffeil i'w mewnforio"
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527
+=======
+#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524
+>>>>>>> origin/master
 msgid "Location of the text file"
 msgstr "Lleoliad y ffeil destun"
 
@@ -2173,14 +2327,22 @@ msgstr "Lleoliad y ffeil destun"
 msgid "File uploads are not allowed on this server."
 msgstr "Dyw lanlwytho ffeiliau ddim yn cael ei ganiatáu ar y gweinydd hwn."
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536
+=======
+#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533
+>>>>>>> origin/master
 #: tbl_change.php:1025
 msgid "The directory you set for upload work cannot be reached"
 msgstr ""
 "Does dim modd cyrraedd y cyfeiriadur a osodoch chi ar gyfer gwaith a "
 "lanwlythwyd"
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539
+=======
+#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536
+>>>>>>> origin/master
 #: tbl_change.php:1028
 msgid "web server upload directory"
 msgstr "cyfeiriadur lanlwytho y gweinydd gwe"
@@ -2307,7 +2469,11 @@ msgstr "Trefnu gan allwedd"
 #: libraries/import/docsql.php:34 libraries/import/ldi.php:47
 #: libraries/import/ods.php:30 libraries/import/sql.php:20
 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26
+<<<<<<< HEAD
 #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751
+=======
+#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753
+>>>>>>> origin/master
 msgid "Options"
 msgstr "Opsiynau"
 
@@ -2448,7 +2614,11 @@ msgstr "Defnydd Pwll Byffer"
 
 #: libraries/engines/innodb.lib.php:194 server_databases.php:137
 #: server_databases.php:305 server_status.php:525 server_status.php:586
+<<<<<<< HEAD
 #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694
+=======
+#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696
+>>>>>>> origin/master
 msgid "Total"
 msgstr "Cyfanswm"
 
@@ -2693,7 +2863,11 @@ msgid ""
 msgstr ""
 
 #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88
+<<<<<<< HEAD
 #: tbl_printview.php:375 tbl_structure.php:735
+=======
+#: tbl_printview.php:375 tbl_structure.php:737
+>>>>>>> origin/master
 msgid "Format"
 msgstr "Fformat"
 
@@ -2757,8 +2931,13 @@ msgstr "Microsoft Word 2000"
 #: libraries/export/latex.php:201 libraries/export/odt.php:48
 #: libraries/export/sql.php:106 libraries/export/sql.php:868
 #: libraries/export/texytext.php:27 server_databases.php:127
+<<<<<<< HEAD
 #: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316
 #: tbl_structure.php:663
+=======
+#: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316
+#: tbl_structure.php:665
+>>>>>>> origin/master
 msgid "Data"
 msgstr "Data"
 
@@ -2807,9 +2986,15 @@ msgstr "Math MIME"
 #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57
 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177
 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:332 server_privileges.php:732
 #: server_privileges.php:735 server_privileges.php:791
 #: server_privileges.php:1554 server_privileges.php:2092
+=======
+#: libraries/replication_gui.lib.php:332 server_privileges.php:731
+#: server_privileges.php:734 server_privileges.php:790
+#: server_privileges.php:1537 server_privileges.php:2069
+>>>>>>> origin/master
 #: server_processlist.php:55 server_synchronize.php:1159
 msgid "Host"
 msgstr "Gwesteiwr"
@@ -3467,8 +3652,13 @@ msgstr ""
 
 #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59
 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:262 server_privileges.php:712
 #: server_privileges.php:715 server_privileges.php:722
+=======
+#: libraries/replication_gui.lib.php:262 server_privileges.php:711
+#: server_privileges.php:714 server_privileges.php:721
+>>>>>>> origin/master
 #: server_synchronize.php:1171
 msgid "User name"
 msgstr ""
@@ -3485,14 +3675,22 @@ msgstr "Statws y meistr"
 msgid "Slave status"
 msgstr "Statws y caeth"
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448
+=======
+#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445
+>>>>>>> origin/master
 #: server_status.php:737 server_variables.php:52
 msgid "Variable"
 msgstr "Newidyn"
 
 #: libraries/replication_gui.lib.php:118 server_status.php:738
 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138
+<<<<<<< HEAD
 #: tbl_structure.php:727
+=======
+#: tbl_structure.php:729
+>>>>>>> origin/master
 msgid "Value"
 msgstr "Gwerth"
 
@@ -3510,11 +3708,16 @@ msgstr ""
 msgid "Add slave replication user"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:257 server_privileges.php:717
+=======
+#: libraries/replication_gui.lib.php:257 server_privileges.php:716
+>>>>>>> origin/master
 msgid "Any user"
 msgstr "Unrhyw ddefnyddiwr"
 
 #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:349 server_privileges.php:718
 #: server_privileges.php:785 server_privileges.php:809
 #: server_privileges.php:1950 server_privileges.php:1980
@@ -3538,6 +3741,31 @@ msgid "Use Host Table"
 msgstr "Defnyddiwch Dabl Gwesteiwyr"
 
 #: libraries/replication_gui.lib.php:334 server_privileges.php:793
+=======
+#: libraries/replication_gui.lib.php:349 server_privileges.php:717
+#: server_privileges.php:784 server_privileges.php:808
+#: server_privileges.php:1928 server_privileges.php:1958
+msgid "Use text field"
+msgstr "Defnyddiwch faes testun"
+
+#: libraries/replication_gui.lib.php:305 server_privileges.php:764
+msgid "Any host"
+msgstr "Unrhyw westeiwr"
+
+#: libraries/replication_gui.lib.php:309 server_privileges.php:768
+msgid "Local"
+msgstr "Lleol"
+
+#: libraries/replication_gui.lib.php:315 server_privileges.php:773
+msgid "This Host"
+msgstr "Y Gwesteiwr Hwn"
+
+#: libraries/replication_gui.lib.php:321 server_privileges.php:779
+msgid "Use Host Table"
+msgstr "Defnyddiwch Dabl Gwesteiwyr"
+
+#: libraries/replication_gui.lib.php:334 server_privileges.php:792
+>>>>>>> origin/master
 msgid ""
 "When Host table is used, this field is ignored and values stored in Host "
 "table are used instead."
@@ -7402,10 +7630,13 @@ msgstr ""
 msgid "Show insert query"
 msgstr "Dangos ymholiad mewnosod"
 
+<<<<<<< HEAD
 #: tbl_change.php:1140
 msgid "and then"
 msgstr "ac yna"
 
+=======
+>>>>>>> origin/master
 #: tbl_change.php:1144
 msgid "Go back to previous page"
 msgstr "Dychwelyd i'r dudalen flaenorol"
@@ -7598,6 +7829,7 @@ msgstr ""
 msgid "Show tables"
 msgstr ""
 
+<<<<<<< HEAD
 #: tbl_printview.php:309 tbl_structure.php:654
 msgid "Space usage"
 msgstr ""
@@ -7631,6 +7863,41 @@ msgid "Row length"
 msgstr ""
 
 #: tbl_printview.php:413 tbl_structure.php:791
+=======
+#: tbl_printview.php:309 tbl_structure.php:656
+msgid "Space usage"
+msgstr ""
+
+#: tbl_printview.php:313 tbl_structure.php:660
+msgid "Usage"
+msgstr ""
+
+#: tbl_printview.php:340 tbl_structure.php:687
+msgid "Effective"
+msgstr ""
+
+#: tbl_printview.php:365 tbl_structure.php:725
+msgid "Row Statistics"
+msgstr ""
+
+#: tbl_printview.php:368 tbl_structure.php:728
+msgid "Statements"
+msgstr ""
+
+#: tbl_printview.php:379 tbl_structure.php:740
+msgid "static"
+msgstr ""
+
+#: tbl_printview.php:381 tbl_structure.php:742
+msgid "dynamic"
+msgstr ""
+
+#: tbl_printview.php:403 tbl_structure.php:785
+msgid "Row length"
+msgstr ""
+
+#: tbl_printview.php:413 tbl_structure.php:793
+>>>>>>> origin/master
 msgid " Row size "
 msgstr ""
 
diff --git a/po/da.po b/po/da.po
index 2993fc587..45c87503a 100755
--- a/po/da.po
+++ b/po/da.po
@@ -3,7 +3,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2010-07-03 21:45+0530\n"
+=======
+"POT-Creation-Date: 2010-07-03 09:00-0400\n"
+>>>>>>> origin/master
 "PO-Revision-Date: 2010-03-12 09:13+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: danish <da@li.org>\n"
@@ -48,15 +52,26 @@ msgstr "Søg"
 #: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046
 #: libraries/Theme_Manager.class.php:311
 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719
+<<<<<<< HEAD
 #: libraries/common.lib.php:1344 libraries/common.lib.php:2301
 #: libraries/display_change_password.lib.php:82
 #: libraries/display_create_table.lib.php:62
+=======
+#: libraries/common.lib.php:1335 libraries/common.lib.php:2288
+#: libraries/display_change_password.lib.php:82
+#: libraries/display_create_table.lib.php:63
+>>>>>>> origin/master
 #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532
 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76
 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104
+<<<<<<< HEAD
 #: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480
 #: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782
+=======
+#: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477
+#: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782
+>>>>>>> origin/master
 #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328
 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142
 #: server_privileges.php:665 server_privileges.php:1641
@@ -66,8 +81,13 @@ msgstr "Søg"
 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171
 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265
 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561
+<<<<<<< HEAD
 #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560
 #: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512
+=======
+#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562
+#: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512
+>>>>>>> origin/master
 #: view_create.php:182 view_operations.php:101
 msgid "Go"
 msgstr "Udfør"
@@ -120,10 +140,17 @@ msgstr "Kolonnenavne"
 #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245
 #: libraries/export/latex.php:360 libraries/export/odt.php:297
 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100
+<<<<<<< HEAD
 #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093
 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
 #: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321
+=======
+#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070
+#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
+#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
+#: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321
+>>>>>>> origin/master
 msgid "Type"
 msgstr "Datatype"
 
@@ -164,9 +191,15 @@ msgstr "Kommentarer"
 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322
 #: libraries/export/latex.php:430 libraries/export/odt.php:368
 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263
+<<<<<<< HEAD
 #: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596
 #: server_privileges.php:1911 server_privileges.php:1916
 #: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228
+=======
+#: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579
+#: server_privileges.php:1889 server_privileges.php:1894
+#: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228
+>>>>>>> origin/master
 #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342
 msgid "No"
 msgstr "Nej"
@@ -180,9 +213,15 @@ msgstr "Nej"
 #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106
 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262
 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344
+<<<<<<< HEAD
 #: server_databases.php:64 server_privileges.php:1582
 #: server_privileges.php:1596 server_privileges.php:1911
 #: server_privileges.php:1914 server_privileges.php:2210 sql.php:193
+=======
+#: server_databases.php:64 server_privileges.php:1565
+#: server_privileges.php:1579 server_privileges.php:1889
+#: server_privileges.php:1892 server_privileges.php:2187 sql.php:193
+>>>>>>> origin/master
 #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350
 #: tbl_tracking.php:335 tbl_tracking.php:340
 msgid "Yes"
@@ -231,7 +270,15 @@ msgstr "Omdøb database til"
 msgid "Command"
 msgstr "Kommando"
 
+<<<<<<< HEAD
 #: db_operations.php:466
+=======
+#: db_operations.php:429 tbl_change.php:1140
+msgid "and then"
+msgstr "og derefter"
+
+#: db_operations.php:455
+>>>>>>> origin/master
 msgid "Copy database to"
 msgstr "Kopiér database til"
 
@@ -319,7 +366,11 @@ msgstr ""
 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730
 #: server_collations.php:54 server_collations.php:66 server_databases.php:111
 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179
+<<<<<<< HEAD
 #: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326
+=======
+#: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326
+>>>>>>> origin/master
 msgid "Collation"
 msgstr "Kollation (Collation)"
 
@@ -348,7 +399,11 @@ msgstr "Tabel"
 #: db_printview.php:105 libraries/db_structure.lib.php:56
 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146
 #: navigation.php:638 navigation.php:660 server_databases.php:122
+<<<<<<< HEAD
 #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775
+=======
+#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777
+>>>>>>> origin/master
 msgid "Rows"
 msgstr "Rækker"
 
@@ -363,19 +418,31 @@ msgstr "i brug"
 
 #: db_printview.php:187 libraries/db_info.inc.php:88
 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433
+<<<<<<< HEAD
 #: tbl_structure.php:807
+=======
+#: tbl_structure.php:809
+>>>>>>> origin/master
 msgid "Creation"
 msgstr "Oprettelse"
 
 #: db_printview.php:196 libraries/db_info.inc.php:93
 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443
+<<<<<<< HEAD
 #: tbl_structure.php:815
+=======
+#: tbl_structure.php:817
+>>>>>>> origin/master
 msgid "Last update"
 msgstr "Sidste opdatering"
 
 #: db_printview.php:205 libraries/db_info.inc.php:98
 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453
+<<<<<<< HEAD
 #: tbl_structure.php:823
+=======
+#: tbl_structure.php:825
+>>>>>>> origin/master
 msgid "Last check"
 msgstr "Sidste check"
 
@@ -440,7 +507,11 @@ msgstr "Del (Slet)"
 
 #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553
 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779
+<<<<<<< HEAD
 #: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250
+=======
+#: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250
+>>>>>>> origin/master
 #: tbl_select.php:286
 msgid "Or"
 msgstr "Eller"
@@ -658,9 +729,15 @@ msgstr "Med det markerede:"
 msgid "Check All"
 msgstr "Afmærk alt"
 
+<<<<<<< HEAD
 #: db_structure.php:529 libraries/display_tbl.lib.php:2077
 #: libraries/replication_gui.lib.php:36 server_databases.php:350
 #: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460
+=======
+#: db_structure.php:531 libraries/display_tbl.lib.php:2077
+#: libraries/replication_gui.lib.php:36 server_databases.php:350
+#: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462
+>>>>>>> origin/master
 msgid "Uncheck All"
 msgstr "Fjern alle mærker"
 
@@ -1127,10 +1204,17 @@ msgid "Prev"
 msgstr "Forrige"
 
 #. l10n: Display text for next month link in calendar
+<<<<<<< HEAD
 #: js/messages.php:106 libraries/common.lib.php:2366
 #: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338
 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
 #: tbl_structure.php:799
+=======
+#: js/messages.php:77 libraries/common.lib.php:2353
+#: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338
+#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
+#: tbl_structure.php:801
+>>>>>>> origin/master
 msgid "Next"
 msgstr "Næste"
 
@@ -1674,7 +1758,11 @@ msgstr "Kodeord:"
 msgid "Server Choice"
 msgstr "Server valg"
 
+<<<<<<< HEAD
 #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63
+=======
+#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59
+>>>>>>> origin/master
 msgid "Cookies must be enabled past this point."
 msgstr "Herefter skal cookies være slået til."
 
@@ -1755,7 +1843,11 @@ msgstr ""
 "Kan ikke bruge iconv ejheller libiconv eller recode_string funktionen omend "
 "udvidelsen ser ud til at være indlæst. Check din PHP-konfiguration."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:580
+=======
+#: libraries/common.inc.php:576
+>>>>>>> origin/master
 msgid ""
 "phpMyAdmin was unable to read your configuration file!<br />This might "
 "happen if PHP finds a parse error in it or PHP cannot find the file.<br /"
@@ -1770,13 +1862,21 @@ msgstr ""
 "fejlmeddelelse(r) du får. I de fleste tilfælde mangler der et anførselstegn "
 "eller et semikolon et sted.<br />Hvis du får en blank side, er alt i orden."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:591
+=======
+#: libraries/common.inc.php:587
+>>>>>>> origin/master
 #, fuzzy, php-format
 #| msgid "Could not load default configuration from: \"%1$s\""
 msgid "Could not load default configuration from: %1$s"
 msgstr "Kunne ikke indlæse standardkonfiguration fra: \"%1$s\""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:596
+=======
+#: libraries/common.inc.php:592
+>>>>>>> origin/master
 msgid ""
 "The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
 "configuration file!"
@@ -1784,29 +1884,49 @@ msgstr ""
 "<tt>$cfg['PmaAbsoluteUri']</tt> direktivet SKAL være sat i din "
 "konfigurationsfil!"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:626
+=======
+#: libraries/common.inc.php:622
+>>>>>>> origin/master
 #, fuzzy, php-format
 #| msgid "Invalid server index: \"%s\""
 msgid "Invalid server index: %s"
 msgstr "Ugyldigt server indeks: \"%s\""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:633
+=======
+#: libraries/common.inc.php:629
+>>>>>>> origin/master
 #, php-format
 msgid "Invalid hostname for server %1$s. Please review your configuration."
 msgstr ""
 "Ugyldigt hostnavn for server %1$s. Gennemgå venligst din konfiguration."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:642 libraries/header.inc.php:100
+=======
+#: libraries/common.inc.php:638 libraries/header.inc.php:96
+>>>>>>> origin/master
 #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47
 #: main.php:185 test/theme.php:57
 msgid "Server"
 msgstr "Server"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:820
 msgid "Invalid authentication method set in configuration:"
 msgstr "Ugyldig autorisationsmetode sat i konfiguration:"
 
 #: libraries/common.inc.php:923
+=======
+#: libraries/common.inc.php:816
+msgid "Invalid authentication method set in configuration:"
+msgstr "Ugyldig autorisationsmetode sat i konfiguration:"
+
+#: libraries/common.inc.php:919
+>>>>>>> origin/master
 #, php-format
 msgid "You should upgrade to %s %s or later."
 msgstr "Du burde opdatere til %s %s eller senere."
@@ -2053,7 +2173,11 @@ msgid ""
 msgstr "Kan være anslået. Se FAQ 3.11"
 
 #: libraries/db_structure.lib.php:69 server_databases.php:142
+<<<<<<< HEAD
 #: tbl_printview.php:335 tbl_structure.php:680
+=======
+#: tbl_printview.php:335 tbl_structure.php:682
+>>>>>>> origin/master
 msgid "Overhead"
 msgstr "Overhead"
 
@@ -2081,22 +2205,36 @@ msgid "Change password"
 msgstr "Ændre kodeord"
 
 #: libraries/display_change_password.lib.php:35
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:348 server_privileges.php:808
+=======
+#: libraries/replication_gui.lib.php:348 server_privileges.php:807
+>>>>>>> origin/master
 msgid "No Password"
 msgstr "Intet kodeord"
 
 #: libraries/display_change_password.lib.php:41
 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63
 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:352 server_privileges.php:797
 #: server_privileges.php:801 server_privileges.php:812
 #: server_privileges.php:1555 server_synchronize.php:1175
+=======
+#: libraries/replication_gui.lib.php:352 server_privileges.php:796
+#: server_privileges.php:800 server_privileges.php:811
+#: server_privileges.php:1538 server_synchronize.php:1175
+>>>>>>> origin/master
 msgid "Password"
 msgstr "Kodeord"
 
 #: libraries/display_change_password.lib.php:46
 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359
+<<<<<<< HEAD
 #: server_privileges.php:816 server_privileges.php:819
+=======
+#: server_privileges.php:815 server_privileges.php:818
+>>>>>>> origin/master
 msgid "Re-type"
 msgstr "Skriv igen"
 
@@ -2111,12 +2249,20 @@ msgid "MySQL 4.0 compatible"
 msgstr "MySQL&nbsp;4.0 kompatibel"
 
 #: libraries/display_change_password.lib.php:72
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:363 server_privileges.php:823
+=======
+#: libraries/replication_gui.lib.php:363 server_privileges.php:822
+>>>>>>> origin/master
 msgid "Generate Password"
 msgstr "Generér Kodeord"
 
 #: libraries/display_change_password.lib.php:75
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:366 server_privileges.php:826
+=======
+#: libraries/replication_gui.lib.php:366 server_privileges.php:825
+>>>>>>> origin/master
 msgid "Generate"
 msgstr "Generér"
 
@@ -2204,7 +2350,11 @@ msgid "remember template"
 msgstr "husk skabelonen"
 
 #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552
+=======
+#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549
+>>>>>>> origin/master
 msgid "Character set of the file:"
 msgstr "Tegnsæt for filen:"
 
@@ -2257,7 +2407,11 @@ msgstr ""
 msgid "File to import"
 msgstr "Fil til import"
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527
+=======
+#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524
+>>>>>>> origin/master
 msgid "Location of the text file"
 msgstr "Tekstfilens placering"
 
@@ -2265,12 +2419,20 @@ msgstr "Tekstfilens placering"
 msgid "File uploads are not allowed on this server."
 msgstr "Fil-uploads er ikke tilladte på denne server."
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536
+=======
+#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533
+>>>>>>> origin/master
 #: tbl_change.php:1025
 msgid "The directory you set for upload work cannot be reached"
 msgstr "Mappen du har sat til upload-arbejde kan ikke findes"
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539
+=======
+#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536
+>>>>>>> origin/master
 #: tbl_change.php:1028
 msgid "web server upload directory"
 msgstr "webserver upload-mappe"
@@ -2406,7 +2568,11 @@ msgstr "Sorteringsnøgle"
 #: libraries/import/docsql.php:34 libraries/import/ldi.php:47
 #: libraries/import/ods.php:30 libraries/import/sql.php:20
 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26
+<<<<<<< HEAD
 #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751
+=======
+#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753
+>>>>>>> origin/master
 msgid "Options"
 msgstr "Indstillinger"
 
@@ -2553,7 +2719,11 @@ msgstr "Buffer Pool Forbrug"
 
 #: libraries/engines/innodb.lib.php:194 server_databases.php:137
 #: server_databases.php:305 server_status.php:525 server_status.php:586
+<<<<<<< HEAD
 #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694
+=======
+#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696
+>>>>>>> origin/master
 msgid "Total"
 msgstr "Total"
 
@@ -2812,7 +2982,11 @@ msgid ""
 msgstr ""
 
 #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88
+<<<<<<< HEAD
 #: tbl_printview.php:375 tbl_structure.php:735
+=======
+#: tbl_printview.php:375 tbl_structure.php:737
+>>>>>>> origin/master
 msgid "Format"
 msgstr "Format"
 
@@ -2884,8 +3058,13 @@ msgstr "Microsoft Word 2000"
 #: libraries/export/latex.php:201 libraries/export/odt.php:48
 #: libraries/export/sql.php:106 libraries/export/sql.php:868
 #: libraries/export/texytext.php:27 server_databases.php:127
+<<<<<<< HEAD
 #: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316
 #: tbl_structure.php:663
+=======
+#: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316
+#: tbl_structure.php:665
+>>>>>>> origin/master
 msgid "Data"
 msgstr "Data"
 
@@ -2934,9 +3113,15 @@ msgstr "MIME-type"
 #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57
 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177
 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:332 server_privileges.php:732
 #: server_privileges.php:735 server_privileges.php:791
 #: server_privileges.php:1554 server_privileges.php:2092
+=======
+#: libraries/replication_gui.lib.php:332 server_privileges.php:731
+#: server_privileges.php:734 server_privileges.php:790
+#: server_privileges.php:1537 server_privileges.php:2069
+>>>>>>> origin/master
 #: server_processlist.php:55 server_synchronize.php:1159
 msgid "Host"
 msgstr "Vært"
@@ -3601,8 +3786,13 @@ msgstr ""
 
 #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59
 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:262 server_privileges.php:712
 #: server_privileges.php:715 server_privileges.php:722
+=======
+#: libraries/replication_gui.lib.php:262 server_privileges.php:711
+#: server_privileges.php:714 server_privileges.php:721
+>>>>>>> origin/master
 #: server_synchronize.php:1171
 msgid "User name"
 msgstr "Brugernavn"
@@ -3619,14 +3809,22 @@ msgstr ""
 msgid "Slave status"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448
+=======
+#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445
+>>>>>>> origin/master
 #: server_status.php:737 server_variables.php:52
 msgid "Variable"
 msgstr "Variabel"
 
 #: libraries/replication_gui.lib.php:118 server_status.php:738
 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138
+<<<<<<< HEAD
 #: tbl_structure.php:727
+=======
+#: tbl_structure.php:729
+>>>>>>> origin/master
 msgid "Value"
 msgstr "Værdi"
 
@@ -3644,11 +3842,16 @@ msgstr ""
 msgid "Add slave replication user"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:257 server_privileges.php:717
+=======
+#: libraries/replication_gui.lib.php:257 server_privileges.php:716
+>>>>>>> origin/master
 msgid "Any user"
 msgstr "Enhver bruger"
 
 #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:349 server_privileges.php:718
 #: server_privileges.php:785 server_privileges.php:809
 #: server_privileges.php:1950 server_privileges.php:1980
@@ -3672,6 +3875,31 @@ msgid "Use Host Table"
 msgstr "Brug Host Tabel"
 
 #: libraries/replication_gui.lib.php:334 server_privileges.php:793
+=======
+#: libraries/replication_gui.lib.php:349 server_privileges.php:717
+#: server_privileges.php:784 server_privileges.php:808
+#: server_privileges.php:1928 server_privileges.php:1958
+msgid "Use text field"
+msgstr "Brug tekstfelt"
+
+#: libraries/replication_gui.lib.php:305 server_privileges.php:764
+msgid "Any host"
+msgstr "Enhver vært"
+
+#: libraries/replication_gui.lib.php:309 server_privileges.php:768
+msgid "Local"
+msgstr "Lokal"
+
+#: libraries/replication_gui.lib.php:315 server_privileges.php:773
+msgid "This Host"
+msgstr "Denne Host"
+
+#: libraries/replication_gui.lib.php:321 server_privileges.php:779
+msgid "Use Host Table"
+msgstr "Brug Host Tabel"
+
+#: libraries/replication_gui.lib.php:334 server_privileges.php:792
+>>>>>>> origin/master
 msgid ""
 "When Host table is used, this field is ignored and values stored in Host "
 "table are used instead."
@@ -7846,10 +8074,13 @@ msgstr ""
 msgid "Show insert query"
 msgstr ""
 
+<<<<<<< HEAD
 #: tbl_change.php:1140
 msgid "and then"
 msgstr "og derefter"
 
+=======
+>>>>>>> origin/master
 #: tbl_change.php:1144
 msgid "Go back to previous page"
 msgstr "Tilbage til foregående side"
@@ -8045,6 +8276,7 @@ msgstr "Check reference-integriteten"
 msgid "Show tables"
 msgstr "Vis tabeller"
 
+<<<<<<< HEAD
 #: tbl_printview.php:309 tbl_structure.php:654
 msgid "Space usage"
 msgstr "Pladsforbrug"
@@ -8078,6 +8310,41 @@ msgid "Row length"
 msgstr "Rækkelængde"
 
 #: tbl_printview.php:413 tbl_structure.php:791
+=======
+#: tbl_printview.php:309 tbl_structure.php:656
+msgid "Space usage"
+msgstr "Pladsforbrug"
+
+#: tbl_printview.php:313 tbl_structure.php:660
+msgid "Usage"
+msgstr "Benyttelse"
+
+#: tbl_printview.php:340 tbl_structure.php:687
+msgid "Effective"
+msgstr "Effektiv"
+
+#: tbl_printview.php:365 tbl_structure.php:725
+msgid "Row Statistics"
+msgstr "Række-statistik"
+
+#: tbl_printview.php:368 tbl_structure.php:728
+msgid "Statements"
+msgstr "Erklæringer"
+
+#: tbl_printview.php:379 tbl_structure.php:740
+msgid "static"
+msgstr ""
+
+#: tbl_printview.php:381 tbl_structure.php:742
+msgid "dynamic"
+msgstr "dynamisk"
+
+#: tbl_printview.php:403 tbl_structure.php:785
+msgid "Row length"
+msgstr "Rækkelængde"
+
+#: tbl_printview.php:413 tbl_structure.php:793
+>>>>>>> origin/master
 msgid " Row size "
 msgstr " Rækkestørrelse "
 
diff --git a/po/de.po b/po/de.po
index 56a1cd5e1..c085c08da 100755
--- a/po/de.po
+++ b/po/de.po
@@ -3,7 +3,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2010-07-03 21:45+0530\n"
+=======
+"POT-Creation-Date: 2010-07-03 09:00-0400\n"
+>>>>>>> origin/master
 "PO-Revision-Date: 2010-06-03 21:04+0200\n"
 "Last-Translator:  <canin@in.com>\n"
 "Language-Team: german <de@li.org>\n"
@@ -49,15 +53,26 @@ msgstr "Suche"
 #: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046
 #: libraries/Theme_Manager.class.php:311
 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719
+<<<<<<< HEAD
 #: libraries/common.lib.php:1344 libraries/common.lib.php:2301
 #: libraries/display_change_password.lib.php:82
 #: libraries/display_create_table.lib.php:62
+=======
+#: libraries/common.lib.php:1335 libraries/common.lib.php:2288
+#: libraries/display_change_password.lib.php:82
+#: libraries/display_create_table.lib.php:63
+>>>>>>> origin/master
 #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532
 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76
 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104
+<<<<<<< HEAD
 #: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480
 #: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782
+=======
+#: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477
+#: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782
+>>>>>>> origin/master
 #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328
 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142
 #: server_privileges.php:665 server_privileges.php:1641
@@ -67,8 +82,13 @@ msgstr "Suche"
 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171
 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265
 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561
+<<<<<<< HEAD
 #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560
 #: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512
+=======
+#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562
+#: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512
+>>>>>>> origin/master
 #: view_create.php:182 view_operations.php:101
 msgid "Go"
 msgstr "OK"
@@ -121,10 +141,17 @@ msgstr "Spaltennamen"
 #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245
 #: libraries/export/latex.php:360 libraries/export/odt.php:297
 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100
+<<<<<<< HEAD
 #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093
 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
 #: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321
+=======
+#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070
+#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
+#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
+#: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321
+>>>>>>> origin/master
 msgid "Type"
 msgstr "Typ"
 
@@ -165,9 +192,15 @@ msgstr "Kommentare"
 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322
 #: libraries/export/latex.php:430 libraries/export/odt.php:368
 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263
+<<<<<<< HEAD
 #: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596
 #: server_privileges.php:1911 server_privileges.php:1916
 #: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228
+=======
+#: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579
+#: server_privileges.php:1889 server_privileges.php:1894
+#: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228
+>>>>>>> origin/master
 #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342
 msgid "No"
 msgstr "Nein"
@@ -181,9 +214,15 @@ msgstr "Nein"
 #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106
 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262
 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344
+<<<<<<< HEAD
 #: server_databases.php:64 server_privileges.php:1582
 #: server_privileges.php:1596 server_privileges.php:1911
 #: server_privileges.php:1914 server_privileges.php:2210 sql.php:193
+=======
+#: server_databases.php:64 server_privileges.php:1565
+#: server_privileges.php:1579 server_privileges.php:1889
+#: server_privileges.php:1892 server_privileges.php:2187 sql.php:193
+>>>>>>> origin/master
 #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350
 #: tbl_tracking.php:335 tbl_tracking.php:340
 msgid "Yes"
@@ -232,7 +271,15 @@ msgstr "Datenbank umbenennen in"
 msgid "Command"
 msgstr "Befehl"
 
+<<<<<<< HEAD
 #: db_operations.php:466
+=======
+#: db_operations.php:429 tbl_change.php:1140
+msgid "and then"
+msgstr "und dann"
+
+#: db_operations.php:455
+>>>>>>> origin/master
 msgid "Copy database to"
 msgstr "Datenbank kopieren nach"
 
@@ -314,7 +361,11 @@ msgstr "Aktivieren"
 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730
 #: server_collations.php:54 server_collations.php:66 server_databases.php:111
 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179
+<<<<<<< HEAD
 #: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326
+=======
+#: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326
+>>>>>>> origin/master
 msgid "Collation"
 msgstr "Kollation"
 
@@ -343,7 +394,11 @@ msgstr "Tabelle"
 #: db_printview.php:105 libraries/db_structure.lib.php:56
 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146
 #: navigation.php:638 navigation.php:660 server_databases.php:122
+<<<<<<< HEAD
 #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775
+=======
+#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777
+>>>>>>> origin/master
 msgid "Rows"
 msgstr "Zeilen"
 
@@ -358,19 +413,31 @@ msgstr "in Benutzung"
 
 #: db_printview.php:187 libraries/db_info.inc.php:88
 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433
+<<<<<<< HEAD
 #: tbl_structure.php:807
+=======
+#: tbl_structure.php:809
+>>>>>>> origin/master
 msgid "Creation"
 msgstr "Erzeugt am"
 
 #: db_printview.php:196 libraries/db_info.inc.php:93
 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443
+<<<<<<< HEAD
 #: tbl_structure.php:815
+=======
+#: tbl_structure.php:817
+>>>>>>> origin/master
 msgid "Last update"
 msgstr "Aktualisiert am"
 
 #: db_printview.php:205 libraries/db_info.inc.php:98
 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453
+<<<<<<< HEAD
 #: tbl_structure.php:823
+=======
+#: tbl_structure.php:825
+>>>>>>> origin/master
 msgid "Last check"
 msgstr "Letzter Check am"
 
@@ -434,7 +501,11 @@ msgstr "Entf."
 
 #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553
 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779
+<<<<<<< HEAD
 #: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250
+=======
+#: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250
+>>>>>>> origin/master
 #: tbl_select.php:286
 msgid "Or"
 msgstr "oder"
@@ -652,9 +723,15 @@ msgstr "markierte:"
 msgid "Check All"
 msgstr "Alle auswählen"
 
+<<<<<<< HEAD
 #: db_structure.php:529 libraries/display_tbl.lib.php:2077
 #: libraries/replication_gui.lib.php:36 server_databases.php:350
 #: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460
+=======
+#: db_structure.php:531 libraries/display_tbl.lib.php:2077
+#: libraries/replication_gui.lib.php:36 server_databases.php:350
+#: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462
+>>>>>>> origin/master
 msgid "Uncheck All"
 msgstr "Auswahl entfernen"
 
@@ -1116,10 +1193,17 @@ msgid "Prev"
 msgstr "Vorherige"
 
 #. l10n: Display text for next month link in calendar
+<<<<<<< HEAD
 #: js/messages.php:106 libraries/common.lib.php:2366
 #: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338
 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
 #: tbl_structure.php:799
+=======
+#: js/messages.php:77 libraries/common.lib.php:2353
+#: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338
+#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
+#: tbl_structure.php:801
+>>>>>>> origin/master
 msgid "Next"
 msgstr "Nächste"
 
@@ -1626,7 +1710,11 @@ msgstr "Passwort:"
 msgid "Server Choice"
 msgstr "Server Auswählen"
 
+<<<<<<< HEAD
 #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63
+=======
+#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59
+>>>>>>> origin/master
 msgid "Cookies must be enabled past this point."
 msgstr "Ab diesem Punkt müssen Cookies aktiviert sein."
 
@@ -1712,7 +1800,11 @@ msgstr ""
 "werden, obwohl die benötigten php-Erweiterungen angeblich geladen wurden. "
 "Bitte überprüfen Sie Ihre PHP-Konfiguration."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:580
+=======
+#: libraries/common.inc.php:576
+>>>>>>> origin/master
 msgid ""
 "phpMyAdmin was unable to read your configuration file!<br />This might "
 "happen if PHP finds a parse error in it or PHP cannot find the file.<br /"
@@ -1728,12 +1820,20 @@ msgstr ""
 "Meistens fehlt bloß irgendwo ein Anführungszeichen oder Semikolon.<br />Wenn "
 "Sie eine leere Seite erhalten, ist Ihre Konfigurationsdatei in Ordnung."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:591
+=======
+#: libraries/common.inc.php:587
+>>>>>>> origin/master
 #, php-format
 msgid "Could not load default configuration from: %1$s"
 msgstr "Fehler beim Laden der Standard-Konfiguration von: %1$s"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:596
+=======
+#: libraries/common.inc.php:592
+>>>>>>> origin/master
 msgid ""
 "The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
 "configuration file!"
@@ -1741,29 +1841,49 @@ msgstr ""
 "Das <tt>$cfg['PmaAbsoluteUri']</tt>-Verzeichnis MUSS in Ihrer "
 "Konfigurationsdatei angegeben werden!"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:626
+=======
+#: libraries/common.inc.php:622
+>>>>>>> origin/master
 #, php-format
 msgid "Invalid server index: %s"
 msgstr "Ungültige Server-Nummer: %s"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:633
+=======
+#: libraries/common.inc.php:629
+>>>>>>> origin/master
 #, php-format
 msgid "Invalid hostname for server %1$s. Please review your configuration."
 msgstr ""
 "Ungültiger Host-Name für Server %1$s. Bitte überprüfen Sie Ihre "
 "Konfiguration."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:642 libraries/header.inc.php:100
+=======
+#: libraries/common.inc.php:638 libraries/header.inc.php:96
+>>>>>>> origin/master
 #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47
 #: main.php:185 test/theme.php:57
 msgid "Server"
 msgstr "Server"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:820
 msgid "Invalid authentication method set in configuration:"
 msgstr "Ungültige Authentifikationsmethode:"
 
 #: libraries/common.inc.php:923
+=======
+#: libraries/common.inc.php:816
+msgid "Invalid authentication method set in configuration:"
+msgstr "Ungültige Authentifikationsmethode:"
+
+#: libraries/common.inc.php:919
+>>>>>>> origin/master
 #, php-format
 msgid "You should upgrade to %s %s or later."
 msgstr "Sie sollten auf %s %s oder neuer umsteigen."
@@ -2011,7 +2131,11 @@ msgstr ""
 "Es kann sich hierbei um Näherungswerte handeln. Bitte lesen Sie auch FAQ 3.11"
 
 #: libraries/db_structure.lib.php:69 server_databases.php:142
+<<<<<<< HEAD
 #: tbl_printview.php:335 tbl_structure.php:680
+=======
+#: tbl_printview.php:335 tbl_structure.php:682
+>>>>>>> origin/master
 msgid "Overhead"
 msgstr "Überhang"
 
@@ -2042,22 +2166,36 @@ msgid "Change password"
 msgstr "Passwort ändern"
 
 #: libraries/display_change_password.lib.php:35
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:348 server_privileges.php:808
+=======
+#: libraries/replication_gui.lib.php:348 server_privileges.php:807
+>>>>>>> origin/master
 msgid "No Password"
 msgstr "Kein Passwort"
 
 #: libraries/display_change_password.lib.php:41
 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63
 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:352 server_privileges.php:797
 #: server_privileges.php:801 server_privileges.php:812
 #: server_privileges.php:1555 server_synchronize.php:1175
+=======
+#: libraries/replication_gui.lib.php:352 server_privileges.php:796
+#: server_privileges.php:800 server_privileges.php:811
+#: server_privileges.php:1538 server_synchronize.php:1175
+>>>>>>> origin/master
 msgid "Password"
 msgstr "Passwort"
 
 #: libraries/display_change_password.lib.php:46
 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359
+<<<<<<< HEAD
 #: server_privileges.php:816 server_privileges.php:819
+=======
+#: server_privileges.php:815 server_privileges.php:818
+>>>>>>> origin/master
 msgid "Re-type"
 msgstr "Wiederholen"
 
@@ -2070,12 +2208,20 @@ msgid "MySQL 4.0 compatible"
 msgstr "MySQL&nbsp;4.0 kompatibel"
 
 #: libraries/display_change_password.lib.php:72
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:363 server_privileges.php:823
+=======
+#: libraries/replication_gui.lib.php:363 server_privileges.php:822
+>>>>>>> origin/master
 msgid "Generate Password"
 msgstr "Passwort generieren"
 
 #: libraries/display_change_password.lib.php:75
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:366 server_privileges.php:826
+=======
+#: libraries/replication_gui.lib.php:366 server_privileges.php:825
+>>>>>>> origin/master
 msgid "Generate"
 msgstr "Generieren"
 
@@ -2164,7 +2310,11 @@ msgid "remember template"
 msgstr "Konvention merken"
 
 #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552
+=======
+#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549
+>>>>>>> origin/master
 msgid "Character set of the file:"
 msgstr "Zeichencodierung der Datei:"
 
@@ -2223,7 +2373,11 @@ msgstr ""
 msgid "File to import"
 msgstr "Zu importierende Datei"
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527
+=======
+#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524
+>>>>>>> origin/master
 msgid "Location of the text file"
 msgstr "Datei"
 
@@ -2231,12 +2385,20 @@ msgstr "Datei"
 msgid "File uploads are not allowed on this server."
 msgstr "Das hochladen von Dateien ist auf diesem Server nicht erlaubt."
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536
+=======
+#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533
+>>>>>>> origin/master
 #: tbl_change.php:1025
 msgid "The directory you set for upload work cannot be reached"
 msgstr "Auf das festgelegte Upload-Verzeichnis kann nicht zugegriffen werden."
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539
+=======
+#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536
+>>>>>>> origin/master
 #: tbl_change.php:1028
 msgid "web server upload directory"
 msgstr "Upload-Verzeichnis auf dem Webserver"
@@ -2372,7 +2534,11 @@ msgstr "Nach Schlüssel sortieren"
 #: libraries/import/docsql.php:34 libraries/import/ldi.php:47
 #: libraries/import/ods.php:30 libraries/import/sql.php:20
 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26
+<<<<<<< HEAD
 #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751
+=======
+#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753
+>>>>>>> origin/master
 msgid "Options"
 msgstr "Optionen"
 
@@ -2520,7 +2686,11 @@ msgstr "Auslastung des Puffer-Pools"
 
 #: libraries/engines/innodb.lib.php:194 server_databases.php:137
 #: server_databases.php:305 server_status.php:525 server_status.php:586
+<<<<<<< HEAD
 #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694
+=======
+#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696
+>>>>>>> origin/master
 msgid "Total"
 msgstr "Insgesamt"
 
@@ -2804,7 +2974,11 @@ msgstr ""
 "ansonsten werden sie umbenannt und bekommen die nächsthöhere Nummer."
 
 #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88
+<<<<<<< HEAD
 #: tbl_printview.php:375 tbl_structure.php:735
+=======
+#: tbl_printview.php:375 tbl_structure.php:737
+>>>>>>> origin/master
 msgid "Format"
 msgstr "Format"
 
@@ -2876,8 +3050,13 @@ msgstr "Microsoft Word 2000"
 #: libraries/export/latex.php:201 libraries/export/odt.php:48
 #: libraries/export/sql.php:106 libraries/export/sql.php:868
 #: libraries/export/texytext.php:27 server_databases.php:127
+<<<<<<< HEAD
 #: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316
 #: tbl_structure.php:663
+=======
+#: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316
+#: tbl_structure.php:665
+>>>>>>> origin/master
 msgid "Data"
 msgstr "Daten"
 
@@ -2926,9 +3105,15 @@ msgstr "MIME-Typ"
 #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57
 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177
 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:332 server_privileges.php:732
 #: server_privileges.php:735 server_privileges.php:791
 #: server_privileges.php:1554 server_privileges.php:2092
+=======
+#: libraries/replication_gui.lib.php:332 server_privileges.php:731
+#: server_privileges.php:734 server_privileges.php:790
+#: server_privileges.php:1537 server_privileges.php:2069
+>>>>>>> origin/master
 #: server_processlist.php:55 server_synchronize.php:1159
 msgid "Host"
 msgstr "Host"
@@ -3606,8 +3791,13 @@ msgstr ""
 
 #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59
 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:262 server_privileges.php:712
 #: server_privileges.php:715 server_privileges.php:722
+=======
+#: libraries/replication_gui.lib.php:262 server_privileges.php:711
+#: server_privileges.php:714 server_privileges.php:721
+>>>>>>> origin/master
 #: server_synchronize.php:1171
 msgid "User name"
 msgstr "Benutzername"
@@ -3624,14 +3814,22 @@ msgstr "Master-Status"
 msgid "Slave status"
 msgstr "Slave-Status"
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448
+=======
+#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445
+>>>>>>> origin/master
 #: server_status.php:737 server_variables.php:52
 msgid "Variable"
 msgstr "Variable"
 
 #: libraries/replication_gui.lib.php:118 server_status.php:738
 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138
+<<<<<<< HEAD
 #: tbl_structure.php:727
+=======
+#: tbl_structure.php:729
+>>>>>>> origin/master
 msgid "Value"
 msgstr "Wert"
 
@@ -3651,11 +3849,16 @@ msgstr ""
 msgid "Add slave replication user"
 msgstr "Benutzer für den Replication-Slave hinzufügen"
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:257 server_privileges.php:717
+=======
+#: libraries/replication_gui.lib.php:257 server_privileges.php:716
+>>>>>>> origin/master
 msgid "Any user"
 msgstr "Jeder Benutzer"
 
 #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:349 server_privileges.php:718
 #: server_privileges.php:785 server_privileges.php:809
 #: server_privileges.php:1950 server_privileges.php:1980
@@ -3679,6 +3882,31 @@ msgid "Use Host Table"
 msgstr "Verwende Hosttabelle"
 
 #: libraries/replication_gui.lib.php:334 server_privileges.php:793
+=======
+#: libraries/replication_gui.lib.php:349 server_privileges.php:717
+#: server_privileges.php:784 server_privileges.php:808
+#: server_privileges.php:1928 server_privileges.php:1958
+msgid "Use text field"
+msgstr "Textfeld verwenden"
+
+#: libraries/replication_gui.lib.php:305 server_privileges.php:764
+msgid "Any host"
+msgstr "Jeder Host"
+
+#: libraries/replication_gui.lib.php:309 server_privileges.php:768
+msgid "Local"
+msgstr "Lokal"
+
+#: libraries/replication_gui.lib.php:315 server_privileges.php:773
+msgid "This Host"
+msgstr "Dieser Host"
+
+#: libraries/replication_gui.lib.php:321 server_privileges.php:779
+msgid "Use Host Table"
+msgstr "Verwende Hosttabelle"
+
+#: libraries/replication_gui.lib.php:334 server_privileges.php:792
+>>>>>>> origin/master
 msgid ""
 "When Host table is used, this field is ignored and values stored in Host "
 "table are used instead."
@@ -8150,10 +8378,13 @@ msgstr "Als neue Zeile einfügen und Fehler ignorieren"
 msgid "Show insert query"
 msgstr "Zeige insert  Abfrage"
 
+<<<<<<< HEAD
 #: tbl_change.php:1140
 msgid "and then"
 msgstr "und dann"
 
+=======
+>>>>>>> origin/master
 #: tbl_change.php:1144
 msgid "Go back to previous page"
 msgstr "zurück"
@@ -8347,6 +8578,7 @@ msgstr "Prüfe referentielle Integrität:"
 msgid "Show tables"
 msgstr "Tabellen anzeigen"
 
+<<<<<<< HEAD
 #: tbl_printview.php:309 tbl_structure.php:654
 msgid "Space usage"
 msgstr "Speicherplatzverbrauch"
@@ -8380,6 +8612,41 @@ msgid "Row length"
 msgstr "Zeilenlänge"
 
 #: tbl_printview.php:413 tbl_structure.php:791
+=======
+#: tbl_printview.php:309 tbl_structure.php:656
+msgid "Space usage"
+msgstr "Speicherplatzverbrauch"
+
+#: tbl_printview.php:313 tbl_structure.php:660
+msgid "Usage"
+msgstr "Verbrauch"
+
+#: tbl_printview.php:340 tbl_structure.php:687
+msgid "Effective"
+msgstr "Effektiv"
+
+#: tbl_printview.php:365 tbl_structure.php:725
+msgid "Row Statistics"
+msgstr "Zeilenstatistik"
+
+#: tbl_printview.php:368 tbl_structure.php:728
+msgid "Statements"
+msgstr "Angaben"
+
+#: tbl_printview.php:379 tbl_structure.php:740
+msgid "static"
+msgstr "statisch"
+
+#: tbl_printview.php:381 tbl_structure.php:742
+msgid "dynamic"
+msgstr "dynamisch"
+
+#: tbl_printview.php:403 tbl_structure.php:785
+msgid "Row length"
+msgstr "Zeilenlänge"
+
+#: tbl_printview.php:413 tbl_structure.php:793
+>>>>>>> origin/master
 msgid " Row size "
 msgstr "Zeilengröße"
 
diff --git a/po/el.po b/po/el.po
index 584387f10..934f084b5 100755
--- a/po/el.po
+++ b/po/el.po
@@ -3,7 +3,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2010-07-03 21:45+0530\n"
+=======
+"POT-Creation-Date: 2010-07-03 09:00-0400\n"
+>>>>>>> origin/master
 "PO-Revision-Date: 2010-03-30 23:16+0200\n"
 "Last-Translator: Michal <michal@cihar.com>\n"
 "Language-Team: greek <el@li.org>\n"
@@ -49,15 +53,26 @@ msgstr "Αναζήτηση"
 #: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046
 #: libraries/Theme_Manager.class.php:311
 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719
+<<<<<<< HEAD
 #: libraries/common.lib.php:1344 libraries/common.lib.php:2301
 #: libraries/display_change_password.lib.php:82
 #: libraries/display_create_table.lib.php:62
+=======
+#: libraries/common.lib.php:1335 libraries/common.lib.php:2288
+#: libraries/display_change_password.lib.php:82
+#: libraries/display_create_table.lib.php:63
+>>>>>>> origin/master
 #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532
 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76
 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104
+<<<<<<< HEAD
 #: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480
 #: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782
+=======
+#: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477
+#: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782
+>>>>>>> origin/master
 #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328
 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142
 #: server_privileges.php:665 server_privileges.php:1641
@@ -67,8 +82,13 @@ msgstr "Αναζήτηση"
 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171
 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265
 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561
+<<<<<<< HEAD
 #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560
 #: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512
+=======
+#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562
+#: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512
+>>>>>>> origin/master
 #: view_create.php:182 view_operations.php:101
 msgid "Go"
 msgstr "Εκτέλεση"
@@ -121,10 +141,17 @@ msgstr "Ονόματα στηλών"
 #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245
 #: libraries/export/latex.php:360 libraries/export/odt.php:297
 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100
+<<<<<<< HEAD
 #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093
 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
 #: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321
+=======
+#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070
+#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
+#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
+#: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321
+>>>>>>> origin/master
 msgid "Type"
 msgstr "Τύπος"
 
@@ -165,9 +192,15 @@ msgstr "Σχόλια"
 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322
 #: libraries/export/latex.php:430 libraries/export/odt.php:368
 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263
+<<<<<<< HEAD
 #: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596
 #: server_privileges.php:1911 server_privileges.php:1916
 #: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228
+=======
+#: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579
+#: server_privileges.php:1889 server_privileges.php:1894
+#: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228
+>>>>>>> origin/master
 #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342
 msgid "No"
 msgstr "Όχι"
@@ -181,9 +214,15 @@ msgstr "Όχι"
 #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106
 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262
 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344
+<<<<<<< HEAD
 #: server_databases.php:64 server_privileges.php:1582
 #: server_privileges.php:1596 server_privileges.php:1911
 #: server_privileges.php:1914 server_privileges.php:2210 sql.php:193
+=======
+#: server_databases.php:64 server_privileges.php:1565
+#: server_privileges.php:1579 server_privileges.php:1889
+#: server_privileges.php:1892 server_privileges.php:2187 sql.php:193
+>>>>>>> origin/master
 #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350
 #: tbl_tracking.php:335 tbl_tracking.php:340
 msgid "Yes"
@@ -232,7 +271,15 @@ msgstr "Μετονομασία βάσης δεδομένων σε"
 msgid "Command"
 msgstr "Εντολή"
 
+<<<<<<< HEAD
 #: db_operations.php:466
+=======
+#: db_operations.php:429 tbl_change.php:1140
+msgid "and then"
+msgstr "και μετά"
+
+#: db_operations.php:455
+>>>>>>> origin/master
 msgid "Copy database to"
 msgstr "Αντιγραφή βάσης δεδομένων σε"
 
@@ -317,7 +364,11 @@ msgstr "Ενεργοποίηση"
 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730
 #: server_collations.php:54 server_collations.php:66 server_databases.php:111
 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179
+<<<<<<< HEAD
 #: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326
+=======
+#: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326
+>>>>>>> origin/master
 msgid "Collation"
 msgstr "Σύνθεση"
 
@@ -346,7 +397,11 @@ msgstr "Πίνακας "
 #: db_printview.php:105 libraries/db_structure.lib.php:56
 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146
 #: navigation.php:638 navigation.php:660 server_databases.php:122
+<<<<<<< HEAD
 #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775
+=======
+#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777
+>>>>>>> origin/master
 msgid "Rows"
 msgstr "Εγγραφές"
 
@@ -361,19 +416,31 @@ msgstr "σε χρήση"
 
 #: db_printview.php:187 libraries/db_info.inc.php:88
 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433
+<<<<<<< HEAD
 #: tbl_structure.php:807
+=======
+#: tbl_structure.php:809
+>>>>>>> origin/master
 msgid "Creation"
 msgstr "Δημιουργία"
 
 #: db_printview.php:196 libraries/db_info.inc.php:93
 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443
+<<<<<<< HEAD
 #: tbl_structure.php:815
+=======
+#: tbl_structure.php:817
+>>>>>>> origin/master
 msgid "Last update"
 msgstr "Τελευταία ενημέρωση"
 
 #: db_printview.php:205 libraries/db_info.inc.php:98
 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453
+<<<<<<< HEAD
 #: tbl_structure.php:823
+=======
+#: tbl_structure.php:825
+>>>>>>> origin/master
 msgid "Last check"
 msgstr "τελευταίος έλεγχος"
 
@@ -438,7 +505,11 @@ msgstr "Διαγραφή"
 
 #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553
 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779
+<<<<<<< HEAD
 #: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250
+=======
+#: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250
+>>>>>>> origin/master
 #: tbl_select.php:286
 msgid "Or"
 msgstr "Ή"
@@ -659,9 +730,15 @@ msgstr "Με τους επιλεγμένους:"
 msgid "Check All"
 msgstr "Επιλογή όλων"
 
+<<<<<<< HEAD
 #: db_structure.php:529 libraries/display_tbl.lib.php:2077
 #: libraries/replication_gui.lib.php:36 server_databases.php:350
 #: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460
+=======
+#: db_structure.php:531 libraries/display_tbl.lib.php:2077
+#: libraries/replication_gui.lib.php:36 server_databases.php:350
+#: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462
+>>>>>>> origin/master
 msgid "Uncheck All"
 msgstr "Απεπιλογή όλων"
 
@@ -1127,10 +1204,17 @@ msgid "Prev"
 msgstr "Προηγούμενο"
 
 #. l10n: Display text for next month link in calendar
+<<<<<<< HEAD
 #: js/messages.php:106 libraries/common.lib.php:2366
 #: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338
 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
 #: tbl_structure.php:799
+=======
+#: js/messages.php:77 libraries/common.lib.php:2353
+#: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338
+#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
+#: tbl_structure.php:801
+>>>>>>> origin/master
 msgid "Next"
 msgstr "Επόμενο"
 
@@ -1658,7 +1742,11 @@ msgstr "Κωδικός πρόσβασης:"
 msgid "Server Choice"
 msgstr "Επιλογή Διακομιστή"
 
+<<<<<<< HEAD
 #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63
+=======
+#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59
+>>>>>>> origin/master
 msgid "Cookies must be enabled past this point."
 msgstr "Από αυτό το σημείο πρέπει να έχετε ενεργοποιημένα cookies."
 
@@ -1743,7 +1831,11 @@ msgstr ""
 "ρουτίνας recode_string, ενώ η επέκταση έχει φορτωθεί. Ελέξτε τις ρυθμίσεις "
 "της php."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:580
+=======
+#: libraries/common.inc.php:576
+>>>>>>> origin/master
 msgid ""
 "phpMyAdmin was unable to read your configuration file!<br />This might "
 "happen if PHP finds a parse error in it or PHP cannot find the file.<br /"
@@ -1760,12 +1852,20 @@ msgstr ""
 "(\") ή ερωτηματικά (;).<br />Εάν η php επιστρέψει μια λευκή σελίδα, όλα "
 "είναι σωστά."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:591
+=======
+#: libraries/common.inc.php:587
+>>>>>>> origin/master
 #, fuzzy, php-format
 msgid "Could not load default configuration from: %1$s"
 msgstr "Αδύνατη η φόρτωση της προεπιλεγμένης ρύθμισης από: «%1$s»"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:596
+=======
+#: libraries/common.inc.php:592
+>>>>>>> origin/master
 msgid ""
 "The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
 "configuration file!"
@@ -1773,29 +1873,49 @@ msgstr ""
 "Η εντολή <tt>$cfg['PmaAbsoluteUri']</tt> ΠΡΕΠΕΙ να οριστεί στο αρχείο "
 "ρυθμίσεων!"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:626
+=======
+#: libraries/common.inc.php:622
+>>>>>>> origin/master
 #, fuzzy, php-format
 msgid "Invalid server index: %s"
 msgstr "Μη έγκυρο ευρετήριο διακομιστή: «%s»"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:633
+=======
+#: libraries/common.inc.php:629
+>>>>>>> origin/master
 #, php-format
 msgid "Invalid hostname for server %1$s. Please review your configuration."
 msgstr ""
 "Μη έγκυρο όνομα διακομιστή για τον διακομιστή %1$s. Ξαναδείτε τις ρυθμίσεις "
 "σας."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:642 libraries/header.inc.php:100
+=======
+#: libraries/common.inc.php:638 libraries/header.inc.php:96
+>>>>>>> origin/master
 #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47
 #: main.php:185 test/theme.php:57
 msgid "Server"
 msgstr "Διακομιστής"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:820
 msgid "Invalid authentication method set in configuration:"
 msgstr "Ορίστηκε εσφαλμένη μέθοδος πιστοποίησης στη ρύθμιση:"
 
 #: libraries/common.inc.php:923
+=======
+#: libraries/common.inc.php:816
+msgid "Invalid authentication method set in configuration:"
+msgstr "Ορίστηκε εσφαλμένη μέθοδος πιστοποίησης στη ρύθμιση:"
+
+#: libraries/common.inc.php:919
+>>>>>>> origin/master
 #, php-format
 msgid "You should upgrade to %s %s or later."
 msgstr "Πρέπει να αναβαθμίσετε σε %s %s ή νεότερη."
@@ -2041,7 +2161,11 @@ msgid ""
 msgstr "Ίσως είναι κατά προσέγγιση. Δείτε τις ΣΑΕ 3.11"
 
 #: libraries/db_structure.lib.php:69 server_databases.php:142
+<<<<<<< HEAD
 #: tbl_printview.php:335 tbl_structure.php:680
+=======
+#: tbl_printview.php:335 tbl_structure.php:682
+>>>>>>> origin/master
 msgid "Overhead"
 msgstr "Περίσσεια"
 
@@ -2068,22 +2192,36 @@ msgid "Change password"
 msgstr "Αλλαγή κωδικού πρόσβασης"
 
 #: libraries/display_change_password.lib.php:35
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:348 server_privileges.php:808
+=======
+#: libraries/replication_gui.lib.php:348 server_privileges.php:807
+>>>>>>> origin/master
 msgid "No Password"
 msgstr "Χωρίς Κωδικό Πρόσβασης"
 
 #: libraries/display_change_password.lib.php:41
 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63
 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:352 server_privileges.php:797
 #: server_privileges.php:801 server_privileges.php:812
 #: server_privileges.php:1555 server_synchronize.php:1175
+=======
+#: libraries/replication_gui.lib.php:352 server_privileges.php:796
+#: server_privileges.php:800 server_privileges.php:811
+#: server_privileges.php:1538 server_synchronize.php:1175
+>>>>>>> origin/master
 msgid "Password"
 msgstr "Κωδικός Πρόσβασης"
 
 #: libraries/display_change_password.lib.php:46
 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359
+<<<<<<< HEAD
 #: server_privileges.php:816 server_privileges.php:819
+=======
+#: server_privileges.php:815 server_privileges.php:818
+>>>>>>> origin/master
 msgid "Re-type"
 msgstr "Επαναεισαγωγή"
 
@@ -2097,12 +2235,20 @@ msgid "MySQL 4.0 compatible"
 msgstr "Συμβατό με MySQL 4.0"
 
 #: libraries/display_change_password.lib.php:72
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:363 server_privileges.php:823
+=======
+#: libraries/replication_gui.lib.php:363 server_privileges.php:822
+>>>>>>> origin/master
 msgid "Generate Password"
 msgstr "Παραγωγή Κωδικού Πρόσβασης"
 
 #: libraries/display_change_password.lib.php:75
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:366 server_privileges.php:826
+=======
+#: libraries/replication_gui.lib.php:366 server_privileges.php:825
+>>>>>>> origin/master
 msgid "Generate"
 msgstr "Παραγωγή"
 
@@ -2191,7 +2337,11 @@ msgid "remember template"
 msgstr "αποθήκευση μορφής"
 
 #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552
+=======
+#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549
+>>>>>>> origin/master
 msgid "Character set of the file:"
 msgstr "Σύνολο χαρακτήρων του αρχείου:"
 
@@ -2249,7 +2399,11 @@ msgstr ""
 msgid "File to import"
 msgstr "Αρχείο για εισαγωγή"
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527
+=======
+#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524
+>>>>>>> origin/master
 msgid "Location of the text file"
 msgstr "Τοποθεσία του αρχείου κειμένου"
 
@@ -2257,13 +2411,21 @@ msgstr "Τοποθεσία του αρχείου κειμένου"
 msgid "File uploads are not allowed on this server."
 msgstr "Οι αποστολές αρχείων δεν επιτρέπονται σε αυτό τον διακομιστή."
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536
+=======
+#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533
+>>>>>>> origin/master
 #: tbl_change.php:1025
 msgid "The directory you set for upload work cannot be reached"
 msgstr ""
 "Ο υποκατάλογος που ορίσατε για την αποθήκευση αρχείων δεν μπόρεσε να βρεθεί"
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539
+=======
+#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536
+>>>>>>> origin/master
 #: tbl_change.php:1028
 msgid "web server upload directory"
 msgstr "Υποκατάλογος αποθήκευσης αρχείων διακομιστή"
@@ -2399,7 +2561,11 @@ msgstr "Ταξινόμηση ανά κλειδί"
 #: libraries/import/docsql.php:34 libraries/import/ldi.php:47
 #: libraries/import/ods.php:30 libraries/import/sql.php:20
 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26
+<<<<<<< HEAD
 #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751
+=======
+#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753
+>>>>>>> origin/master
 msgid "Options"
 msgstr "Επιλογές"
 
@@ -2547,7 +2713,11 @@ msgstr "Χρήση Buffer Pool"
 
 #: libraries/engines/innodb.lib.php:194 server_databases.php:137
 #: server_databases.php:305 server_status.php:525 server_status.php:586
+<<<<<<< HEAD
 #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694
+=======
+#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696
+>>>>>>> origin/master
 msgid "Total"
 msgstr "Σύνολο"
 
@@ -2839,7 +3009,11 @@ msgstr ""
 "τους δίδεται ο επόμενος αύξων αριθμός."
 
 #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88
+<<<<<<< HEAD
 #: tbl_printview.php:375 tbl_structure.php:735
+=======
+#: tbl_printview.php:375 tbl_structure.php:737
+>>>>>>> origin/master
 msgid "Format"
 msgstr "Μορφοποίηση"
 
@@ -2913,8 +3087,13 @@ msgstr "Έγγραφο Microsoft Word 2000"
 #: libraries/export/latex.php:201 libraries/export/odt.php:48
 #: libraries/export/sql.php:106 libraries/export/sql.php:868
 #: libraries/export/texytext.php:27 server_databases.php:127
+<<<<<<< HEAD
 #: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316
 #: tbl_structure.php:663
+=======
+#: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316
+#: tbl_structure.php:665
+>>>>>>> origin/master
 msgid "Data"
 msgstr "Δεδομένα"
 
@@ -2963,9 +3142,15 @@ msgstr "Τύπος MIME"
 #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57
 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177
 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:332 server_privileges.php:732
 #: server_privileges.php:735 server_privileges.php:791
 #: server_privileges.php:1554 server_privileges.php:2092
+=======
+#: libraries/replication_gui.lib.php:332 server_privileges.php:731
+#: server_privileges.php:734 server_privileges.php:790
+#: server_privileges.php:1537 server_privileges.php:2069
+>>>>>>> origin/master
 #: server_processlist.php:55 server_synchronize.php:1159
 msgid "Host"
 msgstr "Σύστημα"
@@ -3635,8 +3820,13 @@ msgstr ""
 
 #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59
 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:262 server_privileges.php:712
 #: server_privileges.php:715 server_privileges.php:722
+=======
+#: libraries/replication_gui.lib.php:262 server_privileges.php:711
+#: server_privileges.php:714 server_privileges.php:721
+>>>>>>> origin/master
 #: server_synchronize.php:1171
 msgid "User name"
 msgstr "Όνομα χρήστη"
@@ -3653,14 +3843,22 @@ msgstr "Κατάσταση πρωτεύοντος"
 msgid "Slave status"
 msgstr "Κατάσταση δευτερεύοντος"
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448
+=======
+#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445
+>>>>>>> origin/master
 #: server_status.php:737 server_variables.php:52
 msgid "Variable"
 msgstr "Μεταβλητή"
 
 #: libraries/replication_gui.lib.php:118 server_status.php:738
 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138
+<<<<<<< HEAD
 #: tbl_structure.php:727
+=======
+#: tbl_structure.php:729
+>>>>>>> origin/master
 msgid "Value"
 msgstr "Τιμή"
 
@@ -3680,11 +3878,16 @@ msgstr ""
 msgid "Add slave replication user"
 msgstr "Προσθήκη δευτερέοντα χρήστη αναπαραγωγής"
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:257 server_privileges.php:717
+=======
+#: libraries/replication_gui.lib.php:257 server_privileges.php:716
+>>>>>>> origin/master
 msgid "Any user"
 msgstr "Οποιοσδήποτε Χρήστης"
 
 #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:349 server_privileges.php:718
 #: server_privileges.php:785 server_privileges.php:809
 #: server_privileges.php:1950 server_privileges.php:1980
@@ -3708,6 +3911,31 @@ msgid "Use Host Table"
 msgstr "Χρήση Οικείου Πίνακα"
 
 #: libraries/replication_gui.lib.php:334 server_privileges.php:793
+=======
+#: libraries/replication_gui.lib.php:349 server_privileges.php:717
+#: server_privileges.php:784 server_privileges.php:808
+#: server_privileges.php:1928 server_privileges.php:1958
+msgid "Use text field"
+msgstr "Χρησιμοποιήστε το πεδίο κειμένου"
+
+#: libraries/replication_gui.lib.php:305 server_privileges.php:764
+msgid "Any host"
+msgstr "Οποιοδήποτε Σύστημα"
+
+#: libraries/replication_gui.lib.php:309 server_privileges.php:768
+msgid "Local"
+msgstr "Τοπικό"
+
+#: libraries/replication_gui.lib.php:315 server_privileges.php:773
+msgid "This Host"
+msgstr "Αυτός ο διακομιστής"
+
+#: libraries/replication_gui.lib.php:321 server_privileges.php:779
+msgid "Use Host Table"
+msgstr "Χρήση Οικείου Πίνακα"
+
+#: libraries/replication_gui.lib.php:334 server_privileges.php:792
+>>>>>>> origin/master
 msgid ""
 "When Host table is used, this field is ignored and values stored in Host "
 "table are used instead."
@@ -8221,10 +8449,13 @@ msgstr "Εισαγωγή ως νέα γραμμή και παράβλεψη σφ
 msgid "Show insert query"
 msgstr "Εμφάνιση ερωτήματος SQL"
 
+<<<<<<< HEAD
 #: tbl_change.php:1140
 msgid "and then"
 msgstr "και μετά"
 
+=======
+>>>>>>> origin/master
 #: tbl_change.php:1144
 msgid "Go back to previous page"
 msgstr "Επιστροφή"
@@ -8420,6 +8651,7 @@ msgstr "Έλεγχος ακεραιότητας συσχετίσεων:"
 msgid "Show tables"
 msgstr "Εμφάνιση πινάκων"
 
+<<<<<<< HEAD
 #: tbl_printview.php:309 tbl_structure.php:654
 msgid "Space usage"
 msgstr "Χρήση χώρου"
@@ -8453,6 +8685,41 @@ msgid "Row length"
 msgstr "Μέγεθος Γραμμής"
 
 #: tbl_printview.php:413 tbl_structure.php:791
+=======
+#: tbl_printview.php:309 tbl_structure.php:656
+msgid "Space usage"
+msgstr "Χρήση χώρου"
+
+#: tbl_printview.php:313 tbl_structure.php:660
+msgid "Usage"
+msgstr "Χρήση"
+
+#: tbl_printview.php:340 tbl_structure.php:687
+msgid "Effective"
+msgstr "Αποτελεσματικός"
+
+#: tbl_printview.php:365 tbl_structure.php:725
+msgid "Row Statistics"
+msgstr "Στατιστικά Εγγραφών"
+
+#: tbl_printview.php:368 tbl_structure.php:728
+msgid "Statements"
+msgstr "Δηλώσεις"
+
+#: tbl_printview.php:379 tbl_structure.php:740
+msgid "static"
+msgstr "στατικό"
+
+#: tbl_printview.php:381 tbl_structure.php:742
+msgid "dynamic"
+msgstr "δυναμικά"
+
+#: tbl_printview.php:403 tbl_structure.php:785
+msgid "Row length"
+msgstr "Μέγεθος Γραμμής"
+
+#: tbl_printview.php:413 tbl_structure.php:793
+>>>>>>> origin/master
 msgid " Row size "
 msgstr " Μέγεθος Εγγραφής "
 
diff --git a/po/en_GB.po b/po/en_GB.po
index fab8ffea0..2fb055345 100755
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -3,7 +3,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2010-07-03 21:45+0530\n"
+=======
+"POT-Creation-Date: 2010-07-03 09:00-0400\n"
+>>>>>>> origin/master
 "PO-Revision-Date: 2010-06-09 10:42+0200\n"
 "Last-Translator: Michal <michal@cihar.com>\n"
 "Language-Team: english-gb <en_GB@li.org>\n"
@@ -49,15 +53,26 @@ msgstr "Search"
 #: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046
 #: libraries/Theme_Manager.class.php:311
 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719
+<<<<<<< HEAD
 #: libraries/common.lib.php:1344 libraries/common.lib.php:2301
 #: libraries/display_change_password.lib.php:82
 #: libraries/display_create_table.lib.php:62
+=======
+#: libraries/common.lib.php:1335 libraries/common.lib.php:2288
+#: libraries/display_change_password.lib.php:82
+#: libraries/display_create_table.lib.php:63
+>>>>>>> origin/master
 #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532
 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76
 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104
+<<<<<<< HEAD
 #: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480
 #: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782
+=======
+#: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477
+#: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782
+>>>>>>> origin/master
 #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328
 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142
 #: server_privileges.php:665 server_privileges.php:1641
@@ -67,8 +82,13 @@ msgstr "Search"
 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171
 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265
 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561
+<<<<<<< HEAD
 #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560
 #: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512
+=======
+#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562
+#: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512
+>>>>>>> origin/master
 #: view_create.php:182 view_operations.php:101
 msgid "Go"
 msgstr "Go"
@@ -119,10 +139,17 @@ msgstr "Column"
 #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245
 #: libraries/export/latex.php:360 libraries/export/odt.php:297
 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100
+<<<<<<< HEAD
 #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093
 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
 #: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321
+=======
+#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070
+#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
+#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
+#: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321
+>>>>>>> origin/master
 msgid "Type"
 msgstr "Type"
 
@@ -163,9 +190,15 @@ msgstr "Comments"
 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322
 #: libraries/export/latex.php:430 libraries/export/odt.php:368
 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263
+<<<<<<< HEAD
 #: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596
 #: server_privileges.php:1911 server_privileges.php:1916
 #: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228
+=======
+#: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579
+#: server_privileges.php:1889 server_privileges.php:1894
+#: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228
+>>>>>>> origin/master
 #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342
 msgid "No"
 msgstr "No"
@@ -179,9 +212,15 @@ msgstr "No"
 #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106
 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262
 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344
+<<<<<<< HEAD
 #: server_databases.php:64 server_privileges.php:1582
 #: server_privileges.php:1596 server_privileges.php:1911
 #: server_privileges.php:1914 server_privileges.php:2210 sql.php:193
+=======
+#: server_databases.php:64 server_privileges.php:1565
+#: server_privileges.php:1579 server_privileges.php:1889
+#: server_privileges.php:1892 server_privileges.php:2187 sql.php:193
+>>>>>>> origin/master
 #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350
 #: tbl_tracking.php:335 tbl_tracking.php:340
 msgid "Yes"
@@ -230,7 +269,15 @@ msgstr "Rename database to"
 msgid "Command"
 msgstr "Command"
 
+<<<<<<< HEAD
 #: db_operations.php:466
+=======
+#: db_operations.php:429 tbl_change.php:1140
+msgid "and then"
+msgstr "and then"
+
+#: db_operations.php:455
+>>>>>>> origin/master
 msgid "Copy database to"
 msgstr "Copy database to"
 
@@ -312,7 +359,11 @@ msgstr "Enable"
 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730
 #: server_collations.php:54 server_collations.php:66 server_databases.php:111
 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179
+<<<<<<< HEAD
 #: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326
+=======
+#: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326
+>>>>>>> origin/master
 msgid "Collation"
 msgstr "Collation"
 
@@ -341,7 +392,11 @@ msgstr "Table"
 #: db_printview.php:105 libraries/db_structure.lib.php:56
 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146
 #: navigation.php:638 navigation.php:660 server_databases.php:122
+<<<<<<< HEAD
 #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775
+=======
+#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777
+>>>>>>> origin/master
 msgid "Rows"
 msgstr "Rows"
 
@@ -356,19 +411,31 @@ msgstr "in use"
 
 #: db_printview.php:187 libraries/db_info.inc.php:88
 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433
+<<<<<<< HEAD
 #: tbl_structure.php:807
+=======
+#: tbl_structure.php:809
+>>>>>>> origin/master
 msgid "Creation"
 msgstr "Creation"
 
 #: db_printview.php:196 libraries/db_info.inc.php:93
 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443
+<<<<<<< HEAD
 #: tbl_structure.php:815
+=======
+#: tbl_structure.php:817
+>>>>>>> origin/master
 msgid "Last update"
 msgstr "Last update"
 
 #: db_printview.php:205 libraries/db_info.inc.php:98
 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453
+<<<<<<< HEAD
 #: tbl_structure.php:823
+=======
+#: tbl_structure.php:825
+>>>>>>> origin/master
 msgid "Last check"
 msgstr "Last check"
 
@@ -432,7 +499,11 @@ msgstr "Del"
 
 #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553
 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779
+<<<<<<< HEAD
 #: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250
+=======
+#: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250
+>>>>>>> origin/master
 #: tbl_select.php:286
 msgid "Or"
 msgstr "Or"
@@ -646,9 +717,15 @@ msgstr "With selected:"
 msgid "Check All"
 msgstr "Check All"
 
+<<<<<<< HEAD
 #: db_structure.php:529 libraries/display_tbl.lib.php:2077
 #: libraries/replication_gui.lib.php:36 server_databases.php:350
 #: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460
+=======
+#: db_structure.php:531 libraries/display_tbl.lib.php:2077
+#: libraries/replication_gui.lib.php:36 server_databases.php:350
+#: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462
+>>>>>>> origin/master
 msgid "Uncheck All"
 msgstr "Uncheck All"
 
@@ -1104,10 +1181,17 @@ msgid "Prev"
 msgstr "Prev"
 
 #. l10n: Display text for next month link in calendar
+<<<<<<< HEAD
 #: js/messages.php:106 libraries/common.lib.php:2366
 #: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338
 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
 #: tbl_structure.php:799
+=======
+#: js/messages.php:77 libraries/common.lib.php:2353
+#: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338
+#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
+#: tbl_structure.php:801
+>>>>>>> origin/master
 msgid "Next"
 msgstr "Next"
 
@@ -1609,7 +1693,11 @@ msgstr "Password:"
 msgid "Server Choice"
 msgstr "Server Choice"
 
+<<<<<<< HEAD
 #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63
+=======
+#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59
+>>>>>>> origin/master
 msgid "Cookies must be enabled past this point."
 msgstr "Cookies must be enabled past this point."
 
@@ -1690,7 +1778,11 @@ msgstr ""
 "Couldn't use the iconv, libiconv, or recode_string functions, although the "
 "necessary extensions appear to be loaded. Check your PHP configuration."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:580
+=======
+#: libraries/common.inc.php:576
+>>>>>>> origin/master
 msgid ""
 "phpMyAdmin was unable to read your configuration file!<br />This might "
 "happen if PHP finds a parse error in it or PHP cannot find the file.<br /"
@@ -1706,12 +1798,20 @@ msgstr ""
 "semicolon is missing somewhere.<br />If you receive a blank page, everything "
 "is fine."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:591
+=======
+#: libraries/common.inc.php:587
+>>>>>>> origin/master
 #, php-format
 msgid "Could not load default configuration from: %1$s"
 msgstr "Could not load default configuration from: %1$s"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:596
+=======
+#: libraries/common.inc.php:592
+>>>>>>> origin/master
 msgid ""
 "The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
 "configuration file!"
@@ -1719,27 +1819,47 @@ msgstr ""
 "The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
 "configuration file!"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:626
+=======
+#: libraries/common.inc.php:622
+>>>>>>> origin/master
 #, php-format
 msgid "Invalid server index: %s"
 msgstr "Invalid server index: %s"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:633
+=======
+#: libraries/common.inc.php:629
+>>>>>>> origin/master
 #, php-format
 msgid "Invalid hostname for server %1$s. Please review your configuration."
 msgstr "Invalid hostname for server %1$s. Please review your configuration."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:642 libraries/header.inc.php:100
+=======
+#: libraries/common.inc.php:638 libraries/header.inc.php:96
+>>>>>>> origin/master
 #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47
 #: main.php:185 test/theme.php:57
 msgid "Server"
 msgstr "Server"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:820
 msgid "Invalid authentication method set in configuration:"
 msgstr "Invalid authentication method set in configuration:"
 
 #: libraries/common.inc.php:923
+=======
+#: libraries/common.inc.php:816
+msgid "Invalid authentication method set in configuration:"
+msgstr "Invalid authentication method set in configuration:"
+
+#: libraries/common.inc.php:919
+>>>>>>> origin/master
 #, php-format
 msgid "You should upgrade to %s %s or later."
 msgstr "You should upgrade to %s %s or later."
@@ -1986,7 +2106,11 @@ msgstr ""
 "3.11[/a]"
 
 #: libraries/db_structure.lib.php:69 server_databases.php:142
+<<<<<<< HEAD
 #: tbl_printview.php:335 tbl_structure.php:680
+=======
+#: tbl_printview.php:335 tbl_structure.php:682
+>>>>>>> origin/master
 msgid "Overhead"
 msgstr "Overhead"
 
@@ -2013,22 +2137,36 @@ msgid "Change password"
 msgstr "Change password"
 
 #: libraries/display_change_password.lib.php:35
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:348 server_privileges.php:808
+=======
+#: libraries/replication_gui.lib.php:348 server_privileges.php:807
+>>>>>>> origin/master
 msgid "No Password"
 msgstr "No Password"
 
 #: libraries/display_change_password.lib.php:41
 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63
 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:352 server_privileges.php:797
 #: server_privileges.php:801 server_privileges.php:812
 #: server_privileges.php:1555 server_synchronize.php:1175
+=======
+#: libraries/replication_gui.lib.php:352 server_privileges.php:796
+#: server_privileges.php:800 server_privileges.php:811
+#: server_privileges.php:1538 server_synchronize.php:1175
+>>>>>>> origin/master
 msgid "Password"
 msgstr "Password"
 
 #: libraries/display_change_password.lib.php:46
 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359
+<<<<<<< HEAD
 #: server_privileges.php:816 server_privileges.php:819
+=======
+#: server_privileges.php:815 server_privileges.php:818
+>>>>>>> origin/master
 msgid "Re-type"
 msgstr "Re-type"
 
@@ -2041,12 +2179,20 @@ msgid "MySQL 4.0 compatible"
 msgstr "MySQL 4.0 compatible"
 
 #: libraries/display_change_password.lib.php:72
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:363 server_privileges.php:823
+=======
+#: libraries/replication_gui.lib.php:363 server_privileges.php:822
+>>>>>>> origin/master
 msgid "Generate Password"
 msgstr "Generate Password"
 
 #: libraries/display_change_password.lib.php:75
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:366 server_privileges.php:826
+=======
+#: libraries/replication_gui.lib.php:366 server_privileges.php:825
+>>>>>>> origin/master
 msgid "Generate"
 msgstr "Generate"
 
@@ -2131,7 +2277,11 @@ msgid "remember template"
 msgstr "remember template"
 
 #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552
+=======
+#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549
+>>>>>>> origin/master
 msgid "Character set of the file:"
 msgstr "Character set of the file:"
 
@@ -2189,7 +2339,11 @@ msgstr ""
 msgid "File to import"
 msgstr "File to import"
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527
+=======
+#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524
+>>>>>>> origin/master
 msgid "Location of the text file"
 msgstr "Location of the text file"
 
@@ -2197,12 +2351,20 @@ msgstr "Location of the text file"
 msgid "File uploads are not allowed on this server."
 msgstr "File uploads are not allowed on this server."
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536
+=======
+#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533
+>>>>>>> origin/master
 #: tbl_change.php:1025
 msgid "The directory you set for upload work cannot be reached"
 msgstr "The directory you set for upload work cannot be reached"
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539
+=======
+#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536
+>>>>>>> origin/master
 #: tbl_change.php:1028
 msgid "web server upload directory"
 msgstr "web server upload directory"
@@ -2333,7 +2495,11 @@ msgstr "Sort by key"
 #: libraries/import/docsql.php:34 libraries/import/ldi.php:47
 #: libraries/import/ods.php:30 libraries/import/sql.php:20
 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26
+<<<<<<< HEAD
 #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751
+=======
+#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753
+>>>>>>> origin/master
 msgid "Options"
 msgstr "Options"
 
@@ -2478,7 +2644,11 @@ msgstr "Buffer Pool Usage"
 
 #: libraries/engines/innodb.lib.php:194 server_databases.php:137
 #: server_databases.php:305 server_status.php:525 server_status.php:586
+<<<<<<< HEAD
 #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694
+=======
+#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696
+>>>>>>> origin/master
 msgid "Total"
 msgstr "Total"
 
@@ -2763,7 +2933,11 @@ msgstr ""
 "number."
 
 #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88
+<<<<<<< HEAD
 #: tbl_printview.php:375 tbl_structure.php:735
+=======
+#: tbl_printview.php:375 tbl_structure.php:737
+>>>>>>> origin/master
 msgid "Format"
 msgstr "Format"
 
@@ -2827,8 +3001,13 @@ msgstr "Microsoft Word 2000"
 #: libraries/export/latex.php:201 libraries/export/odt.php:48
 #: libraries/export/sql.php:106 libraries/export/sql.php:868
 #: libraries/export/texytext.php:27 server_databases.php:127
+<<<<<<< HEAD
 #: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316
 #: tbl_structure.php:663
+=======
+#: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316
+#: tbl_structure.php:665
+>>>>>>> origin/master
 msgid "Data"
 msgstr "Data"
 
@@ -2877,9 +3056,15 @@ msgstr "MIME type"
 #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57
 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177
 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:332 server_privileges.php:732
 #: server_privileges.php:735 server_privileges.php:791
 #: server_privileges.php:1554 server_privileges.php:2092
+=======
+#: libraries/replication_gui.lib.php:332 server_privileges.php:731
+#: server_privileges.php:734 server_privileges.php:790
+#: server_privileges.php:1537 server_privileges.php:2069
+>>>>>>> origin/master
 #: server_processlist.php:55 server_synchronize.php:1159
 msgid "Host"
 msgstr "Host"
@@ -3547,8 +3732,13 @@ msgstr ""
 
 #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59
 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:262 server_privileges.php:712
 #: server_privileges.php:715 server_privileges.php:722
+=======
+#: libraries/replication_gui.lib.php:262 server_privileges.php:711
+#: server_privileges.php:714 server_privileges.php:721
+>>>>>>> origin/master
 #: server_synchronize.php:1171
 msgid "User name"
 msgstr "User name"
@@ -3565,14 +3755,22 @@ msgstr "Master status"
 msgid "Slave status"
 msgstr "Slave status"
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448
+=======
+#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445
+>>>>>>> origin/master
 #: server_status.php:737 server_variables.php:52
 msgid "Variable"
 msgstr "Variable"
 
 #: libraries/replication_gui.lib.php:118 server_status.php:738
 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138
+<<<<<<< HEAD
 #: tbl_structure.php:727
+=======
+#: tbl_structure.php:729
+>>>>>>> origin/master
 msgid "Value"
 msgstr "Value"
 
@@ -3592,11 +3790,16 @@ msgstr ""
 msgid "Add slave replication user"
 msgstr "Add slave replication user"
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:257 server_privileges.php:717
+=======
+#: libraries/replication_gui.lib.php:257 server_privileges.php:716
+>>>>>>> origin/master
 msgid "Any user"
 msgstr "Any user"
 
 #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:349 server_privileges.php:718
 #: server_privileges.php:785 server_privileges.php:809
 #: server_privileges.php:1950 server_privileges.php:1980
@@ -3620,6 +3823,31 @@ msgid "Use Host Table"
 msgstr "Use Host Table"
 
 #: libraries/replication_gui.lib.php:334 server_privileges.php:793
+=======
+#: libraries/replication_gui.lib.php:349 server_privileges.php:717
+#: server_privileges.php:784 server_privileges.php:808
+#: server_privileges.php:1928 server_privileges.php:1958
+msgid "Use text field"
+msgstr "Use text field"
+
+#: libraries/replication_gui.lib.php:305 server_privileges.php:764
+msgid "Any host"
+msgstr "Any host"
+
+#: libraries/replication_gui.lib.php:309 server_privileges.php:768
+msgid "Local"
+msgstr "Local"
+
+#: libraries/replication_gui.lib.php:315 server_privileges.php:773
+msgid "This Host"
+msgstr "This Host"
+
+#: libraries/replication_gui.lib.php:321 server_privileges.php:779
+msgid "Use Host Table"
+msgstr "Use Host Table"
+
+#: libraries/replication_gui.lib.php:334 server_privileges.php:792
+>>>>>>> origin/master
 msgid ""
 "When Host table is used, this field is ignored and values stored in Host "
 "table are used instead."
@@ -7902,10 +8130,13 @@ msgstr "Insert as new row and ignore errors"
 msgid "Show insert query"
 msgstr "Show insert query"
 
+<<<<<<< HEAD
 #: tbl_change.php:1140
 msgid "and then"
 msgstr "and then"
 
+=======
+>>>>>>> origin/master
 #: tbl_change.php:1144
 msgid "Go back to previous page"
 msgstr "Go back to previous page"
@@ -8098,6 +8329,7 @@ msgstr "Check referential integrity:"
 msgid "Show tables"
 msgstr "Show tables"
 
+<<<<<<< HEAD
 #: tbl_printview.php:309 tbl_structure.php:654
 msgid "Space usage"
 msgstr "Space usage"
@@ -8131,6 +8363,41 @@ msgid "Row length"
 msgstr "Row length"
 
 #: tbl_printview.php:413 tbl_structure.php:791
+=======
+#: tbl_printview.php:309 tbl_structure.php:656
+msgid "Space usage"
+msgstr "Space usage"
+
+#: tbl_printview.php:313 tbl_structure.php:660
+msgid "Usage"
+msgstr "Usage"
+
+#: tbl_printview.php:340 tbl_structure.php:687
+msgid "Effective"
+msgstr "Effective"
+
+#: tbl_printview.php:365 tbl_structure.php:725
+msgid "Row Statistics"
+msgstr "Row Statistics"
+
+#: tbl_printview.php:368 tbl_structure.php:728
+msgid "Statements"
+msgstr "Statements"
+
+#: tbl_printview.php:379 tbl_structure.php:740
+msgid "static"
+msgstr "static"
+
+#: tbl_printview.php:381 tbl_structure.php:742
+msgid "dynamic"
+msgstr "dynamic"
+
+#: tbl_printview.php:403 tbl_structure.php:785
+msgid "Row length"
+msgstr "Row length"
+
+#: tbl_printview.php:413 tbl_structure.php:793
+>>>>>>> origin/master
 msgid " Row size "
 msgstr " Row size "
 
diff --git a/po/es.po b/po/es.po
index 85020ffb4..acff3f320 100755
--- a/po/es.po
+++ b/po/es.po
@@ -3,7 +3,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2010-07-03 21:45+0530\n"
+=======
+"POT-Creation-Date: 2010-07-03 09:00-0400\n"
+>>>>>>> origin/master
 "PO-Revision-Date: 2010-03-12 11:23+0200\n"
 "Last-Translator: Michal <michal@cihar.com>\n"
 "Language-Team: spanish <es@li.org>\n"
@@ -49,15 +53,26 @@ msgstr "Buscar"
 #: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046
 #: libraries/Theme_Manager.class.php:311
 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719
+<<<<<<< HEAD
 #: libraries/common.lib.php:1344 libraries/common.lib.php:2301
 #: libraries/display_change_password.lib.php:82
 #: libraries/display_create_table.lib.php:62
+=======
+#: libraries/common.lib.php:1335 libraries/common.lib.php:2288
+#: libraries/display_change_password.lib.php:82
+#: libraries/display_create_table.lib.php:63
+>>>>>>> origin/master
 #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532
 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76
 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104
+<<<<<<< HEAD
 #: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480
 #: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782
+=======
+#: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477
+#: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782
+>>>>>>> origin/master
 #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328
 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142
 #: server_privileges.php:665 server_privileges.php:1641
@@ -67,8 +82,13 @@ msgstr "Buscar"
 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171
 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265
 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561
+<<<<<<< HEAD
 #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560
 #: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512
+=======
+#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562
+#: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512
+>>>>>>> origin/master
 #: view_create.php:182 view_operations.php:101
 msgid "Go"
 msgstr "Continuar"
@@ -121,10 +141,17 @@ msgstr "Nombre de las columnas"
 #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245
 #: libraries/export/latex.php:360 libraries/export/odt.php:297
 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100
+<<<<<<< HEAD
 #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093
 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
 #: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321
+=======
+#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070
+#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
+#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
+#: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321
+>>>>>>> origin/master
 msgid "Type"
 msgstr "Tipo"
 
@@ -165,9 +192,15 @@ msgstr "Comentarios"
 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322
 #: libraries/export/latex.php:430 libraries/export/odt.php:368
 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263
+<<<<<<< HEAD
 #: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596
 #: server_privileges.php:1911 server_privileges.php:1916
 #: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228
+=======
+#: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579
+#: server_privileges.php:1889 server_privileges.php:1894
+#: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228
+>>>>>>> origin/master
 #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342
 msgid "No"
 msgstr "No"
@@ -181,9 +214,15 @@ msgstr "No"
 #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106
 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262
 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344
+<<<<<<< HEAD
 #: server_databases.php:64 server_privileges.php:1582
 #: server_privileges.php:1596 server_privileges.php:1911
 #: server_privileges.php:1914 server_privileges.php:2210 sql.php:193
+=======
+#: server_databases.php:64 server_privileges.php:1565
+#: server_privileges.php:1579 server_privileges.php:1889
+#: server_privileges.php:1892 server_privileges.php:2187 sql.php:193
+>>>>>>> origin/master
 #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350
 #: tbl_tracking.php:335 tbl_tracking.php:340
 msgid "Yes"
@@ -232,7 +271,15 @@ msgstr "Cambiar el nombre de la base de datos a"
 msgid "Command"
 msgstr "Comando"
 
+<<<<<<< HEAD
 #: db_operations.php:466
+=======
+#: db_operations.php:429 tbl_change.php:1140
+msgid "and then"
+msgstr "y luego"
+
+#: db_operations.php:455
+>>>>>>> origin/master
 msgid "Copy database to"
 msgstr "Copiar la base de datos a"
 
@@ -320,7 +367,11 @@ msgstr "Habilite"
 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730
 #: server_collations.php:54 server_collations.php:66 server_databases.php:111
 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179
+<<<<<<< HEAD
 #: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326
+=======
+#: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326
+>>>>>>> origin/master
 msgid "Collation"
 msgstr "Cotejamiento"
 
@@ -349,7 +400,11 @@ msgstr "Tabla"
 #: db_printview.php:105 libraries/db_structure.lib.php:56
 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146
 #: navigation.php:638 navigation.php:660 server_databases.php:122
+<<<<<<< HEAD
 #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775
+=======
+#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777
+>>>>>>> origin/master
 msgid "Rows"
 msgstr "Filas"
 
@@ -364,19 +419,31 @@ msgstr "en uso"
 
 #: db_printview.php:187 libraries/db_info.inc.php:88
 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433
+<<<<<<< HEAD
 #: tbl_structure.php:807
+=======
+#: tbl_structure.php:809
+>>>>>>> origin/master
 msgid "Creation"
 msgstr "Creación"
 
 #: db_printview.php:196 libraries/db_info.inc.php:93
 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443
+<<<<<<< HEAD
 #: tbl_structure.php:815
+=======
+#: tbl_structure.php:817
+>>>>>>> origin/master
 msgid "Last update"
 msgstr "Última actualización"
 
 #: db_printview.php:205 libraries/db_info.inc.php:98
 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453
+<<<<<<< HEAD
 #: tbl_structure.php:823
+=======
+#: tbl_structure.php:825
+>>>>>>> origin/master
 msgid "Last check"
 msgstr "Última revisión"
 
@@ -441,7 +508,11 @@ msgstr "Borrar"
 
 #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553
 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779
+<<<<<<< HEAD
 #: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250
+=======
+#: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250
+>>>>>>> origin/master
 #: tbl_select.php:286
 msgid "Or"
 msgstr "O"
@@ -662,9 +733,15 @@ msgstr "Para los elementos que están marcados:"
 msgid "Check All"
 msgstr "Marcar todos/as"
 
+<<<<<<< HEAD
 #: db_structure.php:529 libraries/display_tbl.lib.php:2077
 #: libraries/replication_gui.lib.php:36 server_databases.php:350
 #: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460
+=======
+#: db_structure.php:531 libraries/display_tbl.lib.php:2077
+#: libraries/replication_gui.lib.php:36 server_databases.php:350
+#: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462
+>>>>>>> origin/master
 msgid "Uncheck All"
 msgstr "Desmarcar todos"
 
@@ -1140,10 +1217,17 @@ msgid "Prev"
 msgstr "Previo"
 
 #. l10n: Display text for next month link in calendar
+<<<<<<< HEAD
 #: js/messages.php:106 libraries/common.lib.php:2366
 #: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338
 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
 #: tbl_structure.php:799
+=======
+#: js/messages.php:77 libraries/common.lib.php:2353
+#: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338
+#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
+#: tbl_structure.php:801
+>>>>>>> origin/master
 msgid "Next"
 msgstr "Próxima"
 
@@ -1700,7 +1784,11 @@ msgstr "Contraseña:"
 msgid "Server Choice"
 msgstr "Elección del servidor"
 
+<<<<<<< HEAD
 #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63
+=======
+#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59
+>>>>>>> origin/master
 msgid "Cookies must be enabled past this point."
 msgstr "Las \"cookies\" deben estar habilitadas."
 
@@ -1784,7 +1872,11 @@ msgstr ""
 "No se puede utilizar iconv ni libiconv ni la función recode_string mientras "
 "se carga la extensión de informes. Comprueba la configuración de php."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:580
+=======
+#: libraries/common.inc.php:576
+>>>>>>> origin/master
 msgid ""
 "phpMyAdmin was unable to read your configuration file!<br />This might "
 "happen if PHP finds a parse error in it or PHP cannot find the file.<br /"
@@ -1800,13 +1892,21 @@ msgstr ""
 "error que reciba. En muchas ocasiones falta una coma o punto y coma en algún "
 "sitio.<br />Si recibe una página en blanco, todo está correcto."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:591
+=======
+#: libraries/common.inc.php:587
+>>>>>>> origin/master
 #, fuzzy, php-format
 #| msgid "Could not load default configuration from: \"%1$s\""
 msgid "Could not load default configuration from: %1$s"
 msgstr "No fue posible cargar la configuración predeterminada desde: \"%1$s\""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:596
+=======
+#: libraries/common.inc.php:592
+>>>>>>> origin/master
 msgid ""
 "The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
 "configuration file!"
@@ -1814,30 +1914,50 @@ msgstr ""
 "El contenido de <tt>$cfg['PmaAbsoluteUri']</tt> ¡DEBE constar en config.inc."
 "php!"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:626
+=======
+#: libraries/common.inc.php:622
+>>>>>>> origin/master
 #, fuzzy, php-format
 #| msgid "Invalid server index: \"%s\""
 msgid "Invalid server index: %s"
 msgstr "No es válido el índice del servidor: \"%s\""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:633
+=======
+#: libraries/common.inc.php:629
+>>>>>>> origin/master
 #, php-format
 msgid "Invalid hostname for server %1$s. Please review your configuration."
 msgstr ""
 "El nombre del host no es válido para el servidor %1$s. Por favor, revise su "
 "configuración."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:642 libraries/header.inc.php:100
+=======
+#: libraries/common.inc.php:638 libraries/header.inc.php:96
+>>>>>>> origin/master
 #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47
 #: main.php:185 test/theme.php:57
 msgid "Server"
 msgstr "Servidor"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:820
 msgid "Invalid authentication method set in configuration:"
 msgstr "El método de autenticación no es válido en la configuración actual:"
 
 #: libraries/common.inc.php:923
+=======
+#: libraries/common.inc.php:816
+msgid "Invalid authentication method set in configuration:"
+msgstr "El método de autenticación no es válido en la configuración actual:"
+
+#: libraries/common.inc.php:919
+>>>>>>> origin/master
 #, php-format
 msgid "You should upgrade to %s %s or later."
 msgstr "Usted debería actualizar su %s a la versión %s o más reciente."
@@ -2084,7 +2204,11 @@ msgid ""
 msgstr "Podría ser aproximado.  Léase la FAQ 3.11"
 
 #: libraries/db_structure.lib.php:69 server_databases.php:142
+<<<<<<< HEAD
 #: tbl_printview.php:335 tbl_structure.php:680
+=======
+#: tbl_printview.php:335 tbl_structure.php:682
+>>>>>>> origin/master
 msgid "Overhead"
 msgstr "Residuo a depurar"
 
@@ -2114,22 +2238,36 @@ msgid "Change password"
 msgstr "Cambio de contraseña"
 
 #: libraries/display_change_password.lib.php:35
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:348 server_privileges.php:808
+=======
+#: libraries/replication_gui.lib.php:348 server_privileges.php:807
+>>>>>>> origin/master
 msgid "No Password"
 msgstr "Sin contraseña"
 
 #: libraries/display_change_password.lib.php:41
 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63
 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:352 server_privileges.php:797
 #: server_privileges.php:801 server_privileges.php:812
 #: server_privileges.php:1555 server_synchronize.php:1175
+=======
+#: libraries/replication_gui.lib.php:352 server_privileges.php:796
+#: server_privileges.php:800 server_privileges.php:811
+#: server_privileges.php:1538 server_synchronize.php:1175
+>>>>>>> origin/master
 msgid "Password"
 msgstr "Contraseña"
 
 #: libraries/display_change_password.lib.php:46
 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359
+<<<<<<< HEAD
 #: server_privileges.php:816 server_privileges.php:819
+=======
+#: server_privileges.php:815 server_privileges.php:818
+>>>>>>> origin/master
 msgid "Re-type"
 msgstr "Debe volver a escribir"
 
@@ -2144,12 +2282,20 @@ msgid "MySQL 4.0 compatible"
 msgstr "Compatible con MySQL&nbsp;4.0"
 
 #: libraries/display_change_password.lib.php:72
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:363 server_privileges.php:823
+=======
+#: libraries/replication_gui.lib.php:363 server_privileges.php:822
+>>>>>>> origin/master
 msgid "Generate Password"
 msgstr "Generar la contraseña"
 
 #: libraries/display_change_password.lib.php:75
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:366 server_privileges.php:826
+=======
+#: libraries/replication_gui.lib.php:366 server_privileges.php:825
+>>>>>>> origin/master
 msgid "Generate"
 msgstr "Generar"
 
@@ -2240,7 +2386,11 @@ msgid "remember template"
 msgstr "recordar la plantilla"
 
 #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552
+=======
+#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549
+>>>>>>> origin/master
 msgid "Character set of the file:"
 msgstr "Juego de caracteres del archivo:"
 
@@ -2293,7 +2443,11 @@ msgstr ""
 msgid "File to import"
 msgstr "Archivo a importar"
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527
+=======
+#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524
+>>>>>>> origin/master
 msgid "Location of the text file"
 msgstr "Localización del archivo de texto"
 
@@ -2301,13 +2455,21 @@ msgstr "Localización del archivo de texto"
 msgid "File uploads are not allowed on this server."
 msgstr "No está permitido subir archivos a este servidor."
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536
+=======
+#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533
+>>>>>>> origin/master
 #: tbl_change.php:1025
 msgid "The directory you set for upload work cannot be reached"
 msgstr ""
 "No está disponible el directorio que usted habilitó para subir las tareas"
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539
+=======
+#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536
+>>>>>>> origin/master
 #: tbl_change.php:1028
 msgid "web server upload directory"
 msgstr "directorio en el servidor web para subir los archivos"
@@ -2446,7 +2608,11 @@ msgstr "Organizar según la clave"
 #: libraries/import/docsql.php:34 libraries/import/ldi.php:47
 #: libraries/import/ods.php:30 libraries/import/sql.php:20
 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26
+<<<<<<< HEAD
 #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751
+=======
+#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753
+>>>>>>> origin/master
 msgid "Options"
 msgstr "Opciones"
 
@@ -2595,7 +2761,11 @@ msgstr "Total de memoria del búfer consumido"
 
 #: libraries/engines/innodb.lib.php:194 server_databases.php:137
 #: server_databases.php:305 server_status.php:525 server_status.php:586
+<<<<<<< HEAD
 #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694
+=======
+#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696
+>>>>>>> origin/master
 msgid "Total"
 msgstr "Total"
 
@@ -2891,7 +3061,11 @@ msgstr ""
 "reciben el siguiente número más alto."
 
 #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88
+<<<<<<< HEAD
 #: tbl_printview.php:375 tbl_structure.php:735
+=======
+#: tbl_printview.php:375 tbl_structure.php:737
+>>>>>>> origin/master
 msgid "Format"
 msgstr "Formato"
 
@@ -2963,8 +3137,13 @@ msgstr "Microsoft Word 2000"
 #: libraries/export/latex.php:201 libraries/export/odt.php:48
 #: libraries/export/sql.php:106 libraries/export/sql.php:868
 #: libraries/export/texytext.php:27 server_databases.php:127
+<<<<<<< HEAD
 #: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316
 #: tbl_structure.php:663
+=======
+#: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316
+#: tbl_structure.php:665
+>>>>>>> origin/master
 msgid "Data"
 msgstr "Datos"
 
@@ -3013,9 +3192,15 @@ msgstr "MIME-type"
 #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57
 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177
 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:332 server_privileges.php:732
 #: server_privileges.php:735 server_privileges.php:791
 #: server_privileges.php:1554 server_privileges.php:2092
+=======
+#: libraries/replication_gui.lib.php:332 server_privileges.php:731
+#: server_privileges.php:734 server_privileges.php:790
+#: server_privileges.php:1537 server_privileges.php:2069
+>>>>>>> origin/master
 #: server_processlist.php:55 server_synchronize.php:1159
 msgid "Host"
 msgstr "Servidor"
@@ -3693,8 +3878,13 @@ msgstr ""
 
 #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59
 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:262 server_privileges.php:712
 #: server_privileges.php:715 server_privileges.php:722
+=======
+#: libraries/replication_gui.lib.php:262 server_privileges.php:711
+#: server_privileges.php:714 server_privileges.php:721
+>>>>>>> origin/master
 #: server_synchronize.php:1171
 msgid "User name"
 msgstr "Nombre de usuario"
@@ -3714,14 +3904,22 @@ msgstr "Mostrar el estado del esclavo"
 msgid "Slave status"
 msgstr "Mostrar el estado del esclavo"
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448
+=======
+#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445
+>>>>>>> origin/master
 #: server_status.php:737 server_variables.php:52
 msgid "Variable"
 msgstr "Variable"
 
 #: libraries/replication_gui.lib.php:118 server_status.php:738
 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138
+<<<<<<< HEAD
 #: tbl_structure.php:727
+=======
+#: tbl_structure.php:729
+>>>>>>> origin/master
 msgid "Value"
 msgstr "Valor"
 
@@ -3739,11 +3937,16 @@ msgstr ""
 msgid "Add slave replication user"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:257 server_privileges.php:717
+=======
+#: libraries/replication_gui.lib.php:257 server_privileges.php:716
+>>>>>>> origin/master
 msgid "Any user"
 msgstr "Cualquier usuario"
 
 #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:349 server_privileges.php:718
 #: server_privileges.php:785 server_privileges.php:809
 #: server_privileges.php:1950 server_privileges.php:1980
@@ -3767,6 +3970,31 @@ msgid "Use Host Table"
 msgstr "Usar la tabla Anfitrión (Host)"
 
 #: libraries/replication_gui.lib.php:334 server_privileges.php:793
+=======
+#: libraries/replication_gui.lib.php:349 server_privileges.php:717
+#: server_privileges.php:784 server_privileges.php:808
+#: server_privileges.php:1928 server_privileges.php:1958
+msgid "Use text field"
+msgstr "Use el campo de texto"
+
+#: libraries/replication_gui.lib.php:305 server_privileges.php:764
+msgid "Any host"
+msgstr "Cualquier servidor"
+
+#: libraries/replication_gui.lib.php:309 server_privileges.php:768
+msgid "Local"
+msgstr "Local"
+
+#: libraries/replication_gui.lib.php:315 server_privileges.php:773
+msgid "This Host"
+msgstr "Este Host"
+
+#: libraries/replication_gui.lib.php:321 server_privileges.php:779
+msgid "Use Host Table"
+msgstr "Usar la tabla Anfitrión (Host)"
+
+#: libraries/replication_gui.lib.php:334 server_privileges.php:792
+>>>>>>> origin/master
 msgid ""
 "When Host table is used, this field is ignored and values stored in Host "
 "table are used instead."
@@ -8202,10 +8430,13 @@ msgstr ""
 msgid "Show insert query"
 msgstr "Mostrando la consulta SQL"
 
+<<<<<<< HEAD
 #: tbl_change.php:1140
 msgid "and then"
 msgstr "y luego"
 
+=======
+>>>>>>> origin/master
 #: tbl_change.php:1144
 msgid "Go back to previous page"
 msgstr "Volver"
@@ -8402,6 +8633,7 @@ msgstr "Comprobar la integridad referencial:"
 msgid "Show tables"
 msgstr "Mostrar las tablas"
 
+<<<<<<< HEAD
 #: tbl_printview.php:309 tbl_structure.php:654
 msgid "Space usage"
 msgstr "Espacio utilizado"
@@ -8435,6 +8667,41 @@ msgid "Row length"
 msgstr "Longitud de la fila"
 
 #: tbl_printview.php:413 tbl_structure.php:791
+=======
+#: tbl_printview.php:309 tbl_structure.php:656
+msgid "Space usage"
+msgstr "Espacio utilizado"
+
+#: tbl_printview.php:313 tbl_structure.php:660
+msgid "Usage"
+msgstr "Uso"
+
+#: tbl_printview.php:340 tbl_structure.php:687
+msgid "Effective"
+msgstr "Efectivo/a"
+
+#: tbl_printview.php:365 tbl_structure.php:725
+msgid "Row Statistics"
+msgstr "Estadísticas de la fila"
+
+#: tbl_printview.php:368 tbl_structure.php:728
+msgid "Statements"
+msgstr "Enunciado"
+
+#: tbl_printview.php:379 tbl_structure.php:740
+msgid "static"
+msgstr ""
+
+#: tbl_printview.php:381 tbl_structure.php:742
+msgid "dynamic"
+msgstr "dinámico/a"
+
+#: tbl_printview.php:403 tbl_structure.php:785
+msgid "Row length"
+msgstr "Longitud de la fila"
+
+#: tbl_printview.php:413 tbl_structure.php:793
+>>>>>>> origin/master
 msgid " Row size "
 msgstr " Tamaño de la fila "
 
diff --git a/po/et.po b/po/et.po
index ce8c24672..e39ded23a 100755
--- a/po/et.po
+++ b/po/et.po
@@ -3,7 +3,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2010-07-03 21:45+0530\n"
+=======
+"POT-Creation-Date: 2010-07-03 09:00-0400\n"
+>>>>>>> origin/master
 "PO-Revision-Date: 2010-03-12 09:14+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: estonian <et@li.org>\n"
@@ -48,15 +52,26 @@ msgstr "Otsi"
 #: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046
 #: libraries/Theme_Manager.class.php:311
 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719
+<<<<<<< HEAD
 #: libraries/common.lib.php:1344 libraries/common.lib.php:2301
 #: libraries/display_change_password.lib.php:82
 #: libraries/display_create_table.lib.php:62
+=======
+#: libraries/common.lib.php:1335 libraries/common.lib.php:2288
+#: libraries/display_change_password.lib.php:82
+#: libraries/display_create_table.lib.php:63
+>>>>>>> origin/master
 #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532
 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76
 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104
+<<<<<<< HEAD
 #: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480
 #: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782
+=======
+#: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477
+#: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782
+>>>>>>> origin/master
 #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328
 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142
 #: server_privileges.php:665 server_privileges.php:1641
@@ -66,8 +81,13 @@ msgstr "Otsi"
 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171
 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265
 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561
+<<<<<<< HEAD
 #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560
 #: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512
+=======
+#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562
+#: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512
+>>>>>>> origin/master
 #: view_create.php:182 view_operations.php:101
 msgid "Go"
 msgstr "Mine"
@@ -120,10 +140,17 @@ msgstr "Väljade nimed"
 #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245
 #: libraries/export/latex.php:360 libraries/export/odt.php:297
 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100
+<<<<<<< HEAD
 #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093
 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
 #: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321
+=======
+#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070
+#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
+#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
+#: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321
+>>>>>>> origin/master
 msgid "Type"
 msgstr "Tüüp"
 
@@ -164,9 +191,15 @@ msgstr "Kommentaarid"
 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322
 #: libraries/export/latex.php:430 libraries/export/odt.php:368
 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263
+<<<<<<< HEAD
 #: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596
 #: server_privileges.php:1911 server_privileges.php:1916
 #: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228
+=======
+#: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579
+#: server_privileges.php:1889 server_privileges.php:1894
+#: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228
+>>>>>>> origin/master
 #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342
 msgid "No"
 msgstr "Ei"
@@ -180,9 +213,15 @@ msgstr "Ei"
 #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106
 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262
 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344
+<<<<<<< HEAD
 #: server_databases.php:64 server_privileges.php:1582
 #: server_privileges.php:1596 server_privileges.php:1911
 #: server_privileges.php:1914 server_privileges.php:2210 sql.php:193
+=======
+#: server_databases.php:64 server_privileges.php:1565
+#: server_privileges.php:1579 server_privileges.php:1889
+#: server_privileges.php:1892 server_privileges.php:2187 sql.php:193
+>>>>>>> origin/master
 #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350
 #: tbl_tracking.php:335 tbl_tracking.php:340
 msgid "Yes"
@@ -231,7 +270,15 @@ msgstr "Nimeta andmebaas ümber"
 msgid "Command"
 msgstr "Käsk"
 
+<<<<<<< HEAD
 #: db_operations.php:466
+=======
+#: db_operations.php:429 tbl_change.php:1140
+msgid "and then"
+msgstr "ja siis"
+
+#: db_operations.php:455
+>>>>>>> origin/master
 msgid "Copy database to"
 msgstr "Kopeeri andmebaas"
 
@@ -320,7 +367,11 @@ msgstr "Lubatud"
 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730
 #: server_collations.php:54 server_collations.php:66 server_databases.php:111
 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179
+<<<<<<< HEAD
 #: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326
+=======
+#: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326
+>>>>>>> origin/master
 msgid "Collation"
 msgstr "Määrang"
 
@@ -349,7 +400,11 @@ msgstr "Tabel"
 #: db_printview.php:105 libraries/db_structure.lib.php:56
 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146
 #: navigation.php:638 navigation.php:660 server_databases.php:122
+<<<<<<< HEAD
 #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775
+=======
+#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777
+>>>>>>> origin/master
 msgid "Rows"
 msgstr "Ridu"
 
@@ -364,19 +419,31 @@ msgstr "kasutusel"
 
 #: db_printview.php:187 libraries/db_info.inc.php:88
 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433
+<<<<<<< HEAD
 #: tbl_structure.php:807
+=======
+#: tbl_structure.php:809
+>>>>>>> origin/master
 msgid "Creation"
 msgstr "Loodud"
 
 #: db_printview.php:196 libraries/db_info.inc.php:93
 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443
+<<<<<<< HEAD
 #: tbl_structure.php:815
+=======
+#: tbl_structure.php:817
+>>>>>>> origin/master
 msgid "Last update"
 msgstr "Viimane muudatus"
 
 #: db_printview.php:205 libraries/db_info.inc.php:98
 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453
+<<<<<<< HEAD
 #: tbl_structure.php:823
+=======
+#: tbl_structure.php:825
+>>>>>>> origin/master
 msgid "Last check"
 msgstr "Viimane vaatamine"
 
@@ -441,7 +508,11 @@ msgstr "Del"
 
 #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553
 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779
+<<<<<<< HEAD
 #: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250
+=======
+#: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250
+>>>>>>> origin/master
 #: tbl_select.php:286
 msgid "Or"
 msgstr "või"
@@ -659,9 +730,15 @@ msgstr "Valitud:"
 msgid "Check All"
 msgstr "Märgista kõik"
 
+<<<<<<< HEAD
 #: db_structure.php:529 libraries/display_tbl.lib.php:2077
 #: libraries/replication_gui.lib.php:36 server_databases.php:350
 #: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460
+=======
+#: db_structure.php:531 libraries/display_tbl.lib.php:2077
+#: libraries/replication_gui.lib.php:36 server_databases.php:350
+#: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462
+>>>>>>> origin/master
 msgid "Uncheck All"
 msgstr "Puhasta kõik"
 
@@ -1130,10 +1207,17 @@ msgid "Prev"
 msgstr "Eelmine"
 
 #. l10n: Display text for next month link in calendar
+<<<<<<< HEAD
 #: js/messages.php:106 libraries/common.lib.php:2366
 #: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338
 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
 #: tbl_structure.php:799
+=======
+#: js/messages.php:77 libraries/common.lib.php:2353
+#: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338
+#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
+#: tbl_structure.php:801
+>>>>>>> origin/master
 msgid "Next"
 msgstr "Järgmine"
 
@@ -1675,7 +1759,11 @@ msgstr "Parool:"
 msgid "Server Choice"
 msgstr "Serveri valik"
 
+<<<<<<< HEAD
 #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63
+=======
+#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59
+>>>>>>> origin/master
 msgid "Cookies must be enabled past this point."
 msgstr "Küpsised(cookies) peavad alates sellest momendist lubatud olema."
 
@@ -1755,7 +1843,11 @@ msgstr ""
 "Ei suuda kasutada iconv-d või libiconvi või recode_string funktsiooni kuigi "
 "moodul on installitud Kontrollige oma PHP konfiguratsiooni."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:580
+=======
+#: libraries/common.inc.php:576
+>>>>>>> origin/master
 msgid ""
 "phpMyAdmin was unable to read your configuration file!<br />This might "
 "happen if PHP finds a parse error in it or PHP cannot find the file.<br /"
@@ -1771,13 +1863,21 @@ msgstr ""
 "kuskilt puudu ülakoma või semikoolon.<br />Kui Teile kuvatakse tühi leht on "
 "kõik korras."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:591
+=======
+#: libraries/common.inc.php:587
+>>>>>>> origin/master
 #, fuzzy, php-format
 #| msgid "Could not load default configuration from: \"%1$s\""
 msgid "Could not load default configuration from: %1$s"
 msgstr "Pole võimalik laadida vaikimisi seadete faili: \"%1$s\""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:596
+=======
+#: libraries/common.inc.php:592
+>>>>>>> origin/master
 msgid ""
 "The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
 "configuration file!"
@@ -1785,28 +1885,48 @@ msgstr ""
 "<tt>$cfg['PmaAbsoluteUri']</tt> konstant peab teie konfiguratsioonifailis "
 "määratud olema!"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:626
+=======
+#: libraries/common.inc.php:622
+>>>>>>> origin/master
 #, fuzzy, php-format
 #| msgid "Invalid server index: \"%s\""
 msgid "Invalid server index: %s"
 msgstr "Vigane serveri indeks: \"%s\""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:633
+=======
+#: libraries/common.inc.php:629
+>>>>>>> origin/master
 #, php-format
 msgid "Invalid hostname for server %1$s. Please review your configuration."
 msgstr "Vigane hostname serverile %1$s. Palun kontrolli seadeid."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:642 libraries/header.inc.php:100
+=======
+#: libraries/common.inc.php:638 libraries/header.inc.php:96
+>>>>>>> origin/master
 #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47
 #: main.php:185 test/theme.php:57
 msgid "Server"
 msgstr "Server"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:820
 msgid "Invalid authentication method set in configuration:"
 msgstr "Vigane autoriseerimise meetod konfiguratsioonifailis:"
 
 #: libraries/common.inc.php:923
+=======
+#: libraries/common.inc.php:816
+msgid "Invalid authentication method set in configuration:"
+msgstr "Vigane autoriseerimise meetod konfiguratsioonifailis:"
+
+#: libraries/common.inc.php:919
+>>>>>>> origin/master
 #, php-format
 msgid "You should upgrade to %s %s or later."
 msgstr "Te peaksite uuendama %s -i versioonini %s või uuemaks."
@@ -2055,7 +2175,11 @@ msgid ""
 msgstr "Võib olla umbkaudne. Vaadake FAQ 3.11"
 
 #: libraries/db_structure.lib.php:69 server_databases.php:142
+<<<<<<< HEAD
 #: tbl_printview.php:335 tbl_structure.php:680
+=======
+#: tbl_printview.php:335 tbl_structure.php:682
+>>>>>>> origin/master
 msgid "Overhead"
 msgstr "Ülejääv"
 
@@ -2082,22 +2206,36 @@ msgid "Change password"
 msgstr "Muuda parooli"
 
 #: libraries/display_change_password.lib.php:35
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:348 server_privileges.php:808
+=======
+#: libraries/replication_gui.lib.php:348 server_privileges.php:807
+>>>>>>> origin/master
 msgid "No Password"
 msgstr "Ilma paroolita"
 
 #: libraries/display_change_password.lib.php:41
 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63
 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:352 server_privileges.php:797
 #: server_privileges.php:801 server_privileges.php:812
 #: server_privileges.php:1555 server_synchronize.php:1175
+=======
+#: libraries/replication_gui.lib.php:352 server_privileges.php:796
+#: server_privileges.php:800 server_privileges.php:811
+#: server_privileges.php:1538 server_synchronize.php:1175
+>>>>>>> origin/master
 msgid "Password"
 msgstr "Parool"
 
 #: libraries/display_change_password.lib.php:46
 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359
+<<<<<<< HEAD
 #: server_privileges.php:816 server_privileges.php:819
+=======
+#: server_privileges.php:815 server_privileges.php:818
+>>>>>>> origin/master
 msgid "Re-type"
 msgstr "Sisesta uuesti"
 
@@ -2112,12 +2250,20 @@ msgid "MySQL 4.0 compatible"
 msgstr "MySQL&nbsp;4.0-iga ühilduv"
 
 #: libraries/display_change_password.lib.php:72
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:363 server_privileges.php:823
+=======
+#: libraries/replication_gui.lib.php:363 server_privileges.php:822
+>>>>>>> origin/master
 msgid "Generate Password"
 msgstr "Genereeri parool"
 
 #: libraries/display_change_password.lib.php:75
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:366 server_privileges.php:826
+=======
+#: libraries/replication_gui.lib.php:366 server_privileges.php:825
+>>>>>>> origin/master
 msgid "Generate"
 msgstr "Genereeri"
 
@@ -2205,7 +2351,11 @@ msgid "remember template"
 msgstr "jäta template meelde"
 
 #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552
+=======
+#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549
+>>>>>>> origin/master
 msgid "Character set of the file:"
 msgstr "Faili tähetabel:"
 
@@ -2258,7 +2408,11 @@ msgstr ""
 msgid "File to import"
 msgstr "Imporditav Fail"
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527
+=======
+#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524
+>>>>>>> origin/master
 msgid "Location of the text file"
 msgstr "tekstifaili asukoht"
 
@@ -2266,12 +2420,20 @@ msgstr "tekstifaili asukoht"
 msgid "File uploads are not allowed on this server."
 msgstr "Faile pole lubatud laadida sellesse serverisse."
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536
+=======
+#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533
+>>>>>>> origin/master
 #: tbl_change.php:1025
 msgid "The directory you set for upload work cannot be reached"
 msgstr "Kataloog mille Te üleslaadimiseks sättisite ei ole ligipääsetav"
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539
+=======
+#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536
+>>>>>>> origin/master
 #: tbl_change.php:1028
 msgid "web server upload directory"
 msgstr "webiserveri üleslaadimiskataloogi"
@@ -2405,7 +2567,11 @@ msgstr "Sorteeri võtme järgi"
 #: libraries/import/docsql.php:34 libraries/import/ldi.php:47
 #: libraries/import/ods.php:30 libraries/import/sql.php:20
 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26
+<<<<<<< HEAD
 #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751
+=======
+#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753
+>>>>>>> origin/master
 #, fuzzy
 msgid "Options"
 msgstr "Tegevused"
@@ -2554,7 +2720,11 @@ msgstr "Puhverdusala kasutamine"
 
 #: libraries/engines/innodb.lib.php:194 server_databases.php:137
 #: server_databases.php:305 server_status.php:525 server_status.php:586
+<<<<<<< HEAD
 #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694
+=======
+#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696
+>>>>>>> origin/master
 msgid "Total"
 msgstr "Kokku"
 
@@ -2815,7 +2985,11 @@ msgid ""
 msgstr ""
 
 #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88
+<<<<<<< HEAD
 #: tbl_printview.php:375 tbl_structure.php:735
+=======
+#: tbl_printview.php:375 tbl_structure.php:737
+>>>>>>> origin/master
 msgid "Format"
 msgstr "Formaat"
 
@@ -2887,8 +3061,13 @@ msgstr "Microsoft Word 2000"
 #: libraries/export/latex.php:201 libraries/export/odt.php:48
 #: libraries/export/sql.php:106 libraries/export/sql.php:868
 #: libraries/export/texytext.php:27 server_databases.php:127
+<<<<<<< HEAD
 #: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316
 #: tbl_structure.php:663
+=======
+#: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316
+#: tbl_structure.php:665
+>>>>>>> origin/master
 msgid "Data"
 msgstr "Andmed"
 
@@ -2937,9 +3116,15 @@ msgstr "MIME-tüüp"
 #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57
 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177
 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:332 server_privileges.php:732
 #: server_privileges.php:735 server_privileges.php:791
 #: server_privileges.php:1554 server_privileges.php:2092
+=======
+#: libraries/replication_gui.lib.php:332 server_privileges.php:731
+#: server_privileges.php:734 server_privileges.php:790
+#: server_privileges.php:1537 server_privileges.php:2069
+>>>>>>> origin/master
 #: server_processlist.php:55 server_synchronize.php:1159
 msgid "Host"
 msgstr "Masin"
@@ -3611,8 +3796,13 @@ msgstr ""
 
 #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59
 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:262 server_privileges.php:712
 #: server_privileges.php:715 server_privileges.php:722
+=======
+#: libraries/replication_gui.lib.php:262 server_privileges.php:711
+#: server_privileges.php:714 server_privileges.php:721
+>>>>>>> origin/master
 #: server_synchronize.php:1171
 msgid "User name"
 msgstr "Kasutajanimi"
@@ -3632,14 +3822,22 @@ msgstr "Näita alluvate(slave) staatust"
 msgid "Slave status"
 msgstr "Näita alluvate(slave) staatust"
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448
+=======
+#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445
+>>>>>>> origin/master
 #: server_status.php:737 server_variables.php:52
 msgid "Variable"
 msgstr "Muutuja"
 
 #: libraries/replication_gui.lib.php:118 server_status.php:738
 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138
+<<<<<<< HEAD
 #: tbl_structure.php:727
+=======
+#: tbl_structure.php:729
+>>>>>>> origin/master
 msgid "Value"
 msgstr "Väärtus"
 
@@ -3657,11 +3855,16 @@ msgstr ""
 msgid "Add slave replication user"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:257 server_privileges.php:717
+=======
+#: libraries/replication_gui.lib.php:257 server_privileges.php:716
+>>>>>>> origin/master
 msgid "Any user"
 msgstr "Kõik kasutajad"
 
 #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:349 server_privileges.php:718
 #: server_privileges.php:785 server_privileges.php:809
 #: server_privileges.php:1950 server_privileges.php:1980
@@ -3685,6 +3888,31 @@ msgid "Use Host Table"
 msgstr "Kasuta host tabelit"
 
 #: libraries/replication_gui.lib.php:334 server_privileges.php:793
+=======
+#: libraries/replication_gui.lib.php:349 server_privileges.php:717
+#: server_privileges.php:784 server_privileges.php:808
+#: server_privileges.php:1928 server_privileges.php:1958
+msgid "Use text field"
+msgstr "Kasutage tekstivälja"
+
+#: libraries/replication_gui.lib.php:305 server_privileges.php:764
+msgid "Any host"
+msgstr "Kõik masinad"
+
+#: libraries/replication_gui.lib.php:309 server_privileges.php:768
+msgid "Local"
+msgstr "Lokaalne"
+
+#: libraries/replication_gui.lib.php:315 server_privileges.php:773
+msgid "This Host"
+msgstr "Antud host"
+
+#: libraries/replication_gui.lib.php:321 server_privileges.php:779
+msgid "Use Host Table"
+msgstr "Kasuta host tabelit"
+
+#: libraries/replication_gui.lib.php:334 server_privileges.php:792
+>>>>>>> origin/master
 msgid ""
 "When Host table is used, this field is ignored and values stored in Host "
 "table are used instead."
@@ -7900,10 +8128,13 @@ msgstr ""
 msgid "Show insert query"
 msgstr "Näitan SQL päringut"
 
+<<<<<<< HEAD
 #: tbl_change.php:1140
 msgid "and then"
 msgstr "ja siis"
 
+=======
+>>>>>>> origin/master
 #: tbl_change.php:1144
 msgid "Go back to previous page"
 msgstr "Mine eelmisele lehele tagasi"
@@ -8102,6 +8333,7 @@ msgstr "Kontrolli pärinevust:"
 msgid "Show tables"
 msgstr "Näita tabeleid"
 
+<<<<<<< HEAD
 #: tbl_printview.php:309 tbl_structure.php:654
 msgid "Space usage"
 msgstr "Ruumivõtt"
@@ -8135,6 +8367,41 @@ msgid "Row length"
 msgstr "Rea pikkus"
 
 #: tbl_printview.php:413 tbl_structure.php:791
+=======
+#: tbl_printview.php:309 tbl_structure.php:656
+msgid "Space usage"
+msgstr "Ruumivõtt"
+
+#: tbl_printview.php:313 tbl_structure.php:660
+msgid "Usage"
+msgstr "Kasutus"
+
+#: tbl_printview.php:340 tbl_structure.php:687
+msgid "Effective"
+msgstr "Efektiivne"
+
+#: tbl_printview.php:365 tbl_structure.php:725
+msgid "Row Statistics"
+msgstr "Rea statistika"
+
+#: tbl_printview.php:368 tbl_structure.php:728
+msgid "Statements"
+msgstr "Parameerid"
+
+#: tbl_printview.php:379 tbl_structure.php:740
+msgid "static"
+msgstr ""
+
+#: tbl_printview.php:381 tbl_structure.php:742
+msgid "dynamic"
+msgstr "dünaamiline"
+
+#: tbl_printview.php:403 tbl_structure.php:785
+msgid "Row length"
+msgstr "Rea pikkus"
+
+#: tbl_printview.php:413 tbl_structure.php:793
+>>>>>>> origin/master
 msgid " Row size "
 msgstr " rea suurus "
 
diff --git a/po/eu.po b/po/eu.po
index 831c6b224..b95e53f4e 100755
--- a/po/eu.po
+++ b/po/eu.po
@@ -3,7 +3,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2010-07-03 21:45+0530\n"
+=======
+"POT-Creation-Date: 2010-07-03 09:00-0400\n"
+>>>>>>> origin/master
 "PO-Revision-Date: 2010-03-31 10:40+0200\n"
 "Last-Translator:  <hey_neken@mundurat.net>\n"
 "Language-Team: basque <eu@li.org>\n"
@@ -49,15 +53,26 @@ msgstr "Bilatu"
 #: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046
 #: libraries/Theme_Manager.class.php:311
 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719
+<<<<<<< HEAD
 #: libraries/common.lib.php:1344 libraries/common.lib.php:2301
 #: libraries/display_change_password.lib.php:82
 #: libraries/display_create_table.lib.php:62
+=======
+#: libraries/common.lib.php:1335 libraries/common.lib.php:2288
+#: libraries/display_change_password.lib.php:82
+#: libraries/display_create_table.lib.php:63
+>>>>>>> origin/master
 #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532
 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76
 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104
+<<<<<<< HEAD
 #: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480
 #: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782
+=======
+#: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477
+#: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782
+>>>>>>> origin/master
 #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328
 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142
 #: server_privileges.php:665 server_privileges.php:1641
@@ -67,8 +82,13 @@ msgstr "Bilatu"
 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171
 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265
 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561
+<<<<<<< HEAD
 #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560
 #: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512
+=======
+#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562
+#: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512
+>>>>>>> origin/master
 #: view_create.php:182 view_operations.php:101
 msgid "Go"
 msgstr "Joan"
@@ -121,10 +141,17 @@ msgstr "Zutabe izenak"
 #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245
 #: libraries/export/latex.php:360 libraries/export/odt.php:297
 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100
+<<<<<<< HEAD
 #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093
 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
 #: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321
+=======
+#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070
+#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
+#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
+#: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321
+>>>>>>> origin/master
 msgid "Type"
 msgstr "Mota"
 
@@ -165,9 +192,15 @@ msgstr "Iruzkinak"
 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322
 #: libraries/export/latex.php:430 libraries/export/odt.php:368
 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263
+<<<<<<< HEAD
 #: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596
 #: server_privileges.php:1911 server_privileges.php:1916
 #: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228
+=======
+#: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579
+#: server_privileges.php:1889 server_privileges.php:1894
+#: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228
+>>>>>>> origin/master
 #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342
 msgid "No"
 msgstr "Ez"
@@ -181,9 +214,15 @@ msgstr "Ez"
 #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106
 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262
 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344
+<<<<<<< HEAD
 #: server_databases.php:64 server_privileges.php:1582
 #: server_privileges.php:1596 server_privileges.php:1911
 #: server_privileges.php:1914 server_privileges.php:2210 sql.php:193
+=======
+#: server_databases.php:64 server_privileges.php:1565
+#: server_privileges.php:1579 server_privileges.php:1889
+#: server_privileges.php:1892 server_privileges.php:2187 sql.php:193
+>>>>>>> origin/master
 #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350
 #: tbl_tracking.php:335 tbl_tracking.php:340
 msgid "Yes"
@@ -234,7 +273,15 @@ msgstr "Taula berrizendatu izen honetara: "
 msgid "Command"
 msgstr "Komandoa"
 
+<<<<<<< HEAD
 #: db_operations.php:466
+=======
+#: db_operations.php:429 tbl_change.php:1140
+msgid "and then"
+msgstr "eta orduan"
+
+#: db_operations.php:455
+>>>>>>> origin/master
 #, fuzzy
 msgid "Copy database to"
 msgstr "Datu-baserik ez"
@@ -325,7 +372,11 @@ msgstr "Gaituta"
 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730
 #: server_collations.php:54 server_collations.php:66 server_databases.php:111
 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179
+<<<<<<< HEAD
 #: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326
+=======
+#: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326
+>>>>>>> origin/master
 msgid "Collation"
 msgstr "Ordenamendua"
 
@@ -354,7 +405,11 @@ msgstr "Taula"
 #: db_printview.php:105 libraries/db_structure.lib.php:56
 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146
 #: navigation.php:638 navigation.php:660 server_databases.php:122
+<<<<<<< HEAD
 #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775
+=======
+#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777
+>>>>>>> origin/master
 msgid "Rows"
 msgstr "Errenkadak"
 
@@ -369,19 +424,31 @@ msgstr "lanean"
 
 #: db_printview.php:187 libraries/db_info.inc.php:88
 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433
+<<<<<<< HEAD
 #: tbl_structure.php:807
+=======
+#: tbl_structure.php:809
+>>>>>>> origin/master
 msgid "Creation"
 msgstr "Sortzea"
 
 #: db_printview.php:196 libraries/db_info.inc.php:93
 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443
+<<<<<<< HEAD
 #: tbl_structure.php:815
+=======
+#: tbl_structure.php:817
+>>>>>>> origin/master
 msgid "Last update"
 msgstr "Azken eguneraketa"
 
 #: db_printview.php:205 libraries/db_info.inc.php:98
 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453
+<<<<<<< HEAD
 #: tbl_structure.php:823
+=======
+#: tbl_structure.php:825
+>>>>>>> origin/master
 msgid "Last check"
 msgstr "Azken egiaztapena"
 
@@ -446,7 +513,11 @@ msgstr "Ezabatu"
 
 #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553
 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779
+<<<<<<< HEAD
 #: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250
+=======
+#: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250
+>>>>>>> origin/master
 #: tbl_select.php:286
 msgid "Or"
 msgstr "Edo"
@@ -665,9 +736,15 @@ msgstr "Ikurdunak:"
 msgid "Check All"
 msgstr "Guztiak egiaztatu"
 
+<<<<<<< HEAD
 #: db_structure.php:529 libraries/display_tbl.lib.php:2077
 #: libraries/replication_gui.lib.php:36 server_databases.php:350
 #: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460
+=======
+#: db_structure.php:531 libraries/display_tbl.lib.php:2077
+#: libraries/replication_gui.lib.php:36 server_databases.php:350
+#: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462
+>>>>>>> origin/master
 msgid "Uncheck All"
 msgstr "Desautatu dena"
 
@@ -1122,10 +1199,17 @@ msgid "Prev"
 msgstr "Aurrekoa"
 
 #. l10n: Display text for next month link in calendar
+<<<<<<< HEAD
 #: js/messages.php:106 libraries/common.lib.php:2366
 #: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338
 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
 #: tbl_structure.php:799
+=======
+#: js/messages.php:77 libraries/common.lib.php:2353
+#: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338
+#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
+#: tbl_structure.php:801
+>>>>>>> origin/master
 msgid "Next"
 msgstr "Hurrengoa"
 
@@ -1662,7 +1746,11 @@ msgstr "Pasahitza:"
 msgid "Server Choice"
 msgstr "Zerbitzariaren hautaketa"
 
+<<<<<<< HEAD
 #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63
+=======
+#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59
+>>>>>>> origin/master
 msgid "Cookies must be enabled past this point."
 msgstr "Puntu honetarako cookie-ek gaituta egon behar dute."
 
@@ -1742,7 +1830,11 @@ msgstr ""
 "Ezin dira erabili ez iconv, ez libiconv ezta recode_string funtzioa "
 "luzapenen txostena kargatzen den bitartean. Berpasatu php-ren konfigurazioa."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:580
+=======
+#: libraries/common.inc.php:576
+>>>>>>> origin/master
 msgid ""
 "phpMyAdmin was unable to read your configuration file!<br />This might "
 "happen if PHP finds a parse error in it or PHP cannot find the file.<br /"
@@ -1759,12 +1851,20 @@ msgstr ""
 "nonbait ez egoteak sortzen du arazoa.<br />Orria txuriz jasoz gero, dena "
 "ondo legoke."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:591
+=======
+#: libraries/common.inc.php:587
+>>>>>>> origin/master
 #, php-format
 msgid "Could not load default configuration from: %1$s"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:596
+=======
+#: libraries/common.inc.php:592
+>>>>>>> origin/master
 msgid ""
 "The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
 "configuration file!"
@@ -1772,27 +1872,47 @@ msgstr ""
 "<tt>$cfg['PmaAbsoluteUri']</tt> direktibak zure konfigurazio fitxategian "
 "zehaztuta behar du egon!"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:626
+=======
+#: libraries/common.inc.php:622
+>>>>>>> origin/master
 #, php-format
 msgid "Invalid server index: %s"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:633
+=======
+#: libraries/common.inc.php:629
+>>>>>>> origin/master
 #, php-format
 msgid "Invalid hostname for server %1$s. Please review your configuration."
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:642 libraries/header.inc.php:100
+=======
+#: libraries/common.inc.php:638 libraries/header.inc.php:96
+>>>>>>> origin/master
 #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47
 #: main.php:185 test/theme.php:57
 msgid "Server"
 msgstr "Zerbitzaria"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:820
 msgid "Invalid authentication method set in configuration:"
 msgstr ""
 
 #: libraries/common.inc.php:923
+=======
+#: libraries/common.inc.php:816
+msgid "Invalid authentication method set in configuration:"
+msgstr ""
+
+#: libraries/common.inc.php:919
+>>>>>>> origin/master
 #, php-format
 msgid "You should upgrade to %s %s or later."
 msgstr "%s %s bertsiora edo handiago batera eguneratu beharko zenuke."
@@ -2038,7 +2158,11 @@ msgid ""
 msgstr ""
 
 #: libraries/db_structure.lib.php:69 server_databases.php:142
+<<<<<<< HEAD
 #: tbl_printview.php:335 tbl_structure.php:680
+=======
+#: tbl_printview.php:335 tbl_structure.php:682
+>>>>>>> origin/master
 msgid "Overhead"
 msgstr "Arazteko hondakina"
 
@@ -2065,22 +2189,36 @@ msgid "Change password"
 msgstr "Pasahitza aldatu"
 
 #: libraries/display_change_password.lib.php:35
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:348 server_privileges.php:808
+=======
+#: libraries/replication_gui.lib.php:348 server_privileges.php:807
+>>>>>>> origin/master
 msgid "No Password"
 msgstr "Pasahitzik ez"
 
 #: libraries/display_change_password.lib.php:41
 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63
 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:352 server_privileges.php:797
 #: server_privileges.php:801 server_privileges.php:812
 #: server_privileges.php:1555 server_synchronize.php:1175
+=======
+#: libraries/replication_gui.lib.php:352 server_privileges.php:796
+#: server_privileges.php:800 server_privileges.php:811
+#: server_privileges.php:1538 server_synchronize.php:1175
+>>>>>>> origin/master
 msgid "Password"
 msgstr "Pasahitza"
 
 #: libraries/display_change_password.lib.php:46
 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359
+<<<<<<< HEAD
 #: server_privileges.php:816 server_privileges.php:819
+=======
+#: server_privileges.php:815 server_privileges.php:818
+>>>>>>> origin/master
 msgid "Re-type"
 msgstr "Berridatzi"
 
@@ -2093,12 +2231,20 @@ msgid "MySQL 4.0 compatible"
 msgstr ""
 
 #: libraries/display_change_password.lib.php:72
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:363 server_privileges.php:823
+=======
+#: libraries/replication_gui.lib.php:363 server_privileges.php:822
+>>>>>>> origin/master
 msgid "Generate Password"
 msgstr ""
 
 #: libraries/display_change_password.lib.php:75
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:366 server_privileges.php:826
+=======
+#: libraries/replication_gui.lib.php:366 server_privileges.php:825
+>>>>>>> origin/master
 #, fuzzy
 msgid "Generate"
 msgstr "Egilea:"
@@ -2185,7 +2331,11 @@ msgid "remember template"
 msgstr "txantiloia gogoratu"
 
 #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552
+=======
+#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549
+>>>>>>> origin/master
 msgid "Character set of the file:"
 msgstr "Fitxategiaren karaktereen kodeketa:"
 
@@ -2238,7 +2388,11 @@ msgstr ""
 msgid "File to import"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527
+=======
+#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524
+>>>>>>> origin/master
 msgid "Location of the text file"
 msgstr "Testu-fitxategiaren kokapena"
 
@@ -2246,12 +2400,20 @@ msgstr "Testu-fitxategiaren kokapena"
 msgid "File uploads are not allowed on this server."
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536
+=======
+#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533
+>>>>>>> origin/master
 #: tbl_change.php:1025
 msgid "The directory you set for upload work cannot be reached"
 msgstr "Igoerentzat ezarri duzun direktorioa ez dago eskuragarri"
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539
+=======
+#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536
+>>>>>>> origin/master
 #: tbl_change.php:1028
 msgid "web server upload directory"
 msgstr "Fitxategiak igotzeko web-zerbitzariaren direktorioa"
@@ -2380,7 +2542,11 @@ msgstr "Gakoaren arabera ordenatu"
 #: libraries/import/docsql.php:34 libraries/import/ldi.php:47
 #: libraries/import/ods.php:30 libraries/import/sql.php:20
 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26
+<<<<<<< HEAD
 #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751
+=======
+#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753
+>>>>>>> origin/master
 #, fuzzy
 msgid "Options"
 msgstr "Eragiketak"
@@ -2527,7 +2693,11 @@ msgstr ""
 
 #: libraries/engines/innodb.lib.php:194 server_databases.php:137
 #: server_databases.php:305 server_status.php:525 server_status.php:586
+<<<<<<< HEAD
 #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694
+=======
+#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696
+>>>>>>> origin/master
 msgid "Total"
 msgstr "Gutira"
 
@@ -2773,7 +2943,11 @@ msgid ""
 msgstr ""
 
 #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88
+<<<<<<< HEAD
 #: tbl_printview.php:375 tbl_structure.php:735
+=======
+#: tbl_printview.php:375 tbl_structure.php:737
+>>>>>>> origin/master
 msgid "Format"
 msgstr "Formatoa"
 
@@ -2845,8 +3019,13 @@ msgstr ""
 #: libraries/export/latex.php:201 libraries/export/odt.php:48
 #: libraries/export/sql.php:106 libraries/export/sql.php:868
 #: libraries/export/texytext.php:27 server_databases.php:127
+<<<<<<< HEAD
 #: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316
 #: tbl_structure.php:663
+=======
+#: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316
+#: tbl_structure.php:665
+>>>>>>> origin/master
 msgid "Data"
 msgstr "Datuak"
 
@@ -2896,9 +3075,15 @@ msgstr "MIME-mota"
 #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57
 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177
 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:332 server_privileges.php:732
 #: server_privileges.php:735 server_privileges.php:791
 #: server_privileges.php:1554 server_privileges.php:2092
+=======
+#: libraries/replication_gui.lib.php:332 server_privileges.php:731
+#: server_privileges.php:734 server_privileges.php:790
+#: server_privileges.php:1537 server_privileges.php:2069
+>>>>>>> origin/master
 #: server_processlist.php:55 server_synchronize.php:1159
 msgid "Host"
 msgstr "Zerbitzaria"
@@ -3575,8 +3760,13 @@ msgstr ""
 
 #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59
 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:262 server_privileges.php:712
 #: server_privileges.php:715 server_privileges.php:722
+=======
+#: libraries/replication_gui.lib.php:262 server_privileges.php:711
+#: server_privileges.php:714 server_privileges.php:721
+>>>>>>> origin/master
 #: server_synchronize.php:1171
 msgid "User name"
 msgstr "Erabiltzaile-izena"
@@ -3594,14 +3784,22 @@ msgstr ""
 msgid "Slave status"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448
+=======
+#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445
+>>>>>>> origin/master
 #: server_status.php:737 server_variables.php:52
 msgid "Variable"
 msgstr "Aldagaia"
 
 #: libraries/replication_gui.lib.php:118 server_status.php:738
 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138
+<<<<<<< HEAD
 #: tbl_structure.php:727
+=======
+#: tbl_structure.php:729
+>>>>>>> origin/master
 msgid "Value"
 msgstr "balioa"
 
@@ -3620,11 +3818,16 @@ msgstr ""
 msgid "Add slave replication user"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:257 server_privileges.php:717
+=======
+#: libraries/replication_gui.lib.php:257 server_privileges.php:716
+>>>>>>> origin/master
 msgid "Any user"
 msgstr "Edozein erabiltzaile"
 
 #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:349 server_privileges.php:718
 #: server_privileges.php:785 server_privileges.php:809
 #: server_privileges.php:1950 server_privileges.php:1980
@@ -3648,6 +3851,31 @@ msgid "Use Host Table"
 msgstr "Host taula erabili"
 
 #: libraries/replication_gui.lib.php:334 server_privileges.php:793
+=======
+#: libraries/replication_gui.lib.php:349 server_privileges.php:717
+#: server_privileges.php:784 server_privileges.php:808
+#: server_privileges.php:1928 server_privileges.php:1958
+msgid "Use text field"
+msgstr "Testu-eremua erabili"
+
+#: libraries/replication_gui.lib.php:305 server_privileges.php:764
+msgid "Any host"
+msgstr "Edozein ostalari"
+
+#: libraries/replication_gui.lib.php:309 server_privileges.php:768
+msgid "Local"
+msgstr "Lokal"
+
+#: libraries/replication_gui.lib.php:315 server_privileges.php:773
+msgid "This Host"
+msgstr "Host hau"
+
+#: libraries/replication_gui.lib.php:321 server_privileges.php:779
+msgid "Use Host Table"
+msgstr "Host taula erabili"
+
+#: libraries/replication_gui.lib.php:334 server_privileges.php:792
+>>>>>>> origin/master
 msgid ""
 "When Host table is used, this field is ignored and values stored in Host "
 "table are used instead."
@@ -7719,10 +7947,13 @@ msgstr ""
 msgid "Show insert query"
 msgstr ""
 
+<<<<<<< HEAD
 #: tbl_change.php:1140
 msgid "and then"
 msgstr "eta orduan"
 
+=======
+>>>>>>> origin/master
 #: tbl_change.php:1144
 msgid "Go back to previous page"
 msgstr "Itzuli"
@@ -7920,6 +8151,7 @@ msgstr "Erreferentzien integritatea egiaztatu:"
 msgid "Show tables"
 msgstr "Taulak erakutsi"
 
+<<<<<<< HEAD
 #: tbl_printview.php:309 tbl_structure.php:654
 msgid "Space usage"
 msgstr "Erabilitako lekua"
@@ -7953,6 +8185,41 @@ msgid "Row length"
 msgstr "Errenkadaren luzera"
 
 #: tbl_printview.php:413 tbl_structure.php:791
+=======
+#: tbl_printview.php:309 tbl_structure.php:656
+msgid "Space usage"
+msgstr "Erabilitako lekua"
+
+#: tbl_printview.php:313 tbl_structure.php:660
+msgid "Usage"
+msgstr "Erabilpena"
+
+#: tbl_printview.php:340 tbl_structure.php:687
+msgid "Effective"
+msgstr "Eraginkorra"
+
+#: tbl_printview.php:365 tbl_structure.php:725
+msgid "Row Statistics"
+msgstr "Errenkadaren estatistikak"
+
+#: tbl_printview.php:368 tbl_structure.php:728
+msgid "Statements"
+msgstr "Sententziak"
+
+#: tbl_printview.php:379 tbl_structure.php:740
+msgid "static"
+msgstr ""
+
+#: tbl_printview.php:381 tbl_structure.php:742
+msgid "dynamic"
+msgstr "dinamikoa"
+
+#: tbl_printview.php:403 tbl_structure.php:785
+msgid "Row length"
+msgstr "Errenkadaren luzera"
+
+#: tbl_printview.php:413 tbl_structure.php:793
+>>>>>>> origin/master
 msgid " Row size "
 msgstr " Errenkadaren tamaina "
 
diff --git a/po/fa.po b/po/fa.po
index 7b5cc942f..5331ebfd7 100755
--- a/po/fa.po
+++ b/po/fa.po
@@ -3,7 +3,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2010-07-03 21:45+0530\n"
+=======
+"POT-Creation-Date: 2010-07-03 09:00-0400\n"
+>>>>>>> origin/master
 "PO-Revision-Date: 2010-05-19 03:54+0200\n"
 "Last-Translator:  <ahmad_usa2007@yahoo.com>\n"
 "Language-Team: persian <fa@li.org>\n"
@@ -46,15 +50,26 @@ msgstr "جستجو"
 #: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046
 #: libraries/Theme_Manager.class.php:311
 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719
+<<<<<<< HEAD
 #: libraries/common.lib.php:1344 libraries/common.lib.php:2301
 #: libraries/display_change_password.lib.php:82
 #: libraries/display_create_table.lib.php:62
+=======
+#: libraries/common.lib.php:1335 libraries/common.lib.php:2288
+#: libraries/display_change_password.lib.php:82
+#: libraries/display_create_table.lib.php:63
+>>>>>>> origin/master
 #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532
 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76
 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104
+<<<<<<< HEAD
 #: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480
 #: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782
+=======
+#: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477
+#: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782
+>>>>>>> origin/master
 #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328
 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142
 #: server_privileges.php:665 server_privileges.php:1641
@@ -64,8 +79,13 @@ msgstr "جستجو"
 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171
 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265
 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561
+<<<<<<< HEAD
 #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560
 #: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512
+=======
+#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562
+#: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512
+>>>>>>> origin/master
 #: view_create.php:182 view_operations.php:101
 msgid "Go"
 msgstr "تاييد"
@@ -119,10 +139,17 @@ msgstr "نام ستونها"
 #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245
 #: libraries/export/latex.php:360 libraries/export/odt.php:297
 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100
+<<<<<<< HEAD
 #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093
 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
 #: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321
+=======
+#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070
+#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
+#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
+#: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321
+>>>>>>> origin/master
 msgid "Type"
 msgstr "نوع"
 
@@ -163,9 +190,15 @@ msgstr "توضيحات"
 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322
 #: libraries/export/latex.php:430 libraries/export/odt.php:368
 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263
+<<<<<<< HEAD
 #: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596
 #: server_privileges.php:1911 server_privileges.php:1916
 #: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228
+=======
+#: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579
+#: server_privileges.php:1889 server_privileges.php:1894
+#: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228
+>>>>>>> origin/master
 #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342
 msgid "No"
 msgstr "خير"
@@ -179,9 +212,15 @@ msgstr "خير"
 #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106
 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262
 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344
+<<<<<<< HEAD
 #: server_databases.php:64 server_privileges.php:1582
 #: server_privileges.php:1596 server_privileges.php:1911
 #: server_privileges.php:1914 server_privileges.php:2210 sql.php:193
+=======
+#: server_databases.php:64 server_privileges.php:1565
+#: server_privileges.php:1579 server_privileges.php:1889
+#: server_privileges.php:1892 server_privileges.php:2187 sql.php:193
+>>>>>>> origin/master
 #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350
 #: tbl_tracking.php:335 tbl_tracking.php:340
 msgid "Yes"
@@ -232,7 +271,15 @@ msgstr "بازناميدن جدول به"
 msgid "Command"
 msgstr "دستور"
 
+<<<<<<< HEAD
 #: db_operations.php:466
+=======
+#: db_operations.php:429 tbl_change.php:1140
+msgid "and then"
+msgstr "و سپس"
+
+#: db_operations.php:455
+>>>>>>> origin/master
 #, fuzzy
 msgid "Copy database to"
 msgstr "No databases"
@@ -320,7 +367,11 @@ msgstr "فعال"
 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730
 #: server_collations.php:54 server_collations.php:66 server_databases.php:111
 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179
+<<<<<<< HEAD
 #: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326
+=======
+#: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326
+>>>>>>> origin/master
 msgid "Collation"
 msgstr "مقایسه"
 
@@ -349,7 +400,11 @@ msgstr "جدول"
 #: db_printview.php:105 libraries/db_structure.lib.php:56
 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146
 #: navigation.php:638 navigation.php:660 server_databases.php:122
+<<<<<<< HEAD
 #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775
+=======
+#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777
+>>>>>>> origin/master
 msgid "Rows"
 msgstr "سطرها"
 
@@ -364,20 +419,32 @@ msgstr "in use"
 
 #: db_printview.php:187 libraries/db_info.inc.php:88
 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433
+<<<<<<< HEAD
 #: tbl_structure.php:807
+=======
+#: tbl_structure.php:809
+>>>>>>> origin/master
 #, fuzzy
 msgid "Creation"
 msgstr "ساختن"
 
 #: db_printview.php:196 libraries/db_info.inc.php:93
 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443
+<<<<<<< HEAD
 #: tbl_structure.php:815
+=======
+#: tbl_structure.php:817
+>>>>>>> origin/master
 msgid "Last update"
 msgstr ""
 
 #: db_printview.php:205 libraries/db_info.inc.php:98
 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453
+<<<<<<< HEAD
 #: tbl_structure.php:823
+=======
+#: tbl_structure.php:825
+>>>>>>> origin/master
 msgid "Last check"
 msgstr ""
 
@@ -441,7 +508,11 @@ msgstr "Del"
 
 #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553
 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779
+<<<<<<< HEAD
 #: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250
+=======
+#: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250
+>>>>>>> origin/master
 #: tbl_select.php:286
 msgid "Or"
 msgstr "يا"
@@ -659,9 +730,15 @@ msgstr "موارد انتخاب‌شده :"
 msgid "Check All"
 msgstr "انتخاب همه"
 
+<<<<<<< HEAD
 #: db_structure.php:529 libraries/display_tbl.lib.php:2077
 #: libraries/replication_gui.lib.php:36 server_databases.php:350
 #: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460
+=======
+#: db_structure.php:531 libraries/display_tbl.lib.php:2077
+#: libraries/replication_gui.lib.php:36 server_databases.php:350
+#: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462
+>>>>>>> origin/master
 msgid "Uncheck All"
 msgstr "عدم انتخاب همه"
 
@@ -1106,10 +1183,17 @@ msgid "Prev"
 msgstr "قبل"
 
 #. l10n: Display text for next month link in calendar
+<<<<<<< HEAD
 #: js/messages.php:106 libraries/common.lib.php:2366
 #: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338
 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
 #: tbl_structure.php:799
+=======
+#: js/messages.php:77 libraries/common.lib.php:2353
+#: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338
+#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
+#: tbl_structure.php:801
+>>>>>>> origin/master
 msgid "Next"
 msgstr "بعد"
 
@@ -1639,7 +1723,11 @@ msgstr "اسم رمز:"
 msgid "Server Choice"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63
+=======
+#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59
+>>>>>>> origin/master
 msgid "Cookies must be enabled past this point."
 msgstr ""
 
@@ -1717,7 +1805,11 @@ msgid ""
 "necessary extensions appear to be loaded. Check your PHP configuration."
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:580
+=======
+#: libraries/common.inc.php:576
+>>>>>>> origin/master
 msgid ""
 "phpMyAdmin was unable to read your configuration file!<br />This might "
 "happen if PHP finds a parse error in it or PHP cannot find the file.<br /"
@@ -1733,38 +1825,66 @@ msgstr ""
 "(\" ; \") در جايي وجود ندارد.<br />اگر يك صفحه خالي دريافت كرديد ، همه چيز "
 "درست است."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:591
+=======
+#: libraries/common.inc.php:587
+>>>>>>> origin/master
 #, php-format
 msgid "Could not load default configuration from: %1$s"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:596
+=======
+#: libraries/common.inc.php:592
+>>>>>>> origin/master
 msgid ""
 "The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
 "configuration file!"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:626
+=======
+#: libraries/common.inc.php:622
+>>>>>>> origin/master
 #, php-format
 msgid "Invalid server index: %s"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:633
+=======
+#: libraries/common.inc.php:629
+>>>>>>> origin/master
 #, php-format
 msgid "Invalid hostname for server %1$s. Please review your configuration."
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:642 libraries/header.inc.php:100
+=======
+#: libraries/common.inc.php:638 libraries/header.inc.php:96
+>>>>>>> origin/master
 #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47
 #: main.php:185 test/theme.php:57
 msgid "Server"
 msgstr "سرور"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:820
 msgid "Invalid authentication method set in configuration:"
 msgstr ""
 
 #: libraries/common.inc.php:923
+=======
+#: libraries/common.inc.php:816
+msgid "Invalid authentication method set in configuration:"
+msgstr ""
+
+#: libraries/common.inc.php:919
+>>>>>>> origin/master
 #, php-format
 msgid "You should upgrade to %s %s or later."
 msgstr ""
@@ -2012,7 +2132,11 @@ msgid ""
 msgstr ""
 
 #: libraries/db_structure.lib.php:69 server_databases.php:142
+<<<<<<< HEAD
 #: tbl_printview.php:335 tbl_structure.php:680
+=======
+#: tbl_printview.php:335 tbl_structure.php:682
+>>>>>>> origin/master
 msgid "Overhead"
 msgstr ""
 
@@ -2039,22 +2163,36 @@ msgid "Change password"
 msgstr "تغيير اسم رمز"
 
 #: libraries/display_change_password.lib.php:35
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:348 server_privileges.php:808
+=======
+#: libraries/replication_gui.lib.php:348 server_privileges.php:807
+>>>>>>> origin/master
 msgid "No Password"
 msgstr "بدون اسم رمز"
 
 #: libraries/display_change_password.lib.php:41
 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63
 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:352 server_privileges.php:797
 #: server_privileges.php:801 server_privileges.php:812
 #: server_privileges.php:1555 server_synchronize.php:1175
+=======
+#: libraries/replication_gui.lib.php:352 server_privileges.php:796
+#: server_privileges.php:800 server_privileges.php:811
+#: server_privileges.php:1538 server_synchronize.php:1175
+>>>>>>> origin/master
 msgid "Password"
 msgstr "اسم رمز"
 
 #: libraries/display_change_password.lib.php:46
 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359
+<<<<<<< HEAD
 #: server_privileges.php:816 server_privileges.php:819
+=======
+#: server_privileges.php:815 server_privileges.php:818
+>>>>>>> origin/master
 msgid "Re-type"
 msgstr "تكرار"
 
@@ -2067,12 +2205,20 @@ msgid "MySQL 4.0 compatible"
 msgstr ""
 
 #: libraries/display_change_password.lib.php:72
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:363 server_privileges.php:823
+=======
+#: libraries/replication_gui.lib.php:363 server_privileges.php:822
+>>>>>>> origin/master
 msgid "Generate Password"
 msgstr ""
 
 #: libraries/display_change_password.lib.php:75
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:366 server_privileges.php:826
+=======
+#: libraries/replication_gui.lib.php:366 server_privileges.php:825
+>>>>>>> origin/master
 #, fuzzy
 msgid "Generate"
 msgstr "توليد‌شده توسط"
@@ -2160,7 +2306,11 @@ msgid "remember template"
 msgstr ""
 
 #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552
+=======
+#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549
+>>>>>>> origin/master
 msgid "Character set of the file:"
 msgstr "مجموعه كاراكترهاي پرونده:"
 
@@ -2213,7 +2363,11 @@ msgstr ""
 msgid "File to import"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527
+=======
+#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524
+>>>>>>> origin/master
 msgid "Location of the text file"
 msgstr "محل پرونده متني"
 
@@ -2221,12 +2375,20 @@ msgstr "محل پرونده متني"
 msgid "File uploads are not allowed on this server."
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536
+=======
+#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533
+>>>>>>> origin/master
 #: tbl_change.php:1025
 msgid "The directory you set for upload work cannot be reached"
 msgstr "پوشه‌اي را كه براي انتقال فايل انتخاب كرده‌ايد قابل دسترسي نيست."
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539
+=======
+#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536
+>>>>>>> origin/master
 #: tbl_change.php:1028
 msgid "web server upload directory"
 msgstr ""
@@ -2356,7 +2518,11 @@ msgstr ""
 #: libraries/import/docsql.php:34 libraries/import/ldi.php:47
 #: libraries/import/ods.php:30 libraries/import/sql.php:20
 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26
+<<<<<<< HEAD
 #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751
+=======
+#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753
+>>>>>>> origin/master
 #, fuzzy
 msgid "Options"
 msgstr "عمليات"
@@ -2500,7 +2666,11 @@ msgstr ""
 
 #: libraries/engines/innodb.lib.php:194 server_databases.php:137
 #: server_databases.php:305 server_status.php:525 server_status.php:586
+<<<<<<< HEAD
 #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694
+=======
+#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696
+>>>>>>> origin/master
 msgid "Total"
 msgstr "جمع كل"
 
@@ -2745,7 +2915,11 @@ msgid ""
 msgstr ""
 
 #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88
+<<<<<<< HEAD
 #: tbl_printview.php:375 tbl_structure.php:735
+=======
+#: tbl_printview.php:375 tbl_structure.php:737
+>>>>>>> origin/master
 msgid "Format"
 msgstr "قالب"
 
@@ -2817,8 +2991,13 @@ msgstr ""
 #: libraries/export/latex.php:201 libraries/export/odt.php:48
 #: libraries/export/sql.php:106 libraries/export/sql.php:868
 #: libraries/export/texytext.php:27 server_databases.php:127
+<<<<<<< HEAD
 #: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316
 #: tbl_structure.php:663
+=======
+#: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316
+#: tbl_structure.php:665
+>>>>>>> origin/master
 msgid "Data"
 msgstr "داده"
 
@@ -2868,9 +3047,15 @@ msgstr ""
 #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57
 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177
 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:332 server_privileges.php:732
 #: server_privileges.php:735 server_privileges.php:791
 #: server_privileges.php:1554 server_privileges.php:2092
+=======
+#: libraries/replication_gui.lib.php:332 server_privileges.php:731
+#: server_privileges.php:734 server_privileges.php:790
+#: server_privileges.php:1537 server_privileges.php:2069
+>>>>>>> origin/master
 #: server_processlist.php:55 server_synchronize.php:1159
 msgid "Host"
 msgstr "ميزبان"
@@ -3541,8 +3726,13 @@ msgstr ""
 
 #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59
 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:262 server_privileges.php:712
 #: server_privileges.php:715 server_privileges.php:722
+=======
+#: libraries/replication_gui.lib.php:262 server_privileges.php:711
+#: server_privileges.php:714 server_privileges.php:721
+>>>>>>> origin/master
 #: server_synchronize.php:1171
 msgid "User name"
 msgstr "نام كاربر"
@@ -3560,14 +3750,22 @@ msgstr ""
 msgid "Slave status"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448
+=======
+#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445
+>>>>>>> origin/master
 #: server_status.php:737 server_variables.php:52
 msgid "Variable"
 msgstr "متغییر"
 
 #: libraries/replication_gui.lib.php:118 server_status.php:738
 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138
+<<<<<<< HEAD
 #: tbl_structure.php:727
+=======
+#: tbl_structure.php:729
+>>>>>>> origin/master
 msgid "Value"
 msgstr "مقدار"
 
@@ -3586,11 +3784,16 @@ msgstr ""
 msgid "Add slave replication user"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:257 server_privileges.php:717
+=======
+#: libraries/replication_gui.lib.php:257 server_privileges.php:716
+>>>>>>> origin/master
 msgid "Any user"
 msgstr "همه كاربران"
 
 #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:349 server_privileges.php:718
 #: server_privileges.php:785 server_privileges.php:809
 #: server_privileges.php:1950 server_privileges.php:1980
@@ -3614,6 +3817,31 @@ msgid "Use Host Table"
 msgstr ""
 
 #: libraries/replication_gui.lib.php:334 server_privileges.php:793
+=======
+#: libraries/replication_gui.lib.php:349 server_privileges.php:717
+#: server_privileges.php:784 server_privileges.php:808
+#: server_privileges.php:1928 server_privileges.php:1958
+msgid "Use text field"
+msgstr ""
+
+#: libraries/replication_gui.lib.php:305 server_privileges.php:764
+msgid "Any host"
+msgstr "همه ميزبانها"
+
+#: libraries/replication_gui.lib.php:309 server_privileges.php:768
+msgid "Local"
+msgstr "محلی"
+
+#: libraries/replication_gui.lib.php:315 server_privileges.php:773
+msgid "This Host"
+msgstr ""
+
+#: libraries/replication_gui.lib.php:321 server_privileges.php:779
+msgid "Use Host Table"
+msgstr ""
+
+#: libraries/replication_gui.lib.php:334 server_privileges.php:792
+>>>>>>> origin/master
 msgid ""
 "When Host table is used, this field is ignored and values stored in Host "
 "table are used instead."
@@ -7557,10 +7785,13 @@ msgstr ""
 msgid "Show insert query"
 msgstr ""
 
+<<<<<<< HEAD
 #: tbl_change.php:1140
 msgid "and then"
 msgstr "و سپس"
 
+=======
+>>>>>>> origin/master
 #: tbl_change.php:1144
 msgid "Go back to previous page"
 msgstr "برو به صفحه قبل"
@@ -7756,6 +7987,7 @@ msgstr ""
 msgid "Show tables"
 msgstr "نمايش جدولها"
 
+<<<<<<< HEAD
 #: tbl_printview.php:309 tbl_structure.php:654
 msgid "Space usage"
 msgstr "فضاي استفاده‌شده"
@@ -7789,6 +8021,41 @@ msgid "Row length"
 msgstr "طول سطر"
 
 #: tbl_printview.php:413 tbl_structure.php:791
+=======
+#: tbl_printview.php:309 tbl_structure.php:656
+msgid "Space usage"
+msgstr "فضاي استفاده‌شده"
+
+#: tbl_printview.php:313 tbl_structure.php:660
+msgid "Usage"
+msgstr "استفاده"
+
+#: tbl_printview.php:340 tbl_structure.php:687
+msgid "Effective"
+msgstr "موثر"
+
+#: tbl_printview.php:365 tbl_structure.php:725
+msgid "Row Statistics"
+msgstr "آمار سطرها"
+
+#: tbl_printview.php:368 tbl_structure.php:728
+msgid "Statements"
+msgstr "شرج"
+
+#: tbl_printview.php:379 tbl_structure.php:740
+msgid "static"
+msgstr ""
+
+#: tbl_printview.php:381 tbl_structure.php:742
+msgid "dynamic"
+msgstr "پويا"
+
+#: tbl_printview.php:403 tbl_structure.php:785
+msgid "Row length"
+msgstr "طول سطر"
+
+#: tbl_printview.php:413 tbl_structure.php:793
+>>>>>>> origin/master
 msgid " Row size "
 msgstr " اندازه سطر "
 
diff --git a/po/fi.po b/po/fi.po
index 5d40aaa80..311af2a6a 100755
--- a/po/fi.po
+++ b/po/fi.po
@@ -3,7 +3,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2010-07-03 21:45+0530\n"
+=======
+"POT-Creation-Date: 2010-07-03 09:00-0400\n"
+>>>>>>> origin/master
 "PO-Revision-Date: 2010-04-30 18:08+0200\n"
 "Last-Translator:  <kajouni@gmail.com>\n"
 "Language-Team: finnish <fi@li.org>\n"
@@ -49,15 +53,26 @@ msgstr "Etsi"
 #: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046
 #: libraries/Theme_Manager.class.php:311
 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719
+<<<<<<< HEAD
 #: libraries/common.lib.php:1344 libraries/common.lib.php:2301
 #: libraries/display_change_password.lib.php:82
 #: libraries/display_create_table.lib.php:62
+=======
+#: libraries/common.lib.php:1335 libraries/common.lib.php:2288
+#: libraries/display_change_password.lib.php:82
+#: libraries/display_create_table.lib.php:63
+>>>>>>> origin/master
 #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532
 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76
 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104
+<<<<<<< HEAD
 #: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480
 #: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782
+=======
+#: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477
+#: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782
+>>>>>>> origin/master
 #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328
 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142
 #: server_privileges.php:665 server_privileges.php:1641
@@ -67,8 +82,13 @@ msgstr "Etsi"
 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171
 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265
 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561
+<<<<<<< HEAD
 #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560
 #: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512
+=======
+#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562
+#: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512
+>>>>>>> origin/master
 #: view_create.php:182 view_operations.php:101
 msgid "Go"
 msgstr "Siirry"
@@ -121,10 +141,17 @@ msgstr "Sarakkeiden nimet"
 #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245
 #: libraries/export/latex.php:360 libraries/export/odt.php:297
 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100
+<<<<<<< HEAD
 #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093
 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
 #: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321
+=======
+#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070
+#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
+#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
+#: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321
+>>>>>>> origin/master
 msgid "Type"
 msgstr "Tyyppi"
 
@@ -165,9 +192,15 @@ msgstr "Kommentit"
 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322
 #: libraries/export/latex.php:430 libraries/export/odt.php:368
 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263
+<<<<<<< HEAD
 #: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596
 #: server_privileges.php:1911 server_privileges.php:1916
 #: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228
+=======
+#: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579
+#: server_privileges.php:1889 server_privileges.php:1894
+#: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228
+>>>>>>> origin/master
 #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342
 msgid "No"
 msgstr "Ei"
@@ -181,9 +214,15 @@ msgstr "Ei"
 #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106
 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262
 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344
+<<<<<<< HEAD
 #: server_databases.php:64 server_privileges.php:1582
 #: server_privileges.php:1596 server_privileges.php:1911
 #: server_privileges.php:1914 server_privileges.php:2210 sql.php:193
+=======
+#: server_databases.php:64 server_privileges.php:1565
+#: server_privileges.php:1579 server_privileges.php:1889
+#: server_privileges.php:1892 server_privileges.php:2187 sql.php:193
+>>>>>>> origin/master
 #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350
 #: tbl_tracking.php:335 tbl_tracking.php:340
 msgid "Yes"
@@ -232,7 +271,15 @@ msgstr "Muuta tietokannan nimi"
 msgid "Command"
 msgstr "Komento"
 
+<<<<<<< HEAD
 #: db_operations.php:466
+=======
+#: db_operations.php:429 tbl_change.php:1140
+msgid "and then"
+msgstr "ja sen jälkeen"
+
+#: db_operations.php:455
+>>>>>>> origin/master
 msgid "Copy database to"
 msgstr "Luo tietokannasta toinen tietokanta nimellä"
 
@@ -320,7 +367,11 @@ msgstr "Ota käyttöön"
 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730
 #: server_collations.php:54 server_collations.php:66 server_databases.php:111
 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179
+<<<<<<< HEAD
 #: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326
+=======
+#: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326
+>>>>>>> origin/master
 msgid "Collation"
 msgstr "Aakkosjärjestys"
 
@@ -349,7 +400,11 @@ msgstr "Taulu"
 #: db_printview.php:105 libraries/db_structure.lib.php:56
 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146
 #: navigation.php:638 navigation.php:660 server_databases.php:122
+<<<<<<< HEAD
 #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775
+=======
+#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777
+>>>>>>> origin/master
 msgid "Rows"
 msgstr "Kpl rivejä"
 
@@ -364,19 +419,31 @@ msgstr "käytössä"
 
 #: db_printview.php:187 libraries/db_info.inc.php:88
 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433
+<<<<<<< HEAD
 #: tbl_structure.php:807
+=======
+#: tbl_structure.php:809
+>>>>>>> origin/master
 msgid "Creation"
 msgstr "Luotu"
 
 #: db_printview.php:196 libraries/db_info.inc.php:93
 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443
+<<<<<<< HEAD
 #: tbl_structure.php:815
+=======
+#: tbl_structure.php:817
+>>>>>>> origin/master
 msgid "Last update"
 msgstr "Viimeksi päivitetty"
 
 #: db_printview.php:205 libraries/db_info.inc.php:98
 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453
+<<<<<<< HEAD
 #: tbl_structure.php:823
+=======
+#: tbl_structure.php:825
+>>>>>>> origin/master
 msgid "Last check"
 msgstr "Viimeksi tarkistettu"
 
@@ -441,7 +508,11 @@ msgstr "Poista"
 
 #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553
 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779
+<<<<<<< HEAD
 #: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250
+=======
+#: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250
+>>>>>>> origin/master
 #: tbl_select.php:286
 msgid "Or"
 msgstr "Tai"
@@ -661,9 +732,15 @@ msgstr "Valitut:"
 msgid "Check All"
 msgstr "Valitse kaikki"
 
+<<<<<<< HEAD
 #: db_structure.php:529 libraries/display_tbl.lib.php:2077
 #: libraries/replication_gui.lib.php:36 server_databases.php:350
 #: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460
+=======
+#: db_structure.php:531 libraries/display_tbl.lib.php:2077
+#: libraries/replication_gui.lib.php:36 server_databases.php:350
+#: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462
+>>>>>>> origin/master
 msgid "Uncheck All"
 msgstr "Poista valinta kaikista"
 
@@ -1128,10 +1205,17 @@ msgid "Prev"
 msgstr "Edellinen"
 
 #. l10n: Display text for next month link in calendar
+<<<<<<< HEAD
 #: js/messages.php:106 libraries/common.lib.php:2366
 #: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338
 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
 #: tbl_structure.php:799
+=======
+#: js/messages.php:77 libraries/common.lib.php:2353
+#: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338
+#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
+#: tbl_structure.php:801
+>>>>>>> origin/master
 msgid "Next"
 msgstr "Seuraava"
 
@@ -1682,7 +1766,11 @@ msgstr "Salasana:"
 msgid "Server Choice"
 msgstr "Valitse palvelin"
 
+<<<<<<< HEAD
 #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63
+=======
+#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59
+>>>>>>> origin/master
 msgid "Cookies must be enabled past this point."
 msgstr "Selaimessa on oltava evästeet päällä tästä lähtien."
 
@@ -1766,7 +1854,11 @@ msgstr ""
 "Iconv-, libiconv- tai recode_string-funktioita ei voitu käyttää. Tarkista "
 "PHP:n asetukset."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:580
+=======
+#: libraries/common.inc.php:576
+>>>>>>> origin/master
 msgid ""
 "phpMyAdmin was unable to read your configuration file!<br />This might "
 "happen if PHP finds a parse error in it or PHP cannot find the file.<br /"
@@ -1781,40 +1873,68 @@ msgstr ""
 "Todennäköisimmin joltain riviltä puuttuu lainausmerkki tai puolipiste.<br /"
 ">Jos linkistä avautuva sivu on tyhjä, asetustiedostossa ei ollut virhettä."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:591
+=======
+#: libraries/common.inc.php:587
+>>>>>>> origin/master
 #, fuzzy, php-format
 #| msgid "Could not load default configuration from: \"%1$s\""
 msgid "Could not load default configuration from: %1$s"
 msgstr "Oletusasetuksia ei voitu ladata kohteesta: \"%1$s\""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:596
+=======
+#: libraries/common.inc.php:592
+>>>>>>> origin/master
 msgid ""
 "The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
 "configuration file!"
 msgstr "<tt>$cfg['PmaAbsoluteUri']</tt> täytyy määritellä asetustiedostossa!"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:626
+=======
+#: libraries/common.inc.php:622
+>>>>>>> origin/master
 #, fuzzy, php-format
 #| msgid "Invalid server index: \"%s\""
 msgid "Invalid server index: %s"
 msgstr "Virheellinen palvelimen indeksi: \"%s\""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:633
+=======
+#: libraries/common.inc.php:629
+>>>>>>> origin/master
 #, php-format
 msgid "Invalid hostname for server %1$s. Please review your configuration."
 msgstr "Palvelimella %1$s virheellinen nimi. Tarkista asetukset."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:642 libraries/header.inc.php:100
+=======
+#: libraries/common.inc.php:638 libraries/header.inc.php:96
+>>>>>>> origin/master
 #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47
 #: main.php:185 test/theme.php:57
 msgid "Server"
 msgstr "Palvelin"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:820
 msgid "Invalid authentication method set in configuration:"
 msgstr "Asetuksissa on virheellinen todennustapa:"
 
 #: libraries/common.inc.php:923
+=======
+#: libraries/common.inc.php:816
+msgid "Invalid authentication method set in configuration:"
+msgstr "Asetuksissa on virheellinen todennustapa:"
+
+#: libraries/common.inc.php:919
+>>>>>>> origin/master
 #, php-format
 msgid "You should upgrade to %s %s or later."
 msgstr "Sinun tulisi päivittää versioon %s %s tai sitä uudempaan."
@@ -2061,7 +2181,11 @@ msgid ""
 msgstr "Saattaa olla summittainen. Katso FAQ 3.11"
 
 #: libraries/db_structure.lib.php:69 server_databases.php:142
+<<<<<<< HEAD
 #: tbl_printview.php:335 tbl_structure.php:680
+=======
+#: tbl_printview.php:335 tbl_structure.php:682
+>>>>>>> origin/master
 msgid "Overhead"
 msgstr "Ylijäämä"
 
@@ -2091,22 +2215,36 @@ msgid "Change password"
 msgstr "Vaihda salasana"
 
 #: libraries/display_change_password.lib.php:35
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:348 server_privileges.php:808
+=======
+#: libraries/replication_gui.lib.php:348 server_privileges.php:807
+>>>>>>> origin/master
 msgid "No Password"
 msgstr "Ei salasanaa"
 
 #: libraries/display_change_password.lib.php:41
 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63
 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:352 server_privileges.php:797
 #: server_privileges.php:801 server_privileges.php:812
 #: server_privileges.php:1555 server_synchronize.php:1175
+=======
+#: libraries/replication_gui.lib.php:352 server_privileges.php:796
+#: server_privileges.php:800 server_privileges.php:811
+#: server_privileges.php:1538 server_synchronize.php:1175
+>>>>>>> origin/master
 msgid "Password"
 msgstr "Salasana"
 
 #: libraries/display_change_password.lib.php:46
 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359
+<<<<<<< HEAD
 #: server_privileges.php:816 server_privileges.php:819
+=======
+#: server_privileges.php:815 server_privileges.php:818
+>>>>>>> origin/master
 msgid "Re-type"
 msgstr "Kirjoita uudelleen"
 
@@ -2121,12 +2259,20 @@ msgid "MySQL 4.0 compatible"
 msgstr "MySQL&nbsp;4.0 -yhteensopiva"
 
 #: libraries/display_change_password.lib.php:72
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:363 server_privileges.php:823
+=======
+#: libraries/replication_gui.lib.php:363 server_privileges.php:822
+>>>>>>> origin/master
 msgid "Generate Password"
 msgstr "Keksi salasana"
 
 #: libraries/display_change_password.lib.php:75
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:366 server_privileges.php:826
+=======
+#: libraries/replication_gui.lib.php:366 server_privileges.php:825
+>>>>>>> origin/master
 msgid "Generate"
 msgstr "Keksi"
 
@@ -2214,7 +2360,11 @@ msgid "remember template"
 msgstr "muista pohja"
 
 #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552
+=======
+#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549
+>>>>>>> origin/master
 msgid "Character set of the file:"
 msgstr "Tiedoston merkistö:"
 
@@ -2272,7 +2422,11 @@ msgstr ""
 msgid "File to import"
 msgstr "Tuotava tiedosto"
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527
+=======
+#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524
+>>>>>>> origin/master
 msgid "Location of the text file"
 msgstr "Tiedoston sijainti"
 
@@ -2280,12 +2434,20 @@ msgstr "Tiedoston sijainti"
 msgid "File uploads are not allowed on this server."
 msgstr "Tällä palvelimella ei ole sallittu tiedostojen lähetystä."
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536
+=======
+#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533
+>>>>>>> origin/master
 #: tbl_change.php:1025
 msgid "The directory you set for upload work cannot be reached"
 msgstr "Tiedostojen lähetykseen valittua hakemistoa ei voida käyttää"
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539
+=======
+#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536
+>>>>>>> origin/master
 #: tbl_change.php:1028
 msgid "web server upload directory"
 msgstr "palvelimen lähetyshakemisto"
@@ -2421,7 +2583,11 @@ msgstr "Lajittele avaimen mukaan"
 #: libraries/import/docsql.php:34 libraries/import/ldi.php:47
 #: libraries/import/ods.php:30 libraries/import/sql.php:20
 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26
+<<<<<<< HEAD
 #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751
+=======
+#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753
+>>>>>>> origin/master
 msgid "Options"
 msgstr "Valinnat"
 
@@ -2567,7 +2733,11 @@ msgstr "Puskurivarannon käyttö"
 
 #: libraries/engines/innodb.lib.php:194 server_databases.php:137
 #: server_databases.php:305 server_status.php:525 server_status.php:586
+<<<<<<< HEAD
 #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694
+=======
+#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696
+>>>>>>> origin/master
 msgid "Total"
 msgstr "Yhteensä"
 
@@ -2852,7 +3022,11 @@ msgstr ""
 "numero."
 
 #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88
+<<<<<<< HEAD
 #: tbl_printview.php:375 tbl_structure.php:735
+=======
+#: tbl_printview.php:375 tbl_structure.php:737
+>>>>>>> origin/master
 msgid "Format"
 msgstr "Muoto"
 
@@ -2926,8 +3100,13 @@ msgstr "Microsoft Word 2000"
 #: libraries/export/latex.php:201 libraries/export/odt.php:48
 #: libraries/export/sql.php:106 libraries/export/sql.php:868
 #: libraries/export/texytext.php:27 server_databases.php:127
+<<<<<<< HEAD
 #: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316
 #: tbl_structure.php:663
+=======
+#: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316
+#: tbl_structure.php:665
+>>>>>>> origin/master
 msgid "Data"
 msgstr "Tietoa"
 
@@ -2976,9 +3155,15 @@ msgstr "MIME-tyyppi"
 #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57
 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177
 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:332 server_privileges.php:732
 #: server_privileges.php:735 server_privileges.php:791
 #: server_privileges.php:1554 server_privileges.php:2092
+=======
+#: libraries/replication_gui.lib.php:332 server_privileges.php:731
+#: server_privileges.php:734 server_privileges.php:790
+#: server_privileges.php:1537 server_privileges.php:2069
+>>>>>>> origin/master
 #: server_processlist.php:55 server_synchronize.php:1159
 msgid "Host"
 msgstr "Palvelin"
@@ -3649,8 +3834,13 @@ msgstr ""
 
 #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59
 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:262 server_privileges.php:712
 #: server_privileges.php:715 server_privileges.php:722
+=======
+#: libraries/replication_gui.lib.php:262 server_privileges.php:711
+#: server_privileges.php:714 server_privileges.php:721
+>>>>>>> origin/master
 #: server_synchronize.php:1171
 msgid "User name"
 msgstr "Käyttäjänimi"
@@ -3667,14 +3857,22 @@ msgstr "Isännän tila"
 msgid "Slave status"
 msgstr "Alipalvelimen tila"
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448
+=======
+#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445
+>>>>>>> origin/master
 #: server_status.php:737 server_variables.php:52
 msgid "Variable"
 msgstr "Muuttuja"
 
 #: libraries/replication_gui.lib.php:118 server_status.php:738
 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138
+<<<<<<< HEAD
 #: tbl_structure.php:727
+=======
+#: tbl_structure.php:729
+>>>>>>> origin/master
 msgid "Value"
 msgstr "Arvo"
 
@@ -3694,11 +3892,16 @@ msgstr ""
 msgid "Add slave replication user"
 msgstr "Lisää alireplikaatiokäyttäjä"
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:257 server_privileges.php:717
+=======
+#: libraries/replication_gui.lib.php:257 server_privileges.php:716
+>>>>>>> origin/master
 msgid "Any user"
 msgstr "Kuka tahansa käyttäjä"
 
 #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:349 server_privileges.php:718
 #: server_privileges.php:785 server_privileges.php:809
 #: server_privileges.php:1950 server_privileges.php:1980
@@ -3722,6 +3925,31 @@ msgid "Use Host Table"
 msgstr "Käytä isäntätaulua"
 
 #: libraries/replication_gui.lib.php:334 server_privileges.php:793
+=======
+#: libraries/replication_gui.lib.php:349 server_privileges.php:717
+#: server_privileges.php:784 server_privileges.php:808
+#: server_privileges.php:1928 server_privileges.php:1958
+msgid "Use text field"
+msgstr "Käytä tekstikenttää"
+
+#: libraries/replication_gui.lib.php:305 server_privileges.php:764
+msgid "Any host"
+msgstr "Mikä tahansa palvelin"
+
+#: libraries/replication_gui.lib.php:309 server_privileges.php:768
+msgid "Local"
+msgstr "Paikallinen"
+
+#: libraries/replication_gui.lib.php:315 server_privileges.php:773
+msgid "This Host"
+msgstr "Tämä isäntä"
+
+#: libraries/replication_gui.lib.php:321 server_privileges.php:779
+msgid "Use Host Table"
+msgstr "Käytä isäntätaulua"
+
+#: libraries/replication_gui.lib.php:334 server_privileges.php:792
+>>>>>>> origin/master
 msgid ""
 "When Host table is used, this field is ignored and values stored in Host "
 "table are used instead."
@@ -8180,10 +8408,13 @@ msgstr ""
 msgid "Show insert query"
 msgstr "Näytetään SQL-kysely"
 
+<<<<<<< HEAD
 #: tbl_change.php:1140
 msgid "and then"
 msgstr "ja sen jälkeen"
 
+=======
+>>>>>>> origin/master
 #: tbl_change.php:1144
 msgid "Go back to previous page"
 msgstr "Takaisin"
@@ -8378,6 +8609,7 @@ msgstr "Tarkista viitteiden eheys:"
 msgid "Show tables"
 msgstr "Näytä taulut"
 
+<<<<<<< HEAD
 #: tbl_printview.php:309 tbl_structure.php:654
 msgid "Space usage"
 msgstr "Levytilan käyttö"
@@ -8411,6 +8643,41 @@ msgid "Row length"
 msgstr "Rivin pituus"
 
 #: tbl_printview.php:413 tbl_structure.php:791
+=======
+#: tbl_printview.php:309 tbl_structure.php:656
+msgid "Space usage"
+msgstr "Levytilan käyttö"
+
+#: tbl_printview.php:313 tbl_structure.php:660
+msgid "Usage"
+msgstr "Käyttö"
+
+#: tbl_printview.php:340 tbl_structure.php:687
+msgid "Effective"
+msgstr "Pätevä"
+
+#: tbl_printview.php:365 tbl_structure.php:725
+msgid "Row Statistics"
+msgstr "Rivitilastot"
+
+#: tbl_printview.php:368 tbl_structure.php:728
+msgid "Statements"
+msgstr "Tieto"
+
+#: tbl_printview.php:379 tbl_structure.php:740
+msgid "static"
+msgstr "staattinen"
+
+#: tbl_printview.php:381 tbl_structure.php:742
+msgid "dynamic"
+msgstr "dynaaminen"
+
+#: tbl_printview.php:403 tbl_structure.php:785
+msgid "Row length"
+msgstr "Rivin pituus"
+
+#: tbl_printview.php:413 tbl_structure.php:793
+>>>>>>> origin/master
 msgid " Row size "
 msgstr " Rivin koko "
 
diff --git a/po/fr.po b/po/fr.po
index cee2a71f2..99a87945f 100755
--- a/po/fr.po
+++ b/po/fr.po
@@ -3,7 +3,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2010-07-03 21:45+0530\n"
+=======
+"POT-Creation-Date: 2010-07-03 09:00-0400\n"
+>>>>>>> origin/master
 "PO-Revision-Date: 2010-07-01 19:56+0200\n"
 "Last-Translator: Marc Delisle <marc@infomarc.info>\n"
 "Language-Team: french <fr@li.org>\n"
@@ -49,15 +53,26 @@ msgstr "Rechercher"
 #: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046
 #: libraries/Theme_Manager.class.php:311
 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719
+<<<<<<< HEAD
 #: libraries/common.lib.php:1344 libraries/common.lib.php:2301
 #: libraries/display_change_password.lib.php:82
 #: libraries/display_create_table.lib.php:62
+=======
+#: libraries/common.lib.php:1335 libraries/common.lib.php:2288
+#: libraries/display_change_password.lib.php:82
+#: libraries/display_create_table.lib.php:63
+>>>>>>> origin/master
 #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532
 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76
 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104
+<<<<<<< HEAD
 #: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480
 #: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782
+=======
+#: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477
+#: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782
+>>>>>>> origin/master
 #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328
 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142
 #: server_privileges.php:665 server_privileges.php:1641
@@ -67,8 +82,13 @@ msgstr "Rechercher"
 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171
 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265
 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561
+<<<<<<< HEAD
 #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560
 #: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512
+=======
+#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562
+#: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512
+>>>>>>> origin/master
 #: view_create.php:182 view_operations.php:101
 msgid "Go"
 msgstr "Exécuter"
@@ -119,10 +139,17 @@ msgstr "Colonne"
 #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245
 #: libraries/export/latex.php:360 libraries/export/odt.php:297
 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100
+<<<<<<< HEAD
 #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093
 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
 #: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321
+=======
+#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070
+#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
+#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
+#: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321
+>>>>>>> origin/master
 msgid "Type"
 msgstr "Type"
 
@@ -163,9 +190,15 @@ msgstr "Commentaires"
 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322
 #: libraries/export/latex.php:430 libraries/export/odt.php:368
 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263
+<<<<<<< HEAD
 #: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596
 #: server_privileges.php:1911 server_privileges.php:1916
 #: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228
+=======
+#: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579
+#: server_privileges.php:1889 server_privileges.php:1894
+#: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228
+>>>>>>> origin/master
 #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342
 msgid "No"
 msgstr "Non"
@@ -179,9 +212,15 @@ msgstr "Non"
 #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106
 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262
 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344
+<<<<<<< HEAD
 #: server_databases.php:64 server_privileges.php:1582
 #: server_privileges.php:1596 server_privileges.php:1911
 #: server_privileges.php:1914 server_privileges.php:2210 sql.php:193
+=======
+#: server_databases.php:64 server_privileges.php:1565
+#: server_privileges.php:1579 server_privileges.php:1889
+#: server_privileges.php:1892 server_privileges.php:2187 sql.php:193
+>>>>>>> origin/master
 #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350
 #: tbl_tracking.php:335 tbl_tracking.php:340
 msgid "Yes"
@@ -230,7 +269,15 @@ msgstr "Changer le nom de la base de données pour"
 msgid "Command"
 msgstr "Commande"
 
+<<<<<<< HEAD
 #: db_operations.php:466
+=======
+#: db_operations.php:429 tbl_change.php:1140
+msgid "and then"
+msgstr "et ensuite"
+
+#: db_operations.php:455
+>>>>>>> origin/master
 msgid "Copy database to"
 msgstr "Copier la base de données vers"
 
@@ -312,7 +359,11 @@ msgstr "Activer"
 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730
 #: server_collations.php:54 server_collations.php:66 server_databases.php:111
 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179
+<<<<<<< HEAD
 #: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326
+=======
+#: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326
+>>>>>>> origin/master
 msgid "Collation"
 msgstr "Interclassement"
 
@@ -341,7 +392,11 @@ msgstr "Table"
 #: db_printview.php:105 libraries/db_structure.lib.php:56
 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146
 #: navigation.php:638 navigation.php:660 server_databases.php:122
+<<<<<<< HEAD
 #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775
+=======
+#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777
+>>>>>>> origin/master
 msgid "Rows"
 msgstr "Enregistrements"
 
@@ -356,19 +411,31 @@ msgstr "utilisé"
 
 #: db_printview.php:187 libraries/db_info.inc.php:88
 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433
+<<<<<<< HEAD
 #: tbl_structure.php:807
+=======
+#: tbl_structure.php:809
+>>>>>>> origin/master
 msgid "Creation"
 msgstr "Création"
 
 #: db_printview.php:196 libraries/db_info.inc.php:93
 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443
+<<<<<<< HEAD
 #: tbl_structure.php:815
+=======
+#: tbl_structure.php:817
+>>>>>>> origin/master
 msgid "Last update"
 msgstr "Dernière modification"
 
 #: db_printview.php:205 libraries/db_info.inc.php:98
 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453
+<<<<<<< HEAD
 #: tbl_structure.php:823
+=======
+#: tbl_structure.php:825
+>>>>>>> origin/master
 msgid "Last check"
 msgstr "Dernière vérification"
 
@@ -432,7 +499,11 @@ msgstr "Effacer"
 
 #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553
 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779
+<<<<<<< HEAD
 #: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250
+=======
+#: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250
+>>>>>>> origin/master
 #: tbl_select.php:286
 msgid "Or"
 msgstr "Ou"
@@ -646,9 +717,15 @@ msgstr "Pour la sélection :"
 msgid "Check All"
 msgstr "Tout cocher"
 
+<<<<<<< HEAD
 #: db_structure.php:529 libraries/display_tbl.lib.php:2077
 #: libraries/replication_gui.lib.php:36 server_databases.php:350
 #: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460
+=======
+#: db_structure.php:531 libraries/display_tbl.lib.php:2077
+#: libraries/replication_gui.lib.php:36 server_databases.php:350
+#: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462
+>>>>>>> origin/master
 msgid "Uncheck All"
 msgstr "Tout décocher"
 
@@ -1116,10 +1193,17 @@ msgid "Prev"
 msgstr "Précédent"
 
 #. l10n: Display text for next month link in calendar
+<<<<<<< HEAD
 #: js/messages.php:106 libraries/common.lib.php:2366
 #: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338
 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
 #: tbl_structure.php:799
+=======
+#: js/messages.php:77 libraries/common.lib.php:2353
+#: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338
+#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
+#: tbl_structure.php:801
+>>>>>>> origin/master
 msgid "Next"
 msgstr "Suivant"
 
@@ -1625,7 +1709,11 @@ msgstr "Mot de passe&nbsp;:"
 msgid "Server Choice"
 msgstr "Choix du serveur"
 
+<<<<<<< HEAD
 #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63
+=======
+#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59
+>>>>>>> origin/master
 msgid "Cookies must be enabled past this point."
 msgstr "Vous devez accepter les cookies pour poursuivre."
 
@@ -1708,7 +1796,11 @@ msgstr ""
 "ces extensions semblent chargées. Veuillez vérifier votre configuration de "
 "PHP."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:580
+=======
+#: libraries/common.inc.php:576
+>>>>>>> origin/master
 msgid ""
 "phpMyAdmin was unable to read your configuration file!<br />This might "
 "happen if PHP finds a parse error in it or PHP cannot find the file.<br /"
@@ -1724,13 +1816,21 @@ msgstr ""
 "virgule sont manquants.<br />Si vous recevez une page blanche, aucune erreur "
 "n'a été détectée."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:591
+=======
+#: libraries/common.inc.php:587
+>>>>>>> origin/master
 #, php-format
 msgid "Could not load default configuration from: %1$s"
 msgstr "Chargement de la configuration par défaut impossible depuis %1$s"
 
 # OK
+<<<<<<< HEAD
 #: libraries/common.inc.php:596
+=======
+#: libraries/common.inc.php:592
+>>>>>>> origin/master
 msgid ""
 "The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
 "configuration file!"
@@ -1738,30 +1838,50 @@ msgstr ""
 "Le paramètre <tt>$cfg['PmaAbsoluteUri']</tt> DOIT être renseigné dans votre "
 "fichier de configuration !"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:626
+=======
+#: libraries/common.inc.php:622
+>>>>>>> origin/master
 #, php-format
 msgid "Invalid server index: %s"
 msgstr "Indice de serveur invalide: %s"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:633
+=======
+#: libraries/common.inc.php:629
+>>>>>>> origin/master
 #, php-format
 msgid "Invalid hostname for server %1$s. Please review your configuration."
 msgstr ""
 "Nom d'hôte (hostname) invalide pour le serveur %1$s. Veuillez vérifier votre "
 "configuration."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:642 libraries/header.inc.php:100
+=======
+#: libraries/common.inc.php:638 libraries/header.inc.php:96
+>>>>>>> origin/master
 #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47
 #: main.php:185 test/theme.php:57
 msgid "Server"
 msgstr "Serveur"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:820
+=======
+#: libraries/common.inc.php:816
+>>>>>>> origin/master
 msgid "Invalid authentication method set in configuration:"
 msgstr ""
 "Le fichier de configuration contient un type d'authentification invalide :"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:923
+=======
+#: libraries/common.inc.php:919
+>>>>>>> origin/master
 #, php-format
 msgid "You should upgrade to %s %s or later."
 msgstr "Vous devriez utiliser %s en version %s ou plus récente."
@@ -2008,7 +2128,11 @@ msgstr ""
 "FAQ 3.11[/a]"
 
 #: libraries/db_structure.lib.php:69 server_databases.php:142
+<<<<<<< HEAD
 #: tbl_printview.php:335 tbl_structure.php:680
+=======
+#: tbl_printview.php:335 tbl_structure.php:682
+>>>>>>> origin/master
 msgid "Overhead"
 msgstr "Perte"
 
@@ -2038,22 +2162,36 @@ msgid "Change password"
 msgstr "Modifier le mot de passe"
 
 #: libraries/display_change_password.lib.php:35
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:348 server_privileges.php:808
+=======
+#: libraries/replication_gui.lib.php:348 server_privileges.php:807
+>>>>>>> origin/master
 msgid "No Password"
 msgstr "Aucun mot de passe"
 
 #: libraries/display_change_password.lib.php:41
 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63
 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:352 server_privileges.php:797
 #: server_privileges.php:801 server_privileges.php:812
 #: server_privileges.php:1555 server_synchronize.php:1175
+=======
+#: libraries/replication_gui.lib.php:352 server_privileges.php:796
+#: server_privileges.php:800 server_privileges.php:811
+#: server_privileges.php:1538 server_synchronize.php:1175
+>>>>>>> origin/master
 msgid "Password"
 msgstr "Mot de passe"
 
 #: libraries/display_change_password.lib.php:46
 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359
+<<<<<<< HEAD
 #: server_privileges.php:816 server_privileges.php:819
+=======
+#: server_privileges.php:815 server_privileges.php:818
+>>>>>>> origin/master
 msgid "Re-type"
 msgstr "Entrer à nouveau"
 
@@ -2066,12 +2204,20 @@ msgid "MySQL 4.0 compatible"
 msgstr "Compatible MySQL 4.0"
 
 #: libraries/display_change_password.lib.php:72
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:363 server_privileges.php:823
+=======
+#: libraries/replication_gui.lib.php:363 server_privileges.php:822
+>>>>>>> origin/master
 msgid "Generate Password"
 msgstr "Générer un mot de passe"
 
 #: libraries/display_change_password.lib.php:75
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:366 server_privileges.php:826
+=======
+#: libraries/replication_gui.lib.php:366 server_privileges.php:825
+>>>>>>> origin/master
 msgid "Generate"
 msgstr "Générer"
 
@@ -2156,7 +2302,11 @@ msgid "remember template"
 msgstr "se souvenir du modèle"
 
 #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552
+=======
+#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549
+>>>>>>> origin/master
 msgid "Character set of the file:"
 msgstr "Jeu de caractères du fichier:"
 
@@ -2214,7 +2364,11 @@ msgstr ""
 msgid "File to import"
 msgstr "Fichier à importer"
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527
+=======
+#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524
+>>>>>>> origin/master
 msgid "Location of the text file"
 msgstr "Emplacement du fichier texte"
 
@@ -2222,12 +2376,20 @@ msgstr "Emplacement du fichier texte"
 msgid "File uploads are not allowed on this server."
 msgstr "Les téléchargements vers ce serveur ne sont pas permis."
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536
+=======
+#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533
+>>>>>>> origin/master
 #: tbl_change.php:1025
 msgid "The directory you set for upload work cannot be reached"
 msgstr "Le répertoire de transfert est inaccessible"
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539
+=======
+#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536
+>>>>>>> origin/master
 #: tbl_change.php:1028
 msgid "web server upload directory"
 msgstr "répertoire de transfert du serveur Web"
@@ -2359,7 +2521,11 @@ msgstr "Trier sur l'index"
 #: libraries/import/docsql.php:34 libraries/import/ldi.php:47
 #: libraries/import/ods.php:30 libraries/import/sql.php:20
 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26
+<<<<<<< HEAD
 #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751
+=======
+#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753
+>>>>>>> origin/master
 msgid "Options"
 msgstr "Options"
 
@@ -2504,7 +2670,11 @@ msgstr "Utilisation de la mémoire-tampon"
 
 #: libraries/engines/innodb.lib.php:194 server_databases.php:137
 #: server_databases.php:305 server_status.php:525 server_status.php:586
+<<<<<<< HEAD
 #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694
+=======
+#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696
+>>>>>>> origin/master
 msgid "Total"
 msgstr "Total"
 
@@ -2797,7 +2967,11 @@ msgstr ""
 "plus anciens sont détruits, sinon ils sont renommés."
 
 #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88
+<<<<<<< HEAD
 #: tbl_printview.php:375 tbl_structure.php:735
+=======
+#: tbl_printview.php:375 tbl_structure.php:737
+>>>>>>> origin/master
 msgid "Format"
 msgstr "Format"
 
@@ -2861,8 +3035,13 @@ msgstr "Microsoft Word 2000"
 #: libraries/export/latex.php:201 libraries/export/odt.php:48
 #: libraries/export/sql.php:106 libraries/export/sql.php:868
 #: libraries/export/texytext.php:27 server_databases.php:127
+<<<<<<< HEAD
 #: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316
 #: tbl_structure.php:663
+=======
+#: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316
+#: tbl_structure.php:665
+>>>>>>> origin/master
 msgid "Data"
 msgstr "Données"
 
@@ -2911,9 +3090,15 @@ msgstr "Type MIME"
 #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57
 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177
 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:332 server_privileges.php:732
 #: server_privileges.php:735 server_privileges.php:791
 #: server_privileges.php:1554 server_privileges.php:2092
+=======
+#: libraries/replication_gui.lib.php:332 server_privileges.php:731
+#: server_privileges.php:734 server_privileges.php:790
+#: server_privileges.php:1537 server_privileges.php:2069
+>>>>>>> origin/master
 #: server_processlist.php:55 server_synchronize.php:1159
 msgid "Host"
 msgstr "Serveur"
@@ -3586,8 +3771,13 @@ msgstr ""
 
 #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59
 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:262 server_privileges.php:712
 #: server_privileges.php:715 server_privileges.php:722
+=======
+#: libraries/replication_gui.lib.php:262 server_privileges.php:711
+#: server_privileges.php:714 server_privileges.php:721
+>>>>>>> origin/master
 #: server_synchronize.php:1171
 msgid "User name"
 msgstr "Nom d'utilisateur"
@@ -3604,14 +3794,22 @@ msgstr "État du maître"
 msgid "Slave status"
 msgstr "État de l'esclave"
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448
+=======
+#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445
+>>>>>>> origin/master
 #: server_status.php:737 server_variables.php:52
 msgid "Variable"
 msgstr "Variable"
 
 #: libraries/replication_gui.lib.php:118 server_status.php:738
 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138
+<<<<<<< HEAD
 #: tbl_structure.php:727
+=======
+#: tbl_structure.php:729
+>>>>>>> origin/master
 msgid "Value"
 msgstr "Valeur"
 
@@ -3631,11 +3829,16 @@ msgstr ""
 msgid "Add slave replication user"
 msgstr "Ajouter un utilisateur pour la réplication vers l'esclave?"
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:257 server_privileges.php:717
+=======
+#: libraries/replication_gui.lib.php:257 server_privileges.php:716
+>>>>>>> origin/master
 msgid "Any user"
 msgstr "Tout utilisateur"
 
 #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:349 server_privileges.php:718
 #: server_privileges.php:785 server_privileges.php:809
 #: server_privileges.php:1950 server_privileges.php:1980
@@ -3659,6 +3862,31 @@ msgid "Use Host Table"
 msgstr "Utiliser la table Host"
 
 #: libraries/replication_gui.lib.php:334 server_privileges.php:793
+=======
+#: libraries/replication_gui.lib.php:349 server_privileges.php:717
+#: server_privileges.php:784 server_privileges.php:808
+#: server_privileges.php:1928 server_privileges.php:1958
+msgid "Use text field"
+msgstr "Entrez une valeur"
+
+#: libraries/replication_gui.lib.php:305 server_privileges.php:764
+msgid "Any host"
+msgstr "Tout serveur"
+
+#: libraries/replication_gui.lib.php:309 server_privileges.php:768
+msgid "Local"
+msgstr "Local"
+
+#: libraries/replication_gui.lib.php:315 server_privileges.php:773
+msgid "This Host"
+msgstr "Ce serveur"
+
+#: libraries/replication_gui.lib.php:321 server_privileges.php:779
+msgid "Use Host Table"
+msgstr "Utiliser la table Host"
+
+#: libraries/replication_gui.lib.php:334 server_privileges.php:792
+>>>>>>> origin/master
 msgid ""
 "When Host table is used, this field is ignored and values stored in Host "
 "table are used instead."
@@ -8005,10 +8233,13 @@ msgstr "Sauvegarder un nouvel enregistrement (ignorer les erreurs)"
 msgid "Show insert query"
 msgstr "Afficher l'énoncé d'insertion"
 
+<<<<<<< HEAD
 #: tbl_change.php:1140
 msgid "and then"
 msgstr "et ensuite"
 
+=======
+>>>>>>> origin/master
 #: tbl_change.php:1144
 msgid "Go back to previous page"
 msgstr "Retourner à la page précédente"
@@ -8201,6 +8432,7 @@ msgstr "Vérifier l'intégrité référentielle"
 msgid "Show tables"
 msgstr "Afficher les tables"
 
+<<<<<<< HEAD
 #: tbl_printview.php:309 tbl_structure.php:654
 msgid "Space usage"
 msgstr "Espace utilisé"
@@ -8234,6 +8466,41 @@ msgid "Row length"
 msgstr "Longueur enr."
 
 #: tbl_printview.php:413 tbl_structure.php:791
+=======
+#: tbl_printview.php:309 tbl_structure.php:656
+msgid "Space usage"
+msgstr "Espace utilisé"
+
+#: tbl_printview.php:313 tbl_structure.php:660
+msgid "Usage"
+msgstr "Espace"
+
+#: tbl_printview.php:340 tbl_structure.php:687
+msgid "Effective"
+msgstr "effectif"
+
+#: tbl_printview.php:365 tbl_structure.php:725
+msgid "Row Statistics"
+msgstr "Statistiques"
+
+#: tbl_printview.php:368 tbl_structure.php:728
+msgid "Statements"
+msgstr "Information"
+
+#: tbl_printview.php:379 tbl_structure.php:740
+msgid "static"
+msgstr "statique"
+
+#: tbl_printview.php:381 tbl_structure.php:742
+msgid "dynamic"
+msgstr "dynamique"
+
+#: tbl_printview.php:403 tbl_structure.php:785
+msgid "Row length"
+msgstr "Longueur enr."
+
+#: tbl_printview.php:413 tbl_structure.php:793
+>>>>>>> origin/master
 msgid " Row size "
 msgstr " Taille enr. "
 
diff --git a/po/gl.po b/po/gl.po
index c05b77ce7..5f2672525 100755
--- a/po/gl.po
+++ b/po/gl.po
@@ -3,7 +3,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2010-07-03 21:45+0530\n"
+=======
+"POT-Creation-Date: 2010-07-03 09:00-0400\n"
+>>>>>>> origin/master
 "PO-Revision-Date: 2010-03-12 09:14+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: galician <gl@li.org>\n"
@@ -49,15 +53,26 @@ msgstr "Procurar"
 #: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046
 #: libraries/Theme_Manager.class.php:311
 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719
+<<<<<<< HEAD
 #: libraries/common.lib.php:1344 libraries/common.lib.php:2301
 #: libraries/display_change_password.lib.php:82
 #: libraries/display_create_table.lib.php:62
+=======
+#: libraries/common.lib.php:1335 libraries/common.lib.php:2288
+#: libraries/display_change_password.lib.php:82
+#: libraries/display_create_table.lib.php:63
+>>>>>>> origin/master
 #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532
 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76
 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104
+<<<<<<< HEAD
 #: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480
 #: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782
+=======
+#: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477
+#: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782
+>>>>>>> origin/master
 #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328
 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142
 #: server_privileges.php:665 server_privileges.php:1641
@@ -67,8 +82,13 @@ msgstr "Procurar"
 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171
 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265
 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561
+<<<<<<< HEAD
 #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560
 #: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512
+=======
+#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562
+#: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512
+>>>>>>> origin/master
 #: view_create.php:182 view_operations.php:101
 msgid "Go"
 msgstr "Executar"
@@ -121,10 +141,17 @@ msgstr "Nomes das columnas"
 #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245
 #: libraries/export/latex.php:360 libraries/export/odt.php:297
 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100
+<<<<<<< HEAD
 #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093
 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
 #: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321
+=======
+#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070
+#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
+#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
+#: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321
+>>>>>>> origin/master
 msgid "Type"
 msgstr "Tipo"
 
@@ -165,9 +192,15 @@ msgstr "Comentarios"
 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322
 #: libraries/export/latex.php:430 libraries/export/odt.php:368
 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263
+<<<<<<< HEAD
 #: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596
 #: server_privileges.php:1911 server_privileges.php:1916
 #: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228
+=======
+#: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579
+#: server_privileges.php:1889 server_privileges.php:1894
+#: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228
+>>>>>>> origin/master
 #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342
 msgid "No"
 msgstr "Non"
@@ -181,9 +214,15 @@ msgstr "Non"
 #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106
 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262
 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344
+<<<<<<< HEAD
 #: server_databases.php:64 server_privileges.php:1582
 #: server_privileges.php:1596 server_privileges.php:1911
 #: server_privileges.php:1914 server_privileges.php:2210 sql.php:193
+=======
+#: server_databases.php:64 server_privileges.php:1565
+#: server_privileges.php:1579 server_privileges.php:1889
+#: server_privileges.php:1892 server_privileges.php:2187 sql.php:193
+>>>>>>> origin/master
 #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350
 #: tbl_tracking.php:335 tbl_tracking.php:340
 msgid "Yes"
@@ -232,7 +271,15 @@ msgstr "Mudar o nome da base de datos para"
 msgid "Command"
 msgstr "Orde"
 
+<<<<<<< HEAD
 #: db_operations.php:466
+=======
+#: db_operations.php:429 tbl_change.php:1140
+msgid "and then"
+msgstr "e despois"
+
+#: db_operations.php:455
+>>>>>>> origin/master
 msgid "Copy database to"
 msgstr "Copiar a base de datos para"
 
@@ -320,7 +367,11 @@ msgstr "Activar"
 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730
 #: server_collations.php:54 server_collations.php:66 server_databases.php:111
 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179
+<<<<<<< HEAD
 #: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326
+=======
+#: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326
+>>>>>>> origin/master
 msgid "Collation"
 msgstr "Orde alfabética"
 
@@ -349,7 +400,11 @@ msgstr "Táboa"
 #: db_printview.php:105 libraries/db_structure.lib.php:56
 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146
 #: navigation.php:638 navigation.php:660 server_databases.php:122
+<<<<<<< HEAD
 #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775
+=======
+#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777
+>>>>>>> origin/master
 msgid "Rows"
 msgstr "Fileiras"
 
@@ -364,19 +419,31 @@ msgstr "en uso"
 
 #: db_printview.php:187 libraries/db_info.inc.php:88
 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433
+<<<<<<< HEAD
 #: tbl_structure.php:807
+=======
+#: tbl_structure.php:809
+>>>>>>> origin/master
 msgid "Creation"
 msgstr "Creación"
 
 #: db_printview.php:196 libraries/db_info.inc.php:93
 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443
+<<<<<<< HEAD
 #: tbl_structure.php:815
+=======
+#: tbl_structure.php:817
+>>>>>>> origin/master
 msgid "Last update"
 msgstr "Actualización máis recente"
 
 #: db_printview.php:205 libraries/db_info.inc.php:98
 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453
+<<<<<<< HEAD
 #: tbl_structure.php:823
+=======
+#: tbl_structure.php:825
+>>>>>>> origin/master
 msgid "Last check"
 msgstr "Comprobación máis recente"
 
@@ -441,7 +508,11 @@ msgstr "Eliminar"
 
 #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553
 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779
+<<<<<<< HEAD
 #: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250
+=======
+#: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250
+>>>>>>> origin/master
 #: tbl_select.php:286
 msgid "Or"
 msgstr "ou"
@@ -661,9 +732,15 @@ msgstr "Todos os marcados"
 msgid "Check All"
 msgstr "Marcalos todos"
 
+<<<<<<< HEAD
 #: db_structure.php:529 libraries/display_tbl.lib.php:2077
 #: libraries/replication_gui.lib.php:36 server_databases.php:350
 #: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460
+=======
+#: db_structure.php:531 libraries/display_tbl.lib.php:2077
+#: libraries/replication_gui.lib.php:36 server_databases.php:350
+#: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462
+>>>>>>> origin/master
 msgid "Uncheck All"
 msgstr "Quitarlles as marcas a todos"
 
@@ -1129,10 +1206,17 @@ msgid "Prev"
 msgstr "Anterior"
 
 #. l10n: Display text for next month link in calendar
+<<<<<<< HEAD
 #: js/messages.php:106 libraries/common.lib.php:2366
 #: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338
 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
 #: tbl_structure.php:799
+=======
+#: js/messages.php:77 libraries/common.lib.php:2353
+#: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338
+#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
+#: tbl_structure.php:801
+>>>>>>> origin/master
 msgid "Next"
 msgstr "Seguinte"
 
@@ -1685,7 +1769,11 @@ msgstr "Contrasinal:"
 msgid "Server Choice"
 msgstr "Escolla de servidor"
 
+<<<<<<< HEAD
 #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63
+=======
+#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59
+>>>>>>> origin/master
 msgid "Cookies must be enabled past this point."
 msgstr "A partir de aquí debe permitir cookies."
 
@@ -1768,7 +1856,11 @@ msgstr ""
 "Non é posíbel usar nen iconv nen libiconv nen a función recode_stringf "
 "mentres haxa engadidos por cargar. Comprobe a configuración do php."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:580
+=======
+#: libraries/common.inc.php:576
+>>>>>>> origin/master
 msgid ""
 "phpMyAdmin was unable to read your configuration file!<br />This might "
 "happen if PHP finds a parse error in it or PHP cannot find the file.<br /"
@@ -1784,13 +1876,21 @@ msgstr ""
 "casos simplemente faltan unha aspa ou un ponto e vírcula <br/>Se recibe unha "
 "páxina en branco é que todo está ben."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:591
+=======
+#: libraries/common.inc.php:587
+>>>>>>> origin/master
 #, fuzzy, php-format
 #| msgid "Could not load default configuration from: \"%1$s\""
 msgid "Could not load default configuration from: %1$s"
 msgstr "Non se puido cargar a configuración desde: \"%1$s\""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:596
+=======
+#: libraries/common.inc.php:592
+>>>>>>> origin/master
 msgid ""
 "The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
 "configuration file!"
@@ -1798,29 +1898,49 @@ msgstr ""
 "A directiva <tt>$cfg['PmaAbsoluteUri']</tt> DEBE estar asignada no seu "
 "ficheiro de configuración."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:626
+=======
+#: libraries/common.inc.php:622
+>>>>>>> origin/master
 #, fuzzy, php-format
 #| msgid "Invalid server index: \"%s\""
 msgid "Invalid server index: %s"
 msgstr "O índice do servidor non é válido: \"%s\""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:633
+=======
+#: libraries/common.inc.php:629
+>>>>>>> origin/master
 #, php-format
 msgid "Invalid hostname for server %1$s. Please review your configuration."
 msgstr ""
 "O nome de servidor non é válido para o servidor %1$s. Revise a configuración."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:642 libraries/header.inc.php:100
+=======
+#: libraries/common.inc.php:638 libraries/header.inc.php:96
+>>>>>>> origin/master
 #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47
 #: main.php:185 test/theme.php:57
 msgid "Server"
 msgstr "Servidor"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:820
 msgid "Invalid authentication method set in configuration:"
 msgstr "Na configuración indicouse un método de autenticación que non válido::"
 
 #: libraries/common.inc.php:923
+=======
+#: libraries/common.inc.php:816
+msgid "Invalid authentication method set in configuration:"
+msgstr "Na configuración indicouse un método de autenticación que non válido::"
+
+#: libraries/common.inc.php:919
+>>>>>>> origin/master
 #, php-format
 msgid "You should upgrade to %s %s or later."
 msgstr "Debería actualizar a %s %s ou posterior."
@@ -2068,7 +2188,11 @@ msgid ""
 msgstr "Pode non ser exacto. Consulte a FAQ 3.11"
 
 #: libraries/db_structure.lib.php:69 server_databases.php:142
+<<<<<<< HEAD
 #: tbl_printview.php:335 tbl_structure.php:680
+=======
+#: tbl_printview.php:335 tbl_structure.php:682
+>>>>>>> origin/master
 msgid "Overhead"
 msgstr "De máis (Overhead)"
 
@@ -2097,22 +2221,36 @@ msgid "Change password"
 msgstr "Trocar o contrasinal"
 
 #: libraries/display_change_password.lib.php:35
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:348 server_privileges.php:808
+=======
+#: libraries/replication_gui.lib.php:348 server_privileges.php:807
+>>>>>>> origin/master
 msgid "No Password"
 msgstr "Sen contrasinal"
 
 #: libraries/display_change_password.lib.php:41
 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63
 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:352 server_privileges.php:797
 #: server_privileges.php:801 server_privileges.php:812
 #: server_privileges.php:1555 server_synchronize.php:1175
+=======
+#: libraries/replication_gui.lib.php:352 server_privileges.php:796
+#: server_privileges.php:800 server_privileges.php:811
+#: server_privileges.php:1538 server_synchronize.php:1175
+>>>>>>> origin/master
 msgid "Password"
 msgstr "Contrasinal"
 
 #: libraries/display_change_password.lib.php:46
 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359
+<<<<<<< HEAD
 #: server_privileges.php:816 server_privileges.php:819
+=======
+#: server_privileges.php:815 server_privileges.php:818
+>>>>>>> origin/master
 msgid "Re-type"
 msgstr "Reescribir"
 
@@ -2127,12 +2265,20 @@ msgid "MySQL 4.0 compatible"
 msgstr "Compatíbel co MySQL&nbsp;4.0"
 
 #: libraries/display_change_password.lib.php:72
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:363 server_privileges.php:823
+=======
+#: libraries/replication_gui.lib.php:363 server_privileges.php:822
+>>>>>>> origin/master
 msgid "Generate Password"
 msgstr "Xerar un contrasinal"
 
 #: libraries/display_change_password.lib.php:75
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:366 server_privileges.php:826
+=======
+#: libraries/replication_gui.lib.php:366 server_privileges.php:825
+>>>>>>> origin/master
 msgid "Generate"
 msgstr "Xerar"
 
@@ -2221,7 +2367,11 @@ msgid "remember template"
 msgstr "lembrar o modelo"
 
 #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552
+=======
+#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549
+>>>>>>> origin/master
 msgid "Character set of the file:"
 msgstr "Conxunto de caracteres do ficheiro:"
 
@@ -2279,7 +2429,11 @@ msgstr ""
 msgid "File to import"
 msgstr "Ficheiro a importar"
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527
+=======
+#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524
+>>>>>>> origin/master
 msgid "Location of the text file"
 msgstr "Localización do arquivo de texto"
 
@@ -2287,12 +2441,20 @@ msgstr "Localización do arquivo de texto"
 msgid "File uploads are not allowed on this server."
 msgstr "Este servidor non admite a recepción de ficheiros."
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536
+=======
+#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533
+>>>>>>> origin/master
 #: tbl_change.php:1025
 msgid "The directory you set for upload work cannot be reached"
 msgstr "Non se pode acceder ao directorio que designou para os envíos"
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539
+=======
+#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536
+>>>>>>> origin/master
 #: tbl_change.php:1028
 msgid "web server upload directory"
 msgstr "directorio de recepción do servidor web"
@@ -2428,7 +2590,11 @@ msgstr "Ordenar pola chave"
 #: libraries/import/docsql.php:34 libraries/import/ldi.php:47
 #: libraries/import/ods.php:30 libraries/import/sql.php:20
 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26
+<<<<<<< HEAD
 #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751
+=======
+#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753
+>>>>>>> origin/master
 msgid "Options"
 msgstr "Opcións"
 
@@ -2577,7 +2743,11 @@ msgstr "Uso da reserva da memoria intermedia"
 
 #: libraries/engines/innodb.lib.php:194 server_databases.php:137
 #: server_databases.php:305 server_status.php:525 server_status.php:586
+<<<<<<< HEAD
 #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694
+=======
+#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696
+>>>>>>> origin/master
 msgid "Total"
 msgstr "Total"
 
@@ -2867,7 +3037,11 @@ msgstr ""
 "o nome e dáselles o número máis alto seguinte."
 
 #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88
+<<<<<<< HEAD
 #: tbl_printview.php:375 tbl_structure.php:735
+=======
+#: tbl_printview.php:375 tbl_structure.php:737
+>>>>>>> origin/master
 msgid "Format"
 msgstr "Formato"
 
@@ -2941,8 +3115,13 @@ msgstr "Microsoft Word 2000"
 #: libraries/export/latex.php:201 libraries/export/odt.php:48
 #: libraries/export/sql.php:106 libraries/export/sql.php:868
 #: libraries/export/texytext.php:27 server_databases.php:127
+<<<<<<< HEAD
 #: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316
 #: tbl_structure.php:663
+=======
+#: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316
+#: tbl_structure.php:665
+>>>>>>> origin/master
 msgid "Data"
 msgstr "Datos"
 
@@ -2991,9 +3170,15 @@ msgstr "Tipo MIME"
 #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57
 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177
 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:332 server_privileges.php:732
 #: server_privileges.php:735 server_privileges.php:791
 #: server_privileges.php:1554 server_privileges.php:2092
+=======
+#: libraries/replication_gui.lib.php:332 server_privileges.php:731
+#: server_privileges.php:734 server_privileges.php:790
+#: server_privileges.php:1537 server_privileges.php:2069
+>>>>>>> origin/master
 #: server_processlist.php:55 server_synchronize.php:1159
 msgid "Host"
 msgstr "Servidor"
@@ -3666,8 +3851,13 @@ msgstr ""
 
 #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59
 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:262 server_privileges.php:712
 #: server_privileges.php:715 server_privileges.php:722
+=======
+#: libraries/replication_gui.lib.php:262 server_privileges.php:711
+#: server_privileges.php:714 server_privileges.php:721
+>>>>>>> origin/master
 #: server_synchronize.php:1171
 msgid "User name"
 msgstr "Nome do usuario"
@@ -3684,14 +3874,22 @@ msgstr "Estado do mestre"
 msgid "Slave status"
 msgstr "Estado do escravo"
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448
+=======
+#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445
+>>>>>>> origin/master
 #: server_status.php:737 server_variables.php:52
 msgid "Variable"
 msgstr "Variábel"
 
 #: libraries/replication_gui.lib.php:118 server_status.php:738
 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138
+<<<<<<< HEAD
 #: tbl_structure.php:727
+=======
+#: tbl_structure.php:729
+>>>>>>> origin/master
 msgid "Value"
 msgstr "Valor"
 
@@ -3711,11 +3909,16 @@ msgstr ""
 msgid "Add slave replication user"
 msgstr "Engadir un usuario de replicación de escravos"
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:257 server_privileges.php:717
+=======
+#: libraries/replication_gui.lib.php:257 server_privileges.php:716
+>>>>>>> origin/master
 msgid "Any user"
 msgstr "Calquera usuario"
 
 #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:349 server_privileges.php:718
 #: server_privileges.php:785 server_privileges.php:809
 #: server_privileges.php:1950 server_privileges.php:1980
@@ -3739,6 +3942,31 @@ msgid "Use Host Table"
 msgstr "Usar a táboa de Host"
 
 #: libraries/replication_gui.lib.php:334 server_privileges.php:793
+=======
+#: libraries/replication_gui.lib.php:349 server_privileges.php:717
+#: server_privileges.php:784 server_privileges.php:808
+#: server_privileges.php:1928 server_privileges.php:1958
+msgid "Use text field"
+msgstr "Use campo de texto"
+
+#: libraries/replication_gui.lib.php:305 server_privileges.php:764
+msgid "Any host"
+msgstr "Calquera servidor"
+
+#: libraries/replication_gui.lib.php:309 server_privileges.php:768
+msgid "Local"
+msgstr "Local"
+
+#: libraries/replication_gui.lib.php:315 server_privileges.php:773
+msgid "This Host"
+msgstr "Este servidor"
+
+#: libraries/replication_gui.lib.php:321 server_privileges.php:779
+msgid "Use Host Table"
+msgstr "Usar a táboa de Host"
+
+#: libraries/replication_gui.lib.php:334 server_privileges.php:792
+>>>>>>> origin/master
 msgid ""
 "When Host table is used, this field is ignored and values stored in Host "
 "table are used instead."
@@ -8230,10 +8458,13 @@ msgstr ""
 msgid "Show insert query"
 msgstr "Mostrar procura SQL"
 
+<<<<<<< HEAD
 #: tbl_change.php:1140
 msgid "and then"
 msgstr "e despois"
 
+=======
+>>>>>>> origin/master
 #: tbl_change.php:1144
 msgid "Go back to previous page"
 msgstr "Voltar"
@@ -8429,6 +8660,7 @@ msgstr "Comprobar a integridade das referencias:"
 msgid "Show tables"
 msgstr "Mostrar as táboas"
 
+<<<<<<< HEAD
 #: tbl_printview.php:309 tbl_structure.php:654
 msgid "Space usage"
 msgstr "Uso do espazo"
@@ -8462,6 +8694,41 @@ msgid "Row length"
 msgstr "Lonxitude da fileira"
 
 #: tbl_printview.php:413 tbl_structure.php:791
+=======
+#: tbl_printview.php:309 tbl_structure.php:656
+msgid "Space usage"
+msgstr "Uso do espazo"
+
+#: tbl_printview.php:313 tbl_structure.php:660
+msgid "Usage"
+msgstr "Uso"
+
+#: tbl_printview.php:340 tbl_structure.php:687
+msgid "Effective"
+msgstr "Efectivo"
+
+#: tbl_printview.php:365 tbl_structure.php:725
+msgid "Row Statistics"
+msgstr "Estatísticas da fileira"
+
+#: tbl_printview.php:368 tbl_structure.php:728
+msgid "Statements"
+msgstr "Informacións"
+
+#: tbl_printview.php:379 tbl_structure.php:740
+msgid "static"
+msgstr "estático"
+
+#: tbl_printview.php:381 tbl_structure.php:742
+msgid "dynamic"
+msgstr "dinámico"
+
+#: tbl_printview.php:403 tbl_structure.php:785
+msgid "Row length"
+msgstr "Lonxitude da fileira"
+
+#: tbl_printview.php:413 tbl_structure.php:793
+>>>>>>> origin/master
 msgid " Row size "
 msgstr " Tamaño da fileira "
 
diff --git a/po/he.po b/po/he.po
index 9fa500ba4..aa88df969 100755
--- a/po/he.po
+++ b/po/he.po
@@ -3,7 +3,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2010-07-03 21:45+0530\n"
+=======
+"POT-Creation-Date: 2010-07-03 09:00-0400\n"
+>>>>>>> origin/master
 "PO-Revision-Date: 2010-03-12 09:15+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: hebrew <he@li.org>\n"
@@ -45,15 +49,26 @@ msgstr "חיפוש"
 #: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046
 #: libraries/Theme_Manager.class.php:311
 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719
+<<<<<<< HEAD
 #: libraries/common.lib.php:1344 libraries/common.lib.php:2301
 #: libraries/display_change_password.lib.php:82
 #: libraries/display_create_table.lib.php:62
+=======
+#: libraries/common.lib.php:1335 libraries/common.lib.php:2288
+#: libraries/display_change_password.lib.php:82
+#: libraries/display_create_table.lib.php:63
+>>>>>>> origin/master
 #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532
 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76
 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104
+<<<<<<< HEAD
 #: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480
 #: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782
+=======
+#: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477
+#: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782
+>>>>>>> origin/master
 #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328
 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142
 #: server_privileges.php:665 server_privileges.php:1641
@@ -63,8 +78,13 @@ msgstr "חיפוש"
 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171
 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265
 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561
+<<<<<<< HEAD
 #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560
 #: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512
+=======
+#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562
+#: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512
+>>>>>>> origin/master
 #: view_create.php:182 view_operations.php:101
 msgid "Go"
 msgstr "סע"
@@ -117,10 +137,17 @@ msgstr "שמות עמודה"
 #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245
 #: libraries/export/latex.php:360 libraries/export/odt.php:297
 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100
+<<<<<<< HEAD
 #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093
 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
 #: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321
+=======
+#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070
+#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
+#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
+#: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321
+>>>>>>> origin/master
 msgid "Type"
 msgstr "סוג"
 
@@ -161,9 +188,15 @@ msgstr "הערות"
 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322
 #: libraries/export/latex.php:430 libraries/export/odt.php:368
 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263
+<<<<<<< HEAD
 #: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596
 #: server_privileges.php:1911 server_privileges.php:1916
 #: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228
+=======
+#: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579
+#: server_privileges.php:1889 server_privileges.php:1894
+#: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228
+>>>>>>> origin/master
 #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342
 msgid "No"
 msgstr "לא"
@@ -177,9 +210,15 @@ msgstr "לא"
 #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106
 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262
 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344
+<<<<<<< HEAD
 #: server_databases.php:64 server_privileges.php:1582
 #: server_privileges.php:1596 server_privileges.php:1911
 #: server_privileges.php:1914 server_privileges.php:2210 sql.php:193
+=======
+#: server_databases.php:64 server_privileges.php:1565
+#: server_privileges.php:1579 server_privileges.php:1889
+#: server_privileges.php:1892 server_privileges.php:2187 sql.php:193
+>>>>>>> origin/master
 #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350
 #: tbl_tracking.php:335 tbl_tracking.php:340
 msgid "Yes"
@@ -228,7 +267,15 @@ msgstr "שינוי שם מאגר נתונים אל"
 msgid "Command"
 msgstr "פקודה"
 
+<<<<<<< HEAD
 #: db_operations.php:466
+=======
+#: db_operations.php:429 tbl_change.php:1140
+msgid "and then"
+msgstr "ואז"
+
+#: db_operations.php:455
+>>>>>>> origin/master
 msgid "Copy database to"
 msgstr "העתקת מאגר נתונים אל"
 
@@ -317,7 +364,11 @@ msgstr "מופעל"
 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730
 #: server_collations.php:54 server_collations.php:66 server_databases.php:111
 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179
+<<<<<<< HEAD
 #: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326
+=======
+#: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326
+>>>>>>> origin/master
 msgid "Collation"
 msgstr "קידוד"
 
@@ -345,7 +396,11 @@ msgstr "טבלה"
 #: db_printview.php:105 libraries/db_structure.lib.php:56
 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146
 #: navigation.php:638 navigation.php:660 server_databases.php:122
+<<<<<<< HEAD
 #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775
+=======
+#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777
+>>>>>>> origin/master
 msgid "Rows"
 msgstr "שורות"
 
@@ -360,19 +415,31 @@ msgstr "בשימוש"
 
 #: db_printview.php:187 libraries/db_info.inc.php:88
 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433
+<<<<<<< HEAD
 #: tbl_structure.php:807
+=======
+#: tbl_structure.php:809
+>>>>>>> origin/master
 msgid "Creation"
 msgstr "יצירה"
 
 #: db_printview.php:196 libraries/db_info.inc.php:93
 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443
+<<<<<<< HEAD
 #: tbl_structure.php:815
+=======
+#: tbl_structure.php:817
+>>>>>>> origin/master
 msgid "Last update"
 msgstr "עדכון אחרון"
 
 #: db_printview.php:205 libraries/db_info.inc.php:98
 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453
+<<<<<<< HEAD
 #: tbl_structure.php:823
+=======
+#: tbl_structure.php:825
+>>>>>>> origin/master
 msgid "Last check"
 msgstr "נבדק לאחרונה"
 
@@ -437,7 +504,11 @@ msgstr "מחיקה"
 
 #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553
 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779
+<<<<<<< HEAD
 #: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250
+=======
+#: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250
+>>>>>>> origin/master
 #: tbl_select.php:286
 msgid "Or"
 msgstr "או"
@@ -656,9 +727,15 @@ msgstr "עם הנבחרים:"
 msgid "Check All"
 msgstr "בחירת הכל"
 
+<<<<<<< HEAD
 #: db_structure.php:529 libraries/display_tbl.lib.php:2077
 #: libraries/replication_gui.lib.php:36 server_databases.php:350
 #: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460
+=======
+#: db_structure.php:531 libraries/display_tbl.lib.php:2077
+#: libraries/replication_gui.lib.php:36 server_databases.php:350
+#: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462
+>>>>>>> origin/master
 msgid "Uncheck All"
 msgstr "בטל סימון הכל"
 
@@ -1111,10 +1188,17 @@ msgid "Prev"
 msgstr "הקודם"
 
 #. l10n: Display text for next month link in calendar
+<<<<<<< HEAD
 #: js/messages.php:106 libraries/common.lib.php:2366
 #: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338
 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
 #: tbl_structure.php:799
+=======
+#: js/messages.php:77 libraries/common.lib.php:2353
+#: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338
+#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
+#: tbl_structure.php:801
+>>>>>>> origin/master
 msgid "Next"
 msgstr "הבא"
 
@@ -1653,7 +1737,11 @@ msgstr "סיסמא:"
 msgid "Server Choice"
 msgstr "בחירת שרת"
 
+<<<<<<< HEAD
 #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63
+=======
+#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59
+>>>>>>> origin/master
 msgid "Cookies must be enabled past this point."
 msgstr "עוגיות (Cookies) חייבות לפעול מנקודה זאת."
 
@@ -1732,7 +1820,11 @@ msgstr ""
 "נכשל בשימוש בפונקציות iconv, libiconv או recode, למרות שזה נראה כי התוספות "
 "הדרושות נטענו. בדוק את הגדרות PHP שלך."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:580
+=======
+#: libraries/common.inc.php:576
+>>>>>>> origin/master
 msgid ""
 "phpMyAdmin was unable to read your configuration file!<br />This might "
 "happen if PHP finds a parse error in it or PHP cannot find the file.<br /"
@@ -1746,38 +1838,66 @@ msgstr ""
 "ישירות בעזרת הקישור מתחת להודעה זו וקרא את הודעת PHP שהינך מקבל. ברוב המילים "
 "גרש או נקודה-פסיק חסרים במקום כלשהו.<br /> אם הינך מקבל דף ריק, הכל בסדר."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:591
+=======
+#: libraries/common.inc.php:587
+>>>>>>> origin/master
 #, php-format
 msgid "Could not load default configuration from: %1$s"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:596
+=======
+#: libraries/common.inc.php:592
+>>>>>>> origin/master
 msgid ""
 "The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
 "configuration file!"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:626
+=======
+#: libraries/common.inc.php:622
+>>>>>>> origin/master
 #, php-format
 msgid "Invalid server index: %s"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:633
+=======
+#: libraries/common.inc.php:629
+>>>>>>> origin/master
 #, php-format
 msgid "Invalid hostname for server %1$s. Please review your configuration."
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:642 libraries/header.inc.php:100
+=======
+#: libraries/common.inc.php:638 libraries/header.inc.php:96
+>>>>>>> origin/master
 #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47
 #: main.php:185 test/theme.php:57
 msgid "Server"
 msgstr "שרת"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:820
 msgid "Invalid authentication method set in configuration:"
 msgstr ""
 
 #: libraries/common.inc.php:923
+=======
+#: libraries/common.inc.php:816
+msgid "Invalid authentication method set in configuration:"
+msgstr ""
+
+#: libraries/common.inc.php:919
+>>>>>>> origin/master
 #, php-format
 msgid "You should upgrade to %s %s or later."
 msgstr "אתה צריך לשדרג אל %s %s לפחות."
@@ -2026,7 +2146,11 @@ msgid ""
 msgstr "יכול להיות הערכה. ראה FAQ 3.11"
 
 #: libraries/db_structure.lib.php:69 server_databases.php:142
+<<<<<<< HEAD
 #: tbl_printview.php:335 tbl_structure.php:680
+=======
+#: tbl_printview.php:335 tbl_structure.php:682
+>>>>>>> origin/master
 msgid "Overhead"
 msgstr "תקורה"
 
@@ -2053,22 +2177,36 @@ msgid "Change password"
 msgstr "שינוי סיסמא"
 
 #: libraries/display_change_password.lib.php:35
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:348 server_privileges.php:808
+=======
+#: libraries/replication_gui.lib.php:348 server_privileges.php:807
+>>>>>>> origin/master
 msgid "No Password"
 msgstr "ללא סיסמא"
 
 #: libraries/display_change_password.lib.php:41
 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63
 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:352 server_privileges.php:797
 #: server_privileges.php:801 server_privileges.php:812
 #: server_privileges.php:1555 server_synchronize.php:1175
+=======
+#: libraries/replication_gui.lib.php:352 server_privileges.php:796
+#: server_privileges.php:800 server_privileges.php:811
+#: server_privileges.php:1538 server_synchronize.php:1175
+>>>>>>> origin/master
 msgid "Password"
 msgstr "סיסמא"
 
 #: libraries/display_change_password.lib.php:46
 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359
+<<<<<<< HEAD
 #: server_privileges.php:816 server_privileges.php:819
+=======
+#: server_privileges.php:815 server_privileges.php:818
+>>>>>>> origin/master
 msgid "Re-type"
 msgstr "הקלדה נוספת"
 
@@ -2083,12 +2221,20 @@ msgid "MySQL 4.0 compatible"
 msgstr "תואם MySQL&nbsp;4.0"
 
 #: libraries/display_change_password.lib.php:72
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:363 server_privileges.php:823
+=======
+#: libraries/replication_gui.lib.php:363 server_privileges.php:822
+>>>>>>> origin/master
 msgid "Generate Password"
 msgstr "ייצור סיסמא"
 
 #: libraries/display_change_password.lib.php:75
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:366 server_privileges.php:826
+=======
+#: libraries/replication_gui.lib.php:366 server_privileges.php:825
+>>>>>>> origin/master
 msgid "Generate"
 msgstr "ייצור"
 
@@ -2174,7 +2320,11 @@ msgid "remember template"
 msgstr "זכור תבנית"
 
 #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552
+=======
+#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549
+>>>>>>> origin/master
 msgid "Character set of the file:"
 msgstr "חבילת הקידוד של הקובץ:"
 
@@ -2227,7 +2377,11 @@ msgstr ""
 msgid "File to import"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527
+=======
+#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524
+>>>>>>> origin/master
 msgid "Location of the text file"
 msgstr "מיקום של קובץ טקסט"
 
@@ -2235,12 +2389,20 @@ msgstr "מיקום של קובץ טקסט"
 msgid "File uploads are not allowed on this server."
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536
+=======
+#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533
+>>>>>>> origin/master
 #: tbl_change.php:1025
 msgid "The directory you set for upload work cannot be reached"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539
+=======
+#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536
+>>>>>>> origin/master
 #: tbl_change.php:1028
 #, fuzzy
 msgid "web server upload directory"
@@ -2370,7 +2532,11 @@ msgstr ""
 #: libraries/import/docsql.php:34 libraries/import/ldi.php:47
 #: libraries/import/ods.php:30 libraries/import/sql.php:20
 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26
+<<<<<<< HEAD
 #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751
+=======
+#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753
+>>>>>>> origin/master
 #, fuzzy
 msgid "Options"
 msgstr "פעולות"
@@ -2515,7 +2681,11 @@ msgstr ""
 
 #: libraries/engines/innodb.lib.php:194 server_databases.php:137
 #: server_databases.php:305 server_status.php:525 server_status.php:586
+<<<<<<< HEAD
 #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694
+=======
+#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696
+>>>>>>> origin/master
 msgid "Total"
 msgstr "סה\"כ"
 
@@ -2761,7 +2931,11 @@ msgid ""
 msgstr ""
 
 #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88
+<<<<<<< HEAD
 #: tbl_printview.php:375 tbl_structure.php:735
+=======
+#: tbl_printview.php:375 tbl_structure.php:737
+>>>>>>> origin/master
 msgid "Format"
 msgstr "תבנית"
 
@@ -2831,8 +3005,13 @@ msgstr "Microsoft Word 2000"
 #: libraries/export/latex.php:201 libraries/export/odt.php:48
 #: libraries/export/sql.php:106 libraries/export/sql.php:868
 #: libraries/export/texytext.php:27 server_databases.php:127
+<<<<<<< HEAD
 #: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316
 #: tbl_structure.php:663
+=======
+#: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316
+#: tbl_structure.php:665
+>>>>>>> origin/master
 msgid "Data"
 msgstr "נתונים"
 
@@ -2881,9 +3060,15 @@ msgstr "סוג MIME"
 #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57
 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177
 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:332 server_privileges.php:732
 #: server_privileges.php:735 server_privileges.php:791
 #: server_privileges.php:1554 server_privileges.php:2092
+=======
+#: libraries/replication_gui.lib.php:332 server_privileges.php:731
+#: server_privileges.php:734 server_privileges.php:790
+#: server_privileges.php:1537 server_privileges.php:2069
+>>>>>>> origin/master
 #: server_processlist.php:55 server_synchronize.php:1159
 msgid "Host"
 msgstr "מארח"
@@ -3553,8 +3738,13 @@ msgstr ""
 
 #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59
 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:262 server_privileges.php:712
 #: server_privileges.php:715 server_privileges.php:722
+=======
+#: libraries/replication_gui.lib.php:262 server_privileges.php:711
+#: server_privileges.php:714 server_privileges.php:721
+>>>>>>> origin/master
 #: server_synchronize.php:1171
 msgid "User name"
 msgstr "שם משתמש"
@@ -3572,14 +3762,22 @@ msgstr ""
 msgid "Slave status"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448
+=======
+#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445
+>>>>>>> origin/master
 #: server_status.php:737 server_variables.php:52
 msgid "Variable"
 msgstr "משתנה"
 
 #: libraries/replication_gui.lib.php:118 server_status.php:738
 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138
+<<<<<<< HEAD
 #: tbl_structure.php:727
+=======
+#: tbl_structure.php:729
+>>>>>>> origin/master
 msgid "Value"
 msgstr "ערך"
 
@@ -3597,11 +3795,16 @@ msgstr ""
 msgid "Add slave replication user"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:257 server_privileges.php:717
+=======
+#: libraries/replication_gui.lib.php:257 server_privileges.php:716
+>>>>>>> origin/master
 msgid "Any user"
 msgstr "כל משתמש"
 
 #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:349 server_privileges.php:718
 #: server_privileges.php:785 server_privileges.php:809
 #: server_privileges.php:1950 server_privileges.php:1980
@@ -3625,6 +3828,31 @@ msgid "Use Host Table"
 msgstr "Use Host Table"
 
 #: libraries/replication_gui.lib.php:334 server_privileges.php:793
+=======
+#: libraries/replication_gui.lib.php:349 server_privileges.php:717
+#: server_privileges.php:784 server_privileges.php:808
+#: server_privileges.php:1928 server_privileges.php:1958
+msgid "Use text field"
+msgstr "השתמש בשדה טקסט"
+
+#: libraries/replication_gui.lib.php:305 server_privileges.php:764
+msgid "Any host"
+msgstr "כל שרת מארח"
+
+#: libraries/replication_gui.lib.php:309 server_privileges.php:768
+msgid "Local"
+msgstr "מקומי"
+
+#: libraries/replication_gui.lib.php:315 server_privileges.php:773
+msgid "This Host"
+msgstr "מארח זה"
+
+#: libraries/replication_gui.lib.php:321 server_privileges.php:779
+msgid "Use Host Table"
+msgstr "Use Host Table"
+
+#: libraries/replication_gui.lib.php:334 server_privileges.php:792
+>>>>>>> origin/master
 msgid ""
 "When Host table is used, this field is ignored and values stored in Host "
 "table are used instead."
@@ -7603,10 +7831,13 @@ msgstr ""
 msgid "Show insert query"
 msgstr ""
 
+<<<<<<< HEAD
 #: tbl_change.php:1140
 msgid "and then"
 msgstr "ואז"
 
+=======
+>>>>>>> origin/master
 #: tbl_change.php:1144
 msgid "Go back to previous page"
 msgstr "חזרה לעמוד הקודם"
@@ -7803,6 +8034,7 @@ msgstr ""
 msgid "Show tables"
 msgstr "ראיית טבלאות"
 
+<<<<<<< HEAD
 #: tbl_printview.php:309 tbl_structure.php:654
 msgid "Space usage"
 msgstr "שימוש מקום"
@@ -7836,6 +8068,41 @@ msgid "Row length"
 msgstr "אורך שורה"
 
 #: tbl_printview.php:413 tbl_structure.php:791
+=======
+#: tbl_printview.php:309 tbl_structure.php:656
+msgid "Space usage"
+msgstr "שימוש מקום"
+
+#: tbl_printview.php:313 tbl_structure.php:660
+msgid "Usage"
+msgstr "שימוש"
+
+#: tbl_printview.php:340 tbl_structure.php:687
+msgid "Effective"
+msgstr "יעיל"
+
+#: tbl_printview.php:365 tbl_structure.php:725
+msgid "Row Statistics"
+msgstr "סטטיסטיקת שורה"
+
+#: tbl_printview.php:368 tbl_structure.php:728
+msgid "Statements"
+msgstr "משפטים"
+
+#: tbl_printview.php:379 tbl_structure.php:740
+msgid "static"
+msgstr ""
+
+#: tbl_printview.php:381 tbl_structure.php:742
+msgid "dynamic"
+msgstr "דינאמי"
+
+#: tbl_printview.php:403 tbl_structure.php:785
+msgid "Row length"
+msgstr "אורך שורה"
+
+#: tbl_printview.php:413 tbl_structure.php:793
+>>>>>>> origin/master
 msgid " Row size "
 msgstr " גודל שורה "
 
diff --git a/po/hi.po b/po/hi.po
index 3097e7420..5ca7225c7 100755
--- a/po/hi.po
+++ b/po/hi.po
@@ -3,7 +3,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2010-07-03 21:45+0530\n"
+=======
+"POT-Creation-Date: 2010-07-03 09:00-0400\n"
+>>>>>>> origin/master
 "PO-Revision-Date: 2010-05-21 05:48+0200\n"
 "Last-Translator:  <u4663530@anu.edu.au>\n"
 "Language-Team: hindi <hi@li.org>\n"
@@ -48,15 +52,26 @@ msgstr "खोजें"
 #: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046
 #: libraries/Theme_Manager.class.php:311
 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719
+<<<<<<< HEAD
 #: libraries/common.lib.php:1344 libraries/common.lib.php:2301
 #: libraries/display_change_password.lib.php:82
 #: libraries/display_create_table.lib.php:62
+=======
+#: libraries/common.lib.php:1335 libraries/common.lib.php:2288
+#: libraries/display_change_password.lib.php:82
+#: libraries/display_create_table.lib.php:63
+>>>>>>> origin/master
 #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532
 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76
 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104
+<<<<<<< HEAD
 #: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480
 #: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782
+=======
+#: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477
+#: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782
+>>>>>>> origin/master
 #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328
 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142
 #: server_privileges.php:665 server_privileges.php:1641
@@ -66,8 +81,13 @@ msgstr "खोजें"
 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171
 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265
 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561
+<<<<<<< HEAD
 #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560
 #: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512
+=======
+#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562
+#: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512
+>>>>>>> origin/master
 #: view_create.php:182 view_operations.php:101
 msgid "Go"
 msgstr "आगे"
@@ -120,10 +140,17 @@ msgstr "कोलम के नाम"
 #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245
 #: libraries/export/latex.php:360 libraries/export/odt.php:297
 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100
+<<<<<<< HEAD
 #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093
 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
 #: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321
+=======
+#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070
+#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
+#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
+#: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321
+>>>>>>> origin/master
 msgid "Type"
 msgstr "टाइप"
 
@@ -164,9 +191,15 @@ msgstr "टिप्पणी"
 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322
 #: libraries/export/latex.php:430 libraries/export/odt.php:368
 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263
+<<<<<<< HEAD
 #: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596
 #: server_privileges.php:1911 server_privileges.php:1916
 #: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228
+=======
+#: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579
+#: server_privileges.php:1889 server_privileges.php:1894
+#: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228
+>>>>>>> origin/master
 #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342
 msgid "No"
 msgstr "नहीं"
@@ -180,9 +213,15 @@ msgstr "नहीं"
 #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106
 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262
 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344
+<<<<<<< HEAD
 #: server_databases.php:64 server_privileges.php:1582
 #: server_privileges.php:1596 server_privileges.php:1911
 #: server_privileges.php:1914 server_privileges.php:2210 sql.php:193
+=======
+#: server_databases.php:64 server_privileges.php:1565
+#: server_privileges.php:1579 server_privileges.php:1889
+#: server_privileges.php:1892 server_privileges.php:2187 sql.php:193
+>>>>>>> origin/master
 #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350
 #: tbl_tracking.php:335 tbl_tracking.php:340
 msgid "Yes"
@@ -231,7 +270,15 @@ msgstr "डेटाबेस का नाम बदल कर ____ रखे
 msgid "Command"
 msgstr "आदेश"
 
+<<<<<<< HEAD
 #: db_operations.php:466
+=======
+#: db_operations.php:429 tbl_change.php:1140
+msgid "and then"
+msgstr "और फिर"
+
+#: db_operations.php:455
+>>>>>>> origin/master
 msgid "Copy database to"
 msgstr "डेटाबेस को ______ में कॉपी करें"
 
@@ -313,7 +360,11 @@ msgstr "सक्षम"
 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730
 #: server_collations.php:54 server_collations.php:66 server_databases.php:111
 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179
+<<<<<<< HEAD
 #: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326
+=======
+#: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326
+>>>>>>> origin/master
 msgid "Collation"
 msgstr "क्रम में करें"
 
@@ -342,7 +393,11 @@ msgstr "  टेबल "
 #: db_printview.php:105 libraries/db_structure.lib.php:56
 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146
 #: navigation.php:638 navigation.php:660 server_databases.php:122
+<<<<<<< HEAD
 #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775
+=======
+#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777
+>>>>>>> origin/master
 msgid "Rows"
 msgstr ""
 
@@ -357,19 +412,31 @@ msgstr "उपयोग में"
 
 #: db_printview.php:187 libraries/db_info.inc.php:88
 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433
+<<<<<<< HEAD
 #: tbl_structure.php:807
+=======
+#: tbl_structure.php:809
+>>>>>>> origin/master
 msgid "Creation"
 msgstr "रचना"
 
 #: db_printview.php:196 libraries/db_info.inc.php:93
 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443
+<<<<<<< HEAD
 #: tbl_structure.php:815
+=======
+#: tbl_structure.php:817
+>>>>>>> origin/master
 msgid "Last update"
 msgstr "पिछला नवीनीकरण"
 
 #: db_printview.php:205 libraries/db_info.inc.php:98
 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453
+<<<<<<< HEAD
 #: tbl_structure.php:823
+=======
+#: tbl_structure.php:825
+>>>>>>> origin/master
 msgid "Last check"
 msgstr "पिछली जाँच"
 
@@ -434,7 +501,11 @@ msgstr "हटाइए"
 
 #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553
 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779
+<<<<<<< HEAD
 #: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250
+=======
+#: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250
+>>>>>>> origin/master
 #: tbl_select.php:286
 msgid "Or"
 msgstr "अथवा"
@@ -652,9 +723,15 @@ msgstr "चुने हुओं को:"
 msgid "Check All"
 msgstr "सभी को चेक करें"
 
+<<<<<<< HEAD
 #: db_structure.php:529 libraries/display_tbl.lib.php:2077
 #: libraries/replication_gui.lib.php:36 server_databases.php:350
 #: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460
+=======
+#: db_structure.php:531 libraries/display_tbl.lib.php:2077
+#: libraries/replication_gui.lib.php:36 server_databases.php:350
+#: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462
+>>>>>>> origin/master
 msgid "Uncheck All"
 msgstr " सभी को अनचेक करें"
 
@@ -1105,10 +1182,17 @@ msgid "Prev"
 msgstr "पिछला"
 
 #. l10n: Display text for next month link in calendar
+<<<<<<< HEAD
 #: js/messages.php:106 libraries/common.lib.php:2366
 #: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338
 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
 #: tbl_structure.php:799
+=======
+#: js/messages.php:77 libraries/common.lib.php:2353
+#: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338
+#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
+#: tbl_structure.php:801
+>>>>>>> origin/master
 msgid "Next"
 msgstr " अगला"
 
@@ -1603,7 +1687,11 @@ msgstr "पासव्रड:"
 msgid "Server Choice"
 msgstr "सर्वर चुनिये"
 
+<<<<<<< HEAD
 #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63
+=======
+#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59
+>>>>>>> origin/master
 msgid "Cookies must be enabled past this point."
 msgstr "कुकीज़ इस बिंदु अतीत सक्षम होना चाहिए."
 
@@ -1678,7 +1766,11 @@ msgid ""
 "necessary extensions appear to be loaded. Check your PHP configuration."
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:580
+=======
+#: libraries/common.inc.php:576
+>>>>>>> origin/master
 msgid ""
 "phpMyAdmin was unable to read your configuration file!<br />This might "
 "happen if PHP finds a parse error in it or PHP cannot find the file.<br /"
@@ -1688,38 +1780,66 @@ msgid ""
 "is fine."
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:591
+=======
+#: libraries/common.inc.php:587
+>>>>>>> origin/master
 #, php-format
 msgid "Could not load default configuration from: %1$s"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:596
+=======
+#: libraries/common.inc.php:592
+>>>>>>> origin/master
 msgid ""
 "The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
 "configuration file!"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:626
+=======
+#: libraries/common.inc.php:622
+>>>>>>> origin/master
 #, php-format
 msgid "Invalid server index: %s"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:633
+=======
+#: libraries/common.inc.php:629
+>>>>>>> origin/master
 #, php-format
 msgid "Invalid hostname for server %1$s. Please review your configuration."
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:642 libraries/header.inc.php:100
+=======
+#: libraries/common.inc.php:638 libraries/header.inc.php:96
+>>>>>>> origin/master
 #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47
 #: main.php:185 test/theme.php:57
 msgid "Server"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:820
 msgid "Invalid authentication method set in configuration:"
 msgstr ""
 
 #: libraries/common.inc.php:923
+=======
+#: libraries/common.inc.php:816
+msgid "Invalid authentication method set in configuration:"
+msgstr ""
+
+#: libraries/common.inc.php:919
+>>>>>>> origin/master
 #, php-format
 msgid "You should upgrade to %s %s or later."
 msgstr ""
@@ -1963,7 +2083,11 @@ msgstr ""
 "शायद अनुमानित हैं. [a@./Documentation.html#faq3_11@Documentation]FAQ 3.11[/a] देखें"
 
 #: libraries/db_structure.lib.php:69 server_databases.php:142
+<<<<<<< HEAD
 #: tbl_printview.php:335 tbl_structure.php:680
+=======
+#: tbl_printview.php:335 tbl_structure.php:682
+>>>>>>> origin/master
 msgid "Overhead"
 msgstr ""
 
@@ -1990,22 +2114,36 @@ msgid "Change password"
 msgstr "पासव्रड बदलिये"
 
 #: libraries/display_change_password.lib.php:35
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:348 server_privileges.php:808
+=======
+#: libraries/replication_gui.lib.php:348 server_privileges.php:807
+>>>>>>> origin/master
 msgid "No Password"
 msgstr "पासवर्ड नहीं है"
 
 #: libraries/display_change_password.lib.php:41
 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63
 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:352 server_privileges.php:797
 #: server_privileges.php:801 server_privileges.php:812
 #: server_privileges.php:1555 server_synchronize.php:1175
+=======
+#: libraries/replication_gui.lib.php:352 server_privileges.php:796
+#: server_privileges.php:800 server_privileges.php:811
+#: server_privileges.php:1538 server_synchronize.php:1175
+>>>>>>> origin/master
 msgid "Password"
 msgstr ""
 
 #: libraries/display_change_password.lib.php:46
 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359
+<<<<<<< HEAD
 #: server_privileges.php:816 server_privileges.php:819
+=======
+#: server_privileges.php:815 server_privileges.php:818
+>>>>>>> origin/master
 msgid "Re-type"
 msgstr ""
 
@@ -2018,12 +2156,20 @@ msgid "MySQL 4.0 compatible"
 msgstr ""
 
 #: libraries/display_change_password.lib.php:72
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:363 server_privileges.php:823
+=======
+#: libraries/replication_gui.lib.php:363 server_privileges.php:822
+>>>>>>> origin/master
 msgid "Generate Password"
 msgstr ""
 
 #: libraries/display_change_password.lib.php:75
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:366 server_privileges.php:826
+=======
+#: libraries/replication_gui.lib.php:366 server_privileges.php:825
+>>>>>>> origin/master
 msgid "Generate"
 msgstr ""
 
@@ -2108,7 +2254,11 @@ msgid "remember template"
 msgstr ""
 
 #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552
+=======
+#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549
+>>>>>>> origin/master
 msgid "Character set of the file:"
 msgstr ""
 
@@ -2161,7 +2311,11 @@ msgstr ""
 msgid "File to import"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527
+=======
+#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524
+>>>>>>> origin/master
 msgid "Location of the text file"
 msgstr ""
 
@@ -2169,12 +2323,20 @@ msgstr ""
 msgid "File uploads are not allowed on this server."
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536
+=======
+#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533
+>>>>>>> origin/master
 #: tbl_change.php:1025
 msgid "The directory you set for upload work cannot be reached"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539
+=======
+#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536
+>>>>>>> origin/master
 #: tbl_change.php:1028
 msgid "web server upload directory"
 msgstr ""
@@ -2305,7 +2467,11 @@ msgstr ""
 #: libraries/import/docsql.php:34 libraries/import/ldi.php:47
 #: libraries/import/ods.php:30 libraries/import/sql.php:20
 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26
+<<<<<<< HEAD
 #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751
+=======
+#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753
+>>>>>>> origin/master
 msgid "Options"
 msgstr ""
 
@@ -2446,7 +2612,11 @@ msgstr "बफर पूल उपयोग"
 
 #: libraries/engines/innodb.lib.php:194 server_databases.php:137
 #: server_databases.php:305 server_status.php:525 server_status.php:586
+<<<<<<< HEAD
 #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694
+=======
+#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696
+>>>>>>> origin/master
 msgid "Total"
 msgstr ""
 
@@ -2691,7 +2861,11 @@ msgid ""
 msgstr ""
 
 #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88
+<<<<<<< HEAD
 #: tbl_printview.php:375 tbl_structure.php:735
+=======
+#: tbl_printview.php:375 tbl_structure.php:737
+>>>>>>> origin/master
 msgid "Format"
 msgstr ""
 
@@ -2759,8 +2933,13 @@ msgstr ""
 #: libraries/export/latex.php:201 libraries/export/odt.php:48
 #: libraries/export/sql.php:106 libraries/export/sql.php:868
 #: libraries/export/texytext.php:27 server_databases.php:127
+<<<<<<< HEAD
 #: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316
 #: tbl_structure.php:663
+=======
+#: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316
+#: tbl_structure.php:665
+>>>>>>> origin/master
 msgid "Data"
 msgstr " डाटा"
 
@@ -2809,9 +2988,15 @@ msgstr ""
 #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57
 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177
 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:332 server_privileges.php:732
 #: server_privileges.php:735 server_privileges.php:791
 #: server_privileges.php:1554 server_privileges.php:2092
+=======
+#: libraries/replication_gui.lib.php:332 server_privileges.php:731
+#: server_privileges.php:734 server_privileges.php:790
+#: server_privileges.php:1537 server_privileges.php:2069
+>>>>>>> origin/master
 #: server_processlist.php:55 server_synchronize.php:1159
 msgid "Host"
 msgstr "होस्ट"
@@ -3475,8 +3660,13 @@ msgstr ""
 
 #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59
 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:262 server_privileges.php:712
 #: server_privileges.php:715 server_privileges.php:722
+=======
+#: libraries/replication_gui.lib.php:262 server_privileges.php:711
+#: server_privileges.php:714 server_privileges.php:721
+>>>>>>> origin/master
 #: server_synchronize.php:1171
 msgid "User name"
 msgstr "यूसर नेम"
@@ -3493,14 +3683,22 @@ msgstr ""
 msgid "Slave status"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448
+=======
+#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445
+>>>>>>> origin/master
 #: server_status.php:737 server_variables.php:52
 msgid "Variable"
 msgstr ""
 
 #: libraries/replication_gui.lib.php:118 server_status.php:738
 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138
+<<<<<<< HEAD
 #: tbl_structure.php:727
+=======
+#: tbl_structure.php:729
+>>>>>>> origin/master
 msgid "Value"
 msgstr "मूल्य"
 
@@ -3518,11 +3716,16 @@ msgstr ""
 msgid "Add slave replication user"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:257 server_privileges.php:717
+=======
+#: libraries/replication_gui.lib.php:257 server_privileges.php:716
+>>>>>>> origin/master
 msgid "Any user"
 msgstr "कोई भी उपयोगकर्ता"
 
 #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:349 server_privileges.php:718
 #: server_privileges.php:785 server_privileges.php:809
 #: server_privileges.php:1950 server_privileges.php:1980
@@ -3546,6 +3749,31 @@ msgid "Use Host Table"
 msgstr ""
 
 #: libraries/replication_gui.lib.php:334 server_privileges.php:793
+=======
+#: libraries/replication_gui.lib.php:349 server_privileges.php:717
+#: server_privileges.php:784 server_privileges.php:808
+#: server_privileges.php:1928 server_privileges.php:1958
+msgid "Use text field"
+msgstr ""
+
+#: libraries/replication_gui.lib.php:305 server_privileges.php:764
+msgid "Any host"
+msgstr "कोई भी होस्ट"
+
+#: libraries/replication_gui.lib.php:309 server_privileges.php:768
+msgid "Local"
+msgstr "Local"
+
+#: libraries/replication_gui.lib.php:315 server_privileges.php:773
+msgid "This Host"
+msgstr ""
+
+#: libraries/replication_gui.lib.php:321 server_privileges.php:779
+msgid "Use Host Table"
+msgstr ""
+
+#: libraries/replication_gui.lib.php:334 server_privileges.php:792
+>>>>>>> origin/master
 msgid ""
 "When Host table is used, this field is ignored and values stored in Host "
 "table are used instead."
@@ -7435,10 +7663,13 @@ msgstr ""
 msgid "Show insert query"
 msgstr ""
 
+<<<<<<< HEAD
 #: tbl_change.php:1140
 msgid "and then"
 msgstr "और फिर"
 
+=======
+>>>>>>> origin/master
 #: tbl_change.php:1144
 msgid "Go back to previous page"
 msgstr "पिछले पृष्ट पर वापस जाएँ"
@@ -7631,6 +7862,7 @@ msgstr ""
 msgid "Show tables"
 msgstr " टेबल दिखाओ"
 
+<<<<<<< HEAD
 #: tbl_printview.php:309 tbl_structure.php:654
 msgid "Space usage"
 msgstr ""
@@ -7664,6 +7896,41 @@ msgid "Row length"
 msgstr " रौ की लंबाई"
 
 #: tbl_printview.php:413 tbl_structure.php:791
+=======
+#: tbl_printview.php:309 tbl_structure.php:656
+msgid "Space usage"
+msgstr ""
+
+#: tbl_printview.php:313 tbl_structure.php:660
+msgid "Usage"
+msgstr "उपयोग"
+
+#: tbl_printview.php:340 tbl_structure.php:687
+msgid "Effective"
+msgstr " वास्तविक"
+
+#: tbl_printview.php:365 tbl_structure.php:725
+msgid "Row Statistics"
+msgstr ""
+
+#: tbl_printview.php:368 tbl_structure.php:728
+msgid "Statements"
+msgstr ""
+
+#: tbl_printview.php:379 tbl_structure.php:740
+msgid "static"
+msgstr ""
+
+#: tbl_printview.php:381 tbl_structure.php:742
+msgid "dynamic"
+msgstr ""
+
+#: tbl_printview.php:403 tbl_structure.php:785
+msgid "Row length"
+msgstr " रौ की लंबाई"
+
+#: tbl_printview.php:413 tbl_structure.php:793
+>>>>>>> origin/master
 msgid " Row size "
 msgstr ""
 
diff --git a/po/hr.po b/po/hr.po
index 1016afc76..1e18f0db0 100755
--- a/po/hr.po
+++ b/po/hr.po
@@ -3,7 +3,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2010-07-03 21:45+0530\n"
+=======
+"POT-Creation-Date: 2010-07-03 09:00-0400\n"
+>>>>>>> origin/master
 "PO-Revision-Date: 2010-03-12 09:13+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: croatian <hr@li.org>\n"
@@ -48,15 +52,26 @@ msgstr "Traži"
 #: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046
 #: libraries/Theme_Manager.class.php:311
 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719
+<<<<<<< HEAD
 #: libraries/common.lib.php:1344 libraries/common.lib.php:2301
 #: libraries/display_change_password.lib.php:82
 #: libraries/display_create_table.lib.php:62
+=======
+#: libraries/common.lib.php:1335 libraries/common.lib.php:2288
+#: libraries/display_change_password.lib.php:82
+#: libraries/display_create_table.lib.php:63
+>>>>>>> origin/master
 #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532
 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76
 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104
+<<<<<<< HEAD
 #: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480
 #: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782
+=======
+#: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477
+#: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782
+>>>>>>> origin/master
 #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328
 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142
 #: server_privileges.php:665 server_privileges.php:1641
@@ -66,8 +81,13 @@ msgstr "Traži"
 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171
 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265
 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561
+<<<<<<< HEAD
 #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560
 #: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512
+=======
+#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562
+#: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512
+>>>>>>> origin/master
 #: view_create.php:182 view_operations.php:101
 msgid "Go"
 msgstr "Kreni"
@@ -120,10 +140,17 @@ msgstr "Nazivi stupaca"
 #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245
 #: libraries/export/latex.php:360 libraries/export/odt.php:297
 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100
+<<<<<<< HEAD
 #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093
 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
 #: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321
+=======
+#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070
+#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
+#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
+#: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321
+>>>>>>> origin/master
 msgid "Type"
 msgstr "Vrsta"
 
@@ -164,9 +191,15 @@ msgstr "Komentari"
 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322
 #: libraries/export/latex.php:430 libraries/export/odt.php:368
 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263
+<<<<<<< HEAD
 #: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596
 #: server_privileges.php:1911 server_privileges.php:1916
 #: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228
+=======
+#: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579
+#: server_privileges.php:1889 server_privileges.php:1894
+#: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228
+>>>>>>> origin/master
 #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342
 msgid "No"
 msgstr "Ne"
@@ -180,9 +213,15 @@ msgstr "Ne"
 #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106
 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262
 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344
+<<<<<<< HEAD
 #: server_databases.php:64 server_privileges.php:1582
 #: server_privileges.php:1596 server_privileges.php:1911
 #: server_privileges.php:1914 server_privileges.php:2210 sql.php:193
+=======
+#: server_databases.php:64 server_privileges.php:1565
+#: server_privileges.php:1579 server_privileges.php:1889
+#: server_privileges.php:1892 server_privileges.php:2187 sql.php:193
+>>>>>>> origin/master
 #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350
 #: tbl_tracking.php:335 tbl_tracking.php:340
 msgid "Yes"
@@ -231,7 +270,15 @@ msgstr "Preimenuj bazu podataka u"
 msgid "Command"
 msgstr "Naredba"
 
+<<<<<<< HEAD
 #: db_operations.php:466
+=======
+#: db_operations.php:429 tbl_change.php:1140
+msgid "and then"
+msgstr "i potom"
+
+#: db_operations.php:455
+>>>>>>> origin/master
 msgid "Copy database to"
 msgstr "Kopiraj bazu podataka u"
 
@@ -321,7 +368,11 @@ msgstr "Omogućeno"
 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730
 #: server_collations.php:54 server_collations.php:66 server_databases.php:111
 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179
+<<<<<<< HEAD
 #: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326
+=======
+#: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326
+>>>>>>> origin/master
 msgid "Collation"
 msgstr "Uspoređivanje"
 
@@ -350,7 +401,11 @@ msgstr "Tablica"
 #: db_printview.php:105 libraries/db_structure.lib.php:56
 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146
 #: navigation.php:638 navigation.php:660 server_databases.php:122
+<<<<<<< HEAD
 #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775
+=======
+#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777
+>>>>>>> origin/master
 msgid "Rows"
 msgstr "Redaka"
 
@@ -365,19 +420,31 @@ msgstr "u upotrebi"
 
 #: db_printview.php:187 libraries/db_info.inc.php:88
 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433
+<<<<<<< HEAD
 #: tbl_structure.php:807
+=======
+#: tbl_structure.php:809
+>>>>>>> origin/master
 msgid "Creation"
 msgstr "Izrada"
 
 #: db_printview.php:196 libraries/db_info.inc.php:93
 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443
+<<<<<<< HEAD
 #: tbl_structure.php:815
+=======
+#: tbl_structure.php:817
+>>>>>>> origin/master
 msgid "Last update"
 msgstr "Posljednje ažuriranje"
 
 #: db_printview.php:205 libraries/db_info.inc.php:98
 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453
+<<<<<<< HEAD
 #: tbl_structure.php:823
+=======
+#: tbl_structure.php:825
+>>>>>>> origin/master
 msgid "Last check"
 msgstr "Posljednja provjera"
 
@@ -442,7 +509,11 @@ msgstr "Del"
 
 #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553
 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779
+<<<<<<< HEAD
 #: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250
+=======
+#: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250
+>>>>>>> origin/master
 #: tbl_select.php:286
 msgid "Or"
 msgstr "Ili"
@@ -661,9 +732,15 @@ msgstr "S odabirom:"
 msgid "Check All"
 msgstr "Označi sve"
 
+<<<<<<< HEAD
 #: db_structure.php:529 libraries/display_tbl.lib.php:2077
 #: libraries/replication_gui.lib.php:36 server_databases.php:350
 #: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460
+=======
+#: db_structure.php:531 libraries/display_tbl.lib.php:2077
+#: libraries/replication_gui.lib.php:36 server_databases.php:350
+#: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462
+>>>>>>> origin/master
 msgid "Uncheck All"
 msgstr "Ukloni sve oznake"
 
@@ -1135,10 +1212,17 @@ msgid "Prev"
 msgstr "Prethodni"
 
 #. l10n: Display text for next month link in calendar
+<<<<<<< HEAD
 #: js/messages.php:106 libraries/common.lib.php:2366
 #: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338
 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
 #: tbl_structure.php:799
+=======
+#: js/messages.php:77 libraries/common.lib.php:2353
+#: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338
+#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
+#: tbl_structure.php:801
+>>>>>>> origin/master
 msgid "Next"
 msgstr "Sljedeće"
 
@@ -1686,7 +1770,11 @@ msgstr "Lozinka:"
 msgid "Server Choice"
 msgstr "Odabir poslužitelja"
 
+<<<<<<< HEAD
 #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63
+=======
+#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59
+>>>>>>> origin/master
 msgid "Cookies must be enabled past this point."
 msgstr "Od ovog mjesta potrebno je omogućiti kolačiće."
 
@@ -1767,7 +1855,11 @@ msgstr ""
 "izgleda da su sva potrebna proširenja učitana. Provjerite svoju PHP "
 "konfiguraciju."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:580
+=======
+#: libraries/common.inc.php:576
+>>>>>>> origin/master
 msgid ""
 "phpMyAdmin was unable to read your configuration file!<br />This might "
 "happen if PHP finds a parse error in it or PHP cannot find the file.<br /"
@@ -1783,13 +1875,21 @@ msgstr ""
 "većini slučajeva na nekom mjestu nedostaje znak navodnika ili točke-zareza."
 "<br />Ako se prikaže prazna stranica, sve je u redu."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:591
+=======
+#: libraries/common.inc.php:587
+>>>>>>> origin/master
 #, fuzzy, php-format
 #| msgid "Could not load default configuration from: \"%1$s\""
 msgid "Could not load default configuration from: %1$s"
 msgstr "Nije moguće učitati zadanu konfiguraciju iz: \"%1$s\""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:596
+=======
+#: libraries/common.inc.php:592
+>>>>>>> origin/master
 msgid ""
 "The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
 "configuration file!"
@@ -1797,30 +1897,50 @@ msgstr ""
 "Direktiva <tt>$cfg['PmaAbsoluteUri']</tt> MORA BITI postavljena u vašoj "
 "konfiguracijskoj datoteci!"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:626
+=======
+#: libraries/common.inc.php:622
+>>>>>>> origin/master
 #, fuzzy, php-format
 #| msgid "Invalid server index: \"%s\""
 msgid "Invalid server index: %s"
 msgstr "Neispravan indeks poslužitelja: \"%s\""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:633
+=======
+#: libraries/common.inc.php:629
+>>>>>>> origin/master
 #, php-format
 msgid "Invalid hostname for server %1$s. Please review your configuration."
 msgstr ""
 "Neispravan naziv za poslužitelj %1$s. Molimo, pregledajte svoju "
 "konfiguraciju."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:642 libraries/header.inc.php:100
+=======
+#: libraries/common.inc.php:638 libraries/header.inc.php:96
+>>>>>>> origin/master
 #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47
 #: main.php:185 test/theme.php:57
 msgid "Server"
 msgstr "Poslužitelj"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:820
 msgid "Invalid authentication method set in configuration:"
 msgstr "Neispravan komplet načina provjere vjerodostojnosti u konfiguraciji:"
 
 #: libraries/common.inc.php:923
+=======
+#: libraries/common.inc.php:816
+msgid "Invalid authentication method set in configuration:"
+msgstr "Neispravan komplet načina provjere vjerodostojnosti u konfiguraciji:"
+
+#: libraries/common.inc.php:919
+>>>>>>> origin/master
 #, php-format
 msgid "You should upgrade to %s %s or later."
 msgstr "Trebali biste nadograditi na %s %s ili kasniju."
@@ -2069,7 +2189,11 @@ msgid ""
 msgstr "Može biti približno. Pogledajte ČPP 3.11"
 
 #: libraries/db_structure.lib.php:69 server_databases.php:142
+<<<<<<< HEAD
 #: tbl_printview.php:335 tbl_structure.php:680
+=======
+#: tbl_printview.php:335 tbl_structure.php:682
+>>>>>>> origin/master
 msgid "Overhead"
 msgstr "Prepunjenje"
 
@@ -2099,22 +2223,36 @@ msgid "Change password"
 msgstr "Promijeni lozinku"
 
 #: libraries/display_change_password.lib.php:35
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:348 server_privileges.php:808
+=======
+#: libraries/replication_gui.lib.php:348 server_privileges.php:807
+>>>>>>> origin/master
 msgid "No Password"
 msgstr "Bez lozinke"
 
 #: libraries/display_change_password.lib.php:41
 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63
 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:352 server_privileges.php:797
 #: server_privileges.php:801 server_privileges.php:812
 #: server_privileges.php:1555 server_synchronize.php:1175
+=======
+#: libraries/replication_gui.lib.php:352 server_privileges.php:796
+#: server_privileges.php:800 server_privileges.php:811
+#: server_privileges.php:1538 server_synchronize.php:1175
+>>>>>>> origin/master
 msgid "Password"
 msgstr "Lozinka"
 
 #: libraries/display_change_password.lib.php:46
 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359
+<<<<<<< HEAD
 #: server_privileges.php:816 server_privileges.php:819
+=======
+#: server_privileges.php:815 server_privileges.php:818
+>>>>>>> origin/master
 msgid "Re-type"
 msgstr "Ponovite"
 
@@ -2129,12 +2267,20 @@ msgid "MySQL 4.0 compatible"
 msgstr "MySQL&nbsp;4.0 kompatibilno"
 
 #: libraries/display_change_password.lib.php:72
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:363 server_privileges.php:823
+=======
+#: libraries/replication_gui.lib.php:363 server_privileges.php:822
+>>>>>>> origin/master
 msgid "Generate Password"
 msgstr "Generiraj lozinku"
 
 #: libraries/display_change_password.lib.php:75
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:366 server_privileges.php:826
+=======
+#: libraries/replication_gui.lib.php:366 server_privileges.php:825
+>>>>>>> origin/master
 msgid "Generate"
 msgstr "Generiraj"
 
@@ -2222,7 +2368,11 @@ msgid "remember template"
 msgstr "zapamti predložak"
 
 #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552
+=======
+#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549
+>>>>>>> origin/master
 msgid "Character set of the file:"
 msgstr "Tablica znakova za datoteku:"
 
@@ -2275,7 +2425,11 @@ msgstr ""
 msgid "File to import"
 msgstr "Datoteka za uvoz"
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527
+=======
+#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524
+>>>>>>> origin/master
 msgid "Location of the text file"
 msgstr "Lokacija tekstualne datoteke"
 
@@ -2283,12 +2437,20 @@ msgstr "Lokacija tekstualne datoteke"
 msgid "File uploads are not allowed on this server."
 msgstr "Učitavanje datoteka nije dopušteno na ovom poslužitelju."
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536
+=======
+#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533
+>>>>>>> origin/master
 #: tbl_change.php:1025
 msgid "The directory you set for upload work cannot be reached"
 msgstr "Mapu koju ste odabrali za potrebe učitavanja nije moguće dohvatiti"
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539
+=======
+#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536
+>>>>>>> origin/master
 #: tbl_change.php:1028
 msgid "web server upload directory"
 msgstr "mapa učitavanja web poslužitelja"
@@ -2424,7 +2586,11 @@ msgstr "Presloži po ključu"
 #: libraries/import/docsql.php:34 libraries/import/ldi.php:47
 #: libraries/import/ods.php:30 libraries/import/sql.php:20
 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26
+<<<<<<< HEAD
 #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751
+=======
+#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753
+>>>>>>> origin/master
 msgid "Options"
 msgstr "Opcije"
 
@@ -2571,7 +2737,11 @@ msgstr "Iskoristivost međuspremnika"
 
 #: libraries/engines/innodb.lib.php:194 server_databases.php:137
 #: server_databases.php:305 server_status.php:525 server_status.php:586
+<<<<<<< HEAD
 #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694
+=======
+#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696
+>>>>>>> origin/master
 msgid "Total"
 msgstr "Ukupno"
 
@@ -2860,7 +3030,11 @@ msgstr ""
 "broj."
 
 #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88
+<<<<<<< HEAD
 #: tbl_printview.php:375 tbl_structure.php:735
+=======
+#: tbl_printview.php:375 tbl_structure.php:737
+>>>>>>> origin/master
 msgid "Format"
 msgstr "Oblikovanje"
 
@@ -2932,8 +3106,13 @@ msgstr "Microsoft Word 2000"
 #: libraries/export/latex.php:201 libraries/export/odt.php:48
 #: libraries/export/sql.php:106 libraries/export/sql.php:868
 #: libraries/export/texytext.php:27 server_databases.php:127
+<<<<<<< HEAD
 #: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316
 #: tbl_structure.php:663
+=======
+#: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316
+#: tbl_structure.php:665
+>>>>>>> origin/master
 msgid "Data"
 msgstr "Podaci"
 
@@ -2982,9 +3161,15 @@ msgstr "MIME vrsta"
 #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57
 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177
 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:332 server_privileges.php:732
 #: server_privileges.php:735 server_privileges.php:791
 #: server_privileges.php:1554 server_privileges.php:2092
+=======
+#: libraries/replication_gui.lib.php:332 server_privileges.php:731
+#: server_privileges.php:734 server_privileges.php:790
+#: server_privileges.php:1537 server_privileges.php:2069
+>>>>>>> origin/master
 #: server_processlist.php:55 server_synchronize.php:1159
 msgid "Host"
 msgstr "Računalo"
@@ -3657,8 +3842,13 @@ msgstr ""
 
 #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59
 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:262 server_privileges.php:712
 #: server_privileges.php:715 server_privileges.php:722
+=======
+#: libraries/replication_gui.lib.php:262 server_privileges.php:711
+#: server_privileges.php:714 server_privileges.php:721
+>>>>>>> origin/master
 #: server_synchronize.php:1171
 msgid "User name"
 msgstr "Korisničko ime"
@@ -3678,14 +3868,22 @@ msgstr "Prikaži stanje potčinjenog"
 msgid "Slave status"
 msgstr "Prikaži stanje potčinjenog"
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448
+=======
+#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445
+>>>>>>> origin/master
 #: server_status.php:737 server_variables.php:52
 msgid "Variable"
 msgstr "Varijabla"
 
 #: libraries/replication_gui.lib.php:118 server_status.php:738
 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138
+<<<<<<< HEAD
 #: tbl_structure.php:727
+=======
+#: tbl_structure.php:729
+>>>>>>> origin/master
 msgid "Value"
 msgstr "Vrijednost"
 
@@ -3703,11 +3901,16 @@ msgstr ""
 msgid "Add slave replication user"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:257 server_privileges.php:717
+=======
+#: libraries/replication_gui.lib.php:257 server_privileges.php:716
+>>>>>>> origin/master
 msgid "Any user"
 msgstr "Bilo koji korisnik"
 
 #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:349 server_privileges.php:718
 #: server_privileges.php:785 server_privileges.php:809
 #: server_privileges.php:1950 server_privileges.php:1980
@@ -3731,6 +3934,31 @@ msgid "Use Host Table"
 msgstr "Upotrijebi tablicu poslužitelja"
 
 #: libraries/replication_gui.lib.php:334 server_privileges.php:793
+=======
+#: libraries/replication_gui.lib.php:349 server_privileges.php:717
+#: server_privileges.php:784 server_privileges.php:808
+#: server_privileges.php:1928 server_privileges.php:1958
+msgid "Use text field"
+msgstr "Upotrijebi tekstualno polje"
+
+#: libraries/replication_gui.lib.php:305 server_privileges.php:764
+msgid "Any host"
+msgstr "Bilo koje računalo"
+
+#: libraries/replication_gui.lib.php:309 server_privileges.php:768
+msgid "Local"
+msgstr "Lokalno"
+
+#: libraries/replication_gui.lib.php:315 server_privileges.php:773
+msgid "This Host"
+msgstr "Ovo računalo"
+
+#: libraries/replication_gui.lib.php:321 server_privileges.php:779
+msgid "Use Host Table"
+msgstr "Upotrijebi tablicu poslužitelja"
+
+#: libraries/replication_gui.lib.php:334 server_privileges.php:792
+>>>>>>> origin/master
 msgid ""
 "When Host table is used, this field is ignored and values stored in Host "
 "table are used instead."
@@ -7981,10 +8209,13 @@ msgstr ""
 msgid "Show insert query"
 msgstr "Prikazivanje SQL upita"
 
+<<<<<<< HEAD
 #: tbl_change.php:1140
 msgid "and then"
 msgstr "i potom"
 
+=======
+>>>>>>> origin/master
 #: tbl_change.php:1144
 msgid "Go back to previous page"
 msgstr "Kreni nazad na prethodnu stranicu"
@@ -8180,6 +8411,7 @@ msgstr "Provjeri referencijalan integritet:"
 msgid "Show tables"
 msgstr "Prikaži tablice"
 
+<<<<<<< HEAD
 #: tbl_printview.php:309 tbl_structure.php:654
 msgid "Space usage"
 msgstr "Iskorištenost prostora"
@@ -8213,6 +8445,41 @@ msgid "Row length"
 msgstr "Duljina retka"
 
 #: tbl_printview.php:413 tbl_structure.php:791
+=======
+#: tbl_printview.php:309 tbl_structure.php:656
+msgid "Space usage"
+msgstr "Iskorištenost prostora"
+
+#: tbl_printview.php:313 tbl_structure.php:660
+msgid "Usage"
+msgstr "Upotreba"
+
+#: tbl_printview.php:340 tbl_structure.php:687
+msgid "Effective"
+msgstr "Na snazi"
+
+#: tbl_printview.php:365 tbl_structure.php:725
+msgid "Row Statistics"
+msgstr "Statistike redova"
+
+#: tbl_printview.php:368 tbl_structure.php:728
+msgid "Statements"
+msgstr "Izjave"
+
+#: tbl_printview.php:379 tbl_structure.php:740
+msgid "static"
+msgstr ""
+
+#: tbl_printview.php:381 tbl_structure.php:742
+msgid "dynamic"
+msgstr "dinamički"
+
+#: tbl_printview.php:403 tbl_structure.php:785
+msgid "Row length"
+msgstr "Duljina retka"
+
+#: tbl_printview.php:413 tbl_structure.php:793
+>>>>>>> origin/master
 msgid " Row size "
 msgstr " Veličina retka "
 
diff --git a/po/hu.po b/po/hu.po
index 1096c6f08..c53653249 100755
--- a/po/hu.po
+++ b/po/hu.po
@@ -3,7 +3,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2010-07-03 21:45+0530\n"
+=======
+"POT-Creation-Date: 2010-07-03 09:00-0400\n"
+>>>>>>> origin/master
 "PO-Revision-Date: 2010-03-12 09:15+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: hungarian <hu@li.org>\n"
@@ -48,15 +52,26 @@ msgstr "Keresés"
 #: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046
 #: libraries/Theme_Manager.class.php:311
 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719
+<<<<<<< HEAD
 #: libraries/common.lib.php:1344 libraries/common.lib.php:2301
 #: libraries/display_change_password.lib.php:82
 #: libraries/display_create_table.lib.php:62
+=======
+#: libraries/common.lib.php:1335 libraries/common.lib.php:2288
+#: libraries/display_change_password.lib.php:82
+#: libraries/display_create_table.lib.php:63
+>>>>>>> origin/master
 #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532
 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76
 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104
+<<<<<<< HEAD
 #: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480
 #: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782
+=======
+#: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477
+#: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782
+>>>>>>> origin/master
 #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328
 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142
 #: server_privileges.php:665 server_privileges.php:1641
@@ -66,8 +81,13 @@ msgstr "Keresés"
 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171
 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265
 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561
+<<<<<<< HEAD
 #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560
 #: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512
+=======
+#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562
+#: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512
+>>>>>>> origin/master
 #: view_create.php:182 view_operations.php:101
 msgid "Go"
 msgstr "Indítás"
@@ -120,10 +140,17 @@ msgstr "Oszlopnevek"
 #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245
 #: libraries/export/latex.php:360 libraries/export/odt.php:297
 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100
+<<<<<<< HEAD
 #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093
 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
 #: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321
+=======
+#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070
+#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
+#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
+#: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321
+>>>>>>> origin/master
 msgid "Type"
 msgstr "Típus"
 
@@ -164,9 +191,15 @@ msgstr "Megjegyzések"
 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322
 #: libraries/export/latex.php:430 libraries/export/odt.php:368
 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263
+<<<<<<< HEAD
 #: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596
 #: server_privileges.php:1911 server_privileges.php:1916
 #: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228
+=======
+#: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579
+#: server_privileges.php:1889 server_privileges.php:1894
+#: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228
+>>>>>>> origin/master
 #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342
 msgid "No"
 msgstr "Nem"
@@ -180,9 +213,15 @@ msgstr "Nem"
 #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106
 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262
 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344
+<<<<<<< HEAD
 #: server_databases.php:64 server_privileges.php:1582
 #: server_privileges.php:1596 server_privileges.php:1911
 #: server_privileges.php:1914 server_privileges.php:2210 sql.php:193
+=======
+#: server_databases.php:64 server_privileges.php:1565
+#: server_privileges.php:1579 server_privileges.php:1889
+#: server_privileges.php:1892 server_privileges.php:2187 sql.php:193
+>>>>>>> origin/master
 #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350
 #: tbl_tracking.php:335 tbl_tracking.php:340
 msgid "Yes"
@@ -231,7 +270,15 @@ msgstr "Adatbázis átnevezése"
 msgid "Command"
 msgstr "Parancs"
 
+<<<<<<< HEAD
 #: db_operations.php:466
+=======
+#: db_operations.php:429 tbl_change.php:1140
+msgid "and then"
+msgstr "és utána"
+
+#: db_operations.php:455
+>>>>>>> origin/master
 msgid "Copy database to"
 msgstr "Adatbázis másolása"
 
@@ -319,7 +366,11 @@ msgstr "Engedélyezés"
 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730
 #: server_collations.php:54 server_collations.php:66 server_databases.php:111
 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179
+<<<<<<< HEAD
 #: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326
+=======
+#: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326
+>>>>>>> origin/master
 msgid "Collation"
 msgstr "Illesztés"
 
@@ -348,7 +399,11 @@ msgstr "Tábla"
 #: db_printview.php:105 libraries/db_structure.lib.php:56
 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146
 #: navigation.php:638 navigation.php:660 server_databases.php:122
+<<<<<<< HEAD
 #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775
+=======
+#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777
+>>>>>>> origin/master
 msgid "Rows"
 msgstr "sor"
 
@@ -363,19 +418,31 @@ msgstr "használatban"
 
 #: db_printview.php:187 libraries/db_info.inc.php:88
 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433
+<<<<<<< HEAD
 #: tbl_structure.php:807
+=======
+#: tbl_structure.php:809
+>>>>>>> origin/master
 msgid "Creation"
 msgstr "Létrehozás"
 
 #: db_printview.php:196 libraries/db_info.inc.php:93
 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443
+<<<<<<< HEAD
 #: tbl_structure.php:815
+=======
+#: tbl_structure.php:817
+>>>>>>> origin/master
 msgid "Last update"
 msgstr "Utolsó frissítés"
 
 #: db_printview.php:205 libraries/db_info.inc.php:98
 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453
+<<<<<<< HEAD
 #: tbl_structure.php:823
+=======
+#: tbl_structure.php:825
+>>>>>>> origin/master
 msgid "Last check"
 msgstr "Utolsó ellenőrzés"
 
@@ -440,7 +507,11 @@ msgstr "Törlés"
 
 #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553
 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779
+<<<<<<< HEAD
 #: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250
+=======
+#: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250
+>>>>>>> origin/master
 #: tbl_select.php:286
 msgid "Or"
 msgstr "Vagy"
@@ -660,9 +731,15 @@ msgstr "A kijelöltekkel végzendő művelet:"
 msgid "Check All"
 msgstr "Mind kijelölése"
 
+<<<<<<< HEAD
 #: db_structure.php:529 libraries/display_tbl.lib.php:2077
 #: libraries/replication_gui.lib.php:36 server_databases.php:350
 #: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460
+=======
+#: db_structure.php:531 libraries/display_tbl.lib.php:2077
+#: libraries/replication_gui.lib.php:36 server_databases.php:350
+#: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462
+>>>>>>> origin/master
 msgid "Uncheck All"
 msgstr "Kijelölés törlése"
 
@@ -1135,10 +1212,17 @@ msgid "Prev"
 msgstr "Előző"
 
 #. l10n: Display text for next month link in calendar
+<<<<<<< HEAD
 #: js/messages.php:106 libraries/common.lib.php:2366
 #: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338
 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
 #: tbl_structure.php:799
+=======
+#: js/messages.php:77 libraries/common.lib.php:2353
+#: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338
+#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
+#: tbl_structure.php:801
+>>>>>>> origin/master
 msgid "Next"
 msgstr "Következő"
 
@@ -1689,7 +1773,11 @@ msgstr "Jelszó:"
 msgid "Server Choice"
 msgstr "Szerver választása"
 
+<<<<<<< HEAD
 #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63
+=======
+#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59
+>>>>>>> origin/master
 msgid "Cookies must be enabled past this point."
 msgstr "Ettől a ponttól engedélyeznie kell a cookie-k fogadását."
 
@@ -1772,7 +1860,11 @@ msgstr ""
 "úgy tűnik, hogy a szükséges kiterjesztések betöltése megtörtént. Ellenőrizze "
 "a PHP beállításokat."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:580
+=======
+#: libraries/common.inc.php:576
+>>>>>>> origin/master
 msgid ""
 "phpMyAdmin was unable to read your configuration file!<br />This might "
 "happen if PHP finds a parse error in it or PHP cannot find the file.<br /"
@@ -1788,14 +1880,22 @@ msgstr ""
 "vagy pontosvessző hiányzik valahol.<br />Ha üres oldalt kap, akkor minden "
 "rendben."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:591
+=======
+#: libraries/common.inc.php:587
+>>>>>>> origin/master
 #, fuzzy, php-format
 #| msgid "Could not load default configuration from: \"%1$s\""
 msgid "Could not load default configuration from: %1$s"
 msgstr ""
 "Nem lehetett betölteni az alapértelmezett konfigurációt innen: \"%1$s\""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:596
+=======
+#: libraries/common.inc.php:592
+>>>>>>> origin/master
 msgid ""
 "The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
 "configuration file!"
@@ -1803,28 +1903,48 @@ msgstr ""
 "A <tt>$cfg['PmaAbsoluteUri']</tt> utasítás értékét a konfigurációs fájlban "
 "KELL megadni!"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:626
+=======
+#: libraries/common.inc.php:622
+>>>>>>> origin/master
 #, fuzzy, php-format
 #| msgid "Invalid server index: \"%s\""
 msgid "Invalid server index: %s"
 msgstr "Érvénytelen szerverindex: \"%s\""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:633
+=======
+#: libraries/common.inc.php:629
+>>>>>>> origin/master
 #, php-format
 msgid "Invalid hostname for server %1$s. Please review your configuration."
 msgstr "A(z) %1$s szerver hosztneve érvénytelen. Ellenőrizze a beállításokat."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:642 libraries/header.inc.php:100
+=======
+#: libraries/common.inc.php:638 libraries/header.inc.php:96
+>>>>>>> origin/master
 #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47
 #: main.php:185 test/theme.php:57
 msgid "Server"
 msgstr "Szerver"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:820
 msgid "Invalid authentication method set in configuration:"
 msgstr "Érvénytelen hitelesítési mód került beállításra a konfigurációban:"
 
 #: libraries/common.inc.php:923
+=======
+#: libraries/common.inc.php:816
+msgid "Invalid authentication method set in configuration:"
+msgstr "Érvénytelen hitelesítési mód került beállításra a konfigurációban:"
+
+#: libraries/common.inc.php:919
+>>>>>>> origin/master
 #, php-format
 msgid "You should upgrade to %s %s or later."
 msgstr "Frissítenie kell %s %s vagy újabb verzióra."
@@ -2072,7 +2192,11 @@ msgid ""
 msgstr "Becsült érték lehet. Lásd: GYIK 3.11"
 
 #: libraries/db_structure.lib.php:69 server_databases.php:142
+<<<<<<< HEAD
 #: tbl_printview.php:335 tbl_structure.php:680
+=======
+#: tbl_printview.php:335 tbl_structure.php:682
+>>>>>>> origin/master
 msgid "Overhead"
 msgstr "Felülírás"
 
@@ -2103,22 +2227,36 @@ msgid "Change password"
 msgstr "Jelszó megváltoztatása"
 
 #: libraries/display_change_password.lib.php:35
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:348 server_privileges.php:808
+=======
+#: libraries/replication_gui.lib.php:348 server_privileges.php:807
+>>>>>>> origin/master
 msgid "No Password"
 msgstr "Nincs jelszó"
 
 #: libraries/display_change_password.lib.php:41
 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63
 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:352 server_privileges.php:797
 #: server_privileges.php:801 server_privileges.php:812
 #: server_privileges.php:1555 server_synchronize.php:1175
+=======
+#: libraries/replication_gui.lib.php:352 server_privileges.php:796
+#: server_privileges.php:800 server_privileges.php:811
+#: server_privileges.php:1538 server_synchronize.php:1175
+>>>>>>> origin/master
 msgid "Password"
 msgstr "Jelszó"
 
 #: libraries/display_change_password.lib.php:46
 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359
+<<<<<<< HEAD
 #: server_privileges.php:816 server_privileges.php:819
+=======
+#: server_privileges.php:815 server_privileges.php:818
+>>>>>>> origin/master
 msgid "Re-type"
 msgstr "Újraírás"
 
@@ -2133,12 +2271,20 @@ msgid "MySQL 4.0 compatible"
 msgstr "MySQL&nbsp;4.0 kompatibilis"
 
 #: libraries/display_change_password.lib.php:72
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:363 server_privileges.php:823
+=======
+#: libraries/replication_gui.lib.php:363 server_privileges.php:822
+>>>>>>> origin/master
 msgid "Generate Password"
 msgstr "Jelszó generálása"
 
 #: libraries/display_change_password.lib.php:75
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:366 server_privileges.php:826
+=======
+#: libraries/replication_gui.lib.php:366 server_privileges.php:825
+>>>>>>> origin/master
 msgid "Generate"
 msgstr "Generálás"
 
@@ -2228,7 +2374,11 @@ msgid "remember template"
 msgstr "a sablon megjegyzése"
 
 #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552
+=======
+#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549
+>>>>>>> origin/master
 msgid "Character set of the file:"
 msgstr "A fájl karakterkészlete:"
 
@@ -2281,7 +2431,11 @@ msgstr ""
 msgid "File to import"
 msgstr "Importálandó fájl"
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527
+=======
+#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524
+>>>>>>> origin/master
 msgid "Location of the text file"
 msgstr "A szövegfájl helye"
 
@@ -2289,12 +2443,20 @@ msgstr "A szövegfájl helye"
 msgid "File uploads are not allowed on this server."
 msgstr "Ezen a szerveren a fájlfeltöltések nem engedélyezettek."
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536
+=======
+#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533
+>>>>>>> origin/master
 #: tbl_change.php:1025
 msgid "The directory you set for upload work cannot be reached"
 msgstr "Nem elérhető a feltöltésekhez megadott könyvtár"
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539
+=======
+#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536
+>>>>>>> origin/master
 #: tbl_change.php:1028
 msgid "web server upload directory"
 msgstr "webszerver feltöltési könyvtár"
@@ -2432,7 +2594,11 @@ msgstr "Kulcs szerinti rendezés"
 #: libraries/import/docsql.php:34 libraries/import/ldi.php:47
 #: libraries/import/ods.php:30 libraries/import/sql.php:20
 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26
+<<<<<<< HEAD
 #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751
+=======
+#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753
+>>>>>>> origin/master
 msgid "Options"
 msgstr "Beállítások"
 
@@ -2580,7 +2746,11 @@ msgstr "Pufferkészlet kihasználtsága"
 
 #: libraries/engines/innodb.lib.php:194 server_databases.php:137
 #: server_databases.php:305 server_status.php:525 server_status.php:586
+<<<<<<< HEAD
 #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694
+=======
+#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696
+>>>>>>> origin/master
 msgid "Total"
 msgstr "Összesen"
 
@@ -2868,7 +3038,11 @@ msgstr ""
 "nekik."
 
 #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88
+<<<<<<< HEAD
 #: tbl_printview.php:375 tbl_structure.php:735
+=======
+#: tbl_printview.php:375 tbl_structure.php:737
+>>>>>>> origin/master
 msgid "Format"
 msgstr "Formátum"
 
@@ -2942,8 +3116,13 @@ msgstr "Microsoft Word 2000"
 #: libraries/export/latex.php:201 libraries/export/odt.php:48
 #: libraries/export/sql.php:106 libraries/export/sql.php:868
 #: libraries/export/texytext.php:27 server_databases.php:127
+<<<<<<< HEAD
 #: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316
 #: tbl_structure.php:663
+=======
+#: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316
+#: tbl_structure.php:665
+>>>>>>> origin/master
 msgid "Data"
 msgstr "Adatok"
 
@@ -2992,9 +3171,15 @@ msgstr "MIME-típus"
 #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57
 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177
 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:332 server_privileges.php:732
 #: server_privileges.php:735 server_privileges.php:791
 #: server_privileges.php:1554 server_privileges.php:2092
+=======
+#: libraries/replication_gui.lib.php:332 server_privileges.php:731
+#: server_privileges.php:734 server_privileges.php:790
+#: server_privileges.php:1537 server_privileges.php:2069
+>>>>>>> origin/master
 #: server_processlist.php:55 server_synchronize.php:1159
 msgid "Host"
 msgstr "Hoszt"
@@ -3668,8 +3853,13 @@ msgstr ""
 
 #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59
 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:262 server_privileges.php:712
 #: server_privileges.php:715 server_privileges.php:722
+=======
+#: libraries/replication_gui.lib.php:262 server_privileges.php:711
+#: server_privileges.php:714 server_privileges.php:721
+>>>>>>> origin/master
 #: server_synchronize.php:1171
 msgid "User name"
 msgstr "Felhasználónév"
@@ -3687,14 +3877,22 @@ msgstr "Mester állapot"
 msgid "Slave status"
 msgstr "Másodlagos állapot"
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448
+=======
+#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445
+>>>>>>> origin/master
 #: server_status.php:737 server_variables.php:52
 msgid "Variable"
 msgstr "Változó"
 
 #: libraries/replication_gui.lib.php:118 server_status.php:738
 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138
+<<<<<<< HEAD
 #: tbl_structure.php:727
+=======
+#: tbl_structure.php:729
+>>>>>>> origin/master
 msgid "Value"
 msgstr "Érték"
 
@@ -3712,11 +3910,16 @@ msgstr ""
 msgid "Add slave replication user"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:257 server_privileges.php:717
+=======
+#: libraries/replication_gui.lib.php:257 server_privileges.php:716
+>>>>>>> origin/master
 msgid "Any user"
 msgstr "Bármilyen felhasználó"
 
 #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:349 server_privileges.php:718
 #: server_privileges.php:785 server_privileges.php:809
 #: server_privileges.php:1950 server_privileges.php:1980
@@ -3740,6 +3943,31 @@ msgid "Use Host Table"
 msgstr "Hoszt-tábla használata"
 
 #: libraries/replication_gui.lib.php:334 server_privileges.php:793
+=======
+#: libraries/replication_gui.lib.php:349 server_privileges.php:717
+#: server_privileges.php:784 server_privileges.php:808
+#: server_privileges.php:1928 server_privileges.php:1958
+msgid "Use text field"
+msgstr "Szöveges mező használata"
+
+#: libraries/replication_gui.lib.php:305 server_privileges.php:764
+msgid "Any host"
+msgstr "Bármilyen hoszt"
+
+#: libraries/replication_gui.lib.php:309 server_privileges.php:768
+msgid "Local"
+msgstr "Helyi"
+
+#: libraries/replication_gui.lib.php:315 server_privileges.php:773
+msgid "This Host"
+msgstr "Ez a hoszt"
+
+#: libraries/replication_gui.lib.php:321 server_privileges.php:779
+msgid "Use Host Table"
+msgstr "Hoszt-tábla használata"
+
+#: libraries/replication_gui.lib.php:334 server_privileges.php:792
+>>>>>>> origin/master
 msgid ""
 "When Host table is used, this field is ignored and values stored in Host "
 "table are used instead."
@@ -8214,10 +8442,13 @@ msgstr ""
 msgid "Show insert query"
 msgstr "Megjelenítés SQL lekérdezésként"
 
+<<<<<<< HEAD
 #: tbl_change.php:1140
 msgid "and then"
 msgstr "és utána"
 
+=======
+>>>>>>> origin/master
 #: tbl_change.php:1144
 msgid "Go back to previous page"
 msgstr "Vissza az előző oldalra"
@@ -8414,6 +8645,7 @@ msgstr "Hivatkozási sértetlenség ellenőrzése:"
 msgid "Show tables"
 msgstr "A táblák megjelenítése"
 
+<<<<<<< HEAD
 #: tbl_printview.php:309 tbl_structure.php:654
 msgid "Space usage"
 msgstr "Területhasználat"
@@ -8447,6 +8679,41 @@ msgid "Row length"
 msgstr "Sor hossza"
 
 #: tbl_printview.php:413 tbl_structure.php:791
+=======
+#: tbl_printview.php:309 tbl_structure.php:656
+msgid "Space usage"
+msgstr "Területhasználat"
+
+#: tbl_printview.php:313 tbl_structure.php:660
+msgid "Usage"
+msgstr "Méret"
+
+#: tbl_printview.php:340 tbl_structure.php:687
+msgid "Effective"
+msgstr "Hatályos"
+
+#: tbl_printview.php:365 tbl_structure.php:725
+msgid "Row Statistics"
+msgstr "Sorstatisztika"
+
+#: tbl_printview.php:368 tbl_structure.php:728
+msgid "Statements"
+msgstr "Utasítások"
+
+#: tbl_printview.php:379 tbl_structure.php:740
+msgid "static"
+msgstr "statikus"
+
+#: tbl_printview.php:381 tbl_structure.php:742
+msgid "dynamic"
+msgstr "dinamikus"
+
+#: tbl_printview.php:403 tbl_structure.php:785
+msgid "Row length"
+msgstr "Sor hossza"
+
+#: tbl_printview.php:413 tbl_structure.php:793
+>>>>>>> origin/master
 msgid " Row size "
 msgstr " Sor mérete "
 
diff --git a/po/id.po b/po/id.po
index 2f94e36ea..13b9184e3 100755
--- a/po/id.po
+++ b/po/id.po
@@ -3,7 +3,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2010-07-03 21:45+0530\n"
+=======
+"POT-Creation-Date: 2010-07-03 09:00-0400\n"
+>>>>>>> origin/master
 "PO-Revision-Date: 2010-06-16 01:45+0200\n"
 "Last-Translator:  <jack.hakim@yahoo.com>\n"
 "Language-Team: indonesian <id@li.org>\n"
@@ -49,15 +53,26 @@ msgstr "Cari"
 #: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046
 #: libraries/Theme_Manager.class.php:311
 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719
+<<<<<<< HEAD
 #: libraries/common.lib.php:1344 libraries/common.lib.php:2301
 #: libraries/display_change_password.lib.php:82
 #: libraries/display_create_table.lib.php:62
+=======
+#: libraries/common.lib.php:1335 libraries/common.lib.php:2288
+#: libraries/display_change_password.lib.php:82
+#: libraries/display_create_table.lib.php:63
+>>>>>>> origin/master
 #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532
 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76
 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104
+<<<<<<< HEAD
 #: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480
 #: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782
+=======
+#: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477
+#: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782
+>>>>>>> origin/master
 #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328
 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142
 #: server_privileges.php:665 server_privileges.php:1641
@@ -67,8 +82,13 @@ msgstr "Cari"
 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171
 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265
 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561
+<<<<<<< HEAD
 #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560
 #: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512
+=======
+#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562
+#: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512
+>>>>>>> origin/master
 #: view_create.php:182 view_operations.php:101
 msgid "Go"
 msgstr "Go"
@@ -119,10 +139,17 @@ msgstr "Kolom"
 #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245
 #: libraries/export/latex.php:360 libraries/export/odt.php:297
 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100
+<<<<<<< HEAD
 #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093
 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
 #: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321
+=======
+#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070
+#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
+#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
+#: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321
+>>>>>>> origin/master
 msgid "Type"
 msgstr "Jenis"
 
@@ -163,9 +190,15 @@ msgstr "Komentar"
 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322
 #: libraries/export/latex.php:430 libraries/export/odt.php:368
 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263
+<<<<<<< HEAD
 #: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596
 #: server_privileges.php:1911 server_privileges.php:1916
 #: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228
+=======
+#: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579
+#: server_privileges.php:1889 server_privileges.php:1894
+#: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228
+>>>>>>> origin/master
 #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342
 msgid "No"
 msgstr "Tidak"
@@ -179,9 +212,15 @@ msgstr "Tidak"
 #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106
 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262
 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344
+<<<<<<< HEAD
 #: server_databases.php:64 server_privileges.php:1582
 #: server_privileges.php:1596 server_privileges.php:1911
 #: server_privileges.php:1914 server_privileges.php:2210 sql.php:193
+=======
+#: server_databases.php:64 server_privileges.php:1565
+#: server_privileges.php:1579 server_privileges.php:1889
+#: server_privileges.php:1892 server_privileges.php:2187 sql.php:193
+>>>>>>> origin/master
 #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350
 #: tbl_tracking.php:335 tbl_tracking.php:340
 msgid "Yes"
@@ -230,7 +269,15 @@ msgstr "Ubah nama database menjadi"
 msgid "Command"
 msgstr "Perintah"
 
+<<<<<<< HEAD
 #: db_operations.php:466
+=======
+#: db_operations.php:429 tbl_change.php:1140
+msgid "and then"
+msgstr "selanjutnya"
+
+#: db_operations.php:455
+>>>>>>> origin/master
 msgid "Copy database to"
 msgstr "Salin database ke"
 
@@ -280,7 +327,11 @@ msgstr "Repositori BLOB"
 msgid "Status"
 msgstr "Status"
 
+<<<<<<< HEAD
 #: db_operations.php:559
+=======
+#: db_operations.php:548
+>>>>>>> origin/master
 msgctxt "BLOB repository"
 msgid "Enabled"
 msgstr "Diaktifkan"
@@ -298,7 +349,11 @@ msgctxt "BLOB repository"
 msgid "Repair"
 msgstr "Perbaiki"
 
+<<<<<<< HEAD
 #: db_operations.php:585
+=======
+#: db_operations.php:574
+>>>>>>> origin/master
 msgctxt "BLOB repository"
 msgid "Disabled"
 msgstr "Tidak diaktifkan"
@@ -312,7 +367,11 @@ msgstr "Aktif"
 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730
 #: server_collations.php:54 server_collations.php:66 server_databases.php:111
 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179
+<<<<<<< HEAD
 #: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326
+=======
+#: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326
+>>>>>>> origin/master
 msgid "Collation"
 msgstr "Penyortiran"
 
@@ -341,7 +400,11 @@ msgstr "Tabel"
 #: db_printview.php:105 libraries/db_structure.lib.php:56
 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146
 #: navigation.php:638 navigation.php:660 server_databases.php:122
+<<<<<<< HEAD
 #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775
+=======
+#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777
+>>>>>>> origin/master
 msgid "Rows"
 msgstr "Baris"
 
@@ -356,19 +419,31 @@ msgstr "sedang digunakan"
 
 #: db_printview.php:187 libraries/db_info.inc.php:88
 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433
+<<<<<<< HEAD
 #: tbl_structure.php:807
+=======
+#: tbl_structure.php:809
+>>>>>>> origin/master
 msgid "Creation"
 msgstr "Pembuatan"
 
 #: db_printview.php:196 libraries/db_info.inc.php:93
 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443
+<<<<<<< HEAD
 #: tbl_structure.php:815
+=======
+#: tbl_structure.php:817
+>>>>>>> origin/master
 msgid "Last update"
 msgstr "Update terakhir"
 
 #: db_printview.php:205 libraries/db_info.inc.php:98
 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453
+<<<<<<< HEAD
 #: tbl_structure.php:823
+=======
+#: tbl_structure.php:825
+>>>>>>> origin/master
 msgid "Last check"
 msgstr "Pemeriksaan terakhir"
 
@@ -432,7 +507,11 @@ msgstr "Hapus"
 
 #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553
 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779
+<<<<<<< HEAD
 #: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250
+=======
+#: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250
+>>>>>>> origin/master
 #: tbl_select.php:286
 msgid "Or"
 msgstr "Atau"
@@ -540,7 +619,11 @@ msgstr "Kata dipisahkan oleh karakter spasi (\" \")."
 msgid "Inside table(s):"
 msgstr "Cari dalam tabel:"
 
+<<<<<<< HEAD
 #: db_search.php:367
+=======
+#: db_search.php:355
+>>>>>>> origin/master
 msgid "Inside column:"
 msgstr "Di dalam kolom:"
 
@@ -646,9 +729,15 @@ msgstr "yang ditandai:"
 msgid "Check All"
 msgstr "Pilih semua"
 
+<<<<<<< HEAD
 #: db_structure.php:529 libraries/display_tbl.lib.php:2077
 #: libraries/replication_gui.lib.php:36 server_databases.php:350
 #: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460
+=======
+#: db_structure.php:531 libraries/display_tbl.lib.php:2077
+#: libraries/replication_gui.lib.php:36 server_databases.php:350
+#: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462
+>>>>>>> origin/master
 msgid "Uncheck All"
 msgstr "Balik pilihan"
 
@@ -1107,10 +1196,17 @@ msgid "Prev"
 msgstr "Sebelumnya"
 
 #. l10n: Display text for next month link in calendar
+<<<<<<< HEAD
 #: js/messages.php:106 libraries/common.lib.php:2366
 #: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338
 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
 #: tbl_structure.php:799
+=======
+#: js/messages.php:77 libraries/common.lib.php:2353
+#: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338
+#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
+#: tbl_structure.php:801
+>>>>>>> origin/master
 msgid "Next"
 msgstr "Berikutnya"
 
@@ -1652,7 +1748,11 @@ msgstr "Kata Sandi:"
 msgid "Server Choice"
 msgstr "Pilihan Server"
 
+<<<<<<< HEAD
 #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63
+=======
+#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59
+>>>>>>> origin/master
 msgid "Cookies must be enabled past this point."
 msgstr "Mulai dari sini Cookies harus diaktifkan."
 
@@ -1732,7 +1832,11 @@ msgstr ""
 "Gagal menggunakan iconv, libiconv atau fungsi recode_string selama ekstensi "
 "masih dalam keadaan di-load. Periksa kembali konfigurasi PHP."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:580
+=======
+#: libraries/common.inc.php:576
+>>>>>>> origin/master
 msgid ""
 "phpMyAdmin was unable to read your configuration file!<br />This might "
 "happen if PHP finds a parse error in it or PHP cannot find the file.<br /"
@@ -1748,40 +1852,68 @@ msgstr ""
 "ketinggalan.<br />Jika muncul sebuah halaman kosong, artinya tidak ada "
 "masalah."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:591
+=======
+#: libraries/common.inc.php:587
+>>>>>>> origin/master
 #, fuzzy, php-format
 #| msgid "Could not load default configuration from: \"%1$s\""
 msgid "Could not load default configuration from: %1$s"
 msgstr "Tidak dapat memuat konfigurasi default dari: \"%1$s\""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:596
+=======
+#: libraries/common.inc.php:592
+>>>>>>> origin/master
 msgid ""
 "The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
 "configuration file!"
 msgstr ""
 "Directif <tt>$cfg['PmaAbsoluteUri']</tt> WAJIB diset dalam file konfigurasi!"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:626
+=======
+#: libraries/common.inc.php:622
+>>>>>>> origin/master
 #, php-format
 msgid "Invalid server index: %s"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:633
+=======
+#: libraries/common.inc.php:629
+>>>>>>> origin/master
 #, php-format
 msgid "Invalid hostname for server %1$s. Please review your configuration."
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:642 libraries/header.inc.php:100
+=======
+#: libraries/common.inc.php:638 libraries/header.inc.php:96
+>>>>>>> origin/master
 #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47
 #: main.php:185 test/theme.php:57
 msgid "Server"
 msgstr "Server"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:820
 msgid "Invalid authentication method set in configuration:"
 msgstr ""
 
 #: libraries/common.inc.php:923
+=======
+#: libraries/common.inc.php:816
+msgid "Invalid authentication method set in configuration:"
+msgstr ""
+
+#: libraries/common.inc.php:919
+>>>>>>> origin/master
 #, php-format
 msgid "You should upgrade to %s %s or later."
 msgstr "Disarankan untuk meng-update ke %s versi %s atau lebih baru."
@@ -2029,7 +2161,11 @@ msgstr ""
 "html#faq3_11@Dokumentasi]FAQ 3.11[/a]"
 
 #: libraries/db_structure.lib.php:69 server_databases.php:142
+<<<<<<< HEAD
 #: tbl_printview.php:335 tbl_structure.php:680
+=======
+#: tbl_printview.php:335 tbl_structure.php:682
+>>>>>>> origin/master
 msgid "Overhead"
 msgstr "Kelebihan (Overhead)"
 
@@ -2057,22 +2193,36 @@ msgid "Change password"
 msgstr "Ubah Kata Sandi"
 
 #: libraries/display_change_password.lib.php:35
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:348 server_privileges.php:808
+=======
+#: libraries/replication_gui.lib.php:348 server_privileges.php:807
+>>>>>>> origin/master
 msgid "No Password"
 msgstr "Kata Sandi belum ditetapkan"
 
 #: libraries/display_change_password.lib.php:41
 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63
 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:352 server_privileges.php:797
 #: server_privileges.php:801 server_privileges.php:812
 #: server_privileges.php:1555 server_synchronize.php:1175
+=======
+#: libraries/replication_gui.lib.php:352 server_privileges.php:796
+#: server_privileges.php:800 server_privileges.php:811
+#: server_privileges.php:1538 server_synchronize.php:1175
+>>>>>>> origin/master
 msgid "Password"
 msgstr "Kata Sandi"
 
 #: libraries/display_change_password.lib.php:46
 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359
+<<<<<<< HEAD
 #: server_privileges.php:816 server_privileges.php:819
+=======
+#: server_privileges.php:815 server_privileges.php:818
+>>>>>>> origin/master
 msgid "Re-type"
 msgstr "Ketik ulang"
 
@@ -2087,12 +2237,20 @@ msgid "MySQL 4.0 compatible"
 msgstr "MySQL&nbsp;4.0 compatible"
 
 #: libraries/display_change_password.lib.php:72
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:363 server_privileges.php:823
+=======
+#: libraries/replication_gui.lib.php:363 server_privileges.php:822
+>>>>>>> origin/master
 msgid "Generate Password"
 msgstr "Menghasilkan kata sandi"
 
 #: libraries/display_change_password.lib.php:75
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:366 server_privileges.php:826
+=======
+#: libraries/replication_gui.lib.php:366 server_privileges.php:825
+>>>>>>> origin/master
 msgid "Generate"
 msgstr "Menghasilkan"
 
@@ -2178,7 +2336,11 @@ msgid "remember template"
 msgstr "ingat konvensi"
 
 #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552
+=======
+#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549
+>>>>>>> origin/master
 msgid "Character set of the file:"
 msgstr "Penyusunan karakter dalam file:"
 
@@ -2231,7 +2393,11 @@ msgstr ""
 msgid "File to import"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527
+=======
+#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524
+>>>>>>> origin/master
 msgid "Location of the text file"
 msgstr "dari File"
 
@@ -2239,13 +2405,21 @@ msgstr "dari File"
 msgid "File uploads are not allowed on this server."
 msgstr "Upload file tidak diizinkan di server ini."
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536
+=======
+#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533
+>>>>>>> origin/master
 #: tbl_change.php:1025
 msgid "The directory you set for upload work cannot be reached"
 msgstr ""
 "Direktori yang telah ditetapkan untuk meng-upload tidak dapat dihubungi"
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539
+=======
+#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536
+>>>>>>> origin/master
 #: tbl_change.php:1028
 msgid "web server upload directory"
 msgstr "direktori upload pada web-server"
@@ -2374,7 +2548,11 @@ msgstr "Urut berdasarkan kunci"
 #: libraries/import/docsql.php:34 libraries/import/ldi.php:47
 #: libraries/import/ods.php:30 libraries/import/sql.php:20
 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26
+<<<<<<< HEAD
 #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751
+=======
+#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753
+>>>>>>> origin/master
 #, fuzzy
 msgid "Options"
 msgstr "Operasi"
@@ -2522,7 +2700,11 @@ msgstr "Penggunaan penampungan Buffer"
 
 #: libraries/engines/innodb.lib.php:194 server_databases.php:137
 #: server_databases.php:305 server_status.php:525 server_status.php:586
+<<<<<<< HEAD
 #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694
+=======
+#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696
+>>>>>>> origin/master
 msgid "Total"
 msgstr "Jumlah"
 
@@ -2784,7 +2966,11 @@ msgid ""
 msgstr ""
 
 #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88
+<<<<<<< HEAD
 #: tbl_printview.php:375 tbl_structure.php:735
+=======
+#: tbl_printview.php:375 tbl_structure.php:737
+>>>>>>> origin/master
 msgid "Format"
 msgstr "Format"
 
@@ -2856,8 +3042,13 @@ msgstr "Microsoft Word 2000"
 #: libraries/export/latex.php:201 libraries/export/odt.php:48
 #: libraries/export/sql.php:106 libraries/export/sql.php:868
 #: libraries/export/texytext.php:27 server_databases.php:127
+<<<<<<< HEAD
 #: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316
 #: tbl_structure.php:663
+=======
+#: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316
+#: tbl_structure.php:665
+>>>>>>> origin/master
 msgid "Data"
 msgstr "Data"
 
@@ -2906,9 +3097,15 @@ msgstr "Tipe MIME"
 #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57
 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177
 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:332 server_privileges.php:732
 #: server_privileges.php:735 server_privileges.php:791
 #: server_privileges.php:1554 server_privileges.php:2092
+=======
+#: libraries/replication_gui.lib.php:332 server_privileges.php:731
+#: server_privileges.php:734 server_privileges.php:790
+#: server_privileges.php:1537 server_privileges.php:2069
+>>>>>>> origin/master
 #: server_processlist.php:55 server_synchronize.php:1159
 msgid "Host"
 msgstr "Host"
@@ -3580,8 +3777,13 @@ msgstr ""
 
 #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59
 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:262 server_privileges.php:712
 #: server_privileges.php:715 server_privileges.php:722
+=======
+#: libraries/replication_gui.lib.php:262 server_privileges.php:711
+#: server_privileges.php:714 server_privileges.php:721
+>>>>>>> origin/master
 #: server_synchronize.php:1171
 msgid "User name"
 msgstr "Nama pengguna"
@@ -3599,14 +3801,22 @@ msgstr ""
 msgid "Slave status"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448
+=======
+#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445
+>>>>>>> origin/master
 #: server_status.php:737 server_variables.php:52
 msgid "Variable"
 msgstr "Variabel"
 
 #: libraries/replication_gui.lib.php:118 server_status.php:738
 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138
+<<<<<<< HEAD
 #: tbl_structure.php:727
+=======
+#: tbl_structure.php:729
+>>>>>>> origin/master
 msgid "Value"
 msgstr "Nilai"
 
@@ -3624,11 +3834,16 @@ msgstr ""
 msgid "Add slave replication user"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:257 server_privileges.php:717
+=======
+#: libraries/replication_gui.lib.php:257 server_privileges.php:716
+>>>>>>> origin/master
 msgid "Any user"
 msgstr "Setiap pengguna"
 
 #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:349 server_privileges.php:718
 #: server_privileges.php:785 server_privileges.php:809
 #: server_privileges.php:1950 server_privileges.php:1980
@@ -3652,6 +3867,31 @@ msgid "Use Host Table"
 msgstr "Gunakan Host Table"
 
 #: libraries/replication_gui.lib.php:334 server_privileges.php:793
+=======
+#: libraries/replication_gui.lib.php:349 server_privileges.php:717
+#: server_privileges.php:784 server_privileges.php:808
+#: server_privileges.php:1928 server_privileges.php:1958
+msgid "Use text field"
+msgstr "Gunakan text field"
+
+#: libraries/replication_gui.lib.php:305 server_privileges.php:764
+msgid "Any host"
+msgstr "Setiap host"
+
+#: libraries/replication_gui.lib.php:309 server_privileges.php:768
+msgid "Local"
+msgstr "Lokal"
+
+#: libraries/replication_gui.lib.php:315 server_privileges.php:773
+msgid "This Host"
+msgstr "Host yang ini"
+
+#: libraries/replication_gui.lib.php:321 server_privileges.php:779
+msgid "Use Host Table"
+msgstr "Gunakan Host Table"
+
+#: libraries/replication_gui.lib.php:334 server_privileges.php:792
+>>>>>>> origin/master
 msgid ""
 "When Host table is used, this field is ignored and values stored in Host "
 "table are used instead."
@@ -7747,10 +7987,13 @@ msgstr ""
 msgid "Show insert query"
 msgstr ""
 
+<<<<<<< HEAD
 #: tbl_change.php:1140
 msgid "and then"
 msgstr "selanjutnya"
 
+=======
+>>>>>>> origin/master
 #: tbl_change.php:1144
 msgid "Go back to previous page"
 msgstr "kembali"
@@ -7949,6 +8192,7 @@ msgstr "Cek integriti referensial:"
 msgid "Show tables"
 msgstr "Tampilkan tabel"
 
+<<<<<<< HEAD
 #: tbl_printview.php:309 tbl_structure.php:654
 msgid "Space usage"
 msgstr "Penggunaan tempat"
@@ -7982,6 +8226,41 @@ msgid "Row length"
 msgstr "Panjangnya baris"
 
 #: tbl_printview.php:413 tbl_structure.php:791
+=======
+#: tbl_printview.php:309 tbl_structure.php:656
+msgid "Space usage"
+msgstr "Penggunaan tempat"
+
+#: tbl_printview.php:313 tbl_structure.php:660
+msgid "Usage"
+msgstr "Penggunaan"
+
+#: tbl_printview.php:340 tbl_structure.php:687
+msgid "Effective"
+msgstr "Efektif"
+
+#: tbl_printview.php:365 tbl_structure.php:725
+msgid "Row Statistics"
+msgstr "Statistik Baris"
+
+#: tbl_printview.php:368 tbl_structure.php:728
+msgid "Statements"
+msgstr "Keterangan"
+
+#: tbl_printview.php:379 tbl_structure.php:740
+msgid "static"
+msgstr ""
+
+#: tbl_printview.php:381 tbl_structure.php:742
+msgid "dynamic"
+msgstr "dinamis"
+
+#: tbl_printview.php:403 tbl_structure.php:785
+msgid "Row length"
+msgstr "Panjangnya baris"
+
+#: tbl_printview.php:413 tbl_structure.php:793
+>>>>>>> origin/master
 msgid " Row size "
 msgstr " Besarnya baris "
 
diff --git a/po/it.po b/po/it.po
index bda419eba..7ecdc7a9a 100755
--- a/po/it.po
+++ b/po/it.po
@@ -3,7 +3,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2010-07-03 21:45+0530\n"
+=======
+"POT-Creation-Date: 2010-07-03 09:00-0400\n"
+>>>>>>> origin/master
 "PO-Revision-Date: 2010-05-24 21:25+0200\n"
 "Last-Translator: Fabio <fantonifabio@tiscali.it>\n"
 "Language-Team: italian <it@li.org>\n"
@@ -50,15 +54,26 @@ msgstr "Cerca"
 #: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046
 #: libraries/Theme_Manager.class.php:311
 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719
+<<<<<<< HEAD
 #: libraries/common.lib.php:1344 libraries/common.lib.php:2301
 #: libraries/display_change_password.lib.php:82
 #: libraries/display_create_table.lib.php:62
+=======
+#: libraries/common.lib.php:1335 libraries/common.lib.php:2288
+#: libraries/display_change_password.lib.php:82
+#: libraries/display_create_table.lib.php:63
+>>>>>>> origin/master
 #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532
 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76
 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104
+<<<<<<< HEAD
 #: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480
 #: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782
+=======
+#: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477
+#: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782
+>>>>>>> origin/master
 #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328
 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142
 #: server_privileges.php:665 server_privileges.php:1641
@@ -68,8 +83,13 @@ msgstr "Cerca"
 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171
 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265
 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561
+<<<<<<< HEAD
 #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560
 #: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512
+=======
+#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562
+#: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512
+>>>>>>> origin/master
 #: view_create.php:182 view_operations.php:101
 msgid "Go"
 msgstr "Esegui"
@@ -122,10 +142,17 @@ msgstr "Nomi delle colonne"
 #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245
 #: libraries/export/latex.php:360 libraries/export/odt.php:297
 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100
+<<<<<<< HEAD
 #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093
 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
 #: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321
+=======
+#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070
+#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
+#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
+#: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321
+>>>>>>> origin/master
 msgid "Type"
 msgstr "Tipo"
 
@@ -166,9 +193,15 @@ msgstr "Commenti"
 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322
 #: libraries/export/latex.php:430 libraries/export/odt.php:368
 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263
+<<<<<<< HEAD
 #: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596
 #: server_privileges.php:1911 server_privileges.php:1916
 #: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228
+=======
+#: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579
+#: server_privileges.php:1889 server_privileges.php:1894
+#: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228
+>>>>>>> origin/master
 #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342
 msgid "No"
 msgstr " No "
@@ -182,9 +215,15 @@ msgstr " No "
 #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106
 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262
 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344
+<<<<<<< HEAD
 #: server_databases.php:64 server_privileges.php:1582
 #: server_privileges.php:1596 server_privileges.php:1911
 #: server_privileges.php:1914 server_privileges.php:2210 sql.php:193
+=======
+#: server_databases.php:64 server_privileges.php:1565
+#: server_privileges.php:1579 server_privileges.php:1889
+#: server_privileges.php:1892 server_privileges.php:2187 sql.php:193
+>>>>>>> origin/master
 #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350
 #: tbl_tracking.php:335 tbl_tracking.php:340
 msgid "Yes"
@@ -233,7 +272,15 @@ msgstr "Rinomina il DataBase in"
 msgid "Command"
 msgstr "Comando"
 
+<<<<<<< HEAD
 #: db_operations.php:466
+=======
+#: db_operations.php:429 tbl_change.php:1140
+msgid "and then"
+msgstr "e quindi"
+
+#: db_operations.php:455
+>>>>>>> origin/master
 msgid "Copy database to"
 msgstr "Copia il Database in"
 
@@ -315,7 +362,11 @@ msgstr "Abilita"
 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730
 #: server_collations.php:54 server_collations.php:66 server_databases.php:111
 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179
+<<<<<<< HEAD
 #: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326
+=======
+#: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326
+>>>>>>> origin/master
 msgid "Collation"
 msgstr "Collation"
 
@@ -344,7 +395,11 @@ msgstr "Tabella"
 #: db_printview.php:105 libraries/db_structure.lib.php:56
 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146
 #: navigation.php:638 navigation.php:660 server_databases.php:122
+<<<<<<< HEAD
 #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775
+=======
+#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777
+>>>>>>> origin/master
 msgid "Rows"
 msgstr "Righe"
 
@@ -359,19 +414,31 @@ msgstr "in uso"
 
 #: db_printview.php:187 libraries/db_info.inc.php:88
 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433
+<<<<<<< HEAD
 #: tbl_structure.php:807
+=======
+#: tbl_structure.php:809
+>>>>>>> origin/master
 msgid "Creation"
 msgstr "Creazione"
 
 #: db_printview.php:196 libraries/db_info.inc.php:93
 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443
+<<<<<<< HEAD
 #: tbl_structure.php:815
+=======
+#: tbl_structure.php:817
+>>>>>>> origin/master
 msgid "Last update"
 msgstr "Ultimo cambiamento"
 
 #: db_printview.php:205 libraries/db_info.inc.php:98
 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453
+<<<<<<< HEAD
 #: tbl_structure.php:823
+=======
+#: tbl_structure.php:825
+>>>>>>> origin/master
 msgid "Last check"
 msgstr "Ultimo controllo"
 
@@ -436,7 +503,11 @@ msgstr "Elimina"
 
 #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553
 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779
+<<<<<<< HEAD
 #: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250
+=======
+#: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250
+>>>>>>> origin/master
 #: tbl_select.php:286
 msgid "Or"
 msgstr "Oppure"
@@ -656,9 +727,15 @@ msgstr "Se selezionati:"
 msgid "Check All"
 msgstr "Seleziona tutti"
 
+<<<<<<< HEAD
 #: db_structure.php:529 libraries/display_tbl.lib.php:2077
 #: libraries/replication_gui.lib.php:36 server_databases.php:350
 #: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460
+=======
+#: db_structure.php:531 libraries/display_tbl.lib.php:2077
+#: libraries/replication_gui.lib.php:36 server_databases.php:350
+#: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462
+>>>>>>> origin/master
 msgid "Uncheck All"
 msgstr "Deseleziona tutti"
 
@@ -1125,10 +1202,17 @@ msgid "Prev"
 msgstr "Precedente"
 
 #. l10n: Display text for next month link in calendar
+<<<<<<< HEAD
 #: js/messages.php:106 libraries/common.lib.php:2366
 #: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338
 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
 #: tbl_structure.php:799
+=======
+#: js/messages.php:77 libraries/common.lib.php:2353
+#: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338
+#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
+#: tbl_structure.php:801
+>>>>>>> origin/master
 msgid "Next"
 msgstr "Prossimo"
 
@@ -1629,7 +1713,11 @@ msgstr "Password:"
 msgid "Server Choice"
 msgstr "Scelta del server"
 
+<<<<<<< HEAD
 #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63
+=======
+#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59
+>>>>>>> origin/master
 msgid "Cookies must be enabled past this point."
 msgstr "Da questo punto in poi, i cookie devono essere abilitati."
 
@@ -1713,7 +1801,11 @@ msgstr ""
 "quanto l'estensione deve essere caricata. Controllare la configurazione del "
 "PHP."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:580
+=======
+#: libraries/common.inc.php:576
+>>>>>>> origin/master
 msgid ""
 "phpMyAdmin was unable to read your configuration file!<br />This might "
 "happen if PHP finds a parse error in it or PHP cannot find the file.<br /"
@@ -1729,12 +1821,20 @@ msgstr ""
 "maggior parte dei casi ci sono un apostrofo o una virgoletta mancanti.<br /"
 ">Se ricevete una pagina bianca, allora è tutto a posto."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:591
+=======
+#: libraries/common.inc.php:587
+>>>>>>> origin/master
 #, php-format
 msgid "Could not load default configuration from: %1$s"
 msgstr "Non posso caricare la configurazione predefinita da: %1$s"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:596
+=======
+#: libraries/common.inc.php:592
+>>>>>>> origin/master
 msgid ""
 "The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
 "configuration file!"
@@ -1742,28 +1842,48 @@ msgstr ""
 "La direttiva <tt>$cfg['PmaAbsoluteUri']</tt> DEVE essere impostata nel file "
 "di configurazione!"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:626
+=======
+#: libraries/common.inc.php:622
+>>>>>>> origin/master
 #, php-format
 msgid "Invalid server index: %s"
 msgstr "Indice server non valido: %s"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:633
+=======
+#: libraries/common.inc.php:629
+>>>>>>> origin/master
 #, php-format
 msgid "Invalid hostname for server %1$s. Please review your configuration."
 msgstr ""
 "Nome host per il server %1$s non valido. Controlla la tua configurazione."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:642 libraries/header.inc.php:100
+=======
+#: libraries/common.inc.php:638 libraries/header.inc.php:96
+>>>>>>> origin/master
 #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47
 #: main.php:185 test/theme.php:57
 msgid "Server"
 msgstr "Server"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:820
 msgid "Invalid authentication method set in configuration:"
 msgstr "Metodo di autenticazione settato nella configurazione non valido:"
 
 #: libraries/common.inc.php:923
+=======
+#: libraries/common.inc.php:816
+msgid "Invalid authentication method set in configuration:"
+msgstr "Metodo di autenticazione settato nella configurazione non valido:"
+
+#: libraries/common.inc.php:919
+>>>>>>> origin/master
 #, php-format
 msgid "You should upgrade to %s %s or later."
 msgstr "Si dovrebbe aggiornare %s alla versione %s o successiva."
@@ -2010,7 +2130,11 @@ msgid ""
 msgstr "Può essere approssimato. Vedere FAQ 3.11"
 
 #: libraries/db_structure.lib.php:69 server_databases.php:142
+<<<<<<< HEAD
 #: tbl_printview.php:335 tbl_structure.php:680
+=======
+#: tbl_printview.php:335 tbl_structure.php:682
+>>>>>>> origin/master
 msgid "Overhead"
 msgstr "In eccesso"
 
@@ -2038,22 +2162,36 @@ msgid "Change password"
 msgstr "Cambia password"
 
 #: libraries/display_change_password.lib.php:35
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:348 server_privileges.php:808
+=======
+#: libraries/replication_gui.lib.php:348 server_privileges.php:807
+>>>>>>> origin/master
 msgid "No Password"
 msgstr "Nessuna Password"
 
 #: libraries/display_change_password.lib.php:41
 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63
 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:352 server_privileges.php:797
 #: server_privileges.php:801 server_privileges.php:812
 #: server_privileges.php:1555 server_synchronize.php:1175
+=======
+#: libraries/replication_gui.lib.php:352 server_privileges.php:796
+#: server_privileges.php:800 server_privileges.php:811
+#: server_privileges.php:1538 server_synchronize.php:1175
+>>>>>>> origin/master
 msgid "Password"
 msgstr "Password"
 
 #: libraries/display_change_password.lib.php:46
 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359
+<<<<<<< HEAD
 #: server_privileges.php:816 server_privileges.php:819
+=======
+#: server_privileges.php:815 server_privileges.php:818
+>>>>>>> origin/master
 msgid "Re-type"
 msgstr "Reinserisci"
 
@@ -2066,12 +2204,20 @@ msgid "MySQL 4.0 compatible"
 msgstr "Compatibile con MySQL 4.0"
 
 #: libraries/display_change_password.lib.php:72
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:363 server_privileges.php:823
+=======
+#: libraries/replication_gui.lib.php:363 server_privileges.php:822
+>>>>>>> origin/master
 msgid "Generate Password"
 msgstr "Genera Password"
 
 #: libraries/display_change_password.lib.php:75
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:366 server_privileges.php:826
+=======
+#: libraries/replication_gui.lib.php:366 server_privileges.php:825
+>>>>>>> origin/master
 msgid "Generate"
 msgstr "Genera"
 
@@ -2160,7 +2306,11 @@ msgid "remember template"
 msgstr "ricorda il template"
 
 #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552
+=======
+#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549
+>>>>>>> origin/master
 msgid "Character set of the file:"
 msgstr "Set di caratteri del file:"
 
@@ -2218,7 +2368,11 @@ msgstr ""
 msgid "File to import"
 msgstr "File importato"
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527
+=======
+#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524
+>>>>>>> origin/master
 msgid "Location of the text file"
 msgstr "Percorso del file"
 
@@ -2226,12 +2380,20 @@ msgstr "Percorso del file"
 msgid "File uploads are not allowed on this server."
 msgstr "Non è permesso l'upload dei file su questo server."
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536
+=======
+#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533
+>>>>>>> origin/master
 #: tbl_change.php:1025
 msgid "The directory you set for upload work cannot be reached"
 msgstr "La directory impostata per l'upload non può essere trovata"
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539
+=======
+#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536
+>>>>>>> origin/master
 #: tbl_change.php:1028
 msgid "web server upload directory"
 msgstr "directory di upload del web-server"
@@ -2369,7 +2531,11 @@ msgstr "Ordina per chiave"
 #: libraries/import/docsql.php:34 libraries/import/ldi.php:47
 #: libraries/import/ods.php:30 libraries/import/sql.php:20
 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26
+<<<<<<< HEAD
 #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751
+=======
+#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753
+>>>>>>> origin/master
 msgid "Options"
 msgstr "Opzioni"
 
@@ -2516,7 +2682,11 @@ msgstr "Utilizzo del Buffer Pool"
 
 #: libraries/engines/innodb.lib.php:194 server_databases.php:137
 #: server_databases.php:305 server_status.php:525 server_status.php:586
+<<<<<<< HEAD
 #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694
+=======
+#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696
+>>>>>>> origin/master
 msgid "Total"
 msgstr "Totale"
 
@@ -2807,7 +2977,11 @@ msgstr ""
 "più alto."
 
 #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88
+<<<<<<< HEAD
 #: tbl_printview.php:375 tbl_structure.php:735
+=======
+#: tbl_printview.php:375 tbl_structure.php:737
+>>>>>>> origin/master
 msgid "Format"
 msgstr "Formato"
 
@@ -2879,8 +3053,13 @@ msgstr "Microsoft Word 2000"
 #: libraries/export/latex.php:201 libraries/export/odt.php:48
 #: libraries/export/sql.php:106 libraries/export/sql.php:868
 #: libraries/export/texytext.php:27 server_databases.php:127
+<<<<<<< HEAD
 #: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316
 #: tbl_structure.php:663
+=======
+#: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316
+#: tbl_structure.php:665
+>>>>>>> origin/master
 msgid "Data"
 msgstr "Dati"
 
@@ -2929,9 +3108,15 @@ msgstr "tipo MIME"
 #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57
 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177
 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:332 server_privileges.php:732
 #: server_privileges.php:735 server_privileges.php:791
 #: server_privileges.php:1554 server_privileges.php:2092
+=======
+#: libraries/replication_gui.lib.php:332 server_privileges.php:731
+#: server_privileges.php:734 server_privileges.php:790
+#: server_privileges.php:1537 server_privileges.php:2069
+>>>>>>> origin/master
 #: server_processlist.php:55 server_synchronize.php:1159
 msgid "Host"
 msgstr "Host"
@@ -3601,8 +3786,13 @@ msgstr ""
 
 #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59
 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:262 server_privileges.php:712
 #: server_privileges.php:715 server_privileges.php:722
+=======
+#: libraries/replication_gui.lib.php:262 server_privileges.php:711
+#: server_privileges.php:714 server_privileges.php:721
+>>>>>>> origin/master
 #: server_synchronize.php:1171
 msgid "User name"
 msgstr "Nome utente"
@@ -3622,14 +3812,22 @@ msgstr "Mostra lo stato degli slave"
 msgid "Slave status"
 msgstr "Mostra lo stato degli slave"
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448
+=======
+#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445
+>>>>>>> origin/master
 #: server_status.php:737 server_variables.php:52
 msgid "Variable"
 msgstr "Variabile"
 
 #: libraries/replication_gui.lib.php:118 server_status.php:738
 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138
+<<<<<<< HEAD
 #: tbl_structure.php:727
+=======
+#: tbl_structure.php:729
+>>>>>>> origin/master
 msgid "Value"
 msgstr "Valore"
 
@@ -3647,11 +3845,16 @@ msgstr ""
 msgid "Add slave replication user"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:257 server_privileges.php:717
+=======
+#: libraries/replication_gui.lib.php:257 server_privileges.php:716
+>>>>>>> origin/master
 msgid "Any user"
 msgstr "Qualsiasi utente"
 
 #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:349 server_privileges.php:718
 #: server_privileges.php:785 server_privileges.php:809
 #: server_privileges.php:1950 server_privileges.php:1980
@@ -3675,6 +3878,31 @@ msgid "Use Host Table"
 msgstr "Utilizza la Tabella dell'Host"
 
 #: libraries/replication_gui.lib.php:334 server_privileges.php:793
+=======
+#: libraries/replication_gui.lib.php:349 server_privileges.php:717
+#: server_privileges.php:784 server_privileges.php:808
+#: server_privileges.php:1928 server_privileges.php:1958
+msgid "Use text field"
+msgstr "Utilizza campo text"
+
+#: libraries/replication_gui.lib.php:305 server_privileges.php:764
+msgid "Any host"
+msgstr "Qualsiasi host"
+
+#: libraries/replication_gui.lib.php:309 server_privileges.php:768
+msgid "Local"
+msgstr "Locale"
+
+#: libraries/replication_gui.lib.php:315 server_privileges.php:773
+msgid "This Host"
+msgstr "Questo Host"
+
+#: libraries/replication_gui.lib.php:321 server_privileges.php:779
+msgid "Use Host Table"
+msgstr "Utilizza la Tabella dell'Host"
+
+#: libraries/replication_gui.lib.php:334 server_privileges.php:792
+>>>>>>> origin/master
 msgid ""
 "When Host table is used, this field is ignored and values stored in Host "
 "table are used instead."
@@ -7957,10 +8185,13 @@ msgstr "Inserisci come nuova riga e ignora gli errori"
 msgid "Show insert query"
 msgstr "Mostrando la query SQL"
 
+<<<<<<< HEAD
 #: tbl_change.php:1140
 msgid "and then"
 msgstr "e quindi"
 
+=======
+>>>>>>> origin/master
 #: tbl_change.php:1144
 msgid "Go back to previous page"
 msgstr "Indietro"
@@ -8157,6 +8388,7 @@ msgstr "Controlla l'integrità delle referenze:"
 msgid "Show tables"
 msgstr "Mostra le tabelle"
 
+<<<<<<< HEAD
 #: tbl_printview.php:309 tbl_structure.php:654
 msgid "Space usage"
 msgstr "Spazio utilizzato"
@@ -8190,6 +8422,41 @@ msgid "Row length"
 msgstr "Lunghezza riga"
 
 #: tbl_printview.php:413 tbl_structure.php:791
+=======
+#: tbl_printview.php:309 tbl_structure.php:656
+msgid "Space usage"
+msgstr "Spazio utilizzato"
+
+#: tbl_printview.php:313 tbl_structure.php:660
+msgid "Usage"
+msgstr "Utilizzo"
+
+#: tbl_printview.php:340 tbl_structure.php:687
+msgid "Effective"
+msgstr "Effettivo"
+
+#: tbl_printview.php:365 tbl_structure.php:725
+msgid "Row Statistics"
+msgstr "Statistiche righe"
+
+#: tbl_printview.php:368 tbl_structure.php:728
+msgid "Statements"
+msgstr "Istruzioni"
+
+#: tbl_printview.php:379 tbl_structure.php:740
+msgid "static"
+msgstr ""
+
+#: tbl_printview.php:381 tbl_structure.php:742
+msgid "dynamic"
+msgstr "dinamico"
+
+#: tbl_printview.php:403 tbl_structure.php:785
+msgid "Row length"
+msgstr "Lunghezza riga"
+
+#: tbl_printview.php:413 tbl_structure.php:793
+>>>>>>> origin/master
 msgid " Row size "
 msgstr "Dimensione riga"
 
diff --git a/po/ja.po b/po/ja.po
index 5ba33fd0d..6909ac425 100755
--- a/po/ja.po
+++ b/po/ja.po
@@ -3,7 +3,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2010-07-03 21:45+0530\n"
+=======
+"POT-Creation-Date: 2010-07-03 09:00-0400\n"
+>>>>>>> origin/master
 "PO-Revision-Date: 2010-03-12 11:22+0200\n"
 "Last-Translator: Michal <michal@cihar.com>\n"
 "Language-Team: japanese <jp@li.org>\n"
@@ -49,15 +53,26 @@ msgstr "検索"
 #: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046
 #: libraries/Theme_Manager.class.php:311
 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719
+<<<<<<< HEAD
 #: libraries/common.lib.php:1344 libraries/common.lib.php:2301
 #: libraries/display_change_password.lib.php:82
 #: libraries/display_create_table.lib.php:62
+=======
+#: libraries/common.lib.php:1335 libraries/common.lib.php:2288
+#: libraries/display_change_password.lib.php:82
+#: libraries/display_create_table.lib.php:63
+>>>>>>> origin/master
 #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532
 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76
 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104
+<<<<<<< HEAD
 #: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480
 #: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782
+=======
+#: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477
+#: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782
+>>>>>>> origin/master
 #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328
 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142
 #: server_privileges.php:665 server_privileges.php:1641
@@ -67,8 +82,13 @@ msgstr "検索"
 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171
 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265
 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561
+<<<<<<< HEAD
 #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560
 #: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512
+=======
+#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562
+#: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512
+>>>>>>> origin/master
 #: view_create.php:182 view_operations.php:101
 msgid "Go"
 msgstr "実行する"
@@ -121,10 +141,17 @@ msgstr "カラム名"
 #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245
 #: libraries/export/latex.php:360 libraries/export/odt.php:297
 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100
+<<<<<<< HEAD
 #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093
 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
 #: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321
+=======
+#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070
+#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
+#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
+#: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321
+>>>>>>> origin/master
 msgid "Type"
 msgstr "種別"
 
@@ -165,9 +192,15 @@ msgstr "コメント"
 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322
 #: libraries/export/latex.php:430 libraries/export/odt.php:368
 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263
+<<<<<<< HEAD
 #: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596
 #: server_privileges.php:1911 server_privileges.php:1916
 #: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228
+=======
+#: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579
+#: server_privileges.php:1889 server_privileges.php:1894
+#: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228
+>>>>>>> origin/master
 #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342
 msgid "No"
 msgstr "いいえ"
@@ -181,9 +214,15 @@ msgstr "いいえ"
 #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106
 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262
 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344
+<<<<<<< HEAD
 #: server_databases.php:64 server_privileges.php:1582
 #: server_privileges.php:1596 server_privileges.php:1911
 #: server_privileges.php:1914 server_privileges.php:2210 sql.php:193
+=======
+#: server_databases.php:64 server_privileges.php:1565
+#: server_privileges.php:1579 server_privileges.php:1889
+#: server_privileges.php:1892 server_privileges.php:2187 sql.php:193
+>>>>>>> origin/master
 #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350
 #: tbl_tracking.php:335 tbl_tracking.php:340
 msgid "Yes"
@@ -232,7 +271,15 @@ msgstr "新しいデータベース名"
 msgid "Command"
 msgstr "コマンド"
 
+<<<<<<< HEAD
 #: db_operations.php:466
+=======
+#: db_operations.php:429 tbl_change.php:1140
+msgid "and then"
+msgstr "続いて"
+
+#: db_operations.php:455
+>>>>>>> origin/master
 msgid "Copy database to"
 msgstr "データベースのコピー先"
 
@@ -320,7 +367,11 @@ msgstr ""
 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730
 #: server_collations.php:54 server_collations.php:66 server_databases.php:111
 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179
+<<<<<<< HEAD
 #: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326
+=======
+#: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326
+>>>>>>> origin/master
 msgid "Collation"
 msgstr "照合順序"
 
@@ -349,7 +400,11 @@ msgstr "テーブル"
 #: db_printview.php:105 libraries/db_structure.lib.php:56
 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146
 #: navigation.php:638 navigation.php:660 server_databases.php:122
+<<<<<<< HEAD
 #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775
+=======
+#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777
+>>>>>>> origin/master
 msgid "Rows"
 msgstr "行"
 
@@ -364,19 +419,31 @@ msgstr "使用中"
 
 #: db_printview.php:187 libraries/db_info.inc.php:88
 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433
+<<<<<<< HEAD
 #: tbl_structure.php:807
+=======
+#: tbl_structure.php:809
+>>>>>>> origin/master
 msgid "Creation"
 msgstr "作成日時"
 
 #: db_printview.php:196 libraries/db_info.inc.php:93
 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443
+<<<<<<< HEAD
 #: tbl_structure.php:815
+=======
+#: tbl_structure.php:817
+>>>>>>> origin/master
 msgid "Last update"
 msgstr "最終更新"
 
 #: db_printview.php:205 libraries/db_info.inc.php:98
 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453
+<<<<<<< HEAD
 #: tbl_structure.php:823
+=======
+#: tbl_structure.php:825
+>>>>>>> origin/master
 msgid "Last check"
 msgstr "最終検査"
 
@@ -440,7 +507,11 @@ msgstr "削除"
 
 #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553
 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779
+<<<<<<< HEAD
 #: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250
+=======
+#: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250
+>>>>>>> origin/master
 #: tbl_select.php:286
 msgid "Or"
 msgstr "または"
@@ -658,9 +729,15 @@ msgstr "チェックしたものを:"
 msgid "Check All"
 msgstr "すべてチェックする"
 
+<<<<<<< HEAD
 #: db_structure.php:529 libraries/display_tbl.lib.php:2077
 #: libraries/replication_gui.lib.php:36 server_databases.php:350
 #: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460
+=======
+#: db_structure.php:531 libraries/display_tbl.lib.php:2077
+#: libraries/replication_gui.lib.php:36 server_databases.php:350
+#: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462
+>>>>>>> origin/master
 msgid "Uncheck All"
 msgstr "すべてのチェックを外す"
 
@@ -1125,10 +1202,17 @@ msgid "Prev"
 msgstr "前"
 
 #. l10n: Display text for next month link in calendar
+<<<<<<< HEAD
 #: js/messages.php:106 libraries/common.lib.php:2366
 #: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338
 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
 #: tbl_structure.php:799
+=======
+#: js/messages.php:77 libraries/common.lib.php:2353
+#: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338
+#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
+#: tbl_structure.php:801
+>>>>>>> origin/master
 msgid "Next"
 msgstr "次へ"
 
@@ -1670,7 +1754,11 @@ msgstr "パスワード:"
 msgid "Server Choice"
 msgstr "サーバの選択"
 
+<<<<<<< HEAD
 #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63
+=======
+#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59
+>>>>>>> origin/master
 msgid "Cookies must be enabled past this point."
 msgstr "クッキーを有効にしてください"
 
@@ -1751,7 +1839,11 @@ msgstr ""
 "必要な拡張はロードされているようですが、iconv や libiconv、recode_string の関"
 "数を利用できません。PHP の設定を確認してください"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:580
+=======
+#: libraries/common.inc.php:576
+>>>>>>> origin/master
 msgid ""
 "phpMyAdmin was unable to read your configuration file!<br />This might "
 "happen if PHP finds a parse error in it or PHP cannot find the file.<br /"
@@ -1765,13 +1857,21 @@ msgstr ""
 "で PHP のエラーメッセージを確認してください。たいていの場合はどこかに引用符や"
 "セミコロンの抜けがあります。<br />空白のページが表示されれば問題なしです"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:591
+=======
+#: libraries/common.inc.php:587
+>>>>>>> origin/master
 #, fuzzy, php-format
 #| msgid "Could not load default configuration from: \"%1$s\""
 msgid "Could not load default configuration from: %1$s"
 msgstr "デフォルトの設定を読み込めませんでした: \"%1$s\""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:596
+=======
+#: libraries/common.inc.php:592
+>>>>>>> origin/master
 msgid ""
 "The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
 "configuration file!"
@@ -1779,28 +1879,48 @@ msgstr ""
 "<tt>$cfg['PmaAbsoluteUri']</tt> はかならず設定ファイルで設定する必要がありま"
 "す!"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:626
+=======
+#: libraries/common.inc.php:622
+>>>>>>> origin/master
 #, fuzzy, php-format
 #| msgid "Invalid server index: \"%s\""
 msgid "Invalid server index: %s"
 msgstr "サーバのインデックスが不正です: \"%s\""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:633
+=======
+#: libraries/common.inc.php:629
+>>>>>>> origin/master
 #, php-format
 msgid "Invalid hostname for server %1$s. Please review your configuration."
 msgstr "サーバ %1$s のホスト名が不正です。設定を確認してください"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:642 libraries/header.inc.php:100
+=======
+#: libraries/common.inc.php:638 libraries/header.inc.php:96
+>>>>>>> origin/master
 #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47
 #: main.php:185 test/theme.php:57
 msgid "Server"
 msgstr "サーバ"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:820
 msgid "Invalid authentication method set in configuration:"
 msgstr "設定ファイルに無効な認証方法が指定されています:"
 
 #: libraries/common.inc.php:923
+=======
+#: libraries/common.inc.php:816
+msgid "Invalid authentication method set in configuration:"
+msgstr "設定ファイルに無効な認証方法が指定されています:"
+
+#: libraries/common.inc.php:919
+>>>>>>> origin/master
 #, php-format
 msgid "You should upgrade to %s %s or later."
 msgstr "%s を %s 以降にアップグレードしてください"
@@ -2047,7 +2167,11 @@ msgid ""
 msgstr "正確な数字とは限りません。FAQ 3.11 をご覧ください"
 
 #: libraries/db_structure.lib.php:69 server_databases.php:142
+<<<<<<< HEAD
 #: tbl_printview.php:335 tbl_structure.php:680
+=======
+#: tbl_printview.php:335 tbl_structure.php:682
+>>>>>>> origin/master
 msgid "Overhead"
 msgstr "オーバーヘッド"
 
@@ -2075,22 +2199,36 @@ msgid "Change password"
 msgstr "パスワードを変更する"
 
 #: libraries/display_change_password.lib.php:35
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:348 server_privileges.php:808
+=======
+#: libraries/replication_gui.lib.php:348 server_privileges.php:807
+>>>>>>> origin/master
 msgid "No Password"
 msgstr "パスワードなし"
 
 #: libraries/display_change_password.lib.php:41
 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63
 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:352 server_privileges.php:797
 #: server_privileges.php:801 server_privileges.php:812
 #: server_privileges.php:1555 server_synchronize.php:1175
+=======
+#: libraries/replication_gui.lib.php:352 server_privileges.php:796
+#: server_privileges.php:800 server_privileges.php:811
+#: server_privileges.php:1538 server_synchronize.php:1175
+>>>>>>> origin/master
 msgid "Password"
 msgstr "パスワード"
 
 #: libraries/display_change_password.lib.php:46
 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359
+<<<<<<< HEAD
 #: server_privileges.php:816 server_privileges.php:819
+=======
+#: server_privileges.php:815 server_privileges.php:818
+>>>>>>> origin/master
 msgid "Re-type"
 msgstr "もう一度入力してください"
 
@@ -2105,12 +2243,20 @@ msgid "MySQL 4.0 compatible"
 msgstr "MySQL&nbsp;4.0 互換"
 
 #: libraries/display_change_password.lib.php:72
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:363 server_privileges.php:823
+=======
+#: libraries/replication_gui.lib.php:363 server_privileges.php:822
+>>>>>>> origin/master
 msgid "Generate Password"
 msgstr "パスワードを生成する"
 
 #: libraries/display_change_password.lib.php:75
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:366 server_privileges.php:826
+=======
+#: libraries/replication_gui.lib.php:366 server_privileges.php:825
+>>>>>>> origin/master
 msgid "Generate"
 msgstr "生成する"
 
@@ -2200,7 +2346,11 @@ msgid "remember template"
 msgstr "テンプレートを記憶させる"
 
 #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552
+=======
+#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549
+>>>>>>> origin/master
 msgid "Character set of the file:"
 msgstr "ファイルの文字セット:"
 
@@ -2253,7 +2403,11 @@ msgstr ""
 msgid "File to import"
 msgstr "インポートするファイル"
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527
+=======
+#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524
+>>>>>>> origin/master
 msgid "Location of the text file"
 msgstr "テキストファイルの位置"
 
@@ -2261,12 +2415,20 @@ msgstr "テキストファイルの位置"
 msgid "File uploads are not allowed on this server."
 msgstr "このサーバではファイルのアップロードはできません"
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536
+=======
+#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533
+>>>>>>> origin/master
 #: tbl_change.php:1025
 msgid "The directory you set for upload work cannot be reached"
 msgstr "指定したアップロードディレクトリが利用できません"
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539
+=======
+#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536
+>>>>>>> origin/master
 #: tbl_change.php:1028
 msgid "web server upload directory"
 msgstr "ウェブサーバ上のアップロードディレクトリ"
@@ -2401,7 +2563,11 @@ msgstr "キーでソート"
 #: libraries/import/docsql.php:34 libraries/import/ldi.php:47
 #: libraries/import/ods.php:30 libraries/import/sql.php:20
 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26
+<<<<<<< HEAD
 #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751
+=======
+#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753
+>>>>>>> origin/master
 msgid "Options"
 msgstr "オプション"
 
@@ -2548,7 +2714,11 @@ msgstr "バッファプールの使用量"
 
 #: libraries/engines/innodb.lib.php:194 server_databases.php:137
 #: server_databases.php:305 server_status.php:525 server_status.php:586
+<<<<<<< HEAD
 #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694
+=======
+#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696
+>>>>>>> origin/master
 msgid "Total"
 msgstr "合計"
 
@@ -2831,7 +3001,11 @@ msgstr ""
 "の番号がつけられます。"
 
 #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88
+<<<<<<< HEAD
 #: tbl_printview.php:375 tbl_structure.php:735
+=======
+#: tbl_printview.php:375 tbl_structure.php:737
+>>>>>>> origin/master
 msgid "Format"
 msgstr "フォーマット"
 
@@ -2903,8 +3077,13 @@ msgstr "Microsoft Word 2000"
 #: libraries/export/latex.php:201 libraries/export/odt.php:48
 #: libraries/export/sql.php:106 libraries/export/sql.php:868
 #: libraries/export/texytext.php:27 server_databases.php:127
+<<<<<<< HEAD
 #: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316
 #: tbl_structure.php:663
+=======
+#: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316
+#: tbl_structure.php:665
+>>>>>>> origin/master
 msgid "Data"
 msgstr "データ"
 
@@ -2953,9 +3132,15 @@ msgstr "MIME タイプ"
 #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57
 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177
 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:332 server_privileges.php:732
 #: server_privileges.php:735 server_privileges.php:791
 #: server_privileges.php:1554 server_privileges.php:2092
+=======
+#: libraries/replication_gui.lib.php:332 server_privileges.php:731
+#: server_privileges.php:734 server_privileges.php:790
+#: server_privileges.php:1537 server_privileges.php:2069
+>>>>>>> origin/master
 #: server_processlist.php:55 server_synchronize.php:1159
 msgid "Host"
 msgstr "ホスト"
@@ -3620,8 +3805,13 @@ msgstr ""
 
 #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59
 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:262 server_privileges.php:712
 #: server_privileges.php:715 server_privileges.php:722
+=======
+#: libraries/replication_gui.lib.php:262 server_privileges.php:711
+#: server_privileges.php:714 server_privileges.php:721
+>>>>>>> origin/master
 #: server_synchronize.php:1171
 msgid "User name"
 msgstr "ユーザ名"
@@ -3638,14 +3828,22 @@ msgstr ""
 msgid "Slave status"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448
+=======
+#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445
+>>>>>>> origin/master
 #: server_status.php:737 server_variables.php:52
 msgid "Variable"
 msgstr "変数"
 
 #: libraries/replication_gui.lib.php:118 server_status.php:738
 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138
+<<<<<<< HEAD
 #: tbl_structure.php:727
+=======
+#: tbl_structure.php:729
+>>>>>>> origin/master
 msgid "Value"
 msgstr "値"
 
@@ -3663,11 +3861,16 @@ msgstr ""
 msgid "Add slave replication user"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:257 server_privileges.php:717
+=======
+#: libraries/replication_gui.lib.php:257 server_privileges.php:716
+>>>>>>> origin/master
 msgid "Any user"
 msgstr "すべてのユーザ"
 
 #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:349 server_privileges.php:718
 #: server_privileges.php:785 server_privileges.php:809
 #: server_privileges.php:1950 server_privileges.php:1980
@@ -3691,6 +3894,31 @@ msgid "Use Host Table"
 msgstr "ホストテーブルを使う"
 
 #: libraries/replication_gui.lib.php:334 server_privileges.php:793
+=======
+#: libraries/replication_gui.lib.php:349 server_privileges.php:717
+#: server_privileges.php:784 server_privileges.php:808
+#: server_privileges.php:1928 server_privileges.php:1958
+msgid "Use text field"
+msgstr "テキストフィールドの値を利用する"
+
+#: libraries/replication_gui.lib.php:305 server_privileges.php:764
+msgid "Any host"
+msgstr "すべてのホスト"
+
+#: libraries/replication_gui.lib.php:309 server_privileges.php:768
+msgid "Local"
+msgstr "ローカル"
+
+#: libraries/replication_gui.lib.php:315 server_privileges.php:773
+msgid "This Host"
+msgstr "このホスト"
+
+#: libraries/replication_gui.lib.php:321 server_privileges.php:779
+msgid "Use Host Table"
+msgstr "ホストテーブルを使う"
+
+#: libraries/replication_gui.lib.php:334 server_privileges.php:792
+>>>>>>> origin/master
 msgid ""
 "When Host table is used, this field is ignored and values stored in Host "
 "table are used instead."
@@ -7831,10 +8059,13 @@ msgstr ""
 msgid "Show insert query"
 msgstr ""
 
+<<<<<<< HEAD
 #: tbl_change.php:1140
 msgid "and then"
 msgstr "続いて"
 
+=======
+>>>>>>> origin/master
 #: tbl_change.php:1144
 msgid "Go back to previous page"
 msgstr "前のページに戻る"
@@ -8031,6 +8262,7 @@ msgstr "参照整合性の確認:"
 msgid "Show tables"
 msgstr "テーブルを表示する"
 
+<<<<<<< HEAD
 #: tbl_printview.php:309 tbl_structure.php:654
 msgid "Space usage"
 msgstr "ディスク使用量"
@@ -8064,6 +8296,41 @@ msgid "Row length"
 msgstr "行の長さ"
 
 #: tbl_printview.php:413 tbl_structure.php:791
+=======
+#: tbl_printview.php:309 tbl_structure.php:656
+msgid "Space usage"
+msgstr "ディスク使用量"
+
+#: tbl_printview.php:313 tbl_structure.php:660
+msgid "Usage"
+msgstr "使用量"
+
+#: tbl_printview.php:340 tbl_structure.php:687
+msgid "Effective"
+msgstr "有効"
+
+#: tbl_printview.php:365 tbl_structure.php:725
+msgid "Row Statistics"
+msgstr "行の統計"
+
+#: tbl_printview.php:368 tbl_structure.php:728
+msgid "Statements"
+msgstr "ステートメント"
+
+#: tbl_printview.php:379 tbl_structure.php:740
+msgid "static"
+msgstr ""
+
+#: tbl_printview.php:381 tbl_structure.php:742
+msgid "dynamic"
+msgstr "動的"
+
+#: tbl_printview.php:403 tbl_structure.php:785
+msgid "Row length"
+msgstr "行の長さ"
+
+#: tbl_printview.php:413 tbl_structure.php:793
+>>>>>>> origin/master
 msgid " Row size "
 msgstr " 行のサイズ "
 
diff --git a/po/ka.po b/po/ka.po
index 171d0d6f9..e39ada48e 100755
--- a/po/ka.po
+++ b/po/ka.po
@@ -3,7 +3,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2010-07-03 21:45+0530\n"
+=======
+"POT-Creation-Date: 2010-07-03 09:00-0400\n"
+>>>>>>> origin/master
 "PO-Revision-Date: 2010-03-12 09:14+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: georgian <ka@li.org>\n"
@@ -48,15 +52,26 @@ msgstr "ძებნა"
 #: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046
 #: libraries/Theme_Manager.class.php:311
 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719
+<<<<<<< HEAD
 #: libraries/common.lib.php:1344 libraries/common.lib.php:2301
 #: libraries/display_change_password.lib.php:82
 #: libraries/display_create_table.lib.php:62
+=======
+#: libraries/common.lib.php:1335 libraries/common.lib.php:2288
+#: libraries/display_change_password.lib.php:82
+#: libraries/display_create_table.lib.php:63
+>>>>>>> origin/master
 #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532
 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76
 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104
+<<<<<<< HEAD
 #: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480
 #: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782
+=======
+#: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477
+#: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782
+>>>>>>> origin/master
 #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328
 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142
 #: server_privileges.php:665 server_privileges.php:1641
@@ -66,8 +81,13 @@ msgstr "ძებნა"
 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171
 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265
 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561
+<<<<<<< HEAD
 #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560
 #: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512
+=======
+#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562
+#: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512
+>>>>>>> origin/master
 #: view_create.php:182 view_operations.php:101
 msgid "Go"
 msgstr "გადასვლა"
@@ -120,10 +140,17 @@ msgstr "სვეტების სახელები"
 #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245
 #: libraries/export/latex.php:360 libraries/export/odt.php:297
 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100
+<<<<<<< HEAD
 #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093
 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
 #: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321
+=======
+#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070
+#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
+#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
+#: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321
+>>>>>>> origin/master
 msgid "Type"
 msgstr "ტიპი"
 
@@ -164,9 +191,15 @@ msgstr "კომენტარები"
 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322
 #: libraries/export/latex.php:430 libraries/export/odt.php:368
 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263
+<<<<<<< HEAD
 #: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596
 #: server_privileges.php:1911 server_privileges.php:1916
 #: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228
+=======
+#: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579
+#: server_privileges.php:1889 server_privileges.php:1894
+#: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228
+>>>>>>> origin/master
 #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342
 msgid "No"
 msgstr "არა"
@@ -180,9 +213,15 @@ msgstr "არა"
 #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106
 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262
 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344
+<<<<<<< HEAD
 #: server_databases.php:64 server_privileges.php:1582
 #: server_privileges.php:1596 server_privileges.php:1911
 #: server_privileges.php:1914 server_privileges.php:2210 sql.php:193
+=======
+#: server_databases.php:64 server_privileges.php:1565
+#: server_privileges.php:1579 server_privileges.php:1889
+#: server_privileges.php:1892 server_privileges.php:2187 sql.php:193
+>>>>>>> origin/master
 #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350
 #: tbl_tracking.php:335 tbl_tracking.php:340
 msgid "Yes"
@@ -231,7 +270,15 @@ msgstr "Rename database to"
 msgid "Command"
 msgstr "ბრძანება"
 
+<<<<<<< HEAD
 #: db_operations.php:466
+=======
+#: db_operations.php:429 tbl_change.php:1140
+msgid "and then"
+msgstr "და შემდეგ"
+
+#: db_operations.php:455
+>>>>>>> origin/master
 msgid "Copy database to"
 msgstr "Copy database to"
 
@@ -319,7 +366,11 @@ msgstr "ჩართვა"
 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730
 #: server_collations.php:54 server_collations.php:66 server_databases.php:111
 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179
+<<<<<<< HEAD
 #: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326
+=======
+#: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326
+>>>>>>> origin/master
 msgid "Collation"
 msgstr "კოლაცია"
 
@@ -348,7 +399,11 @@ msgstr "ცხრილი"
 #: db_printview.php:105 libraries/db_structure.lib.php:56
 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146
 #: navigation.php:638 navigation.php:660 server_databases.php:122
+<<<<<<< HEAD
 #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775
+=======
+#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777
+>>>>>>> origin/master
 msgid "Rows"
 msgstr "სტრიქონები"
 
@@ -363,19 +418,31 @@ msgstr "in use"
 
 #: db_printview.php:187 libraries/db_info.inc.php:88
 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433
+<<<<<<< HEAD
 #: tbl_structure.php:807
+=======
+#: tbl_structure.php:809
+>>>>>>> origin/master
 msgid "Creation"
 msgstr "შეიქმნა"
 
 #: db_printview.php:196 libraries/db_info.inc.php:93
 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443
+<<<<<<< HEAD
 #: tbl_structure.php:815
+=======
+#: tbl_structure.php:817
+>>>>>>> origin/master
 msgid "Last update"
 msgstr "უკანასკნელი განახლება"
 
 #: db_printview.php:205 libraries/db_info.inc.php:98
 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453
+<<<<<<< HEAD
 #: tbl_structure.php:823
+=======
+#: tbl_structure.php:825
+>>>>>>> origin/master
 msgid "Last check"
 msgstr "Last check"
 
@@ -440,7 +507,11 @@ msgstr "Del"
 
 #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553
 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779
+<<<<<<< HEAD
 #: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250
+=======
+#: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250
+>>>>>>> origin/master
 #: tbl_select.php:286
 msgid "Or"
 msgstr "ან"
@@ -660,9 +731,15 @@ msgstr "With selected:"
 msgid "Check All"
 msgstr "ყველას შემოწმება"
 
+<<<<<<< HEAD
 #: db_structure.php:529 libraries/display_tbl.lib.php:2077
 #: libraries/replication_gui.lib.php:36 server_databases.php:350
 #: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460
+=======
+#: db_structure.php:531 libraries/display_tbl.lib.php:2077
+#: libraries/replication_gui.lib.php:36 server_databases.php:350
+#: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462
+>>>>>>> origin/master
 msgid "Uncheck All"
 msgstr "მონიშნვის მოხსნა ყველასთვის"
 
@@ -1131,10 +1208,17 @@ msgid "Prev"
 msgstr "წინა"
 
 #. l10n: Display text for next month link in calendar
+<<<<<<< HEAD
 #: js/messages.php:106 libraries/common.lib.php:2366
 #: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338
 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
 #: tbl_structure.php:799
+=======
+#: js/messages.php:77 libraries/common.lib.php:2353
+#: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338
+#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
+#: tbl_structure.php:801
+>>>>>>> origin/master
 msgid "Next"
 msgstr "შემდეგი"
 
@@ -1685,7 +1769,11 @@ msgstr "პაროლი:"
 msgid "Server Choice"
 msgstr "სერვერის არჩევა"
 
+<<<<<<< HEAD
 #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63
+=======
+#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59
+>>>>>>> origin/master
 msgid "Cookies must be enabled past this point."
 msgstr "Cookies must be enabled past this point."
 
@@ -1765,7 +1853,11 @@ msgstr ""
 "Couldn't use the iconv, libiconv, or recode_string functions, although the "
 "necessary extensions appear to be loaded. Check your PHP configuration."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:580
+=======
+#: libraries/common.inc.php:576
+>>>>>>> origin/master
 msgid ""
 "phpMyAdmin was unable to read your configuration file!<br />This might "
 "happen if PHP finds a parse error in it or PHP cannot find the file.<br /"
@@ -1781,13 +1873,21 @@ msgstr ""
 "semicolon is missing somewhere.<br />If you receive a blank page, everything "
 "is fine."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:591
+=======
+#: libraries/common.inc.php:587
+>>>>>>> origin/master
 #, fuzzy, php-format
 #| msgid "Could not load default configuration from: \"%1$s\""
 msgid "Could not load default configuration from: %1$s"
 msgstr "Could not load default configuration from: \"%1$s\""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:596
+=======
+#: libraries/common.inc.php:592
+>>>>>>> origin/master
 msgid ""
 "The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
 "configuration file!"
@@ -1795,28 +1895,48 @@ msgstr ""
 "The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
 "configuration file!"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:626
+=======
+#: libraries/common.inc.php:622
+>>>>>>> origin/master
 #, fuzzy, php-format
 #| msgid "Invalid server index: \"%s\""
 msgid "Invalid server index: %s"
 msgstr "Invalid server index: \"%s\""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:633
+=======
+#: libraries/common.inc.php:629
+>>>>>>> origin/master
 #, php-format
 msgid "Invalid hostname for server %1$s. Please review your configuration."
 msgstr "Invalid hostname for server %1$s. Please review your configuration."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:642 libraries/header.inc.php:100
+=======
+#: libraries/common.inc.php:638 libraries/header.inc.php:96
+>>>>>>> origin/master
 #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47
 #: main.php:185 test/theme.php:57
 msgid "Server"
 msgstr "სერვერი"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:820
 msgid "Invalid authentication method set in configuration:"
 msgstr "Invalid authentication method set in configuration:"
 
 #: libraries/common.inc.php:923
+=======
+#: libraries/common.inc.php:816
+msgid "Invalid authentication method set in configuration:"
+msgstr "Invalid authentication method set in configuration:"
+
+#: libraries/common.inc.php:919
+>>>>>>> origin/master
 #, php-format
 msgid "You should upgrade to %s %s or later."
 msgstr "You should upgrade to %s %s or later."
@@ -2066,7 +2186,11 @@ msgstr ""
 "html#faq3_11@Documentation]FAQ 3.11[/a]"
 
 #: libraries/db_structure.lib.php:69 server_databases.php:142
+<<<<<<< HEAD
 #: tbl_printview.php:335 tbl_structure.php:680
+=======
+#: tbl_printview.php:335 tbl_structure.php:682
+>>>>>>> origin/master
 msgid "Overhead"
 msgstr "Overhead"
 
@@ -2093,22 +2217,36 @@ msgid "Change password"
 msgstr "პაროლის შეცვლა"
 
 #: libraries/display_change_password.lib.php:35
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:348 server_privileges.php:808
+=======
+#: libraries/replication_gui.lib.php:348 server_privileges.php:807
+>>>>>>> origin/master
 msgid "No Password"
 msgstr "პაროლი არაა"
 
 #: libraries/display_change_password.lib.php:41
 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63
 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:352 server_privileges.php:797
 #: server_privileges.php:801 server_privileges.php:812
 #: server_privileges.php:1555 server_synchronize.php:1175
+=======
+#: libraries/replication_gui.lib.php:352 server_privileges.php:796
+#: server_privileges.php:800 server_privileges.php:811
+#: server_privileges.php:1538 server_synchronize.php:1175
+>>>>>>> origin/master
 msgid "Password"
 msgstr "პაროლი"
 
 #: libraries/display_change_password.lib.php:46
 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359
+<<<<<<< HEAD
 #: server_privileges.php:816 server_privileges.php:819
+=======
+#: server_privileges.php:815 server_privileges.php:818
+>>>>>>> origin/master
 msgid "Re-type"
 msgstr "Re-type"
 
@@ -2123,12 +2261,20 @@ msgid "MySQL 4.0 compatible"
 msgstr "MySQL&nbsp;4.0-თან თავსებადი"
 
 #: libraries/display_change_password.lib.php:72
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:363 server_privileges.php:823
+=======
+#: libraries/replication_gui.lib.php:363 server_privileges.php:822
+>>>>>>> origin/master
 msgid "Generate Password"
 msgstr "პაროლის დაგენერირება"
 
 #: libraries/display_change_password.lib.php:75
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:366 server_privileges.php:826
+=======
+#: libraries/replication_gui.lib.php:366 server_privileges.php:825
+>>>>>>> origin/master
 msgid "Generate"
 msgstr "დაგენერირება"
 
@@ -2216,7 +2362,11 @@ msgid "remember template"
 msgstr "remember template"
 
 #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552
+=======
+#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549
+>>>>>>> origin/master
 msgid "Character set of the file:"
 msgstr "სიმბოლოთა ნაკრები ფაილისთვის:"
 
@@ -2269,7 +2419,11 @@ msgstr ""
 msgid "File to import"
 msgstr "შემოსატანი ფაილი"
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527
+=======
+#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524
+>>>>>>> origin/master
 msgid "Location of the text file"
 msgstr "Location of the text file"
 
@@ -2277,12 +2431,20 @@ msgstr "Location of the text file"
 msgid "File uploads are not allowed on this server."
 msgstr "File uploads are not allowed on this server."
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536
+=======
+#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533
+>>>>>>> origin/master
 #: tbl_change.php:1025
 msgid "The directory you set for upload work cannot be reached"
 msgstr "The directory you set for upload work cannot be reached"
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539
+=======
+#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536
+>>>>>>> origin/master
 #: tbl_change.php:1028
 msgid "web server upload directory"
 msgstr "web server upload directory"
@@ -2417,7 +2579,11 @@ msgstr "Sort by key"
 #: libraries/import/docsql.php:34 libraries/import/ldi.php:47
 #: libraries/import/ods.php:30 libraries/import/sql.php:20
 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26
+<<<<<<< HEAD
 #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751
+=======
+#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753
+>>>>>>> origin/master
 msgid "Options"
 msgstr "პარამეტრები"
 
@@ -2565,7 +2731,11 @@ msgstr "Buffer Pool Usage"
 
 #: libraries/engines/innodb.lib.php:194 server_databases.php:137
 #: server_databases.php:305 server_status.php:525 server_status.php:586
+<<<<<<< HEAD
 #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694
+=======
+#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696
+>>>>>>> origin/master
 msgid "Total"
 msgstr "სულ"
 
@@ -2850,7 +3020,11 @@ msgstr ""
 "number."
 
 #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88
+<<<<<<< HEAD
 #: tbl_printview.php:375 tbl_structure.php:735
+=======
+#: tbl_printview.php:375 tbl_structure.php:737
+>>>>>>> origin/master
 msgid "Format"
 msgstr "ფორმატი"
 
@@ -2922,8 +3096,13 @@ msgstr "Microsoft Word 2000"
 #: libraries/export/latex.php:201 libraries/export/odt.php:48
 #: libraries/export/sql.php:106 libraries/export/sql.php:868
 #: libraries/export/texytext.php:27 server_databases.php:127
+<<<<<<< HEAD
 #: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316
 #: tbl_structure.php:663
+=======
+#: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316
+#: tbl_structure.php:665
+>>>>>>> origin/master
 msgid "Data"
 msgstr "მონაცემები"
 
@@ -2972,9 +3151,15 @@ msgstr "MIME-ის ტიპი"
 #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57
 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177
 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:332 server_privileges.php:732
 #: server_privileges.php:735 server_privileges.php:791
 #: server_privileges.php:1554 server_privileges.php:2092
+=======
+#: libraries/replication_gui.lib.php:332 server_privileges.php:731
+#: server_privileges.php:734 server_privileges.php:790
+#: server_privileges.php:1537 server_privileges.php:2069
+>>>>>>> origin/master
 #: server_processlist.php:55 server_synchronize.php:1159
 msgid "Host"
 msgstr "ჰოსტი"
@@ -3650,8 +3835,13 @@ msgstr ""
 
 #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59
 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:262 server_privileges.php:712
 #: server_privileges.php:715 server_privileges.php:722
+=======
+#: libraries/replication_gui.lib.php:262 server_privileges.php:711
+#: server_privileges.php:714 server_privileges.php:721
+>>>>>>> origin/master
 #: server_synchronize.php:1171
 msgid "User name"
 msgstr "მომხმარებლის სახელი"
@@ -3671,14 +3861,22 @@ msgstr "Show slave status"
 msgid "Slave status"
 msgstr "Show slave status"
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448
+=======
+#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445
+>>>>>>> origin/master
 #: server_status.php:737 server_variables.php:52
 msgid "Variable"
 msgstr "ცვლადი"
 
 #: libraries/replication_gui.lib.php:118 server_status.php:738
 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138
+<<<<<<< HEAD
 #: tbl_structure.php:727
+=======
+#: tbl_structure.php:729
+>>>>>>> origin/master
 msgid "Value"
 msgstr "მნიშვნელობა"
 
@@ -3696,11 +3894,16 @@ msgstr ""
 msgid "Add slave replication user"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:257 server_privileges.php:717
+=======
+#: libraries/replication_gui.lib.php:257 server_privileges.php:716
+>>>>>>> origin/master
 msgid "Any user"
 msgstr "ნებისმიერი მომხმარებელი"
 
 #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:349 server_privileges.php:718
 #: server_privileges.php:785 server_privileges.php:809
 #: server_privileges.php:1950 server_privileges.php:1980
@@ -3724,6 +3927,31 @@ msgid "Use Host Table"
 msgstr "Use Host Table"
 
 #: libraries/replication_gui.lib.php:334 server_privileges.php:793
+=======
+#: libraries/replication_gui.lib.php:349 server_privileges.php:717
+#: server_privileges.php:784 server_privileges.php:808
+#: server_privileges.php:1928 server_privileges.php:1958
+msgid "Use text field"
+msgstr "გამოიყენე ტექსტური ველი"
+
+#: libraries/replication_gui.lib.php:305 server_privileges.php:764
+msgid "Any host"
+msgstr "ნებისმიერი ჰოსტი"
+
+#: libraries/replication_gui.lib.php:309 server_privileges.php:768
+msgid "Local"
+msgstr "ლოკალური"
+
+#: libraries/replication_gui.lib.php:315 server_privileges.php:773
+msgid "This Host"
+msgstr "ეს ჰოსტი"
+
+#: libraries/replication_gui.lib.php:321 server_privileges.php:779
+msgid "Use Host Table"
+msgstr "Use Host Table"
+
+#: libraries/replication_gui.lib.php:334 server_privileges.php:792
+>>>>>>> origin/master
 msgid ""
 "When Host table is used, this field is ignored and values stored in Host "
 "table are used instead."
@@ -8109,10 +8337,13 @@ msgstr ""
 msgid "Show insert query"
 msgstr "Showing SQL query"
 
+<<<<<<< HEAD
 #: tbl_change.php:1140
 msgid "and then"
 msgstr "და შემდეგ"
 
+=======
+>>>>>>> origin/master
 #: tbl_change.php:1144
 msgid "Go back to previous page"
 msgstr "წინა გვერდზე დაბრუნება"
@@ -8307,6 +8538,7 @@ msgstr "Check referential integrity:"
 msgid "Show tables"
 msgstr "ცხრილების ჩვენება"
 
+<<<<<<< HEAD
 #: tbl_printview.php:309 tbl_structure.php:654
 msgid "Space usage"
 msgstr "ადგილის გამოყენება"
@@ -8340,6 +8572,41 @@ msgid "Row length"
 msgstr "სტრიქონის სიგრძე"
 
 #: tbl_printview.php:413 tbl_structure.php:791
+=======
+#: tbl_printview.php:309 tbl_structure.php:656
+msgid "Space usage"
+msgstr "ადგილის გამოყენება"
+
+#: tbl_printview.php:313 tbl_structure.php:660
+msgid "Usage"
+msgstr "გამოყენება"
+
+#: tbl_printview.php:340 tbl_structure.php:687
+msgid "Effective"
+msgstr "ეფექტური"
+
+#: tbl_printview.php:365 tbl_structure.php:725
+msgid "Row Statistics"
+msgstr "Row Statistics"
+
+#: tbl_printview.php:368 tbl_structure.php:728
+msgid "Statements"
+msgstr "Statements"
+
+#: tbl_printview.php:379 tbl_structure.php:740
+msgid "static"
+msgstr "სტატიკური"
+
+#: tbl_printview.php:381 tbl_structure.php:742
+msgid "dynamic"
+msgstr "დინამიური"
+
+#: tbl_printview.php:403 tbl_structure.php:785
+msgid "Row length"
+msgstr "სტრიქონის სიგრძე"
+
+#: tbl_printview.php:413 tbl_structure.php:793
+>>>>>>> origin/master
 msgid " Row size "
 msgstr " სტრიქონის ზომა "
 
diff --git a/po/ko.po b/po/ko.po
index 2bc8dbe59..ec6ae7878 100755
--- a/po/ko.po
+++ b/po/ko.po
@@ -3,7 +3,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2010-07-03 21:45+0530\n"
+=======
+"POT-Creation-Date: 2010-07-03 09:00-0400\n"
+>>>>>>> origin/master
 "PO-Revision-Date: 2010-06-16 18:18+0200\n"
 "Last-Translator:  <cihar@nvyu.net>\n"
 "Language-Team: korean <ko@li.org>\n"
@@ -48,15 +52,26 @@ msgstr "검색"
 #: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046
 #: libraries/Theme_Manager.class.php:311
 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719
+<<<<<<< HEAD
 #: libraries/common.lib.php:1344 libraries/common.lib.php:2301
 #: libraries/display_change_password.lib.php:82
 #: libraries/display_create_table.lib.php:62
+=======
+#: libraries/common.lib.php:1335 libraries/common.lib.php:2288
+#: libraries/display_change_password.lib.php:82
+#: libraries/display_create_table.lib.php:63
+>>>>>>> origin/master
 #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532
 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76
 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104
+<<<<<<< HEAD
 #: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480
 #: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782
+=======
+#: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477
+#: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782
+>>>>>>> origin/master
 #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328
 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142
 #: server_privileges.php:665 server_privileges.php:1641
@@ -66,8 +81,13 @@ msgstr "검색"
 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171
 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265
 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561
+<<<<<<< HEAD
 #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560
 #: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512
+=======
+#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562
+#: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512
+>>>>>>> origin/master
 #: view_create.php:182 view_operations.php:101
 msgid "Go"
 msgstr "실행"
@@ -118,10 +138,17 @@ msgstr "컬럼명"
 #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245
 #: libraries/export/latex.php:360 libraries/export/odt.php:297
 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100
+<<<<<<< HEAD
 #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093
 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
 #: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321
+=======
+#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070
+#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
+#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
+#: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321
+>>>>>>> origin/master
 msgid "Type"
 msgstr "종류"
 
@@ -162,9 +189,15 @@ msgstr "설명(코멘트)"
 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322
 #: libraries/export/latex.php:430 libraries/export/odt.php:368
 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263
+<<<<<<< HEAD
 #: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596
 #: server_privileges.php:1911 server_privileges.php:1916
 #: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228
+=======
+#: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579
+#: server_privileges.php:1889 server_privileges.php:1894
+#: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228
+>>>>>>> origin/master
 #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342
 msgid "No"
 msgstr " 아니오 "
@@ -178,9 +211,15 @@ msgstr " 아니오 "
 #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106
 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262
 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344
+<<<<<<< HEAD
 #: server_databases.php:64 server_privileges.php:1582
 #: server_privileges.php:1596 server_privileges.php:1911
 #: server_privileges.php:1914 server_privileges.php:2210 sql.php:193
+=======
+#: server_databases.php:64 server_privileges.php:1565
+#: server_privileges.php:1579 server_privileges.php:1889
+#: server_privileges.php:1892 server_privileges.php:2187 sql.php:193
+>>>>>>> origin/master
 #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350
 #: tbl_tracking.php:335 tbl_tracking.php:340
 msgid "Yes"
@@ -229,7 +268,15 @@ msgstr "데이터베이스 이름 변경"
 msgid "Command"
 msgstr "커맨드"
 
+<<<<<<< HEAD
 #: db_operations.php:466
+=======
+#: db_operations.php:429 tbl_change.php:1140
+msgid "and then"
+msgstr "이어서"
+
+#: db_operations.php:455
+>>>>>>> origin/master
 msgid "Copy database to"
 msgstr "데이터베이스 복사"
 
@@ -279,7 +326,11 @@ msgstr "BLOB 저장소"
 msgid "Status"
 msgstr "상태"
 
+<<<<<<< HEAD
 #: db_operations.php:559
+=======
+#: db_operations.php:548
+>>>>>>> origin/master
 msgctxt "BLOB repository"
 msgid "Enabled"
 msgstr "유효"
@@ -297,7 +348,11 @@ msgctxt "BLOB repository"
 msgid "Repair"
 msgstr "복구"
 
+<<<<<<< HEAD
 #: db_operations.php:585
+=======
+#: db_operations.php:574
+>>>>>>> origin/master
 msgctxt "BLOB repository"
 msgid "Disabled"
 msgstr "무효"
@@ -311,7 +366,11 @@ msgstr "유효"
 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730
 #: server_collations.php:54 server_collations.php:66 server_databases.php:111
 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179
+<<<<<<< HEAD
 #: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326
+=======
+#: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326
+>>>>>>> origin/master
 msgid "Collation"
 msgstr "데이터정렬방식"
 
@@ -340,7 +399,11 @@ msgstr "테이블 "
 #: db_printview.php:105 libraries/db_structure.lib.php:56
 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146
 #: navigation.php:638 navigation.php:660 server_databases.php:122
+<<<<<<< HEAD
 #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775
+=======
+#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777
+>>>>>>> origin/master
 msgid "Rows"
 msgstr "행(레코드)"
 
@@ -355,19 +418,31 @@ msgstr "사용중"
 
 #: db_printview.php:187 libraries/db_info.inc.php:88
 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433
+<<<<<<< HEAD
 #: tbl_structure.php:807
+=======
+#: tbl_structure.php:809
+>>>>>>> origin/master
 msgid "Creation"
 msgstr "생성"
 
 #: db_printview.php:196 libraries/db_info.inc.php:93
 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443
+<<<<<<< HEAD
 #: tbl_structure.php:815
+=======
+#: tbl_structure.php:817
+>>>>>>> origin/master
 msgid "Last update"
 msgstr "업데이트"
 
 #: db_printview.php:205 libraries/db_info.inc.php:98
 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453
+<<<<<<< HEAD
 #: tbl_structure.php:823
+=======
+#: tbl_structure.php:825
+>>>>>>> origin/master
 msgid "Last check"
 msgstr "검사"
 
@@ -430,7 +505,11 @@ msgstr "삭제"
 
 #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553
 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779
+<<<<<<< HEAD
 #: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250
+=======
+#: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250
+>>>>>>> origin/master
 #: tbl_select.php:286
 msgid "Or"
 msgstr "또는"
@@ -538,7 +617,11 @@ msgstr "단어는 스페이스(\" \")로 구분됩니다."
 msgid "Inside table(s):"
 msgstr "찾을 테이블:"
 
+<<<<<<< HEAD
 #: db_search.php:367
+=======
+#: db_search.php:355
+>>>>>>> origin/master
 msgid "Inside column:"
 msgstr "검색할 컬럼:"
 
@@ -642,9 +725,15 @@ msgstr "선택한 것을:"
 msgid "Check All"
 msgstr "모두 체크"
 
+<<<<<<< HEAD
 #: db_structure.php:529 libraries/display_tbl.lib.php:2077
 #: libraries/replication_gui.lib.php:36 server_databases.php:350
 #: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460
+=======
+#: db_structure.php:531 libraries/display_tbl.lib.php:2077
+#: libraries/replication_gui.lib.php:36 server_databases.php:350
+#: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462
+>>>>>>> origin/master
 msgid "Uncheck All"
 msgstr "모두 체크안함"
 
@@ -1088,29 +1177,52 @@ msgid "Choose column to display"
 msgstr "출력할 필드 선택"
 
 #. l10n: Display text for calendar close link
+<<<<<<< HEAD
 #: js/messages.php:102
+=======
+#: js/messages.php:73
+>>>>>>> origin/master
 msgid "Done"
 msgstr "완료"
 
 #. l10n: Display text for previous month link in calendar
+<<<<<<< HEAD
 #: js/messages.php:104
+=======
+#: js/messages.php:75
+>>>>>>> origin/master
 msgid "Prev"
 msgstr "이전"
 
 #. l10n: Display text for next month link in calendar
+<<<<<<< HEAD
 #: js/messages.php:106 libraries/common.lib.php:2366
 #: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338
 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
 #: tbl_structure.php:799
+=======
+#: js/messages.php:77 libraries/common.lib.php:2353
+#: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338
+#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
+#: tbl_structure.php:801
+>>>>>>> origin/master
 msgid "Next"
 msgstr "다음"
 
 #. l10n: Display text for current month link in calendar
+<<<<<<< HEAD
 #: js/messages.php:108
 msgid "Today"
 msgstr "오늘"
 
 #: js/messages.php:111
+=======
+#: js/messages.php:79
+msgid "Today"
+msgstr "오늘"
+
+#: js/messages.php:82
+>>>>>>> origin/master
 msgid "January"
 msgstr "1월"
 
@@ -1118,11 +1230,19 @@ msgstr "1월"
 msgid "February"
 msgstr "2월"
 
+<<<<<<< HEAD
 #: js/messages.php:113
 msgid "March"
 msgstr "3월"
 
 #: js/messages.php:114
+=======
+#: js/messages.php:84
+msgid "March"
+msgstr "3월"
+
+#: js/messages.php:85
+>>>>>>> origin/master
 msgid "April"
 msgstr "4월"
 
@@ -1130,6 +1250,7 @@ msgstr "4월"
 msgid "May"
 msgstr "5월"
 
+<<<<<<< HEAD
 #: js/messages.php:116
 msgid "June"
 msgstr "6월"
@@ -1139,6 +1260,17 @@ msgid "July"
 msgstr "7월"
 
 #: js/messages.php:118
+=======
+#: js/messages.php:87
+msgid "June"
+msgstr "6월"
+
+#: js/messages.php:88
+msgid "July"
+msgstr "7월"
+
+#: js/messages.php:89
+>>>>>>> origin/master
 msgid "August"
 msgstr "8월"
 
@@ -1146,7 +1278,11 @@ msgstr "8월"
 msgid "September"
 msgstr "9월"
 
+<<<<<<< HEAD
 #: js/messages.php:120
+=======
+#: js/messages.php:91
+>>>>>>> origin/master
 msgid "October"
 msgstr "10월"
 
@@ -1179,7 +1315,11 @@ msgid "Apr"
 msgstr "4월"
 
 #. l10n: Short month name
+<<<<<<< HEAD
 #: js/messages.php:134 libraries/common.lib.php:1574
+=======
+#: js/messages.php:105 libraries/common.lib.php:1565
+>>>>>>> origin/master
 msgctxt "Short month name"
 msgid "May"
 msgstr "5월"
@@ -1219,6 +1359,7 @@ msgstr "11월"
 msgid "Dec"
 msgstr "12월"
 
+<<<<<<< HEAD
 #: js/messages.php:151
 msgid "Sunday"
 msgstr "일요일"
@@ -1228,6 +1369,17 @@ msgid "Monday"
 msgstr "월요일"
 
 #: js/messages.php:153
+=======
+#: js/messages.php:122
+msgid "Sunday"
+msgstr "일요일"
+
+#: js/messages.php:123
+msgid "Monday"
+msgstr "월요일"
+
+#: js/messages.php:124
+>>>>>>> origin/master
 msgid "Tuesday"
 msgstr "화요일"
 
@@ -1239,7 +1391,11 @@ msgstr "수요일"
 msgid "Thursday"
 msgstr "목요일"
 
+<<<<<<< HEAD
 #: js/messages.php:156
+=======
+#: js/messages.php:127
+>>>>>>> origin/master
 msgid "Friday"
 msgstr "금요일"
 
@@ -1283,37 +1439,65 @@ msgid "Sat"
 msgstr "토"
 
 #. l10n: Minimal week day name
+<<<<<<< HEAD
 #: js/messages.php:177
+=======
+#: js/messages.php:148
+>>>>>>> origin/master
 msgid "Su"
 msgstr "일"
 
 #. l10n: Minimal week day name
+<<<<<<< HEAD
 #: js/messages.php:179
+=======
+#: js/messages.php:150
+>>>>>>> origin/master
 msgid "Mo"
 msgstr "월"
 
 #. l10n: Minimal week day name
+<<<<<<< HEAD
 #: js/messages.php:181
+=======
+#: js/messages.php:152
+>>>>>>> origin/master
 msgid "Tu"
 msgstr "화"
 
 #. l10n: Minimal week day name
+<<<<<<< HEAD
 #: js/messages.php:183
+=======
+#: js/messages.php:154
+>>>>>>> origin/master
 msgid "We"
 msgstr "수"
 
 #. l10n: Minimal week day name
+<<<<<<< HEAD
 #: js/messages.php:185
+=======
+#: js/messages.php:156
+>>>>>>> origin/master
 msgid "Th"
 msgstr "목"
 
 #. l10n: Minimal week day name
+<<<<<<< HEAD
 #: js/messages.php:187
+=======
+#: js/messages.php:158
+>>>>>>> origin/master
 msgid "Fr"
 msgstr "금"
 
 #. l10n: Minimal week day name
+<<<<<<< HEAD
 #: js/messages.php:189
+=======
+#: js/messages.php:160
+>>>>>>> origin/master
 msgid "Sa"
 msgstr "토"
 
@@ -1326,11 +1510,19 @@ msgstr "주"
 msgid "Hour"
 msgstr "시"
 
+<<<<<<< HEAD
 #: js/messages.php:194
 msgid "Minute"
 msgstr "분"
 
 #: js/messages.php:195
+=======
+#: js/messages.php:165
+msgid "Minute"
+msgstr "분"
+
+#: js/messages.php:166
+>>>>>>> origin/master
 msgid "Second"
 msgstr "초"
 
@@ -1596,7 +1788,11 @@ msgstr "암호:"
 msgid "Server Choice"
 msgstr "서버 선택"
 
+<<<<<<< HEAD
 #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63
+=======
+#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59
+>>>>>>> origin/master
 msgid "Cookies must be enabled past this point."
 msgstr "이 페이지를 넘기려면 쿠키 사용을 허용해야 합니다."
 
@@ -1674,7 +1870,11 @@ msgstr ""
 "필요한 확장기능이 로드된 것 같지만 iconv, libiconv, 혹은 recode_string 함수"
 "를 사용할 수 없습니다. PHP 설정을 확인해주십시오."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:580
+=======
+#: libraries/common.inc.php:576
+>>>>>>> origin/master
 msgid ""
 "phpMyAdmin was unable to read your configuration file!<br />This might "
 "happen if PHP finds a parse error in it or PHP cannot find the file.<br /"
@@ -1689,38 +1889,66 @@ msgstr ""
 "미콜론(;)이 빠져있는 경우가 종종 있습니다.<br />만약 아무것도 보이지 않으면, "
 "정상적인 것입니다."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:591
+=======
+#: libraries/common.inc.php:587
+>>>>>>> origin/master
 #, php-format
 msgid "Could not load default configuration from: %1$s"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:596
+=======
+#: libraries/common.inc.php:592
+>>>>>>> origin/master
 msgid ""
 "The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
 "configuration file!"
 msgstr "환경설정 파일에서 <tt>$cfg['PmaAbsoluteUri']</tt> 주소를 기입하십시오!"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:626
+=======
+#: libraries/common.inc.php:622
+>>>>>>> origin/master
 #, php-format
 msgid "Invalid server index: %s"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:633
+=======
+#: libraries/common.inc.php:629
+>>>>>>> origin/master
 #, php-format
 msgid "Invalid hostname for server %1$s. Please review your configuration."
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:642 libraries/header.inc.php:100
+=======
+#: libraries/common.inc.php:638 libraries/header.inc.php:96
+>>>>>>> origin/master
 #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47
 #: main.php:185 test/theme.php:57
 msgid "Server"
 msgstr "서버"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:820
 msgid "Invalid authentication method set in configuration:"
 msgstr ""
 
 #: libraries/common.inc.php:923
+=======
+#: libraries/common.inc.php:816
+msgid "Invalid authentication method set in configuration:"
+msgstr ""
+
+#: libraries/common.inc.php:919
+>>>>>>> origin/master
 #, php-format
 msgid "You should upgrade to %s %s or later."
 msgstr ""
@@ -1966,7 +2194,11 @@ msgid ""
 msgstr ""
 
 #: libraries/db_structure.lib.php:69 server_databases.php:142
+<<<<<<< HEAD
 #: tbl_printview.php:335 tbl_structure.php:680
+=======
+#: tbl_printview.php:335 tbl_structure.php:682
+>>>>>>> origin/master
 msgid "Overhead"
 msgstr "부담"
 
@@ -1993,22 +2225,36 @@ msgid "Change password"
 msgstr "암호 변경"
 
 #: libraries/display_change_password.lib.php:35
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:348 server_privileges.php:808
+=======
+#: libraries/replication_gui.lib.php:348 server_privileges.php:807
+>>>>>>> origin/master
 msgid "No Password"
 msgstr "암호 없음"
 
 #: libraries/display_change_password.lib.php:41
 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63
 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:352 server_privileges.php:797
 #: server_privileges.php:801 server_privileges.php:812
 #: server_privileges.php:1555 server_synchronize.php:1175
+=======
+#: libraries/replication_gui.lib.php:352 server_privileges.php:796
+#: server_privileges.php:800 server_privileges.php:811
+#: server_privileges.php:1538 server_synchronize.php:1175
+>>>>>>> origin/master
 msgid "Password"
 msgstr "암호"
 
 #: libraries/display_change_password.lib.php:46
 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359
+<<<<<<< HEAD
 #: server_privileges.php:816 server_privileges.php:819
+=======
+#: server_privileges.php:815 server_privileges.php:818
+>>>>>>> origin/master
 msgid "Re-type"
 msgstr "재입력"
 
@@ -2021,12 +2267,20 @@ msgid "MySQL 4.0 compatible"
 msgstr ""
 
 #: libraries/display_change_password.lib.php:72
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:363 server_privileges.php:823
+=======
+#: libraries/replication_gui.lib.php:363 server_privileges.php:822
+>>>>>>> origin/master
 msgid "Generate Password"
 msgstr ""
 
 #: libraries/display_change_password.lib.php:75
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:366 server_privileges.php:826
+=======
+#: libraries/replication_gui.lib.php:366 server_privileges.php:825
+>>>>>>> origin/master
 msgid "Generate"
 msgstr ""
 
@@ -2044,12 +2298,24 @@ msgstr " 만들기 "
 msgid "No Privileges"
 msgstr "권한 없음"
 
+<<<<<<< HEAD
 #: libraries/display_create_table.lib.php:47
+=======
+#: libraries/display_create_table.lib.php:41
+msgid "Table must have at least one column."
+msgstr "테이블은 적어도 1개 이상의 컬럼을 갖고 있어야 합니다."
+
+#: libraries/display_create_table.lib.php:48
+>>>>>>> origin/master
 #, php-format
 msgid "Create table on database %s"
 msgstr "데이터베이스 %s에 새로운 테이블을 만듭니다."
 
+<<<<<<< HEAD
 #: libraries/display_create_table.lib.php:56
+=======
+#: libraries/display_create_table.lib.php:57
+>>>>>>> origin/master
 msgid "Number of columns"
 msgstr "컬럼수"
 
@@ -2110,7 +2376,11 @@ msgid "remember template"
 msgstr "템플릿 기억"
 
 #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552
+=======
+#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549
+>>>>>>> origin/master
 msgid "Character set of the file:"
 msgstr "파일 문자셋:"
 
@@ -2163,7 +2433,11 @@ msgstr ""
 msgid "File to import"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527
+=======
+#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524
+>>>>>>> origin/master
 msgid "Location of the text file"
 msgstr "SQL 텍스트파일의 위치"
 
@@ -2171,12 +2445,20 @@ msgstr "SQL 텍스트파일의 위치"
 msgid "File uploads are not allowed on this server."
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536
+=======
+#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533
+>>>>>>> origin/master
 #: tbl_change.php:1025
 msgid "The directory you set for upload work cannot be reached"
 msgstr "업로드 디렉토리에 접근할 수 없습니다"
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539
+=======
+#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536
+>>>>>>> origin/master
 #: tbl_change.php:1028
 msgid "web server upload directory"
 msgstr "웹서버 업로드 디렉토리"
@@ -2306,7 +2588,11 @@ msgstr ""
 #: libraries/import/docsql.php:34 libraries/import/ldi.php:47
 #: libraries/import/ods.php:30 libraries/import/sql.php:20
 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26
+<<<<<<< HEAD
 #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751
+=======
+#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753
+>>>>>>> origin/master
 #, fuzzy
 msgid "Options"
 msgstr "테이블 작업"
@@ -2449,7 +2735,11 @@ msgstr ""
 
 #: libraries/engines/innodb.lib.php:194 server_databases.php:137
 #: server_databases.php:305 server_status.php:525 server_status.php:586
+<<<<<<< HEAD
 #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694
+=======
+#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696
+>>>>>>> origin/master
 msgid "Total"
 msgstr "전체 사용량"
 
@@ -2695,7 +2985,11 @@ msgid ""
 msgstr ""
 
 #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88
+<<<<<<< HEAD
 #: tbl_printview.php:375 tbl_structure.php:735
+=======
+#: tbl_printview.php:375 tbl_structure.php:737
+>>>>>>> origin/master
 msgid "Format"
 msgstr "Format"
 
@@ -2767,8 +3061,13 @@ msgstr ""
 #: libraries/export/latex.php:201 libraries/export/odt.php:48
 #: libraries/export/sql.php:106 libraries/export/sql.php:868
 #: libraries/export/texytext.php:27 server_databases.php:127
+<<<<<<< HEAD
 #: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316
 #: tbl_structure.php:663
+=======
+#: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316
+#: tbl_structure.php:665
+>>>>>>> origin/master
 msgid "Data"
 msgstr "데이터"
 
@@ -2819,9 +3118,15 @@ msgstr ""
 #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57
 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177
 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:332 server_privileges.php:732
 #: server_privileges.php:735 server_privileges.php:791
 #: server_privileges.php:1554 server_privileges.php:2092
+=======
+#: libraries/replication_gui.lib.php:332 server_privileges.php:731
+#: server_privileges.php:734 server_privileges.php:790
+#: server_privileges.php:1537 server_privileges.php:2069
+>>>>>>> origin/master
 #: server_processlist.php:55 server_synchronize.php:1159
 msgid "Host"
 msgstr "호스트"
@@ -3492,8 +3797,13 @@ msgstr ""
 
 #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59
 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:262 server_privileges.php:712
 #: server_privileges.php:715 server_privileges.php:722
+=======
+#: libraries/replication_gui.lib.php:262 server_privileges.php:711
+#: server_privileges.php:714 server_privileges.php:721
+>>>>>>> origin/master
 #: server_synchronize.php:1171
 msgid "User name"
 msgstr "사용자명"
@@ -3511,14 +3821,22 @@ msgstr ""
 msgid "Slave status"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448
+=======
+#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445
+>>>>>>> origin/master
 #: server_status.php:737 server_variables.php:52
 msgid "Variable"
 msgstr "변수"
 
 #: libraries/replication_gui.lib.php:118 server_status.php:738
 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138
+<<<<<<< HEAD
 #: tbl_structure.php:727
+=======
+#: tbl_structure.php:729
+>>>>>>> origin/master
 msgid "Value"
 msgstr "값"
 
@@ -3537,11 +3855,16 @@ msgstr ""
 msgid "Add slave replication user"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:257 server_privileges.php:717
+=======
+#: libraries/replication_gui.lib.php:257 server_privileges.php:716
+>>>>>>> origin/master
 msgid "Any user"
 msgstr "아무나"
 
 #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:349 server_privileges.php:718
 #: server_privileges.php:785 server_privileges.php:809
 #: server_privileges.php:1950 server_privileges.php:1980
@@ -3565,6 +3888,31 @@ msgid "Use Host Table"
 msgstr ""
 
 #: libraries/replication_gui.lib.php:334 server_privileges.php:793
+=======
+#: libraries/replication_gui.lib.php:349 server_privileges.php:717
+#: server_privileges.php:784 server_privileges.php:808
+#: server_privileges.php:1928 server_privileges.php:1958
+msgid "Use text field"
+msgstr ""
+
+#: libraries/replication_gui.lib.php:305 server_privileges.php:764
+msgid "Any host"
+msgstr "아무데서나"
+
+#: libraries/replication_gui.lib.php:309 server_privileges.php:768
+msgid "Local"
+msgstr "Local"
+
+#: libraries/replication_gui.lib.php:315 server_privileges.php:773
+msgid "This Host"
+msgstr ""
+
+#: libraries/replication_gui.lib.php:321 server_privileges.php:779
+msgid "Use Host Table"
+msgstr ""
+
+#: libraries/replication_gui.lib.php:334 server_privileges.php:792
+>>>>>>> origin/master
 msgid ""
 "When Host table is used, this field is ignored and values stored in Host "
 "table are used instead."
@@ -7537,10 +7885,13 @@ msgstr ""
 msgid "Show insert query"
 msgstr ""
 
+<<<<<<< HEAD
 #: tbl_change.php:1140
 msgid "and then"
 msgstr "이어서"
 
+=======
+>>>>>>> origin/master
 #: tbl_change.php:1144
 msgid "Go back to previous page"
 msgstr "되돌아가기"
@@ -7736,6 +8087,7 @@ msgstr "referential 무결성 검사:"
 msgid "Show tables"
 msgstr "테이블 보기"
 
+<<<<<<< HEAD
 #: tbl_printview.php:309 tbl_structure.php:654
 msgid "Space usage"
 msgstr "공간 사용량"
@@ -7769,6 +8121,41 @@ msgid "Row length"
 msgstr "행 길이"
 
 #: tbl_printview.php:413 tbl_structure.php:791
+=======
+#: tbl_printview.php:309 tbl_structure.php:656
+msgid "Space usage"
+msgstr "공간 사용량"
+
+#: tbl_printview.php:313 tbl_structure.php:660
+msgid "Usage"
+msgstr "사용법(량)"
+
+#: tbl_printview.php:340 tbl_structure.php:687
+msgid "Effective"
+msgstr "실제량"
+
+#: tbl_printview.php:365 tbl_structure.php:725
+msgid "Row Statistics"
+msgstr "행(레코드) 통계"
+
+#: tbl_printview.php:368 tbl_structure.php:728
+msgid "Statements"
+msgstr "명세"
+
+#: tbl_printview.php:379 tbl_structure.php:740
+msgid "static"
+msgstr ""
+
+#: tbl_printview.php:381 tbl_structure.php:742
+msgid "dynamic"
+msgstr "동적(다이내믹)"
+
+#: tbl_printview.php:403 tbl_structure.php:785
+msgid "Row length"
+msgstr "행 길이"
+
+#: tbl_printview.php:413 tbl_structure.php:793
+>>>>>>> origin/master
 msgid " Row size "
 msgstr " Row size "
 
diff --git a/po/lt.po b/po/lt.po
index 5c4c08d55..fe6ea680e 100755
--- a/po/lt.po
+++ b/po/lt.po
@@ -3,7 +3,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2010-07-03 21:45+0530\n"
+=======
+"POT-Creation-Date: 2010-07-03 09:00-0400\n"
+>>>>>>> origin/master
 "PO-Revision-Date: 2010-04-16 19:52+0200\n"
 "Last-Translator: Rytis <rytis.s@gmail.com>\n"
 "Language-Team: lithuanian <lt@li.org>\n"
@@ -49,15 +53,26 @@ msgstr "Paieška"
 #: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046
 #: libraries/Theme_Manager.class.php:311
 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719
+<<<<<<< HEAD
 #: libraries/common.lib.php:1344 libraries/common.lib.php:2301
 #: libraries/display_change_password.lib.php:82
 #: libraries/display_create_table.lib.php:62
+=======
+#: libraries/common.lib.php:1335 libraries/common.lib.php:2288
+#: libraries/display_change_password.lib.php:82
+#: libraries/display_create_table.lib.php:63
+>>>>>>> origin/master
 #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532
 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76
 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104
+<<<<<<< HEAD
 #: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480
 #: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782
+=======
+#: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477
+#: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782
+>>>>>>> origin/master
 #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328
 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142
 #: server_privileges.php:665 server_privileges.php:1641
@@ -67,8 +82,13 @@ msgstr "Paieška"
 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171
 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265
 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561
+<<<<<<< HEAD
 #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560
 #: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512
+=======
+#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562
+#: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512
+>>>>>>> origin/master
 #: view_create.php:182 view_operations.php:101
 msgid "Go"
 msgstr "Vykdyti"
@@ -121,10 +141,17 @@ msgstr "Stulpelių vardai"
 #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245
 #: libraries/export/latex.php:360 libraries/export/odt.php:297
 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100
+<<<<<<< HEAD
 #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093
 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
 #: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321
+=======
+#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070
+#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
+#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
+#: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321
+>>>>>>> origin/master
 msgid "Type"
 msgstr "Tipas"
 
@@ -165,9 +192,15 @@ msgstr "Komentarai"
 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322
 #: libraries/export/latex.php:430 libraries/export/odt.php:368
 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263
+<<<<<<< HEAD
 #: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596
 #: server_privileges.php:1911 server_privileges.php:1916
 #: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228
+=======
+#: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579
+#: server_privileges.php:1889 server_privileges.php:1894
+#: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228
+>>>>>>> origin/master
 #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342
 msgid "No"
 msgstr "Ne"
@@ -181,9 +214,15 @@ msgstr "Ne"
 #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106
 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262
 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344
+<<<<<<< HEAD
 #: server_databases.php:64 server_privileges.php:1582
 #: server_privileges.php:1596 server_privileges.php:1911
 #: server_privileges.php:1914 server_privileges.php:2210 sql.php:193
+=======
+#: server_databases.php:64 server_privileges.php:1565
+#: server_privileges.php:1579 server_privileges.php:1889
+#: server_privileges.php:1892 server_privileges.php:2187 sql.php:193
+>>>>>>> origin/master
 #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350
 #: tbl_tracking.php:335 tbl_tracking.php:340
 msgid "Yes"
@@ -232,7 +271,15 @@ msgstr "Pervadinti duombazę į"
 msgid "Command"
 msgstr "Komanda"
 
+<<<<<<< HEAD
 #: db_operations.php:466
+=======
+#: db_operations.php:429 tbl_change.php:1140
+msgid "and then"
+msgstr "ir tada"
+
+#: db_operations.php:455
+>>>>>>> origin/master
 msgid "Copy database to"
 msgstr "Kopijuoti duombazę į"
 
@@ -320,7 +367,11 @@ msgstr "Įjungti"
 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730
 #: server_collations.php:54 server_collations.php:66 server_databases.php:111
 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179
+<<<<<<< HEAD
 #: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326
+=======
+#: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326
+>>>>>>> origin/master
 msgid "Collation"
 msgstr "Palyginimas"
 
@@ -349,7 +400,11 @@ msgstr "Lentelė"
 #: db_printview.php:105 libraries/db_structure.lib.php:56
 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146
 #: navigation.php:638 navigation.php:660 server_databases.php:122
+<<<<<<< HEAD
 #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775
+=======
+#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777
+>>>>>>> origin/master
 msgid "Rows"
 msgstr "Eilutės"
 
@@ -364,19 +419,31 @@ msgstr "šiuo metu naudojama"
 
 #: db_printview.php:187 libraries/db_info.inc.php:88
 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433
+<<<<<<< HEAD
 #: tbl_structure.php:807
+=======
+#: tbl_structure.php:809
+>>>>>>> origin/master
 msgid "Creation"
 msgstr "Sukurta"
 
 #: db_printview.php:196 libraries/db_info.inc.php:93
 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443
+<<<<<<< HEAD
 #: tbl_structure.php:815
+=======
+#: tbl_structure.php:817
+>>>>>>> origin/master
 msgid "Last update"
 msgstr "Paskutinis atnaujinimas"
 
 #: db_printview.php:205 libraries/db_info.inc.php:98
 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453
+<<<<<<< HEAD
 #: tbl_structure.php:823
+=======
+#: tbl_structure.php:825
+>>>>>>> origin/master
 msgid "Last check"
 msgstr "Paskutinis patikrinimas"
 
@@ -442,7 +509,11 @@ msgstr "Pakeičiant"
 
 #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553
 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779
+<<<<<<< HEAD
 #: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250
+=======
+#: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250
+>>>>>>> origin/master
 #: tbl_select.php:286
 msgid "Or"
 msgstr "Arba"
@@ -660,9 +731,15 @@ msgstr "Pasirinktus:"
 msgid "Check All"
 msgstr "Pažymėti visus"
 
+<<<<<<< HEAD
 #: db_structure.php:529 libraries/display_tbl.lib.php:2077
 #: libraries/replication_gui.lib.php:36 server_databases.php:350
 #: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460
+=======
+#: db_structure.php:531 libraries/display_tbl.lib.php:2077
+#: libraries/replication_gui.lib.php:36 server_databases.php:350
+#: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462
+>>>>>>> origin/master
 msgid "Uncheck All"
 msgstr "Atžymėti visus"
 
@@ -1120,10 +1197,17 @@ msgid "Prev"
 msgstr "Praėjęs"
 
 #. l10n: Display text for next month link in calendar
+<<<<<<< HEAD
 #: js/messages.php:106 libraries/common.lib.php:2366
 #: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338
 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
 #: tbl_structure.php:799
+=======
+#: js/messages.php:77 libraries/common.lib.php:2353
+#: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338
+#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
+#: tbl_structure.php:801
+>>>>>>> origin/master
 msgid "Next"
 msgstr "Sekantis"
 
@@ -1668,7 +1752,11 @@ msgstr "Slaptažodis:"
 msgid "Server Choice"
 msgstr "Pasirinkti serverį"
 
+<<<<<<< HEAD
 #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63
+=======
+#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59
+>>>>>>> origin/master
 msgid "Cookies must be enabled past this point."
 msgstr "Sausainėliai(Cookies) turi būti priimami."
 
@@ -1751,7 +1839,11 @@ msgstr ""
 "<em>libiconv</em> arba <em>recode_string</em> funkcijomis. Pasitkrinkite PHP "
 "parinktis. "
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:580
+=======
+#: libraries/common.inc.php:576
+>>>>>>> origin/master
 msgid ""
 "phpMyAdmin was unable to read your configuration file!<br />This might "
 "happen if PHP finds a parse error in it or PHP cannot find the file.<br /"
@@ -1767,40 +1859,68 @@ msgstr ""
 "vienoje/keletoje eilučių truksta kabučių ir/arba kabliataškio.<br />Jeigu "
 "išvedamas tuščias naršyklės langas - viskas tvarkoje (klaidų nepastebėta)."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:591
+=======
+#: libraries/common.inc.php:587
+>>>>>>> origin/master
 #, fuzzy, php-format
 #| msgid "Could not load default configuration from: \"%1$s\""
 msgid "Could not load default configuration from: %1$s"
 msgstr "Nepavyko užkrauti nustatymų failo iš \"%1$s\""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:596
+=======
+#: libraries/common.inc.php:592
+>>>>>>> origin/master
 msgid ""
 "The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
 "configuration file!"
 msgstr ""
 "Reikia nustatymų faile įrašyti <tt>$cfg['PmaAbsoluteUri']</tt> reikšmę!"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:626
+=======
+#: libraries/common.inc.php:622
+>>>>>>> origin/master
 #, php-format
 msgid "Invalid server index: %s"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:633
+=======
+#: libraries/common.inc.php:629
+>>>>>>> origin/master
 #, php-format
 msgid "Invalid hostname for server %1$s. Please review your configuration."
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:642 libraries/header.inc.php:100
+=======
+#: libraries/common.inc.php:638 libraries/header.inc.php:96
+>>>>>>> origin/master
 #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47
 #: main.php:185 test/theme.php:57
 msgid "Server"
 msgstr "Serveris"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:820
 msgid "Invalid authentication method set in configuration:"
 msgstr ""
 
 #: libraries/common.inc.php:923
+=======
+#: libraries/common.inc.php:816
+msgid "Invalid authentication method set in configuration:"
+msgstr ""
+
+#: libraries/common.inc.php:919
+>>>>>>> origin/master
 #, php-format
 msgid "You should upgrade to %s %s or later."
 msgstr "Rekomenduojame atnaujint %s iki %s ar vėlesnės versijos."
@@ -2046,7 +2166,11 @@ msgid ""
 msgstr "Gali būti apytikslis. Žiūrėkite DUK 3.11"
 
 #: libraries/db_structure.lib.php:69 server_databases.php:142
+<<<<<<< HEAD
 #: tbl_printview.php:335 tbl_structure.php:680
+=======
+#: tbl_printview.php:335 tbl_structure.php:682
+>>>>>>> origin/master
 msgid "Overhead"
 msgstr "Perteklius"
 
@@ -2073,22 +2197,36 @@ msgid "Change password"
 msgstr "Pakeisti slaptažodį"
 
 #: libraries/display_change_password.lib.php:35
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:348 server_privileges.php:808
+=======
+#: libraries/replication_gui.lib.php:348 server_privileges.php:807
+>>>>>>> origin/master
 msgid "No Password"
 msgstr "Nėra slaptažodžio"
 
 #: libraries/display_change_password.lib.php:41
 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63
 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:352 server_privileges.php:797
 #: server_privileges.php:801 server_privileges.php:812
 #: server_privileges.php:1555 server_synchronize.php:1175
+=======
+#: libraries/replication_gui.lib.php:352 server_privileges.php:796
+#: server_privileges.php:800 server_privileges.php:811
+#: server_privileges.php:1538 server_synchronize.php:1175
+>>>>>>> origin/master
 msgid "Password"
 msgstr "Slaptažodis"
 
 #: libraries/display_change_password.lib.php:46
 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359
+<<<<<<< HEAD
 #: server_privileges.php:816 server_privileges.php:819
+=======
+#: server_privileges.php:815 server_privileges.php:818
+>>>>>>> origin/master
 msgid "Re-type"
 msgstr "Įveskite dar kartą"
 
@@ -2103,12 +2241,20 @@ msgid "MySQL 4.0 compatible"
 msgstr "Suderinamas sy MySQL&nbsp;4.0"
 
 #: libraries/display_change_password.lib.php:72
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:363 server_privileges.php:823
+=======
+#: libraries/replication_gui.lib.php:363 server_privileges.php:822
+>>>>>>> origin/master
 msgid "Generate Password"
 msgstr "Generuoti Slaiptažodį"
 
 #: libraries/display_change_password.lib.php:75
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:366 server_privileges.php:826
+=======
+#: libraries/replication_gui.lib.php:366 server_privileges.php:825
+>>>>>>> origin/master
 msgid "Generate"
 msgstr "Generuoti"
 
@@ -2196,7 +2342,11 @@ msgid "remember template"
 msgstr "atsiminti šabloną"
 
 #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552
+=======
+#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549
+>>>>>>> origin/master
 msgid "Character set of the file:"
 msgstr "Simbolių koduotė faile:"
 
@@ -2249,7 +2399,11 @@ msgstr ""
 msgid "File to import"
 msgstr "Failas importavimui"
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527
+=======
+#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524
+>>>>>>> origin/master
 msgid "Location of the text file"
 msgstr "Tekstiniai SQL užklausų failai"
 
@@ -2257,12 +2411,20 @@ msgstr "Tekstiniai SQL užklausų failai"
 msgid "File uploads are not allowed on this server."
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536
+=======
+#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533
+>>>>>>> origin/master
 #: tbl_change.php:1025
 msgid "The directory you set for upload work cannot be reached"
 msgstr "Nepasiekimas nurodytas www-serverio katalogas atsiuntimams."
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539
+=======
+#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536
+>>>>>>> origin/master
 #: tbl_change.php:1028
 msgid "web server upload directory"
 msgstr "web serverio katalogas atsiuntimams"
@@ -2396,7 +2558,11 @@ msgstr "Rūšiuoti pagal raktą"
 #: libraries/import/docsql.php:34 libraries/import/ldi.php:47
 #: libraries/import/ods.php:30 libraries/import/sql.php:20
 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26
+<<<<<<< HEAD
 #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751
+=======
+#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753
+>>>>>>> origin/master
 msgid "Options"
 msgstr "Nustatymai"
 
@@ -2540,7 +2706,11 @@ msgstr "Buferio Pool'o naudojimas"
 
 #: libraries/engines/innodb.lib.php:194 server_databases.php:137
 #: server_databases.php:305 server_status.php:525 server_status.php:586
+<<<<<<< HEAD
 #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694
+=======
+#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696
+>>>>>>> origin/master
 msgid "Total"
 msgstr "Viso"
 
@@ -2797,7 +2967,11 @@ msgid ""
 msgstr ""
 
 #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88
+<<<<<<< HEAD
 #: tbl_printview.php:375 tbl_structure.php:735
+=======
+#: tbl_printview.php:375 tbl_structure.php:737
+>>>>>>> origin/master
 msgid "Format"
 msgstr "Formatas"
 
@@ -2869,8 +3043,13 @@ msgstr "Microsoft Word 2000"
 #: libraries/export/latex.php:201 libraries/export/odt.php:48
 #: libraries/export/sql.php:106 libraries/export/sql.php:868
 #: libraries/export/texytext.php:27 server_databases.php:127
+<<<<<<< HEAD
 #: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316
 #: tbl_structure.php:663
+=======
+#: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316
+#: tbl_structure.php:665
+>>>>>>> origin/master
 msgid "Data"
 msgstr "Duomenys"
 
@@ -2919,9 +3098,15 @@ msgstr "MIME tipai"
 #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57
 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177
 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:332 server_privileges.php:732
 #: server_privileges.php:735 server_privileges.php:791
 #: server_privileges.php:1554 server_privileges.php:2092
+=======
+#: libraries/replication_gui.lib.php:332 server_privileges.php:731
+#: server_privileges.php:734 server_privileges.php:790
+#: server_privileges.php:1537 server_privileges.php:2069
+>>>>>>> origin/master
 #: server_processlist.php:55 server_synchronize.php:1159
 msgid "Host"
 msgstr "Darbinė stotis"
@@ -3594,8 +3779,13 @@ msgstr ""
 
 #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59
 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:262 server_privileges.php:712
 #: server_privileges.php:715 server_privileges.php:722
+=======
+#: libraries/replication_gui.lib.php:262 server_privileges.php:711
+#: server_privileges.php:714 server_privileges.php:721
+>>>>>>> origin/master
 #: server_synchronize.php:1171
 msgid "User name"
 msgstr "Vartotojo vardas"
@@ -3612,14 +3802,22 @@ msgstr ""
 msgid "Slave status"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448
+=======
+#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445
+>>>>>>> origin/master
 #: server_status.php:737 server_variables.php:52
 msgid "Variable"
 msgstr "Kintamasis"
 
 #: libraries/replication_gui.lib.php:118 server_status.php:738
 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138
+<<<<<<< HEAD
 #: tbl_structure.php:727
+=======
+#: tbl_structure.php:729
+>>>>>>> origin/master
 msgid "Value"
 msgstr "Reikšmė"
 
@@ -3637,11 +3835,16 @@ msgstr ""
 msgid "Add slave replication user"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:257 server_privileges.php:717
+=======
+#: libraries/replication_gui.lib.php:257 server_privileges.php:716
+>>>>>>> origin/master
 msgid "Any user"
 msgstr "Bet kurį vartotoją"
 
 #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:349 server_privileges.php:718
 #: server_privileges.php:785 server_privileges.php:809
 #: server_privileges.php:1950 server_privileges.php:1980
@@ -3665,6 +3868,31 @@ msgid "Use Host Table"
 msgstr "Naudoti Host lentelę"
 
 #: libraries/replication_gui.lib.php:334 server_privileges.php:793
+=======
+#: libraries/replication_gui.lib.php:349 server_privileges.php:717
+#: server_privileges.php:784 server_privileges.php:808
+#: server_privileges.php:1928 server_privileges.php:1958
+msgid "Use text field"
+msgstr "Naudokite teksto įvedimo lauką"
+
+#: libraries/replication_gui.lib.php:305 server_privileges.php:764
+msgid "Any host"
+msgstr "Bet kurį prisijungimo adresą"
+
+#: libraries/replication_gui.lib.php:309 server_privileges.php:768
+msgid "Local"
+msgstr "Lokali darbinė stotis"
+
+#: libraries/replication_gui.lib.php:315 server_privileges.php:773
+msgid "This Host"
+msgstr "Dabartinis serveris"
+
+#: libraries/replication_gui.lib.php:321 server_privileges.php:779
+msgid "Use Host Table"
+msgstr "Naudoti Host lentelę"
+
+#: libraries/replication_gui.lib.php:334 server_privileges.php:792
+>>>>>>> origin/master
 msgid ""
 "When Host table is used, this field is ignored and values stored in Host "
 "table are used instead."
@@ -7778,10 +8006,13 @@ msgstr "Įterpti kaip naują eilutę ir ignoruoti klaidas"
 msgid "Show insert query"
 msgstr "Rodoma SQL užklausa"
 
+<<<<<<< HEAD
 #: tbl_change.php:1140
 msgid "and then"
 msgstr "ir tada"
 
+=======
+>>>>>>> origin/master
 #: tbl_change.php:1144
 msgid "Go back to previous page"
 msgstr "Sugrįžti į buvusį puslapį"
@@ -7977,6 +8208,7 @@ msgstr "Patikrinti sąryšių vientisumą:"
 msgid "Show tables"
 msgstr "Rodyti lentelės"
 
+<<<<<<< HEAD
 #: tbl_printview.php:309 tbl_structure.php:654
 msgid "Space usage"
 msgstr "Vietos naudojimas"
@@ -8010,6 +8242,41 @@ msgid "Row length"
 msgstr "Eilutės ilgis"
 
 #: tbl_printview.php:413 tbl_structure.php:791
+=======
+#: tbl_printview.php:309 tbl_structure.php:656
+msgid "Space usage"
+msgstr "Vietos naudojimas"
+
+#: tbl_printview.php:313 tbl_structure.php:660
+msgid "Usage"
+msgstr "Išnaudota"
+
+#: tbl_printview.php:340 tbl_structure.php:687
+msgid "Effective"
+msgstr "Efektyvus"
+
+#: tbl_printview.php:365 tbl_structure.php:725
+msgid "Row Statistics"
+msgstr "Eilučių statistika"
+
+#: tbl_printview.php:368 tbl_structure.php:728
+msgid "Statements"
+msgstr "Parametrai"
+
+#: tbl_printview.php:379 tbl_structure.php:740
+msgid "static"
+msgstr ""
+
+#: tbl_printview.php:381 tbl_structure.php:742
+msgid "dynamic"
+msgstr "dinaminis"
+
+#: tbl_printview.php:403 tbl_structure.php:785
+msgid "Row length"
+msgstr "Eilutės ilgis"
+
+#: tbl_printview.php:413 tbl_structure.php:793
+>>>>>>> origin/master
 msgid " Row size "
 msgstr "Eilutės dydis"
 
diff --git a/po/lv.po b/po/lv.po
index 1cc3ab288..de42c96d6 100755
--- a/po/lv.po
+++ b/po/lv.po
@@ -3,7 +3,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2010-07-03 21:45+0530\n"
+=======
+"POT-Creation-Date: 2010-07-03 09:00-0400\n"
+>>>>>>> origin/master
 "PO-Revision-Date: 2010-03-12 09:16+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: latvian <lv@li.org>\n"
@@ -48,15 +52,26 @@ msgstr "Meklēt"
 #: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046
 #: libraries/Theme_Manager.class.php:311
 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719
+<<<<<<< HEAD
 #: libraries/common.lib.php:1344 libraries/common.lib.php:2301
 #: libraries/display_change_password.lib.php:82
 #: libraries/display_create_table.lib.php:62
+=======
+#: libraries/common.lib.php:1335 libraries/common.lib.php:2288
+#: libraries/display_change_password.lib.php:82
+#: libraries/display_create_table.lib.php:63
+>>>>>>> origin/master
 #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532
 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76
 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104
+<<<<<<< HEAD
 #: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480
 #: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782
+=======
+#: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477
+#: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782
+>>>>>>> origin/master
 #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328
 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142
 #: server_privileges.php:665 server_privileges.php:1641
@@ -66,8 +81,13 @@ msgstr "Meklēt"
 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171
 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265
 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561
+<<<<<<< HEAD
 #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560
 #: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512
+=======
+#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562
+#: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512
+>>>>>>> origin/master
 #: view_create.php:182 view_operations.php:101
 msgid "Go"
 msgstr "Aiziet!"
@@ -120,10 +140,17 @@ msgstr "Kolonnu nosaukumi"
 #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245
 #: libraries/export/latex.php:360 libraries/export/odt.php:297
 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100
+<<<<<<< HEAD
 #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093
 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
 #: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321
+=======
+#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070
+#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
+#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
+#: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321
+>>>>>>> origin/master
 msgid "Type"
 msgstr "Tips"
 
@@ -164,9 +191,15 @@ msgstr "Komentāri"
 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322
 #: libraries/export/latex.php:430 libraries/export/odt.php:368
 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263
+<<<<<<< HEAD
 #: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596
 #: server_privileges.php:1911 server_privileges.php:1916
 #: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228
+=======
+#: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579
+#: server_privileges.php:1889 server_privileges.php:1894
+#: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228
+>>>>>>> origin/master
 #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342
 msgid "No"
 msgstr "Nē"
@@ -180,9 +213,15 @@ msgstr "Nē"
 #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106
 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262
 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344
+<<<<<<< HEAD
 #: server_databases.php:64 server_privileges.php:1582
 #: server_privileges.php:1596 server_privileges.php:1911
 #: server_privileges.php:1914 server_privileges.php:2210 sql.php:193
+=======
+#: server_databases.php:64 server_privileges.php:1565
+#: server_privileges.php:1579 server_privileges.php:1889
+#: server_privileges.php:1892 server_privileges.php:2187 sql.php:193
+>>>>>>> origin/master
 #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350
 #: tbl_tracking.php:335 tbl_tracking.php:340
 msgid "Yes"
@@ -231,7 +270,15 @@ msgstr "Pārsaukt datubāzi par"
 msgid "Command"
 msgstr "Komanda"
 
+<<<<<<< HEAD
 #: db_operations.php:466
+=======
+#: db_operations.php:429 tbl_change.php:1140
+msgid "and then"
+msgstr ""
+
+#: db_operations.php:455
+>>>>>>> origin/master
 msgid "Copy database to"
 msgstr "Kopēt datubāzi uz"
 
@@ -320,7 +367,11 @@ msgstr "Ieslēgts"
 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730
 #: server_collations.php:54 server_collations.php:66 server_databases.php:111
 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179
+<<<<<<< HEAD
 #: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326
+=======
+#: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326
+>>>>>>> origin/master
 msgid "Collation"
 msgstr "Izkārtojumi"
 
@@ -349,7 +400,11 @@ msgstr "Tabula"
 #: db_printview.php:105 libraries/db_structure.lib.php:56
 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146
 #: navigation.php:638 navigation.php:660 server_databases.php:122
+<<<<<<< HEAD
 #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775
+=======
+#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777
+>>>>>>> origin/master
 msgid "Rows"
 msgstr "Rindas"
 
@@ -364,19 +419,31 @@ msgstr "lietošanā"
 
 #: db_printview.php:187 libraries/db_info.inc.php:88
 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433
+<<<<<<< HEAD
 #: tbl_structure.php:807
+=======
+#: tbl_structure.php:809
+>>>>>>> origin/master
 msgid "Creation"
 msgstr "Izveidošana"
 
 #: db_printview.php:196 libraries/db_info.inc.php:93
 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443
+<<<<<<< HEAD
 #: tbl_structure.php:815
+=======
+#: tbl_structure.php:817
+>>>>>>> origin/master
 msgid "Last update"
 msgstr "Pēdējā atjaunošana"
 
 #: db_printview.php:205 libraries/db_info.inc.php:98
 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453
+<<<<<<< HEAD
 #: tbl_structure.php:823
+=======
+#: tbl_structure.php:825
+>>>>>>> origin/master
 msgid "Last check"
 msgstr "Pēdējā pārbaude"
 
@@ -441,7 +508,11 @@ msgstr "Dzēst"
 
 #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553
 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779
+<<<<<<< HEAD
 #: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250
+=======
+#: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250
+>>>>>>> origin/master
 #: tbl_select.php:286
 msgid "Or"
 msgstr "Vai"
@@ -660,9 +731,15 @@ msgstr "Ar iezīmēto:"
 msgid "Check All"
 msgstr "Iezīmēt visu"
 
+<<<<<<< HEAD
 #: db_structure.php:529 libraries/display_tbl.lib.php:2077
 #: libraries/replication_gui.lib.php:36 server_databases.php:350
 #: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460
+=======
+#: db_structure.php:531 libraries/display_tbl.lib.php:2077
+#: libraries/replication_gui.lib.php:36 server_databases.php:350
+#: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462
+>>>>>>> origin/master
 msgid "Uncheck All"
 msgstr "Neiezīmēt neko"
 
@@ -1118,10 +1195,17 @@ msgid "Prev"
 msgstr "Iepriekšējie"
 
 #. l10n: Display text for next month link in calendar
+<<<<<<< HEAD
 #: js/messages.php:106 libraries/common.lib.php:2366
 #: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338
 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
 #: tbl_structure.php:799
+=======
+#: js/messages.php:77 libraries/common.lib.php:2353
+#: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338
+#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
+#: tbl_structure.php:801
+>>>>>>> origin/master
 msgid "Next"
 msgstr "Nākamie"
 
@@ -1661,7 +1745,11 @@ msgstr "Parole:"
 msgid "Server Choice"
 msgstr "Servera izvēle"
 
+<<<<<<< HEAD
 #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63
+=======
+#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59
+>>>>>>> origin/master
 msgid "Cookies must be enabled past this point."
 msgstr "\"Cookies\" ir jābūt atļautiem aiz šī punkta."
 
@@ -1743,7 +1831,11 @@ msgstr ""
 "Nevar lietot iconv, libiconv vai recode_string funkciju, bet php saka, ka "
 "paplašinājums ir ielādēts. Pārbaudiet php konfigurāciju."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:580
+=======
+#: libraries/common.inc.php:576
+>>>>>>> origin/master
 msgid ""
 "phpMyAdmin was unable to read your configuration file!<br />This might "
 "happen if PHP finds a parse error in it or PHP cannot find the file.<br /"
@@ -1758,12 +1850,20 @@ msgstr ""
 "par kļūdām. Vairākumā gadījumu kaut kur pietrukst pēdiņa vai semikols.<br /"
 ">Ja redzat tukšu lapu, viss ir kārtībā."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:591
+=======
+#: libraries/common.inc.php:587
+>>>>>>> origin/master
 #, php-format
 msgid "Could not load default configuration from: %1$s"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:596
+=======
+#: libraries/common.inc.php:592
+>>>>>>> origin/master
 msgid ""
 "The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
 "configuration file!"
@@ -1771,27 +1871,47 @@ msgstr ""
 "<tt>$cfg['PmaAbsoluteUri']</tt> direktīvai ir JĀBŪT nodefinētai Jūsu "
 "konfigurācijas failā!"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:626
+=======
+#: libraries/common.inc.php:622
+>>>>>>> origin/master
 #, php-format
 msgid "Invalid server index: %s"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:633
+=======
+#: libraries/common.inc.php:629
+>>>>>>> origin/master
 #, php-format
 msgid "Invalid hostname for server %1$s. Please review your configuration."
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:642 libraries/header.inc.php:100
+=======
+#: libraries/common.inc.php:638 libraries/header.inc.php:96
+>>>>>>> origin/master
 #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47
 #: main.php:185 test/theme.php:57
 msgid "Server"
 msgstr "Serveris"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:820
 msgid "Invalid authentication method set in configuration:"
 msgstr ""
 
 #: libraries/common.inc.php:923
+=======
+#: libraries/common.inc.php:816
+msgid "Invalid authentication method set in configuration:"
+msgstr ""
+
+#: libraries/common.inc.php:919
+>>>>>>> origin/master
 #, php-format
 msgid "You should upgrade to %s %s or later."
 msgstr "Jums ir jāuzliek %s %s vai jaunāks."
@@ -2038,7 +2158,11 @@ msgid ""
 msgstr "Var būt aptuvens skaits. Skatīt FAQ 3.11"
 
 #: libraries/db_structure.lib.php:69 server_databases.php:142
+<<<<<<< HEAD
 #: tbl_printview.php:335 tbl_structure.php:680
+=======
+#: tbl_printview.php:335 tbl_structure.php:682
+>>>>>>> origin/master
 msgid "Overhead"
 msgstr "Pārtēriņš"
 
@@ -2065,22 +2189,36 @@ msgid "Change password"
 msgstr "Mainīt paroli"
 
 #: libraries/display_change_password.lib.php:35
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:348 server_privileges.php:808
+=======
+#: libraries/replication_gui.lib.php:348 server_privileges.php:807
+>>>>>>> origin/master
 msgid "No Password"
 msgstr "Nav paroles"
 
 #: libraries/display_change_password.lib.php:41
 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63
 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:352 server_privileges.php:797
 #: server_privileges.php:801 server_privileges.php:812
 #: server_privileges.php:1555 server_synchronize.php:1175
+=======
+#: libraries/replication_gui.lib.php:352 server_privileges.php:796
+#: server_privileges.php:800 server_privileges.php:811
+#: server_privileges.php:1538 server_synchronize.php:1175
+>>>>>>> origin/master
 msgid "Password"
 msgstr "Parole"
 
 #: libraries/display_change_password.lib.php:46
 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359
+<<<<<<< HEAD
 #: server_privileges.php:816 server_privileges.php:819
+=======
+#: server_privileges.php:815 server_privileges.php:818
+>>>>>>> origin/master
 msgid "Re-type"
 msgstr "Atkārtojiet"
 
@@ -2095,12 +2233,20 @@ msgid "MySQL 4.0 compatible"
 msgstr "MySQL&nbsp;4.0 savietojams"
 
 #: libraries/display_change_password.lib.php:72
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:363 server_privileges.php:823
+=======
+#: libraries/replication_gui.lib.php:363 server_privileges.php:822
+>>>>>>> origin/master
 msgid "Generate Password"
 msgstr ""
 
 #: libraries/display_change_password.lib.php:75
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:366 server_privileges.php:826
+=======
+#: libraries/replication_gui.lib.php:366 server_privileges.php:825
+>>>>>>> origin/master
 #, fuzzy
 msgid "Generate"
 msgstr "Uzģenerēja"
@@ -2187,7 +2333,11 @@ msgid "remember template"
 msgstr "atcerēties šablonu"
 
 #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552
+=======
+#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549
+>>>>>>> origin/master
 msgid "Character set of the file:"
 msgstr "Tabulas kodējums:"
 
@@ -2240,7 +2390,11 @@ msgstr ""
 msgid "File to import"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527
+=======
+#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524
+>>>>>>> origin/master
 msgid "Location of the text file"
 msgstr "Teksta faila atrašanās vieta"
 
@@ -2248,12 +2402,20 @@ msgstr "Teksta faila atrašanās vieta"
 msgid "File uploads are not allowed on this server."
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536
+=======
+#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533
+>>>>>>> origin/master
 #: tbl_change.php:1025
 msgid "The directory you set for upload work cannot be reached"
 msgstr "Direktoija, kuru norādijāt augšupielādei, nav pieejama"
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539
+=======
+#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536
+>>>>>>> origin/master
 #: tbl_change.php:1028
 msgid "web server upload directory"
 msgstr "web servera augšupielādes direktorija"
@@ -2382,7 +2544,11 @@ msgstr "Kārtot pēc atslēgas"
 #: libraries/import/docsql.php:34 libraries/import/ldi.php:47
 #: libraries/import/ods.php:30 libraries/import/sql.php:20
 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26
+<<<<<<< HEAD
 #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751
+=======
+#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753
+>>>>>>> origin/master
 #, fuzzy
 msgid "Options"
 msgstr "Darbības"
@@ -2529,7 +2695,11 @@ msgstr ""
 
 #: libraries/engines/innodb.lib.php:194 server_databases.php:137
 #: server_databases.php:305 server_status.php:525 server_status.php:586
+<<<<<<< HEAD
 #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694
+=======
+#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696
+>>>>>>> origin/master
 msgid "Total"
 msgstr "Kopā"
 
@@ -2775,7 +2945,11 @@ msgid ""
 msgstr ""
 
 #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88
+<<<<<<< HEAD
 #: tbl_printview.php:375 tbl_structure.php:735
+=======
+#: tbl_printview.php:375 tbl_structure.php:737
+>>>>>>> origin/master
 msgid "Format"
 msgstr "Formats"
 
@@ -2847,8 +3021,13 @@ msgstr ""
 #: libraries/export/latex.php:201 libraries/export/odt.php:48
 #: libraries/export/sql.php:106 libraries/export/sql.php:868
 #: libraries/export/texytext.php:27 server_databases.php:127
+<<<<<<< HEAD
 #: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316
 #: tbl_structure.php:663
+=======
+#: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316
+#: tbl_structure.php:665
+>>>>>>> origin/master
 msgid "Data"
 msgstr "Dati"
 
@@ -2897,9 +3076,15 @@ msgstr "MIME tips"
 #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57
 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177
 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:332 server_privileges.php:732
 #: server_privileges.php:735 server_privileges.php:791
 #: server_privileges.php:1554 server_privileges.php:2092
+=======
+#: libraries/replication_gui.lib.php:332 server_privileges.php:731
+#: server_privileges.php:734 server_privileges.php:790
+#: server_privileges.php:1537 server_privileges.php:2069
+>>>>>>> origin/master
 #: server_processlist.php:55 server_synchronize.php:1159
 msgid "Host"
 msgstr "Hosts"
@@ -3570,8 +3755,13 @@ msgstr ""
 
 #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59
 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:262 server_privileges.php:712
 #: server_privileges.php:715 server_privileges.php:722
+=======
+#: libraries/replication_gui.lib.php:262 server_privileges.php:711
+#: server_privileges.php:714 server_privileges.php:721
+>>>>>>> origin/master
 #: server_synchronize.php:1171
 msgid "User name"
 msgstr "Lietotājvārds"
@@ -3589,14 +3779,22 @@ msgstr ""
 msgid "Slave status"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448
+=======
+#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445
+>>>>>>> origin/master
 #: server_status.php:737 server_variables.php:52
 msgid "Variable"
 msgstr "Mainīgais"
 
 #: libraries/replication_gui.lib.php:118 server_status.php:738
 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138
+<<<<<<< HEAD
 #: tbl_structure.php:727
+=======
+#: tbl_structure.php:729
+>>>>>>> origin/master
 msgid "Value"
 msgstr "Vērtība"
 
@@ -3614,11 +3812,16 @@ msgstr ""
 msgid "Add slave replication user"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:257 server_privileges.php:717
+=======
+#: libraries/replication_gui.lib.php:257 server_privileges.php:716
+>>>>>>> origin/master
 msgid "Any user"
 msgstr "Jebkurš lietotājs"
 
 #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:349 server_privileges.php:718
 #: server_privileges.php:785 server_privileges.php:809
 #: server_privileges.php:1950 server_privileges.php:1980
@@ -3642,6 +3845,31 @@ msgid "Use Host Table"
 msgstr "Lietot hostu tabulu"
 
 #: libraries/replication_gui.lib.php:334 server_privileges.php:793
+=======
+#: libraries/replication_gui.lib.php:349 server_privileges.php:717
+#: server_privileges.php:784 server_privileges.php:808
+#: server_privileges.php:1928 server_privileges.php:1958
+msgid "Use text field"
+msgstr "Lietot teksta lauku"
+
+#: libraries/replication_gui.lib.php:305 server_privileges.php:764
+msgid "Any host"
+msgstr "Jebkurš hosts"
+
+#: libraries/replication_gui.lib.php:309 server_privileges.php:768
+msgid "Local"
+msgstr "Lokāls"
+
+#: libraries/replication_gui.lib.php:315 server_privileges.php:773
+msgid "This Host"
+msgstr "Šis hosts"
+
+#: libraries/replication_gui.lib.php:321 server_privileges.php:779
+msgid "Use Host Table"
+msgstr "Lietot hostu tabulu"
+
+#: libraries/replication_gui.lib.php:334 server_privileges.php:792
+>>>>>>> origin/master
 msgid ""
 "When Host table is used, this field is ignored and values stored in Host "
 "table are used instead."
@@ -7709,10 +7937,13 @@ msgstr ""
 msgid "Show insert query"
 msgstr ""
 
+<<<<<<< HEAD
 #: tbl_change.php:1140
 msgid "and then"
 msgstr ""
 
+=======
+>>>>>>> origin/master
 #: tbl_change.php:1144
 msgid "Go back to previous page"
 msgstr "Atgriezties atpakaļ iepriekšējā lapā"
@@ -7912,6 +8143,7 @@ msgstr "Pārbaudīt referenciālo integritāti:"
 msgid "Show tables"
 msgstr "Rādīt tabulas"
 
+<<<<<<< HEAD
 #: tbl_printview.php:309 tbl_structure.php:654
 msgid "Space usage"
 msgstr "Diska vietas lietošana"
@@ -7945,6 +8177,41 @@ msgid "Row length"
 msgstr "Rindas garums"
 
 #: tbl_printview.php:413 tbl_structure.php:791
+=======
+#: tbl_printview.php:309 tbl_structure.php:656
+msgid "Space usage"
+msgstr "Diska vietas lietošana"
+
+#: tbl_printview.php:313 tbl_structure.php:660
+msgid "Usage"
+msgstr "Aizņem"
+
+#: tbl_printview.php:340 tbl_structure.php:687
+msgid "Effective"
+msgstr "Efektīvs"
+
+#: tbl_printview.php:365 tbl_structure.php:725
+msgid "Row Statistics"
+msgstr "Rindas statistika"
+
+#: tbl_printview.php:368 tbl_structure.php:728
+msgid "Statements"
+msgstr "Parametrs"
+
+#: tbl_printview.php:379 tbl_structure.php:740
+msgid "static"
+msgstr ""
+
+#: tbl_printview.php:381 tbl_structure.php:742
+msgid "dynamic"
+msgstr "dinamisks"
+
+#: tbl_printview.php:403 tbl_structure.php:785
+msgid "Row length"
+msgstr "Rindas garums"
+
+#: tbl_printview.php:413 tbl_structure.php:793
+>>>>>>> origin/master
 msgid " Row size "
 msgstr " Rindas izmērs "
 
diff --git a/po/mk.po b/po/mk.po
index f1b4b54a2..dbfef7612 100755
--- a/po/mk.po
+++ b/po/mk.po
@@ -3,7 +3,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2010-07-03 21:45+0530\n"
+=======
+"POT-Creation-Date: 2010-07-03 09:00-0400\n"
+>>>>>>> origin/master
 "PO-Revision-Date: 2010-03-12 09:16+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: macedonian_cyrillic <mk@li.org>\n"
@@ -48,15 +52,26 @@ msgstr "Пребарување"
 #: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046
 #: libraries/Theme_Manager.class.php:311
 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719
+<<<<<<< HEAD
 #: libraries/common.lib.php:1344 libraries/common.lib.php:2301
 #: libraries/display_change_password.lib.php:82
 #: libraries/display_create_table.lib.php:62
+=======
+#: libraries/common.lib.php:1335 libraries/common.lib.php:2288
+#: libraries/display_change_password.lib.php:82
+#: libraries/display_create_table.lib.php:63
+>>>>>>> origin/master
 #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532
 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76
 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104
+<<<<<<< HEAD
 #: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480
 #: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782
+=======
+#: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477
+#: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782
+>>>>>>> origin/master
 #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328
 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142
 #: server_privileges.php:665 server_privileges.php:1641
@@ -66,8 +81,13 @@ msgstr "Пребарување"
 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171
 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265
 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561
+<<<<<<< HEAD
 #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560
 #: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512
+=======
+#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562
+#: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512
+>>>>>>> origin/master
 #: view_create.php:182 view_operations.php:101
 msgid "Go"
 msgstr "OK"
@@ -120,10 +140,17 @@ msgstr "Имиња на колони"
 #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245
 #: libraries/export/latex.php:360 libraries/export/odt.php:297
 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100
+<<<<<<< HEAD
 #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093
 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
 #: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321
+=======
+#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070
+#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
+#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
+#: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321
+>>>>>>> origin/master
 msgid "Type"
 msgstr "Тип"
 
@@ -164,9 +191,15 @@ msgstr "Коментари"
 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322
 #: libraries/export/latex.php:430 libraries/export/odt.php:368
 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263
+<<<<<<< HEAD
 #: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596
 #: server_privileges.php:1911 server_privileges.php:1916
 #: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228
+=======
+#: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579
+#: server_privileges.php:1889 server_privileges.php:1894
+#: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228
+>>>>>>> origin/master
 #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342
 msgid "No"
 msgstr "Не"
@@ -180,9 +213,15 @@ msgstr "Не"
 #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106
 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262
 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344
+<<<<<<< HEAD
 #: server_databases.php:64 server_privileges.php:1582
 #: server_privileges.php:1596 server_privileges.php:1911
 #: server_privileges.php:1914 server_privileges.php:2210 sql.php:193
+=======
+#: server_databases.php:64 server_privileges.php:1565
+#: server_privileges.php:1579 server_privileges.php:1889
+#: server_privileges.php:1892 server_privileges.php:2187 sql.php:193
+>>>>>>> origin/master
 #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350
 #: tbl_tracking.php:335 tbl_tracking.php:340
 msgid "Yes"
@@ -231,7 +270,15 @@ msgstr "Преименувај ја базата на податоци во"
 msgid "Command"
 msgstr "Наредба"
 
+<<<<<<< HEAD
 #: db_operations.php:466
+=======
+#: db_operations.php:429 tbl_change.php:1140
+msgid "and then"
+msgstr ""
+
+#: db_operations.php:455
+>>>>>>> origin/master
 msgid "Copy database to"
 msgstr "Копирај ја базата на податоци во"
 
@@ -320,7 +367,11 @@ msgstr "Овозможено"
 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730
 #: server_collations.php:54 server_collations.php:66 server_databases.php:111
 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179
+<<<<<<< HEAD
 #: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326
+=======
+#: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326
+>>>>>>> origin/master
 msgid "Collation"
 msgstr "Подредување"
 
@@ -349,7 +400,11 @@ msgstr "Табела"
 #: db_printview.php:105 libraries/db_structure.lib.php:56
 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146
 #: navigation.php:638 navigation.php:660 server_databases.php:122
+<<<<<<< HEAD
 #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775
+=======
+#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777
+>>>>>>> origin/master
 msgid "Rows"
 msgstr "Записи"
 
@@ -364,19 +419,31 @@ msgstr "се користи"
 
 #: db_printview.php:187 libraries/db_info.inc.php:88
 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433
+<<<<<<< HEAD
 #: tbl_structure.php:807
+=======
+#: tbl_structure.php:809
+>>>>>>> origin/master
 msgid "Creation"
 msgstr "Направено"
 
 #: db_printview.php:196 libraries/db_info.inc.php:93
 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443
+<<<<<<< HEAD
 #: tbl_structure.php:815
+=======
+#: tbl_structure.php:817
+>>>>>>> origin/master
 msgid "Last update"
 msgstr "Последна измена"
 
 #: db_printview.php:205 libraries/db_info.inc.php:98
 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453
+<<<<<<< HEAD
 #: tbl_structure.php:823
+=======
+#: tbl_structure.php:825
+>>>>>>> origin/master
 msgid "Last check"
 msgstr "Последна проверка"
 
@@ -441,7 +508,11 @@ msgstr "Del"
 
 #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553
 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779
+<<<<<<< HEAD
 #: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250
+=======
+#: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250
+>>>>>>> origin/master
 #: tbl_select.php:286
 msgid "Or"
 msgstr "или"
@@ -660,9 +731,15 @@ msgstr "Обележаното:"
 msgid "Check All"
 msgstr "обележи ги сите"
 
+<<<<<<< HEAD
 #: db_structure.php:529 libraries/display_tbl.lib.php:2077
 #: libraries/replication_gui.lib.php:36 server_databases.php:350
 #: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460
+=======
+#: db_structure.php:531 libraries/display_tbl.lib.php:2077
+#: libraries/replication_gui.lib.php:36 server_databases.php:350
+#: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462
+>>>>>>> origin/master
 msgid "Uncheck All"
 msgstr "ниедно"
 
@@ -1116,10 +1193,17 @@ msgid "Prev"
 msgstr "Претходна"
 
 #. l10n: Display text for next month link in calendar
+<<<<<<< HEAD
 #: js/messages.php:106 libraries/common.lib.php:2366
 #: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338
 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
 #: tbl_structure.php:799
+=======
+#: js/messages.php:77 libraries/common.lib.php:2353
+#: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338
+#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
+#: tbl_structure.php:801
+>>>>>>> origin/master
 msgid "Next"
 msgstr "Следен"
 
@@ -1661,7 +1745,11 @@ msgstr "Лозинка:"
 msgid "Server Choice"
 msgstr "Избор на сервер"
 
+<<<<<<< HEAD
 #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63
+=======
+#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59
+>>>>>>> origin/master
 msgid "Cookies must be enabled past this point."
 msgstr "вашиот веб прелистувач треба да допушти cookies"
 
@@ -1743,7 +1831,11 @@ msgstr ""
 "Не можам да ги користам iconv или libiconv или recode_string функциите иако "
 "екстензијата пријавува дека е вчитана. Проверите ја вашата PHP конфигурација."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:580
+=======
+#: libraries/common.inc.php:576
+>>>>>>> origin/master
 msgid ""
 "phpMyAdmin was unable to read your configuration file!<br />This might "
 "happen if PHP finds a parse error in it or PHP cannot find the file.<br /"
@@ -1759,12 +1851,20 @@ msgstr ""
 "ги добивате. Во поголемиот број на случаи, најчесто недостасува наводник или "
 "точка запирка.<br />Ако добиете празна страница, се е во ред."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:591
+=======
+#: libraries/common.inc.php:587
+>>>>>>> origin/master
 #, php-format
 msgid "Could not load default configuration from: %1$s"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:596
+=======
+#: libraries/common.inc.php:592
+>>>>>>> origin/master
 msgid ""
 "The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
 "configuration file!"
@@ -1772,27 +1872,47 @@ msgstr ""
 "<tt>$cfg['PmaAbsoluteUri']</tt> директивата МОРА да биде подесена во "
 "конфигурациската податотека!"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:626
+=======
+#: libraries/common.inc.php:622
+>>>>>>> origin/master
 #, php-format
 msgid "Invalid server index: %s"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:633
+=======
+#: libraries/common.inc.php:629
+>>>>>>> origin/master
 #, php-format
 msgid "Invalid hostname for server %1$s. Please review your configuration."
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:642 libraries/header.inc.php:100
+=======
+#: libraries/common.inc.php:638 libraries/header.inc.php:96
+>>>>>>> origin/master
 #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47
 #: main.php:185 test/theme.php:57
 msgid "Server"
 msgstr "Сервер"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:820
 msgid "Invalid authentication method set in configuration:"
 msgstr ""
 
 #: libraries/common.inc.php:923
+=======
+#: libraries/common.inc.php:816
+msgid "Invalid authentication method set in configuration:"
+msgstr ""
+
+#: libraries/common.inc.php:919
+>>>>>>> origin/master
 #, php-format
 msgid "You should upgrade to %s %s or later."
 msgstr ""
@@ -2045,7 +2165,11 @@ msgstr ""
 "3.11"
 
 #: libraries/db_structure.lib.php:69 server_databases.php:142
+<<<<<<< HEAD
 #: tbl_printview.php:335 tbl_structure.php:680
+=======
+#: tbl_printview.php:335 tbl_structure.php:682
+>>>>>>> origin/master
 msgid "Overhead"
 msgstr "Пречекорување"
 
@@ -2072,22 +2196,36 @@ msgid "Change password"
 msgstr "Промена на лозинка"
 
 #: libraries/display_change_password.lib.php:35
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:348 server_privileges.php:808
+=======
+#: libraries/replication_gui.lib.php:348 server_privileges.php:807
+>>>>>>> origin/master
 msgid "No Password"
 msgstr "Нема лозинка"
 
 #: libraries/display_change_password.lib.php:41
 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63
 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:352 server_privileges.php:797
 #: server_privileges.php:801 server_privileges.php:812
 #: server_privileges.php:1555 server_synchronize.php:1175
+=======
+#: libraries/replication_gui.lib.php:352 server_privileges.php:796
+#: server_privileges.php:800 server_privileges.php:811
+#: server_privileges.php:1538 server_synchronize.php:1175
+>>>>>>> origin/master
 msgid "Password"
 msgstr "Лозинка"
 
 #: libraries/display_change_password.lib.php:46
 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359
+<<<<<<< HEAD
 #: server_privileges.php:816 server_privileges.php:819
+=======
+#: server_privileges.php:815 server_privileges.php:818
+>>>>>>> origin/master
 msgid "Re-type"
 msgstr "Повтори внес"
 
@@ -2102,12 +2240,20 @@ msgid "MySQL 4.0 compatible"
 msgstr "MySQL&nbsp;4.0 компатибилно"
 
 #: libraries/display_change_password.lib.php:72
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:363 server_privileges.php:823
+=======
+#: libraries/replication_gui.lib.php:363 server_privileges.php:822
+>>>>>>> origin/master
 msgid "Generate Password"
 msgstr "Генерирање на лозинка"
 
 #: libraries/display_change_password.lib.php:75
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:366 server_privileges.php:826
+=======
+#: libraries/replication_gui.lib.php:366 server_privileges.php:825
+>>>>>>> origin/master
 msgid "Generate"
 msgstr "Генерирај"
 
@@ -2193,7 +2339,11 @@ msgid "remember template"
 msgstr "запамти го шаблонот"
 
 #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552
+=======
+#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549
+>>>>>>> origin/master
 msgid "Character set of the file:"
 msgstr "Кодна страна на податотеката:"
 
@@ -2246,7 +2396,11 @@ msgstr ""
 msgid "File to import"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527
+=======
+#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524
+>>>>>>> origin/master
 msgid "Location of the text file"
 msgstr "Локација на текстуалната податотека"
 
@@ -2254,12 +2408,20 @@ msgstr "Локација на текстуалната податотека"
 msgid "File uploads are not allowed on this server."
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536
+=======
+#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533
+>>>>>>> origin/master
 #: tbl_change.php:1025
 msgid "The directory you set for upload work cannot be reached"
 msgstr "Директориумот кој го избравте за праќање не е достапен"
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539
+=======
+#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536
+>>>>>>> origin/master
 #: tbl_change.php:1028
 msgid "web server upload directory"
 msgstr "директориум за праќање на веб серверот "
@@ -2388,7 +2550,11 @@ msgstr "Подредување по клуч"
 #: libraries/import/docsql.php:34 libraries/import/ldi.php:47
 #: libraries/import/ods.php:30 libraries/import/sql.php:20
 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26
+<<<<<<< HEAD
 #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751
+=======
+#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753
+>>>>>>> origin/master
 #, fuzzy
 msgid "Options"
 msgstr "Операции"
@@ -2539,7 +2705,11 @@ msgstr "Искористеност на баферот"
 
 #: libraries/engines/innodb.lib.php:194 server_databases.php:137
 #: server_databases.php:305 server_status.php:525 server_status.php:586
+<<<<<<< HEAD
 #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694
+=======
+#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696
+>>>>>>> origin/master
 msgid "Total"
 msgstr "Вкупно"
 
@@ -2801,7 +2971,11 @@ msgid ""
 msgstr ""
 
 #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88
+<<<<<<< HEAD
 #: tbl_printview.php:375 tbl_structure.php:735
+=======
+#: tbl_printview.php:375 tbl_structure.php:737
+>>>>>>> origin/master
 msgid "Format"
 msgstr "Формат"
 
@@ -2873,8 +3047,13 @@ msgstr "Microsoft Word 2000"
 #: libraries/export/latex.php:201 libraries/export/odt.php:48
 #: libraries/export/sql.php:106 libraries/export/sql.php:868
 #: libraries/export/texytext.php:27 server_databases.php:127
+<<<<<<< HEAD
 #: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316
 #: tbl_structure.php:663
+=======
+#: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316
+#: tbl_structure.php:665
+>>>>>>> origin/master
 msgid "Data"
 msgstr "Податоци"
 
@@ -2923,9 +3102,15 @@ msgstr "MIME-типови"
 #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57
 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177
 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:332 server_privileges.php:732
 #: server_privileges.php:735 server_privileges.php:791
 #: server_privileges.php:1554 server_privileges.php:2092
+=======
+#: libraries/replication_gui.lib.php:332 server_privileges.php:731
+#: server_privileges.php:734 server_privileges.php:790
+#: server_privileges.php:1537 server_privileges.php:2069
+>>>>>>> origin/master
 #: server_processlist.php:55 server_synchronize.php:1159
 msgid "Host"
 msgstr "Host"
@@ -3596,8 +3781,13 @@ msgstr ""
 
 #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59
 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:262 server_privileges.php:712
 #: server_privileges.php:715 server_privileges.php:722
+=======
+#: libraries/replication_gui.lib.php:262 server_privileges.php:711
+#: server_privileges.php:714 server_privileges.php:721
+>>>>>>> origin/master
 #: server_synchronize.php:1171
 msgid "User name"
 msgstr "Назив на корисник"
@@ -3615,14 +3805,22 @@ msgstr ""
 msgid "Slave status"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448
+=======
+#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445
+>>>>>>> origin/master
 #: server_status.php:737 server_variables.php:52
 msgid "Variable"
 msgstr "Променлива"
 
 #: libraries/replication_gui.lib.php:118 server_status.php:738
 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138
+<<<<<<< HEAD
 #: tbl_structure.php:727
+=======
+#: tbl_structure.php:729
+>>>>>>> origin/master
 msgid "Value"
 msgstr "Вредност"
 
@@ -3640,11 +3838,16 @@ msgstr ""
 msgid "Add slave replication user"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:257 server_privileges.php:717
+=======
+#: libraries/replication_gui.lib.php:257 server_privileges.php:716
+>>>>>>> origin/master
 msgid "Any user"
 msgstr "Било кој корисник"
 
 #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:349 server_privileges.php:718
 #: server_privileges.php:785 server_privileges.php:809
 #: server_privileges.php:1950 server_privileges.php:1980
@@ -3668,6 +3871,31 @@ msgid "Use Host Table"
 msgstr "Користи ја табелата на host-от"
 
 #: libraries/replication_gui.lib.php:334 server_privileges.php:793
+=======
+#: libraries/replication_gui.lib.php:349 server_privileges.php:717
+#: server_privileges.php:784 server_privileges.php:808
+#: server_privileges.php:1928 server_privileges.php:1958
+msgid "Use text field"
+msgstr "Користи текст поле"
+
+#: libraries/replication_gui.lib.php:305 server_privileges.php:764
+msgid "Any host"
+msgstr "Било кој host"
+
+#: libraries/replication_gui.lib.php:309 server_privileges.php:768
+msgid "Local"
+msgstr "Локален"
+
+#: libraries/replication_gui.lib.php:315 server_privileges.php:773
+msgid "This Host"
+msgstr "Овој host"
+
+#: libraries/replication_gui.lib.php:321 server_privileges.php:779
+msgid "Use Host Table"
+msgstr "Користи ја табелата на host-от"
+
+#: libraries/replication_gui.lib.php:334 server_privileges.php:792
+>>>>>>> origin/master
 msgid ""
 "When Host table is used, this field is ignored and values stored in Host "
 "table are used instead."
@@ -7765,10 +7993,13 @@ msgstr ""
 msgid "Show insert query"
 msgstr ""
 
+<<<<<<< HEAD
 #: tbl_change.php:1140
 msgid "and then"
 msgstr ""
 
+=======
+>>>>>>> origin/master
 #: tbl_change.php:1144
 msgid "Go back to previous page"
 msgstr "Назад на претходната страница"
@@ -7966,6 +8197,7 @@ msgstr "Провери го референцијалниот интегрите
 msgid "Show tables"
 msgstr "Прикажи табели"
 
+<<<<<<< HEAD
 #: tbl_printview.php:309 tbl_structure.php:654
 msgid "Space usage"
 msgstr "Големина"
@@ -7999,6 +8231,41 @@ msgid "Row length"
 msgstr "Должина на запис"
 
 #: tbl_printview.php:413 tbl_structure.php:791
+=======
+#: tbl_printview.php:309 tbl_structure.php:656
+msgid "Space usage"
+msgstr "Големина"
+
+#: tbl_printview.php:313 tbl_structure.php:660
+msgid "Usage"
+msgstr "Големина"
+
+#: tbl_printview.php:340 tbl_structure.php:687
+msgid "Effective"
+msgstr "Ефективни"
+
+#: tbl_printview.php:365 tbl_structure.php:725
+msgid "Row Statistics"
+msgstr "Статистики за записите"
+
+#: tbl_printview.php:368 tbl_structure.php:728
+msgid "Statements"
+msgstr "Име"
+
+#: tbl_printview.php:379 tbl_structure.php:740
+msgid "static"
+msgstr ""
+
+#: tbl_printview.php:381 tbl_structure.php:742
+msgid "dynamic"
+msgstr "динамички"
+
+#: tbl_printview.php:403 tbl_structure.php:785
+msgid "Row length"
+msgstr "Должина на запис"
+
+#: tbl_printview.php:413 tbl_structure.php:793
+>>>>>>> origin/master
 msgid " Row size "
 msgstr "Големина на запис"
 
diff --git a/po/mn.po b/po/mn.po
index cfa770d28..25b95481e 100755
--- a/po/mn.po
+++ b/po/mn.po
@@ -3,7 +3,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2010-07-03 21:45+0530\n"
+=======
+"POT-Creation-Date: 2010-07-03 09:00-0400\n"
+>>>>>>> origin/master
 "PO-Revision-Date: 2010-03-12 09:17+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: mongolian <mn@li.org>\n"
@@ -47,15 +51,26 @@ msgstr "Хайх"
 #: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046
 #: libraries/Theme_Manager.class.php:311
 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719
+<<<<<<< HEAD
 #: libraries/common.lib.php:1344 libraries/common.lib.php:2301
 #: libraries/display_change_password.lib.php:82
 #: libraries/display_create_table.lib.php:62
+=======
+#: libraries/common.lib.php:1335 libraries/common.lib.php:2288
+#: libraries/display_change_password.lib.php:82
+#: libraries/display_create_table.lib.php:63
+>>>>>>> origin/master
 #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532
 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76
 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104
+<<<<<<< HEAD
 #: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480
 #: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782
+=======
+#: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477
+#: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782
+>>>>>>> origin/master
 #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328
 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142
 #: server_privileges.php:665 server_privileges.php:1641
@@ -65,8 +80,13 @@ msgstr "Хайх"
 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171
 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265
 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561
+<<<<<<< HEAD
 #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560
 #: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512
+=======
+#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562
+#: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512
+>>>>>>> origin/master
 #: view_create.php:182 view_operations.php:101
 msgid "Go"
 msgstr "Яв"
@@ -119,10 +139,17 @@ msgstr "Баганын нэрс"
 #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245
 #: libraries/export/latex.php:360 libraries/export/odt.php:297
 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100
+<<<<<<< HEAD
 #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093
 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
 #: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321
+=======
+#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070
+#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
+#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
+#: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321
+>>>>>>> origin/master
 msgid "Type"
 msgstr "Төрөл"
 
@@ -163,9 +190,15 @@ msgstr "Тайлбар"
 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322
 #: libraries/export/latex.php:430 libraries/export/odt.php:368
 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263
+<<<<<<< HEAD
 #: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596
 #: server_privileges.php:1911 server_privileges.php:1916
 #: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228
+=======
+#: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579
+#: server_privileges.php:1889 server_privileges.php:1894
+#: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228
+>>>>>>> origin/master
 #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342
 msgid "No"
 msgstr "Үгүй"
@@ -179,9 +212,15 @@ msgstr "Үгүй"
 #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106
 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262
 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344
+<<<<<<< HEAD
 #: server_databases.php:64 server_privileges.php:1582
 #: server_privileges.php:1596 server_privileges.php:1911
 #: server_privileges.php:1914 server_privileges.php:2210 sql.php:193
+=======
+#: server_databases.php:64 server_privileges.php:1565
+#: server_privileges.php:1579 server_privileges.php:1889
+#: server_privileges.php:1892 server_privileges.php:2187 sql.php:193
+>>>>>>> origin/master
 #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350
 #: tbl_tracking.php:335 tbl_tracking.php:340
 msgid "Yes"
@@ -230,7 +269,15 @@ msgstr "Өгөгдлийн санг д.нэрлэх нь"
 msgid "Command"
 msgstr "Команд"
 
+<<<<<<< HEAD
 #: db_operations.php:466
+=======
+#: db_operations.php:429 tbl_change.php:1140
+msgid "and then"
+msgstr "ба тэгээд"
+
+#: db_operations.php:455
+>>>>>>> origin/master
 msgid "Copy database to"
 msgstr "Өгөгдлийн сан хуулах нь"
 
@@ -318,7 +365,11 @@ msgstr ""
 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730
 #: server_collations.php:54 server_collations.php:66 server_databases.php:111
 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179
+<<<<<<< HEAD
 #: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326
+=======
+#: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326
+>>>>>>> origin/master
 msgid "Collation"
 msgstr "Жишилт"
 
@@ -347,7 +398,11 @@ msgstr "Хүснэгт "
 #: db_printview.php:105 libraries/db_structure.lib.php:56
 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146
 #: navigation.php:638 navigation.php:660 server_databases.php:122
+<<<<<<< HEAD
 #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775
+=======
+#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777
+>>>>>>> origin/master
 msgid "Rows"
 msgstr "Мөрүүд"
 
@@ -362,19 +417,31 @@ msgstr "хэрэглэгдэж байна"
 
 #: db_printview.php:187 libraries/db_info.inc.php:88
 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433
+<<<<<<< HEAD
 #: tbl_structure.php:807
+=======
+#: tbl_structure.php:809
+>>>>>>> origin/master
 msgid "Creation"
 msgstr "Үүсгэлт"
 
 #: db_printview.php:196 libraries/db_info.inc.php:93
 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443
+<<<<<<< HEAD
 #: tbl_structure.php:815
+=======
+#: tbl_structure.php:817
+>>>>>>> origin/master
 msgid "Last update"
 msgstr "Сүүлийн шинэчлэл"
 
 #: db_printview.php:205 libraries/db_info.inc.php:98
 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453
+<<<<<<< HEAD
 #: tbl_structure.php:823
+=======
+#: tbl_structure.php:825
+>>>>>>> origin/master
 msgid "Last check"
 msgstr "Сүүлийн шалгалт"
 
@@ -439,7 +506,11 @@ msgstr "Устгах"
 
 #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553
 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779
+<<<<<<< HEAD
 #: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250
+=======
+#: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250
+>>>>>>> origin/master
 #: tbl_select.php:286
 msgid "Or"
 msgstr "Эсвэл"
@@ -657,9 +728,15 @@ msgstr "Сонгогдсонтой:"
 msgid "Check All"
 msgstr "Бүгдийг чагтлах"
 
+<<<<<<< HEAD
 #: db_structure.php:529 libraries/display_tbl.lib.php:2077
 #: libraries/replication_gui.lib.php:36 server_databases.php:350
 #: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460
+=======
+#: db_structure.php:531 libraries/display_tbl.lib.php:2077
+#: libraries/replication_gui.lib.php:36 server_databases.php:350
+#: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462
+>>>>>>> origin/master
 msgid "Uncheck All"
 msgstr "Бүх чагтыг болих"
 
@@ -1110,10 +1187,17 @@ msgid "Prev"
 msgstr "Өмнөх"
 
 #. l10n: Display text for next month link in calendar
+<<<<<<< HEAD
 #: js/messages.php:106 libraries/common.lib.php:2366
 #: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338
 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
 #: tbl_structure.php:799
+=======
+#: js/messages.php:77 libraries/common.lib.php:2353
+#: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338
+#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
+#: tbl_structure.php:801
+>>>>>>> origin/master
 msgid "Next"
 msgstr "Цааш"
 
@@ -1651,7 +1735,11 @@ msgstr "Нууц үг:"
 msgid "Server Choice"
 msgstr "Сервэр сонго"
 
+<<<<<<< HEAD
 #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63
+=======
+#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59
+>>>>>>> origin/master
 msgid "Cookies must be enabled past this point."
 msgstr "Энэ газарт Cookies нээлттэй байх ёстой."
 
@@ -1731,7 +1819,11 @@ msgstr ""
 "iconv, libiconv, recode_string өргөтгөлүүдийн алийг ч хэрэглэж чадсангүй "
 "(extension reports-д дуудагдах). Php тохиргоогоо шалга."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:580
+=======
+#: libraries/common.inc.php:576
+>>>>>>> origin/master
 msgid ""
 "phpMyAdmin was unable to read your configuration file!<br />This might "
 "happen if PHP finds a parse error in it or PHP cannot find the file.<br /"
@@ -1746,41 +1838,69 @@ msgstr ""
 "нь ихэвчлэн цэгтэй таслалын （;） алдаа байдаг. Хэрэв хоосон хуудас ирвэл – "
 "энэ нь зүгээр байна"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:591
+=======
+#: libraries/common.inc.php:587
+>>>>>>> origin/master
 #, fuzzy, php-format
 #| msgid "Could not load default configuration from: \"%1$s\""
 msgid "Could not load default configuration from: %1$s"
 msgstr "Анхдагч тохиргоо дуудагдсангүй нь: \"%1$s\""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:596
+=======
+#: libraries/common.inc.php:592
+>>>>>>> origin/master
 msgid ""
 "The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
 "configuration file!"
 msgstr ""
 "<tt>$cfg['PmaAbsoluteUri']</tt> -ыг тохиргооны файлд тохируулах хэрэгтэй!"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:626
+=======
+#: libraries/common.inc.php:622
+>>>>>>> origin/master
 #, fuzzy, php-format
 #| msgid "Invalid server index: \"%s\""
 msgid "Invalid server index: %s"
 msgstr "Сервэрийн буруу индекс нь: \"%s\""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:633
+=======
+#: libraries/common.inc.php:629
+>>>>>>> origin/master
 #, php-format
 msgid "Invalid hostname for server %1$s. Please review your configuration."
 msgstr "%1$s сервэрийн хост буруу. Өөрийн тохиргоогоо нягтална уу."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:642 libraries/header.inc.php:100
+=======
+#: libraries/common.inc.php:638 libraries/header.inc.php:96
+>>>>>>> origin/master
 #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47
 #: main.php:185 test/theme.php:57
 msgid "Server"
 msgstr "Сервэр"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:820
 msgid "Invalid authentication method set in configuration:"
 msgstr "Тохиргоонд сонгогдсон буруу зөвшөөрлийн арга:"
 
 #: libraries/common.inc.php:923
+=======
+#: libraries/common.inc.php:816
+msgid "Invalid authentication method set in configuration:"
+msgstr "Тохиргоонд сонгогдсон буруу зөвшөөрлийн арга:"
+
+#: libraries/common.inc.php:919
+>>>>>>> origin/master
 #, php-format
 msgid "You should upgrade to %s %s or later."
 msgstr "Та хувилбар %s -г %s -ээр сайжруулах хэрэгтэй эсвэл дараа."
@@ -2025,7 +2145,11 @@ msgid ""
 msgstr "May be approximate. See FAQ 3.11"
 
 #: libraries/db_structure.lib.php:69 server_databases.php:142
+<<<<<<< HEAD
 #: tbl_printview.php:335 tbl_structure.php:680
+=======
+#: tbl_printview.php:335 tbl_structure.php:682
+>>>>>>> origin/master
 msgid "Overhead"
 msgstr "Толгой дээр"
 
@@ -2052,22 +2176,36 @@ msgid "Change password"
 msgstr "Нууц үг солих"
 
 #: libraries/display_change_password.lib.php:35
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:348 server_privileges.php:808
+=======
+#: libraries/replication_gui.lib.php:348 server_privileges.php:807
+>>>>>>> origin/master
 msgid "No Password"
 msgstr "Нууц үггүй"
 
 #: libraries/display_change_password.lib.php:41
 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63
 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:352 server_privileges.php:797
 #: server_privileges.php:801 server_privileges.php:812
 #: server_privileges.php:1555 server_synchronize.php:1175
+=======
+#: libraries/replication_gui.lib.php:352 server_privileges.php:796
+#: server_privileges.php:800 server_privileges.php:811
+#: server_privileges.php:1538 server_synchronize.php:1175
+>>>>>>> origin/master
 msgid "Password"
 msgstr "Нууц үг"
 
 #: libraries/display_change_password.lib.php:46
 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359
+<<<<<<< HEAD
 #: server_privileges.php:816 server_privileges.php:819
+=======
+#: server_privileges.php:815 server_privileges.php:818
+>>>>>>> origin/master
 msgid "Re-type"
 msgstr "Дахин бич"
 
@@ -2082,12 +2220,20 @@ msgid "MySQL 4.0 compatible"
 msgstr "MySQL&nbsp;4.0 compatible"
 
 #: libraries/display_change_password.lib.php:72
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:363 server_privileges.php:823
+=======
+#: libraries/replication_gui.lib.php:363 server_privileges.php:822
+>>>>>>> origin/master
 msgid "Generate Password"
 msgstr "Нууц үг бий болгох"
 
 #: libraries/display_change_password.lib.php:75
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:366 server_privileges.php:826
+=======
+#: libraries/replication_gui.lib.php:366 server_privileges.php:825
+>>>>>>> origin/master
 msgid "Generate"
 msgstr "Бий болгох"
 
@@ -2175,7 +2321,11 @@ msgid "remember template"
 msgstr "загварыг санах"
 
 #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552
+=======
+#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549
+>>>>>>> origin/master
 msgid "Character set of the file:"
 msgstr "Файлын кодлол:"
 
@@ -2228,7 +2378,11 @@ msgstr ""
 msgid "File to import"
 msgstr "Оруулах файл"
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527
+=======
+#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524
+>>>>>>> origin/master
 msgid "Location of the text file"
 msgstr "Бичвэрфайлын байрлал"
 
@@ -2236,12 +2390,20 @@ msgstr "Бичвэрфайлын байрлал"
 msgid "File uploads are not allowed on this server."
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536
+=======
+#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533
+>>>>>>> origin/master
 #: tbl_change.php:1025
 msgid "The directory you set for upload work cannot be reached"
 msgstr "Таны сонгосон хавтас \"upload\" хийгдэхгүй байна"
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539
+=======
+#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536
+>>>>>>> origin/master
 #: tbl_change.php:1028
 msgid "web server upload directory"
 msgstr "web-сервэр түлхэх хавтас"
@@ -2373,7 +2535,11 @@ msgstr "Түлхүүрээр эрэмбэлэх"
 #: libraries/import/docsql.php:34 libraries/import/ldi.php:47
 #: libraries/import/ods.php:30 libraries/import/sql.php:20
 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26
+<<<<<<< HEAD
 #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751
+=======
+#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753
+>>>>>>> origin/master
 msgid "Options"
 msgstr "Сонголтууд"
 
@@ -2520,7 +2686,11 @@ msgstr "Буффер Pool Хэрэглээ"
 
 #: libraries/engines/innodb.lib.php:194 server_databases.php:137
 #: server_databases.php:305 server_status.php:525 server_status.php:586
+<<<<<<< HEAD
 #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694
+=======
+#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696
+>>>>>>> origin/master
 msgid "Total"
 msgstr "Нийт"
 
@@ -2778,7 +2948,11 @@ msgid ""
 msgstr ""
 
 #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88
+<<<<<<< HEAD
 #: tbl_printview.php:375 tbl_structure.php:735
+=======
+#: tbl_printview.php:375 tbl_structure.php:737
+>>>>>>> origin/master
 msgid "Format"
 msgstr "Тогтнол"
 
@@ -2850,8 +3024,13 @@ msgstr "Microsoft Word 2000"
 #: libraries/export/latex.php:201 libraries/export/odt.php:48
 #: libraries/export/sql.php:106 libraries/export/sql.php:868
 #: libraries/export/texytext.php:27 server_databases.php:127
+<<<<<<< HEAD
 #: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316
 #: tbl_structure.php:663
+=======
+#: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316
+#: tbl_structure.php:665
+>>>>>>> origin/master
 msgid "Data"
 msgstr "Өгөгдөл"
 
@@ -2900,9 +3079,15 @@ msgstr "MIME-төрөл"
 #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57
 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177
 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:332 server_privileges.php:732
 #: server_privileges.php:735 server_privileges.php:791
 #: server_privileges.php:1554 server_privileges.php:2092
+=======
+#: libraries/replication_gui.lib.php:332 server_privileges.php:731
+#: server_privileges.php:734 server_privileges.php:790
+#: server_privileges.php:1537 server_privileges.php:2069
+>>>>>>> origin/master
 #: server_processlist.php:55 server_synchronize.php:1159
 msgid "Host"
 msgstr "Хост"
@@ -3566,8 +3751,13 @@ msgstr ""
 
 #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59
 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:262 server_privileges.php:712
 #: server_privileges.php:715 server_privileges.php:722
+=======
+#: libraries/replication_gui.lib.php:262 server_privileges.php:711
+#: server_privileges.php:714 server_privileges.php:721
+>>>>>>> origin/master
 #: server_synchronize.php:1171
 msgid "User name"
 msgstr "Хэрэглэгчийн нэр"
@@ -3584,14 +3774,22 @@ msgstr ""
 msgid "Slave status"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448
+=======
+#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445
+>>>>>>> origin/master
 #: server_status.php:737 server_variables.php:52
 msgid "Variable"
 msgstr "Хувьсагч"
 
 #: libraries/replication_gui.lib.php:118 server_status.php:738
 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138
+<<<<<<< HEAD
 #: tbl_structure.php:727
+=======
+#: tbl_structure.php:729
+>>>>>>> origin/master
 msgid "Value"
 msgstr "Утга"
 
@@ -3609,11 +3807,16 @@ msgstr ""
 msgid "Add slave replication user"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:257 server_privileges.php:717
+=======
+#: libraries/replication_gui.lib.php:257 server_privileges.php:716
+>>>>>>> origin/master
 msgid "Any user"
 msgstr "Дурын хэрэглэгч"
 
 #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:349 server_privileges.php:718
 #: server_privileges.php:785 server_privileges.php:809
 #: server_privileges.php:1950 server_privileges.php:1980
@@ -3637,6 +3840,31 @@ msgid "Use Host Table"
 msgstr "Хост хүснэгт хэрэглэх"
 
 #: libraries/replication_gui.lib.php:334 server_privileges.php:793
+=======
+#: libraries/replication_gui.lib.php:349 server_privileges.php:717
+#: server_privileges.php:784 server_privileges.php:808
+#: server_privileges.php:1928 server_privileges.php:1958
+msgid "Use text field"
+msgstr "Бичвэр талбар хэрэглэх"
+
+#: libraries/replication_gui.lib.php:305 server_privileges.php:764
+msgid "Any host"
+msgstr "Дурын хост"
+
+#: libraries/replication_gui.lib.php:309 server_privileges.php:768
+msgid "Local"
+msgstr "Local"
+
+#: libraries/replication_gui.lib.php:315 server_privileges.php:773
+msgid "This Host"
+msgstr "Энэ хост"
+
+#: libraries/replication_gui.lib.php:321 server_privileges.php:779
+msgid "Use Host Table"
+msgstr "Хост хүснэгт хэрэглэх"
+
+#: libraries/replication_gui.lib.php:334 server_privileges.php:792
+>>>>>>> origin/master
 msgid ""
 "When Host table is used, this field is ignored and values stored in Host "
 "table are used instead."
@@ -7697,10 +7925,13 @@ msgstr ""
 msgid "Show insert query"
 msgstr ""
 
+<<<<<<< HEAD
 #: tbl_change.php:1140
 msgid "and then"
 msgstr "ба тэгээд"
 
+=======
+>>>>>>> origin/master
 #: tbl_change.php:1144
 msgid "Go back to previous page"
 msgstr "Буцах"
@@ -7896,6 +8127,7 @@ msgstr "Үнэн зөв өгөгдлийг шалгах:"
 msgid "Show tables"
 msgstr "Хүснэгтүүдийг харуулах"
 
+<<<<<<< HEAD
 #: tbl_printview.php:309 tbl_structure.php:654
 msgid "Space usage"
 msgstr "Ашиглалтын зай"
@@ -7929,6 +8161,41 @@ msgid "Row length"
 msgstr "Мөрийн урт"
 
 #: tbl_printview.php:413 tbl_structure.php:791
+=======
+#: tbl_printview.php:309 tbl_structure.php:656
+msgid "Space usage"
+msgstr "Ашиглалтын зай"
+
+#: tbl_printview.php:313 tbl_structure.php:660
+msgid "Usage"
+msgstr "Ашиглалт"
+
+#: tbl_printview.php:340 tbl_structure.php:687
+msgid "Effective"
+msgstr "Эффекттэй"
+
+#: tbl_printview.php:365 tbl_structure.php:725
+msgid "Row Statistics"
+msgstr "Мөрийн статистик"
+
+#: tbl_printview.php:368 tbl_structure.php:728
+msgid "Statements"
+msgstr "Баримтжуулал"
+
+#: tbl_printview.php:379 tbl_structure.php:740
+msgid "static"
+msgstr ""
+
+#: tbl_printview.php:381 tbl_structure.php:742
+msgid "dynamic"
+msgstr "динамик"
+
+#: tbl_printview.php:403 tbl_structure.php:785
+msgid "Row length"
+msgstr "Мөрийн урт"
+
+#: tbl_printview.php:413 tbl_structure.php:793
+>>>>>>> origin/master
 msgid " Row size "
 msgstr " Мөрийн хэмжээ "
 
diff --git a/po/ms.po b/po/ms.po
index d11f73cb2..d2186aab2 100755
--- a/po/ms.po
+++ b/po/ms.po
@@ -3,7 +3,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2010-07-03 21:45+0530\n"
+=======
+"POT-Creation-Date: 2010-07-03 09:00-0400\n"
+>>>>>>> origin/master
 "PO-Revision-Date: 2010-03-12 09:17+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: malay <ms@li.org>\n"
@@ -45,15 +49,26 @@ msgstr "Cari"
 #: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046
 #: libraries/Theme_Manager.class.php:311
 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719
+<<<<<<< HEAD
 #: libraries/common.lib.php:1344 libraries/common.lib.php:2301
 #: libraries/display_change_password.lib.php:82
 #: libraries/display_create_table.lib.php:62
+=======
+#: libraries/common.lib.php:1335 libraries/common.lib.php:2288
+#: libraries/display_change_password.lib.php:82
+#: libraries/display_create_table.lib.php:63
+>>>>>>> origin/master
 #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532
 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76
 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104
+<<<<<<< HEAD
 #: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480
 #: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782
+=======
+#: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477
+#: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782
+>>>>>>> origin/master
 #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328
 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142
 #: server_privileges.php:665 server_privileges.php:1641
@@ -63,8 +78,13 @@ msgstr "Cari"
 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171
 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265
 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561
+<<<<<<< HEAD
 #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560
 #: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512
+=======
+#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562
+#: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512
+>>>>>>> origin/master
 #: view_create.php:182 view_operations.php:101
 msgid "Go"
 msgstr "Pergi"
@@ -119,10 +139,17 @@ msgstr "Nama Kolum"
 #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245
 #: libraries/export/latex.php:360 libraries/export/odt.php:297
 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100
+<<<<<<< HEAD
 #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093
 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
 #: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321
+=======
+#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070
+#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
+#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
+#: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321
+>>>>>>> origin/master
 msgid "Type"
 msgstr "Jenis"
 
@@ -163,9 +190,15 @@ msgstr "Komen"
 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322
 #: libraries/export/latex.php:430 libraries/export/odt.php:368
 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263
+<<<<<<< HEAD
 #: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596
 #: server_privileges.php:1911 server_privileges.php:1916
 #: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228
+=======
+#: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579
+#: server_privileges.php:1889 server_privileges.php:1894
+#: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228
+>>>>>>> origin/master
 #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342
 msgid "No"
 msgstr "Tidak"
@@ -179,9 +212,15 @@ msgstr "Tidak"
 #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106
 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262
 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344
+<<<<<<< HEAD
 #: server_databases.php:64 server_privileges.php:1582
 #: server_privileges.php:1596 server_privileges.php:1911
 #: server_privileges.php:1914 server_privileges.php:2210 sql.php:193
+=======
+#: server_databases.php:64 server_privileges.php:1565
+#: server_privileges.php:1579 server_privileges.php:1889
+#: server_privileges.php:1892 server_privileges.php:2187 sql.php:193
+>>>>>>> origin/master
 #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350
 #: tbl_tracking.php:335 tbl_tracking.php:340
 msgid "Yes"
@@ -232,7 +271,15 @@ msgstr "Tukarnama jadual ke"
 msgid "Command"
 msgstr "Arahan"
 
+<<<<<<< HEAD
 #: db_operations.php:466
+=======
+#: db_operations.php:429 tbl_change.php:1140
+msgid "and then"
+msgstr ""
+
+#: db_operations.php:455
+>>>>>>> origin/master
 #, fuzzy
 msgid "Copy database to"
 msgstr "Tiada pangkalan data"
@@ -322,7 +369,11 @@ msgstr "Membenarkan"
 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730
 #: server_collations.php:54 server_collations.php:66 server_databases.php:111
 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179
+<<<<<<< HEAD
 #: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326
+=======
+#: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326
+>>>>>>> origin/master
 msgid "Collation"
 msgstr ""
 
@@ -351,7 +402,11 @@ msgstr "Jadual"
 #: db_printview.php:105 libraries/db_structure.lib.php:56
 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146
 #: navigation.php:638 navigation.php:660 server_databases.php:122
+<<<<<<< HEAD
 #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775
+=======
+#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777
+>>>>>>> origin/master
 msgid "Rows"
 msgstr "Baris"
 
@@ -366,20 +421,32 @@ msgstr "sedang digunakan"
 
 #: db_printview.php:187 libraries/db_info.inc.php:88
 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433
+<<<<<<< HEAD
 #: tbl_structure.php:807
+=======
+#: tbl_structure.php:809
+>>>>>>> origin/master
 #, fuzzy
 msgid "Creation"
 msgstr "Cipta"
 
 #: db_printview.php:196 libraries/db_info.inc.php:93
 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443
+<<<<<<< HEAD
 #: tbl_structure.php:815
+=======
+#: tbl_structure.php:817
+>>>>>>> origin/master
 msgid "Last update"
 msgstr ""
 
 #: db_printview.php:205 libraries/db_info.inc.php:98
 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453
+<<<<<<< HEAD
 #: tbl_structure.php:823
+=======
+#: tbl_structure.php:825
+>>>>>>> origin/master
 msgid "Last check"
 msgstr ""
 
@@ -444,7 +511,11 @@ msgstr "Del"
 
 #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553
 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779
+<<<<<<< HEAD
 #: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250
+=======
+#: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250
+>>>>>>> origin/master
 #: tbl_select.php:286
 msgid "Or"
 msgstr "Atau"
@@ -662,9 +733,15 @@ msgstr "Dengan pilihan:"
 msgid "Check All"
 msgstr "Tanda Semua"
 
+<<<<<<< HEAD
 #: db_structure.php:529 libraries/display_tbl.lib.php:2077
 #: libraries/replication_gui.lib.php:36 server_databases.php:350
 #: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460
+=======
+#: db_structure.php:531 libraries/display_tbl.lib.php:2077
+#: libraries/replication_gui.lib.php:36 server_databases.php:350
+#: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462
+>>>>>>> origin/master
 msgid "Uncheck All"
 msgstr "Nyahtanda Semua"
 
@@ -1113,10 +1190,17 @@ msgid "Prev"
 msgstr "Terdahulu"
 
 #. l10n: Display text for next month link in calendar
+<<<<<<< HEAD
 #: js/messages.php:106 libraries/common.lib.php:2366
 #: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338
 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
 #: tbl_structure.php:799
+=======
+#: js/messages.php:77 libraries/common.lib.php:2353
+#: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338
+#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
+#: tbl_structure.php:801
+>>>>>>> origin/master
 msgid "Next"
 msgstr "Berikut"
 
@@ -1650,7 +1734,11 @@ msgstr "Katalaluan:"
 msgid "Server Choice"
 msgstr "Pilihan Pelayan"
 
+<<<<<<< HEAD
 #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63
+=======
+#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59
+>>>>>>> origin/master
 msgid "Cookies must be enabled past this point."
 msgstr "Cecikut mestilah dihidupkan ketika ini."
 
@@ -1730,7 +1818,11 @@ msgstr ""
 "Tidak boleh menggunakan fungsi iconv mahupun libiconv mahupun recode_string "
 "apabila sambungan lapuran dimuat. Periksa konfigurasi php anda."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:580
+=======
+#: libraries/common.inc.php:576
+>>>>>>> origin/master
 msgid ""
 "phpMyAdmin was unable to read your configuration file!<br />This might "
 "happen if PHP finds a parse error in it or PHP cannot find the file.<br /"
@@ -1745,39 +1837,67 @@ msgstr ""
 "php yang diterima. Dalam kebanyakan kes quote atau semicolon tertinggal.<br /"
 ">Jika kamu terima laman kosong, semuanya berjalan lancar."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:591
+=======
+#: libraries/common.inc.php:587
+>>>>>>> origin/master
 #, php-format
 msgid "Could not load default configuration from: %1$s"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:596
+=======
+#: libraries/common.inc.php:592
+>>>>>>> origin/master
 msgid ""
 "The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
 "configuration file!"
 msgstr ""
 "<tt>$cfg[PmaAbsoluteUri]</tt> MESTI disetkan di dalam fail konfigurasi."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:626
+=======
+#: libraries/common.inc.php:622
+>>>>>>> origin/master
 #, php-format
 msgid "Invalid server index: %s"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:633
+=======
+#: libraries/common.inc.php:629
+>>>>>>> origin/master
 #, php-format
 msgid "Invalid hostname for server %1$s. Please review your configuration."
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:642 libraries/header.inc.php:100
+=======
+#: libraries/common.inc.php:638 libraries/header.inc.php:96
+>>>>>>> origin/master
 #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47
 #: main.php:185 test/theme.php:57
 msgid "Server"
 msgstr "Pelayan"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:820
 msgid "Invalid authentication method set in configuration:"
 msgstr ""
 
 #: libraries/common.inc.php:923
+=======
+#: libraries/common.inc.php:816
+msgid "Invalid authentication method set in configuration:"
+msgstr ""
+
+#: libraries/common.inc.php:919
+>>>>>>> origin/master
 #, php-format
 msgid "You should upgrade to %s %s or later."
 msgstr ""
@@ -2023,7 +2143,11 @@ msgid ""
 msgstr ""
 
 #: libraries/db_structure.lib.php:69 server_databases.php:142
+<<<<<<< HEAD
 #: tbl_printview.php:335 tbl_structure.php:680
+=======
+#: tbl_printview.php:335 tbl_structure.php:682
+>>>>>>> origin/master
 msgid "Overhead"
 msgstr "Melebihi"
 
@@ -2050,22 +2174,36 @@ msgid "Change password"
 msgstr "Ubah Katalaluan"
 
 #: libraries/display_change_password.lib.php:35
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:348 server_privileges.php:808
+=======
+#: libraries/replication_gui.lib.php:348 server_privileges.php:807
+>>>>>>> origin/master
 msgid "No Password"
 msgstr "Tiada Katalaluan"
 
 #: libraries/display_change_password.lib.php:41
 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63
 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:352 server_privileges.php:797
 #: server_privileges.php:801 server_privileges.php:812
 #: server_privileges.php:1555 server_synchronize.php:1175
+=======
+#: libraries/replication_gui.lib.php:352 server_privileges.php:796
+#: server_privileges.php:800 server_privileges.php:811
+#: server_privileges.php:1538 server_synchronize.php:1175
+>>>>>>> origin/master
 msgid "Password"
 msgstr "Katalaluan"
 
 #: libraries/display_change_password.lib.php:46
 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359
+<<<<<<< HEAD
 #: server_privileges.php:816 server_privileges.php:819
+=======
+#: server_privileges.php:815 server_privileges.php:818
+>>>>>>> origin/master
 msgid "Re-type"
 msgstr "Ulang-taip"
 
@@ -2078,12 +2216,20 @@ msgid "MySQL 4.0 compatible"
 msgstr ""
 
 #: libraries/display_change_password.lib.php:72
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:363 server_privileges.php:823
+=======
+#: libraries/replication_gui.lib.php:363 server_privileges.php:822
+>>>>>>> origin/master
 msgid "Generate Password"
 msgstr ""
 
 #: libraries/display_change_password.lib.php:75
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:366 server_privileges.php:826
+=======
+#: libraries/replication_gui.lib.php:366 server_privileges.php:825
+>>>>>>> origin/master
 #, fuzzy
 msgid "Generate"
 msgstr "Dijana oleh"
@@ -2170,7 +2316,11 @@ msgid "remember template"
 msgstr ""
 
 #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552
+=======
+#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549
+>>>>>>> origin/master
 msgid "Character set of the file:"
 msgstr "Fail bagi set Aksara:"
 
@@ -2223,7 +2373,11 @@ msgstr ""
 msgid "File to import"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527
+=======
+#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524
+>>>>>>> origin/master
 msgid "Location of the text file"
 msgstr "Lokasi bagi fail teks"
 
@@ -2231,12 +2385,20 @@ msgstr "Lokasi bagi fail teks"
 msgid "File uploads are not allowed on this server."
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536
+=======
+#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533
+>>>>>>> origin/master
 #: tbl_change.php:1025
 msgid "The directory you set for upload work cannot be reached"
 msgstr "Direktori muatnaik yang telah ditetapkan tidak dapat dicapai"
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539
+=======
+#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536
+>>>>>>> origin/master
 #: tbl_change.php:1028
 msgid "web server upload directory"
 msgstr "direktori muatnaik pelayan-web"
@@ -2365,7 +2527,11 @@ msgstr ""
 #: libraries/import/docsql.php:34 libraries/import/ldi.php:47
 #: libraries/import/ods.php:30 libraries/import/sql.php:20
 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26
+<<<<<<< HEAD
 #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751
+=======
+#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753
+>>>>>>> origin/master
 #, fuzzy
 msgid "Options"
 msgstr "Operasi"
@@ -2512,7 +2678,11 @@ msgstr ""
 
 #: libraries/engines/innodb.lib.php:194 server_databases.php:137
 #: server_databases.php:305 server_status.php:525 server_status.php:586
+<<<<<<< HEAD
 #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694
+=======
+#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696
+>>>>>>> origin/master
 msgid "Total"
 msgstr "Jumlah"
 
@@ -2758,7 +2928,11 @@ msgid ""
 msgstr ""
 
 #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88
+<<<<<<< HEAD
 #: tbl_printview.php:375 tbl_structure.php:735
+=======
+#: tbl_printview.php:375 tbl_structure.php:737
+>>>>>>> origin/master
 msgid "Format"
 msgstr "Format"
 
@@ -2830,8 +3004,13 @@ msgstr ""
 #: libraries/export/latex.php:201 libraries/export/odt.php:48
 #: libraries/export/sql.php:106 libraries/export/sql.php:868
 #: libraries/export/texytext.php:27 server_databases.php:127
+<<<<<<< HEAD
 #: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316
 #: tbl_structure.php:663
+=======
+#: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316
+#: tbl_structure.php:665
+>>>>>>> origin/master
 msgid "Data"
 msgstr "Data"
 
@@ -2881,9 +3060,15 @@ msgstr ""
 #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57
 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177
 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:332 server_privileges.php:732
 #: server_privileges.php:735 server_privileges.php:791
 #: server_privileges.php:1554 server_privileges.php:2092
+=======
+#: libraries/replication_gui.lib.php:332 server_privileges.php:731
+#: server_privileges.php:734 server_privileges.php:790
+#: server_privileges.php:1537 server_privileges.php:2069
+>>>>>>> origin/master
 #: server_processlist.php:55 server_synchronize.php:1159
 msgid "Host"
 msgstr "Hos"
@@ -3553,8 +3738,13 @@ msgstr ""
 
 #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59
 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:262 server_privileges.php:712
 #: server_privileges.php:715 server_privileges.php:722
+=======
+#: libraries/replication_gui.lib.php:262 server_privileges.php:711
+#: server_privileges.php:714 server_privileges.php:721
+>>>>>>> origin/master
 #: server_synchronize.php:1171
 msgid "User name"
 msgstr "Kata Pengenalan"
@@ -3572,14 +3762,22 @@ msgstr ""
 msgid "Slave status"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448
+=======
+#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445
+>>>>>>> origin/master
 #: server_status.php:737 server_variables.php:52
 msgid "Variable"
 msgstr "Pembolehubah"
 
 #: libraries/replication_gui.lib.php:118 server_status.php:738
 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138
+<<<<<<< HEAD
 #: tbl_structure.php:727
+=======
+#: tbl_structure.php:729
+>>>>>>> origin/master
 msgid "Value"
 msgstr "Nilai"
 
@@ -3598,11 +3796,16 @@ msgstr ""
 msgid "Add slave replication user"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:257 server_privileges.php:717
+=======
+#: libraries/replication_gui.lib.php:257 server_privileges.php:716
+>>>>>>> origin/master
 msgid "Any user"
 msgstr "Sebarang pengguna"
 
 #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:349 server_privileges.php:718
 #: server_privileges.php:785 server_privileges.php:809
 #: server_privileges.php:1950 server_privileges.php:1980
@@ -3626,6 +3829,31 @@ msgid "Use Host Table"
 msgstr ""
 
 #: libraries/replication_gui.lib.php:334 server_privileges.php:793
+=======
+#: libraries/replication_gui.lib.php:349 server_privileges.php:717
+#: server_privileges.php:784 server_privileges.php:808
+#: server_privileges.php:1928 server_privileges.php:1958
+msgid "Use text field"
+msgstr ""
+
+#: libraries/replication_gui.lib.php:305 server_privileges.php:764
+msgid "Any host"
+msgstr "Sebarang hos"
+
+#: libraries/replication_gui.lib.php:309 server_privileges.php:768
+msgid "Local"
+msgstr "Local"
+
+#: libraries/replication_gui.lib.php:315 server_privileges.php:773
+msgid "This Host"
+msgstr ""
+
+#: libraries/replication_gui.lib.php:321 server_privileges.php:779
+msgid "Use Host Table"
+msgstr ""
+
+#: libraries/replication_gui.lib.php:334 server_privileges.php:792
+>>>>>>> origin/master
 msgid ""
 "When Host table is used, this field is ignored and values stored in Host "
 "table are used instead."
@@ -7602,10 +7830,13 @@ msgstr ""
 msgid "Show insert query"
 msgstr ""
 
+<<<<<<< HEAD
 #: tbl_change.php:1140
 msgid "and then"
 msgstr ""
 
+=======
+>>>>>>> origin/master
 #: tbl_change.php:1144
 msgid "Go back to previous page"
 msgstr "Kembali ke muka sebelumnya"
@@ -7801,6 +8032,7 @@ msgstr "Semak integriti rujukan:"
 msgid "Show tables"
 msgstr "Papar jadual"
 
+<<<<<<< HEAD
 #: tbl_printview.php:309 tbl_structure.php:654
 msgid "Space usage"
 msgstr "Penggunaan ruang"
@@ -7834,6 +8066,41 @@ msgid "Row length"
 msgstr "Panjang baris"
 
 #: tbl_printview.php:413 tbl_structure.php:791
+=======
+#: tbl_printview.php:309 tbl_structure.php:656
+msgid "Space usage"
+msgstr "Penggunaan ruang"
+
+#: tbl_printview.php:313 tbl_structure.php:660
+msgid "Usage"
+msgstr "Penggunaan"
+
+#: tbl_printview.php:340 tbl_structure.php:687
+msgid "Effective"
+msgstr "Berkesan"
+
+#: tbl_printview.php:365 tbl_structure.php:725
+msgid "Row Statistics"
+msgstr "Statistik Baris"
+
+#: tbl_printview.php:368 tbl_structure.php:728
+msgid "Statements"
+msgstr "Penyataan"
+
+#: tbl_printview.php:379 tbl_structure.php:740
+msgid "static"
+msgstr ""
+
+#: tbl_printview.php:381 tbl_structure.php:742
+msgid "dynamic"
+msgstr "dinamik"
+
+#: tbl_printview.php:403 tbl_structure.php:785
+msgid "Row length"
+msgstr "Panjang baris"
+
+#: tbl_printview.php:413 tbl_structure.php:793
+>>>>>>> origin/master
 msgid " Row size "
 msgstr " Saiz baris "
 
diff --git a/po/nb.po b/po/nb.po
index 0ab670471..bbe2590af 100755
--- a/po/nb.po
+++ b/po/nb.po
@@ -3,7 +3,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2010-07-03 21:45+0530\n"
+=======
+"POT-Creation-Date: 2010-07-03 09:00-0400\n"
+>>>>>>> origin/master
 "PO-Revision-Date: 2010-06-09 14:17+0200\n"
 "Last-Translator:  <sven.erik.andersen@gmail.com>\n"
 "Language-Team: norwegian <no@li.org>\n"
@@ -48,15 +52,26 @@ msgstr "Søk"
 #: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046
 #: libraries/Theme_Manager.class.php:311
 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719
+<<<<<<< HEAD
 #: libraries/common.lib.php:1344 libraries/common.lib.php:2301
 #: libraries/display_change_password.lib.php:82
 #: libraries/display_create_table.lib.php:62
+=======
+#: libraries/common.lib.php:1335 libraries/common.lib.php:2288
+#: libraries/display_change_password.lib.php:82
+#: libraries/display_create_table.lib.php:63
+>>>>>>> origin/master
 #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532
 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76
 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104
+<<<<<<< HEAD
 #: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480
 #: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782
+=======
+#: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477
+#: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782
+>>>>>>> origin/master
 #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328
 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142
 #: server_privileges.php:665 server_privileges.php:1641
@@ -66,8 +81,13 @@ msgstr "Søk"
 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171
 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265
 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561
+<<<<<<< HEAD
 #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560
 #: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512
+=======
+#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562
+#: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512
+>>>>>>> origin/master
 #: view_create.php:182 view_operations.php:101
 msgid "Go"
 msgstr "Utfør"
@@ -118,10 +138,17 @@ msgstr "Kolonne"
 #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245
 #: libraries/export/latex.php:360 libraries/export/odt.php:297
 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100
+<<<<<<< HEAD
 #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093
 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
 #: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321
+=======
+#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070
+#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
+#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
+#: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321
+>>>>>>> origin/master
 msgid "Type"
 msgstr "Type"
 
@@ -162,9 +189,15 @@ msgstr "Kommentarer"
 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322
 #: libraries/export/latex.php:430 libraries/export/odt.php:368
 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263
+<<<<<<< HEAD
 #: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596
 #: server_privileges.php:1911 server_privileges.php:1916
 #: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228
+=======
+#: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579
+#: server_privileges.php:1889 server_privileges.php:1894
+#: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228
+>>>>>>> origin/master
 #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342
 msgid "No"
 msgstr "Nei"
@@ -178,9 +211,15 @@ msgstr "Nei"
 #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106
 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262
 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344
+<<<<<<< HEAD
 #: server_databases.php:64 server_privileges.php:1582
 #: server_privileges.php:1596 server_privileges.php:1911
 #: server_privileges.php:1914 server_privileges.php:2210 sql.php:193
+=======
+#: server_databases.php:64 server_privileges.php:1565
+#: server_privileges.php:1579 server_privileges.php:1889
+#: server_privileges.php:1892 server_privileges.php:2187 sql.php:193
+>>>>>>> origin/master
 #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350
 #: tbl_tracking.php:335 tbl_tracking.php:340
 msgid "Yes"
@@ -229,7 +268,15 @@ msgstr "Endre databasens navn til"
 msgid "Command"
 msgstr "Kommando"
 
+<<<<<<< HEAD
 #: db_operations.php:466
+=======
+#: db_operations.php:429 tbl_change.php:1140
+msgid "and then"
+msgstr "og så"
+
+#: db_operations.php:455
+>>>>>>> origin/master
 msgid "Copy database to"
 msgstr "Kopier databasen til"
 
@@ -311,7 +358,11 @@ msgstr "Slå på"
 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730
 #: server_collations.php:54 server_collations.php:66 server_databases.php:111
 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179
+<<<<<<< HEAD
 #: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326
+=======
+#: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326
+>>>>>>> origin/master
 msgid "Collation"
 msgstr "Sammenligning"
 
@@ -340,7 +391,11 @@ msgstr "Tabell"
 #: db_printview.php:105 libraries/db_structure.lib.php:56
 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146
 #: navigation.php:638 navigation.php:660 server_databases.php:122
+<<<<<<< HEAD
 #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775
+=======
+#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777
+>>>>>>> origin/master
 msgid "Rows"
 msgstr "Rader"
 
@@ -355,19 +410,31 @@ msgstr "i bruk"
 
 #: db_printview.php:187 libraries/db_info.inc.php:88
 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433
+<<<<<<< HEAD
 #: tbl_structure.php:807
+=======
+#: tbl_structure.php:809
+>>>>>>> origin/master
 msgid "Creation"
 msgstr "Opprettet"
 
 #: db_printview.php:196 libraries/db_info.inc.php:93
 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443
+<<<<<<< HEAD
 #: tbl_structure.php:815
+=======
+#: tbl_structure.php:817
+>>>>>>> origin/master
 msgid "Last update"
 msgstr "Sist oppdatert"
 
 #: db_printview.php:205 libraries/db_info.inc.php:98
 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453
+<<<<<<< HEAD
 #: tbl_structure.php:823
+=======
+#: tbl_structure.php:825
+>>>>>>> origin/master
 msgid "Last check"
 msgstr "Sist kontrollert"
 
@@ -431,7 +498,11 @@ msgstr "Slett"
 
 #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553
 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779
+<<<<<<< HEAD
 #: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250
+=======
+#: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250
+>>>>>>> origin/master
 #: tbl_select.php:286
 msgid "Or"
 msgstr "Eller"
@@ -643,9 +714,15 @@ msgstr "Med avkrysset:"
 msgid "Check All"
 msgstr "Merk alle"
 
+<<<<<<< HEAD
 #: db_structure.php:529 libraries/display_tbl.lib.php:2077
 #: libraries/replication_gui.lib.php:36 server_databases.php:350
 #: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460
+=======
+#: db_structure.php:531 libraries/display_tbl.lib.php:2077
+#: libraries/replication_gui.lib.php:36 server_databases.php:350
+#: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462
+>>>>>>> origin/master
 msgid "Uncheck All"
 msgstr "Fjern merking"
 
@@ -1105,10 +1182,17 @@ msgid "Prev"
 msgstr "Forrige"
 
 #. l10n: Display text for next month link in calendar
+<<<<<<< HEAD
 #: js/messages.php:106 libraries/common.lib.php:2366
 #: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338
 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
 #: tbl_structure.php:799
+=======
+#: js/messages.php:77 libraries/common.lib.php:2353
+#: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338
+#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
+#: tbl_structure.php:801
+>>>>>>> origin/master
 msgid "Next"
 msgstr "Neste"
 
@@ -1610,7 +1694,11 @@ msgstr "Passord:"
 msgid "Server Choice"
 msgstr "Tjenervalg"
 
+<<<<<<< HEAD
 #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63
+=======
+#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59
+>>>>>>> origin/master
 msgid "Cookies must be enabled past this point."
 msgstr "Cookies må være slått på forbi dette punkt."
 
@@ -1691,7 +1779,11 @@ msgstr ""
 "Kan ikke bruke hverken iconv, libiconv eller recode_string funksjonene selv "
 "om modulene sier de er lastet. Sjekk din php-konfigurasjon."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:580
+=======
+#: libraries/common.inc.php:576
+>>>>>>> origin/master
 msgid ""
 "phpMyAdmin was unable to read your configuration file!<br />This might "
 "happen if PHP finds a parse error in it or PHP cannot find the file.<br /"
@@ -1706,12 +1798,20 @@ msgstr ""
 "som du vil få. I de fleste tilfeller så mangler det et anførselstegn eller "
 "et semikolon et sted.<br />Hvis du får en blank side så er alt ok."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:591
+=======
+#: libraries/common.inc.php:587
+>>>>>>> origin/master
 #, php-format
 msgid "Could not load default configuration from: %1$s"
 msgstr "Kunne ikke laste standard konfigurasjonsfil fra: %1$s"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:596
+=======
+#: libraries/common.inc.php:592
+>>>>>>> origin/master
 msgid ""
 "The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
 "configuration file!"
@@ -1719,27 +1819,47 @@ msgstr ""
 "<tt>$cfg['PmaAbsoluteUri']</tt> variabelen MÅ være innstilt i din "
 "konfigurasjonsfil!"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:626
+=======
+#: libraries/common.inc.php:622
+>>>>>>> origin/master
 #, php-format
 msgid "Invalid server index: %s"
 msgstr "Ugyldig tjenerindeks: \"%s\""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:633
+=======
+#: libraries/common.inc.php:629
+>>>>>>> origin/master
 #, php-format
 msgid "Invalid hostname for server %1$s. Please review your configuration."
 msgstr "Ugyldig tjenernavn for tjener %1$s. Kontroller din konfigurasjon."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:642 libraries/header.inc.php:100
+=======
+#: libraries/common.inc.php:638 libraries/header.inc.php:96
+>>>>>>> origin/master
 #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47
 #: main.php:185 test/theme.php:57
 msgid "Server"
 msgstr "Tjener"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:820
 msgid "Invalid authentication method set in configuration:"
 msgstr "Ugyldig autentiseringsmetode satt opp i konfigureringen:"
 
 #: libraries/common.inc.php:923
+=======
+#: libraries/common.inc.php:816
+msgid "Invalid authentication method set in configuration:"
+msgstr "Ugyldig autentiseringsmetode satt opp i konfigureringen:"
+
+#: libraries/common.inc.php:919
+>>>>>>> origin/master
 #, php-format
 msgid "You should upgrade to %s %s or later."
 msgstr "Du burde oppgradere til %s %s eller nyere."
@@ -1983,7 +2103,11 @@ msgid ""
 msgstr "Kan være unøyaktig. Se FAQ 3.11"
 
 #: libraries/db_structure.lib.php:69 server_databases.php:142
+<<<<<<< HEAD
 #: tbl_printview.php:335 tbl_structure.php:680
+=======
+#: tbl_printview.php:335 tbl_structure.php:682
+>>>>>>> origin/master
 msgid "Overhead"
 msgstr "Overheng"
 
@@ -2011,22 +2135,36 @@ msgid "Change password"
 msgstr "Endre passord"
 
 #: libraries/display_change_password.lib.php:35
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:348 server_privileges.php:808
+=======
+#: libraries/replication_gui.lib.php:348 server_privileges.php:807
+>>>>>>> origin/master
 msgid "No Password"
 msgstr "Intet passord"
 
 #: libraries/display_change_password.lib.php:41
 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63
 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:352 server_privileges.php:797
 #: server_privileges.php:801 server_privileges.php:812
 #: server_privileges.php:1555 server_synchronize.php:1175
+=======
+#: libraries/replication_gui.lib.php:352 server_privileges.php:796
+#: server_privileges.php:800 server_privileges.php:811
+#: server_privileges.php:1538 server_synchronize.php:1175
+>>>>>>> origin/master
 msgid "Password"
 msgstr "Passord"
 
 #: libraries/display_change_password.lib.php:46
 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359
+<<<<<<< HEAD
 #: server_privileges.php:816 server_privileges.php:819
+=======
+#: server_privileges.php:815 server_privileges.php:818
+>>>>>>> origin/master
 msgid "Re-type"
 msgstr "Gjenta"
 
@@ -2039,12 +2177,20 @@ msgid "MySQL 4.0 compatible"
 msgstr "MySQL 4.0 kompatibel"
 
 #: libraries/display_change_password.lib.php:72
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:363 server_privileges.php:823
+=======
+#: libraries/replication_gui.lib.php:363 server_privileges.php:822
+>>>>>>> origin/master
 msgid "Generate Password"
 msgstr "Generer passord"
 
 #: libraries/display_change_password.lib.php:75
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:366 server_privileges.php:826
+=======
+#: libraries/replication_gui.lib.php:366 server_privileges.php:825
+>>>>>>> origin/master
 msgid "Generate"
 msgstr "Generer"
 
@@ -2129,7 +2275,11 @@ msgid "remember template"
 msgstr "husk malen"
 
 #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552
+=======
+#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549
+>>>>>>> origin/master
 msgid "Character set of the file:"
 msgstr "Filens tegnsett:"
 
@@ -2186,7 +2336,11 @@ msgstr ""
 msgid "File to import"
 msgstr "Fil for importering"
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527
+=======
+#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524
+>>>>>>> origin/master
 msgid "Location of the text file"
 msgstr "Plassering av filen"
 
@@ -2194,12 +2348,20 @@ msgstr "Plassering av filen"
 msgid "File uploads are not allowed on this server."
 msgstr "Filopplastinger er ikke tillatt på denne tjeneren."
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536
+=======
+#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533
+>>>>>>> origin/master
 #: tbl_change.php:1025
 msgid "The directory you set for upload work cannot be reached"
 msgstr "Katalogen du anga for opplasting kan ikke nåes"
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539
+=======
+#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536
+>>>>>>> origin/master
 #: tbl_change.php:1028
 msgid "web server upload directory"
 msgstr "webtjener opplastingskatalog"
@@ -2331,7 +2493,11 @@ msgstr "Sorter etter nøkkel"
 #: libraries/import/docsql.php:34 libraries/import/ldi.php:47
 #: libraries/import/ods.php:30 libraries/import/sql.php:20
 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26
+<<<<<<< HEAD
 #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751
+=======
+#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753
+>>>>>>> origin/master
 msgid "Options"
 msgstr "Innstillinger"
 
@@ -2476,7 +2642,11 @@ msgstr "Mellomlagerbruk"
 
 #: libraries/engines/innodb.lib.php:194 server_databases.php:137
 #: server_databases.php:305 server_status.php:525 server_status.php:586
+<<<<<<< HEAD
 #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694
+=======
+#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696
+>>>>>>> origin/master
 msgid "Total"
 msgstr "Totalt"
 
@@ -2761,7 +2931,11 @@ msgstr ""
 "neste høyeste nummeret."
 
 #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88
+<<<<<<< HEAD
 #: tbl_printview.php:375 tbl_structure.php:735
+=======
+#: tbl_printview.php:375 tbl_structure.php:737
+>>>>>>> origin/master
 msgid "Format"
 msgstr "Format"
 
@@ -2825,8 +2999,13 @@ msgstr "Microsoft Word 2000"
 #: libraries/export/latex.php:201 libraries/export/odt.php:48
 #: libraries/export/sql.php:106 libraries/export/sql.php:868
 #: libraries/export/texytext.php:27 server_databases.php:127
+<<<<<<< HEAD
 #: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316
 #: tbl_structure.php:663
+=======
+#: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316
+#: tbl_structure.php:665
+>>>>>>> origin/master
 msgid "Data"
 msgstr "Data"
 
@@ -2875,9 +3054,15 @@ msgstr "MIME-type"
 #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57
 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177
 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:332 server_privileges.php:732
 #: server_privileges.php:735 server_privileges.php:791
 #: server_privileges.php:1554 server_privileges.php:2092
+=======
+#: libraries/replication_gui.lib.php:332 server_privileges.php:731
+#: server_privileges.php:734 server_privileges.php:790
+#: server_privileges.php:1537 server_privileges.php:2069
+>>>>>>> origin/master
 #: server_processlist.php:55 server_synchronize.php:1159
 msgid "Host"
 msgstr "Vert"
@@ -3545,8 +3730,13 @@ msgstr ""
 
 #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59
 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:262 server_privileges.php:712
 #: server_privileges.php:715 server_privileges.php:722
+=======
+#: libraries/replication_gui.lib.php:262 server_privileges.php:711
+#: server_privileges.php:714 server_privileges.php:721
+>>>>>>> origin/master
 #: server_synchronize.php:1171
 msgid "User name"
 msgstr "Brukernavn"
@@ -3563,14 +3753,22 @@ msgstr "Masterstatus"
 msgid "Slave status"
 msgstr "Slavestatus"
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448
+=======
+#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445
+>>>>>>> origin/master
 #: server_status.php:737 server_variables.php:52
 msgid "Variable"
 msgstr "Variabler"
 
 #: libraries/replication_gui.lib.php:118 server_status.php:738
 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138
+<<<<<<< HEAD
 #: tbl_structure.php:727
+=======
+#: tbl_structure.php:729
+>>>>>>> origin/master
 msgid "Value"
 msgstr "Verdi"
 
@@ -3590,11 +3788,16 @@ msgstr ""
 msgid "Add slave replication user"
 msgstr "Legg til slavereplikasjonsbruker"
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:257 server_privileges.php:717
+=======
+#: libraries/replication_gui.lib.php:257 server_privileges.php:716
+>>>>>>> origin/master
 msgid "Any user"
 msgstr "Alle brukere"
 
 #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:349 server_privileges.php:718
 #: server_privileges.php:785 server_privileges.php:809
 #: server_privileges.php:1950 server_privileges.php:1980
@@ -3618,6 +3821,31 @@ msgid "Use Host Table"
 msgstr "Vis vert tabell"
 
 #: libraries/replication_gui.lib.php:334 server_privileges.php:793
+=======
+#: libraries/replication_gui.lib.php:349 server_privileges.php:717
+#: server_privileges.php:784 server_privileges.php:808
+#: server_privileges.php:1928 server_privileges.php:1958
+msgid "Use text field"
+msgstr "Bruk tekstfelt"
+
+#: libraries/replication_gui.lib.php:305 server_privileges.php:764
+msgid "Any host"
+msgstr "Alle verter"
+
+#: libraries/replication_gui.lib.php:309 server_privileges.php:768
+msgid "Local"
+msgstr "Lokal"
+
+#: libraries/replication_gui.lib.php:315 server_privileges.php:773
+msgid "This Host"
+msgstr "Denne vert"
+
+#: libraries/replication_gui.lib.php:321 server_privileges.php:779
+msgid "Use Host Table"
+msgstr "Vis vert tabell"
+
+#: libraries/replication_gui.lib.php:334 server_privileges.php:792
+>>>>>>> origin/master
 msgid ""
 "When Host table is used, this field is ignored and values stored in Host "
 "table are used instead."
@@ -7917,10 +8145,13 @@ msgstr "Sett inn som ny rad og ignorer feil"
 msgid "Show insert query"
 msgstr "Viser SQL spørring"
 
+<<<<<<< HEAD
 #: tbl_change.php:1140
 msgid "and then"
 msgstr "og så"
 
+=======
+>>>>>>> origin/master
 #: tbl_change.php:1144
 msgid "Go back to previous page"
 msgstr "Returner"
@@ -8114,6 +8345,7 @@ msgstr "Sjekk referanseintegritet:"
 msgid "Show tables"
 msgstr "Vis tabeller"
 
+<<<<<<< HEAD
 #: tbl_printview.php:309 tbl_structure.php:654
 msgid "Space usage"
 msgstr "Plassbruk"
@@ -8147,6 +8379,41 @@ msgid "Row length"
 msgstr "Radlengde"
 
 #: tbl_printview.php:413 tbl_structure.php:791
+=======
+#: tbl_printview.php:309 tbl_structure.php:656
+msgid "Space usage"
+msgstr "Plassbruk"
+
+#: tbl_printview.php:313 tbl_structure.php:660
+msgid "Usage"
+msgstr "Bruk"
+
+#: tbl_printview.php:340 tbl_structure.php:687
+msgid "Effective"
+msgstr "Effektiv"
+
+#: tbl_printview.php:365 tbl_structure.php:725
+msgid "Row Statistics"
+msgstr "Radstatistikk"
+
+#: tbl_printview.php:368 tbl_structure.php:728
+msgid "Statements"
+msgstr "Oversikt"
+
+#: tbl_printview.php:379 tbl_structure.php:740
+msgid "static"
+msgstr "statisk"
+
+#: tbl_printview.php:381 tbl_structure.php:742
+msgid "dynamic"
+msgstr "dynamisk"
+
+#: tbl_printview.php:403 tbl_structure.php:785
+msgid "Row length"
+msgstr "Radlengde"
+
+#: tbl_printview.php:413 tbl_structure.php:793
+>>>>>>> origin/master
 msgid " Row size "
 msgstr " Radstørrelse "
 
diff --git a/po/nl.po b/po/nl.po
index 844270ca1..30545dc39 100755
--- a/po/nl.po
+++ b/po/nl.po
@@ -3,7 +3,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2010-07-03 21:45+0530\n"
+=======
+"POT-Creation-Date: 2010-07-03 09:00-0400\n"
+>>>>>>> origin/master
 "PO-Revision-Date: 2010-05-31 01:06+0200\n"
 "Last-Translator: Bjorn <inbox@bjornroesbeke.be>\n"
 "Language-Team: dutch <nl@li.org>\n"
@@ -48,15 +52,26 @@ msgstr "Zoeken"
 #: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046
 #: libraries/Theme_Manager.class.php:311
 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719
+<<<<<<< HEAD
 #: libraries/common.lib.php:1344 libraries/common.lib.php:2301
 #: libraries/display_change_password.lib.php:82
 #: libraries/display_create_table.lib.php:62
+=======
+#: libraries/common.lib.php:1335 libraries/common.lib.php:2288
+#: libraries/display_change_password.lib.php:82
+#: libraries/display_create_table.lib.php:63
+>>>>>>> origin/master
 #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532
 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76
 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104
+<<<<<<< HEAD
 #: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480
 #: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782
+=======
+#: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477
+#: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782
+>>>>>>> origin/master
 #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328
 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142
 #: server_privileges.php:665 server_privileges.php:1641
@@ -66,8 +81,13 @@ msgstr "Zoeken"
 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171
 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265
 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561
+<<<<<<< HEAD
 #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560
 #: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512
+=======
+#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562
+#: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512
+>>>>>>> origin/master
 #: view_create.php:182 view_operations.php:101
 msgid "Go"
 msgstr "Start"
@@ -120,10 +140,17 @@ msgstr "Kolom namen"
 #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245
 #: libraries/export/latex.php:360 libraries/export/odt.php:297
 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100
+<<<<<<< HEAD
 #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093
 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
 #: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321
+=======
+#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070
+#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
+#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
+#: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321
+>>>>>>> origin/master
 msgid "Type"
 msgstr "Type"
 
@@ -164,9 +191,15 @@ msgstr "Commentaar"
 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322
 #: libraries/export/latex.php:430 libraries/export/odt.php:368
 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263
+<<<<<<< HEAD
 #: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596
 #: server_privileges.php:1911 server_privileges.php:1916
 #: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228
+=======
+#: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579
+#: server_privileges.php:1889 server_privileges.php:1894
+#: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228
+>>>>>>> origin/master
 #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342
 msgid "No"
 msgstr "Nee"
@@ -180,9 +213,15 @@ msgstr "Nee"
 #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106
 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262
 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344
+<<<<<<< HEAD
 #: server_databases.php:64 server_privileges.php:1582
 #: server_privileges.php:1596 server_privileges.php:1911
 #: server_privileges.php:1914 server_privileges.php:2210 sql.php:193
+=======
+#: server_databases.php:64 server_privileges.php:1565
+#: server_privileges.php:1579 server_privileges.php:1889
+#: server_privileges.php:1892 server_privileges.php:2187 sql.php:193
+>>>>>>> origin/master
 #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350
 #: tbl_tracking.php:335 tbl_tracking.php:340
 msgid "Yes"
@@ -231,7 +270,15 @@ msgstr "Hernoem database naar"
 msgid "Command"
 msgstr "Commando"
 
+<<<<<<< HEAD
 #: db_operations.php:466
+=======
+#: db_operations.php:429 tbl_change.php:1140
+msgid "and then"
+msgstr "en dan"
+
+#: db_operations.php:455
+>>>>>>> origin/master
 msgid "Copy database to"
 msgstr "Kopieer database naar"
 
@@ -317,7 +364,11 @@ msgstr "Inschakelen"
 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730
 #: server_collations.php:54 server_collations.php:66 server_databases.php:111
 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179
+<<<<<<< HEAD
 #: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326
+=======
+#: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326
+>>>>>>> origin/master
 msgid "Collation"
 msgstr "Collatie"
 
@@ -346,7 +397,11 @@ msgstr "Tabel"
 #: db_printview.php:105 libraries/db_structure.lib.php:56
 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146
 #: navigation.php:638 navigation.php:660 server_databases.php:122
+<<<<<<< HEAD
 #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775
+=======
+#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777
+>>>>>>> origin/master
 msgid "Rows"
 msgstr "Rijen"
 
@@ -361,19 +416,31 @@ msgstr "in gebruik"
 
 #: db_printview.php:187 libraries/db_info.inc.php:88
 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433
+<<<<<<< HEAD
 #: tbl_structure.php:807
+=======
+#: tbl_structure.php:809
+>>>>>>> origin/master
 msgid "Creation"
 msgstr "Gecreëerd"
 
 #: db_printview.php:196 libraries/db_info.inc.php:93
 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443
+<<<<<<< HEAD
 #: tbl_structure.php:815
+=======
+#: tbl_structure.php:817
+>>>>>>> origin/master
 msgid "Last update"
 msgstr "Laatst bijgewerkt"
 
 #: db_printview.php:205 libraries/db_info.inc.php:98
 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453
+<<<<<<< HEAD
 #: tbl_structure.php:823
+=======
+#: tbl_structure.php:825
+>>>>>>> origin/master
 msgid "Last check"
 msgstr "Laatst gecontroleerd"
 
@@ -438,7 +505,11 @@ msgstr "Verwijder"
 
 #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553
 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779
+<<<<<<< HEAD
 #: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250
+=======
+#: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250
+>>>>>>> origin/master
 #: tbl_select.php:286
 msgid "Or"
 msgstr "Of"
@@ -657,9 +728,15 @@ msgstr "Met geselecteerd:"
 msgid "Check All"
 msgstr "Selecteer alles"
 
+<<<<<<< HEAD
 #: db_structure.php:529 libraries/display_tbl.lib.php:2077
 #: libraries/replication_gui.lib.php:36 server_databases.php:350
 #: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460
+=======
+#: db_structure.php:531 libraries/display_tbl.lib.php:2077
+#: libraries/replication_gui.lib.php:36 server_databases.php:350
+#: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462
+>>>>>>> origin/master
 msgid "Uncheck All"
 msgstr "Deselecteer alles"
 
@@ -1130,10 +1207,17 @@ msgid "Prev"
 msgstr "Vorige"
 
 #. l10n: Display text for next month link in calendar
+<<<<<<< HEAD
 #: js/messages.php:106 libraries/common.lib.php:2366
 #: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338
 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
 #: tbl_structure.php:799
+=======
+#: js/messages.php:77 libraries/common.lib.php:2353
+#: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338
+#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
+#: tbl_structure.php:801
+>>>>>>> origin/master
 msgid "Next"
 msgstr "Volgende"
 
@@ -1654,7 +1738,11 @@ msgstr "Wachtwoord:"
 msgid "Server Choice"
 msgstr "Serverkeuze"
 
+<<<<<<< HEAD
 #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63
+=======
+#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59
+>>>>>>> origin/master
 msgid "Cookies must be enabled past this point."
 msgstr "Cookies moeten aan staan voorbij dit punt."
 
@@ -1736,7 +1824,11 @@ msgstr ""
 "Kan iconv, libiconv en recode_string functies niet gebruiken hoewel de "
 "extensies geladen geladen lijken te zijn. Controleer de PHP configuratie."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:580
+=======
+#: libraries/common.inc.php:576
+>>>>>>> origin/master
 msgid ""
 "phpMyAdmin was unable to read your configuration file!<br />This might "
 "happen if PHP finds a parse error in it or PHP cannot find the file.<br /"
@@ -1753,12 +1845,20 @@ msgstr ""
 "blanco pagina wordt weergegeven zijn er geen problemen."
 
 # 'kon niet vanuit "%1$s" geladen worden' is juister.
+<<<<<<< HEAD
 #: libraries/common.inc.php:591
+=======
+#: libraries/common.inc.php:587
+>>>>>>> origin/master
 #, php-format
 msgid "Could not load default configuration from: %1$s"
 msgstr "Standaard configuratiebestand kon niet geladen worden vanuit: \"%1$s\""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:596
+=======
+#: libraries/common.inc.php:592
+>>>>>>> origin/master
 msgid ""
 "The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
 "configuration file!"
@@ -1766,28 +1866,48 @@ msgstr ""
 "De <tt>$cfg['PmaAbsoluteUri']</tt> richtlijn MOET gezet zijn in het "
 "configuratiebestand!"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:626
+=======
+#: libraries/common.inc.php:622
+>>>>>>> origin/master
 #, fuzzy, php-format
 #| msgid "Invalid server index: \"%s\""
 msgid "Invalid server index: %s"
 msgstr "Ongeldige serverindex: \"%s\""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:633
+=======
+#: libraries/common.inc.php:629
+>>>>>>> origin/master
 #, php-format
 msgid "Invalid hostname for server %1$s. Please review your configuration."
 msgstr "Ongeldige machinenaam voor server %1$s. Controleer uw configuratie."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:642 libraries/header.inc.php:100
+=======
+#: libraries/common.inc.php:638 libraries/header.inc.php:96
+>>>>>>> origin/master
 #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47
 #: main.php:185 test/theme.php:57
 msgid "Server"
 msgstr "Server"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:820
 msgid "Invalid authentication method set in configuration:"
 msgstr "Ongeldige authenticatiemethode opgegeven in configuratie:"
 
 #: libraries/common.inc.php:923
+=======
+#: libraries/common.inc.php:816
+msgid "Invalid authentication method set in configuration:"
+msgstr "Ongeldige authenticatiemethode opgegeven in configuratie:"
+
+#: libraries/common.inc.php:919
+>>>>>>> origin/master
 #, php-format
 msgid "You should upgrade to %s %s or later."
 msgstr "U moet opwaarderen (upgraden) naar %s %s of hoger."
@@ -2035,7 +2155,11 @@ msgstr ""
 "a]"
 
 #: libraries/db_structure.lib.php:69 server_databases.php:142
+<<<<<<< HEAD
 #: tbl_printview.php:335 tbl_structure.php:680
+=======
+#: tbl_printview.php:335 tbl_structure.php:682
+>>>>>>> origin/master
 msgid "Overhead"
 msgstr "Overhead"
 
@@ -2064,22 +2188,36 @@ msgid "Change password"
 msgstr "Wijzig wachtwoord"
 
 #: libraries/display_change_password.lib.php:35
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:348 server_privileges.php:808
+=======
+#: libraries/replication_gui.lib.php:348 server_privileges.php:807
+>>>>>>> origin/master
 msgid "No Password"
 msgstr "Geen wachtwoord"
 
 #: libraries/display_change_password.lib.php:41
 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63
 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:352 server_privileges.php:797
 #: server_privileges.php:801 server_privileges.php:812
 #: server_privileges.php:1555 server_synchronize.php:1175
+=======
+#: libraries/replication_gui.lib.php:352 server_privileges.php:796
+#: server_privileges.php:800 server_privileges.php:811
+#: server_privileges.php:1538 server_synchronize.php:1175
+>>>>>>> origin/master
 msgid "Password"
 msgstr "Wachtwoord"
 
 #: libraries/display_change_password.lib.php:46
 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359
+<<<<<<< HEAD
 #: server_privileges.php:816 server_privileges.php:819
+=======
+#: server_privileges.php:815 server_privileges.php:818
+>>>>>>> origin/master
 msgid "Re-type"
 msgstr "Type opnieuw"
 
@@ -2093,12 +2231,20 @@ msgid "MySQL 4.0 compatible"
 msgstr "Compatibel met MySQL&nbsp;4.0"
 
 #: libraries/display_change_password.lib.php:72
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:363 server_privileges.php:823
+=======
+#: libraries/replication_gui.lib.php:363 server_privileges.php:822
+>>>>>>> origin/master
 msgid "Generate Password"
 msgstr "Genereer wachtwoord"
 
 #: libraries/display_change_password.lib.php:75
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:366 server_privileges.php:826
+=======
+#: libraries/replication_gui.lib.php:366 server_privileges.php:825
+>>>>>>> origin/master
 msgid "Generate"
 msgstr "Genereer"
 
@@ -2188,7 +2334,11 @@ msgid "remember template"
 msgstr "Onthoud template"
 
 #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552
+=======
+#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549
+>>>>>>> origin/master
 msgid "Character set of the file:"
 msgstr "Karakter set van het bestand:"
 
@@ -2246,7 +2396,11 @@ msgstr ""
 msgid "File to import"
 msgstr "Te importeren bestand"
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527
+=======
+#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524
+>>>>>>> origin/master
 msgid "Location of the text file"
 msgstr "Locatie van het tekstbestand"
 
@@ -2254,13 +2408,21 @@ msgstr "Locatie van het tekstbestand"
 msgid "File uploads are not allowed on this server."
 msgstr "Het uploaden van bestanden is niet toegestaan op deze server."
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536
+=======
+#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533
+>>>>>>> origin/master
 #: tbl_change.php:1025
 msgid "The directory you set for upload work cannot be reached"
 msgstr ""
 "De directory die u heeft ingesteld om te uploaden kan niet worden bereikt."
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539
+=======
+#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536
+>>>>>>> origin/master
 #: tbl_change.php:1028
 msgid "web server upload directory"
 msgstr "web-server upload directory"
@@ -2396,7 +2558,11 @@ msgstr "Sorteren op sleutel"
 #: libraries/import/docsql.php:34 libraries/import/ldi.php:47
 #: libraries/import/ods.php:30 libraries/import/sql.php:20
 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26
+<<<<<<< HEAD
 #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751
+=======
+#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753
+>>>>>>> origin/master
 msgid "Options"
 msgstr "Opties"
 
@@ -2545,7 +2711,11 @@ msgstr "Buffer Pool Gebruik"
 
 #: libraries/engines/innodb.lib.php:194 server_databases.php:137
 #: server_databases.php:305 server_status.php:525 server_status.php:586
+<<<<<<< HEAD
 #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694
+=======
+#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696
+>>>>>>> origin/master
 msgid "Total"
 msgstr "Totaal"
 
@@ -2835,7 +3005,11 @@ msgstr ""
 "hernoemd met een opgehoogd volgnummer"
 
 #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88
+<<<<<<< HEAD
 #: tbl_printview.php:375 tbl_structure.php:735
+=======
+#: tbl_printview.php:375 tbl_structure.php:737
+>>>>>>> origin/master
 msgid "Format"
 msgstr "Opmaak"
 
@@ -2909,8 +3083,13 @@ msgstr "Microsoft Word 2000"
 #: libraries/export/latex.php:201 libraries/export/odt.php:48
 #: libraries/export/sql.php:106 libraries/export/sql.php:868
 #: libraries/export/texytext.php:27 server_databases.php:127
+<<<<<<< HEAD
 #: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316
 #: tbl_structure.php:663
+=======
+#: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316
+#: tbl_structure.php:665
+>>>>>>> origin/master
 msgid "Data"
 msgstr "Data"
 
@@ -2959,9 +3138,15 @@ msgstr "MIME-type"
 #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57
 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177
 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:332 server_privileges.php:732
 #: server_privileges.php:735 server_privileges.php:791
 #: server_privileges.php:1554 server_privileges.php:2092
+=======
+#: libraries/replication_gui.lib.php:332 server_privileges.php:731
+#: server_privileges.php:734 server_privileges.php:790
+#: server_privileges.php:1537 server_privileges.php:2069
+>>>>>>> origin/master
 #: server_processlist.php:55 server_synchronize.php:1159
 msgid "Host"
 msgstr "Machine"
@@ -3639,8 +3824,13 @@ msgstr ""
 
 #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59
 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:262 server_privileges.php:712
 #: server_privileges.php:715 server_privileges.php:722
+=======
+#: libraries/replication_gui.lib.php:262 server_privileges.php:711
+#: server_privileges.php:714 server_privileges.php:721
+>>>>>>> origin/master
 #: server_synchronize.php:1171
 msgid "User name"
 msgstr "Gebruikersnaam"
@@ -3657,14 +3847,22 @@ msgstr "Master status"
 msgid "Slave status"
 msgstr "Slave status"
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448
+=======
+#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445
+>>>>>>> origin/master
 #: server_status.php:737 server_variables.php:52
 msgid "Variable"
 msgstr "Variabelen"
 
 #: libraries/replication_gui.lib.php:118 server_status.php:738
 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138
+<<<<<<< HEAD
 #: tbl_structure.php:727
+=======
+#: tbl_structure.php:729
+>>>>>>> origin/master
 msgid "Value"
 msgstr "Waarde"
 
@@ -3684,11 +3882,16 @@ msgstr ""
 msgid "Add slave replication user"
 msgstr "Voeg slave replicatie gebruiker toe"
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:257 server_privileges.php:717
+=======
+#: libraries/replication_gui.lib.php:257 server_privileges.php:716
+>>>>>>> origin/master
 msgid "Any user"
 msgstr "Een willekeurige gebruiker"
 
 #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:349 server_privileges.php:718
 #: server_privileges.php:785 server_privileges.php:809
 #: server_privileges.php:1950 server_privileges.php:1980
@@ -3712,6 +3915,31 @@ msgid "Use Host Table"
 msgstr "Gebruik Host Tabel"
 
 #: libraries/replication_gui.lib.php:334 server_privileges.php:793
+=======
+#: libraries/replication_gui.lib.php:349 server_privileges.php:717
+#: server_privileges.php:784 server_privileges.php:808
+#: server_privileges.php:1928 server_privileges.php:1958
+msgid "Use text field"
+msgstr "Gebruik tekstveld"
+
+#: libraries/replication_gui.lib.php:305 server_privileges.php:764
+msgid "Any host"
+msgstr "Een willekeurige machine"
+
+#: libraries/replication_gui.lib.php:309 server_privileges.php:768
+msgid "Local"
+msgstr "lokaal"
+
+#: libraries/replication_gui.lib.php:315 server_privileges.php:773
+msgid "This Host"
+msgstr "Deze machine"
+
+#: libraries/replication_gui.lib.php:321 server_privileges.php:779
+msgid "Use Host Table"
+msgstr "Gebruik Host Tabel"
+
+#: libraries/replication_gui.lib.php:334 server_privileges.php:792
+>>>>>>> origin/master
 msgid ""
 "When Host table is used, this field is ignored and values stored in Host "
 "table are used instead."
@@ -8201,10 +8429,13 @@ msgstr ""
 msgid "Show insert query"
 msgstr "Toont SQL-query"
 
+<<<<<<< HEAD
 #: tbl_change.php:1140
 msgid "and then"
 msgstr "en dan"
 
+=======
+>>>>>>> origin/master
 #: tbl_change.php:1144
 msgid "Go back to previous page"
 msgstr "Terug"
@@ -8401,6 +8632,7 @@ msgstr "Controleer referentiële integriteit"
 msgid "Show tables"
 msgstr "Toon tabellen"
 
+<<<<<<< HEAD
 #: tbl_printview.php:309 tbl_structure.php:654
 msgid "Space usage"
 msgstr "Ruimtegebruik"
@@ -8434,6 +8666,41 @@ msgid "Row length"
 msgstr "Lengte van de rij"
 
 #: tbl_printview.php:413 tbl_structure.php:791
+=======
+#: tbl_printview.php:309 tbl_structure.php:656
+msgid "Space usage"
+msgstr "Ruimtegebruik"
+
+#: tbl_printview.php:313 tbl_structure.php:660
+msgid "Usage"
+msgstr "Gebruik"
+
+#: tbl_printview.php:340 tbl_structure.php:687
+msgid "Effective"
+msgstr "Effectief"
+
+#: tbl_printview.php:365 tbl_structure.php:725
+msgid "Row Statistics"
+msgstr "Rij-statistiek"
+
+#: tbl_printview.php:368 tbl_structure.php:728
+msgid "Statements"
+msgstr "Opdrachten"
+
+#: tbl_printview.php:379 tbl_structure.php:740
+msgid "static"
+msgstr "statisch"
+
+#: tbl_printview.php:381 tbl_structure.php:742
+msgid "dynamic"
+msgstr "dynamisch"
+
+#: tbl_printview.php:403 tbl_structure.php:785
+msgid "Row length"
+msgstr "Lengte van de rij"
+
+#: tbl_printview.php:413 tbl_structure.php:793
+>>>>>>> origin/master
 msgid " Row size "
 msgstr " Grootte van de rij"
 
diff --git a/po/phpmyadmin.pot b/po/phpmyadmin.pot
index a639af71e..64bbdff31 100755
--- a/po/phpmyadmin.pot
+++ b/po/phpmyadmin.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-07-03 21:45+0530\n"
+"POT-Creation-Date: 2010-07-03 09:00-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -49,15 +49,15 @@ msgstr ""
 #: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046
 #: libraries/Theme_Manager.class.php:311
 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719
-#: libraries/common.lib.php:1344 libraries/common.lib.php:2301
+#: libraries/common.lib.php:1335 libraries/common.lib.php:2288
 #: libraries/display_change_password.lib.php:82
-#: libraries/display_create_table.lib.php:62
+#: libraries/display_create_table.lib.php:63
 #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532
 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76
 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104
-#: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480
-#: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782
+#: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477
+#: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782
 #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328
 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142
 #: server_privileges.php:665 server_privileges.php:1641
@@ -67,8 +67,8 @@ msgstr ""
 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171
 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265
 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561
-#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560
-#: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512
+#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562
+#: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512
 #: view_create.php:182 view_operations.php:101
 msgid "Go"
 msgstr ""
@@ -119,10 +119,10 @@ msgstr ""
 #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245
 #: libraries/export/latex.php:360 libraries/export/odt.php:297
 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100
-#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093
+#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070
 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
-#: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321
+#: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321
 msgid "Type"
 msgstr ""
 
@@ -163,9 +163,9 @@ msgstr ""
 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322
 #: libraries/export/latex.php:430 libraries/export/odt.php:368
 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263
-#: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596
-#: server_privileges.php:1911 server_privileges.php:1916
-#: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228
+#: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579
+#: server_privileges.php:1889 server_privileges.php:1894
+#: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228
 #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342
 msgid "No"
 msgstr ""
@@ -179,9 +179,9 @@ msgstr ""
 #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106
 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262
 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344
-#: server_databases.php:64 server_privileges.php:1582
-#: server_privileges.php:1596 server_privileges.php:1911
-#: server_privileges.php:1914 server_privileges.php:2210 sql.php:193
+#: server_databases.php:64 server_privileges.php:1565
+#: server_privileges.php:1579 server_privileges.php:1889
+#: server_privileges.php:1892 server_privileges.php:2187 sql.php:193
 #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350
 #: tbl_tracking.php:335 tbl_tracking.php:340
 msgid "Yes"
@@ -230,7 +230,11 @@ msgstr ""
 msgid "Command"
 msgstr ""
 
-#: db_operations.php:466
+#: db_operations.php:429 tbl_change.php:1140
+msgid "and then"
+msgstr ""
+
+#: db_operations.php:455
 msgid "Copy database to"
 msgstr ""
 
@@ -312,7 +316,7 @@ msgstr ""
 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730
 #: server_collations.php:54 server_collations.php:66 server_databases.php:111
 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179
-#: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326
+#: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326
 msgid "Collation"
 msgstr ""
 
@@ -339,7 +343,7 @@ msgstr ""
 #: db_printview.php:105 libraries/db_structure.lib.php:56
 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146
 #: navigation.php:638 navigation.php:660 server_databases.php:122
-#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775
+#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777
 msgid "Rows"
 msgstr ""
 
@@ -354,19 +358,19 @@ msgstr ""
 
 #: db_printview.php:187 libraries/db_info.inc.php:88
 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433
-#: tbl_structure.php:807
+#: tbl_structure.php:809
 msgid "Creation"
 msgstr ""
 
 #: db_printview.php:196 libraries/db_info.inc.php:93
 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443
-#: tbl_structure.php:815
+#: tbl_structure.php:817
 msgid "Last update"
 msgstr ""
 
 #: db_printview.php:205 libraries/db_info.inc.php:98
 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453
-#: tbl_structure.php:823
+#: tbl_structure.php:825
 msgid "Last check"
 msgstr ""
 
@@ -430,7 +434,7 @@ msgstr ""
 
 #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553
 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779
-#: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250
+#: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250
 #: tbl_select.php:286
 msgid "Or"
 msgstr ""
@@ -642,9 +646,9 @@ msgstr ""
 msgid "Check All"
 msgstr ""
 
-#: db_structure.php:529 libraries/display_tbl.lib.php:2077
+#: db_structure.php:531 libraries/display_tbl.lib.php:2077
 #: libraries/replication_gui.lib.php:36 server_databases.php:350
-#: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460
+#: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462
 msgid "Uncheck All"
 msgstr ""
 
@@ -1062,10 +1066,10 @@ msgid "Prev"
 msgstr ""
 
 #. l10n: Display text for next month link in calendar
-#: js/messages.php:106 libraries/common.lib.php:2366
-#: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338
+#: js/messages.php:77 libraries/common.lib.php:2353
+#: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338
 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
-#: tbl_structure.php:799
+#: tbl_structure.php:801
 msgid "Next"
 msgstr ""
 
@@ -1553,7 +1557,7 @@ msgstr ""
 msgid "Server Choice"
 msgstr ""
 
-#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63
+#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59
 msgid "Cookies must be enabled past this point."
 msgstr ""
 
@@ -1628,7 +1632,7 @@ msgid ""
 "necessary extensions appear to be loaded. Check your PHP configuration."
 msgstr ""
 
-#: libraries/common.inc.php:580
+#: libraries/common.inc.php:576
 msgid ""
 "phpMyAdmin was unable to read your configuration file!<br />This might "
 "happen if PHP finds a parse error in it or PHP cannot find the file.<br /"
@@ -1638,38 +1642,38 @@ msgid ""
 "is fine."
 msgstr ""
 
-#: libraries/common.inc.php:591
+#: libraries/common.inc.php:587
 #, possible-php-format
 msgid "Could not load default configuration from: %1$s"
 msgstr ""
 
-#: libraries/common.inc.php:596
+#: libraries/common.inc.php:592
 msgid ""
 "The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
 "configuration file!"
 msgstr ""
 
-#: libraries/common.inc.php:626
+#: libraries/common.inc.php:622
 #, possible-php-format
 msgid "Invalid server index: %s"
 msgstr ""
 
-#: libraries/common.inc.php:633
+#: libraries/common.inc.php:629
 #, possible-php-format
 msgid "Invalid hostname for server %1$s. Please review your configuration."
 msgstr ""
 
-#: libraries/common.inc.php:642 libraries/header.inc.php:100
+#: libraries/common.inc.php:638 libraries/header.inc.php:96
 #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47
 #: main.php:185 test/theme.php:57
 msgid "Server"
 msgstr ""
 
-#: libraries/common.inc.php:820
+#: libraries/common.inc.php:816
 msgid "Invalid authentication method set in configuration:"
 msgstr ""
 
-#: libraries/common.inc.php:923
+#: libraries/common.inc.php:919
 #, possible-php-format
 msgid "You should upgrade to %s %s or later."
 msgstr ""
@@ -1912,7 +1916,7 @@ msgid ""
 msgstr ""
 
 #: libraries/db_structure.lib.php:69 server_databases.php:142
-#: tbl_printview.php:335 tbl_structure.php:680
+#: tbl_printview.php:335 tbl_structure.php:682
 msgid "Overhead"
 msgstr ""
 
@@ -1939,22 +1943,22 @@ msgid "Change password"
 msgstr ""
 
 #: libraries/display_change_password.lib.php:35
-#: libraries/replication_gui.lib.php:348 server_privileges.php:808
+#: libraries/replication_gui.lib.php:348 server_privileges.php:807
 msgid "No Password"
 msgstr ""
 
 #: libraries/display_change_password.lib.php:41
 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63
 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342
-#: libraries/replication_gui.lib.php:352 server_privileges.php:797
-#: server_privileges.php:801 server_privileges.php:812
-#: server_privileges.php:1555 server_synchronize.php:1175
+#: libraries/replication_gui.lib.php:352 server_privileges.php:796
+#: server_privileges.php:800 server_privileges.php:811
+#: server_privileges.php:1538 server_synchronize.php:1175
 msgid "Password"
 msgstr ""
 
 #: libraries/display_change_password.lib.php:46
 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359
-#: server_privileges.php:816 server_privileges.php:819
+#: server_privileges.php:815 server_privileges.php:818
 msgid "Re-type"
 msgstr ""
 
@@ -1967,12 +1971,12 @@ msgid "MySQL 4.0 compatible"
 msgstr ""
 
 #: libraries/display_change_password.lib.php:72
-#: libraries/replication_gui.lib.php:363 server_privileges.php:823
+#: libraries/replication_gui.lib.php:363 server_privileges.php:822
 msgid "Generate Password"
 msgstr ""
 
 #: libraries/display_change_password.lib.php:75
-#: libraries/replication_gui.lib.php:366 server_privileges.php:826
+#: libraries/replication_gui.lib.php:366 server_privileges.php:825
 msgid "Generate"
 msgstr ""
 
@@ -2054,7 +2058,7 @@ msgid "remember template"
 msgstr ""
 
 #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177
-#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552
+#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549
 msgid "Character set of the file:"
 msgstr ""
 
@@ -2107,7 +2111,7 @@ msgstr ""
 msgid "File to import"
 msgstr ""
 
-#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527
+#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524
 msgid "Location of the text file"
 msgstr ""
 
@@ -2115,12 +2119,12 @@ msgstr ""
 msgid "File uploads are not allowed on this server."
 msgstr ""
 
-#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536
+#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533
 #: tbl_change.php:1025
 msgid "The directory you set for upload work cannot be reached"
 msgstr ""
 
-#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539
+#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536
 #: tbl_change.php:1028
 msgid "web server upload directory"
 msgstr ""
@@ -2247,7 +2251,7 @@ msgstr ""
 #: libraries/import/docsql.php:34 libraries/import/ldi.php:47
 #: libraries/import/ods.php:30 libraries/import/sql.php:20
 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26
-#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751
+#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753
 msgid "Options"
 msgstr ""
 
@@ -2388,7 +2392,7 @@ msgstr ""
 
 #: libraries/engines/innodb.lib.php:194 server_databases.php:137
 #: server_databases.php:305 server_status.php:525 server_status.php:586
-#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694
+#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696
 msgid "Total"
 msgstr ""
 
@@ -2633,7 +2637,7 @@ msgid ""
 msgstr ""
 
 #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88
-#: tbl_printview.php:375 tbl_structure.php:735
+#: tbl_printview.php:375 tbl_structure.php:737
 msgid "Format"
 msgstr ""
 
@@ -2697,8 +2701,8 @@ msgstr ""
 #: libraries/export/latex.php:201 libraries/export/odt.php:48
 #: libraries/export/sql.php:106 libraries/export/sql.php:868
 #: libraries/export/texytext.php:27 server_databases.php:127
-#: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316
-#: tbl_structure.php:663
+#: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316
+#: tbl_structure.php:665
 msgid "Data"
 msgstr ""
 
@@ -2747,9 +2751,9 @@ msgstr ""
 #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57
 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177
 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275
-#: libraries/replication_gui.lib.php:332 server_privileges.php:732
-#: server_privileges.php:735 server_privileges.php:791
-#: server_privileges.php:1554 server_privileges.php:2092
+#: libraries/replication_gui.lib.php:332 server_privileges.php:731
+#: server_privileges.php:734 server_privileges.php:790
+#: server_privileges.php:1537 server_privileges.php:2069
 #: server_processlist.php:55 server_synchronize.php:1159
 msgid "Host"
 msgstr ""
@@ -3407,8 +3411,8 @@ msgstr ""
 
 #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59
 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255
-#: libraries/replication_gui.lib.php:262 server_privileges.php:712
-#: server_privileges.php:715 server_privileges.php:722
+#: libraries/replication_gui.lib.php:262 server_privileges.php:711
+#: server_privileges.php:714 server_privileges.php:721
 #: server_synchronize.php:1171
 msgid "User name"
 msgstr ""
@@ -3425,14 +3429,14 @@ msgstr ""
 msgid "Slave status"
 msgstr ""
 
-#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448
+#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445
 #: server_status.php:737 server_variables.php:52
 msgid "Variable"
 msgstr ""
 
 #: libraries/replication_gui.lib.php:118 server_status.php:738
 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138
-#: tbl_structure.php:727
+#: tbl_structure.php:729
 msgid "Value"
 msgstr ""
 
@@ -3450,34 +3454,34 @@ msgstr ""
 msgid "Add slave replication user"
 msgstr ""
 
-#: libraries/replication_gui.lib.php:257 server_privileges.php:717
+#: libraries/replication_gui.lib.php:257 server_privileges.php:716
 msgid "Any user"
 msgstr ""
 
 #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326
-#: libraries/replication_gui.lib.php:349 server_privileges.php:718
-#: server_privileges.php:785 server_privileges.php:809
-#: server_privileges.php:1950 server_privileges.php:1980
+#: libraries/replication_gui.lib.php:349 server_privileges.php:717
+#: server_privileges.php:784 server_privileges.php:808
+#: server_privileges.php:1928 server_privileges.php:1958
 msgid "Use text field"
 msgstr ""
 
-#: libraries/replication_gui.lib.php:305 server_privileges.php:765
+#: libraries/replication_gui.lib.php:305 server_privileges.php:764
 msgid "Any host"
 msgstr ""
 
-#: libraries/replication_gui.lib.php:309 server_privileges.php:769
+#: libraries/replication_gui.lib.php:309 server_privileges.php:768
 msgid "Local"
 msgstr ""
 
-#: libraries/replication_gui.lib.php:315 server_privileges.php:774
+#: libraries/replication_gui.lib.php:315 server_privileges.php:773
 msgid "This Host"
 msgstr ""
 
-#: libraries/replication_gui.lib.php:321 server_privileges.php:780
+#: libraries/replication_gui.lib.php:321 server_privileges.php:779
 msgid "Use Host Table"
 msgstr ""
 
-#: libraries/replication_gui.lib.php:334 server_privileges.php:793
+#: libraries/replication_gui.lib.php:334 server_privileges.php:792
 msgid ""
 "When Host table is used, this field is ignored and values stored in Host "
 "table are used instead."
@@ -7335,10 +7339,6 @@ msgstr ""
 msgid "Show insert query"
 msgstr ""
 
-#: tbl_change.php:1140
-msgid "and then"
-msgstr ""
-
 #: tbl_change.php:1144
 msgid "Go back to previous page"
 msgstr ""
@@ -7529,39 +7529,39 @@ msgstr ""
 msgid "Show tables"
 msgstr ""
 
-#: tbl_printview.php:309 tbl_structure.php:654
+#: tbl_printview.php:309 tbl_structure.php:656
 msgid "Space usage"
 msgstr ""
 
-#: tbl_printview.php:313 tbl_structure.php:658
+#: tbl_printview.php:313 tbl_structure.php:660
 msgid "Usage"
 msgstr ""
 
-#: tbl_printview.php:340 tbl_structure.php:685
+#: tbl_printview.php:340 tbl_structure.php:687
 msgid "Effective"
 msgstr ""
 
-#: tbl_printview.php:365 tbl_structure.php:723
+#: tbl_printview.php:365 tbl_structure.php:725
 msgid "Row Statistics"
 msgstr ""
 
-#: tbl_printview.php:368 tbl_structure.php:726
+#: tbl_printview.php:368 tbl_structure.php:728
 msgid "Statements"
 msgstr ""
 
-#: tbl_printview.php:379 tbl_structure.php:738
+#: tbl_printview.php:379 tbl_structure.php:740
 msgid "static"
 msgstr ""
 
-#: tbl_printview.php:381 tbl_structure.php:740
+#: tbl_printview.php:381 tbl_structure.php:742
 msgid "dynamic"
 msgstr ""
 
-#: tbl_printview.php:403 tbl_structure.php:783
+#: tbl_printview.php:403 tbl_structure.php:785
 msgid "Row length"
 msgstr ""
 
-#: tbl_printview.php:413 tbl_structure.php:791
+#: tbl_printview.php:413 tbl_structure.php:793
 msgid " Row size "
 msgstr ""
 
diff --git a/po/pl.po b/po/pl.po
index 4ff04c878..8caaedd89 100755
--- a/po/pl.po
+++ b/po/pl.po
@@ -3,7 +3,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2010-07-03 21:45+0530\n"
+=======
+"POT-Creation-Date: 2010-07-03 09:00-0400\n"
+>>>>>>> origin/master
 "PO-Revision-Date: 2010-03-12 09:17+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: polish <pl@li.org>\n"
@@ -48,15 +52,26 @@ msgstr "Szukaj"
 #: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046
 #: libraries/Theme_Manager.class.php:311
 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719
+<<<<<<< HEAD
 #: libraries/common.lib.php:1344 libraries/common.lib.php:2301
 #: libraries/display_change_password.lib.php:82
 #: libraries/display_create_table.lib.php:62
+=======
+#: libraries/common.lib.php:1335 libraries/common.lib.php:2288
+#: libraries/display_change_password.lib.php:82
+#: libraries/display_create_table.lib.php:63
+>>>>>>> origin/master
 #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532
 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76
 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104
+<<<<<<< HEAD
 #: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480
 #: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782
+=======
+#: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477
+#: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782
+>>>>>>> origin/master
 #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328
 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142
 #: server_privileges.php:665 server_privileges.php:1641
@@ -66,8 +81,13 @@ msgstr "Szukaj"
 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171
 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265
 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561
+<<<<<<< HEAD
 #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560
 #: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512
+=======
+#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562
+#: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512
+>>>>>>> origin/master
 #: view_create.php:182 view_operations.php:101
 msgid "Go"
 msgstr "Wykonaj"
@@ -120,10 +140,17 @@ msgstr "Nazwy kolumn"
 #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245
 #: libraries/export/latex.php:360 libraries/export/odt.php:297
 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100
+<<<<<<< HEAD
 #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093
 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
 #: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321
+=======
+#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070
+#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
+#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
+#: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321
+>>>>>>> origin/master
 msgid "Type"
 msgstr "Typ"
 
@@ -164,9 +191,15 @@ msgstr "Komentarze"
 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322
 #: libraries/export/latex.php:430 libraries/export/odt.php:368
 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263
+<<<<<<< HEAD
 #: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596
 #: server_privileges.php:1911 server_privileges.php:1916
 #: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228
+=======
+#: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579
+#: server_privileges.php:1889 server_privileges.php:1894
+#: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228
+>>>>>>> origin/master
 #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342
 msgid "No"
 msgstr "Nie"
@@ -180,9 +213,15 @@ msgstr "Nie"
 #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106
 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262
 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344
+<<<<<<< HEAD
 #: server_databases.php:64 server_privileges.php:1582
 #: server_privileges.php:1596 server_privileges.php:1911
 #: server_privileges.php:1914 server_privileges.php:2210 sql.php:193
+=======
+#: server_databases.php:64 server_privileges.php:1565
+#: server_privileges.php:1579 server_privileges.php:1889
+#: server_privileges.php:1892 server_privileges.php:2187 sql.php:193
+>>>>>>> origin/master
 #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350
 #: tbl_tracking.php:335 tbl_tracking.php:340
 msgid "Yes"
@@ -231,7 +270,15 @@ msgstr "Zmień nazwę bazy danych na"
 msgid "Command"
 msgstr "Polecenie"
 
+<<<<<<< HEAD
 #: db_operations.php:466
+=======
+#: db_operations.php:429 tbl_change.php:1140
+msgid "and then"
+msgstr "a następnie"
+
+#: db_operations.php:455
+>>>>>>> origin/master
 msgid "Copy database to"
 msgstr "Kopiuj bazę danych do"
 
@@ -319,7 +366,11 @@ msgstr "Włącz"
 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730
 #: server_collations.php:54 server_collations.php:66 server_databases.php:111
 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179
+<<<<<<< HEAD
 #: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326
+=======
+#: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326
+>>>>>>> origin/master
 msgid "Collation"
 msgstr "Metoda porównywania napisów"
 
@@ -348,7 +399,11 @@ msgstr "Tabela"
 #: db_printview.php:105 libraries/db_structure.lib.php:56
 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146
 #: navigation.php:638 navigation.php:660 server_databases.php:122
+<<<<<<< HEAD
 #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775
+=======
+#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777
+>>>>>>> origin/master
 msgid "Rows"
 msgstr "Rekordów"
 
@@ -363,19 +418,31 @@ msgstr "w użyciu"
 
 #: db_printview.php:187 libraries/db_info.inc.php:88
 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433
+<<<<<<< HEAD
 #: tbl_structure.php:807
+=======
+#: tbl_structure.php:809
+>>>>>>> origin/master
 msgid "Creation"
 msgstr "Utworzenie"
 
 #: db_printview.php:196 libraries/db_info.inc.php:93
 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443
+<<<<<<< HEAD
 #: tbl_structure.php:815
+=======
+#: tbl_structure.php:817
+>>>>>>> origin/master
 msgid "Last update"
 msgstr "Ostatnia aktualizacja"
 
 #: db_printview.php:205 libraries/db_info.inc.php:98
 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453
+<<<<<<< HEAD
 #: tbl_structure.php:823
+=======
+#: tbl_structure.php:825
+>>>>>>> origin/master
 msgid "Last check"
 msgstr "Ostatnie sprawdzenie"
 
@@ -440,7 +507,11 @@ msgstr "Usuń"
 
 #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553
 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779
+<<<<<<< HEAD
 #: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250
+=======
+#: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250
+>>>>>>> origin/master
 #: tbl_select.php:286
 msgid "Or"
 msgstr "lub"
@@ -660,9 +731,15 @@ msgstr "Zaznaczone:"
 msgid "Check All"
 msgstr "Zaznacz wszystkie"
 
+<<<<<<< HEAD
 #: db_structure.php:529 libraries/display_tbl.lib.php:2077
 #: libraries/replication_gui.lib.php:36 server_databases.php:350
 #: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460
+=======
+#: db_structure.php:531 libraries/display_tbl.lib.php:2077
+#: libraries/replication_gui.lib.php:36 server_databases.php:350
+#: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462
+>>>>>>> origin/master
 msgid "Uncheck All"
 msgstr "Odznacz wszystkie"
 
@@ -1135,10 +1212,17 @@ msgid "Prev"
 msgstr "Poprzednie"
 
 #. l10n: Display text for next month link in calendar
+<<<<<<< HEAD
 #: js/messages.php:106 libraries/common.lib.php:2366
 #: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338
 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
 #: tbl_structure.php:799
+=======
+#: js/messages.php:77 libraries/common.lib.php:2353
+#: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338
+#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
+#: tbl_structure.php:801
+>>>>>>> origin/master
 msgid "Next"
 msgstr "Następne"
 
@@ -1688,7 +1772,11 @@ msgstr "Hasło:"
 msgid "Server Choice"
 msgstr "Wybór serwera"
 
+<<<<<<< HEAD
 #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63
+=======
+#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59
+>>>>>>> origin/master
 msgid "Cookies must be enabled past this point."
 msgstr "Odtąd musi być włączona obsługa ciasteczek."
 
@@ -1769,7 +1857,11 @@ msgstr ""
 "Nie udało się użyć ani funkcji iconv, ani libiconv, mimo że rozszerzenia "
 "zgłaszają się jako załadowane. Proszę sprawdzić swoją konfigurację PHP."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:580
+=======
+#: libraries/common.inc.php:576
+>>>>>>> origin/master
 msgid ""
 "phpMyAdmin was unable to read your configuration file!<br />This might "
 "happen if PHP finds a parse error in it or PHP cannot find the file.<br /"
@@ -1785,13 +1877,21 @@ msgstr ""
 "przypadków brakuje gdzieś cudzysłowu lub średnika.<br />Jeżeli otrzymasz "
 "pustą stronę, wszystko jest w porządku."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:591
+=======
+#: libraries/common.inc.php:587
+>>>>>>> origin/master
 #, fuzzy, php-format
 #| msgid "Could not load default configuration from: \"%1$s\""
 msgid "Could not load default configuration from: %1$s"
 msgstr "Nie udało się załadować domyślnej konfiguracji z pliku: \"%1$s\""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:596
+=======
+#: libraries/common.inc.php:592
+>>>>>>> origin/master
 msgid ""
 "The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
 "configuration file!"
@@ -1799,29 +1899,49 @@ msgstr ""
 "Dyrektywa <tt>$cfg['PmaAbsoluteUri']</tt> musi być ustawiona w pliku "
 "konfiguracyjnym!"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:626
+=======
+#: libraries/common.inc.php:622
+>>>>>>> origin/master
 #, fuzzy, php-format
 #| msgid "Invalid server index: \"%s\""
 msgid "Invalid server index: %s"
 msgstr "Niewłaściwy numer serwera: \"%s\""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:633
+=======
+#: libraries/common.inc.php:629
+>>>>>>> origin/master
 #, php-format
 msgid "Invalid hostname for server %1$s. Please review your configuration."
 msgstr ""
 "Niewłaściwa nazwa hosta serwera %1$s. Proszę przyjrzeć się konfiguracji."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:642 libraries/header.inc.php:100
+=======
+#: libraries/common.inc.php:638 libraries/header.inc.php:96
+>>>>>>> origin/master
 #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47
 #: main.php:185 test/theme.php:57
 msgid "Server"
 msgstr "Serwer"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:820
 msgid "Invalid authentication method set in configuration:"
 msgstr "W konfiguracji ustawiono błędną metodę uwierzytelniania:"
 
 #: libraries/common.inc.php:923
+=======
+#: libraries/common.inc.php:816
+msgid "Invalid authentication method set in configuration:"
+msgstr "W konfiguracji ustawiono błędną metodę uwierzytelniania:"
+
+#: libraries/common.inc.php:919
+>>>>>>> origin/master
 #, php-format
 msgid "You should upgrade to %s %s or later."
 msgstr "Poleca się aktualizację do %s w wersji %s lub późniejszej."
@@ -2069,7 +2189,11 @@ msgid ""
 msgstr "Być może w przybliżeniu. Zobacz FAQ 3.11"
 
 #: libraries/db_structure.lib.php:69 server_databases.php:142
+<<<<<<< HEAD
 #: tbl_printview.php:335 tbl_structure.php:680
+=======
+#: tbl_printview.php:335 tbl_structure.php:682
+>>>>>>> origin/master
 msgid "Overhead"
 msgstr "Nadmiar"
 
@@ -2099,22 +2223,36 @@ msgid "Change password"
 msgstr "Zmień hasło"
 
 #: libraries/display_change_password.lib.php:35
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:348 server_privileges.php:808
+=======
+#: libraries/replication_gui.lib.php:348 server_privileges.php:807
+>>>>>>> origin/master
 msgid "No Password"
 msgstr "Brak hasła"
 
 #: libraries/display_change_password.lib.php:41
 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63
 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:352 server_privileges.php:797
 #: server_privileges.php:801 server_privileges.php:812
 #: server_privileges.php:1555 server_synchronize.php:1175
+=======
+#: libraries/replication_gui.lib.php:352 server_privileges.php:796
+#: server_privileges.php:800 server_privileges.php:811
+#: server_privileges.php:1538 server_synchronize.php:1175
+>>>>>>> origin/master
 msgid "Password"
 msgstr "Hasło"
 
 #: libraries/display_change_password.lib.php:46
 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359
+<<<<<<< HEAD
 #: server_privileges.php:816 server_privileges.php:819
+=======
+#: server_privileges.php:815 server_privileges.php:818
+>>>>>>> origin/master
 msgid "Re-type"
 msgstr "Ponownie"
 
@@ -2129,12 +2267,20 @@ msgid "MySQL 4.0 compatible"
 msgstr "Kompatybilny z MySQL-em&nbsp;4.0"
 
 #: libraries/display_change_password.lib.php:72
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:363 server_privileges.php:823
+=======
+#: libraries/replication_gui.lib.php:363 server_privileges.php:822
+>>>>>>> origin/master
 msgid "Generate Password"
 msgstr "Generuj hasło"
 
 #: libraries/display_change_password.lib.php:75
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:366 server_privileges.php:826
+=======
+#: libraries/replication_gui.lib.php:366 server_privileges.php:825
+>>>>>>> origin/master
 msgid "Generate"
 msgstr "Generuj"
 
@@ -2222,7 +2368,11 @@ msgid "remember template"
 msgstr "pamiętaj szablon"
 
 #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552
+=======
+#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549
+>>>>>>> origin/master
 msgid "Character set of the file:"
 msgstr "Kodowanie pliku:"
 
@@ -2275,7 +2425,11 @@ msgstr ""
 msgid "File to import"
 msgstr "Plik do importu"
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527
+=======
+#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524
+>>>>>>> origin/master
 msgid "Location of the text file"
 msgstr "Lokalizacja pliku tekstowego"
 
@@ -2283,12 +2437,20 @@ msgstr "Lokalizacja pliku tekstowego"
 msgid "File uploads are not allowed on this server."
 msgstr "Serwer nie pozwala na upload plików."
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536
+=======
+#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533
+>>>>>>> origin/master
 #: tbl_change.php:1025
 msgid "The directory you set for upload work cannot be reached"
 msgstr "Katalog ustalony dla uploadu jest nieosiągalny"
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539
+=======
+#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536
+>>>>>>> origin/master
 #: tbl_change.php:1028
 msgid "web server upload directory"
 msgstr "katalog serwera WWW dla uploadu"
@@ -2426,7 +2588,11 @@ msgstr "Sortuj wg klucza"
 #: libraries/import/docsql.php:34 libraries/import/ldi.php:47
 #: libraries/import/ods.php:30 libraries/import/sql.php:20
 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26
+<<<<<<< HEAD
 #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751
+=======
+#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753
+>>>>>>> origin/master
 msgid "Options"
 msgstr "Opcje"
 
@@ -2573,7 +2739,11 @@ msgstr "Użycie rezerw buforowych"
 
 #: libraries/engines/innodb.lib.php:194 server_databases.php:137
 #: server_databases.php:305 server_status.php:525 server_status.php:586
+<<<<<<< HEAD
 #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694
+=======
+#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696
+>>>>>>> origin/master
 msgid "Total"
 msgstr "Sumarycznie"
 
@@ -2851,7 +3021,11 @@ msgstr ""
 "i dostają kolejny najwyższy numer."
 
 #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88
+<<<<<<< HEAD
 #: tbl_printview.php:375 tbl_structure.php:735
+=======
+#: tbl_printview.php:375 tbl_structure.php:737
+>>>>>>> origin/master
 msgid "Format"
 msgstr "Format"
 
@@ -2923,8 +3097,13 @@ msgstr "Microsoft Word 2000"
 #: libraries/export/latex.php:201 libraries/export/odt.php:48
 #: libraries/export/sql.php:106 libraries/export/sql.php:868
 #: libraries/export/texytext.php:27 server_databases.php:127
+<<<<<<< HEAD
 #: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316
 #: tbl_structure.php:663
+=======
+#: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316
+#: tbl_structure.php:665
+>>>>>>> origin/master
 msgid "Data"
 msgstr "Dane"
 
@@ -2973,9 +3152,15 @@ msgstr "Typ MIME"
 #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57
 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177
 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:332 server_privileges.php:732
 #: server_privileges.php:735 server_privileges.php:791
 #: server_privileges.php:1554 server_privileges.php:2092
+=======
+#: libraries/replication_gui.lib.php:332 server_privileges.php:731
+#: server_privileges.php:734 server_privileges.php:790
+#: server_privileges.php:1537 server_privileges.php:2069
+>>>>>>> origin/master
 #: server_processlist.php:55 server_synchronize.php:1159
 msgid "Host"
 msgstr "Host"
@@ -3654,8 +3839,13 @@ msgstr ""
 
 #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59
 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:262 server_privileges.php:712
 #: server_privileges.php:715 server_privileges.php:722
+=======
+#: libraries/replication_gui.lib.php:262 server_privileges.php:711
+#: server_privileges.php:714 server_privileges.php:721
+>>>>>>> origin/master
 #: server_synchronize.php:1171
 msgid "User name"
 msgstr "Nazwa użytkownika"
@@ -3675,14 +3865,22 @@ msgstr "Status serwera podrzędnego"
 msgid "Slave status"
 msgstr "Status serwera podrzędnego"
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448
+=======
+#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445
+>>>>>>> origin/master
 #: server_status.php:737 server_variables.php:52
 msgid "Variable"
 msgstr "Zmienna"
 
 #: libraries/replication_gui.lib.php:118 server_status.php:738
 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138
+<<<<<<< HEAD
 #: tbl_structure.php:727
+=======
+#: tbl_structure.php:729
+>>>>>>> origin/master
 msgid "Value"
 msgstr "Wartość"
 
@@ -3700,11 +3898,16 @@ msgstr ""
 msgid "Add slave replication user"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:257 server_privileges.php:717
+=======
+#: libraries/replication_gui.lib.php:257 server_privileges.php:716
+>>>>>>> origin/master
 msgid "Any user"
 msgstr "Dowolny użytkownik"
 
 #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:349 server_privileges.php:718
 #: server_privileges.php:785 server_privileges.php:809
 #: server_privileges.php:1950 server_privileges.php:1980
@@ -3728,6 +3931,31 @@ msgid "Use Host Table"
 msgstr "Użyj tabeli hostów"
 
 #: libraries/replication_gui.lib.php:334 server_privileges.php:793
+=======
+#: libraries/replication_gui.lib.php:349 server_privileges.php:717
+#: server_privileges.php:784 server_privileges.php:808
+#: server_privileges.php:1928 server_privileges.php:1958
+msgid "Use text field"
+msgstr "Użyj pola tekstowego"
+
+#: libraries/replication_gui.lib.php:305 server_privileges.php:764
+msgid "Any host"
+msgstr "Dowolny host"
+
+#: libraries/replication_gui.lib.php:309 server_privileges.php:768
+msgid "Local"
+msgstr "Host lokalny"
+
+#: libraries/replication_gui.lib.php:315 server_privileges.php:773
+msgid "This Host"
+msgstr "Ten host"
+
+#: libraries/replication_gui.lib.php:321 server_privileges.php:779
+msgid "Use Host Table"
+msgstr "Użyj tabeli hostów"
+
+#: libraries/replication_gui.lib.php:334 server_privileges.php:792
+>>>>>>> origin/master
 msgid ""
 "When Host table is used, this field is ignored and values stored in Host "
 "table are used instead."
@@ -8058,10 +8286,13 @@ msgstr ""
 msgid "Show insert query"
 msgstr "Wyświetlane jest zapytanie SQL."
 
+<<<<<<< HEAD
 #: tbl_change.php:1140
 msgid "and then"
 msgstr "a następnie"
 
+=======
+>>>>>>> origin/master
 #: tbl_change.php:1144
 msgid "Go back to previous page"
 msgstr "Wróć"
@@ -8257,6 +8488,7 @@ msgstr "Sprawdź spójność powiązań:"
 msgid "Show tables"
 msgstr "Pokaż tabele"
 
+<<<<<<< HEAD
 #: tbl_printview.php:309 tbl_structure.php:654
 msgid "Space usage"
 msgstr "Wykorzystanie przestrzeni"
@@ -8290,6 +8522,41 @@ msgid "Row length"
 msgstr "Długość rekordu"
 
 #: tbl_printview.php:413 tbl_structure.php:791
+=======
+#: tbl_printview.php:309 tbl_structure.php:656
+msgid "Space usage"
+msgstr "Wykorzystanie przestrzeni"
+
+#: tbl_printview.php:313 tbl_structure.php:660
+msgid "Usage"
+msgstr "Wykorzystanie"
+
+#: tbl_printview.php:340 tbl_structure.php:687
+msgid "Effective"
+msgstr "Efektywne"
+
+#: tbl_printview.php:365 tbl_structure.php:725
+msgid "Row Statistics"
+msgstr "Statystyka rekordów"
+
+#: tbl_printview.php:368 tbl_structure.php:728
+msgid "Statements"
+msgstr "Cecha"
+
+#: tbl_printview.php:379 tbl_structure.php:740
+msgid "static"
+msgstr ""
+
+#: tbl_printview.php:381 tbl_structure.php:742
+msgid "dynamic"
+msgstr "zmienny"
+
+#: tbl_printview.php:403 tbl_structure.php:785
+msgid "Row length"
+msgstr "Długość rekordu"
+
+#: tbl_printview.php:413 tbl_structure.php:793
+>>>>>>> origin/master
 msgid " Row size "
 msgstr " Rozmiar rekordu "
 
diff --git a/po/pt.po b/po/pt.po
index cc830bc4e..07e24b916 100755
--- a/po/pt.po
+++ b/po/pt.po
@@ -3,7 +3,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2010-07-03 21:45+0530\n"
+=======
+"POT-Creation-Date: 2010-07-03 09:00-0400\n"
+>>>>>>> origin/master
 "PO-Revision-Date: 2010-03-12 09:17+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: portuguese <pt@li.org>\n"
@@ -45,15 +49,26 @@ msgstr "Pesquisar"
 #: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046
 #: libraries/Theme_Manager.class.php:311
 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719
+<<<<<<< HEAD
 #: libraries/common.lib.php:1344 libraries/common.lib.php:2301
 #: libraries/display_change_password.lib.php:82
 #: libraries/display_create_table.lib.php:62
+=======
+#: libraries/common.lib.php:1335 libraries/common.lib.php:2288
+#: libraries/display_change_password.lib.php:82
+#: libraries/display_create_table.lib.php:63
+>>>>>>> origin/master
 #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532
 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76
 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104
+<<<<<<< HEAD
 #: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480
 #: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782
+=======
+#: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477
+#: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782
+>>>>>>> origin/master
 #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328
 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142
 #: server_privileges.php:665 server_privileges.php:1641
@@ -63,8 +78,13 @@ msgstr "Pesquisar"
 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171
 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265
 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561
+<<<<<<< HEAD
 #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560
 #: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512
+=======
+#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562
+#: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512
+>>>>>>> origin/master
 #: view_create.php:182 view_operations.php:101
 msgid "Go"
 msgstr "Executa"
@@ -117,10 +137,17 @@ msgstr "Nome dos Campos"
 #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245
 #: libraries/export/latex.php:360 libraries/export/odt.php:297
 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100
+<<<<<<< HEAD
 #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093
 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
 #: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321
+=======
+#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070
+#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
+#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
+#: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321
+>>>>>>> origin/master
 msgid "Type"
 msgstr "Tipo"
 
@@ -161,9 +188,15 @@ msgstr "Comentários"
 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322
 #: libraries/export/latex.php:430 libraries/export/odt.php:368
 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263
+<<<<<<< HEAD
 #: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596
 #: server_privileges.php:1911 server_privileges.php:1916
 #: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228
+=======
+#: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579
+#: server_privileges.php:1889 server_privileges.php:1894
+#: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228
+>>>>>>> origin/master
 #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342
 msgid "No"
 msgstr "Não"
@@ -177,9 +210,15 @@ msgstr "Não"
 #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106
 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262
 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344
+<<<<<<< HEAD
 #: server_databases.php:64 server_privileges.php:1582
 #: server_privileges.php:1596 server_privileges.php:1911
 #: server_privileges.php:1914 server_privileges.php:2210 sql.php:193
+=======
+#: server_databases.php:64 server_privileges.php:1565
+#: server_privileges.php:1579 server_privileges.php:1889
+#: server_privileges.php:1892 server_privileges.php:2187 sql.php:193
+>>>>>>> origin/master
 #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350
 #: tbl_tracking.php:335 tbl_tracking.php:340
 msgid "Yes"
@@ -230,7 +269,15 @@ msgstr "Renomeia a tabela para "
 msgid "Command"
 msgstr "Comando"
 
+<<<<<<< HEAD
 #: db_operations.php:466
+=======
+#: db_operations.php:429 tbl_change.php:1140
+msgid "and then"
+msgstr ""
+
+#: db_operations.php:455
+>>>>>>> origin/master
 #, fuzzy
 msgid "Copy database to"
 msgstr "Sem bases de dados"
@@ -321,7 +368,11 @@ msgstr "Activado"
 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730
 #: server_collations.php:54 server_collations.php:66 server_databases.php:111
 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179
+<<<<<<< HEAD
 #: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326
+=======
+#: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326
+>>>>>>> origin/master
 #, fuzzy
 msgid "Collation"
 msgstr "Criação"
@@ -351,7 +402,11 @@ msgstr "Tabela"
 #: db_printview.php:105 libraries/db_structure.lib.php:56
 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146
 #: navigation.php:638 navigation.php:660 server_databases.php:122
+<<<<<<< HEAD
 #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775
+=======
+#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777
+>>>>>>> origin/master
 msgid "Rows"
 msgstr "Registos"
 
@@ -366,19 +421,31 @@ msgstr "em uso"
 
 #: db_printview.php:187 libraries/db_info.inc.php:88
 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433
+<<<<<<< HEAD
 #: tbl_structure.php:807
+=======
+#: tbl_structure.php:809
+>>>>>>> origin/master
 msgid "Creation"
 msgstr "Criação"
 
 #: db_printview.php:196 libraries/db_info.inc.php:93
 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443
+<<<<<<< HEAD
 #: tbl_structure.php:815
+=======
+#: tbl_structure.php:817
+>>>>>>> origin/master
 msgid "Last update"
 msgstr "Actualização"
 
 #: db_printview.php:205 libraries/db_info.inc.php:98
 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453
+<<<<<<< HEAD
 #: tbl_structure.php:823
+=======
+#: tbl_structure.php:825
+>>>>>>> origin/master
 msgid "Last check"
 msgstr "Verificação"
 
@@ -443,7 +510,11 @@ msgstr "Elim."
 
 #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553
 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779
+<<<<<<< HEAD
 #: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250
+=======
+#: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250
+>>>>>>> origin/master
 #: tbl_select.php:286
 msgid "Or"
 msgstr "Ou"
@@ -662,9 +733,15 @@ msgstr "Com os seleccionados:"
 msgid "Check All"
 msgstr "Todos"
 
+<<<<<<< HEAD
 #: db_structure.php:529 libraries/display_tbl.lib.php:2077
 #: libraries/replication_gui.lib.php:36 server_databases.php:350
 #: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460
+=======
+#: db_structure.php:531 libraries/display_tbl.lib.php:2077
+#: libraries/replication_gui.lib.php:36 server_databases.php:350
+#: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462
+>>>>>>> origin/master
 msgid "Uncheck All"
 msgstr "Nenhum"
 
@@ -1122,10 +1199,17 @@ msgid "Prev"
 msgstr "Anterior"
 
 #. l10n: Display text for next month link in calendar
+<<<<<<< HEAD
 #: js/messages.php:106 libraries/common.lib.php:2366
 #: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338
 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
 #: tbl_structure.php:799
+=======
+#: js/messages.php:77 libraries/common.lib.php:2353
+#: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338
+#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
+#: tbl_structure.php:801
+>>>>>>> origin/master
 msgid "Next"
 msgstr "Próximo"
 
@@ -1662,7 +1746,11 @@ msgstr "Palavra-passe&nbsp;:"
 msgid "Server Choice"
 msgstr "Escolha do Servidor"
 
+<<<<<<< HEAD
 #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63
+=======
+#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59
+>>>>>>> origin/master
 msgid "Cookies must be enabled past this point."
 msgstr "O mecanismo de \"Cookies\" tem de estar ligado a partir deste ponto."
 
@@ -1744,7 +1832,11 @@ msgstr ""
 "<i>recode_string</i> enquanto a extensão reportar que está ligada. Confira a "
 "configuração do seu php."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:580
+=======
+#: libraries/common.inc.php:576
+>>>>>>> origin/master
 msgid ""
 "phpMyAdmin was unable to read your configuration file!<br />This might "
 "happen if PHP finds a parse error in it or PHP cannot find the file.<br /"
@@ -1760,12 +1852,20 @@ msgstr ""
 "maior parte dos casos, trata-se de uma falta de aspas ou de um ponto e "
 "vírgula algures.<br />Se receber uma página em branco, está tudo correcto."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:591
+=======
+#: libraries/common.inc.php:587
+>>>>>>> origin/master
 #, php-format
 msgid "Could not load default configuration from: %1$s"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:596
+=======
+#: libraries/common.inc.php:592
+>>>>>>> origin/master
 msgid ""
 "The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
 "configuration file!"
@@ -1773,27 +1873,47 @@ msgstr ""
 "A directiva <tt>$cfg['PmaAbsoluteUri']</tt> TEM que ser definida no ficheiro "
 "de configuração!"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:626
+=======
+#: libraries/common.inc.php:622
+>>>>>>> origin/master
 #, php-format
 msgid "Invalid server index: %s"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:633
+=======
+#: libraries/common.inc.php:629
+>>>>>>> origin/master
 #, php-format
 msgid "Invalid hostname for server %1$s. Please review your configuration."
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:642 libraries/header.inc.php:100
+=======
+#: libraries/common.inc.php:638 libraries/header.inc.php:96
+>>>>>>> origin/master
 #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47
 #: main.php:185 test/theme.php:57
 msgid "Server"
 msgstr "Servidor"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:820
 msgid "Invalid authentication method set in configuration:"
 msgstr ""
 
 #: libraries/common.inc.php:923
+=======
+#: libraries/common.inc.php:816
+msgid "Invalid authentication method set in configuration:"
+msgstr ""
+
+#: libraries/common.inc.php:919
+>>>>>>> origin/master
 #, php-format
 msgid "You should upgrade to %s %s or later."
 msgstr "deve actualizar para %s %s ou mais recente."
@@ -2042,7 +2162,11 @@ msgid ""
 msgstr ""
 
 #: libraries/db_structure.lib.php:69 server_databases.php:142
+<<<<<<< HEAD
 #: tbl_printview.php:335 tbl_structure.php:680
+=======
+#: tbl_printview.php:335 tbl_structure.php:682
+>>>>>>> origin/master
 msgid "Overhead"
 msgstr "Suspenso"
 
@@ -2069,22 +2193,36 @@ msgid "Change password"
 msgstr "Alterar a palavra-passe"
 
 #: libraries/display_change_password.lib.php:35
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:348 server_privileges.php:808
+=======
+#: libraries/replication_gui.lib.php:348 server_privileges.php:807
+>>>>>>> origin/master
 msgid "No Password"
 msgstr "Sem palavra-passe"
 
 #: libraries/display_change_password.lib.php:41
 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63
 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:352 server_privileges.php:797
 #: server_privileges.php:801 server_privileges.php:812
 #: server_privileges.php:1555 server_synchronize.php:1175
+=======
+#: libraries/replication_gui.lib.php:352 server_privileges.php:796
+#: server_privileges.php:800 server_privileges.php:811
+#: server_privileges.php:1538 server_synchronize.php:1175
+>>>>>>> origin/master
 msgid "Password"
 msgstr "Palavra-passe"
 
 #: libraries/display_change_password.lib.php:46
 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359
+<<<<<<< HEAD
 #: server_privileges.php:816 server_privileges.php:819
+=======
+#: server_privileges.php:815 server_privileges.php:818
+>>>>>>> origin/master
 msgid "Re-type"
 msgstr "Confirma"
 
@@ -2097,12 +2235,20 @@ msgid "MySQL 4.0 compatible"
 msgstr ""
 
 #: libraries/display_change_password.lib.php:72
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:363 server_privileges.php:823
+=======
+#: libraries/replication_gui.lib.php:363 server_privileges.php:822
+>>>>>>> origin/master
 msgid "Generate Password"
 msgstr ""
 
 #: libraries/display_change_password.lib.php:75
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:366 server_privileges.php:826
+=======
+#: libraries/replication_gui.lib.php:366 server_privileges.php:825
+>>>>>>> origin/master
 #, fuzzy
 msgid "Generate"
 msgstr "Gerado por"
@@ -2190,7 +2336,11 @@ msgid "remember template"
 msgstr "Lembrar-se do modelo"
 
 #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552
+=======
+#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549
+>>>>>>> origin/master
 msgid "Character set of the file:"
 msgstr "Configurar o Mapa de Caracteres do ficheiro:"
 
@@ -2243,7 +2393,11 @@ msgstr ""
 msgid "File to import"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527
+=======
+#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524
+>>>>>>> origin/master
 msgid "Location of the text file"
 msgstr "Localização do arquivo de texto"
 
@@ -2251,12 +2405,20 @@ msgstr "Localização do arquivo de texto"
 msgid "File uploads are not allowed on this server."
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536
+=======
+#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533
+>>>>>>> origin/master
 #: tbl_change.php:1025
 msgid "The directory you set for upload work cannot be reached"
 msgstr "Não é possivel alcançar a directoria que configurou para fazer upload"
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539
+=======
+#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536
+>>>>>>> origin/master
 #: tbl_change.php:1028
 msgid "web server upload directory"
 msgstr "Directoria no servidor web para fazer upload"
@@ -2385,7 +2547,11 @@ msgstr "Ordenar por chave"
 #: libraries/import/docsql.php:34 libraries/import/ldi.php:47
 #: libraries/import/ods.php:30 libraries/import/sql.php:20
 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26
+<<<<<<< HEAD
 #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751
+=======
+#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753
+>>>>>>> origin/master
 #, fuzzy
 msgid "Options"
 msgstr "Operações"
@@ -2532,7 +2698,11 @@ msgstr ""
 
 #: libraries/engines/innodb.lib.php:194 server_databases.php:137
 #: server_databases.php:305 server_status.php:525 server_status.php:586
+<<<<<<< HEAD
 #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694
+=======
+#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696
+>>>>>>> origin/master
 msgid "Total"
 msgstr "Total"
 
@@ -2778,7 +2948,11 @@ msgid ""
 msgstr ""
 
 #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88
+<<<<<<< HEAD
 #: tbl_printview.php:375 tbl_structure.php:735
+=======
+#: tbl_printview.php:375 tbl_structure.php:737
+>>>>>>> origin/master
 msgid "Format"
 msgstr "Formato"
 
@@ -2850,8 +3024,13 @@ msgstr ""
 #: libraries/export/latex.php:201 libraries/export/odt.php:48
 #: libraries/export/sql.php:106 libraries/export/sql.php:868
 #: libraries/export/texytext.php:27 server_databases.php:127
+<<<<<<< HEAD
 #: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316
 #: tbl_structure.php:663
+=======
+#: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316
+#: tbl_structure.php:665
+>>>>>>> origin/master
 msgid "Data"
 msgstr "Dados"
 
@@ -2900,9 +3079,15 @@ msgstr "MIME-type"
 #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57
 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177
 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:332 server_privileges.php:732
 #: server_privileges.php:735 server_privileges.php:791
 #: server_privileges.php:1554 server_privileges.php:2092
+=======
+#: libraries/replication_gui.lib.php:332 server_privileges.php:731
+#: server_privileges.php:734 server_privileges.php:790
+#: server_privileges.php:1537 server_privileges.php:2069
+>>>>>>> origin/master
 #: server_processlist.php:55 server_synchronize.php:1159
 msgid "Host"
 msgstr "Máquina"
@@ -3584,8 +3769,13 @@ msgstr ""
 
 #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59
 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:262 server_privileges.php:712
 #: server_privileges.php:715 server_privileges.php:722
+=======
+#: libraries/replication_gui.lib.php:262 server_privileges.php:711
+#: server_privileges.php:714 server_privileges.php:721
+>>>>>>> origin/master
 #: server_synchronize.php:1171
 msgid "User name"
 msgstr "Nome do Utilizador"
@@ -3603,14 +3793,22 @@ msgstr ""
 msgid "Slave status"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448
+=======
+#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445
+>>>>>>> origin/master
 #: server_status.php:737 server_variables.php:52
 msgid "Variable"
 msgstr "Variável"
 
 #: libraries/replication_gui.lib.php:118 server_status.php:738
 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138
+<<<<<<< HEAD
 #: tbl_structure.php:727
+=======
+#: tbl_structure.php:729
+>>>>>>> origin/master
 msgid "Value"
 msgstr "Valor"
 
@@ -3629,11 +3827,16 @@ msgstr ""
 msgid "Add slave replication user"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:257 server_privileges.php:717
+=======
+#: libraries/replication_gui.lib.php:257 server_privileges.php:716
+>>>>>>> origin/master
 msgid "Any user"
 msgstr "Qualquer utilizador"
 
 #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:349 server_privileges.php:718
 #: server_privileges.php:785 server_privileges.php:809
 #: server_privileges.php:1950 server_privileges.php:1980
@@ -3657,6 +3860,31 @@ msgid "Use Host Table"
 msgstr "Usar a tabela do anfitrião"
 
 #: libraries/replication_gui.lib.php:334 server_privileges.php:793
+=======
+#: libraries/replication_gui.lib.php:349 server_privileges.php:717
+#: server_privileges.php:784 server_privileges.php:808
+#: server_privileges.php:1928 server_privileges.php:1958
+msgid "Use text field"
+msgstr "Usar campo de texto"
+
+#: libraries/replication_gui.lib.php:305 server_privileges.php:764
+msgid "Any host"
+msgstr "Qualquer máquina"
+
+#: libraries/replication_gui.lib.php:309 server_privileges.php:768
+msgid "Local"
+msgstr "Local"
+
+#: libraries/replication_gui.lib.php:315 server_privileges.php:773
+msgid "This Host"
+msgstr "Este Anfitrião"
+
+#: libraries/replication_gui.lib.php:321 server_privileges.php:779
+msgid "Use Host Table"
+msgstr "Usar a tabela do anfitrião"
+
+#: libraries/replication_gui.lib.php:334 server_privileges.php:792
+>>>>>>> origin/master
 msgid ""
 "When Host table is used, this field is ignored and values stored in Host "
 "table are used instead."
@@ -7682,10 +7910,13 @@ msgstr ""
 msgid "Show insert query"
 msgstr ""
 
+<<<<<<< HEAD
 #: tbl_change.php:1140
 msgid "and then"
 msgstr ""
 
+=======
+>>>>>>> origin/master
 #: tbl_change.php:1144
 msgid "Go back to previous page"
 msgstr "Voltar atrás"
@@ -7884,6 +8115,7 @@ msgstr "Verificar Integridade referencial:"
 msgid "Show tables"
 msgstr "Mostra tabelas"
 
+<<<<<<< HEAD
 #: tbl_printview.php:309 tbl_structure.php:654
 msgid "Space usage"
 msgstr "Espaço ocupado"
@@ -7917,6 +8149,41 @@ msgid "Row length"
 msgstr "Comprim. dos reg."
 
 #: tbl_printview.php:413 tbl_structure.php:791
+=======
+#: tbl_printview.php:309 tbl_structure.php:656
+msgid "Space usage"
+msgstr "Espaço ocupado"
+
+#: tbl_printview.php:313 tbl_structure.php:660
+msgid "Usage"
+msgstr "Utilização"
+
+#: tbl_printview.php:340 tbl_structure.php:687
+msgid "Effective"
+msgstr "Em uso"
+
+#: tbl_printview.php:365 tbl_structure.php:725
+msgid "Row Statistics"
+msgstr "Estatísticas dos registos"
+
+#: tbl_printview.php:368 tbl_structure.php:728
+msgid "Statements"
+msgstr "Itens"
+
+#: tbl_printview.php:379 tbl_structure.php:740
+msgid "static"
+msgstr ""
+
+#: tbl_printview.php:381 tbl_structure.php:742
+msgid "dynamic"
+msgstr "dinâmico"
+
+#: tbl_printview.php:403 tbl_structure.php:785
+msgid "Row length"
+msgstr "Comprim. dos reg."
+
+#: tbl_printview.php:413 tbl_structure.php:793
+>>>>>>> origin/master
 msgid " Row size "
 msgstr " Tamanho dos reg."
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 36cd4564a..35ee98e68 100755
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -3,7 +3,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2010-07-03 21:45+0530\n"
+=======
+"POT-Creation-Date: 2010-07-03 09:00-0400\n"
+>>>>>>> origin/master
 "PO-Revision-Date: 2010-03-21 05:17+0200\n"
 "Last-Translator: Maurício Meneghini Fauth <mauriciofauth@gmail.com>\n"
 "Language-Team: brazilian_portuguese <pt_BR@li.org>\n"
@@ -49,15 +53,26 @@ msgstr "Procurar"
 #: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046
 #: libraries/Theme_Manager.class.php:311
 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719
+<<<<<<< HEAD
 #: libraries/common.lib.php:1344 libraries/common.lib.php:2301
 #: libraries/display_change_password.lib.php:82
 #: libraries/display_create_table.lib.php:62
+=======
+#: libraries/common.lib.php:1335 libraries/common.lib.php:2288
+#: libraries/display_change_password.lib.php:82
+#: libraries/display_create_table.lib.php:63
+>>>>>>> origin/master
 #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532
 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76
 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104
+<<<<<<< HEAD
 #: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480
 #: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782
+=======
+#: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477
+#: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782
+>>>>>>> origin/master
 #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328
 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142
 #: server_privileges.php:665 server_privileges.php:1641
@@ -67,8 +82,13 @@ msgstr "Procurar"
 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171
 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265
 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561
+<<<<<<< HEAD
 #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560
 #: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512
+=======
+#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562
+#: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512
+>>>>>>> origin/master
 #: view_create.php:182 view_operations.php:101
 msgid "Go"
 msgstr "Executar"
@@ -121,10 +141,17 @@ msgstr "Nome das colunas"
 #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245
 #: libraries/export/latex.php:360 libraries/export/odt.php:297
 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100
+<<<<<<< HEAD
 #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093
 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
 #: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321
+=======
+#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070
+#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
+#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
+#: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321
+>>>>>>> origin/master
 msgid "Type"
 msgstr "Tipo"
 
@@ -165,9 +192,15 @@ msgstr "Comentários"
 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322
 #: libraries/export/latex.php:430 libraries/export/odt.php:368
 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263
+<<<<<<< HEAD
 #: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596
 #: server_privileges.php:1911 server_privileges.php:1916
 #: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228
+=======
+#: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579
+#: server_privileges.php:1889 server_privileges.php:1894
+#: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228
+>>>>>>> origin/master
 #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342
 msgid "No"
 msgstr "Não"
@@ -181,9 +214,15 @@ msgstr "Não"
 #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106
 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262
 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344
+<<<<<<< HEAD
 #: server_databases.php:64 server_privileges.php:1582
 #: server_privileges.php:1596 server_privileges.php:1911
 #: server_privileges.php:1914 server_privileges.php:2210 sql.php:193
+=======
+#: server_databases.php:64 server_privileges.php:1565
+#: server_privileges.php:1579 server_privileges.php:1889
+#: server_privileges.php:1892 server_privileges.php:2187 sql.php:193
+>>>>>>> origin/master
 #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350
 #: tbl_tracking.php:335 tbl_tracking.php:340
 msgid "Yes"
@@ -232,7 +271,15 @@ msgstr "Renomear Banco de Dados para"
 msgid "Command"
 msgstr "Comando"
 
+<<<<<<< HEAD
 #: db_operations.php:466
+=======
+#: db_operations.php:429 tbl_change.php:1140
+msgid "and then"
+msgstr "e então"
+
+#: db_operations.php:455
+>>>>>>> origin/master
 msgid "Copy database to"
 msgstr "Copiar Banco de Dados para"
 
@@ -320,7 +367,11 @@ msgstr "Habilitar"
 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730
 #: server_collations.php:54 server_collations.php:66 server_databases.php:111
 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179
+<<<<<<< HEAD
 #: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326
+=======
+#: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326
+>>>>>>> origin/master
 msgid "Collation"
 msgstr "Collation"
 
@@ -349,7 +400,11 @@ msgstr "Tabela"
 #: db_printview.php:105 libraries/db_structure.lib.php:56
 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146
 #: navigation.php:638 navigation.php:660 server_databases.php:122
+<<<<<<< HEAD
 #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775
+=======
+#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777
+>>>>>>> origin/master
 msgid "Rows"
 msgstr "Registros"
 
@@ -364,19 +419,31 @@ msgstr "em uso"
 
 #: db_printview.php:187 libraries/db_info.inc.php:88
 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433
+<<<<<<< HEAD
 #: tbl_structure.php:807
+=======
+#: tbl_structure.php:809
+>>>>>>> origin/master
 msgid "Creation"
 msgstr "Criação"
 
 #: db_printview.php:196 libraries/db_info.inc.php:93
 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443
+<<<<<<< HEAD
 #: tbl_structure.php:815
+=======
+#: tbl_structure.php:817
+>>>>>>> origin/master
 msgid "Last update"
 msgstr "Última atualização"
 
 #: db_printview.php:205 libraries/db_info.inc.php:98
 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453
+<<<<<<< HEAD
 #: tbl_structure.php:823
+=======
+#: tbl_structure.php:825
+>>>>>>> origin/master
 msgid "Last check"
 msgstr "Última verificação"
 
@@ -441,7 +508,11 @@ msgstr "Del"
 
 #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553
 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779
+<<<<<<< HEAD
 #: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250
+=======
+#: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250
+>>>>>>> origin/master
 #: tbl_select.php:286
 msgid "Or"
 msgstr "Ou"
@@ -659,9 +730,15 @@ msgstr "Com marcados:"
 msgid "Check All"
 msgstr "Marcar todos"
 
+<<<<<<< HEAD
 #: db_structure.php:529 libraries/display_tbl.lib.php:2077
 #: libraries/replication_gui.lib.php:36 server_databases.php:350
 #: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460
+=======
+#: db_structure.php:531 libraries/display_tbl.lib.php:2077
+#: libraries/replication_gui.lib.php:36 server_databases.php:350
+#: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462
+>>>>>>> origin/master
 msgid "Uncheck All"
 msgstr "Desmarcar todos"
 
@@ -1132,10 +1209,17 @@ msgid "Prev"
 msgstr "Anterior"
 
 #. l10n: Display text for next month link in calendar
+<<<<<<< HEAD
 #: js/messages.php:106 libraries/common.lib.php:2366
 #: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338
 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
 #: tbl_structure.php:799
+=======
+#: js/messages.php:77 libraries/common.lib.php:2353
+#: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338
+#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
+#: tbl_structure.php:801
+>>>>>>> origin/master
 msgid "Next"
 msgstr "Próximo"
 
@@ -1684,7 +1768,11 @@ msgstr "Senha:"
 msgid "Server Choice"
 msgstr "Seleção do Servidor"
 
+<<<<<<< HEAD
 #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63
+=======
+#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59
+>>>>>>> origin/master
 msgid "Cookies must be enabled past this point."
 msgstr "Cookies devem estar ativos após este ponto."
 
@@ -1766,7 +1854,11 @@ msgstr ""
 "<i>recode_string</i> enquanto a extensão reportar que está ligada. Confira a "
 "configuração do seu php."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:580
+=======
+#: libraries/common.inc.php:576
+>>>>>>> origin/master
 msgid ""
 "phpMyAdmin was unable to read your configuration file!<br />This might "
 "happen if PHP finds a parse error in it or PHP cannot find the file.<br /"
@@ -1782,41 +1874,69 @@ msgstr ""
 "dos casos, trata-se de uma falta de aspas ou de um ponto e vírgula errado."
 "<br />Se receber uma página em branco, está tudo certo."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:591
+=======
+#: libraries/common.inc.php:587
+>>>>>>> origin/master
 #, fuzzy, php-format
 #| msgid "Could not load default configuration from: \"%1$s\""
 msgid "Could not load default configuration from: %1$s"
 msgstr "Não foi possível carregar configuração padrão de: \"%1$s\""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:596
+=======
+#: libraries/common.inc.php:592
+>>>>>>> origin/master
 msgid ""
 "The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
 "configuration file!"
 msgstr "A variável <tt>$cfg['PmaAbsoluteUri']</tt> deve ser setada"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:626
+=======
+#: libraries/common.inc.php:622
+>>>>>>> origin/master
 #, fuzzy, php-format
 #| msgid "Invalid server index: \"%s\""
 msgid "Invalid server index: %s"
 msgstr "Índice de servidor inválido: \"%s\""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:633
+=======
+#: libraries/common.inc.php:629
+>>>>>>> origin/master
 #, php-format
 msgid "Invalid hostname for server %1$s. Please review your configuration."
 msgstr ""
 "Nome de serivdor inválido para o servidor %1$s. Verifique suas configurações."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:642 libraries/header.inc.php:100
+=======
+#: libraries/common.inc.php:638 libraries/header.inc.php:96
+>>>>>>> origin/master
 #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47
 #: main.php:185 test/theme.php:57
 msgid "Server"
 msgstr "Servidor"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:820
 msgid "Invalid authentication method set in configuration:"
 msgstr "Método de autenticação inválido informado nas configurações:"
 
 #: libraries/common.inc.php:923
+=======
+#: libraries/common.inc.php:816
+msgid "Invalid authentication method set in configuration:"
+msgstr "Método de autenticação inválido informado nas configurações:"
+
+#: libraries/common.inc.php:919
+>>>>>>> origin/master
 #, php-format
 msgid "You should upgrade to %s %s or later."
 msgstr "Você deveria atualizar para %s %s ou posterior."
@@ -2061,7 +2181,11 @@ msgid ""
 msgstr "Pode ser aproximado. Veja o FAQ 3.11"
 
 #: libraries/db_structure.lib.php:69 server_databases.php:142
+<<<<<<< HEAD
 #: tbl_printview.php:335 tbl_structure.php:680
+=======
+#: tbl_printview.php:335 tbl_structure.php:682
+>>>>>>> origin/master
 msgid "Overhead"
 msgstr "Sobrecarga"
 
@@ -2090,22 +2214,36 @@ msgid "Change password"
 msgstr "Alterar a senha"
 
 #: libraries/display_change_password.lib.php:35
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:348 server_privileges.php:808
+=======
+#: libraries/replication_gui.lib.php:348 server_privileges.php:807
+>>>>>>> origin/master
 msgid "No Password"
 msgstr "Sem senha"
 
 #: libraries/display_change_password.lib.php:41
 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63
 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:352 server_privileges.php:797
 #: server_privileges.php:801 server_privileges.php:812
 #: server_privileges.php:1555 server_synchronize.php:1175
+=======
+#: libraries/replication_gui.lib.php:352 server_privileges.php:796
+#: server_privileges.php:800 server_privileges.php:811
+#: server_privileges.php:1538 server_synchronize.php:1175
+>>>>>>> origin/master
 msgid "Password"
 msgstr "Senha"
 
 #: libraries/display_change_password.lib.php:46
 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359
+<<<<<<< HEAD
 #: server_privileges.php:816 server_privileges.php:819
+=======
+#: server_privileges.php:815 server_privileges.php:818
+>>>>>>> origin/master
 msgid "Re-type"
 msgstr "Re-digite"
 
@@ -2120,12 +2258,20 @@ msgid "MySQL 4.0 compatible"
 msgstr "Compatível com MySQL&nbsp;4.0"
 
 #: libraries/display_change_password.lib.php:72
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:363 server_privileges.php:823
+=======
+#: libraries/replication_gui.lib.php:363 server_privileges.php:822
+>>>>>>> origin/master
 msgid "Generate Password"
 msgstr "Gerar Senha"
 
 #: libraries/display_change_password.lib.php:75
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:366 server_privileges.php:826
+=======
+#: libraries/replication_gui.lib.php:366 server_privileges.php:825
+>>>>>>> origin/master
 msgid "Generate"
 msgstr "Gerar"
 
@@ -2213,7 +2359,11 @@ msgid "remember template"
 msgstr "lembrar modelo"
 
 #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552
+=======
+#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549
+>>>>>>> origin/master
 msgid "Character set of the file:"
 msgstr "Conjunto de caracteres do arquivo"
 
@@ -2266,7 +2416,11 @@ msgstr ""
 msgid "File to import"
 msgstr "Arquivo para importar"
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527
+=======
+#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524
+>>>>>>> origin/master
 msgid "Location of the text file"
 msgstr "Localização do arquivo texto"
 
@@ -2274,13 +2428,21 @@ msgstr "Localização do arquivo texto"
 msgid "File uploads are not allowed on this server."
 msgstr "Não é permitido subir arquivos neste servidor."
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536
+=======
+#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533
+>>>>>>> origin/master
 #: tbl_change.php:1025
 msgid "The directory you set for upload work cannot be reached"
 msgstr ""
 "O diretório que você especificou para subir arquivos não foi encontrado."
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539
+=======
+#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536
+>>>>>>> origin/master
 #: tbl_change.php:1028
 msgid "web server upload directory"
 msgstr "Servidor web subiu o diretório"
@@ -2416,7 +2578,11 @@ msgstr "Ordenar pela chave"
 #: libraries/import/docsql.php:34 libraries/import/ldi.php:47
 #: libraries/import/ods.php:30 libraries/import/sql.php:20
 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26
+<<<<<<< HEAD
 #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751
+=======
+#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753
+>>>>>>> origin/master
 msgid "Options"
 msgstr "Opções"
 
@@ -2565,7 +2731,11 @@ msgstr "Uso do Buffer Pool"
 
 #: libraries/engines/innodb.lib.php:194 server_databases.php:137
 #: server_databases.php:305 server_status.php:525 server_status.php:586
+<<<<<<< HEAD
 #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694
+=======
+#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696
+>>>>>>> origin/master
 msgid "Total"
 msgstr "Total"
 
@@ -2827,7 +2997,11 @@ msgid ""
 msgstr ""
 
 #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88
+<<<<<<< HEAD
 #: tbl_printview.php:375 tbl_structure.php:735
+=======
+#: tbl_printview.php:375 tbl_structure.php:737
+>>>>>>> origin/master
 msgid "Format"
 msgstr "Formato"
 
@@ -2899,8 +3073,13 @@ msgstr "Microsoft Word 2000"
 #: libraries/export/latex.php:201 libraries/export/odt.php:48
 #: libraries/export/sql.php:106 libraries/export/sql.php:868
 #: libraries/export/texytext.php:27 server_databases.php:127
+<<<<<<< HEAD
 #: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316
 #: tbl_structure.php:663
+=======
+#: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316
+#: tbl_structure.php:665
+>>>>>>> origin/master
 msgid "Data"
 msgstr "Dados"
 
@@ -2949,9 +3128,15 @@ msgstr "MIME-type"
 #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57
 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177
 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:332 server_privileges.php:732
 #: server_privileges.php:735 server_privileges.php:791
 #: server_privileges.php:1554 server_privileges.php:2092
+=======
+#: libraries/replication_gui.lib.php:332 server_privileges.php:731
+#: server_privileges.php:734 server_privileges.php:790
+#: server_privileges.php:1537 server_privileges.php:2069
+>>>>>>> origin/master
 #: server_processlist.php:55 server_synchronize.php:1159
 msgid "Host"
 msgstr "Servidor"
@@ -3623,8 +3808,13 @@ msgstr ""
 
 #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59
 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:262 server_privileges.php:712
 #: server_privileges.php:715 server_privileges.php:722
+=======
+#: libraries/replication_gui.lib.php:262 server_privileges.php:711
+#: server_privileges.php:714 server_privileges.php:721
+>>>>>>> origin/master
 #: server_synchronize.php:1171
 msgid "User name"
 msgstr "Nome do usuário"
@@ -3643,14 +3833,22 @@ msgstr "Exibir status dos escravos"
 msgid "Slave status"
 msgstr "Exibir status dos escravos"
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448
+=======
+#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445
+>>>>>>> origin/master
 #: server_status.php:737 server_variables.php:52
 msgid "Variable"
 msgstr "Variáveis"
 
 #: libraries/replication_gui.lib.php:118 server_status.php:738
 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138
+<<<<<<< HEAD
 #: tbl_structure.php:727
+=======
+#: tbl_structure.php:729
+>>>>>>> origin/master
 msgid "Value"
 msgstr "Valor"
 
@@ -3668,11 +3866,16 @@ msgstr ""
 msgid "Add slave replication user"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:257 server_privileges.php:717
+=======
+#: libraries/replication_gui.lib.php:257 server_privileges.php:716
+>>>>>>> origin/master
 msgid "Any user"
 msgstr "Qualquer usuário"
 
 #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:349 server_privileges.php:718
 #: server_privileges.php:785 server_privileges.php:809
 #: server_privileges.php:1950 server_privileges.php:1980
@@ -3696,6 +3899,31 @@ msgid "Use Host Table"
 msgstr "Usar Tabela do Servidor"
 
 #: libraries/replication_gui.lib.php:334 server_privileges.php:793
+=======
+#: libraries/replication_gui.lib.php:349 server_privileges.php:717
+#: server_privileges.php:784 server_privileges.php:808
+#: server_privileges.php:1928 server_privileges.php:1958
+msgid "Use text field"
+msgstr "Usar campo texto"
+
+#: libraries/replication_gui.lib.php:305 server_privileges.php:764
+msgid "Any host"
+msgstr "Qualquer servidor"
+
+#: libraries/replication_gui.lib.php:309 server_privileges.php:768
+msgid "Local"
+msgstr "Local"
+
+#: libraries/replication_gui.lib.php:315 server_privileges.php:773
+msgid "This Host"
+msgstr "Esse Servidor"
+
+#: libraries/replication_gui.lib.php:321 server_privileges.php:779
+msgid "Use Host Table"
+msgstr "Usar Tabela do Servidor"
+
+#: libraries/replication_gui.lib.php:334 server_privileges.php:792
+>>>>>>> origin/master
 msgid ""
 "When Host table is used, this field is ignored and values stored in Host "
 "table are used instead."
@@ -7945,10 +8173,13 @@ msgstr ""
 msgid "Show insert query"
 msgstr "Exibindo consulta SQL"
 
+<<<<<<< HEAD
 #: tbl_change.php:1140
 msgid "and then"
 msgstr "e então"
 
+=======
+>>>>>>> origin/master
 #: tbl_change.php:1144
 msgid "Go back to previous page"
 msgstr "Retornar"
@@ -8145,6 +8376,7 @@ msgstr "Verificar integridade referencial:"
 msgid "Show tables"
 msgstr "Mostrar tabelas"
 
+<<<<<<< HEAD
 #: tbl_printview.php:309 tbl_structure.php:654
 msgid "Space usage"
 msgstr "Uso do espaço"
@@ -8178,6 +8410,41 @@ msgid "Row length"
 msgstr "Tamanho do registro"
 
 #: tbl_printview.php:413 tbl_structure.php:791
+=======
+#: tbl_printview.php:309 tbl_structure.php:656
+msgid "Space usage"
+msgstr "Uso do espaço"
+
+#: tbl_printview.php:313 tbl_structure.php:660
+msgid "Usage"
+msgstr "Uso"
+
+#: tbl_printview.php:340 tbl_structure.php:687
+msgid "Effective"
+msgstr "Efetivo"
+
+#: tbl_printview.php:365 tbl_structure.php:725
+msgid "Row Statistics"
+msgstr "Estatísticas do registros"
+
+#: tbl_printview.php:368 tbl_structure.php:728
+msgid "Statements"
+msgstr "Comandos"
+
+#: tbl_printview.php:379 tbl_structure.php:740
+msgid "static"
+msgstr ""
+
+#: tbl_printview.php:381 tbl_structure.php:742
+msgid "dynamic"
+msgstr "dinâmico"
+
+#: tbl_printview.php:403 tbl_structure.php:785
+msgid "Row length"
+msgstr "Tamanho do registro"
+
+#: tbl_printview.php:413 tbl_structure.php:793
+>>>>>>> origin/master
 msgid " Row size "
 msgstr " Tamanho do registro "
 
diff --git a/po/ro.po b/po/ro.po
index 6cc67b8b5..09e62fe9a 100755
--- a/po/ro.po
+++ b/po/ro.po
@@ -3,7 +3,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2010-07-03 21:45+0530\n"
+=======
+"POT-Creation-Date: 2010-07-03 09:00-0400\n"
+>>>>>>> origin/master
 "PO-Revision-Date: 2010-05-16 01:40+0200\n"
 "Last-Translator:  <ssuceveanu@yahoo.com>\n"
 "Language-Team: romanian <ro@li.org>\n"
@@ -50,15 +54,26 @@ msgstr "Caută"
 #: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046
 #: libraries/Theme_Manager.class.php:311
 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719
+<<<<<<< HEAD
 #: libraries/common.lib.php:1344 libraries/common.lib.php:2301
 #: libraries/display_change_password.lib.php:82
 #: libraries/display_create_table.lib.php:62
+=======
+#: libraries/common.lib.php:1335 libraries/common.lib.php:2288
+#: libraries/display_change_password.lib.php:82
+#: libraries/display_create_table.lib.php:63
+>>>>>>> origin/master
 #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532
 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76
 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104
+<<<<<<< HEAD
 #: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480
 #: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782
+=======
+#: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477
+#: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782
+>>>>>>> origin/master
 #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328
 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142
 #: server_privileges.php:665 server_privileges.php:1641
@@ -68,8 +83,13 @@ msgstr "Caută"
 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171
 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265
 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561
+<<<<<<< HEAD
 #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560
 #: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512
+=======
+#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562
+#: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512
+>>>>>>> origin/master
 #: view_create.php:182 view_operations.php:101
 msgid "Go"
 msgstr "Execută"
@@ -122,10 +142,17 @@ msgstr "Denumirile coloanelor"
 #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245
 #: libraries/export/latex.php:360 libraries/export/odt.php:297
 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100
+<<<<<<< HEAD
 #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093
 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
 #: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321
+=======
+#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070
+#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
+#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
+#: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321
+>>>>>>> origin/master
 msgid "Type"
 msgstr "Tip"
 
@@ -166,9 +193,15 @@ msgstr "Comentarii"
 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322
 #: libraries/export/latex.php:430 libraries/export/odt.php:368
 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263
+<<<<<<< HEAD
 #: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596
 #: server_privileges.php:1911 server_privileges.php:1916
 #: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228
+=======
+#: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579
+#: server_privileges.php:1889 server_privileges.php:1894
+#: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228
+>>>>>>> origin/master
 #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342
 msgid "No"
 msgstr "Nu"
@@ -182,9 +215,15 @@ msgstr "Nu"
 #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106
 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262
 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344
+<<<<<<< HEAD
 #: server_databases.php:64 server_privileges.php:1582
 #: server_privileges.php:1596 server_privileges.php:1911
 #: server_privileges.php:1914 server_privileges.php:2210 sql.php:193
+=======
+#: server_databases.php:64 server_privileges.php:1565
+#: server_privileges.php:1579 server_privileges.php:1889
+#: server_privileges.php:1892 server_privileges.php:2187 sql.php:193
+>>>>>>> origin/master
 #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350
 #: tbl_tracking.php:335 tbl_tracking.php:340
 msgid "Yes"
@@ -233,7 +272,15 @@ msgstr "Redenumire bază de date în"
 msgid "Command"
 msgstr "Comanda"
 
+<<<<<<< HEAD
 #: db_operations.php:466
+=======
+#: db_operations.php:429 tbl_change.php:1140
+msgid "and then"
+msgstr "și apoi"
+
+#: db_operations.php:455
+>>>>>>> origin/master
 msgid "Copy database to"
 msgstr "Copiază baza de date"
 
@@ -317,7 +364,11 @@ msgstr "Activează"
 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730
 #: server_collations.php:54 server_collations.php:66 server_databases.php:111
 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179
+<<<<<<< HEAD
 #: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326
+=======
+#: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326
+>>>>>>> origin/master
 msgid "Collation"
 msgstr "Interclasare"
 
@@ -346,7 +397,11 @@ msgstr "Tabel"
 #: db_printview.php:105 libraries/db_structure.lib.php:56
 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146
 #: navigation.php:638 navigation.php:660 server_databases.php:122
+<<<<<<< HEAD
 #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775
+=======
+#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777
+>>>>>>> origin/master
 msgid "Rows"
 msgstr "Linie"
 
@@ -361,19 +416,31 @@ msgstr "în folosință"
 
 #: db_printview.php:187 libraries/db_info.inc.php:88
 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433
+<<<<<<< HEAD
 #: tbl_structure.php:807
+=======
+#: tbl_structure.php:809
+>>>>>>> origin/master
 msgid "Creation"
 msgstr "Creare"
 
 #: db_printview.php:196 libraries/db_info.inc.php:93
 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443
+<<<<<<< HEAD
 #: tbl_structure.php:815
+=======
+#: tbl_structure.php:817
+>>>>>>> origin/master
 msgid "Last update"
 msgstr "Ultima actualizare"
 
 #: db_printview.php:205 libraries/db_info.inc.php:98
 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453
+<<<<<<< HEAD
 #: tbl_structure.php:823
+=======
+#: tbl_structure.php:825
+>>>>>>> origin/master
 msgid "Last check"
 msgstr "Ultima verficare"
 
@@ -439,7 +506,11 @@ msgstr "Del"
 
 #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553
 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779
+<<<<<<< HEAD
 #: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250
+=======
+#: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250
+>>>>>>> origin/master
 #: tbl_select.php:286
 msgid "Or"
 msgstr "Sau"
@@ -658,9 +729,15 @@ msgstr "Cele bifate:"
 msgid "Check All"
 msgstr "Marchează toate"
 
+<<<<<<< HEAD
 #: db_structure.php:529 libraries/display_tbl.lib.php:2077
 #: libraries/replication_gui.lib.php:36 server_databases.php:350
 #: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460
+=======
+#: db_structure.php:531 libraries/display_tbl.lib.php:2077
+#: libraries/replication_gui.lib.php:36 server_databases.php:350
+#: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462
+>>>>>>> origin/master
 msgid "Uncheck All"
 msgstr "Demarchează toate"
 
@@ -1133,10 +1210,17 @@ msgid "Prev"
 msgstr "Anterior"
 
 #. l10n: Display text for next month link in calendar
+<<<<<<< HEAD
 #: js/messages.php:106 libraries/common.lib.php:2366
 #: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338
 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
 #: tbl_structure.php:799
+=======
+#: js/messages.php:77 libraries/common.lib.php:2353
+#: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338
+#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
+#: tbl_structure.php:801
+>>>>>>> origin/master
 msgid "Next"
 msgstr "Următorul"
 
@@ -1687,7 +1771,11 @@ msgstr "Parolă:"
 msgid "Server Choice"
 msgstr "Alegerea serverului"
 
+<<<<<<< HEAD
 #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63
+=======
+#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59
+>>>>>>> origin/master
 msgid "Cookies must be enabled past this point."
 msgstr "Trebuie sa aveti activat \"cookies\"."
 
@@ -1769,7 +1857,11 @@ msgstr ""
 "Nu pot folosi funcțiile iconv nici libiconv nici recode_string în timp ce "
 "extensia este încărcată. Verificați configurația PHP."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:580
+=======
+#: libraries/common.inc.php:576
+>>>>>>> origin/master
 msgid ""
 "phpMyAdmin was unable to read your configuration file!<br />This might "
 "happen if PHP finds a parse error in it or PHP cannot find the file.<br /"
@@ -1785,13 +1877,21 @@ msgstr ""
 "lipsesc apostroful sau ghilimele.<br />Daca primesti o pagina goala, totul "
 "pare sa fie bine."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:591
+=======
+#: libraries/common.inc.php:587
+>>>>>>> origin/master
 #, fuzzy, php-format
 #| msgid "Could not load default configuration from: \"%1$s\""
 msgid "Could not load default configuration from: %1$s"
 msgstr "Nu s-a putut încărca configurația implicită din: „%1$s”"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:596
+=======
+#: libraries/common.inc.php:592
+>>>>>>> origin/master
 msgid ""
 "The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
 "configuration file!"
@@ -1799,30 +1899,50 @@ msgstr ""
 "Directiva <tt>$cfg['PmaAbsoluteUri']</tt> TREBUIE să fie stabilită în "
 "fișierul de configurare!"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:626
+=======
+#: libraries/common.inc.php:622
+>>>>>>> origin/master
 #, fuzzy, php-format
 #| msgid "Invalid server index: \"%s\""
 msgid "Invalid server index: %s"
 msgstr "Index de server nevalid: „%s”"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:633
+=======
+#: libraries/common.inc.php:629
+>>>>>>> origin/master
 #, php-format
 msgid "Invalid hostname for server %1$s. Please review your configuration."
 msgstr ""
 "Gazdă nevalidă pentru serverul %1$s. Vă rugăm să revizuiți configurația "
 "dumneavoastră."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:642 libraries/header.inc.php:100
+=======
+#: libraries/common.inc.php:638 libraries/header.inc.php:96
+>>>>>>> origin/master
 #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47
 #: main.php:185 test/theme.php:57
 msgid "Server"
 msgstr "Server"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:820
 msgid "Invalid authentication method set in configuration:"
 msgstr "Metodă de autentificare nevalidă stabilită în configurație:"
 
 #: libraries/common.inc.php:923
+=======
+#: libraries/common.inc.php:816
+msgid "Invalid authentication method set in configuration:"
+msgstr "Metodă de autentificare nevalidă stabilită în configurație:"
+
+#: libraries/common.inc.php:919
+>>>>>>> origin/master
 #, php-format
 msgid "You should upgrade to %s %s or later."
 msgstr "Ar trebui sa reactualizati serverul %s %s la o versiune mai noua."
@@ -2070,7 +2190,11 @@ msgid ""
 msgstr "Poate fi aproximativ. Vezi FAQ 3.11"
 
 #: libraries/db_structure.lib.php:69 server_databases.php:142
+<<<<<<< HEAD
 #: tbl_printview.php:335 tbl_structure.php:680
+=======
+#: tbl_printview.php:335 tbl_structure.php:682
+>>>>>>> origin/master
 msgid "Overhead"
 msgstr "Asupra"
 
@@ -2097,22 +2221,36 @@ msgid "Change password"
 msgstr "Schimbare parolă"
 
 #: libraries/display_change_password.lib.php:35
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:348 server_privileges.php:808
+=======
+#: libraries/replication_gui.lib.php:348 server_privileges.php:807
+>>>>>>> origin/master
 msgid "No Password"
 msgstr "Nu există parolă"
 
 #: libraries/display_change_password.lib.php:41
 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63
 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:352 server_privileges.php:797
 #: server_privileges.php:801 server_privileges.php:812
 #: server_privileges.php:1555 server_synchronize.php:1175
+=======
+#: libraries/replication_gui.lib.php:352 server_privileges.php:796
+#: server_privileges.php:800 server_privileges.php:811
+#: server_privileges.php:1538 server_synchronize.php:1175
+>>>>>>> origin/master
 msgid "Password"
 msgstr "Parola"
 
 #: libraries/display_change_password.lib.php:46
 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359
+<<<<<<< HEAD
 #: server_privileges.php:816 server_privileges.php:819
+=======
+#: server_privileges.php:815 server_privileges.php:818
+>>>>>>> origin/master
 msgid "Re-type"
 msgstr "Re-tastează"
 
@@ -2127,12 +2265,20 @@ msgid "MySQL 4.0 compatible"
 msgstr "Compatibil MySQL&nbsp;4.0"
 
 #: libraries/display_change_password.lib.php:72
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:363 server_privileges.php:823
+=======
+#: libraries/replication_gui.lib.php:363 server_privileges.php:822
+>>>>>>> origin/master
 msgid "Generate Password"
 msgstr "Generează parolă"
 
 #: libraries/display_change_password.lib.php:75
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:366 server_privileges.php:826
+=======
+#: libraries/replication_gui.lib.php:366 server_privileges.php:825
+>>>>>>> origin/master
 msgid "Generate"
 msgstr "Generează"
 
@@ -2222,7 +2368,11 @@ msgid "remember template"
 msgstr "ține minte șablonul"
 
 #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552
+=======
+#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549
+>>>>>>> origin/master
 msgid "Character set of the file:"
 msgstr "Setul de caractere al fișierului:"
 
@@ -2275,7 +2425,11 @@ msgstr ""
 msgid "File to import"
 msgstr "Fișier de importat"
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527
+=======
+#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524
+>>>>>>> origin/master
 msgid "Location of the text file"
 msgstr "Locația fișierului textual"
 
@@ -2283,12 +2437,20 @@ msgstr "Locația fișierului textual"
 msgid "File uploads are not allowed on this server."
 msgstr "Încărcările de fișiere nu sînt permise pe acest server."
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536
+=======
+#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533
+>>>>>>> origin/master
 #: tbl_change.php:1025
 msgid "The directory you set for upload work cannot be reached"
 msgstr "Directorul stabilit pentru încărcare nu poate fi găsit"
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539
+=======
+#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536
+>>>>>>> origin/master
 #: tbl_change.php:1028
 msgid "web server upload directory"
 msgstr "director de încărcare al serverului Web"
@@ -2423,7 +2585,11 @@ msgstr "Sortare după cheie"
 #: libraries/import/docsql.php:34 libraries/import/ldi.php:47
 #: libraries/import/ods.php:30 libraries/import/sql.php:20
 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26
+<<<<<<< HEAD
 #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751
+=======
+#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753
+>>>>>>> origin/master
 msgid "Options"
 msgstr "Opțiuni"
 
@@ -2570,7 +2736,11 @@ msgstr "Buffer Pool Usage"
 
 #: libraries/engines/innodb.lib.php:194 server_databases.php:137
 #: server_databases.php:305 server_status.php:525 server_status.php:586
+<<<<<<< HEAD
 #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694
+=======
+#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696
+>>>>>>> origin/master
 msgid "Total"
 msgstr "Total"
 
@@ -2857,7 +3027,11 @@ msgstr ""
 "number."
 
 #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88
+<<<<<<< HEAD
 #: tbl_printview.php:375 tbl_structure.php:735
+=======
+#: tbl_printview.php:375 tbl_structure.php:737
+>>>>>>> origin/master
 msgid "Format"
 msgstr "Format"
 
@@ -2929,8 +3103,13 @@ msgstr "Microsoft Word 2000"
 #: libraries/export/latex.php:201 libraries/export/odt.php:48
 #: libraries/export/sql.php:106 libraries/export/sql.php:868
 #: libraries/export/texytext.php:27 server_databases.php:127
+<<<<<<< HEAD
 #: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316
 #: tbl_structure.php:663
+=======
+#: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316
+#: tbl_structure.php:665
+>>>>>>> origin/master
 msgid "Data"
 msgstr "Date"
 
@@ -2979,9 +3158,15 @@ msgstr "Tip MIME"
 #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57
 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177
 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:332 server_privileges.php:732
 #: server_privileges.php:735 server_privileges.php:791
 #: server_privileges.php:1554 server_privileges.php:2092
+=======
+#: libraries/replication_gui.lib.php:332 server_privileges.php:731
+#: server_privileges.php:734 server_privileges.php:790
+#: server_privileges.php:1537 server_privileges.php:2069
+>>>>>>> origin/master
 #: server_processlist.php:55 server_synchronize.php:1159
 msgid "Host"
 msgstr "Gazda"
@@ -3654,8 +3839,13 @@ msgstr ""
 
 #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59
 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:262 server_privileges.php:712
 #: server_privileges.php:715 server_privileges.php:722
+=======
+#: libraries/replication_gui.lib.php:262 server_privileges.php:711
+#: server_privileges.php:714 server_privileges.php:721
+>>>>>>> origin/master
 #: server_synchronize.php:1171
 msgid "User name"
 msgstr "Nume utilizator"
@@ -3675,14 +3865,22 @@ msgstr "Afișează stare sclav"
 msgid "Slave status"
 msgstr "Afișează stare sclav"
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448
+=======
+#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445
+>>>>>>> origin/master
 #: server_status.php:737 server_variables.php:52
 msgid "Variable"
 msgstr "Variabil"
 
 #: libraries/replication_gui.lib.php:118 server_status.php:738
 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138
+<<<<<<< HEAD
 #: tbl_structure.php:727
+=======
+#: tbl_structure.php:729
+>>>>>>> origin/master
 msgid "Value"
 msgstr "Valoare"
 
@@ -3700,11 +3898,16 @@ msgstr ""
 msgid "Add slave replication user"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:257 server_privileges.php:717
+=======
+#: libraries/replication_gui.lib.php:257 server_privileges.php:716
+>>>>>>> origin/master
 msgid "Any user"
 msgstr "Oricare utilizator"
 
 #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:349 server_privileges.php:718
 #: server_privileges.php:785 server_privileges.php:809
 #: server_privileges.php:1950 server_privileges.php:1980
@@ -3728,6 +3931,31 @@ msgid "Use Host Table"
 msgstr "Utilizare tabel gazde"
 
 #: libraries/replication_gui.lib.php:334 server_privileges.php:793
+=======
+#: libraries/replication_gui.lib.php:349 server_privileges.php:717
+#: server_privileges.php:784 server_privileges.php:808
+#: server_privileges.php:1928 server_privileges.php:1958
+msgid "Use text field"
+msgstr "Utilizare cîmp text"
+
+#: libraries/replication_gui.lib.php:305 server_privileges.php:764
+msgid "Any host"
+msgstr "Oricare gazdă"
+
+#: libraries/replication_gui.lib.php:309 server_privileges.php:768
+msgid "Local"
+msgstr "Local"
+
+#: libraries/replication_gui.lib.php:315 server_privileges.php:773
+msgid "This Host"
+msgstr "Această gazdă"
+
+#: libraries/replication_gui.lib.php:321 server_privileges.php:779
+msgid "Use Host Table"
+msgstr "Utilizare tabel gazde"
+
+#: libraries/replication_gui.lib.php:334 server_privileges.php:792
+>>>>>>> origin/master
 msgid ""
 "When Host table is used, this field is ignored and values stored in Host "
 "table are used instead."
@@ -7972,10 +8200,13 @@ msgstr ""
 msgid "Show insert query"
 msgstr "Afișare interogare SQL"
 
+<<<<<<< HEAD
 #: tbl_change.php:1140
 msgid "and then"
 msgstr "și apoi"
 
+=======
+>>>>>>> origin/master
 #: tbl_change.php:1144
 msgid "Go back to previous page"
 msgstr "Revenire"
@@ -8171,6 +8402,7 @@ msgstr "Verificarea integrității referinței:"
 msgid "Show tables"
 msgstr "Arată tabelele"
 
+<<<<<<< HEAD
 #: tbl_printview.php:309 tbl_structure.php:654
 msgid "Space usage"
 msgstr "Utilizare spațiu"
@@ -8204,6 +8436,41 @@ msgid "Row length"
 msgstr "Lungime linie"
 
 #: tbl_printview.php:413 tbl_structure.php:791
+=======
+#: tbl_printview.php:309 tbl_structure.php:656
+msgid "Space usage"
+msgstr "Utilizare spațiu"
+
+#: tbl_printview.php:313 tbl_structure.php:660
+msgid "Usage"
+msgstr "Utilizare"
+
+#: tbl_printview.php:340 tbl_structure.php:687
+msgid "Effective"
+msgstr "Efectiv"
+
+#: tbl_printview.php:365 tbl_structure.php:725
+msgid "Row Statistics"
+msgstr "Statisticile rîndului"
+
+#: tbl_printview.php:368 tbl_structure.php:728
+msgid "Statements"
+msgstr "Comenzi"
+
+#: tbl_printview.php:379 tbl_structure.php:740
+msgid "static"
+msgstr ""
+
+#: tbl_printview.php:381 tbl_structure.php:742
+msgid "dynamic"
+msgstr "dinamic"
+
+#: tbl_printview.php:403 tbl_structure.php:785
+msgid "Row length"
+msgstr "Lungime linie"
+
+#: tbl_printview.php:413 tbl_structure.php:793
+>>>>>>> origin/master
 msgid " Row size "
 msgstr " Mărime linie "
 
diff --git a/po/ru.po b/po/ru.po
index 7896041b6..105c7d99c 100755
--- a/po/ru.po
+++ b/po/ru.po
@@ -3,7 +3,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2010-07-03 21:45+0530\n"
+=======
+"POT-Creation-Date: 2010-07-03 09:00-0400\n"
+>>>>>>> origin/master
 "PO-Revision-Date: 2010-03-30 23:23+0200\n"
 "Last-Translator: Michal <michal@cihar.com>\n"
 "Language-Team: russian <ru@li.org>\n"
@@ -50,15 +54,26 @@ msgstr "Поиск"
 #: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046
 #: libraries/Theme_Manager.class.php:311
 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719
+<<<<<<< HEAD
 #: libraries/common.lib.php:1344 libraries/common.lib.php:2301
 #: libraries/display_change_password.lib.php:82
 #: libraries/display_create_table.lib.php:62
+=======
+#: libraries/common.lib.php:1335 libraries/common.lib.php:2288
+#: libraries/display_change_password.lib.php:82
+#: libraries/display_create_table.lib.php:63
+>>>>>>> origin/master
 #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532
 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76
 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104
+<<<<<<< HEAD
 #: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480
 #: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782
+=======
+#: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477
+#: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782
+>>>>>>> origin/master
 #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328
 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142
 #: server_privileges.php:665 server_privileges.php:1641
@@ -68,8 +83,13 @@ msgstr "Поиск"
 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171
 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265
 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561
+<<<<<<< HEAD
 #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560
 #: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512
+=======
+#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562
+#: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512
+>>>>>>> origin/master
 #: view_create.php:182 view_operations.php:101
 msgid "Go"
 msgstr "OK"
@@ -122,10 +142,17 @@ msgstr "Названия столбцов"
 #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245
 #: libraries/export/latex.php:360 libraries/export/odt.php:297
 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100
+<<<<<<< HEAD
 #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093
 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
 #: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321
+=======
+#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070
+#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
+#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
+#: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321
+>>>>>>> origin/master
 msgid "Type"
 msgstr "Тип"
 
@@ -166,9 +193,15 @@ msgstr "Комментарии"
 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322
 #: libraries/export/latex.php:430 libraries/export/odt.php:368
 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263
+<<<<<<< HEAD
 #: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596
 #: server_privileges.php:1911 server_privileges.php:1916
 #: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228
+=======
+#: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579
+#: server_privileges.php:1889 server_privileges.php:1894
+#: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228
+>>>>>>> origin/master
 #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342
 msgid "No"
 msgstr "Нет"
@@ -182,9 +215,15 @@ msgstr "Нет"
 #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106
 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262
 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344
+<<<<<<< HEAD
 #: server_databases.php:64 server_privileges.php:1582
 #: server_privileges.php:1596 server_privileges.php:1911
 #: server_privileges.php:1914 server_privileges.php:2210 sql.php:193
+=======
+#: server_databases.php:64 server_privileges.php:1565
+#: server_privileges.php:1579 server_privileges.php:1889
+#: server_privileges.php:1892 server_privileges.php:2187 sql.php:193
+>>>>>>> origin/master
 #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350
 #: tbl_tracking.php:335 tbl_tracking.php:340
 msgid "Yes"
@@ -233,7 +272,15 @@ msgstr "Переименовать базу данных в"
 msgid "Command"
 msgstr "Команда"
 
+<<<<<<< HEAD
 #: db_operations.php:466
+=======
+#: db_operations.php:429 tbl_change.php:1140
+msgid "and then"
+msgstr "и затем"
+
+#: db_operations.php:455
+>>>>>>> origin/master
 msgid "Copy database to"
 msgstr "Скопировать базу данных в"
 
@@ -321,7 +368,11 @@ msgstr "Включить"
 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730
 #: server_collations.php:54 server_collations.php:66 server_databases.php:111
 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179
+<<<<<<< HEAD
 #: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326
+=======
+#: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326
+>>>>>>> origin/master
 msgid "Collation"
 msgstr "Сравнение"
 
@@ -350,7 +401,11 @@ msgstr "Таблица "
 #: db_printview.php:105 libraries/db_structure.lib.php:56
 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146
 #: navigation.php:638 navigation.php:660 server_databases.php:122
+<<<<<<< HEAD
 #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775
+=======
+#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777
+>>>>>>> origin/master
 msgid "Rows"
 msgstr "Строки"
 
@@ -365,19 +420,31 @@ msgstr "используется"
 
 #: db_printview.php:187 libraries/db_info.inc.php:88
 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433
+<<<<<<< HEAD
 #: tbl_structure.php:807
+=======
+#: tbl_structure.php:809
+>>>>>>> origin/master
 msgid "Creation"
 msgstr "Создание"
 
 #: db_printview.php:196 libraries/db_info.inc.php:93
 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443
+<<<<<<< HEAD
 #: tbl_structure.php:815
+=======
+#: tbl_structure.php:817
+>>>>>>> origin/master
 msgid "Last update"
 msgstr "Последнее обновление"
 
 #: db_printview.php:205 libraries/db_info.inc.php:98
 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453
+<<<<<<< HEAD
 #: tbl_structure.php:823
+=======
+#: tbl_structure.php:825
+>>>>>>> origin/master
 msgid "Last check"
 msgstr "Последняя проверка"
 
@@ -444,7 +511,11 @@ msgstr "Удалить"
 
 #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553
 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779
+<<<<<<< HEAD
 #: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250
+=======
+#: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250
+>>>>>>> origin/master
 #: tbl_select.php:286
 msgid "Or"
 msgstr "Или"
@@ -664,9 +735,15 @@ msgstr "С отмеченными:"
 msgid "Check All"
 msgstr "Отметить все"
 
+<<<<<<< HEAD
 #: db_structure.php:529 libraries/display_tbl.lib.php:2077
 #: libraries/replication_gui.lib.php:36 server_databases.php:350
 #: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460
+=======
+#: db_structure.php:531 libraries/display_tbl.lib.php:2077
+#: libraries/replication_gui.lib.php:36 server_databases.php:350
+#: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462
+>>>>>>> origin/master
 msgid "Uncheck All"
 msgstr "Снять выделение"
 
@@ -1136,10 +1213,17 @@ msgid "Prev"
 msgstr "Назад"
 
 #. l10n: Display text for next month link in calendar
+<<<<<<< HEAD
 #: js/messages.php:106 libraries/common.lib.php:2366
 #: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338
 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
 #: tbl_structure.php:799
+=======
+#: js/messages.php:77 libraries/common.lib.php:2353
+#: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338
+#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
+#: tbl_structure.php:801
+>>>>>>> origin/master
 msgid "Next"
 msgstr "Следующий"
 
@@ -1687,7 +1771,11 @@ msgstr "Пароль:"
 msgid "Server Choice"
 msgstr "Выбор сервера"
 
+<<<<<<< HEAD
 #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63
+=======
+#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59
+>>>>>>> origin/master
 msgid "Cookies must be enabled past this point."
 msgstr "Для полноценной работы необходима поддержка cookies браузером."
 
@@ -1768,7 +1856,11 @@ msgstr ""
 "Несмотря на то что необходимые расширения загружены, использование функций "
 "iconv, libiconv или recode_string - невозможно. Проверьте настройки PHP."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:580
+=======
+#: libraries/common.inc.php:576
+>>>>>>> origin/master
 msgid ""
 "phpMyAdmin was unable to read your configuration file!<br />This might "
 "happen if PHP finds a parse error in it or PHP cannot find the file.<br /"
@@ -1784,13 +1876,21 @@ msgstr ""
 "синтаксическая ошибка, например, где-то пропущена кавычка или точка с "
 "запятой.<br />Если отобразится пустая страница - все в порядке."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:591
+=======
+#: libraries/common.inc.php:587
+>>>>>>> origin/master
 #, fuzzy, php-format
 #| msgid "Could not load default configuration from: \"%1$s\""
 msgid "Could not load default configuration from: %1$s"
 msgstr "Невозможно загрузить изначальную конфигурацию из: &quot;%1$s&quot;"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:596
+=======
+#: libraries/common.inc.php:592
+>>>>>>> origin/master
 msgid ""
 "The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
 "configuration file!"
@@ -1798,31 +1898,51 @@ msgstr ""
 "Директива <tt>$cfg['PmaAbsoluteUri']</tt> ДОЛЖНА быть установлена в "
 "конфигурационном файле!"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:626
+=======
+#: libraries/common.inc.php:622
+>>>>>>> origin/master
 #, fuzzy, php-format
 #| msgid "Invalid server index: \"%s\""
 msgid "Invalid server index: %s"
 msgstr "Неправильный номер сервера: &quot;%s&quot;"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:633
+=======
+#: libraries/common.inc.php:629
+>>>>>>> origin/master
 #, php-format
 msgid "Invalid hostname for server %1$s. Please review your configuration."
 msgstr ""
 "Для сервера %1$s указано неверное имя хоста. Исправьте настройки заданные в "
 "конфигурационном файле phpMyAdmin."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:642 libraries/header.inc.php:100
+=======
+#: libraries/common.inc.php:638 libraries/header.inc.php:96
+>>>>>>> origin/master
 #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47
 #: main.php:185 test/theme.php:57
 msgid "Server"
 msgstr "Сервер"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:820
+=======
+#: libraries/common.inc.php:816
+>>>>>>> origin/master
 msgid "Invalid authentication method set in configuration:"
 msgstr ""
 "В конфигурационном файле phpMyAdmin установлен неверный метод аутентификации:"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:923
+=======
+#: libraries/common.inc.php:919
+>>>>>>> origin/master
 #, php-format
 msgid "You should upgrade to %s %s or later."
 msgstr "Необходимо обновить %s до версии %s или выше."
@@ -2070,7 +2190,11 @@ msgid ""
 msgstr "Может быть приблизительно. См. FAQ 3.11"
 
 #: libraries/db_structure.lib.php:69 server_databases.php:142
+<<<<<<< HEAD
 #: tbl_printview.php:335 tbl_structure.php:680
+=======
+#: tbl_printview.php:335 tbl_structure.php:682
+>>>>>>> origin/master
 msgid "Overhead"
 msgstr "Фрагментировано"
 
@@ -2100,22 +2224,36 @@ msgid "Change password"
 msgstr "Изменить пароль"
 
 #: libraries/display_change_password.lib.php:35
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:348 server_privileges.php:808
+=======
+#: libraries/replication_gui.lib.php:348 server_privileges.php:807
+>>>>>>> origin/master
 msgid "No Password"
 msgstr "Без пароля"
 
 #: libraries/display_change_password.lib.php:41
 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63
 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:352 server_privileges.php:797
 #: server_privileges.php:801 server_privileges.php:812
 #: server_privileges.php:1555 server_synchronize.php:1175
+=======
+#: libraries/replication_gui.lib.php:352 server_privileges.php:796
+#: server_privileges.php:800 server_privileges.php:811
+#: server_privileges.php:1538 server_synchronize.php:1175
+>>>>>>> origin/master
 msgid "Password"
 msgstr "Пароль"
 
 #: libraries/display_change_password.lib.php:46
 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359
+<<<<<<< HEAD
 #: server_privileges.php:816 server_privileges.php:819
+=======
+#: server_privileges.php:815 server_privileges.php:818
+>>>>>>> origin/master
 msgid "Re-type"
 msgstr "Подтверждение"
 
@@ -2130,12 +2268,20 @@ msgid "MySQL 4.0 compatible"
 msgstr "MySQL&nbsp;4.0 совместимо"
 
 #: libraries/display_change_password.lib.php:72
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:363 server_privileges.php:823
+=======
+#: libraries/replication_gui.lib.php:363 server_privileges.php:822
+>>>>>>> origin/master
 msgid "Generate Password"
 msgstr "Создать пароль"
 
 #: libraries/display_change_password.lib.php:75
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:366 server_privileges.php:826
+=======
+#: libraries/replication_gui.lib.php:366 server_privileges.php:825
+>>>>>>> origin/master
 msgid "Generate"
 msgstr "Генерировать"
 
@@ -2225,7 +2371,11 @@ msgid "remember template"
 msgstr "запомнить шаблон"
 
 #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552
+=======
+#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549
+>>>>>>> origin/master
 msgid "Character set of the file:"
 msgstr "Кодировка файла:"
 
@@ -2281,7 +2431,11 @@ msgstr "Пожалуйста, подождите, файл был загруже
 msgid "File to import"
 msgstr "Импортируемый файл"
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527
+=======
+#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524
+>>>>>>> origin/master
 msgid "Location of the text file"
 msgstr "Выбор файла"
 
@@ -2289,12 +2443,20 @@ msgstr "Выбор файла"
 msgid "File uploads are not allowed on this server."
 msgstr "Загрузка файлов на сервер, невозможна."
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536
+=======
+#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533
+>>>>>>> origin/master
 #: tbl_change.php:1025
 msgid "The directory you set for upload work cannot be reached"
 msgstr "Установленный каталог загрузки не доступен"
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539
+=======
+#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536
+>>>>>>> origin/master
 #: tbl_change.php:1028
 msgid "web server upload directory"
 msgstr "Из каталога загрузки"
@@ -2429,7 +2591,11 @@ msgstr "Сортировать по индексу"
 #: libraries/import/docsql.php:34 libraries/import/ldi.php:47
 #: libraries/import/ods.php:30 libraries/import/sql.php:20
 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26
+<<<<<<< HEAD
 #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751
+=======
+#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753
+>>>>>>> origin/master
 msgid "Options"
 msgstr "Параметры"
 
@@ -2576,7 +2742,11 @@ msgstr "Использование"
 
 #: libraries/engines/innodb.lib.php:194 server_databases.php:137
 #: server_databases.php:305 server_status.php:525 server_status.php:586
+<<<<<<< HEAD
 #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694
+=======
+#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696
+>>>>>>> origin/master
 msgid "Total"
 msgstr "Всего"
 
@@ -2868,7 +3038,11 @@ msgstr ""
 "порядковый номер."
 
 #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88
+<<<<<<< HEAD
 #: tbl_printview.php:375 tbl_structure.php:735
+=======
+#: tbl_printview.php:375 tbl_structure.php:737
+>>>>>>> origin/master
 msgid "Format"
 msgstr "Формат"
 
@@ -2942,8 +3116,13 @@ msgstr "Microsoft Word 2000"
 #: libraries/export/latex.php:201 libraries/export/odt.php:48
 #: libraries/export/sql.php:106 libraries/export/sql.php:868
 #: libraries/export/texytext.php:27 server_databases.php:127
+<<<<<<< HEAD
 #: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316
 #: tbl_structure.php:663
+=======
+#: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316
+#: tbl_structure.php:665
+>>>>>>> origin/master
 msgid "Data"
 msgstr "Данные"
 
@@ -2992,9 +3171,15 @@ msgstr "MIME-тип"
 #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57
 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177
 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:332 server_privileges.php:732
 #: server_privileges.php:735 server_privileges.php:791
 #: server_privileges.php:1554 server_privileges.php:2092
+=======
+#: libraries/replication_gui.lib.php:332 server_privileges.php:731
+#: server_privileges.php:734 server_privileges.php:790
+#: server_privileges.php:1537 server_privileges.php:2069
+>>>>>>> origin/master
 #: server_processlist.php:55 server_synchronize.php:1159
 msgid "Host"
 msgstr "Хост"
@@ -3665,8 +3850,13 @@ msgstr ""
 
 #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59
 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:262 server_privileges.php:712
 #: server_privileges.php:715 server_privileges.php:722
+=======
+#: libraries/replication_gui.lib.php:262 server_privileges.php:711
+#: server_privileges.php:714 server_privileges.php:721
+>>>>>>> origin/master
 #: server_synchronize.php:1171
 msgid "User name"
 msgstr "Имя пользователя"
@@ -3683,14 +3873,22 @@ msgstr "Статус Master"
 msgid "Slave status"
 msgstr "Статус Slave"
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448
+=======
+#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445
+>>>>>>> origin/master
 #: server_status.php:737 server_variables.php:52
 msgid "Variable"
 msgstr "Переменная"
 
 #: libraries/replication_gui.lib.php:118 server_status.php:738
 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138
+<<<<<<< HEAD
 #: tbl_structure.php:727
+=======
+#: tbl_structure.php:729
+>>>>>>> origin/master
 msgid "Value"
 msgstr "Значение"
 
@@ -3710,11 +3908,16 @@ msgstr ""
 msgid "Add slave replication user"
 msgstr "Добавьте подчиненного пользователя репликации"
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:257 server_privileges.php:717
+=======
+#: libraries/replication_gui.lib.php:257 server_privileges.php:716
+>>>>>>> origin/master
 msgid "Any user"
 msgstr "Любой пользователь"
 
 #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:349 server_privileges.php:718
 #: server_privileges.php:785 server_privileges.php:809
 #: server_privileges.php:1950 server_privileges.php:1980
@@ -3738,6 +3941,31 @@ msgid "Use Host Table"
 msgstr "Использовать таблицу хостов"
 
 #: libraries/replication_gui.lib.php:334 server_privileges.php:793
+=======
+#: libraries/replication_gui.lib.php:349 server_privileges.php:717
+#: server_privileges.php:784 server_privileges.php:808
+#: server_privileges.php:1928 server_privileges.php:1958
+msgid "Use text field"
+msgstr "Использовать текстовое поле"
+
+#: libraries/replication_gui.lib.php:305 server_privileges.php:764
+msgid "Any host"
+msgstr "Любой хост"
+
+#: libraries/replication_gui.lib.php:309 server_privileges.php:768
+msgid "Local"
+msgstr "Локальный"
+
+#: libraries/replication_gui.lib.php:315 server_privileges.php:773
+msgid "This Host"
+msgstr "Этот хост"
+
+#: libraries/replication_gui.lib.php:321 server_privileges.php:779
+msgid "Use Host Table"
+msgstr "Использовать таблицу хостов"
+
+#: libraries/replication_gui.lib.php:334 server_privileges.php:792
+>>>>>>> origin/master
 msgid ""
 "When Host table is used, this field is ignored and values stored in Host "
 "table are used instead."
@@ -8247,10 +8475,13 @@ msgstr ""
 msgid "Show insert query"
 msgstr "Отображает SQL-запрос"
 
+<<<<<<< HEAD
 #: tbl_change.php:1140
 msgid "and then"
 msgstr "и затем"
 
+=======
+>>>>>>> origin/master
 #: tbl_change.php:1144
 msgid "Go back to previous page"
 msgstr "Вернуться на предыдущую страницу"
@@ -8445,6 +8676,7 @@ msgstr "Проверить целостность данных:"
 msgid "Show tables"
 msgstr "Отображение таблиц"
 
+<<<<<<< HEAD
 #: tbl_printview.php:309 tbl_structure.php:654
 msgid "Space usage"
 msgstr "Используемое пространство"
@@ -8478,6 +8710,41 @@ msgid "Row length"
 msgstr "Длина строки"
 
 #: tbl_printview.php:413 tbl_structure.php:791
+=======
+#: tbl_printview.php:309 tbl_structure.php:656
+msgid "Space usage"
+msgstr "Используемое пространство"
+
+#: tbl_printview.php:313 tbl_structure.php:660
+msgid "Usage"
+msgstr "Использование"
+
+#: tbl_printview.php:340 tbl_structure.php:687
+msgid "Effective"
+msgstr "Эффективность"
+
+#: tbl_printview.php:365 tbl_structure.php:725
+msgid "Row Statistics"
+msgstr "Статистика строк"
+
+#: tbl_printview.php:368 tbl_structure.php:728
+msgid "Statements"
+msgstr "Характеристика"
+
+#: tbl_printview.php:379 tbl_structure.php:740
+msgid "static"
+msgstr "статический"
+
+#: tbl_printview.php:381 tbl_structure.php:742
+msgid "dynamic"
+msgstr "динамический"
+
+#: tbl_printview.php:403 tbl_structure.php:785
+msgid "Row length"
+msgstr "Длина строки"
+
+#: tbl_printview.php:413 tbl_structure.php:793
+>>>>>>> origin/master
 msgid " Row size "
 msgstr "Размер строки"
 
diff --git a/po/si.po b/po/si.po
index 33049eeb7..523606b32 100755
--- a/po/si.po
+++ b/po/si.po
@@ -3,7 +3,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2010-07-03 21:45+0530\n"
+=======
+"POT-Creation-Date: 2010-07-03 09:00-0400\n"
+>>>>>>> origin/master
 "PO-Revision-Date: 2010-03-30 23:09+0200\n"
 "Last-Translator: Michal <michal@cihar.com>\n"
 "Language-Team: sinhala <si@li.org>\n"
@@ -48,15 +52,26 @@ msgstr "සෙවීම"
 #: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046
 #: libraries/Theme_Manager.class.php:311
 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719
+<<<<<<< HEAD
 #: libraries/common.lib.php:1344 libraries/common.lib.php:2301
 #: libraries/display_change_password.lib.php:82
 #: libraries/display_create_table.lib.php:62
+=======
+#: libraries/common.lib.php:1335 libraries/common.lib.php:2288
+#: libraries/display_change_password.lib.php:82
+#: libraries/display_create_table.lib.php:63
+>>>>>>> origin/master
 #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532
 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76
 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104
+<<<<<<< HEAD
 #: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480
 #: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782
+=======
+#: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477
+#: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782
+>>>>>>> origin/master
 #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328
 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142
 #: server_privileges.php:665 server_privileges.php:1641
@@ -66,8 +81,13 @@ msgstr "සෙවීම"
 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171
 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265
 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561
+<<<<<<< HEAD
 #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560
 #: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512
+=======
+#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562
+#: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512
+>>>>>>> origin/master
 #: view_create.php:182 view_operations.php:101
 msgid "Go"
 msgstr "යන්න"
@@ -120,10 +140,17 @@ msgstr "තීර නම්"
 #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245
 #: libraries/export/latex.php:360 libraries/export/odt.php:297
 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100
+<<<<<<< HEAD
 #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093
 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
 #: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321
+=======
+#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070
+#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
+#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
+#: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321
+>>>>>>> origin/master
 msgid "Type"
 msgstr "වර්ගය"
 
@@ -164,9 +191,15 @@ msgstr "විස්තරය"
 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322
 #: libraries/export/latex.php:430 libraries/export/odt.php:368
 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263
+<<<<<<< HEAD
 #: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596
 #: server_privileges.php:1911 server_privileges.php:1916
 #: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228
+=======
+#: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579
+#: server_privileges.php:1889 server_privileges.php:1894
+#: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228
+>>>>>>> origin/master
 #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342
 msgid "No"
 msgstr "නැත"
@@ -180,9 +213,15 @@ msgstr "නැත"
 #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106
 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262
 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344
+<<<<<<< HEAD
 #: server_databases.php:64 server_privileges.php:1582
 #: server_privileges.php:1596 server_privileges.php:1911
 #: server_privileges.php:1914 server_privileges.php:2210 sql.php:193
+=======
+#: server_databases.php:64 server_privileges.php:1565
+#: server_privileges.php:1579 server_privileges.php:1889
+#: server_privileges.php:1892 server_privileges.php:2187 sql.php:193
+>>>>>>> origin/master
 #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350
 #: tbl_tracking.php:335 tbl_tracking.php:340
 msgid "Yes"
@@ -231,7 +270,15 @@ msgstr "බවට දත්තගබඩාවේ නම වෙනස් කර
 msgid "Command"
 msgstr "විධානය"
 
+<<<<<<< HEAD
 #: db_operations.php:466
+=======
+#: db_operations.php:429 tbl_change.php:1140
+msgid "and then"
+msgstr "සහ එවිට"
+
+#: db_operations.php:455
+>>>>>>> origin/master
 msgid "Copy database to"
 msgstr "වෙත දත්තගබඩාව පිටවත් කරන්න"
 
@@ -320,7 +367,11 @@ msgstr "සක්‍රිය කරන් ලද"
 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730
 #: server_collations.php:54 server_collations.php:66 server_databases.php:111
 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179
+<<<<<<< HEAD
 #: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326
+=======
+#: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326
+>>>>>>> origin/master
 msgid "Collation"
 msgstr "Collation"
 
@@ -349,7 +400,11 @@ msgstr "වගුව"
 #: db_printview.php:105 libraries/db_structure.lib.php:56
 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146
 #: navigation.php:638 navigation.php:660 server_databases.php:122
+<<<<<<< HEAD
 #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775
+=======
+#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777
+>>>>>>> origin/master
 msgid "Rows"
 msgstr "පේළි"
 
@@ -364,19 +419,31 @@ msgstr "භාවිතා වෙමින් පවතී"
 
 #: db_printview.php:187 libraries/db_info.inc.php:88
 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433
+<<<<<<< HEAD
 #: tbl_structure.php:807
+=======
+#: tbl_structure.php:809
+>>>>>>> origin/master
 msgid "Creation"
 msgstr "සෑදීම"
 
 #: db_printview.php:196 libraries/db_info.inc.php:93
 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443
+<<<<<<< HEAD
 #: tbl_structure.php:815
+=======
+#: tbl_structure.php:817
+>>>>>>> origin/master
 msgid "Last update"
 msgstr "අවසන් යාවත් කාලීන කිරීම"
 
 #: db_printview.php:205 libraries/db_info.inc.php:98
 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453
+<<<<<<< HEAD
 #: tbl_structure.php:823
+=======
+#: tbl_structure.php:825
+>>>>>>> origin/master
 msgid "Last check"
 msgstr "අවසන් පරීක්ෂාව"
 
@@ -441,7 +508,11 @@ msgstr "Del"
 
 #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553
 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779
+<<<<<<< HEAD
 #: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250
+=======
+#: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250
+>>>>>>> origin/master
 #: tbl_select.php:286
 msgid "Or"
 msgstr "හෝ"
@@ -659,9 +730,15 @@ msgstr "තෝරාගත්:"
 msgid "Check All"
 msgstr "සියල්ල කතිර කොටුගත කරන්න"
 
+<<<<<<< HEAD
 #: db_structure.php:529 libraries/display_tbl.lib.php:2077
 #: libraries/replication_gui.lib.php:36 server_databases.php:350
 #: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460
+=======
+#: db_structure.php:531 libraries/display_tbl.lib.php:2077
+#: libraries/replication_gui.lib.php:36 server_databases.php:350
+#: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462
+>>>>>>> origin/master
 msgid "Uncheck All"
 msgstr "කතිර කොටුගත කිරීම ඉවත් කරන්න"
 
@@ -1129,10 +1206,17 @@ msgid "Prev"
 msgstr "පෙර"
 
 #. l10n: Display text for next month link in calendar
+<<<<<<< HEAD
 #: js/messages.php:106 libraries/common.lib.php:2366
 #: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338
 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
 #: tbl_structure.php:799
+=======
+#: js/messages.php:77 libraries/common.lib.php:2353
+#: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338
+#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
+#: tbl_structure.php:801
+>>>>>>> origin/master
 msgid "Next"
 msgstr "මීලඟ"
 
@@ -1675,7 +1759,11 @@ msgstr "මුරපදය:"
 msgid "Server Choice"
 msgstr "සර්වරයේ තේරීම"
 
+<<<<<<< HEAD
 #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63
+=======
+#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59
+>>>>>>> origin/master
 msgid "Cookies must be enabled past this point."
 msgstr "මෙම ස්ථානය පසු කිරීම සඳහා කුකීස් - Cookies සක්‍රිය කල යුතුයි."
 
@@ -1755,7 +1843,11 @@ msgstr ""
 "Couldn't use either the iconv, libiconv or recode_string functions, although "
 "the necessary extensions appear to be loaded. Check your PHP configuration."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:580
+=======
+#: libraries/common.inc.php:576
+>>>>>>> origin/master
 msgid ""
 "phpMyAdmin was unable to read your configuration file!<br />This might "
 "happen if PHP finds a parse error in it or PHP cannot find the file.<br /"
@@ -1771,13 +1863,21 @@ msgstr ""
 "semicolon is missing somewhere.<br />If you receive a blank page, everything "
 "is fine."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:591
+=======
+#: libraries/common.inc.php:587
+>>>>>>> origin/master
 #, fuzzy, php-format
 #| msgid "Could not load default configuration from: \"%1$s\""
 msgid "Could not load default configuration from: %1$s"
 msgstr "Could not load default configuration from: \"%1$s\""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:596
+=======
+#: libraries/common.inc.php:592
+>>>>>>> origin/master
 msgid ""
 "The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
 "configuration file!"
@@ -1785,28 +1885,48 @@ msgstr ""
 "The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
 "configuration file!"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:626
+=======
+#: libraries/common.inc.php:622
+>>>>>>> origin/master
 #, fuzzy, php-format
 #| msgid "Invalid server index: \"%s\""
 msgid "Invalid server index: %s"
 msgstr "Invalid server index: \"%s\""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:633
+=======
+#: libraries/common.inc.php:629
+>>>>>>> origin/master
 #, php-format
 msgid "Invalid hostname for server %1$s. Please review your configuration."
 msgstr "Invalid hostname for server %1$s. Please review your configuration."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:642 libraries/header.inc.php:100
+=======
+#: libraries/common.inc.php:638 libraries/header.inc.php:96
+>>>>>>> origin/master
 #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47
 #: main.php:185 test/theme.php:57
 msgid "Server"
 msgstr "සර්වරය"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:820
 msgid "Invalid authentication method set in configuration:"
 msgstr "Invalid authentication method set in configuration:"
 
 #: libraries/common.inc.php:923
+=======
+#: libraries/common.inc.php:816
+msgid "Invalid authentication method set in configuration:"
+msgstr "Invalid authentication method set in configuration:"
+
+#: libraries/common.inc.php:919
+>>>>>>> origin/master
 #, php-format
 msgid "You should upgrade to %s %s or later."
 msgstr "You should upgrade to %s %s or later."
@@ -2054,7 +2174,11 @@ msgid ""
 msgstr "සමහර විට ආසන්න වශයෙන්. FAQ 3.11 බලන්න"
 
 #: libraries/db_structure.lib.php:69 server_databases.php:142
+<<<<<<< HEAD
 #: tbl_printview.php:335 tbl_structure.php:680
+=======
+#: tbl_printview.php:335 tbl_structure.php:682
+>>>>>>> origin/master
 msgid "Overhead"
 msgstr "පිරිවැය"
 
@@ -2081,22 +2205,36 @@ msgid "Change password"
 msgstr "මුරපදය වෙනස් කරන්න"
 
 #: libraries/display_change_password.lib.php:35
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:348 server_privileges.php:808
+=======
+#: libraries/replication_gui.lib.php:348 server_privileges.php:807
+>>>>>>> origin/master
 msgid "No Password"
 msgstr "මුරපදයක් නැත"
 
 #: libraries/display_change_password.lib.php:41
 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63
 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:352 server_privileges.php:797
 #: server_privileges.php:801 server_privileges.php:812
 #: server_privileges.php:1555 server_synchronize.php:1175
+=======
+#: libraries/replication_gui.lib.php:352 server_privileges.php:796
+#: server_privileges.php:800 server_privileges.php:811
+#: server_privileges.php:1538 server_synchronize.php:1175
+>>>>>>> origin/master
 msgid "Password"
 msgstr "මුරපදය"
 
 #: libraries/display_change_password.lib.php:46
 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359
+<<<<<<< HEAD
 #: server_privileges.php:816 server_privileges.php:819
+=======
+#: server_privileges.php:815 server_privileges.php:818
+>>>>>>> origin/master
 msgid "Re-type"
 msgstr "නැවත ටයිප් කරන්න"
 
@@ -2111,12 +2249,20 @@ msgid "MySQL 4.0 compatible"
 msgstr "MySQL&nbsp;4.0 compatible"
 
 #: libraries/display_change_password.lib.php:72
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:363 server_privileges.php:823
+=======
+#: libraries/replication_gui.lib.php:363 server_privileges.php:822
+>>>>>>> origin/master
 msgid "Generate Password"
 msgstr "මුරපදය උත්පාදනය කරන්න"
 
 #: libraries/display_change_password.lib.php:75
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:366 server_privileges.php:826
+=======
+#: libraries/replication_gui.lib.php:366 server_privileges.php:825
+>>>>>>> origin/master
 msgid "Generate"
 msgstr "උත්පාදනය කරන්න"
 
@@ -2204,7 +2350,11 @@ msgid "remember template"
 msgstr "ටෙම්ප්ලේටය මතක තබා ගන්න"
 
 #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552
+=======
+#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549
+>>>>>>> origin/master
 msgid "Character set of the file:"
 msgstr "ගොනුවේ අක්ෂර කට්ටලය:"
 
@@ -2257,7 +2407,11 @@ msgstr ""
 msgid "File to import"
 msgstr "ආනයනය සඳහා වූ ගොනුව"
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527
+=======
+#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524
+>>>>>>> origin/master
 msgid "Location of the text file"
 msgstr "පාඨ ගොනුවෙහි පිහිටුම"
 
@@ -2265,12 +2419,20 @@ msgstr "පාඨ ගොනුවෙහි පිහිටුම"
 msgid "File uploads are not allowed on this server."
 msgstr "File uploads are not allowed on this server."
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536
+=======
+#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533
+>>>>>>> origin/master
 #: tbl_change.php:1025
 msgid "The directory you set for upload work cannot be reached"
 msgstr "අප්ලෝඩ් කිරීම් සඳහා සැකසූ ඩිරෙක්ටරිය වෙත පිවිසිය නොහැක"
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539
+=======
+#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536
+>>>>>>> origin/master
 #: tbl_change.php:1028
 msgid "web server upload directory"
 msgstr "අන්තර්ජාල සර්වරයේ අප්ලෝඩ් ඩිරෙක්ටරිය"
@@ -2405,7 +2567,11 @@ msgstr "යතුර අනුව තෝරන්න"
 #: libraries/import/docsql.php:34 libraries/import/ldi.php:47
 #: libraries/import/ods.php:30 libraries/import/sql.php:20
 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26
+<<<<<<< HEAD
 #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751
+=======
+#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753
+>>>>>>> origin/master
 #, fuzzy
 msgid "Options"
 msgstr "මෙහෙයුම්"
@@ -2554,7 +2720,11 @@ msgstr "Buffer Pool Usage"
 
 #: libraries/engines/innodb.lib.php:194 server_databases.php:137
 #: server_databases.php:305 server_status.php:525 server_status.php:586
+<<<<<<< HEAD
 #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694
+=======
+#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696
+>>>>>>> origin/master
 msgid "Total"
 msgstr "මුළු එකතුව"
 
@@ -2815,7 +2985,11 @@ msgid ""
 msgstr ""
 
 #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88
+<<<<<<< HEAD
 #: tbl_printview.php:375 tbl_structure.php:735
+=======
+#: tbl_printview.php:375 tbl_structure.php:737
+>>>>>>> origin/master
 msgid "Format"
 msgstr "ආකෘතිය"
 
@@ -2887,8 +3061,13 @@ msgstr "මෛක්‍රොසොෆ්ට් වර්ඩ් 2000"
 #: libraries/export/latex.php:201 libraries/export/odt.php:48
 #: libraries/export/sql.php:106 libraries/export/sql.php:868
 #: libraries/export/texytext.php:27 server_databases.php:127
+<<<<<<< HEAD
 #: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316
 #: tbl_structure.php:663
+=======
+#: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316
+#: tbl_structure.php:665
+>>>>>>> origin/master
 msgid "Data"
 msgstr "දත්ත"
 
@@ -2937,9 +3116,15 @@ msgstr "MIME වර්ගය"
 #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57
 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177
 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:332 server_privileges.php:732
 #: server_privileges.php:735 server_privileges.php:791
 #: server_privileges.php:1554 server_privileges.php:2092
+=======
+#: libraries/replication_gui.lib.php:332 server_privileges.php:731
+#: server_privileges.php:734 server_privileges.php:790
+#: server_privileges.php:1537 server_privileges.php:2069
+>>>>>>> origin/master
 #: server_processlist.php:55 server_synchronize.php:1159
 msgid "Host"
 msgstr "දායකයා"
@@ -3615,8 +3800,13 @@ msgstr ""
 
 #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59
 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:262 server_privileges.php:712
 #: server_privileges.php:715 server_privileges.php:722
+=======
+#: libraries/replication_gui.lib.php:262 server_privileges.php:711
+#: server_privileges.php:714 server_privileges.php:721
+>>>>>>> origin/master
 #: server_synchronize.php:1171
 msgid "User name"
 msgstr "භාවිත නාමය"
@@ -3636,14 +3826,22 @@ msgstr "උපතත්වයන් පෙන්වන්න"
 msgid "Slave status"
 msgstr "උපතත්වයන් පෙන්වන්න"
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448
+=======
+#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445
+>>>>>>> origin/master
 #: server_status.php:737 server_variables.php:52
 msgid "Variable"
 msgstr "Variable"
 
 #: libraries/replication_gui.lib.php:118 server_status.php:738
 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138
+<<<<<<< HEAD
 #: tbl_structure.php:727
+=======
+#: tbl_structure.php:729
+>>>>>>> origin/master
 msgid "Value"
 msgstr "Value"
 
@@ -3661,11 +3859,16 @@ msgstr ""
 msgid "Add slave replication user"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:257 server_privileges.php:717
+=======
+#: libraries/replication_gui.lib.php:257 server_privileges.php:716
+>>>>>>> origin/master
 msgid "Any user"
 msgstr "ඕනෑම භාවිතා කරන්නෙක්"
 
 #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:349 server_privileges.php:718
 #: server_privileges.php:785 server_privileges.php:809
 #: server_privileges.php:1950 server_privileges.php:1980
@@ -3689,6 +3892,31 @@ msgid "Use Host Table"
 msgstr "දායක වගුව භාවිතා කරන්න"
 
 #: libraries/replication_gui.lib.php:334 server_privileges.php:793
+=======
+#: libraries/replication_gui.lib.php:349 server_privileges.php:717
+#: server_privileges.php:784 server_privileges.php:808
+#: server_privileges.php:1928 server_privileges.php:1958
+msgid "Use text field"
+msgstr "Use text field"
+
+#: libraries/replication_gui.lib.php:305 server_privileges.php:764
+msgid "Any host"
+msgstr "ඕනෑම දායකයෙක්"
+
+#: libraries/replication_gui.lib.php:309 server_privileges.php:768
+msgid "Local"
+msgstr "ස්වදේශී"
+
+#: libraries/replication_gui.lib.php:315 server_privileges.php:773
+msgid "This Host"
+msgstr "this host"
+
+#: libraries/replication_gui.lib.php:321 server_privileges.php:779
+msgid "Use Host Table"
+msgstr "දායක වගුව භාවිතා කරන්න"
+
+#: libraries/replication_gui.lib.php:334 server_privileges.php:792
+>>>>>>> origin/master
 msgid ""
 "When Host table is used, this field is ignored and values stored in Host "
 "table are used instead."
@@ -7892,10 +8120,13 @@ msgstr ""
 msgid "Show insert query"
 msgstr ""
 
+<<<<<<< HEAD
 #: tbl_change.php:1140
 msgid "and then"
 msgstr "සහ එවිට"
 
+=======
+>>>>>>> origin/master
 #: tbl_change.php:1144
 msgid "Go back to previous page"
 msgstr "පෙර පිටුවට ආපසු යන්න"
@@ -8093,6 +8324,7 @@ msgstr "Check referential integrity:"
 msgid "Show tables"
 msgstr "වගු පෙන්වන්න"
 
+<<<<<<< HEAD
 #: tbl_printview.php:309 tbl_structure.php:654
 msgid "Space usage"
 msgstr "අවකාශ භාවිතය"
@@ -8126,6 +8358,41 @@ msgid "Row length"
 msgstr "පේළියේ දිග"
 
 #: tbl_printview.php:413 tbl_structure.php:791
+=======
+#: tbl_printview.php:309 tbl_structure.php:656
+msgid "Space usage"
+msgstr "අවකාශ භාවිතය"
+
+#: tbl_printview.php:313 tbl_structure.php:660
+msgid "Usage"
+msgstr "භාවිතය"
+
+#: tbl_printview.php:340 tbl_structure.php:687
+msgid "Effective"
+msgstr "Effective"
+
+#: tbl_printview.php:365 tbl_structure.php:725
+msgid "Row Statistics"
+msgstr "පේළි සංඛ්‍ය ලේඛන"
+
+#: tbl_printview.php:368 tbl_structure.php:728
+msgid "Statements"
+msgstr "ප්‍රකාශය"
+
+#: tbl_printview.php:379 tbl_structure.php:740
+msgid "static"
+msgstr ""
+
+#: tbl_printview.php:381 tbl_structure.php:742
+msgid "dynamic"
+msgstr "ගතික"
+
+#: tbl_printview.php:403 tbl_structure.php:785
+msgid "Row length"
+msgstr "පේළියේ දිග"
+
+#: tbl_printview.php:413 tbl_structure.php:793
+>>>>>>> origin/master
 msgid " Row size "
 msgstr "පේළියේ ප්‍රමාණය"
 
diff --git a/po/sk.po b/po/sk.po
index 2d194275e..3b2c46f4d 100755
--- a/po/sk.po
+++ b/po/sk.po
@@ -3,7 +3,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2010-07-03 21:45+0530\n"
+=======
+"POT-Creation-Date: 2010-07-03 09:00-0400\n"
+>>>>>>> origin/master
 "PO-Revision-Date: 2010-03-30 23:47+0200\n"
 "Last-Translator: Michal <michal@cihar.com>\n"
 "Language-Team: slovak <sk@li.org>\n"
@@ -49,15 +53,26 @@ msgstr "Hľadať"
 #: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046
 #: libraries/Theme_Manager.class.php:311
 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719
+<<<<<<< HEAD
 #: libraries/common.lib.php:1344 libraries/common.lib.php:2301
 #: libraries/display_change_password.lib.php:82
 #: libraries/display_create_table.lib.php:62
+=======
+#: libraries/common.lib.php:1335 libraries/common.lib.php:2288
+#: libraries/display_change_password.lib.php:82
+#: libraries/display_create_table.lib.php:63
+>>>>>>> origin/master
 #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532
 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76
 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104
+<<<<<<< HEAD
 #: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480
 #: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782
+=======
+#: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477
+#: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782
+>>>>>>> origin/master
 #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328
 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142
 #: server_privileges.php:665 server_privileges.php:1641
@@ -67,8 +82,13 @@ msgstr "Hľadať"
 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171
 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265
 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561
+<<<<<<< HEAD
 #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560
 #: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512
+=======
+#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562
+#: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512
+>>>>>>> origin/master
 #: view_create.php:182 view_operations.php:101
 msgid "Go"
 msgstr "Vykonaj"
@@ -121,10 +141,17 @@ msgstr "Názvy stĺpcov"
 #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245
 #: libraries/export/latex.php:360 libraries/export/odt.php:297
 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100
+<<<<<<< HEAD
 #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093
 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
 #: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321
+=======
+#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070
+#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
+#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
+#: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321
+>>>>>>> origin/master
 msgid "Type"
 msgstr "Typ"
 
@@ -165,9 +192,15 @@ msgstr "Komentáre"
 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322
 #: libraries/export/latex.php:430 libraries/export/odt.php:368
 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263
+<<<<<<< HEAD
 #: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596
 #: server_privileges.php:1911 server_privileges.php:1916
 #: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228
+=======
+#: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579
+#: server_privileges.php:1889 server_privileges.php:1894
+#: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228
+>>>>>>> origin/master
 #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342
 msgid "No"
 msgstr "Nie"
@@ -181,9 +214,15 @@ msgstr "Nie"
 #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106
 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262
 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344
+<<<<<<< HEAD
 #: server_databases.php:64 server_privileges.php:1582
 #: server_privileges.php:1596 server_privileges.php:1911
 #: server_privileges.php:1914 server_privileges.php:2210 sql.php:193
+=======
+#: server_databases.php:64 server_privileges.php:1565
+#: server_privileges.php:1579 server_privileges.php:1889
+#: server_privileges.php:1892 server_privileges.php:2187 sql.php:193
+>>>>>>> origin/master
 #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350
 #: tbl_tracking.php:335 tbl_tracking.php:340
 msgid "Yes"
@@ -232,7 +271,15 @@ msgstr "Premenovať databázu na"
 msgid "Command"
 msgstr "Príkaz"
 
+<<<<<<< HEAD
 #: db_operations.php:466
+=======
+#: db_operations.php:429 tbl_change.php:1140
+msgid "and then"
+msgstr "a potom"
+
+#: db_operations.php:455
+>>>>>>> origin/master
 msgid "Copy database to"
 msgstr "Skopírovať databázu na"
 
@@ -322,7 +369,11 @@ msgstr "Zapnuté"
 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730
 #: server_collations.php:54 server_collations.php:66 server_databases.php:111
 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179
+<<<<<<< HEAD
 #: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326
+=======
+#: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326
+>>>>>>> origin/master
 msgid "Collation"
 msgstr "Zotriedenie"
 
@@ -351,7 +402,11 @@ msgstr "Tabuľka"
 #: db_printview.php:105 libraries/db_structure.lib.php:56
 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146
 #: navigation.php:638 navigation.php:660 server_databases.php:122
+<<<<<<< HEAD
 #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775
+=======
+#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777
+>>>>>>> origin/master
 msgid "Rows"
 msgstr "Riadkov"
 
@@ -366,19 +421,31 @@ msgstr "práve sa používa"
 
 #: db_printview.php:187 libraries/db_info.inc.php:88
 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433
+<<<<<<< HEAD
 #: tbl_structure.php:807
+=======
+#: tbl_structure.php:809
+>>>>>>> origin/master
 msgid "Creation"
 msgstr "Vytvorenie"
 
 #: db_printview.php:196 libraries/db_info.inc.php:93
 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443
+<<<<<<< HEAD
 #: tbl_structure.php:815
+=======
+#: tbl_structure.php:817
+>>>>>>> origin/master
 msgid "Last update"
 msgstr "Posledná zmena"
 
 #: db_printview.php:205 libraries/db_info.inc.php:98
 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453
+<<<<<<< HEAD
 #: tbl_structure.php:823
+=======
+#: tbl_structure.php:825
+>>>>>>> origin/master
 msgid "Last check"
 msgstr "Posledná kontrola"
 
@@ -444,7 +511,11 @@ msgstr "Zmazať"
 
 #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553
 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779
+<<<<<<< HEAD
 #: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250
+=======
+#: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250
+>>>>>>> origin/master
 #: tbl_select.php:286
 msgid "Or"
 msgstr "alebo"
@@ -663,9 +734,15 @@ msgstr "Výber:"
 msgid "Check All"
 msgstr "Označiť všetko"
 
+<<<<<<< HEAD
 #: db_structure.php:529 libraries/display_tbl.lib.php:2077
 #: libraries/replication_gui.lib.php:36 server_databases.php:350
 #: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460
+=======
+#: db_structure.php:531 libraries/display_tbl.lib.php:2077
+#: libraries/replication_gui.lib.php:36 server_databases.php:350
+#: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462
+>>>>>>> origin/master
 msgid "Uncheck All"
 msgstr "Odznačiť všetko"
 
@@ -1135,10 +1212,17 @@ msgid "Prev"
 msgstr "Predchádzajúci"
 
 #. l10n: Display text for next month link in calendar
+<<<<<<< HEAD
 #: js/messages.php:106 libraries/common.lib.php:2366
 #: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338
 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
 #: tbl_structure.php:799
+=======
+#: js/messages.php:77 libraries/common.lib.php:2353
+#: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338
+#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
+#: tbl_structure.php:801
+>>>>>>> origin/master
 msgid "Next"
 msgstr "Ďalší"
 
@@ -1681,7 +1765,11 @@ msgstr "Heslo:"
 msgid "Server Choice"
 msgstr "Voľba serveru"
 
+<<<<<<< HEAD
 #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63
+=======
+#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59
+>>>>>>> origin/master
 msgid "Cookies must be enabled past this point."
 msgstr "Cookies musia byť povolené, pokiaľ chcete pokračovať."
 
@@ -1762,7 +1850,11 @@ msgstr ""
 "Nie je možné použiť funkcie iconv, libiconv a recode_string aj napriek tomu, "
 "že rozšírenia sú nahrané. Skontrolujte prosím nastavenie PHP."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:580
+=======
+#: libraries/common.inc.php:576
+>>>>>>> origin/master
 msgid ""
 "phpMyAdmin was unable to read your configuration file!<br />This might "
 "happen if PHP finds a parse error in it or PHP cannot find the file.<br /"
@@ -1778,13 +1870,21 @@ msgstr ""
 "chýbajúcu úvodzovku alebo bodkočiarku.<br />Ak dostanete iba prázdnu "
 "stránku, všetko je v poriadku."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:591
+=======
+#: libraries/common.inc.php:587
+>>>>>>> origin/master
 #, fuzzy, php-format
 #| msgid "Could not load default configuration from: \"%1$s\""
 msgid "Could not load default configuration from: %1$s"
 msgstr "Nepodarilo sa načítať prednastavenú konfiguráciu zo súboru: \"%1$s\""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:596
+=======
+#: libraries/common.inc.php:592
+>>>>>>> origin/master
 msgid ""
 "The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
 "configuration file!"
@@ -1792,28 +1892,48 @@ msgstr ""
 "Direktíva <tt>$cfg['PmaAbsoluteUri']</tt> v konfiguračnom súbore MUSÍ byť "
 "nastavená!"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:626
+=======
+#: libraries/common.inc.php:622
+>>>>>>> origin/master
 #, fuzzy, php-format
 #| msgid "Invalid server index: \"%s\""
 msgid "Invalid server index: %s"
 msgstr "Chybný index serveru: \"%s\""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:633
+=======
+#: libraries/common.inc.php:629
+>>>>>>> origin/master
 #, php-format
 msgid "Invalid hostname for server %1$s. Please review your configuration."
 msgstr "Chybný názov hostu pre server %1$s. Prosím, skontrolujte konfiguráciu."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:642 libraries/header.inc.php:100
+=======
+#: libraries/common.inc.php:638 libraries/header.inc.php:96
+>>>>>>> origin/master
 #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47
 #: main.php:185 test/theme.php:57
 msgid "Server"
 msgstr "Server"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:820
 msgid "Invalid authentication method set in configuration:"
 msgstr "V konfigurácii je nastavená nesprávna autentifikačná metóda:"
 
 #: libraries/common.inc.php:923
+=======
+#: libraries/common.inc.php:816
+msgid "Invalid authentication method set in configuration:"
+msgstr "V konfigurácii je nastavená nesprávna autentifikačná metóda:"
+
+#: libraries/common.inc.php:919
+>>>>>>> origin/master
 #, php-format
 msgid "You should upgrade to %s %s or later."
 msgstr "Mali by ste aktualizovať %s na verziu %s alebo vyššiu."
@@ -2058,7 +2178,11 @@ msgid ""
 msgstr "Môže byť nepresné. Pozri FAQ 3.11"
 
 #: libraries/db_structure.lib.php:69 server_databases.php:142
+<<<<<<< HEAD
 #: tbl_printview.php:335 tbl_structure.php:680
+=======
+#: tbl_printview.php:335 tbl_structure.php:682
+>>>>>>> origin/master
 msgid "Overhead"
 msgstr "Naviac"
 
@@ -2085,22 +2209,36 @@ msgid "Change password"
 msgstr "Zmeniť heslo"
 
 #: libraries/display_change_password.lib.php:35
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:348 server_privileges.php:808
+=======
+#: libraries/replication_gui.lib.php:348 server_privileges.php:807
+>>>>>>> origin/master
 msgid "No Password"
 msgstr "Žiadne heslo"
 
 #: libraries/display_change_password.lib.php:41
 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63
 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:352 server_privileges.php:797
 #: server_privileges.php:801 server_privileges.php:812
 #: server_privileges.php:1555 server_synchronize.php:1175
+=======
+#: libraries/replication_gui.lib.php:352 server_privileges.php:796
+#: server_privileges.php:800 server_privileges.php:811
+#: server_privileges.php:1538 server_synchronize.php:1175
+>>>>>>> origin/master
 msgid "Password"
 msgstr "Heslo"
 
 #: libraries/display_change_password.lib.php:46
 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359
+<<<<<<< HEAD
 #: server_privileges.php:816 server_privileges.php:819
+=======
+#: server_privileges.php:815 server_privileges.php:818
+>>>>>>> origin/master
 msgid "Re-type"
 msgstr "Potvrdiť"
 
@@ -2115,12 +2253,20 @@ msgid "MySQL 4.0 compatible"
 msgstr "Kompatibilné s&nbsp;MySQL&nbsp;4.0"
 
 #: libraries/display_change_password.lib.php:72
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:363 server_privileges.php:823
+=======
+#: libraries/replication_gui.lib.php:363 server_privileges.php:822
+>>>>>>> origin/master
 msgid "Generate Password"
 msgstr "Vytvoriť Heslo"
 
 #: libraries/display_change_password.lib.php:75
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:366 server_privileges.php:826
+=======
+#: libraries/replication_gui.lib.php:366 server_privileges.php:825
+>>>>>>> origin/master
 msgid "Generate"
 msgstr "Vytvoriť"
 
@@ -2209,7 +2355,11 @@ msgid "remember template"
 msgstr "zapamätať si vzor"
 
 #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552
+=======
+#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549
+>>>>>>> origin/master
 msgid "Character set of the file:"
 msgstr "Znaková sada súboru:"
 
@@ -2265,7 +2415,11 @@ msgstr ""
 msgid "File to import"
 msgstr "Súbor na importovanie"
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527
+=======
+#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524
+>>>>>>> origin/master
 msgid "Location of the text file"
 msgstr "Lokácia textového súboru"
 
@@ -2273,12 +2427,20 @@ msgstr "Lokácia textového súboru"
 msgid "File uploads are not allowed on this server."
 msgstr "Ukladanie súborov na server nie je povolené."
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536
+=======
+#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533
+>>>>>>> origin/master
 #: tbl_change.php:1025
 msgid "The directory you set for upload work cannot be reached"
 msgstr "Adresár určený pre upload súborov sa nedá otvoriť"
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539
+=======
+#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536
+>>>>>>> origin/master
 #: tbl_change.php:1028
 msgid "web server upload directory"
 msgstr "upload adresár web serveru"
@@ -2416,7 +2578,11 @@ msgstr "Zoradiť podľa kľúča"
 #: libraries/import/docsql.php:34 libraries/import/ldi.php:47
 #: libraries/import/ods.php:30 libraries/import/sql.php:20
 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26
+<<<<<<< HEAD
 #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751
+=======
+#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753
+>>>>>>> origin/master
 msgid "Options"
 msgstr "Nastavenia"
 
@@ -2563,7 +2729,11 @@ msgstr "Využitie Vyrovnávacej Pamäte"
 
 #: libraries/engines/innodb.lib.php:194 server_databases.php:137
 #: server_databases.php:305 server_status.php:525 server_status.php:586
+<<<<<<< HEAD
 #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694
+=======
+#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696
+>>>>>>> origin/master
 msgid "Total"
 msgstr "Celkom"
 
@@ -2824,7 +2994,11 @@ msgid ""
 msgstr ""
 
 #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88
+<<<<<<< HEAD
 #: tbl_printview.php:375 tbl_structure.php:735
+=======
+#: tbl_printview.php:375 tbl_structure.php:737
+>>>>>>> origin/master
 msgid "Format"
 msgstr "Formát"
 
@@ -2896,8 +3070,13 @@ msgstr "Microsoft Word 2000"
 #: libraries/export/latex.php:201 libraries/export/odt.php:48
 #: libraries/export/sql.php:106 libraries/export/sql.php:868
 #: libraries/export/texytext.php:27 server_databases.php:127
+<<<<<<< HEAD
 #: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316
 #: tbl_structure.php:663
+=======
+#: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316
+#: tbl_structure.php:665
+>>>>>>> origin/master
 msgid "Data"
 msgstr "Dáta"
 
@@ -2946,9 +3125,15 @@ msgstr "MIME typ"
 #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57
 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177
 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:332 server_privileges.php:732
 #: server_privileges.php:735 server_privileges.php:791
 #: server_privileges.php:1554 server_privileges.php:2092
+=======
+#: libraries/replication_gui.lib.php:332 server_privileges.php:731
+#: server_privileges.php:734 server_privileges.php:790
+#: server_privileges.php:1537 server_privileges.php:2069
+>>>>>>> origin/master
 #: server_processlist.php:55 server_synchronize.php:1159
 msgid "Host"
 msgstr "Hostiteľ"
@@ -3620,8 +3805,13 @@ msgstr ""
 
 #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59
 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:262 server_privileges.php:712
 #: server_privileges.php:715 server_privileges.php:722
+=======
+#: libraries/replication_gui.lib.php:262 server_privileges.php:711
+#: server_privileges.php:714 server_privileges.php:721
+>>>>>>> origin/master
 #: server_synchronize.php:1171
 msgid "User name"
 msgstr "Meno používateľa"
@@ -3640,14 +3830,22 @@ msgstr "Zobraziť stav master replikácie"
 msgid "Slave status"
 msgstr "Zobraziť stav podriadených hostov"
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448
+=======
+#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445
+>>>>>>> origin/master
 #: server_status.php:737 server_variables.php:52
 msgid "Variable"
 msgstr "Premenná"
 
 #: libraries/replication_gui.lib.php:118 server_status.php:738
 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138
+<<<<<<< HEAD
 #: tbl_structure.php:727
+=======
+#: tbl_structure.php:729
+>>>>>>> origin/master
 msgid "Value"
 msgstr "Hodnota"
 
@@ -3665,11 +3863,16 @@ msgstr ""
 msgid "Add slave replication user"
 msgstr "Pridať replikačného užívateľa pre slave"
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:257 server_privileges.php:717
+=======
+#: libraries/replication_gui.lib.php:257 server_privileges.php:716
+>>>>>>> origin/master
 msgid "Any user"
 msgstr "Akýkoľvek používateľ"
 
 #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:349 server_privileges.php:718
 #: server_privileges.php:785 server_privileges.php:809
 #: server_privileges.php:1950 server_privileges.php:1980
@@ -3693,6 +3896,31 @@ msgid "Use Host Table"
 msgstr "Použiť tabuľku s hostiteľmi"
 
 #: libraries/replication_gui.lib.php:334 server_privileges.php:793
+=======
+#: libraries/replication_gui.lib.php:349 server_privileges.php:717
+#: server_privileges.php:784 server_privileges.php:808
+#: server_privileges.php:1928 server_privileges.php:1958
+msgid "Use text field"
+msgstr "Požiť textové pole"
+
+#: libraries/replication_gui.lib.php:305 server_privileges.php:764
+msgid "Any host"
+msgstr "Akýkoľvek hostiteľ"
+
+#: libraries/replication_gui.lib.php:309 server_privileges.php:768
+msgid "Local"
+msgstr "Lokálny"
+
+#: libraries/replication_gui.lib.php:315 server_privileges.php:773
+msgid "This Host"
+msgstr "Tento počítač"
+
+#: libraries/replication_gui.lib.php:321 server_privileges.php:779
+msgid "Use Host Table"
+msgstr "Použiť tabuľku s hostiteľmi"
+
+#: libraries/replication_gui.lib.php:334 server_privileges.php:792
+>>>>>>> origin/master
 msgid ""
 "When Host table is used, this field is ignored and values stored in Host "
 "table are used instead."
@@ -7922,10 +8150,13 @@ msgstr ""
 msgid "Show insert query"
 msgstr "Zobrazujem SQL dotaz"
 
+<<<<<<< HEAD
 #: tbl_change.php:1140
 msgid "and then"
 msgstr "a potom"
 
+=======
+>>>>>>> origin/master
 #: tbl_change.php:1144
 msgid "Go back to previous page"
 msgstr "Späť"
@@ -8121,6 +8352,7 @@ msgstr "Skontrolovať referenčnú integritu:"
 msgid "Show tables"
 msgstr "Zobraziť tabuľky"
 
+<<<<<<< HEAD
 #: tbl_printview.php:309 tbl_structure.php:654
 msgid "Space usage"
 msgstr "Zabrané miesto"
@@ -8154,6 +8386,41 @@ msgid "Row length"
 msgstr "Dĺžka riadku"
 
 #: tbl_printview.php:413 tbl_structure.php:791
+=======
+#: tbl_printview.php:309 tbl_structure.php:656
+msgid "Space usage"
+msgstr "Zabrané miesto"
+
+#: tbl_printview.php:313 tbl_structure.php:660
+msgid "Usage"
+msgstr "Využitie"
+
+#: tbl_printview.php:340 tbl_structure.php:687
+msgid "Effective"
+msgstr "Efektívny"
+
+#: tbl_printview.php:365 tbl_structure.php:725
+msgid "Row Statistics"
+msgstr "Štatistika riadku"
+
+#: tbl_printview.php:368 tbl_structure.php:728
+msgid "Statements"
+msgstr "Údaj"
+
+#: tbl_printview.php:379 tbl_structure.php:740
+msgid "static"
+msgstr ""
+
+#: tbl_printview.php:381 tbl_structure.php:742
+msgid "dynamic"
+msgstr "dynamický"
+
+#: tbl_printview.php:403 tbl_structure.php:785
+msgid "Row length"
+msgstr "Dĺžka riadku"
+
+#: tbl_printview.php:413 tbl_structure.php:793
+>>>>>>> origin/master
 msgid " Row size "
 msgstr " Veľkosť riadku "
 
diff --git a/po/sl.po b/po/sl.po
index 29d5a27c6..4d9cd2d85 100755
--- a/po/sl.po
+++ b/po/sl.po
@@ -3,7 +3,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2010-07-03 21:45+0530\n"
+=======
+"POT-Creation-Date: 2010-07-03 09:00-0400\n"
+>>>>>>> origin/master
 "PO-Revision-Date: 2010-06-29 22:42+0200\n"
 "Last-Translator: Domen <dbc334@gmail.com>\n"
 "Language-Team: slovenian <sl@li.org>\n"
@@ -49,15 +53,26 @@ msgstr "Iskanje"
 #: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046
 #: libraries/Theme_Manager.class.php:311
 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719
+<<<<<<< HEAD
 #: libraries/common.lib.php:1344 libraries/common.lib.php:2301
 #: libraries/display_change_password.lib.php:82
 #: libraries/display_create_table.lib.php:62
+=======
+#: libraries/common.lib.php:1335 libraries/common.lib.php:2288
+#: libraries/display_change_password.lib.php:82
+#: libraries/display_create_table.lib.php:63
+>>>>>>> origin/master
 #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532
 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76
 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104
+<<<<<<< HEAD
 #: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480
 #: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782
+=======
+#: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477
+#: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782
+>>>>>>> origin/master
 #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328
 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142
 #: server_privileges.php:665 server_privileges.php:1641
@@ -67,8 +82,13 @@ msgstr "Iskanje"
 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171
 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265
 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561
+<<<<<<< HEAD
 #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560
 #: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512
+=======
+#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562
+#: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512
+>>>>>>> origin/master
 #: view_create.php:182 view_operations.php:101
 msgid "Go"
 msgstr "Izvedi"
@@ -119,10 +139,17 @@ msgstr "Stolpec"
 #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245
 #: libraries/export/latex.php:360 libraries/export/odt.php:297
 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100
+<<<<<<< HEAD
 #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093
 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
 #: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321
+=======
+#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070
+#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
+#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
+#: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321
+>>>>>>> origin/master
 msgid "Type"
 msgstr "Vrsta"
 
@@ -163,9 +190,15 @@ msgstr "Komentarji"
 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322
 #: libraries/export/latex.php:430 libraries/export/odt.php:368
 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263
+<<<<<<< HEAD
 #: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596
 #: server_privileges.php:1911 server_privileges.php:1916
 #: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228
+=======
+#: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579
+#: server_privileges.php:1889 server_privileges.php:1894
+#: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228
+>>>>>>> origin/master
 #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342
 msgid "No"
 msgstr "Ne"
@@ -179,9 +212,15 @@ msgstr "Ne"
 #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106
 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262
 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344
+<<<<<<< HEAD
 #: server_databases.php:64 server_privileges.php:1582
 #: server_privileges.php:1596 server_privileges.php:1911
 #: server_privileges.php:1914 server_privileges.php:2210 sql.php:193
+=======
+#: server_databases.php:64 server_privileges.php:1565
+#: server_privileges.php:1579 server_privileges.php:1889
+#: server_privileges.php:1892 server_privileges.php:2187 sql.php:193
+>>>>>>> origin/master
 #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350
 #: tbl_tracking.php:335 tbl_tracking.php:340
 msgid "Yes"
@@ -230,7 +269,15 @@ msgstr "Preimenuj zbirko podatkov v"
 msgid "Command"
 msgstr "Ukaz"
 
+<<<<<<< HEAD
 #: db_operations.php:466
+=======
+#: db_operations.php:429 tbl_change.php:1140
+msgid "and then"
+msgstr "in potem"
+
+#: db_operations.php:455
+>>>>>>> origin/master
 msgid "Copy database to"
 msgstr "Kopiraj zbirko podatkov v"
 
@@ -312,7 +359,11 @@ msgstr "Omogoči"
 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730
 #: server_collations.php:54 server_collations.php:66 server_databases.php:111
 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179
+<<<<<<< HEAD
 #: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326
+=======
+#: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326
+>>>>>>> origin/master
 msgid "Collation"
 msgstr "Pravilo za razvrščanje znakov"
 
@@ -341,7 +392,11 @@ msgstr "Tabela"
 #: db_printview.php:105 libraries/db_structure.lib.php:56
 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146
 #: navigation.php:638 navigation.php:660 server_databases.php:122
+<<<<<<< HEAD
 #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775
+=======
+#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777
+>>>>>>> origin/master
 msgid "Rows"
 msgstr "vrstic"
 
@@ -356,19 +411,31 @@ msgstr "v uporabi"
 
 #: db_printview.php:187 libraries/db_info.inc.php:88
 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433
+<<<<<<< HEAD
 #: tbl_structure.php:807
+=======
+#: tbl_structure.php:809
+>>>>>>> origin/master
 msgid "Creation"
 msgstr "Ustvarjeno"
 
 #: db_printview.php:196 libraries/db_info.inc.php:93
 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443
+<<<<<<< HEAD
 #: tbl_structure.php:815
+=======
+#: tbl_structure.php:817
+>>>>>>> origin/master
 msgid "Last update"
 msgstr "Zadnjič posodobljeno"
 
 #: db_printview.php:205 libraries/db_info.inc.php:98
 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453
+<<<<<<< HEAD
 #: tbl_structure.php:823
+=======
+#: tbl_structure.php:825
+>>>>>>> origin/master
 msgid "Last check"
 msgstr "Zadnjič pregledano"
 
@@ -434,7 +501,11 @@ msgstr "Briši"
 
 #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553
 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779
+<<<<<<< HEAD
 #: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250
+=======
+#: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250
+>>>>>>> origin/master
 #: tbl_select.php:286
 msgid "Or"
 msgstr "Ali"
@@ -646,9 +717,15 @@ msgstr "Z označenim:"
 msgid "Check All"
 msgstr "Označi vse"
 
+<<<<<<< HEAD
 #: db_structure.php:529 libraries/display_tbl.lib.php:2077
 #: libraries/replication_gui.lib.php:36 server_databases.php:350
 #: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460
+=======
+#: db_structure.php:531 libraries/display_tbl.lib.php:2077
+#: libraries/replication_gui.lib.php:36 server_databases.php:350
+#: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462
+>>>>>>> origin/master
 msgid "Uncheck All"
 msgstr "Odznači vse"
 
@@ -1109,10 +1186,17 @@ msgid "Prev"
 msgstr "Prejšnji"
 
 #. l10n: Display text for next month link in calendar
+<<<<<<< HEAD
 #: js/messages.php:106 libraries/common.lib.php:2366
 #: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338
 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
 #: tbl_structure.php:799
+=======
+#: js/messages.php:77 libraries/common.lib.php:2353
+#: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338
+#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
+#: tbl_structure.php:801
+>>>>>>> origin/master
 msgid "Next"
 msgstr "Naslednji"
 
@@ -1618,7 +1702,11 @@ msgstr "Geslo:"
 msgid "Server Choice"
 msgstr "Izbira strežnika"
 
+<<<<<<< HEAD
 #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63
+=======
+#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59
+>>>>>>> origin/master
 msgid "Cookies must be enabled past this point."
 msgstr "Če želite še dalje uporabljati program, morate omogočiti piškotke."
 
@@ -1699,7 +1787,11 @@ msgstr ""
 "Ni mogoče uporabljati funkcij iconv, libiconv ali recode_string, čeprav so "
 "potrebne razširitve normalno naložene. Preverite vašo konfiguracijo PHP."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:580
+=======
+#: libraries/common.inc.php:576
+>>>>>>> origin/master
 msgid ""
 "phpMyAdmin was unable to read your configuration file!<br />This might "
 "happen if PHP finds a parse error in it or PHP cannot find the file.<br /"
@@ -1715,12 +1807,20 @@ msgstr ""
 "večini primerov gre za manjkajoči narekovaj ali podpičje.<br />Če dobite "
 "prazno stran, je vse v redu."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:591
+=======
+#: libraries/common.inc.php:587
+>>>>>>> origin/master
 #, php-format
 msgid "Could not load default configuration from: %1$s"
 msgstr "Ne morem naložiti privzete konfiguracije iz: %1$s"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:596
+=======
+#: libraries/common.inc.php:592
+>>>>>>> origin/master
 msgid ""
 "The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
 "configuration file!"
@@ -1728,29 +1828,49 @@ msgstr ""
 "Ukaz <tt>$cfg['PmaAbsoluteUri']</tt> MORA biti določen v konfiguracijski "
 "datoteki!"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:626
+=======
+#: libraries/common.inc.php:622
+>>>>>>> origin/master
 #, php-format
 msgid "Invalid server index: %s"
 msgstr "Neveljaven indeks strežnika: %s"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:633
+=======
+#: libraries/common.inc.php:629
+>>>>>>> origin/master
 #, php-format
 msgid "Invalid hostname for server %1$s. Please review your configuration."
 msgstr ""
 "Neveljavno ime gostitelja za strežnik %1$s. Prosim, preglejte svojo "
 "konfiguracijo."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:642 libraries/header.inc.php:100
+=======
+#: libraries/common.inc.php:638 libraries/header.inc.php:96
+>>>>>>> origin/master
 #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47
 #: main.php:185 test/theme.php:57
 msgid "Server"
 msgstr "Strežnik"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:820
 msgid "Invalid authentication method set in configuration:"
 msgstr "Neveljaven način overitve določen v konfiguracijski datoteki:"
 
 #: libraries/common.inc.php:923
+=======
+#: libraries/common.inc.php:816
+msgid "Invalid authentication method set in configuration:"
+msgstr "Neveljaven način overitve določen v konfiguracijski datoteki:"
+
+#: libraries/common.inc.php:919
+>>>>>>> origin/master
 #, php-format
 msgid "You should upgrade to %s %s or later."
 msgstr "%s bi morali nadgraditi v verzijo %s ali novejšo."
@@ -1997,7 +2117,11 @@ msgstr ""
 "3.11[/a]"
 
 #: libraries/db_structure.lib.php:69 server_databases.php:142
+<<<<<<< HEAD
 #: tbl_printview.php:335 tbl_structure.php:680
+=======
+#: tbl_printview.php:335 tbl_structure.php:682
+>>>>>>> origin/master
 msgid "Overhead"
 msgstr "Presežek"
 
@@ -2026,22 +2150,36 @@ msgid "Change password"
 msgstr "Spremeni geslo"
 
 #: libraries/display_change_password.lib.php:35
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:348 server_privileges.php:808
+=======
+#: libraries/replication_gui.lib.php:348 server_privileges.php:807
+>>>>>>> origin/master
 msgid "No Password"
 msgstr "Brez gesla"
 
 #: libraries/display_change_password.lib.php:41
 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63
 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:352 server_privileges.php:797
 #: server_privileges.php:801 server_privileges.php:812
 #: server_privileges.php:1555 server_synchronize.php:1175
+=======
+#: libraries/replication_gui.lib.php:352 server_privileges.php:796
+#: server_privileges.php:800 server_privileges.php:811
+#: server_privileges.php:1538 server_synchronize.php:1175
+>>>>>>> origin/master
 msgid "Password"
 msgstr "Geslo"
 
 #: libraries/display_change_password.lib.php:46
 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359
+<<<<<<< HEAD
 #: server_privileges.php:816 server_privileges.php:819
+=======
+#: server_privileges.php:815 server_privileges.php:818
+>>>>>>> origin/master
 msgid "Re-type"
 msgstr "Ponovno vnesi"
 
@@ -2054,12 +2192,20 @@ msgid "MySQL 4.0 compatible"
 msgstr "Združljivo z MySQL 4.0"
 
 #: libraries/display_change_password.lib.php:72
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:363 server_privileges.php:823
+=======
+#: libraries/replication_gui.lib.php:363 server_privileges.php:822
+>>>>>>> origin/master
 msgid "Generate Password"
 msgstr "Ustvari geslo"
 
 #: libraries/display_change_password.lib.php:75
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:366 server_privileges.php:826
+=======
+#: libraries/replication_gui.lib.php:366 server_privileges.php:825
+>>>>>>> origin/master
 msgid "Generate"
 msgstr "Ustvari"
 
@@ -2145,7 +2291,11 @@ msgid "remember template"
 msgstr "shrani predlogo"
 
 #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552
+=======
+#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549
+>>>>>>> origin/master
 msgid "Character set of the file:"
 msgstr "Nabor znakov datoteke:"
 
@@ -2203,7 +2353,11 @@ msgstr ""
 msgid "File to import"
 msgstr "Datoteka za uvoz"
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527
+=======
+#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524
+>>>>>>> origin/master
 msgid "Location of the text file"
 msgstr "Mesto datoteke z besedilom"
 
@@ -2211,12 +2365,20 @@ msgstr "Mesto datoteke z besedilom"
 msgid "File uploads are not allowed on this server."
 msgstr "Nalaganje datotek na tem strežniku ni dovoljeno."
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536
+=======
+#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533
+>>>>>>> origin/master
 #: tbl_change.php:1025
 msgid "The directory you set for upload work cannot be reached"
 msgstr "Imenik, ki ste ga določili za nalaganje, je nedosegljiv"
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539
+=======
+#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536
+>>>>>>> origin/master
 #: tbl_change.php:1028
 msgid "web server upload directory"
 msgstr "imenik za nalaganje datotek"
@@ -2348,7 +2510,11 @@ msgstr "Uredi po ključu"
 #: libraries/import/docsql.php:34 libraries/import/ldi.php:47
 #: libraries/import/ods.php:30 libraries/import/sql.php:20
 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26
+<<<<<<< HEAD
 #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751
+=======
+#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753
+>>>>>>> origin/master
 msgid "Options"
 msgstr "Možnosti"
 
@@ -2493,7 +2659,11 @@ msgstr "Uporaba zaloge medpomnilnika"
 
 #: libraries/engines/innodb.lib.php:194 server_databases.php:137
 #: server_databases.php:305 server_status.php:525 server_status.php:586
+<<<<<<< HEAD
 #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694
+=======
+#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696
+>>>>>>> origin/master
 msgid "Total"
 msgstr "Skupaj"
 
@@ -2780,7 +2950,11 @@ msgstr ""
 "bo naslednja najvišja številka."
 
 #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88
+<<<<<<< HEAD
 #: tbl_printview.php:375 tbl_structure.php:735
+=======
+#: tbl_printview.php:375 tbl_structure.php:737
+>>>>>>> origin/master
 msgid "Format"
 msgstr "Oblika"
 
@@ -2844,8 +3018,13 @@ msgstr "Microsoft Word 2000"
 #: libraries/export/latex.php:201 libraries/export/odt.php:48
 #: libraries/export/sql.php:106 libraries/export/sql.php:868
 #: libraries/export/texytext.php:27 server_databases.php:127
+<<<<<<< HEAD
 #: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316
 #: tbl_structure.php:663
+=======
+#: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316
+#: tbl_structure.php:665
+>>>>>>> origin/master
 msgid "Data"
 msgstr "Podatki"
 
@@ -2894,9 +3073,15 @@ msgstr "Vrsta MIME"
 #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57
 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177
 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:332 server_privileges.php:732
 #: server_privileges.php:735 server_privileges.php:791
 #: server_privileges.php:1554 server_privileges.php:2092
+=======
+#: libraries/replication_gui.lib.php:332 server_privileges.php:731
+#: server_privileges.php:734 server_privileges.php:790
+#: server_privileges.php:1537 server_privileges.php:2069
+>>>>>>> origin/master
 #: server_processlist.php:55 server_synchronize.php:1159
 msgid "Host"
 msgstr "Gostitelj"
@@ -3566,8 +3751,13 @@ msgstr ""
 
 #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59
 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:262 server_privileges.php:712
 #: server_privileges.php:715 server_privileges.php:722
+=======
+#: libraries/replication_gui.lib.php:262 server_privileges.php:711
+#: server_privileges.php:714 server_privileges.php:721
+>>>>>>> origin/master
 #: server_synchronize.php:1171
 msgid "User name"
 msgstr "Uporabniško ime"
@@ -3584,14 +3774,22 @@ msgstr "Stanje glavnega strežnika"
 msgid "Slave status"
 msgstr "Stanje podrejenca"
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448
+=======
+#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445
+>>>>>>> origin/master
 #: server_status.php:737 server_variables.php:52
 msgid "Variable"
 msgstr "Spremenljivka"
 
 #: libraries/replication_gui.lib.php:118 server_status.php:738
 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138
+<<<<<<< HEAD
 #: tbl_structure.php:727
+=======
+#: tbl_structure.php:729
+>>>>>>> origin/master
 msgid "Value"
 msgstr "Vrednost"
 
@@ -3611,11 +3809,16 @@ msgstr ""
 msgid "Add slave replication user"
 msgstr "Dodaj uporabnika podvojevanja podrejencev"
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:257 server_privileges.php:717
+=======
+#: libraries/replication_gui.lib.php:257 server_privileges.php:716
+>>>>>>> origin/master
 msgid "Any user"
 msgstr "Kateri koli uporabnik"
 
 #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:349 server_privileges.php:718
 #: server_privileges.php:785 server_privileges.php:809
 #: server_privileges.php:1950 server_privileges.php:1980
@@ -3639,6 +3842,31 @@ msgid "Use Host Table"
 msgstr "Uporabi tabelo gostiteljev"
 
 #: libraries/replication_gui.lib.php:334 server_privileges.php:793
+=======
+#: libraries/replication_gui.lib.php:349 server_privileges.php:717
+#: server_privileges.php:784 server_privileges.php:808
+#: server_privileges.php:1928 server_privileges.php:1958
+msgid "Use text field"
+msgstr "Uporabi besedilno polje"
+
+#: libraries/replication_gui.lib.php:305 server_privileges.php:764
+msgid "Any host"
+msgstr "Kateri koli gostitelj"
+
+#: libraries/replication_gui.lib.php:309 server_privileges.php:768
+msgid "Local"
+msgstr "Lokalno"
+
+#: libraries/replication_gui.lib.php:315 server_privileges.php:773
+msgid "This Host"
+msgstr "Ta strežnik"
+
+#: libraries/replication_gui.lib.php:321 server_privileges.php:779
+msgid "Use Host Table"
+msgstr "Uporabi tabelo gostiteljev"
+
+#: libraries/replication_gui.lib.php:334 server_privileges.php:792
+>>>>>>> origin/master
 msgid ""
 "When Host table is used, this field is ignored and values stored in Host "
 "table are used instead."
@@ -7950,10 +8178,13 @@ msgstr "Vstavi kot novo vrstico in presliši napake"
 msgid "Show insert query"
 msgstr "Prikaži poizvedbo insert"
 
+<<<<<<< HEAD
 #: tbl_change.php:1140
 msgid "and then"
 msgstr "in potem"
 
+=======
+>>>>>>> origin/master
 #: tbl_change.php:1144
 msgid "Go back to previous page"
 msgstr "Nazaj na prejšnjo stran"
@@ -8146,6 +8377,7 @@ msgstr "Preveri referenčno integriteto:"
 msgid "Show tables"
 msgstr "Pokaži tabele"
 
+<<<<<<< HEAD
 #: tbl_printview.php:309 tbl_structure.php:654
 msgid "Space usage"
 msgstr "Poraba prostora"
@@ -8179,6 +8411,41 @@ msgid "Row length"
 msgstr "Dolžina vrstice"
 
 #: tbl_printview.php:413 tbl_structure.php:791
+=======
+#: tbl_printview.php:309 tbl_structure.php:656
+msgid "Space usage"
+msgstr "Poraba prostora"
+
+#: tbl_printview.php:313 tbl_structure.php:660
+msgid "Usage"
+msgstr "Uporaba"
+
+#: tbl_printview.php:340 tbl_structure.php:687
+msgid "Effective"
+msgstr "Učinkovito"
+
+#: tbl_printview.php:365 tbl_structure.php:725
+msgid "Row Statistics"
+msgstr "Statistika vrstic"
+
+#: tbl_printview.php:368 tbl_structure.php:728
+msgid "Statements"
+msgstr "Izjave"
+
+#: tbl_printview.php:379 tbl_structure.php:740
+msgid "static"
+msgstr "statično"
+
+#: tbl_printview.php:381 tbl_structure.php:742
+msgid "dynamic"
+msgstr "dinamično"
+
+#: tbl_printview.php:403 tbl_structure.php:785
+msgid "Row length"
+msgstr "Dolžina vrstice"
+
+#: tbl_printview.php:413 tbl_structure.php:793
+>>>>>>> origin/master
 msgid " Row size "
 msgstr " Velikost vrstice "
 
diff --git a/po/sq.po b/po/sq.po
index a4927ecf9..3e4e23ef8 100755
--- a/po/sq.po
+++ b/po/sq.po
@@ -3,7 +3,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2010-07-03 21:45+0530\n"
+=======
+"POT-Creation-Date: 2010-07-03 09:00-0400\n"
+>>>>>>> origin/master
 "PO-Revision-Date: 2010-05-19 13:02+0200\n"
 "Last-Translator: Laurent <laurenti@alblinux.net>\n"
 "Language-Team: albanian <sq@li.org>\n"
@@ -49,15 +53,26 @@ msgstr "Kërko"
 #: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046
 #: libraries/Theme_Manager.class.php:311
 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719
+<<<<<<< HEAD
 #: libraries/common.lib.php:1344 libraries/common.lib.php:2301
 #: libraries/display_change_password.lib.php:82
 #: libraries/display_create_table.lib.php:62
+=======
+#: libraries/common.lib.php:1335 libraries/common.lib.php:2288
+#: libraries/display_change_password.lib.php:82
+#: libraries/display_create_table.lib.php:63
+>>>>>>> origin/master
 #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532
 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76
 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104
+<<<<<<< HEAD
 #: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480
 #: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782
+=======
+#: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477
+#: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782
+>>>>>>> origin/master
 #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328
 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142
 #: server_privileges.php:665 server_privileges.php:1641
@@ -67,8 +82,13 @@ msgstr "Kërko"
 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171
 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265
 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561
+<<<<<<< HEAD
 #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560
 #: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512
+=======
+#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562
+#: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512
+>>>>>>> origin/master
 #: view_create.php:182 view_operations.php:101
 msgid "Go"
 msgstr "Zbato"
@@ -121,10 +141,17 @@ msgstr "Emrat e kollonave"
 #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245
 #: libraries/export/latex.php:360 libraries/export/odt.php:297
 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100
+<<<<<<< HEAD
 #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093
 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
 #: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321
+=======
+#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070
+#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
+#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
+#: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321
+>>>>>>> origin/master
 msgid "Type"
 msgstr "Lloji"
 
@@ -165,9 +192,15 @@ msgstr "Komente"
 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322
 #: libraries/export/latex.php:430 libraries/export/odt.php:368
 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263
+<<<<<<< HEAD
 #: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596
 #: server_privileges.php:1911 server_privileges.php:1916
 #: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228
+=======
+#: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579
+#: server_privileges.php:1889 server_privileges.php:1894
+#: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228
+>>>>>>> origin/master
 #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342
 msgid "No"
 msgstr " Jo "
@@ -181,9 +214,15 @@ msgstr " Jo "
 #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106
 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262
 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344
+<<<<<<< HEAD
 #: server_databases.php:64 server_privileges.php:1582
 #: server_privileges.php:1596 server_privileges.php:1911
 #: server_privileges.php:1914 server_privileges.php:2210 sql.php:193
+=======
+#: server_databases.php:64 server_privileges.php:1565
+#: server_privileges.php:1579 server_privileges.php:1889
+#: server_privileges.php:1892 server_privileges.php:2187 sql.php:193
+>>>>>>> origin/master
 #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350
 #: tbl_tracking.php:335 tbl_tracking.php:340
 msgid "Yes"
@@ -232,7 +271,15 @@ msgstr "Ndysho emrin e databazës në"
 msgid "Command"
 msgstr "Komanda"
 
+<<<<<<< HEAD
 #: db_operations.php:466
+=======
+#: db_operations.php:429 tbl_change.php:1140
+msgid "and then"
+msgstr ""
+
+#: db_operations.php:455
+>>>>>>> origin/master
 msgid "Copy database to"
 msgstr "Kopjo databazën në"
 
@@ -314,7 +361,11 @@ msgstr "Aktivizo"
 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730
 #: server_collations.php:54 server_collations.php:66 server_databases.php:111
 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179
+<<<<<<< HEAD
 #: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326
+=======
+#: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326
+>>>>>>> origin/master
 msgid "Collation"
 msgstr "Collation"
 
@@ -343,7 +394,11 @@ msgstr "Tabela"
 #: db_printview.php:105 libraries/db_structure.lib.php:56
 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146
 #: navigation.php:638 navigation.php:660 server_databases.php:122
+<<<<<<< HEAD
 #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775
+=======
+#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777
+>>>>>>> origin/master
 msgid "Rows"
 msgstr "rreshta"
 
@@ -358,19 +413,31 @@ msgstr "në përdorim"
 
 #: db_printview.php:187 libraries/db_info.inc.php:88
 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433
+<<<<<<< HEAD
 #: tbl_structure.php:807
+=======
+#: tbl_structure.php:809
+>>>>>>> origin/master
 msgid "Creation"
 msgstr "Krijimi"
 
 #: db_printview.php:196 libraries/db_info.inc.php:93
 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443
+<<<<<<< HEAD
 #: tbl_structure.php:815
+=======
+#: tbl_structure.php:817
+>>>>>>> origin/master
 msgid "Last update"
 msgstr "Ndryshimi i fundit"
 
 #: db_printview.php:205 libraries/db_info.inc.php:98
 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453
+<<<<<<< HEAD
 #: tbl_structure.php:823
+=======
+#: tbl_structure.php:825
+>>>>>>> origin/master
 msgid "Last check"
 msgstr "Kontrolli i fundit"
 
@@ -435,7 +502,11 @@ msgstr "Fshi"
 
 #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553
 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779
+<<<<<<< HEAD
 #: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250
+=======
+#: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250
+>>>>>>> origin/master
 #: tbl_select.php:286
 msgid "Or"
 msgstr "Ose"
@@ -654,9 +725,15 @@ msgstr "N.q.s. të zgjedhur:"
 msgid "Check All"
 msgstr "Zgjidh gjithçka"
 
+<<<<<<< HEAD
 #: db_structure.php:529 libraries/display_tbl.lib.php:2077
 #: libraries/replication_gui.lib.php:36 server_databases.php:350
 #: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460
+=======
+#: db_structure.php:531 libraries/display_tbl.lib.php:2077
+#: libraries/replication_gui.lib.php:36 server_databases.php:350
+#: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462
+>>>>>>> origin/master
 msgid "Uncheck All"
 msgstr "Asnjë zgjedhje"
 
@@ -1113,10 +1190,17 @@ msgid "Prev"
 msgstr "Paraardhësi"
 
 #. l10n: Display text for next month link in calendar
+<<<<<<< HEAD
 #: js/messages.php:106 libraries/common.lib.php:2366
 #: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338
 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
 #: tbl_structure.php:799
+=======
+#: js/messages.php:77 libraries/common.lib.php:2353
+#: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338
+#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
+#: tbl_structure.php:801
+>>>>>>> origin/master
 msgid "Next"
 msgstr "Në vazhdim"
 
@@ -1655,7 +1739,11 @@ msgstr "Fjalëkalimi:"
 msgid "Server Choice"
 msgstr "Zgjedhja e serverit"
 
+<<<<<<< HEAD
 #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63
+=======
+#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59
+>>>>>>> origin/master
 msgid "Cookies must be enabled past this point."
 msgstr "Nga kjo pikë e tutje, cookies duhet të jenë të aktivuara."
 
@@ -1735,7 +1823,11 @@ msgstr ""
 "I pamundur përdorimi i funksioneve iconv apo libiconv apo recode_string për "
 "shkak se ekstensioni duhet të ngarkohet. Kontrolloni konfigurimin e php."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:580
+=======
+#: libraries/common.inc.php:576
+>>>>>>> origin/master
 msgid ""
 "phpMyAdmin was unable to read your configuration file!<br />This might "
 "happen if PHP finds a parse error in it or PHP cannot find the file.<br /"
@@ -1751,12 +1843,20 @@ msgstr ""
 "rasteve mund t'ju mungojë një apostrofë apo një presje.<br />Nëse faqja që "
 "do t'ju hapet është bosh (e bardhë), atëhere gjithçka është në rregull."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:591
+=======
+#: libraries/common.inc.php:587
+>>>>>>> origin/master
 #, php-format
 msgid "Could not load default configuration from: %1$s"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:596
+=======
+#: libraries/common.inc.php:592
+>>>>>>> origin/master
 msgid ""
 "The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
 "configuration file!"
@@ -1764,27 +1864,47 @@ msgstr ""
 "Direktiva <tt>$cfg['PmaAbsoluteUri']</tt> DUHET të përcaktohet tek file i "
 "konfigurimit!"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:626
+=======
+#: libraries/common.inc.php:622
+>>>>>>> origin/master
 #, php-format
 msgid "Invalid server index: %s"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:633
+=======
+#: libraries/common.inc.php:629
+>>>>>>> origin/master
 #, php-format
 msgid "Invalid hostname for server %1$s. Please review your configuration."
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:642 libraries/header.inc.php:100
+=======
+#: libraries/common.inc.php:638 libraries/header.inc.php:96
+>>>>>>> origin/master
 #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47
 #: main.php:185 test/theme.php:57
 msgid "Server"
 msgstr "Serveri"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:820
 msgid "Invalid authentication method set in configuration:"
 msgstr ""
 
 #: libraries/common.inc.php:923
+=======
+#: libraries/common.inc.php:816
+msgid "Invalid authentication method set in configuration:"
+msgstr ""
+
+#: libraries/common.inc.php:919
+>>>>>>> origin/master
 #, php-format
 msgid "You should upgrade to %s %s or later."
 msgstr "Duhet të instaloni %s %s ose superior."
@@ -2029,7 +2149,11 @@ msgid ""
 msgstr ""
 
 #: libraries/db_structure.lib.php:69 server_databases.php:142
+<<<<<<< HEAD
 #: tbl_printview.php:335 tbl_structure.php:680
+=======
+#: tbl_printview.php:335 tbl_structure.php:682
+>>>>>>> origin/master
 msgid "Overhead"
 msgstr "Mbi limit"
 
@@ -2056,22 +2180,36 @@ msgid "Change password"
 msgstr "Ndrysho fjalëkalimin"
 
 #: libraries/display_change_password.lib.php:35
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:348 server_privileges.php:808
+=======
+#: libraries/replication_gui.lib.php:348 server_privileges.php:807
+>>>>>>> origin/master
 msgid "No Password"
 msgstr "Asnjë fjalëkalim"
 
 #: libraries/display_change_password.lib.php:41
 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63
 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:352 server_privileges.php:797
 #: server_privileges.php:801 server_privileges.php:812
 #: server_privileges.php:1555 server_synchronize.php:1175
+=======
+#: libraries/replication_gui.lib.php:352 server_privileges.php:796
+#: server_privileges.php:800 server_privileges.php:811
+#: server_privileges.php:1538 server_synchronize.php:1175
+>>>>>>> origin/master
 msgid "Password"
 msgstr "Fjalëkalimi"
 
 #: libraries/display_change_password.lib.php:46
 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359
+<<<<<<< HEAD
 #: server_privileges.php:816 server_privileges.php:819
+=======
+#: server_privileges.php:815 server_privileges.php:818
+>>>>>>> origin/master
 msgid "Re-type"
 msgstr "Rifut"
 
@@ -2084,12 +2222,20 @@ msgid "MySQL 4.0 compatible"
 msgstr ""
 
 #: libraries/display_change_password.lib.php:72
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:363 server_privileges.php:823
+=======
+#: libraries/replication_gui.lib.php:363 server_privileges.php:822
+>>>>>>> origin/master
 msgid "Generate Password"
 msgstr ""
 
 #: libraries/display_change_password.lib.php:75
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:366 server_privileges.php:826
+=======
+#: libraries/replication_gui.lib.php:366 server_privileges.php:825
+>>>>>>> origin/master
 #, fuzzy
 msgid "Generate"
 msgstr "Gjeneruar nga"
@@ -2176,7 +2322,11 @@ msgid "remember template"
 msgstr "kujto template"
 
 #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552
+=======
+#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549
+>>>>>>> origin/master
 msgid "Character set of the file:"
 msgstr "Familja gërmave të file:"
 
@@ -2229,7 +2379,11 @@ msgstr ""
 msgid "File to import"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527
+=======
+#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524
+>>>>>>> origin/master
 msgid "Location of the text file"
 msgstr "Pozicioni i file"
 
@@ -2237,12 +2391,20 @@ msgstr "Pozicioni i file"
 msgid "File uploads are not allowed on this server."
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536
+=======
+#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533
+>>>>>>> origin/master
 #: tbl_change.php:1025
 msgid "The directory you set for upload work cannot be reached"
 msgstr "Directory që keni zgjedhur për upload nuk arrin të gjehet"
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539
+=======
+#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536
+>>>>>>> origin/master
 #: tbl_change.php:1028
 msgid "web server upload directory"
 msgstr "directory e upload të server-it web"
@@ -2371,7 +2533,11 @@ msgstr "Rendit sipas kyçit"
 #: libraries/import/docsql.php:34 libraries/import/ldi.php:47
 #: libraries/import/ods.php:30 libraries/import/sql.php:20
 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26
+<<<<<<< HEAD
 #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751
+=======
+#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753
+>>>>>>> origin/master
 #, fuzzy
 msgid "Options"
 msgstr "Operacione"
@@ -2518,7 +2684,11 @@ msgstr ""
 
 #: libraries/engines/innodb.lib.php:194 server_databases.php:137
 #: server_databases.php:305 server_status.php:525 server_status.php:586
+<<<<<<< HEAD
 #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694
+=======
+#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696
+>>>>>>> origin/master
 msgid "Total"
 msgstr "Gjithsej"
 
@@ -2764,7 +2934,11 @@ msgid ""
 msgstr ""
 
 #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88
+<<<<<<< HEAD
 #: tbl_printview.php:375 tbl_structure.php:735
+=======
+#: tbl_printview.php:375 tbl_structure.php:737
+>>>>>>> origin/master
 msgid "Format"
 msgstr "Formati"
 
@@ -2836,8 +3010,13 @@ msgstr ""
 #: libraries/export/latex.php:201 libraries/export/odt.php:48
 #: libraries/export/sql.php:106 libraries/export/sql.php:868
 #: libraries/export/texytext.php:27 server_databases.php:127
+<<<<<<< HEAD
 #: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316
 #: tbl_structure.php:663
+=======
+#: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316
+#: tbl_structure.php:665
+>>>>>>> origin/master
 msgid "Data"
 msgstr "Të dhëna"
 
@@ -2886,9 +3065,15 @@ msgstr "Lloji MIME"
 #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57
 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177
 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:332 server_privileges.php:732
 #: server_privileges.php:735 server_privileges.php:791
 #: server_privileges.php:1554 server_privileges.php:2092
+=======
+#: libraries/replication_gui.lib.php:332 server_privileges.php:731
+#: server_privileges.php:734 server_privileges.php:790
+#: server_privileges.php:1537 server_privileges.php:2069
+>>>>>>> origin/master
 #: server_processlist.php:55 server_synchronize.php:1159
 msgid "Host"
 msgstr "Host"
@@ -3560,8 +3745,13 @@ msgstr ""
 
 #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59
 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:262 server_privileges.php:712
 #: server_privileges.php:715 server_privileges.php:722
+=======
+#: libraries/replication_gui.lib.php:262 server_privileges.php:711
+#: server_privileges.php:714 server_privileges.php:721
+>>>>>>> origin/master
 #: server_synchronize.php:1171
 msgid "User name"
 msgstr "Emri i përdoruesit"
@@ -3579,14 +3769,22 @@ msgstr ""
 msgid "Slave status"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448
+=======
+#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445
+>>>>>>> origin/master
 #: server_status.php:737 server_variables.php:52
 msgid "Variable"
 msgstr "E ndryshueshme"
 
 #: libraries/replication_gui.lib.php:118 server_status.php:738
 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138
+<<<<<<< HEAD
 #: tbl_structure.php:727
+=======
+#: tbl_structure.php:729
+>>>>>>> origin/master
 msgid "Value"
 msgstr "Vlerë"
 
@@ -3605,11 +3803,16 @@ msgstr ""
 msgid "Add slave replication user"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:257 server_privileges.php:717
+=======
+#: libraries/replication_gui.lib.php:257 server_privileges.php:716
+>>>>>>> origin/master
 msgid "Any user"
 msgstr "Çfarëdo përdorues"
 
 #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:349 server_privileges.php:718
 #: server_privileges.php:785 server_privileges.php:809
 #: server_privileges.php:1950 server_privileges.php:1980
@@ -3633,6 +3836,31 @@ msgid "Use Host Table"
 msgstr "Përdor Tabelën e Host-it"
 
 #: libraries/replication_gui.lib.php:334 server_privileges.php:793
+=======
+#: libraries/replication_gui.lib.php:349 server_privileges.php:717
+#: server_privileges.php:784 server_privileges.php:808
+#: server_privileges.php:1928 server_privileges.php:1958
+msgid "Use text field"
+msgstr "Përdor fushë teksti"
+
+#: libraries/replication_gui.lib.php:305 server_privileges.php:764
+msgid "Any host"
+msgstr "Çfarëdo host"
+
+#: libraries/replication_gui.lib.php:309 server_privileges.php:768
+msgid "Local"
+msgstr "Lokal"
+
+#: libraries/replication_gui.lib.php:315 server_privileges.php:773
+msgid "This Host"
+msgstr "Këtë Host"
+
+#: libraries/replication_gui.lib.php:321 server_privileges.php:779
+msgid "Use Host Table"
+msgstr "Përdor Tabelën e Host-it"
+
+#: libraries/replication_gui.lib.php:334 server_privileges.php:792
+>>>>>>> origin/master
 msgid ""
 "When Host table is used, this field is ignored and values stored in Host "
 "table are used instead."
@@ -7711,10 +7939,13 @@ msgstr ""
 msgid "Show insert query"
 msgstr ""
 
+<<<<<<< HEAD
 #: tbl_change.php:1140
 msgid "and then"
 msgstr ""
 
+=======
+>>>>>>> origin/master
 #: tbl_change.php:1144
 msgid "Go back to previous page"
 msgstr "Mbrapa"
@@ -7912,6 +8143,7 @@ msgstr "Kontrollo integritetin e informacioneve:"
 msgid "Show tables"
 msgstr "Shfaq tabelat"
 
+<<<<<<< HEAD
 #: tbl_printview.php:309 tbl_structure.php:654
 msgid "Space usage"
 msgstr "Hapësira e përdorur"
@@ -7945,6 +8177,41 @@ msgid "Row length"
 msgstr "Gjatësia e rreshtit"
 
 #: tbl_printview.php:413 tbl_structure.php:791
+=======
+#: tbl_printview.php:309 tbl_structure.php:656
+msgid "Space usage"
+msgstr "Hapësira e përdorur"
+
+#: tbl_printview.php:313 tbl_structure.php:660
+msgid "Usage"
+msgstr "Përdorimi"
+
+#: tbl_printview.php:340 tbl_structure.php:687
+msgid "Effective"
+msgstr "Efektiv"
+
+#: tbl_printview.php:365 tbl_structure.php:725
+msgid "Row Statistics"
+msgstr "Statistikat e rreshtave"
+
+#: tbl_printview.php:368 tbl_structure.php:728
+msgid "Statements"
+msgstr "Instruksione"
+
+#: tbl_printview.php:379 tbl_structure.php:740
+msgid "static"
+msgstr ""
+
+#: tbl_printview.php:381 tbl_structure.php:742
+msgid "dynamic"
+msgstr "dinamik"
+
+#: tbl_printview.php:403 tbl_structure.php:785
+msgid "Row length"
+msgstr "Gjatësia e rreshtit"
+
+#: tbl_printview.php:413 tbl_structure.php:793
+>>>>>>> origin/master
 msgid " Row size "
 msgstr "Madhësia e rreshtit"
 
diff --git a/po/sr.po b/po/sr.po
index 32218045f..a3c5b937f 100755
--- a/po/sr.po
+++ b/po/sr.po
@@ -3,7 +3,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2010-07-03 21:45+0530\n"
+=======
+"POT-Creation-Date: 2010-07-03 09:00-0400\n"
+>>>>>>> origin/master
 "PO-Revision-Date: 2010-03-30 23:47+0200\n"
 "Last-Translator: Michal <michal@cihar.com>\n"
 "Language-Team: serbian_cyrillic <sr@li.org>\n"
@@ -50,15 +54,26 @@ msgstr "Претраживање"
 #: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046
 #: libraries/Theme_Manager.class.php:311
 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719
+<<<<<<< HEAD
 #: libraries/common.lib.php:1344 libraries/common.lib.php:2301
 #: libraries/display_change_password.lib.php:82
 #: libraries/display_create_table.lib.php:62
+=======
+#: libraries/common.lib.php:1335 libraries/common.lib.php:2288
+#: libraries/display_change_password.lib.php:82
+#: libraries/display_create_table.lib.php:63
+>>>>>>> origin/master
 #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532
 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76
 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104
+<<<<<<< HEAD
 #: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480
 #: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782
+=======
+#: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477
+#: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782
+>>>>>>> origin/master
 #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328
 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142
 #: server_privileges.php:665 server_privileges.php:1641
@@ -68,8 +83,13 @@ msgstr "Претраживање"
 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171
 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265
 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561
+<<<<<<< HEAD
 #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560
 #: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512
+=======
+#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562
+#: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512
+>>>>>>> origin/master
 #: view_create.php:182 view_operations.php:101
 msgid "Go"
 msgstr "Крени"
@@ -122,10 +142,17 @@ msgstr "Имена колона"
 #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245
 #: libraries/export/latex.php:360 libraries/export/odt.php:297
 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100
+<<<<<<< HEAD
 #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093
 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
 #: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321
+=======
+#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070
+#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
+#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
+#: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321
+>>>>>>> origin/master
 msgid "Type"
 msgstr "Тип"
 
@@ -166,9 +193,15 @@ msgstr "Коментари"
 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322
 #: libraries/export/latex.php:430 libraries/export/odt.php:368
 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263
+<<<<<<< HEAD
 #: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596
 #: server_privileges.php:1911 server_privileges.php:1916
 #: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228
+=======
+#: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579
+#: server_privileges.php:1889 server_privileges.php:1894
+#: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228
+>>>>>>> origin/master
 #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342
 msgid "No"
 msgstr "Не"
@@ -182,9 +215,15 @@ msgstr "Не"
 #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106
 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262
 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344
+<<<<<<< HEAD
 #: server_databases.php:64 server_privileges.php:1582
 #: server_privileges.php:1596 server_privileges.php:1911
 #: server_privileges.php:1914 server_privileges.php:2210 sql.php:193
+=======
+#: server_databases.php:64 server_privileges.php:1565
+#: server_privileges.php:1579 server_privileges.php:1889
+#: server_privileges.php:1892 server_privileges.php:2187 sql.php:193
+>>>>>>> origin/master
 #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350
 #: tbl_tracking.php:335 tbl_tracking.php:340
 msgid "Yes"
@@ -233,7 +272,15 @@ msgstr "Преименуј базу у"
 msgid "Command"
 msgstr "Наредба"
 
+<<<<<<< HEAD
 #: db_operations.php:466
+=======
+#: db_operations.php:429 tbl_change.php:1140
+msgid "and then"
+msgstr "и онда"
+
+#: db_operations.php:455
+>>>>>>> origin/master
 msgid "Copy database to"
 msgstr "Копирај базу у"
 
@@ -322,7 +369,11 @@ msgstr "Омогућено"
 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730
 #: server_collations.php:54 server_collations.php:66 server_databases.php:111
 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179
+<<<<<<< HEAD
 #: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326
+=======
+#: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326
+>>>>>>> origin/master
 msgid "Collation"
 msgstr "Сортирање"
 
@@ -351,7 +402,11 @@ msgstr "Табела"
 #: db_printview.php:105 libraries/db_structure.lib.php:56
 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146
 #: navigation.php:638 navigation.php:660 server_databases.php:122
+<<<<<<< HEAD
 #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775
+=======
+#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777
+>>>>>>> origin/master
 msgid "Rows"
 msgstr "Редова"
 
@@ -366,19 +421,31 @@ msgstr "се користи"
 
 #: db_printview.php:187 libraries/db_info.inc.php:88
 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433
+<<<<<<< HEAD
 #: tbl_structure.php:807
+=======
+#: tbl_structure.php:809
+>>>>>>> origin/master
 msgid "Creation"
 msgstr "Направљено"
 
 #: db_printview.php:196 libraries/db_info.inc.php:93
 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443
+<<<<<<< HEAD
 #: tbl_structure.php:815
+=======
+#: tbl_structure.php:817
+>>>>>>> origin/master
 msgid "Last update"
 msgstr "Последња измена"
 
 #: db_printview.php:205 libraries/db_info.inc.php:98
 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453
+<<<<<<< HEAD
 #: tbl_structure.php:823
+=======
+#: tbl_structure.php:825
+>>>>>>> origin/master
 msgid "Last check"
 msgstr "Последња провера"
 
@@ -444,7 +511,11 @@ msgstr "Del"
 
 #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553
 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779
+<<<<<<< HEAD
 #: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250
+=======
+#: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250
+>>>>>>> origin/master
 #: tbl_select.php:286
 msgid "Or"
 msgstr "или"
@@ -662,9 +733,15 @@ msgstr "Означено:"
 msgid "Check All"
 msgstr "Означи све"
 
+<<<<<<< HEAD
 #: db_structure.php:529 libraries/display_tbl.lib.php:2077
 #: libraries/replication_gui.lib.php:36 server_databases.php:350
 #: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460
+=======
+#: db_structure.php:531 libraries/display_tbl.lib.php:2077
+#: libraries/replication_gui.lib.php:36 server_databases.php:350
+#: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462
+>>>>>>> origin/master
 msgid "Uncheck All"
 msgstr "ниједно"
 
@@ -1133,10 +1210,17 @@ msgid "Prev"
 msgstr "Претходна"
 
 #. l10n: Display text for next month link in calendar
+<<<<<<< HEAD
 #: js/messages.php:106 libraries/common.lib.php:2366
 #: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338
 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
 #: tbl_structure.php:799
+=======
+#: js/messages.php:77 libraries/common.lib.php:2353
+#: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338
+#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
+#: tbl_structure.php:801
+>>>>>>> origin/master
 msgid "Next"
 msgstr "Следећи"
 
@@ -1681,7 +1765,11 @@ msgstr "Лозинка:"
 msgid "Server Choice"
 msgstr "Избор сервера"
 
+<<<<<<< HEAD
 #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63
+=======
+#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59
+>>>>>>> origin/master
 msgid "Cookies must be enabled past this point."
 msgstr "Колачићи (Cookies) морају у овом случају бити активни."
 
@@ -1761,7 +1849,11 @@ msgstr ""
 "Не могу да користим iconv или libiconv или recode_string функције иако "
 "екстензија пријављује да је учитана. Проверите вашу PHP конфигурацију."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:580
+=======
+#: libraries/common.inc.php:576
+>>>>>>> origin/master
 msgid ""
 "phpMyAdmin was unable to read your configuration file!<br />This might "
 "happen if PHP finds a parse error in it or PHP cannot find the file.<br /"
@@ -1777,13 +1869,21 @@ msgstr ""
 "недостаје наводник или тачка-зарез.<br />Ако добијете празну страну, све је "
 "у реду."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:591
+=======
+#: libraries/common.inc.php:587
+>>>>>>> origin/master
 #, fuzzy, php-format
 #| msgid "Could not load default configuration from: \"%1$s\""
 msgid "Could not load default configuration from: %1$s"
 msgstr "Не могу да учитам подразумевану конфигурацију из: \"%1$s\""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:596
+=======
+#: libraries/common.inc.php:592
+>>>>>>> origin/master
 msgid ""
 "The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
 "configuration file!"
@@ -1791,28 +1891,48 @@ msgstr ""
 "<tt>$cfg['PmaAbsoluteUri']</tt> директива МОРА бити подешена у "
 "конфигурационој датотеци!"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:626
+=======
+#: libraries/common.inc.php:622
+>>>>>>> origin/master
 #, fuzzy, php-format
 #| msgid "Invalid server index: \"%s\""
 msgid "Invalid server index: %s"
 msgstr "Неисправан индекс сервера: \"%s\""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:633
+=======
+#: libraries/common.inc.php:629
+>>>>>>> origin/master
 #, php-format
 msgid "Invalid hostname for server %1$s. Please review your configuration."
 msgstr "Неисправан назив сервера %1$s. Молимо проверите своју конфигурацију."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:642 libraries/header.inc.php:100
+=======
+#: libraries/common.inc.php:638 libraries/header.inc.php:96
+>>>>>>> origin/master
 #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47
 #: main.php:185 test/theme.php:57
 msgid "Server"
 msgstr "Сервер"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:820
 msgid "Invalid authentication method set in configuration:"
 msgstr "Неисправан метод аутентикације је задат у конфигурацији:"
 
 #: libraries/common.inc.php:923
+=======
+#: libraries/common.inc.php:816
+msgid "Invalid authentication method set in configuration:"
+msgstr "Неисправан метод аутентикације је задат у конфигурацији:"
+
+#: libraries/common.inc.php:919
+>>>>>>> origin/master
 #, php-format
 msgid "You should upgrade to %s %s or later."
 msgstr "Требало би да унапредите ваш %s сервер на верзију %s или новију."
@@ -2059,7 +2179,11 @@ msgid ""
 msgstr "Може бити приближно. Видите FAQ 3.11"
 
 #: libraries/db_structure.lib.php:69 server_databases.php:142
+<<<<<<< HEAD
 #: tbl_printview.php:335 tbl_structure.php:680
+=======
+#: tbl_printview.php:335 tbl_structure.php:682
+>>>>>>> origin/master
 msgid "Overhead"
 msgstr "Прекорачење"
 
@@ -2088,22 +2212,36 @@ msgid "Change password"
 msgstr "Промени лозинку"
 
 #: libraries/display_change_password.lib.php:35
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:348 server_privileges.php:808
+=======
+#: libraries/replication_gui.lib.php:348 server_privileges.php:807
+>>>>>>> origin/master
 msgid "No Password"
 msgstr "Нема лозинке"
 
 #: libraries/display_change_password.lib.php:41
 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63
 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:352 server_privileges.php:797
 #: server_privileges.php:801 server_privileges.php:812
 #: server_privileges.php:1555 server_synchronize.php:1175
+=======
+#: libraries/replication_gui.lib.php:352 server_privileges.php:796
+#: server_privileges.php:800 server_privileges.php:811
+#: server_privileges.php:1538 server_synchronize.php:1175
+>>>>>>> origin/master
 msgid "Password"
 msgstr "Лозинка"
 
 #: libraries/display_change_password.lib.php:46
 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359
+<<<<<<< HEAD
 #: server_privileges.php:816 server_privileges.php:819
+=======
+#: server_privileges.php:815 server_privileges.php:818
+>>>>>>> origin/master
 msgid "Re-type"
 msgstr "Поновите унос"
 
@@ -2118,12 +2256,20 @@ msgid "MySQL 4.0 compatible"
 msgstr "MySQL&nbsp;4.0 компатибилно"
 
 #: libraries/display_change_password.lib.php:72
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:363 server_privileges.php:823
+=======
+#: libraries/replication_gui.lib.php:363 server_privileges.php:822
+>>>>>>> origin/master
 msgid "Generate Password"
 msgstr "Направи лозинку"
 
 #: libraries/display_change_password.lib.php:75
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:366 server_privileges.php:826
+=======
+#: libraries/replication_gui.lib.php:366 server_privileges.php:825
+>>>>>>> origin/master
 msgid "Generate"
 msgstr "Направи"
 
@@ -2212,7 +2358,11 @@ msgid "remember template"
 msgstr "запамти шаблон"
 
 #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552
+=======
+#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549
+>>>>>>> origin/master
 msgid "Character set of the file:"
 msgstr "Карактер сет датотеке:"
 
@@ -2265,7 +2415,11 @@ msgstr ""
 msgid "File to import"
 msgstr "Датотека за увоз"
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527
+=======
+#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524
+>>>>>>> origin/master
 msgid "Location of the text file"
 msgstr "Локација текстуалне датотеке"
 
@@ -2273,12 +2427,20 @@ msgstr "Локација текстуалне датотеке"
 msgid "File uploads are not allowed on this server."
 msgstr "Слање датотека на овај сервер није дозвољено."
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536
+=======
+#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533
+>>>>>>> origin/master
 #: tbl_change.php:1025
 msgid "The directory you set for upload work cannot be reached"
 msgstr "Директоријум који сте изабрали за слање није доступан"
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539
+=======
+#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536
+>>>>>>> origin/master
 #: tbl_change.php:1028
 msgid "web server upload directory"
 msgstr "директоријум за слање веб сервера "
@@ -2414,7 +2576,11 @@ msgstr "Сортирај по кључу"
 #: libraries/import/docsql.php:34 libraries/import/ldi.php:47
 #: libraries/import/ods.php:30 libraries/import/sql.php:20
 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26
+<<<<<<< HEAD
 #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751
+=======
+#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753
+>>>>>>> origin/master
 msgid "Options"
 msgstr "Опције"
 
@@ -2563,7 +2729,11 @@ msgstr "Коришћење скупа прихватника"
 
 #: libraries/engines/innodb.lib.php:194 server_databases.php:137
 #: server_databases.php:305 server_status.php:525 server_status.php:586
+<<<<<<< HEAD
 #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694
+=======
+#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696
+>>>>>>> origin/master
 msgid "Total"
 msgstr "Укупно"
 
@@ -2824,7 +2994,11 @@ msgid ""
 msgstr ""
 
 #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88
+<<<<<<< HEAD
 #: tbl_printview.php:375 tbl_structure.php:735
+=======
+#: tbl_printview.php:375 tbl_structure.php:737
+>>>>>>> origin/master
 msgid "Format"
 msgstr "Формат"
 
@@ -2896,8 +3070,13 @@ msgstr "Microsoft Word 2000"
 #: libraries/export/latex.php:201 libraries/export/odt.php:48
 #: libraries/export/sql.php:106 libraries/export/sql.php:868
 #: libraries/export/texytext.php:27 server_databases.php:127
+<<<<<<< HEAD
 #: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316
 #: tbl_structure.php:663
+=======
+#: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316
+#: tbl_structure.php:665
+>>>>>>> origin/master
 msgid "Data"
 msgstr "Подаци"
 
@@ -2946,9 +3125,15 @@ msgstr "MIME-типови"
 #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57
 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177
 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:332 server_privileges.php:732
 #: server_privileges.php:735 server_privileges.php:791
 #: server_privileges.php:1554 server_privileges.php:2092
+=======
+#: libraries/replication_gui.lib.php:332 server_privileges.php:731
+#: server_privileges.php:734 server_privileges.php:790
+#: server_privileges.php:1537 server_privileges.php:2069
+>>>>>>> origin/master
 #: server_processlist.php:55 server_synchronize.php:1159
 msgid "Host"
 msgstr "Домаћин"
@@ -3621,8 +3806,13 @@ msgstr ""
 
 #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59
 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:262 server_privileges.php:712
 #: server_privileges.php:715 server_privileges.php:722
+=======
+#: libraries/replication_gui.lib.php:262 server_privileges.php:711
+#: server_privileges.php:714 server_privileges.php:721
+>>>>>>> origin/master
 #: server_synchronize.php:1171
 msgid "User name"
 msgstr "Име корисника"
@@ -3642,14 +3832,22 @@ msgstr "Прикажи статус подређених сервера"
 msgid "Slave status"
 msgstr "Прикажи статус подређених сервера"
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448
+=======
+#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445
+>>>>>>> origin/master
 #: server_status.php:737 server_variables.php:52
 msgid "Variable"
 msgstr "Променљива"
 
 #: libraries/replication_gui.lib.php:118 server_status.php:738
 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138
+<<<<<<< HEAD
 #: tbl_structure.php:727
+=======
+#: tbl_structure.php:729
+>>>>>>> origin/master
 msgid "Value"
 msgstr "Вредност"
 
@@ -3667,11 +3865,16 @@ msgstr ""
 msgid "Add slave replication user"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:257 server_privileges.php:717
+=======
+#: libraries/replication_gui.lib.php:257 server_privileges.php:716
+>>>>>>> origin/master
 msgid "Any user"
 msgstr "Било који корисник"
 
 #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:349 server_privileges.php:718
 #: server_privileges.php:785 server_privileges.php:809
 #: server_privileges.php:1950 server_privileges.php:1980
@@ -3695,6 +3898,31 @@ msgid "Use Host Table"
 msgstr "Користи табелу домаћина"
 
 #: libraries/replication_gui.lib.php:334 server_privileges.php:793
+=======
+#: libraries/replication_gui.lib.php:349 server_privileges.php:717
+#: server_privileges.php:784 server_privileges.php:808
+#: server_privileges.php:1928 server_privileges.php:1958
+msgid "Use text field"
+msgstr "Користи текст поље"
+
+#: libraries/replication_gui.lib.php:305 server_privileges.php:764
+msgid "Any host"
+msgstr "Било који домаћин"
+
+#: libraries/replication_gui.lib.php:309 server_privileges.php:768
+msgid "Local"
+msgstr "Локални"
+
+#: libraries/replication_gui.lib.php:315 server_privileges.php:773
+msgid "This Host"
+msgstr "Овај сервер"
+
+#: libraries/replication_gui.lib.php:321 server_privileges.php:779
+msgid "Use Host Table"
+msgstr "Користи табелу домаћина"
+
+#: libraries/replication_gui.lib.php:334 server_privileges.php:792
+>>>>>>> origin/master
 msgid ""
 "When Host table is used, this field is ignored and values stored in Host "
 "table are used instead."
@@ -7913,10 +8141,13 @@ msgstr ""
 msgid "Show insert query"
 msgstr "Приказ као SQL упит"
 
+<<<<<<< HEAD
 #: tbl_change.php:1140
 msgid "and then"
 msgstr "и онда"
 
+=======
+>>>>>>> origin/master
 #: tbl_change.php:1144
 msgid "Go back to previous page"
 msgstr "Назад на претходну страну"
@@ -8114,6 +8345,7 @@ msgstr "Провери референцијални интегритет:"
 msgid "Show tables"
 msgstr "Прикажи табеле"
 
+<<<<<<< HEAD
 #: tbl_printview.php:309 tbl_structure.php:654
 msgid "Space usage"
 msgstr "Заузеће"
@@ -8147,6 +8379,41 @@ msgid "Row length"
 msgstr "Дужина реда"
 
 #: tbl_printview.php:413 tbl_structure.php:791
+=======
+#: tbl_printview.php:309 tbl_structure.php:656
+msgid "Space usage"
+msgstr "Заузеће"
+
+#: tbl_printview.php:313 tbl_structure.php:660
+msgid "Usage"
+msgstr "Заузеће"
+
+#: tbl_printview.php:340 tbl_structure.php:687
+msgid "Effective"
+msgstr "Ефективне"
+
+#: tbl_printview.php:365 tbl_structure.php:725
+msgid "Row Statistics"
+msgstr "Статистике реда"
+
+#: tbl_printview.php:368 tbl_structure.php:728
+msgid "Statements"
+msgstr "Име"
+
+#: tbl_printview.php:379 tbl_structure.php:740
+msgid "static"
+msgstr ""
+
+#: tbl_printview.php:381 tbl_structure.php:742
+msgid "dynamic"
+msgstr "динамички"
+
+#: tbl_printview.php:403 tbl_structure.php:785
+msgid "Row length"
+msgstr "Дужина реда"
+
+#: tbl_printview.php:413 tbl_structure.php:793
+>>>>>>> origin/master
 msgid " Row size "
 msgstr "Величина реда"
 
diff --git a/po/sr@latin.po b/po/sr@latin.po
index 2ec41d804..001bc16e6 100755
--- a/po/sr@latin.po
+++ b/po/sr@latin.po
@@ -3,7 +3,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2010-07-03 21:45+0530\n"
+=======
+"POT-Creation-Date: 2010-07-03 09:00-0400\n"
+>>>>>>> origin/master
 "PO-Revision-Date: 2010-03-30 23:47+0200\n"
 "Last-Translator: Michal <michal@cihar.com>\n"
 "Language-Team: serbian_latin <sr@latin@li.org>\n"
@@ -50,15 +54,26 @@ msgstr "Pretraživanje"
 #: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046
 #: libraries/Theme_Manager.class.php:311
 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719
+<<<<<<< HEAD
 #: libraries/common.lib.php:1344 libraries/common.lib.php:2301
 #: libraries/display_change_password.lib.php:82
 #: libraries/display_create_table.lib.php:62
+=======
+#: libraries/common.lib.php:1335 libraries/common.lib.php:2288
+#: libraries/display_change_password.lib.php:82
+#: libraries/display_create_table.lib.php:63
+>>>>>>> origin/master
 #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532
 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76
 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104
+<<<<<<< HEAD
 #: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480
 #: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782
+=======
+#: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477
+#: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782
+>>>>>>> origin/master
 #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328
 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142
 #: server_privileges.php:665 server_privileges.php:1641
@@ -68,8 +83,13 @@ msgstr "Pretraživanje"
 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171
 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265
 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561
+<<<<<<< HEAD
 #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560
 #: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512
+=======
+#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562
+#: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512
+>>>>>>> origin/master
 #: view_create.php:182 view_operations.php:101
 msgid "Go"
 msgstr "Kreni"
@@ -122,10 +142,17 @@ msgstr "Imena kolona"
 #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245
 #: libraries/export/latex.php:360 libraries/export/odt.php:297
 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100
+<<<<<<< HEAD
 #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093
 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
 #: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321
+=======
+#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070
+#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
+#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
+#: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321
+>>>>>>> origin/master
 msgid "Type"
 msgstr "Tip"
 
@@ -166,9 +193,15 @@ msgstr "Komentari"
 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322
 #: libraries/export/latex.php:430 libraries/export/odt.php:368
 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263
+<<<<<<< HEAD
 #: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596
 #: server_privileges.php:1911 server_privileges.php:1916
 #: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228
+=======
+#: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579
+#: server_privileges.php:1889 server_privileges.php:1894
+#: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228
+>>>>>>> origin/master
 #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342
 msgid "No"
 msgstr "Ne"
@@ -182,9 +215,15 @@ msgstr "Ne"
 #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106
 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262
 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344
+<<<<<<< HEAD
 #: server_databases.php:64 server_privileges.php:1582
 #: server_privileges.php:1596 server_privileges.php:1911
 #: server_privileges.php:1914 server_privileges.php:2210 sql.php:193
+=======
+#: server_databases.php:64 server_privileges.php:1565
+#: server_privileges.php:1579 server_privileges.php:1889
+#: server_privileges.php:1892 server_privileges.php:2187 sql.php:193
+>>>>>>> origin/master
 #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350
 #: tbl_tracking.php:335 tbl_tracking.php:340
 msgid "Yes"
@@ -233,7 +272,15 @@ msgstr "Preimenuj bazu u"
 msgid "Command"
 msgstr "Naredba"
 
+<<<<<<< HEAD
 #: db_operations.php:466
+=======
+#: db_operations.php:429 tbl_change.php:1140
+msgid "and then"
+msgstr "i onda"
+
+#: db_operations.php:455
+>>>>>>> origin/master
 msgid "Copy database to"
 msgstr "Kopiraj bazu u"
 
@@ -322,7 +369,11 @@ msgstr "Omogućeno"
 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730
 #: server_collations.php:54 server_collations.php:66 server_databases.php:111
 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179
+<<<<<<< HEAD
 #: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326
+=======
+#: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326
+>>>>>>> origin/master
 msgid "Collation"
 msgstr "Sortiranje"
 
@@ -351,7 +402,11 @@ msgstr "Tabela"
 #: db_printview.php:105 libraries/db_structure.lib.php:56
 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146
 #: navigation.php:638 navigation.php:660 server_databases.php:122
+<<<<<<< HEAD
 #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775
+=======
+#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777
+>>>>>>> origin/master
 msgid "Rows"
 msgstr "Redova"
 
@@ -366,19 +421,31 @@ msgstr "se koristi"
 
 #: db_printview.php:187 libraries/db_info.inc.php:88
 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433
+<<<<<<< HEAD
 #: tbl_structure.php:807
+=======
+#: tbl_structure.php:809
+>>>>>>> origin/master
 msgid "Creation"
 msgstr "Napravljeno"
 
 #: db_printview.php:196 libraries/db_info.inc.php:93
 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443
+<<<<<<< HEAD
 #: tbl_structure.php:815
+=======
+#: tbl_structure.php:817
+>>>>>>> origin/master
 msgid "Last update"
 msgstr "Poslednja izmena"
 
 #: db_printview.php:205 libraries/db_info.inc.php:98
 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453
+<<<<<<< HEAD
 #: tbl_structure.php:823
+=======
+#: tbl_structure.php:825
+>>>>>>> origin/master
 msgid "Last check"
 msgstr "Poslednja provera"
 
@@ -444,7 +511,11 @@ msgstr "Del"
 
 #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553
 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779
+<<<<<<< HEAD
 #: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250
+=======
+#: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250
+>>>>>>> origin/master
 #: tbl_select.php:286
 msgid "Or"
 msgstr "ili"
@@ -662,9 +733,15 @@ msgstr "Označeno:"
 msgid "Check All"
 msgstr "Označi sve"
 
+<<<<<<< HEAD
 #: db_structure.php:529 libraries/display_tbl.lib.php:2077
 #: libraries/replication_gui.lib.php:36 server_databases.php:350
 #: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460
+=======
+#: db_structure.php:531 libraries/display_tbl.lib.php:2077
+#: libraries/replication_gui.lib.php:36 server_databases.php:350
+#: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462
+>>>>>>> origin/master
 msgid "Uncheck All"
 msgstr "nijedno"
 
@@ -1133,10 +1210,17 @@ msgid "Prev"
 msgstr "Prethodna"
 
 #. l10n: Display text for next month link in calendar
+<<<<<<< HEAD
 #: js/messages.php:106 libraries/common.lib.php:2366
 #: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338
 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
 #: tbl_structure.php:799
+=======
+#: js/messages.php:77 libraries/common.lib.php:2353
+#: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338
+#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
+#: tbl_structure.php:801
+>>>>>>> origin/master
 msgid "Next"
 msgstr "Sledeći"
 
@@ -1681,7 +1765,11 @@ msgstr "Lozinka:"
 msgid "Server Choice"
 msgstr "Izbor servera"
 
+<<<<<<< HEAD
 #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63
+=======
+#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59
+>>>>>>> origin/master
 msgid "Cookies must be enabled past this point."
 msgstr "Kolačići (Cookies) moraju u ovom slučaju biti aktivni."
 
@@ -1761,7 +1849,11 @@ msgstr ""
 "Ne mogu da koristim iconv ili libiconv ili recode_string funkcije iako "
 "ekstenzija prijavljuje da je učitana. Proverite vašu PHP konfiguraciju."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:580
+=======
+#: libraries/common.inc.php:576
+>>>>>>> origin/master
 msgid ""
 "phpMyAdmin was unable to read your configuration file!<br />This might "
 "happen if PHP finds a parse error in it or PHP cannot find the file.<br /"
@@ -1777,13 +1869,21 @@ msgstr ""
 "nedostaje navodnik ili tačka-zarez.<br />Ako dobijete praznu stranu, sve je "
 "u redu."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:591
+=======
+#: libraries/common.inc.php:587
+>>>>>>> origin/master
 #, fuzzy, php-format
 #| msgid "Could not load default configuration from: \"%1$s\""
 msgid "Could not load default configuration from: %1$s"
 msgstr "Ne mogu da učitam podrazumevanu konfiguraciju iz: \"%1$s\""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:596
+=======
+#: libraries/common.inc.php:592
+>>>>>>> origin/master
 msgid ""
 "The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
 "configuration file!"
@@ -1791,28 +1891,48 @@ msgstr ""
 "<tt>$cfg['PmaAbsoluteUri']</tt> direktiva MORA biti podešena u "
 "konfiguracionoj datoteci!"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:626
+=======
+#: libraries/common.inc.php:622
+>>>>>>> origin/master
 #, fuzzy, php-format
 #| msgid "Invalid server index: \"%s\""
 msgid "Invalid server index: %s"
 msgstr "Neispravan indeks servera: \"%s\""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:633
+=======
+#: libraries/common.inc.php:629
+>>>>>>> origin/master
 #, php-format
 msgid "Invalid hostname for server %1$s. Please review your configuration."
 msgstr "Neispravan naziv servera %1$s. Molimo proverite svoju konfiguraciju."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:642 libraries/header.inc.php:100
+=======
+#: libraries/common.inc.php:638 libraries/header.inc.php:96
+>>>>>>> origin/master
 #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47
 #: main.php:185 test/theme.php:57
 msgid "Server"
 msgstr "Server"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:820
 msgid "Invalid authentication method set in configuration:"
 msgstr "Neispravan metod autentikacije je zadat u konfiguraciji:"
 
 #: libraries/common.inc.php:923
+=======
+#: libraries/common.inc.php:816
+msgid "Invalid authentication method set in configuration:"
+msgstr "Neispravan metod autentikacije je zadat u konfiguraciji:"
+
+#: libraries/common.inc.php:919
+>>>>>>> origin/master
 #, php-format
 msgid "You should upgrade to %s %s or later."
 msgstr "Trebalo bi da unapredite vaš %s server na verziju %s ili noviju."
@@ -2059,7 +2179,11 @@ msgid ""
 msgstr "Može biti približno. Vidite FAQ 3.11"
 
 #: libraries/db_structure.lib.php:69 server_databases.php:142
+<<<<<<< HEAD
 #: tbl_printview.php:335 tbl_structure.php:680
+=======
+#: tbl_printview.php:335 tbl_structure.php:682
+>>>>>>> origin/master
 msgid "Overhead"
 msgstr "Prekoračenje"
 
@@ -2088,22 +2212,36 @@ msgid "Change password"
 msgstr "Promeni lozinku"
 
 #: libraries/display_change_password.lib.php:35
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:348 server_privileges.php:808
+=======
+#: libraries/replication_gui.lib.php:348 server_privileges.php:807
+>>>>>>> origin/master
 msgid "No Password"
 msgstr "Nema lozinke"
 
 #: libraries/display_change_password.lib.php:41
 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63
 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:352 server_privileges.php:797
 #: server_privileges.php:801 server_privileges.php:812
 #: server_privileges.php:1555 server_synchronize.php:1175
+=======
+#: libraries/replication_gui.lib.php:352 server_privileges.php:796
+#: server_privileges.php:800 server_privileges.php:811
+#: server_privileges.php:1538 server_synchronize.php:1175
+>>>>>>> origin/master
 msgid "Password"
 msgstr "Lozinka"
 
 #: libraries/display_change_password.lib.php:46
 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359
+<<<<<<< HEAD
 #: server_privileges.php:816 server_privileges.php:819
+=======
+#: server_privileges.php:815 server_privileges.php:818
+>>>>>>> origin/master
 msgid "Re-type"
 msgstr "Ponovite unos"
 
@@ -2118,12 +2256,20 @@ msgid "MySQL 4.0 compatible"
 msgstr "MySQL&nbsp;4.0 kompatibilno"
 
 #: libraries/display_change_password.lib.php:72
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:363 server_privileges.php:823
+=======
+#: libraries/replication_gui.lib.php:363 server_privileges.php:822
+>>>>>>> origin/master
 msgid "Generate Password"
 msgstr "Napravi lozinku"
 
 #: libraries/display_change_password.lib.php:75
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:366 server_privileges.php:826
+=======
+#: libraries/replication_gui.lib.php:366 server_privileges.php:825
+>>>>>>> origin/master
 msgid "Generate"
 msgstr "Napravi"
 
@@ -2212,7 +2358,11 @@ msgid "remember template"
 msgstr "zapamti šablon"
 
 #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552
+=======
+#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549
+>>>>>>> origin/master
 msgid "Character set of the file:"
 msgstr "Karakter set datoteke:"
 
@@ -2265,7 +2415,11 @@ msgstr ""
 msgid "File to import"
 msgstr "Datoteka za uvoz"
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527
+=======
+#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524
+>>>>>>> origin/master
 msgid "Location of the text file"
 msgstr "Lokacija tekstualne datoteke"
 
@@ -2273,12 +2427,20 @@ msgstr "Lokacija tekstualne datoteke"
 msgid "File uploads are not allowed on this server."
 msgstr "Slanje datoteka na ovaj server nije dozvoljeno."
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536
+=======
+#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533
+>>>>>>> origin/master
 #: tbl_change.php:1025
 msgid "The directory you set for upload work cannot be reached"
 msgstr "Direktorijum koji ste izabrali za slanje nije dostupan"
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539
+=======
+#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536
+>>>>>>> origin/master
 #: tbl_change.php:1028
 msgid "web server upload directory"
 msgstr "direktorijum za slanje veb servera "
@@ -2414,7 +2576,11 @@ msgstr "Sortiraj po ključu"
 #: libraries/import/docsql.php:34 libraries/import/ldi.php:47
 #: libraries/import/ods.php:30 libraries/import/sql.php:20
 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26
+<<<<<<< HEAD
 #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751
+=======
+#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753
+>>>>>>> origin/master
 msgid "Options"
 msgstr "Opcije"
 
@@ -2563,7 +2729,11 @@ msgstr "Korišćenje skupa prihvatnika"
 
 #: libraries/engines/innodb.lib.php:194 server_databases.php:137
 #: server_databases.php:305 server_status.php:525 server_status.php:586
+<<<<<<< HEAD
 #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694
+=======
+#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696
+>>>>>>> origin/master
 msgid "Total"
 msgstr "Ukupno"
 
@@ -2824,7 +2994,11 @@ msgid ""
 msgstr ""
 
 #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88
+<<<<<<< HEAD
 #: tbl_printview.php:375 tbl_structure.php:735
+=======
+#: tbl_printview.php:375 tbl_structure.php:737
+>>>>>>> origin/master
 msgid "Format"
 msgstr "Format"
 
@@ -2896,8 +3070,13 @@ msgstr "Microsoft Word 2000"
 #: libraries/export/latex.php:201 libraries/export/odt.php:48
 #: libraries/export/sql.php:106 libraries/export/sql.php:868
 #: libraries/export/texytext.php:27 server_databases.php:127
+<<<<<<< HEAD
 #: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316
 #: tbl_structure.php:663
+=======
+#: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316
+#: tbl_structure.php:665
+>>>>>>> origin/master
 msgid "Data"
 msgstr "Podaci"
 
@@ -2946,9 +3125,15 @@ msgstr "MIME-tipovi"
 #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57
 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177
 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:332 server_privileges.php:732
 #: server_privileges.php:735 server_privileges.php:791
 #: server_privileges.php:1554 server_privileges.php:2092
+=======
+#: libraries/replication_gui.lib.php:332 server_privileges.php:731
+#: server_privileges.php:734 server_privileges.php:790
+#: server_privileges.php:1537 server_privileges.php:2069
+>>>>>>> origin/master
 #: server_processlist.php:55 server_synchronize.php:1159
 msgid "Host"
 msgstr "Domaćin"
@@ -3621,8 +3806,13 @@ msgstr ""
 
 #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59
 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:262 server_privileges.php:712
 #: server_privileges.php:715 server_privileges.php:722
+=======
+#: libraries/replication_gui.lib.php:262 server_privileges.php:711
+#: server_privileges.php:714 server_privileges.php:721
+>>>>>>> origin/master
 #: server_synchronize.php:1171
 msgid "User name"
 msgstr "Ime korisnika"
@@ -3642,14 +3832,22 @@ msgstr "Prikaži status podređenih servera"
 msgid "Slave status"
 msgstr "Prikaži status podređenih servera"
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448
+=======
+#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445
+>>>>>>> origin/master
 #: server_status.php:737 server_variables.php:52
 msgid "Variable"
 msgstr "Promenljiva"
 
 #: libraries/replication_gui.lib.php:118 server_status.php:738
 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138
+<<<<<<< HEAD
 #: tbl_structure.php:727
+=======
+#: tbl_structure.php:729
+>>>>>>> origin/master
 msgid "Value"
 msgstr "Vrednost"
 
@@ -3667,11 +3865,16 @@ msgstr ""
 msgid "Add slave replication user"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:257 server_privileges.php:717
+=======
+#: libraries/replication_gui.lib.php:257 server_privileges.php:716
+>>>>>>> origin/master
 msgid "Any user"
 msgstr "Bilo koji korisnik"
 
 #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:349 server_privileges.php:718
 #: server_privileges.php:785 server_privileges.php:809
 #: server_privileges.php:1950 server_privileges.php:1980
@@ -3695,6 +3898,31 @@ msgid "Use Host Table"
 msgstr "Koristi tabelu domaćina"
 
 #: libraries/replication_gui.lib.php:334 server_privileges.php:793
+=======
+#: libraries/replication_gui.lib.php:349 server_privileges.php:717
+#: server_privileges.php:784 server_privileges.php:808
+#: server_privileges.php:1928 server_privileges.php:1958
+msgid "Use text field"
+msgstr "Koristi tekst polje"
+
+#: libraries/replication_gui.lib.php:305 server_privileges.php:764
+msgid "Any host"
+msgstr "Bilo koji domaćin"
+
+#: libraries/replication_gui.lib.php:309 server_privileges.php:768
+msgid "Local"
+msgstr "Lokalni"
+
+#: libraries/replication_gui.lib.php:315 server_privileges.php:773
+msgid "This Host"
+msgstr "Ovaj server"
+
+#: libraries/replication_gui.lib.php:321 server_privileges.php:779
+msgid "Use Host Table"
+msgstr "Koristi tabelu domaćina"
+
+#: libraries/replication_gui.lib.php:334 server_privileges.php:792
+>>>>>>> origin/master
 msgid ""
 "When Host table is used, this field is ignored and values stored in Host "
 "table are used instead."
@@ -7918,10 +8146,13 @@ msgstr ""
 msgid "Show insert query"
 msgstr "Prikaz kao SQL upit"
 
+<<<<<<< HEAD
 #: tbl_change.php:1140
 msgid "and then"
 msgstr "i onda"
 
+=======
+>>>>>>> origin/master
 #: tbl_change.php:1144
 msgid "Go back to previous page"
 msgstr "Nazad na prethodnu stranu"
@@ -8119,6 +8350,7 @@ msgstr "Proveri referencijalni integritet:"
 msgid "Show tables"
 msgstr "Prikaži tabele"
 
+<<<<<<< HEAD
 #: tbl_printview.php:309 tbl_structure.php:654
 msgid "Space usage"
 msgstr "Zauzeće"
@@ -8152,6 +8384,41 @@ msgid "Row length"
 msgstr "Dužina reda"
 
 #: tbl_printview.php:413 tbl_structure.php:791
+=======
+#: tbl_printview.php:309 tbl_structure.php:656
+msgid "Space usage"
+msgstr "Zauzeće"
+
+#: tbl_printview.php:313 tbl_structure.php:660
+msgid "Usage"
+msgstr "Zauzeće"
+
+#: tbl_printview.php:340 tbl_structure.php:687
+msgid "Effective"
+msgstr "Efektivne"
+
+#: tbl_printview.php:365 tbl_structure.php:725
+msgid "Row Statistics"
+msgstr "Statistike reda"
+
+#: tbl_printview.php:368 tbl_structure.php:728
+msgid "Statements"
+msgstr "Ime"
+
+#: tbl_printview.php:379 tbl_structure.php:740
+msgid "static"
+msgstr ""
+
+#: tbl_printview.php:381 tbl_structure.php:742
+msgid "dynamic"
+msgstr "dinamički"
+
+#: tbl_printview.php:403 tbl_structure.php:785
+msgid "Row length"
+msgstr "Dužina reda"
+
+#: tbl_printview.php:413 tbl_structure.php:793
+>>>>>>> origin/master
 msgid " Row size "
 msgstr "Veličina reda"
 
diff --git a/po/sv.po b/po/sv.po
index b3b217654..32dc16205 100755
--- a/po/sv.po
+++ b/po/sv.po
@@ -3,7 +3,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2010-07-03 21:45+0530\n"
+=======
+"POT-Creation-Date: 2010-07-03 09:00-0400\n"
+>>>>>>> origin/master
 "PO-Revision-Date: 2010-03-12 09:19+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: swedish <sv@li.org>\n"
@@ -48,15 +52,26 @@ msgstr "Sök"
 #: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046
 #: libraries/Theme_Manager.class.php:311
 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719
+<<<<<<< HEAD
 #: libraries/common.lib.php:1344 libraries/common.lib.php:2301
 #: libraries/display_change_password.lib.php:82
 #: libraries/display_create_table.lib.php:62
+=======
+#: libraries/common.lib.php:1335 libraries/common.lib.php:2288
+#: libraries/display_change_password.lib.php:82
+#: libraries/display_create_table.lib.php:63
+>>>>>>> origin/master
 #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532
 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76
 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104
+<<<<<<< HEAD
 #: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480
 #: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782
+=======
+#: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477
+#: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782
+>>>>>>> origin/master
 #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328
 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142
 #: server_privileges.php:665 server_privileges.php:1641
@@ -66,8 +81,13 @@ msgstr "Sök"
 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171
 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265
 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561
+<<<<<<< HEAD
 #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560
 #: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512
+=======
+#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562
+#: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512
+>>>>>>> origin/master
 #: view_create.php:182 view_operations.php:101
 msgid "Go"
 msgstr "Kör"
@@ -120,10 +140,17 @@ msgstr "Kolumn-namn"
 #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245
 #: libraries/export/latex.php:360 libraries/export/odt.php:297
 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100
+<<<<<<< HEAD
 #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093
 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
 #: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321
+=======
+#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070
+#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
+#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
+#: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321
+>>>>>>> origin/master
 msgid "Type"
 msgstr "Typ"
 
@@ -164,9 +191,15 @@ msgstr "Kommentarer"
 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322
 #: libraries/export/latex.php:430 libraries/export/odt.php:368
 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263
+<<<<<<< HEAD
 #: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596
 #: server_privileges.php:1911 server_privileges.php:1916
 #: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228
+=======
+#: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579
+#: server_privileges.php:1889 server_privileges.php:1894
+#: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228
+>>>>>>> origin/master
 #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342
 msgid "No"
 msgstr "Nej"
@@ -180,9 +213,15 @@ msgstr "Nej"
 #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106
 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262
 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344
+<<<<<<< HEAD
 #: server_databases.php:64 server_privileges.php:1582
 #: server_privileges.php:1596 server_privileges.php:1911
 #: server_privileges.php:1914 server_privileges.php:2210 sql.php:193
+=======
+#: server_databases.php:64 server_privileges.php:1565
+#: server_privileges.php:1579 server_privileges.php:1889
+#: server_privileges.php:1892 server_privileges.php:2187 sql.php:193
+>>>>>>> origin/master
 #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350
 #: tbl_tracking.php:335 tbl_tracking.php:340
 msgid "Yes"
@@ -231,7 +270,15 @@ msgstr "Döp om databasen till"
 msgid "Command"
 msgstr "Kommando"
 
+<<<<<<< HEAD
 #: db_operations.php:466
+=======
+#: db_operations.php:429 tbl_change.php:1140
+msgid "and then"
+msgstr "och sedan"
+
+#: db_operations.php:455
+>>>>>>> origin/master
 msgid "Copy database to"
 msgstr "Kopiera databas till"
 
@@ -319,7 +366,11 @@ msgstr "Aktivera"
 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730
 #: server_collations.php:54 server_collations.php:66 server_databases.php:111
 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179
+<<<<<<< HEAD
 #: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326
+=======
+#: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326
+>>>>>>> origin/master
 msgid "Collation"
 msgstr "Kollationering"
 
@@ -348,7 +399,11 @@ msgstr "Tabell"
 #: db_printview.php:105 libraries/db_structure.lib.php:56
 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146
 #: navigation.php:638 navigation.php:660 server_databases.php:122
+<<<<<<< HEAD
 #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775
+=======
+#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777
+>>>>>>> origin/master
 msgid "Rows"
 msgstr "Rader"
 
@@ -363,19 +418,31 @@ msgstr "används"
 
 #: db_printview.php:187 libraries/db_info.inc.php:88
 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433
+<<<<<<< HEAD
 #: tbl_structure.php:807
+=======
+#: tbl_structure.php:809
+>>>>>>> origin/master
 msgid "Creation"
 msgstr "Skapades"
 
 #: db_printview.php:196 libraries/db_info.inc.php:93
 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443
+<<<<<<< HEAD
 #: tbl_structure.php:815
+=======
+#: tbl_structure.php:817
+>>>>>>> origin/master
 msgid "Last update"
 msgstr "Senaste uppdatering"
 
 #: db_printview.php:205 libraries/db_info.inc.php:98
 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453
+<<<<<<< HEAD
 #: tbl_structure.php:823
+=======
+#: tbl_structure.php:825
+>>>>>>> origin/master
 msgid "Last check"
 msgstr "Senaste kontroll"
 
@@ -440,7 +507,11 @@ msgstr "Ta bort"
 
 #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553
 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779
+<<<<<<< HEAD
 #: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250
+=======
+#: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250
+>>>>>>> origin/master
 #: tbl_select.php:286
 msgid "Or"
 msgstr "Eller"
@@ -658,9 +729,15 @@ msgstr "Med markerade:"
 msgid "Check All"
 msgstr "Markera alla"
 
+<<<<<<< HEAD
 #: db_structure.php:529 libraries/display_tbl.lib.php:2077
 #: libraries/replication_gui.lib.php:36 server_databases.php:350
 #: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460
+=======
+#: db_structure.php:531 libraries/display_tbl.lib.php:2077
+#: libraries/replication_gui.lib.php:36 server_databases.php:350
+#: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462
+>>>>>>> origin/master
 msgid "Uncheck All"
 msgstr "Avmarkera alla"
 
@@ -1131,10 +1208,17 @@ msgid "Prev"
 msgstr "Föregående"
 
 #. l10n: Display text for next month link in calendar
+<<<<<<< HEAD
 #: js/messages.php:106 libraries/common.lib.php:2366
 #: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338
 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
 #: tbl_structure.php:799
+=======
+#: js/messages.php:77 libraries/common.lib.php:2353
+#: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338
+#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
+#: tbl_structure.php:801
+>>>>>>> origin/master
 msgid "Next"
 msgstr "Nästa"
 
@@ -1684,7 +1768,11 @@ msgstr "Lösenord:"
 msgid "Server Choice"
 msgstr "Serverval"
 
+<<<<<<< HEAD
 #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63
+=======
+#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59
+>>>>>>> origin/master
 msgid "Cookies must be enabled past this point."
 msgstr "Kakor (cookies) måste tillåtas för att gå vidare."
 
@@ -1767,7 +1855,11 @@ msgstr ""
 "fastän de nödvändiga tilläggen verkar vara laddade. Kontrollera din PHP-"
 "konfiguration."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:580
+=======
+#: libraries/common.inc.php:576
+>>>>>>> origin/master
 msgid ""
 "phpMyAdmin was unable to read your configuration file!<br />This might "
 "happen if PHP finds a parse error in it or PHP cannot find the file.<br /"
@@ -1782,13 +1874,21 @@ msgstr ""
 "som du erhåller. I de flesta fall saknas ett citationstecken eller ett "
 "semikolon någonstans.<br />Om du erhåller en tom sida är allt bra."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:591
+=======
+#: libraries/common.inc.php:587
+>>>>>>> origin/master
 #, fuzzy, php-format
 #| msgid "Could not load default configuration from: \"%1$s\""
 msgid "Could not load default configuration from: %1$s"
 msgstr "Kunde inte ladda standardkonfiguration från: \"%1$s\""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:596
+=======
+#: libraries/common.inc.php:592
+>>>>>>> origin/master
 msgid ""
 "The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
 "configuration file!"
@@ -1796,28 +1896,48 @@ msgstr ""
 "Variabeln <tt>$cfg['PmaAbsoluteUri']</tt> MÅSTE anges i din "
 "konfigurationsfil!"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:626
+=======
+#: libraries/common.inc.php:622
+>>>>>>> origin/master
 #, fuzzy, php-format
 #| msgid "Invalid server index: \"%s\""
 msgid "Invalid server index: %s"
 msgstr "Ogiltigt serverindex: \"%s\""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:633
+=======
+#: libraries/common.inc.php:629
+>>>>>>> origin/master
 #, php-format
 msgid "Invalid hostname for server %1$s. Please review your configuration."
 msgstr "Ogiltigt värdnamn för server %1$s. Var god granska din konfiguration."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:642 libraries/header.inc.php:100
+=======
+#: libraries/common.inc.php:638 libraries/header.inc.php:96
+>>>>>>> origin/master
 #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47
 #: main.php:185 test/theme.php:57
 msgid "Server"
 msgstr "Server"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:820
 msgid "Invalid authentication method set in configuration:"
 msgstr "Ogiltig metod för autentisering angiven i konfiguration:"
 
 #: libraries/common.inc.php:923
+=======
+#: libraries/common.inc.php:816
+msgid "Invalid authentication method set in configuration:"
+msgstr "Ogiltig metod för autentisering angiven i konfiguration:"
+
+#: libraries/common.inc.php:919
+>>>>>>> origin/master
 #, php-format
 msgid "You should upgrade to %s %s or later."
 msgstr "Du bör uppgradera till %s %s eller senare."
@@ -2065,7 +2185,11 @@ msgid ""
 msgstr "Kan vara ungefärligt. Se FAQ 3.11"
 
 #: libraries/db_structure.lib.php:69 server_databases.php:142
+<<<<<<< HEAD
 #: tbl_printview.php:335 tbl_structure.php:680
+=======
+#: tbl_printview.php:335 tbl_structure.php:682
+>>>>>>> origin/master
 msgid "Overhead"
 msgstr "Outnyttjat"
 
@@ -2092,22 +2216,36 @@ msgid "Change password"
 msgstr "Byt lösenord"
 
 #: libraries/display_change_password.lib.php:35
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:348 server_privileges.php:808
+=======
+#: libraries/replication_gui.lib.php:348 server_privileges.php:807
+>>>>>>> origin/master
 msgid "No Password"
 msgstr "Inget lösenord"
 
 #: libraries/display_change_password.lib.php:41
 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63
 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:352 server_privileges.php:797
 #: server_privileges.php:801 server_privileges.php:812
 #: server_privileges.php:1555 server_synchronize.php:1175
+=======
+#: libraries/replication_gui.lib.php:352 server_privileges.php:796
+#: server_privileges.php:800 server_privileges.php:811
+#: server_privileges.php:1538 server_synchronize.php:1175
+>>>>>>> origin/master
 msgid "Password"
 msgstr "Lösenord"
 
 #: libraries/display_change_password.lib.php:46
 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359
+<<<<<<< HEAD
 #: server_privileges.php:816 server_privileges.php:819
+=======
+#: server_privileges.php:815 server_privileges.php:818
+>>>>>>> origin/master
 msgid "Re-type"
 msgstr "Skriv igen"
 
@@ -2122,12 +2260,20 @@ msgid "MySQL 4.0 compatible"
 msgstr "Kompatibel med MySQL&nbsp;4.0"
 
 #: libraries/display_change_password.lib.php:72
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:363 server_privileges.php:823
+=======
+#: libraries/replication_gui.lib.php:363 server_privileges.php:822
+>>>>>>> origin/master
 msgid "Generate Password"
 msgstr "Generera lösenord"
 
 #: libraries/display_change_password.lib.php:75
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:366 server_privileges.php:826
+=======
+#: libraries/replication_gui.lib.php:366 server_privileges.php:825
+>>>>>>> origin/master
 msgid "Generate"
 msgstr "Generera"
 
@@ -2215,7 +2361,11 @@ msgid "remember template"
 msgstr "kom ihåg mall"
 
 #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552
+=======
+#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549
+>>>>>>> origin/master
 msgid "Character set of the file:"
 msgstr "Filens teckenuppsättning:"
 
@@ -2273,7 +2423,11 @@ msgstr ""
 msgid "File to import"
 msgstr "Fil att importera"
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527
+=======
+#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524
+>>>>>>> origin/master
 msgid "Location of the text file"
 msgstr "Textfilens plats"
 
@@ -2281,12 +2435,20 @@ msgstr "Textfilens plats"
 msgid "File uploads are not allowed on this server."
 msgstr "Filuppladdningar är inte tillåtna på denna server."
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536
+=======
+#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533
+>>>>>>> origin/master
 #: tbl_change.php:1025
 msgid "The directory you set for upload work cannot be reached"
 msgstr "Katalogen som du konfigurerat för uppladdning kan inte nås"
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539
+=======
+#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536
+>>>>>>> origin/master
 #: tbl_change.php:1028
 msgid "web server upload directory"
 msgstr "Uppladdningskatalog på webbserver"
@@ -2422,7 +2584,11 @@ msgstr "Sortera efter nyckel"
 #: libraries/import/docsql.php:34 libraries/import/ldi.php:47
 #: libraries/import/ods.php:30 libraries/import/sql.php:20
 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26
+<<<<<<< HEAD
 #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751
+=======
+#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753
+>>>>>>> origin/master
 msgid "Options"
 msgstr "Alternativ"
 
@@ -2570,7 +2736,11 @@ msgstr "Buffertanvändning"
 
 #: libraries/engines/innodb.lib.php:194 server_databases.php:137
 #: server_databases.php:305 server_status.php:525 server_status.php:586
+<<<<<<< HEAD
 #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694
+=======
+#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696
+>>>>>>> origin/master
 msgid "Total"
 msgstr "Totalt"
 
@@ -2854,7 +3024,11 @@ msgstr ""
 "bort. Annars döps de om och ges det näst högsta numret."
 
 #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88
+<<<<<<< HEAD
 #: tbl_printview.php:375 tbl_structure.php:735
+=======
+#: tbl_printview.php:375 tbl_structure.php:737
+>>>>>>> origin/master
 msgid "Format"
 msgstr "Format"
 
@@ -2928,8 +3102,13 @@ msgstr "Microsoft Word 2000"
 #: libraries/export/latex.php:201 libraries/export/odt.php:48
 #: libraries/export/sql.php:106 libraries/export/sql.php:868
 #: libraries/export/texytext.php:27 server_databases.php:127
+<<<<<<< HEAD
 #: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316
 #: tbl_structure.php:663
+=======
+#: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316
+#: tbl_structure.php:665
+>>>>>>> origin/master
 msgid "Data"
 msgstr "Data"
 
@@ -2978,9 +3157,15 @@ msgstr "MIME-typ"
 #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57
 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177
 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:332 server_privileges.php:732
 #: server_privileges.php:735 server_privileges.php:791
 #: server_privileges.php:1554 server_privileges.php:2092
+=======
+#: libraries/replication_gui.lib.php:332 server_privileges.php:731
+#: server_privileges.php:734 server_privileges.php:790
+#: server_privileges.php:1537 server_privileges.php:2069
+>>>>>>> origin/master
 #: server_processlist.php:55 server_synchronize.php:1159
 msgid "Host"
 msgstr "Värd"
@@ -3655,8 +3840,13 @@ msgstr ""
 
 #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59
 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:262 server_privileges.php:712
 #: server_privileges.php:715 server_privileges.php:722
+=======
+#: libraries/replication_gui.lib.php:262 server_privileges.php:711
+#: server_privileges.php:714 server_privileges.php:721
+>>>>>>> origin/master
 #: server_synchronize.php:1171
 msgid "User name"
 msgstr "Användarnamn"
@@ -3674,14 +3864,22 @@ msgstr "Master-status"
 msgid "Slave status"
 msgstr "Slave-status"
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448
+=======
+#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445
+>>>>>>> origin/master
 #: server_status.php:737 server_variables.php:52
 msgid "Variable"
 msgstr "Variabel"
 
 #: libraries/replication_gui.lib.php:118 server_status.php:738
 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138
+<<<<<<< HEAD
 #: tbl_structure.php:727
+=======
+#: tbl_structure.php:729
+>>>>>>> origin/master
 msgid "Value"
 msgstr "Värde"
 
@@ -3699,11 +3897,16 @@ msgstr ""
 msgid "Add slave replication user"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:257 server_privileges.php:717
+=======
+#: libraries/replication_gui.lib.php:257 server_privileges.php:716
+>>>>>>> origin/master
 msgid "Any user"
 msgstr "Vilken användare som helst"
 
 #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:349 server_privileges.php:718
 #: server_privileges.php:785 server_privileges.php:809
 #: server_privileges.php:1950 server_privileges.php:1980
@@ -3727,6 +3930,31 @@ msgid "Use Host Table"
 msgstr "Använd värdtabell"
 
 #: libraries/replication_gui.lib.php:334 server_privileges.php:793
+=======
+#: libraries/replication_gui.lib.php:349 server_privileges.php:717
+#: server_privileges.php:784 server_privileges.php:808
+#: server_privileges.php:1928 server_privileges.php:1958
+msgid "Use text field"
+msgstr "Använd textfältet"
+
+#: libraries/replication_gui.lib.php:305 server_privileges.php:764
+msgid "Any host"
+msgstr "Vilken värd som helst"
+
+#: libraries/replication_gui.lib.php:309 server_privileges.php:768
+msgid "Local"
+msgstr "Lokal"
+
+#: libraries/replication_gui.lib.php:315 server_privileges.php:773
+msgid "This Host"
+msgstr "Denna värd"
+
+#: libraries/replication_gui.lib.php:321 server_privileges.php:779
+msgid "Use Host Table"
+msgstr "Använd värdtabell"
+
+#: libraries/replication_gui.lib.php:334 server_privileges.php:792
+>>>>>>> origin/master
 msgid ""
 "When Host table is used, this field is ignored and values stored in Host "
 "table are used instead."
@@ -8138,10 +8366,13 @@ msgstr ""
 msgid "Show insert query"
 msgstr "Visar SQL-fråga"
 
+<<<<<<< HEAD
 #: tbl_change.php:1140
 msgid "and then"
 msgstr "och sedan"
 
+=======
+>>>>>>> origin/master
 #: tbl_change.php:1144
 msgid "Go back to previous page"
 msgstr "Gå tillbaka till föregående sida"
@@ -8338,6 +8569,7 @@ msgstr "Kontrollera referensintegritet:"
 msgid "Show tables"
 msgstr "Visa tabeller"
 
+<<<<<<< HEAD
 #: tbl_printview.php:309 tbl_structure.php:654
 msgid "Space usage"
 msgstr "Utrymmesanvändning"
@@ -8371,6 +8603,41 @@ msgid "Row length"
 msgstr "Radlängd"
 
 #: tbl_printview.php:413 tbl_structure.php:791
+=======
+#: tbl_printview.php:309 tbl_structure.php:656
+msgid "Space usage"
+msgstr "Utrymmesanvändning"
+
+#: tbl_printview.php:313 tbl_structure.php:660
+msgid "Usage"
+msgstr "Användning"
+
+#: tbl_printview.php:340 tbl_structure.php:687
+msgid "Effective"
+msgstr "Effektivt"
+
+#: tbl_printview.php:365 tbl_structure.php:725
+msgid "Row Statistics"
+msgstr "Radstatistik"
+
+#: tbl_printview.php:368 tbl_structure.php:728
+msgid "Statements"
+msgstr "Uppgift"
+
+#: tbl_printview.php:379 tbl_structure.php:740
+msgid "static"
+msgstr "statisk"
+
+#: tbl_printview.php:381 tbl_structure.php:742
+msgid "dynamic"
+msgstr "dynamisk"
+
+#: tbl_printview.php:403 tbl_structure.php:785
+msgid "Row length"
+msgstr "Radlängd"
+
+#: tbl_printview.php:413 tbl_structure.php:793
+>>>>>>> origin/master
 msgid " Row size "
 msgstr "Radstorlek"
 
diff --git a/po/ta.po b/po/ta.po
index 106ce11d7..dd4987dfc 100755
--- a/po/ta.po
+++ b/po/ta.po
@@ -6,7 +6,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2010-07-03 21:45+0530\n"
+=======
+"POT-Creation-Date: 2010-07-03 09:00-0400\n"
+>>>>>>> origin/master
 "PO-Revision-Date: 2010-04-16 10:43+0200\n"
 "Last-Translator: Sutharshan <sutharshan02@gmail.com>\n"
 "Language-Team: Tamil <ta@li.org>\n"
@@ -49,15 +53,26 @@ msgstr ""
 #: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046
 #: libraries/Theme_Manager.class.php:311
 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719
+<<<<<<< HEAD
 #: libraries/common.lib.php:1344 libraries/common.lib.php:2301
 #: libraries/display_change_password.lib.php:82
 #: libraries/display_create_table.lib.php:62
+=======
+#: libraries/common.lib.php:1335 libraries/common.lib.php:2288
+#: libraries/display_change_password.lib.php:82
+#: libraries/display_create_table.lib.php:63
+>>>>>>> origin/master
 #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532
 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76
 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104
+<<<<<<< HEAD
 #: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480
 #: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782
+=======
+#: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477
+#: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782
+>>>>>>> origin/master
 #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328
 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142
 #: server_privileges.php:665 server_privileges.php:1641
@@ -67,8 +82,13 @@ msgstr ""
 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171
 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265
 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561
+<<<<<<< HEAD
 #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560
 #: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512
+=======
+#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562
+#: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512
+>>>>>>> origin/master
 #: view_create.php:182 view_operations.php:101
 msgid "Go"
 msgstr ""
@@ -119,10 +139,17 @@ msgstr ""
 #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245
 #: libraries/export/latex.php:360 libraries/export/odt.php:297
 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100
+<<<<<<< HEAD
 #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093
 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
 #: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321
+=======
+#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070
+#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
+#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
+#: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321
+>>>>>>> origin/master
 msgid "Type"
 msgstr ""
 
@@ -163,9 +190,15 @@ msgstr ""
 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322
 #: libraries/export/latex.php:430 libraries/export/odt.php:368
 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263
+<<<<<<< HEAD
 #: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596
 #: server_privileges.php:1911 server_privileges.php:1916
 #: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228
+=======
+#: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579
+#: server_privileges.php:1889 server_privileges.php:1894
+#: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228
+>>>>>>> origin/master
 #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342
 msgid "No"
 msgstr ""
@@ -179,9 +212,15 @@ msgstr ""
 #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106
 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262
 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344
+<<<<<<< HEAD
 #: server_databases.php:64 server_privileges.php:1582
 #: server_privileges.php:1596 server_privileges.php:1911
 #: server_privileges.php:1914 server_privileges.php:2210 sql.php:193
+=======
+#: server_databases.php:64 server_privileges.php:1565
+#: server_privileges.php:1579 server_privileges.php:1889
+#: server_privileges.php:1892 server_privileges.php:2187 sql.php:193
+>>>>>>> origin/master
 #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350
 #: tbl_tracking.php:335 tbl_tracking.php:340
 msgid "Yes"
@@ -230,7 +269,15 @@ msgstr ""
 msgid "Command"
 msgstr ""
 
+<<<<<<< HEAD
 #: db_operations.php:466
+=======
+#: db_operations.php:429 tbl_change.php:1140
+msgid "and then"
+msgstr ""
+
+#: db_operations.php:455
+>>>>>>> origin/master
 msgid "Copy database to"
 msgstr ""
 
@@ -312,7 +359,11 @@ msgstr ""
 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730
 #: server_collations.php:54 server_collations.php:66 server_databases.php:111
 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179
+<<<<<<< HEAD
 #: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326
+=======
+#: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326
+>>>>>>> origin/master
 msgid "Collation"
 msgstr ""
 
@@ -339,7 +390,11 @@ msgstr ""
 #: db_printview.php:105 libraries/db_structure.lib.php:56
 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146
 #: navigation.php:638 navigation.php:660 server_databases.php:122
+<<<<<<< HEAD
 #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775
+=======
+#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777
+>>>>>>> origin/master
 msgid "Rows"
 msgstr ""
 
@@ -354,19 +409,31 @@ msgstr ""
 
 #: db_printview.php:187 libraries/db_info.inc.php:88
 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433
+<<<<<<< HEAD
 #: tbl_structure.php:807
+=======
+#: tbl_structure.php:809
+>>>>>>> origin/master
 msgid "Creation"
 msgstr ""
 
 #: db_printview.php:196 libraries/db_info.inc.php:93
 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443
+<<<<<<< HEAD
 #: tbl_structure.php:815
+=======
+#: tbl_structure.php:817
+>>>>>>> origin/master
 msgid "Last update"
 msgstr ""
 
 #: db_printview.php:205 libraries/db_info.inc.php:98
 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453
+<<<<<<< HEAD
 #: tbl_structure.php:823
+=======
+#: tbl_structure.php:825
+>>>>>>> origin/master
 msgid "Last check"
 msgstr ""
 
@@ -430,7 +497,11 @@ msgstr ""
 
 #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553
 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779
+<<<<<<< HEAD
 #: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250
+=======
+#: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250
+>>>>>>> origin/master
 #: tbl_select.php:286
 msgid "Or"
 msgstr ""
@@ -646,9 +717,15 @@ msgstr ""
 msgid "Check All"
 msgstr ""
 
+<<<<<<< HEAD
 #: db_structure.php:529 libraries/display_tbl.lib.php:2077
 #: libraries/replication_gui.lib.php:36 server_databases.php:350
 #: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460
+=======
+#: db_structure.php:531 libraries/display_tbl.lib.php:2077
+#: libraries/replication_gui.lib.php:36 server_databases.php:350
+#: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462
+>>>>>>> origin/master
 msgid "Uncheck All"
 msgstr ""
 
@@ -1072,10 +1149,17 @@ msgid "Prev"
 msgstr ""
 
 #. l10n: Display text for next month link in calendar
+<<<<<<< HEAD
 #: js/messages.php:106 libraries/common.lib.php:2366
 #: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338
 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
 #: tbl_structure.php:799
+=======
+#: js/messages.php:77 libraries/common.lib.php:2353
+#: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338
+#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
+#: tbl_structure.php:801
+>>>>>>> origin/master
 msgid "Next"
 msgstr ""
 
@@ -1606,7 +1690,11 @@ msgstr ""
 msgid "Server Choice"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63
+=======
+#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59
+>>>>>>> origin/master
 msgid "Cookies must be enabled past this point."
 msgstr ""
 
@@ -1681,7 +1769,11 @@ msgid ""
 "necessary extensions appear to be loaded. Check your PHP configuration."
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:580
+=======
+#: libraries/common.inc.php:576
+>>>>>>> origin/master
 msgid ""
 "phpMyAdmin was unable to read your configuration file!<br />This might "
 "happen if PHP finds a parse error in it or PHP cannot find the file.<br /"
@@ -1691,38 +1783,66 @@ msgid ""
 "is fine."
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:591
+=======
+#: libraries/common.inc.php:587
+>>>>>>> origin/master
 #, php-format
 msgid "Could not load default configuration from: %1$s"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:596
+=======
+#: libraries/common.inc.php:592
+>>>>>>> origin/master
 msgid ""
 "The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
 "configuration file!"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:626
+=======
+#: libraries/common.inc.php:622
+>>>>>>> origin/master
 #, php-format
 msgid "Invalid server index: %s"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:633
+=======
+#: libraries/common.inc.php:629
+>>>>>>> origin/master
 #, php-format
 msgid "Invalid hostname for server %1$s. Please review your configuration."
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:642 libraries/header.inc.php:100
+=======
+#: libraries/common.inc.php:638 libraries/header.inc.php:96
+>>>>>>> origin/master
 #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47
 #: main.php:185 test/theme.php:57
 msgid "Server"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:820
 msgid "Invalid authentication method set in configuration:"
 msgstr ""
 
 #: libraries/common.inc.php:923
+=======
+#: libraries/common.inc.php:816
+msgid "Invalid authentication method set in configuration:"
+msgstr ""
+
+#: libraries/common.inc.php:919
+>>>>>>> origin/master
 #, php-format
 msgid "You should upgrade to %s %s or later."
 msgstr ""
@@ -1965,7 +2085,11 @@ msgid ""
 msgstr ""
 
 #: libraries/db_structure.lib.php:69 server_databases.php:142
+<<<<<<< HEAD
 #: tbl_printview.php:335 tbl_structure.php:680
+=======
+#: tbl_printview.php:335 tbl_structure.php:682
+>>>>>>> origin/master
 msgid "Overhead"
 msgstr ""
 
@@ -1992,22 +2116,36 @@ msgid "Change password"
 msgstr ""
 
 #: libraries/display_change_password.lib.php:35
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:348 server_privileges.php:808
+=======
+#: libraries/replication_gui.lib.php:348 server_privileges.php:807
+>>>>>>> origin/master
 msgid "No Password"
 msgstr ""
 
 #: libraries/display_change_password.lib.php:41
 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63
 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:352 server_privileges.php:797
 #: server_privileges.php:801 server_privileges.php:812
 #: server_privileges.php:1555 server_synchronize.php:1175
+=======
+#: libraries/replication_gui.lib.php:352 server_privileges.php:796
+#: server_privileges.php:800 server_privileges.php:811
+#: server_privileges.php:1538 server_synchronize.php:1175
+>>>>>>> origin/master
 msgid "Password"
 msgstr ""
 
 #: libraries/display_change_password.lib.php:46
 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359
+<<<<<<< HEAD
 #: server_privileges.php:816 server_privileges.php:819
+=======
+#: server_privileges.php:815 server_privileges.php:818
+>>>>>>> origin/master
 msgid "Re-type"
 msgstr ""
 
@@ -2020,12 +2158,20 @@ msgid "MySQL 4.0 compatible"
 msgstr ""
 
 #: libraries/display_change_password.lib.php:72
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:363 server_privileges.php:823
+=======
+#: libraries/replication_gui.lib.php:363 server_privileges.php:822
+>>>>>>> origin/master
 msgid "Generate Password"
 msgstr ""
 
 #: libraries/display_change_password.lib.php:75
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:366 server_privileges.php:826
+=======
+#: libraries/replication_gui.lib.php:366 server_privileges.php:825
+>>>>>>> origin/master
 msgid "Generate"
 msgstr ""
 
@@ -2107,7 +2253,11 @@ msgid "remember template"
 msgstr ""
 
 #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552
+=======
+#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549
+>>>>>>> origin/master
 msgid "Character set of the file:"
 msgstr ""
 
@@ -2160,7 +2310,11 @@ msgstr ""
 msgid "File to import"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527
+=======
+#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524
+>>>>>>> origin/master
 msgid "Location of the text file"
 msgstr ""
 
@@ -2168,12 +2322,20 @@ msgstr ""
 msgid "File uploads are not allowed on this server."
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536
+=======
+#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533
+>>>>>>> origin/master
 #: tbl_change.php:1025
 msgid "The directory you set for upload work cannot be reached"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539
+=======
+#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536
+>>>>>>> origin/master
 #: tbl_change.php:1028
 msgid "web server upload directory"
 msgstr ""
@@ -2300,7 +2462,11 @@ msgstr ""
 #: libraries/import/docsql.php:34 libraries/import/ldi.php:47
 #: libraries/import/ods.php:30 libraries/import/sql.php:20
 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26
+<<<<<<< HEAD
 #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751
+=======
+#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753
+>>>>>>> origin/master
 msgid "Options"
 msgstr ""
 
@@ -2441,7 +2607,11 @@ msgstr ""
 
 #: libraries/engines/innodb.lib.php:194 server_databases.php:137
 #: server_databases.php:305 server_status.php:525 server_status.php:586
+<<<<<<< HEAD
 #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694
+=======
+#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696
+>>>>>>> origin/master
 msgid "Total"
 msgstr ""
 
@@ -2686,7 +2856,11 @@ msgid ""
 msgstr ""
 
 #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88
+<<<<<<< HEAD
 #: tbl_printview.php:375 tbl_structure.php:735
+=======
+#: tbl_printview.php:375 tbl_structure.php:737
+>>>>>>> origin/master
 msgid "Format"
 msgstr ""
 
@@ -2750,8 +2924,13 @@ msgstr ""
 #: libraries/export/latex.php:201 libraries/export/odt.php:48
 #: libraries/export/sql.php:106 libraries/export/sql.php:868
 #: libraries/export/texytext.php:27 server_databases.php:127
+<<<<<<< HEAD
 #: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316
 #: tbl_structure.php:663
+=======
+#: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316
+#: tbl_structure.php:665
+>>>>>>> origin/master
 msgid "Data"
 msgstr ""
 
@@ -2800,9 +2979,15 @@ msgstr ""
 #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57
 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177
 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:332 server_privileges.php:732
 #: server_privileges.php:735 server_privileges.php:791
 #: server_privileges.php:1554 server_privileges.php:2092
+=======
+#: libraries/replication_gui.lib.php:332 server_privileges.php:731
+#: server_privileges.php:734 server_privileges.php:790
+#: server_privileges.php:1537 server_privileges.php:2069
+>>>>>>> origin/master
 #: server_processlist.php:55 server_synchronize.php:1159
 msgid "Host"
 msgstr ""
@@ -3460,8 +3645,13 @@ msgstr ""
 
 #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59
 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:262 server_privileges.php:712
 #: server_privileges.php:715 server_privileges.php:722
+=======
+#: libraries/replication_gui.lib.php:262 server_privileges.php:711
+#: server_privileges.php:714 server_privileges.php:721
+>>>>>>> origin/master
 #: server_synchronize.php:1171
 msgid "User name"
 msgstr ""
@@ -3478,14 +3668,22 @@ msgstr ""
 msgid "Slave status"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448
+=======
+#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445
+>>>>>>> origin/master
 #: server_status.php:737 server_variables.php:52
 msgid "Variable"
 msgstr ""
 
 #: libraries/replication_gui.lib.php:118 server_status.php:738
 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138
+<<<<<<< HEAD
 #: tbl_structure.php:727
+=======
+#: tbl_structure.php:729
+>>>>>>> origin/master
 msgid "Value"
 msgstr ""
 
@@ -3503,11 +3701,16 @@ msgstr ""
 msgid "Add slave replication user"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:257 server_privileges.php:717
+=======
+#: libraries/replication_gui.lib.php:257 server_privileges.php:716
+>>>>>>> origin/master
 msgid "Any user"
 msgstr ""
 
 #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:349 server_privileges.php:718
 #: server_privileges.php:785 server_privileges.php:809
 #: server_privileges.php:1950 server_privileges.php:1980
@@ -3531,6 +3734,31 @@ msgid "Use Host Table"
 msgstr ""
 
 #: libraries/replication_gui.lib.php:334 server_privileges.php:793
+=======
+#: libraries/replication_gui.lib.php:349 server_privileges.php:717
+#: server_privileges.php:784 server_privileges.php:808
+#: server_privileges.php:1928 server_privileges.php:1958
+msgid "Use text field"
+msgstr ""
+
+#: libraries/replication_gui.lib.php:305 server_privileges.php:764
+msgid "Any host"
+msgstr ""
+
+#: libraries/replication_gui.lib.php:309 server_privileges.php:768
+msgid "Local"
+msgstr ""
+
+#: libraries/replication_gui.lib.php:315 server_privileges.php:773
+msgid "This Host"
+msgstr ""
+
+#: libraries/replication_gui.lib.php:321 server_privileges.php:779
+msgid "Use Host Table"
+msgstr ""
+
+#: libraries/replication_gui.lib.php:334 server_privileges.php:792
+>>>>>>> origin/master
 msgid ""
 "When Host table is used, this field is ignored and values stored in Host "
 "table are used instead."
@@ -7391,10 +7619,13 @@ msgstr ""
 msgid "Show insert query"
 msgstr ""
 
+<<<<<<< HEAD
 #: tbl_change.php:1140
 msgid "and then"
 msgstr ""
 
+=======
+>>>>>>> origin/master
 #: tbl_change.php:1144
 msgid "Go back to previous page"
 msgstr ""
@@ -7585,6 +7816,7 @@ msgstr ""
 msgid "Show tables"
 msgstr ""
 
+<<<<<<< HEAD
 #: tbl_printview.php:309 tbl_structure.php:654
 msgid "Space usage"
 msgstr ""
@@ -7618,6 +7850,41 @@ msgid "Row length"
 msgstr ""
 
 #: tbl_printview.php:413 tbl_structure.php:791
+=======
+#: tbl_printview.php:309 tbl_structure.php:656
+msgid "Space usage"
+msgstr ""
+
+#: tbl_printview.php:313 tbl_structure.php:660
+msgid "Usage"
+msgstr ""
+
+#: tbl_printview.php:340 tbl_structure.php:687
+msgid "Effective"
+msgstr ""
+
+#: tbl_printview.php:365 tbl_structure.php:725
+msgid "Row Statistics"
+msgstr ""
+
+#: tbl_printview.php:368 tbl_structure.php:728
+msgid "Statements"
+msgstr ""
+
+#: tbl_printview.php:379 tbl_structure.php:740
+msgid "static"
+msgstr ""
+
+#: tbl_printview.php:381 tbl_structure.php:742
+msgid "dynamic"
+msgstr ""
+
+#: tbl_printview.php:403 tbl_structure.php:785
+msgid "Row length"
+msgstr ""
+
+#: tbl_printview.php:413 tbl_structure.php:793
+>>>>>>> origin/master
 msgid " Row size "
 msgstr ""
 
diff --git a/po/te.po b/po/te.po
index 47383713c..787246953 100755
--- a/po/te.po
+++ b/po/te.po
@@ -6,7 +6,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2010-07-03 21:45+0530\n"
+=======
+"POT-Creation-Date: 2010-07-03 09:00-0400\n"
+>>>>>>> origin/master
 "PO-Revision-Date: 2010-05-26 14:20+0200\n"
 "Last-Translator:  <veeven@gmail.com>\n"
 "Language-Team: Telugu <te@li.org>\n"
@@ -50,15 +54,26 @@ msgstr "శోధించు"
 #: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046
 #: libraries/Theme_Manager.class.php:311
 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719
+<<<<<<< HEAD
 #: libraries/common.lib.php:1344 libraries/common.lib.php:2301
 #: libraries/display_change_password.lib.php:82
 #: libraries/display_create_table.lib.php:62
+=======
+#: libraries/common.lib.php:1335 libraries/common.lib.php:2288
+#: libraries/display_change_password.lib.php:82
+#: libraries/display_create_table.lib.php:63
+>>>>>>> origin/master
 #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532
 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76
 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104
+<<<<<<< HEAD
 #: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480
 #: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782
+=======
+#: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477
+#: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782
+>>>>>>> origin/master
 #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328
 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142
 #: server_privileges.php:665 server_privileges.php:1641
@@ -68,8 +83,13 @@ msgstr "శోధించు"
 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171
 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265
 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561
+<<<<<<< HEAD
 #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560
 #: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512
+=======
+#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562
+#: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512
+>>>>>>> origin/master
 #: view_create.php:182 view_operations.php:101
 msgid "Go"
 msgstr "వెళ్ళు"
@@ -123,10 +143,17 @@ msgstr "ఆజ్ఞ"
 #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245
 #: libraries/export/latex.php:360 libraries/export/odt.php:297
 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100
+<<<<<<< HEAD
 #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093
 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
 #: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321
+=======
+#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070
+#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
+#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
+#: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321
+>>>>>>> origin/master
 msgid "Type"
 msgstr "రకం"
 
@@ -167,9 +194,15 @@ msgstr "వ్యాఖ్యలు"
 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322
 #: libraries/export/latex.php:430 libraries/export/odt.php:368
 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263
+<<<<<<< HEAD
 #: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596
 #: server_privileges.php:1911 server_privileges.php:1916
 #: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228
+=======
+#: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579
+#: server_privileges.php:1889 server_privileges.php:1894
+#: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228
+>>>>>>> origin/master
 #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342
 msgid "No"
 msgstr "కాదు"
@@ -183,9 +216,15 @@ msgstr "కాదు"
 #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106
 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262
 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344
+<<<<<<< HEAD
 #: server_databases.php:64 server_privileges.php:1582
 #: server_privileges.php:1596 server_privileges.php:1911
 #: server_privileges.php:1914 server_privileges.php:2210 sql.php:193
+=======
+#: server_databases.php:64 server_privileges.php:1565
+#: server_privileges.php:1579 server_privileges.php:1889
+#: server_privileges.php:1892 server_privileges.php:2187 sql.php:193
+>>>>>>> origin/master
 #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350
 #: tbl_tracking.php:335 tbl_tracking.php:340
 msgid "Yes"
@@ -236,7 +275,16 @@ msgstr ""
 msgid "Command"
 msgstr "ఆజ్ఞ"
 
+<<<<<<< HEAD
 #: db_operations.php:466
+=======
+# మొదటి అనువాదము
+#: db_operations.php:429 tbl_change.php:1140
+msgid "and then"
+msgstr "మరియు తరువాత"
+
+#: db_operations.php:455
+>>>>>>> origin/master
 msgid "Copy database to"
 msgstr ""
 
@@ -320,7 +368,11 @@ msgstr ""
 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730
 #: server_collations.php:54 server_collations.php:66 server_databases.php:111
 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179
+<<<<<<< HEAD
 #: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326
+=======
+#: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326
+>>>>>>> origin/master
 msgid "Collation"
 msgstr ""
 
@@ -347,7 +399,11 @@ msgstr "పట్టిక"
 #: db_printview.php:105 libraries/db_structure.lib.php:56
 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146
 #: navigation.php:638 navigation.php:660 server_databases.php:122
+<<<<<<< HEAD
 #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775
+=======
+#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777
+>>>>>>> origin/master
 msgid "Rows"
 msgstr ""
 
@@ -363,19 +419,31 @@ msgstr "వాడుకలో ఉన్నది"
 
 #: db_printview.php:187 libraries/db_info.inc.php:88
 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433
+<<<<<<< HEAD
 #: tbl_structure.php:807
+=======
+#: tbl_structure.php:809
+>>>>>>> origin/master
 msgid "Creation"
 msgstr ""
 
 #: db_printview.php:196 libraries/db_info.inc.php:93
 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443
+<<<<<<< HEAD
 #: tbl_structure.php:815
+=======
+#: tbl_structure.php:817
+>>>>>>> origin/master
 msgid "Last update"
 msgstr ""
 
 #: db_printview.php:205 libraries/db_info.inc.php:98
 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453
+<<<<<<< HEAD
 #: tbl_structure.php:823
+=======
+#: tbl_structure.php:825
+>>>>>>> origin/master
 msgid "Last check"
 msgstr ""
 
@@ -442,7 +510,11 @@ msgstr ""
 # మొదటి అనువాదము
 #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553
 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779
+<<<<<<< HEAD
 #: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250
+=======
+#: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250
+>>>>>>> origin/master
 #: tbl_select.php:286
 msgid "Or"
 msgstr "లేదా"
@@ -658,9 +730,15 @@ msgstr ""
 msgid "Check All"
 msgstr ""
 
+<<<<<<< HEAD
 #: db_structure.php:529 libraries/display_tbl.lib.php:2077
 #: libraries/replication_gui.lib.php:36 server_databases.php:350
 #: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460
+=======
+#: db_structure.php:531 libraries/display_tbl.lib.php:2077
+#: libraries/replication_gui.lib.php:36 server_databases.php:350
+#: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462
+>>>>>>> origin/master
 msgid "Uncheck All"
 msgstr ""
 
@@ -1113,10 +1191,17 @@ msgstr "క్రితము"
 
 # మొదటి అనువాదము
 #. l10n: Display text for next month link in calendar
+<<<<<<< HEAD
 #: js/messages.php:106 libraries/common.lib.php:2366
 #: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338
 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
 #: tbl_structure.php:799
+=======
+#: js/messages.php:77 libraries/common.lib.php:2353
+#: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338
+#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
+#: tbl_structure.php:801
+>>>>>>> origin/master
 msgid "Next"
 msgstr "తదుపరి"
 
@@ -1653,7 +1738,11 @@ msgstr "సంకేతపదం:"
 msgid "Server Choice"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63
+=======
+#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59
+>>>>>>> origin/master
 msgid "Cookies must be enabled past this point."
 msgstr ""
 
@@ -1730,7 +1819,11 @@ msgid ""
 "necessary extensions appear to be loaded. Check your PHP configuration."
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:580
+=======
+#: libraries/common.inc.php:576
+>>>>>>> origin/master
 msgid ""
 "phpMyAdmin was unable to read your configuration file!<br />This might "
 "happen if PHP finds a parse error in it or PHP cannot find the file.<br /"
@@ -1740,38 +1833,66 @@ msgid ""
 "is fine."
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:591
+=======
+#: libraries/common.inc.php:587
+>>>>>>> origin/master
 #, php-format
 msgid "Could not load default configuration from: %1$s"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:596
+=======
+#: libraries/common.inc.php:592
+>>>>>>> origin/master
 msgid ""
 "The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
 "configuration file!"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:626
+=======
+#: libraries/common.inc.php:622
+>>>>>>> origin/master
 #, php-format
 msgid "Invalid server index: %s"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:633
+=======
+#: libraries/common.inc.php:629
+>>>>>>> origin/master
 #, php-format
 msgid "Invalid hostname for server %1$s. Please review your configuration."
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:642 libraries/header.inc.php:100
+=======
+#: libraries/common.inc.php:638 libraries/header.inc.php:96
+>>>>>>> origin/master
 #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47
 #: main.php:185 test/theme.php:57
 msgid "Server"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:820
 msgid "Invalid authentication method set in configuration:"
 msgstr ""
 
 #: libraries/common.inc.php:923
+=======
+#: libraries/common.inc.php:816
+msgid "Invalid authentication method set in configuration:"
+msgstr ""
+
+#: libraries/common.inc.php:919
+>>>>>>> origin/master
 #, php-format
 msgid "You should upgrade to %s %s or later."
 msgstr ""
@@ -2016,7 +2137,11 @@ msgid ""
 msgstr ""
 
 #: libraries/db_structure.lib.php:69 server_databases.php:142
+<<<<<<< HEAD
 #: tbl_printview.php:335 tbl_structure.php:680
+=======
+#: tbl_printview.php:335 tbl_structure.php:682
+>>>>>>> origin/master
 msgid "Overhead"
 msgstr ""
 
@@ -2043,22 +2168,36 @@ msgid "Change password"
 msgstr ""
 
 #: libraries/display_change_password.lib.php:35
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:348 server_privileges.php:808
+=======
+#: libraries/replication_gui.lib.php:348 server_privileges.php:807
+>>>>>>> origin/master
 msgid "No Password"
 msgstr "సంకేతపదం లేదు"
 
 #: libraries/display_change_password.lib.php:41
 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63
 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:352 server_privileges.php:797
 #: server_privileges.php:801 server_privileges.php:812
 #: server_privileges.php:1555 server_synchronize.php:1175
+=======
+#: libraries/replication_gui.lib.php:352 server_privileges.php:796
+#: server_privileges.php:800 server_privileges.php:811
+#: server_privileges.php:1538 server_synchronize.php:1175
+>>>>>>> origin/master
 msgid "Password"
 msgstr "సంకేతపదం"
 
 #: libraries/display_change_password.lib.php:46
 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359
+<<<<<<< HEAD
 #: server_privileges.php:816 server_privileges.php:819
+=======
+#: server_privileges.php:815 server_privileges.php:818
+>>>>>>> origin/master
 msgid "Re-type"
 msgstr ""
 
@@ -2071,12 +2210,20 @@ msgid "MySQL 4.0 compatible"
 msgstr ""
 
 #: libraries/display_change_password.lib.php:72
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:363 server_privileges.php:823
+=======
+#: libraries/replication_gui.lib.php:363 server_privileges.php:822
+>>>>>>> origin/master
 msgid "Generate Password"
 msgstr ""
 
 #: libraries/display_change_password.lib.php:75
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:366 server_privileges.php:826
+=======
+#: libraries/replication_gui.lib.php:366 server_privileges.php:825
+>>>>>>> origin/master
 msgid "Generate"
 msgstr ""
 
@@ -2159,7 +2306,11 @@ msgid "remember template"
 msgstr ""
 
 #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552
+=======
+#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549
+>>>>>>> origin/master
 msgid "Character set of the file:"
 msgstr ""
 
@@ -2212,7 +2363,11 @@ msgstr ""
 msgid "File to import"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527
+=======
+#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524
+>>>>>>> origin/master
 msgid "Location of the text file"
 msgstr "పాఠ్యపు దస్త్రం యొక్క ప్రాంతం"
 
@@ -2220,12 +2375,20 @@ msgstr "పాఠ్యపు దస్త్రం యొక్క ప్రా
 msgid "File uploads are not allowed on this server."
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536
+=======
+#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533
+>>>>>>> origin/master
 #: tbl_change.php:1025
 msgid "The directory you set for upload work cannot be reached"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539
+=======
+#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536
+>>>>>>> origin/master
 #: tbl_change.php:1028
 msgid "web server upload directory"
 msgstr ""
@@ -2352,7 +2515,11 @@ msgstr ""
 #: libraries/import/docsql.php:34 libraries/import/ldi.php:47
 #: libraries/import/ods.php:30 libraries/import/sql.php:20
 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26
+<<<<<<< HEAD
 #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751
+=======
+#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753
+>>>>>>> origin/master
 msgid "Options"
 msgstr ""
 
@@ -2495,7 +2662,11 @@ msgstr ""
 
 #: libraries/engines/innodb.lib.php:194 server_databases.php:137
 #: server_databases.php:305 server_status.php:525 server_status.php:586
+<<<<<<< HEAD
 #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694
+=======
+#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696
+>>>>>>> origin/master
 msgid "Total"
 msgstr "మొత్తం"
 
@@ -2742,7 +2913,11 @@ msgid ""
 msgstr ""
 
 #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88
+<<<<<<< HEAD
 #: tbl_printview.php:375 tbl_structure.php:735
+=======
+#: tbl_printview.php:375 tbl_structure.php:737
+>>>>>>> origin/master
 msgid "Format"
 msgstr ""
 
@@ -2806,8 +2981,13 @@ msgstr ""
 #: libraries/export/latex.php:201 libraries/export/odt.php:48
 #: libraries/export/sql.php:106 libraries/export/sql.php:868
 #: libraries/export/texytext.php:27 server_databases.php:127
+<<<<<<< HEAD
 #: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316
 #: tbl_structure.php:663
+=======
+#: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316
+#: tbl_structure.php:665
+>>>>>>> origin/master
 msgid "Data"
 msgstr ""
 
@@ -2856,9 +3036,15 @@ msgstr ""
 #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57
 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177
 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:332 server_privileges.php:732
 #: server_privileges.php:735 server_privileges.php:791
 #: server_privileges.php:1554 server_privileges.php:2092
+=======
+#: libraries/replication_gui.lib.php:332 server_privileges.php:731
+#: server_privileges.php:734 server_privileges.php:790
+#: server_privileges.php:1537 server_privileges.php:2069
+>>>>>>> origin/master
 #: server_processlist.php:55 server_synchronize.php:1159
 msgid "Host"
 msgstr ""
@@ -3531,8 +3717,13 @@ msgstr ""
 
 #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59
 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:262 server_privileges.php:712
 #: server_privileges.php:715 server_privileges.php:722
+=======
+#: libraries/replication_gui.lib.php:262 server_privileges.php:711
+#: server_privileges.php:714 server_privileges.php:721
+>>>>>>> origin/master
 #: server_synchronize.php:1171
 msgid "User name"
 msgstr "వాడుకరి పేరు"
@@ -3549,14 +3740,22 @@ msgstr ""
 msgid "Slave status"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448
+=======
+#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445
+>>>>>>> origin/master
 #: server_status.php:737 server_variables.php:52
 msgid "Variable"
 msgstr ""
 
 #: libraries/replication_gui.lib.php:118 server_status.php:738
 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138
+<<<<<<< HEAD
 #: tbl_structure.php:727
+=======
+#: tbl_structure.php:729
+>>>>>>> origin/master
 msgid "Value"
 msgstr "విలువ"
 
@@ -3575,11 +3774,16 @@ msgid "Add slave replication user"
 msgstr ""
 
 # మొదటి అనువాదము
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:257 server_privileges.php:717
+=======
+#: libraries/replication_gui.lib.php:257 server_privileges.php:716
+>>>>>>> origin/master
 msgid "Any user"
 msgstr "ఏ వాడుకరి ఐనను"
 
 #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:349 server_privileges.php:718
 #: server_privileges.php:785 server_privileges.php:809
 #: server_privileges.php:1950 server_privileges.php:1980
@@ -3603,6 +3807,31 @@ msgid "Use Host Table"
 msgstr ""
 
 #: libraries/replication_gui.lib.php:334 server_privileges.php:793
+=======
+#: libraries/replication_gui.lib.php:349 server_privileges.php:717
+#: server_privileges.php:784 server_privileges.php:808
+#: server_privileges.php:1928 server_privileges.php:1958
+msgid "Use text field"
+msgstr ""
+
+#: libraries/replication_gui.lib.php:305 server_privileges.php:764
+msgid "Any host"
+msgstr ""
+
+#: libraries/replication_gui.lib.php:309 server_privileges.php:768
+msgid "Local"
+msgstr "స్థానిక"
+
+#: libraries/replication_gui.lib.php:315 server_privileges.php:773
+msgid "This Host"
+msgstr ""
+
+#: libraries/replication_gui.lib.php:321 server_privileges.php:779
+msgid "Use Host Table"
+msgstr ""
+
+#: libraries/replication_gui.lib.php:334 server_privileges.php:792
+>>>>>>> origin/master
 msgid ""
 "When Host table is used, this field is ignored and values stored in Host "
 "table are used instead."
@@ -7502,11 +7731,14 @@ msgid "Show insert query"
 msgstr ""
 
 # మొదటి అనువాదము
+<<<<<<< HEAD
 #: tbl_change.php:1140
 msgid "and then"
 msgstr "మరియు తరువాత"
 
 # మొదటి అనువాదము
+=======
+>>>>>>> origin/master
 #: tbl_change.php:1144
 msgid "Go back to previous page"
 msgstr "మునుపటి పుటకు వెళ్ళు"
@@ -7699,6 +7931,7 @@ msgstr ""
 msgid "Show tables"
 msgstr ""
 
+<<<<<<< HEAD
 #: tbl_printview.php:309 tbl_structure.php:654
 msgid "Space usage"
 msgstr ""
@@ -7732,6 +7965,41 @@ msgid "Row length"
 msgstr ""
 
 #: tbl_printview.php:413 tbl_structure.php:791
+=======
+#: tbl_printview.php:309 tbl_structure.php:656
+msgid "Space usage"
+msgstr ""
+
+#: tbl_printview.php:313 tbl_structure.php:660
+msgid "Usage"
+msgstr "వాడుక"
+
+#: tbl_printview.php:340 tbl_structure.php:687
+msgid "Effective"
+msgstr ""
+
+#: tbl_printview.php:365 tbl_structure.php:725
+msgid "Row Statistics"
+msgstr "వరుసల గణాంకాలు"
+
+#: tbl_printview.php:368 tbl_structure.php:728
+msgid "Statements"
+msgstr ""
+
+#: tbl_printview.php:379 tbl_structure.php:740
+msgid "static"
+msgstr ""
+
+#: tbl_printview.php:381 tbl_structure.php:742
+msgid "dynamic"
+msgstr ""
+
+#: tbl_printview.php:403 tbl_structure.php:785
+msgid "Row length"
+msgstr ""
+
+#: tbl_printview.php:413 tbl_structure.php:793
+>>>>>>> origin/master
 msgid " Row size "
 msgstr ""
 
diff --git a/po/th.po b/po/th.po
index 69c37ad1b..7f5aecf85 100755
--- a/po/th.po
+++ b/po/th.po
@@ -3,7 +3,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2010-07-03 21:45+0530\n"
+=======
+"POT-Creation-Date: 2010-07-03 09:00-0400\n"
+>>>>>>> origin/master
 "PO-Revision-Date: 2010-03-12 09:19+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: thai <th@li.org>\n"
@@ -45,15 +49,26 @@ msgstr "ค้นหา"
 #: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046
 #: libraries/Theme_Manager.class.php:311
 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719
+<<<<<<< HEAD
 #: libraries/common.lib.php:1344 libraries/common.lib.php:2301
 #: libraries/display_change_password.lib.php:82
 #: libraries/display_create_table.lib.php:62
+=======
+#: libraries/common.lib.php:1335 libraries/common.lib.php:2288
+#: libraries/display_change_password.lib.php:82
+#: libraries/display_create_table.lib.php:63
+>>>>>>> origin/master
 #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532
 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76
 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104
+<<<<<<< HEAD
 #: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480
 #: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782
+=======
+#: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477
+#: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782
+>>>>>>> origin/master
 #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328
 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142
 #: server_privileges.php:665 server_privileges.php:1641
@@ -63,8 +78,13 @@ msgstr "ค้นหา"
 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171
 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265
 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561
+<<<<<<< HEAD
 #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560
 #: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512
+=======
+#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562
+#: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512
+>>>>>>> origin/master
 #: view_create.php:182 view_operations.php:101
 msgid "Go"
 msgstr "ลงมือ"
@@ -117,10 +137,17 @@ msgstr "ชื่อคอลัมน์"
 #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245
 #: libraries/export/latex.php:360 libraries/export/odt.php:297
 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100
+<<<<<<< HEAD
 #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093
 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
 #: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321
+=======
+#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070
+#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
+#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
+#: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321
+>>>>>>> origin/master
 msgid "Type"
 msgstr "ชนิด"
 
@@ -161,9 +188,15 @@ msgstr "หมายเหตุ"
 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322
 #: libraries/export/latex.php:430 libraries/export/odt.php:368
 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263
+<<<<<<< HEAD
 #: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596
 #: server_privileges.php:1911 server_privileges.php:1916
 #: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228
+=======
+#: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579
+#: server_privileges.php:1889 server_privileges.php:1894
+#: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228
+>>>>>>> origin/master
 #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342
 msgid "No"
 msgstr "ไม่"
@@ -177,9 +210,15 @@ msgstr "ไม่"
 #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106
 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262
 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344
+<<<<<<< HEAD
 #: server_databases.php:64 server_privileges.php:1582
 #: server_privileges.php:1596 server_privileges.php:1911
 #: server_privileges.php:1914 server_privileges.php:2210 sql.php:193
+=======
+#: server_databases.php:64 server_privileges.php:1565
+#: server_privileges.php:1579 server_privileges.php:1889
+#: server_privileges.php:1892 server_privileges.php:2187 sql.php:193
+>>>>>>> origin/master
 #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350
 #: tbl_tracking.php:335 tbl_tracking.php:340
 msgid "Yes"
@@ -229,7 +268,15 @@ msgstr "เปลี่ยนชื่อฐานข้อมูลเป็น
 msgid "Command"
 msgstr "คำสั่ง"
 
+<<<<<<< HEAD
 #: db_operations.php:466
+=======
+#: db_operations.php:429 tbl_change.php:1140
+msgid "and then"
+msgstr ""
+
+#: db_operations.php:455
+>>>>>>> origin/master
 #, fuzzy
 msgid "Copy database to"
 msgstr "เปลี่ยนชื่อฐานข้อมูลเป็น"
@@ -320,7 +367,11 @@ msgstr "เปิดใช้อยู่"
 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730
 #: server_collations.php:54 server_collations.php:66 server_databases.php:111
 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179
+<<<<<<< HEAD
 #: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326
+=======
+#: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326
+>>>>>>> origin/master
 msgid "Collation"
 msgstr "การเรียงลำดับ"
 
@@ -348,7 +399,11 @@ msgstr "ตาราง "
 #: db_printview.php:105 libraries/db_structure.lib.php:56
 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146
 #: navigation.php:638 navigation.php:660 server_databases.php:122
+<<<<<<< HEAD
 #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775
+=======
+#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777
+>>>>>>> origin/master
 msgid "Rows"
 msgstr "แถว"
 
@@ -363,19 +418,31 @@ msgstr "ใช้อยู่"
 
 #: db_printview.php:187 libraries/db_info.inc.php:88
 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433
+<<<<<<< HEAD
 #: tbl_structure.php:807
+=======
+#: tbl_structure.php:809
+>>>>>>> origin/master
 msgid "Creation"
 msgstr "สร้างเมื่อ"
 
 #: db_printview.php:196 libraries/db_info.inc.php:93
 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443
+<<<<<<< HEAD
 #: tbl_structure.php:815
+=======
+#: tbl_structure.php:817
+>>>>>>> origin/master
 msgid "Last update"
 msgstr "ปรับปรุงครั้งสุดท้ายเมื่อ"
 
 #: db_printview.php:205 libraries/db_info.inc.php:98
 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453
+<<<<<<< HEAD
 #: tbl_structure.php:823
+=======
+#: tbl_structure.php:825
+>>>>>>> origin/master
 msgid "Last check"
 msgstr "ตรวจสอบครั้งสุดท้ายเมื่อ"
 
@@ -440,7 +507,11 @@ msgstr "ลบ"
 
 #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553
 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779
+<<<<<<< HEAD
 #: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250
+=======
+#: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250
+>>>>>>> origin/master
 #: tbl_select.php:286
 msgid "Or"
 msgstr "หรือ"
@@ -659,9 +730,15 @@ msgstr "ทำกับที่เลือก:"
 msgid "Check All"
 msgstr "เลือกทั้งหมด"
 
+<<<<<<< HEAD
 #: db_structure.php:529 libraries/display_tbl.lib.php:2077
 #: libraries/replication_gui.lib.php:36 server_databases.php:350
 #: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460
+=======
+#: db_structure.php:531 libraries/display_tbl.lib.php:2077
+#: libraries/replication_gui.lib.php:36 server_databases.php:350
+#: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462
+>>>>>>> origin/master
 msgid "Uncheck All"
 msgstr "ไม่เลือกเลย"
 
@@ -1113,10 +1190,17 @@ msgid "Prev"
 msgstr "ก่อนหน้า"
 
 #. l10n: Display text for next month link in calendar
+<<<<<<< HEAD
 #: js/messages.php:106 libraries/common.lib.php:2366
 #: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338
 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
 #: tbl_structure.php:799
+=======
+#: js/messages.php:77 libraries/common.lib.php:2353
+#: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338
+#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
+#: tbl_structure.php:801
+>>>>>>> origin/master
 msgid "Next"
 msgstr "ต่อไป"
 
@@ -1651,7 +1735,11 @@ msgstr "รหัสผ่าน:"
 msgid "Server Choice"
 msgstr "ตัวเลือกเซิร์ฟเวอร์"
 
+<<<<<<< HEAD
 #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63
+=======
+#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59
+>>>>>>> origin/master
 msgid "Cookies must be enabled past this point."
 msgstr "ต้องอนุญาตใช้ใช้ 'คุ๊กกี้' (cookie) เสียก่อน จึงจะผ่านจุดนี้ไปได้"
 
@@ -1730,7 +1818,11 @@ msgstr ""
 "ไม่สามารถใช้ฟังก์ชั่น iconv หรือ libiconv หรือ recode_string ทั้งๆ ที่สามารถเรียกตัวช่วย "
 "สำหรับฟังก์ชั่นเหล่านั้นขึ้นมาได้แล้ว. ลองตรวจสอบการตั้งค่าของ PHP"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:580
+=======
+#: libraries/common.inc.php:576
+>>>>>>> origin/master
 msgid ""
 "phpMyAdmin was unable to read your configuration file!<br />This might "
 "happen if PHP finds a parse error in it or PHP cannot find the file.<br /"
@@ -1745,38 +1837,66 @@ msgstr ""
 "อะไรหรือไม่  ลองตรวจสอบดูเครื่องหมาย quote หรือ semicolon ว่าใส่ครบหรือเปล่า<br /"
 ">ถ้าคุณเห็นหน้าว่างๆ แสดงว่าทุกอย่างเป็นปกติดี"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:591
+=======
+#: libraries/common.inc.php:587
+>>>>>>> origin/master
 #, php-format
 msgid "Could not load default configuration from: %1$s"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:596
+=======
+#: libraries/common.inc.php:592
+>>>>>>> origin/master
 msgid ""
 "The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
 "configuration file!"
 msgstr "<b>ต้อง</b>กำหนดค่า <tt>$cfg['PmaAbsoluteUri']</tt> ในไฟล์คอนฟิกูเรชั่นเสียก่อน"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:626
+=======
+#: libraries/common.inc.php:622
+>>>>>>> origin/master
 #, php-format
 msgid "Invalid server index: %s"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:633
+=======
+#: libraries/common.inc.php:629
+>>>>>>> origin/master
 #, php-format
 msgid "Invalid hostname for server %1$s. Please review your configuration."
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:642 libraries/header.inc.php:100
+=======
+#: libraries/common.inc.php:638 libraries/header.inc.php:96
+>>>>>>> origin/master
 #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47
 #: main.php:185 test/theme.php:57
 msgid "Server"
 msgstr "เซิร์ฟเวอร์"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:820
 msgid "Invalid authentication method set in configuration:"
 msgstr ""
 
 #: libraries/common.inc.php:923
+=======
+#: libraries/common.inc.php:816
+msgid "Invalid authentication method set in configuration:"
+msgstr ""
+
+#: libraries/common.inc.php:919
+>>>>>>> origin/master
 #, php-format
 msgid "You should upgrade to %s %s or later."
 msgstr ""
@@ -2022,7 +2142,11 @@ msgid ""
 msgstr ""
 
 #: libraries/db_structure.lib.php:69 server_databases.php:142
+<<<<<<< HEAD
 #: tbl_printview.php:335 tbl_structure.php:680
+=======
+#: tbl_printview.php:335 tbl_structure.php:682
+>>>>>>> origin/master
 msgid "Overhead"
 msgstr "เกินความจำเป็น"
 
@@ -2049,22 +2173,36 @@ msgid "Change password"
 msgstr "เปลี่ยนรหัสผ่าน"
 
 #: libraries/display_change_password.lib.php:35
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:348 server_privileges.php:808
+=======
+#: libraries/replication_gui.lib.php:348 server_privileges.php:807
+>>>>>>> origin/master
 msgid "No Password"
 msgstr "ไม่มีรหัสผ่าน"
 
 #: libraries/display_change_password.lib.php:41
 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63
 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:352 server_privileges.php:797
 #: server_privileges.php:801 server_privileges.php:812
 #: server_privileges.php:1555 server_synchronize.php:1175
+=======
+#: libraries/replication_gui.lib.php:352 server_privileges.php:796
+#: server_privileges.php:800 server_privileges.php:811
+#: server_privileges.php:1538 server_synchronize.php:1175
+>>>>>>> origin/master
 msgid "Password"
 msgstr "รหัสผ่าน"
 
 #: libraries/display_change_password.lib.php:46
 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359
+<<<<<<< HEAD
 #: server_privileges.php:816 server_privileges.php:819
+=======
+#: server_privileges.php:815 server_privileges.php:818
+>>>>>>> origin/master
 msgid "Re-type"
 msgstr "พิมพ์ใหม่"
 
@@ -2077,12 +2215,20 @@ msgid "MySQL 4.0 compatible"
 msgstr ""
 
 #: libraries/display_change_password.lib.php:72
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:363 server_privileges.php:823
+=======
+#: libraries/replication_gui.lib.php:363 server_privileges.php:822
+>>>>>>> origin/master
 msgid "Generate Password"
 msgstr ""
 
 #: libraries/display_change_password.lib.php:75
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:366 server_privileges.php:826
+=======
+#: libraries/replication_gui.lib.php:366 server_privileges.php:825
+>>>>>>> origin/master
 #, fuzzy
 msgid "Generate"
 msgstr "สร้างโดย"
@@ -2169,7 +2315,11 @@ msgid "remember template"
 msgstr "จำรูปแบบ"
 
 #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552
+=======
+#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549
+>>>>>>> origin/master
 msgid "Character set of the file:"
 msgstr "ชุดอักขระของไฟล์ (character set):"
 
@@ -2222,7 +2372,11 @@ msgstr ""
 msgid "File to import"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527
+=======
+#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524
+>>>>>>> origin/master
 msgid "Location of the text file"
 msgstr "เลือกไฟล์ข้อความจาก"
 
@@ -2230,12 +2384,20 @@ msgstr "เลือกไฟล์ข้อความจาก"
 msgid "File uploads are not allowed on this server."
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536
+=======
+#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533
+>>>>>>> origin/master
 #: tbl_change.php:1025
 msgid "The directory you set for upload work cannot be reached"
 msgstr "ไม่สามารถใช้งาน ไดเรกทอรีที่ตั้งไว้สำหรับอัพโหลดได้"
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539
+=======
+#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536
+>>>>>>> origin/master
 #: tbl_change.php:1028
 msgid "web server upload directory"
 msgstr "ไดเรกทอรีสำหรับอัพโหลด ที่เว็บเซิร์ฟเวอร์"
@@ -2364,7 +2526,11 @@ msgstr "เรียงโดยคีย์"
 #: libraries/import/docsql.php:34 libraries/import/ldi.php:47
 #: libraries/import/ods.php:30 libraries/import/sql.php:20
 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26
+<<<<<<< HEAD
 #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751
+=======
+#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753
+>>>>>>> origin/master
 #, fuzzy
 msgid "Options"
 msgstr "กระบวนการ"
@@ -2512,7 +2678,11 @@ msgstr ""
 
 #: libraries/engines/innodb.lib.php:194 server_databases.php:137
 #: server_databases.php:305 server_status.php:525 server_status.php:586
+<<<<<<< HEAD
 #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694
+=======
+#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696
+>>>>>>> origin/master
 msgid "Total"
 msgstr "รวม"
 
@@ -2758,7 +2928,11 @@ msgid ""
 msgstr ""
 
 #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88
+<<<<<<< HEAD
 #: tbl_printview.php:375 tbl_structure.php:735
+=======
+#: tbl_printview.php:375 tbl_structure.php:737
+>>>>>>> origin/master
 msgid "Format"
 msgstr "รูปแบบ"
 
@@ -2830,8 +3004,13 @@ msgstr ""
 #: libraries/export/latex.php:201 libraries/export/odt.php:48
 #: libraries/export/sql.php:106 libraries/export/sql.php:868
 #: libraries/export/texytext.php:27 server_databases.php:127
+<<<<<<< HEAD
 #: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316
 #: tbl_structure.php:663
+=======
+#: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316
+#: tbl_structure.php:665
+>>>>>>> origin/master
 msgid "Data"
 msgstr "ข้อมูล"
 
@@ -2880,9 +3059,15 @@ msgstr "MIME-type"
 #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57
 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177
 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:332 server_privileges.php:732
 #: server_privileges.php:735 server_privileges.php:791
 #: server_privileges.php:1554 server_privileges.php:2092
+=======
+#: libraries/replication_gui.lib.php:332 server_privileges.php:731
+#: server_privileges.php:734 server_privileges.php:790
+#: server_privileges.php:1537 server_privileges.php:2069
+>>>>>>> origin/master
 #: server_processlist.php:55 server_synchronize.php:1159
 msgid "Host"
 msgstr "โฮสต์"
@@ -3554,8 +3739,13 @@ msgstr ""
 
 #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59
 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:262 server_privileges.php:712
 #: server_privileges.php:715 server_privileges.php:722
+=======
+#: libraries/replication_gui.lib.php:262 server_privileges.php:711
+#: server_privileges.php:714 server_privileges.php:721
+>>>>>>> origin/master
 #: server_synchronize.php:1171
 msgid "User name"
 msgstr "ชื่อผู้ใช้"
@@ -3573,14 +3763,22 @@ msgstr ""
 msgid "Slave status"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448
+=======
+#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445
+>>>>>>> origin/master
 #: server_status.php:737 server_variables.php:52
 msgid "Variable"
 msgstr "ตัวแปร"
 
 #: libraries/replication_gui.lib.php:118 server_status.php:738
 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138
+<<<<<<< HEAD
 #: tbl_structure.php:727
+=======
+#: tbl_structure.php:729
+>>>>>>> origin/master
 msgid "Value"
 msgstr "ค่า"
 
@@ -3599,11 +3797,16 @@ msgstr ""
 msgid "Add slave replication user"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:257 server_privileges.php:717
+=======
+#: libraries/replication_gui.lib.php:257 server_privileges.php:716
+>>>>>>> origin/master
 msgid "Any user"
 msgstr "ผู้ใช้ใดๆ"
 
 #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:349 server_privileges.php:718
 #: server_privileges.php:785 server_privileges.php:809
 #: server_privileges.php:1950 server_privileges.php:1980
@@ -3627,6 +3830,31 @@ msgid "Use Host Table"
 msgstr ""
 
 #: libraries/replication_gui.lib.php:334 server_privileges.php:793
+=======
+#: libraries/replication_gui.lib.php:349 server_privileges.php:717
+#: server_privileges.php:784 server_privileges.php:808
+#: server_privileges.php:1928 server_privileges.php:1958
+msgid "Use text field"
+msgstr "ใช้ช่องใส่ข้อความ (text field)"
+
+#: libraries/replication_gui.lib.php:305 server_privileges.php:764
+msgid "Any host"
+msgstr "โฮสต์ใดๆ"
+
+#: libraries/replication_gui.lib.php:309 server_privileges.php:768
+msgid "Local"
+msgstr "โลคอล"
+
+#: libraries/replication_gui.lib.php:315 server_privileges.php:773
+msgid "This Host"
+msgstr "โฮสต์นี้"
+
+#: libraries/replication_gui.lib.php:321 server_privileges.php:779
+msgid "Use Host Table"
+msgstr ""
+
+#: libraries/replication_gui.lib.php:334 server_privileges.php:792
+>>>>>>> origin/master
 msgid ""
 "When Host table is used, this field is ignored and values stored in Host "
 "table are used instead."
@@ -7612,10 +7840,13 @@ msgstr ""
 msgid "Show insert query"
 msgstr ""
 
+<<<<<<< HEAD
 #: tbl_change.php:1140
 msgid "and then"
 msgstr ""
 
+=======
+>>>>>>> origin/master
 #: tbl_change.php:1144
 msgid "Go back to previous page"
 msgstr "ส่งกลับ"
@@ -7812,6 +8043,7 @@ msgstr "ตรวจสอบความสมบูรณ์ของการ
 msgid "Show tables"
 msgstr "แสดงตาราง"
 
+<<<<<<< HEAD
 #: tbl_printview.php:309 tbl_structure.php:654
 msgid "Space usage"
 msgstr "เนื้อที่ที่ใช้"
@@ -7845,6 +8077,41 @@ msgid "Row length"
 msgstr "ความยาวแถว"
 
 #: tbl_printview.php:413 tbl_structure.php:791
+=======
+#: tbl_printview.php:309 tbl_structure.php:656
+msgid "Space usage"
+msgstr "เนื้อที่ที่ใช้"
+
+#: tbl_printview.php:313 tbl_structure.php:660
+msgid "Usage"
+msgstr "ใช้งาน"
+
+#: tbl_printview.php:340 tbl_structure.php:687
+msgid "Effective"
+msgstr "มีผล"
+
+#: tbl_printview.php:365 tbl_structure.php:725
+msgid "Row Statistics"
+msgstr "สถิติของแถว"
+
+#: tbl_printview.php:368 tbl_structure.php:728
+msgid "Statements"
+msgstr "คำสั่ง"
+
+#: tbl_printview.php:379 tbl_structure.php:740
+msgid "static"
+msgstr ""
+
+#: tbl_printview.php:381 tbl_structure.php:742
+msgid "dynamic"
+msgstr "ไม่คงที่"
+
+#: tbl_printview.php:403 tbl_structure.php:785
+msgid "Row length"
+msgstr "ความยาวแถว"
+
+#: tbl_printview.php:413 tbl_structure.php:793
+>>>>>>> origin/master
 msgid " Row size "
 msgstr " ขนาดแถว "
 
diff --git a/po/tr.po b/po/tr.po
index 6b68b5b77..d1ea88ac9 100755
--- a/po/tr.po
+++ b/po/tr.po
@@ -3,7 +3,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2010-07-03 21:45+0530\n"
+=======
+"POT-Creation-Date: 2010-07-03 09:00-0400\n"
+>>>>>>> origin/master
 "PO-Revision-Date: 2010-06-21 19:58+0200\n"
 "Last-Translator: Burak <hitowerdigit@hotmail.com>\n"
 "Language-Team: turkish <tr@li.org>\n"
@@ -49,15 +53,26 @@ msgstr "Ara"
 #: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046
 #: libraries/Theme_Manager.class.php:311
 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719
+<<<<<<< HEAD
 #: libraries/common.lib.php:1344 libraries/common.lib.php:2301
 #: libraries/display_change_password.lib.php:82
 #: libraries/display_create_table.lib.php:62
+=======
+#: libraries/common.lib.php:1335 libraries/common.lib.php:2288
+#: libraries/display_change_password.lib.php:82
+#: libraries/display_create_table.lib.php:63
+>>>>>>> origin/master
 #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532
 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76
 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104
+<<<<<<< HEAD
 #: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480
 #: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782
+=======
+#: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477
+#: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782
+>>>>>>> origin/master
 #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328
 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142
 #: server_privileges.php:665 server_privileges.php:1641
@@ -67,8 +82,13 @@ msgstr "Ara"
 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171
 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265
 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561
+<<<<<<< HEAD
 #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560
 #: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512
+=======
+#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562
+#: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512
+>>>>>>> origin/master
 #: view_create.php:182 view_operations.php:101
 msgid "Go"
 msgstr "Git"
@@ -119,10 +139,17 @@ msgstr "Sütun"
 #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245
 #: libraries/export/latex.php:360 libraries/export/odt.php:297
 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100
+<<<<<<< HEAD
 #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093
 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
 #: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321
+=======
+#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070
+#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
+#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
+#: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321
+>>>>>>> origin/master
 msgid "Type"
 msgstr "Türü"
 
@@ -163,9 +190,15 @@ msgstr "Yorumlar"
 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322
 #: libraries/export/latex.php:430 libraries/export/odt.php:368
 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263
+<<<<<<< HEAD
 #: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596
 #: server_privileges.php:1911 server_privileges.php:1916
 #: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228
+=======
+#: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579
+#: server_privileges.php:1889 server_privileges.php:1894
+#: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228
+>>>>>>> origin/master
 #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342
 msgid "No"
 msgstr "Hayır"
@@ -179,9 +212,15 @@ msgstr "Hayır"
 #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106
 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262
 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344
+<<<<<<< HEAD
 #: server_databases.php:64 server_privileges.php:1582
 #: server_privileges.php:1596 server_privileges.php:1911
 #: server_privileges.php:1914 server_privileges.php:2210 sql.php:193
+=======
+#: server_databases.php:64 server_privileges.php:1565
+#: server_privileges.php:1579 server_privileges.php:1889
+#: server_privileges.php:1892 server_privileges.php:2187 sql.php:193
+>>>>>>> origin/master
 #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350
 #: tbl_tracking.php:335 tbl_tracking.php:340
 msgid "Yes"
@@ -230,7 +269,15 @@ msgstr "Veritabanını şuna yeniden adlandır"
 msgid "Command"
 msgstr "Komut"
 
+<<<<<<< HEAD
 #: db_operations.php:466
+=======
+#: db_operations.php:429 tbl_change.php:1140
+msgid "and then"
+msgstr "ve sonra"
+
+#: db_operations.php:455
+>>>>>>> origin/master
 msgid "Copy database to"
 msgstr "Veritabanını şuraya kopyala:"
 
@@ -280,7 +327,11 @@ msgstr "BLOB Havuzu"
 msgid "Status"
 msgstr "Durum"
 
+<<<<<<< HEAD
 #: db_operations.php:559
+=======
+#: db_operations.php:548
+>>>>>>> origin/master
 msgctxt "BLOB repository"
 msgid "Enabled"
 msgstr "Etkinleştirildi"
@@ -293,12 +344,20 @@ msgstr "Etkisiz"
 msgid "Damaged"
 msgstr "Hasarlı"
 
+<<<<<<< HEAD
 #: db_operations.php:577
+=======
+#: db_operations.php:566
+>>>>>>> origin/master
 msgctxt "BLOB repository"
 msgid "Repair"
 msgstr "Onar"
 
+<<<<<<< HEAD
 #: db_operations.php:585
+=======
+#: db_operations.php:574
+>>>>>>> origin/master
 msgctxt "BLOB repository"
 msgid "Disabled"
 msgstr "Etkisizleştirildi"
@@ -312,7 +371,11 @@ msgstr "Etkin"
 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730
 #: server_collations.php:54 server_collations.php:66 server_databases.php:111
 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179
+<<<<<<< HEAD
 #: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326
+=======
+#: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326
+>>>>>>> origin/master
 msgid "Collation"
 msgstr "Karşılaştırma"
 
@@ -341,7 +404,11 @@ msgstr "Tablo"
 #: db_printview.php:105 libraries/db_structure.lib.php:56
 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146
 #: navigation.php:638 navigation.php:660 server_databases.php:122
+<<<<<<< HEAD
 #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775
+=======
+#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777
+>>>>>>> origin/master
 msgid "Rows"
 msgstr "Satır"
 
@@ -356,19 +423,31 @@ msgstr "kullanımda"
 
 #: db_printview.php:187 libraries/db_info.inc.php:88
 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433
+<<<<<<< HEAD
 #: tbl_structure.php:807
+=======
+#: tbl_structure.php:809
+>>>>>>> origin/master
 msgid "Creation"
 msgstr "Oluşturma"
 
 #: db_printview.php:196 libraries/db_info.inc.php:93
 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443
+<<<<<<< HEAD
 #: tbl_structure.php:815
+=======
+#: tbl_structure.php:817
+>>>>>>> origin/master
 msgid "Last update"
 msgstr "Son güncellenme"
 
 #: db_printview.php:205 libraries/db_info.inc.php:98
 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453
+<<<<<<< HEAD
 #: tbl_structure.php:823
+=======
+#: tbl_structure.php:825
+>>>>>>> origin/master
 msgid "Last check"
 msgstr "Son kontrol"
 
@@ -431,7 +510,11 @@ msgstr "Del"
 
 #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553
 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779
+<<<<<<< HEAD
 #: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250
+=======
+#: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250
+>>>>>>> origin/master
 #: tbl_select.php:286
 msgid "Or"
 msgstr "Veya"
@@ -539,7 +622,11 @@ msgstr "Kelimeler boşlukla ayrılır (\" \")."
 msgid "Inside table(s):"
 msgstr "Tablo içindeki(ler):"
 
+<<<<<<< HEAD
 #: db_search.php:367
+=======
+#: db_search.php:355
+>>>>>>> origin/master
 msgid "Inside column:"
 msgstr "İç sütun:"
 
@@ -645,9 +732,15 @@ msgstr "Seçilileri:"
 msgid "Check All"
 msgstr "Tümünü Seç"
 
+<<<<<<< HEAD
 #: db_structure.php:529 libraries/display_tbl.lib.php:2077
 #: libraries/replication_gui.lib.php:36 server_databases.php:350
 #: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460
+=======
+#: db_structure.php:531 libraries/display_tbl.lib.php:2077
+#: libraries/replication_gui.lib.php:36 server_databases.php:350
+#: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462
+>>>>>>> origin/master
 msgid "Uncheck All"
 msgstr "Hiçbirini Seçme"
 
@@ -1094,34 +1187,61 @@ msgstr "Dış Anahtarı seç"
 msgid "Please select the primary key or a unique key"
 msgstr "Lütfen birincil anaktarı veya benzersiz anahtarı seçin"
 
+<<<<<<< HEAD
 #: js/messages.php:92 pmd_general.php:77 tbl_relation.php:548
+=======
+#: js/messages.php:63 pmd_general.php:77 tbl_relation.php:548
+>>>>>>> origin/master
 msgid "Choose column to display"
 msgstr "Göstermek için sütun seçin"
 
 #. l10n: Display text for calendar close link
+<<<<<<< HEAD
 #: js/messages.php:102
+=======
+#: js/messages.php:73
+>>>>>>> origin/master
 msgid "Done"
 msgstr "Bitti"
 
 #. l10n: Display text for previous month link in calendar
+<<<<<<< HEAD
 #: js/messages.php:104
+=======
+#: js/messages.php:75
+>>>>>>> origin/master
 msgid "Prev"
 msgstr "Önceki"
 
 #. l10n: Display text for next month link in calendar
+<<<<<<< HEAD
 #: js/messages.php:106 libraries/common.lib.php:2366
 #: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338
 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
 #: tbl_structure.php:799
+=======
+#: js/messages.php:77 libraries/common.lib.php:2353
+#: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338
+#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
+#: tbl_structure.php:801
+>>>>>>> origin/master
 msgid "Next"
 msgstr "Sonraki"
 
 #. l10n: Display text for current month link in calendar
+<<<<<<< HEAD
 #: js/messages.php:108
 msgid "Today"
 msgstr "Bugün"
 
 #: js/messages.php:111
+=======
+#: js/messages.php:79
+msgid "Today"
+msgstr "Bugün"
+
+#: js/messages.php:82
+>>>>>>> origin/master
 msgid "January"
 msgstr "Ocak"
 
@@ -1129,11 +1249,19 @@ msgstr "Ocak"
 msgid "February"
 msgstr "Şubat"
 
+<<<<<<< HEAD
 #: js/messages.php:113
 msgid "March"
 msgstr "Mart"
 
 #: js/messages.php:114
+=======
+#: js/messages.php:84
+msgid "March"
+msgstr "Mart"
+
+#: js/messages.php:85
+>>>>>>> origin/master
 msgid "April"
 msgstr "Nisan"
 
@@ -1141,6 +1269,7 @@ msgstr "Nisan"
 msgid "May"
 msgstr "Mayıs"
 
+<<<<<<< HEAD
 #: js/messages.php:116
 msgid "June"
 msgstr "Haziran"
@@ -1150,6 +1279,17 @@ msgid "July"
 msgstr "Temmuz"
 
 #: js/messages.php:118
+=======
+#: js/messages.php:87
+msgid "June"
+msgstr "Haziran"
+
+#: js/messages.php:88
+msgid "July"
+msgstr "Temmuz"
+
+#: js/messages.php:89
+>>>>>>> origin/master
 msgid "August"
 msgstr "Ağustos"
 
@@ -1157,7 +1297,11 @@ msgstr "Ağustos"
 msgid "September"
 msgstr "Eylül"
 
+<<<<<<< HEAD
 #: js/messages.php:120
+=======
+#: js/messages.php:91
+>>>>>>> origin/master
 msgid "October"
 msgstr "Ekim"
 
@@ -1190,7 +1334,11 @@ msgid "Apr"
 msgstr "Nis"
 
 #. l10n: Short month name
+<<<<<<< HEAD
 #: js/messages.php:134 libraries/common.lib.php:1574
+=======
+#: js/messages.php:105 libraries/common.lib.php:1565
+>>>>>>> origin/master
 msgctxt "Short month name"
 msgid "May"
 msgstr "May"
@@ -1230,6 +1378,7 @@ msgstr "Kas"
 msgid "Dec"
 msgstr "Ara"
 
+<<<<<<< HEAD
 #: js/messages.php:151
 msgid "Sunday"
 msgstr "Pazar"
@@ -1239,6 +1388,17 @@ msgid "Monday"
 msgstr "Pazartesi"
 
 #: js/messages.php:153
+=======
+#: js/messages.php:122
+msgid "Sunday"
+msgstr "Pazar"
+
+#: js/messages.php:123
+msgid "Monday"
+msgstr "Pazartesi"
+
+#: js/messages.php:124
+>>>>>>> origin/master
 msgid "Tuesday"
 msgstr "Salı"
 
@@ -1250,7 +1410,11 @@ msgstr "Çarşamba"
 msgid "Thursday"
 msgstr "Perşembe"
 
+<<<<<<< HEAD
 #: js/messages.php:156
+=======
+#: js/messages.php:127
+>>>>>>> origin/master
 msgid "Friday"
 msgstr "Cuma"
 
@@ -1294,42 +1458,74 @@ msgid "Sat"
 msgstr "Ctesi"
 
 #. l10n: Minimal week day name
+<<<<<<< HEAD
 #: js/messages.php:177
+=======
+#: js/messages.php:148
+>>>>>>> origin/master
 msgid "Su"
 msgstr "Paz"
 
 #. l10n: Minimal week day name
+<<<<<<< HEAD
 #: js/messages.php:179
+=======
+#: js/messages.php:150
+>>>>>>> origin/master
 msgid "Mo"
 msgstr "Ptesi"
 
 #. l10n: Minimal week day name
+<<<<<<< HEAD
 #: js/messages.php:181
+=======
+#: js/messages.php:152
+>>>>>>> origin/master
 msgid "Tu"
 msgstr "Sa"
 
 #. l10n: Minimal week day name
+<<<<<<< HEAD
 #: js/messages.php:183
+=======
+#: js/messages.php:154
+>>>>>>> origin/master
 msgid "We"
 msgstr "Ça"
 
 #. l10n: Minimal week day name
+<<<<<<< HEAD
 #: js/messages.php:185
+=======
+#: js/messages.php:156
+>>>>>>> origin/master
 msgid "Th"
 msgstr "Pe"
 
 #. l10n: Minimal week day name
+<<<<<<< HEAD
 #: js/messages.php:187
+=======
+#: js/messages.php:158
+>>>>>>> origin/master
 msgid "Fr"
 msgstr "Cu"
 
 #. l10n: Minimal week day name
+<<<<<<< HEAD
 #: js/messages.php:189
+=======
+#: js/messages.php:160
+>>>>>>> origin/master
 msgid "Sa"
 msgstr "Ctesi"
 
 #. l10n: Column header for week of the year in calendar
+<<<<<<< HEAD
 #: js/messages.php:191
+=======
+#: js/messages.php:162
+>>>>>>> origin/master
 msgid "Wk"
 msgstr "Hs"
 
@@ -1337,11 +1533,19 @@ msgstr "Hs"
 msgid "Hour"
 msgstr "Saat"
 
+<<<<<<< HEAD
 #: js/messages.php:194
 msgid "Minute"
 msgstr "Dakika"
 
 #: js/messages.php:195
+=======
+#: js/messages.php:165
+msgid "Minute"
+msgstr "Dakika"
+
+#: js/messages.php:166
+>>>>>>> origin/master
 msgid "Second"
 msgstr "Saniye"
 
@@ -1612,7 +1816,11 @@ msgstr "Parola:"
 msgid "Server Choice"
 msgstr "Sunucu Seçimi"
 
+<<<<<<< HEAD
 #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63
+=======
+#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59
+>>>>>>> origin/master
 msgid "Cookies must be enabled past this point."
 msgstr "Bu kısmı geçmek için tanımlama bilgileri (cookies) açık olmalı."
 
@@ -1694,7 +1902,11 @@ msgstr ""
 "Gerekli uzantılar yüklenmiş görünmesine rağmen, ne iconv, ne libinconv, ne "
 "de recode_string işlevi kullanılamadı. PHP yapılandırmanızı kontrol edin."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:580
+=======
+#: libraries/common.inc.php:576
+>>>>>>> origin/master
 msgid ""
 "phpMyAdmin was unable to read your configuration file!<br />This might "
 "happen if PHP finds a parse error in it or PHP cannot find the file.<br /"
@@ -1710,12 +1922,20 @@ msgstr ""
 "bir yerde tırnak veya noktalı virgül eksiktir.<br />Eğer boş bir sayfa "
 "karşınıza çıkıyorsa, her şey yolunda demektir."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:591
+=======
+#: libraries/common.inc.php:587
+>>>>>>> origin/master
 #, php-format
 msgid "Could not load default configuration from: %1$s"
 msgstr "Varsayılan yapılandırma bundan yüklenemedi: %1$s"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:596
+=======
+#: libraries/common.inc.php:592
+>>>>>>> origin/master
 msgid ""
 "The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
 "configuration file!"
@@ -1723,29 +1943,49 @@ msgstr ""
 "<tt>$cfg['PmaAbsoluteUri']</tt> talimatı yapılandırma dosyanız içinde "
 "AYARLANMAK zorundadır!"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:626
+=======
+#: libraries/common.inc.php:622
+>>>>>>> origin/master
 #, php-format
 msgid "Invalid server index: %s"
 msgstr "Geçersiz sunucu indeksi: %s"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:633
+=======
+#: libraries/common.inc.php:629
+>>>>>>> origin/master
 #, php-format
 msgid "Invalid hostname for server %1$s. Please review your configuration."
 msgstr ""
 "%1$s sunucusu için geçersiz anamakine. Lütfen yapılandırmanızı gözden "
 "geçirin."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:642 libraries/header.inc.php:100
+=======
+#: libraries/common.inc.php:638 libraries/header.inc.php:96
+>>>>>>> origin/master
 #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47
 #: main.php:185 test/theme.php:57
 msgid "Server"
 msgstr "Sunucu"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:820
 msgid "Invalid authentication method set in configuration:"
 msgstr "Yapılandırma içinde geçersiz kimlik denetimi yöntemi ayarı:"
 
 #: libraries/common.inc.php:923
+=======
+#: libraries/common.inc.php:816
+msgid "Invalid authentication method set in configuration:"
+msgstr "Yapılandırma içinde geçersiz kimlik denetimi yöntemi ayarı:"
+
+#: libraries/common.inc.php:919
+>>>>>>> origin/master
 #, php-format
 msgid "You should upgrade to %s %s or later."
 msgstr "%s %s veya sonrasına yükseltmelisiniz."
@@ -1818,7 +2058,11 @@ msgstr "SQL'i onayla"
 msgid "Inline edit of this query"
 msgstr "Bu sorguyu sıralı düzenle"
 
+<<<<<<< HEAD
 #: libraries/common.lib.php:1283
+=======
+#: libraries/common.lib.php:1280
+>>>>>>> origin/master
 msgid "Inline"
 msgstr "Sıralı"
 
@@ -1992,7 +2236,11 @@ msgstr ""
 "a]'e bakın"
 
 #: libraries/db_structure.lib.php:69 server_databases.php:142
+<<<<<<< HEAD
 #: tbl_printview.php:335 tbl_structure.php:680
+=======
+#: tbl_printview.php:335 tbl_structure.php:682
+>>>>>>> origin/master
 msgid "Overhead"
 msgstr "Ek Yük"
 
@@ -2021,22 +2269,36 @@ msgid "Change password"
 msgstr "Parola değiştir"
 
 #: libraries/display_change_password.lib.php:35
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:348 server_privileges.php:808
+=======
+#: libraries/replication_gui.lib.php:348 server_privileges.php:807
+>>>>>>> origin/master
 msgid "No Password"
 msgstr "Parola yok"
 
 #: libraries/display_change_password.lib.php:41
 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63
 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:352 server_privileges.php:797
 #: server_privileges.php:801 server_privileges.php:812
 #: server_privileges.php:1555 server_synchronize.php:1175
+=======
+#: libraries/replication_gui.lib.php:352 server_privileges.php:796
+#: server_privileges.php:800 server_privileges.php:811
+#: server_privileges.php:1538 server_synchronize.php:1175
+>>>>>>> origin/master
 msgid "Password"
 msgstr "Parola"
 
 #: libraries/display_change_password.lib.php:46
 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359
+<<<<<<< HEAD
 #: server_privileges.php:816 server_privileges.php:819
+=======
+#: server_privileges.php:815 server_privileges.php:818
+>>>>>>> origin/master
 msgid "Re-type"
 msgstr "Yeniden gir"
 
@@ -2049,12 +2311,20 @@ msgid "MySQL 4.0 compatible"
 msgstr "MySQL 4.0 uyumlu"
 
 #: libraries/display_change_password.lib.php:72
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:363 server_privileges.php:823
+=======
+#: libraries/replication_gui.lib.php:363 server_privileges.php:822
+>>>>>>> origin/master
 msgid "Generate Password"
 msgstr "Parola Üret"
 
 #: libraries/display_change_password.lib.php:75
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:366 server_privileges.php:826
+=======
+#: libraries/replication_gui.lib.php:366 server_privileges.php:825
+>>>>>>> origin/master
 msgid "Generate"
 msgstr "Üret"
 
@@ -2072,12 +2342,24 @@ msgstr "Oluştur"
 msgid "No Privileges"
 msgstr "Yetkiniz yok"
 
+<<<<<<< HEAD
 #: libraries/display_create_table.lib.php:47
+=======
+#: libraries/display_create_table.lib.php:41
+msgid "Table must have at least one column."
+msgstr "Tablonun en az bir sütunu olmalı."
+
+#: libraries/display_create_table.lib.php:48
+>>>>>>> origin/master
 #, php-format
 msgid "Create table on database %s"
 msgstr "%s veritabanında yeni tablo oluştur"
 
+<<<<<<< HEAD
 #: libraries/display_create_table.lib.php:56
+=======
+#: libraries/display_create_table.lib.php:57
+>>>>>>> origin/master
 msgid "Number of columns"
 msgstr "Sütun sayısı"
 
@@ -2140,7 +2422,11 @@ msgid "remember template"
 msgstr "şablonu hatırla"
 
 #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552
+=======
+#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549
+>>>>>>> origin/master
 msgid "Character set of the file:"
 msgstr "Dosyanın karakter grubu:"
 
@@ -2198,7 +2484,11 @@ msgstr ""
 msgid "File to import"
 msgstr "İçeri aktarmak için dosya"
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527
+=======
+#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524
+>>>>>>> origin/master
 msgid "Location of the text file"
 msgstr "Metin dosyasının yeri"
 
@@ -2206,12 +2496,20 @@ msgstr "Metin dosyasının yeri"
 msgid "File uploads are not allowed on this server."
 msgstr "Bu sunucuda dosya gönderimlerine izin verilmez."
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536
+=======
+#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533
+>>>>>>> origin/master
 #: tbl_change.php:1025
 msgid "The directory you set for upload work cannot be reached"
 msgstr "Gönderme işi için ayarladığınız dizine ulaşılamıyor"
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539
+=======
+#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536
+>>>>>>> origin/master
 #: tbl_change.php:1028
 msgid "web server upload directory"
 msgstr "web sunucusu gönderme dizini"
@@ -2345,7 +2643,11 @@ msgstr "Anahtara göre sırala"
 #: libraries/import/docsql.php:34 libraries/import/ldi.php:47
 #: libraries/import/ods.php:30 libraries/import/sql.php:20
 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26
+<<<<<<< HEAD
 #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751
+=======
+#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753
+>>>>>>> origin/master
 msgid "Options"
 msgstr "Seçenekler"
 
@@ -2490,7 +2792,11 @@ msgstr "Ara Bellek Havuzu Kullanımı"
 
 #: libraries/engines/innodb.lib.php:194 server_databases.php:137
 #: server_databases.php:305 server_status.php:525 server_status.php:586
+<<<<<<< HEAD
 #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694
+=======
+#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696
+>>>>>>> origin/master
 msgid "Total"
 msgstr "Toplam"
 
@@ -2778,7 +3084,11 @@ msgstr ""
 "diğer taraftan yeniden adlandırılır ve bir sonraki en yüksek numara verilir."
 
 #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88
+<<<<<<< HEAD
 #: tbl_printview.php:375 tbl_structure.php:735
+=======
+#: tbl_printview.php:375 tbl_structure.php:737
+>>>>>>> origin/master
 msgid "Format"
 msgstr "Biçim"
 
@@ -2842,8 +3152,13 @@ msgstr "Microsoft Word 2000"
 #: libraries/export/latex.php:201 libraries/export/odt.php:48
 #: libraries/export/sql.php:106 libraries/export/sql.php:868
 #: libraries/export/texytext.php:27 server_databases.php:127
+<<<<<<< HEAD
 #: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316
 #: tbl_structure.php:663
+=======
+#: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316
+#: tbl_structure.php:665
+>>>>>>> origin/master
 msgid "Data"
 msgstr "Veri"
 
@@ -2892,9 +3207,15 @@ msgstr "MIME türü"
 #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57
 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177
 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:332 server_privileges.php:732
 #: server_privileges.php:735 server_privileges.php:791
 #: server_privileges.php:1554 server_privileges.php:2092
+=======
+#: libraries/replication_gui.lib.php:332 server_privileges.php:731
+#: server_privileges.php:734 server_privileges.php:790
+#: server_privileges.php:1537 server_privileges.php:2069
+>>>>>>> origin/master
 #: server_processlist.php:55 server_synchronize.php:1159
 msgid "Host"
 msgstr "Anamakine"
@@ -3564,8 +3885,13 @@ msgstr ""
 
 #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59
 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:262 server_privileges.php:712
 #: server_privileges.php:715 server_privileges.php:722
+=======
+#: libraries/replication_gui.lib.php:262 server_privileges.php:711
+#: server_privileges.php:714 server_privileges.php:721
+>>>>>>> origin/master
 #: server_synchronize.php:1171
 msgid "User name"
 msgstr "Kullanıcı Adı"
@@ -3582,14 +3908,22 @@ msgstr "Master durumu"
 msgid "Slave status"
 msgstr "Slave durumu"
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448
+=======
+#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445
+>>>>>>> origin/master
 #: server_status.php:737 server_variables.php:52
 msgid "Variable"
 msgstr "Değişken"
 
 #: libraries/replication_gui.lib.php:118 server_status.php:738
 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138
+<<<<<<< HEAD
 #: tbl_structure.php:727
+=======
+#: tbl_structure.php:729
+>>>>>>> origin/master
 msgid "Value"
 msgstr "Değer"
 
@@ -3609,11 +3943,16 @@ msgstr ""
 msgid "Add slave replication user"
 msgstr "Slave kopya etme kullanıcısı ekle"
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:257 server_privileges.php:717
+=======
+#: libraries/replication_gui.lib.php:257 server_privileges.php:716
+>>>>>>> origin/master
 msgid "Any user"
 msgstr "Herhangi kullanıcı"
 
 #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:349 server_privileges.php:718
 #: server_privileges.php:785 server_privileges.php:809
 #: server_privileges.php:1950 server_privileges.php:1980
@@ -3637,6 +3976,31 @@ msgid "Use Host Table"
 msgstr "Anamakine Tablosu kullan"
 
 #: libraries/replication_gui.lib.php:334 server_privileges.php:793
+=======
+#: libraries/replication_gui.lib.php:349 server_privileges.php:717
+#: server_privileges.php:784 server_privileges.php:808
+#: server_privileges.php:1928 server_privileges.php:1958
+msgid "Use text field"
+msgstr "Metin alanını kullan"
+
+#: libraries/replication_gui.lib.php:305 server_privileges.php:764
+msgid "Any host"
+msgstr "Herhangi anamakine"
+
+#: libraries/replication_gui.lib.php:309 server_privileges.php:768
+msgid "Local"
+msgstr "Yerel"
+
+#: libraries/replication_gui.lib.php:315 server_privileges.php:773
+msgid "This Host"
+msgstr "Bu Anamakine"
+
+#: libraries/replication_gui.lib.php:321 server_privileges.php:779
+msgid "Use Host Table"
+msgstr "Anamakine Tablosu kullan"
+
+#: libraries/replication_gui.lib.php:334 server_privileges.php:792
+>>>>>>> origin/master
 msgid ""
 "When Host table is used, this field is ignored and values stored in Host "
 "table are used instead."
@@ -3731,7 +4095,11 @@ msgstr "%s sunucusu üzerinde SQL sorgusunu/sorgularını çalıştır"
 msgid "Run SQL query/queries on database %s"
 msgstr "%s veritabanı üzerinde SQL sorgusunu/sorgularını çalıştır"
 
+<<<<<<< HEAD
 #: libraries/sql_query_form.lib.php:320
+=======
+#: libraries/sql_query_form.lib.php:317
+>>>>>>> origin/master
 msgid "Columns"
 msgstr "Sütun"
 
@@ -3938,7 +4306,11 @@ msgstr "Kaydet"
 msgid "Add %s column(s)"
 msgstr "%s sütun ekle"
 
+<<<<<<< HEAD
 #: libraries/tbl_properties.inc.php:784 tbl_structure.php:534
+=======
+#: libraries/tbl_properties.inc.php:784 tbl_structure.php:536
+>>>>>>> origin/master
 msgid "You have to add at least one column."
 msgstr "En az bir sütun eklemek zorundasınız."
 
@@ -4752,7 +5124,11 @@ msgstr "Veri değiştirilmesine izin ver."
 msgid "No privileges."
 msgstr "Yetkiniz yok."
 
+<<<<<<< HEAD
 #: server_privileges.php:303 server_privileges.php:304
+=======
+#: server_privileges.php:302 server_privileges.php:303
+>>>>>>> origin/master
 msgctxt "None privileges"
 msgid "None"
 msgstr "Hiçbiri"
@@ -4795,7 +5171,11 @@ msgstr "Oturum Açma Bilgisi"
 msgid "Do not change the password"
 msgstr "Parolayı değiştirme"
 
+<<<<<<< HEAD
 #: server_privileges.php:844 server_privileges.php:2228
+=======
+#: server_privileges.php:843 server_privileges.php:2205
+>>>>>>> origin/master
 msgid "No user found."
 msgstr "Kullanıcı bulunamadı."
 
@@ -4949,7 +5329,11 @@ msgstr ""
 msgid "Database for user"
 msgstr "Kullanıcı için veritabanı"
 
+<<<<<<< HEAD
 #: server_privileges.php:2060
+=======
+#: server_privileges.php:2037
+>>>>>>> origin/master
 msgctxt "Create none database for user"
 msgid "None"
 msgstr "Hiçbiri"
@@ -7970,10 +8354,13 @@ msgstr "Yeni satır olarak ekle ve hataları yoksay"
 msgid "Show insert query"
 msgstr "Ekleme sorgusunu göster"
 
+<<<<<<< HEAD
 #: tbl_change.php:1140
 msgid "and then"
 msgstr "ve sonra"
 
+=======
+>>>>>>> origin/master
 #: tbl_change.php:1144
 msgid "Go back to previous page"
 msgstr "Önceki sayfaya geri dön"
@@ -8168,6 +8555,7 @@ msgstr "İlgili bütünlük kontrolü:"
 msgid "Show tables"
 msgstr "Tabloları göster"
 
+<<<<<<< HEAD
 #: tbl_printview.php:309 tbl_structure.php:654
 msgid "Space usage"
 msgstr "Alan kullanımı"
@@ -8201,6 +8589,41 @@ msgid "Row length"
 msgstr "Satır uzunluğu"
 
 #: tbl_printview.php:413 tbl_structure.php:791
+=======
+#: tbl_printview.php:309 tbl_structure.php:656
+msgid "Space usage"
+msgstr "Alan kullanımı"
+
+#: tbl_printview.php:313 tbl_structure.php:660
+msgid "Usage"
+msgstr "Kullanım"
+
+#: tbl_printview.php:340 tbl_structure.php:687
+msgid "Effective"
+msgstr "Etkili"
+
+#: tbl_printview.php:365 tbl_structure.php:725
+msgid "Row Statistics"
+msgstr "Satır İstatistikleri"
+
+#: tbl_printview.php:368 tbl_structure.php:728
+msgid "Statements"
+msgstr "İfadeler"
+
+#: tbl_printview.php:379 tbl_structure.php:740
+msgid "static"
+msgstr "sabit"
+
+#: tbl_printview.php:381 tbl_structure.php:742
+msgid "dynamic"
+msgstr "değişken"
+
+#: tbl_printview.php:403 tbl_structure.php:785
+msgid "Row length"
+msgstr "Satır uzunluğu"
+
+#: tbl_printview.php:413 tbl_structure.php:793
+>>>>>>> origin/master
 msgid " Row size "
 msgstr " Satır boyutu "
 
@@ -8286,7 +8709,11 @@ msgstr "İlişki görünümü"
 msgid "Propose table structure"
 msgstr "Tablo yapısı öner"
 
+<<<<<<< HEAD
 #: tbl_structure.php:538
+=======
+#: tbl_structure.php:540
+>>>>>>> origin/master
 msgid "Add column"
 msgstr "Sütun ekle"
 
diff --git a/po/tt.po b/po/tt.po
index 4ec3e7694..4f171412d 100755
--- a/po/tt.po
+++ b/po/tt.po
@@ -3,7 +3,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2010-07-03 21:45+0530\n"
+=======
+"POT-Creation-Date: 2010-07-03 09:00-0400\n"
+>>>>>>> origin/master
 "PO-Revision-Date: 2010-03-30 23:14+0200\n"
 "Last-Translator: Michal <michal@cihar.com>\n"
 "Language-Team: tatarish <tt@li.org>\n"
@@ -49,15 +53,26 @@ msgstr "Ezläw"
 #: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046
 #: libraries/Theme_Manager.class.php:311
 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719
+<<<<<<< HEAD
 #: libraries/common.lib.php:1344 libraries/common.lib.php:2301
 #: libraries/display_change_password.lib.php:82
 #: libraries/display_create_table.lib.php:62
+=======
+#: libraries/common.lib.php:1335 libraries/common.lib.php:2288
+#: libraries/display_change_password.lib.php:82
+#: libraries/display_create_table.lib.php:63
+>>>>>>> origin/master
 #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532
 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76
 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104
+<<<<<<< HEAD
 #: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480
 #: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782
+=======
+#: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477
+#: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782
+>>>>>>> origin/master
 #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328
 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142
 #: server_privileges.php:665 server_privileges.php:1641
@@ -67,8 +82,13 @@ msgstr "Ezläw"
 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171
 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265
 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561
+<<<<<<< HEAD
 #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560
 #: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512
+=======
+#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562
+#: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512
+>>>>>>> origin/master
 #: view_create.php:182 view_operations.php:101
 msgid "Go"
 msgstr "Äydä"
@@ -121,10 +141,17 @@ msgstr "Alan iseme"
 #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245
 #: libraries/export/latex.php:360 libraries/export/odt.php:297
 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100
+<<<<<<< HEAD
 #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093
 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
 #: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321
+=======
+#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070
+#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
+#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
+#: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321
+>>>>>>> origin/master
 msgid "Type"
 msgstr "Töre"
 
@@ -165,9 +192,15 @@ msgstr "Açıqlama"
 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322
 #: libraries/export/latex.php:430 libraries/export/odt.php:368
 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263
+<<<<<<< HEAD
 #: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596
 #: server_privileges.php:1911 server_privileges.php:1916
 #: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228
+=======
+#: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579
+#: server_privileges.php:1889 server_privileges.php:1894
+#: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228
+>>>>>>> origin/master
 #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342
 msgid "No"
 msgstr "Yuq"
@@ -181,9 +214,15 @@ msgstr "Yuq"
 #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106
 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262
 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344
+<<<<<<< HEAD
 #: server_databases.php:64 server_privileges.php:1582
 #: server_privileges.php:1596 server_privileges.php:1911
 #: server_privileges.php:1914 server_privileges.php:2210 sql.php:193
+=======
+#: server_databases.php:64 server_privileges.php:1565
+#: server_privileges.php:1579 server_privileges.php:1889
+#: server_privileges.php:1892 server_privileges.php:2187 sql.php:193
+>>>>>>> origin/master
 #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350
 #: tbl_tracking.php:335 tbl_tracking.php:340
 msgid "Yes"
@@ -232,7 +271,15 @@ msgstr "Biremlekne bolay atap quy"
 msgid "Command"
 msgstr "Ämer"
 
+<<<<<<< HEAD
 #: db_operations.php:466
+=======
+#: db_operations.php:429 tbl_change.php:1140
+msgid "and then"
+msgstr ", şunnan soñ"
+
+#: db_operations.php:455
+>>>>>>> origin/master
 msgid "Copy database to"
 msgstr "Biremlekne boña kübäyt"
 
@@ -321,7 +368,11 @@ msgstr "Açıq"
 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730
 #: server_collations.php:54 server_collations.php:66 server_databases.php:111
 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179
+<<<<<<< HEAD
 #: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326
+=======
+#: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326
+>>>>>>> origin/master
 msgid "Collation"
 msgstr "Tezü cayı"
 
@@ -350,7 +401,11 @@ msgstr "Tüşämä"
 #: db_printview.php:105 libraries/db_structure.lib.php:56
 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146
 #: navigation.php:638 navigation.php:660 server_databases.php:122
+<<<<<<< HEAD
 #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775
+=======
+#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777
+>>>>>>> origin/master
 msgid "Rows"
 msgstr "Kerem"
 
@@ -365,19 +420,31 @@ msgstr "totıla"
 
 #: db_printview.php:187 libraries/db_info.inc.php:88
 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433
+<<<<<<< HEAD
 #: tbl_structure.php:807
+=======
+#: tbl_structure.php:809
+>>>>>>> origin/master
 msgid "Creation"
 msgstr "Yasalışı"
 
 #: db_printview.php:196 libraries/db_info.inc.php:93
 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443
+<<<<<<< HEAD
 #: tbl_structure.php:815
+=======
+#: tbl_structure.php:817
+>>>>>>> origin/master
 msgid "Last update"
 msgstr "Soñğı yañartılu"
 
 #: db_printview.php:205 libraries/db_info.inc.php:98
 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453
+<<<<<<< HEAD
 #: tbl_structure.php:823
+=======
+#: tbl_structure.php:825
+>>>>>>> origin/master
 msgid "Last check"
 msgstr "Soñğı tikşerü"
 
@@ -441,7 +508,11 @@ msgstr "Sal"
 
 #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553
 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779
+<<<<<<< HEAD
 #: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250
+=======
+#: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250
+>>>>>>> origin/master
 #: tbl_select.php:286
 msgid "Or"
 msgstr "Yä"
@@ -660,9 +731,15 @@ msgstr "Saylanğannı:"
 msgid "Check All"
 msgstr "Saylap Beter"
 
+<<<<<<< HEAD
 #: db_structure.php:529 libraries/display_tbl.lib.php:2077
 #: libraries/replication_gui.lib.php:36 server_databases.php:350
 #: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460
+=======
+#: db_structure.php:531 libraries/display_tbl.lib.php:2077
+#: libraries/replication_gui.lib.php:36 server_databases.php:350
+#: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462
+>>>>>>> origin/master
 msgid "Uncheck All"
 msgstr "Saylanunı Töşer"
 
@@ -1120,10 +1197,17 @@ msgid "Prev"
 msgstr "Uzğan"
 
 #. l10n: Display text for next month link in calendar
+<<<<<<< HEAD
 #: js/messages.php:106 libraries/common.lib.php:2366
 #: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338
 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
 #: tbl_structure.php:799
+=======
+#: js/messages.php:77 libraries/common.lib.php:2353
+#: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338
+#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
+#: tbl_structure.php:801
+>>>>>>> origin/master
 msgid "Next"
 msgstr "Kiläse"
 
@@ -1663,7 +1747,11 @@ msgstr "Sersüz:"
 msgid "Server Choice"
 msgstr "Server Saylaw"
 
+<<<<<<< HEAD
 #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63
+=======
+#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59
+>>>>>>> origin/master
 msgid "Cookies must be enabled past this point."
 msgstr "Cookies must be enabled past this point."
 
@@ -1743,7 +1831,11 @@ msgstr ""
 "Can not use iconv nor libiconv nor recode_string function while extension "
 "reports to be loaded. Check your php configuration."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:580
+=======
+#: libraries/common.inc.php:576
+>>>>>>> origin/master
 msgid ""
 "phpMyAdmin was unable to read your configuration file!<br />This might "
 "happen if PHP finds a parse error in it or PHP cannot find the file.<br /"
@@ -1759,13 +1851,21 @@ msgstr ""
 "semicolon is missing somewhere.<br />If you receive a blank page, everything "
 "is fine."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:591
+=======
+#: libraries/common.inc.php:587
+>>>>>>> origin/master
 #, fuzzy, php-format
 #| msgid "Could not load default configuration from: \"%1$s\""
 msgid "Could not load default configuration from: %1$s"
 msgstr "Töp köyläneşen yökläp bulmadı: \"%1$s\""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:596
+=======
+#: libraries/common.inc.php:592
+>>>>>>> origin/master
 msgid ""
 "The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
 "configuration file!"
@@ -1773,28 +1873,48 @@ msgstr ""
 "The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
 "configuration file!"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:626
+=======
+#: libraries/common.inc.php:622
+>>>>>>> origin/master
 #, fuzzy, php-format
 #| msgid "Invalid server index: \"%s\""
 msgid "Invalid server index: %s"
 msgstr "Serverdäge \"%s\" digän tezeleş yaraqsız"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:633
+=======
+#: libraries/common.inc.php:629
+>>>>>>> origin/master
 #, php-format
 msgid "Invalid hostname for server %1$s. Please review your configuration."
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:642 libraries/header.inc.php:100
+=======
+#: libraries/common.inc.php:638 libraries/header.inc.php:96
+>>>>>>> origin/master
 #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47
 #: main.php:185 test/theme.php:57
 msgid "Server"
 msgstr "Server"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:820
 msgid "Invalid authentication method set in configuration:"
 msgstr ""
 
 #: libraries/common.inc.php:923
+=======
+#: libraries/common.inc.php:816
+msgid "Invalid authentication method set in configuration:"
+msgstr ""
+
+#: libraries/common.inc.php:919
+>>>>>>> origin/master
 #, php-format
 msgid "You should upgrade to %s %s or later."
 msgstr "You should upgrade to %s %s or later."
@@ -2040,7 +2160,11 @@ msgid ""
 msgstr "Törle buluı bar. YBS 3.11 qarísı"
 
 #: libraries/db_structure.lib.php:69 server_databases.php:142
+<<<<<<< HEAD
 #: tbl_printview.php:335 tbl_structure.php:680
+=======
+#: tbl_printview.php:335 tbl_structure.php:682
+>>>>>>> origin/master
 msgid "Overhead"
 msgstr "Overhead"
 
@@ -2067,22 +2191,36 @@ msgid "Change password"
 msgstr "Sersüz üzgärtü"
 
 #: libraries/display_change_password.lib.php:35
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:348 server_privileges.php:808
+=======
+#: libraries/replication_gui.lib.php:348 server_privileges.php:807
+>>>>>>> origin/master
 msgid "No Password"
 msgstr "Sersüzsez"
 
 #: libraries/display_change_password.lib.php:41
 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63
 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:352 server_privileges.php:797
 #: server_privileges.php:801 server_privileges.php:812
 #: server_privileges.php:1555 server_synchronize.php:1175
+=======
+#: libraries/replication_gui.lib.php:352 server_privileges.php:796
+#: server_privileges.php:800 server_privileges.php:811
+#: server_privileges.php:1538 server_synchronize.php:1175
+>>>>>>> origin/master
 msgid "Password"
 msgstr "Sersüz"
 
 #: libraries/display_change_password.lib.php:46
 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359
+<<<<<<< HEAD
 #: server_privileges.php:816 server_privileges.php:819
+=======
+#: server_privileges.php:815 server_privileges.php:818
+>>>>>>> origin/master
 msgid "Re-type"
 msgstr "Qabatla"
 
@@ -2097,12 +2235,20 @@ msgid "MySQL 4.0 compatible"
 msgstr "MySQL&nbsp;4.0 öçen yaraqlı"
 
 #: libraries/display_change_password.lib.php:72
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:363 server_privileges.php:823
+=======
+#: libraries/replication_gui.lib.php:363 server_privileges.php:822
+>>>>>>> origin/master
 msgid "Generate Password"
 msgstr "Sersüz Ürçetü"
 
 #: libraries/display_change_password.lib.php:75
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:366 server_privileges.php:826
+=======
+#: libraries/replication_gui.lib.php:366 server_privileges.php:825
+>>>>>>> origin/master
 msgid "Generate"
 msgstr "Ürçet"
 
@@ -2188,7 +2334,11 @@ msgid "remember template"
 msgstr "tözeleşen yatla"
 
 #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552
+=======
+#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549
+>>>>>>> origin/master
 msgid "Character set of the file:"
 msgstr "Şul biremneñ bilgelämäse:"
 
@@ -2241,7 +2391,11 @@ msgstr ""
 msgid "File to import"
 msgstr "Yöklise birem"
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527
+=======
+#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524
+>>>>>>> origin/master
 msgid "Location of the text file"
 msgstr "SQL-ämerlege belän birem yökläw"
 
@@ -2249,12 +2403,20 @@ msgstr "SQL-ämerlege belän birem yökläw"
 msgid "File uploads are not allowed on this server."
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536
+=======
+#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533
+>>>>>>> origin/master
 #: tbl_change.php:1025
 msgid "The directory you set for upload work cannot be reached"
 msgstr "Yökläw öçen bigelängän törgäkne uqıp bulmí"
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539
+=======
+#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536
+>>>>>>> origin/master
 #: tbl_change.php:1028
 msgid "web server upload directory"
 msgstr "web-server'neñ yökläw törgäge"
@@ -2385,7 +2547,11 @@ msgstr "Qullanası tezeş"
 #: libraries/import/docsql.php:34 libraries/import/ldi.php:47
 #: libraries/import/ods.php:30 libraries/import/sql.php:20
 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26
+<<<<<<< HEAD
 #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751
+=======
+#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753
+>>>>>>> origin/master
 #, fuzzy
 msgid "Options"
 msgstr "Eşkärtü"
@@ -2532,7 +2698,11 @@ msgstr "Bufer Pul Totılğanlığı"
 
 #: libraries/engines/innodb.lib.php:194 server_databases.php:137
 #: server_databases.php:305 server_status.php:525 server_status.php:586
+<<<<<<< HEAD
 #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694
+=======
+#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696
+>>>>>>> origin/master
 msgid "Total"
 msgstr "Tulayım"
 
@@ -2792,7 +2962,11 @@ msgid ""
 msgstr ""
 
 #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88
+<<<<<<< HEAD
 #: tbl_printview.php:375 tbl_structure.php:735
+=======
+#: tbl_printview.php:375 tbl_structure.php:737
+>>>>>>> origin/master
 msgid "Format"
 msgstr "Tözeleş"
 
@@ -2864,8 +3038,13 @@ msgstr "Microsoft Word 2000"
 #: libraries/export/latex.php:201 libraries/export/odt.php:48
 #: libraries/export/sql.php:106 libraries/export/sql.php:868
 #: libraries/export/texytext.php:27 server_databases.php:127
+<<<<<<< HEAD
 #: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316
 #: tbl_structure.php:663
+=======
+#: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316
+#: tbl_structure.php:665
+>>>>>>> origin/master
 msgid "Data"
 msgstr "Eçtälek"
 
@@ -2914,9 +3093,15 @@ msgstr "MIME-törläre"
 #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57
 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177
 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:332 server_privileges.php:732
 #: server_privileges.php:735 server_privileges.php:791
 #: server_privileges.php:1554 server_privileges.php:2092
+=======
+#: libraries/replication_gui.lib.php:332 server_privileges.php:731
+#: server_privileges.php:734 server_privileges.php:790
+#: server_privileges.php:1537 server_privileges.php:2069
+>>>>>>> origin/master
 #: server_processlist.php:55 server_synchronize.php:1159
 msgid "Host"
 msgstr "Host"
@@ -3592,8 +3777,13 @@ msgstr ""
 
 #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59
 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:262 server_privileges.php:712
 #: server_privileges.php:715 server_privileges.php:722
+=======
+#: libraries/replication_gui.lib.php:262 server_privileges.php:711
+#: server_privileges.php:714 server_privileges.php:721
+>>>>>>> origin/master
 #: server_synchronize.php:1171
 msgid "User name"
 msgstr "İreşü iseme"
@@ -3611,14 +3801,22 @@ msgstr ""
 msgid "Slave status"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448
+=======
+#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445
+>>>>>>> origin/master
 #: server_status.php:737 server_variables.php:52
 msgid "Variable"
 msgstr "Üzgärmä"
 
 #: libraries/replication_gui.lib.php:118 server_status.php:738
 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138
+<<<<<<< HEAD
 #: tbl_structure.php:727
+=======
+#: tbl_structure.php:729
+>>>>>>> origin/master
 msgid "Value"
 msgstr "Bäyä"
 
@@ -3636,11 +3834,16 @@ msgstr ""
 msgid "Add slave replication user"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:257 server_privileges.php:717
+=======
+#: libraries/replication_gui.lib.php:257 server_privileges.php:716
+>>>>>>> origin/master
 msgid "Any user"
 msgstr "Törle qullanuçı"
 
 #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:349 server_privileges.php:718
 #: server_privileges.php:785 server_privileges.php:809
 #: server_privileges.php:1950 server_privileges.php:1980
@@ -3664,6 +3867,31 @@ msgid "Use Host Table"
 msgstr "Host Tüşämä eçennän"
 
 #: libraries/replication_gui.lib.php:334 server_privileges.php:793
+=======
+#: libraries/replication_gui.lib.php:349 server_privileges.php:717
+#: server_privileges.php:784 server_privileges.php:808
+#: server_privileges.php:1928 server_privileges.php:1958
+msgid "Use text field"
+msgstr "Bu mätennän"
+
+#: libraries/replication_gui.lib.php:305 server_privileges.php:764
+msgid "Any host"
+msgstr "Bar bulğan host"
+
+#: libraries/replication_gui.lib.php:309 server_privileges.php:768
+msgid "Local"
+msgstr "Cirle"
+
+#: libraries/replication_gui.lib.php:315 server_privileges.php:773
+msgid "This Host"
+msgstr "Bu Sanaq"
+
+#: libraries/replication_gui.lib.php:321 server_privileges.php:779
+msgid "Use Host Table"
+msgstr "Host Tüşämä eçennän"
+
+#: libraries/replication_gui.lib.php:334 server_privileges.php:792
+>>>>>>> origin/master
 msgid ""
 "When Host table is used, this field is ignored and values stored in Host "
 "table are used instead."
@@ -7758,10 +7986,13 @@ msgstr ""
 msgid "Show insert query"
 msgstr ""
 
+<<<<<<< HEAD
 #: tbl_change.php:1140
 msgid "and then"
 msgstr ", şunnan soñ"
 
+=======
+>>>>>>> origin/master
 #: tbl_change.php:1144
 msgid "Go back to previous page"
 msgstr "Aldağı bitkä qaytu"
@@ -7959,6 +8190,7 @@ msgstr "Bäyläneşlärne döreslekkä tikşerü:"
 msgid "Show tables"
 msgstr "Tüşämälär kürsätäse"
 
+<<<<<<< HEAD
 #: tbl_printview.php:309 tbl_structure.php:654
 msgid "Space usage"
 msgstr "Totılğan Alan"
@@ -7992,6 +8224,41 @@ msgid "Row length"
 msgstr "Kerem ozınlığı"
 
 #: tbl_printview.php:413 tbl_structure.php:791
+=======
+#: tbl_printview.php:309 tbl_structure.php:656
+msgid "Space usage"
+msgstr "Totılğan Alan"
+
+#: tbl_printview.php:313 tbl_structure.php:660
+msgid "Usage"
+msgstr "Totılu"
+
+#: tbl_printview.php:340 tbl_structure.php:687
+msgid "Effective"
+msgstr "Uñışlı"
+
+#: tbl_printview.php:365 tbl_structure.php:725
+msgid "Row Statistics"
+msgstr "Kerem Nöfüse"
+
+#: tbl_printview.php:368 tbl_structure.php:728
+msgid "Statements"
+msgstr "Cömlä"
+
+#: tbl_printview.php:379 tbl_structure.php:740
+msgid "static"
+msgstr ""
+
+#: tbl_printview.php:381 tbl_structure.php:742
+msgid "dynamic"
+msgstr "üzgärüçän"
+
+#: tbl_printview.php:403 tbl_structure.php:785
+msgid "Row length"
+msgstr "Kerem ozınlığı"
+
+#: tbl_printview.php:413 tbl_structure.php:793
+>>>>>>> origin/master
 msgid " Row size "
 msgstr " Kerem olılığı"
 
diff --git a/po/uk.po b/po/uk.po
index df5a515e3..306cdf342 100755
--- a/po/uk.po
+++ b/po/uk.po
@@ -3,7 +3,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2010-07-03 21:45+0530\n"
+=======
+"POT-Creation-Date: 2010-07-03 09:00-0400\n"
+>>>>>>> origin/master
 "PO-Revision-Date: 2010-03-12 09:19+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: ukrainian <uk@li.org>\n"
@@ -45,15 +49,26 @@ msgstr "Шукати"
 #: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046
 #: libraries/Theme_Manager.class.php:311
 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719
+<<<<<<< HEAD
 #: libraries/common.lib.php:1344 libraries/common.lib.php:2301
 #: libraries/display_change_password.lib.php:82
 #: libraries/display_create_table.lib.php:62
+=======
+#: libraries/common.lib.php:1335 libraries/common.lib.php:2288
+#: libraries/display_change_password.lib.php:82
+#: libraries/display_create_table.lib.php:63
+>>>>>>> origin/master
 #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532
 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76
 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104
+<<<<<<< HEAD
 #: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480
 #: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782
+=======
+#: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477
+#: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782
+>>>>>>> origin/master
 #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328
 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142
 #: server_privileges.php:665 server_privileges.php:1641
@@ -63,8 +78,13 @@ msgstr "Шукати"
 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171
 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265
 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561
+<<<<<<< HEAD
 #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560
 #: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512
+=======
+#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562
+#: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512
+>>>>>>> origin/master
 #: view_create.php:182 view_operations.php:101
 msgid "Go"
 msgstr "Вперед"
@@ -117,10 +137,17 @@ msgstr "Назви колонок"
 #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245
 #: libraries/export/latex.php:360 libraries/export/odt.php:297
 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100
+<<<<<<< HEAD
 #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093
 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
 #: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321
+=======
+#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070
+#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
+#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
+#: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321
+>>>>>>> origin/master
 msgid "Type"
 msgstr "Тип"
 
@@ -161,9 +188,15 @@ msgstr "Коментарі"
 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322
 #: libraries/export/latex.php:430 libraries/export/odt.php:368
 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263
+<<<<<<< HEAD
 #: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596
 #: server_privileges.php:1911 server_privileges.php:1916
 #: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228
+=======
+#: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579
+#: server_privileges.php:1889 server_privileges.php:1894
+#: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228
+>>>>>>> origin/master
 #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342
 msgid "No"
 msgstr "Ні"
@@ -177,9 +210,15 @@ msgstr "Ні"
 #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106
 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262
 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344
+<<<<<<< HEAD
 #: server_databases.php:64 server_privileges.php:1582
 #: server_privileges.php:1596 server_privileges.php:1911
 #: server_privileges.php:1914 server_privileges.php:2210 sql.php:193
+=======
+#: server_databases.php:64 server_privileges.php:1565
+#: server_privileges.php:1579 server_privileges.php:1889
+#: server_privileges.php:1892 server_privileges.php:2187 sql.php:193
+>>>>>>> origin/master
 #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350
 #: tbl_tracking.php:335 tbl_tracking.php:340
 msgid "Yes"
@@ -228,7 +267,15 @@ msgstr ""
 msgid "Command"
 msgstr "Команда"
 
+<<<<<<< HEAD
 #: db_operations.php:466
+=======
+#: db_operations.php:429 tbl_change.php:1140
+msgid "and then"
+msgstr ""
+
+#: db_operations.php:455
+>>>>>>> origin/master
 msgid "Copy database to"
 msgstr ""
 
@@ -316,7 +363,11 @@ msgstr ""
 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730
 #: server_collations.php:54 server_collations.php:66 server_databases.php:111
 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179
+<<<<<<< HEAD
 #: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326
+=======
+#: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326
+>>>>>>> origin/master
 msgid "Collation"
 msgstr "Порівняння"
 
@@ -345,7 +396,11 @@ msgstr "таблиця "
 #: db_printview.php:105 libraries/db_structure.lib.php:56
 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146
 #: navigation.php:638 navigation.php:660 server_databases.php:122
+<<<<<<< HEAD
 #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775
+=======
+#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777
+>>>>>>> origin/master
 msgid "Rows"
 msgstr "Рядки"
 
@@ -360,19 +415,31 @@ msgstr "використовується"
 
 #: db_printview.php:187 libraries/db_info.inc.php:88
 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433
+<<<<<<< HEAD
 #: tbl_structure.php:807
+=======
+#: tbl_structure.php:809
+>>>>>>> origin/master
 msgid "Creation"
 msgstr "Створено"
 
 #: db_printview.php:196 libraries/db_info.inc.php:93
 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443
+<<<<<<< HEAD
 #: tbl_structure.php:815
+=======
+#: tbl_structure.php:817
+>>>>>>> origin/master
 msgid "Last update"
 msgstr "Поновлено"
 
 #: db_printview.php:205 libraries/db_info.inc.php:98
 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453
+<<<<<<< HEAD
 #: tbl_structure.php:823
+=======
+#: tbl_structure.php:825
+>>>>>>> origin/master
 msgid "Last check"
 msgstr "Перевірено"
 
@@ -437,7 +504,11 @@ msgstr "Видалити"
 
 #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553
 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779
+<<<<<<< HEAD
 #: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250
+=======
+#: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250
+>>>>>>> origin/master
 #: tbl_select.php:286
 msgid "Or"
 msgstr "або"
@@ -655,9 +726,15 @@ msgstr "З відміченими:"
 msgid "Check All"
 msgstr "Відмітити все"
 
+<<<<<<< HEAD
 #: db_structure.php:529 libraries/display_tbl.lib.php:2077
 #: libraries/replication_gui.lib.php:36 server_databases.php:350
 #: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460
+=======
+#: db_structure.php:531 libraries/display_tbl.lib.php:2077
+#: libraries/replication_gui.lib.php:36 server_databases.php:350
+#: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462
+>>>>>>> origin/master
 msgid "Uncheck All"
 msgstr "Зняти усі відмітки"
 
@@ -1109,10 +1186,17 @@ msgid "Prev"
 msgstr "Назад"
 
 #. l10n: Display text for next month link in calendar
+<<<<<<< HEAD
 #: js/messages.php:106 libraries/common.lib.php:2366
 #: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338
 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
 #: tbl_structure.php:799
+=======
+#: js/messages.php:77 libraries/common.lib.php:2353
+#: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338
+#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
+#: tbl_structure.php:801
+>>>>>>> origin/master
 msgid "Next"
 msgstr "Дальше"
 
@@ -1648,7 +1732,11 @@ msgstr "Пароль:"
 msgid "Server Choice"
 msgstr "Вибір сервера"
 
+<<<<<<< HEAD
 #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63
+=======
+#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59
+>>>>>>> origin/master
 msgid "Cookies must be enabled past this point."
 msgstr "З цього моменту Cookies повинні бути дозволені."
 
@@ -1729,7 +1817,11 @@ msgstr ""
 "recode_string поки буде завантажено extension reports. Перевірте Вашу php "
 "конфігурацію."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:580
+=======
+#: libraries/common.inc.php:576
+>>>>>>> origin/master
 msgid ""
 "phpMyAdmin was unable to read your configuration file!<br />This might "
 "happen if PHP finds a parse error in it or PHP cannot find the file.<br /"
@@ -1746,12 +1838,20 @@ msgstr ""
 "просто бракує лапок чи двокрапки.  <br />Якщо Ви отримаєте порожню сторінку, "
 "- значить все в порядку."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:591
+=======
+#: libraries/common.inc.php:587
+>>>>>>> origin/master
 #, php-format
 msgid "Could not load default configuration from: %1$s"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:596
+=======
+#: libraries/common.inc.php:592
+>>>>>>> origin/master
 msgid ""
 "The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
 "configuration file!"
@@ -1759,27 +1859,47 @@ msgstr ""
 "Змінна <tt>$cfg['PmaAbsoluteUri']</tt> ПОВИННА бути встановлена у Вашому "
 "конфіґураційному файлі!"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:626
+=======
+#: libraries/common.inc.php:622
+>>>>>>> origin/master
 #, php-format
 msgid "Invalid server index: %s"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:633
+=======
+#: libraries/common.inc.php:629
+>>>>>>> origin/master
 #, php-format
 msgid "Invalid hostname for server %1$s. Please review your configuration."
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:642 libraries/header.inc.php:100
+=======
+#: libraries/common.inc.php:638 libraries/header.inc.php:96
+>>>>>>> origin/master
 #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47
 #: main.php:185 test/theme.php:57
 msgid "Server"
 msgstr "Сервер"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:820
 msgid "Invalid authentication method set in configuration:"
 msgstr ""
 
 #: libraries/common.inc.php:923
+=======
+#: libraries/common.inc.php:816
+msgid "Invalid authentication method set in configuration:"
+msgstr ""
+
+#: libraries/common.inc.php:919
+>>>>>>> origin/master
 #, php-format
 msgid "You should upgrade to %s %s or later."
 msgstr ""
@@ -2022,7 +2142,11 @@ msgid ""
 msgstr ""
 
 #: libraries/db_structure.lib.php:69 server_databases.php:142
+<<<<<<< HEAD
 #: tbl_printview.php:335 tbl_structure.php:680
+=======
+#: tbl_printview.php:335 tbl_structure.php:682
+>>>>>>> origin/master
 msgid "Overhead"
 msgstr "Надмірні видатки"
 
@@ -2049,22 +2173,36 @@ msgid "Change password"
 msgstr "Змінити пароль"
 
 #: libraries/display_change_password.lib.php:35
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:348 server_privileges.php:808
+=======
+#: libraries/replication_gui.lib.php:348 server_privileges.php:807
+>>>>>>> origin/master
 msgid "No Password"
 msgstr "Без паролю"
 
 #: libraries/display_change_password.lib.php:41
 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63
 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:352 server_privileges.php:797
 #: server_privileges.php:801 server_privileges.php:812
 #: server_privileges.php:1555 server_synchronize.php:1175
+=======
+#: libraries/replication_gui.lib.php:352 server_privileges.php:796
+#: server_privileges.php:800 server_privileges.php:811
+#: server_privileges.php:1538 server_synchronize.php:1175
+>>>>>>> origin/master
 msgid "Password"
 msgstr "Пароль"
 
 #: libraries/display_change_password.lib.php:46
 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359
+<<<<<<< HEAD
 #: server_privileges.php:816 server_privileges.php:819
+=======
+#: server_privileges.php:815 server_privileges.php:818
+>>>>>>> origin/master
 msgid "Re-type"
 msgstr "Підтвердження"
 
@@ -2077,12 +2215,20 @@ msgid "MySQL 4.0 compatible"
 msgstr ""
 
 #: libraries/display_change_password.lib.php:72
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:363 server_privileges.php:823
+=======
+#: libraries/replication_gui.lib.php:363 server_privileges.php:822
+>>>>>>> origin/master
 msgid "Generate Password"
 msgstr ""
 
 #: libraries/display_change_password.lib.php:75
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:366 server_privileges.php:826
+=======
+#: libraries/replication_gui.lib.php:366 server_privileges.php:825
+>>>>>>> origin/master
 msgid "Generate"
 msgstr ""
 
@@ -2167,7 +2313,11 @@ msgid "remember template"
 msgstr "запам'ятати шаблон"
 
 #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552
+=======
+#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549
+>>>>>>> origin/master
 msgid "Character set of the file:"
 msgstr "Кодування файлу:"
 
@@ -2220,7 +2370,11 @@ msgstr ""
 msgid "File to import"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527
+=======
+#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524
+>>>>>>> origin/master
 msgid "Location of the text file"
 msgstr "вкажіть розташування текстового файлу"
 
@@ -2228,12 +2382,20 @@ msgstr "вкажіть розташування текстового файлу"
 msgid "File uploads are not allowed on this server."
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536
+=======
+#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533
+>>>>>>> origin/master
 #: tbl_change.php:1025
 msgid "The directory you set for upload work cannot be reached"
 msgstr "Встановлений Вами каталог для завантаження файлів недоступний"
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539
+=======
+#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536
+>>>>>>> origin/master
 #: tbl_change.php:1028
 msgid "web server upload directory"
 msgstr "каталог веб-сервера для завантаження файлів (upload directory)"
@@ -2362,7 +2524,11 @@ msgstr ""
 #: libraries/import/docsql.php:34 libraries/import/ldi.php:47
 #: libraries/import/ods.php:30 libraries/import/sql.php:20
 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26
+<<<<<<< HEAD
 #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751
+=======
+#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753
+>>>>>>> origin/master
 msgid "Options"
 msgstr ""
 
@@ -2505,7 +2671,11 @@ msgstr ""
 
 #: libraries/engines/innodb.lib.php:194 server_databases.php:137
 #: server_databases.php:305 server_status.php:525 server_status.php:586
+<<<<<<< HEAD
 #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694
+=======
+#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696
+>>>>>>> origin/master
 msgid "Total"
 msgstr "Разом"
 
@@ -2750,7 +2920,11 @@ msgid ""
 msgstr ""
 
 #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88
+<<<<<<< HEAD
 #: tbl_printview.php:375 tbl_structure.php:735
+=======
+#: tbl_printview.php:375 tbl_structure.php:737
+>>>>>>> origin/master
 msgid "Format"
 msgstr "Формат"
 
@@ -2822,8 +2996,13 @@ msgstr ""
 #: libraries/export/latex.php:201 libraries/export/odt.php:48
 #: libraries/export/sql.php:106 libraries/export/sql.php:868
 #: libraries/export/texytext.php:27 server_databases.php:127
+<<<<<<< HEAD
 #: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316
 #: tbl_structure.php:663
+=======
+#: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316
+#: tbl_structure.php:665
+>>>>>>> origin/master
 msgid "Data"
 msgstr "Дані"
 
@@ -2872,9 +3051,15 @@ msgstr "MIME-type"
 #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57
 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177
 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:332 server_privileges.php:732
 #: server_privileges.php:735 server_privileges.php:791
 #: server_privileges.php:1554 server_privileges.php:2092
+=======
+#: libraries/replication_gui.lib.php:332 server_privileges.php:731
+#: server_privileges.php:734 server_privileges.php:790
+#: server_privileges.php:1537 server_privileges.php:2069
+>>>>>>> origin/master
 #: server_processlist.php:55 server_synchronize.php:1159
 msgid "Host"
 msgstr "Хост"
@@ -3538,8 +3723,13 @@ msgstr ""
 
 #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59
 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:262 server_privileges.php:712
 #: server_privileges.php:715 server_privileges.php:722
+=======
+#: libraries/replication_gui.lib.php:262 server_privileges.php:711
+#: server_privileges.php:714 server_privileges.php:721
+>>>>>>> origin/master
 #: server_synchronize.php:1171
 msgid "User name"
 msgstr "Ім'я користувача"
@@ -3556,14 +3746,22 @@ msgstr ""
 msgid "Slave status"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448
+=======
+#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445
+>>>>>>> origin/master
 #: server_status.php:737 server_variables.php:52
 msgid "Variable"
 msgstr "Змінна"
 
 #: libraries/replication_gui.lib.php:118 server_status.php:738
 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138
+<<<<<<< HEAD
 #: tbl_structure.php:727
+=======
+#: tbl_structure.php:729
+>>>>>>> origin/master
 msgid "Value"
 msgstr "Значення"
 
@@ -3581,11 +3779,16 @@ msgstr ""
 msgid "Add slave replication user"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:257 server_privileges.php:717
+=======
+#: libraries/replication_gui.lib.php:257 server_privileges.php:716
+>>>>>>> origin/master
 msgid "Any user"
 msgstr "Довільний користувач"
 
 #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:349 server_privileges.php:718
 #: server_privileges.php:785 server_privileges.php:809
 #: server_privileges.php:1950 server_privileges.php:1980
@@ -3609,6 +3812,31 @@ msgid "Use Host Table"
 msgstr "Використовувати Таблицю Хостів"
 
 #: libraries/replication_gui.lib.php:334 server_privileges.php:793
+=======
+#: libraries/replication_gui.lib.php:349 server_privileges.php:717
+#: server_privileges.php:784 server_privileges.php:808
+#: server_privileges.php:1928 server_privileges.php:1958
+msgid "Use text field"
+msgstr "Використовувати текстове поле"
+
+#: libraries/replication_gui.lib.php:305 server_privileges.php:764
+msgid "Any host"
+msgstr "Довільний хост"
+
+#: libraries/replication_gui.lib.php:309 server_privileges.php:768
+msgid "Local"
+msgstr "Локальний"
+
+#: libraries/replication_gui.lib.php:315 server_privileges.php:773
+msgid "This Host"
+msgstr "Цей хост"
+
+#: libraries/replication_gui.lib.php:321 server_privileges.php:779
+msgid "Use Host Table"
+msgstr "Використовувати Таблицю Хостів"
+
+#: libraries/replication_gui.lib.php:334 server_privileges.php:792
+>>>>>>> origin/master
 msgid ""
 "When Host table is used, this field is ignored and values stored in Host "
 "table are used instead."
@@ -7610,10 +7838,13 @@ msgstr ""
 msgid "Show insert query"
 msgstr ""
 
+<<<<<<< HEAD
 #: tbl_change.php:1140
 msgid "and then"
 msgstr ""
 
+=======
+>>>>>>> origin/master
 #: tbl_change.php:1144
 msgid "Go back to previous page"
 msgstr "Повернутись"
@@ -7806,6 +8037,7 @@ msgstr "Перевір цілісність даних на рівні поси
 msgid "Show tables"
 msgstr "Показати таблиці"
 
+<<<<<<< HEAD
 #: tbl_printview.php:309 tbl_structure.php:654
 msgid "Space usage"
 msgstr "Простір, що використовується"
@@ -7839,6 +8071,41 @@ msgid "Row length"
 msgstr "Довжина рядка"
 
 #: tbl_printview.php:413 tbl_structure.php:791
+=======
+#: tbl_printview.php:309 tbl_structure.php:656
+msgid "Space usage"
+msgstr "Простір, що використовується"
+
+#: tbl_printview.php:313 tbl_structure.php:660
+msgid "Usage"
+msgstr "Використання"
+
+#: tbl_printview.php:340 tbl_structure.php:687
+msgid "Effective"
+msgstr "Ефективність"
+
+#: tbl_printview.php:365 tbl_structure.php:725
+msgid "Row Statistics"
+msgstr "Статистика рядка"
+
+#: tbl_printview.php:368 tbl_structure.php:728
+msgid "Statements"
+msgstr "Параметр"
+
+#: tbl_printview.php:379 tbl_structure.php:740
+msgid "static"
+msgstr ""
+
+#: tbl_printview.php:381 tbl_structure.php:742
+msgid "dynamic"
+msgstr "динамічний"
+
+#: tbl_printview.php:403 tbl_structure.php:785
+msgid "Row length"
+msgstr "Довжина рядка"
+
+#: tbl_printview.php:413 tbl_structure.php:793
+>>>>>>> origin/master
 msgid " Row size "
 msgstr " Розмір рядка "
 
diff --git a/po/ur.po b/po/ur.po
index fa4b08747..aacdc5e29 100755
--- a/po/ur.po
+++ b/po/ur.po
@@ -6,7 +6,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2010-07-03 21:45+0530\n"
+=======
+"POT-Creation-Date: 2010-07-03 09:00-0400\n"
+>>>>>>> origin/master
 "PO-Revision-Date: 2010-05-14 12:35+0200\n"
 "Last-Translator:  <monymirza@gmail.com>\n"
 "Language-Team: Urdu <ur@li.org>\n"
@@ -52,15 +56,26 @@ msgstr "تلاش"
 #: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046
 #: libraries/Theme_Manager.class.php:311
 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719
+<<<<<<< HEAD
 #: libraries/common.lib.php:1344 libraries/common.lib.php:2301
 #: libraries/display_change_password.lib.php:82
 #: libraries/display_create_table.lib.php:62
+=======
+#: libraries/common.lib.php:1335 libraries/common.lib.php:2288
+#: libraries/display_change_password.lib.php:82
+#: libraries/display_create_table.lib.php:63
+>>>>>>> origin/master
 #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532
 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76
 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104
+<<<<<<< HEAD
 #: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480
 #: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782
+=======
+#: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477
+#: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782
+>>>>>>> origin/master
 #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328
 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142
 #: server_privileges.php:665 server_privileges.php:1641
@@ -70,8 +85,13 @@ msgstr "تلاش"
 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171
 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265
 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561
+<<<<<<< HEAD
 #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560
 #: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512
+=======
+#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562
+#: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512
+>>>>>>> origin/master
 #: view_create.php:182 view_operations.php:101
 msgid "Go"
 msgstr "جائو"
@@ -124,10 +144,17 @@ msgstr "کمانڈ"
 #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245
 #: libraries/export/latex.php:360 libraries/export/odt.php:297
 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100
+<<<<<<< HEAD
 #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093
 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
 #: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321
+=======
+#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070
+#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
+#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
+#: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321
+>>>>>>> origin/master
 msgid "Type"
 msgstr "قِسم"
 
@@ -168,9 +195,15 @@ msgstr "آراء-رائے"
 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322
 #: libraries/export/latex.php:430 libraries/export/odt.php:368
 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263
+<<<<<<< HEAD
 #: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596
 #: server_privileges.php:1911 server_privileges.php:1916
 #: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228
+=======
+#: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579
+#: server_privileges.php:1889 server_privileges.php:1894
+#: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228
+>>>>>>> origin/master
 #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342
 msgid "No"
 msgstr "نہیں"
@@ -184,9 +217,15 @@ msgstr "نہیں"
 #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106
 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262
 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344
+<<<<<<< HEAD
 #: server_databases.php:64 server_privileges.php:1582
 #: server_privileges.php:1596 server_privileges.php:1911
 #: server_privileges.php:1914 server_privileges.php:2210 sql.php:193
+=======
+#: server_databases.php:64 server_privileges.php:1565
+#: server_privileges.php:1579 server_privileges.php:1889
+#: server_privileges.php:1892 server_privileges.php:2187 sql.php:193
+>>>>>>> origin/master
 #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350
 #: tbl_tracking.php:335 tbl_tracking.php:340
 msgid "Yes"
@@ -235,7 +274,15 @@ msgstr "ڈیٹا بیس کا نام بدلیں"
 msgid "Command"
 msgstr "کمانڈ"
 
+<<<<<<< HEAD
 #: db_operations.php:466
+=======
+#: db_operations.php:429 tbl_change.php:1140
+msgid "and then"
+msgstr "اور پھر"
+
+#: db_operations.php:455
+>>>>>>> origin/master
 msgid "Copy database to"
 msgstr "ڈیٹا بیس کاپی کریں"
 
@@ -317,7 +364,11 @@ msgstr "فعال"
 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730
 #: server_collations.php:54 server_collations.php:66 server_databases.php:111
 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179
+<<<<<<< HEAD
 #: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326
+=======
+#: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326
+>>>>>>> origin/master
 msgid "Collation"
 msgstr "کولیکشن"
 
@@ -346,7 +397,11 @@ msgstr "ٹیبل"
 #: db_printview.php:105 libraries/db_structure.lib.php:56
 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146
 #: navigation.php:638 navigation.php:660 server_databases.php:122
+<<<<<<< HEAD
 #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775
+=======
+#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777
+>>>>>>> origin/master
 msgid "Rows"
 msgstr ""
 
@@ -361,19 +416,31 @@ msgstr "استعمال میں"
 
 #: db_printview.php:187 libraries/db_info.inc.php:88
 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433
+<<<<<<< HEAD
 #: tbl_structure.php:807
+=======
+#: tbl_structure.php:809
+>>>>>>> origin/master
 msgid "Creation"
 msgstr "تخلیق"
 
 #: db_printview.php:196 libraries/db_info.inc.php:93
 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443
+<<<<<<< HEAD
 #: tbl_structure.php:815
+=======
+#: tbl_structure.php:817
+>>>>>>> origin/master
 msgid "Last update"
 msgstr "آخری دفعہ اپ ڈیٹ"
 
 #: db_printview.php:205 libraries/db_info.inc.php:98
 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453
+<<<<<<< HEAD
 #: tbl_structure.php:823
+=======
+#: tbl_structure.php:825
+>>>>>>> origin/master
 msgid "Last check"
 msgstr "آخری دفعہ چیک"
 
@@ -438,7 +505,11 @@ msgstr "Del"
 
 #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553
 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779
+<<<<<<< HEAD
 #: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250
+=======
+#: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250
+>>>>>>> origin/master
 #: tbl_select.php:286
 msgid "Or"
 msgstr "یا"
@@ -658,9 +729,15 @@ msgstr "With selected:"
 msgid "Check All"
 msgstr "چیک آل"
 
+<<<<<<< HEAD
 #: db_structure.php:529 libraries/display_tbl.lib.php:2077
 #: libraries/replication_gui.lib.php:36 server_databases.php:350
 #: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460
+=======
+#: db_structure.php:531 libraries/display_tbl.lib.php:2077
+#: libraries/replication_gui.lib.php:36 server_databases.php:350
+#: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462
+>>>>>>> origin/master
 msgid "Uncheck All"
 msgstr "ان چیک آل"
 
@@ -1104,10 +1181,17 @@ msgid "Prev"
 msgstr ""
 
 #. l10n: Display text for next month link in calendar
+<<<<<<< HEAD
 #: js/messages.php:106 libraries/common.lib.php:2366
 #: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338
 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
 #: tbl_structure.php:799
+=======
+#: js/messages.php:77 libraries/common.lib.php:2353
+#: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338
+#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
+#: tbl_structure.php:801
+>>>>>>> origin/master
 msgid "Next"
 msgstr ""
 
@@ -1595,7 +1679,11 @@ msgstr ""
 msgid "Server Choice"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63
+=======
+#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59
+>>>>>>> origin/master
 msgid "Cookies must be enabled past this point."
 msgstr ""
 
@@ -1670,7 +1758,11 @@ msgid ""
 "necessary extensions appear to be loaded. Check your PHP configuration."
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:580
+=======
+#: libraries/common.inc.php:576
+>>>>>>> origin/master
 msgid ""
 "phpMyAdmin was unable to read your configuration file!<br />This might "
 "happen if PHP finds a parse error in it or PHP cannot find the file.<br /"
@@ -1680,38 +1772,66 @@ msgid ""
 "is fine."
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:591
+=======
+#: libraries/common.inc.php:587
+>>>>>>> origin/master
 #, php-format
 msgid "Could not load default configuration from: %1$s"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:596
+=======
+#: libraries/common.inc.php:592
+>>>>>>> origin/master
 msgid ""
 "The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
 "configuration file!"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:626
+=======
+#: libraries/common.inc.php:622
+>>>>>>> origin/master
 #, php-format
 msgid "Invalid server index: %s"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:633
+=======
+#: libraries/common.inc.php:629
+>>>>>>> origin/master
 #, php-format
 msgid "Invalid hostname for server %1$s. Please review your configuration."
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:642 libraries/header.inc.php:100
+=======
+#: libraries/common.inc.php:638 libraries/header.inc.php:96
+>>>>>>> origin/master
 #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47
 #: main.php:185 test/theme.php:57
 msgid "Server"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:820
 msgid "Invalid authentication method set in configuration:"
 msgstr ""
 
 #: libraries/common.inc.php:923
+=======
+#: libraries/common.inc.php:816
+msgid "Invalid authentication method set in configuration:"
+msgstr ""
+
+#: libraries/common.inc.php:919
+>>>>>>> origin/master
 #, php-format
 msgid "You should upgrade to %s %s or later."
 msgstr ""
@@ -1954,7 +2074,11 @@ msgid ""
 msgstr ""
 
 #: libraries/db_structure.lib.php:69 server_databases.php:142
+<<<<<<< HEAD
 #: tbl_printview.php:335 tbl_structure.php:680
+=======
+#: tbl_printview.php:335 tbl_structure.php:682
+>>>>>>> origin/master
 msgid "Overhead"
 msgstr ""
 
@@ -1981,22 +2105,36 @@ msgid "Change password"
 msgstr ""
 
 #: libraries/display_change_password.lib.php:35
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:348 server_privileges.php:808
+=======
+#: libraries/replication_gui.lib.php:348 server_privileges.php:807
+>>>>>>> origin/master
 msgid "No Password"
 msgstr ""
 
 #: libraries/display_change_password.lib.php:41
 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63
 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:352 server_privileges.php:797
 #: server_privileges.php:801 server_privileges.php:812
 #: server_privileges.php:1555 server_synchronize.php:1175
+=======
+#: libraries/replication_gui.lib.php:352 server_privileges.php:796
+#: server_privileges.php:800 server_privileges.php:811
+#: server_privileges.php:1538 server_synchronize.php:1175
+>>>>>>> origin/master
 msgid "Password"
 msgstr ""
 
 #: libraries/display_change_password.lib.php:46
 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359
+<<<<<<< HEAD
 #: server_privileges.php:816 server_privileges.php:819
+=======
+#: server_privileges.php:815 server_privileges.php:818
+>>>>>>> origin/master
 msgid "Re-type"
 msgstr ""
 
@@ -2009,12 +2147,20 @@ msgid "MySQL 4.0 compatible"
 msgstr ""
 
 #: libraries/display_change_password.lib.php:72
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:363 server_privileges.php:823
+=======
+#: libraries/replication_gui.lib.php:363 server_privileges.php:822
+>>>>>>> origin/master
 msgid "Generate Password"
 msgstr ""
 
 #: libraries/display_change_password.lib.php:75
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:366 server_privileges.php:826
+=======
+#: libraries/replication_gui.lib.php:366 server_privileges.php:825
+>>>>>>> origin/master
 msgid "Generate"
 msgstr ""
 
@@ -2096,7 +2242,11 @@ msgid "remember template"
 msgstr ""
 
 #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552
+=======
+#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549
+>>>>>>> origin/master
 msgid "Character set of the file:"
 msgstr ""
 
@@ -2149,7 +2299,11 @@ msgstr ""
 msgid "File to import"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527
+=======
+#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524
+>>>>>>> origin/master
 msgid "Location of the text file"
 msgstr ""
 
@@ -2157,12 +2311,20 @@ msgstr ""
 msgid "File uploads are not allowed on this server."
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536
+=======
+#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533
+>>>>>>> origin/master
 #: tbl_change.php:1025
 msgid "The directory you set for upload work cannot be reached"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539
+=======
+#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536
+>>>>>>> origin/master
 #: tbl_change.php:1028
 msgid "web server upload directory"
 msgstr ""
@@ -2289,7 +2451,11 @@ msgstr ""
 #: libraries/import/docsql.php:34 libraries/import/ldi.php:47
 #: libraries/import/ods.php:30 libraries/import/sql.php:20
 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26
+<<<<<<< HEAD
 #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751
+=======
+#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753
+>>>>>>> origin/master
 msgid "Options"
 msgstr ""
 
@@ -2430,7 +2596,11 @@ msgstr ""
 
 #: libraries/engines/innodb.lib.php:194 server_databases.php:137
 #: server_databases.php:305 server_status.php:525 server_status.php:586
+<<<<<<< HEAD
 #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694
+=======
+#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696
+>>>>>>> origin/master
 msgid "Total"
 msgstr ""
 
@@ -2675,7 +2845,11 @@ msgid ""
 msgstr ""
 
 #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88
+<<<<<<< HEAD
 #: tbl_printview.php:375 tbl_structure.php:735
+=======
+#: tbl_printview.php:375 tbl_structure.php:737
+>>>>>>> origin/master
 msgid "Format"
 msgstr ""
 
@@ -2739,8 +2913,13 @@ msgstr ""
 #: libraries/export/latex.php:201 libraries/export/odt.php:48
 #: libraries/export/sql.php:106 libraries/export/sql.php:868
 #: libraries/export/texytext.php:27 server_databases.php:127
+<<<<<<< HEAD
 #: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316
 #: tbl_structure.php:663
+=======
+#: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316
+#: tbl_structure.php:665
+>>>>>>> origin/master
 msgid "Data"
 msgstr ""
 
@@ -2789,9 +2968,15 @@ msgstr ""
 #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57
 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177
 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:332 server_privileges.php:732
 #: server_privileges.php:735 server_privileges.php:791
 #: server_privileges.php:1554 server_privileges.php:2092
+=======
+#: libraries/replication_gui.lib.php:332 server_privileges.php:731
+#: server_privileges.php:734 server_privileges.php:790
+#: server_privileges.php:1537 server_privileges.php:2069
+>>>>>>> origin/master
 #: server_processlist.php:55 server_synchronize.php:1159
 msgid "Host"
 msgstr ""
@@ -3449,8 +3634,13 @@ msgstr ""
 
 #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59
 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:262 server_privileges.php:712
 #: server_privileges.php:715 server_privileges.php:722
+=======
+#: libraries/replication_gui.lib.php:262 server_privileges.php:711
+#: server_privileges.php:714 server_privileges.php:721
+>>>>>>> origin/master
 #: server_synchronize.php:1171
 msgid "User name"
 msgstr ""
@@ -3467,14 +3657,22 @@ msgstr ""
 msgid "Slave status"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448
+=======
+#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445
+>>>>>>> origin/master
 #: server_status.php:737 server_variables.php:52
 msgid "Variable"
 msgstr ""
 
 #: libraries/replication_gui.lib.php:118 server_status.php:738
 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138
+<<<<<<< HEAD
 #: tbl_structure.php:727
+=======
+#: tbl_structure.php:729
+>>>>>>> origin/master
 msgid "Value"
 msgstr ""
 
@@ -3492,11 +3690,16 @@ msgstr ""
 msgid "Add slave replication user"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:257 server_privileges.php:717
+=======
+#: libraries/replication_gui.lib.php:257 server_privileges.php:716
+>>>>>>> origin/master
 msgid "Any user"
 msgstr ""
 
 #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:349 server_privileges.php:718
 #: server_privileges.php:785 server_privileges.php:809
 #: server_privileges.php:1950 server_privileges.php:1980
@@ -3520,6 +3723,31 @@ msgid "Use Host Table"
 msgstr ""
 
 #: libraries/replication_gui.lib.php:334 server_privileges.php:793
+=======
+#: libraries/replication_gui.lib.php:349 server_privileges.php:717
+#: server_privileges.php:784 server_privileges.php:808
+#: server_privileges.php:1928 server_privileges.php:1958
+msgid "Use text field"
+msgstr ""
+
+#: libraries/replication_gui.lib.php:305 server_privileges.php:764
+msgid "Any host"
+msgstr ""
+
+#: libraries/replication_gui.lib.php:309 server_privileges.php:768
+msgid "Local"
+msgstr ""
+
+#: libraries/replication_gui.lib.php:315 server_privileges.php:773
+msgid "This Host"
+msgstr ""
+
+#: libraries/replication_gui.lib.php:321 server_privileges.php:779
+msgid "Use Host Table"
+msgstr ""
+
+#: libraries/replication_gui.lib.php:334 server_privileges.php:792
+>>>>>>> origin/master
 msgid ""
 "When Host table is used, this field is ignored and values stored in Host "
 "table are used instead."
@@ -7385,10 +7613,13 @@ msgstr ""
 msgid "Show insert query"
 msgstr ""
 
+<<<<<<< HEAD
 #: tbl_change.php:1140
 msgid "and then"
 msgstr "اور پھر"
 
+=======
+>>>>>>> origin/master
 #: tbl_change.php:1144
 msgid "Go back to previous page"
 msgstr ""
@@ -7579,6 +7810,7 @@ msgstr ""
 msgid "Show tables"
 msgstr ""
 
+<<<<<<< HEAD
 #: tbl_printview.php:309 tbl_structure.php:654
 msgid "Space usage"
 msgstr ""
@@ -7612,6 +7844,41 @@ msgid "Row length"
 msgstr ""
 
 #: tbl_printview.php:413 tbl_structure.php:791
+=======
+#: tbl_printview.php:309 tbl_structure.php:656
+msgid "Space usage"
+msgstr ""
+
+#: tbl_printview.php:313 tbl_structure.php:660
+msgid "Usage"
+msgstr ""
+
+#: tbl_printview.php:340 tbl_structure.php:687
+msgid "Effective"
+msgstr ""
+
+#: tbl_printview.php:365 tbl_structure.php:725
+msgid "Row Statistics"
+msgstr ""
+
+#: tbl_printview.php:368 tbl_structure.php:728
+msgid "Statements"
+msgstr ""
+
+#: tbl_printview.php:379 tbl_structure.php:740
+msgid "static"
+msgstr ""
+
+#: tbl_printview.php:381 tbl_structure.php:742
+msgid "dynamic"
+msgstr ""
+
+#: tbl_printview.php:403 tbl_structure.php:785
+msgid "Row length"
+msgstr ""
+
+#: tbl_printview.php:413 tbl_structure.php:793
+>>>>>>> origin/master
 msgid " Row size "
 msgstr ""
 
diff --git a/po/uz.po b/po/uz.po
index 4dbebf5b7..a139a307b 100755
--- a/po/uz.po
+++ b/po/uz.po
@@ -3,7 +3,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2010-07-03 21:45+0530\n"
+=======
+"POT-Creation-Date: 2010-07-03 09:00-0400\n"
+>>>>>>> origin/master
 "PO-Revision-Date: 2010-03-12 09:20+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: uzbek_cyrillic <uz@li.org>\n"
@@ -47,15 +51,26 @@ msgstr "Қидириш"
 #: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046
 #: libraries/Theme_Manager.class.php:311
 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719
+<<<<<<< HEAD
 #: libraries/common.lib.php:1344 libraries/common.lib.php:2301
 #: libraries/display_change_password.lib.php:82
 #: libraries/display_create_table.lib.php:62
+=======
+#: libraries/common.lib.php:1335 libraries/common.lib.php:2288
+#: libraries/display_change_password.lib.php:82
+#: libraries/display_create_table.lib.php:63
+>>>>>>> origin/master
 #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532
 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76
 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104
+<<<<<<< HEAD
 #: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480
 #: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782
+=======
+#: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477
+#: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782
+>>>>>>> origin/master
 #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328
 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142
 #: server_privileges.php:665 server_privileges.php:1641
@@ -65,8 +80,13 @@ msgstr "Қидириш"
 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171
 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265
 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561
+<<<<<<< HEAD
 #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560
 #: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512
+=======
+#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562
+#: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512
+>>>>>>> origin/master
 #: view_create.php:182 view_operations.php:101
 msgid "Go"
 msgstr "OK"
@@ -119,10 +139,17 @@ msgstr "Майдон номлари"
 #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245
 #: libraries/export/latex.php:360 libraries/export/odt.php:297
 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100
+<<<<<<< HEAD
 #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093
 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
 #: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321
+=======
+#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070
+#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
+#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
+#: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321
+>>>>>>> origin/master
 msgid "Type"
 msgstr "Тур"
 
@@ -163,9 +190,15 @@ msgstr "Изоҳлар"
 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322
 #: libraries/export/latex.php:430 libraries/export/odt.php:368
 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263
+<<<<<<< HEAD
 #: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596
 #: server_privileges.php:1911 server_privileges.php:1916
 #: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228
+=======
+#: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579
+#: server_privileges.php:1889 server_privileges.php:1894
+#: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228
+>>>>>>> origin/master
 #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342
 msgid "No"
 msgstr "Йўқ"
@@ -179,9 +212,15 @@ msgstr "Йўқ"
 #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106
 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262
 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344
+<<<<<<< HEAD
 #: server_databases.php:64 server_privileges.php:1582
 #: server_privileges.php:1596 server_privileges.php:1911
 #: server_privileges.php:1914 server_privileges.php:2210 sql.php:193
+=======
+#: server_databases.php:64 server_privileges.php:1565
+#: server_privileges.php:1579 server_privileges.php:1889
+#: server_privileges.php:1892 server_privileges.php:2187 sql.php:193
+>>>>>>> origin/master
 #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350
 #: tbl_tracking.php:335 tbl_tracking.php:340
 msgid "Yes"
@@ -230,7 +269,15 @@ msgstr "Маълумотлар базаси номини қуйидагига ў
 msgid "Command"
 msgstr "Буйруқ"
 
+<<<<<<< HEAD
 #: db_operations.php:466
+=======
+#: db_operations.php:429 tbl_change.php:1140
+msgid "and then"
+msgstr "ва сўнг"
+
+#: db_operations.php:455
+>>>>>>> origin/master
 msgid "Copy database to"
 msgstr "Маълумотлар базасидан қуйидагига нусха олиш"
 
@@ -318,7 +365,11 @@ msgstr "Фаоллантириш"
 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730
 #: server_collations.php:54 server_collations.php:66 server_databases.php:111
 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179
+<<<<<<< HEAD
 #: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326
+=======
+#: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326
+>>>>>>> origin/master
 msgid "Collation"
 msgstr "Таққослаш"
 
@@ -347,7 +398,11 @@ msgstr "Жадвал "
 #: db_printview.php:105 libraries/db_structure.lib.php:56
 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146
 #: navigation.php:638 navigation.php:660 server_databases.php:122
+<<<<<<< HEAD
 #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775
+=======
+#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777
+>>>>>>> origin/master
 msgid "Rows"
 msgstr "Қаторларсони"
 
@@ -362,19 +417,31 @@ msgstr "ишлатилмоқда"
 
 #: db_printview.php:187 libraries/db_info.inc.php:88
 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433
+<<<<<<< HEAD
 #: tbl_structure.php:807
+=======
+#: tbl_structure.php:809
+>>>>>>> origin/master
 msgid "Creation"
 msgstr "Тузиш"
 
 #: db_printview.php:196 libraries/db_info.inc.php:93
 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443
+<<<<<<< HEAD
 #: tbl_structure.php:815
+=======
+#: tbl_structure.php:817
+>>>>>>> origin/master
 msgid "Last update"
 msgstr "Охирги янгиланиш"
 
 #: db_printview.php:205 libraries/db_info.inc.php:98
 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453
+<<<<<<< HEAD
 #: tbl_structure.php:823
+=======
+#: tbl_structure.php:825
+>>>>>>> origin/master
 msgid "Last check"
 msgstr "Охирги текширув"
 
@@ -439,7 +506,11 @@ msgstr "Ўчириш"
 
 #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553
 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779
+<<<<<<< HEAD
 #: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250
+=======
+#: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250
+>>>>>>> origin/master
 #: tbl_select.php:286
 msgid "Or"
 msgstr "Ёки"
@@ -659,9 +730,15 @@ msgstr "Белгиланганларни: "
 msgid "Check All"
 msgstr "Барчасини белгилаш"
 
+<<<<<<< HEAD
 #: db_structure.php:529 libraries/display_tbl.lib.php:2077
 #: libraries/replication_gui.lib.php:36 server_databases.php:350
 #: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460
+=======
+#: db_structure.php:531 libraries/display_tbl.lib.php:2077
+#: libraries/replication_gui.lib.php:36 server_databases.php:350
+#: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462
+>>>>>>> origin/master
 msgid "Uncheck All"
 msgstr "Белгилашни бекор қилиш"
 
@@ -1133,10 +1210,17 @@ msgid "Prev"
 msgstr "Орқага"
 
 #. l10n: Display text for next month link in calendar
+<<<<<<< HEAD
 #: js/messages.php:106 libraries/common.lib.php:2366
 #: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338
 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
 #: tbl_structure.php:799
+=======
+#: js/messages.php:77 libraries/common.lib.php:2353
+#: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338
+#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
+#: tbl_structure.php:801
+>>>>>>> origin/master
 msgid "Next"
 msgstr "Кейинги"
 
@@ -1684,7 +1768,11 @@ msgstr "Парол:"
 msgid "Server Choice"
 msgstr "Серверни танланг"
 
+<<<<<<< HEAD
 #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63
+=======
+#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59
+>>>>>>> origin/master
 msgid "Cookies must be enabled past this point."
 msgstr "Браузерда \"cookies\" фаоллаштирилган бўлиши шарт."
 
@@ -1770,7 +1858,11 @@ msgstr ""
 "\"recode_string\" функциясини ишлатиб бўлмади. Эҳтимол, PHP ни созлашда "
 "хатолик мавжуд."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:580
+=======
+#: libraries/common.inc.php:576
+>>>>>>> origin/master
 msgid ""
 "phpMyAdmin was unable to read your configuration file!<br />This might "
 "happen if PHP finds a parse error in it or PHP cannot find the file.<br /"
@@ -1785,13 +1877,21 @@ msgstr ""
 "ни кўриб чиқинг. Кўп ҳолларда қўштирноқ ёки нуқта-вергул қолдириб кетилган "
 "бўлади.<br />Агар бўм-бўш саҳифа кўрсатилса, демак, ҳаммаси жойида."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:591
+=======
+#: libraries/common.inc.php:587
+>>>>>>> origin/master
 #, fuzzy, php-format
 #| msgid "Could not load default configuration from: \"%1$s\""
 msgid "Could not load default configuration from: %1$s"
 msgstr " \"%1$s\" файлидан андоза конфигурацияни юклаб бўлмади."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:596
+=======
+#: libraries/common.inc.php:592
+>>>>>>> origin/master
 msgid ""
 "The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
 "configuration file!"
@@ -1799,31 +1899,51 @@ msgstr ""
 "<tt>$cfg[\"PmaAbsoluteUrl\"]</tt> директиваси конфигурацион файлда созланиши "
 "ШАРТ!"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:626
+=======
+#: libraries/common.inc.php:622
+>>>>>>> origin/master
 #, fuzzy, php-format
 #| msgid "Invalid server index: \"%s\""
 msgid "Invalid server index: %s"
 msgstr "Сервер рақами нотўғри: \"%s\""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:633
+=======
+#: libraries/common.inc.php:629
+>>>>>>> origin/master
 #, php-format
 msgid "Invalid hostname for server %1$s. Please review your configuration."
 msgstr ""
 " %1$s сервери учун нотўғри хост номи кўрсатилган. phpMyAdmin конфигурацион "
 "файлида белгиланган созлашларни тўғирланг."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:642 libraries/header.inc.php:100
+=======
+#: libraries/common.inc.php:638 libraries/header.inc.php:96
+>>>>>>> origin/master
 #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47
 #: main.php:185 test/theme.php:57
 msgid "Server"
 msgstr "Сервер"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:820
+=======
+#: libraries/common.inc.php:816
+>>>>>>> origin/master
 msgid "Invalid authentication method set in configuration:"
 msgstr ""
 "phpMyAdmin конфигурацион файлида нотўғри аутентификация усули белгиланган:"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:923
+=======
+#: libraries/common.inc.php:919
+>>>>>>> origin/master
 #, php-format
 msgid "You should upgrade to %s %s or later."
 msgstr " \"%s\" ни \"%s\" версияга ёки каттароқ версияга янгилаш зарур."
@@ -2076,7 +2196,11 @@ msgstr ""
 "3.11\"[/a]га қаранг"
 
 #: libraries/db_structure.lib.php:69 server_databases.php:142
+<<<<<<< HEAD
 #: tbl_printview.php:335 tbl_structure.php:680
+=======
+#: tbl_printview.php:335 tbl_structure.php:682
+>>>>>>> origin/master
 msgid "Overhead"
 msgstr "Фрагментланган"
 
@@ -2105,22 +2229,36 @@ msgid "Change password"
 msgstr "Паролни ўзгартириш"
 
 #: libraries/display_change_password.lib.php:35
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:348 server_privileges.php:808
+=======
+#: libraries/replication_gui.lib.php:348 server_privileges.php:807
+>>>>>>> origin/master
 msgid "No Password"
 msgstr "Парол йўқ"
 
 #: libraries/display_change_password.lib.php:41
 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63
 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:352 server_privileges.php:797
 #: server_privileges.php:801 server_privileges.php:812
 #: server_privileges.php:1555 server_synchronize.php:1175
+=======
+#: libraries/replication_gui.lib.php:352 server_privileges.php:796
+#: server_privileges.php:800 server_privileges.php:811
+#: server_privileges.php:1538 server_synchronize.php:1175
+>>>>>>> origin/master
 msgid "Password"
 msgstr "Парол"
 
 #: libraries/display_change_password.lib.php:46
 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359
+<<<<<<< HEAD
 #: server_privileges.php:816 server_privileges.php:819
+=======
+#: server_privileges.php:815 server_privileges.php:818
+>>>>>>> origin/master
 msgid "Re-type"
 msgstr "Тасдиқлаш"
 
@@ -2135,12 +2273,20 @@ msgid "MySQL 4.0 compatible"
 msgstr "MySQL 4.0 га мос"
 
 #: libraries/display_change_password.lib.php:72
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:363 server_privileges.php:823
+=======
+#: libraries/replication_gui.lib.php:363 server_privileges.php:822
+>>>>>>> origin/master
 msgid "Generate Password"
 msgstr "Парол ўрнатиш"
 
 #: libraries/display_change_password.lib.php:75
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:366 server_privileges.php:826
+=======
+#: libraries/replication_gui.lib.php:366 server_privileges.php:825
+>>>>>>> origin/master
 msgid "Generate"
 msgstr "Генерация қилиш"
 
@@ -2230,7 +2376,11 @@ msgid "remember template"
 msgstr " шаблонни ёдда тутиш"
 
 #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552
+=======
+#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549
+>>>>>>> origin/master
 msgid "Character set of the file:"
 msgstr "Файл кодировкаси: "
 
@@ -2288,7 +2438,11 @@ msgstr ""
 msgid "File to import"
 msgstr "Импорт қилинаётган файл "
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527
+=======
+#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524
+>>>>>>> origin/master
 msgid "Location of the text file"
 msgstr "Файлни танлаш"
 
@@ -2296,12 +2450,20 @@ msgstr "Файлни танлаш"
 msgid "File uploads are not allowed on this server."
 msgstr "Файлларни серверга юклаб бўлмади."
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536
+=======
+#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533
+>>>>>>> origin/master
 #: tbl_change.php:1025
 msgid "The directory you set for upload work cannot be reached"
 msgstr "Кўрсатилган каталокка юклаб бўлмади"
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539
+=======
+#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536
+>>>>>>> origin/master
 #: tbl_change.php:1028
 msgid "web server upload directory"
 msgstr "Юклаш каталогидан"
@@ -2438,7 +2600,11 @@ msgstr "Индекс бўйича сортировка қилиш"
 #: libraries/import/docsql.php:34 libraries/import/ldi.php:47
 #: libraries/import/ods.php:30 libraries/import/sql.php:20
 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26
+<<<<<<< HEAD
 #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751
+=======
+#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753
+>>>>>>> origin/master
 msgid "Options"
 msgstr "Параметрлар"
 
@@ -2585,7 +2751,11 @@ msgstr "Ишлатилиш"
 
 #: libraries/engines/innodb.lib.php:194 server_databases.php:137
 #: server_databases.php:305 server_status.php:525 server_status.php:586
+<<<<<<< HEAD
 #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694
+=======
+#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696
+>>>>>>> origin/master
 msgid "Total"
 msgstr "Жами"
 
@@ -2873,7 +3043,11 @@ msgstr ""
 "рақамланади."
 
 #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88
+<<<<<<< HEAD
 #: tbl_printview.php:375 tbl_structure.php:735
+=======
+#: tbl_printview.php:375 tbl_structure.php:737
+>>>>>>> origin/master
 msgid "Format"
 msgstr "Формат"
 
@@ -2947,8 +3121,13 @@ msgstr "Microsoft Word 2000"
 #: libraries/export/latex.php:201 libraries/export/odt.php:48
 #: libraries/export/sql.php:106 libraries/export/sql.php:868
 #: libraries/export/texytext.php:27 server_databases.php:127
+<<<<<<< HEAD
 #: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316
 #: tbl_structure.php:663
+=======
+#: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316
+#: tbl_structure.php:665
+>>>>>>> origin/master
 msgid "Data"
 msgstr "Маълумотлар"
 
@@ -2997,9 +3176,15 @@ msgstr "MIME тури"
 #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57
 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177
 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:332 server_privileges.php:732
 #: server_privileges.php:735 server_privileges.php:791
 #: server_privileges.php:1554 server_privileges.php:2092
+=======
+#: libraries/replication_gui.lib.php:332 server_privileges.php:731
+#: server_privileges.php:734 server_privileges.php:790
+#: server_privileges.php:1537 server_privileges.php:2069
+>>>>>>> origin/master
 #: server_processlist.php:55 server_synchronize.php:1159
 msgid "Host"
 msgstr "Хост"
@@ -3681,8 +3866,13 @@ msgstr ""
 
 #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59
 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:262 server_privileges.php:712
 #: server_privileges.php:715 server_privileges.php:722
+=======
+#: libraries/replication_gui.lib.php:262 server_privileges.php:711
+#: server_privileges.php:714 server_privileges.php:721
+>>>>>>> origin/master
 #: server_synchronize.php:1171
 msgid "User name"
 msgstr "Фойдаланувчи номи"
@@ -3699,14 +3889,22 @@ msgstr "Бош сервер статуси"
 msgid "Slave status"
 msgstr "Тобе сервер статуси"
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448
+=======
+#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445
+>>>>>>> origin/master
 #: server_status.php:737 server_variables.php:52
 msgid "Variable"
 msgstr "Ўзгарувчи"
 
 #: libraries/replication_gui.lib.php:118 server_status.php:738
 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138
+<<<<<<< HEAD
 #: tbl_structure.php:727
+=======
+#: tbl_structure.php:729
+>>>>>>> origin/master
 msgid "Value"
 msgstr "Қиймати"
 
@@ -3726,11 +3924,16 @@ msgstr ""
 msgid "Add slave replication user"
 msgstr "Тобе репликация фойдаланувчисини қўшиш"
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:257 server_privileges.php:717
+=======
+#: libraries/replication_gui.lib.php:257 server_privileges.php:716
+>>>>>>> origin/master
 msgid "Any user"
 msgstr "Ҳар қайси фойдаланувчи"
 
 #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:349 server_privileges.php:718
 #: server_privileges.php:785 server_privileges.php:809
 #: server_privileges.php:1950 server_privileges.php:1980
@@ -3754,6 +3957,31 @@ msgid "Use Host Table"
 msgstr "Хостлар жадвалидан фойдаланиш"
 
 #: libraries/replication_gui.lib.php:334 server_privileges.php:793
+=======
+#: libraries/replication_gui.lib.php:349 server_privileges.php:717
+#: server_privileges.php:784 server_privileges.php:808
+#: server_privileges.php:1928 server_privileges.php:1958
+msgid "Use text field"
+msgstr "Матнмайдонини ишлатиш"
+
+#: libraries/replication_gui.lib.php:305 server_privileges.php:764
+msgid "Any host"
+msgstr "Ҳар қайси хост"
+
+#: libraries/replication_gui.lib.php:309 server_privileges.php:768
+msgid "Local"
+msgstr "Локал"
+
+#: libraries/replication_gui.lib.php:315 server_privileges.php:773
+msgid "This Host"
+msgstr "Ушбу хост"
+
+#: libraries/replication_gui.lib.php:321 server_privileges.php:779
+msgid "Use Host Table"
+msgstr "Хостлар жадвалидан фойдаланиш"
+
+#: libraries/replication_gui.lib.php:334 server_privileges.php:792
+>>>>>>> origin/master
 msgid ""
 "When Host table is used, this field is ignored and values stored in Host "
 "table are used instead."
@@ -8251,10 +8479,13 @@ msgstr "Янги қатор сифатида қўшиш ва хатоликла
 msgid "Show insert query"
 msgstr "Киритилган сўровни кўрсатиш"
 
+<<<<<<< HEAD
 #: tbl_change.php:1140
 msgid "and then"
 msgstr "ва сўнг"
 
+=======
+>>>>>>> origin/master
 #: tbl_change.php:1144
 msgid "Go back to previous page"
 msgstr "Олдинги саҳифага ўтиш"
@@ -8448,6 +8679,7 @@ msgstr "Маълумотлар яхлитлигини текшириш:"
 msgid "Show tables"
 msgstr "Жадвалларни кўрсатиш"
 
+<<<<<<< HEAD
 #: tbl_printview.php:309 tbl_structure.php:654
 msgid "Space usage"
 msgstr "Фойдаланилаётган жой"
@@ -8481,6 +8713,41 @@ msgid "Row length"
 msgstr "Қатор узунлиги"
 
 #: tbl_printview.php:413 tbl_structure.php:791
+=======
+#: tbl_printview.php:309 tbl_structure.php:656
+msgid "Space usage"
+msgstr "Фойдаланилаётган жой"
+
+#: tbl_printview.php:313 tbl_structure.php:660
+msgid "Usage"
+msgstr "Ишлатилиш"
+
+#: tbl_printview.php:340 tbl_structure.php:687
+msgid "Effective"
+msgstr "Эффективлик"
+
+#: tbl_printview.php:365 tbl_structure.php:725
+msgid "Row Statistics"
+msgstr "Қаторлар статистикаси"
+
+#: tbl_printview.php:368 tbl_structure.php:728
+msgid "Statements"
+msgstr "Тавсиф"
+
+#: tbl_printview.php:379 tbl_structure.php:740
+msgid "static"
+msgstr "статик"
+
+#: tbl_printview.php:381 tbl_structure.php:742
+msgid "dynamic"
+msgstr "динамик"
+
+#: tbl_printview.php:403 tbl_structure.php:785
+msgid "Row length"
+msgstr "Қатор узунлиги"
+
+#: tbl_printview.php:413 tbl_structure.php:793
+>>>>>>> origin/master
 msgid " Row size "
 msgstr "Қатор ҳажми"
 
diff --git a/po/uz@latin.po b/po/uz@latin.po
index 2818fffd0..2ad3ae33e 100755
--- a/po/uz@latin.po
+++ b/po/uz@latin.po
@@ -3,7 +3,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2010-07-03 21:45+0530\n"
+=======
+"POT-Creation-Date: 2010-07-03 09:00-0400\n"
+>>>>>>> origin/master
 "PO-Revision-Date: 2010-03-12 09:20+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: uzbek_latin <uz@latin@li.org>\n"
@@ -48,15 +52,26 @@ msgstr "Qidirish"
 #: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046
 #: libraries/Theme_Manager.class.php:311
 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719
+<<<<<<< HEAD
 #: libraries/common.lib.php:1344 libraries/common.lib.php:2301
 #: libraries/display_change_password.lib.php:82
 #: libraries/display_create_table.lib.php:62
+=======
+#: libraries/common.lib.php:1335 libraries/common.lib.php:2288
+#: libraries/display_change_password.lib.php:82
+#: libraries/display_create_table.lib.php:63
+>>>>>>> origin/master
 #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532
 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76
 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104
+<<<<<<< HEAD
 #: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480
 #: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782
+=======
+#: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477
+#: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782
+>>>>>>> origin/master
 #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328
 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142
 #: server_privileges.php:665 server_privileges.php:1641
@@ -66,8 +81,13 @@ msgstr "Qidirish"
 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171
 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265
 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561
+<<<<<<< HEAD
 #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560
 #: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512
+=======
+#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562
+#: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512
+>>>>>>> origin/master
 #: view_create.php:182 view_operations.php:101
 msgid "Go"
 msgstr "OK"
@@ -120,10 +140,17 @@ msgstr "Maydon nomlari"
 #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245
 #: libraries/export/latex.php:360 libraries/export/odt.php:297
 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100
+<<<<<<< HEAD
 #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093
 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
 #: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321
+=======
+#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070
+#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
+#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
+#: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321
+>>>>>>> origin/master
 msgid "Type"
 msgstr "Tur"
 
@@ -164,9 +191,15 @@ msgstr "Izohlar"
 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322
 #: libraries/export/latex.php:430 libraries/export/odt.php:368
 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263
+<<<<<<< HEAD
 #: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596
 #: server_privileges.php:1911 server_privileges.php:1916
 #: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228
+=======
+#: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579
+#: server_privileges.php:1889 server_privileges.php:1894
+#: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228
+>>>>>>> origin/master
 #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342
 msgid "No"
 msgstr "Yo‘q"
@@ -180,9 +213,15 @@ msgstr "Yo‘q"
 #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106
 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262
 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344
+<<<<<<< HEAD
 #: server_databases.php:64 server_privileges.php:1582
 #: server_privileges.php:1596 server_privileges.php:1911
 #: server_privileges.php:1914 server_privileges.php:2210 sql.php:193
+=======
+#: server_databases.php:64 server_privileges.php:1565
+#: server_privileges.php:1579 server_privileges.php:1889
+#: server_privileges.php:1892 server_privileges.php:2187 sql.php:193
+>>>>>>> origin/master
 #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350
 #: tbl_tracking.php:335 tbl_tracking.php:340
 msgid "Yes"
@@ -231,7 +270,15 @@ msgstr "Ma`lumotlar bazasi nomini quyidagiga o‘zgartirish"
 msgid "Command"
 msgstr "Buyruq"
 
+<<<<<<< HEAD
 #: db_operations.php:466
+=======
+#: db_operations.php:429 tbl_change.php:1140
+msgid "and then"
+msgstr "va so‘ng"
+
+#: db_operations.php:455
+>>>>>>> origin/master
 msgid "Copy database to"
 msgstr "Ma`lumotlar bazasidan quyidagiga nusxa olish"
 
@@ -319,7 +366,11 @@ msgstr "Faollantirish"
 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730
 #: server_collations.php:54 server_collations.php:66 server_databases.php:111
 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179
+<<<<<<< HEAD
 #: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326
+=======
+#: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326
+>>>>>>> origin/master
 msgid "Collation"
 msgstr "Taqqoslash"
 
@@ -348,7 +399,11 @@ msgstr "Jadval "
 #: db_printview.php:105 libraries/db_structure.lib.php:56
 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146
 #: navigation.php:638 navigation.php:660 server_databases.php:122
+<<<<<<< HEAD
 #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775
+=======
+#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777
+>>>>>>> origin/master
 msgid "Rows"
 msgstr "Qatorlarsoni"
 
@@ -363,19 +418,31 @@ msgstr "ishlatilmoqda"
 
 #: db_printview.php:187 libraries/db_info.inc.php:88
 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433
+<<<<<<< HEAD
 #: tbl_structure.php:807
+=======
+#: tbl_structure.php:809
+>>>>>>> origin/master
 msgid "Creation"
 msgstr "Tuzish"
 
 #: db_printview.php:196 libraries/db_info.inc.php:93
 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443
+<<<<<<< HEAD
 #: tbl_structure.php:815
+=======
+#: tbl_structure.php:817
+>>>>>>> origin/master
 msgid "Last update"
 msgstr "Oxirgi yangilanish"
 
 #: db_printview.php:205 libraries/db_info.inc.php:98
 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453
+<<<<<<< HEAD
 #: tbl_structure.php:823
+=======
+#: tbl_structure.php:825
+>>>>>>> origin/master
 msgid "Last check"
 msgstr "Oxirgi tekshiruv"
 
@@ -440,7 +507,11 @@ msgstr "O‘chirish"
 
 #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553
 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779
+<<<<<<< HEAD
 #: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250
+=======
+#: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250
+>>>>>>> origin/master
 #: tbl_select.php:286
 msgid "Or"
 msgstr "Yoki"
@@ -661,9 +732,15 @@ msgstr "Belgilanganlarni: "
 msgid "Check All"
 msgstr "Barchasini belgilash"
 
+<<<<<<< HEAD
 #: db_structure.php:529 libraries/display_tbl.lib.php:2077
 #: libraries/replication_gui.lib.php:36 server_databases.php:350
 #: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460
+=======
+#: db_structure.php:531 libraries/display_tbl.lib.php:2077
+#: libraries/replication_gui.lib.php:36 server_databases.php:350
+#: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462
+>>>>>>> origin/master
 msgid "Uncheck All"
 msgstr "Belgilashni bekor qilish"
 
@@ -1138,10 +1215,17 @@ msgid "Prev"
 msgstr "Orqaga"
 
 #. l10n: Display text for next month link in calendar
+<<<<<<< HEAD
 #: js/messages.php:106 libraries/common.lib.php:2366
 #: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338
 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
 #: tbl_structure.php:799
+=======
+#: js/messages.php:77 libraries/common.lib.php:2353
+#: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338
+#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
+#: tbl_structure.php:801
+>>>>>>> origin/master
 msgid "Next"
 msgstr "Keyingi"
 
@@ -1689,7 +1773,11 @@ msgstr "Parol:"
 msgid "Server Choice"
 msgstr "Serverni tanlang"
 
+<<<<<<< HEAD
 #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63
+=======
+#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59
+>>>>>>> origin/master
 msgid "Cookies must be enabled past this point."
 msgstr "Brauzerda \"cookies\" faollashtirilgan bo‘lishi shart."
 
@@ -1775,7 +1863,11 @@ msgstr ""
 "yoki \"recode_string\" funksiyasini ishlatib bo‘lmadi. Ehtimol, PHP ni "
 "sozlashda xatolik mavjud."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:580
+=======
+#: libraries/common.inc.php:576
+>>>>>>> origin/master
 msgid ""
 "phpMyAdmin was unable to read your configuration file!<br />This might "
 "happen if PHP finds a parse error in it or PHP cannot find the file.<br /"
@@ -1791,13 +1883,21 @@ msgstr ""
 "nuqta-vergul qoldirib ketilgan bo‘ladi.<br />Agar bo‘m-bo‘sh sahifa "
 "ko‘rsatilsa, demak, hammasi joyida."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:591
+=======
+#: libraries/common.inc.php:587
+>>>>>>> origin/master
 #, fuzzy, php-format
 #| msgid "Could not load default configuration from: \"%1$s\""
 msgid "Could not load default configuration from: %1$s"
 msgstr " \"%1$s\" faylidan andoza konfiguratsiyani yuklab bo‘lmadi."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:596
+=======
+#: libraries/common.inc.php:592
+>>>>>>> origin/master
 msgid ""
 "The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
 "configuration file!"
@@ -1805,32 +1905,52 @@ msgstr ""
 "<tt>$cfg[\"PmaAbsoluteUrl\"]</tt> direktivasi konfiguratsion faylda "
 "sozlanishi SHART!"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:626
+=======
+#: libraries/common.inc.php:622
+>>>>>>> origin/master
 #, fuzzy, php-format
 #| msgid "Invalid server index: \"%s\""
 msgid "Invalid server index: %s"
 msgstr "Server raqami noto‘g‘ri: \"%s\""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:633
+=======
+#: libraries/common.inc.php:629
+>>>>>>> origin/master
 #, php-format
 msgid "Invalid hostname for server %1$s. Please review your configuration."
 msgstr ""
 " %1$s serveri uchun noto‘g‘ri xost nomi ko‘rsatilgan. phpMyAdmin "
 "konfiguratsion faylida belgilangan sozlashlarni to‘g‘irlang."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:642 libraries/header.inc.php:100
+=======
+#: libraries/common.inc.php:638 libraries/header.inc.php:96
+>>>>>>> origin/master
 #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47
 #: main.php:185 test/theme.php:57
 msgid "Server"
 msgstr "Server"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:820
+=======
+#: libraries/common.inc.php:816
+>>>>>>> origin/master
 msgid "Invalid authentication method set in configuration:"
 msgstr ""
 "phpMyAdmin konfiguratsion faylida noto‘g‘ri autentifikatsiya usuli "
 "belgilangan:"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:923
+=======
+#: libraries/common.inc.php:919
+>>>>>>> origin/master
 #, php-format
 msgid "You should upgrade to %s %s or later."
 msgstr " \"%s\" ni \"%s\" versiyaga yoki kattaroq versiyaga yangilash zarur."
@@ -2083,7 +2203,11 @@ msgstr ""
 "\"FAQ 3.11\"[/a]ga qarang"
 
 #: libraries/db_structure.lib.php:69 server_databases.php:142
+<<<<<<< HEAD
 #: tbl_printview.php:335 tbl_structure.php:680
+=======
+#: tbl_printview.php:335 tbl_structure.php:682
+>>>>>>> origin/master
 msgid "Overhead"
 msgstr "Fragmentlangan"
 
@@ -2112,22 +2236,36 @@ msgid "Change password"
 msgstr "Parolni o‘zgartirish"
 
 #: libraries/display_change_password.lib.php:35
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:348 server_privileges.php:808
+=======
+#: libraries/replication_gui.lib.php:348 server_privileges.php:807
+>>>>>>> origin/master
 msgid "No Password"
 msgstr "Parol yo‘q"
 
 #: libraries/display_change_password.lib.php:41
 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63
 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:352 server_privileges.php:797
 #: server_privileges.php:801 server_privileges.php:812
 #: server_privileges.php:1555 server_synchronize.php:1175
+=======
+#: libraries/replication_gui.lib.php:352 server_privileges.php:796
+#: server_privileges.php:800 server_privileges.php:811
+#: server_privileges.php:1538 server_synchronize.php:1175
+>>>>>>> origin/master
 msgid "Password"
 msgstr "Parol"
 
 #: libraries/display_change_password.lib.php:46
 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359
+<<<<<<< HEAD
 #: server_privileges.php:816 server_privileges.php:819
+=======
+#: server_privileges.php:815 server_privileges.php:818
+>>>>>>> origin/master
 msgid "Re-type"
 msgstr "Tasdiqlash"
 
@@ -2142,12 +2280,20 @@ msgid "MySQL 4.0 compatible"
 msgstr "MySQL 4.0 ga mos"
 
 #: libraries/display_change_password.lib.php:72
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:363 server_privileges.php:823
+=======
+#: libraries/replication_gui.lib.php:363 server_privileges.php:822
+>>>>>>> origin/master
 msgid "Generate Password"
 msgstr "Parol o‘rnatish"
 
 #: libraries/display_change_password.lib.php:75
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:366 server_privileges.php:826
+=======
+#: libraries/replication_gui.lib.php:366 server_privileges.php:825
+>>>>>>> origin/master
 msgid "Generate"
 msgstr "Generatsiya qilish"
 
@@ -2237,7 +2383,11 @@ msgid "remember template"
 msgstr " shablonni yodda tutish"
 
 #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552
+=======
+#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549
+>>>>>>> origin/master
 msgid "Character set of the file:"
 msgstr "Fayl kodirovkasi: "
 
@@ -2295,7 +2445,11 @@ msgstr ""
 msgid "File to import"
 msgstr "Import qilinayotgan fayl "
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527
+=======
+#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524
+>>>>>>> origin/master
 msgid "Location of the text file"
 msgstr "Faylni tanlash"
 
@@ -2303,12 +2457,20 @@ msgstr "Faylni tanlash"
 msgid "File uploads are not allowed on this server."
 msgstr "Fayllarni serverga yuklab bo‘lmadi."
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536
+=======
+#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533
+>>>>>>> origin/master
 #: tbl_change.php:1025
 msgid "The directory you set for upload work cannot be reached"
 msgstr "Ko‘rsatilgan katalokka yuklab bo‘lmadi"
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539
+=======
+#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536
+>>>>>>> origin/master
 #: tbl_change.php:1028
 msgid "web server upload directory"
 msgstr "Yuklash katalogidan"
@@ -2448,7 +2610,11 @@ msgstr "Indeks bo‘yicha sortirovka qilish"
 #: libraries/import/docsql.php:34 libraries/import/ldi.php:47
 #: libraries/import/ods.php:30 libraries/import/sql.php:20
 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26
+<<<<<<< HEAD
 #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751
+=======
+#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753
+>>>>>>> origin/master
 msgid "Options"
 msgstr "Parametrlar"
 
@@ -2596,7 +2762,11 @@ msgstr "Ishlatilish"
 
 #: libraries/engines/innodb.lib.php:194 server_databases.php:137
 #: server_databases.php:305 server_status.php:525 server_status.php:586
+<<<<<<< HEAD
 #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694
+=======
+#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696
+>>>>>>> origin/master
 msgid "Total"
 msgstr "Jami"
 
@@ -2886,7 +3056,11 @@ msgstr ""
 "tartibda raqamlanadi."
 
 #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88
+<<<<<<< HEAD
 #: tbl_printview.php:375 tbl_structure.php:735
+=======
+#: tbl_printview.php:375 tbl_structure.php:737
+>>>>>>> origin/master
 msgid "Format"
 msgstr "Format"
 
@@ -2960,8 +3134,13 @@ msgstr "Microsoft Word 2000"
 #: libraries/export/latex.php:201 libraries/export/odt.php:48
 #: libraries/export/sql.php:106 libraries/export/sql.php:868
 #: libraries/export/texytext.php:27 server_databases.php:127
+<<<<<<< HEAD
 #: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316
 #: tbl_structure.php:663
+=======
+#: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316
+#: tbl_structure.php:665
+>>>>>>> origin/master
 msgid "Data"
 msgstr "Ma`lumotlar"
 
@@ -3010,9 +3189,15 @@ msgstr "MIME turi"
 #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57
 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177
 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:332 server_privileges.php:732
 #: server_privileges.php:735 server_privileges.php:791
 #: server_privileges.php:1554 server_privileges.php:2092
+=======
+#: libraries/replication_gui.lib.php:332 server_privileges.php:731
+#: server_privileges.php:734 server_privileges.php:790
+#: server_privileges.php:1537 server_privileges.php:2069
+>>>>>>> origin/master
 #: server_processlist.php:55 server_synchronize.php:1159
 msgid "Host"
 msgstr "Xost"
@@ -3698,8 +3883,13 @@ msgstr ""
 
 #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59
 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:262 server_privileges.php:712
 #: server_privileges.php:715 server_privileges.php:722
+=======
+#: libraries/replication_gui.lib.php:262 server_privileges.php:711
+#: server_privileges.php:714 server_privileges.php:721
+>>>>>>> origin/master
 #: server_synchronize.php:1171
 msgid "User name"
 msgstr "Foydalanuvchi nomi"
@@ -3716,14 +3906,22 @@ msgstr "Bosh rеplikatsiya sеrvеri statusi"
 msgid "Slave status"
 msgstr "Tobе rеplikatsiya sеrvеri statusi"
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448
+=======
+#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445
+>>>>>>> origin/master
 #: server_status.php:737 server_variables.php:52
 msgid "Variable"
 msgstr "O‘zgaruvchi"
 
 #: libraries/replication_gui.lib.php:118 server_status.php:738
 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138
+<<<<<<< HEAD
 #: tbl_structure.php:727
+=======
+#: tbl_structure.php:729
+>>>>>>> origin/master
 msgid "Value"
 msgstr "Qiymati"
 
@@ -3743,11 +3941,16 @@ msgstr ""
 msgid "Add slave replication user"
 msgstr "Tobе rеplikatsiya foydalanuvchisini qo‘shish"
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:257 server_privileges.php:717
+=======
+#: libraries/replication_gui.lib.php:257 server_privileges.php:716
+>>>>>>> origin/master
 msgid "Any user"
 msgstr "Har qaysi foydalanuvchi"
 
 #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:349 server_privileges.php:718
 #: server_privileges.php:785 server_privileges.php:809
 #: server_privileges.php:1950 server_privileges.php:1980
@@ -3771,6 +3974,31 @@ msgid "Use Host Table"
 msgstr "Xostlar jadvalidan foydalanish"
 
 #: libraries/replication_gui.lib.php:334 server_privileges.php:793
+=======
+#: libraries/replication_gui.lib.php:349 server_privileges.php:717
+#: server_privileges.php:784 server_privileges.php:808
+#: server_privileges.php:1928 server_privileges.php:1958
+msgid "Use text field"
+msgstr "Matnmaydonini ishlatish"
+
+#: libraries/replication_gui.lib.php:305 server_privileges.php:764
+msgid "Any host"
+msgstr "Har qaysi xost"
+
+#: libraries/replication_gui.lib.php:309 server_privileges.php:768
+msgid "Local"
+msgstr "Lokal"
+
+#: libraries/replication_gui.lib.php:315 server_privileges.php:773
+msgid "This Host"
+msgstr "Ushbu xost"
+
+#: libraries/replication_gui.lib.php:321 server_privileges.php:779
+msgid "Use Host Table"
+msgstr "Xostlar jadvalidan foydalanish"
+
+#: libraries/replication_gui.lib.php:334 server_privileges.php:792
+>>>>>>> origin/master
 msgid ""
 "When Host table is used, this field is ignored and values stored in Host "
 "table are used instead."
@@ -8313,10 +8541,13 @@ msgstr "Yangi qator sifatida qo‘shish va xatoliklarga e’tibor bеrmaslik"
 msgid "Show insert query"
 msgstr "Kiritilgan so‘rovni ko‘rsatish"
 
+<<<<<<< HEAD
 #: tbl_change.php:1140
 msgid "and then"
 msgstr "va so‘ng"
 
+=======
+>>>>>>> origin/master
 #: tbl_change.php:1144
 msgid "Go back to previous page"
 msgstr "Oldingi sahifaga o‘tish"
@@ -8511,6 +8742,7 @@ msgstr "Ma`lumotlar yaxlitligini tekshirish:"
 msgid "Show tables"
 msgstr "Jadvallarni ko‘rsatish"
 
+<<<<<<< HEAD
 #: tbl_printview.php:309 tbl_structure.php:654
 msgid "Space usage"
 msgstr "Foydalanilayotgan joy"
@@ -8544,6 +8776,41 @@ msgid "Row length"
 msgstr "Qator uzunligi"
 
 #: tbl_printview.php:413 tbl_structure.php:791
+=======
+#: tbl_printview.php:309 tbl_structure.php:656
+msgid "Space usage"
+msgstr "Foydalanilayotgan joy"
+
+#: tbl_printview.php:313 tbl_structure.php:660
+msgid "Usage"
+msgstr "Ishlatilish"
+
+#: tbl_printview.php:340 tbl_structure.php:687
+msgid "Effective"
+msgstr "Effektivlik"
+
+#: tbl_printview.php:365 tbl_structure.php:725
+msgid "Row Statistics"
+msgstr "Qatorlar statistikasi"
+
+#: tbl_printview.php:368 tbl_structure.php:728
+msgid "Statements"
+msgstr "Tavsif"
+
+#: tbl_printview.php:379 tbl_structure.php:740
+msgid "static"
+msgstr "statik"
+
+#: tbl_printview.php:381 tbl_structure.php:742
+msgid "dynamic"
+msgstr "dinamik"
+
+#: tbl_printview.php:403 tbl_structure.php:785
+msgid "Row length"
+msgstr "Qator uzunligi"
+
+#: tbl_printview.php:413 tbl_structure.php:793
+>>>>>>> origin/master
 msgid " Row size "
 msgstr "Qator hajmi"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index c31e8e97f..fb0d7304e 100755
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -3,7 +3,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2010-07-03 21:45+0530\n"
+=======
+"POT-Creation-Date: 2010-07-03 09:00-0400\n"
+>>>>>>> origin/master
 "PO-Revision-Date: 2010-06-04 14:09+0200\n"
 "Last-Translator: shanyan baishui <Siramizu@gmail.com>\n"
 "Language-Team: chinese_simplified <zh_CN@li.org>\n"
@@ -48,15 +52,26 @@ msgstr "搜索"
 #: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046
 #: libraries/Theme_Manager.class.php:311
 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719
+<<<<<<< HEAD
 #: libraries/common.lib.php:1344 libraries/common.lib.php:2301
 #: libraries/display_change_password.lib.php:82
 #: libraries/display_create_table.lib.php:62
+=======
+#: libraries/common.lib.php:1335 libraries/common.lib.php:2288
+#: libraries/display_change_password.lib.php:82
+#: libraries/display_create_table.lib.php:63
+>>>>>>> origin/master
 #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532
 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76
 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104
+<<<<<<< HEAD
 #: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480
 #: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782
+=======
+#: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477
+#: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782
+>>>>>>> origin/master
 #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328
 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142
 #: server_privileges.php:665 server_privileges.php:1641
@@ -66,8 +81,13 @@ msgstr "搜索"
 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171
 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265
 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561
+<<<<<<< HEAD
 #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560
 #: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512
+=======
+#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562
+#: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512
+>>>>>>> origin/master
 #: view_create.php:182 view_operations.php:101
 msgid "Go"
 msgstr "执行"
@@ -118,10 +138,17 @@ msgstr "字段"
 #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245
 #: libraries/export/latex.php:360 libraries/export/odt.php:297
 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100
+<<<<<<< HEAD
 #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093
 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
 #: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321
+=======
+#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070
+#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
+#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
+#: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321
+>>>>>>> origin/master
 msgid "Type"
 msgstr "类型"
 
@@ -162,9 +189,15 @@ msgstr "注释"
 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322
 #: libraries/export/latex.php:430 libraries/export/odt.php:368
 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263
+<<<<<<< HEAD
 #: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596
 #: server_privileges.php:1911 server_privileges.php:1916
 #: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228
+=======
+#: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579
+#: server_privileges.php:1889 server_privileges.php:1894
+#: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228
+>>>>>>> origin/master
 #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342
 msgid "No"
 msgstr "否"
@@ -178,9 +211,15 @@ msgstr "否"
 #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106
 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262
 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344
+<<<<<<< HEAD
 #: server_databases.php:64 server_privileges.php:1582
 #: server_privileges.php:1596 server_privileges.php:1911
 #: server_privileges.php:1914 server_privileges.php:2210 sql.php:193
+=======
+#: server_databases.php:64 server_privileges.php:1565
+#: server_privileges.php:1579 server_privileges.php:1889
+#: server_privileges.php:1892 server_privileges.php:2187 sql.php:193
+>>>>>>> origin/master
 #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350
 #: tbl_tracking.php:335 tbl_tracking.php:340
 msgid "Yes"
@@ -229,7 +268,15 @@ msgstr "将数据库改名为"
 msgid "Command"
 msgstr "命令"
 
+<<<<<<< HEAD
 #: db_operations.php:466
+=======
+#: db_operations.php:429 tbl_change.php:1140
+msgid "and then"
+msgstr "然后"
+
+#: db_operations.php:455
+>>>>>>> origin/master
 msgid "Copy database to"
 msgstr "复制数据库到"
 
@@ -311,7 +358,11 @@ msgstr "启用"
 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730
 #: server_collations.php:54 server_collations.php:66 server_databases.php:111
 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179
+<<<<<<< HEAD
 #: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326
+=======
+#: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326
+>>>>>>> origin/master
 msgid "Collation"
 msgstr "整理"
 
@@ -338,7 +389,11 @@ msgstr "表"
 #: db_printview.php:105 libraries/db_structure.lib.php:56
 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146
 #: navigation.php:638 navigation.php:660 server_databases.php:122
+<<<<<<< HEAD
 #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775
+=======
+#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777
+>>>>>>> origin/master
 msgid "Rows"
 msgstr "行数"
 
@@ -353,19 +408,31 @@ msgstr "使用中"
 
 #: db_printview.php:187 libraries/db_info.inc.php:88
 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433
+<<<<<<< HEAD
 #: tbl_structure.php:807
+=======
+#: tbl_structure.php:809
+>>>>>>> origin/master
 msgid "Creation"
 msgstr "创建时间"
 
 #: db_printview.php:196 libraries/db_info.inc.php:93
 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443
+<<<<<<< HEAD
 #: tbl_structure.php:815
+=======
+#: tbl_structure.php:817
+>>>>>>> origin/master
 msgid "Last update"
 msgstr "最后更新"
 
 #: db_printview.php:205 libraries/db_info.inc.php:98
 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453
+<<<<<<< HEAD
 #: tbl_structure.php:823
+=======
+#: tbl_structure.php:825
+>>>>>>> origin/master
 msgid "Last check"
 msgstr "最后检查"
 
@@ -428,7 +495,11 @@ msgstr "删除"
 
 #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553
 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779
+<<<<<<< HEAD
 #: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250
+=======
+#: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250
+>>>>>>> origin/master
 #: tbl_select.php:286
 msgid "Or"
 msgstr "或"
@@ -644,9 +715,15 @@ msgstr "选中项："
 msgid "Check All"
 msgstr "全选"
 
+<<<<<<< HEAD
 #: db_structure.php:529 libraries/display_tbl.lib.php:2077
 #: libraries/replication_gui.lib.php:36 server_databases.php:350
 #: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460
+=======
+#: db_structure.php:531 libraries/display_tbl.lib.php:2077
+#: libraries/replication_gui.lib.php:36 server_databases.php:350
+#: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462
+>>>>>>> origin/master
 msgid "Uncheck All"
 msgstr "全不选"
 
@@ -1095,10 +1172,17 @@ msgid "Prev"
 msgstr "上个月"
 
 #. l10n: Display text for next month link in calendar
+<<<<<<< HEAD
 #: js/messages.php:106 libraries/common.lib.php:2366
 #: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338
 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
 #: tbl_structure.php:799
+=======
+#: js/messages.php:77 libraries/common.lib.php:2353
+#: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338
+#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
+#: tbl_structure.php:801
+>>>>>>> origin/master
 msgid "Next"
 msgstr "下个月"
 
@@ -1588,7 +1672,11 @@ msgstr "密码："
 msgid "Server Choice"
 msgstr "选择服务器"
 
+<<<<<<< HEAD
 #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63
+=======
+#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59
+>>>>>>> origin/master
 msgid "Cookies must be enabled past this point."
 msgstr "必须启用 Cookies 才能登录。"
 
@@ -1667,7 +1755,11 @@ msgstr ""
 "虽然必须的扩展已经加载，但还是无法使用 iconv、libiconv 和 recode_string 函"
 "数。请检查您的 PHP 配置。"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:580
+=======
+#: libraries/common.inc.php:576
+>>>>>>> origin/master
 msgid ""
 "phpMyAdmin was unable to read your configuration file!<br />This might "
 "happen if PHP finds a parse error in it or PHP cannot find the file.<br /"
@@ -1681,38 +1773,66 @@ msgstr ""
 "常的错误都是因为某处漏了引号或分号。<br />如果您看到的是一个空白页，则代表没"
 "有任何问题。"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:591
+=======
+#: libraries/common.inc.php:587
+>>>>>>> origin/master
 #, php-format
 msgid "Could not load default configuration from: %1$s"
 msgstr "无法加载默认配置: %1$s"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:596
+=======
+#: libraries/common.inc.php:592
+>>>>>>> origin/master
 msgid ""
 "The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
 "configuration file!"
 msgstr "必须在您的配置文件中设置 <tt>$cfg['PmaAbsoluteUri']</tt> ！"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:626
+=======
+#: libraries/common.inc.php:622
+>>>>>>> origin/master
 #, php-format
 msgid "Invalid server index: %s"
 msgstr "无效的服务器索引: %s"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:633
+=======
+#: libraries/common.inc.php:629
+>>>>>>> origin/master
 #, php-format
 msgid "Invalid hostname for server %1$s. Please review your configuration."
 msgstr "无效的主机名 %1$s，请检查配置文件。"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:642 libraries/header.inc.php:100
+=======
+#: libraries/common.inc.php:638 libraries/header.inc.php:96
+>>>>>>> origin/master
 #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47
 #: main.php:185 test/theme.php:57
 msgid "Server"
 msgstr "服务器"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:820
 msgid "Invalid authentication method set in configuration:"
 msgstr "配置文件中设置的认证方式无效："
 
 #: libraries/common.inc.php:923
+=======
+#: libraries/common.inc.php:816
+msgid "Invalid authentication method set in configuration:"
+msgstr "配置文件中设置的认证方式无效："
+
+#: libraries/common.inc.php:919
+>>>>>>> origin/master
 #, php-format
 msgid "You should upgrade to %s %s or later."
 msgstr "您应升级到 %s %s 或更高版本。"
@@ -1958,7 +2078,11 @@ msgstr ""
 "可能接近。参见 [a@./Documentation.html#faq3_11@Documentation]FAQ 3.11[/a]"
 
 #: libraries/db_structure.lib.php:69 server_databases.php:142
+<<<<<<< HEAD
 #: tbl_printview.php:335 tbl_structure.php:680
+=======
+#: tbl_printview.php:335 tbl_structure.php:682
+>>>>>>> origin/master
 msgid "Overhead"
 msgstr "多余"
 
@@ -1985,22 +2109,36 @@ msgid "Change password"
 msgstr "修改密码"
 
 #: libraries/display_change_password.lib.php:35
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:348 server_privileges.php:808
+=======
+#: libraries/replication_gui.lib.php:348 server_privileges.php:807
+>>>>>>> origin/master
 msgid "No Password"
 msgstr "无密码"
 
 #: libraries/display_change_password.lib.php:41
 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63
 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:352 server_privileges.php:797
 #: server_privileges.php:801 server_privileges.php:812
 #: server_privileges.php:1555 server_synchronize.php:1175
+=======
+#: libraries/replication_gui.lib.php:352 server_privileges.php:796
+#: server_privileges.php:800 server_privileges.php:811
+#: server_privileges.php:1538 server_synchronize.php:1175
+>>>>>>> origin/master
 msgid "Password"
 msgstr "密码"
 
 #: libraries/display_change_password.lib.php:46
 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359
+<<<<<<< HEAD
 #: server_privileges.php:816 server_privileges.php:819
+=======
+#: server_privileges.php:815 server_privileges.php:818
+>>>>>>> origin/master
 msgid "Re-type"
 msgstr "重新输入"
 
@@ -2013,12 +2151,20 @@ msgid "MySQL 4.0 compatible"
 msgstr "MySQL 4.0 兼容"
 
 #: libraries/display_change_password.lib.php:72
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:363 server_privileges.php:823
+=======
+#: libraries/replication_gui.lib.php:363 server_privileges.php:822
+>>>>>>> origin/master
 msgid "Generate Password"
 msgstr "生成密码"
 
 #: libraries/display_change_password.lib.php:75
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:366 server_privileges.php:826
+=======
+#: libraries/replication_gui.lib.php:366 server_privileges.php:825
+>>>>>>> origin/master
 msgid "Generate"
 msgstr "生成"
 
@@ -2102,7 +2248,11 @@ msgid "remember template"
 msgstr "记住模板"
 
 #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552
+=======
+#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549
+>>>>>>> origin/master
 msgid "Character set of the file:"
 msgstr "文件的字符集："
 
@@ -2157,7 +2307,11 @@ msgstr "正在上传，没有详细信息，请稍候。"
 msgid "File to import"
 msgstr "要导入的文件"
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527
+=======
+#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524
+>>>>>>> origin/master
 msgid "Location of the text file"
 msgstr "文本文件的位置"
 
@@ -2165,12 +2319,20 @@ msgstr "文本文件的位置"
 msgid "File uploads are not allowed on this server."
 msgstr "此服务器禁止了文件上传。"
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536
+=======
+#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533
+>>>>>>> origin/master
 #: tbl_change.php:1025
 msgid "The directory you set for upload work cannot be reached"
 msgstr "用于上传的文件夹出错，无法使用"
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539
+=======
+#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536
+>>>>>>> origin/master
 #: tbl_change.php:1028
 msgid "web server upload directory"
 msgstr "网站服务器上传文件夹"
@@ -2299,7 +2461,11 @@ msgstr "主键排序"
 #: libraries/import/docsql.php:34 libraries/import/ldi.php:47
 #: libraries/import/ods.php:30 libraries/import/sql.php:20
 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26
+<<<<<<< HEAD
 #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751
+=======
+#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753
+>>>>>>> origin/master
 msgid "Options"
 msgstr "选项"
 
@@ -2440,7 +2606,11 @@ msgstr "缓冲池使用情况"
 
 #: libraries/engines/innodb.lib.php:194 server_databases.php:137
 #: server_databases.php:305 server_status.php:525 server_status.php:586
+<<<<<<< HEAD
 #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694
+=======
+#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696
+>>>>>>> origin/master
 msgid "Total"
 msgstr "总计"
 
@@ -2704,7 +2874,11 @@ msgstr ""
 "被删除，或者被以升序数字序列重命名。"
 
 #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88
+<<<<<<< HEAD
 #: tbl_printview.php:375 tbl_structure.php:735
+=======
+#: tbl_printview.php:375 tbl_structure.php:737
+>>>>>>> origin/master
 msgid "Format"
 msgstr "格式"
 
@@ -2768,8 +2942,13 @@ msgstr "Microsoft Word 2000"
 #: libraries/export/latex.php:201 libraries/export/odt.php:48
 #: libraries/export/sql.php:106 libraries/export/sql.php:868
 #: libraries/export/texytext.php:27 server_databases.php:127
+<<<<<<< HEAD
 #: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316
 #: tbl_structure.php:663
+=======
+#: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316
+#: tbl_structure.php:665
+>>>>>>> origin/master
 msgid "Data"
 msgstr "数据"
 
@@ -2818,9 +2997,15 @@ msgstr "MIME 类型"
 #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57
 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177
 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:332 server_privileges.php:732
 #: server_privileges.php:735 server_privileges.php:791
 #: server_privileges.php:1554 server_privileges.php:2092
+=======
+#: libraries/replication_gui.lib.php:332 server_privileges.php:731
+#: server_privileges.php:734 server_privileges.php:790
+#: server_privileges.php:1537 server_privileges.php:2069
+>>>>>>> origin/master
 #: server_processlist.php:55 server_synchronize.php:1159
 msgid "Host"
 msgstr "主机"
@@ -3482,8 +3667,13 @@ msgstr ""
 
 #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59
 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:262 server_privileges.php:712
 #: server_privileges.php:715 server_privileges.php:722
+=======
+#: libraries/replication_gui.lib.php:262 server_privileges.php:711
+#: server_privileges.php:714 server_privileges.php:721
+>>>>>>> origin/master
 #: server_synchronize.php:1171
 msgid "User name"
 msgstr "用户名"
@@ -3500,14 +3690,22 @@ msgstr "主服务器状态"
 msgid "Slave status"
 msgstr "从服务器状态"
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448
+=======
+#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445
+>>>>>>> origin/master
 #: server_status.php:737 server_variables.php:52
 msgid "Variable"
 msgstr "变量"
 
 #: libraries/replication_gui.lib.php:118 server_status.php:738
 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138
+<<<<<<< HEAD
 #: tbl_structure.php:727
+=======
+#: tbl_structure.php:729
+>>>>>>> origin/master
 msgid "Value"
 msgstr "值"
 
@@ -3525,11 +3723,16 @@ msgstr "仅通过 --report-host=主机名 参数启动的从服务器可见。"
 msgid "Add slave replication user"
 msgstr "添加从复制用户"
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:257 server_privileges.php:717
+=======
+#: libraries/replication_gui.lib.php:257 server_privileges.php:716
+>>>>>>> origin/master
 msgid "Any user"
 msgstr "任意用户"
 
 #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:349 server_privileges.php:718
 #: server_privileges.php:785 server_privileges.php:809
 #: server_privileges.php:1950 server_privileges.php:1980
@@ -3553,6 +3756,31 @@ msgid "Use Host Table"
 msgstr "使用主机表"
 
 #: libraries/replication_gui.lib.php:334 server_privileges.php:793
+=======
+#: libraries/replication_gui.lib.php:349 server_privileges.php:717
+#: server_privileges.php:784 server_privileges.php:808
+#: server_privileges.php:1928 server_privileges.php:1958
+msgid "Use text field"
+msgstr "使用文本域"
+
+#: libraries/replication_gui.lib.php:305 server_privileges.php:764
+msgid "Any host"
+msgstr "任意主机"
+
+#: libraries/replication_gui.lib.php:309 server_privileges.php:768
+msgid "Local"
+msgstr "本地"
+
+#: libraries/replication_gui.lib.php:315 server_privileges.php:773
+msgid "This Host"
+msgstr "此主机"
+
+#: libraries/replication_gui.lib.php:321 server_privileges.php:779
+msgid "Use Host Table"
+msgstr "使用主机表"
+
+#: libraries/replication_gui.lib.php:334 server_privileges.php:792
+>>>>>>> origin/master
 msgid ""
 "When Host table is used, this field is ignored and values stored in Host "
 "table are used instead."
@@ -7653,10 +7881,13 @@ msgstr "以新行插入 (忽略错误)"
 msgid "Show insert query"
 msgstr "显示插入语句"
 
+<<<<<<< HEAD
 #: tbl_change.php:1140
 msgid "and then"
 msgstr "然后"
 
+=======
+>>>>>>> origin/master
 #: tbl_change.php:1144
 msgid "Go back to previous page"
 msgstr "返回上一页"
@@ -7847,6 +8078,7 @@ msgstr "检查引用完整性："
 msgid "Show tables"
 msgstr "显示表"
 
+<<<<<<< HEAD
 #: tbl_printview.php:309 tbl_structure.php:654
 msgid "Space usage"
 msgstr "已用空间"
@@ -7880,6 +8112,41 @@ msgid "Row length"
 msgstr "行长度"
 
 #: tbl_printview.php:413 tbl_structure.php:791
+=======
+#: tbl_printview.php:309 tbl_structure.php:656
+msgid "Space usage"
+msgstr "已用空间"
+
+#: tbl_printview.php:313 tbl_structure.php:660
+msgid "Usage"
+msgstr "已用"
+
+#: tbl_printview.php:340 tbl_structure.php:687
+msgid "Effective"
+msgstr "有效"
+
+#: tbl_printview.php:365 tbl_structure.php:725
+msgid "Row Statistics"
+msgstr "行统计"
+
+#: tbl_printview.php:368 tbl_structure.php:728
+msgid "Statements"
+msgstr "说明"
+
+#: tbl_printview.php:379 tbl_structure.php:740
+msgid "static"
+msgstr "静态"
+
+#: tbl_printview.php:381 tbl_structure.php:742
+msgid "dynamic"
+msgstr "动态"
+
+#: tbl_printview.php:403 tbl_structure.php:785
+msgid "Row length"
+msgstr "行长度"
+
+#: tbl_printview.php:413 tbl_structure.php:793
+>>>>>>> origin/master
 msgid " Row size "
 msgstr " 行大小 "
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index d82fff880..decaa11fc 100755
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -3,7 +3,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2010-07-03 21:45+0530\n"
+=======
+"POT-Creation-Date: 2010-07-03 09:00-0400\n"
+>>>>>>> origin/master
 "PO-Revision-Date: 2010-03-12 09:15+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: chinese_traditional <zh_TW@li.org>\n"
@@ -47,15 +51,26 @@ msgstr "搜索"
 #: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046
 #: libraries/Theme_Manager.class.php:311
 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719
+<<<<<<< HEAD
 #: libraries/common.lib.php:1344 libraries/common.lib.php:2301
 #: libraries/display_change_password.lib.php:82
 #: libraries/display_create_table.lib.php:62
+=======
+#: libraries/common.lib.php:1335 libraries/common.lib.php:2288
+#: libraries/display_change_password.lib.php:82
+#: libraries/display_create_table.lib.php:63
+>>>>>>> origin/master
 #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532
 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76
 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104
+<<<<<<< HEAD
 #: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480
 #: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782
+=======
+#: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477
+#: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782
+>>>>>>> origin/master
 #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328
 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142
 #: server_privileges.php:665 server_privileges.php:1641
@@ -65,8 +80,13 @@ msgstr "搜索"
 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171
 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265
 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561
+<<<<<<< HEAD
 #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560
 #: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512
+=======
+#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562
+#: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512
+>>>>>>> origin/master
 #: view_create.php:182 view_operations.php:101
 msgid "Go"
 msgstr "執行"
@@ -119,10 +139,17 @@ msgstr "欄位名稱"
 #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245
 #: libraries/export/latex.php:360 libraries/export/odt.php:297
 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100
+<<<<<<< HEAD
 #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093
 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
 #: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321
+=======
+#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070
+#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142
+#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178
+#: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321
+>>>>>>> origin/master
 msgid "Type"
 msgstr "型態"
 
@@ -163,9 +190,15 @@ msgstr "註解"
 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322
 #: libraries/export/latex.php:430 libraries/export/odt.php:368
 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263
+<<<<<<< HEAD
 #: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596
 #: server_privileges.php:1911 server_privileges.php:1916
 #: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228
+=======
+#: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579
+#: server_privileges.php:1889 server_privileges.php:1894
+#: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228
+>>>>>>> origin/master
 #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342
 msgid "No"
 msgstr " 否 "
@@ -179,9 +212,15 @@ msgstr " 否 "
 #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106
 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262
 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344
+<<<<<<< HEAD
 #: server_databases.php:64 server_privileges.php:1582
 #: server_privileges.php:1596 server_privileges.php:1911
 #: server_privileges.php:1914 server_privileges.php:2210 sql.php:193
+=======
+#: server_databases.php:64 server_privileges.php:1565
+#: server_privileges.php:1579 server_privileges.php:1889
+#: server_privileges.php:1892 server_privileges.php:2187 sql.php:193
+>>>>>>> origin/master
 #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350
 #: tbl_tracking.php:335 tbl_tracking.php:340
 msgid "Yes"
@@ -230,7 +269,15 @@ msgstr "更改資料庫名稱到"
 msgid "Command"
 msgstr "指令"
 
+<<<<<<< HEAD
 #: db_operations.php:466
+=======
+#: db_operations.php:429 tbl_change.php:1140
+msgid "and then"
+msgstr "然後"
+
+#: db_operations.php:455
+>>>>>>> origin/master
 msgid "Copy database to"
 msgstr "複製資料庫到"
 
@@ -319,7 +366,11 @@ msgstr "啟動"
 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730
 #: server_collations.php:54 server_collations.php:66 server_databases.php:111
 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179
+<<<<<<< HEAD
 #: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326
+=======
+#: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326
+>>>>>>> origin/master
 msgid "Collation"
 msgstr "校對"
 
@@ -346,7 +397,11 @@ msgstr "資料表"
 #: db_printview.php:105 libraries/db_structure.lib.php:56
 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146
 #: navigation.php:638 navigation.php:660 server_databases.php:122
+<<<<<<< HEAD
 #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775
+=======
+#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777
+>>>>>>> origin/master
 msgid "Rows"
 msgstr "資料列列數"
 
@@ -361,19 +416,31 @@ msgstr "使用中"
 
 #: db_printview.php:187 libraries/db_info.inc.php:88
 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433
+<<<<<<< HEAD
 #: tbl_structure.php:807
+=======
+#: tbl_structure.php:809
+>>>>>>> origin/master
 msgid "Creation"
 msgstr "建立"
 
 #: db_printview.php:196 libraries/db_info.inc.php:93
 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443
+<<<<<<< HEAD
 #: tbl_structure.php:815
+=======
+#: tbl_structure.php:817
+>>>>>>> origin/master
 msgid "Last update"
 msgstr "最後更新"
 
 #: db_printview.php:205 libraries/db_info.inc.php:98
 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453
+<<<<<<< HEAD
 #: tbl_structure.php:823
+=======
+#: tbl_structure.php:825
+>>>>>>> origin/master
 msgid "Last check"
 msgstr "最後檢查"
 
@@ -438,7 +505,11 @@ msgstr "移除"
 
 #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553
 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779
+<<<<<<< HEAD
 #: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250
+=======
+#: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250
+>>>>>>> origin/master
 #: tbl_select.php:286
 msgid "Or"
 msgstr "或"
@@ -656,9 +727,15 @@ msgstr "選擇的資料表："
 msgid "Check All"
 msgstr "全選"
 
+<<<<<<< HEAD
 #: db_structure.php:529 libraries/display_tbl.lib.php:2077
 #: libraries/replication_gui.lib.php:36 server_databases.php:350
 #: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460
+=======
+#: db_structure.php:531 libraries/display_tbl.lib.php:2077
+#: libraries/replication_gui.lib.php:36 server_databases.php:350
+#: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462
+>>>>>>> origin/master
 msgid "Uncheck All"
 msgstr "全部取消"
 
@@ -1111,10 +1188,17 @@ msgid "Prev"
 msgstr "前一頁"
 
 #. l10n: Display text for next month link in calendar
+<<<<<<< HEAD
 #: js/messages.php:106 libraries/common.lib.php:2366
 #: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338
 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
 #: tbl_structure.php:799
+=======
+#: js/messages.php:77 libraries/common.lib.php:2353
+#: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338
+#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423
+#: tbl_structure.php:801
+>>>>>>> origin/master
 msgid "Next"
 msgstr "下一個"
 
@@ -1653,7 +1737,11 @@ msgstr "密碼:"
 msgid "Server Choice"
 msgstr "選擇伺服器"
 
+<<<<<<< HEAD
 #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63
+=======
+#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59
+>>>>>>> origin/master
 msgid "Cookies must be enabled past this point."
 msgstr "Cookies 必須啟動才能登入."
 
@@ -1732,7 +1820,11 @@ msgstr ""
 "當文編碼模組讀取後,未能使用 iconv, libiconv 或 recode_string 功能. 請檢查您"
 "的 php 設定."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:580
+=======
+#: libraries/common.inc.php:576
+>>>>>>> origin/master
 msgid ""
 "phpMyAdmin was unable to read your configuration file!<br />This might "
 "happen if PHP finds a parse error in it or PHP cannot find the file.<br /"
@@ -1746,40 +1838,68 @@ msgstr ""
 "誤都來自某處漏了引號或分別.<br />如果按下連結後出現空白頁, 即代表沒有任何問"
 "題."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:591
+=======
+#: libraries/common.inc.php:587
+>>>>>>> origin/master
 #, fuzzy, php-format
 #| msgid "Could not load default configuration from: \"%1$s\""
 msgid "Could not load default configuration from: %1$s"
 msgstr "無法讀取預設設定: \"%1$s\""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:596
+=======
+#: libraries/common.inc.php:592
+>>>>>>> origin/master
 msgid ""
 "The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
 "configuration file!"
 msgstr " 必須在設定檔內設定 <tt>$cfg['PmaAbsoluteUri']</tt> !"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:626
+=======
+#: libraries/common.inc.php:622
+>>>>>>> origin/master
 #, fuzzy, php-format
 #| msgid "Invalid server index: \"%s\""
 msgid "Invalid server index: %s"
 msgstr "伺服器索引錯誤: \"%s\""
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:633
+=======
+#: libraries/common.inc.php:629
+>>>>>>> origin/master
 #, php-format
 msgid "Invalid hostname for server %1$s. Please review your configuration."
 msgstr "伺服器 %1$s 主機名稱錯誤, 請翻查設定值."
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:642 libraries/header.inc.php:100
+=======
+#: libraries/common.inc.php:638 libraries/header.inc.php:96
+>>>>>>> origin/master
 #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47
 #: main.php:185 test/theme.php:57
 msgid "Server"
 msgstr "伺服器"
 
+<<<<<<< HEAD
 #: libraries/common.inc.php:820
 msgid "Invalid authentication method set in configuration:"
 msgstr "於設定內設定錯誤認證方式:"
 
 #: libraries/common.inc.php:923
+=======
+#: libraries/common.inc.php:816
+msgid "Invalid authentication method set in configuration:"
+msgstr "於設定內設定錯誤認證方式:"
+
+#: libraries/common.inc.php:919
+>>>>>>> origin/master
 #, php-format
 msgid "You should upgrade to %s %s or later."
 msgstr "您應該更新到 %s %s 或之後."
@@ -2026,7 +2146,11 @@ msgid ""
 msgstr "可能接近. 請參看 FAQ 3.11"
 
 #: libraries/db_structure.lib.php:69 server_databases.php:142
+<<<<<<< HEAD
 #: tbl_printview.php:335 tbl_structure.php:680
+=======
+#: tbl_printview.php:335 tbl_structure.php:682
+>>>>>>> origin/master
 msgid "Overhead"
 msgstr "多餘"
 
@@ -2053,22 +2177,36 @@ msgid "Change password"
 msgstr "更改密碼"
 
 #: libraries/display_change_password.lib.php:35
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:348 server_privileges.php:808
+=======
+#: libraries/replication_gui.lib.php:348 server_privileges.php:807
+>>>>>>> origin/master
 msgid "No Password"
 msgstr "不用密碼"
 
 #: libraries/display_change_password.lib.php:41
 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63
 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:352 server_privileges.php:797
 #: server_privileges.php:801 server_privileges.php:812
 #: server_privileges.php:1555 server_synchronize.php:1175
+=======
+#: libraries/replication_gui.lib.php:352 server_privileges.php:796
+#: server_privileges.php:800 server_privileges.php:811
+#: server_privileges.php:1538 server_synchronize.php:1175
+>>>>>>> origin/master
 msgid "Password"
 msgstr "密碼"
 
 #: libraries/display_change_password.lib.php:46
 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359
+<<<<<<< HEAD
 #: server_privileges.php:816 server_privileges.php:819
+=======
+#: server_privileges.php:815 server_privileges.php:818
+>>>>>>> origin/master
 msgid "Re-type"
 msgstr "確認密碼"
 
@@ -2083,12 +2221,20 @@ msgid "MySQL 4.0 compatible"
 msgstr "MySQL&nbsp;4.0 相容"
 
 #: libraries/display_change_password.lib.php:72
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:363 server_privileges.php:823
+=======
+#: libraries/replication_gui.lib.php:363 server_privileges.php:822
+>>>>>>> origin/master
 msgid "Generate Password"
 msgstr "產生密碼"
 
 #: libraries/display_change_password.lib.php:75
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:366 server_privileges.php:826
+=======
+#: libraries/replication_gui.lib.php:366 server_privileges.php:825
+>>>>>>> origin/master
 msgid "Generate"
 msgstr "產生"
 
@@ -2174,7 +2320,11 @@ msgid "remember template"
 msgstr "保留樣式名稱"
 
 #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552
+=======
+#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549
+>>>>>>> origin/master
 msgid "Character set of the file:"
 msgstr "文字編碼檔案:"
 
@@ -2227,7 +2377,11 @@ msgstr ""
 msgid "File to import"
 msgstr "載入檔案"
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527
+=======
+#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524
+>>>>>>> origin/master
 msgid "Location of the text file"
 msgstr "文字檔案的位置"
 
@@ -2235,12 +2389,20 @@ msgstr "文字檔案的位置"
 msgid "File uploads are not allowed on this server."
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536
+=======
+#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533
+>>>>>>> origin/master
 #: tbl_change.php:1025
 msgid "The directory you set for upload work cannot be reached"
 msgstr "設定之上載目錄錯誤，未能使用"
 
+<<<<<<< HEAD
 #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539
+=======
+#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536
+>>>>>>> origin/master
 #: tbl_change.php:1028
 msgid "web server upload directory"
 msgstr "Web 伺服器上載目錄"
@@ -2371,7 +2533,11 @@ msgstr "依鍵名排序"
 #: libraries/import/docsql.php:34 libraries/import/ldi.php:47
 #: libraries/import/ods.php:30 libraries/import/sql.php:20
 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26
+<<<<<<< HEAD
 #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751
+=======
+#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753
+>>>>>>> origin/master
 #, fuzzy
 msgid "Options"
 msgstr "管理"
@@ -2516,7 +2682,11 @@ msgstr "緩衝區使用空間"
 
 #: libraries/engines/innodb.lib.php:194 server_databases.php:137
 #: server_databases.php:305 server_status.php:525 server_status.php:586
+<<<<<<< HEAD
 #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694
+=======
+#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696
+>>>>>>> origin/master
 msgid "Total"
 msgstr "總共"
 
@@ -2771,7 +2941,11 @@ msgid ""
 msgstr ""
 
 #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88
+<<<<<<< HEAD
 #: tbl_printview.php:375 tbl_structure.php:735
+=======
+#: tbl_printview.php:375 tbl_structure.php:737
+>>>>>>> origin/master
 msgid "Format"
 msgstr "格式"
 
@@ -2843,8 +3017,13 @@ msgstr "Microsoft Word 2000"
 #: libraries/export/latex.php:201 libraries/export/odt.php:48
 #: libraries/export/sql.php:106 libraries/export/sql.php:868
 #: libraries/export/texytext.php:27 server_databases.php:127
+<<<<<<< HEAD
 #: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316
 #: tbl_structure.php:663
+=======
+#: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316
+#: tbl_structure.php:665
+>>>>>>> origin/master
 msgid "Data"
 msgstr "資料"
 
@@ -2893,9 +3072,15 @@ msgstr "MIME 類型"
 #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57
 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177
 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:332 server_privileges.php:732
 #: server_privileges.php:735 server_privileges.php:791
 #: server_privileges.php:1554 server_privileges.php:2092
+=======
+#: libraries/replication_gui.lib.php:332 server_privileges.php:731
+#: server_privileges.php:734 server_privileges.php:790
+#: server_privileges.php:1537 server_privileges.php:2069
+>>>>>>> origin/master
 #: server_processlist.php:55 server_synchronize.php:1159
 msgid "Host"
 msgstr "主機"
@@ -3568,8 +3753,13 @@ msgstr ""
 
 #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59
 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:262 server_privileges.php:712
 #: server_privileges.php:715 server_privileges.php:722
+=======
+#: libraries/replication_gui.lib.php:262 server_privileges.php:711
+#: server_privileges.php:714 server_privileges.php:721
+>>>>>>> origin/master
 #: server_synchronize.php:1171
 msgid "User name"
 msgstr "使用者名稱"
@@ -3588,14 +3778,22 @@ msgstr ""
 msgid "Slave status"
 msgstr "顯示 slave 狀態"
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448
+=======
+#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445
+>>>>>>> origin/master
 #: server_status.php:737 server_variables.php:52
 msgid "Variable"
 msgstr "資訊"
 
 #: libraries/replication_gui.lib.php:118 server_status.php:738
 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138
+<<<<<<< HEAD
 #: tbl_structure.php:727
+=======
+#: tbl_structure.php:729
+>>>>>>> origin/master
 msgid "Value"
 msgstr "值"
 
@@ -3613,11 +3811,16 @@ msgstr ""
 msgid "Add slave replication user"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:257 server_privileges.php:717
+=======
+#: libraries/replication_gui.lib.php:257 server_privileges.php:716
+>>>>>>> origin/master
 msgid "Any user"
 msgstr "任何使用者"
 
 #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326
+<<<<<<< HEAD
 #: libraries/replication_gui.lib.php:349 server_privileges.php:718
 #: server_privileges.php:785 server_privileges.php:809
 #: server_privileges.php:1950 server_privileges.php:1980
@@ -3641,6 +3844,31 @@ msgid "Use Host Table"
 msgstr "使用主機資料表"
 
 #: libraries/replication_gui.lib.php:334 server_privileges.php:793
+=======
+#: libraries/replication_gui.lib.php:349 server_privileges.php:717
+#: server_privileges.php:784 server_privileges.php:808
+#: server_privileges.php:1928 server_privileges.php:1958
+msgid "Use text field"
+msgstr "文字輸入"
+
+#: libraries/replication_gui.lib.php:305 server_privileges.php:764
+msgid "Any host"
+msgstr "任何主機"
+
+#: libraries/replication_gui.lib.php:309 server_privileges.php:768
+msgid "Local"
+msgstr "本地"
+
+#: libraries/replication_gui.lib.php:315 server_privileges.php:773
+msgid "This Host"
+msgstr "指定主機"
+
+#: libraries/replication_gui.lib.php:321 server_privileges.php:779
+msgid "Use Host Table"
+msgstr "使用主機資料表"
+
+#: libraries/replication_gui.lib.php:334 server_privileges.php:792
+>>>>>>> origin/master
 msgid ""
 "When Host table is used, this field is ignored and values stored in Host "
 "table are used instead."
@@ -7663,10 +7891,13 @@ msgstr ""
 msgid "Show insert query"
 msgstr ""
 
+<<<<<<< HEAD
 #: tbl_change.php:1140
 msgid "and then"
 msgstr "然後"
 
+=======
+>>>>>>> origin/master
 #: tbl_change.php:1144
 msgid "Go back to previous page"
 msgstr "返回"
@@ -7862,6 +8093,7 @@ msgstr "檢查指示完整性:"
 msgid "Show tables"
 msgstr "顯示資料表"
 
+<<<<<<< HEAD
 #: tbl_printview.php:309 tbl_structure.php:654
 msgid "Space usage"
 msgstr "已使用空間"
@@ -7895,6 +8127,41 @@ msgid "Row length"
 msgstr "資料列長度"
 
 #: tbl_printview.php:413 tbl_structure.php:791
+=======
+#: tbl_printview.php:309 tbl_structure.php:656
+msgid "Space usage"
+msgstr "已使用空間"
+
+#: tbl_printview.php:313 tbl_structure.php:660
+msgid "Usage"
+msgstr "使用"
+
+#: tbl_printview.php:340 tbl_structure.php:687
+msgid "Effective"
+msgstr "實際"
+
+#: tbl_printview.php:365 tbl_structure.php:725
+msgid "Row Statistics"
+msgstr "資料列統計數值"
+
+#: tbl_printview.php:368 tbl_structure.php:728
+msgid "Statements"
+msgstr "敘述"
+
+#: tbl_printview.php:379 tbl_structure.php:740
+msgid "static"
+msgstr ""
+
+#: tbl_printview.php:381 tbl_structure.php:742
+msgid "dynamic"
+msgstr "動態"
+
+#: tbl_printview.php:403 tbl_structure.php:785
+msgid "Row length"
+msgstr "資料列長度"
+
+#: tbl_printview.php:413 tbl_structure.php:793
+>>>>>>> origin/master
 msgid " Row size "
 msgstr "資料列大小"